diff options
author | Karl Berry <karl@freefriends.org> | 2016-06-20 22:41:14 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-06-20 22:41:14 +0000 |
commit | dd8cd465b253cee19fa61fc89383c0c61a0791e4 (patch) | |
tree | 879b137590b9ae1dc87a49a741cbb9a1390dad25 /Master/texmf-dist/tex/latex/koma-script/scrbase.sty | |
parent | 84f03266593d0aeb4f714b3f4b76f2d1ea4f4bd6 (diff) |
koma-script (20jun16)
git-svn-id: svn://tug.org/texlive/trunk@41508 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrbase.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrbase.sty | 40 |
1 files changed, 30 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index b8a5b21e7cf..7f6ce060e4f 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -44,7 +44,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2215 2015-10-06 09:50:41Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,18 +66,18 @@ \fi } \fi - \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}% + \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrbase% }[% - 2016/05/10 v3.20 KOMA-Script + 2016/06/14 v3.21 KOMA-Script package (% KOMA-Script-independent basics and keyval usage)] @@ -393,9 +393,9 @@ %%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $ %%% From File: $Id: scrlfile.dtx 2429 2016-04-12 12:10:19Z kohm $ \RequirePackage{scrlfile}[% - 2016/05/10 v3.20 KOMA-Script + 2016/06/14 v3.21 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $ \newcommand*{\XdivY}[2]{% \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax } @@ -1061,7 +1061,15 @@ \ifstr{#1}{mm}{\@tempswatrue}{% \ifstr{#1}{dd}{\@tempswatrue}{% \ifstr{#1}{cc}{\@tempswatrue}{% - \ifstr{#1}{sp}{\@tempswatrue}{}% + \ifstr{#1}{sp}{\@tempswatrue}{% + \ifstr{#1}{ex}{\@tempswatrue}{% + \ifstr{#1}{em}{\@tempswatrue}{% + \scr@ifpdfoutput{% + \ifstr{#1}{px}{\@tempswatrue}{}% + }{}% + }% + }% + }% }% }% }% @@ -1075,14 +1083,26 @@ \let@as@internal@defined{ifpdftex} \BeforePackage{pdfcprot}{\let\ifpdftex\relax} \AfterPackage{pdfcprot}{\let@as@internal@defined{ifpdftex}} +\newcommand{\scr@ifluatex}{\ifnotundefined{luatexversion}} +\newcommand*{\scr@ifpdforluatex}{% + \scr@ifpdftex{\@firstoftwo}{\scr@ifluatex{\@firstoftwo}{\@secondoftwo}}% +} \newcommand{\scr@ifVTeX}{\ifnotundefined{VTeXversion}} \let@as@internal@defined{ifVTeX} \newcommand{\scr@ifpdfoutput}{% \scr@ifundefinedorrelax{pdfoutput}{% - \scr@ifundefinedorrelax{OpMode}{% - \expandafter\@secondoftwo% + \scr@ifundefinedorrelax{outputmode}{% + \scr@ifundefinedorrelax{OpMode}{% + \expandafter\@secondoftwo% + }{% + \ifnum\OpMode=1 + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi + }% }{% - \ifnum\OpMode=1 + \ifnum\outputmode>0 \expandafter\@firstoftwo \else \expandafter\@secondoftwo |