From ef9899920185559088c099d9249af27f963d0644 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 30 Sep 2014 21:54:11 +0000 Subject: flowfram (30sep14) git-svn-id: svn://tug.org/texlive/trunk@35291 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/flowfram/CHANGES | 7 ++++ Master/texmf-dist/doc/latex/flowfram/README | 4 +-- .../texmf-dist/doc/latex/flowfram/ffuserguide.pdf | Bin 300802 -> 300851 bytes .../texmf-dist/doc/latex/flowfram/ffuserguide.tex | 36 +++++++++++++-------- Master/texmf-dist/doc/latex/flowfram/flowfram.pdf | Bin 527295 -> 527791 bytes .../doc/latex/flowfram/samples/sample-article.pdf | Bin 163046 -> 162965 bytes .../doc/latex/flowfram/samples/sample-brochure.pdf | Bin 101913 -> 101864 bytes .../doc/latex/flowfram/samples/sample-news.pdf | Bin 48208 -> 47955 bytes .../doc/latex/flowfram/samples/sample-news2.pdf | Bin 52822 -> 52800 bytes .../doc/latex/flowfram/samples/sample-pages.pdf | Bin 136314 -> 136770 bytes .../doc/latex/flowfram/samples/sample-poster.pdf | Bin 91427 -> 91411 bytes .../doc/latex/flowfram/samples/sample-rot.pdf | Bin 54595 -> 54567 bytes .../doc/latex/flowfram/samples/sample.pdf | Bin 100471 -> 100455 bytes .../doc/latex/flowfram/samples/sample1.pdf | Bin 151306 -> 151194 bytes .../doc/latex/flowfram/samples/sample2.pdf | Bin 142717 -> 142653 bytes .../doc/latex/flowfram/samples/sample3.pdf | Bin 46660 -> 46646 bytes .../doc/latex/flowfram/samples/sampleRL.pdf | Bin 31657 -> 31648 bytes .../texmf-dist/source/latex/flowfram/flowfram.dtx | 21 ++++++++---- .../texmf-dist/source/latex/flowfram/flowfram.ins | 2 +- Master/texmf-dist/tex/latex/flowfram/flowfram.sty | 8 +++-- 20 files changed, 53 insertions(+), 25 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/flowfram/CHANGES b/Master/texmf-dist/doc/latex/flowfram/CHANGES index a10df6dcc2f..230769eb0f4 100644 --- a/Master/texmf-dist/doc/latex/flowfram/CHANGES +++ b/Master/texmf-dist/doc/latex/flowfram/CHANGES @@ -1,5 +1,12 @@ flowfram change log +1.17 (2014/09/30) : + + * Fixed new bug introduced by bug fix in v1.15 related to + lists spanning or following a break across frames of + unequal widths. + (both bugs should now be fixed) + 1.16 (2014/06/04) : * Added `hide' and `hidethis' attributes for static and dynamic diff --git a/Master/texmf-dist/doc/latex/flowfram/README b/Master/texmf-dist/doc/latex/flowfram/README index 56197e19701..9cdc01ae9e2 100644 --- a/Master/texmf-dist/doc/latex/flowfram/README +++ b/Master/texmf-dist/doc/latex/flowfram/README @@ -1,6 +1,6 @@ -LaTeX Package : flowfram v1.16 +LaTeX Package : flowfram v1.17 -Last Modified : 2014-06-04 +Last Modified : 2014-09-30 Author : Nicola Talbot diff --git a/Master/texmf-dist/doc/latex/flowfram/ffuserguide.pdf b/Master/texmf-dist/doc/latex/flowfram/ffuserguide.pdf index 705023bf45f..dd2636be067 100644 Binary files a/Master/texmf-dist/doc/latex/flowfram/ffuserguide.pdf and b/Master/texmf-dist/doc/latex/flowfram/ffuserguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/flowfram/ffuserguide.tex b/Master/texmf-dist/doc/latex/flowfram/ffuserguide.tex index 3a2c96ac194..3e77ded1390 100644 --- a/Master/texmf-dist/doc/latex/flowfram/ffuserguide.tex +++ b/Master/texmf-dist/doc/latex/flowfram/ffuserguide.tex @@ -364,9 +364,9 @@ backcolor=blue,textcolor=white,style=footstyle,pages=none} \begin{document}\label{top} \title{Creating Flow Frames for Posters, Brochures or -Magazines using flowfram.sty version 1.16} +Magazines using flowfram.sty version 1.17} \author{Nicola L. C. Talbot} -\date{2014-06-04} +\date{2014-09-30} % swap frames around for title page \ffswapoddeven*{main} @@ -418,12 +418,19 @@ the contents of the \env{document} environment flow from one \gls*{frame} to the next in the order that they were defined. This is useful for creating posters or magazines or any other form of document that does not -conform to the standard one or two column layout. +conform to the standard one or two column layout. There's an +optional helper application called +\texttt{flowframtk}\footnote{\url{http://www.dickimaw-books.com/apps/flowframtk/}} +if you prefer to use a graphical user interface to set up the +document layout. \textbf{The \styni{flowfram} package tries to make \TeX\ do something it wasn't originally designed to do. It modifies the -output routine and may not always perform as desired. Caveat -emptor---or `you get what you pay for'.} +output routine and may not always perform as desired. Extra care +must be taken if a paragraph spans frames of unequal width due to +the asynchronous nature of \TeX's output routine. (See +\latexhtml{\autoref{sec:unexpectedoutput}}{\htmlref{Unexpected +Output}{sec:unexpectedoutput}}.}) The \styni{flowfram} package provides three types of \gls*{frame}: \glspl{flow}, \glspl{static} and \glspl{dynamic} with dimensions and @@ -789,7 +796,8 @@ result, the end of the paragraph at the beginning of the new If a paragraph does span two \glspl*{flow} of unequal width without using \cmdname{framebreak} a warning will be issued. If a subtle difference in frame widths is caused by rounding errors (for -example, if the frames were created using Jpgfdraw) you can adjust +example, if the frames were created using \texttt{flowframtk} or +\texttt{jpgfdraw}) you can adjust the tolerance to suppress these warnings. The default tolerance is 2pt. To change this, set the length register \cmdname{fftolerance} to the required tolerance. For example, to suppress warnings where @@ -3213,11 +3221,12 @@ For an up-to-date list of frequently asked questions, see \htmladdnormallink{flowfram FAQ}{http://www.dickimaw-books.com/faqs/flowframfaq.html}}. If you have a query that is not addressed here, please try there first. If -that doesn't answer your query, try posting a message to the \LaTeX\ -Community Forum (\url{http://latex-community.org/forum/}), \TeX\ on -StackExchange (\url{http://tex.stackexchange.com/}) or the -\texttt{comp.text.tex} newsgroup. I generally answer questions in -those places much quicker than queries that are emailed to me. +that doesn't answer your query, try posting a message to +\TeX\ on StackExchange (\url{http://tex.stackexchange.com/}), +the \LaTeX\ Community Forum (\url{http://latex-community.org/forum/}) +or the \texttt{comp.text.tex} newsgroup. I generally answer questions in +those places much quicker than queries that are emailed to me, which +tend to get lost in my inbox. Bugs can be reported using the \latexhtml{form at \url{http://www.dickimaw-books.com/bug-report.html}}{\htmladdnormallink{bug @@ -3361,12 +3370,13 @@ Location of the Typeblock}{sec:typeblockloc}}. \item Is there a GUI I can use to make it easier to create the \glspl{frame}? -Yes, Jpgfdraw which can be downloaded from: -\url{http://www.dickimaw-books.com/apps/jpgfdraw/} +Yes, \texttt{flowframtk} which can be downloaded from: +\url{http://www.dickimaw-books.com/apps/flowframtk/} \end{enumerate} \htmlnav \section{Unexpected Output} +\label{sec:unexpectedoutput} \begin{enumerate} \item The lines at the beginning of my \glspl{flow} are the diff --git a/Master/texmf-dist/doc/latex/flowfram/flowfram.pdf b/Master/texmf-dist/doc/latex/flowfram/flowfram.pdf index 98120b11450..6b983117132 100644 Binary files a/Master/texmf-dist/doc/latex/flowfram/flowfram.pdf and b/Master/texmf-dist/doc/latex/flowfram/flowfram.pdf differ diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-article.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-article.pdf index 2c23b69394c..668b591a319 100644 Binary files a/Master/texmf-dist/doc/latex/flowfram/samples/sample-article.pdf and b/Master/texmf-dist/doc/latex/flowfram/samples/sample-article.pdf differ diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-brochure.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-brochure.pdf index 0e0e16f8749..2b4e4a1ab28 100644 Binary files a/Master/texmf-dist/doc/latex/flowfram/samples/sample-brochure.pdf and b/Master/texmf-dist/doc/latex/flowfram/samples/sample-brochure.pdf differ diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-news.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-news.pdf index 68f15731385..dbef799fb03 100644 Binary files a/Master/texmf-dist/doc/latex/flowfram/samples/sample-news.pdf and b/Master/texmf-dist/doc/latex/flowfram/samples/sample-news.pdf differ diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-news2.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-news2.pdf index 69706c2bfa5..18ab26a51ec 100644 Binary files a/Master/texmf-dist/doc/latex/flowfram/samples/sample-news2.pdf and b/Master/texmf-dist/doc/latex/flowfram/samples/sample-news2.pdf differ diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-pages.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-pages.pdf index e40baadf2f7..45bb05e20ee 100644 Binary files a/Master/texmf-dist/doc/latex/flowfram/samples/sample-pages.pdf and b/Master/texmf-dist/doc/latex/flowfram/samples/sample-pages.pdf differ diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-poster.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-poster.pdf index 5b80d3338f4..d46b9c78b5e 100644 Binary files a/Master/texmf-dist/doc/latex/flowfram/samples/sample-poster.pdf and b/Master/texmf-dist/doc/latex/flowfram/samples/sample-poster.pdf differ diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-rot.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-rot.pdf index 9af2219927e..a735b63def8 100644 Binary files a/Master/texmf-dist/doc/latex/flowfram/samples/sample-rot.pdf and b/Master/texmf-dist/doc/latex/flowfram/samples/sample-rot.pdf differ diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample.pdf index 0e8539c0a6c..5ea4cc46fcf 100644 Binary files a/Master/texmf-dist/doc/latex/flowfram/samples/sample.pdf and b/Master/texmf-dist/doc/latex/flowfram/samples/sample.pdf differ diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample1.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample1.pdf index 098e36ae7ff..05615edb0ea 100644 Binary files a/Master/texmf-dist/doc/latex/flowfram/samples/sample1.pdf and b/Master/texmf-dist/doc/latex/flowfram/samples/sample1.pdf differ diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample2.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample2.pdf index 45d218a8f8e..222707cba7d 100644 Binary files a/Master/texmf-dist/doc/latex/flowfram/samples/sample2.pdf and b/Master/texmf-dist/doc/latex/flowfram/samples/sample2.pdf differ diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample3.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample3.pdf index 49e1033b743..4f60f5b5adf 100644 Binary files a/Master/texmf-dist/doc/latex/flowfram/samples/sample3.pdf and b/Master/texmf-dist/doc/latex/flowfram/samples/sample3.pdf differ diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sampleRL.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sampleRL.pdf index 15867f881e3..fcf38f2f953 100644 Binary files a/Master/texmf-dist/doc/latex/flowfram/samples/sampleRL.pdf and b/Master/texmf-dist/doc/latex/flowfram/samples/sampleRL.pdf differ 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} % %\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 diff --git a/Master/texmf-dist/tex/latex/flowfram/flowfram.sty b/Master/texmf-dist/tex/latex/flowfram/flowfram.sty index d3d1fc31a89..776e7fbee02 100644 --- a/Master/texmf-dist/tex/latex/flowfram/flowfram.sty +++ b/Master/texmf-dist/tex/latex/flowfram/flowfram.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{flowfram}[2014/06/04 v1.16 (NLCT)] +\ProvidesPackage{flowfram}[2014/09/30 v1.17 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval} \RequirePackage{graphics} @@ -3401,7 +3401,11 @@ \expandafter\vsize\csname colheight\romannumeral#1\endcsname \global\@colht\vsize \global\@colroom\@colht - \ifnum\linewidth>\columnwidth + \ifnum\@listdepth>0\relax + \ifnum\linewidth>\columnwidth + \global\linewidth\columnwidth + \fi + \else \global\linewidth\columnwidth \fi %\global\textwidth\columnwidth -- cgit v1.2.3