summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/flowfram
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-09-30 21:54:11 +0000
committerKarl Berry <karl@freefriends.org>2014-09-30 21:54:11 +0000
commitef9899920185559088c099d9249af27f963d0644 (patch)
tree357ef2739da65dfdf1c4ee4f38bd0b97583bfe9f /Master/texmf-dist/source/latex/flowfram
parent46e60dcc83d0668a813fa25b80582adc425ffcf8 (diff)
flowfram (30sep14)
git-svn-id: svn://tug.org/texlive/trunk@35291 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/flowfram')
-rw-r--r--Master/texmf-dist/source/latex/flowfram/flowfram.dtx21
-rw-r--r--Master/texmf-dist/source/latex/flowfram/flowfram.ins2
2 files changed, 15 insertions, 8 deletions
diff --git a/Master/texmf-dist/source/latex/flowfram/flowfram.dtx b/Master/texmf-dist/source/latex/flowfram/flowfram.dtx
index e23309351cc..96a0b6adccf 100644
--- a/Master/texmf-dist/source/latex/flowfram/flowfram.dtx
+++ b/Master/texmf-dist/source/latex/flowfram/flowfram.dtx
@@ -13,7 +13,7 @@
% -doc "docstub.tex"
% -author "Nicola Talbot"
% flowfram
-% Created on 2014/6/7 15:18
+% Created on 2014/9/30 10:10
%\fi
%\iffalse
%<*package>
@@ -44,7 +44,7 @@
\addtolength{\marginparwidth}{10pt}
\addtolength{\oddsidemargin}{20pt}
-\CheckSum{12713}
+\CheckSum{12721}
\PageIndex
\usepackage{url}
@@ -145,9 +145,9 @@ IDN}]{idl}{IDL}{identification label}
\end{document}
%</driver>
%\fi
-%\title{Documented Source Code for flowfram.sty v1.16}
+%\title{Documented Source Code for flowfram.sty v1.17}
%\author{Nicola L. C. Talbot}
-%\date{2014-06-04}
+%\date{2014-09-30}
%\maketitle
%
%This is the documented source code for the flowfram package.
@@ -172,7 +172,7 @@ IDN}]{idl}{IDL}{identification label}
% Declare package, and identify it as a \LaTeXe\ package.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{flowfram}[2014/06/04 v1.16 (NLCT)]
+\ProvidesPackage{flowfram}[2014/09/30 v1.17 (NLCT)]
% \end{macrocode}
% Load packages needed by this package
% \begin{macrocode}
@@ -5499,11 +5499,18 @@ IDN}]{idl}{IDL}{identification label}
% \end{macrocode}
% We may be inside an environment that has modified the line
% width, such as one of the list environments so we can't just set
-% \cs{linewidth} to \cs{columnwidth}. Only modify \cs{linewidth} if
+% \cs{linewidth} to \cs{columnwidth}. Test if we're in a list
+% environment by checking if \cs{@listdepth} is greater than 0. If
+% true, only modify \cs{linewidth} if
% it's larger than the new column width.
%\changes{1.15}{2014-05-15}{set \cs{linewidth} as well as \cs{textwidth}}
+%\changes{1.17}{2014-09-30}{added check for list}
% \begin{macrocode}
- \ifnum\linewidth>\columnwidth
+ \ifnum\@listdepth>0\relax
+ \ifnum\linewidth>\columnwidth
+ \global\linewidth\columnwidth
+ \fi
+ \else
\global\linewidth\columnwidth
\fi
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/flowfram/flowfram.ins b/Master/texmf-dist/source/latex/flowfram/flowfram.ins
index 557f81a1fbb..fc58370382e 100644
--- a/Master/texmf-dist/source/latex/flowfram/flowfram.ins
+++ b/Master/texmf-dist/source/latex/flowfram/flowfram.ins
@@ -1,4 +1,4 @@
-% flowfram.ins generated using makedtx version 1.1 2014/6/7 15:18
+% flowfram.ins generated using makedtx version 1.1 2014/9/30 10:10
\input docstrip
\preamble