koma-script (30sep15)

git-svn-id: svn://tug.org/texlive/trunk@38504 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 116 insertions, 46 deletions

diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index befb01b633b..3874e878d2c 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
@@ -74,7 +74,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 2149 2015-07-02 08:07:30Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2208 2015-09-29 08:13:01Z kohm $
 \begingroup
   \catcode`\@11\relax
   \ifx\KOMAScriptVersion\undefined
@@ -96,7 +96,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2015/09/29 v3.19 KOMA-Script}%
 \endgroup
 \providecommand*{\scr@clsextension}{\@clsextension}
 \AtBeginDocument{%
@@ -111,19 +111,19 @@
 \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
 \edef\KOMAClassFileName{\KOMAClassFileName}
 \ProvidesClass{\KOMAClassName}[%
-  2015/07/02 v3.18 KOMA-Script
+  2015/09/29 v3.19 KOMA-Script
   document class (\ClassName)%
 ]
-%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2190 2015-08-29 17:21:55Z kohm $
 \RequirePackage{scrkbase}[\KOMAScriptVersion]
 %%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $
 \RequirePackage{tocbasic}[%
-  2015/07/02 v3.18 KOMA-Script
+  2015/09/29 v3.19 KOMA-Script
 ]
 \addtotoclist{toc}
 \addtotoclist[float]{lof}
 \addtotoclist[float]{lot}
-%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $
 %%%            (run: prepare)
 \newcommand*{\scr@dotchangeatdocument}[1]{%
   \ClassError{\KOMAClassName}{%
@@ -175,7 +175,7 @@
 \newcommand*{\size@paragraph}{}
 \newcommand*{\size@subparagraph}{}
 \newcommand*{\sectfont}{\normalcolor\sffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $
 \newif\if@scr@emulatestandardclasses
 \let\scr@emulatestandardclassestrue\relax
 \let\scr@emulatestandardclassesfalse\relax
@@ -295,6 +295,8 @@
 \@namedef{scr@v@3.17a}{15}
 \@namedef{scr@v@3.17c}{15}
 \@namedef{scr@v@3.18}{15}
+\@namedef{scr@v@3.18a}{15}
+\@namedef{scr@v@3.19}{15}
 \@namedef{scr@v@last}{15}
 \newcommand*{\scr@v@is@lt}[1]{%
   \scr@compatibility<\@nameuse{scr@v@#1}
@@ -330,8 +332,8 @@
 {final}{draft=false}
 \DeclareOption{leqno}{\input{leqno.clo}}
 \DeclareOption{fleqn}{\input{fleqn.clo}}
-%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
 \newcommand*\@ptsize{%
   11%
 }
@@ -398,7 +400,7 @@
     \KOMAClassFileName
   }{fontsize}{#1}%
 }
-%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $
 \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
 \newcommand*{\@@BCOR}{}
 \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -504,7 +506,7 @@
   {onecolumn}{twocolumn=false}
 \DeclareOption*{%
   \x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $
 \newcommand*{\setparsizes}[3]{%
   \edef\f@parindent{\the\parindent}%
   \edef\f@parskip{\the\parskip}%
@@ -512,7 +514,10 @@
   \def\scr@parindent{#1}%
   \def\scr@parskip{#2}%
   \def\scr@parfillskip{#3}%
-  \def\par@update{\let\par@update\default@par@update\par@updaterelative}%
+  \def\par@update{%
+    \if@atdocument\let\par@update\default@par@update\fi
+    \par@updaterelative
+  }%
   \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{false}%
   \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{never}%
   \KOMA@kav@remove{.\KOMAClassFileName}{parskip}{full}%
@@ -665,7 +670,7 @@
 \KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
 \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
 \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $
 \newif\if@titlepage
 \@titlepagefalse
 \newif\if@titlepageiscoverpage
@@ -699,7 +704,7 @@
 \KOMA@ifkey{abstract}{@abstrt}
 \KOMA@DeclareStandardOption{abstracton}{abstract=true}
 \KOMA@DeclareStandardOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $
 %%%            (run: option)
 \KOMA@key{numbers}{%
   \KOMA@set@ncmdkey{numbers}{@tempa}{%
@@ -825,14 +830,14 @@
 \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
 \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
 \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $
 \newif\if@hsl
 \KOMA@key{headsepline}[true]{%
   \KOMA@set@ifkey{headsepline}{@hsl}{#1}%
   \ifx\FamilyKeyState\FamilyKeyStateProcessed
     \KOMA@kav@replacebool{.\KOMAClassFileName}{headsepline}{@hsl}%
     \@ifundefined{typearea}{%
-      \PassOptionsToPackage{typearea}{headinclude=#1}%
+      \PassOptionsToPackage{headinclude=#1}{typearea}%
     }{%
       \KOMAoptions{headinclude=#1}{}%
     }%
@@ -846,7 +851,7 @@
   \ifx\FamilyKeyState\FamilyKeyStateProcessed
     \KOMA@kav@replacebool{.\KOMAClassFileName}{footsepline}{@fsl}%
     \@ifundefined{typearea}{%
-      \PassOptionsToPackage{typearea}{footinclude=#1}%
+      \PassOptionsToPackage{footinclude=#1}{typearea}%
     }{%
       \KOMAoptions{footinclude=#1}%
     }%
@@ -1085,7 +1090,7 @@
 \DeclareOption{origlongtable}{\@komalongtablefalse}
 \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline}
 \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $
 \KOMA@key{footnotes}{%
   \ifx\@footnotemark\scr@saved@footnotemark
   \else
@@ -1155,7 +1160,7 @@
   \csname FN@mf@prepare\endcsname
   \ifhmode\spacefactor\@x@sf\fi
   \relax}
-%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $
 \newif\if@tocleft
 \KOMA@key{toc}{%
   \KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -1542,7 +1547,7 @@
 \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
 \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
 \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $
 \newcommand*{\idx@@heading}{%
   \ifidx@leveldown
     \expandafter\subsection
@@ -1626,7 +1631,7 @@
 \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}
 \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
 %%% From File: $Id: scrkernel-listsandtabulars.dtx 2028 2015-03-23 12:19:51Z kohm $
-%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $
 %%%            (run: execoption)
 \KOMAExecuteOptions{numbers=autoendperiod}
 %%% From File: $Id: scrkernel-miscellaneous.dtx 2028 2015-03-23 12:19:51Z kohm $
@@ -1635,8 +1640,8 @@
   headings=big%
 }
 \KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2101 2015-05-14 10:20:33Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 2063 2015-04-03 11:55:42Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2168 2015-07-26 09:32:03Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2181 2015-08-24 09:30:25Z kohm $
 \newcommand*\scr@setlength[4]{%
   \expandafter\ifnum\scr@v@is@lt{3.12}\relax
     \setlength{#1}{#2 \@plus#3 \@minus#4}%
@@ -2074,12 +2079,12 @@
   \@nomath\sfb}
 \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
 \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2151 2015-07-03 09:25:42Z kohm $
       \def\today{\ifcase\month\or
         January\or February\or March\or April\or May\or June\or
         July\or August\or September\or October\or November\or December\fi
         \space\number\day, \number\year}%
-%%% From File: $Id: scrkernel-typearea.dtx 2108 2015-05-20 18:11:25Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2166 2015-07-26 08:15:44Z kohm $
 \let\@BCOR                =\relax
 \let\@@BCOR               =\relax
 \let\@DIV                 =\relax
@@ -2123,7 +2128,7 @@
     }\reserved@a
   \fi
 \fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 2045 2015-03-25 09:47:54Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2179 2015-08-22 06:36:48Z kohm $
 \setlength{\lineskip}{\p@}
 \setlength{\normallineskip}{\p@}
 \setlength{\columnsep}{10\p@}
@@ -2208,7 +2213,7 @@
   \begingroup
     \edef\@tempa{#2}%
     \expandafter\scr@@defaultunits\expandafter#1\@tempa plusplus\@nnil
-    \edef\@tempa{\noexpand\endgroup\noexpand\setlength{\noexpand#1}{\the#1}}%
+    \edef\@tempa{\noexpand\endgroup\noexpand#1\the\glueexpr #1\relax}%
   \@tempa
 }
 \newcommand*{\scr@@defaultunits}{}
@@ -2223,16 +2228,16 @@
 \def\scr@@@defaultunits#1#2#3minus#4minus#5\@nnil{%
   \ifx\relax#2\relax
     \@defaultunits\@tempskipa#3pt\relax\@nnil
-    \setlength{#1}{\@tempskipa}%
+    #1\@tempskipa
   \else
     \@defaultunits\@tempskipa\z@\@plus#3pt\relax\@nnil
-    \setlength{#1}{\@tempskipa}%
+    #1\@tempskipa
     \@defaultunits\@tempskipa#2pt\relax\@nnil
-    \addtolength{#1}{\@tempskipa}%
+    \advance#1\@tempskipa
   \fi
   \ifx\relax#4\relax\else
     \@defaultunits\@tempskipa\z@\@minus #4pt\relax\@nnil
-    \addtolength{#1}{\@tempskipa}%
+    \advance#1\@tempskipa
   \fi
 }
 \newcommand*{\@list@extra}{%
@@ -2251,7 +2256,7 @@
 \@lowpenalty  = 51
 \@medpenalty  =151
 \@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 2011 2015-03-17 11:39:55Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2182 2015-08-25 09:10:08Z kohm $
 \newcommand*{\@extratitle}{}%
 \newcommand{\extratitle}[1]{\gdef\@extratitle{%
     #1%
@@ -2445,7 +2450,8 @@
         \fi
         \@maketitle
       \fi
-      \thispagestyle{\titlepagestyle}\@thanks
+      \ifx\titlepagestyle\@empty\else\thispagestyle{\titlepagestyle}\fi
+      \@thanks
     \endgroup
   \fi
   \setcounter{footnote}{0}%
@@ -2589,7 +2595,7 @@
   \fi
 }
 \newcommand*\abstractname{Abstract}
-%%% From File: $Id: scrkernel-sections.dtx 2131 2015-06-10 18:17:51Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2195 2015-09-09 06:01:54Z kohm $
 %%%            (run: body)
 \setcounter{secnumdepth}{3}
 \newcommand*{\ifnumbered}[1]{%
@@ -2671,6 +2677,7 @@
     \fi
     \@ifstar {%
       \csname scr@preto@ssect@hook\endcsname
+      \def\scr@s@ct@@nn@m@{#1}%
       \@ssect{\glueexpr #3\relax}{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}%
     }{%
       \csname scr@preto@sect@hook\endcsname
@@ -2778,7 +2785,7 @@
 \ifx\@sect\@tempa\else
   \ClassWarning{\KOMAClassName}{%
     Unexpected definition of \string\@sect!\MessageBreak
-    Please send an information about this to\MessageBreak
+    Please send information about this to\MessageBreak
     the KOMA-Script maintainer!\MessageBreak
     Maybe LaTeX will be broken by the redefinition\MessageBreak
     of \string\@sect\space}%
@@ -2813,9 +2820,8 @@
   \@tempskipa \glueexpr #5\relax\relax
   \ifdim \@tempskipa>\z@
     \begingroup
-      #6{%
-        \@hangfrom{\hskip \glueexpr #3\relax\@svsec}%
-        \interlinepenalty \@M #8\@@par}%
+      #6{\interlinepenalty \@M
+        \sectionlinesformat{#1}{\glueexpr #3\relax}\@svsec{#8}\@@par}%
     \endgroup
     \expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}%
     \ifx\scr@ds@tocentry\@empty\else
@@ -2834,8 +2840,7 @@
     \fi
   \else
     \def\@svsechd{%
-      #6{\hskip \glueexpr #3\relax
-        \@svsec #8}%
+      #6{\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}%
        \expandafter\csname #1mark\expandafter\endcsname
        \expandafter{\scr@ds@head}%
       \ifx\scr@ds@tocentry\@empty\else
@@ -2868,6 +2873,61 @@
   \ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi
 }
 \newif\if@scr@tempswa
+\newcommand{\sectionlinesformat}[4]{%
+  \@hangfrom{\hskip #2#3}{#4}%
+}
+\newcommand{\sectioncatchphraseformat}[4]{%
+  \hskip #2#3#4%
+}
+\def\@tempa#1#2#3#4#5{%
+  \@tempskipa #3\relax
+  \ifdim \@tempskipa>\z@
+    \begingroup
+      #4{%
+        \@hangfrom{\hskip #1}%
+          \interlinepenalty \@M #5\@@par}%
+    \endgroup
+  \else
+    \def\@svsechd{#4{\hskip #1\relax #5}}%
+  \fi
+  \@xsect{#3}}
+\ifx\@ssect\@tempa\else
+  \ClassWarning{\KOMAClassName}{%
+    Unexpected definition of \string\@ssect!\MessageBreak
+    Please send information about this to\MessageBreak
+    the KOMA-Script maintainer!\MessageBreak
+    Maybe LaTeX will be broken by the redefinition\MessageBreak
+    of \string\@ssect\space}%
+\fi
+\def\@ssect#1#2#3#4#5{%
+  \scr@ifundefinedorrelax{scr@s@ct@@nn@m@}{%
+    \ClassWarning{\KOMAClassName}{incompatible usage of
+      \string\@ssect\space detected.\MessageBreak
+      You've used the KOMA-Script implementation of
+      \string\@ssect\MessageBreak
+      from within a non compatible caller, that does not\MessageBreak
+      \string\scr@s@ct@@nn@m@\space locally.\MessageBreak
+      This could result in several error messages}%
+    \def\scr@s@ct@@nn@m@{\string\scr@s@ct@@nn@m@}%
+  }{}%
+  \@tempskipa #3\relax
+  \ifdim \@tempskipa>\z@
+    \begingroup
+      #4{\interlinepenalty \@M
+        \expandafter\sectionlinesformat\expandafter{\scr@s@ct@@nn@m@}%
+        {\glueexpr #1\relax}\@empty{#5}\@@par}%
+    \endgroup
+  \else
+    \edef\@svsechd{%
+      \unexpanded{#4}{%
+        \noexpand\sectioncatchphraseformat{\scr@s@ct@@nn@m@}%
+        \unexpanded{{\glueexpr #1\relax}\@empty{#5}}%
+      }%
+    }%
+  \fi
+  \let\scr@s@ct@@nn@m@\relax
+  \@xsect{\glueexpr #3\relax}%
+}
 \newcommand*{\scr@IfUsePrefixLineWarning}[2]{%
   \ClassWarning{\KOMAClassName}{%
     usage of \string\IfUsePrefixLine\space outside
@@ -3072,6 +3132,8 @@
         }%
       }\reserved@a
     }%
+    \FamilyStringKey[.dsc]{KOMAarg}{counterwithout}{\scr@local@counterwithout}%
+    \let\scr@local@counterwithout\relax
     \FamilyStringKey[.dsc]{KOMAarg}{counterwithin}{\scr@local@counterwithin}%
     \let\scr@local@counterwithin\relax
     \scr@ifundefinedorrelax{scr@local@tocleveloffset}{%
@@ -3138,6 +3200,13 @@
     \endgroup
     \@firstofone{%
       \@ifundefined{c@#2}{\newcounter{#2}}{}%
+      \ifx\scr@local@counterwithout\relax
+      \else\ifx\scr@local@counterwithout\@empty
+        \else
+          \@removefromreset{#2}{\scr@local@counterwithout}%
+        \fi
+        \@namedef{the#2}{\arabic{#2}}%
+      \fi
       \ifx\scr@local@counterwithin\relax
       \else\ifx\scr@local@counterwithin\@empty
           \@namedef{the#2}{\arabic{#2}}%
@@ -3938,7 +4007,7 @@
     \let\scr@ttl@@extract\relax
   }%
 }
-%%% From File: $Id: scrkernel-pagestyles.dtx 2130 2015-06-10 09:36:46Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2162 2015-07-15 07:30:52Z kohm $
 \newcommand*{\set@tempdima@hw}{%
   \setlength{\@tempdima}{\textwidth}%
   \if@mincl
@@ -4577,7 +4646,7 @@
 }{%
   \end@dblfloat
 }
-%%% From File: $Id: scrkernel-footnotes.dtx 2011 2015-03-17 11:39:55Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2180 2015-08-24 09:28:16Z kohm $
 \renewcommand*\footnoterule{%
   \normalsize\ftn@rule@test@values
   \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
@@ -4714,7 +4783,7 @@
   \endgroup
   \@footnotemark
 }
-%%% From File: $Id: scrkernel-listsof.dtx 2134 2015-06-15 11:34:28Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2206 2015-09-27 08:08:34Z kohm $
 \renewcommand*{\numberline}[1]{%
   \numberline@box{%
     \numberline@prefix
@@ -4778,7 +4847,7 @@
     usage of deprecated \string\toc@heading!\MessageBreak
     You should use the features of package `tocbasic'\MessageBreak
     instead of \string\toc@heading.\MessageBreak
-    Definition of \string\toc@heading\space my be removed from\MessageBreak
+    Definition of \string\toc@heading\space may be removed from\MessageBreak
     KOMA-Script soon, so it should not be used
   }%
   \section*{\contentsname}%
@@ -4931,7 +5000,7 @@
 }
 \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
 \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: $Id: scrkernel-index.dtx 2134 2015-06-15 11:34:28Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $
 \newcommand*{\index@preamble}{}
 \let\index@preamble=\relax
 \newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}}
@@ -4962,7 +5031,8 @@
   \columnsep 35\p@
   \idx@heading%
   \index@preamble\par\nobreak
-  \thispagestyle{\indexpagestyle}\parindent\z@
+  \ifx\indexpagestyle\@empty\else\thispagestyle{\indexpagestyle}\fi
+  \parindent\z@
   \setlength{\parskip}{\z@ \@plus .3\p@}%
   \setlength{\parfillskip}{\z@ \@plus 1fil}%
   \let\item\@idxitem