summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-11-03 22:26:53 +0000
committerKarl Berry <karl@freefriends.org>2015-11-03 22:26:53 +0000
commit14c29b37fc08cd01cf10e7c7816e28734950cd92 (patch)
treefd9b20ce6f3b7b0bb81f4c8215830cee5f5e5ea8
parent9400888610cff531773a7fea1602494e3e99c20f (diff)
fix2col (3nov15)
git-svn-id: svn://tug.org/texlive/trunk@38770 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/fix2col/README8
-rw-r--r--Master/texmf-dist/doc/latex/fix2col/fix2col.pdfbin87126 -> 212312 bytes
-rw-r--r--Master/texmf-dist/source/latex/fix2col/fix2col.dtx18
-rw-r--r--Master/texmf-dist/tex/latex/fix2col/fix2col.sty5
4 files changed, 26 insertions, 5 deletions
diff --git a/Master/texmf-dist/doc/latex/fix2col/README b/Master/texmf-dist/doc/latex/fix2col/README
index 19ef4ecde6c..fa6ef96d146 100644
--- a/Master/texmf-dist/doc/latex/fix2col/README
+++ b/Master/texmf-dist/doc/latex/fix2col/README
@@ -1,7 +1,11 @@
fix2col.dtx
fix2col.ins
- Superceeded by fixltx2e, part of the base LaTeX distribution.
- Two column fixes.
+ OBSOLETE: do not use in new documents.
+ This package will do nothing in LaTeX formats after 2015/01/01
+ as the fixes that it implements were incorporated into fixltx2e
+ package, which is itself obsolete as since the 2015/01/01 release
+ these fixes are in format.
+
a) Fix mark handling so \firstmark is taken from the first column
if that column has marks at all.
(A copy of Piet van Oostrum's fixmarks package, more or less.)
diff --git a/Master/texmf-dist/doc/latex/fix2col/fix2col.pdf b/Master/texmf-dist/doc/latex/fix2col/fix2col.pdf
index a66dda3efd9..4c38351c42e 100644
--- a/Master/texmf-dist/doc/latex/fix2col/fix2col.pdf
+++ b/Master/texmf-dist/doc/latex/fix2col/fix2col.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/fix2col/fix2col.dtx b/Master/texmf-dist/source/latex/fix2col/fix2col.dtx
index 963f35e8fd1..15e2e494677 100644
--- a/Master/texmf-dist/source/latex/fix2col/fix2col.dtx
+++ b/Master/texmf-dist/source/latex/fix2col/fix2col.dtx
@@ -12,7 +12,7 @@
%<driver> \ProvidesFile{fix2col.drv}
% \fi
% \ProvidesFile{fix2col.dtx}
- [1998/08/17 v0.03 Output Routine fixes for two column mode (DPC,FMi)]
+ [2015/11/13 v0.04 Output Routine fixes for two column mode (DPC,FMi)]
%
% \iffalse
%<*driver>
@@ -24,7 +24,7 @@
% \fi
%
% \GetFileInfo{fix2col.dtx}
-% \CheckSum{579}
+% \CheckSum{583}
%
% \changes{v0.01}{1997/11/07}
% {Initial version}
@@ -50,6 +50,10 @@
% \maketitle
%
% \section{Introduction}
+%
+% \textbf{Note:} This package is obsolete, the fixes described here are
+% incorporated into \LaTeX\ formats from 2015/01/01 onwards.
+%
% This package makes two independent changes to \LaTeX's two column
% output routine to fix the following two longstanding `features'.
%
@@ -185,6 +189,16 @@
%<*package>
% \end{macrocode}
%
+% \subsection{Do nothing on current releases}
+%
+% \changes{v0.04}{2015/11/03}
+% {Abort on new formats}
+% \begin{macrocode}
+\@ifl@t@r\fmtversion{2014/12/31}
+{\PackageWarningNoLine{fix2col}{Obsolete package: ignored}\endinput}
+{}
+% \end{macrocode}
+%
% \subsection{Preserving Marks}
%
% This is just a change to the single command |\@outputdblcol|
diff --git a/Master/texmf-dist/tex/latex/fix2col/fix2col.sty b/Master/texmf-dist/tex/latex/fix2col/fix2col.sty
index 15695aa25ef..07c9ad585a3 100644
--- a/Master/texmf-dist/tex/latex/fix2col/fix2col.sty
+++ b/Master/texmf-dist/tex/latex/fix2col/fix2col.sty
@@ -12,7 +12,10 @@
%% See 00readme.txt for details.
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fix2col}
- [1998/08/17 v0.03 Output Routine fixes for two column mode (DPC,FMi)]
+ [2015/11/13 v0.04 Output Routine fixes for two column mode (DPC,FMi)]
+\@ifl@t@r\fmtversion{2014/12/31}
+{\PackageWarningNoLine{fix2col}{Obsolete package: ignored}\endinput}
+{}
\def\@outputdblcol{%
\if@firstcolumn
\global\@firstcolumnfalse