summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-07-04 18:37:28 +0000
committerKarl Berry <karl@freefriends.org>2010-07-04 18:37:28 +0000
commitaaaeb30859dca58379cfade7cc0a573630a5c109 (patch)
tree56f4f65eb7edc62bb02a18d0593e769aeba760d9
parentd6282847da4407c43a92c2417554b824806c1fe9 (diff)
papertex update (30jun10)
git-svn-id: svn://tug.org/texlive/trunk@19230 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/papertex/CHANGES33
-rw-r--r--Master/texmf-dist/doc/latex/papertex/README8
-rw-r--r--Master/texmf-dist/doc/latex/papertex/papertex.pdfbin172962 -> 258316 bytes
-rw-r--r--Master/texmf-dist/source/latex/papertex/papertex.dtx7
-rw-r--r--Master/texmf-dist/source/latex/papertex/papertex.ins2
-rw-r--r--Master/texmf-dist/tex/latex/papertex/papertex.cls5
6 files changed, 32 insertions, 23 deletions
diff --git a/Master/texmf-dist/doc/latex/papertex/CHANGES b/Master/texmf-dist/doc/latex/papertex/CHANGES
index ae0db6adc74..6c4b612016b 100644
--- a/Master/texmf-dist/doc/latex/papertex/CHANGES
+++ b/Master/texmf-dist/doc/latex/papertex/CHANGES
@@ -1,40 +1,45 @@
-------------------------------------------------------
paperTeX: class change history
-------------------------------------------------------
-Copyright (C) 2007 by Ignacio Llopis <lloptor@gmail.com>
+Copyright (C) 2010 by Ignacio Llopis <lloptor@gmail.com>
-------------------------------------------------------
+v.1.2b (30 June 2010)
+-------------------------
+- set papertex@imgsize = 0 in command \image.
+- very thanks to Janosch Maier.
+
v.1.2a (27 February 2007)
-------------------------
-- anysize package is replaced by geometry
-- new ``a3paper'' option
-- 12pt can now be used (it did not work before)
-- fixed some documentation bugs
-- \authorandplace default alignment = left
+- anysize package is replaced by geometry.
+- new ``a3paper'' option.
+- 12pt can now be used (it did not work before).
+- fixed some documentation bugs.
+- \authorandplace default alignment = left.
v.1.2 (25 January 2007)
-------------------------
-- \minraggedcols counter added
-- \raggedFormat style command added
-- thanks to Will Henney & Donald Arseneau for the idea
+- \minraggedcols counter added.
+- \raggedFormat style command added.
+- thanks to Will Henney & Donald Arseneau for the idea.
v.1.1c (20 January 2007)
-------------------------
- specification of ``a4paper'' option when loading ``article'' class.
- \makeindex command removed (it produced an empty .idx file).
-- very thanks to Dan
+- very thanks to Dan.
v.1.1b (18 January 2007)
-------------------------
- solved problem with hyperlinks in the main index. added \phantomsection (s).
- ``shortnews'' environment can now be refered. new label parameter.
-- very thanks to Randy Yates
+- very thanks to Randy Yates.
v.1.1a (15 January 2007)
-------------------------
- corrected a big error in documentation (I said usepackage{papertex}
-but papertex is a class!!)
-- very thanks to Christoph Bier
+but papertex is a class!!).
+- very thanks to Christoph Bier.
v.1.1 (10 January 2007)
------------------------
@@ -48,4 +53,4 @@ v.1.0 (6 July 2006)
Ignacio Llopis <lloptor@gmail.com>
-http://nachollopis.com \ No newline at end of file
+http://nachollopis.com
diff --git a/Master/texmf-dist/doc/latex/papertex/README b/Master/texmf-dist/doc/latex/papertex/README
index 8e552766bcc..b01df21551d 100644
--- a/Master/texmf-dist/doc/latex/papertex/README
+++ b/Master/texmf-dist/doc/latex/papertex/README
@@ -1,10 +1,10 @@
-------------------------------------------------------
paperTeX: creating newspapers using LaTeX2e
-------------------------------------------------------
-Copyright (C) 2007 by Ignacio Llopis <lloptor@gmail.com>
+Copyright (C) 2010 by Ignacio Llopis <lloptor@gmail.com>
-------------------------------------------------------
-{Version 1.2a}
+{Version 1.2b}
This class allows LaTeX users to create a newspaper using LaTeX.
This class was created together with a Perl script in order to create
@@ -41,7 +41,7 @@ Files of the `paperTeX' class:
License
-------
-These files are copyrighted, 2006-2007, Ignacio Llopis. They
+These files are copyrighted, 2006-2010, Ignacio Llopis. They
are released under the terms of the LaTeX Project Public License.
See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
for the details of that license.
@@ -49,4 +49,4 @@ for the details of that license.
Ignacio Llopis <lloptor@gmail.com>
-http://nachollopis.com \ No newline at end of file
+http://nachollopis.com
diff --git a/Master/texmf-dist/doc/latex/papertex/papertex.pdf b/Master/texmf-dist/doc/latex/papertex/papertex.pdf
index a0c2754140d..24834edc9bc 100644
--- a/Master/texmf-dist/doc/latex/papertex/papertex.pdf
+++ b/Master/texmf-dist/doc/latex/papertex/papertex.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/papertex/papertex.dtx b/Master/texmf-dist/source/latex/papertex/papertex.dtx
index f589dae7ac9..f8391790a55 100644
--- a/Master/texmf-dist/source/latex/papertex/papertex.dtx
+++ b/Master/texmf-dist/source/latex/papertex/papertex.dtx
@@ -22,7 +22,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<class>\ProvidesClass{papertex}
%<*class>
- [2007/02/27 v1.2a paperTeX class]
+ [2010/06/30 v1.2b paperTeX class]
%</class>
%
%<*driver>
@@ -62,6 +62,7 @@
% \changes{v1.1c}{2007/01/20}{Makeindex removed.}
% \changes{v1.2}{2007/01/25}{New counter minraggedcols and raggedFormat command. They allow users to have ragged texts in news.}
% \changes{v1.2a}{2007/02/27}{Anysize package replaced by geometry. Option `12pt' is now sent to standard article class. Authorandplace aligns on the left now. Bugs in documentation. New `a3paper' option.}
+% \changes{v1.2b}{2010/06/30}{Bug fix. Set length \textit{imgsize} to 0 in command \\image. Thanks to Janosch Maier.}
%
% \GetFileInfo{papertex.dtx}
%
@@ -881,6 +882,8 @@
% it shows a warning in the compilation log.
% \begin{macrocode}
\newcommand{\image}[2]{
+ %set imgsize to 0pt in each call - thanks to Janosch Maier
+ \setlength{\papertex@imgsize}{0pt}
\vspace{5pt}
%distance between frame and image
\setlength{\fboxsep}{1pt}
@@ -1656,4 +1659,4 @@
% \PrintIndex
% \PrintChanges
% \Finale
-\endinput \ No newline at end of file
+\endinput
diff --git a/Master/texmf-dist/source/latex/papertex/papertex.ins b/Master/texmf-dist/source/latex/papertex/papertex.ins
index 777fa3f463b..2ada79871e4 100644
--- a/Master/texmf-dist/source/latex/papertex/papertex.ins
+++ b/Master/texmf-dist/source/latex/papertex/papertex.ins
@@ -21,7 +21,7 @@
This is a generated file.
-Copyright (C) 2006 by Ignacio Llopis <lloptor@gmail.com>
+Copyright (C) 2010 by Ignacio Llopis <lloptor@gmail.com>
This file may be distributed and/or modified under the conditions of
the LaTeX Project Public License, either version 1.2 of this license
diff --git a/Master/texmf-dist/tex/latex/papertex/papertex.cls b/Master/texmf-dist/tex/latex/papertex/papertex.cls
index d695a04ba53..d032760a1c8 100644
--- a/Master/texmf-dist/tex/latex/papertex/papertex.cls
+++ b/Master/texmf-dist/tex/latex/papertex/papertex.cls
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2006 by Ignacio Llopis <lloptor@gmail.com>
+%% Copyright (C) 2010 by Ignacio Llopis <lloptor@gmail.com>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.2 of this license
@@ -22,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{papertex}
- [2007/02/27 v1.2a paperTeX class]
+ [2010/06/30 v1.2b paperTeX class]
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{papertex}[2006/07/06 paperTeX class]
\RequirePackage{ifthen}
@@ -338,6 +338,7 @@
{\begin{lrbox}{\papertex@fmbox}\begin{minipage}{#1}}
{\end{minipage}\end{lrbox}\fbox{\usebox{\papertex@fmbox}}}
\newcommand{\image}[2]{
+\setlength{\papertex@imgsize}{0pt}
\vspace{5pt}
\setlength{\fboxsep}{1pt}
\addtolength{\papertex@imgsize}{\columnwidth}