summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/gmutils/gmRCS.sty8
-rw-r--r--Master/texmf-dist/tex/latex/gmutils/gmampulex.sty8
-rw-r--r--Master/texmf-dist/tex/latex/gmutils/gmbase.sty272
-rw-r--r--Master/texmf-dist/tex/latex/gmutils/gmcommand.sty217
-rw-r--r--Master/texmf-dist/tex/latex/gmutils/gmenvir.sty30
-rw-r--r--Master/texmf-dist/tex/latex/gmutils/gmlogos.sty28
-rw-r--r--Master/texmf-dist/tex/latex/gmutils/gmmeta.sty20
-rw-r--r--Master/texmf-dist/tex/latex/gmutils/gmmw.sty12
-rw-r--r--Master/texmf-dist/tex/latex/gmutils/gmnotonlypream.sty8
-rw-r--r--Master/texmf-dist/tex/latex/gmutils/gmparts.sty11
-rw-r--r--Master/texmf-dist/tex/latex/gmutils/gmrelsize.sty13
-rw-r--r--Master/texmf-dist/tex/latex/gmutils/gmtypos.sty317
-rw-r--r--Master/texmf-dist/tex/latex/gmutils/gmurl.sty10
-rw-r--r--Master/texmf-dist/tex/latex/gmutils/gmutils.sty10
14 files changed, 665 insertions, 299 deletions
diff --git a/Master/texmf-dist/tex/latex/gmutils/gmRCS.sty b/Master/texmf-dist/tex/latex/gmutils/gmRCS.sty
index 0ac760f4d0d..1ecabf4d001 100644
--- a/Master/texmf-dist/tex/latex/gmutils/gmRCS.sty
+++ b/Master/texmf-dist/tex/latex/gmutils/gmRCS.sty
@@ -2,7 +2,7 @@
%% \iffalse ^^A we skip the debug setting
\IfFileExists{\string~/bin/gen_and_xela}{\errorcontextlines=1000 }{}
%% \fi
-%% ^^A $Id: TheUltimateMaster.gmd,v 0.297 2011/02/02 18:13:11 natror Exp natror $
+%% ^^A $Id: TheUltimateMaster.gmd,v 0.352 2011/10/12 15:19:42 natror Exp natror $
%% This is file “gmRCS.sty” generated with the DocStrip utility.
%%
%%
@@ -13,7 +13,7 @@
%%
%% Copyright ©
%% by Grzegorz ‘Natror’ Murzynowski
-%% natror (at) o2 (dot) pl
+%% natror (at) gmail (dot) com
%%
%% This program is subject to the LaTeX Project Public License.
%% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
@@ -23,13 +23,13 @@
%%
%%
%%
-%% For the documentation please refer to the file(s)
+%% For documentation please refer to the file(s)
%% gmutils.{gmd,pdf}.
%%
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gmRCS}
- [2010/10/24 v0.993 (GM)]
+ [2011/10/12 v0.996 (GM)]
%%
diff --git a/Master/texmf-dist/tex/latex/gmutils/gmampulex.sty b/Master/texmf-dist/tex/latex/gmutils/gmampulex.sty
index ba1495c1187..9ae544868e6 100644
--- a/Master/texmf-dist/tex/latex/gmutils/gmampulex.sty
+++ b/Master/texmf-dist/tex/latex/gmutils/gmampulex.sty
@@ -2,7 +2,7 @@
%% \iffalse ^^A we skip the debug setting
\IfFileExists{\string~/bin/gen_and_xela}{\errorcontextlines=1000 }{}
%% \fi
-%% ^^A $Id: TheUltimateMaster.gmd,v 0.297 2011/02/02 18:13:11 natror Exp natror $
+%% ^^A $Id: TheUltimateMaster.gmd,v 0.352 2011/10/12 15:19:42 natror Exp natror $
%% This is file “gmampulex.sty” generated with the DocStrip utility.
%%
%%
@@ -13,7 +13,7 @@
%%
%% Copyright ©
%% by Grzegorz ‘Natror’ Murzynowski
-%% natror (at) o2 (dot) pl
+%% natror (at) gmail (dot) com
%%
%% This program is subject to the LaTeX Project Public License.
%% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
@@ -23,13 +23,13 @@
%%
%%
%%
-%% For the documentation please refer to the file(s)
+%% For documentation please refer to the file(s)
%% gmutils.{gmd,pdf}.
%%
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gmampulex}
- [2010/10/24 v0.993 Ampulex Compressa-like modifier of macros (GM)]
+ [2011/10/12 v0.996 Ampulex Compressa-like modifier of macros (GM)]
%%
diff --git a/Master/texmf-dist/tex/latex/gmutils/gmbase.sty b/Master/texmf-dist/tex/latex/gmutils/gmbase.sty
index ecc0542281f..23bd9ebb16a 100644
--- a/Master/texmf-dist/tex/latex/gmutils/gmbase.sty
+++ b/Master/texmf-dist/tex/latex/gmutils/gmbase.sty
@@ -2,7 +2,7 @@
%% \iffalse ^^A we skip the debug setting
\IfFileExists{\string~/bin/gen_and_xela}{\errorcontextlines=1000 }{}
%% \fi
-%% ^^A $Id: TheUltimateMaster.gmd,v 0.297 2011/02/02 18:13:11 natror Exp natror $
+%% ^^A $Id: TheUltimateMaster.gmd,v 0.352 2011/10/12 15:19:42 natror Exp natror $
%% This is file “gmbase.sty” generated with the DocStrip utility.
%%
%%
@@ -13,7 +13,7 @@
%%
%% Copyright ©
%% by Grzegorz ‘Natror’ Murzynowski
-%% natror (at) o2 (dot) pl
+%% natror (at) gmail (dot) com
%%
%% This program is subject to the LaTeX Project Public License.
%% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
@@ -23,19 +23,21 @@
%%
%%
%%
-%% For the documentation please refer to the file(s)
+%% For documentation please refer to the file(s)
%% gmutils.{gmd,pdf}.
%%
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gmbase}
- [2010/10/24 v0.993 some tricky low-level macros (GM)]
+ [2011/10/12 v0.996 some low-level macros (GM)]
%%
%%
%% ^^A\typeout{\unexpanded{#4}}%%
+\RequirePackage {expl3, xparse} % because it's used anyway: by
+
\ifx\XeTeXversion\relax
\let\XeTeXversion\@undefined% If someone earlier used
\fi
@@ -88,7 +90,7 @@
\strip@bslash{#1}%
}
-\long\def\@xanxcs#1{%
+\long\def\@xanxcs #1{%
\ifcat\@nx~\@nx#1%
\@nx#1%
\else
@@ -96,6 +98,10 @@
\fi
}
+\long\def\@xanxcssimple #1{%
+ \@xa\@nx\csname #1\endcsname
+}
+
\long\def\@xaucs#1{%
\unexpanded\@xa\@xa\@xa{\csname #1\endcsname}%
}
@@ -113,6 +119,23 @@
\def\lpdef{\long\protected\def}
\let\pldef\lpdef
+\long\def\gmu@ifdefinable
+#1% a \CS
+{%
+ \ifx #1\@undefined
+ \@xa \@firstoftwo
+ \else
+ \@xa\@secondoftwo
+ \fi
+ {\@firstoftwo}%
+ {\ifx #1\relax
+ \@xa\@firstoftwo
+ \else
+ \@xa \@secondoftwo
+ \fi
+ }%
+}
+
\def\pedef{\protected\edef}
\def\pxdef{\protected\xdef}
@@ -134,7 +157,8 @@
\long\def\gmu@gobdef#1#{% \UnDef
\def\gmu@tempa{}% it's a~junk |\def|-assignment
% to absorb possible prefixes.
- \@gobble}
+ \@gobble
+}
\def\pprovide{\protected\provide}
@@ -148,15 +172,27 @@
\fi
}
+\newcommand\newdef % sort of newcommand that accepts prefixes.
+[1]%
+{%
+ \gmu@ifdefinable #1%
+ {\pdef #1}
+ {%
+ \PackageError {gmbase} {\@nx#1 already defined.}{}%
+ \gmu@gobdef
+ }%
+}
+
+\protected\newdef \pnew {%
+ \protected\newdef
+}
-\long\def\gmu@if#1#2{%
- \ifnum\strcmp{incsname}{\detokenize{#1}}=\z@
- \@xa\@xa\@xa\ifincsname
- \@gobble\fi % this |\fi| balances the conditional when false
- \else
- \csname if#1\@xa\endcsname
+
+\long\def\gmu@if #1#2{%
+ \csname if#1\endcsname #2%
+ \@xa\@firstoftwo
+ \else\@xa\@secondoftwo
\fi
- #2\@xa\@firstoftwo\else\@xa\@secondoftwo\fi
}
\long\def\gmu@notif#1#2{%
@@ -167,15 +203,21 @@
\def\gmu@ifsw #1{\gmu@if {#1}{}}
\def\gmu@notsw #1{\gmu@notif {#1}{}}
+\def \gmu@ifincsname
+{%
+ \ifincsname
+ \@xa\@firstoftwo
+ \else
+ \@xa\@secondoftwo
+ \fi
+}
+
\long\def\gmu@unless #1#2{%
- \ifnum\strcmp{incsname}{\detokenize{#1}}=\z@
- \@xa\@xa\@xa\unless \@xa\@xa\@xa\ifincsname
- \@gobble\fi % this |\fi| balances the conditional when it's not
- % |\ifincsname|
+ \@xa\unless \csname if#1\endcsname #2%
+ \@xa\@firstoftwo
\else
- \@xa\unless \csname if#1\@xa\endcsname
+ \@xa\@secondoftwo
\fi
- #2\@xa\@firstoftwo\else\@xa\@secondoftwo\fi
}
@@ -314,16 +356,16 @@
\def\fooatletter{\foone\makeatletter}
\newcommand*\@emptify[1]{\let#1=\@empty}
-\@ifdefinable\emptify{\let\emptify\@emptify}
+\gmu@ifdefinable\emptify{\let\emptify\@emptify}
\newcommand*\g@emptify{\global\@emptify}
-\@ifdefinable\gemptify{\let\gemptify\g@emptify}
+\gmu@ifdefinable\gemptify{\let\gemptify\g@emptify}
\newcommand\@relaxen[1]{\let#1=\relax}
-\@ifdefinable\relaxen{\let\relaxen\@relaxen}
+\gmu@ifdefinable\relaxen{\let\relaxen\@relaxen}
\newcommand*\g@relaxen{\global\@relaxen}
-\@ifdefinable\grelaxen{\let\grelaxen\g@relaxen}
+\gmu@ifdefinable\grelaxen{\let\grelaxen\g@relaxen}
\long\def\gmu@ifempty#1{%\
\ifnum\strcmp{\detokenize{#1}}{}=\z@
@@ -343,18 +385,17 @@
\fi
}
-\long\pdef\IfAmong#1\among#2{%\label{IfAmong}\
- % \begin{enumargs}
- % \item the token(s) whose presence we check,
- % \item the list of tokens in which we search |#1|,
- % \item the ‘if found’ stuff,
- % \item the ‘if not found’ stuff.
- % \end{enumargs}
+\long\pdef\IfAmong
+#1% the token(s) whose presence we check,
+\among % delimiter of |#1|
+#2% the list of tokens in which we search |#1|,
+{%\label{IfAmong}
% \chgs{2008/12/05 v0.98 split from \cs{IfAmong}}
%
\long\def\gmu@among@##1#1##2\gmu@among@{%
\gmu@ifempty{##2}\@secondoftwo\@firstoftwo}%
- \gmu@among@#2#1\gmu@among@}
+ \gmu@among@#2#1\gmu@among@
+}
\newif\ifgmu@ifquant
@@ -618,11 +659,6 @@
% applied to |#1|. Therefore it turns true for |#1| being e.g.\ primitive
% \TeX's skip registers and |#2|==|\skip|.
{%
- \PackageInfo{gmbase}{^^J%
- Checking whether ***\string#1*** is a ***\string #2***^^J
- If the next message you get is an error^^J%
- ***missing number treated as 0***,^^J
- then it's probably not^^J}%
\@tempswafalse
%
\gmu@CASE x{\defNoHash#2}%
@@ -1235,7 +1271,7 @@
\ifincsname\xiiunder
\else
\ifmmode\subs
- \else\_%
+ \else\xiiunder %
\fi
\fi}}}% We define it as \inverb|\_| not just as
\foone{\catcode`\!=0
@@ -1284,6 +1320,10 @@
\edef#1{\unexpanded{#2}}%
}
+\long\pdef\xdefU#1#2{%
+ \xdef#1{\unexpanded{#2}}%
+}
+
\long\pdef\@ifnextcat#1#2#3{%
\edefU\reserved@d{#1}%
\edefU\reserved@a{#2}%
@@ -1398,14 +1438,17 @@
\@ifnextnotgroup{#2}{#1}}
\pdef\ignoreactiveM{%
- \@ifnextgroup{}{\gmu@checkM}}
+ \@ifnextgroup{}{\gmu@checkM}%
+}
\foone\obeylines{% we know it's a~single token since we use this macro
% only in \incmd\@ifnextgroup's ‘else’.
\long\pdef\gmu@checkM#1{%
\ifx
#1\@xa\ignoreactiveM%
- \else\@xa#1\fi}}
+ \else\@xa#1\fi %
+ }%
+}
\let\gmu@reserveda\*%
\def\*{%
@@ -1524,7 +1567,7 @@
\afterassignment\gmu@ifna@resa
\let\gmu@drain=
}%
- {% else we perform |\gmu@ifnextany|
+ {% else we perform |\gmu@ifnextanyIS|
\gmu@ifxany{\@let@token}{#1}{%
\gmu@ifnextStrXany {#1}{#2}{#3}%
}%
@@ -1900,10 +1943,12 @@
\def\@ifXeTeX{% two-argument command
\ifdefined\XeTeXversion
\unless\ifx\XeTeXversion\relax\afterfifi\@firstoftwo\else\afterfifi\@secondoftwo\fi
- \else\afterfi\@secondoftwo\fi}
+ \else\afterfi\@secondoftwo\fi
+}
+
-\def\XeTeXifprefix{% to be used as prefix to an |\if›…| test.
- \@ifXeTeX{}{\unless}}
+\newif\ifgmuXeTeX
+\@ifXeTeX{\gmuXeTeXtrue}{}%
\@ifXeTeX{%
@@ -2346,7 +2391,7 @@
\@xa\@firstoftwo
\else\@xa\@secondoftwo
\fi
-}
+}% of |\gmu@ifskip|.
\def\gmu@ifbox
#1% a box register number (e.g.~|\copy\z@|)
@@ -2438,10 +2483,7 @@
#2% parameters string
#3% definition's body
{%
- \def#1#2{%
- \gmu@if {incsname}{}%
- {\string#1}{#3}%
- }%
+ \def#1#2{\gmu@ifincsname {\string#1}{#3}}%
}
@@ -2475,12 +2517,25 @@
{%
\gmu@CountTokens{#2}%
\gmu@if {num}{\c@gmu@TokensCount=\@ne}%
- {\gmu@if x{#2 }%
- \@secondoftwo\@firstoftwo}%
+ {\gmu@if x{#2 }% if |#2| is single token of blank space then we
+ % don't consider it single since it can't be an
+ % argument to a macro if without braces.
+ \@secondoftwo\@firstoftwo
+ }%
\@secondoftwo
{#1#2}{#1{{#2}}}%
}% of |\gmu@passbraced|
+\long\def\gmu@passbracedNotSp
+#1% the stuff to be put before |#2|
+#2% the stuff we check and pass unbraced if single or braced otherwise
+{%
+ \gmu@CountTokens{#2}%
+ \gmu@if {num}{\c@gmu@TokensCount=\@ne}%
+ {#1{#2}}%
+ {#1{{#2}}}%
+}% of |\gmu@passbracedNotSp|
+
\long\def\MeaningOrUnex#1{%
\gmu@if {singletoken}{{#1}}%
{\meaning#1}{\unexpanded{#1}}%
@@ -2500,6 +2555,8 @@
\@iwru{»\unexpanded{#1}« is »\MeaningOrUnex{#1}«}%
}
+\pldef\@iwruU #1{\@iwru{\unexpanded{#1}}}
+
\pldef\@iwruif#1{%
\gmu@if {gmu@debug@msgs}{}
{\@iwru{#1}}{}%
@@ -2621,7 +2678,7 @@
{%
\ifnum
\gmu@ifQUANT@iter
- 0% for the General Quantifier 0 terminates calculation (a
+ 0% for the General Quantifier 0 terminates calculation (when a
% counter-example has just been found)
1% To make any calculation sense we assume 1 at the beginning
#1
@@ -2649,6 +2706,11 @@
\long\def\@sN #1 {\csname #1\endcsname}
\long\def\@sdN #1 {\csname \detokenize{#1}\endcsname}
+
+\pdef\clap #1{\hbox to \z@{\hss #1\hss}}
+
+\pdef\hsizecline #1{\hbox to\hsize{\hss #1\hss}}
+
\long\def\gmu@extreme
#1% kind of test (|num| or |dim|)
#2% inequality sign: |<| for minimum, |>| for maximum.
@@ -2875,6 +2937,114 @@
\def\hrule@zero{\hrule height\z@ width\z@ depth\z@}
+\pdef \protected@nil {}
+\let\protected@empty\protected@nil
+
+\ifgmuXeTeX
+
+ % 2011/02/03, 12.53 definitions of the macros for combinig
+
+ \def\gmu@nobound
+ #1% a~char
+ #2% bound number
+ {%
+ \gmu@unless {}
+ {0%
+ \gmu@if {num}{#2=\@ne }{0}{}%
+ \gmu@if {num}{#2=13 } {0}{}%
+ 1}
+ {}
+ {%
+ \leavevmode
+ \kern -\glyphbound #1 1%
+ }%
+ #1%
+ \gmu@unless {}
+ {0%
+ \gmu@if {num}{#2=\thr@@ }{0}{}%
+ \gmu@if {num}{#2=13 }{0}{}%
+ 1}
+ {}
+ {%
+ \kern -\glyphbound #1 3%
+ }%
+ }
+
+ \def\glyphbound
+ #1% char (name)
+ #2% number of the bound
+ {%
+ \XeTeXglyphbounds #2 \XeTeXglyphindex "#1"
+ }
+
+ \def\gmu@halfcomb
+ #1% the “basic” char
+ #2% the accent char
+ #3% emergency [\pk{fontspec}] font spec
+ {%
+ #1\kern-\gmu@halfwd #1%
+ \clap{%
+ \gmu@unless {fontchar}{\font `#2 }
+ {#3}{}%
+ #2}%
+ \kern\gmu@halfwd #1%
+ }
+
+ \def\gmu@halfwd#1{0,45\fontcharwd\font`#1 }
+
+ \def\gmu@llapcomb
+ #1% the “basic” char
+ #2% the accent char
+ #3% emergency [\pk{fontspec}] font spec
+ {%
+ \gmu@nobound #13%
+ \llap{%
+ \gmu@unless {fontchar}{\font `#2 }
+ {#3}{}%
+ #2}%
+ \kern \XeTeXglyphbounds 3 \XeTeXglyphindex "#1"
+ }
+
+\fi % of if \XeTeX
+
+\pdef\@rmfromreset
+#1% counter to be freed, e.g., |figure|,
+#2% counter from whose power we free |#1|, e.g., |chapter|.
+{%
+ {%
+ \def\@elt ##1{%
+ \gmu@ifdetokens{#1}{##1}%
+ {}% then we remove the element, otherwise
+ {\@nx\@elt {##1}}%
+ }%
+ %
+ \Name\xdef{cl@#2}{\csname cl@#2\endcsname}%
+ }%
+}
+
+
+\long\def \gmu@iflist {%
+ % |#1| (implicit) what if in a list environment
+ % |#2| (implicit) what if not in a list env.
+ \ifnum \@listdepth>\z@
+ \@xa\@firstoftwo
+ \else
+ \@xa\@secondoftwo
+ \fi
+}
+
+\foone {\@makeother \^^I }{%
+ \def\xiitab{^^I}%
+}
+
+\foone {\catcode 9=\active } {%
+ % Totally perverse, but seems to be useful with DocStrip.
+ \def\gmu@maketabtab {%
+ \def ^^I{\xiitab}%
+ }%
+}
+
+
\endinput
%%
%% End of file `gmbase.sty'.
diff --git a/Master/texmf-dist/tex/latex/gmutils/gmcommand.sty b/Master/texmf-dist/tex/latex/gmutils/gmcommand.sty
index 574667d67bf..f83fc8a2c17 100644
--- a/Master/texmf-dist/tex/latex/gmutils/gmcommand.sty
+++ b/Master/texmf-dist/tex/latex/gmutils/gmcommand.sty
@@ -2,7 +2,7 @@
%% \iffalse ^^A we skip the debug setting
\IfFileExists{\string~/bin/gen_and_xela}{\errorcontextlines=1000 }{}
%% \fi
-%% ^^A $Id: TheUltimateMaster.gmd,v 0.297 2011/02/02 18:13:11 natror Exp natror $
+%% ^^A $Id: TheUltimateMaster.gmd,v 0.352 2011/10/12 15:19:42 natror Exp natror $
%% This is file “gmcommand.sty” generated with the DocStrip utility.
%%
%%
@@ -13,7 +13,7 @@
%%
%% Copyright ©
%% by Grzegorz ‘Natror’ Murzynowski
-%% natror (at) o2 (dot) pl
+%% natror (at) gmail (dot) com
%%
%% This program is subject to the LaTeX Project Public License.
%% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
@@ -23,20 +23,20 @@
%%
%%
%%
-%% For the documentation please refer to the file(s)
+%% For documentation please refer to the file(s)
%% gmutils.{gmd,pdf}.
%%
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gmcommand}
- [2010/10/24 v0.993 definition of powerful \string \DeclareCommand \string &al. (GM)]
+ [2011/10/12 v0.996 definition of \string \DeclareCommand \string &al. based on the ancient xparse (pre-expl3) (GM)]
%%
%%
%% ^^A\typeout{\unexpanded{#4}}%%
-\RequirePackage{gmbase} % we require the tricky low-level macros.
+\RequirePackage{gmbase} % we require the low-level macros.
\unless\ifcsname ifgmu@quiet\endcsname
\Name\newif {ifgmu@quiet}% % it has to be at least (at highest) in
@@ -44,7 +44,6 @@
% % \pk{gmutils.sty} (a bug fix)}
\fi
- %
\unless\ifdefined\@temptokenb
\newtoks\@temptokenb
@@ -142,9 +141,11 @@
{\@dc@arguments{#2}#1\the\@dc@arguments}%
}
+\newtoks \@dc@ParsedSpecs
+
\def\@dc@ResetParseAuxilia{%
%
- \emptify\@dc@ParsedSpecs{}%
+ \@dc@ParsedSpecs={}%
%
\c@dc@catchernum\z@ % the count of catchers
\c@dc@argnum\z@ % the count of arguments (inner arity) (it may be
@@ -198,15 +199,15 @@
\def\@dc@argtypes{%
=\gobblespace \loop \lostwax \SameAs \Scope
- AaBbCcDdGgKkMmOo% ^^U Ôô
- QqSs*TtŤťUuǓǔWw%
+ AaBbCcDdGgKkMmOo%
+ QqSs*TtUuWw%
\drs
}
-\def\@dc@drses{\drs}
+\def\@dc@drses{\drs} % decimal respecting space
\@ifXeTeX
-{\addtomacro\@dc@argtypes{ďĎ}%
+{\addtomacro\@dc@argtypes{ďĎŤťǓǔÔô}%
\addtomacro\@dc@drses{ďĎ}%
}
{}
@@ -241,6 +242,7 @@
{\@dc@addtoparsed@BareSpace }
{}%
%
+ %
\gmu@ifsw {@dc@long@}%
{\@dc@addtospecs@bare{>P}}
{}%
@@ -399,6 +401,11 @@
\@dc@DeclareDefault Q {\NoValue}
+\@ifXeTeX {%
+ \@dc@DeclareDefault Ô{\NoValue}%
+}
+{}
+
\@dc@DeclareDefault U {\NoValue}
\long\def\@dc@maybe@expandafter #1{%
@@ -418,9 +425,9 @@
\long\def\@dc@addtospecs #1{%
\@dc@maybe@expandafter {#1}%
- {\@xa \addtomacro \@xa\@dc@ParsedSpecs\@xa{\@xa{#1}}%
+ {\@xa \addtotoks \@xa\@dc@ParsedSpecs\@xa{\@xa{#1}}%
}%
- {\addtomacro\@dc@ParsedSpecs{{#1}}}%
+ {\addtotoks\@dc@ParsedSpecs{{#1}}}%
}
\long\def\dc@addtoParsed@ #1{%
@@ -429,7 +436,7 @@
}
\long\def\@dc@addtospecs@bare #1{%
- \addtomacro\@dc@ParsedSpecs{#1}%
+ \addtotoks\@dc@ParsedSpecs{#1}%
}
\long\def\@dc@addtotoks@bare #1{%
@@ -465,11 +472,13 @@
\Restore@Macro\@dc@addargum}%
}
+\StoreMacro@nocat\gmu@passbraced
+
\pdef\@dc@BareSpaceArg{%
- \let \@dc@Loop@CareOfSpace \@dc@Loop@CareOfSpace@NoBraces
+ \let \gmu@passbraced \gmu@passbracedNotSp
\def\@dc@addargum {%
\Restore@Macro\@dc@addargum
- \Restore@Macro\@dc@Loop@CareOfSpace
+ \Restore@Macro\gmu@passbraced
\@dc@addargum
}%
}
@@ -537,6 +546,7 @@
{\BareSpace}
{\@dc@BareSpace@true}
%
+ %
\gmu@EatCases
{\IgnInfo{gmcommand}{while parsing arg specifiers}{#1}}%
\gmu@ESAC
@@ -638,7 +648,7 @@
\@dc@AliasPLower T
\long\def\ArgumentCatcher@Ť #1#2#3% as in |›…@T|
-{%
+{% one-token catcher that respects space.
\ArgumentCatcher@Loop
{StrX}{\any}{#1}{\any}{}{1}{#2}{% empty eacher
}{#3}%
@@ -694,7 +704,7 @@
% perform matching. \rrthis
%
\gmu@ifempty{#5}%
- {\gmu@if {strings} {\any #4}%
+ {\gmu@if {strings} {\none #4}%
{\@dc@Loop@addallfalse\@dc@Loop@drainalltrue}%
{\@dc@Loop@addalltrue\@dc@Loop@drainallfalse}%
}% of if |#5| empty
@@ -872,6 +882,27 @@
\@dc@AliasPLower Q
+\@ifXeTeX {%
+ \long\def\ArgumentCatcher@Ô
+ #1% list
+ #2% default (|\NoValue| by default, as in previous versions).
+ {%
+ \@dc@BareSpaceArg
+ \ArgumentCatcher@Loop
+ {str}%
+ \any
+ { #1}% note the space before |#1|—settheory sum of |#1| and drainers.
+ \any
+ { }% we ignore spaces—it's a legacy setting, maybe we'll optionise
+ % it in the future
+ \m@ne % we allow any number of tokens
+ {#2}% default, by default |\NoValue|, as defined in line \ref{Q-arg deft.}
+ {}% empty eacher
+ }%
+
+ \@dc@AliasPLower Ô
+
+}{}% of if \XeTeX
\def\ArgumentCatcher@D{% decimal argument (useful for dates e.g.)
\ArgumentCatcher@Q
@@ -890,7 +921,7 @@
{StrX}%
\any
{-+0123456789}%
- \none
+ \any
{}%
\m@ne
{#1}%
@@ -1067,7 +1098,7 @@
{\ArgumentCatcher@G{#2}{##1}}%
\Name\lpdef{ArgumentCatcher@P\strip@bslash{#1}}%
##1% default value
- {\ArgumentCatcher@G{#2}{##1}}%
+ {\ArgumentCatcher@PG{#2}{##1}}% »P« was missing. Fixed 2011/03/22, 16.14.
%
\gmu@if {cat}{a\@nx#1}%
{\@dc@LowerAliases #1}{}%
@@ -1139,13 +1170,11 @@
\@dc@AliasCatcher {PScope} \Scope
-\def\NoValue{-NoValue-}
-
-\long\def\IfNoValueTF#1{% % \chgs{2008/12/1 v0.98 the \pk{xparse} tests for
+\long\def\gmuIfNoValueTF#1{% % \chgs{2008/12/1 v0.98 the \pk{xparse} tests for
% the presence of value redefined and much simplified (43 \CS'es
- % less). Moreover, they are now fully expandable: \cmd\IfNoValueTF,
- % \cmd\IfNoValueT, \cmd\IfNoValueF, \cmd\IfValueTF, \cmd\IfValueT,
- % \cmd\IfValueF}
+ % less). Moreover, they are now fully expandable: \cmd\gmuIfNoValueTF,
+ % \cmd\gmuIfNoValueT, \cmd\gmuIfNoValueF, \cmd\gmuIfValueTF, \cmd\gmuIfValueT,
+ % \cmd\gmuIfValueF}
%
% \chgs{2010/05/27 v0.993 bug fix: order of \cmd\NoValue and
% \cs{@firstofmany} reversed after a catastrophal |{11}{11}| argument}
@@ -1153,17 +1182,17 @@
\else\afterfi\@secondoftwo
\fi}
-\long\def\IfNoValueT#1#2{\IfNoValueTF{#1}{#2}\@empty}
+\long\def\gmuIfNoValueT#1#2{\gmuIfNoValueTF{#1}{#2}\@empty}
-\long\def\IfNoValueF#1#2{\IfNoValueTF{#1}\@empty{#2}}
+\long\def\gmuIfNoValueF#1#2{\gmuIfNoValueTF{#1}\@empty{#2}}
-\long\def\IfValueTF#1#2#3{\IfNoValueTF{#1}{#3}{#2}}
+\long\def\gmuIfValueTF#1#2#3{\gmuIfNoValueTF{#1}{#3}{#2}}
-\long\def\PutIfValue#1{\IfValueT{#1}{#1}}
+\long\def\gmuPutIfValue#1{\gmuIfValueT{#1}{#1}}
-\let\IfValueT\IfNoValueF
+\let\gmuIfValueT\gmuIfNoValueF
-\let\IfValueF\IfNoValueT
+\let\gmuIfValueF\gmuIfNoValueT
\long\pdef\IfLong#1{%\
% \begin{enumargs}
@@ -1324,7 +1353,7 @@
\@dc@buckstopshere % it's the sentinel of parsing. Since the test
%
\@xa \Name \@xa \addtomacro \@xa \@dc@specsname
- \@xa {\@xa{\@dc@ParsedSpecs}}%
+ \@xa {\@xa{\the\@dc@ParsedSpecs}}%
%
\@xa\Name\@xa\addtomacro\@xa\@dc@specsname
\@xa{\@xa{\the \c@dc@argnum}}%
@@ -1360,7 +1389,7 @@
}
\def\@dc@DCprefixQlist{\global\protected\outer\long
- \relax % for the very tricky case when |\@dc@global| may be
+ \relax % for the somewhat perverse case when |\@dc@global| may be
!lL.qQiIwW\sphack\envhack}
\long\def\ShowCommand #1{%
@@ -1428,7 +1457,7 @@
{\unexpanded{#1}}%
{%
\@nx\@dc@addargum{{%
- \IfValueTF{#2}{%
+ \gmuIfValueTF{#2}{%
\gmu@if{@dc@xadefault@ii@}{}%
{\@xau{#2}}%
{\unexpanded{#2}}%
@@ -1441,6 +1470,16 @@
\@dc@global@ % set properly before |\@dc@ParseNextSpecifier #3⁄<buck>|.
\if P\@dc@long@letter\relax\long\fi
\gmu@tempa
+ %
+ \@dc@addtospecs {#1}%
+ %
+ \gmuIfValueTF{#2}{%
+ \gmu@if{@dc@xadefault@ii@}{}%
+ {\@xa\@dc@addtospecs\@xa{#2}}%
+ {\@dc@addtospecs{#2}}%
+ }
+ {\@xa\@dc@addtospecs\@xa{\@dc@K@defaultrepl}}%
+ %
% Now we clean up and continue construction of arguments parser. \nostanza
\@dc@ParseNextSpecifier
}% of |\@dc@define@K|
@@ -1454,8 +1493,8 @@
%
#2 >Pm % list of tokens to match for/against iteration
%
- >i T{\drain \drop \Drain \Drop}
- #3 T{\any \none }{\none} % the “sign” of matching for draining
+ >i T{\drain \drop \Drain \Drop \lost \Lost}
+ #3 T{\any \none }{\any} % the “sign” of matching for draining
%
#4 b{} % list of drainers, empty by default
%
@@ -1510,7 +1549,7 @@
\DeclareCommand\grab@LostWax {
>iT{\lost \Lost}
- #1 b{\lostwax@NoValue}
+ #1 b{\lostwax@NoVal}
>iT {\count \ubound}
#2 D{1}
>iT{\endlost \EndLost}
@@ -1519,7 +1558,7 @@
%
\def\@dc@LostWaxA{>iw}%
%
- \gmu@ifdetokens {\lostwax@NoValue}{#1}
+ \gmu@ifdetokens {\lostwax@NoVal}{#1}
{%
% if no particular value of the “lost wax” is provided, we assume
% the same as the “until” delimiter(s).
@@ -1712,7 +1751,7 @@
}{%
\def\gmu@DeclareEnvironment@resa{\envhack}% we add the information we define an
% environment.
- \IfValueT{#2}%
+ \gmuIfValueT{#2}%
{\addtomacro\gmu@DeclareEnvironment@resa{#2}}% we pass all the ‘prefixes’ to
% \incs{Decl\+are\+Comm\+and}
% \stanza
@@ -1814,7 +1853,7 @@
% to the redefinition of
% \cs{verb} in \pk{xlxtra} 2008/07/29}
\@ifXeTeX{%
- \IfValueT{#1}{\PassOptionsToPackage{#1}{fontspec}}%
+ \gmuIfValueT{#1}{\PassOptionsToPackage{#1}{fontspec}}%
\@ifpackageloaded{gmverb}%
{%
\Store@Macro\verb
@@ -1860,6 +1899,10 @@
{\spaceskip=\glueexpr\dimexpr#2*#1\relax plus\dimexpr #3*#1\relax
minus\dimexpr#4*#1\relax\relax}
+\pdef\unsetspaceskip{%
+ \spaceskip=\z@skip
+}
+
\def\makestarlow{%
\begingroup\lccode`\~=`\*\lowercase{%% \Define**
\endgroup\def~{\gmu@lowstar}}% 2009/10/19 |\let| changed to
@@ -1887,9 +1930,9 @@
#2 B{2\baselineskip}% (2) optional (formerly mandatory) long version of
% required room on a page
>is
- #3 B{} % (3) what if the room is enough
+ #3 >PB{} % (3) what if the room is enough
>is
- #4 B{\newpage} % (4) what if there's to little room on a page
+ #4 >PB{\newpage} % (4) what if there's to little room on a page
}{%
% \chgs{2009/03/18 v0.98 made \eTeX-ish}
% \chgs{2009/05/25 v0.98 made ifthenelse-like with ‘then’ and ‘else’
@@ -1903,7 +1946,7 @@
\gmu@pageremain
<%
\dimexpr
- (\IfValueTF{#1}{#1\baselineskip}{#2})*1%
+ (\gmuIfValueTF{#1}{#1\baselineskip}{#2})*1%
\endexpr
%
% \CH{2010/06/28 v0.993 I added |(›…)*1| to assure that |\relax|
@@ -1913,14 +1956,25 @@
\fi
*%
\ifdim \gmu@pageremain >-1sp
- 1\else 0%
+ 1% if the room left on current page is nonnegative,
+ % then we indeed are on current page so “enough” and
+ % “not enough” does make sense: Enough is enough.
+ \else 0% otherwise we are on next page (or further) and assume
+ % there is enough room for our purpose.
\fi
- >\z@
- }% of condition
- {\typeout{@@@@@ not enough page \on@line}%
- #4%
- }%
- {#3}%
+ *%
+ \ifdim \pagegoal <\maxdimen
+ 1 % if there are some boxes on current page, so checking room
+ % does make sense.
+ \else 0% otherwise (no boxes on current page) assume there's
+ % enough room
+ \fi
+ >\z@
+ }% of condition
+ {\typeout{@@@@@ not enough page \on@line}%
+ #4%
+ }%
+ {#3}%
}
\long\def\gmu@LC@LetInners
@@ -2032,7 +2086,7 @@
#2% a decimal number
{\edef\gmu@SC@grouplevel{%
\the\numexpr
- \IfValueTF{#1}%
+ \gmuIfValueTF{#1}%
{\currentgrouplevel#1#2+1}{#2}%
}% of the grouplevel-carrying macro
}
@@ -2219,7 +2273,7 @@
#2 b % enlargement (dim(expr)) for baselineskip (if absent, |#1| is used)
}{\edef\gmu@tempa{%
\@nx\fontsize{\the\dimexpr\f@size pt+#1}%
- {\the\dimexpr 1\baselineskip+ \IfValueTF{#2}{#2}{#1}}%
+ {\the\dimexpr 1\baselineskip+ \gmuIfValueTF{#2}{#2}{#1}}%
}\gmu@tempa\selectfont
}
@@ -2229,7 +2283,7 @@
\gobblespace
}{\edef\gmu@tempa{%
\@nx\fontsize{\the\dimexpr #1\dimexpr\f@size pt\relax}%
- {\the\dimexpr \IfValueTF{#2}{#2}{#1}\baselineskip}%
+ {\the\dimexpr \gmuIfValueTF{#2}{#2}{#1}\baselineskip}%
}\gmu@tempa\selectfont
}
@@ -2239,12 +2293,16 @@
\DeclareCommand\bihyphen{
O{*} % token that'll make the discretionary hyphen |\-| allow other break-points
}{%
- \DeclareCommand\gmu@discretionaryhyphen{T{#1}ca}{%
- \IfValueT{##2}{%
+ \DeclareCommand\gmu@discretionaryhyphen{%
+ T{#1}%
+ G{&&}%
+ a
+ }{%
+ \gmuIfValueT{##2}{%
\gmu@ifempty{##2}{}{%
\def\gmu@bihyphen@char{##2}}%
}%
- \IfValueT{##3}{%
+ \gmuIfValueT{##3}{%
\gmu@ifempty{##3}{}{%
\def\gmu@bihyphen@corr{##3}}%
}%
@@ -2253,9 +2311,9 @@
% hyphenation of the word's before- and
% after-parts or forbid it (if absent, then we take
% |\discretionary|).
- \IfValueTF{##1}\discre\discretionary
+ \gmuIfValueTF{##1}\discre\discretionary
{% before break
- \IfValueTF{##2}
+ \gmuIfValueTF{##2}
{%
\gmu@ifempty{##2}{\gmu@bihyphen@char}{##2}%
}%
@@ -2265,7 +2323,7 @@
\fi}%
}% end of before break
{%after break
- \IfValueT{##3}{%
+ \gmuIfValueT{##3}{%
\gmu@ifempty{##3}{\gmu@bihyphen@corr}{##3}%
}%
}%
@@ -2293,9 +2351,9 @@
}{% not in \XeTeX\ we use legacy |D| arg.\ specifiers:
\DeclareCommand\gmshowlists {
>iT{\depth}
- Ď{1}%
+ D{1}%
>iT{\breadth}
- Ď{10000000}
+ D{10000000}
}%
}
{\tracingonline=\@ne
@@ -2333,6 +2391,41 @@
\DeclareCommand \IgnorePars {m Q{\par}} {#1}
+\DeclareCommand\putpenalty {=}
+{%
+ \gmu@iflastglue
+ {\@tempskipa=\lastskip
+ \mode@skip -\@tempskipa
+ \penalty \@tempcnta
+ \mode@skip \@tempskipa
+ }%
+ {\gmu@iflastkern
+ {\@temdima=\lastkern
+ \kern-\@temdima
+ \penalty \@tempcnta
+ \kern \@temdima
+ }
+ {%
+ \penalty\@tempcnta
+ }%
+ }%
+}
+
+\newskip \gmu@TrashSkip
+
+\pdef \mode@skip {%
+ \ifvmode \vskip
+ \else
+ \ifhmode \hskip
+ \else
+ \ifmmode \mskip
+ \else
+ \gmu@TrashSkip
+ \fi
+ \fi
+ \fi
+}
+
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/gmutils/gmenvir.sty b/Master/texmf-dist/tex/latex/gmutils/gmenvir.sty
index a5d1759ab40..347198ceacf 100644
--- a/Master/texmf-dist/tex/latex/gmutils/gmenvir.sty
+++ b/Master/texmf-dist/tex/latex/gmutils/gmenvir.sty
@@ -2,7 +2,7 @@
%% \iffalse ^^A we skip the debug setting
\IfFileExists{\string~/bin/gen_and_xela}{\errorcontextlines=1000 }{}
%% \fi
-%% ^^A $Id: TheUltimateMaster.gmd,v 0.297 2011/02/02 18:13:11 natror Exp natror $
+%% ^^A $Id: TheUltimateMaster.gmd,v 0.352 2011/10/12 15:19:42 natror Exp natror $
%% This is file “gmenvir.sty” generated with the DocStrip utility.
%%
%%
@@ -13,7 +13,7 @@
%%
%% Copyright ©
%% by Grzegorz ‘Natror’ Murzynowski
-%% natror (at) o2 (dot) pl
+%% natror (at) gmail (dot) com
%%
%% This program is subject to the LaTeX Project Public License.
%% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
@@ -23,13 +23,13 @@
%%
%%
%%
-%% For the documentation please refer to the file(s)
+%% For documentation please refer to the file(s)
%% gmutils.{gmd,pdf}.
%%
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gmenvir}
- [2010/10/24 v0.993 redefinition of \string \begin \space and \string \end (GM)]
+ [2011/10/12 v0.996 redefinition of \string \begin \space and \string \end (GM)]
%%
@@ -52,14 +52,14 @@
}%
}
-\def\@popenvir#1#2#3{%
- \@XA{\@popenvir@#1#2#3}\@envirstack\@nil
+\def\@popenvir #1#2#3{%
+ \@XA{\@popenvir@ #1#2#3}\@envirstack\@nil
}
-\def\@popenvir@#1#2#3#4#5#6#7\@nil{%
- \gdef#1{#4}% |#1| carries last envir name
- \gdef#2{#5}% |#2| carries last envir level
- \gdef#3{#6}% |#3| carries last envir beginnig line
+\def\@popenvir@ #1#2#3#4#5#6#7\@nil{%
+ \gdef #1{#4}% |#1| carries last envir name
+ \gdef #2{#5}% |#2| carries last envir level
+ \gdef #3{#6}% |#3| carries last envir beginnig line
\gdef\@envirstack{#7}% and we update the stack
}
@@ -107,8 +107,14 @@
\ampulexdef\end[#1][#1]\endcsname\@checkend{%
\endcsname
-\@popenvir\gmu@drain\gmu@drain\gmu@drain
-\@checkend}
+\@xa\gmu@ifempty\@xa{\@envirstack}%
+{%
+ \PackageError {gmutils/base}%
+ {There's no environment to pop!}{Oy vey, gefeelte fish!}%
+}%
+{\@popenvir\gmu@drain\gmu@drain\gmu@drain }%
+\@checkend
+}
\pdef\@endif#1{\@ifenvir{#1}{\end{#1}}{}}
diff --git a/Master/texmf-dist/tex/latex/gmutils/gmlogos.sty b/Master/texmf-dist/tex/latex/gmutils/gmlogos.sty
index 40034f4fe0d..107ccfd7855 100644
--- a/Master/texmf-dist/tex/latex/gmutils/gmlogos.sty
+++ b/Master/texmf-dist/tex/latex/gmutils/gmlogos.sty
@@ -2,7 +2,7 @@
%% \iffalse ^^A we skip the debug setting
\IfFileExists{\string~/bin/gen_and_xela}{\errorcontextlines=1000 }{}
%% \fi
-%% ^^A $Id: TheUltimateMaster.gmd,v 0.297 2011/02/02 18:13:11 natror Exp natror $
+%% ^^A $Id: TheUltimateMaster.gmd,v 0.352 2011/10/12 15:19:42 natror Exp natror $
%% This is file “gmlogos.sty” generated with the DocStrip utility.
%%
%%
@@ -13,7 +13,7 @@
%%
%% Copyright ©
%% by Grzegorz ‘Natror’ Murzynowski
-%% natror (at) o2 (dot) pl
+%% natror (at) gmail (dot) com
%%
%% This program is subject to the LaTeX Project Public License.
%% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
@@ -23,13 +23,13 @@
%%
%%
%%
-%% For the documentation please refer to the file(s)
+%% For documentation please refer to the file(s)
%% gmutils.{gmd,pdf}.
%%
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gmlogos}
- [2010/04/09 v0.993 TeX-related logos (GM)]
+ [2011/05/05 v0.996 TeX-related logos (GM)]
%%
@@ -46,6 +46,16 @@
\Store@Macro\TeX
\AtBeginDocument{\Restore@Macro\TeX}
+\lpdef\EofTeX
+#1#2% whether put kerns before and after »E« respectively.
+#3% we do nothing with it (maybe unbrace) but we want to gobble
+ % possible space.
+{\if1#1\relax \kern-.1667em \fi
+ \lower.5ex\hbox{E}%
+ \if1#2\relax \kern-.125em \fi
+ #3
+}
+
\newcommand*\DeclareLogo[3][\relax]{% \begin{enumargs*}
% \opt is for non-\LaTeX\ spelling and will be used in the
% \acro{PD1} encoding (to make pdf bookmarks);
@@ -90,7 +100,8 @@
\kern-\the\count\tw@ sp\relax
\fi}%
\gmlogos@hyphen
- \TeX}
+ \TeX
+}
\DeclareLogo\LaTeXe{\mbox{\m@th \if
b\expandafter\@car\f@series\@nil\boldmath\fi
@@ -151,12 +162,15 @@
\DeclareLogo\pdfTeX{pdf\gmlogos@hyphen\TeX}
\DeclareLogo\pdfLaTeX{pdf\gmlogos@hyphen\LaTeX}
+
\gmu@ifundefined{XeTeX}{%
\DeclareLogo\XeTeX{X\kern-.125em\relax
\gmu@ifundefined{reflectbox}{%
\lower.5ex\hbox{E}\kern-.1667em\relax}{%
\lower.5ex\hbox{\reflectbox{E}}\kern-.1667em\relax}%
- \TeX}}{}
+ \TeX
+ }%
+}{}
\gmu@ifundefined{XeLaTeX}{%
\DeclareLogo\XeLaTeX{X\kern-.125em\relax
@@ -203,6 +217,8 @@
\DeclareLogo[LuaTeX]\LuaTeX{\textsc{Lua}\gmlogos@hyphen\TeX}
+\DeclareLogo [ConTeXt]\ConTeXt{Con\gmlogos@hyphen\TeX t}
+
\emptify\gmlogos@hyphen
\def\HyphenateLogo#1{%
diff --git a/Master/texmf-dist/tex/latex/gmutils/gmmeta.sty b/Master/texmf-dist/tex/latex/gmutils/gmmeta.sty
index e75e15e1fa8..fa8b106d612 100644
--- a/Master/texmf-dist/tex/latex/gmutils/gmmeta.sty
+++ b/Master/texmf-dist/tex/latex/gmutils/gmmeta.sty
@@ -2,7 +2,7 @@
%% \iffalse ^^A we skip the debug setting
\IfFileExists{\string~/bin/gen_and_xela}{\errorcontextlines=1000 }{}
%% \fi
-%% ^^A $Id: TheUltimateMaster.gmd,v 0.297 2011/02/02 18:13:11 natror Exp natror $
+%% ^^A $Id: TheUltimateMaster.gmd,v 0.352 2011/10/12 15:19:42 natror Exp natror $
%% This is file “gmmeta.sty” generated with the DocStrip utility.
%%
%%
@@ -13,7 +13,7 @@
%%
%% Copyright ©
%% by Grzegorz ‘Natror’ Murzynowski
-%% natror (at) o2 (dot) pl
+%% natror (at) gmail (dot) com
%%
%% This program is subject to the LaTeX Project Public License.
%% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
@@ -23,13 +23,13 @@
%%
%%
%%
-%% For the documentation please refer to the file(s)
+%% For documentation please refer to the file(s)
%% gmutils.{gmd,pdf}.
%%
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gmmeta}
- [2010/10/24 v0.993 meta-symbols for typesetting macros and arguments (GM)]
+ [2011/10/12 v0.996 meta-symbols for typesetting macros and arguments (GM)]
%%
@@ -126,6 +126,8 @@
\cs@inner{#1}%
}% of |\cs|
+\let\type@bslash\bslash
+
\pdef\cs@inner#1#2{%
#1#2%
\endgroup}
@@ -203,12 +205,12 @@
% has arguments and typesets them in brackets, parentheses or curly
% braces. Note it gobbles subsequent |\arg|s and just iterates.
\def\next{0}%
- \IfValueT{#1}%
+ \gmuIfValueT{#1}%
{\metachar[\scanverb{*}\metachar]\def\next{1}}%
- \IfValueT{#2}{\@oarg{#2}\def\next{1}}%
- \IfValueT{#3}{\@parg{#3}\def\next{1}}%
- \IfValueT{#4}{\marg{#4}\def\next{1}}%
- \IfValueT{#5}{\aarg{#5}\def\next{1}}%
+ \gmuIfValueT{#2}{\@oarg{#2}\def\next{1}}%
+ \gmuIfValueT{#3}{\@parg{#3}\def\next{1}}%
+ \gmuIfValueT{#4}{\marg{#4}\def\next{1}}%
+ \gmuIfValueT{#5}{\aarg{#5}\def\next{1}}%
\@ifnextchar\egroup{\endgroup}{%
\if1\next\@xa\arg@dc
\else % it's crucial that we look for verbatim braces \emph{after}
diff --git a/Master/texmf-dist/tex/latex/gmutils/gmmw.sty b/Master/texmf-dist/tex/latex/gmutils/gmmw.sty
index 809276b3470..46b8e41fa7d 100644
--- a/Master/texmf-dist/tex/latex/gmutils/gmmw.sty
+++ b/Master/texmf-dist/tex/latex/gmutils/gmmw.sty
@@ -2,7 +2,7 @@
%% \iffalse ^^A we skip the debug setting
\IfFileExists{\string~/bin/gen_and_xela}{\errorcontextlines=1000 }{}
%% \fi
-%% ^^A $Id: TheUltimateMaster.gmd,v 0.297 2011/02/02 18:13:11 natror Exp natror $
+%% ^^A $Id: TheUltimateMaster.gmd,v 0.352 2011/10/12 15:19:42 natror Exp natror $
%% This is file “gmmw.sty” generated with the DocStrip utility.
%%
%%
@@ -13,7 +13,7 @@
%%
%% Copyright ©
%% by Grzegorz ‘Natror’ Murzynowski
-%% natror (at) o2 (dot) pl
+%% natror (at) gmail (dot) com
%%
%% This program is subject to the LaTeX Project Public License.
%% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
@@ -23,13 +23,13 @@
%%
%%
%%
-%% For the documentation please refer to the file(s)
+%% For documentation please refer to the file(s)
%% gmutils.{gmd,pdf}.
%%
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gmmw}
- [2010/10/24 v0.993 improvements to the MWCLS classes (GM)]
+ [2011/10/12 v0.996 improvements and workarounds to the MWCLS classes (GM)]
%%
@@ -256,7 +256,7 @@
\SetSectionFormatting[breakbefore,wholewidth]
{part}{\z@\@plus1fill}{}{\z@\@plus3fill}%
%
- \IfValueF{#1}{%
+ \gmuIfValueF{#1}{%
\gmu@ifundefined{chapter}{}{%
\SetSectionFormatting[breakbefore,wholewidth]
{chapter}
@@ -311,7 +311,7 @@
% \Define\gmu@secxx
\def\gmu@secxx#1#2[#3]#4{%
\ifx\gmu@secstar\@empty
- % \nostanza a~little trick to allow
+ % \nostanza a~tiny little trick to allow
% a~special version of the heading just to the running head.
\@namedef{#1mark}##1{% we redefine \cs{\<sec>mark} to gobble its
% argument and to launch the stored true marking command on the
diff --git a/Master/texmf-dist/tex/latex/gmutils/gmnotonlypream.sty b/Master/texmf-dist/tex/latex/gmutils/gmnotonlypream.sty
index 4db60627e98..1578aba3d9f 100644
--- a/Master/texmf-dist/tex/latex/gmutils/gmnotonlypream.sty
+++ b/Master/texmf-dist/tex/latex/gmutils/gmnotonlypream.sty
@@ -2,7 +2,7 @@
%% \iffalse ^^A we skip the debug setting
\IfFileExists{\string~/bin/gen_and_xela}{\errorcontextlines=1000 }{}
%% \fi
-%% ^^A $Id: TheUltimateMaster.gmd,v 0.297 2011/02/02 18:13:11 natror Exp natror $
+%% ^^A $Id: TheUltimateMaster.gmd,v 0.352 2011/10/12 15:19:42 natror Exp natror $
%% This is file “gmnotonlypream.sty” generated with the DocStrip utility.
%%
%%
@@ -13,7 +13,7 @@
%%
%% Copyright ©
%% by Grzegorz ‘Natror’ Murzynowski
-%% natror (at) o2 (dot) pl
+%% natror (at) gmail (dot) com
%%
%% This program is subject to the LaTeX Project Public License.
%% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
@@ -23,13 +23,13 @@
%%
%%
%%
-%% For the documentation please refer to the file(s)
+%% For documentation please refer to the file(s)
%% gmutils.{gmd,pdf}.
%%
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gmnotonlypream}
- [2010/10/24 v0.993 modification of the 'only preamble' clause (GM)]
+ [2011/10/12 v0.996 modification of the 'only preamble' clause (GM)]
%%
diff --git a/Master/texmf-dist/tex/latex/gmutils/gmparts.sty b/Master/texmf-dist/tex/latex/gmutils/gmparts.sty
index 004bbb15db0..2551f47445c 100644
--- a/Master/texmf-dist/tex/latex/gmutils/gmparts.sty
+++ b/Master/texmf-dist/tex/latex/gmutils/gmparts.sty
@@ -2,7 +2,7 @@
%% \iffalse ^^A we skip the debug setting
\IfFileExists{\string~/bin/gen_and_xela}{\errorcontextlines=1000 }{}
%% \fi
-%% ^^A $Id: TheUltimateMaster.gmd,v 0.297 2011/02/02 18:13:11 natror Exp natror $
+%% ^^A $Id: TheUltimateMaster.gmd,v 0.352 2011/10/12 15:19:42 natror Exp natror $
%% This is file “gmparts.sty” generated with the DocStrip utility.
%%
%%
@@ -13,7 +13,7 @@
%%
%% Copyright ©
%% by Grzegorz ‘Natror’ Murzynowski
-%% natror (at) o2 (dot) pl
+%% natror (at) gmail (dot) com
%%
%% This program is subject to the LaTeX Project Public License.
%% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
@@ -23,13 +23,13 @@
%%
%%
%%
-%% For the documentation please refer to the file(s)
+%% For documentation please refer to the file(s)
%% gmutils.{gmd,pdf}.
%%
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gmparts}
- [2010/10/24 v0.993 modification of \string \include \space \string & in/excluding parts of main file (GM)]
+ [2011/10/12 v0.996 modification of \string \include \space \string & in/excluding parts of main file (GM)]
%%
@@ -80,7 +80,8 @@
\deadcycles\z@
\@nameuse{cp@\gmu@filename}%
\fi
- \let\@auxout\@mainaux}
+ \let\@auxout\@mainaux
+}
\newcommand\whenonly[3]{%
\def\gmu@whonly{#1,}%
diff --git a/Master/texmf-dist/tex/latex/gmutils/gmrelsize.sty b/Master/texmf-dist/tex/latex/gmutils/gmrelsize.sty
index 19aabf2d0aa..9ee550c4754 100644
--- a/Master/texmf-dist/tex/latex/gmutils/gmrelsize.sty
+++ b/Master/texmf-dist/tex/latex/gmutils/gmrelsize.sty
@@ -2,7 +2,7 @@
%% \iffalse ^^A we skip the debug setting
\IfFileExists{\string~/bin/gen_and_xela}{\errorcontextlines=1000 }{}
%% \fi
-%% ^^A $Id: TheUltimateMaster.gmd,v 0.297 2011/02/02 18:13:11 natror Exp natror $
+%% ^^A $Id: TheUltimateMaster.gmd,v 0.352 2011/10/12 15:19:42 natror Exp natror $
%% This is file “gmrelsize.sty” generated with the DocStrip utility.
%%
%%
@@ -13,7 +13,7 @@
%%
%% Copyright ©
%% by Grzegorz ‘Natror’ Murzynowski
-%% natror (at) o2 (dot) pl
+%% natror (at) gmail (dot) com
%%
%% This program is subject to the LaTeX Project Public License.
%% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
@@ -23,13 +23,13 @@
%%
%%
%%
-%% For the documentation please refer to the file(s)
+%% For documentation please refer to the file(s)
%% gmutils.{gmd,pdf}.
%%
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gmrelsize}
- [2010/04/09 v0.993 chosen macros from the relsize package and mine (GM)]
+ [2010/04/09 v0.996 chosen macros from the relsize package and mine (GM)]
%%
@@ -57,11 +57,12 @@
\ifcase\@tempcnta % set new size based on altered number
\tiny \or \scriptsize \or \footnotesize \or \small \or \normalsize \or
\large \or \Large \or \LARGE \or \huge \or \Huge \else
- \rs@size@warning{large}{\string\Huge}\Huge
+ \rs@size@warning{large}{\string\Huge}\Huge
\fi\fi}% end of |\relsize|.
\providecommand*\rs@size@warning[2]{\PackageWarning{gmutils (relsize)}{%
- Size requested is too #1.\MessageBreak Using #2 instead}}
+ Size requested is too #1.\MessageBreak Using #2 instead}%
+}%
\providecommand*\rs@unknown@warning{\PackageWarning{gmutils (relsize)}{Current font size
is unknown! (Why?!?)\MessageBreak Assuming \string\normalsize}}
diff --git a/Master/texmf-dist/tex/latex/gmutils/gmtypos.sty b/Master/texmf-dist/tex/latex/gmutils/gmtypos.sty
index 72f5e1e28a7..65f6516e9c3 100644
--- a/Master/texmf-dist/tex/latex/gmutils/gmtypos.sty
+++ b/Master/texmf-dist/tex/latex/gmutils/gmtypos.sty
@@ -2,7 +2,7 @@
%% \iffalse ^^A we skip the debug setting
\IfFileExists{\string~/bin/gen_and_xela}{\errorcontextlines=1000 }{}
%% \fi
-%% ^^A $Id: TheUltimateMaster.gmd,v 0.297 2011/02/02 18:13:11 natror Exp natror $
+%% ^^A $Id: TheUltimateMaster.gmd,v 0.352 2011/10/12 15:19:42 natror Exp natror $
%% This is file “gmtypos.sty” generated with the DocStrip utility.
%%
%%
@@ -13,7 +13,7 @@
%%
%% Copyright ©
%% by Grzegorz ‘Natror’ Murzynowski
-%% natror (at) o2 (dot) pl
+%% natror (at) gmail (dot) com
%%
%% This program is subject to the LaTeX Project Public License.
%% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
@@ -23,13 +23,13 @@
%%
%%
%%
-%% For the documentation please refer to the file(s)
+%% For documentation please refer to the file(s)
%% gmutils.{gmd,pdf}.
%%
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gmtypos}
- [2010/10/24 v0.993 a collection of macros, mosltly typographical (GM)]
+ [2011/10/12 v0.996 a collection of macros, mostly typographical (GM)]
%%
@@ -46,14 +46,13 @@
\ProcessOptions
-
-
\AtBeginDocument{%
\@ifpackageloaded{fontspec}{%
\pdef\udigits{%
\addfontfeature{Numbers=Uppercase}}%
}{%
- \emptify\udigits}}
+ \emptify\udigits}%
+}
\def\Xedekfracc{\gmu@ifstar\gmu@xedekfraccstar\gmu@xedekfraccplain}
@@ -141,7 +140,7 @@
\def\GMtextsuperscript{%
\@ifXeTeX{%
\DeclareCommand\textsuperscript{sm}{%
- \IfValueTF{##1}{\textsuperscript@@{##2}}%
+ \gmuIfValueTF{##1}{\textsuperscript@@{##2}}%
{%
\begingroup
\addfontfeature{VerticalPosition=Numerator}##2%
@@ -207,7 +206,7 @@
% \inverb|\symgmathRoman⁄<version>| (math family) and
% \inverb|\gmath@fontt⁄<version>| (font).
}{%
- \IfValueT{#1}{%
+ \gmuIfValueT{#1}{%
\DeclareMathVersion{#1}% this sets the defaults so no need to
% define them explicitly
}% of if |#1| given
@@ -215,58 +214,58 @@
\gmu@getfontdata{\rmfamily\itshape}%
%
\edef\gmu@tempa{%
- \IfValueTF{#1}{\@nx\SetSymbolFont{letters}{#1}}%
+ \gmuIfValueTF{#1}{\@nx\SetSymbolFont{letters}{#1}}%
{\@nx\DeclareSymbolFont{letters}}%
- {\encodingdefault}{gmathit\PutIfValue{#1}}{m}{it}%
- \IfValueT{#1}{%
+ {\encodingdefault}{gmathit\gmuPutIfValue{#1}}{m}{it}%
+ \gmuIfValueT{#1}{%
\@nx\DeclareSymbolFont{letters#1}%
- {\encodingdefault}{gmathit\PutIfValue{#1}}{m}{it}%
+ {\encodingdefault}{gmathit\gmuPutIfValue{#1}}{m}{it}%
}%
- \@nx\DeclareFontFamily{\encodingdefault}{gmathit\PutIfValue{#1}}{%
+ \@nx\DeclareFontFamily{\encodingdefault}{gmathit\gmuPutIfValue{#1}}{%
\skewchar\font\gmu@theskewchar\space}%
- \@nx\DeclareFontShape{\encodingdefault}{gmathit\PutIfValue{#1}}{m}{it}{%
+ \@nx\DeclareFontShape{\encodingdefault}{gmathit\gmuPutIfValue{#1}}{m}{it}{%
<-> \gmu@fontscalebr \gmu@fontstring}{}%
- \IfValueT{#1}{%
+ \gmuIfValueT{#1}{%
\@nx\SetMathAlphabet\@nx\mathit{#1}{\encodingdefault}{gmathit#1}{m}{it}}%
}\gmu@tempa
%
- \IfValueT{#2}{%
+ \gmuIfValueT{#2}{%
\gmu@getfontdata{#2\gmu@ifstored{\upshape}{\storedcsname{upshape}}{\upshape}}%
\edef\gmu@tempa{%
- \@nx\DeclareSymbolFont{gmathRoman\PutIfValue{#1}}%
- {\encodingdefault}{gmathRm\PutIfValue{#1}}{m}{n}%
- \@nx\DeclareFontFamily{\encodingdefault}{gmathRm\PutIfValue{#1}}{%
+ \@nx\DeclareSymbolFont{gmathRoman\gmuPutIfValue{#1}}%
+ {\encodingdefault}{gmathRm\gmuPutIfValue{#1}}{m}{n}%
+ \@nx\DeclareFontFamily{\encodingdefault}{gmathRm\gmuPutIfValue{#1}}{%
\skewchar\font\gmu@theskewchar\space}%
- \@nx\DeclareFontShape{\encodingdefault}{gmathRm\PutIfValue{#1}}{m}{n}{%
+ \@nx\DeclareFontShape{\encodingdefault}{gmathRm\gmuPutIfValue{#1}}{m}{n}{%
<-> \gmu@fontscalebr \gmu@fontstring}{}%
}\gmu@tempa
- \@xa\font\csname gmath@fontt\PutIfValue{#1}\endcsname
+ \@xa\font\csname gmath@fontt\gmuPutIfValue{#1}\endcsname
=\gmu@fontstring\relax
% \stanza
\gmu@getfontdata{#2\gmu@ifstored{\itshape}{\storedcsname{itshape}}{\itshape}}%
\edef\gmu@tempa{%
- \@nx\DeclareSymbolFont{gmathItalic\PutIfValue{#1}}%
- {\encodingdefault}{gmathIt\PutIfValue{#1}}{m}{n}%
- \@nx\DeclareFontFamily{\encodingdefault}{gmathIt\PutIfValue{#1}}{%
+ \@nx\DeclareSymbolFont{gmathItalic\gmuPutIfValue{#1}}%
+ {\encodingdefault}{gmathIt\gmuPutIfValue{#1}}{m}{n}%
+ \@nx\DeclareFontFamily{\encodingdefault}{gmathIt\gmuPutIfValue{#1}}{%
\skewchar\font\gmu@theskewchar\space}%
- \@nx\DeclareFontShape{\encodingdefault}{gmathIt\PutIfValue{#1}}{m}{n}{%
+ \@nx\DeclareFontShape{\encodingdefault}{gmathIt\gmuPutIfValue{#1}}{m}{n}{%
<-> \gmu@fontscalebr \gmu@fontstring}{}%
}\gmu@tempa
}% of if |#2| given
% \stanza
\gmu@getfontdata{\rmfamily\upshape}%
\edef\gmu@tempa{%
- \IfValueTF{#1}{\@nx\SetSymbolFont{gmathroman}{#1}}%
+ \gmuIfValueTF{#1}{\@nx\SetSymbolFont{gmathroman}{#1}}%
{\@nx\DeclareSymbolFont{gmathroman}}%
- {\encodingdefault}{gmathrm\PutIfValue{#1}}{m}{n}%
- \@nx\DeclareFontFamily{\encodingdefault}{gmathrm\PutIfValue{#1}}{%
+ {\encodingdefault}{gmathrm\gmuPutIfValue{#1}}{m}{n}%
+ \@nx\DeclareFontFamily{\encodingdefault}{gmathrm\gmuPutIfValue{#1}}{%
\skewchar\font\gmu@theskewchar\space}%
- \@nx\DeclareFontShape{\encodingdefault}{gmathrm\PutIfValue{#1}}{m}{n}{%
+ \@nx\DeclareFontShape{\encodingdefault}{gmathrm\gmuPutIfValue{#1}}{m}{n}{%
<-> \gmu@fontscalebr \gmu@fontstring}{}%
- \IfValueT{#1}{%
+ \gmuIfValueT{#1}{%
\@nx\SetMathAlphabet\@nx\mathrm{#1}{\encodingdefault}{gmathrm#1}{m}{n}}%
}\gmu@tempa
- \@xa\font\csname gmath@font\PutIfValue{#1}\endcsname
+ \@xa\font\csname gmath@font\gmuPutIfValue{#1}\endcsname
=\gmu@fontstring\relax
\gmathfamshook
}
@@ -283,7 +282,7 @@
}{%\
%
\gmath@getfamnum(##4)%
- \IfValueTF{##2}{%
+ \gmuIfValueTF{##2}{%
\edef\gmu@tempa{%
= \mathchar@type##3\space
\gmath@famnum\space
@@ -324,10 +323,10 @@
\endcsname
\iffontchar\gmath@ft"##1 \gmath@do##2[##1]##3(##6)%
\else
- \IfValueTF{##4}{%
+ \gmuIfValueTF{##4}{%
\iffontchar\gmath@ft"##4 \gmath@do##2[##4]##3(##6)%
\else
- \IfValueTF{##5}{%
+ \gmuIfValueTF{##5}{%
\iffontchar\gmath@ft"##5 \gmath@do##2[##5]##3(##6)%
\else
\gmath@restore{##1}{##2}{##3}{##4}{##5}{##7}%
@@ -341,7 +340,7 @@
% family given as |##6|. If there're no respective chars, we try
% the same with the family given (as a~word) in |##7|.
\def\gmath@restore##1##2##3##4##5##6{%
- \IfValueT{##6}%
+ \gmuIfValueT{##6}%
{\ifcsname ##6\endcsname
\edef\gmu@tempa{%
\unexpanded{\gmath@doif{##1}{##2}{##3}[##4][##5]}%
@@ -366,7 +365,7 @@
% \end{enumargs*}
%
\gmath@getfamnum
- \IfValueTF{##2}{%
+ \gmuIfValueTF{##2}{%
\edef\gmu@tempa{%
= \gmath@famnum\space "##2\relax}%
\edef\gmu@tempa{%
@@ -411,9 +410,9 @@
\DeclareCommand\gmu@dogmathbase{oC{\NoValue}}{%
\Restore@Macro\mathchar@type%
%
- \IfValueT{##1}{\mathversion{##1}}%
+ \gmuIfValueT{##1}{\mathversion{##1}}%
%
- \edef\gmath@version{\PutIfValue{##1}}%
+ \edef\gmath@version{\gmuPutIfValue{##1}}%
%
\@xa\let\@xa\gmath@fam\csname symgmathroman%
\endcsname
@@ -686,7 +685,7 @@
\DeclareCommand\gmath{oC{\NoValue}}{%
\gmathbase[#1](#2)%
\gmathfurther
- \IfValueT{#1}{\csname gmathhook#1\endcsname}% this allows adding
+ \gmuIfValueT{#1}{\csname gmathhook#1\endcsname}% this allows adding
% version-specific stuff (I~first used this for Fell fonts rescued
% with Garamond Premier)
}
@@ -849,7 +848,7 @@
\begingroup
\edef\gmu@tempa{#2}%
\makeatletter%
- \IfValueT{#1}{%
+ \gmuIfValueT{#1}{%
\prependtomacro\fake@onum@ii{%
\begingroup\addfontfeature{FakeBold=#1}}%
\addtomacro\fake@onum@ii\endgroup
@@ -1063,8 +1062,6 @@
\newcommand*{\TODO}[1][]{{%
\sffamily\bfseries\huge TO-DO!\if\relax#1\relax\else\space\fi#1}}
-
-
\newcommand*\twocoltoc{%
\RequirePackage{multicol}%
\def\@starttoc##1{%
@@ -1157,7 +1154,8 @@
% it is ended with a~space. Adding one
% more space in this line resulted in
% an infinite loop, of course.
- \fi}
+ \fi
+}
\def\gmu@acroiter#1{%
\gmu@notif {x\@xa\@xa} {\@firstofmany#1\@undefined\@nil \gmu@acroiter}
@@ -1168,8 +1166,8 @@
{}%
}
-\def\gmu@acrokernel#1{%
- \gmu@if {cat} {a\@xanx\@firstofmany#1\@undefined\@nil}
+\def\gmu@acrokernel #1{%
+ \gmu@if {cat} {a\@xanx\@firstofmany#1\@undefined\@nil}%
{\gmu@if {num} {`#1=\uccode`#1\space }% a space to delimit numer
% (without it further macros were
% expanded which in this case are
@@ -1184,8 +1182,8 @@
}
-\def\IMHO{\acro{IMHO}}
-\def\AKA{\acro{AKA}}
+\def\IMHO{\acro{IMHO}\spifletter}
+\def\AKA{\acro{AKA}\spifletter}
\pdef\usc#1{{\addfontfeature{Letters=UppercaseSmallCaps}#1}}
@@ -1286,6 +1284,7 @@
}
+
\def\napapierkistretch{0,3pt}% It's quite much for 11/13pt leading.
\def\napapierkicore{\advance\baselineskip%
@@ -1293,15 +1292,16 @@
\DeclareEnvironment{napapierki}{s}{%
% \chgs{2009/01/05 v0.98 added optional star controlling globalness}
- \par\IfValueT{#1}{\global}%
+ \par\gmuIfValueT{#1}{\global}%
%
\napapierkicore}
{%
\par
- \IfValueT{#1}{\global\baselineskip=1\baselineskip\relax
+ \gmuIfValueT{#1}{\global\baselineskip=1\baselineskip\relax
}%
}% so that you can use \inverb|\napapierki*›…\endnapapierki*|
+
\newcount\gmu@luzniej
\newcommand*\luzniejcore[1][1]{%
@@ -1320,7 +1320,11 @@
\def\pauza@skipcore{\hskip0.2em plus0.1em\relax
\pauzacore
- \@ifnextchar,{% 2009/11/22 added a special case of a comma following pauza
+ \@ifnextanyIS {,;:}%
+ {% 2009/11/22 added a special case of a comma following pauza,
+ % 2011/02/22, 13.33 extended to colon and semicolon (well, the
+ % latter should not happen in such a position but a colon did (in
+ % Polish)).
}{\hskip.2em plus0.1em\relax\ignorespaces}}%
\def\ppauza@skipcore{\unskip\penalty10000\hskip0.2em plus0.1em\relax
\ppauza@dash\hskip.2em plus0.1em\ignorespaces}
@@ -1340,7 +1344,9 @@
% i~maszynowy} the dialogue dash (in Polish) should be followed by
% a~rigid hskip of \dekfracc1/2\,em.
\pdef\pauzadial{%
- \leavevmode\pauzacore\penalty10000\hskip0,5em\ignorespaces}
+ \ifhmode\unskip\quad\else\leavevmode\fi
+ \pauzacore\penalty10000\hskip0,5em\ignorespaces
+ }
%
% And a~version with no space at the left, to begin a~|\noindent|ed
% paragraph explaining e.g.\ a~quotation:
@@ -1371,10 +1377,21 @@
\ifhmode
\unskip\penalty10000
\afterfi{%
- \@ifnextspace{\pauza@skipcore}%
- {\@ifnextchar,{\pauza@skipcore}% a special case of comma added 2009/11/22
- {\@ifnextMac{\pauza@skipcore}%
- {\pauzacore\penalty\hyphenpenalty\hskip\z@skip}}}%
+ \@ifnextanyRS { ,;:}% was comma as a special case; 2011/02/22,
+ % 13.32 added colon and semicolon.
+ %
+ % The above needs some explanation, I suppose. We check if next token
+ % is blank space or some punctuations, for which purpose we
+ % use \inverb|\@ifnextanyRS|, where |RS| stands for
+ % “respecting space”. So if next is a space it turns true. Then
+ % \inverb|\pauza@skipcore|'s test does not respect space
+ % (gobbles it) and typesets punctuators with no skip while a
+ % blank replaces with a skip.
+ %
+ {\pauza@skipcore}%
+ {\@ifnextMac{\pauza@skipcore}%
+ {\pauzacore\penalty\hyphenpenalty\hskip\z@skip}%
+ }%
}% of |\afterfi|'s argument
\else
% \nostanza According to \tytul{Instrukcja technologiczna.\ Skład ręczny ^^B
@@ -1403,10 +1420,16 @@
\def\emdash{\char`\—}
}% of at begin document
-\def\longpauza{\def\pauzacore{—}}
+\def\longpauza{%
+ \def\pauzacore@long{—}%
+ \let\pauzacore\pauzacore@long
+}
\longpauza
+
\def\shortpauza{%
- \def\pauzacore{\hbox{–\kern,23em\relax\llap{–}}}}%
+ \def\pauzacore@short{\hbox{–\kern,23em\relax\llap{–}}}%
+ \let\pauzacore\pauzacore@short
+}%
\def\ppauza@dash{–}%
\else % not \XeTeX
@@ -1456,19 +1479,21 @@
##1 Q{0123456789\bgroup}>iT{/-} % year
##2 Q{0123456789\bgroup}>iT{/-} % month
##3 Q{0123456789\bgroup} % day
- ##4 T{,}
- ##5 K{##1\gmu@datefsl} % additional stuff after comma
+ >is % terminator of date scanning that will be gobbled
+ ##4 T{,}% another terminator of date, but this will be printed
+ ##5 K{##1\gmu@datefsl} % additional stuff after comma (or instead date)
}{%
- \IfValueF{##2}{\PutIfValue{##3}}%
- \IfValueT{##2}{%
+ \gmuIfValueF{##2}{\gmuPutIfValue{##3}}%
+ \gmuIfValueT{##2}{%
\@tempcnta=0##3\relax\the\@tempcnta
\ifcase##2\relax\or\ stycznia\or\ lutego%
\or\ marca\or\ kwietnia\or\ maja\or\ czerwca\or\ lipca\or\ sierpnia%
\or\ września\or\ października\or\ listopada\or\ grudnia\else
{}%
\fi}%
- \IfValueT{##1}{\space ##1}%
- \PutIfValue{##4}\IfValueT{##5}{ ##5}%
+ \gmuIfValueT{##1}{\space ##1}%
+ \gmuPutIfValue{##4}%
+ \gmu@ifempty{##5}{}{ ##5}%
}% of \incs{gmu@datefsl}.
}% of |\polskadata|
@@ -1479,10 +1504,11 @@
Q{0123456789\bgroup}>iT{/-} % (1) year
Q{0123456789\bgroup}>iT{/-} % (2) month
Q{0123456789\bgroup} % (3) day
+ >is
T{,} K{##1\gmu@datefsl} % (4, 5) additional stuff after comma
}{%
- \IfValueF{##2}{\PutIfValue{##3}}%
- \IfValueT{##2}{%
+ \gmuIfValueF{##2}{\gmuPutIfValue{##3}}%
+ \gmuIfValueT{##2}{%
\ifcase##2\relax\or January\or February%
\or March\or April\or May\or June\or July\or August%
\or September\or October\or November\or December\else
@@ -1490,33 +1516,52 @@
\fi}%
\space
\@tempcnta=##3\relax\the\@tempcnta,
- \IfValueT{##1}{ ##1}%
- \PutIfValue{##4}\IfValueT{##5}{ ##5}%
+ \gmuIfValueT{##1}{ ##1}%
+ \gmuPutIfValue{##4}%
+ \gmu@ifempty{##5}{}{ ##5}%
}% of \incs{gmu@datefsl}.
}%
\newif\ifdate
-\pdef\bidate#1{%
+\pdef\bidate #1{%
\gmu@datefsl#1\gmu@datefsl
}
-\pdef\linedate{\gmu@ifstar\linedate@@\linedate@}
-\pdef\linedate@@#1{\linedate@{--{}{}#1}}
-\pdef\linedate@#1{\par
- \linedate@hook{#1}%
- \ifdate\addvspace{\dateskipamount}%
- \possvfil% if we put it before |\addvspace|, the v-space is always added.
- \date@line{\DateFont \bidate{#1}}%
- \nopagebreak
- \else%|%\ifnum\arabic{dateinsection}>0\dekbigskip\fi|
- \addvspace{\bigskipamount}\possvfil
- \fi}% end of |\linedate|.
+\DeclareCommand\linedate{s{}m}
+{%
+ \par
+ \linedate@hook #1#2\@nil%
+ \addvspace{\dateskipamount}%
+ \possvfil% if we put it before |\addvspace|, the v-space is always
+ % added.
+ %
+ \ifdate
+ % ^^U \addvspace{\dateskipamount}%
+ \if@CofaćPrzedDatą@
+ \penalty\@M
+ \vskip-0,5\baselineskip
+ \else
+ \@CofaćPrzedDatą@true
+ \fi
+ %
+ \date@line{\DateFont \bidate{#1#2}}%
+ \nopagebreak
+ % ^^U \else%|%\ifnum\arabic{dateinsection}>0\dekbigskip\fi|
+ % ^^U \addvspace{\bigskipamount}\possvfil
+ \fi
+}% end of |\linedate|.
+
+\newif\if@CofaćPrzedDatą@
+\@CofaćPrzedDatą@true
+
+\pdef\NoPredate {\@CofaćPrzedDatą@false}
\newcommand*\DateFont{\footnotesize\itshape}
-\let\linedate@hook\@gobble
+\def\linedate@hook #1\@nil{}
-\let\dateskipamount\medskipamount
+\newskip\dateskipamount
+\dateskipamount\medskipamount
\pdef\rdate{\let\date@line\rightline \linedate}
@@ -1569,7 +1614,7 @@
Q{+-0123456789} % optional looseness (most probably negative)
}{%
\begingroup
- \IfValueT{#1}{\looseness=#1\IfValueTF{#2}{#2}{1}\relax
+ \gmuIfValueT{#1}{\looseness=#1\gmuIfValueTF{#2}{#2}{1}\relax
\multiply\tolerance by \tw@
}%
\fullparcore
@@ -1592,12 +1637,12 @@
A{\twopar@atleast}% (3)
>iT{\cipolagwa}}{%
\begingroup
- \IfValueT{##1}{%
- \looseness=##1\IfValueTF{##2}{##2}{1}\relax
+ \gmuIfValueT{##1}{%
+ \looseness=##1\gmuIfValueTF{##2}{##2}{1}\relax
\multiply\tolerance by2
}%
\twoparcore<##3>%
- \par
+ \endgraf
\endgroup
}% of \incmd\twopar.
% \stanza
@@ -1648,11 +1693,11 @@
% absent, parbox is aligned right;
% \dc text for the datum parbox.
% \end{enumargs}
- \IfValueTF{#1}{\leftline{%
+ \gmuIfValueTF{#1}{\leftline{%
\kern1\leftskip
\whernfont
\hskip#1\relax\parbox
- {\dimexpr\textwidth-\leftskip-\rightskip-#1}%
+ {\dimexpr\hsize-\leftskip-\rightskip-#1}%
{#2}% of |\parbox|,
}% of |\leftline|,
}% of |ValueT{#1}|.
@@ -1671,7 +1716,7 @@
% side to be ragged)
O{t} % vertical alignment of parbox
>is % separator
- O{0,7666\textwidth} % (3) width of parbox
+ O{0,7666\hsize} % (3) width of parbox
m % (4) parbox contents
}{%
% \begin{enumargs}
@@ -1679,7 +1724,7 @@
% \dc the |\parbox|'s contents.
% \end{enumargs}
\parbox[#2]{#3}{%
- \IfValueTF{#1}{#1}{\leftskip}=0sp plus \textwidth
+ \gmuIfValueTF{#1}{#1}{\leftskip}=0sp plus \textwidth
\parfillskip0sp\relax
\let\\\linebreak
\disobeylines
@@ -1691,28 +1736,56 @@
\def\whern{%
\endgraf\nopagebreak
\gmu@ifstar{\wherncore}%
- {\vskip\whernskip\wherncore}}
+ {\vskip\whernskip\wherncore}%
+}
\let\whernfont\footnotesize
\newskip\whernskip
\whernskip2\baselineskip minus 2\baselineskip\relax
-\DeclareCommand\whernup{%
- o % a~vskip before
- >is % separating star (ignored)
- o % (2) custom width of parbox
- >Pm}{\par
- \IfValueT{#1}{\vskip#1\relax}%
- \leftline{%
- \gmu@leftskipcorr
- \IfValueTF{#2}{\whern@parbox\rightskip[b][#2]}%
- {\whern@parbox\rightskip[b]}%
- {#3}%
- }%
- \setprevdepth
- \nopagebreak\relax
- \@ifenvir{quote}{\noindent\ignorespaces}{}}
+\foone{\obeylines}{%
+ \DeclareCommand\whernup{%
+#1 o % a~vskip before
+ >is % separating star (ignored)
+#2 o % custom width of parbox
+#3 >Pm%
+#4 o % a vskip between this box and subsqt. text
+ >iQ{ \par
+ }%
+ }% of args' spec
+}% of obey lines
+{\par
+ \gmuIfValueT{#1}{\vskip#1\relax}%
+ %
+ % The \env{prosato} env. of \pk{gmverse} \& derivs. set some
+ % positive parskip and counterkrank its first occurrence by a vskip
+ % of its negative. Therefore here we put ourselves in a |\rlap| and
+ % put at the very beginning of a paragraph.
+ \ifinner \noindent\nobreak\kern-1\leftskip \nobreak
+ \rlap{%
+ \vbox{%
+ \fi % of if inner
+ \leftline{%
+ % ^^A \gmu@leftskipcorr
+ \gmuIfValueTF{#2}{\whern@parbox\rightskip[b][#2]}%
+ {\whern@parbox\rightskip[b]}%
+ {#3}%
+ }%
+ %
+ \ifinner
+ \gmuIfValueT {#4}{\vskip\glueexpr #4\endexpr }%
+ \phantom{Ala ma Filifjonkgyr}%
+ }% of vbox
+ }% of rlap
+ %
+ \penalty\@M
+ \kern 1\leftskip
+ \@ifenvir{quote}{\hskip\z@skip}{\hskip\parindent\relax}%
+ \else
+ \gmuIfValueT {#4}{\vskip \glueexpr #4\endexpr }%
+ \fi
+}% of |\whernup|'s body.
\pdef\thousep#1{% a~macro that'll put the thousand separator between
@@ -1773,7 +1846,7 @@
% we declare it as a command with Q-type argument to allow spaces
% between digits.
\ifmmode\hbox\bgroup\@gmu@mmhboxtrue\fi
- \IfValueTF{##1}{% we are given a sequence of digits
+ \gmuIfValueTF{##1}{% we are given a sequence of digits
\@tempcnta=##1\relax
\ifnum\@tempcnta<0 $-$%
\@tempcnta=-\@tempcnta
@@ -1796,26 +1869,28 @@
% \stanza
% We make the footnote mark in the footnote |\scriptsize| not
% |\scriptscriptsize|.\nostanza
- \IfValueT{#1}% the following setting is suitable for old style
+ \gmuIfValueT{#1}% the following setting is suitable for old style
% numbers in footnote marks, therefore I~place it in the starred
% version of the command.
{\prependtomacro\gmu@ATfootnotes{%
\pdef\@makefnmark{%
\mbox {\normalfont \textsuperscript {\smaller[3]\@thefnmark }}}%
}% of prepend,
- }% of |\IfValueT|.
+ }% of |\gmuIfValueT|.
%
\gmu@ATfootnotes
\gmu@AT@ampulex\maketitle% without \pk{hyperref}
- \ifdefined\HyOrg@maketitle
- \afterfi{\gmu@AT@ampulex\HyOrg@maketitle}% with \pk{hyperref}
+ \unless\if@HyOrg@maketitle@ampulexed@
+ \ifdefined\HyOrg@maketitle
+ \afterfi{\gmu@AT@ampulex\HyOrg@maketitle}% with \pk{hyperref}
+ \fi
+ \@HyOrg@maketitle@ampulexed@true
\fi
}
-\pdef\gmu@AT@ampulex#1{%
- \typeout{@@@@@^^J^^J\@nx#1^^J^^J%
- @@@@ meaning:^^J\meaning#1%
- }%
+\newif\if@HyOrg@maketitle@ampulexed@
+
+\pdef\gmu@AT@ampulex #1{%
\ampulexdef#1{\def\@makefnmark}%
\if@twocolumn
{\gmu@ATfootnotes\if@twocolumn}% Ampulex redefinition of
@@ -1860,7 +1935,7 @@
\def\TrzaskaTilde{%
\@xa\DeclareCommand\@xa\gmu@smarttilde
\@xa{\@xa T\@xa{\all@stars~}}{%
- \IfValueTF{##1}{\nobreakspace{}}%
+ \gmuIfValueTF{##1}{\nobreakspace{}}%
{\ifdim\dimexpr\hsize-\leftskip-\rightskip
-\ifdim\hangindent<\z@-\fi\hangindent % the last
% parameter is used with respect to the \pk{floatflt} package.
@@ -1933,10 +2008,10 @@
\catcode`ѥ\active
\DeclareCommand\ac {b} {%
- \IfValueTF{#1}
+ \gmuIfValueTF{#1}%
{%
\acro{#1}%
- }
+ }%
{\ac@u}%
}
@@ -1976,11 +2051,13 @@
\addtomacro\@dc@acpunctanddelimsp{~}
\DeclareCommand\ac@u{
- >\@xa U{\@dc@acpunctanddelimsp ()[]<>ѥ} \default{}
+ >\@xa U {\@dc@acpunctanddelimsp ()[]<>ѥ} \default{}
\eacher {\ac@kernel}
>iW{ѥ}
}
-{\text{#1}}
+{%
+ \ifmmode\@xa\text\else\@xa\firstofone\fi{#1}%
+}
\fi % of if \XeTeX\ of l.~\ref{12322}.
diff --git a/Master/texmf-dist/tex/latex/gmutils/gmurl.sty b/Master/texmf-dist/tex/latex/gmutils/gmurl.sty
index 74349d6c97b..646585eea1d 100644
--- a/Master/texmf-dist/tex/latex/gmutils/gmurl.sty
+++ b/Master/texmf-dist/tex/latex/gmutils/gmurl.sty
@@ -2,7 +2,7 @@
%% \iffalse ^^A we skip the debug setting
\IfFileExists{\string~/bin/gen_and_xela}{\errorcontextlines=1000 }{}
%% \fi
-%% ^^A $Id: TheUltimateMaster.gmd,v 0.297 2011/02/02 18:13:11 natror Exp natror $
+%% ^^A $Id: TheUltimateMaster.gmd,v 0.352 2011/10/12 15:19:42 natror Exp natror $
%% This is file “gmurl.sty” generated with the DocStrip utility.
%%
%%
@@ -13,7 +13,7 @@
%%
%% Copyright ©
%% by Grzegorz ‘Natror’ Murzynowski
-%% natror (at) o2 (dot) pl
+%% natror (at) gmail (dot) com
%%
%% This program is subject to the LaTeX Project Public License.
%% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
@@ -23,13 +23,13 @@
%%
%%
%%
-%% For the documentation please refer to the file(s)
+%% For documentation please refer to the file(s)
%% gmutils.{gmd,pdf}.
%%
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gmurl}
- [2010/10/24 v0.993 modifications to the url package (GM)]
+ [2011/10/12 v0.996 modifications to the url package (GM)]
%%
@@ -121,7 +121,7 @@
}%
% \stanza
\def\verbatim@mathhack@##1##2##3##4##5##6{%
- \IfValueT{##4}{%
+ \gmuIfValueT{##4}{%
\edef\gmu@thinmuskip{\the\thinmuskip}%
\edef\gmu@medmuskip{\the\medmuskip}%
\edef\gmu@thickmuskip{\the\thickmuskip}%
diff --git a/Master/texmf-dist/tex/latex/gmutils/gmutils.sty b/Master/texmf-dist/tex/latex/gmutils/gmutils.sty
index 9dfdfd9f53e..b2af20cc336 100644
--- a/Master/texmf-dist/tex/latex/gmutils/gmutils.sty
+++ b/Master/texmf-dist/tex/latex/gmutils/gmutils.sty
@@ -2,7 +2,7 @@
%% \iffalse ^^A we skip the debug setting
\IfFileExists{\string~/bin/gen_and_xela}{\errorcontextlines=1000 }{}
%% \fi
-%% ^^A $Id: TheUltimateMaster.gmd,v 0.297 2011/02/02 18:13:11 natror Exp natror $
+%% ^^A $Id: TheUltimateMaster.gmd,v 0.352 2011/10/12 15:19:42 natror Exp natror $
%% This is file “gmutils.sty” generated with the DocStrip utility.
%%
%%
@@ -11,9 +11,9 @@
%% gmutils/gmutils.gmd (with options: `utils')
%%
%%
-%% Copyright © 2005, 2006, 2007, 2008, 2009, 2010
+%% Copyright © 2005, 2006, 2007, 2008, 2009, 2010, 2011
%% by Grzegorz ‘Natror’ Murzynowski
-%% natror (at) o2 (dot) pl
+%% natror (at) gmail (dot) com
%%
%% This program is subject to the LaTeX Project Public License.
%% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
@@ -23,13 +23,13 @@
%%
%%
%%
-%% For the documentation please refer to the file(s)
+%% For documentation please refer to the file(s)
%% gmutils.{gmd,pdf}.
%%
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gmutils}
- [2010/10/24 v0.993 some rather TeXnical macros, some of them tricky (GM)]
+ [2011/10/12 v0.996 some low-TeXnical macros, most of them copied from the Gurus (GM)]
%%
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 00:12:13 +0000