diff options
author | Karl Berry <karl@freefriends.org> | 2014-05-15 23:15:16 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-05-15 23:15:16 +0000 |
commit | b9e37e869e581a6e88d2add24560dc0fcb7e8e1b (patch) | |
tree | 4e66b68db87069e905a07dc6f44f7ca083322886 /Master/texmf-dist/source/latex/flowfram | |
parent | 5163dadf8cc6f05bed4163095af39bf5a4c260ac (diff) |
flowfram (15may14)
git-svn-id: svn://tug.org/texlive/trunk@34048 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/flowfram')
-rw-r--r-- | Master/texmf-dist/source/latex/flowfram/flowfram.dtx | 51 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/flowfram/flowfram.ins | 4 |
2 files changed, 38 insertions, 17 deletions
diff --git a/Master/texmf-dist/source/latex/flowfram/flowfram.dtx b/Master/texmf-dist/source/latex/flowfram/flowfram.dtx index 61890ddf0e7..37cbe1e0567 100644 --- a/Master/texmf-dist/source/latex/flowfram/flowfram.dtx +++ b/Master/texmf-dist/source/latex/flowfram/flowfram.dtx @@ -1,5 +1,5 @@ %\iffalse -% flowfram.dtx generated using makedtx version 0.94b (c) Nicola Talbot +% flowfram.dtx generated using makedtx version 1.1 (c) Nicola Talbot % Command line args: % -macrocode "flowfram\.perl" % -macrocode ".*\.tex" @@ -13,7 +13,7 @@ % -doc "docstub.tex" % -author "Nicola Talbot" % flowfram -% Created on 2012/11/10 22:19 +% Created on 2014/5/15 15:25 %\fi %\iffalse %<*package> @@ -36,7 +36,7 @@ %\fi % \iffalse % Doc-Source file to use with LaTeX2e -% Copyright (C) 2012 Nicola Talbot, all rights reserved. +% Copyright (C) 2014 Nicola Talbot, all rights reserved. % \fi % \iffalse %<*driver> @@ -44,7 +44,7 @@ \addtolength{\marginparwidth}{10pt} \addtolength{\oddsidemargin}{20pt} -\CheckSum{12608} +\CheckSum{12619} \PageIndex \usepackage{url} @@ -53,6 +53,8 @@ pdfauthor={Nicola L C Talbot}, pdftitle={Documented Source Code for flowfram.sty}]{hyperref} \usepackage[style=altlist,toc,nonumberlist]{glossaries} +\RecordChanges + \newglossary[slg]{secondary}{sgi}{sgo}{Glossary} \renewcommand{\acronymtype}{secondary} @@ -143,9 +145,9 @@ IDN}]{idl}{IDL}{identification label} \end{document} %</driver> %\fi -%\title{Documented Source Code for flowfram.sty v1.14} +%\title{Documented Source Code for flowfram.sty v1.15} %\author{Nicola L. C. Talbot} -%\date{2012-11-10} +%\date{2014-05-15} %\maketitle % %This is the documented source code for the flowfram package. @@ -169,7 +171,7 @@ IDN}]{idl}{IDL}{identification label} % Declare package, and identify it as a \LaTeXe\ package. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{flowfram}[2012/11/10 v1.14 (NLCT)] +\ProvidesPackage{flowfram}[2014/05/15 v1.15 (NLCT)] % \end{macrocode} % Load packages needed by this package % \begin{macrocode} @@ -2464,12 +2466,21 @@ IDN}]{idl}{IDL}{identification label} \def\ff@shape{2}% }% {% - \ifx#1\relax - \def\ff@shape{0}% - \else - \PackageError{flowfram}{Unknown shape \string#1}{}% - \def\ff@shape{2}% - \fi +% \end{macrocode} +%\changes{1.15}{2014-05-15}{added check for \cs{Shapepar}} +% \begin{macrocode} + \ifdefequal{#1}{\Shapepar}% + {% + \def\ff@shape{2}% + }% + {% + \ifx#1\relax + \def\ff@shape{0}% + \else + \PackageError{flowfram}{Unknown shape \string#1}{}% + \def\ff@shape{2}% + \fi + }% }% }% } @@ -2569,7 +2580,7 @@ IDN}]{idl}{IDL}{identification label} }% \or % \end{macrocode} -% \ics{shapepar}: +% \ics{shapepar} or \ics{Shapepar}: % \begin{macrocode} \edef\@sf@mpg{% \noexpand @@ -5427,7 +5438,17 @@ IDN}]{idl}{IDL}{identification label} \expandafter\vsize\csname colheight\romannumeral#1\endcsname \global\@colht\vsize \global\@colroom\@colht - \global\linewidth\columnwidth +% \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 +% it's larger than the new column width. +%\changes{1.15}{2014-05-15}{set \cs{linewidth} as well as \cs{textwidth}} +%\begin{macrocode} + \ifnum\linewidth>\columnwidth + \global\linewidth\columnwidth + \fi + \global\textwidth\columnwidth \setmargin \fi \stepcounter{displayedframe}% diff --git a/Master/texmf-dist/source/latex/flowfram/flowfram.ins b/Master/texmf-dist/source/latex/flowfram/flowfram.ins index 999f48fe496..b8cbdfcfd26 100644 --- a/Master/texmf-dist/source/latex/flowfram/flowfram.ins +++ b/Master/texmf-dist/source/latex/flowfram/flowfram.ins @@ -1,10 +1,10 @@ -% flowfram.ins generated using makedtx version 0.94b 2012/11/10 22:19 +% flowfram.ins generated using makedtx version 1.1 2014/5/15 15:25 \input docstrip \preamble flowfram.dtx - Copyright 2012 Nicola Talbot + Copyright 2014 Nicola Talbot This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 |