summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/base
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-09-19 22:29:15 +0000
committerKarl Berry <karl@freefriends.org>2014-09-19 22:29:15 +0000
commit3b378d704d5d92df25314e52e0ce8cac217e9fd0 (patch)
treeff5e7f0f4f2af8ad417031d5c7a3c5a0919f328a /Master/texmf-dist/source/latex/base
parent796aff43e398e55e1c10290bd6d37bcc6099d030 (diff)
latex2e (19sep14)
git-svn-id: svn://tug.org/texlive/trunk@35209 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/base')
-rw-r--r--Master/texmf-dist/source/latex/base/fixltx2e.dtx34
-rw-r--r--Master/texmf-dist/source/latex/base/unpack.ins3
2 files changed, 34 insertions, 3 deletions
diff --git a/Master/texmf-dist/source/latex/base/fixltx2e.dtx b/Master/texmf-dist/source/latex/base/fixltx2e.dtx
index b6ed3420cb3..dc2d5522254 100644
--- a/Master/texmf-dist/source/latex/base/fixltx2e.dtx
+++ b/Master/texmf-dist/source/latex/base/fixltx2e.dtx
@@ -38,7 +38,7 @@
%<driver>\ProvidesFile{fixltx2e.drv}
% \fi
% \ProvidesFile{fixltx2e.dtx}
- [2014/06/10 v1.1r fixes to LaTeX]
+ [2014/08/30 v1.1s fixes to LaTeX]
%
% \iffalse
%<*driver>
@@ -54,7 +54,7 @@
%</driver>
% \fi
%
-% \CheckSum{1214}
+% \CheckSum{1221}
%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -745,6 +745,25 @@
% operation to get at the column marks invalid.
%
%
+% \section{Fixes added after 2014/05/01}
+%
+% \subsection{Within counters only reset next level down (pr4393)}
+%
+% This is actually implicitly documented behavior in the \LaTeX{}
+% Manual that states that |\stepcounter| resets all counters marked
+% ``within''. However it means that if, for example, theorems are
+% numbered within sections and you start a new chapter in a book, the
+% section counter is reset to zero but the theorem counter is not
+% until the first section appears. Thus a theorem directly within the
+% chapter body (without a new section) would show an incremented
+% number relative to the last theorem of the previous chapter.
+%
+%
+% For this reason we are now resetting all levels of within in one go
+% even if that means that some of these resets may happen several times
+% unnecessarily.
+%
+%
% \StopEventually{}
%
% \section{Implementation}
@@ -2245,6 +2264,17 @@
}
% \end{macrocode}
%
+% \subsection{Within counters only reset next level down}
+%
+% \changes{v1.1s}{2014/08/30}{Reset all within counters in one go}
+%
+% Rather than resetting the ``within'' counter to zero we set it to
+% $-1$ and then run |\stepcounter| that moves it to $0$ and also
+% initiates resetting the next level down.
+% \begin{macrocode}
+ \def\@stpelt#1{\global\csname c@#1\endcsname \m@ne\stepcounter{#1}}
+% \end{macrocode}
+%
% \begin{macrocode}
%</fixltx2e>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/base/unpack.ins b/Master/texmf-dist/source/latex/base/unpack.ins
index 4a5484d10f9..b5c068f7d06 100644
--- a/Master/texmf-dist/source/latex/base/unpack.ins
+++ b/Master/texmf-dist/source/latex/base/unpack.ins
@@ -60,7 +60,8 @@
}
-\askonceonly
+%\askonceonly
+\askforoverwritefalse
\keepsilent