>From 709e5350e4b9ca4435142c67fa3e05fe0748365c Mon Sep 17 00:00:00 2001 From: Akira Yokosawa <akiyks@xxxxxxxxx> Date: Thu, 20 Jul 2017 23:35:31 +0900 Subject: [PATCH v2 2/8] Apply workaround to floatrowpf.sty Also modify package names in the sty file. They are output to the log file as part of info or error messages. Signed-off-by: Akira Yokosawa <akiyks@xxxxxxxxx> --- floatrowpf.sty | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/floatrowpf.sty b/floatrowpf.sty index 18ef28a..b98af62 100644 --- a/floatrowpf.sty +++ b/floatrowpf.sty @@ -1,4 +1,13 @@ -%% +%%% +%%% This is file `floatrowpf.sty', which is a modified version +%%% of `floatrow.sty' to work around issues in two-column layout. +%%% The possible workaround was posted at: +%%% https://tex.stackexchange.com/questions/133127/ +%%% +%%% Modified by Akira Yokosawa for perfbook project. +%%% +%%% Following is the original header: +%%% %% This is file `floatrow.sty', %% generated with the docstrip utility. %% @@ -21,16 +30,16 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e}[1995/06/01] -\ProvidesPackage{floatrow} - [2008/08/02 v0.3b floatrow: float package extension] +\ProvidesPackage{floatrowpf} + [2017/07/17 v0.3b-ay floatrowpf: customized floatrow for perfbook] \@ifundefined{float@caption}{% \@ifundefined{rotfloat@float}{}% - {\PackageError{floatrow}{Do not use rotfloat package with floatrow.\MessageBreak + {\PackageError{floatrowpf}{Do not use rotfloat package with floatrowpf.\MessageBreak The latter will be skipped}{}% - \@namedef{opt@xxxxxxxxxxxx}{}\endinput}}% - {\PackageError{floatrow}{Do not use float package with floatrow.\MessageBreak + \@namedef{opt@xxxxxxxxxxxxxx}{}\endinput}}% + {\PackageError{floatrowpf}{Do not use float package with floatrowpf.\MessageBreak The latter will be skipped}{}% - \@namedef{opt@xxxxxxxxxxxx}{}\endinput} + \@namedef{opt@xxxxxxxxxxxxxx}{}\endinput} \@namedef{ver@xxxxxxxxx}{2001/11/08 v1.3d (excerpt) Float enhancements (AL)} \@namedef{ver@xxxxxxxxxxxx}{2004/01/04 v1.2 (excerpt) @@ -38,7 +47,7 @@ \RequirePackage{keyval} \RequirePackage{caption3} \@ifpackagelater{caption3}{2007/04/11 v3.0q}{}{\PackageError - {floatrow}{For a successful cooperation we need at least\MessageBreak + {floatrowpf}{For a successful cooperation we need at least\MessageBreak version `2007/04/11 v3.0q' of package caption,\MessageBreak but only version\MessageBreak `\csname ver@caption.\@pkgextension\endcsname'\MessageBreak @@ -62,7 +71,7 @@ \@ifundefined{c@figure}% {\setcounter{float@type}{1}}% {\setcounter{float@type}{4}} -\newcommand\flrow@package{floatrow} +\newcommand\flrow@package{floatrowpf} \newcommand*\flrow@error[1]{\PackageError\flrow@package{#1}\flrow@eh} \newcommand*\flrow@eh{% If you do not understand this error, please take look\MessageBreak @@ -114,7 +123,8 @@ \newcommand\flrow@restyle[1]{% \@namedef{#1}{\killfloatstyle\def\@captype{#1}\FR@redefs \flrow@setlist{{#1}}% - \textwidth\columnwidth\edef\FBB@wd{\the\columnwidth}% + %\textwidth\columnwidth <-- error in two-column layout + \edef\FBB@wd{\the\columnwidth}% \FRifFBOX\@@setframe\relax\@@FStrue\@float{#1}}% \@namedef{#1*}{\killfloatstyle\def\@captype{#1}\FR@redefs \flrow@setlist{{#1}{widefloat}{wide#1}}% @@ -452,7 +462,7 @@ \@tempa{#1\@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}}% \newcommand\float@addtolists[1]{% \def\float@do##1{\addtocontents{##1}{#1}} \the\float@exts} -\PackageInfo{floatrow}{Modified float package code loaded} +\PackageInfo{floatrowpf}{Modified float package code loaded} \IfFileExists{rotating.sty}{\@tempswatrue}{\@tempswafalse} \if@tempswa \let\rotfloat@HH\@float@HH @@ -470,7 +480,7 @@ \@rotdblfloat{}[]% \ifFBbuild\rotfloat@@makebox{#1}\else\box\@currbox\fi \end@rotdblfloat}} -\PackageInfo{floatrow}{Modified rotfloat package code loaded} +\PackageInfo{floatrowpf}{Modified rotfloat package code loaded} \fi \@ifdefinable\FR@everyfloat{\newtoks\FR@everyfloat} \FR@everyfloat={\let\@footnotetext\@mpfootnotetext @@ -516,7 +526,7 @@ \@ifnextchar[{\FB@nc{#1}{#2}}{\FB@nc{#1}{#2}[]}} \newcommand\renewfloatcommand[2]{% \@ifundefined{#1}{}% - {\PackageInfo{floatrow}{Redefining \string#1}}% + {\PackageInfo{floatrowpf}{Redefining \string#1}}% \@ifnextchar[{\FB@nc{#1}{#2}}{\FB@nc{#1}{#2}[]}} \@ifdefinable\FB@nc{}\@ifdefinable\FB@@nc{} \def\FB@nc#1#2[#3]{% @@ -1469,4 +1479,4 @@ \if@tempswa\RequirePackage{fr-longtable}\fi} \endinput %% -%% End of file `floatrow.sty'. +%% End of file `floatrowpf.sty'. -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe perfbook" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
