summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-11-10 03:01:01 +0000
committerNorbert Preining <norbert@preining.info>2019-11-10 03:01:01 +0000
commit838842fa4625160270947ca654e7492e3c7afc44 (patch)
treef0e66df5245b9f6b82f11152282ed9c60a5faeca /macros/latex/contrib
parent89213117b5298d9493446422708bf48384368825 (diff)
CTAN sync 201911100301
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/fancyvrb/Changes1
-rw-r--r--macros/latex/contrib/fancyvrb/latex/fancyvrb-ex.sty2
-rw-r--r--macros/latex/contrib/fancyvrb/latex/fancyvrb.sty10
-rw-r--r--macros/latex/contrib/fancyvrb/latex/hbaw.sty35
-rw-r--r--macros/latex/contrib/fancyvrb/latex/hcolor.sty35
-rw-r--r--macros/latex/contrib/hyperref/.xr-hyper.sty.swpbin16384 -> 0 bytes
-rw-r--r--macros/latex/contrib/hyperref/ChangeLog.txt4
-rw-r--r--macros/latex/contrib/hyperref/README.md2
-rw-r--r--macros/latex/contrib/hyperref/backref.pdfbin119610 -> 127581 bytes
-rw-r--r--macros/latex/contrib/hyperref/doc/manual.css8
-rw-r--r--macros/latex/contrib/hyperref/doc/manual.html2
-rw-r--r--macros/latex/contrib/hyperref/doc/manual.pdfbin286711 -> 286698 bytes
-rw-r--r--macros/latex/contrib/hyperref/doc/options.pdfbin30263 -> 30252 bytes
-rw-r--r--macros/latex/contrib/hyperref/hyperref.dtx70
-rw-r--r--macros/latex/contrib/hyperref/hyperref.pdfbin2408294 -> 2461806 bytes
-rw-r--r--macros/latex/contrib/hyperref/nameref.pdfbin118426 -> 125513 bytes
-rw-r--r--macros/latex/contrib/iftex/iftex.pdfbin201807 -> 233649 bytes
-rw-r--r--macros/latex/contrib/iftex/iftex.sty54
-rw-r--r--macros/latex/contrib/iftex/iftex.tex17
-rw-r--r--macros/latex/contrib/poetry/CHANGES5
-rw-r--r--macros/latex/contrib/poetry/poetry.dtx11
-rw-r--r--macros/latex/contrib/poetry/poetry.pdfbin261288 -> 261991 bytes
22 files changed, 118 insertions, 138 deletions
diff --git a/macros/latex/contrib/fancyvrb/Changes b/macros/latex/contrib/fancyvrb/Changes
index 40236df70c..53b4516552 100644
--- a/macros/latex/contrib/fancyvrb/Changes
+++ b/macros/latex/contrib/fancyvrb/Changes
@@ -1,4 +1,5 @@
--- fancyvrb.sty
+3.4 2019/11/09 - use catcode change for space if \textvisiblespace doesn't exist (hv)
3.3 2019/10/22 - use \textvisiblespace for showspaces (hv)
3.2a 2019/01/15 - added missing style files (hv)
3.2 2019/01/08 - remove the loading of package xcolor (hv)
diff --git a/macros/latex/contrib/fancyvrb/latex/fancyvrb-ex.sty b/macros/latex/contrib/fancyvrb/latex/fancyvrb-ex.sty
index 054ede2ada..72c4d535d3 100644
--- a/macros/latex/contrib/fancyvrb/latex/fancyvrb-ex.sty
+++ b/macros/latex/contrib/fancyvrb/latex/fancyvrb-ex.sty
@@ -1,7 +1,7 @@
%%
%% This is file `fancyvrb-ex.sty',
%%
-%% COPYRIGHT 2018-, by Herbert Voss <hvoss@tug.org>
+%% COPYRIGHT 2018,2019-, by Herbert Voss <hvoss@tug.org>
%%
%% This package may be distributed under the terms of the LaTeX Project Public
%% License, as described in lppl.txt in the base LaTeX distribution.
diff --git a/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty b/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty
index b9fb18c759..5026b819e7 100644
--- a/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty
+++ b/macros/latex/contrib/fancyvrb/latex/fancyvrb.sty
@@ -13,8 +13,8 @@
%% verbatim environments and commands and extensive documentation.
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{3.3}
-\def\filedate{2019/10/22}
+\def\fileversion{3.4}
+\def\filedate{2019/11/09}
\ProvidesPackage{fancyvrb}[\filedate]
\message{Style option: `fancyvrb' v\fileversion \space <\filedate> (tvz)}
\csname fancyvrb@loaded\endcsname
@@ -529,8 +529,10 @@
\fvset{defineactive}
\define@booleankey{FV}{showspaces}%
{\def\FV@Space{{\FancyVerbSpace}}}%
- {\def\FV@Space{\ }}
-{\catcode`\ =12 \gdef\FancyVerbSpace{\texttt{\textvisiblespace}}}
+ {\def\FV@Space{\ }}
+\@ifundefined{textvisiblespace}%
+ {\begingroup\catcode`\ =12 \gdef\FancyVerbSpace{\tt }\endgroup}
+ {\let\FancyVerbSpace\textvisiblespace}
\fvset{showspaces=false}
\def\FV@Tab{\hbox to\FancyVerbTabSize\fontdimen2\font{\hss\FV@TabChar}}
\define@key{FV}{tabsize}{%
diff --git a/macros/latex/contrib/fancyvrb/latex/hbaw.sty b/macros/latex/contrib/fancyvrb/latex/hbaw.sty
index 728f4fe345..3e1478a27b 100644
--- a/macros/latex/contrib/fancyvrb/latex/hbaw.sty
+++ b/macros/latex/contrib/fancyvrb/latex/hbaw.sty
@@ -1,39 +1,14 @@
%%
%% This is file `hbaw.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% fvrb-ex.dtx (with options: `hbaw')
-%%
-%% IMPORTANT NOTICE:
-%%
-%% For the copyright see the source file.
%%
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from hbaw.sty.
-%%
-%% For distribution of the original source see the terms
-%% for copying and modification in the file fvrb-ex.dtx.
-%%
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
-%%
-%% Package `fvrb-ex' (`fvrb-ex', `hbaw' and `hcolor')
-%%
%% COPYING:
-%% The files of this package "fvrb-ex" are released under the Artistic
-%% License Version 2. A copy of that license is included in the file
-%% artistic2.txt inside the fancyvrb package. This package consists of
-%% the following files:
-%% README fvrb-ex.dtx fvrb-ex.ins
+%% This package may be distributed under the terms of the LaTeX Project Public
+%% License, as described in lppl.txt in the base LaTeX distribution.
+%% Either version 1.0 or, at your option, any later version.
%%
-%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou@idris.fr>
-%% March 27, 1998
+%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou@idris.fr> March 27, 1998
+%% packed by Herbert Voss <hvoss@tug.org>
%%
-%% Package `hbaw'
%%
\NeedsTeXFormat{LaTeX2e}
\def\fileversion{1.4}
diff --git a/macros/latex/contrib/fancyvrb/latex/hcolor.sty b/macros/latex/contrib/fancyvrb/latex/hcolor.sty
index 64a29b5666..236fdd78f2 100644
--- a/macros/latex/contrib/fancyvrb/latex/hcolor.sty
+++ b/macros/latex/contrib/fancyvrb/latex/hcolor.sty
@@ -1,39 +1,14 @@
%%
%% This is file `hcolor.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% fvrb-ex.dtx (with options: `hcolor')
-%%
-%% IMPORTANT NOTICE:
-%%
-%% For the copyright see the source file.
-%%
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from hcolor.sty.
-%%
-%% For distribution of the original source see the terms
-%% for copying and modification in the file fvrb-ex.dtx.
-%%
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
-%%
-%% Package `fvrb-ex' (`fvrb-ex', `hbaw' and `hcolor')
%%
%% COPYING:
-%% The files of this package "fvrb-ex" are released under the Artistic
-%% License Version 2. A copy of that license is included in the file
-%% artistic2.txt inside the fancyvrb package. This package consists of
-%% the following files:
-%% README fvrb-ex.dtx fvrb-ex.ins
+%% This package may be distributed under the terms of the LaTeX Project Public
+%% License, as described in lppl.txt in the base LaTeX distribution.
+%% Either version 1.0 or, at your option, any later version.
%%
-%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou@idris.fr>
-%% March 27, 1998
+%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou@idris.fr> March 27, 1998
+%% packed by Herbert Voss <hvoss@tug.org>
%%
-%% Package `hcolor'
%%
\NeedsTeXFormat{LaTeX2e}
\def\fileversion{1.4}
diff --git a/macros/latex/contrib/hyperref/.xr-hyper.sty.swp b/macros/latex/contrib/hyperref/.xr-hyper.sty.swp
deleted file mode 100644
index bfddf77377..0000000000
--- a/macros/latex/contrib/hyperref/.xr-hyper.sty.swp
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/hyperref/ChangeLog.txt b/macros/latex/contrib/hyperref/ChangeLog.txt
index 80f5a9f873..c93958e5eb 100644
--- a/macros/latex/contrib/hyperref/ChangeLog.txt
+++ b/macros/latex/contrib/hyperref/ChangeLog.txt
@@ -1,3 +1,7 @@
+2019-11-06 David Carlisle
+ * don't load hobsub-hyperref,ifpdf,ifluatex,ifxetex,ifvtex
+ do load new iftex
+
2019-10-03 David Carlisle
* xr-hyper update to match xr
diff --git a/macros/latex/contrib/hyperref/README.md b/macros/latex/contrib/hyperref/README.md
index 82a4937b9c..2b58b34802 100644
--- a/macros/latex/contrib/hyperref/README.md
+++ b/macros/latex/contrib/hyperref/README.md
@@ -1,5 +1,5 @@
# README for hyperref bundle
-2019-10-03
+2019-11-06
## INTRODUCTION
diff --git a/macros/latex/contrib/hyperref/backref.pdf b/macros/latex/contrib/hyperref/backref.pdf
index ee0d8ddd36..37bf795e69 100644
--- a/macros/latex/contrib/hyperref/backref.pdf
+++ b/macros/latex/contrib/hyperref/backref.pdf
Binary files differ
diff --git a/macros/latex/contrib/hyperref/doc/manual.css b/macros/latex/contrib/hyperref/doc/manual.css
index 0943cab494..6104bdd11a 100644
--- a/macros/latex/contrib/hyperref/doc/manual.css
+++ b/macros/latex/contrib/hyperref/doc/manual.css
@@ -168,7 +168,9 @@ td.td01{ padding-left:0pt; padding-right:5pt; }
td.td10{ padding-left:5pt; padding-right:0pt; }
td.td11{ padding-left:5pt; padding-right:5pt; }
table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
-.hline hr, .cline hr{ height : 1px; margin:0px; }
+.hline hr, .cline hr{ height : 0px; margin:0px; }
+.hline td, .cline td{ padding: 0; }
+.hline hr, .cline hr{border:none;border-top:1px solid black;}
.tabbing-right {text-align:right;}
span.TEX {letter-spacing: -0.125em; }
span.TEX span.E{ position:relative;top:0.5ex;left:-0.0417em;}
@@ -232,7 +234,9 @@ td.td01{ padding-left:0pt; padding-right:5pt; }
td.td10{ padding-left:5pt; padding-right:0pt; }
td.td11{ padding-left:5pt; padding-right:5pt; }
table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
-.hline hr, .cline hr{ height : 1px; margin:0px; }
+.hline hr, .cline hr{ height : 0px; margin:0px; }
+.hline td, .cline td{ padding: 0; }
+.hline hr, .cline hr{border:none;border-top:1px solid black;}
div.array {text-align:center;}
table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
div.longtable{text-align:center;}
diff --git a/macros/latex/contrib/hyperref/doc/manual.html b/macros/latex/contrib/hyperref/doc/manual.html
index ef07c562a0..16fc7bddce 100644
--- a/macros/latex/contrib/hyperref/doc/manual.html
+++ b/macros/latex/contrib/hyperref/doc/manual.html
@@ -2051,7 +2051,7 @@ class="td10">
class="td01"><span
class="ec-lmvtt-10">pdfnonfullscreenpagemode </span></td><td style="white-space:normal; text-align:left;" id="TBL-8-27-2"
class="td11">
- <!--l. 760--><p class="noindent" >boolean </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-27-3"
+ <!--l. 760--><p class="noindent" >text </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-27-3"
class="td11"> <span
class="ec-lmri-10">empty </span></td><td style="white-space:normal; text-align:left;" id="TBL-8-27-4"
class="td10">
diff --git a/macros/latex/contrib/hyperref/doc/manual.pdf b/macros/latex/contrib/hyperref/doc/manual.pdf
index 150ed4513c..ceee2cc8d6 100644
--- a/macros/latex/contrib/hyperref/doc/manual.pdf
+++ b/macros/latex/contrib/hyperref/doc/manual.pdf
Binary files differ
diff --git a/macros/latex/contrib/hyperref/doc/options.pdf b/macros/latex/contrib/hyperref/doc/options.pdf
index cec94f6e6c..d5d92d0e31 100644
--- a/macros/latex/contrib/hyperref/doc/options.pdf
+++ b/macros/latex/contrib/hyperref/doc/options.pdf
Binary files differ
diff --git a/macros/latex/contrib/hyperref/hyperref.dtx b/macros/latex/contrib/hyperref/hyperref.dtx
index 92a4cad56d..5fa0f2e608 100644
--- a/macros/latex/contrib/hyperref/hyperref.dtx
+++ b/macros/latex/contrib/hyperref/hyperref.dtx
@@ -49,7 +49,7 @@
%<puvnenc>\ProvidesFile{puvnenc.def}
%<puarenc>\ProvidesFile{puarenc.def}
%<psdextra>\ProvidesFile{psdextra.def}
-%<!none> [2019/09/28 v7.00a %
+%<!none> [2019/11/06 v7.00b %
%<package> Hypertext links for LaTeX]
%<nohyperref> Dummy hyperref (SR)]
%<driver> Hyperref documentation driver file]
@@ -90,13 +90,12 @@
%<psdextra> Hyperref: Additions to PDF string support]
%<*driver>
\documentclass{ltxdoc}
-\usepackage{array}
-\usepackage{ifluatex,ifxetex}
-\ifnum 0\ifluatex 1\else\ifxetex 1\fi\fi=0 %
- \usepackage[T1]{fontenc}%
+\usepackage{array,iftex}
+\iftutex
+ \usepackage{fontspec}%
\renewcommand*{\ttdefault}{lmvtt}%
\else
- \usepackage{fontspec}%
+ \usepackage[T1]{fontenc}%
\renewcommand*{\ttdefault}{lmvtt}%
\fi
\usepackage[%
@@ -587,20 +586,9 @@
\Hy@SetCatcodes
% \end{macrocode}
%
-% It needs the December 95 release of \LaTeX, because it uses
-% |\protected@write|, and it defines commands in options; and the page
-% setup internal code changed at that point. It'll probably break
-% with the later releases!
-%
-% Use package |hobsub-hyperref| for faster package loading.
-% \begin{macrocode}
-\IfFileExists{hobsub-hyperref.sty}{%
- \RequirePackage{hobsub-hyperref}[2011/01/30]%
-}{}
-% \end{macrocode}
% \begin{macrocode}
\RequirePackage{ltxcmds}[2010/11/12]
-\RequirePackage{ifpdf}[2006/02/20]
+\RequirePackage{iftex}[2019/10/24]
\RequirePackage{pdftexcmds}[2009/04/10]
\@ifpackagelater{pdftexcmds}{2010/11/04}{}{%
\ltx@IfUndefined{pdfdraftmode}{%
@@ -626,8 +614,6 @@
\RequirePackage{kvsetkeys}[2007/09/29]
\RequirePackage{kvdefinekeys}[2011/04/07]
\RequirePackage{pdfescape}[2007/11/11]
-\RequirePackage{ifvtex}
-\RequirePackage{ifxetex}[2006/08/21]
\RequirePackage{hycolor}
\RequirePackage{letltxmacro}[2008/06/13]
\RequirePackage{auxhook}[2009/12/14]
@@ -5324,7 +5310,7 @@
\def\Hy@DviErrMsg{XeTeX is running}%
\else
\ifvtex
- \ifvtexdvi
+ \ifnum\OpMode=\z@
\Hy@DviModetrue
\else
\def\Hy@DviErrMsg{VTeX is running, but not in DVI mode}%
@@ -7429,24 +7415,26 @@
\ifx\Hy@driver\@empty
\else
\def\Hy@temp{hvtexhtm}%
- \ifvtexhtml
- \ifx\Hy@driver\Hy@temp
+ \ifvtex
+ \ifnum\OpMode=10 %
+ \ifx\Hy@driver\Hy@temp
+ \else
+ \Hy@WarningNoLine{%
+ Wrong driver `\Hy@driver.def';\MessageBreak
+ VTeX is running in HTML mode.\MessageBreak
+ Forcing driver `\Hy@temp.def'%
+ }%
+ \let\Hy@driver\Hy@temp
+ \fi
\else
- \Hy@WarningNoLine{%
- Wrong driver `\Hy@driver.def';\MessageBreak
- VTeX is running in HTML mode.\MessageBreak
- Forcing driver `\Hy@temp.def'%
- }%
- \let\Hy@driver\Hy@temp
- \fi
- \else
- \ifx\Hy@driver\Hy@temp
- \Hy@WarningNoLine{%
- Wrong driver `\Hy@driver.def';\MessageBreak
- VTeX is not running in HTML mode.\MessageBreak
- Using default driver%
- }%
- \let\Hy@driver\@empty
+ \ifx\Hy@driver\Hy@temp
+ \Hy@WarningNoLine{%
+ Wrong driver `\Hy@driver.def';\MessageBreak
+ VTeX is not running in HTML mode.\MessageBreak
+ Using default driver%
+ }%
+ \let\Hy@driver\@empty
+ \fi
\fi
\fi
\fi
@@ -7469,7 +7457,7 @@
\ifxetex
\def\Hy@driver{hxetex}%
\else
- \ifvtexhtml
+ \ifnum\OpMode=10 %
\def\Hy@driver{hvtexhtm}%
\def\MaybeStopEarly{%
\Hy@Message{Stopped early}%
@@ -7480,10 +7468,10 @@
\endinput
}%
\else
- \ifvtexpdf
+ \ifnum\OpMode=\@ne
\def\Hy@driver{hvtex}%
\else
- \ifvtexps
+ \ifnum\OpMode=\tw@
\def\Hy@driver{hvtex}%
\else
\ifx\HyOpt@DriverFallback\ltx@empty
diff --git a/macros/latex/contrib/hyperref/hyperref.pdf b/macros/latex/contrib/hyperref/hyperref.pdf
index add067eb88..5718fa167b 100644
--- a/macros/latex/contrib/hyperref/hyperref.pdf
+++ b/macros/latex/contrib/hyperref/hyperref.pdf
Binary files differ
diff --git a/macros/latex/contrib/hyperref/nameref.pdf b/macros/latex/contrib/hyperref/nameref.pdf
index 7eb2809f46..e3ba587456 100644
--- a/macros/latex/contrib/hyperref/nameref.pdf
+++ b/macros/latex/contrib/hyperref/nameref.pdf
Binary files differ
diff --git a/macros/latex/contrib/iftex/iftex.pdf b/macros/latex/contrib/iftex/iftex.pdf
index c46ce713ae..97c093e87f 100644
--- a/macros/latex/contrib/iftex/iftex.pdf
+++ b/macros/latex/contrib/iftex/iftex.pdf
Binary files differ
diff --git a/macros/latex/contrib/iftex/iftex.sty b/macros/latex/contrib/iftex/iftex.sty
index 4c1923c2c1..8ee4a0fe79 100644
--- a/macros/latex/contrib/iftex/iftex.sty
+++ b/macros/latex/contrib/iftex/iftex.sty
@@ -30,7 +30,7 @@
% ProvidesPackage declaration in LaTeX
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
- \ProvidesPackage{iftex}[2019/11/04 v1.0b TeX engine tests]
+ \ProvidesPackage{iftex}[2019/11/07 v1.0c TeX engine tests]
\fi
% Save @ catcode, to restore at end, not needed in LaTeX.
@@ -54,7 +54,8 @@
% eTeX \protected if available.
-\ifx\protected\@undefined
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname protected\endcsname\relax
\let\IFTEX@protected\relax
\else
\let\IFTEX@protected\protected
@@ -68,7 +69,7 @@
\catcode41 12 % )
\catcode44 12 % ,
\catcode46 12 % .
- \ifx\directlua\@undefined\else
+ \expandafter\ifx\csname directlua\endcsname\relax\else
\directlua{tex.enableprimitives("IFTEX@", {"detokenize","protected"})}
\fi
}
@@ -99,7 +100,8 @@
\csname if#2\endcsname}
% etex (should always be true in latex based formats)
-\ifx\numexpr\@undefined
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname numexpr\endcsname\relax
\IFTEX@let{etex}{false}
\else
\IFTEX@let{etex}{true}
@@ -108,7 +110,8 @@
% pdftex (including in dvi mode)
\IFTEX@let{IFTEX@savedpdftex}{pdftex}
-\ifx\pdftexversion\@undefined
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname pdftexversion\endcsname\relax
\IFTEX@let{pdftex}{false}
\else
\IFTEX@let{pdftex}{true}
@@ -116,7 +119,8 @@
\IFTEX@let{PDFTeX}{pdftex}
% xetex
-\ifx\XeTeXrevision\@undefined
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname XeTeXrevision\endcsname\relax
\IFTEX@let{xetex}{false}
\else
\IFTEX@let{xetex}{true}
@@ -125,18 +129,21 @@
% luatex (including luahbtex)
-\ifx\directlua\@undefined
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname directlua\endcsname\relax
\IFTEX@let{luatex}{false}
\else
\IFTEX@let{luatex}{true}
\fi
\IFTEX@let{LuaTeX}{luatex}
+
% luahbtex (or luatex + luaharfbuzz)
% Use luaharfbuzz test rather than status.luatex_engine=="luahbtex"
% for issue #2.
\IFTEX@let{luahbtex}{false}
-\ifx\directlua\@undefined
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname directlua\endcsname\relax
\else
\directlua{\IFTEX@detokenize{
if(pcall(require, 'luaharfbuzz')) then
@@ -149,7 +156,8 @@
% ptex (including all variants)
-\ifx\kanjiskip\@undefined
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname kanjiskip\endcsname\relax
\IFTEX@let{ptex}{false}
\else
\IFTEX@let{ptex}{true}
@@ -165,7 +173,8 @@
\IFTEX@let{upTeX}{uptex}
% ptex-ng
-\ifx\ngbanner\@undefined
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname ngbanner\endcsname\relax
\IFTEX@let{ptexng}{false}
\else
\IFTEX@let{ptexng}{true}
@@ -174,7 +183,8 @@
% vtex
\IFTEX@let{IFTEX@savedVTeX}{VTeX}
-\ifx\VTeXversion\@undefined
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname VTeXversion\endcsname\relax
\IFTEX@let{vtex}{false}
\else
\IFTEX@let{vtex}{true}
@@ -184,7 +194,8 @@
% aleph
\IFTEX@let{alephtex}{false}
\ifptex\else
-\ifx\omathchardef\@undefined
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname omathchardef\endcsname\relax
\else
\IFTEX@let{alephtex}{true}
\fi
@@ -193,21 +204,26 @@
% tutex (LuaTeX or XeTeX)
-\ifx\Umathchardef\@undefined
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname Umathchardef\endcsname\relax
\IFTEX@let{tutex}{false}
\else
\IFTEX@let{tutex}{true}
\fi
\IFTEX@let{TUTeX}{tutex}
-
-
% Output mode
% declare with as if with \newif
\def\pdftrue{\let\ifpdf\iftrue}
\def\pdffalse{\let\ifpdf\iffalse}
\pdffalse
-\ifx\directlua\undefined
+\ifluatex
+\directlua{\IFTEX@detokenize{
+if (tex.outputmode or tex.pdfoutput or 0) > 0 then
+ tex.print('\\pdftrue')
+end
+}}
+\else
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname pdfoutput\endcsname\relax
\ifvtex
@@ -220,12 +236,6 @@
\pdftrue
\fi
\fi
-\else
-\directlua{\IFTEX@detokenize{
-if (tex.outputmode or tex.pdfoutput or 0) > 0 then
- tex.print('\\pdftrue')
-end
-}}
\fi
diff --git a/macros/latex/contrib/iftex/iftex.tex b/macros/latex/contrib/iftex/iftex.tex
index 67703b93c5..8e13546e77 100644
--- a/macros/latex/contrib/iftex/iftex.tex
+++ b/macros/latex/contrib/iftex/iftex.tex
@@ -39,7 +39,7 @@ engine (or a compatible extension) is being used.
For compatibility with earlier packages which did not all use the same
naming convention all these conditionals are provided in two forms, a
-lowercase name \verb|\iffootex| and a mixed case name \verb|\ifooTeX|.
+lowercase name \verb|\iffootex| and a mixed case name \verb|\iffooTeX|.
\item a command \verb|RequireFooTeX| which checks that \textsf{footex}
is being used, and stops the run with an error message if a
@@ -181,4 +181,19 @@ tests for p\TeX\ variants and this package does \emph{not} replace the
by their original authors and recommended for Japanese documents that
need fine control over the Japanese \TeX\ system in use.
+\section{Compatibility with \textsf{scrbase}}
+The \textsf{scrbase} package (which is automatically included in the
+popular \textsf{KOMA-Script} classes) by default defines
+\verb|\ifpdftex| and \verb|\ifVTeX| with a different syntax. If you
+use the \textsf{scrbase} option \verb|internalonly| then
+\textsf{scrbase} will not define these and the definitions as
+described here will take effect. This is recommended and will not
+affect any \textsf{scrbase} package code as internally
+\textsf{scrbase} uses private versions of those commands prefixed with
+\verb|\scr@|. However this package detects if the \textsf{scrbase}
+definitions are in effect and if so does not redefine them, for
+compatibility with existing documents. The \textsf{iftex} versions
+will still be available under the names \verb|\ifPDFTeX| and
+\verb|\ifvtex|.
+
\end{document}
diff --git a/macros/latex/contrib/poetry/CHANGES b/macros/latex/contrib/poetry/CHANGES
index 42cc519f2e..578def1a4e 100644
--- a/macros/latex/contrib/poetry/CHANGES
+++ b/macros/latex/contrib/poetry/CHANGES
@@ -1,3 +1,8 @@
+9 Nov 1203 (9 Nov 2019): Protected the index commands so
+that the package works with classes that don't include
+indices. Also removed two spurious "{"s. Thanks to David
+Carlisle for pointing out the issues to me. Version 2.1.
+
2 May 1203 (2 May 2019): Added ability to arbitrarily label
both the left and right sides of the line. Version 2.0.
diff --git a/macros/latex/contrib/poetry/poetry.dtx b/macros/latex/contrib/poetry/poetry.dtx
index de710f3239..774c2842ba 100644
--- a/macros/latex/contrib/poetry/poetry.dtx
+++ b/macros/latex/contrib/poetry/poetry.dtx
@@ -22,7 +22,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{poetry}[2019/05/02 v2.0 support for typesetting poetry]
+%<package>\ProvidesPackage{poetry}[2019/05/02 v2.1 support for typesetting poetry]
%<*driver>
\documentclass{ltxdoc}
@@ -77,7 +77,7 @@
%</driver>
% \fi
%
-% \title{The |poetry| Package, v2.0}
+% \title{The |poetry| Package, v2.1}
% \author{Donald P.\ Goodman III}
% \date{\today}
%
@@ -1314,7 +1314,6 @@
% \label{sect:implem}
%
% \begin{macrocode}
-\ProvidesPackage{poetry}%
\RequirePackage{modulus}%
\newcounter{poemline}%
\newcount\poemlineno%
@@ -1336,8 +1335,8 @@
\newcounter{poemrtlinenumsevery}\setcounter{poemrtlinenumsevery}{1}%
\newcount\poem@rt@linenumsevery\poem@rt@linenumsevery=\value{poemrtlinenumsevery}%
\newlength{\poemindent}\setlength{\poemindent}{0pt}%
-\newlength{\poemtopskip}{\setlength{\poemtopskip}{1em}%
-\newlength{\poembotskip}{\setlength{\poembotskip}{1em}%
+\newlength{\poemtopskip}\setlength{\poemtopskip}{1em}%
+\newlength{\poembotskip}\setlength{\poembotskip}{1em}%
\newdimen\poem@topskip\newdimen\poem@botskip%
\newdimen\poem@defleftskip\poem@defleftskip=\the\poemindent%
\newdimen\poem@maxlinewd%
@@ -1716,6 +1715,7 @@
% |imakeidx| package for this, so as not to interfere with
% any existing indices.
% \begin{macrocode}
+\ifx\theindex\@undefined\else%
\RequirePackage{imakeidx}
\makeindex[intoc,columns=1,name={\jobname-iofl},title={\poemioflname}]
\def\poemioflname{Index of First Lines}%
@@ -1729,6 +1729,7 @@
\def\printiofl{%
\printindex[\jobname-iofl]%
}%
+\fi%
% \end{macrocode}
% \listofpoems
% \PrintIndex
diff --git a/macros/latex/contrib/poetry/poetry.pdf b/macros/latex/contrib/poetry/poetry.pdf
index f22f9cee84..2fbe72dd41 100644
--- a/macros/latex/contrib/poetry/poetry.pdf
+++ b/macros/latex/contrib/poetry/poetry.pdf
Binary files differ