9 files changed, 1554 insertions, 6 deletions
diff --git a/Master/texmf-dist/doc/latex/papertex/example/example.aux b/Master/texmf-dist/doc/latex/papertex/example/example.aux
new file mode 100644
index 00000000000..a28ac6d5170
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/papertex/example/example.aux
@@ -0,0 +1,18 @@
+\relax 
+\ifx\hyper@anchor\@undefined
+\global \let \oldcontentsline\contentsline
+\gdef \contentsline#1#2#3#4{\oldcontentsline{#1}{#2}{#3}}
+\global \let \oldnewlabel\newlabel
+\gdef \newlabel#1#2{\newlabelxx{#1}#2}
+\gdef \newlabelxx#1#2#3#4#5#6{\oldnewlabel{#1}{{#2}{#3}}}
+\AtEndDocument{\let \contentsline\oldcontentsline
+\let \newlabel\oldnewlabel}
+\else
+\global \let \hyper@last\relax 
+\fi
+
+\catcode`"\active
+\select@language{latin}
+\@writefile{toc}{\select@language{latin}}
+\@writefile{lof}{\select@language{latin}}
+\@writefile{lot}{\select@language{latin}}
diff --git a/Master/texmf-dist/doc/latex/papertex/example/example.log b/Master/texmf-dist/doc/latex/papertex/example/example.log
new file mode 100644
index 00000000000..90c069f229f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/papertex/example/example.log
@@ -0,0 +1,595 @@
+This is pdfeTeX, Version 3.141592-1.30.6-2.2 (MiKTeX 2.5) (preloaded format=pdflatex 2006.10.28)  8 MAR 2007 18:20
+entering extended mode
+**example.tex
+(example.tex
+LaTeX2e <2005/12/01>
+Babel <v3.8g> and hyphenation patterns for english, spanish, catalan, latin, lo
+aded.
+(papertex.cls
+Document Class: papertex 2007/02/27 v1.2a paperTeX class
+Document Class: papertex 2006/07/06 paperTeX class
+(C:\texmf\tex\latex\base\ifthen.sty
+Package: ifthen 2001/05/26 v1.1c Standard LaTeX ifthen package (DPC)
+)
+\papertex@imgsize=\skip41
+\papertex@coltitsize=\skip42
+\papertex@pageneed=\skip43
+\papertex@pageleft=\skip44
+\papertex@indexwidth=\skip45
+\columnlines=\skip46
+\papertex@gridrows=\count79
+\papertex@gridcolumns=\count80
+\minraggedcols=\count81
+ (C:\texmf\tex\latex\base\article.cls
+Document Class: article 2005/09/16 v1.4f Standard LaTeX document class
+(C:\texmf\tex\latex\base\size10.clo
+File: size10.clo 2005/09/16 v1.4f Standard LaTeX file (size option)
+)
+\c@part=\count82
+\c@section=\count83
+\c@subsection=\count84
+\c@subsubsection=\count85
+\c@paragraph=\count86
+\c@subparagraph=\count87
+\c@figure=\count88
+\c@table=\count89
+\abovecaptionskip=\skip47
+\belowcaptionskip=\skip48
+\bibindent=\dimen102
+) (C:\texmf\tex\generic\oberdiek\ifpdf.sty
+Package: ifpdf 2006/02/20 v1.4 Provides the ifpdf switch (HO)
+Package ifpdf Info: pdfTeX in pdf mode detected.
+) (C:\texmf\tex\latex\multido\multido.sty
+Package: multido 2004/05/17 package wrapper for PSTricks `multido.tex', (HV/RN)
+
+
+(C:\texmf\tex\generic\multido\multido.tex  v1.41, 2004/05/18 <tvz>
+\multido@count=\count90
+\multidocount=\count91
+\multido@stuff=\toks14
+)
+File: multido.tex 2004/05/18 v1.41 `multido' (tvz)
+)
+(C:\texmf\tex\latex\datetime\datetime.sty
+Package: datetime 2006/12/05 v2.49 Date Time Package
+
+(C:\texmf\tex\latex\fmtcount\fmtcount.sty
+Package: fmtcount 2006/07/29 v1.04
+
+(C:\texmf\tex\latex\graphics\keyval.sty
+Package: keyval 1999/03/16 v1.13 key=value parser (DPC)
+\KV@toks@=\toks15
+)
+\c@padzeroesN=\count92
+
+No configuration file fmtcount.cfg found.
+\@DT@modctr=\count93
+\@ordinalctr=\count94
+\@orgargctr=\count95
+\@strctr=\count96
+\@tmpstrctr=\count97
+\@DT@loopN=\count98
+\@DT@X=\count99
+)
+\@day=\count100
+\@month=\count101
+\@year=\count102
+Package datetime Info: No datetime.cfg file found, using default settings on in
+put line 151.
+\@dtctr=\count103
+\dayofyear=\count104
+\dayofweek=\count105
+LaTeX Info: Redefining \today on input line 414.
+\c@HOUR=\count106
+\c@HOURXII=\count107
+\c@MINUTE=\count108
+\c@TOHOUR=\count109
+\c@TOMINUTE=\count110
+) (C:\texmf\tex\latex\tools\multicol.sty
+Package: multicol 2006/05/18 v1.6g multicolumn formatting (FMi)
+\c@tracingmulticols=\count111
+\mult@box=\box26
+\multicol@leftmargin=\dimen103
+\c@unbalance=\count112
+\c@collectmore=\count113
+\doublecol@number=\count114
+\multicoltolerance=\count115
+\multicolpretolerance=\count116
+\full@width=\dimen104
+\page@free=\dimen105
+\premulticols=\dimen106
+\postmulticols=\dimen107
+\multicolsep=\skip49
+\multicolbaselineskip=\skip50
+\partial@page=\box27
+\last@line=\box28
+\mult@rightbox=\box29
+\mult@grightbox=\box30
+\mult@gfirstbox=\box31
+\mult@firstbox=\box32
+\@tempa=\box33
+\@tempa=\box34
+\@tempa=\box35
+\@tempa=\box36
+\@tempa=\box37
+\@tempa=\box38
+\@tempa=\box39
+\@tempa=\box40
+\@tempa=\box41
+\@tempa=\box42
+\@tempa=\box43
+\@tempa=\box44
+\@tempa=\box45
+\@tempa=\box46
+\@tempa=\box47
+\@tempa=\box48
+\@tempa=\box49
+\c@columnbadness=\count117
+\c@finalcolumnbadness=\count118
+\last@try=\dimen108
+\multicolovershoot=\dimen109
+\multicolundershoot=\dimen110
+\mult@nat@firstbox=\box50
+\colbreak@box=\box51
+)
+(C:\texmf\tex\latex\fancyhdr\fancyhdr.sty
+\fancy@headwidth=\skip51
+\f@ncyO@elh=\skip52
+\f@ncyO@erh=\skip53
+\f@ncyO@olh=\skip54
+\f@ncyO@orh=\skip55
+\f@ncyO@elf=\skip56
+\f@ncyO@erf=\skip57
+\f@ncyO@olf=\skip58
+\f@ncyO@orf=\skip59
+)
+(C:\texmf\tex\latex\seminar\fancybox.sty
+Package: fancybox 2000/09/19 1.3
+
+Style option: `fancybox' v1.3 <2000/09/19> (tvz)
+\@fancybox=\box52
+\shadowsize=\dimen111
+\@Sbox=\box53
+\do@VerbBox=\toks16
+\the@fancyput=\toks17
+\this@fancyput=\toks18
+\EndVerbatimTokens=\toks19
+\Verbatim@Outfile=\write3
+\Verbatim@Infile=\read1
+) (C:\texmf\tex\latex\geometry\geometry.sty
+Package: geometry 2002/07/08 v3.2 Page Geometry
+\Gm@cnth=\count119
+\Gm@cntv=\count120
+\c@Gm@tempcnt=\count121
+\Gm@bindingoffset=\dimen112
+\Gm@wd@mp=\dimen113
+\Gm@odd@mp=\dimen114
+\Gm@even@mp=\dimen115
+\Gm@dimlist=\toks20
+
+(C:\texmf\tex\latex\geometry\geometry.cfg))
+(C:\texmf\tex\latex\graphics\graphicx.sty
+Package: graphicx 1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR)
+
+(C:\texmf\tex\latex\graphics\graphics.sty
+Package: graphics 2006/02/20 v1.0o Standard LaTeX Graphics (DPC,SPQR)
+ (C:\texmf\tex\latex\graphics\trig.sty
+Package: trig 1999/03/16 v1.09 sin cos tan (DPC)
+) (C:\texmf\tex\latex\00miktex\graphics.cfg
+File: graphics.cfg 2005/12/29 v1.2 MiKTeX 'graphics' configuration
+)
+Package graphics Info: Driver file: pdftex.def on input line 90.
+
+(C:\texmf\tex\latex\graphics\pdftex.def
+File: pdftex.def 2006/08/14 v0.03t Graphics/color for pdfTeX
+\Gread@gobject=\count122
+))
+\Gin@req@height=\dimen116
+\Gin@req@width=\dimen117
+)
+(C:\texmf\tex\latex\graphics\color.sty
+Package: color 2005/11/14 v1.0j Standard LaTeX Color (DPC)
+ (C:\texmf\tex\latex\00miktex\color.cfg
+File: color.cfg 2005/12/29 v1.1 MiKTeX 'color' configuration
+)
+Package color Info: Driver file: pdftex.def on input line 130.
+) (C:\texmf\tex\latex\hyperref\hyperref.sty
+Package: hyperref 2006/11/30 v6.75h Hypertext links for LaTeX
+\@linkdim=\dimen118
+\Hy@linkcounter=\count123
+\Hy@pagecounter=\count124
+
+(C:\texmf\tex\latex\hyperref\pd1enc.def
+File: pd1enc.def 2006/11/30 v6.75h Hyperref: PDFDocEncoding definition (HO)
+)
+(C:\texmf\tex\latex\00miktex\hyperref.cfg
+File: hyperref.cfg 2006/02/14 v1.1 MiKTeX 'hyperref' configuration
+)
+(C:\texmf\tex\latex\oberdiek\kvoptions.sty
+Package: kvoptions 2006/08/22 v2.4 Connects package keyval with LaTeX options (
+HO)
+)
+Package hyperref Info: Option `final' set `true' on input line 2195.
+Package hyperref Info: Hyper figures OFF on input line 2245.
+Package hyperref Info: Link nesting OFF on input line 2250.
+Package hyperref Info: Hyper index ON on input line 2253.
+Package hyperref Info: Plain pages OFF on input line 2260.
+Package hyperref Info: Backreferencing OFF on input line 2265.
+
+Implicit mode ON; LaTeX internals redefined
+Package hyperref Info: Bookmarks ON on input line 2395.
+(C:\texmf\tex\latex\ltxmisc\url.sty
+\Urlmuskip=\muskip10
+Package: url 2005/06/27  ver 3.2  Verb mode for urls, etc.
+)
+LaTeX Info: Redefining \url on input line 2550.
+\Fld@menulength=\count125
+\Field@Width=\dimen119
+\Fld@charsize=\dimen120
+\Choice@toks=\toks21
+\Field@toks=\toks22
+Package hyperref Info: Hyper figures OFF on input line 3028.
+Package hyperref Info: Link nesting OFF on input line 3033.
+Package hyperref Info: Hyper index ON on input line 3036.
+Package hyperref Info: backreferencing OFF on input line 3043.
+Package hyperref Info: Link coloring OFF on input line 3048.
+\Hy@abspage=\count126
+\c@Item=\count127
+\c@Hfootnote=\count128
+)
+*hyperref using driver hpdftex*
+(C:\texmf\tex\latex\hyperref\hpdftex.def
+File: hpdftex.def 2006/11/30 v6.75h Hyperref driver for pdfTeX
+\Fld@listcount=\count129
+)
+(C:\texmf\tex\latex\textpos\textpos.sty
+Package: textpos 2006/09/02 v1.7a
+
+Package: `textpos' 1.7a <2006 September 2>
+(C:\texmf\tex\latex\ms\everyshi.sty
+Package: everyshi 2001/05/15 v3.00 EveryShipout Package (MS)
+)
+\TP@textbox=\box54
+\TP@holdbox=\box55
+\TPHorizModule=\dimen121
+\TPVertModule=\dimen122
+\TP@margin=\dimen123
+\TP@absmargin=\dimen124
+
+Grid set 16 x 16 = 37.34424pt x 52.81541pt
+\TPboxrulesize=\dimen125
+\TP@ox=\dimen126
+\TP@oy=\dimen127
+\TP@tbargs=\toks23
+\TP@prevdepth=\dimen128
+TextBlockOrigin set to 0pt x 0pt
+) (C:\texmf\tex\latex\hyphenat\hyphenat.sty
+Package: hyphenat 2001/01/02 v2.3a hyphenation utilities
+\langwohyphens=\language4
+LaTeX Info: Redefining \_ on input line 46.
+)
+(C:\texmf\tex\latex\wrapfig\wrapfig.sty
+\wrapoverhang=\dimen129
+\WF@size=\dimen130
+\c@WF@wrappedlines=\count130
+\WF@box=\box56
+\WF@everypar=\toks24
+Package: wrapfig 2003/01/31  v 3.6
+)
+(C:\texmf\tex\latex\lastpage\lastpage.sty
+Package: lastpage 1994/06/25 v0.1b LaTeX2e package for refs to last page number
+ (JPG)
+)
+(C:\texmf\tex\latex\setspace\setspace.sty
+Package: setspace 2000/12/01 6.7 Contributed and Supported LaTeX2e package
+
+Package: `setspace' 6.7 <2000/12/01>
+) (C:\texmf\tex\latex\ms\ragged2e.sty
+Package: ragged2e 2003/03/25 v2.04 ragged2e Package (MS)
+ (C:\texmf\tex\latex\ms\everysel.sty
+Package: everysel 1999/06/08 v1.03 EverySelectfont Package (MS)
+)
+\CenteringLeftskip=\skip60
+\RaggedLeftLeftskip=\skip61
+\RaggedRightLeftskip=\skip62
+\CenteringRightskip=\skip63
+\RaggedLeftRightskip=\skip64
+\RaggedRightRightskip=\skip65
+\CenteringParfillskip=\skip66
+\RaggedLeftParfillskip=\skip67
+\RaggedRightParfillskip=\skip68
+\JustifyingParfillskip=\skip69
+\CenteringParindent=\skip70
+\RaggedLeftParindent=\skip71
+\RaggedRightParindent=\skip72
+\JustifyingParindent=\skip73
+)
+\papertex@fmbox=\box57
+
+TextBlockOrigin set to 1cm x 1cm
+\papertex@dx=\dimen131
+\papertex@dy=\dimen132
+\papertex@cx=\count131
+\papertex@cy=\count132
+) (C:\texmf\tex\latex\base\inputenc.sty
+Package: inputenc 2006/05/05 v1.1b Input encoding file
+\inpenc@prehook=\toks25
+\inpenc@posthook=\toks26
+ (C:\texmf\tex\latex\base\latin1.def
+File: latin1.def 2006/05/05 v1.1b Input encoding file
+))
+(C:\texmf\tex\generic\babel\babel.sty
+Package: babel 2005/05/21 v3.8g The Babel package
+
+*************************************
+* Local config file bblopts.cfg used
+*
+(C:\texmf\tex\latex\00miktex\bblopts.cfg
+File: bblopts.cfg 2006/07/31 v1.0 MiKTeX 'babel' configuration
+) (C:\texmf\tex\generic\babel\latin.ldf
+File: latin.ldf 2005/03/30 v2.0f Latin support from the babel system
+(C:\texmf\tex\generic\babel\babel.def
+File: babel.def 2005/05/21 v3.8g Babel common definitions
+\babel@savecnt=\count133
+\U@D=\dimen133
+)
+Package babel Info: Making " an active character on input line 182.
+)) (C:\texmf\tex\latex\ltxmisc\ulem.sty
+\UL@box=\box58
+\UL@hyphenbox=\box59
+\UL@skip=\skip74
+\UL@hook=\toks27
+\UL@pe=\count134
+\UL@pixel=\dimen134
+\ULC@box=\box60
+Package: ulem 2000/05/26
+\ULdepth=\dimen135
+)
+(example.aux)
+LaTeX Font Info:    Checking defaults for OML/cmm/m/it on input line 52.
+LaTeX Font Info:    ... okay on input line 52.
+LaTeX Font Info:    Checking defaults for T1/cmr/m/n on input line 52.
+LaTeX Font Info:    ... okay on input line 52.
+LaTeX Font Info:    Checking defaults for OT1/cmr/m/n on input line 52.
+LaTeX Font Info:    ... okay on input line 52.
+LaTeX Font Info:    Checking defaults for OMS/cmsy/m/n on input line 52.
+LaTeX Font Info:    ... okay on input line 52.
+LaTeX Font Info:    Checking defaults for OMX/cmex/m/n on input line 52.
+LaTeX Font Info:    ... okay on input line 52.
+LaTeX Font Info:    Checking defaults for U/cmr/m/n on input line 52.
+LaTeX Font Info:    ... okay on input line 52.
+LaTeX Font Info:    Checking defaults for PD1/pdf/m/n on input line 52.
+LaTeX Font Info:    ... okay on input line 52.
+-------------------- Geometry parameters
+paper: class default
+landscape: --
+twocolumn: --
+twoside: --
+asymmetric: --
+h-parts: 42.67912pt, 512.14963pt, 42.67912pt
+v-parts: 56.9055pt, 731.23584pt, 56.9055pt
+hmarginratio: --
+vmarginratio: --
+lines: --
+heightrounded: --
+bindingoffset: 0.0pt
+truedimen: --
+includehead: --
+includefoot: --
+includemp: --
+driver: pdftex
+-------------------- Page layout dimensions and switches
+\paperwidth  597.50787pt
+\paperheight 845.04684pt
+\textwidth  512.14963pt
+\textheight 731.23584pt
+\oddsidemargin  -29.59087pt
+\evensidemargin -29.59087pt
+\topmargin  -41.59085pt
+\headheight 14.0pt
+\headsep    14.22636pt
+\footskip   30.0pt
+\marginparwidth 57.0pt
+\marginparsep   11.0pt
+\columnsep  56.9055pt
+\skip\footins  9.0pt plus 4.0pt minus 2.0pt
+\hoffset 0.0pt
+\voffset 0.0pt
+\mag 1000
+
+(1in=72.27pt, 1cm=28.45pt)
+-----------------------
+ (C:\texmf\tex\context\base\supp-pdf.tex
+(C:\texmf\tex\context\base\supp-mis.tex
+loading : Context Support Macros / Miscellaneous (2004.10.26)
+\protectiondepth=\count135
+\scratchcounter=\count136
+\scratchtoks=\toks28
+\scratchdimen=\dimen136
+\scratchskip=\skip75
+\scratchmuskip=\muskip11
+\scratchbox=\box61
+\scratchread=\read2
+\scratchwrite=\write4
+\zeropoint=\dimen137
+\onepoint=\dimen138
+\onebasepoint=\dimen139
+\minusone=\count137
+\thousandpoint=\dimen140
+\onerealpoint=\dimen141
+\emptytoks=\toks29
+\nextbox=\box62
+\nextdepth=\dimen142
+\everyline=\toks30
+\!!counta=\count138
+\!!countb=\count139
+\recursecounter=\count140
+)
+loading : Context Support Macros / PDF (2004.03.26)
+\nofMPsegments=\count141
+\nofMParguments=\count142
+\MPscratchCnt=\count143
+\MPscratchDim=\dimen143
+\MPnumerator=\count144
+\everyMPtoPDFconversion=\toks31
+)
+Package hyperref Info: Link coloring OFF on input line 52.
+ (C:\texmf\tex\latex\hyperref\nameref.sty
+Package: nameref 2006/08/15 v2.26 Cross-referencing by name of section
+
+(C:\texmf\tex\latex\oberdiek\refcount.sty
+Package: refcount 2006/02/20 v3.0 Data extraction from references (HO)
+)
+\c@section@level=\count145
+)
+LaTeX Info: Redefining \ref on input line 52.
+LaTeX Info: Redefining \pageref on input line 52.
+ (example.out) (example.out)
+\@outlinefile=\write5
+
+ABD: EveryShipout initializing macros
+LaTeX Info: Redefining \selectfont on input line 52.
+LaTeX Font Info:    Font shape `OT1/cmtt/bx/n' in size <12> not available
+(Font)              Font shape `OT1/cmtt/m/n' tried instead on input line 56.
+LaTeX Font Info:    Try loading font information for T1+bch on input line 56.
+ (C:\texmf\tex\latex\psnfss\t1bch.fd
+File: t1bch.fd 2004/10/18 font definitions for T1/bch.
+)
+LaTeX Font Info:    Try loading font information for T1+cmss on input line 56.
+
+(C:\texmf\tex\latex\base\t1cmss.fd
+File: t1cmss.fd 1999/05/25 v2.5h Standard LaTeX font definitions
+)
+
+LaTeX Font Warning: Font shape `T1/cmss/b/n' undefined
+(Font)              using `T1/cmss/m/n' instead on input line 56.
+
+
+LaTeX Font Warning: Font shape `T1/cmss/m/n' in size <28.45274> not available
+(Font)              size <29.86> substituted on input line 56.
+
+LaTeX Font Info:    Try loading font information for T1+pag on input line 56.
+(C:\texmf\tex\latex\psnfss\t1pag.fd
+File: t1pag.fd 2001/06/04 font definitions for T1/pag.
+)
+LaTeX Font Info:    External font `cmex10' loaded for size
+(Font)              <7> on input line 56.
+LaTeX Font Info:    External font `cmex10' loaded for size
+(Font)              <5> on input line 56.
+
+<img/ireland.jpg, id=37, 401.5pt x 301.125pt>
+File: img/ireland.jpg Graphic file (type jpg)
+ <use img/ireland.jpg>
+Overfull \hbox (2.20001pt too wide) in paragraph at lines 58--58
+[] 
+ []
+
+
+Overfull \hbox (12.61743pt too wide) in paragraph at lines 61--61
+[]\OT1/cmss/bx/n/24.88 First hea-ding. Ae-nean sem
+ []
+
+
+Overfull \hbox (15.0pt too wide) in paragraph at lines 61--61
+[][] 
+ []
+
+File: img/ireland.jpg Graphic file (type jpg)
+<use img/ireland.jpg>
+Overfull \hbox (2.20001pt too wide) in paragraph at lines 74--74
+[] 
+ []
+
+
+Underfull \hbox (badness 10000) in paragraph at lines 77--78
+
+ []
+
+
+Underfull \hbox (badness 10000) in paragraph at lines 79--80
+
+ []
+
+
+Underfull \hbox (badness 2173) in paragraph at lines 81--81
+\OT1/cmss/m/n/12 Ae-nean ve-hi-cu-la com-mo-
+ []
+
+
+Underfull \hbox (badness 10000) in paragraph at lines 81--82
+
+ []
+
+
+Underfull \hbox (badness 10000) in paragraph at lines 83--84
+
+ []
+
+
+Overfull \hbox (4.71405pt too wide) in paragraph at lines 84--84
+[][] 
+ []
+
+<img/weather/rain.jpg, id=38, 128.48pt x 128.48pt>
+File: img/weather/rain.jpg Graphic file (type jpg)
+ <use img/weather/rain.jpg>
+LaTeX Font Info:    External font `cmex10' loaded for size
+(Font)              <9> on input line 87.
+LaTeX Font Info:    External font `cmex10' loaded for size
+(Font)              <6> on input line 87.
+
+Underfull \hbox (badness 10000) in paragraph at lines 87--87
+
+ []
+
+<img/weather/sun.jpg, id=39, 128.48pt x 128.48pt>
+File: img/weather/sun.jpg Graphic file (type jpg)
+ <use img/weather/sun.jpg>
+Overfull \hbox (9.34955pt too wide) in paragraph at lines 88--88
+[]\OT1/cmr/m/n/9 TOMORROW 
+ []
+
+
+Underfull \hbox (badness 10000) in paragraph at lines 88--88
+
+ []
+
+<img/weather/clouds.jpg, id=40, 128.48pt x 128.48pt>
+File: img/weather/clouds.jpg Graphic file (type jpg)
+
+<use img/weather/clouds.jpg>
+Underfull \hbox (badness 10000) in paragraph at lines 89--89
+
+ []
+
+
+Overfull \hbox (6.20001pt too wide) in paragraph at lines 86--90
+[] 
+ []
+
+
+LaTeX Font Warning: Font shape `T1/cmss/b/n' in size <11.38109> not available
+(Font)              size <10.95> substituted on input line 92.
+
+
+Overfull \hbox (4.71405pt too wide) in paragraph at lines 98--98
+[][] 
+ []
+
+[1.51.41{psfonts.map}
+
+ <img/weather/rain.jpg> <img/weather/sun.jpg> <img/weather/clouds.jpg> <img/ire
+land.jpg>]
+Adding a new piece of news
+
+Class paperTeX Warning: Image img/ireland needs: 163.81105pt and there is left:
+ 16383.99998pt  on input line 111.
+
+File: img/ireland.jpg Graphic file (type jpg)
+<use img/ireland.jpg>
+! Missing number, treated as zero.
+<to be read again> 
+                   }
+l.118 ...red}{\framebox{\textwidth}{asdfasdfasdf}}
+                                                  
+? 
+\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/papertex/example/example.out b/Master/texmf-dist/doc/latex/papertex/example/example.out
new file mode 100644
index 00000000000..ad42965e7f5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/papertex/example/example.out
@@ -0,0 +1 @@
+\BOOKMARK [1][-]{1.1}{FRONT PAGE}{}
diff --git a/Master/texmf-dist/doc/latex/papertex/example/example.pdf b/Master/texmf-dist/doc/latex/papertex/example/example.pdf
index f497a7deb20..eff18578ad0 100644
--- a/Master/texmf-dist/doc/latex/papertex/example/example.pdf
+++ b/Master/texmf-dist/doc/latex/papertex/example/example.pdf
diff --git a/Master/texmf-dist/doc/latex/papertex/example/example.tex b/Master/texmf-dist/doc/latex/papertex/example/example.tex
index 8f82c378f75..97cae11cc35 100644
--- a/Master/texmf-dist/doc/latex/papertex/example/example.tex
+++ b/Master/texmf-dist/doc/latex/papertex/example/example.tex
@@ -24,6 +24,7 @@
 \usepackage[latin]{babel}
 %\usepackage[T1]{fontenc}
 \usepackage{ulem}
+%\usepackage{color}
 %\usepackage{times}
 
 %\definecolor{color}{cmyk}{1, 0,0, 0.5}
@@ -42,6 +43,9 @@
 \title{my first paperTeX}
 \edition{my papertex edition}
 
+\setlength{\columnsep}{2cm}
+
+
 %new "ragged text" feature
 \minraggedcols=3
 
diff --git a/Master/texmf-dist/doc/latex/papertex/example/img/firefox.png b/Master/texmf-dist/doc/latex/papertex/example/img/firefox.png
deleted file mode 100644
index 3f8a32c6c7d..00000000000
--- a/Master/texmf-dist/doc/latex/papertex/example/img/firefox.png
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/papertex/example/papertex.cls b/Master/texmf-dist/doc/latex/papertex/example/papertex.cls
new file mode 100644
index 00000000000..d695a04ba53
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/papertex/example/papertex.cls
@@ -0,0 +1,924 @@
+%%
+%% This is file `papertex.cls',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% papertex.dtx  (with options: `class')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 2006 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
+%% or (at your option) any later version.  The latest version of this
+%% license is in:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% and version 1.2 or later is part of all distributions of LaTeX version
+%% 1999/12/01 or later.
+%% 
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesClass{papertex}
+    [2007/02/27 v1.2a paperTeX class]
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{papertex}[2006/07/06 paperTeX class]
+\RequirePackage{ifthen}
+\newlength{\papertex@imgsize}
+\newlength{\papertex@coltitsize}
+\newlength{\papertex@pageneed}
+\newlength{\papertex@pageleft}
+\newlength{\papertex@indexwidth}
+\newcommand{\papertex@ncolumns}{0}
+\newlength{\columnlines}
+\setlength{\columnlines}{0 pt} % no lines by default
+\newboolean{papertex@hyphenatedtitles}
+\setboolean{papertex@hyphenatedtitles}{true}
+\newboolean{papertex@ninepoints}
+\setboolean{papertex@ninepoints}{false}
+\newboolean{papertex@showgrid}
+\setboolean{papertex@showgrid}{false}
+\newboolean{papertex@a3paper}
+\setboolean{papertex@a3paper}{false}
+\newboolean{papertex@insidefrontpage}
+\setboolean{papertex@insidefrontpage}{false}
+\newboolean{papertex@insideweather}
+\setboolean{papertex@insideweather}{false}
+\newboolean{papertex@insideindex}
+\setboolean{papertex@insideindex}{false}
+\newcount\papertex@gridrows
+\newcount\papertex@gridcolumns
+\papertex@gridrows=40
+\papertex@gridcolumns=50
+\newcount\minraggedcols
+\minraggedcols=5
+\DeclareOption{10pt}{\PassOptionsToClass{10pt}{article}}
+\DeclareOption{11pt}{\PassOptionsToClass{11pt}{article}}
+\DeclareOption{12pt}{\PassOptionsToClass{12pt}{article}}
+\DeclareOption{twocolumn}%
+{\ClassWarning{paperTeX}{Option 'twocolumn' not available for paperTeX.}}
+\DeclareOption{notitlepage}%
+{\ClassWarning{paperTeX}{Option 'notitlepage' not available for paperTeX.}}
+\DeclareOption{twoside}%
+{\ClassWarning{paperTeX}{Option 'twoside' not available for paperTeX.}}
+\DeclareOption{9pt}{\setboolean{papertex@ninepoints}{true}}
+\DeclareOption{hyphenatedtitles}{\setboolean{papertex@hyphenatedtitles}{false}}
+\DeclareOption{columnlines}{\setlength{\columnlines}{0.1 pt}}
+\DeclareOption{showgrid}{\setboolean{papertex@showgrid}{true}}
+\DeclareOption{a3paper}{\setboolean{papertex@a3paper}{true}}
+\ProcessOptions\relax
+\LoadClass[10pt, onecolumn, titlepage, a4paper]{article}
+\RequirePackage{ifpdf}
+\RequirePackage{multido}
+\RequirePackage{datetime}
+\RequirePackage{multicol}
+\RequirePackage{fancyhdr}
+\RequirePackage{fancybox}
+\ifthenelse{\boolean{papertex@a3paper}}{%
+\RequirePackage[a3paper,headsep=0.5cm,vmargin={2cm,2cm},hmargin={1.5cm,1.5cm}]{geometry}
+}{
+\RequirePackage[headsep=0.5cm,vmargin={2cm,2cm},hmargin={1.5cm,1.5cm}]{geometry}
+}
+\ifpdf
+\RequirePackage[pdftex]{graphicx,color}
+  \RequirePackage[pdftex]{hyperref}
+\else
+\RequirePackage{color}
+\RequirePackage[dvips]{graphicx}
+\RequirePackage[dvips]{hyperref}
+\fi
+\RequirePackage[absolute]{textpos} % absoulte positioning
+\RequirePackage{hyphenat} % when hyphenate
+\RequirePackage{wrapfig}
+\RequirePackage{lastpage} % to know the last page number
+\RequirePackage{setspace} % set space between lines
+\RequirePackage{ragged2e}
+\newcommand{\raggedFormat}{\RaggedRight}
+\AtEndOfClass{\papertexInit}
+\ifthenelse{\boolean{papertex@showgrid}}{%
+\AtBeginDocument{
+\grid[show]{\papertex@gridrows}{\papertex@gridcolumns}}
+\advance\minraggedcols by -1
+}{%
+\AtBeginDocument{
+\grid[]{\papertex@gridrows}{\papertex@gridcolumns}}
+\advance\minraggedcols by -1
+}
+\ifthenelse{\boolean{papertex@ninepoints}}{
+\renewcommand{\normalsize}{%
+  \@setfontsize{\normalsize}{9pt}{10pt}%
+  \setlength{\abovedisplayskip}{5pt plus 1pt minus .5pt}%
+  \setlength{\belowdisplayskip}{\abovedisplayskip}%
+  \setlength{\abovedisplayshortskip}{3pt plus 1pt minus 2pt}%
+  \setlength{\belowdisplayshortskip}{\abovedisplayshortskip}}
+
+\renewcommand{\tiny}{\@setfontsize{\tiny}{5pt}{6pt}}
+
+\renewcommand{\scriptsize}{\@setfontsize{\scriptsize}{7pt}{8pt}}
+
+\renewcommand{\small}{%
+  \@setfontsize{\small}{8pt}{9pt}%
+  \setlength{\abovedisplayskip}{4pt plus 1pt minus 1pt}%
+  \setlength{\belowdisplayskip}{\abovedisplayskip}%
+  \setlength{\abovedisplayshortskip}{2pt plus 1pt}%
+  \setlength{\belowdisplayshortskip}{\abovedisplayshortskip}}
+
+\renewcommand{\footnotesize}{%
+  \@setfontsize{\footnotesize}{8pt}{9pt}%
+  \setlength{\abovedisplayskip}{4pt plus 1pt minus .5pt}%
+  \setlength{\belowdisplayskip}{\abovedisplayskip}%
+  \setlength{\abovedisplayshortskip}{2pt plus 1pt}%
+  \setlength{\belowdisplayshortskip}{\abovedisplayshortskip}}
+
+\renewcommand{\large}{\@setfontsize{\large}{11pt}{13pt}}
+\renewcommand{\Large}{\@setfontsize{\Large}{14pt}{18pt}}
+\renewcommand{\LARGE}{\@setfontsize{\LARGE}{18pt}{20pt}}
+\renewcommand{\huge}{\@setfontsize{\huge}{20pt}{25pt}}
+\renewcommand{\Huge}{\@setfontsize{\Huge}{25pt}{30pt}}
+}{}
+\definecolor{color}{cmyk}{0.5, 0, 1, 0.5}
+\definecolor{max}{cmyk}{0, 0.5, 0.5, 0.5}
+\definecolor{min}{cmyk}{0.5, 0, 0.5, 0.5}
+\newcommand{\papertex@wwwTxt}{http://nachollopis.com}
+\newcommand{\papertex@wwwFormat}{\sffamily}
+\newcommand{\papertex@www}{%
+\raisebox{-3pt}{{\papertex@wwwFormat\papertex@wwwTxt}}
+}
+\newcommand{\papertex@edition}{MY EDITION}
+\newcommand{\editionFormat}{\large\bfseries\texttt}
+\newcommand{\papertex@editionLogo}{%
+\raisebox{-3pt}{%
+\textcolor{color}{{\editionFormat\papertex@edition}}%
+}%
+}
+\newcommand{\indexFormat}{\large\bfseries\sffamily}
+\newcommand{\papertex@indexFrameTitle}[1]
+{\begin{flushright}{\textcolor{color}{{\indexFormat #1}}}\end{flushright}}
+
+\newcommand{\indexEntryFormat}{\large\sffamily}
+\newcommand{\papertex@indexEntry}[1]{\begin{minipage}{13\TPHorizModule}%
+{\indexEntryFormat\noindent\ignorespaces{#1}}%
+\end{minipage}}
+\newcommand{\indexEntrySeparator}{\rule{\papertex@indexwidth}{.1pt}}
+\newcommand{\indexEntryPageTxt}{p.}
+\newcommand{\indexEntryPageFormat}{\footnotesize}
+\newcommand{\papertex@indexEntryPage}[1]{%
+{\indexEntryPageFormat\textcolor{color}{\indexEntryPageTxt{}~#1}}%
+}
+\newcommand{\headDateTimeFormat}{}
+\newcommand{\papertex@headDateTime}{%
+\headDateTimeFormat\date\hspace{5pt}$\parallel$\hspace{5pt}%
+\textcolor{color}{\currenttime h}%
+}
+\newcommand{\weatherFormat}{\bfseries\sffamily}
+\newcommand{\papertex@weather}[1]{%
+\noindent\textcolor{color}{{\weatherFormat #1}}%
+}
+\newcommand{\weatherTempFormat}{\small}
+\newcommand{\weatherUnits}{\textdegree{}C}
+\newcommand{\papertex@section}[0]{FRONT PAGE}
+\newcommand{\papertex@headleft}{%
+{{\usefont{T1}{bch}{b}{n} \noindent\textcolor{color}{paper}}%
+{\usefont{T1}{pag}{m}{n} \textcolor{black}{TeX}} , \date}%
+}
+\newcommand{\papertex@headcenter}{%
+\papertex@section{}
+}
+\newcommand{\papertex@headright}{%
+\textcolor{color}{\small\papertex@edition}%
+\hspace*{5pt}\thepage\ / \pageref{LastPage}
+}
+
+\newcommand{\heading}[3]{%
+\renewcommand{\papertex@headleft}{#1}%
+\renewcommand{\papertex@headcenter}{#2}%
+\renewcommand{\papertex@headright}{#3}%
+}
+\newcommand{\papertex@footleft}{%
+{\footnotesize\copyright\ \papertex@wwwTxt{} - Created using paper\TeX{}}%
+}
+\newcommand{\papertex@footcenter}{%
+}
+\newcommand{\papertex@footright}{%
+}
+
+\newcommand{\foot}[3]{%
+\renewcommand{\papertex@footleft}{#1}%
+\renewcommand{\papertex@footcenter}{#2}%
+\renewcommand{\papertex@footright}{#3}%
+}
+\newcommand{\firstTitleFormat}{\Huge\sffamily\bfseries\flushleft}
+\newcommand{\papertex@firstTitle}[1]{%
+{%
+\begin{spacing}{2.0}{%
+\noindent\ignorespaces
+\ifthenelse{\boolean{papertex@hyphenatedtitles}}%
+{\nohyphens{\firstTitleFormat #1}}%
+{{\firstTitleFormat #1}}%
+}%
+\end{spacing}%
+}%
+}
+\newcommand{\firstTextFormat}{}
+\newcommand{\papertex@firstText}[1]{%
+{\noindent\ignorespaces\firstTextFormat #1}%
+}
+\newcommand{\secondTitleFormat}{\LARGE\sffamily\bfseries}
+\newcommand{\papertex@secondTitle}[1]{%
+\begin{spacing}{1.5}{%
+\noindent\ignorespaces\flushleft
+\ifthenelse{\boolean{papertex@hyphenatedtitles}}%
+{\nohyphens{\secondTitleFormat #1}}%
+{{\secondTitleFormat #1}}%
+}\end{spacing}%
+}
+\newcommand{\secondSubtitleFormat}{\large}
+\newcommand{\papertex@secondSubtitle}[1]{%
+{\noindent\ignorespaces{\secondSubtitleFormat #1}}%
+}
+\newcommand{\secondTextFormat}{}
+\newcommand{\papertex@secondText}[1]{%
+\begin{multicols}{2}
+{\noindent\ignorespaces\secondTextFormat #1}
+\end{multicols}
+}
+\newcommand{\thirdTitleFormat}{\Large\sffamily\bfseries}
+\newcommand{\papertex@thirdTitle}[1]{%
+\begin{spacing}{1.5}{%
+\noindent\ignorespaces\flushleft
+\ifthenelse{\boolean{papertex@hyphenatedtitles}}%
+{\nohyphens{\thirdTitleFormat #1}}%
+{{\thirdTitleFormat #1}}%
+}\end{spacing}%
+}
+\newcommand{\thirdSubtitleFormat}{\large}
+\newcommand{\papertex@thirdSubtitle}[1]%
+{{\noindent\ignorespaces\thirdSubtitleFormat #1}}
+\newcommand{\thirdTextFormat}{}
+\newcommand{\papertex@thirdText}[1]{{\thirdTextFormat #1}}
+\newcommand{\pictureCaptionFormat}{\small\bfseries}
+\newcommand{\papertex@pictureCaption}[1]{%
+{\noindent\pictureCaptionFormat #1}%
+}
+\newcommand{\pagesFormat}{\bfseries\footnotesize}
+\newcommand{\papertex@pages}[1]%
+{\noindent\textcolor{color}{\pagesFormat\MakeUppercase{#1}}}
+\newcommand{\innerTitleFormat}{\Huge}
+\newcommand{\papertex@innerTitle}[1]{%
+\begin{flushleft}{%
+\noindent
+\ifthenelse{\boolean{papertex@hyphenatedtitles}}%
+{\nohyphens{\innerTitleFormat #1}}%
+{{\innerTitleFormat #1}}%
+}%
+\\%
+\end{flushleft}%
+}
+\newcommand{\innerSubtitleFormat}{\large}
+\newcommand{\papertex@innerSubtitle}[1]{{\innerSubtitleFormat #1}}
+\newcommand{\timestampTxt}{h}
+\newcommand{\timestampSeparator}{|}
+\newcommand{\timestampFormat}{\small}
+\newcommand{\timestamp}[1]{%
+{\timestampFormat\textcolor{color}{%
+#1~\timestampTxt{}}%
+}~\timestampSeparator{}%
+}
+\newcommand{\innerAuthorFormat}{\footnotesize}
+\newcommand{\innerPlaceFormat}{\footnotesize\bfseries}
+\newcommand{\innerTextFinalMark}{\rule{0.65em}{0.65em}}
+\newcommand{\editorialTitleFormat}{\LARGE\textit}
+\newcommand{\papertex@editorialTitle}[1]{\editorialTitleFormat{#1}}
+\newcommand{\editorialAuthorFormat}{\textsc}
+\newcommand{\shortnewsTitleFormat}{\LARGE\bfseries}
+\newcommand{\papertex@shortnewsTitle}[1]{{\shortnewsTitleFormat #1}}
+\newcommand{\shortnewsSubtitleFormat}{\Large}
+\newcommand{\papertex@shortnewsSubtitle}[1]{{\shortnewsSubtitleFormat #1}}
+\newcommand{\shortnewsItemTitleFormat}{\large\bfseries}
+\newcommand{\papertex@shortnewsItemTitle}[1]{{\shortnewsItemTitleFormat #1}}
+\renewcommand{\maketitle}{\begin{titlepage}%
+  \let\footnotesize\small
+  \let\footnoterule\relax
+  \let \footnote \thanks
+  \null\vfil
+  \vskip 60\p@
+  \begin{center}%
+    {\LARGE \@title \par}%
+    \vskip 1em%
+    {\LARGE ``\papertex@edition '' \par}%
+    \vskip 3em%
+    {\large
+     \lineskip .75em%
+      \begin{tabular}[t]{c}%
+        \@author
+      \end{tabular}\par}%
+      \vskip 1.5em%
+    {\large \@date \par}%
+  \end{center}\par
+  \@thanks
+  \vfil\null
+  \end{titlepage}%
+  \setcounter{footnote}{0}%
+  \global\let\thanks\relax
+  \global\let\maketitle\relax
+  \global\let\@thanks\@empty
+  \global\let\@author\@empty
+  \global\let\@date\@empty
+  \global\let\@title\@empty
+  \global\let\title\relax
+  \global\let\author\relax
+  \global\let\date\relax
+  \global\let\and\relax
+}
+\newcommand{\papertex@say}[1]{\typeout{#1}}
+\newsavebox{\papertex@fmbox}
+\newenvironment{papertex@fmpage}[1]
+ {\begin{lrbox}{\papertex@fmbox}\begin{minipage}{#1}}
+ {\end{minipage}\end{lrbox}\fbox{\usebox{\papertex@fmbox}}}
+\newcommand{\image}[2]{
+\vspace{5pt}
+\setlength{\fboxsep}{1pt}
+\addtolength{\papertex@imgsize}{\columnwidth}
+\addtolength{\papertex@imgsize}{-1\columnsep}
+\ifpdf
+\setlength{\papertex@pageneed}{1.5\papertex@imgsize}
+\addtolength{\papertex@pageneed}{50pt}
+\ClassWarning{paperTeX}{%
+Image #1 needs: \the\papertex@pageneed \space %
+and there is left: \the\page@free\space%
+}
+\ifdim \papertex@pageneed < \page@free
+
+{\centering\fbox{%
+\includegraphics[width = \papertex@imgsize,
+height = \papertex@imgsize,
+keepaspectratio ]{#1}}}
+\papertex@pictureCaption{#2}
+
+\vspace{5pt}
+\else
+\ClassWarning{Image #1 needs more space!%
+  It was not inserted!}
+\fi
+\fi
+}
+\textblockorigin{1cm}{1cm}
+\newdimen\papertex@dx
+\newdimen\papertex@dy
+\newcount\papertex@cx
+\newcount\papertex@cy
+\newcommand{\grid}[3][]{
+\papertex@dx=\textwidth%
+\papertex@dy=\textheight%
+\papertex@cx=#3% %columns
+\papertex@cy=#2% %rows
+
+\count1=#3%
+\advance\count1 by 1
+
+\count2=#2%
+\advance\count2 by 1
+
+\divide\papertex@dx by #3
+\divide\papertex@dy by #2
+
+\setlength{\TPHorizModule}{\papertex@dx}
+\setlength{\TPVertModule}{\papertex@dy}
+
+\ifthenelse{\equal{#1}{show}}{
+\multido{\papertex@nrow=0+1}{\count2}{
+\begin{textblock}{\papertex@cx}(0,\papertex@nrow)
+\rule[0pt]{\textwidth}{.1pt}
+\end{textblock}
+}
+
+\multido{\papertex@ncol=0+1}{\count1}{
+\begin{textblock}{\papertex@cy}(\papertex@ncol,0)
+\rule[0pt]{.1pt}{\textheight}
+\end{textblock}
+}
+}{}
+}
+\newcommand{\papertexInit}{
+\setlength{\headheight}{14pt}
+\renewcommand{\headrulewidth}{0.4pt}
+
+\pagestyle{fancy}
+
+\setlength{\columnseprule}{\columnlines}
+\setlength{\fboxrule}{0.1 pt}
+
+}
+\newcommand{\logo}[0]{
+%% Heading %%
+\noindent\hrulefill\hspace{10pt}\papertex@editionLogo\hspace{5pt}\papertex@www
+
+\vspace*{-3pt}
+
+{\fontsize{10mm}{12mm} \usefont{T1}{bch}{b}{n} \noindent\textcolor{color}{\sffamily paper}}%
+{\fontsize{12mm}{14mm} \usefont{T1}{pag}{m}{n} \textcolor{black}{TeX}}
+\hrulefill
+\hspace{10pt}\papertex@headDateTime
+
+}
+\newcommand{\minilogo}[0]{
+{\fontsize{4mm}{6mm} \usefont{T1}{bch}{b}{n} \noindent\textcolor{color}{\sffamily paper}}%
+{\fontsize{7mm}{12mm} \usefont{T1}{pag}{m}{n} \textcolor{black}{TeX}}
+
+\vspace*{5pt}
+}
+\newcommand{\mylogo}[1]{
+{#1}
+
+\noindent
+\papertex@editionLogo\hspace{5pt}
+\hrulefill
+\hspace{5pt}\papertex@headDateTime
+}
+\newcommand{\edition}[1]{\renewcommand{\papertex@edition}{#1}}
+\newenvironment{frontpage}[0]
+{
+\setboolean{papertex@insidefrontpage}{true}
+\thispagestyle{empty}
+\pdfbookmark[1]{FRONT PAGE}{\thepage}
+\logo
+
+}%
+{
+\thispagestyle{empty}
+\clearpage
+\newpage
+
+\fancyhead{}
+\fancyfoot{}
+\fancyhead[R]{\papertex@headright}
+\fancyhead[L]{\papertex@headleft}
+    \fancyhead[C]{\papertex@headcenter}
+    \fancyfoot[R]{\papertex@footright}
+    \fancyfoot[L]{\papertex@footleft}
+\fancyfoot[C]{\papertex@footcenter}
+\renewcommand{\headrulewidth}{0.4pt}
+\setboolean{papertex@insidefrontpage}{false}
+
+}
+\newcommand{\firstnews}[3]
+{
+\ifthenelse{\boolean{papertex@insidefrontpage}}{%
+\ifthenelse{\boolean{papertex@hyphenatedtitles}}{%
+\begin{textblock}{24}(22,5)
+}
+{
+\begin{textblock}{28}(22,5)
+}
+\vspace{-7pt}
+\papertex@firstTitle{#1}
+\end{textblock}
+\begin{textblock}{29}(22,10)
+\vspace{5pt plus 2pt minus 2pt}
+
+\papertex@firstText{\timestamp{#3}~#2}
+
+\end{textblock}
+
+\begin{textblock}{50}(0,15)
+\rule{50\TPHorizModule}{.3pt}
+\end{textblock}
+}{%else
+\ClassError{paperTeX}{%
+\protect\firstnews\space in a wrong place.\MessageBreak
+\protect\firstnews\space may only appear inside frontpage environment.
+}{%
+\protect\firstnews\space may only appear inside frontpage environment.
+}%
+}
+}
+\newcommand{\secondnews}[5]
+{
+\ifthenelse{\boolean{papertex@insidefrontpage}}{%
+\begin{textblock}{33}(2,16)
+\papertex@pages{#4}
+\vspace{-5pt}
+\papertex@secondTitle{#1}
+
+\vspace*{5pt}
+
+\papertex@secondSubtitle{#2}
+
+\vspace*{-7pt}
+
+\papertex@secondText{\timestamp{#5}~#3}
+
+\end{textblock}
+
+\begin{textblock}{33}(2,25)
+\vspace{5pt plus 2pt minus 2pt}
+
+\noindent\ignorespaces\rule{33\TPHorizModule}{.3pt}
+\end{textblock}
+}{%else
+\ClassError{paperTeX}{%
+\protect\secondnews\space in a wrong place.\MessageBreak
+\protect\secondnews\space may only appear inside frontpage environment.
+}{%
+\protect\secondnews\space may only appear inside frontpage environment.
+}%
+}
+}
+\newcommand{\thirdnews}[6]
+{
+\ifthenelse{\boolean{papertex@insidefrontpage}}{%
+\begin{textblock}{32}(2,26)
+\papertex@pages{#5}
+\vspace{-5pt}
+\setlength{\fboxsep}{1pt}
+\papertex@thirdTitle{#1}
+
+\vspace*{5pt}
+
+\papertex@thirdSubtitle{#2}
+
+\vspace*{5pt}
+
+{\noindent\ignorespaces %
+\ifthenelse{\equal{#4}{}}{}
+{\begin{wrapfigure}{r}{.3\textwidth}
+\vspace*{-12pt}
+\ifpdf
+\noindent\fbox{\includegraphics[width=.3\textwidth]{#4}}
+\fi
+\end{wrapfigure}%
+}%
+\papertex@thirdText{\timestamp{#6}~#3}
+
+}
+
+\vspace*{5pt}
+
+\end{textblock}
+}{%else
+\ClassError{paperTeX}{%
+\protect\thirdnews\space in a wrong place.\MessageBreak
+\protect\thirdnews\space may only appear inside frontpage environment.
+}{%
+\protect\thirdnews\space may only appear inside frontpage environment.
+}%
+}
+}
+\newcommand{\firstimage}[2]
+{
+\ifthenelse{\boolean{papertex@insidefrontpage}}{%
+\begin{textblock}{18}(2,5)
+\setlength{\fboxsep}{1pt}
+\ifpdf % only in PDF
+\noindent\fbox{\includegraphics[width = 18\TPHorizModule ]{#1}}
+\fi
+
+\papertex@pictureCaption{#2}
+\end{textblock}%
+}
+{\ClassError{paperTeX}{%
+\protect\firstimage\space in a wrong place.\MessageBreak
+\protect\firstimage\space may only appear inside frontpage environment.
+}{%
+\protect\firstimage\space may only appear inside frontpage environment.
+}}
+}%
+\newcommand{\weatheritem}[5]{%
+\ifthenelse{\boolean{papertex@insideweather}}{
+\begin{minipage}{45pt}
+\ifpdf
+\includegraphics[width=40pt]{#1}
+\fi
+\end{minipage}
+\begin{minipage}{50pt}
+\weatherTempFormat
+#2\\
+\textcolor{min}{#3} $\|$ \textcolor{max}{#4} \weatherUnits{}\\
+#5
+\end{minipage}
+}{%else
+\ClassError{paperTeX}{%
+\protect\weatheritem\space in a wrong place.\MessageBreak
+\protect\weatheritem\space may only appear inside weatherblock environment.
+}{%
+\protect\weatheritem\space may only appear inside weatherblock environment.\MessageBreak
+weatherblock environment may only appear inside frontpage environment.
+}%
+}
+}
+\newenvironment{weatherblock}[1]
+{
+\ifthenelse{\boolean{papertex@insidefrontpage}}{%
+\setboolean{papertex@insideweather}{true}
+\begin{textblock}{32}(2,38)
+\vspace*{-15pt}
+
+\hfill\papertex@weather{#1}
+
+\vspace*{5pt}
+
+\noindent\begin{papertex@fmpage}{32\TPHorizModule}
+\begin{minipage}{32\TPHorizModule}
+\hspace{5pt}
+
+}{%
+\ClassError{paperTeX}{%
+weatherblock in a wrong place.\MessageBreak
+weatherblock may only appear inside frontpage environment.
+}{%
+weatherblock may only appear inside frontpage environment.
+}
+}
+}%
+{
+\end{minipage}
+\end{papertex@fmpage}
+\end{textblock}
+\setboolean{papertex@insideweather}{false}
+}
+\newenvironment{authorblock}[0]
+{
+\ifthenelse{\boolean{papertex@insidefrontpage}}{%
+\begin{textblock}{15}(36,35)
+\setlength{\fboxsep}{5pt}
+\begin{papertex@fmpage}{13\TPHorizModule}
+\begin{minipage}{13\TPHorizModule}
+\centering
+\minilogo
+
+}{%else
+\ClassError{paperTeX}{%
+authorblock in a wrong place.\MessageBreak
+authorblock may only appear inside frontpage environment.
+}{%
+authorblock may only appear inside frontpage environment.
+}
+}
+}
+{
+\end{minipage}
+\end{papertex@fmpage}
+\end{textblock}
+}
+\newenvironment{indexblock}[1]
+{
+\ifthenelse{\boolean{papertex@insidefrontpage}}{%
+\setboolean{papertex@insideindex}{true}%let's in
+\begin{textblock}{15}(36,16)
+\setlength{\papertex@indexwidth}{13\TPHorizModule}
+\papertex@indexFrameTitle{#1}
+
+\setlength{\fboxsep}{5pt} %espacio entre el frame y la imagen
+\begin{papertex@fmpage}{\papertex@indexwidth}
+\begin{minipage}{\papertex@indexwidth}
+\vspace*{10pt}
+}{%else
+\ClassError{paperTeX}{%
+indexblock in a wrong place.\MessageBreak
+indexblock may only appear inside frontpage environment.
+}{%
+indexblock may only appear inside frontpage environment.
+}
+}
+}%
+{
+\end{minipage}
+\end{papertex@fmpage}
+\end{textblock}
+\setboolean{papertex@insideindex}{false}%let's out
+}
+\newcommand{\indexitem}[2]
+{
+\ifthenelse{\boolean{papertex@insideindex}}{
+\papertex@indexEntry{#1~\papertex@indexEntryPage{\pageref{#2}}}
+
+\vspace{0.5cm}
+
+\noindent\ignorespaces\indexEntrySeparator{}
+}{%else
+\ClassError{paperTeX}{%
+\protect\indexitem\space in a wrong place.\MessageBreak
+\protect\indexitem\space may only appear inside indexblock environment.
+}{%
+\protect\indexitem\space may only appear inside indexblock environment.\MessageBreak
+indexblock environment may only appear inside frontpage environment.
+}%
+}
+}
+\newcommand{\papertex@inexpandedtitle}[1]{
+\begin{minipage}{.95\textwidth}
+\begin{center}
+\noindent\Large\textbf{#1}
+\end{center}
+\end{minipage}
+}
+
+\newcommand{\expandedtitle}[2]{
+\end{multicols}
+
+\begin{center}
+\setlength{\fboxsep}{5pt}
+\setlength{\shadowsize}{2pt}
+\ifthenelse{\equal{#1}{shadowbox}}{%
+\shadowbox{%
+\papertex@inexpandedtitle{#2}%
+}%
+}{}
+\ifthenelse{\equal{#1}{doublebox}}{%
+\doublebox{%
+\papertex@inexpandedtitle{#2}%
+}%
+}{}
+\ifthenelse{\equal{#1}{ovalbox}}{%
+\ovalbox{%
+\papertex@inexpandedtitle{#2}%
+}%
+}{}
+\ifthenelse{\equal{#1}{Ovalbox}}{%
+\Ovalbox{%
+\papertex@inexpandedtitle{#2}%
+}%
+}{}
+\ifthenelse{\equal{#1}{lines}}{
+\hrule
+\vspace*{8pt}
+\begin{center}
+\noindent\Large\textbf{#2}
+\end{center}
+\vspace*{8pt}
+\hrule
+}{}
+\end{center}
+
+\begin{multicols}{\papertex@ncolumns{}}
+\ifnum \papertex@ncolumns > \minraggedcols
+\raggedFormat
+\fi
+}
+\newcommand{\papertex@incolumntitle}[2]{
+\begin{minipage}{#1}
+\begin{center}
+\noindent\normalsize\textbf{#2}
+\end{center}
+\end{minipage}
+}
+
+\newcommand{\columntitle}[2]{
+\vspace*{5pt}
+\begin{center}
+\setlength{\fboxsep}{5pt}
+\setlength{\shadowsize}{2pt}
+\addtolength{\papertex@coltitsize}{\columnwidth}
+\addtolength{\papertex@coltitsize}{-1\columnsep}
+\addtolength{\papertex@coltitsize}{-5pt}
+\addtolength{\papertex@coltitsize}{-1\shadowsize}
+\ifthenelse{\equal{#1}{shadowbox}}{%
+\shadowbox{%
+\papertex@incolumntitle{\papertex@coltitsize}{#2}%
+}%
+}{}
+\ifthenelse{\equal{#1}{doublebox}}{%
+\doublebox{%
+\papertex@incolumntitle{\papertex@coltitsize}{#2}%
+}%
+}{}
+\ifthenelse{\equal{#1}{ovalbox}}{%
+\ovalbox{%
+\papertex@incolumntitle{\papertex@coltitsize}{#2}%
+}%
+}{}
+\ifthenelse{\equal{#1}{Ovalbox}}{%
+\Ovalbox{%
+\papertex@incolumntitle{\papertex@coltitsize}{#2}%
+}%
+}{}
+\ifthenelse{\equal{#1}{lines}}{
+\hrule
+\vspace*{5pt}
+\begin{center}
+\noindent\normalsize\textbf{#2}
+\end{center}
+\vspace*{5pt}
+\hrule
+}{}
+\end{center}
+}
+\renewcommand{\date}{%
+\longdate{\today}%
+}
+\newcommand{\authorandplace}[2]{%
+\leftline{%
+{\innerAuthorFormat #1},\space{}{\innerPlaceFormat #2}%
+}%
+\par %
+}
+\newcommand{\newsection}[1]{
+\pdfbookmark[0]{#1}{\thepage} %bookmark para el pdf
+\renewcommand{\papertex@section}{#1}
+}
+\newenvironment{news}[5]
+{
+\papertex@say{Adding a new piece of news}
+\renewcommand{\papertex@ncolumns}{#1}
+\begin{multicols}{#1}[%
+\papertex@pages{#4}
+\papertex@innerTitle{#2}%
+\papertex@innerSubtitle{#3}%
+][4cm]%
+\phantomsection
+\pdfbookmark[1]{#2}{\thepage}
+\label{#5}
+\ifnum #1 > \minraggedcols
+\raggedFormat
+\fi
+}
+{~\innerTextFinalMark{}
+\end{multicols}
+}
+\newcommand{\newssep}{%
+\setlength{\papertex@pageneed}{16000pt}
+\setlength\papertex@pageleft{\pagegoal}
+\addtolength\papertex@pageleft{-\pagetotal}
+
+\papertex@say{How much left \the\papertex@pageleft}
+
+\ifdim \papertex@pageneed < \papertex@pageleft
+\papertex@say{Not enough space}
+\else
+\papertex@say{Adding sep line between news}
+\vspace*{10pt plus 10pt minus 5pt}
+\hrule
+\vspace*{10pt plus 5pt minus 5pt}
+\fi
+
+}
+\newcommand{\papertex@editorialTit}[2]{
+\setlength{\arrayrulewidth}{.1pt}
+\begin{center}
+\begin{tabular}{c}
+\noindent
+\papertex@editorialTitle{#1}
+\vspace{2pt plus 1pt minus 1pt}
+\\
+\hline
+\vspace{2pt plus 1pt minus 1pt}
+\\
+\editorialAuthorFormat{#2}
+\end{tabular}
+\end{center}
+}
+\newenvironment{editorial}[4]
+{
+\papertex@say{Adding a new editorial}
+\begin{multicols}{#1}[%
+\papertex@editorialTit{#2}{#3}%
+][4cm]
+\phantomsection
+\pdfbookmark[1]{#2}{\thepage}
+\label{#4}
+\ifnum #1 > \minraggedcols
+\raggedFormat
+\fi
+}
+{
+\end{multicols}
+}
+\newcommand{\papertex@shortnewsTit}[2]{
+\begin{center}
+\vbox{%
+\noindent
+\papertex@shortnewsTitle{#1}
+\vspace{4pt plus 2pt minus 2pt}
+\hrule
+\vspace{4pt plus 2pt minus 2pt}
+\papertex@shortnewsSubtitle{#2}
+}
+\end{center}
+}
+\newenvironment{shortnews}[4]
+{
+\papertex@say{Adding a short news block}
+\begin{multicols}{#1}[\papertex@shortnewsTit{#2}{#3}][4cm] %
+\phantomsection
+\pdfbookmark[1]{#2}{\thepage}
+    \label{#4}
+\par %
+\ifnum #1 > \minraggedcols
+\raggedFormat
+\fi
+}
+{
+\end{multicols}
+}
+\newcommand{\shortnewsitem}[2]{
+\goodbreak
+\vspace{5pt plus 3pt minus 3pt}
+{\vbox{\noindent\papertex@shortnewsItemTitle{#1}}}
+\vspace{5pt plus 3pt minus 3pt}
+{\noindent #2}\\
+}
+\endinput
+%%
+%% End of file `papertex.cls'.
diff --git a/Master/texmf-dist/tpm/papertex.tpm b/Master/texmf-dist/tpm/papertex.tpm
index 52d98b77cf1..b0af4558872 100644
--- a/Master/texmf-dist/tpm/papertex.tpm
+++ b/Master/texmf-dist/tpm/papertex.tpm
@@ -3,29 +3,32 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/papertex.zip">
     <TPM:Name>papertex</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2007/02/27 23:30:00</TPM:Date>
+    <TPM:Date>2007/03/09 00:20:00</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>karl</TPM:Creator>
     <TPM:Title>The papertex package.</TPM:Title>
     <TPM:Description></TPM:Description>
     <TPM:Author></TPM:Author>
-    <TPM:Size>555969</TPM:Size>
+    <TPM:Size>592595</TPM:Size>
     <TPM:License></TPM:License>
     <TPM:Build/>
-    <TPM:RunFiles size="25685">
+    <TPM:RunFiles size="25739">
 texmf-dist/tex/latex/papertex/papertex.cls
 texmf-dist/tpm/papertex.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="507664">
+    <TPM:DocFiles size="350466">
 texmf-dist/doc/latex/papertex/CHANGES
 texmf-dist/doc/latex/papertex/README
+texmf-dist/doc/latex/papertex/example/example.aux
+texmf-dist/doc/latex/papertex/example/example.log
+texmf-dist/doc/latex/papertex/example/example.out
 texmf-dist/doc/latex/papertex/example/example.pdf
 texmf-dist/doc/latex/papertex/example/example.tex
-texmf-dist/doc/latex/papertex/example/img/firefox.png
 texmf-dist/doc/latex/papertex/example/img/ireland.jpg
 texmf-dist/doc/latex/papertex/example/img/weather/clouds.jpg
 texmf-dist/doc/latex/papertex/example/img/weather/rain.jpg
 texmf-dist/doc/latex/papertex/example/img/weather/sun.jpg
+texmf-dist/doc/latex/papertex/example/papertex.cls
 texmf-dist/doc/latex/papertex/papertex.pdf
     </TPM:DocFiles>
     <TPM:SourceFiles size="59246">
diff --git a/Master/texmf/lists/papertex b/Master/texmf/lists/papertex
index daee8d41d99..fc030fddb7b 100644
--- a/Master/texmf/lists/papertex
+++ b/Master/texmf/lists/papertex
@@ -1,12 +1,15 @@
 texmf-dist/doc/latex/papertex/CHANGES
 texmf-dist/doc/latex/papertex/README
+texmf-dist/doc/latex/papertex/example/example.aux
+texmf-dist/doc/latex/papertex/example/example.log
+texmf-dist/doc/latex/papertex/example/example.out
 texmf-dist/doc/latex/papertex/example/example.pdf
 texmf-dist/doc/latex/papertex/example/example.tex
-texmf-dist/doc/latex/papertex/example/img/firefox.png
 texmf-dist/doc/latex/papertex/example/img/ireland.jpg
 texmf-dist/doc/latex/papertex/example/img/weather/clouds.jpg
 texmf-dist/doc/latex/papertex/example/img/weather/rain.jpg
 texmf-dist/doc/latex/papertex/example/img/weather/sun.jpg
+texmf-dist/doc/latex/papertex/example/papertex.cls
 texmf-dist/doc/latex/papertex/papertex.pdf
 texmf-dist/source/latex/papertex/papertex.dtx
 texmf-dist/source/latex/papertex/papertex.ins