summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/bibtex/bib/jurabib/jbtest.bib2
-rw-r--r--Master/texmf-dist/bibtex/bst/chem-journal/jcc.bst29
-rw-r--r--Master/texmf-dist/bibtex/bst/rsc/rsc.bst356
-rw-r--r--Master/texmf-dist/doc/generic/pst-bar/LICENSE4
-rw-r--r--Master/texmf-dist/doc/generic/pst-bar/README34
-rw-r--r--Master/texmf-dist/doc/latex/ccaption/README5
-rw-r--r--Master/texmf-dist/doc/latex/ccaption/ccaption.pdfbin386224 -> 387734 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cdpbundl/00readme.txt194
-rw-r--r--Master/texmf-dist/doc/latex/cdpbundl/manifest.txt36
-rw-r--r--Master/texmf-dist/doc/latex/cdpbundl/overview.pdfbin678930 -> 679245 bytes
-rw-r--r--Master/texmf-dist/doc/latex/coordsys/README19
-rw-r--r--Master/texmf-dist/doc/latex/coordsys/coordsys.pdf1780
-rw-r--r--Master/texmf-dist/doc/latex/coordsys/putfile.26
-rw-r--r--Master/texmf-dist/doc/latex/dramatist/README25
-rw-r--r--Master/texmf-dist/doc/latex/dramatist/dramatist.pdfbin332110 -> 285539 bytes
-rw-r--r--Master/texmf-dist/doc/latex/dramatist/marlowe-poemscol.tex2
-rw-r--r--Master/texmf-dist/doc/latex/dramatist/marlowe-verse.tex2
-rw-r--r--Master/texmf-dist/doc/latex/dramatist/schiller.tex2
-rw-r--r--Master/texmf-dist/doc/latex/egplot/egplot.README4
-rw-r--r--Master/texmf-dist/doc/latex/egplot/manual.ps.gzbin236688 -> 150572 bytes
-rw-r--r--Master/texmf-dist/doc/latex/filecontents/README23
-rw-r--r--Master/texmf-dist/doc/latex/filecontents/filecontents.pdfbin125250 -> 181354 bytes
-rw-r--r--Master/texmf-dist/doc/latex/footbib/footbib.dvibin98664 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/footbib/footbib.pdfbin0 -> 261220 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jurabib/jbtest.pdfbin0 -> 62273 bytes
-rw-r--r--Master/texmf-dist/doc/latex/maybemath/README13
-rw-r--r--Master/texmf-dist/doc/latex/metaobj/license.txt2
-rw-r--r--Master/texmf-dist/doc/latex/metaplot/README12
-rw-r--r--Master/texmf-dist/doc/latex/mwcls/CZYTAJ2
-rw-r--r--Master/texmf-dist/doc/latex/mwcls/README2
-rw-r--r--Master/texmf-dist/fonts/source/public/dingbat/dingbat.mf244
-rw-r--r--Master/texmf-dist/metapost/metaplot/metaplot.mp15
-rw-r--r--Master/texmf-dist/source/latex/ccaption/ccaption.dtx27
-rw-r--r--Master/texmf-dist/source/latex/cdpbundl/cdpbundl.dtx876
-rw-r--r--Master/texmf-dist/source/latex/cdpbundl/cdpbundl.ins6
-rw-r--r--Master/texmf-dist/source/latex/coordsys/coordsys.dtx202
-rw-r--r--Master/texmf-dist/source/latex/coordsys/coordsys.ins102
-rw-r--r--Master/texmf-dist/source/latex/dramatist/dramatist.dtx144
-rw-r--r--Master/texmf-dist/source/latex/egplot/egplot.drv5
-rw-r--r--Master/texmf-dist/source/latex/egplot/egplot.dtx203
-rw-r--r--Master/texmf-dist/source/latex/egplot/egpman.drv5
-rw-r--r--Master/texmf-dist/source/latex/filecontents/filecontents.dtx54
-rw-r--r--Master/texmf-dist/source/latex/filecontents/filecontents.ins32
-rw-r--r--Master/texmf-dist/source/latex/footbib/footbib.dtx81
-rw-r--r--Master/texmf-dist/source/latex/footbib/footbib.ins12
-rw-r--r--Master/texmf-dist/tex/latex/ccaption/ccaption.sty8
-rw-r--r--Master/texmf-dist/tex/latex/cdpbundl/adiseal.sty8
-rw-r--r--Master/texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls49
-rw-r--r--Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty13
-rw-r--r--Master/texmf-dist/tex/latex/cdpbundl/cdpshues-example.def4
-rw-r--r--Master/texmf-dist/tex/latex/cdpbundl/cdpshues.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/cdpbundl/epson-stylus-740.def4
-rw-r--r--Master/texmf-dist/tex/latex/cdpbundl/hp-laserjet-4500.def4
-rw-r--r--Master/texmf-dist/tex/latex/cdpbundl/lettcdpadi.cls8
-rw-r--r--Master/texmf-dist/tex/latex/cdpbundl/letteracdp.cls49
-rw-r--r--Master/texmf-dist/tex/latex/clefval/clefval.sty2
-rw-r--r--Master/texmf-dist/tex/latex/coordsys/coordsys.sty6
-rw-r--r--Master/texmf-dist/tex/latex/coordsys/logsys.sty6
-rw-r--r--Master/texmf-dist/tex/latex/dpfloat/dpfloat.sty42
-rw-r--r--Master/texmf-dist/tex/latex/dramatist/dramatist.sty92
-rw-r--r--Master/texmf-dist/tex/latex/egplot/egplot.sty94
-rw-r--r--Master/texmf-dist/tex/latex/filecontents/filecontents.sty18
-rw-r--r--Master/texmf-dist/tex/latex/footbib/footbib.sty25
-rw-r--r--Master/texmf-dist/tex/latex/jurabib/frjbbib.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/lcd/lcd.sty26
-rw-r--r--Master/texmf-dist/tex/latex/maybemath/maybemath.sty85
-rw-r--r--Master/texmf-dist/tex/latex/pdfscreen/pdfscreen.sty15
-rw-r--r--Master/texmf-dist/tex/latex/pst-bar/pst-bar.sty1
-rw-r--r--Master/texmf-dist/tpm/ccaption.tpm8
-rw-r--r--Master/texmf-dist/tpm/cdpbundl.tpm8
-rw-r--r--Master/texmf-dist/tpm/chem-journal.tpm2
-rw-r--r--Master/texmf-dist/tpm/clefval.tpm4
-rw-r--r--Master/texmf-dist/tpm/coordsys.tpm8
-rw-r--r--Master/texmf-dist/tpm/dingbat.tpm4
-rw-r--r--Master/texmf-dist/tpm/dpfloat.tpm4
-rw-r--r--Master/texmf-dist/tpm/dramatist.tpm8
-rw-r--r--Master/texmf-dist/tpm/egplot.tpm8
-rw-r--r--Master/texmf-dist/tpm/filecontents.tpm8
-rw-r--r--Master/texmf-dist/tpm/footbib.tpm8
-rw-r--r--Master/texmf-dist/tpm/jurabib.tpm7
-rw-r--r--Master/texmf-dist/tpm/lcd.tpm4
-rw-r--r--Master/texmf-dist/tpm/maybemath.tpm6
-rw-r--r--Master/texmf-dist/tpm/metaobj.tpm2
-rw-r--r--Master/texmf-dist/tpm/metaplot.tpm6
-rw-r--r--Master/texmf-dist/tpm/mwcls.tpm2
-rw-r--r--Master/texmf-dist/tpm/pdfscreen.tpm4
-rw-r--r--Master/texmf-dist/tpm/pst-bar.tpm6
-rw-r--r--Master/texmf-dist/tpm/rsc.tpm2
-rw-r--r--Master/texmf/lists/footbib2
-rw-r--r--Master/texmf/lists/jurabib1
90 files changed, 3134 insertions, 2123 deletions
diff --git a/Master/texmf-dist/bibtex/bib/jurabib/jbtest.bib b/Master/texmf-dist/bibtex/bib/jurabib/jbtest.bib
index ab0fed42fee..e60d0ee2a70 100644
--- a/Master/texmf-dist/bibtex/bib/jurabib/jbtest.bib
+++ b/Master/texmf-dist/bibtex/bib/jurabib/jbtest.bib
@@ -115,7 +115,7 @@
@ARTICLE{eujenfrank,
author = {Heiko Eujen and Rainer Frank},
gender = {pm},
- title = {Anfechtung der Bevollm{\"a}chtigung nach Abschlu^^df des
+ title = {Anfechtung der Bevollm{\"a}chtigung nach Abschlu des
Vertretergesch{\"a}ftes\,?},
language = {german},
journal = {JZ},
diff --git a/Master/texmf-dist/bibtex/bst/chem-journal/jcc.bst b/Master/texmf-dist/bibtex/bst/chem-journal/jcc.bst
index 8370282bd53..3a7a60c2e47 100644
--- a/Master/texmf-dist/bibtex/bst/chem-journal/jcc.bst
+++ b/Master/texmf-dist/bibtex/bst/chem-journal/jcc.bst
@@ -1,18 +1,18 @@
-% BibTeX bibliography style `jcc' for J. Comp. Chem.
-% 1/26/96 Joerg-R. Hill
+% BibTeX bibliography style `jcc2005' for J. Comp. Chem.
+% 03 May 05 A. Cervellino
% no output of 'title' for 'article', 'book', 'inbook', 'incollection'
% no output of 'note' except in 'unpublished'
+% initials after the name, semicolons to separate authors,
+% etc. usw.
%
-% version 0.99a for BibTeX versions 0.99a or later, LaTeX version 2.09.
-% Copyright (C) 1985, all rights reserved.
+% for BibTeX versions 0.99a or later, LaTeX2e.
+% Copyright under Latex Project Public License (LPPL)
% Copying of this file is authorized only if either
% (1) you make absolutely no changes to your copy, including name, or
% (2) if you do make changes, you name it something other than
% btxbst.doc, plain.bst, unsrt.bst, alpha.bst, and abbrv.bst.
% This restriction helps ensure that all standard styles are identical.
-% The file btxbst.doc has the documentation for this style.
%
-% Fixed article, book references 11/10/92---CLF
ENTRY
{ address
@@ -231,6 +231,13 @@ FUNCTION {paren}
if$
}
+FUNCTION {comma}
+{ duplicate$ empty$
+ { pop$ "" }
+ { swap$ * "," * }
+ if$
+}
+
INTEGERS { nameptr namesleft numnames }
FUNCTION {format.names}
@@ -239,12 +246,12 @@ FUNCTION {format.names}
s num.names$ 'numnames :=
numnames 'namesleft :=
{ namesleft #0 > }
- { s nameptr "{f.~}{vv~}{ll}{, jj}" format.name$ 't :=
+ { s nameptr "{vv~}{ll,~}{jj,~}{f.}" format.name$ 't :=
nameptr #1 >
{ namesleft #1 >
- { ", " * t * }
+ { "; " * t * }
{ numnames #2 >
- { "," * }
+ { "" * }
'skip$
if$
t "others" =
@@ -325,7 +332,7 @@ FUNCTION {format.date}
if$
}
{ month empty$
- { year paren }
+ { year }
{ month " " * year paren }
if$
}
@@ -621,8 +628,8 @@ FUNCTION {article}
format.authors "author" output.check
crossref missing$
{ journal emphasize "journal" output.check
- format.vol.num.pages output new.item
format.date "year" output.check
+ format.vol.num.pages output new.item
}
{ format.article.crossref output.nonnull
format.pages output
diff --git a/Master/texmf-dist/bibtex/bst/rsc/rsc.bst b/Master/texmf-dist/bibtex/bst/rsc/rsc.bst
index 25d816ea9b8..856d6a976c2 100644
--- a/Master/texmf-dist/bibtex/bst/rsc/rsc.bst
+++ b/Master/texmf-dist/bibtex/bst/rsc/rsc.bst
@@ -1,50 +1,56 @@
% ----------------------------------------------------------------
% BibTeX bibliography style `rsc' for Dalton Trans.,
-% Org. Biomol. Chem., etc.
+% Org. Biomol. Chem., Chem. Commun., Phys. Chem. Chem. Phys., etc.
% ----------------------------------------------------------------
%
% ----------------------------------------------------------------
% Maintained by Joseph A. Wright
% E-mail: joseph.wright@morningstar2.co.uk
+% Released under the GNU General Public License
+% See http://www.gnu.org/licenses/gpl.txt
% ----------------------------------------------------------------
% ----------------------------------------------------------------
% History
+% 2006-10-30 Improvements to patent number handling; automatic
+% digit grouping. Patent assignee recognised from
+% organization field. Added support for non-standard
+% types as in achemso.bst
+% 2006-10-22 Added converters for edition numbers (to change
+% 1 to 1st, 2 to 2nd, etc.) from custom-bib
+% package.
% 2006-06-27 Substantial improvements to output consistency
-% with RSC style requirements
+% with RSC style requirements.
% Improved support for unpublished works, in press
% and so on.
% ----------------------------------------------------------------
%
% ----------------------------------------------------------------
-% Usage notes
-% 1) Patents. Patents can be saves as type 'patent' or 'other'
+% Usage notes:
+% 1) Other than the 'article' reference type, the RSC publication
+% rules give only limited guidance. I have therefore had to
+% look at a number of real-world examples, and pick the useage
+% I am happiest with. So of the layout is therefore more of
+% a personal preference than anything else.
+% 2) Patents. Patents can be saves as type 'patent' or 'other'
% Fill in as for article, and the correct formatting will
% result (Authors, "Journal", Year). Any other use of 'other'
-% will give the same result.
-% 2) Unpublished. If a journal is given (for example, for
+% will give the same result. Patent numbers are automatically
+% digit-grouped if they are purely made up of digits. Assignee
+% is given in the organization field.
+% 3) Unpublished. If a journal is given (for example, for
% submitted or in press articles), then this will be printed.
% Use the 'note' field for the status of the references
% (personal communication, in press, etc.)
-% 3) In press articles with DOI. If unpublished articles have
+% 4) In press articles with DOI. If unpublished articles have
% a DOI given, this will be given in the output, with
% the year added as well. In this case, no 'note' is added
-% 4) Miscellaneous (e.g. software). Use the 'howpublished' field
-% for organisation,address etc.
-% ----------------------------------------------------------------
-%
-% ----------------------------------------------------------------
-% Based on original file from BibTeX distribution. Notice from
-% that file is reproduced below:
-% ----------------------------------------------------------------
-% version 0.99a for BibTeX versions 0.99a or later, LaTeX version 2.09.
-% Copyright (C) 1985, all rights reserved.
-% Copying of this file is authorized only if either
-% (1) you make absolutely no changes to your copy, including name, or
-% (2) if you do make changes, you name it something other than
-% btxbst.doc, plain.bst, unsrt.bst, alpha.bst, and abbrv.bst.
-% This restriction helps ensure that all standard styles are identical.
-% The file btxbst.doc has the documentation for this style.
+% 5) Miscellaneous (e.g. software). Use the 'howpublished' field
+% for organisation, address etc.
+% 6) The non-standard types remark, inpress and submitted are
+% supported for compatibility with achemso.bst. Note that they
+% are implemented to act in the same way as the rest of this
+% style.
% ----------------------------------------------------------------
ENTRY
@@ -273,6 +279,127 @@ FUNCTION {paren}
if$
}
+% Some functions taken from custombib.tex
+FUNCTION {bbl.first}
+{ "1st" }
+
+FUNCTION {bbl.second}
+{ "2nd" }
+
+FUNCTION {bbl.third}
+{ "3rd" }
+
+FUNCTION {bbl.fourth}
+{ "4th" }
+
+FUNCTION {bbl.fifth}
+{ "5th" }
+
+FUNCTION {bbl.st}
+{ "st" }
+
+FUNCTION {bbl.nd}
+{ "nd" }
+
+FUNCTION {bbl.rd}
+{ "rd" }
+
+FUNCTION {bbl.th}
+{ "th" }
+
+FUNCTION {eng.ord}
+{ duplicate$ "1" swap$ *
+ #-2 #1 substring$ "1" =
+ { bbl.th * }
+ { duplicate$ #-1 #1 substring$
+ duplicate$ "1" =
+ { pop$ bbl.st * }
+ { duplicate$ "2" =
+ { pop$ bbl.nd * }
+ { "3" =
+ { bbl.rd * }
+ { bbl.th * }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {is.num}
+{ chr.to.int$
+ duplicate$ "0" chr.to.int$ < not
+ swap$ "9" chr.to.int$ > not and
+}
+
+FUNCTION {extract.num}
+{ duplicate$ 't :=
+ "" 's :=
+ { t empty$ not }
+ { t #1 #1 substring$
+ t #2 global.max$ substring$ 't :=
+ duplicate$ is.num
+ { s swap$ * 's := }
+ { pop$ "" 't := }
+ if$
+ }
+ while$
+ s empty$
+ 'skip$
+ { pop$ s }
+ if$
+}
+
+FUNCTION {bibinfo.check}
+{ swap$
+ duplicate$ missing$
+ {
+ pop$ pop$
+ ""
+ }
+ { duplicate$ empty$
+ {
+ swap$ pop$
+ }
+ { swap$
+ pop$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {convert.edition}
+{ extract.num "l" change.case$ 's :=
+ s "first" = s "1" = or
+ { bbl.first 't := }
+ { s "second" = s "2" = or
+ { bbl.second 't := }
+ { s "third" = s "3" = or
+ { bbl.third 't := }
+ { s "fourth" = s "4" = or
+ { bbl.fourth 't := }
+ { s "fifth" = s "5" = or
+ { bbl.fifth 't := }
+ { s #1 #1 substring$ is.num
+ { s eng.ord 't := }
+ { edition 't := }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ t
+}
+
INTEGERS { nameptr namesleft numnames }
FUNCTION {format.names}
@@ -325,6 +452,117 @@ FUNCTION {format.editors}
if$
}
+INTEGERS { a b }
+
+FUNCTION {mult}
+{
+ 'a := %% we store the first value
+ 'b := %% we store the second value
+
+ b #0 < %% We remember the sign of b, and
+ {#-1 #0 b - 'b :=} %% then consider its absolute value.
+ {#1} %%
+ if$ %%
+
+ #0 %% Put 0 on the stack.
+ {b #0 >} %% While b is strictly positive,
+ { %% we add a to the value on the stack
+ a + %% and decrement b.
+ b #1 - 'b := %%
+ } %%
+ while$ %%
+
+ swap$ %% Last, we take the opposite
+ 'skip$ %% if b was negative.
+ {#0 swap$ -} %%
+ if$ %%
+}
+
+FUNCTION {chr.to.value.silent} %% The ASCII code of a character
+{
+ chr.to.int$ #48 - %% ASCII value of "0" -> 48
+ duplicate$ duplicate$ %% "1" -> 49
+ #0 < swap$ #9 > or %% ...
+ { pop$ pop$ "0" #0 }
+ {}
+ if$
+}
+
+FUNCTION {str.to.int.aux.silent} %% The auxiliary function
+{
+ {duplicate$ empty$ not} %% While the string is not empty
+ { %% consider its first char
+ swap$ #10 mult 'a := %% and ``add'' it at the end of
+ duplicate$ #1 #1 substring$ %% the result.
+ chr.to.value.silent a +
+ swap$
+ #2 global.max$ substring$
+ }
+ while$
+ pop$
+}
+
+FUNCTION {str.to.int.silent}
+{ %% Handling negative values
+ duplicate$ #1 #1 substring$ "-" =
+ {#1 swap$ #2 global.max$ substring$}
+ {#0 swap$}
+ if$
+ %% Initialization, and then
+ #0 swap$ str.to.int.aux.silent %% call to the aux. funtion
+ swap$
+ {#0 swap$ -} %% And handle the sign.
+ {}
+ if$
+}
+
+% Two functions from Nicolas Markey
+
+FUNCTION{is.a.digit}
+{
+ duplicate$ "" =
+ {pop$ #0}
+ {chr.to.int$ #48 - duplicate$
+ #0 < swap$ #9 > or not}
+ if$
+}
+
+FUNCTION{is.a.number}
+{
+ {duplicate$ #1 #1 substring$ is.a.digit }
+ {#2 global.max$ substring$}
+ while$
+ "" =
+}
+
+FUNCTION {n.separate.multi}
+{ 't :=
+ ""
+ #0 'numnames :=
+ t text.length$ #4 > t is.a.number and % Test that t is both:
+ { % 1) a number
+ { t empty$ not } % 2) over four digits long
+ { t #-1 #1 substring$ is.num
+ { numnames #1 + 'numnames := }
+ { #0 'numnames := }
+ if$
+ t #-1 #1 substring$ swap$ *
+ t #-2 global.max$ substring$ 't :=
+ numnames #4 =
+ { duplicate$ #1 #1 substring$ swap$
+ #2 global.max$ substring$
+ "\," swap$ * *
+ #1 'numnames :=
+ }
+ 'skip$
+ if$
+ }
+ while$
+ }
+ { t swap$ * }
+ if$
+}
+
% Need a different format for books with editors
% than for editors in a collection
@@ -445,12 +683,15 @@ FUNCTION {format.number.series}
}
FUNCTION {format.edition}
-{ edition empty$
- { "" }
- { output.state mid.sentence =
- { edition "l" change.case$ " edn." * }
- { edition "t" change.case$ " edn." * }
- if$
+{ edition duplicate$ empty$ 'skip$
+ {
+ convert.edition
+ output.state mid.sentence =
+ { "l" }
+ { "t" }
+ if$ change.case$
+ "edn." bibinfo.check
+ " " * "edn." *
}
if$
}
@@ -499,6 +740,17 @@ FUNCTION {format.pages.nopp}
if$
}
+FUNCTION {format.pages.patent}
+{ pages empty$
+ { "there is no patent number for " cite$ * warning$ }
+ { pages multi.page.check
+ { pages n.dashify }
+ { pages n.separate.multi }
+ if$
+ }
+ if$
+}
+
FUNCTION {format.vol.num.pages}
{ volume boldface field.or.null
number empty$
@@ -640,11 +892,11 @@ FUNCTION {format.crossref.editor}
{ editor #1 "{vv~}{ll}" format.name$
editor num.names$ duplicate$
#2 >
- { pop$ " et~al." * }
+ { pop$ " \emph{et~al.}" * }
{ #2 <
'skip$
{ editor #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
- { " et~al." * }
+ { " \emph{et~al.}" * }
{ " and " * editor #2 "{vv~}{ll}" format.name$ * }
if$
}
@@ -725,10 +977,15 @@ FUNCTION {article}
FUNCTION {patent}
{ output.bibitem
- format.authors "author" output.check
+ organization empty$
+ { format.authors "author" output.check }
+ { format.authors
+ " (" organization ")" * * *
+ "author" output.check
+ }
+ if$
journal emphasize "journal" output.check
- " "
- format.pages.nopp output
+ format.pages.patent "pages" output.check
format.date "year" output.check
fin.entry
}
@@ -890,7 +1147,7 @@ FUNCTION {manual}
FUNCTION {mastersthesis}
{ output.bibitem
format.authors "author" output.check
- "M.Sc.~thesis" format.thesis.type output.nonnull
+ "M.Sc.~thesis" emphasize format.thesis.type output.nonnull
school "school" output.check
address output
format.date "year" output.check
@@ -912,7 +1169,7 @@ FUNCTION {misc}
FUNCTION {phdthesis}
{ output.bibitem
format.authors "author" output.check
- "Ph.D.~thesis" format.thesis.type output.nonnull
+ "Ph.D.~thesis" emphasize format.thesis.type output.nonnull
school "school" output.check
address output
format.date "year" output.check
@@ -981,6 +1238,33 @@ FUNCTION {unpublished}
fin.entry
}
+% The next three dunctions are taken from
+% achemso to provide compatiblity. They have
+% been modified to conform to the approach taken by
+% the rest of this style.
+
+FUNCTION { submitted }
+{ output.bibitem
+ format.authors "author" output.check
+ "submitted for publication in"
+ journal emphasize space.connect "journal" output.check
+ fin.entry
+}
+
+FUNCTION { inpress }
+{ output.bibitem
+ format.authors "author" output.check
+ journal emphasize "journal" output.check
+ "in press" output
+ fin.entry
+}
+
+FUNCTION { remark }
+{ output.bibitem
+ note "note" output.check
+ fin.entry
+}
+
FUNCTION {default.type} { misc }
MACRO {jan} {"January"}
diff --git a/Master/texmf-dist/doc/generic/pst-bar/LICENSE b/Master/texmf-dist/doc/generic/pst-bar/LICENSE
index 5758f0f0045..d0d0621559e 100644
--- a/Master/texmf-dist/doc/generic/pst-bar/LICENSE
+++ b/Master/texmf-dist/doc/generic/pst-bar/LICENSE
@@ -1,2 +1,2 @@
-This material is subject to the LaTeX Project Public License. See
-http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for details.
+This material is subject to the LaTeX Project Public License. See
+http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for details.
diff --git a/Master/texmf-dist/doc/generic/pst-bar/README b/Master/texmf-dist/doc/generic/pst-bar/README
index cab7a017cba..7ed6a090579 100644
--- a/Master/texmf-dist/doc/generic/pst-bar/README
+++ b/Master/texmf-dist/doc/generic/pst-bar/README
@@ -1,17 +1,17 @@
-With pst-bar, one may use pstricks to produce bar charts directly from a data
-file. This package is still in the beta stage --- the usual caveats pertaining
-to beta software apply. Additional features and improved (in both content and
-layout) documentation will be provided as the code stabilizes.
-
-INSTALLATION:
-
-pst-bar consists of three files: pst-bar.sty, pst-bar.tex, and pst-bar.pro.
-Place the first two anywhere your installation can find them (typically
-$LOCALTEXMF/tex/latex/pst-bar for pst-bar.sty and
-$LOCALTEXMF/tex/generic/pst-bar for pst-bar.tex). Place pst-bar.pro where dvips
-can find it, typically in the pstricks subdirectory of your dvips directory
-(i.e., $LOCALTEXMF/dvips/pstricks).
-
-DOCUMENTATION:
-
-See pst-bar-doc.ps or pst-bar-doc.pdf for details on using pst-bar.
+With pst-bar, one may use pstricks to produce bar charts directly from a data
+file. This package is still in the beta stage --- the usual caveats pertaining
+to beta software apply. Additional features and improved (in both content and
+layout) documentation will be provided as the code stabilizes.
+
+INSTALLATION:
+
+pst-bar consists of three files: pst-bar.sty, pst-bar.tex, and pst-bar.pro.
+Place the first two anywhere your installation can find them (typically
+$LOCALTEXMF/tex/latex/pst-bar for pst-bar.sty and
+$LOCALTEXMF/tex/generic/pst-bar for pst-bar.tex). Place pst-bar.pro where dvips
+can find it, typically in the pstricks subdirectory of your dvips directory
+(i.e., $LOCALTEXMF/dvips/pstricks).
+
+DOCUMENTATION:
+
+See pst-bar-doc.ps or pst-bar-doc.pdf for details on using pst-bar.
diff --git a/Master/texmf-dist/doc/latex/ccaption/README b/Master/texmf-dist/doc/latex/ccaption/README
index a3f3bdbed9c..7ab0ea913e8 100644
--- a/Master/texmf-dist/doc/latex/ccaption/README
+++ b/Master/texmf-dist/doc/latex/ccaption/README
@@ -7,6 +7,9 @@ Tools are provided for defining your own captioning styles.
The packagehas been tested in conjunction with the rotating, caption2,
subfigure, sidecap, endfloat, longtable, xtab, tocloft and hyperref packages.
+Changes in version 3.2a (2005/03/29)
+o Fixed a labelling problem with bilingual captions
+
Changes in version 3.2 (2005/03/21)
o New commands for bilingual captions in longtables
@@ -110,7 +113,7 @@ o Print ccaption.dvi for a hardcopy of the package manual
o Move ccaption.sty to a location where LaTeX will find it
(see the FAQ http://www.tex.ac.uk/faq for more about this).
-2005/03/21
+2005/03/29
Peter Wilson
herries dot press at earthlink dot net
diff --git a/Master/texmf-dist/doc/latex/ccaption/ccaption.pdf b/Master/texmf-dist/doc/latex/ccaption/ccaption.pdf
index df982408827..27ca02b652c 100644
--- a/Master/texmf-dist/doc/latex/ccaption/ccaption.pdf
+++ b/Master/texmf-dist/doc/latex/ccaption/ccaption.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cdpbundl/00readme.txt b/Master/texmf-dist/doc/latex/cdpbundl/00readme.txt
index 0ee85668d63..a6e828117d0 100644
--- a/Master/texmf-dist/doc/latex/cdpbundl/00readme.txt
+++ b/Master/texmf-dist/doc/latex/cdpbundl/00readme.txt
@@ -4,7 +4,7 @@ This is file `00readme.txt'.
This file is part of a work named "C.D.P. Bundle".
-Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
+Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
The C.D.P. Bundle may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -26,7 +26,7 @@ This file, after giving a brief description of the C.D.P. Bundle,
explains how to install it and how to generate its--alas, still
incomplete!--documentation.
-January 1, 2005
+January 1, 2006 (vers. 0.34)
@@ -45,19 +45,18 @@ CONTENTS
A DOZEN LINES DESCRIPTION OF THE SOFTWARE
=========================================
-The C.D.P. Bundle was originally developed for a free association
-named "C.D.P." (more on it in the documentation), to typeset its
-official letters with the appropriate letterhead; but more generally,
-it can be used to typeset high-quality business letters formatted
-according to Italian style conventions. It is highly configurable,
-and its modular structure provides you with building blocks of
-increasing level, by means of which you can compose practically every
-kind of business letter you could need (including anglo-saxon ones!).
-It is also possible to write letters divided into sections and
-paragraphs, to include floating figures and tables, and to use the
-commands "\tableofcontents", "\listoffigures", and "\listoftables" to
-compile the relevant indexes. A single input file can contain several
-letters, and each letter will have its own table of contents, etc.,
+The C.D.P. Bundle was originally developed for a free association named
+"C.D.P." (more on it in the documentation), to typeset its official letters
+with the appropriate letterhead; but more generally, it can be used to
+typeset high-quality business letters formatted according to Italian style
+conventions. It is highly configurable, and its modular structure provides
+you with building blocks of increasing level, by means of which you can
+compose practically every kind of business letter you could need (including
+anglo-saxon ones!). It is also possible to write letters divided into
+sections and paragraphs, to include floating figures and tables, and to use
+the commands "\tableofcontents", "\listoffigures", and "\listoftables" to
+compile the relevant indexes. A single input file can contain several
+letters, and each letter will have its own table of contents, etc.,
independent from the other ones.
@@ -65,24 +64,24 @@ independent from the other ones.
DRAWBACKS
=========
-The documentation included in this distribution is absolutely minimal.
-For meaningful instructions on how to use the macros, the reader is
-referred to other documents available at the web site of the author's
-department, which, however, are written in Italian. Since the main
-purpose of these macros is to typeset letters according to Italian
-conventions, this should not be a problem. I shall consider translating
-the documentation in English only if at least 5 persons ask me to.
+The documentation included in this distribution is absolutely minimal. For
+meaningful instructions on how to use the macros, the reader is referred to
+other documents available at the web site of the author's department,
+which, however, are written in Italian. Since the main purpose of these
+macros is to typeset letters according to Italian conventions, this should
+not be a problem. I will consider translating the documentation in English
+only if at least 5 persons ask me to.
INSTALLATION IN A SNAPSHOT
==========================
-The C.D.P. Bundle is distributed in the usual .dtx + .ins format. The
-main file is `cdpbundl.dtx', with installation script `cdpbundl.ins'.
-Do the usual things to install it and to generate the documentation.
-If you don't know what the usual things are, read below. Note that to
-generate the documentation you should do the following:
+The C.D.P. Bundle is distributed in the usual .dtx + .ins format. The main
+file is `cdpbundl.dtx', with installation script `cdpbundl.ins'. Do the
+usual things to install it and to generate the documentation. If you don't
+know what the usual things are, read below. Note that in order to generate
+the documentation you should do the following:
latex; latex; makeindex (.idx); makeindex (.glo); latex; latex.
@@ -91,17 +90,17 @@ latex; latex; makeindex (.idx); makeindex (.glo); latex; latex.
CHECKING THE CONTENTS OF THE DISTRIBUTION
=========================================
-Before installing the C.D.P. Bundle and generating its documentation, it
-is a good idea to read the file `manifest.txt', which lists all the
-files that make up the distribution, to check that you don't lack any of
-them (in particular, that you have the file `manifest.txt' itself!). If
-you do find that some files are missing, don't hesitate to complain to
-the distributor from whom you obtained the others: this person, company,
-or institution is infringing the copyright (actually, the copyleft) of
-the C.D.P. Bundle. Please remember, however, that in order to comply
-with the copyright a distributor is only requested to supply the files
-listed in `manifest.txt' under the title "MEANING OF THE TERM `Work'",
-and not those listed under "MEANING OF THE TERM `Compiled Work'".
+Before installing the C.D.P. Bundle and generating its documentation, it is
+a good idea to read the file `manifest.txt', which lists all the files that
+make up the distribution, to check that you don't lack any of them (in
+particular, that you have the file `manifest.txt' itself!). If you do find
+that some files are missing, don't hesitate to complain to the distributor
+from whom you obtained the others: this person, company, or institution is
+infringing the copyright (actually, the copyleft) of the C.D.P. Bundle.
+Please remember, however, that in order to comply with the copyright a
+distributor is only requested to supply the files listed in `manifest.txt'
+under the title "MEANING OF THE TERM `Work'", but not those listed under
+"MEANING OF THE TERM `Compiled Work'".
@@ -110,13 +109,12 @@ HOW TO INSTALL THE C.D.P. BUNDLE
To install the C.D.P. Bundle, follow these steps:
-1) Make sure that the files `cdpbundl.dtx' and `cdpbundl.ins' are placed
-in the same directory; below, we shall indicate this directory as "the
-current directory".
+1) Make sure that the files `cdpbundl.dtx' and `cdpbundl.ins' are placed in
+the same directory; below, we shall indicate this directory as "the current
+directory".
-2) Run LaTeX (or Plain TeX) once on the file `cdpbundl.ins'. This
-will generate, in the current directory, the following LaTeX input
-files:
+2) Run LaTeX (or Plain TeX) once on the file `cdpbundl.ins'. This will
+generate, in the current directory, the following LaTeX input files:
adiseal.sty
articoletteracdp.cls
@@ -128,39 +126,38 @@ files:
lettcdpadi.cls
letteracdp.cls
-3) Move all the files listed in 2) from the current directory to a
-LaTeX input directory--see b) and c) below.
+3) Move all the files listed in 2) from the current directory to a LaTeX
+input directory--see b) and c) below.
4) If you wish, delete the file `cdpbundl.log' to save disk space.
Installation is now finished! The following comments may be useful:
-a) The above listing of all the files you need to move is also
-displayed on the terminal at the end of the run of the file
-`cdpbundl.ins'.
-
-b) The documentation of your TeX installation should tell you how to
-find the LaTeX input directory/ies, and probably also how to create
-new LaTeX input directories reserved to hold your private classes and
-packages. If your TeX installation offers you the chance of defining
-your private LaTeX input directories, I recommend you exploit this
-possibility and place the generated files into such a directory.
-
-c) If you are not able to find the LaTeX input directories, or you are
-not allowed to modify them and cannot create your personal LaTeX input
-directories, do this: place all the files listed under 2) above in any
-directory of your choice (a newly created, empty directory would be
-the best choice, however); then put all the LaTeX source files that
-you want to typeset using the C.D.P. Bundle in that same directory.
-Of course, this solution becomes impractical if the number of such
-source files exceeds a dozen or so; but for a few files you can do
-this way, at least until you decide to finally learn how to create
-your private LaTeX input directories! :-)
-
-d) You may also choose to install the C.D.P. Bundle inside the main
-texmf tree of your TeX installation (as opposed to installing it inside
-a directory devoted to private classes and packages). In this case,
-note that the TDS-compliant location for the C.D.P. Bundle, that is, the
+a) The above listing of all the files you need to move is also displayed on
+the terminal at the end of the run of the file `cdpbundl.ins'.
+
+b) The documentation of your TeX installation should tell you how to find
+the LaTeX input directory/ies, and probably also how to create new LaTeX
+input directories reserved to hold your private classes and packages. If
+your TeX installation offers you the chance of defining your private LaTeX
+input directories, I recommend you exploit this possibility and place the
+generated files into such a directory.
+
+c) If you are not able to find the LaTeX input directories, or you are not
+allowed to modify them and cannot create your personal LaTeX input
+directories, do this: place all the files listed under 2) above in any
+directory of your choice (a newly created, empty directory would be the
+best choice, however); then put all the LaTeX source files that you want to
+typeset using the C.D.P. Bundle in that same directory. Of course, this
+solution becomes impractical if the number of such source files exceeds a
+dozen or so; but for a few files you can do this way, at least until you
+decide to finally learn how to create your private LaTeX input directories!
+:-)
+
+d) You may also choose to install the C.D.P. Bundle inside the main texmf
+tree of your TeX installation (as opposed to installing it inside a
+directory devoted to private classes and packages). In this case, note
+that the TDS-compliant location for the C.D.P. Bundle, that is, the
directory inside which you should put all the files listed in 2), is
$TEXMF/tex/latex/cdpbundl/
@@ -169,44 +166,39 @@ The documentation, on the other hand, should be stored inside
$TEXMF/doc/latex/cdpbundl/
-Of course, in order to do so you must have appropriate access
-priviledges to the texmf tree of your site.
+Of course, in order to do so you must have appropriate access priviledges
+to the texmf tree of your site.
HOW TO GENERATE THE DOCUMENTATION
=================================
-A shortened form of the documentation, already typeset and packaged in
-PDF format, is given in the file `overview.pdf' that you might have
-found on some sites (e.g., the CTAN sites). This file, however, is
-not part of the C.D.P. Bundle and distributors are not requested to
-include it among the distributed files. Moreover, it does not contain
-any implementation notes (in which most users are not at all
-interested).
+A shortened form of the documentation, already typeset and packaged in PDF
+format, is given in the file `overview.pdf' that you might have found on
+some sites (e.g., the CTAN sites). This file, however, is not part of the
+C.D.P. Bundle and distributors are not requested to include it among the
+distributed files. Moreover, it does not contain any implementation notes
+(in which most users are not at all interested).
-If the distributor from whom you obtained the C.D.P. Bundle did not
-provide the file `overview.pdf', or if you want the full
-documentation, complete with all the available implementation notes
-(but, alas, still incomplete for many respects), you can generate it
-by following these steps:
+If the distributor from whom you obtained the C.D.P. Bundle did not provide
+the file `overview.pdf', or if you want the full documentation, complete
+with all the available implementation notes (but, alas, still incomplete
+for many respects), you can generate it by following these steps:
1) Run LaTeX (_not_ Plain TeX) _twice_ on the file `cdpbundl.dtx'.
This, among other things, will generate the files `cdpbundl.idx' and
`cdpbundl.glo' in the same directory as the file `cdpbundl.dtx'.
-2) Run MakeIndex on the file `cdpbundl.idx' obtained in 1), using the
-style file `gind.sty', which is part of the standard LaTeX
-distribution.
+2) Run MakeIndex on the file `cdpbundl.idx' obtained in 1), using the style
+file `gind.sty', which is part of the standard LaTeX distribution.
-3) Run MakeIndex on the file `cdpbundl.glo' obtained in 1), using the
-style file `gglo.sty', which is part of the standard LaTeX
-distribution.
+3) Run MakeIndex on the file `cdpbundl.glo' obtained in 1), using the style
+file `gglo.sty', which is part of the standard LaTeX distribution.
4) Run LaTeX _two_ more times on the file `cdpbundl.dtx'.
-5) If you wish, you can now delete the following files, to save disk
-space:
+5) If you wish, you can now delete the following files, to save disk space:
cdpbundl.aux
cdpbundl.glo
@@ -218,12 +210,16 @@ space:
cdpbundl.log
cdpbundl.toc
-After step 4), you should get the documentation in DVI format in the
-file `cdpbundl.dvi', located in the same directory as `cdpbundl.dtx',
-with all indexes, table of contents, etc. correctly set.
+After step 4), you should get the documentation in DVI format in the file
+`cdpbundl.dvi', located in the same directory as `cdpbundl.dtx', with all
+indexes, table of contents, etc. correctly set.
-However, if you are neurotic (as I am) and have a fast computer, you
-could run LaTeX three or four times, instead of two, in step 1)... :-)
+However, if you are neurotic (as I am) and have a fast computer, you could
+run LaTeX three or four times, instead of two, in step 1)... :-)
+
+Other LaTeX typesetting engines should work in the same way, perhaps
+producing the output in a different format; for example, you may use
+pdflatex in place of LaTeX to obtain the documentation in PDF format.
diff --git a/Master/texmf-dist/doc/latex/cdpbundl/manifest.txt b/Master/texmf-dist/doc/latex/cdpbundl/manifest.txt
index 9edb5780a4e..4c63e5af5c7 100644
--- a/Master/texmf-dist/doc/latex/cdpbundl/manifest.txt
+++ b/Master/texmf-dist/doc/latex/cdpbundl/manifest.txt
@@ -3,7 +3,7 @@ This is file `manifest.txt'.
This file is part of a work named "C.D.P. Bundle".
-Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
+Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
The C.D.P. Bundle may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -21,23 +21,23 @@ precisely, it explains how the locutions "Work" and "Compiled Work",
used in the LaTeX Project Public License, are to be interpreted
in the case of this work.
-January 1, 2005
+January 1, 2006 (vers. 0.34)
MEANING OF THE TERM "Work"
==========================
-In the case of the C.D.P. Bundle, the "Work" is the collection of
-the following 4 files:
+In the case of the C.D.P. Bundle, the "Work" is the collection of the
+following 4 files:
00readme.txt -- start by reading this file
-manifest.txt -- this file
+manifest.txt -- the file you are reading now
cdpbundl.dtx -- main source file
cdpbundl.ins -- installation script
-If you have received the 4 files listed above, you posses an integral
-copy of the C.D.P. Bundle.
+If you have received the 4 files listed above, you possess an integral copy
+of the C.D.P. Bundle.
@@ -70,30 +70,32 @@ following one:
cdpbundl.pdf -- documentation in PDF format
-but at least one among the files `cdpbundl.dvi' and `cdpbundl.pdf' must
-be included in a "Compiled Work" that you want to distribute. The file
-`cdpbundl.pdf' is obtained by submitting to the program pdfTeX the file
-`cdpbundl.dtx'.
+but at least one among the files `cdpbundl.dvi' and `cdpbundl.pdf' must be
+included in a "Compiled Work" that you want to distribute. The file
+`cdpbundl.pdf' is obtained by submitting to the program pdflatex the file
+`cdpbundl.dtx', following the same steps as those explained in
+`00readme.txt' under the title "How to generate the documentation".
ANCILLARY FILES
===============
-The package of files distributed through the Comprehensive TeX Archive
+The package of files distributed through the Comprehensive TeX Archive
Network (CTAN) includes also the following two files:
README -- guide to directory contents
overview.pdf -- general information on the C.D.P. Bundle (PDF)
-This two files are included only for informative purposes and are _not_
-part of the C.D.P. Bundle.
+These two files are included only for informative purposes and are _not_ a
+required part of the C.D.P. Bundle (of course you may, if you wish, include
+them in your distribution too).
COMMENT
=======
-Please remember that, in order to distribute a functionally integral
-copy of the C.D.P. Bundle, it suffices to distribute only the 4 files
-that constitute the "Work".
+Please remember that, in order to distribute a LPPL-compliant copy of the
+C.D.P. Bundle, it suffices to distribute only the 4 files that constitute
+the "Work".
diff --git a/Master/texmf-dist/doc/latex/cdpbundl/overview.pdf b/Master/texmf-dist/doc/latex/cdpbundl/overview.pdf
index 86da1fb9a59..2d93205b58f 100644
--- a/Master/texmf-dist/doc/latex/cdpbundl/overview.pdf
+++ b/Master/texmf-dist/doc/latex/cdpbundl/overview.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/coordsys/README b/Master/texmf-dist/doc/latex/coordsys/README
index 48e03ad476d..f44f40d8245 100644
--- a/Master/texmf-dist/doc/latex/coordsys/README
+++ b/Master/texmf-dist/doc/latex/coordsys/README
@@ -1,11 +1,8 @@
-The coordsys and logsys packages draw Cartesian and logarithmic
-coordinate systems, number lines, and grids in a variety of
-styles.
-
-New in this version:
-
- * New commands for drawing intervals.
- * Improved interaction with Maple (exporting curves from Maple).
- * Improved algorithm for avoiding collision between tick marks
- and arrowheads.
- * Automatics interaction with the color package.
+The coordsys and logsys packages draw Cartesian and logarithmic
+coordinate systems, number lines, and grids in a variety of
+styles. Moreover, these packages include commands for drawing
+intervals and for exporting curves from Maple to LaTeX.
+
+This material is subject to the LaTeX Project Public License.
+See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
+for the details of that license.
diff --git a/Master/texmf-dist/doc/latex/coordsys/coordsys.pdf b/Master/texmf-dist/doc/latex/coordsys/coordsys.pdf
index 3d9b3e1cd56..83da6b40235 100644
--- a/Master/texmf-dist/doc/latex/coordsys/coordsys.pdf
+++ b/Master/texmf-dist/doc/latex/coordsys/coordsys.pdf
@@ -5,7 +5,7 @@
/Subtype/Type1
/Name/F1
/FontDescriptor 8 0 R
-/BaseFont/MWHCZK+CMR17
+/BaseFont/XBTWGP+CMR17
/FirstChar 33
/LastChar 196
/Widths[249.6 458.6 772.1 458.6 772.1 719.8 249.6 354.1 354.1 458.6 719.8 249.6 301.9
@@ -27,7 +27,7 @@ endobj
/Subtype/Type1
/Name/F2
/FontDescriptor 11 0 R
-/BaseFont/RODGGG+CMSS17
+/BaseFont/NYTQEW+CMSS17
/FirstChar 33
/LastChar 196
/Widths[299.8 470.2 783.7 470.2 783.7 712.1 261.2 365.7 365.7 470.2 731.4 261.2 313.5
@@ -49,7 +49,7 @@ endobj
/Subtype/Type1
/Name/F3
/FontDescriptor 14 0 R
-/BaseFont/ONOYNM+CMSY10
+/BaseFont/EASVUQ+CMSY10
/FirstChar 33
/LastChar 196
/Widths[1000 500 500 1000 1000 1000 777.8 1000 1000 611.1 611.1 1000 1000 1000 777.8
@@ -70,7 +70,7 @@ endobj
/Subtype/Type1
/Name/F4
/FontDescriptor 17 0 R
-/BaseFont/ROKQYA+CMR12
+/BaseFont/PWBEBX+CMR12
/FirstChar 33
/LastChar 196
/Widths[272 489.6 816 489.6 816 761.6 272 380.8 380.8 489.6 761.6 272 326.4 272 489.6
@@ -91,7 +91,7 @@ endobj
/Subtype/Type1
/Name/F5
/FontDescriptor 20 0 R
-/BaseFont/YJGSTE+CMSY8
+/BaseFont/YKALFB+CMSY8
/FirstChar 33
/LastChar 196
/Widths[1062.5 531.3 531.3 1062.5 1062.5 1062.5 826.4 1062.5 1062.5 649.3 649.3 1062.5
@@ -113,7 +113,7 @@ endobj
/Subtype/Type1
/Name/F6
/FontDescriptor 23 0 R
-/BaseFont/XKWQLR+CMBX9
+/BaseFont/BKHRXO+CMBX9
/FirstChar 33
/LastChar 196
/Widths[360.2 617.6 986.1 591.7 986.1 920.4 328.7 460.2 460.2 591.7 920.4 328.7 394.4
@@ -135,7 +135,7 @@ endobj
/Subtype/Type1
/Name/F7
/FontDescriptor 26 0 R
-/BaseFont/DEGBGN+CMR9
+/BaseFont/IKAODM+CMR9
/FirstChar 33
/LastChar 196
/Widths[285.5 513.9 856.5 513.9 856.5 799.4 285.5 399.7 399.7 513.9 799.4 285.5 342.6
@@ -156,7 +156,7 @@ endobj
/Subtype/Type1
/Name/F8
/FontDescriptor 29 0 R
-/BaseFont/NLYOZQ+CMSS9
+/BaseFont/LHBVMG+CMSS9
/FirstChar 33
/LastChar 196
/Widths[325.6 513.9 856.5 513.9 856.5 779.3 285.5 399.7 399.7 513.9 799.4 285.5 342.6
@@ -178,7 +178,7 @@ endobj
/Subtype/Type1
/Name/F9
/FontDescriptor 32 0 R
-/BaseFont/TUBSIU+CMBX12
+/BaseFont/DCJTVD+CMBX12
/FirstChar 33
/LastChar 196
/Widths[342.6 581 937.5 562.5 937.5 875 312.5 437.5 437.5 562.5 875 312.5 375 312.5
@@ -199,7 +199,7 @@ endobj
/Subtype/Type1
/Name/F10
/FontDescriptor 35 0 R
-/BaseFont/GYSFKK+CMBX10
+/BaseFont/HZGQDS+CMBX10
/FirstChar 33
/LastChar 196
/Widths[350 602.8 958.3 575 958.3 894.4 319.4 447.2 447.2 575 894.4 319.4 383.3 319.4
@@ -220,7 +220,7 @@ endobj
/Subtype/Type1
/Name/F11
/FontDescriptor 38 0 R
-/BaseFont/MCSXTE+CMR10
+/BaseFont/ALATFI+CMR10
/FirstChar 33
/LastChar 196
/Widths[277.8 500 833.3 500 833.3 777.8 277.8 388.9 388.9 500 777.8 277.8 333.3 277.8
@@ -241,7 +241,7 @@ endobj
/Subtype/Type1
/Name/F12
/FontDescriptor 41 0 R
-/BaseFont/UEMZVW+CMSY6
+/BaseFont/QGOVZK+CMSY6
/FirstChar 33
/LastChar 196
/Widths[1222.2 638.9 638.9 1222.2 1222.2 1222.2 963 1222.2 1222.2 768.5 768.5 1222.2
@@ -262,7 +262,7 @@ endobj
/Subtype/Type1
/Name/F13
/FontDescriptor 44 0 R
-/BaseFont/VHDZXW+CMR8
+/BaseFont/LCWNEQ+CMR8
/FirstChar 33
/LastChar 196
/Widths[295.1 531.3 885.4 531.3 885.4 826.4 295.1 413.2 413.2 531.3 826.4 295.1 354.2
@@ -284,7 +284,7 @@ endobj
/Subtype/Type1
/Name/F14
/FontDescriptor 47 0 R
-/BaseFont/WBXGHI+CMSS8
+/BaseFont/ZOXODI+CMSS8
/FirstChar 33
/LastChar 196
/Widths[336.8 531.3 885.4 531.3 885.4 805.6 295.1 413.2 413.2 531.3 826.4 295.1 354.2
@@ -306,7 +306,7 @@ endobj
/Subtype/Type1
/Name/F15
/FontDescriptor 50 0 R
-/BaseFont/ZGOLMJ+CMR6
+/BaseFont/GJPBOO+CMR6
/FirstChar 33
/LastChar 196
/Widths[351.8 611.1 1000 611.1 1000 935.2 351.8 481.5 481.5 611.1 935.2 351.8 416.7
@@ -328,10 +328,14 @@ endobj
/Length 1545
>>
stream
-xXKo6WH+F|Wm]4Zۃbs5Hr!)Knd_"^l|3NVТVY1? .e_lK1C92&9"Y!d~g>zG14Y/6kqEewER)WIlTެ73X\LqR| 2ƨSaM35.sr)erf \ I(T,/I.nibכoY.F3+StUf3a6J*DpsRh1-<(aTopO5NFs.) Ҽ(cGL/Y4ƅ ,jg]ߖ evk1~
-MǪm8 T;|`Un5>;Ӹ!"vqvOӔٻ#"}35vd%ulPY,89>!CVZ<00Sv~]{xrdٞ~*nlLΎ3w*iܜN i]<43
-ɯ *<P]V\ctIHr
-L,J2&ABLZd[dn?Q(P;T%rfsfs%'enЀնKd,c4u:I+.L(j%8=<UXH<IRpD6q7-}ٞXaP@Xᆋe.q4%KȘ;ĸR\C!3\?Pɔ
+xXKo6WH+oWm]4Zۃbs5Hr!)Knd_"^l|3N(c* ?ƿ_M}:?z3^P+Ar6?G/(&UEf C63In(=Qj:I6FM
+)Tr/fZrqNkripaV(e(s˨sY.-[rIeJ4vKެ|r 5yU]ʦM"XE nX
+1SݲσM
+tYdt< -3GL1>.gLf3hr@Hu}[./V[ 8Lڧ5jNSv*%p%KdEVȪY#-L.KYc|۴Hso.z}_5A[#gsRWMnG \D.,) p}X6uD0d|NA@jo[oȄ| \UY#=#aGWod1C?j>8CЎNbCq4&{V; N#3qPUO" Ա_W $ $YngJD`:̝k7 SB|n<6Lr
+, Jgf}JB|:9Vb,=Ut9C 3 Np 5]> ŗأrB;%VSLP}뺋ԍqW]_Qh%Vq'N iRK@[W.Z֑'e:Hrգ@39hBvD i
+8()GbeUZ6á&RpNJʫư )Q=zkJjW?Xp+G8zŮWAQ| cLxd/!
+. 1+ut:$;m nAI%ؐh63/WKc %
++@ZK-,sBţ5ޙoa+ȩzmjL!d:'EEC؀.kO}mj*BMll.l}|X ~lelB'iÅKMr>-8/l7G\M 8EFg5VdhX"C'VvYK\|z8Mhz80?215n=7P W샫|8ɓ
endstream
endobj
55 0 obj
@@ -365,7 +369,7 @@ endobj
/Subtype/Type1
/Name/F16
/FontDescriptor 59 0 R
-/BaseFont/GPUPPB+CMSS10
+/BaseFont/HNSZSI+CMSS10
/FirstChar 33
/LastChar 196
/Widths[319.4 500 833.3 500 833.3 758.3 277.8 388.9 388.9 500 777.8 277.8 333.3 277.8
@@ -386,7 +390,7 @@ endobj
/Subtype/Type1
/Name/F17
/FontDescriptor 62 0 R
-/BaseFont/DZVZKK+CMTT10
+/BaseFont/IOUJGC+CMTT10
/FirstChar 33
/LastChar 196
/Widths[525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525
@@ -405,7 +409,7 @@ endobj
/Subtype/Type1
/Name/F18
/FontDescriptor 65 0 R
-/BaseFont/ZHMASC+CMTI10
+/BaseFont/ESTJUL+CMTI10
/FirstChar 33
/LastChar 196
/Widths[306.7 514.4 817.8 769.1 817.8 766.7 306.7 408.9 408.9 511.1 766.7 306.7 357.8
@@ -426,7 +430,7 @@ endobj
/Subtype/Type1
/Name/F19
/FontDescriptor 68 0 R
-/BaseFont/LJJGGB+CMTT9
+/BaseFont/XTKISF+CMTT9
/FirstChar 33
/LastChar 196
/Widths[525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525
@@ -445,7 +449,7 @@ endobj
/Subtype/Type1
/Name/F20
/FontDescriptor 71 0 R
-/BaseFont/NDEZJO+LINE10
+/BaseFont/NWDPJP+LINE10
/FirstChar 33
/LastChar 195
/Widths[1000 1000 1000 0 833.3 0 0 1000 1000 1000 1000 1000 1000 0 750 0 1000 0 1000
@@ -502,7 +506,7 @@ endobj
/Subtype/Type1
/Name/F21
/FontDescriptor 78 0 R
-/BaseFont/OVQWOV+CMMI10
+/BaseFont/GWGRXM+CMMI10
/FirstChar 33
/LastChar 196
/Widths[622.5 466.3 591.4 828.1 517 362.8 654.2 1000 1000 1000 1000 277.8 277.8 500
@@ -555,7 +559,7 @@ endobj
/Subtype/Type1
/Name/F22
/FontDescriptor 85 0 R
-/BaseFont/JAYYKT+CMR7
+/BaseFont/YFKMCR+CMR7
/FirstChar 33
/LastChar 196
/Widths[323.4 569.4 938.5 569.4 938.5 877 323.4 446.4 446.4 569.4 877 323.4 384.9
@@ -789,7 +793,7 @@ endobj
/Subtype/Type1
/Name/F23
/FontDescriptor 104 0 R
-/BaseFont/ZAJUJN+CMSY7
+/BaseFont/FKUFBP+CMSY7
/FirstChar 33
/LastChar 196
/Widths[1138.9 585.3 585.3 1138.9 1138.9 1138.9 892.9 1138.9 1138.9 708.3 708.3 1138.9
@@ -811,7 +815,7 @@ endobj
/Subtype/Type1
/Name/F24
/FontDescriptor 107 0 R
-/BaseFont/ANYURY+CMMI7
+/BaseFont/ETNNCI+CMMI7
/FirstChar 33
/LastChar 196
/Widths[719.7 539.7 689.9 950 592.7 439.2 751.4 1138.9 1138.9 1138.9 1138.9 339.3
@@ -830,26 +834,24 @@ endobj
109 0 obj
<<
/Filter[/FlateDecode]
-/Length 3252
+/Length 3424
>>
stream
-xڵ[KsWHU $6I6MRCFsH5Hx@=+n
-2WʎmLJxrY{vP
-t\UgT:= k-ηVTwϞYz\H˼xl}}v
-Km{t=-?oO Ђ
-6Cn0ĨNA|Fa#]g5=6z<7 Z&a]s0TЄq/ "k߳ ghL΂Bo;Dh344b MP9Җmek~ݴ~Hn#]}`B[wg|K#
-1YF`FHJ@Xk &Oوptg=f[H.tK%v TQ3p<CH|E98}B
-C/~3~'{9zJF0(*+4VThzl4>_( n[O.NU^XZM.M?ogqsUQpTyeFL&. L1A1 `#Z9ѹ=H b L܇SrD S!E7Fnff
-:we <teǛ6I&*SRTXQ񐔭pBnӭ/,m_QMʺж6|
-|\tk r\T*$y8Ą&wEX@%.vhq)01{؀[J7f܆҆V ~UEjCq#n_u9nG itlTjN/ g=}oyçMph}}
-=^̆o&PK1}o1m) _ _w1 !Ie^ |͈- }}+\֦L^9igOfaceq7(Lc{LZbv_;_"M2qP+:+9UNUuV{ W҆=h0Y5dGR媗qZ0Pf'+kQf *eJ
-@]RhX?mPw58ϟQ|C[F(/E ۷oX
-ƭMr!I>ט5JLe
-/^YBhA,bB,/+LhfFL$LH3
-GW$` iS3 `ZC)= )1ֈ L1AH#&n))ff=f[h
--Rhť&paN^UsqqShУ^)Rch(G`\8~o͈XN.jGвh0
-ܬ?5B<ݭcSͰS+6y(܁6h=k6b| >{Ùu< L62$r|RC"ѷ>ہ2fJk,mp
-wSs
+xڵ[o~_GHXEk@qy(MTV6. (S]|/Ӑ3$!?gVW|ǿ
+XeW7VN0[dY|L1f#Vv_Zu<!%wG(P յpL9_?7kxZZQl zoT ͮLLʲt׮7k*jϰtqz|x+W]@nGᅞ^?UGW_ k߄V+jz-`&uj/s`ގq|*ȏǦǻ> Qx<շt7@ -5\ܷ]󿖔3x{ovsto#[_k#ڵd|:hwUx7uznMBn堫kPq7y'1^k?og΀bowD}ߩ'|HYA(tP8Ҕl[ݵK6Go|vz>'~{"(Ԥ>5ww %l[9F1npO$0LԌq1-?e
+*~OʲlRJ\f`)= sVaL IT8!zh/WOZdJt\p *
+Mͫ(4@8+ˤI.QW+
+±M{}RcQsfB+?8:Yt
+P]1e'A9S Naz$`)qHa%I7A Ӗ"&sLn Ӕ8'L=l I@ꕗ[l%E#+fRb7_91(4Ʊ4V
+ia/ȯK 3{ gJe zW0<.7] LXZ6<J:_ -)0y"nh)
+ktuWL֏!Coo0hM\ng\_ZMI^~U0K=>w+̷ubͷ\X\q;;f:b'a'~þ掲x1Ih^ŌԐT4sE<oT@dΖ04 QiEޮ$
+Z ̲-:-аg&!lJӵ-: JVQ{Lǜ+1^0@_)zIO=u覡,c}Wwƶ.)ka]ߥގ7ۅz2&&$OMP
+eI< 0G6_d
+q=0nǘOƻmwxIh>Jß>;1ZfI:4B|`xE@]ý|']vopW:7fy{xlZ]dPQIYh_M=k3&/Vd^ь=W+޴x!sҥbոqjLƔm:CD|zAezBd^^}0O#g<H-C'sRA6tBcn j:VkHjqWjtB}VT݊[2n
+0 crt)id=-nBP~)W=T˝P XY,ƥfϊV{ckE=ֺ‡䩞뫤ЅNT'(
+Ojq%1.# Nz"xUR} fHD*ռXI[`F
+ͯ*zy_VHJ:]4;|П?C$.v[<mEzuxjn
+/3}6'G:lOLA)kͧzik0\+JXc7[ZuJ
endstream
endobj
110 0 obj
@@ -866,6 +868,8 @@ endobj
/F20 72 0 R
/F23 105 0 R
/F24 108 0 R
+/F15 51 0 R
+/F13 45 0 R
>>
endobj
102 0 obj
@@ -880,7 +884,7 @@ endobj
/Subtype/Type1
/Name/F25
/FontDescriptor 114 0 R
-/BaseFont/WSNUNX+CMTT8
+/BaseFont/QCLRYW+CMTT8
/FirstChar 33
/LastChar 196
/Widths[531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3
@@ -899,34 +903,35 @@ endobj
116 0 obj
<<
/Filter[/FlateDecode]
-/Length 2579
+/Length 2663
>>
stream
-xZKsWfJ/-&;8é!Dzx$8
-׫/3`cht
-RCfi?OgٛU.%U)dv͏>K|__ZVD0GIUDUsx6\V]s%|֧+Izu9RҽsL%yhADRj*F:\' &4,PM2tCHQRZMI$0X}Sy$^m$ JR̥&'
-d>1'L5Vcxl_m9t$J+'d J:`ؗSMmӻvmw~Iw/ӜN綹o@,XH3<)(M%$2H
-%34y&6pfE:`ngcE cw}0
-? mpvwhOad٨VjtrQU ,zsADj"hDŽ_ (l>WpN][Nh8V;GYtZR 㵐
-^0O[2
-HKWFgg> ~&*R~
-<AD*
- >D1=ޛ+hI `3c
-*KtL,ɐC21$#=!AJJ Kh h D#OH:&y
-JhQ $Hk B!)b!AF %D#OH$ D#OH'yBUMM4˞̈O8<#̐r4ȠQ@Rèa'qmE\>*3ɸusr 'JÕw+6,eE~呅H Rr@Dx *A
-BPR\zq .'nP2n1 /a'˷撘ql1ćwJVpiQUbRS$gBa諂-.M\2265s?tfycS*G=և>ZWl"nE3Oȑam(zm6:&U~<5v 41=􀎟؂BM⍄̃6)wPX,evW ǐz(I :g9gcbO!v:I}.D(no}sOC맏ۮ3fm*6l!MY<p7K#0`,ӑeT^N^~.n0S12HY"d ̑P#as7M@ Y
-hsdU6(HX2D@#5tL4
-X0GX0G5lD CR95 s2:&Yhs0Gәij<RSwҞk\-H23mw7p5 YXXA KV|mf M7Ȱ\ "C4o(PDNd_1JW&GC’Q"BZRR<XZi H(!BFHKX@⑘2L4$x
-hd )
-i HyB֌Zm%뫪qNd;YloWs,5ǽ?8Zqi`Vыr+<G
+xZs m?EAVb7ͦ(Qm%`
+΄P|@2)˱;\|j}?ȤZ|'Sϗڷ?#Af,Fa%
+cZ.0JuEldlHYE$EE<K^`@<͊m:]ol 91kce`Y^ܥl(jXKj
+UcfEuN4ĤKr/db$hS]O71^L X1OnRwƒceV0mYtZk!5*</v`JȊVӧs}^b-S,J._cw1xSث.[+K OhVJI4 `=a
+*)0 ]`G`HOHFHOH&x))e`b'$HHC|'$HL#<!A"b'L,B%F aIhQ $HX<($,Ik R4LDDHOHL4q'$HH#OɰǏY^s !k8`&
+O𖹚;2hF_4G֠XYSHzۥg0r91b
+G 5e7.}ߚAi
+5jXX\wdִWF A·s@9 לjCN.F/؋( *9aC,%`էjX=?8~|ٴ1ەZwtWjM5"yhE!X!L*eIW|F2 x
+(S x
+x]
+0+S`Ra<2X )3@X )3@o`Oy0a%Ha<J
+-P/ҵ츤2d*Y]+JTK ߨu-5aV-
+b1Dc!M MHϷtr83;$lOHKA*0۸i 3H!0-##i 3Hp>>fPF"D5r-Ӛ VKVS/^zodgVl{KSE^5W\04y.*
+VA@+m?<h)W}8@5.Hl#`ٝƧŸ
+qܬsNƠ%$3؟봁璓;r@#}Lp3 Cuv
+<PQWT0m>%vm&3r?.j
+i>堇
+f?&1q`g%ΘyBmۦ1d緹ϰ}j-a5߸uGϓ/y⹷]9+/Xi.
endstream
endobj
117 0 obj
<<
+/F11 39 0 R
/F17 63 0 R
/F3 15 0 R
/F18 66 0 R
-/F11 39 0 R
/F22 86 0 R
/F19 69 0 R
/F20 72 0 R
@@ -1069,7 +1074,7 @@ endobj
/Subtype/Type1
/Name/F26
/FontDescriptor 133 0 R
-/BaseFont/WUFVHX+LCIRCLE10
+/BaseFont/IWPXPG+LCIRCLE10
/FirstChar 33
/LastChar 195
/Widths[3600 3600 3600 4000 4000 4000 4000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -1087,7 +1092,7 @@ endobj
/Subtype/Type1
/Name/F27
/FontDescriptor 136 0 R
-/BaseFont/GCRFCN+CMMI8
+/BaseFont/RNOWPB+CMMI8
/FirstChar 33
/LastChar 196
/Widths[660.7 490.6 632.1 882.1 544.1 388.9 692.4 1062.5 1062.5 1062.5 1062.5 295.1
@@ -1117,10 +1122,10 @@ xYK8me /=0
GFN1HPv$_.*
^ȁ,Oe?~"$VP(sB-2d!'8jt 3N+1NOq0q#OqBG;3z2%9VT VZdꌜEI3"ia'3q'
Јp;
- LxN`P{{.[s-$ƺw$getH06lɤGky0IAH nq]]zF|x*8 CU G\04,~whsҤJG\ZdZw0۹T d*J
-*M_E;
-.dÛkׯ"(];5{4Ifl"Vwǝr)ͮyH@^?kn{>|U]sRt梈i啋by:H2H2&AYJZmΠ 3Nʼnf'8L0dd8=a@6qzBș_J/AKk]hӿZZ@X2ہ W65QNENH-tD2X)݅'E,ς:7. x{Ts8U]=}b7oh}+we'6BA?2PjaJr1)+o |GB&ػDZ jis=ޚ:ʸ5^X*̢ k[g9߳pDQaӝMM$
-Dݹ kypEW`g݇AG졂=d5}Ӂi 3^ FT2{﹩N0IpoR]OGN
+ LxN`P{{.[s-$ƺw$getH06lɤGky0IAH nq]]zF|x*8 CU G\04,~whsҤJG\ZdZw0۹T d*J
+-cwKk
+}澱QƍRc]dX:7#
+lj'P$hXC̓+
endstream
endobj
139 0 obj
@@ -1153,7 +1158,7 @@ endobj
/Subtype/Type1
/Name/F28
/FontDescriptor 143 0 R
-/BaseFont/HVFCTG+CMCSC10
+/BaseFont/BGZLHZ+CMCSC10
/FirstChar 33
/LastChar 196
/Widths[319.4 552.8 902.8 552.8 902.8 844.4 319.4 436.1 436.1 552.8 844.4 319.4 377.8
@@ -1172,7 +1177,7 @@ endobj
145 0 obj
<<
/Filter[/FlateDecode]
-/Length 3236
+/Length 3235
>>
stream
x[_oXKEJ
@@ -1181,13 +1186,17 @@ X9B,,"4r ,!B"b$4rsdx}FB,#-!Bs_#!3`k4b
k (\13X-%gG] 3<_ɋaKCUЩrbCRU_Tɟ]l3IE ?iq&?`Eg_1m`rIZ l./*?ؿ8/4A{!C20d%} "  h 3@$B "*󕱄 !B|e,aȰ D`"Pf -!B,e a:} b`.I0d>1PH ?f O| b }(c3@2!@Cұ$_.p.pRK\/SfQ0 U+uLt* S
s|vBъہˈ5$#Dsnۅ̄ MT^NtOjB "+s^c$:.kl|F6J ˙&LCFodZ2,K^\Yܟ:۞rM5{}XYZkt"9=D I@VXX}oΗ(W)+VPwV =㹑yfW|&Rkɒ.`_X{-{GxN=3dޠrr]s /f2f^X~ܬ~qf]?ԧH2yKwT*a@/f7E ;Q.x뾞AKh$D~4@hdezx!D:FZm3P:߿<Γ8pj,.9ы;,9
wF%nCnw\ ;#Wͧ~۫ iXHXQEG/l^gwKaglX
-x,??V8k er c!AK)? <iY -LAvW Oyj <iHMo
-?úIj(WvU/eKөma2W>EC[N54=nxn-މd,Py!kpf*;+yymx]^9XıڢQܓAn
-.,f;t>$ T&3U4&"j櫂7u4XE@rcd[ڎ 7*ޤT:M'S#ўz|b5~630wtAˁY@st:1W]ڬ|'_c[[W3~bێ}8!AF3 L6Î
-U[rxxYn `-iې8X:Áq`XD17]\ 7|Τ퀩Y
-6]XZLaVl(!TM@dŨvqhc&49X2
-h-=ޛ_ȶ3+ӢNۺ74{KgZPp4ř hX SrR D<Uvcv98~Xif'?-OKr(&Ӛ= M+7y5S"ʓzI Usf_w0$Qཅ<(su3KכM ~cafzTݍ7%cɾ. Go`ЎO ; ?m8ċ&wϮJWMOg~25_ I/ Te-6w$c/ 2
-ǯT,XX0-ؐ~ "^OAPq%hmk{#Se#׾soa=8%H42ݜ mm;fOOl3)苎B0<7
+x,??V8k er c!AK)? <iY -LAvW Oyj <+A0K}tSt
+:e|yDs sv;N,y[ӎ }mƀ#}pj0B.]ÖA1C9XSӶjW}:Dz F ^ڊgb#r(L6h%]7aJ9.xiLI1qfk9ʕ]`RtjfkXL&x<OlƖG|G M%Ƕpw"" d`}\(k
+5j}l
+`^{sWy9;qhdз[+/
+1EmGï>cW #Tz&LK@aGa*sl}N ~I<,
+
+ sk70Ɩ4mo,80,EG[>gv,NN.V@,xA0+XT6AN&mB2ebT T841v? BqhShT3 ?
+o4O K2̑z%8ݹ0[ 6J{`=|Ӊ'y@sP&-/䛶cA^Mv CմF)q
+g272ɧS 4;2jnf~Í>5; $cR֑it&IɥI
+:Fq&Z:| ꪶu!'$(m ;>dwhӶn$8ͦm(7Mq 1;C1
+"d mmBy}blw- 'iAԣ4njitm&}Q\?+
endstream
endobj
146 0 obj
@@ -1222,7 +1231,7 @@ endobj
/Subtype/Type1
/Name/F29
/FontDescriptor 150 0 R
-/BaseFont/ITRDAB+CMR5
+/BaseFont/YBQGDB+CMR5
/FirstChar 33
/LastChar 196
/Widths[402.8 680.6 1097.2 680.6 1097.2 1027.8 402.8 541.7 541.7 680.6 1027.8 402.8
@@ -1340,7 +1349,7 @@ endobj
/Subtype/Type1
/Name/F30
/FontDescriptor 161 0 R
-/BaseFont/TJJPKH+CMSY5
+/BaseFont/WUTMGY+CMSY5
/FirstChar 33
/LastChar 196
/Widths[1361.1 736.1 736.1 1361.1 1361.1 1361.1 1083.3 1361.1 1361.1 875 875 1361.1
@@ -1362,7 +1371,7 @@ endobj
/Subtype/Type1
/Name/F31
/FontDescriptor 164 0 R
-/BaseFont/CCGVHN+CMMI5
+/BaseFont/ZREWPU+CMMI5
/FirstChar 33
/LastChar 196
/Widths[886.4 674.7 855.3 1144.8 726 578.1 918.1 1361.1 1361.1 1361.1 1361.1 458.3
@@ -1489,23 +1498,16 @@ endobj
174 0 obj
<<
/Filter[/FlateDecode]
-/Length 2436
+/Length 2461
>>
stream
-xڭَ6}Bo+cZ$EJJ@$ 0@,d[iY2tbQtQ,źxc>gG}U:sw"4wZ@9|v?nw^݂9NrO3LoFnѤI"a-C\'? AɧM(7B'+@Pg.73#?,H-c)&#zcf$τtXm^qA7b=&h]Fyn-X`!dA#)+(<+ 0nRNqqKi FVnUyP1Mo6;f$JjZ)J2N}ܹK!PrǏ3#얃v 7G|Bʦ"F,@ܜxqZZ/ jڧ6!ND:H =޴}|^B{zqݕ`5G٤Y^6Kq}`{p$ TG(0W#Ij A=Ŕm(a#ےDN2
-ب&aO&Qzt!g\@x(X#k2d ZbcQhɺ Xo8
-H*#n킨dL:Kڪ~vfGkڪ]> Sx18o\ECq@.si~;m{ʛdA3w6T$3$S[Rk>n;khBDkf㜜
-A!چQ@J2 E% <`{Nf4'i^hkm
-!~Wr<;x]I LR&SMՉ[G\L!>pE~Q5Wk$P_5DuLd(>Y+=S`AJŏgME(n/GG/c"u+y G$S_!oZ]bۈ%#$uN
-ħ#PrՐlP)L (e &Z$l~nt?ruuMN 4{㖑q;vç9>+Se
-XLsj?L86 qIeXaUt} ׀]+W^$^h̺1 .p&i@Aذjط\S>-L|7+Qe
-J\Z)7.5OB51ip ڀT_\~К9rޕ nvrgU}s;Pʪi=E3 0Ư
-z㺵@{EA֍ihK)'
-zvaAxq8drme1T
-8[l_\"WR3_*a`oj6k vp
-Bk=sZ-/=NR`&9hZ3USmC k\[w Լ&2w&ZVng; 6 LE3̋9ZG a5YO~H>:ץr!EW=9jQ> 熒zq"k#
-4Z$\euR/lE̟pf4L`"}PK
-%Sћ,gA>ݘڰ Ye#:[ ~JGa[9
+xڭYݓ_[*I DRy9*Wy Y&xvǧ[-1_!VO5^{Oz?Vg?7^D1Ž,۟wBoxoo9v@(n}lC)L/]V S|~Ӷ2w>mD.̀T A<J ^q}odeU1 %KwhUNsW<0؊0dBz[YBGlN}iE_LrV%ӃMiVkR0dŎGǢs q}Oa$xLͦ=M-Sn7[:ud2=|,#Qs2F$ &ְ _Z Hf˕6xd[*Vʄl Ww}ZU)Zf
+?rÅz0+X9y qSƮ@D .- z
+6 (\
+r2#MWP R`ȖO]IܔafߦGz9"м
+D gUz7x]6J#8yaש..YS%zwf7N:_ gYB[8$)D>+ՀUWD DC:Ifۙ'84Aذ~eCǷ |S^-3Ӗ>-C2JZ[E7.-O2<
+OhSwJGOY4Lʚ(L?I0(k#1VV˸v<UUWUeg)v=MGMGi֛1"c9 Fן>
+i uk`=U
endstream
endobj
175 0 obj
@@ -1534,7 +1536,7 @@ endobj
/Subtype/Type1
/Name/F32
/FontDescriptor 179 0 R
-/BaseFont/DRACLL+CMTI9
+/BaseFont/BSWRLP+CMTI9
/FirstChar 33
/LastChar 196
/Widths[314.8 527.8 839.5 786.1 839.5 787 314.8 419.8 419.8 524.7 787 314.8 367.3
@@ -1552,16 +1554,13 @@ endobj
181 0 obj
<<
/Filter[/FlateDecode]
-/Length 1141
+/Length 1900
>>
stream
-x͙[6+wƊNޥ&i;H=Em&^
- FEa'?o[$L ##5Gt&yYMg$B2k8r}2lKޭ rm1{[^_WEYx^<)47x 'PC4@B#mW*3C2QLҖضB2y",<tD<*WjUzD6Wl͉0ʳ:+r"PeS6B
-KQL1DE$%Qwڣmaf>T<X7P
-Dn$;)q̌AW(C11aCo~Sw#x;04M,C@܂$9EY`!zUbKUE)tD򰛪G`jc^X-t!02w%=㎷w
-s؆`]NfԬqm廄$qA^[R {twũŒLPwHI "s3 =fXx#'thX_D{3}ujL\}JM:оeIӭw/>
-H:Kv3ZZw
-0=UzjOȬpPƖ>fyZ<v]_!NJf2ڧ~LcxbUVEn1tn|h|=|
+xZI6WhwmHr$3f*t%tMT0> ca`\޷0&}۽xodRwԄpn$d.(?'y/>2QH 'sJO̐ϛ\Y>3IOYTa_4JŨha?g]ُEZCK*?=,ܻH,̿i,de4"{)'-,9,
+
+0ΦZ
+Dx5OvEO<Ç#mȼ{xNY58W"D@( fiPWoYCkmGa|AO ;yWB}룬nM:!orzoGY֎!UcdU/Ȫj?eQV2Kܞz[9PrN(ZnG;?^Oa taXyCB9y_9Gn[6?vX ʹ5SgEvꣃqRtLh8bħpx!"kZ1"{>E2}#c4^6]oO*3t^OO: y=x[~?槀
endstream
endobj
182 0 obj
@@ -1587,7 +1586,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-33 -250 945 749]
-/FontName/MWHCZK+CMR17
+/FontName/XBTWGP+CMR17
/ItalicAngle 0
/StemV 53
/FontFile 7 0 R
@@ -1600,22 +1599,11 @@ endobj
/Length1 908
/Length2 2928
/Length3 533
-/Length 3569
+/Length 3568
>>
stream
-xgXSiH HQQ(0R
-
-V#h2HPGA$
-S ?_. `X<(r
-2
-CoceƭN^B57ȯZP*}t=<ө,6Y%_pf/(o1Ѻ~lMMzb=œ*z?nKN j/62
-CMC%[Fax,I*i,klpa_~mlD-L}2x?LT4Y]qphmɩ$7N/п]>,s!|9#ڌ'Ia/z_@p u;# R.2Y]*ҵP!j.y# ?+dSg}%&&9d/ ߛ-$q.~ _qٖ`q2<ײt\y6OD+3٪X>KHDm<4CqQu`'{dɖ6X
-Z?KNxU:d9^S) n]+yY. 5/tn8$5@S=vX9cџ˶Qrr݌3<GQ$&p*D#}ps:!YfyڣW(Y uC(#v~Z>H}V3!#Ƣ8uHP?%`E^р/N5 u҄&cwjkfѯf'i D)u>~ؐD+l$H+-UܰKn1c?$ϛ ݬh3m^ N(3c[.FĸoC-nŒ1w(7E`Ep Tk FS>ĮsJ]BJ+B<|aH'S'F낹,|1F67xPn 2w|| !ېfˮ|Ꚗ~Yyr_m|[D\UJ.tyTʳ_$G, "ATv50 f5Y4ow'n. o.kLH(Tڦ>QR~u
-P2g*^:B22&få)3Z篃?'iuŤK
-?^T-s*}d~2n
- 菼 ֡x}qqh!xJn:srC<]-
-E6ͺ<x߹
-y( o~ mgL7ҁ]7taJ6</DZ`-=n:l&^9 Qg-.+j1d:D%4DpV0VRgnlEw9Wg bAoQ,8\zۆm@Z6Z[mA=(jiPT9n,ke½]Ļ4)1b5H">Ø[OhP~x}:'*_9 e;LR<wzA?,Or90=l=4Ν xԲDLTmtΖs Vՙ
+xy<dzdYJV8YgcMe2fa3g]HC"[Y(d-T9z~}-u]_aAcIU "Ȓp)oR0: DqD *pEE8
+[+u>ӛ1˿?1UOÄ/\<=
endstream
endobj
11 0 obj
@@ -1625,7 +1613,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-58 -250 939 758]
-/FontName/RODGGG+CMSS17
+/FontName/NYTQEW+CMSS17
/ItalicAngle 0
/StemV 76
/FontFile 10 0 R
@@ -1641,20 +1629,21 @@ endobj
/Length 2556
>>
stream
-xy< B~ad Y#{cg 0̵'H&%{!:Wr[[N!A;t=u~|<Z1lmڻ
-XF0I!
-@
-A A&` LRw9{D~ڰ T
-ьN
-
-D$_]ǿvܜBHb
-q)M+=(xmiu5[r,d$~Ee }y퇩• ڧ3TƬ.e\9a>&>)6#w 9Pp (5ԧ2/.. :ΈJ\Q٭%Vw{frrɮ +iJ૕bLX!3ԥEk<N{<xdn os;Ɍs3ƋȊ|Cqiu AEycrk նån87N۞99sIEfP\5ܗ"7uqlՀsĴ)nڎ1ɊH A)}}m
--s|X0ϹBFt2|IɏBmӆt`v7 k^=qrɋ[(m2Gp9[]fJSVp9ּ
-h O:܆8+iFf-TeybHYtyUBXkXgp"#y߈\ْWcMng5-W|rHԲs75Bnx8it
-'~ol^|i6)n,NLp kKe8U%M /?7$!f.4W=L;*+)̻ы|S+c]㉢E-=M<'vq>T\@?FyŃw
-Q2ŃCicvҢuVi= bJV!Q ePD\/JqyķZ2Db <zO⪖AkmYjkн,or1T* Jyi^9~Fދ ޱ`e7xV8VP)~>k<=V~%Nlu1U@їsvag=`
-ѧ妑<!|w6aGJ=4ZwenRn lkoWJg}ipr\;kGGF"K5ˈ7XЈ(;4KieHHJP|njYA(23g"*G%P.Ul<}2` (o~2"N#S.\yXI7y8 RT CDS'2TrdL.7v{l׺UtUbǯqz+{HS+ eYY)[҅,|eZ4-K 9wo}:GY ң>PʶVDA_
-l @ɼ=!
+xy< B~adk}Kcaf$Ԥd/9$[ǒ]JYn bK)d9hqι۹<QQpt4!A :BX;ЂCTT "ifx 0`&H8Ga 
+B'AG
+p # $jA @$X?H" uSִ
+L/@S$i@ 0{:5?o\X܂M7<Jp~WЩ!l
+`1
+:79 Z(866X@ A$#S̏; p牢Gçi\޻)[//mgrghE3o4ū`ZOF.*OOM+&^[*JwsʑQ _5bUZf7/
+ҹ:7Rۉ[>-$]o$d4v)tlgE6ډ`&-9U}19؃QWT"vf)faO*RJFMV+L &k/JGLN
+F4:?OUԽ~t;/RX0{/˩xf{gSe) اkHgG5ae
+: <t,"3J24󿄜- ..-9
+]ٽ%NT(m7rO㖵 mU]W|%zgC3qPڗdkC[1lܹL\zκRd ߻7U &ͶU.1*
+>Zw&vd [*;u%68 bb{x:csT%%%|s]VP@ު|辶q 6Wλcq{U_Ŧ#'ɇ%S׈ɵv<|XӖ:Cx Z]Ly5~PvئP{X=՚CVJ_,/ ƨSB(w+97)&L F_++Ud̒kBAMg~ d5>(YM/*8o$#LϓSŊr+kbˆZmYGe`Ζov<kz5C'MS+TWh
+[̼Vb^wx5U.N;_YzwS^ bW8M;eI1</VLYʾoZtr!n0>w;$GSN"` I-
+LtuZpVx@*neiYdkΘݰIw]r-PMO' øz' %ݟXOP{@y9kGG$KH6ZT,;<Gie߅((jpBvZIa.T(2+w*&O!}P.W
+m:ZJJ0=z=`EyuXb]o@Ѽio}Lef =m [( )!B YJRFW:z<wjܪU*}W7xU_D(U|TmoA>[Wl
+% ?]ۿ>D85yF1_cjyGh /?Q@ gC
endstream
endobj
14 0 obj
@@ -1664,7 +1653,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-29 -960 1116 775]
-/FontName/ONOYNM+CMSY10
+/FontName/EASVUQ+CMSY10
/ItalicAngle -14.035
/StemV 85
/FontFile 13 0 R
@@ -1680,19 +1669,20 @@ endobj
/Length 2147
>>
stream
-xVk<TvFEVI\ ҅ruSٍ5cen0H.IɥK% \5{#̖DBMPvԮ>_|;֗yK{%n,w$ֶA
-m(| R
-d!$T
-pP!
-E
-ZL'bD
-""!
-8,G
-=7$.K7Nq'w1
-MZʦ]NϖYuu32u6Ld%nb3]3Kv/[-˯4._1ymXbѺQf?L'=sa iAO)N,M[%&צ/F2bVƜ˝vcqq waw(.pPOXub ?]E8L/vg+wvCOP5I7¼.Dlv|k)Ɖ%QxJʏE33NoC _rP9j]CYmW2! *[U*܋zH\tWΐrLOv˯/kNOHqK_u'?.IYZsx/ȿ=9*V[WmL旡ĭa`CpX8av8
-GStJaI.GK)ZlܩzΡ*;m{6k}%=U\EghI[nޣVSjR!QL@Ro5eIfRiv>=ν
-|4XuЙǶU.u?zlُWz?۰OM,!щkn,~ܣ%qUpN>ٳ]NрK p/<KæDXgSV²%a 6g?7=MwWrwE*1TooB~+Vv+K UT׹?rM:e+Nb]ybAkva:腍(A
-tw̅Q°\E$jvZapݳK곴K_z~au%h.θ.sAE ?5E dYA%ꁆN/l /"vΖ{o=ꨮю*ߦJD+*7y~ rɱ+*z{^ɴJZq$oUJQ{I<V*s23O^+06@mh. AMy{iI'^Թ|8ԫ "ȣU"LNY}=}RagAF}޺;)m (lP5+wJFN5 ΡUJ.,r]M0yZ'k1&3VkTU4=H ;3\d _Uu=;5&7ؐToHKji/qeJ 8نzB_֍+$11'$7gbk78QOL6w$~uLP񢍭/5XL[!MC}=]*S 'E.  sX~v
+xVy<T{FC#"E01,-%M6fΌٜa,IRRIB+"KYs/e$zM֗Rqԭ~~=qW9[8VOLk{<@Q0HC 2
+
+L
+kQ),y
+ sh ~g {ԖOaBTK6 C,H VHҜ >S<SdӾIn.hQ'
+rA
+`d?m<ꗚ!
+I=n5tx ;Ft8R4ju2Jהe/*JF4ޕ<\3RjH"͏˧{NdƸ_3S>/x7}Pm zs-uI,ẆICW1ZQKٴR.Y, 6mjg+vyu)?:QMz1R;w g}3:Le\yP艡Eilrĸ4Z𓛆Jјs9Sni{^Z
+"+bU7; dzŌ>7zjrJ?zG#բMvl~}-yq?x5J6.
+\,_!4 UǾv217'Mu)«ݏP,<1p܃vzAJ A3}a0wkջD{S\̳Lq9fr^b[]-\å#6휟jQ͏jMQ^kIdm물݄N
+W^ЪpũIӮěTFjw[#ﭗ1:#FkPU4O ;\dȅ_Vvޗ;5*7XXoHKlj'qyJi8zB$1~;1i~K'
++$7f`6m9QO4'~uW񤍮+1XtkA l݃ݝ*3R
+F&A.
+BE
endstream
endobj
17 0 obj
@@ -1702,7 +1692,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-34 -251 988 750]
-/FontName/ROKQYA+CMR12
+/FontName/PWBEBX+CMR12
/ItalicAngle 0
/StemV 65
/FontFile 16 0 R
@@ -1712,33 +1702,27 @@ endobj
16 0 obj
<<
/Filter[/FlateDecode]
-/Length1 1132
-/Length2 5007
+/Length1 1116
+/Length2 4931
/Length3 533
-/Length 5762
+/Length 5678
>>
stream
-xgXSk)҂"`
-+*)&KJ%$
-2Po ?%l I_8v"{m< c|Mj72qW oqWoGU)%c/frk^S_b"o{mg]#%نc=ZrvLʭ[M|Yn$RWރaV ~UR C#vE͂_j!,_]],_Һ4h9ubZ@GZ0ޗ6`qJ
-hGr,
-ȢH1&W> #[T ]xR:E$PlzYRZ)ǟݲǏdTYM~="cB8ȧmƫ4r$V9ht{řՓ&5C#[UӢ2n97y)/m_O(# y]6B6ee)$\?eIw+Mv2㤝6u.NOP3Gx顸=~Soh|K+8aPgm
-,`j8/qBo3Λ<ᆮiNr~*y=JÜOYa~ӒBqh5'mMHFs{}%sd\?焳YMWUC6MƇ*Yܽۤ=+CvN#e7C%&Y*̎O39V`y^0mv+T&i0lזMLv}D*IKGHtz/-mN٫ s?Y^şY+d%kRX!&Ed,=Իka.]IRX R'WiTT8U HөZݓm$46ˤ=AxM xՌsu!uX@U_k\~")(_18'-l+]2iʴ^#Hg9u)媷{SNwgTHϳihDYlEerouw[H̢V[+#tg|t$r5湐`#h؄1u
-F\y_>D7XppN>'qBi2p-~>YP\хjvRK''ՍTNo>lP 2#M?JT*ͅ+ V,p Yr<薢>pTy{u3D)AO]>B ej4 m`!|?}nڛ_~S\0¡Sj{ޑww\͇!{d26iA'$Ȅ.3-h-ksG,_Lf](&7竷1Y<U).sIZ~cƇS/ ) )hܚt裯j\ kkq_G$k[t\ G5DNӦGN Iݗv)D7&ϟ|[e1mba`R
-ۗ򥼚tk u')ȋ-$=)za`-z@uu\B
-Qi(jzP%ۻ݁R0o*{WCA;Z>yw򙡊ǴƵ}UJ !#j78ONH8
-2NuKg;Erm j9?BCtrj(8GV*cwI8㚊/i~ElUͥWL$WcN 7셋4kQ f,Y>#M=PogW`* pagi;-D3U5y"?$Meݽ
-؝Wh_)ǵcڭ <Y{ɼf@ku?w>tШK~r$<\09눞_SǢ#ZHJ>^{Ud@'IVvT
-ks";%BC{OFqa]^`G
-JK_1Kڲ
-k8Pȳ=F3?l8F]pz:XCߡL<H̦_J*кʈgFFWYط:j\ yCzZ*lz2#k^HkiFzeQD*ktzܵ#l-uȵaG2dؼrNLsSXmPg#^:7ryL>B*xxP/'dc֭pu'aS{*Dlx/AnǕsӌn,q\޳]T(@8mng/Gw(Zގş"n8,f`p^ʚCp209Tk B&F0)z.t)_^`%^2HwڪIa{|F{[Ylڭ֌9JeYrڣF͹.Ev6Q$w^
-D=t5_)};(~֫T`5ZCgQjaفRXqVH֩7`M%WsAuo:bW+|{7nl)r.+ 9f3AmLjٙ֨ aqRc%P$"z9?lCeٱS9NEt`Îic%7I#MP)C4!s[/5|d>7/)aBg8z,K%jV9ڕC5NAQh,i, 5Z3zf~w!<~l@v͟umjGo*
-wMu̫)P4uUj CO},% \}ؤc4#]1=e]6I8ʠΦո̄K!o,}"Q% M9`53$wdP%&N)&t]z񅜽auHP_N 6݇ /[6}:tB&5>h2zl>鷴l(`U>ױA؃@wQk>福9юP0 '-f{GUab$u S]rF}-mZJ'+EB
-9I 4ES
-NpNH~wΟ&_E<.dIz]+LVWR|@*PC1^cѺKOrJ2)މhڄyISՏD;%%bckЪT_z68JǙB
-nn PLzVy~$zs0᷍d (,'ur$|z$4E{(^yRUe1/m=Ϊ,5j>Amo$ߚꂷ ,]e7Fte"l6Y:~o"K [7v H*;e3rύ<Aht~#I>eCp6U=]$}ѫ3\ޱN4^##o <^&߸16n)n4v;w #U!iGtIyP+.%"Z?Ks;lt!ڰ0ÙEe;G!=mB#،8/I(SنFYUQ?s\^j.Ouk[4|#w?$lzQ L <9I2[avi9pB3}oܑl1vB?M*e ONlz+$\jTv7 ad'rv%Q'
-@,
-
+xy<-ن/kGֱ-{`f%&;eɒ-;&KBQ$dKP
+=N3==Ow^\/HRJqCcx)4XZ`iY
+@)9r/
+"١F@1Љ
+l&3:_/sabq&)UFi|90ݖ"37G`uH/^t x옆f9 }]JWOհ|.$$7Bؾtel'
+f Q3r`S+
+g̵.2ah+#)JZ}xp{giCH{ ?fӞ:N ;vmp zJᏯ|2ݘ)%N3z7(1Y12IdeZ\tr-I̝h\%{pX}%5^e`q$0$b&LDq̘ˡЇ!dC %DQ~\sFfvrٚ~`O6ic=yO/4[YI<cY{)%F Llsstނ޺Z(}߽Zo_g;3mpwGՅþz5kMqvw"CHR!'+yi LLt)Bo h+iLGH~[>ʖBr`Tk0%^  mEz?z?ryUFcYjPzbQ!-%hȭY+Hnn\&r
+nQ'h3gs?{oGQwCoӘSƣmq޾_fv~q[$M\q?lՖA9V~.D;̬zG38ooNE\z2 b)GTr*e_43UJ[3LvxCdl8HwUCeMXRDR{> /rt|lvNur[}? DhZmN@;g?|Sް- 6,jX΁]
+P) àx ёkі'. mF4 y I//}iZ_0Hyr#Ճjܸgzpgs͒uOҞKJK NmXzzOLɿ]͐ɊO)^`"#4q'Ӟgر".p &A<5l@%hA,
+ﳞOIJxe*]l9HVן_ahف?f)S013$
++c2fv%5j,~$},R2M|tf7马T)檻mn X##-&Vc ϗUF,Y< ˿ )֤e\*)(V39>}-nTB}eNP#ƍ]d~.$HQQ,nj&$Oa(+uNОն`?*MAͻD$Iw?v1F ڳ8K}ؗ O[lҚW0X0i۽=Y}{P aGdr&0jKKh
+щ]7($`v $*j:4u
+};y>@췕f\m[y#34ǙGCRÄf;T7y>9|(<C]\ZV sx;ex,dKȪR|w?}l{.r"Dϻ5
+8͌ġ8E'"_]ЧvDF3mBx
endstream
endobj
20 0 obj
@@ -1748,7 +1732,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-30 -955 1185 779]
-/FontName/YJGSTE+CMSY8
+/FontName/YKALFB+CMSY8
/ItalicAngle -14.035
/StemV 89
/FontFile 19 0 R
@@ -1764,14 +1748,15 @@ endobj
/Length 1873
>>
stream
-xRk8U̶L\F\Zmmȭ\B-{/bYi\tqt#9:2rI\F )b6sgs~ih!\oA
-
-aF G#(aF B>d 1aK>Q `h.NAfJ5Ov  N
-.5m;/+][3<V&r] hn7:ԫIi=4?lpPB=Gxh W5Ir|p!=OqRyU~,KuV_[pJI_mLojvuGTUhcRl^SG-{r7_ɕ>^:ZHSW=j%4dI3]sMMRҞͽvA3 j&Cq4O/<t3cP?ݷ_Y_p*63"5bsfaW`SqzT8_NnUQ }LL<4o_8 krU_%~s
-ݡo KMNE7`ο7st{#4M)t^қ폍>T_&<yR8Dm1UU0-g[ N)xo+v N!ʹd)=u(dk|Z𷬋KTx$_-p s PvN ;5|?JH@eAhQ
-Ώ|{^e>~_}cEPbe ciݹ܌H|?E{OIW;,'H V<xNٌś3*j-#s5O
-qTb W(+aA-yƣ
-志MnROU%Ԑ7[#׺!NpE3R&8W^˺sJ׺iNu6?gp(&)u~X/|7K0# d
+xR{<Ty^)"š9eK#V.cfpf5ҺB%VD%֛(+.e R;ky{>hyP ā Cx!HԤGG,
+i:*
+@ 8ʀ1  f\c fGxCHiH$BD| ah1 e)DE"8O ,ʩR2;`"D#W6D_R4wٮ0g~?0e|p9>.\&c+r6
+8+Y:f *b#db F#L7a6Y2 F[zˋ]&`{ń#
+8AL
+aFG#(aF B>$0b,E}r A\
+V~aώ[3z\pJ{_s0@}N԰%Immm!^dW"˾$LGՒ
+FyNNJ?
+.~~ Mo NuW'|?7b^;NHPޛ_{ªsu|L+臵7?+`pۛmx("{)max/c|7K0#^G
endstream
endobj
23 0 obj
@@ -1781,7 +1766,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-58 -250 1195 750]
-/FontName/XKWQLR+CMBX9
+/FontName/BKHRXO+CMBX9
/ItalicAngle 0
/StemV 117
/FontFile 22 0 R
@@ -1791,25 +1776,34 @@ endobj
22 0 obj
<<
/Filter[/FlateDecode]
-/Length1 1029
-/Length2 4187
+/Length1 1057
+/Length2 4520
/Length3 533
-/Length 4882
+/Length 5228
>>
stream
-xy<e"n)131e` fl!"%e_(K$"2%xq<;^e$1
-:XCIW,tϪ
-p#( n0 Kdc"(#BP_IM0
-^< ;2Vt_7 ;f[W#%ivs'U}J
-8Rnno"kCH҅k|n6MJl(Y[5„%ۅ: ~Mqc60.ZdKEّp Ԫ.% 0[L.n ESu5 {``p I N8kN<,ݦ>Ք0S ]Ws;fE!*s|<]CZ8iro_>'^\Eqp:,c5[ u/SE[^^ *3cx2^dߡ49>4Nc<x 92-JVi)~OeGUwVNY$!gҷX, :\<{g1-Rr^aOA\P$>/rZY ~eW 7{Lǽ?R)ob^6p|NNW/қ.޶f:}gDxR7C|D9U]?rAGXzSqYZTL, ϋ;z^"N<-O0QαQ[;'ׯM>F:Ǯsܢ1(%%7w8^?͘١E״+My1Q6R;Y$&;]ts_}.ێvFH<KՐ}-;mDhc?]7|#9ynLey]͡sf+qo*a:*M¦y[BF gqtT[r"l}lI 2` ]aa;RU$v< !DH};BK+fi\]&fœNunBa}6^U]s{ZNg8޺{;Ne3@MksT |WQ#\Usyr8ܸXԍd jxHy$4>~'6f=q拻 d/s3imtԜg Pj 5bO5A21mb<K
-HH(1%E|W2ts).N[!+{
-:[pt/+RW-F-7p5᳦^Nӿs>
- RW8Ss֨ˈd0Gد؏w[rH,5Y]7?B ֌ގ qrn9^4Zx
-KԾhn%L܂E"DOM-uIܶqxB66
-Љ9z).c% gΦu:`J9X'<oH5$O˨uz1ˋ1;`=+vPݰW%%"442YA#pUHguY͹CYc '`J9њoFuH^=nW?9/y6,ߝ<4O!j'نċD>]N o,6eOHG&,.wҢE MAigL. \?9ި2;LÑuC%s$G1J  byx-QfH|Z=Q!hUYH.|u/N%][]la71_.6ewmWO1aӴ}3hi=&|uB%S/:/c1b L<c薑%|64b],wZ+=,Π@ [U}RY ֮i PC3e$A?M)6&3џ{YtJR|wl%`z9[ONOۺuW޵/7*~(`g|S3|7{>{a7"˧6Y}mbB揘;1eh-k\6zlfiwTLkT-iLvˬĞDbB}ײ19,<!:=MR>@byvD]lbv@XƫƲ >ㆅ@?|>̛EԬicHly]P^uIq㐲,^
-uYFerkcakDHy6VX&,̻qqbC=[hE$G՝'ȁ%ɾ~pwͺ'VPۅɍ3c_ci ,BO 37γ!$G)mQvHi{uo ZM(.VƬ̻o.4䍺ei'wBqY9ѺݦD-<:*ckqG*z.%dBX~d
-%f*ךU79L/.g,)<HP&  wo*^Pjڛݺ]ۈIs`E`wUVb?g[pb5 G?> AL`͡)Gռ_j#"`;B۠Q
-̉\hMWB5 ǻ^ب L-|هVVZ)N('qNcnMQX^n= ]}7ZϹgZowF7 Mqd>tiL`_nMͭmu!FM}-Y7|M !,[Dq&zH~Kttצ=LژD,3إRke*M]S&J xmEg^5w"Gc2& L0fEx8M0, +V3+қ'zc>1 iEGR$tv[]ԔQ18p/ur22hÇHdݕP[3Y6zqn@B4ʙ|4.I_OcF^D_m5xh>AZR;D%pi^DCU©5NV1;I.qJ\Dq}{ku9'(k] t3]-T*_.^Go]xI\Enɳ<&㾙p--Nv 4eٜy(4~LJBKg6cD2 wv,Џ_1^l>ma{ٌdxOql[Brs
+xy< ֍طd_˾gf0dMD,!K%ɾEeϖ"S3=y?u;3?|^LTX'C
+x Ā3b\e_G71 H)S±#\@`, A?ߤ
+e
+%$l55 &!M>T^Fs HC YlW}p8E\I\; |Ă$uuiᱬ55IۢFQt0=Z5@򵨊-{[Kwϻ
+e>0Uې7knVHSM=;/16i^j#~j!K=󈦟~H^9%OntP.e]E<d襎R<Ç綗1[]V& (52v2٫K~dYYl-WFoU{<V8Y%+xe~qvCRx[h1gˇ}L+:ӏR>T2-4=
+5>:ry[N}
+ X/ܫfn,͎,$;p\~%IA+./q
+5q>:}6[͊M4J 9NZ?Yԣz[uƩu w8-+&`h@ةdOH`[|%]bz+!@yO&k頂ǩ[yHFXg:E
+.UYyV[> U>h#%o04-PFT Vh|M+D4Tl&a9ic-z,? p^eug?wqI,&Uɻ.¦wӣlʖU3U5M&1eѩ V|2,0¸<e:eyM漭5T +M/oU_ 5cȧ /:_vj%Ty0.).gelLj3 u H2>PԛR6dSaƧ,|k8 ڂZ,Z=tj91
+iͪUuħGfda9կ -8_zJu_L-&XhGζ&ɝfǟl'e{Zc PAmohO9pg7wfHs%i-k}{P*).JZL|MmPvY͌lș@$|GdW JTEmF>ehaW֖z->miW9{uƍC>
+Y \qu'OG<C2QTDqGU<1aӯ+?#8G ^{H=a{{xdP~s!eYE4A<S5}Gnn/ p;5׹F82);7T!J3gXj~}2!=:
+ܩk~ MsW7OzӀ~Dg軬.]{S'󔤶>''gNp_2}% o|AJPF{gtU*ty
+{Pkɧc燳۰^{$= s׏Xk#ʍ'^{gT`!\C>dKi=/$xm-w<[ _V EņĺLIۮ a:R[
+FکSw^פbeKɯPXr֢{Jc(q[BJl Yq˴
+r^Ο UMw K ynGxوnU] {`ӟ M_o6
+o Z'4Kmk=%uI}qu|GYqڞoiڣcjфR.=igᇸ-+E$u7{,zGNy{<x$WmIn zeCRR)DZ+2۪{Xti]9s q\HgIUk3nV;#\F/ez h2R;/XW,cH)kfӨ٠y?shBՄό{"%rNR+>La]2լZL+GΑ/=s?Dʊj_f$.Q*UQ֖IEKs:ea+n$}vǏn/ܲtIGiV{SpWދ8 S #MNB>4<kNu-cjY=S4t"B-n.kk}m+/k;zfjjlPӫS>$Nme 5r3
+X:{2w)a^1^u5n0 qހH##D͂lf%|^b:q(谬Wg~|їҲ#)1!4%z9~oVgeuYԆ.u߭z8uJiNqt׋ \˝c(WzCdM'шM-}Gry;`[7N='sez:Ph*G"5nQsLGؗpShrRϤ0DA,󶯽8˚摧UUVh{ia24leȔZp-KayzR6|0hҘ'fBLYES'?R,ܳW0Dϋ5„IPkD-p,t.Y0=pπGkeVRL;䴫-K۰רݙ6=t&i..ߍIX+LC]TFy%zJuթu4@KQ;lD?d#\`s3'3G$'>%kUdwG[-x7kU*,
+ިZLBu|Zq)PAםf˱dmzՠ*A=I$&ۥ \Ԧ 3pQ).͞B%yͣžVxź6RkO#uХ#Y\Q>qϲߠzڲp]C'Z-.4<#'&b
+-3/$qeH3@8gElc[8*Mj]Hx|Ftq l?;Bgր_g5J8 wl!aM"P-޾G̑o|kDy3x~ʏTZ8,#1=C^()~#rӞkטbW꒥#[^ݱ%y o
+w؏w}M̜7z`Al~_*\ƐE9' ,G U+_o\IfqvjPc[kJ檾s/^nx.KKa{/ ifn6?1-傁_?
+NDͣa@l*y @x*
+e=Nuz7BZGLȴ/!G:Nm\}2بf_Zdug>ރgݺ$Ƒʼnު{a8J]l#9޶_/@`P\BQQ'QEp 
endstream
endobj
26 0 obj
@@ -1819,7 +1813,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-39 -250 1036 750]
-/FontName/DEGBGN+CMR9
+/FontName/IKAODM+CMR9
/ItalicAngle 0
/StemV 74
/FontFile 25 0 R
@@ -1829,34 +1823,48 @@ endobj
25 0 obj
<<
/Filter[/FlateDecode]
-/Length1 1187
-/Length2 5260
+/Length1 1247
+/Length2 5994
/Length3 533
-/Length 6026
+/Length 6787
>>
stream
-xg8uD!F' zD20f AרI 5zD-J"d'ڻe|9{9>.cS(BbD@ 9,
-w
- g/ <
-0gr1C ?oY\0t]7u#ʣ<<}004
-$B~͛
-9<<H\0!i]#{fn 9MHg8-%
-,?#AWZӳ`$<$#/̿)?vE<C $g6[[GA3SemN$ƞpdO*zGvҏXuH8v~2*{j@Xk
-P
-6}J# Bo] n '-7G;nX߂7ǧ%25ZBqpӂ|"^>ç炍"\{ |`#AȜ|:GUI]Ail®_znغ{7c@??Z%#Z
-+`yH ~TJʔXG{G1Re̿Y7p/P"%^oS-Je3ZĹ}5a0਺w&a>M)?ۇNCNXoW[zD(~۱b
-n<ov?jZ`u褣xr;:au^5oҪCBDk LkڷĔؒ3 zAw5A{ݱ1dn…# u LQ2ĜG;OR``T8hgXXFҖ!1" j1-hF<˲iX0$r4O3a)O`%Z9?0*}05B_::DvFV07o!xBY^wVNJGjzHyRzT8aqoprਊZƨき>4Y.SU(η>vYB=&)1B8u)v^._A2W
- `wB&w'IO?_Ѐ=k&ic\.j]vt}̠ep\<6#WU}U.EƐm02y^mDRecE(dG܆X
-e{Gnd57$ifdUL
-|͹nt6PMD[CTuJ={7},JȬϷ2-ȶ|֌xϔ4ܷ;K3Y'L^*sVD
-݉OckӺjeIJp]j?v˪_q?BgSI^бG+1~95"{7L,D1:I2nI"@#4{jnQ,]0>=:MCV`Yh3y]7Y_NG'(n}|jd ]Սr}#^j>.M(c2U[e+[0o<iztc,"9 rJ(nz!1K' $LЅfɽ1\q]Tiww~*î<khJ>|(cOtzL|SU~jmg"SQ,`֐6)-=EC>9S"m@[?_Ȍ0ʇV%"̈bsU\
-tnut'2>2猪C7-xeKۮ:g?FaݱHƧ<G P!gspԢȚVOA}=yl
-,+/
-?ľfmPEY5XWEn'9c2Xiw?]]% lE{ˍI rK-:V:D}N&[y~:ՐdbJUt*gIʙpa зND
-?kD`>\̑6idf@&AlZg;)^l dzzFi~w#yEhy!9KtU筜XB!~Gqן j6
-'GG݁-"t>|jD͊"e!M6[JO'2Xl̦H\ HwH"{! nĮ[<6b }bvRsڭ Ɋa6eh"B)Io_.<%]@:
-4!XY[ܳ|ij4q|iOa8̰JTE*E1:TSjMIr3 q<Yj.V>$T1DceFyJ=^$ί|YYS>:2\Z]
-!Ǚ+`O_U!tN%p[l")wK e;搜2 ]bښ͖O )g&end~ eS,# 1i&X&%\TnW5^4c+,ROȪh>È7uqs}<WdTi4/|G/&CI+6J;4*ZNv<iMm[OX(U*r>.־!^P.Q[插,ϝMuQ j;ښ+93zUV~u%͟B2eS{l%-UY{]g
+xe\רiAkfPJFC:nI)CZJBI TDE{9=_|;3euZ׬{=' (jJ@n0k3ꑵL
+ ,)) 
+
+ lP "sHtϒA{Ж(/fGtFW]7VND"5HnXvB }{pUk$*G
+2W-%BX`fK 4
+w;,
+
+>
+ Sy
+ 684mPq[lKEқc,,ʵ#agpǽxd2q5~P8:1|)y@(q&`2pĕ=SÓhFK26J ?6] G4w=>#'{-É\. M<q~)镐j2BwYFŴ$6XKzCW3q|ljּ8nqd͔?bO3js.5$JjRq ;+.Ė2m 챠G:ى7
+Gݻ܌ƞv%ĺ >/yNJUy&U#׾>ZRe 5XX_;]ōh YG<19zS~nOz &GRԈ2l_D+oSH|+Zڳ
+J{13fޑ}LmF!&9=2F?_323zYeUf
+pZ(8(r^o˴),AlV?ݘI)3|ϯ#H6ZHQfq-we(ތQ";&&"~uzzO6^apwۓj82wٝRw# SuBݑ<D
+E)4
+g.})#|΅NDwL u:78
+yF)('޿;Cv|A^\{Sx-|wk)A:eK.H(K5[~5׽"V"_L@ރEHB_ql\o|<Rl?үxP(^iG]_s^1ʰ@hlEpYKv_.+9)`Xi `d4iH cRTc3,o2yOOj6s-o Yh#\3;($+&[h[Z酵cO2ؗ5fū^S R+"E9b[$.dd;4p+6U|Ffɯɸӯߝ? _|szNInUl7p k8ם/h88ҿhL >
+idjO-vudG5q'W$ܰբ.|kpN#Ӱ`*oGPG%<:CFE"m,Y3b0#^d*XeGzyGژ$~j2GH0bq<>$A7DFkH9D<a(IS# w/ׅ]ԸȈI"2Bv2eR|K0nӀO9I1~>-aDpKqiLzgyσ"_
++%5NK` CMR2Uo.j(EuW%ֿJyGbc'QU5ѕx/ɚdwÚ=$EO:љ7}Ɠϲ M$
+_ĞG-b|mX뵉&gc<qxbo0@)12VNڄDU,db<YNY5*a 17,ge0W~q [P'`|~ZaxbR7󗿖(g<Ԏ|hޏJBa:mVhp.)SC[sMM>U@
+6DDWGL)V5jggw.'{M{h9G/}Sw↹%/-%ivyk(\B@jx+zrzLΐI<.
+=9]f8qŕgNH\{|so^\j~uf=jg=u\| n\5gT-۫ob fEmnK(6 \
+6x+ܯL;/$@qMER6[ǺbPȄ3ΰ~ }ƭzU3x/!=9\?hF}$Ƌe+߀F^).e=~HvN%pP74
+Z2]p @+6EFbI$"e$o"v ;Bb_Lw%<sV#Xqڻ'=|v:z^ԝϒu5=ƘF |UwSb ~ڮFx܃7r?}9|"NU宿!fE$/+r<=UfC*ܱ uBO Yk{ۊI %_in \<\cz[QL+0;vHllfդꫪň@AfQԌo g8 wYH;WfC<Quې
+%l ؑ~@lćkڅ:?|}}eG,qj }79r_ο8,Q9RN2Zx];t
+
+_ O}t7Gg*U3Z^l ē@{*> ɊOgvv_Qsȅ[sHcICNpfR|
+;8:FDZEGņH:OD#_g̮2wJI9-f$r4C&O'<Bh?]9>cvaykރ{ !o@Eszß7wJUbČic+|Wv[MiYMa xkbcG-SҷukZǡ kZZ)=U]w|`zMYE'4-?mz7 ~m`B1SBbg22k>SvE@;|2*1xCcXg$Q&"k
+05,㝛ogiV\F&Du. 5]0 $zuq0(o"ECcZ<m זeHF
+3CJS{vt>}o` k;U_UjG0ƪV m4kV`=fxΓ{O
+<NT^e2ohw8.'=&.:^A"q+l 4b>ي=v3kyhՒ,S< ^H<fsaQ}LSĥMJn{611~Al{#m~G8Z%mMՅEwUSqVҧ)ھ]|pc,_h1'XVo g6>S *n;,$ٴ`qVyROԹK٣Zx-݅s%F I/U>Nܛ%3ȼ4$@S."zm`+5ƀ]1)6úAro`L|
+g3+9@0}8&
+s @9&r7Ɍ8ₙ5|WwW2>/m84;7,Wۘy*Y.Bz($ (RSԤ|bd@;*`*/c0']{`e欯xPPL2$Esk7\Nβ}Us8RST'Kϗy&HgfBM%r)gYɺ=r^]|%ʘ+)W
+k6õs4]: 9zXO9.^>Z(#_H? & gZ/rօPr(7ku+
+~ZQ?* 5ѹ;:T `\`+vsؐta!64XhҏO*X"wʛ)2({J :% 3=w|)q0l\!J|M߹^?}C]EZ >U0 ^i>iL`*3BdBM{i
+r#}} 'Ox
+[R+M½ WƠOD(fdHH_N
endstream
endobj
29 0 obj
@@ -1866,7 +1874,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-63 -250 1027 760]
-/FontName/NLYOZQ+CMSS9
+/FontName/LHBVMG+CMSS9
/ItalicAngle 0
/StemV 83
/FontFile 28 0 R
@@ -1879,24 +1887,17 @@ endobj
/Length1 942
/Length2 2435
/Length3 533
-/Length 3085
+/Length 3084
>>
stream
-xy<ǥlɑ~dfaىa,5!40 Q#pҢƖB"K:N:uRJj([w{q}~<
-8Wm3(hM1:H `uu5:$0!:͒1
- 3
-2y
-c(ьF
-@b
-ƴ_J{f
-2koy5f`\ŽQ=;OFξ;_Y(= yHʰQhصi8vs
- [Dr ]d3dn2xsjƪSPRh~pX"C4e6|w>E!EPZ{]sͪnՙڟZ{7꼤acj|2G4'}Jw\-ڃ3ZU/}|}c%J=Wgjkjb<DotfI TlXI%dR LDz2>0GZV4O%Hq'A}E-<(;eD3;B&t|mO# Ƿ)%1U%bUpQǧ]qܡԗlw!FS*{uq7reEF
-Zݒk[HeviPFs<73g4>Z3\hY]ܴv a#[?o'=\kOᶍڷ 6;H+0
-;&2[SWt4;Ɖ:-dBpl.OXi#;xT%NPhs"kp#wvÌK5:=H=+6q% +ͤ+u~*VJ+bLύ\b-Kk%!,ssCᲢ1
-BTEn'Xdo7$#`qIȽ~ a6:˷Izw[ Mʗ14]y^c'dY񈡂 oP-U= 6wb6 _fE #\oSR}R jy^!Të-5ITg˿uok?oדC;YeXFDnNB%X+Tj>J9~~~`K8vݒ-.{m
-{yl[[(N밞)gqeGaыWMu{S+{"BtE.G@Oū*[-eg^eŅr+Ю ^6--D `k|luŤ ni׭!Wt)^GihՖ:"! ɮ\ 9roDg4 jE8Tsg>'E<L#&rUվ3fcwpOFŎg+&ХWg$}ӌw:&{s+6lwgif8F
-F0 /VX%YLi{0_6#ӔvatplPZ] ;uXlQ7dt0/?12)%7R6ڞrq`ǥuGNs=SMdųeJiiyѮ;<1Q7[zԢ\r|zd+ oStXItņyU9s7jV(ehq@M1bfufWd\92TB9-uu
-'0pսPe7>In긵͘8r*uwB{KQ;/<u4ϗMo6fy3[2^)4+1a N2g쮑^[ww/tF?WD]0?VٔݘQƹ$Bo#·7Q_ުv> nYaҺ@ -z2U3̮y䛰qT}GT)Q PODqf3=WJd QfZn<0MIhЩD]`Q_f8ӂ*U@ ]^,t~ɴ|D9ޯ[>^x~5YD{^r䄵M].`;%' A/Lw5Ʀzf@|VNQ惑_T,2's{l1J $;F"={Jg:GN V~Ǎg?[9bR5,6E LP9TJbq[R ͶϷ1oUM7sIXO.+QcV=oLwNbp2{tYBc-YLHU=!/?'`ҩF
+xy<ǥlɑ~dfaىXjBh?fa FDE-EDԱ;-PTv?u{?|?yp.f$КNcj#ub u0ee H`Bt% b
+pv%p@FHҁH `oh>tGg*d|j<
+p (A8H#l׷6?F##@4++ߪ3/浇+?<z̊F o)
+Yw&xrO02$lN׳<Ef9܂а2#Q.B y+j] &@i-F)ޑ\?}tk\RYx>-ɩ )*+"rL{ySN}eˆz>B!]\g7xJYM2nW3:9ˬzz'j=e._yqкэ쉸ߤFZ%)ǘC򵖥WDB sU]m㹜1cMT"%kt{ڮn'N=.!B!q^֘:spyigQ[wvŇkl򡱏wOu<2vw^lf[(!a{"UJy|HRW#uJ.䡘T]fG(qxT%N``s<s` # SvC4b۝<*K=#6a??3դw3en2FJ+BL c,K&!,׳3S}a0
+ByEln";H<hg7(-&aQȭ^3a&*)wzwZ#ʗ0n4]Yn,c+dYKPMb= Vb6_^}T#\kUR}Rjy^&T-6JVWeɿskm;wm/2,Fç#6&V
+SZzFqƷ}%@?k`%i;nD6=8:%%W?uHϔ=0Wknڀ)K~=NKJ
+ci8%5,+ hzvf%`ܹSfQeFbbd#w ZLvݵ{"n4
+ `~ѭ)>^'J\{ JCmN#ge:Yh쒀2u/WdMGIusI7`cBNR"!w+B%aѯ8h̔ܢ~M'y`T_Szӫ`Vߌ{7T*;ۜkH.Z3Q0D+-)]>]xq%yx[bĸM] *.$:3)+N'Ds%ڦj_\fQOq}_UG-ӽrm0{}%ۇ#Sn]gK;G3A V~#m?]>lJ5$6I TP)DZb~Kbu͖K/1gEUāWnteK-ybtM"GFśH} -8(xN 3!2
endstream
endobj
32 0 obj
@@ -1906,7 +1907,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-53 -251 1139 750]
-/FontName/TUBSIU+CMBX12
+/FontName/DCJTVD+CMBX12
/ItalicAngle 0
/StemV 109
/FontFile 31 0 R
@@ -1919,41 +1920,41 @@ endobj
/Length1 1334
/Length2 6912
/Length3 533
-/Length 7735
+/Length 7734
>>
stream
-xeXm磻:PRZBVFASnCy羟u?m{ֹZ9lL:֎%GW
- ruv _8w DbFC3N1?24ה$rE1{؅<%ՌJdUi=7)^4=*y;FZcr
-bN,Y_~>z֏,TT;g;_a
-5;IOX|DSF bPhcƌ$1mgjX#TISMȈS
-TT ʹОt1d\,qc-K:uuٍ0XcCe
-^^ʋ:\Ux&ڔݔOFupr :{?eof<`3y~`H,1Ao*e񢺾m;]lT%#ȕy"9Ip7
-'1f;'ٞ,R x[+VOӲlaЈ#Ê+{[Ja
-3,zպs_^B ŧ0TKQ2O(?nM:C( ;&xgiC 40l?޽}-5IE/LS;>4(9RS#T]wخjGZN[yɳL<B nt[]mlM{Mvo}>{x8aBlVJsF >^,{1jZDx^uy޵wK~:p@yL(;p}z@lvV[Idrv"o?JZвXυqJ]z\97Sp@k]ϫD5L*W&FŠAx|<4^^*Ô Z&HK߬d8@3nz:5u\EW+]onV
-*f𦽎dz&E
-֞}7( / 1{oN|؆X/'0_x=]]h‰w}>P/׼Q!>/9z#Io 1
-A5 /-|ið<21$= zhi3i>غ{,qEhT?Y|_>H̎]cJx'|,ZFd\LcXI~/lC ?RRcPK.-v|b*T֕mҷ@+Mlaiy (2ڶƠ6qJHD qrHLgPSJHy-
-?sXՖ_E! Q酇M>nU
-BnHIXr$θ4g)8u"3/1mK<oB5
-ޢ$Ae=^/gsA<4Hocq
-go{?@:M|- 􂟙^[w\Hүhރn6>IC%"D;[q)@?Îo2ezB$&gd[V/bѕU&DTz
-b
-$`4; (WuP sx8rw
-kO'*onʼK
-y&.RRU#s8N`N~y9"k@_mXcV Am\+3~V*Kb"/{:!W]54y V-*y}J ϶m9ߺVF/F+dPgS׍~܃/Uv~8ni8hDȽ1jlj#ほkUK{<bhF0(fV<V|D2 OnCU6<$ub"-I]o㇖8e˶G6afŽdXL}՘UX,єR҈-nՆpLAB0ք-,nk9NSj-_dj^S'yş$>Fo|DCWq4fh~SRnY+@QNbp^56DGݗ0ea[bOhC*Uט__X`Z^{@~h21Ito w)W Oiڹ] æm2O+ RAZ}xI hkfHNv$:*$(^L)@qa7嵒V7 J S-"<F*ˤ-Jnx~/׮MV ͮ|L&<0䞇Fa?W
-\0.8> S@-I"yd>D=&{qfhebwP TB307ff-ZD;m
-eg &AGgz:SXc ʜ_/L_U g;࢟;E@G{vA脛gc5~xA?uo,QۻL m<wcyQM #%uA&ұMdLqgj۪0оndMDE /NjNăw]W b*_=ndK*?жk2q>M)ZEJ QU [eGi's5y5=y'S2|*Ȧaֻ^QǸƃ oDBۘQQhE&1]
-?ֈNNٯUDi0 [RYZ(^I ƶISܮ'FwʖoJ4œuu父BLw\]5۔s|&k6AH;xd4!Yz䆩]|Db4 Tpa?~V"^*>O%m
-N/a6?nQ@Ѯ<`TVQuǏMll+ܑi)Ky19k4àj-5vyEWk`t"Y;t:A&Z&$@E6w:> ]%f3YNb&ht{$줸1^B+8'>];%su-^aUgQ=,%|ښ;psj0߹yÈܹ'/PA%Mמpojx/1W+RRq8I B{E=)%dJ
-( yBT]lg^A~j]L*lzc({098J+BI2,tWubz<Fbk2KL#70BE<oKNb{mԇW9[dřf-d+ئ/p/I$י[ZAÃ:\a?-lI<uR
-HpBW̅z5A^~۽aүlװ/$ED4U[04[ ”wύh0BfMDMm8QOOeZBw7SwaiWD%B{³k2=~
-Zb$V4DrVqz#wt"2zLDy50̆y('T1ȭcetXF"+:<OoD\vKV`-pl HE6Q`~f2}@lmGf
-im@deuqJ>G\.7rtY3%`rx:e-5
- ⵝ=i8}
-d|U93Һ^sTN 9r
-gU,S.;=z-G CN5n+{w$jIJď</T6,"=Uy>j}:ZjVy뷍V-%55Ttf9D+0W{E*'s5
-~rnZ" ]kM|QF0%DeaYGfc!̼n8x^Mk̂OVH};DY]s  ^[8ZfBQ5-U6a U!]q~t^N wlf ;9 +q@k8mcj,%q*[/UN3`*\cߟMSs1߿gICW]P[׈Bzf>m$YMs~՝16Y[*܀ƍT&`&jۄPBYy>kw
-ggeU$+?[ܓ3<h15~(`X8#, >j
+xeXm磻:%%a@Zin;NF:wy[/go\uƤ+gh QrD y 
+ $@BA A @H
+aVH%˔2WKng/
+kX8UFu 3\g5!2'2H 8Ja
+M(I$P}Q^~JF7&)C(ڿ O7&5 U@Q}(?b
+C
+/5fC<3?mb~ehZ)w?I<b7c^tzW3*Q&W]2ܴӓx:hz&i:$곙q0K,SquTouoj-b#)EwX`y}İ)gC_z'z~O7cZJ_0>AlV'Ti'VO=n!RTItpGJOOei fcʊR.=g99/m)f S%`~K0u/(;wdMe[?BxSQSU~9
+w҉#[=G*pv>Q#ӦTPX|.91̼4jvfh62:.(- Ib" FʃUISMȈS
+WҨI &`{S 2%?5=-OmK*s >ZmJqn'r: 9a s}b˽7Nv@ۼZߏ?0w~$W[7xVڲxQ]߉6̝.SvSMK]@ԑpJ<$UvlOfiU<_fofQȧiY t 0hāJԑ\na=-}p ˅^
+~h]0  E>8zp;HC%M񢝣0!zFރE4'sבkϛv扼 } &eR7l @y,.KyS<6"}腒YF.7B2*fwRD9b1-8pB[U+I?
+ MqbON-z0TG^iIo?kƌ,1d]jWNr4#6<kX؉xtd
+Cb6sJL=k4qb4?7Cd ݺlhq&")ER8E_:W3F貟UrR0,IȦBS$7V#%>]A_:A,z7 Δ'l '2-oBU_+-$H[Vo~֚;ra æĐS/x!aϤ1} uXߋШ~ľ}>r=BE|)g3T<jݒ}s2-ju'fI-H ,ؗR]ZVT+L[oVT)* P鱅AP8)wemAmn㔐@R$)IΠP-pZ~BqG7-ACb |ܪRcYbnHIXr$θ4g)8u"3/1mK<oB5
+ +$x(RSݼ ӝU"ňޢ$Ae=^/gsA<4Hocq
+go{?@:M|-=31_Ѽ;jm|JFv:!`+R~pe!<&;IMȶ^P9:ڣ+8LgW7H+?Ld'hvĿAP>?ݡk y(]T(rk&o$`,KD3Q]6%ܽc#+Fl\mzv bZ^c"raΧ<w-Û.,$'*ZjI
+YGtW_H/̻Dh-C<9[u]TK?н,ϕQ;]0A`a⭢TDͣ(/ =\X7TW8v.5 |.dқ݇஘iނ&Մz ^C'^A@~{PpcPL5џZͣ=d=@)$Enٯt-1=#Tę*vb>S"|d[γo"0 IRoJ g\@X5º͝p)Bq˜^")/
+V }wCF’lsIߤES ϰ-Dp(xГ-%Zo jƘӈ0Op 朹
+~)wSzv[*lWǑV'p{_5/ 6N1S|m\+3~V
+*K/{:!W]54{ V-*y}J ϶m9VF/<F+dPgS
+׍~܃/Uv~8ni8hDȿ1jlj#ほkUO{<bhF0(fVT<VzD2 OnCU7<tb"-I]o㇖8e˵G6afŽdXL}՘UX,єR҈-nՆHlAB0ք-,nk9NSj-_dj^S'yş%E>FJl|DCWq2fh~SRnY+HQNbp^56DGݗ0ea[bOhC*Uט__X`Z^T{@~hg!cV2~@R<Bs+Mle|9W9!&&
+O|4S,`+UZv[,M?
+܍] F5/ԅLJ60%@<mT"@Z;'R6%83@{/*:w_%73|%/|Cۮ64yh)9x_FETBw,bb[Tct ռl#Yz[Gftr
+?N ocFunGxxtnk^GN%_=`>0PO)m!]O?*)Y/++w)\+&ޔiV'H/'$ekG︺k w ·)M.lvXߟjB SM{r?iw'οh:~0DS|(̗ (:hwX2{GEQ9E%?Z>&ofc[<l+dMYY3E`UkѬ+_k`vڡt 25'9tGnR-µQLxE*1p7Q6F+|}LN%B$+qzn±%*
+V[ x? e݁O[b| ;7t;R#%*佽L seji+G3ٔ κWzѓr~[rN
+],V2a(
+{r.9AKn>/D"+L50k[6d+%$X4vi'O
+%Id5020
+ uǔDoCM!*xYs&*Ȩu+5͓שUVcs|['h؝m>yZ !,vk_'"_2Gt*Zu3\G t
+}bq7Gm ̗x$t6hw0BsӼ-|؜s?򽫂_W5ur)"/˓MAbo$/\6&c_} LI#}.XPS&(8=3~o79,@5cW1v⅟dؔRav\f+X Y F\ ) Gyv)LYR_f LC"M2wd>Yxob\dvMtY֫%6HYmuKIO4gu'h?+p!N>|֠+ћfB'mt7g6$CAg?q.*pEn+,-8<eq-U±Ud,(ADA7*s*;\qM.O6)q q<\@.rd.$LOꔭL
+׀H%j;{^q,rfuWe!rT⑥y5z9~yqe?f. +SPC+Oo;o Z{BBx!T*S”F?5r' .Z׆=(}W-G׿̔+*N|8^p|NջbGE?t`o2A,da
+ިؕ[M1fPRUc{Y ヲ4:>,Dtrᵃ Gp%5ЉPF=2[={H(eZ{]/l4iBk YvYؠS51ρ0Exm<))&=[פu>
+bbTΜ_V<h[XGu5ZM~6l%hQ"]劉xxt6=B|RO\A]0 9ոP XZ-_ڎʓ8PHdTx9hY6ZPAN\ާ^@ć5<w @@8>"[Txy)1 `+<!Oyo^Cw% ^|.q)=A^
+a7mpV&:Y#D61ыT)Rw% BªCR}fYg\1f͠ cOK7H&Yx#:nE֚`J>qMIݳ:c7/g0}Cyq8/* nWРf?Y'nXcvύ28,{m~kI y4F״Tۄ .T}`wt^y;:&\E`%_/7\㮫hqԜYOlQUh%_fU$+V?s1߿gICW]P[߈Bzf>m$YMs~՝16Y[*ҀƍT&`&jۄPBYy>kwtG`LMɃ*ʎ-Z_sn4_?OC,xxNj
endstream
endobj
35 0 obj
@@ -1963,7 +1964,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-301 -250 1164 946]
-/FontName/GYSFKK+CMBX10
+/FontName/HZGQDS+CMBX10
/ItalicAngle 0
/StemV 114
/FontFile 34 0 R
@@ -1981,7 +1982,7 @@ endobj
stream
xeX\۶I-@P݃;n]CpwBpۭ=;sO?s}k9V)(
lmi²B @F:!
-s775sRSٛ
+s775sRSٛ
6*nv+of؛e'5Q#[csS +
/=edgқY؀vE5ڀaV of= &pM['fp av "l@zM@zlG7$nd~?6؞?޸ n1f@pk@_} Xw.@ m6 ؆B g X F&rue :,@N65g'x10W=!y7O'
2*+RQ,cxWFF?TŊwncg%u?r%Ne눏HρRP\*-Kb
@@ -2025,7 +2026,7 @@ fY\|Ew
EJO=oc,pJx\s.jTp<p4+/J7*T);VQ,
Uog)/Pl2ܷ@
BO8,,)My-r/+򭿈ZۇkV *=H?릲LIf hFȣ2%S=0LGdI8h >Ew: 9 Э ۺ6@~eP^9* Uy-ˮ[hѕY2K*XriIC*
-Um),*$6[yy7IzѮ0v:11GH_FOY?>NA[ e )ļ!`WؕS~ 9+]mu<md0EQȋ]aZgM\!fe`# ~hc0%NM?ދYd}jڈ˞8A2W %WQCsEyڰ<1,&?<n%eK#WհH 9CBE/}^]Z,|[cڞ!W]KɒC~"<
+Um),*$6[yy7IzѮ0v:11GH_FOY?>NA[ e )ļ!`WؕS~ 9+]mu<md0EQȋ]aZgM\!fe`# ~hc0%NM?ދYd}jڈ˞8A2W %WQCsEyڰ<1,&?<n%eK#WհH 9CBE/}^]Z,|[cڞ!W]KɒC~"<
endstream
endobj
38 0 obj
@@ -2035,7 +2036,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-251 -250 1009 969]
-/FontName/MCSXTE+CMR10
+/FontName/ALATFI+CMR10
/ItalicAngle 0
/StemV 69
/FontFile 37 0 R
@@ -2045,77 +2046,65 @@ endobj
37 0 obj
<<
/Filter[/FlateDecode]
-/Length1 1925
-/Length2 13916
+/Length1 1939
+/Length2 14050
/Length3 533
-/Length 14998
+/Length 15137
>>
stream
-xeTݶK;N 5hp sNOף){g{%T}$UVc1w4J::10)0023>~sY;:yIXxxXI$7_^v^V
-v
-bjt5lbDY0=.^$z̠Ayg$ͭ,IX98IL\\L"_ks 䘉  )$.V_3bl<$L}#309
-7 
-ퟖx
-Z3Ȭ+/`9s:Xm99?i 2tv+r"TJʈ!P ?/o5B&-@3C
-TA*(!P7UPC
-jP?CzTOꔩ-B{n$?[R9̠,_ϖ A-BB:`̠ O!Ȕ_reA
-_r\9 W!ȕ_ AB+/ W^!ȕ_rl
-j}|@o4:|~ f?YiI DVGc^`AP4&AklJe@~'rfUTyN٬D(L?w]Rc.J:4.nktW{d=w:" +_i5L;;Ķ T śk†R1v&]5z> %GJɡ|2#ʙBd`[o($Oc1ma[{XZ Q~ַ^"}1cbs Ol4sBДijR
-3Γp3Zaj{ w97˞ȴ>3W 4e=+T>ew ѼvQ6%4ai4Y$NÅ3n,qG X
-_)!=LBw5 ʏh9't'Q-݅ dU&EscoX"ؼ[: A<%<'0
-q~0SVG=w(qJ]#S>jپ@&@,ܠI; W] #)qIB=n⼷U- BqXAc]:2(fVA(D;tfLiTaUuW)X7-+$"$c:h>LV[pۉ1ԶmSߘ+~e W)N Z.Y Qd<#*53wEoI^Αc*FqҹyQU?* 7/b2_'-JHUb. (ҚTQ]D6Ɵ_ bsBNd@yݴ+TԢݖ1*:OO`C- 9W7y[h13M(iS4 Y~
-9 f% )'Oe<_º:a7dt^Y.1icnq>Av1](/ X{1
-USݣ6!W+-3>|NU3^ǐQ49F?O11eGr5N
-̈tv:up|Jٙs0Pn@@*`_|*}NXD򱔉mg2>,LE^TV
-y=V$^ƪBƒG` =w?`<h쟷h^_P\%xx M} 盵"eX`-2)!^߱;g
--XiG\f?j92KaTcbbFDAD8@ >m,x{Sa t<13ôwia,.>)aۀ{>jHg
-xmT
-;5t9TTjz[j#rIu9 CԦHDTu4DTrabGU1TMsW&y(z/0H Ow<qXk ڝ>D*gE2wʄP'cX\a, $^/&<u#-104SRp|wNo)lWV}3&b9IkCLO(Kt.Q/ʐ1%2~D*]orb<}ϓ/ >"-zqAL9txE|y[oPDET鄷)7(4[jEw{9܆j8T
-' hm?$˸sUZ̢pLBa.L`XB959dQjҷ,*[`]]!7%-<^eA^|ymk$RSa >]G놖qmuM$ɏGc㰻7u<fY̾oل7$W4 Ί?-4U)
-+:?|]
-H[E Z]<5}l[?Z^ =I{`$+0^(=nBBoڕHҤvO^EPWL2KGx1D|934,Tu^yBI7XweVeNQ42HA,Sbhbw䪘!AJ a9Tk'!&m4L%ߴb'*K:",7vpS4CvOv0Q q5 cѼVq6;1ԮD2=PRV]Ȇb3INuj8*IL*|9-m *OjMxZL܇;8ge8 _aG'#G/I3;qBg&!jZKkvoton6GhvyK,PiQs#@;Wn5ÜA2_"\an ZϓJlK CT"Ծq?o)rAǯ DJPl=uADK #gu
-m+`r;2H~~`0w.=QG]q)L jcp6\ %nCpcm7Y &"m鎾+zc͵Os/ ;o50R?9O7 ˹,OVOJ⒟<ݣW6]
-=L|,v%h(dakR~[|X#yl"J\(tŞ湈\.B/B76@0J
-8鴲ǀcIVtɡѭ-r5k̂lF3oԭ&&l {BQJf¼ΆѷeZ&O>{AצFڳY|7ݦEAnF`|dE}=:è"M:vPK$ҟM_t06X,`MwnϝliBG:־1KJx0.{ *K^_;G:\$B)Nc`Nn>22yUtXUUm{!1Å9#_f4<ZL8/b )(+ZoIJTNjա /Ѫ\м͐lN0鳎ssQuSSltWdod`1ױu>䧡UY~@ Řy
-rإW?>d70 +tBgy&x*^L:d'%hsL-EgT܄iEu#) pT[[=
-C|Oq!\qȜCdسŨ u1<7Ґ:ëƲMCdyAb
-0`YG+!e.E
-=]1OX4vU5M#B!epG>j
-0}5oy3?i>C!c.Oک
-/^v߾~앱oˉP%+`4D|Q)/TZ4HʢH??ShlY<ɾçڗVüssD,?pn!wkD6P5;}(xl^J3m&;g92Q0A]C'[tUUZ2Qs HQ[ 00֧S:*`)»u`~Sj> \ x
-|Nx xӿ1E>F4Xim8fTo.W
-4K+ê5'թq
-C(nwI%gmO.?j1cWJOV]O jW
-Z~nO:n>{<\h#iYF;͂Sk= xC[ڶƴc-Ln}b,2Ū6(Ei:A qnFXuj+TK;gRw=ʮ.AsaդΥP*[}񴩵'a?9C*3F2SÅR3{,DU3 s3iۊG
-pD (O~sYD|>o^ XӁ\PW^.…iUz|7l1p 1S@DUyȨHƟ z٤:ZWIi03c꧶Td)TGN] +g`c梤}/MWV~Sق%*ޛd_6%3ԓNg˖̧0HLˮ<Ur=sLE w(C9-FSDgBPϝ
-*G{VX`OoEw_bK+;M! BcNe?א
-}|"t:煈O77)jgdnP"时ڴ2,6+0?48aPv
-?m>AMǫ/rS>-,)v
-3«:t}%'v\C)?y
-9cޤKSh
-k\
-@v"A(^nMu zNt xH~&z%Xc`Hm ްuͧ:۰[Hxˠ)YnCzIfoz(=W BcvH_AZ_l<>iE|l! cܵU6N=.5/k˜]2)n{( ۋ4EINFY2ጾ U~5ėL!h|t?ǭa~ mI+7 ڀPtJF& \_u! ODl! t@<y/\Bz4 òBB ܐ#$,-,J*t93[0:Xr4+m7`,lnϲК3@ވcfqSQƹ>$js?8Nи{ʔedxr<&rZ# 﨔'Z\0櫣-~>|פbX+W-,5T9
-$ y۝}P\Ks ODE$bu;2>;e}wx!8S0U¸}oN.lQ3d!v{.I9q*+NJ|C?OX
-<Q]Bkwv)l
-)y0GV"FT-k2~X
-j$DiE= jKڕQ
-;; D.PPdy+
-K"{csMzP
--1pu8/h^↫_Yj
-IN6 Id#fi-}dDE~y$EV|eM{La(߯?'E"&8*K-_Ptvs@TlCT hoꥡ*DkEO <s*DEL#л %|C\pX{.L@aV
-vl)al$I@k喢\h$:J3+$d
-dY䬹3kWnDW#7j7 WgIK/Y=4-Ξ5MC7U2kѮDx콪dٛvu-C,$r->,Z\Ո7I#䡐 pԸF|e @!@v-C>1QM$;'kC2ڽ_"_~');dбgJDK^/=V )jQ:a=\M
-JgU:iHIX|дT#_.YǐpͤU T:cBw#[TIUKBů O2ga`+><a1Q$ڷ 79wF/hhٷʤhn; ?[,#66AHҽ⤋k<bH?_kDz˛
-k7hW"O2bh`AnK ^a T1Rƻhފ?g<\p>{)aNu?)(,Y%(ƇltT{{Gl,'eFҠٶԍ:4bnH€ɡfd_3J9BoU5IܷM5CcKQ̸tZb;OW(]~ >t~,Lh {eBM(+I7E`lQM=
-\r&PDt(gof:Rl߮[/%i)`RE
-Wyy9jC4{vS2G,4(%V Fl, vs
- (HgT&#x:Ŵ2Ɗ"e*OU :kd[knj nF5ST!V(b\P+~9p7 IP|9alV2N.)EhAq1bbzGs֨a+"YR܃,q(짝o4\=q e}`;d8,աmRT3n1~Wڱhbb?q_X }$s&#.d蔙q A7U#]c܀G4kˉN?l3³aWnkzP3v2uAXWl
-m~_ת v闤*ж~A
-Q\Z9Y}"%7 b%$B hGTY76IGʟBɬ1g!jD'|AaE /$3a=Jq`c)3_ptʋe63i;[v©š݄'3ok2Wy8YŻ6;U,q zmR)3ͧ n01)q_eCf\`%H/pȸˋ \_|)|&wXUc4{JRZSyBĹ1sFwĐi9BU06X<5 Kz7הZp"*&zӭ}(u #(U#sCO~ӲDŰlOB ?J/CME0:}魻\@>=72<q*;U:H;Ken.P~4*8D\Y&xc=W:p@kZ:o޷X(f?Uqbi vpRkLfek3U.=<n\oƕ~QeT'
-&3%q=d.920 F&L1`?=ӀXsXHoFxzh BC#I3=vF|k˟a $+sr kH`Mm`:9{fzG>亲X"OL)/Id m5wDK v W!r/!1Jkn`ffؕ(%s;=7P=sѼ9%%UMi!>39p(D>7}"!̷7DDp3[JCxڎdsIo^Zi,cyD l()Q5;Vä.1cܯ(,Cݐiknb+͡U]=~zOb_;W?Tb$LdRD"'K_#e;{9Js@K^U?dRި/NcnUza(f}$+W E7+ir_nZbOZ"ĝfpUFE>4X^('bٽnYb_}
-M8t3fj֧Tႋ*PT>͛ ?~Iv矺#U 1M \ͱdr}OšLVtꏏ:AYu54b9F`y9%7b7"ojDR*˔(̸Jbrae&GC槕z!ٝK
-G#yrL
- z%1B$^镫=Q4T :$2wx&rB%H_~g,<ILYiM#F;򟳍kO `Es>iƒӋ{'D3;-
+xct߶c۶m۶tl;ضmc۶;$o9gwoU5jY;3B) :;ػ13q)31232
+Ð8X9؋q2qq1~
+hKeu&JӢvhY!6Ob_\!|!zXAwx}btn?vj 12ih~pĮ"`W*;^G 9nqJzƤݹ-L/{
+Sy  aA14{*k92Bȏƒ ~Е)
+H)|?xNڊԗ*Q^ר+Ns_~q
+}sOȨj^*f ^TG0 W6KF=lFy#fD1? 3j=eV*J']gtQϪ~˗!όY8ˢ(VzyJ$\
+sޠ0[ F@EI`)dߨjdA:eb'[0*戌3ҟYnuE%]fBҞ
+[9E% c=3kmi~|VN{֝7-ףq&ηnQMr% H3!4c>>`ݤe*+ Lcc_\e)}]\LӒj%/c ~l:aY@wTp|ͳ<:t(;b5 3Suu7ـ0MM7qo %Dt䕆2V>Է&U)0<)Kw+_ʈ_&s _FՀr%RJ@zs%@ jGLe 辚֙{ڠeodb}>Ǔ`)br
+É^X ~vYN8R;fBqv,-#5[S27;z F/@ ,p9GsSo`b2 "ܚ]7zLcsx6%uyY٫̙rM6 .Pn|Yg?o?7J=Ѣo``Ћ-8Jl3V'"cl
+?.VrR f8v'yp?Z=X/:Ӿ)O"FrRJU]ct;r<U~n#Vx r3yr'\K(4%sۂK>ϴL=4bHlI)t&b턌o8D6:j#Z8G2|͘VXg
+F*_2>3{lkJjnr5O LZ q[+y~EVho.;7Y<RQs 6?qxAӰ|dO:*Cd2?9vOuj:`g%^ln`oL.-~OQKM5W.
+|J{SJVADRu(1~nY($݅QbԊ'm2x8մѵ2A9&Uwr5=_IYUU3i#e ԩvC[xBE-C3.Etdu}{taZ'l3:qՇF#z(l;ՐڨqC6ק93roe#
+cɸu-+j4nSHi
+:iy[0o|c(ouMbḛ_pˡTypNvS<
+9Z^<?qn ]--B‰Pٜ&d LD%_~(
+bmW??CU,x;j+Ģ޺jY`צr]7Fa2-%p/b+Cṯ₧b%{yh ?$2]e3YxmqЗoή4{ӻj4Wv`"ĸ>ϰ⅛;#MD}b{ J?)> MÖ͝)A}tҦ̷=2: 2Ս'L擜(Ǔ'3mc'JGzEYԽֻ-7P(aT'eIB,VhumIh_d'^4Ш%ҾE!ĆUxe<ƣc4A=oؿG[A>#B
+ɭ,k`?4 V*I~K8(F*-! rA͉an#2vѽq逍
+ɞ:F>gq5?'*Hvooɾzױ(xR39y5_tqMZ9vϮ%|[ppє碶En}xh2{Ȓ uaN}0a]-7dfPx<p
+Ԥz42o[|3kV&ֳC2V[jH%.kdhaG֓I'j=G>-YYCOǯ}{Z=39H
+B>Z<
+)ƜQ-|jֽ!gUJ&%G)
+*) )B/Θ`Ri2>l֘GC[k"˯AQHWd{r3T3N'TC%zt]tX&;"w.GZ} X [$*l Đ(LFdhÓץ4#J*Zf'BScclESÕt%!L<4!-N{E JhrB3@{H/L{7i ]DvH" ʺTP%0
+בA!25OͥΣ<W ^R댚 vpl/T
+%spujܿҖ[gO<Y#l0!xon*B*-YK<C
+i;7T *91tC4z u3yńmy K-ޛ XJ69,5œMt۪_E`l
+B<xK+ )թ[#̭iqOKLi=Ԏ-Nu!ӑNj> ͠5^Ox3,T ց wv͖3ԬX?퇛.XO5dm 6> P<@Ҭ~֍ ?T'Tju5y *vP"32:m 28QX"d
+_xi BeCU[K9N5dqֽE?aB -h'sfTE)Ѹdd_/$oO]jŗ][9տW[tP hGp$V$b6P.Ae>Zx?)`ݸEon8vF*Vs| \.(M5 %Sm
+[6-%YߞLB32#)"6zJ0ɖz2B cQwaQgGϷ/9к.yg%v4RVJuǰ[m_>h,vl5[dz`(ư:]\# | 5^>K@LCaYBI@2
+ѼMwDroa&dLg⋂SwF)fS_b[ݧɛ]{q:ĵ8!1g_)S,8WCM5m؍2ųK'i;wvo^>e:Cp-~aQ>־rs /@1ʰhVLJH 6YL1BIݙj~
+E} Lj2kut< oLs)UZ֛)mO?ɣdt%&=5g f|WCJDݼૼ
+ȵ&Z/'zϽEX_is1[lSm:׾ϦzUG
+=1D,1$a$k&CP(ƧL߂E6 &MNOyvȦ]ue,Ret(%eIVE{2,Ў<mz]-K}Z."QaH`k ;Mn$LLI-G"^ 'vsR+Rˮi#Ͼ݊Gno6M *n{ >2Owe+6SXȡc-OV0[!WlO.a i9Q`Sx z;ZxRVt]:l%e9X:S:c.JqQ~A0v(k{ }PGxy|P׺.O*PAYؖ,|N54-iŷ}0kMmar n-K/cI`ȇWUKDeg27p}FFM scז]M9k:ҦTێ#!UN#5lc2uy>7I!89A/m-xMHvs`MSɫKI5c~B5;ml~ܱ`ڸY!m
+$l8)uQ?9B</_73K`Uf =ԡt h 3༆1Cm! if.nd$&
+jb(xwG>Lp
+u$9ɗd)u^ZhZӍ
+ڑ:oÝѼ7z+{M<AU1s*j԰69LN6NYVԚl:qd
+]hnCZ^c+6Vsx:Z,zQ
+ѱHC&ɩJ\鶌J\xCnbK/6$`(RKObażgck5>G[bT54O^-h 8l!hG4TJeBE3~?:?g~%^c'*j2Z xB:x8cCDX?<BęЮ~eAP@ك}/qF{R9
+i"cRg|mL_N8\"bkT%"BfnƏ+tp"b=Gco3RjC
++gsܶMw1PPXH'P>Zȍ3MMj-,t{0Rǟ[KZyNB0&%M9DԢ"3aVF\:#!{=/!*zf_PPQr
+&zhH;Ԍ4}J&DXg/3vuDˀم-_< NuW<.nB}^ћL|sQAsOԂ@F\.%ɪ9B)U=As w`^>ɯ;^c+: m^\s 3`3xh紇ʽx2[xEFyYXLs[έ=ܨ !G4T*"QvFJ
+Okӌy%W ~KwC=7RqyL?'A$jZKS/֦*G$;aG,3BPBɇB,d?= *Ƙuu ;,%NL~o>FM~
+
+;7˩F 1&S+]cۘ.UH-~<ƞ ]A/Sniiw}$Ws|#D]EjTW u1Vl]<%%'S1?n\@{.u7z枠j-΂9JbOke%[O+WuVpb Tz
+urV:pZiu56׀"װ. sh? ,j-?n5l&7tWDHynm\Np< W}ۂw_(p\|S*HS+4jϿ^ЯמM:?DRsL|qĀy-Jcgл`/lЉ
+-h#Bo@![$08 &Dު .絣Vl SjM>lʍX˜BNluK ' UOZ[dң.ւ
+Oe{rS:d4\Q>Sфά>3@)Ga5)-k YV8A$GϷLbwHNꕳԻxjh)S%sm1%5oʛ4yu9$مᬵ04UYU^-`?b=VD%:!~ۯ EES0Ǭ`PMj:|
+ :W"
+d g֟Ci44} jg| )‰t~ÑXbk E^ω#(20kŃCWk'FQE⯜@e~xaT5#LޤưLû4]E#ĕU5B$v8(Nu.4SR6r~uq $z\x] Y+,)@ ҺT]TJ䌦ljrg9~*hݫ}$+=OkD oo|}
+WKް!uk# <ݷN!a1mTDzqProgǠ+T͈C\/ȇU8KSF5I%h[Ou{(WG*E:MM-(c,Lxtٔ H Ş6GRc`{g-X0N[["V!QO$@^>H^a談@i%Iī##)*F QOvMcd:2jv*a H_"|{V$aL;*a`w`X{SsK,{Knpxr4/ọ+&΅
+Hx[-Y08>0WtTˑ׻*]5j2-v,ApEz5m_DR9,I8R+"pUNݣR6L7pk7Bdcöu\AstiAd/kП>j:t(x5#"jYE-cS>ޟM{7x0i7͚%OA;δDc/ -Ӵuz*釉pݚp fH<uc ;sPDpP݀\ךCWl7 D3]H\SrȈ( !zv$vyyh;P3ci"";>+E^܁5ڬ6_,.?ꄳN!4݌'{|D6ӧ|ֱ*+xum)[zOFx:swgJ$IIV @PFgTtB*̳} =:huj+vVD qϮDry ÑY g%N_nj/͹O|qe&xsYE5~zzz %-/} +#]* ýnѺƺVmGm*Y}!.oI >Di~tI\}HʢaBYl{P#A6iV-pz*cer16Ç24[8/9GYwrC1Lh{*pSr$(ru,`_\KkuY_&=8-/k#ߦsrո{,
+葸t9r$mh8!-עݦn_n/+G 83`ϯ;ͨѭddGzV<$ǡ` wv}?P\QerAY)J7oYdIkj79~\J3J٭/Ux#N%Q5(FA۾ivcK>]p]/eob]Zo%nL+sj{IT.v i8{ޭ
+GS;)ɲ, !NB%*eD}Z/ #[Q7;0Ⲙ\cjJ%ܟ=˟SVǐ{J92iYd uh|UlPV^=JW1UI94@]M*&TU
endstream
endobj
41 0 obj
@@ -2125,7 +2114,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-4 -948 1329 786]
-/FontName/UEMZVW+CMSY6
+/FontName/QGOVZK+CMSY6
/ItalicAngle -14.035
/StemV 93
/FontFile 40 0 R
@@ -2138,16 +2127,17 @@ endobj
/Length1 799
/Length2 981
/Length3 533
-/Length 1572
+/Length 1573
>>
stream
-xR{8TiViّ-#qs-ȥt999l!jRR mTT;fn$rm{==go=?{}Ɔ,Xz8ł`'06v#QP'
-0x,M!"Ņ"`[+Ȇ3
-`OL
-|1 "飸`:#e Sh@#5C"1 ba8`Xs
-˕ruxq*r4@Xg qe DjҬRX]R@qRO9bI;7&LSZ*6U\*Ol6HPjNWG9 +}>U~hp|WnV"TUVY%2c2G=OgC mmi|/c2rRLV?q0Y T54X_ds:Mŋ-wBL-iS꺊zgy&f.if盪yr-WdOkfVV]y$/ȴ^
-Rig[hkZìH^{j˚ff&S]3l2ti4׆GiC럻=OYgkѰf43׹&gۇ1X6K;_v%4Nr@bv )7؛toe9P^z݉&tVBqKZl"M!*JOzT?xjna~n`)ځ*i<QE
-,_UU~xL=W]Z\Ϋ\FRT`-i׵&<<n2qdwy^E:5[|2EkUrY/ͩN ˏB/B"`wm\
+xR{8TiVi#[jk#c%kr[1Nfͤ˖dBJ)ڨvSdD7Պ\j
+f-`{zV>>{ }Y\z8ł-aG%06v%Q PG
+X%d0&C>ŏшHQ\0
+ވ!G;
+ NP
+^*Ԏp:*ܜD2㪛~|1L8)$;(߭'tS[j$p1˘K?I?8^zv(}[B\>5N‘/W̩ܿ
+TIR/ZT {WI6UEVϷټwnLJnܛq
+ 5Bs}]oJO贉{(CtOǔm>xwhF؋ypWF[e/LՌL)eAS޾w1OE(BR!c?
endstream
endobj
44 0 obj
@@ -2157,7 +2147,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-36 -250 1070 750]
-/FontName/VHDZXW+CMR8
+/FontName/LCWNEQ+CMR8
/ItalicAngle 0
/StemV 76
/FontFile 43 0 R
@@ -2167,49 +2157,50 @@ endobj
43 0 obj
<<
/Filter[/FlateDecode]
-/Length1 1635
-/Length2 9373
+/Length1 1651
+/Length2 9571
/Length3 533
-/Length 10337
+/Length 10537
>>
stream
-xeTʶqҸw F
-
-<B
- >odS cNjnY׬ͽ3a p擲ʱio/KQC H=K |y><IW*XTe Sdl+( dN)r6
-&"{D[b%asy[L85D[.+y&{c\D?^w
- Xrȉ72vj/@ltgZĝYDI4+ִ%ܚRY@kRh%C5}b)*}fh6bw3SA;?p IЌXDh\5\/юUw@ S
-ƬiN1ơDMH1e[>7^7:x-SYJĢQ,]TNo\;iMjcD+7rzSƦ)<jG%(_d_I@=<l(Pc`|4iVR9u7@7\_zo{/˷ 9TV =2ېگV,t#{g(Ô9dt{LTf"m,<&Ͼ#IDYЙeu6$ 05fFckwuBx9%w gߥݥ./. BFk{s<),bF|QJ.d
-] ;pZ%ؕ582+k| \^ArPerk)\F" l|I5e`J
-~cQ$ K] ?ِj6s
-X+ DYys1"&av wkt ;(h
-h/K Ժ x<|qTjHN$nNvәm(BbW%4#"O?\T=)a^|LmXB"J;ԟʼnUwBS:MO"svH(!ۥ"Jspk!;?$ 9OL35fBr|%Zb&^3ZQTbY AN$KTzpQ-Z߼E^ Q<CLp_㘋%Rm51wR^%gh^ 2-.ĝr^1aȰ{xSh\ɪQ~/|̻2b^nULZq-pKn{'ed@ g m<j=']yYbСXt`5;*@OUtvNdmC|)OqE#1Dl$zm VUj/$? dG\+L9SKnm!z
-4>ZXr6]>brغ8aW/_Xtֽ@CxXi쾊2dW*TPIf8*ɱ9w) 2ljؖRk-c׬ DV0K٧诺9O53_
-|,(Lc ͍8i*F-JCR˜Z#T,G*ibap=e4џqQ{߳$wqQ"n_3V0BC?Lߜ$iW\L0/[c0?=/u1+hmf}.lHpiL8&Aɕg Km~ŒR4V 謏ԕT0*xtA|'!_R'OUi3̀I gm٩, pgb6{R5(!N[>򍺟)6T^,
-{WI:Ck49]ϱWP#'/}+y<}&b6$]3\!3(gl\:Дr5ٰ!뙇OL7 u f:6 wC.'b';W/˜M}y1ȉdEڧ%:-ON~-Uak7MBF4TBS_Tj}7
-|6$ O;acW -ZFH壎< #C-_EkBLX#Z繖TlH6H4GBf; uhcRnbP7}/ZfQ'e)*MW6>lwt+&ͽ_r`1zXޑw=Dc`x<uC,ütAV1%H1>L2sh쑕"$LgtMυ8Z!~s\tWVx귣#9
- 2?YP5|c?gn&$FRR{d]{Ir4
-0}sOtԀIzDq#=q"Gk#?|6N!NXů&>u,9'j#ڟӌuI쫶%{}95Y c8"b<!KbW  l핟eK:IfIe\i'Sh ]n<W{ϭFӨi~A':-W#GmkpDvjO3a,T_m: 
-\EhArʥX)a$I@"8C Fb~;+i8ӃYgB
-,qэfPb$5iOV je]3jg$o/5Ț
-6AZǦ_yN+6IbZ W7&8!i!T7ޓB=MC6nEp=RgoT>esZpıo+v1ENoLV[#A., қx!TEP^ib
-|5wuQcӉ0(@"YsdcFvv̦ȝtJkҍ?te> !(έ _)۷_ai Fn\&|6&pU)y
-PŎ AU"}L-<?븟 A5{lRhQ}`>XŰOθĥ ΅_4KՃjr3ב&9\0;qʹPZOgNB__gh ]kWѸ//IX*A;~5~=@Λ: Ti-A$s!Cu$<)ΗҼ<q<A+GWx{ UuNded}fIBJ}  OFX踶%4o"f<e7VqSU47Τݻ:{}4 a?섷4cLxW8H4.$&`Ɇ}Ǎ[*rYJG c:M''ŢiЕy&H
-C[+AhsÛI;y8lV6EF
-d"f۟SrH#⤛kT×nrA.w k
-]i24WYoRk6Ds
-T]S&~K[rM#n[DGxj2ZpVW؏)2* iRcTz0ݡ汒leEW?Nm3+=c/wu͎,>c!З1U~ȸIJ #fVru\tvLcT-5.{˸Ƣlޅɣ\@%-' o8 ?WKqszp':s$[p*I{+Ú,)2 ۛhߘ{jw{^nW8PR*9 *7B1ѷ>=$L=ϋG[h%AAf<^H"B`u@͹]p-0opT[sD'(}€_'D*U|Q$p<'k‰7@z$gqыlO&pD1l*@}tn~FJX\޸Qh0 N?L"l+Ct ?5ESnyâWϬް6CL}rHg{k@Nme5"F>"EUmn#L-t!Tz%S7R95La*}/_@Rا=b\e7=4+.t*渻=b^8!T:f0ǚ*&~
-y1N
-D:(ѐP5.ELEe׫ (
-TYţ#}?THoF#-.^ٷ״S*!X `]ϙcC74~]ziXf@$R_h͛fu!w1OL;ZɼRmunܽ 8vF{H!tj컵gJM(SYbmM
-_?D7m:6}BXNAÜ)BYX+Wi a#[Њݤi N8q
-dVd9ۇ*w0GUFps7|Çb<!N 7~2Y㪼
-&l&<'kd`\>轞I^2=4/"]^ϐu.sߛq.$Iţ M^gRdCcwV Qp%VqBȘo68<wR#i5C! X,=b&QdڟT1PnNBjZK~ґaɜ*IG؅?ԏK)ozZ R{yK,?r7ճ x,upcn mz5m$quPm,ub.=¶PBeR $g7
-^ko+eDvf0%@э
-TB!޽9m?~κ;83=b;5_@u_մ'72hV'@4@s.т>Vހ_ƙS휼]xC(&h.قT
-AIpS۔MqDYo)_zdLKfU9|ИzEhJ.-\gf\+)tQ^??dlɈ&iEK̠fݏZ _OfDM!v%;sE48yqt|Xr|McۏjJ->mR;\)AzZλJPw7ݩKu|ҝxT8CʖȻҏX;?QTޮS "9=de}
-?qgi<廻, L;1ndd*,$dSFay,L>,(s}C$-J{T>Q SE?S䕠3!ݭ_÷/ɬђJ
-
+xUX۶ wwR@(4A;A]kWr~nx1?h(4Y$-2`7VA?FhrK
+d
+< ^7m@
+@H)e6 ?2N?!~#Dr!@ ?Bd D![x˗ yn|<Q rvKA>vv>-Kw5Ȁ@/%Rf.ڔgR}bQ ].wd{8֥vj7˨'jq?Ţܙ{{U~c0ܾ?`n2a>Ƶ60_Y9u]R6?, tXU0u}Yn؍ %h 5xR
+튆шo\"Ib0 5%ێ4Qc=[m}5 -qڈԁc2v71` mp9-)BB]bIjEcV\2Z)ٷ}$bb\ɸ 垯-r2U? FuhVnˆi5 F>{JLڻ"DzQQԗ-VQr"\ | ,_#E_b.BAʺUi],Ka{Wte?Pi)~2\ieY"`eg}<|Jl;%+fែ4jl~AV,J{:@mTmCbݲ+-FjL(dtN$G
+}րvcVuuωEae3Q)ե<g)A#$Bb\A/p?e]a
+jŋyRY9ԟbG:޾ҭt>r>tB0Dy6:b0U2~*9o+;VvN)Qe&k ]./WJ&s 5iʟi;Hov̮|H=Zqn_m=~<%Az0#Ʉ[A1{"rgmt+
+xH,Mk:^kq,z0 TX瘈/t
+>OMfN\km -F^rfSA]Ƽ>̭ n>2Iա(!؛@ab $>V3N-^[Kܧ2+sl_'=> b+?ƛ=G7>\H1(θtNl^j-)q&>ڥ~ _t=wE`}G2~[$Fa= _{FפKgleGG쿆Yo"( 6kzɊ,Q~.\E+5mҶxCUv1~ % [aF%2?9MlUdXx8a#!oP݅8__쳂0$^|Fۧʆ]ô4 QS8quuE~hF]+iy<x֢篸Tzx(昤/Cf"d#c)yFiM99,4i|MSVڗ댉<}-]rCA&X+rQ[K)@lN8^[* :<Fv1asN#,Lz ?-]bڵkkSNMI
+^*~gHȌ`/^9z),NH| |)eKO(ςo4& #%-\RJ7]u#S%kj;IuAۿ03{d!xp잺bO /t鲰{squP6Q<Jy>:޽"n<,20hF֝~6BHe{HNZBdDy~Latyym^|`m4atVۨTX`X2>KnVeU=ԌYrF$kH\wd\z>Ym}Udt?he^r8Hc@Χ>N#[ܨ0@ ݐ$F6zuAGџw mh[/=ЗY,)D7Jq:BoLdHպ1y$sKvEOhb7ꠙUnT
+|'6+sD4"#zdƥ*x5V7^Ɂq=Yrh" ρ^􋯚.x̓6{m0{:a݈3?2?
+mIZu|#`'#JT&G`kҖ Ss֗KF|4i$Ux Oٿtq7Bggtkʺ'~x5W^+1jE(.{ 9Ty  S8zTN 1G',V8(gAep}ן9L_6AXy~m٪ƠՅƕ=h|zbnvr[=/
+jmώSo#X6IaA[s!Uҁ#?QƟ^0^XX-x4zREk&V<S_F0&ͨ}}HeHF8}f
+mWKӸsX@٢'%7vph-LUQi%e6at>w|wp͌Oה\ΓK}[&6j3g~):eXDdzGm1X*"m |,¢J2T3zwl+r$V u,-=ۈ2K) q(щ *u cAOzY|Np"}gZQuSl8{B$9ԧAs:,
+B"f-y
+tHKi9w6c4%3TJe@ue O1gJg֧^64|u-mM\`I^^:<qiU>rWVGA3 &7;@0T]g +(ipD8|!|N2̦
+׻r# xbl!SO~}՗hռ~{]P|8$hH}еF8Lݧz37:Le NԿ&̰B%4;JG:C޿Rӿuٕ0!.s+ _oK;0o1+LV@͈C {ڿhԲم Vy9ԔO,>51iH
+ EQ/PO;OZwqo|GkѸ7S!i.nyXKQ>8v0y1kV]4BAR_q. i`ffd36J< O6Oݷ pBoS99<ЯkIXZ!K Y0ʷ t" kY=?J< ckmLʠ&5Kc:9l?3u`ͤԼg?
+б ^xupڂkA8 ]^i#bX
+6- A?-;?K촬QIAR*E& ʰ畿ʉp[Q0<n2^{!Ey/LWW!Rb,szXgz]oR5 #0 C=I ᆝȰd:7#VIŦc,>:ƤYrNz \}oL4 jOGl- 0tz Z
+V,7d٩2qTRTG*b`n^0ÄSloUi9];)cLcN*6D>Rz|:"[-Ry7jⱶsȉ h:XCTVNz[x}9T2U9H+>;̵9R4ڠ4rBZ! .g8,/]XҬ5\2t)*(u/Y:!xd;%e%#-@8E蔻|8s".Lc6iPE)}62O_~_۔3LΡԮNL5yZSHrc_T/h7(
+„e60|8] X=p8C&Lƴb0g"9sL\.T W?\Co#o?mr7oi$bߞ Ak-IVh2&~}$DN@GeH>F(=")u
+m{+h0{Ir@20,u|IG5XZ4)uY͟xaC[
+fLXX
+J'
+(qձDx9 )}OWK82Me
+3QD1h4MڋS#~K
+]-}׉d8HGSGsuoV-B)eP־/ IEy3?u5&|(o/EN5)E쵦O6#\V"nxA|-X"7Iue@r5ԕZ1^#fKqFzӅ!Q|_ce{*Qr;C55s䌪u\]Fdѥ—OÝ0)BIБu pRCႃze~;<G_
+^}ݢ .ivPM2s@$~Qi/2Qh .xZvFb"(@$Gl
+6!x0v?O-3uM#"F><Gwк?{nwnvX%-TYcp49)/MNW
+W3?½Om\d>d4L 󰞖 v;(x˭`Wa'÷툙u,\eȴ6Qw$
+6S9"Zf j+0%ɢSWq aOI `ЦgjflBzw^\۰eEo|%dW1`ɩ:>Ю%Efڑ6
+Q:lbȐ[!0*>}/Gəʡ v]3?Oe}t:s!*ANuZΘ\뛭K(i>cBH'4[) AɵsC1' /2|E巯%@~Xh
+Vcn=x\9vp btuIm1M߹[edh}ç]v-TmWf6n{ :r>.o,0PB6Bm㨽R*06Ыo;)a21 cv7s>f\ގx}7m0c8!B3rB\PNw24orj_^%]y_c{7#;=WTWԓfz6Րvn,Ppc'0 ^|9%i"QB Syeyv7|
+u L=K]CZ>~fy37Bܫݳu.hᲠB8\"tBv퟽1X )v֖G |݀
+=utN=xmk&Z9HåbAkow LBrIrJ
+g)CF֩ᩣ ?Lgmkڂ$a~q^<WhD.dk!]#ĜaEÕr ٰ3 ctS5gaѯu7"ΥkQepm=&ޟxdbiH#0p敄2n{H~.eFxn8Vaou]*G峊Z m;\:ɬMr8 sH~ry(V)muɟto'E^ ʴ`yYQjeS }wg2.C|օz}V 0:&4 Tvϩ8ĮİfWQ٭QPX|8(\8
+DIr\fE'ؾ{%`^]4b]'V pIL7E6^Ta"y;@}!~,qeODK{X
endstream
endobj
47 0 obj
@@ -2219,7 +2210,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-65 -250 1062 761]
-/FontName/WBXGHI+CMSS8
+/FontName/ZOXODI+CMSS8
/ItalicAngle 0
/StemV 87
/FontFile 46 0 R
@@ -2232,23 +2223,25 @@ endobj
/Length1 912
/Length2 2265
/Length3 533
-/Length 2901
+/Length 2900
>>
stream
-xy<TE"afkp1f1͘$Ie-2)FȒ,%V,Y$Kٲ莺9<yIT(\ mN*08Eu
-o6 G#8؏ 
-YOeD4 #(!@8#b
-}'8 b~B8
-UO
-H~e`Ok 
-(QTmj67>Y!L c xmGorblYq펛֫ɼ8Q)
-r"BO#6&ʼ0ꇙ[e#>~yķ ?*CrlWv wag#n)rgFDLY
-KؾH-(.oqwiys̶kV҈e2qH*/AB.ZrCWH;~&{)rbwH0u*c2AROeK .&k?slp+Od쩳h{K#<~VfjM$t.m8ISHR|'~#&.O՟yC.Aewi;tLɅ
-#6v3ZK[59_.^+5|3'2&YhhH^C}Lro7cQ05*p"z g -5 *ώ#\V#CUkk5Wh19-zKgߨ!<tX> }yUhyt&@:jbjK5 p Aނb7ۦFKqWiuQ+DIݼ?l:Gc$UG Ls!<1iA_Hʺ)s7D3c_Ǐ#b|{gxmo%nsvH*/@(xg3_jTJlGAsnL~}[p>ׇ8ʧJ <Ay*XgRIrddM
-,h,2k7̽dHq=CHQyWڢbe%"㪅GYc./8>5yY(Gf±۾3bfV<hO?FV?hj(Qvq9%@]ew =\Hoo旎xd^|RSֈ/{8Wph!ɺ7e<kI}ξH2o`AMsn7+E$=mM8m,^]q%\̱tSNd
-%[\ЪyINj]+nU)ץwb!:7&h6)k ;qsV~HE x~;o^M#}/96Sp\hx_s[`[0E+'ON|c+P>j cV$pv%Pn~tfgJDw1+,3D)*TI)$5k'("2u{fYpf>G3" }
-"Za Mϵ悐V`{֮æbڛ埀 cN8.7DŽʹ1 ~d
-_9Q~ӡ{'쿼 @AJ"(g!
+xy<TE(CDfdYǚ1sl &I*[h~I52Dd)Ieɒ%YʖGw_u缟~<sdNB 1$ДDBpm
+:PPtk;X
+dkZZ
+z+0
+T?!P
+Od-
+'TT?B YR*,;FF@:"X_
+SW4AZhO@ c
+"sf:D؂{>J3uŘ>J'ǍG(wBl8^̃˹o,<MbmI'R;e4n֦.t<\/9s#7kmW_@}[]gJؤת#CbԊ?w-ZD:\:*d$Q۷q`E,MaŨAnaWȩq-G
+S0yۼsCߧLiK{yHT`XЬ7C"|HQsOi/ͦ FP6{XըeǤ+qS=ylΗ^Vtuzsh ?Ju}^tkc_yptσ#htnjCsfmJ9GȁEۮqIkLJE2X^sKs\$TN=8o>c1>;/TN׳f;L LFbׇ5UJ?% cPww
+>Pch HA޼x},#Fv涯{0̸+τΤ'jZ/
+dmcT=f]\foI֗CF'zky>|9W2Fۛ%O~Ze
+.}-H:YƕUL!3>Om-C I3> fH^ǷC5^؋T3.XkA7;MN[ߍPu
+<1x.ݵRV{R]Z~'&<}#a a
+
+Sw}1(g]6\>(YfUiOrgWj{;S"Խ^a!L" Jq Y$Y+A)3[|2ǚ3i??UAH  %h}5̷bZ߻v$6, 7+-sR+i.tg%}>&V΍f\^'Sv :wy  4DQ$r;!
endstream
endobj
50 0 obj
@@ -2258,7 +2251,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-20 -250 1193 750]
-/FontName/ZGOLMJ+CMR6
+/FontName/GJPBOO+CMR6
/ItalicAngle 0
/StemV 83
/FontFile 49 0 R
@@ -2268,26 +2261,30 @@ endobj
49 0 obj
<<
/Filter[/FlateDecode]
-/Length1 877
-/Length2 2362
+/Length1 895
+/Length2 2549
/Length3 533
-/Length 2998
+/Length 3197
>>
stream
-xy<ÌB荇6klnJE֦42%$[!KӢ "d+!K*;%q&w99y~ڦ@S1&ӎxT
-D'+B"R;2Yh
-Ov]<>!U]9{Em8am垠;;NƕE]K*x"q0o}_ۉ1{0GA矗j/}݉nKo@pT͢3V;/k _M}m,R$Qu>J,-e_a3ܴ ~ &-KYK[`(I^f1{Y,%wq$+W{,PYv]*r1e ǗKeZn:_t7=6ni'e:"PsMjBqOcHLh6$M;.)> 4m+cz0yH[:8bp1+;ʭ8"9JzM:\n<K,\z 8 <49fZ'm_Ι$d9E]IaDgh7FqZISzҎb_Tbp΋
-_vۗ;sqlQ'ہj´|,ܲf_+UY?;zıŒ Nu9^<(xpYW~l/R-ݙ51i&"r25+<37y d94_Zk{Q[-AE&٤s3 }|#_ٓev Eڗ/~jVZGN5"6~܅~{&8:n7S[r
- u8h?sڅCgnËX!C+E<
-`oF>56U^mkf:`+tx]//'Q̂oTŊp
-{aIdv9^A{e|)S?ȝi0xz@JSG *yv[3/
-hzUQ]A^Ty0 ϻV3>{%r r!Q;~lى7FU5D^Km-LpgG{L׾wT91}G_&weK4 %,!-n 5O;;Yվ]@X?uR<_sc#Δfp$ĄZDfnCT"U gZY2gUdsDH|sl !M/|=t'Z.g4aY[(U_'OZ[տʸXyfsFgNV;"` 'r$ /XU5Jm;v[
-h܅oO|4(it<"qV@jΙ9u%r;g$<N;,Nmrrxc1C`,'s/UBPS&s~ 2t% Dl˪^q+Aފۯs*~؂Sb+ ZỈjVOSߓ4\״8. -%-ʍbDiy[~t|Sso=E
-X,sDwm (j9r55<UB9)!&#_2?M"8(룡偛tYLZF+~{"sV6 ,ݕ:@oU|2`(I :[N' ֥=5E+Yպ0=Fވh`+>wSKq²r=e~f0ٿSf ӮU;Vr=]OedL
-r1u_ؚ黴Jrh=u{H -y:w -l[ mU-)FZ;Yoޥ/4xGk}.Z}*Yy^{/$e;'IzJaŜƜH#K 1zBIkϢII2*YH:|l.-пQrhIPZ˜z'_:$m]~N3%sC !A;-RAmf(.(_ֻWzw.L*13XS"oHzZz+
-dbƊZ}IF:c.z~ ֮
-z;?}kz
-p=xIޗ(ֆ2[1lqa{~׬TFhfB\>,ojt*x$&'eUBC&cHT`Ҽ?
+xRy<{ߎ e7$7YYlY5mlيØa0v QB$qdM!KNY
+5g=?<}]wlT Jh
+O A0_UG
+9 nP} -_m*ޛDgà4Jih jBǓI#;P)8~7 n۷p,-Ó(t@\aߘ 8(-d~.c
+J$Q+ i4| l2DPtݓPJ~6R7
+vnᕬq
+5sE-%Cp|s i0su@{oE:tJUz*8OW
+xF d
+1SUV-~x ^|bd.+
+o}֖aĀsj':ۗTiFcLWUpp|e?P'P┙kDJc) ]I!qq/TqD/vl^`k.ׅM%d.9α*)|pu$\j\6QŔO3I0BL%ݣ\|=_,*- p?L0u]"TڊPkU\l*0>Mo72{Z+o!qAxfaɟ'n5:5mx,9`¸_Ar0 zo%;բ;3_L{7ȶ^+ +}:9X4j%$1m=By~C3?usZBYVxaљ2B+~RjR::UwN׍<t)dmpLv)/m+z}^ŔZ<x/]SqYFDG$nIvR?z*_]T_;-y ω$a W_#`qp<DD yHp1YkCB<\ ֻyM%='ѐ[.D2VP
+L&?YTPxp(4xo[+^_,|톐";q8{|-ϓDKF =Kw9YBbܩQAk^鵅_9Xc幭J1D S;H}8XXkUkeaU7'IڴfQ7q1 ꩂsؾjǐ.vچݝw$l!i' ߧ޴S$ZڥQK^+
+^ro&
+ʢgV<.1.wʕPMNO(px:dxX1l.W$x+*X[gUegw[fm>>XzyH',sk+= ?*(Zt^']ڷȣf* ֐΅=z.<zfqE."ډk\br,PtupeM>EG-boS-T3EN,bG_P2!эS O&21Up/&\>oq1+c5|9B?yL
+:*OxɽLl@}%Z o.\4(*~`RNBK{̸_lŹ?e-7+u|t'E^iL5 ;yIsg궃N>ֻTj7ϥF:%}r׎B!f:)k!wC mG7 ǻw-f!Ai١+éyOPb"T)EBRGE!ئ4QzIHV9r6PˣMK9Ĕ&?[ P(V>X9JvTmwFm '#(9̶ݏjdiq=jJyz<{U. KI*Si.&^pSaI
+;˭7AXt DP-G9Qᣣ9>Lap=u2-KϗS|APR+g1nUw:6
+l5?{zV-#4i#R%͜úzuxK[Q6Y]L8+f{Ѹ^_M~Qrir'I;CHTsL2Z@ @K`#SIɰxF. 5=OQ\
+3 vM4Wxϛ[\`xXkb5b١H=%=\%,eq^a/!oH*meА]S"gÓyZtg@\H;\,!5޽ICaH?P_To<
+pl
endstream
endobj
59 0 obj
@@ -2297,7 +2294,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-61 -250 999 759]
-/FontName/GPUPPB+CMSS10
+/FontName/HNSZSI+CMSS10
/ItalicAngle 0
/StemV 78
/FontFile 58 0 R
@@ -2310,26 +2307,28 @@ endobj
/Length1 1093
/Length2 3409
/Length3 533
-/Length 4120
+/Length 4121
>>
stream
-xy<ǕD,Elc!K5dK10 cF"n*{,Ⱦ$Bɾ7}nOzs|sWX
-
-2`0At"a9?
-> NP8C8
-HRrpygNSz
-6G[%MEwqb\?)nV/xc
-E焉/d$UMċ7G|Є="EL
-hV5guϭhype+_Jy"rlKKMʺW֭E2
-Lا3[]"]ƚ?qqRUqݭXO&5(T.K/>9mK͛
-! ش=±AVdqF@Uq\(s\ڤLGl.Xu {iOkd<!n9+7EJSo>a!
-_ ,xN)&hU>qۢj߁tr`n4=6AK6t/ GprnRPZ x51iL%k*3j^B Qj[ tٗd<<jj#~9g1Ž_6{փҕ|gIuOZoB#&Ԓak|2.
-AQ w
-28ovoj9cKFqcҘF-( F4#ѽ/X( V_!ZЖł!ؙ+]%(ck1L/ߔ#&Nfeަ` /{'yHwSMc}<о-5«cAKG(gZϞ
-=Xa 8l6;E2qi@8U|btS7PUDgQnq0e o>$Er\oB=W!4#=nQ dp7iޮ5DHѐ6}7.ax #('3 yg<r?1Z >Dm 7ܵO!T"˕!4@ޓMG+HZu.d+Vkpxlof NaVT q0WGM PyPkM688x3AU`ah-9z =קf)u*xE)W6 NB?/a<`^/|bFZVryk<W$rXLNvyW1W;Bq<Dq3f.sMlFܔXrC>Z7@ZJ/?|5yI[*a :b@Xߤovckfɋ uX=r!`^RJ۩Avќ5kn|8 RdUM^f5 MݸS)QjgC]O*x8eҒ
-u
-z4"&ʭ_AЋOl}{ kg̔gBwXzqc,Ŷ%wl| '|+DŷS<&`9jiQne:DBt+V?~qnޕFi h򵮆 zIg(xlW U"|=a;y+)e׎JO+o5ѡ©<Jaq0o/}`/$0^V3,S篶jgRbɠ/׸=טx\2OƢݮn7If y02hXnbD^C%?đ%RF_x|7DwV0xxE7;ȮV$?ٺ.vSgKy>Yg.[:Oq@n!ƛwoW^od8 Y '667 ,\]1Mx*@91)3S[鿩'P>v ↝ir`uVB Q5)RS7E
-=:׭Q:e:&8/]kŸb%Аyl`_a f3+⾞v(%Y?MDQt0,j+w - g}fSB >sU~ɬch4(cvH ~_YxQR^fp\~ۈ.ٗI;=uLk8OvƆ}>=}}X9ij4wyeRo/o>H>{3~Տgw%ʰ)p,O51׆{cHjΰrŝ𔆻^m `~n^vI^Uh86S|ӂE|$i9xqq07~a?UIJ^tnO1WަSZ})`x$pɵ=0 ?l<Qw}gkTeΌ1TV)4x3c2uX{%KMOE Hr3s1x8{Hh-=p^9ߪP1n}釜VZj*&˒f6O.NEu2)h JRH¡$2$Sj
+xy<Ǖ!٢(*ۘae_Mɖ1ffa0Ⱦ !VB"k(K7Qds]\su N$G.H@-c$* @edbbZd #Q2
+$6Eq3=<OC-`b<̂3q8eQ뗛E+ZG
+%_?aPFx&I޹򥄙JɚGO ߵXU+w>1èIX|NdI/"P->)[w!aIPII:Z/CVq@M9խڔ ]sd_hP x-(Jr),]`mTw./aHvGI޻si'ф52@ɹH^
+:VSj˦բpq (P)7To3PՌmk- Ą:[HV[cv8Սu,iLi(Oue|<72ɍ6g[)q r?\\ ߌtzI8^7A}k/#c&ݎlӗ4ΰDf<ڰ{dSxXvPK[b7WA-_9.óS1ɵįhXY)ҹ+51^(U^x"h3|^E۽xWϿPvkuBOY-Z(ֳR7Ze#k#W7|!o)rxϼv5$xE5:lmu3>-Y]},lNVb9㞫sM0*&"LfP˓ >Gjb*i)ki `c
+Ov7iZĖ yWp 'Lb^`OlO6+kMG  l=͙<.y2UYεŗw. FNhuw,HΆGAVVgCJTD=);Dyjk@){+C,:w.\R,j[3ЯElBMt<}1-ou\+rR<mTe{
+Nyz~Ypln*r7Vg*{GV_ VBSA8喦w(j:VMϔ}rx9+6ΐ$Rv7oKRH}+mq wl-/qż9n- fU+gO]DqrV=|e*m<)n޾&{ԽՎ
+%2m_3֦F5ĿZ.7z,ibc \8gy0;h=5|c6HQ{kM”lјwߗM*Cy?v~d ⥤j'D-vUK7&v*˹Z-||R{eځY3
+LpP,Wg%hOs ΞC<e0˭XC!-F '"O _i$<b6hx[Be*iyH<VrrlC?HETWq^I(uglaeLz`B3Oةt0+5mU dq=iξ-LDՒC>#m/+$A;
+o?оa.TCuᔾ޽7NTeq>l}_-{fT
+e~Go$x+,MCCjQ*7
+{Y+OCO*6}gm=~cΓVCPv9b؍ #Q:7WGoxZ/t&j%\N]{3ΑUN0{'Q e#Yx\s$ICGsM! `m_@ZK D53}N[{-./uā)ScE$RK*AGI廮TX&Pn蹴̓vS_@nbFFθs+6\7ܑcBb5Fyԥs/Jup~ [%Uf(\`gqv5?"y\ycj,}RAԶAݑ`7:(o>XHwc o5ٻ8?ח[Kj>2Kf..3#Ja!cxMb;dS0鋊dג4 #ܥ("PU*N|y 1!57 3SL<`*[v%Y2.pؕ6Ylr
+5
+󯄏}WڪH8e5r
+υ-&UΘy:!AםKMZ&] +ݍe 61eO1}z)9/zg fM =#xfs𯝙U^־<,cýESu{ߓ&'aߞAKi3n0휢Z5?Tgr?}ոC+M NwSgX>Sag3 ǣ߸_ް=R.wl&a ȨrQVjXg|@.Y !prW˶<|Sݜ+!Rh%rخGag0RF5bjPhPd[JH.eWx>U!
+qR#wMxbDC \勽:2`PCwnƘڴ_i.9E l]+q]1IfIpi|php#\it2U#
+Ñ4(`
+rMH5S"Nz
+vVMV*)4zwZ7xN 0?=Psav}<whgW
+i0H/%,9K6W}x˧,OZ{-s3=u3!FOk̔\dMY,Y\\e)MX,Olg7:2z-TԣV^.#^r')™MyʜW wTΉqjFfldK<QwKVm<wJ/:*^#ѻ=j:c~mο:\R'PyH*G܆Qͪ4-sTCL*k24'B"n`
endstream
endobj
62 0 obj
@@ -2339,7 +2338,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-4 -235 731 800]
-/FontName/DZVZKK+CMTT10
+/FontName/IOUJGC+CMTT10
/ItalicAngle 0
/StemV 69
/FontFile 61 0 R
@@ -2349,44 +2348,46 @@ endobj
61 0 obj
<<
/Filter[/FlateDecode]
-/Length1 1651
-/Length2 9395
+/Length1 1594
+/Length2 8773
/Length3 533
-/Length 10374
+/Length 9728
>>
stream
-xeXmi.Ab!n;$%VFzƣ_cy{^뺮chtإ-
-`(;7@V]W % Z@A`9 (P-,v
- /jeB܁`
-=Z[׷Ax5IS7M + ?F8-Nq0owc~ /h_
-] 6 z0t^30/pW12LݕG >8/&h}WkHrӏ᎟|h{H)=O_|N42r4^[{%ވsv 9</Z4鉵椨k^fІ~isZY ^~
-Rs@^¦qGtCS`yp\9甍L5ԝ͙2X>"
-KqIYD߬e
-OQ5nlklpm^>^Y;B7ڧ88K̈);~]IN.M!Zp^1@WWJaV@yѱu`εs,#xIg/3{Y?z>XI-HhO.I]T7 @½Z>q ͧrV:TΒ怱eưH[sA *Ls.]3Ϡ;^8!g/QK/S (7OL;F56~mpys)DMVQpͳʼJÙ/.M]"lAUe -}dJuf3m,yPAFZ;HS9(VP0ɎAU\dBT'[r4 l9xYT<s#oU-%Q_q|{;{xNoU.הS V.9y*6k}b8Ч\ߔ
-Bef jD"(Cǵ$[PΔrs[+ѷ<)/q? ݶe2it:5+KMbG;jl]QDݢz Z6B#n`D{Qa7TW5HUAuՙ^/zM[7 \ H7o%$$c-S3^練/=fyL}$a2MG 0uwM`D eF0~vD0M ,zf 4_[/9% Fx/M
-&=Y;*=jDDd~H4"<\"1~=h|WTddZBAgmVȿo3-xu-jȹ߸Pm.Ȏ[xVמMr,q^u<;SoM4&yؔk;\%we Kg9|%
-J$^c",֙D uF* qR\xwG}NVBsU26ipprr ĹVV1t3GqN?q
-͟fj4 &j±R3W=@z'pFqr)LE;> ,q2ȿlC&ċ`e;S%.kGilhm\c@0uCwAj@qp g;x tU \Տm|-{h{|cCڝO6jyy40~0HvۿDNu/RTk
-[і[NR=s]@+\85 Ov ޤ&ꤌZ ghXy*T%r?y]s1*SiC }s{F_P^ax (hP-՞|luGAJអ#W/}}ZŢ5yg̵Y#ђWt %E@Wfz$7.#s;]|څ@ { ri3\[i)77ҊCMe iC
-*>JӪ9GA3s,e『M`>I7D |oAS=_U@BiO5u""S.Ǥ{<KY)0Y xd*4%9N[dŴcɏ}{;#}AOxd~ /^I)~ORye'ۊfL LRʡgӪL~e!=_P@]}| !1]͝=ܗwd&y:OFrrF% B,x<l,0<b%f]QkO6v>`J^c,hL
-PasWrb^y0خ&Zf!Kj|f4EC[hNo{)
-e( CLTܥ˗a3MF\iJ}Qh$t2UJc jh 6[?o,LMɕr=ևVW{y^|i!Ա<gcIhī
-.T:m:K>2nI[Tb9omBVLƼ_]PEZTp>O|@U'evpq;!sj
-%p&
-\Y~ KT3eםB(ՃvD< 'g|E| MZOf$4 ooMoM@}Ciq>UdoW9ڤӽ~NMaA^[S6nnR޿-- ZySkc8{p_֥5 ۖ;7?eBR=q\xk}`朋)C㘤.c;LO9=02d9g,37k0HտdNMQHшÑ2M>Bj!G@ EQMZ
-<,̋T&WRߗw~ǰS81Avj
- p
-K:=?-w |UrQn~40؄P
-QNz7I粚"w5ֳH9)Bzw(*BgC|QqnŮ>MY >[Vٙ!ܒ(X#z4c2MemDXcfubN ih!ie4vۄji3lqY*c=ǜr?s(
-V6-r4S tZJQWH? cY-kZ<ր}!̮G sp8C"ϻ$n~^Q髬R_y5w:Qk&w:Z9ʘmxm|[B5åD\31>3oonoMxȶѨ98eX SGoZla] DAIݡQ4F)bΰGK*9Q*ydf{R@͈a󼫫C :0,D
-|mꭂu
-AL.04hftb+Ne|`\gyh{ԡΓ$^OKq `hP-
-ht V|6P(|7Ky4*̼@?n 5UAh`z"UC/gﱎڐP]` /-X}Lo[ubxjAEYxcֹ-dɭ?O08B4FeWCr._g촦JfoN.~-0)\ua񽐛Jܦ't.Fy):11ZgbMJchcxDŽu,zBune1FF.Ƴe}U/>bhl葞 *!'$I+fsk"Uk)W<s6j1r,KJ̗,$?2tQK:2b2j=ynG0.?UE,B[&PzRmzFK8nOb8~xwtLKA:,-]"\tϱ^G)6!g'vcB<˸L˯j3ݺ3 Y_{lBSӅk*f%X׎T}c]%i0נ<eHIh@ &f9_m}u3φ}fd5+I+VEݰja9hFKPt^IUhMd6Aϡ,3ʳ>gﬡ\UP8WA!fC猰!fܝ%)-˕Q$3*޹]6Zf7s싈#D)Ģa<zIF (NUvFGW=dY4'V^)Te{k.=$z.QE؍g ޴h&s6gb T=y3$/PEճ ԙE985?$tU}ZdWSEG
-
-vV7 މ(ّ#3eZɽXdrdb,j D^VÚ]mHJnlpLQ$ecJ
-&&߇7u(AO4v!a|gbO`Tusz~I02^[V6=Js z\{+ +lՊYr0QܖW8u)/Vbv QyPw ɼ&=xj?9K qrsFtC9wdj?jdF>gI`G70PⓢfC +O4껜t=|rߛ_}x"+4h+
-H%jAaqVO:ldVHɚWQs6vfU!ѸawAm1ȁK865vc}4,v\l~Bt %(Ո҇hA {st<qgL=ߋR/RA>z[˭N89`2\Jf}͞u'a#ZB+Tjy;`Cr|ΨmEtS,q׺!^t=L*Kh/E;`wߟGd\Ms<K#эr{$l3_
-N@^.z?TG"!x^MkR9G1HU>iGJ ˭s4&olO7]/* 8)e\V@  
+xUTw)bœP܊C܋PP@"+R܋?7g3N91Zk$,յ-!
+p7n0X <  p""
+; j% A
+cF;f5֕3"JE^+][ YX.Ar$m^2IV
+b}ueUhEjZ F^+Y\
+|إ{kmg&}`PM~9 5/iI5$fւx"x)p%V.* Fu<EASuO].ls?e(GI*P8_̒}nNr7]p'!_dh}5ݠ QqnMXr8ٶ7_Q T
+s(!/,h]
+G{ۓБ9gj\@! OژPr;5hգ K9RMQo /6KT"l9&C8,PL}q6~O/atO-m0E_խlp-z"UQp˵ʼOZK3)YЗ{K9ƭB`\CS+%@W~d(TgP1?Φ(O, sm kOA`DADgIϐ~H*w،s~,
+09O?(\B-LƘnw;l Oܼɜ"-ܡ8cK/SG%c]m|sxz؝ߌ>"os5 NdUD?c7#%^ӘʗFi65
+)Bwfh-7L^OI]Q`k'Wun9.|>dSC"cno$HGBtEBzЫly[~  N9QCV.(.R'wh4u/Tכ/~x<&q3˨V>Y!TK0nQ`y%䠔?ƕ5Gj|ܝ0*c.pGj./ϑ^h/=,a0 բ.Def%H^E7ߝ3Rul(+n,40If_udfkjT$w[jor)b 6l¼ӄ =l_VINqrK{Y83nС]Kz{|
+_i~8D5@ʒl Uie+G 2B۹taxz o;fL,j=d*iXPO
+z'ĕfzLdkټ0}kIǗK0
+FT=T~~)ctF'1.n*Pχ?MA3<Ɖ^'??Fadmri&Tz=%Vand& Iϋ$fNJxȓPB)yeY%.
+}-rϰÞlQ0E礧dtrFǣ*a #DUũ`7o.W9>Zx܂,6 JMZ@mێ_RS/qGbuެ%@dui(q>xH}_5E,T,6=̗^\4 ͌hg A1c>$.ᕸIAMat'WTx|}Ol N<>5&aSk1ֆJN|)W31rh}N) MSNi9όPܼðAu.m0St^U=BvxT+Ɠ*6ocHiCүGs< U7D
+Q:7GmcPԪ(8fi|Z o.ICfa5IT=yY#[M K8[J$c%#Hƭ| {A}@fΘ6q-T-1u?^ԮƿO;5C uoxZ3p7֎5ӪF Y8Z^j_VԚƐۙOӝYa
+>Sav H,Z>ٙuG'gJJd
+HJqa5Odڽ]a˧y/J؜Ec3Z}hL'i<-`@>x]K#q|>vyK}:6$(UBЀŤn}8kcTipck* {]C^"b
+uңa@ g^TNW4kǭkKfRp;ǗEN|y(33E$9 8P|~0YA#B/g">( jZyq|h9sT0?{ud 1DC}5]Cm)y5R\O}XS y5Hx ;^Nw,2D@P yn1;OhP~=I PN98q뻎<a͎3wԘXV^3c8>O/aqWuE5^C_տ]SW/`&l0*vTDc\uwpg*Ƀl;\kS@;][Ŗᕔ`_۔$X:.txp<sx#)?M2^6M=Pjj ]qYpemc˵D/sb D1iD#1e/'Λ:Ӊ#ifNwIhb8aSا|LH1( Z[
+\XQ8i欿(j+KlM-qq7W*׫=7+aF_ԱaR&=F)Y6IzNB1ϲ8n|z̽nَHn{CQթ/Ou _ۙw.7{ 1%8NE$4dW>$;w-N30Xih _^_+F
+*s2ۤC_gU"E'k% O$UVeTTj}loc';NLmPfJ!ð<; n)J4-S˪pi!4}Y}Z]jY*Ktu飖!#K^@5}ⅪhA?ou'<ݾlfU[/$M!];`MQ" °M!HM?&Ӥ8_a+=Hy|O05$va޸^s}0 ֠y24GaךZBȓ^ DOlco%{@
+mPTǯ
+8tێ Gx܆E"#6#C<]qZe^!,L7$LAg*BW]|†8x32EQ*b> {u~-]0lV_XI7{\۶`?pP+{[n^}F"isb(cB+fA9QGt:9JeN#VPq[x䇔'Wzxxlµ9R+,c^?^(12zJ@%cqDAPzEqn,D_NW.Aol*jy"Ex<k37Xםl eLHMH6x+OsB!3~
+?Gl3;y3cf 2YW_9qn*~ٵ)}x -\Y.8Рk-`I
+ئ$ʹG&f`zZFN##1a|Ʈ;!Իhh})=p1"恵l>VH< \\C:B[S~kC
+P.}3¨Eih@e>`vVKkIĞ.yKLn* Eknh WPRwכPK#y?҂7Nf:y|/ |rHv'}53\6i1ES:^tyZ4sv]Uvԭr|J|<# FK}"q 9RPg 3:j3%KUYDWuK&="#.X.C k,؄9J\Ya#yMXAi,Z,Mnm ӼY<2/Nm!tݔ|v~a)
+Alߔ^R n]QmvSL5B%hS=GB119)Kb@yY,or&W$vo{SAd"x[\|;(Vwm0/ *[5<*Yyڊ|UtMʰ4$3Y[_ 0SaBw]"DkL
+KJij1W?xrE׿%,|{I!ue
+O:{]v MWP^>-#roQ`\J/T2rԸU79Z/HiKSlڲ\@T:k}V3"t'?|Ғ2v{Kw%KBͿ$"t(:X=%vHf4ݭZJ,
+>0סŰ1ANRt Hzy^G/$qڊpYhZ F!FZd \{B?3sȓ; i/2M`tڙ/Yd;G{
+xZݞiNT?6bgf Vy6pO,~1E+g1hJeeHo@"uٴn]}.CNx`KTk8M͂ۊd˳X
+ޯ垠K2ˆU_%w0xH[ eQ,n;G}yCjW}WEvy7{&ѻϞlL(ȿLZ$޻ÊhƜ@I<CG~9f|̏uY7<]n*Xyoj%BcX;sh?
+ؗ8|~r T7zsG ]m#kĈL(tfXɈ.hc/h#,23v"-^kk)|zf &GHˏhUNS){٫E+]Z\R1ԄF-mn<?ڟd爋sdz[Aitkӫmi.r c$#Rˑcr[N`Yzgob5 {uvv*n7>N8Lf?܎5r&m*}(RT~p4*f*\z7]|o_oϩ
+9Yl~֌G|j7Lޥc PRK1$f
endstream
endobj
65 0 obj
@@ -2396,7 +2397,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-163 -250 1146 969]
-/FontName/ZHMASC+CMTI10
+/FontName/ESTJUL+CMTI10
/ItalicAngle -14.04
/StemV 68
/FontFile 64 0 R
@@ -2406,45 +2407,48 @@ endobj
64 0 obj
<<
/Filter[/FlateDecode]
-/Length1 1194
-/Length2 7478
+/Length1 1209
+/Length2 7701
/Length3 533
-/Length 8249
+/Length 8479
>>
stream
-xUT\ݶ ; 
-%h`VPNp'X
-drc
-61*9Zl^Y &`3(jm T#@U 2e
-T"d󟫲F`Q[sk=3R`W
-hfd
-b74[d/Mg
-u'r/r
-H q@]|R?.ю;YGTWx>'Ci)#b& \CuućmĻx~?=!WUٵ]0Vo*wV<7pqJ_`5L DBj^[o*KdbRϑUAJQ(6^lF6o:7wuhXW%75i_)-,{h>Ƞ8t<*s1/ash iU۟;[R َ5L
-Z`[N'X]E@ȅ$N2ngʧE'y(Sov
-`V9ȇd}YzruAio=Yb>_rBU<~%x ~~2g"+kF
-\ETjg
-qX6E3ފ*XɆNAř bpM<
-A,_ST$-8=|'Zt61|'C{mreޣy|ӓkHB#y)αʯc'ucPHim~v[sG0xTꪷXiTqY0e {aD>Wiy{b5L#8BW&5rek߁>P!\A* hJD.߬  6LO1D{AҦRtNJ퇝bFHy)m4],O 9]xKgd9GY5繛~ߏ,W3S͈:^U~_IӦo_X(E0f.&9}үrk(?oC
-+KԾ(?'(]A ƼFC'jeXn?Ң,(u3%[M]wS+""yEo:MOc>R޲8o1֢Ii
-\ Ko)QΌZ2?;N0*N:xN\<3# һ잊gC(0Oṵ"bku5bˇq~+Ü7!"BHF ;J6kuk\Q('f;7=%uȩOU왭
-B$^;UK)~b
-uZ\&x!м~eRDek؁2rZ!Q!J!__ݷs(> 'Tܠ *1lPUվjb
-:bpT& c -|'p1XhsٯZ%1ƸT9H!,'F30~= 9+*w-=I:ևז}OxdbMr[p3'ZQ[.ȈYMb[\^ϡ)H'F@hW{u}nHB~i?0맗ZJ|ސ庆2PǤcv>WK烛y-Ɓ]r #.W"W%@a=
-jauqrsۯB=oÊGFO|;[zW"[pVއ76Uk0;, dVoDQq_n^ 蘒:υ6W<P?֒f.Gdd$7TIuϕPujqݣ퍵M#=/2BD};`3Joy/șc$w\נ|c6hCǖG,hٲ MMOsIW G-/kCG}DbW{ʪ 5Q
-nˡ*J6o(M[`Kvr?liOK^fѿ#/o\ٻ@+4Ϭq;:QۮNQf
-cp*uތ3{2> epd_u#riV
-k}Td(8`¹^Vm)5qK)q+U329
-%om 'PY1|55_:qUTȄq}iս<b‹/*[kt >Tk9NJM5[)g7;4cjL=¤2yD;FdWNl;1cbC&,^g њ7F;,rOz6lCv
-R%vBXzIjJFB\9 W1\K_؈Q"8{h]Jba^A|Kgl]k(3xg:3[v^pPUj^.wJ YOF<@<'rq+ AK'%Z0LzRuAϳSB&
-`>=<T*ZXӷ gy< ?/_̈́:ᥘ)S|O]Vli{d-)s%TS0?hQoA*3vܓ,qz}ȷD+IrdV}RAO 简EoZ
-nq5e[1m+ zxK{LsfU0 dx х ̺ ]= H3߀(Ei^朠ZCq@{'(2kS !ޅ;$хm6qҘu;Rіf(F@( $`%I Gdg]MK:l*-=*?`2a?8_%]e,RFDBҁ7Fm٪V&L.Uk(]t(ޯ1S /jq؛+JqI+QFn*Õbno맚&9U4њqd)9 {QjIEGBr80A[,?ԉez#g]P WoXlBjofkE$g
-!s56Dd HlїjA!!W" P)wA-ycze/o#ixÛLhas! ?j]Jxv~XT,ISPi.שj%Fy$)!ށCt|=Fl&tH'ϯ#϶2v+$5AT,m{
-hy\kUs6(2
-(C|f
-? W!uUֺ
-(I 3߯ -lÈXd, ]yA4d4&5^A`L ~g*,ٍ OK
-Zͱ#_5SYil@*LtFOy[\* !o8bLjO0A!6FP+
+xeT`A 4n]Fh5@  K rs2ΟYotzkwV=
+, qs dt8\윜Ҙ200q`a
+i4
+8NJ͟ӟ/L;%kQT%'4eARLn 6ԑj)˖)nR>"Pi
+0x3VTHhoK@v?u~nGve90ճM{
+fփ[$?Կ~S IsOZ}?S!J<{eҘ;1'_ʩ@[
+
+2&
+p:O&.!vG)>r@ J-*8 R xF ~a2Ty)Ҍss,
+&t\4F#vK;m<W
+Z%#x'fܖ秿.Fqd*|T[RG}m쨻Gnjo
+
+$?é] K rzwU#~S b\Ѕw=*J!(ʻo$&=76֔b@%f%+|49~ "֟5`8rd_$G)%8f[h)
+Ѷ"#<Crg 54\\3ZoFJWjHq/R6P&7.=)N"h(qEMey"M@b>W,/?Oʜ$-Fvh
+Aq-T@Ė5eOΙWǢ~pc4 3d$_!TJh}Ab>ؼ!;Ok;'N"ّ(Đ_>[:>
+ G.JvZ1)yUưRSjawS<@ywZg_dM]J #[ H.BO4::u=g1y^_`{A.GZ&s x-b,z [֗rwK`
+<I,YkpDQ4n| ZewE%y03
+FHnc <wസ( hG:>P*؍5 %XxmP%SZt,$ Rn)jTAUHTکjxCV`SӉ(y$
+
+}y)OJOdGnd/v˫2
+/S!I}j6q^.7;d`/!8F. yIכ>bטO[rõp#76? z+IGJsS)^lf{b7+E!XFU;u+7 ʹ5gQ2!j/ØRV[ۂD@CXɭV*6f;uH Wwq |\ޥ#/|>P!Wvr Q_){)XHvļ.*|l1ƆN ;d:!s>4 VE tDTUpoW/J6d;T\5Lbi1Ekup/ɯ;9>%.=Xi<d|Zat:ٕW^el-..dIt0͈;L*9 Ժ|^XŚg"ȜB48YEZb&/p Fޟ擨PeZ~\Sfco7?Wi
+jeV%ؔz$DL SuDč~Wj/n0l6B^ٟ9 ow'ztԯS Tr0w.`j$2Pj<nIkO*
+vvgipX[s3Ϛ=whK,4_;ٲLt'dd_ƠȎ][FjMNcM= 3]vN wr
+Sb%B_'\pA!)7%kqG`'!L(xuF
+wH/ր.S(Oq"+=ʹKC@4vX3O&3-cst⚵pl#`o7`WU̱BaLg#ohޗ:fߺI$YU\_ xPTS6J3$S>#{xPf*,66Z!DKKqpeT&`TPXokmvX/dߋY&zvCcN4hep!hb1+CEr&ZW2Bo$gIo %{y^9[؁xJQ]~piɰ,*q;V'0q g@b]^:ekjā 6K4@RA_F VZ{K-
+;y9OX676³\}n :fRNAdۤٶw`Q5S~;ݠi߹==0t:qwsUi2?lzh#HG}iɡZMi &'4_ ?ZؓMi&"(cu|`<^y U[_X3c$w\Pl-;"-QflUb!<G2@IºAb -<RMaɵYSأ$hF~vj>&"i
+ypZuDY3f쁕E$9r[)/Ps(ۥOrV :t ~{نr4<R HDW/(w8<4K(D'ܸ*xY#-_7_ޯ,ѣHh3ҩM$lh)\Z:#h9,"ٿt;~GJd$bZ2ނ]jmM(e@*9\FOxվ2 yF
+>\^Na^]ŨVꙩTpU@iE`ke[.,Nބ%R͍$N>5hCH#,6Dxj}0G̗Yb*ۦZϜ</C|\^YFHI[&5NT}%naUrAE-?)'q9R"gz|
+b_Ȋ:$0db7
+Q.بB*=*oK-|KԠQCCE}qGDʂ`.+v0bֳr+5_YVBOVN^b18r5V5$Gkm.ŀ-F4#Gv۬m:YUD{mӿM{On1|eriJ + tTW qWv"G_ 뛊G8r g.do|[zcf6uF2;?VjgI8Z%:tr#hO3QbVa]DC1n.QTMmsY>n3/d*)DSX<,ެ9<z["5Ι6URniq8Ʊ)
+z_hW)/g4s%1ӢkpPeG*TXu?>s3߹@ m~ρ+:״'r0c6AX
+6EṘa_<u"t0q&ĦHFwjϦԝSA[YuUKEބPا%ƋjŞVg/$H$X= Ijf6cA7F/.*ͩ8ct[M,E!fpퟃ4( 5#F, gd)x2`Reȵ>|jWw|JawFdlUtas5CU0|P:cjO[9I>rK!E^n2@ku?0ur֠ht+g
+LԦ͇Cw!kس9w1Y*?Hw8شU\QE6yޯ%
+eԼ'\Q~LA *yq<ޢRݯJ~Ƃ!)z06c>Y2icR'ƶS ~Q}BIp-YM_]h*lz2ȱJ'2k,<ʿXNp_xF|J8u,u 9A)0R:k9LÉ֋y].TSV6 9vkA`Nob >J8 ]Oy"wJE5zh%Zf9Cy$&t_i
+OhfSɺڨ5RN1١Hh ĕBFA
+B<5º}q'/62e#Lۛ(M3Zg?
endstream
endobj
68 0 obj
@@ -2454,7 +2458,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-6 -233 542 698]
-/FontName/LJJGGB+CMTT9
+/FontName/XTKISF+CMTT9
/ItalicAngle 0
/StemV 74
/FontFile 67 0 R
@@ -2467,55 +2471,49 @@ endobj
/Length1 1736
/Length2 8750
/Length3 533
-/Length 9772
+/Length 9771
>>
stream
-xeX]i aaain FS:$$d>=es]kߺu_>㖱q+:<O
-
-`
-DRGRH*?$rC"_B!TnH$Ջ?$D6w^?$*QQ~ۿK?7[@Py
-Էb퐹\-2@5&N'%K  {J{GϡV?67655 0;^6W}f!ԡw?5 0 pg2܈m`
-ݼy;%$v&}cscѳ nQ^W«cEf_t \6>`PØ hR>3i>phU@?{q6%{MeE 8Zߎ$VC4ykRB=3VXy՞3ѡ;ՍX8I&c% \5cco|;Drl0u3o%op;'!vi~
-vh;BF^Dkv⧃ Ei5zkB+.҅" =bseʿi
-heF!rmT:;$z`HoRɛCߒs)rSu`s%ߡE[[4*⃬2wv
-qHi{4XGt8_rʷX,;J%p%Dt"d4'O}H$ 92_$Gz.eI x*B0)foL4viҙ91j!cPh)3xFf,|ZҴ3P*| 1~RᴳC~{[1H_gBL#uʁXMiBJ3Eŗf`Ɵ-k\zB+BWt{NUL=r )w${kTs˜ǰsglMD UBk7ղ
-CkJs{윭,5atLw;6 d9#'.O*{A[gh[LMO٧|8r2
-GYJoʐ=ۄSm @1_}3[ŰAj{8<a54R53*2f!cnfL/< +D,[c}SQ-62LHޱC3L;ʲw /߶kZұ1>G/Yq,jTDaEt-bRϓ֘5?U\JV .7&""ʱ|8Izх Rq
-)4KeϺAe@4{d~|\cyY.:7
-⍞(RN A'Å ]<4Vš|VwPQju™Ȓ$1[v+ʣ-v,4My[fl$
-5Ɯ}I-VuզZ6G-d&
-<ru~wm?}ES#u*jaÄ)1Í`_ojLN0k̭V-)K872p,:A+M; ;ҚhX?1~֜+ӛuIP,XℲ鉌t:Ft8E[mpYŖ
-!Ęs%)srtLXh5dj'4XC_v&*ikPշm.iw9k&齯45ֈi?X0uY)~A/Q6Վ8mY~`fE}84C?A;MѯldQ)l8dKg;9]}mCb/Pzh^`l[RB]wq-۟_|ol;Tp:AŭoWYy;i+=%M>p ݡLF3˺B9YxQH]vKb
-Щuid
-V)`)[ w01PGا4zNF>#^
-Ϩey=,ÒK҈Մ.4SV5E}ȫcI$ ݑ;::23/,<P&,< f.)).$`9k5oT$Ql&< 橣bdF4O3>I# 2uY!j.ʄq&`IR*d.jy$5c7~ V I
-jqX+zcﳦvQj\fOi2/NrX6A嶞My>!e
-a O, gx{<WM8VBQ[p+hiЗocQPW'>Vk.
-c}dk;&'7N8m`Wu{ WGkF@p3<!Pg_7E >uE5haY2XPT ~<Q<8J3\r±x|Op3)u;\IDq1˒U4ۏf~/t8UQ1Vd
-WoQld &vRt` Nb"V<[.h*ZEVF<xI% YOi/)t}A5[ǓJ'+]Sk% Ǜ0
-3(>_o]xzIVT}P~0>U]HNE8*^;{U62$|1ßyXwF|
-I<ϼE5QH-Ež|7 \V(my]!@#z?@Ue*ؐ5Gl6FpG5fI: A}5uFꀄAnEg\\nU|!QRJlтoARܰ4
-'W#dlʺjdˠ7c1Txj z>(Qɽ]oюGtY9cKe&~؈ϋsWŕ-¼8F/IcP]]č^,V(O$ajtk
-:=KPcqu",LwDǓL
-5MC)6o_~(`Wt?JZMU{r܇8J#2WF_OS? 31EU=EZR5 J|w 2qM'h`CߛP  οA:aN2($9Li'ޮȟ`Φk*Y@_8a߫}tս|CJW2j ~Dɍ}\W\xɻLI2V%' wnzgzkjlt+djL ZTlrޡ,E:c+2âc.DOyv<w/YLF̭#߆~lȚ.<:Iy.I)_>hK  
-Oa[o$Cs6b,ܣW3rgI91& 'sivW8?x.!(r [Î_l_DDNᰜlz<&p\_Z֛W*
-TL<nRGGI$H¢/(+Ogʲ)!{dvJ{Q/uI_ c_dDK܏$zr\)( yT`!]k-G6ئ{}*i箯t:2Zj
-tPu׋ڽi mz400&Zi7~gRϬFfPvbyE/Ps C=;{J?]pl
-ˬ?҉VWUU?čGP-$ zz {-?_(jLS '7eU ٛ!Y=
-SG}d3t{ Yi!1)_=)˾au"&p4Ҷ@$usrHz|'ID|GTT l(emdwmRNA:UCr~6q,di@[
-5pGx?\iS(QvB51?a(So|E}jP{k6X6l;. xqMUq46pFOMYNi\
-Ym~c]$c(YѾLRKfႩV/,["ƁWa A<R-,y+\Jxrv=E
-;I\.}[
-B`e~"¾vfγ›L|-`Z2HҎ*eL5wN=;o݀
-HZ
-rS9Om9/[䫮 ն+Y]-*1۲{TSmGSJ6s.\[ZA(V6k{RcyX<@`|
-EFXXJh^Ykcrф{D
-)@Ak̄O?1q
-1v彁o3l|u߷oOPQT 8tAt`{ejŜN:(°
-".N9_e>JG/ 0oif6iۇjh3mDDa|#Tt?qwbD"crPtP{7_L=09˼N7Lr-"p)ʮ1mTY\g
-ϩ}}{_Nb+d&xT"X![GR^vRf0'If+c5f[d=~ԌiJre9f+I-Q4\{]Kqh2h;h+xϧCWW %=?)?z&-b "q iQ}?!tYU i,(8?:pYRL!hڢ@Cp^^ta Ȉ GOhEl{q/3I+4$aF\7JWv=
-M%W 'Ag7Bd"Hpy:5}fzZ!Ki __vkHx<x&|ͷ[ ٲַ s{]X3XˌYtZ1"s.N߉"I7KJCl-W^́kϱ:9ԴMzT=h+UA(E\7b8QV ?
-N@
+xeX]i .QKziViN F;CBRJ>}o3_<׵Zu-].ikG+#  '
+ce#L
+eA\ `k-eàLۿxTu8_Z@ ~kdvw /7//2/LrwBH
+
+ c. GoG s]^v
+uH*IDRC"~KdsqC"<t)8{q י ,a0+XY>'\Gw
+(U-go b1gxAA(1?p7ąe;(UtcTǃwgϖ&W -PqM~:8GNr/̏A_
+ BǑ8!a}L$HaAU<cE{;#ѱ4WRՐ>@֘1diapa_Gs92!f4~fzYfJ/WQ.׃:Q}s$wnL=1ZL!8DR.Xlp"p,z4r{->d]9?Qd9Oy:_B*TUD(D"qẍ́xK?`γYYo.+_
+)ijKII-O?1n#`*P,;#lۙb?gl4ɗ~7m;>iN˛x< xH)lpB'G>.=FWUړSմH4i"%!P:jO
+zxGg.+R_]e Tecki^ҭ
+\nTe7x;1s>pq똆{E\eo`k/ ~t
+;iA=NW16rGIFG6#j2ZX<$|]ЁLle ]?<ɖ1"Ư*IGUMB#p&E.-4_91'Cͥk6|Ae&qɌNKK}O>~Zzٜ4>(pr02k/uƺP7^s
+=O'WYvsjai,裔yK՜WXop|PlnȪNީ񻽲GΟ d4!M*n3v8 k=ѳ0Tycև5Ff4B~xcM&SHqno V/ng$κl= S˪p{v3~G%7N FőRdxb7!TitQV4h6谽"@Z)whm'd-̪2鲌Yc7ٶثGWiK%asTqLS2)`tβ̼]@cūwm#tE̻ei)OJA /a"s3gاF.x$=sEp h)@+L͟*qα%+caa6<DXcU])Kd=2L =b_^c7.bM~(v!Ji9 21ԁA'AOÄ% 5
+2GlAͅcNއqӺ[SE~|xRVGq9D;՛h<d5fŠ|/75&+bo5VѭHÓP0/ ȁ`iNߺ/^sJQm:+ZWXpBtnj;o"hvd|߯6U^Veye
+.KqLd9ZZR NrO?bPM(ŸWsJ='>*"GNv{iyWz_ Po?#*W ^~ǢR2U#>VuOM'C(´" 3/QF!muw{'<ߣgo
+)7 ]?D}tD x۷[Sq P/ .)b!j8']|P'
+#OMh09FIBk]q?օ&Nx2EIu]gH&1.W|5A9+A~pʦ~8aVׅ/s8<aNSK|qL2E.FNVS6bEt`ʍhV KraGe?JV8_ι4i0M?Kbw,AsV2LOA,ⰍX`<]t{' ]S@@nl¯!K3e4o6ko+,BYwسt<ƌw!!:7-B_K(&&Nwm|c׽ 1Z-za 撒bB|CSfMEB='O+iza{AFxˤ3iT BMU`֞ X],g:)˭",g&w$O_"^S`1|[[/D46g@[8\Z}{_m5Pk@$#9nJm~6;fjkƢzD$ lnʓ))9UP/K@~GYû±rMNg>1F ><Oj\r)_q4.ņb($XvxNm턆h?
+=m<6bfeBvox*D gʁƻQ#[ixt
+iB番`$Y[P&}j hI| S"x8lNy3KUG,,fBjǭyG: t%^ 0,%]P$yc}<ţ-64J{$n1 nmϜ{cf<X9|[<)1:h g{V4tOh
+)7)&gW<G-4z0x
+Gڵŝy c'bO&Eu̳&ݽƫ7_ApS\AA_sR6>v&E6jbZ 0SfT z2Q<4J3\r±X\oPs)u[\Icq}QUT:./{r9UP1V֛Ф
+WoQld &vPt`u.b"V<ͣ/6o:QT3 TMع+9l*(Q>R(Nk]'>.XtϧZ׮C
+3fZgZQ}9-P%H
+R/R9>UUHFE0*V3sU:2 x>×q{Ft ʼn8ϼI=QH-䪔Uٮ|7 XV(m~S!O#z?@My*Ȁ5[l6F`[%چFI,:
+o"EX
+C#{=}"(41]tOb?9VZ<'+Z
+9ZVCl
+IĴ&*r[f J,] x%^
+IK]6'wRIVHqDtIU+\M*KcVPQb:=A=ڎo~˂H~7p])C
+ r;z|ʓ┷LPzE"4C)kz<pN|<PSǤۗd϶cCTGc[
+ve["ie:MU[wgLz|!W7w=rd>Bcbڊ,0Ӥ:
+d/;<hR)9߻uV]jD1viR+1bHD8RPfyޓ9r
+o2QjӍVi4rC=J[1]Z7 t2;\مv<tZdS|ф,ܠڟqrUw'%}~7Z3A"'!%AM@wJ؝ (8տ᧴X-:BUL iumR4qT@ͪ&i҅ᬡp΀ 3E:B͑I G! AL$)BF'z6ϝ,VTV+zblod볗4EVʤM?PE  8%{<Ƀ=Kͱ|`JRQ?>" #44p%[x-VH|˽K"B7
+d
+l6SIC5\r8K_i˳qsv+UR(|kSJS}-W2f&x 8UnuqKl`SJe?hźޱ&=rk?05cRe qpYċnmJR@f{;J2J4Z
+UE#; JϺ 欄qvK9"YB8(׊ϺD:񀬗QߙahC[s/k2߬L_Y`6-sUG4ODGN[Wi/&KG>hElpz.K7 (a}9n(1.&z
+
+bPjja37=LI;i2F-*K-[a
+E)d>nM=j+R˥9~= *9j~͕|)'^-DuMAiTw=%=iq$?@hњ,5Z8~:td.^5nHDZh!g u
endstream
endobj
71 0 obj
@@ -2525,7 +2523,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-150 -150 1020 1020]
-/FontName/NDEZJO+LINE10
+/FontName/NWDPJP+LINE10
/ItalicAngle 0
/StemV 40
/FontFile 70 0 R
@@ -2541,13 +2539,18 @@ endobj
/Length 1736
>>
stream
-xR{Tw@CW (c!I&!(Qy!AԠPX1d& @aEA^>x(VYA`[Y_bw
-j@*A2(tѠ_IT<aBD \S(5pf̕ڰn˔!JTcVG!2\"j
-%vD(5D @݈ xX6,Eq!@ 9yy~*$cR!b<̗\([;N*2‚`*սAH"F0qEaB&&"ևQ-"
-D( *d>`goo7}{ @A:Ży (Q-'ﻯ?tbB$JwR  b"D -.Lj<(ԉ@,W~ayLw1nawq3bɵ !:B]08t
-y- .S*L=`a1A,u`tj.Mv@3d+7/|O>}.ӧ~%eSrWlk7>u?dО9]f{ˆgϦ G##1oVyޅJsMĢ /z^Iʒ%> fn GM?ttNgz Jl/;K~Md'-Uٌo'?qmERW}EsHѹ8T֋VI?sy/JSh&Gfc u"`tDE:Au ?{j螦pv0Y[J c?lWͧY9r=ޜ-5 QcO¹K'Ly6T,\['In]B-՞:Kz*}*{.8Uo8 :vV}sOOz%ҎOPvHζ2h,塖IUݙ-GnO6WΦ3|j:ДD3|?al@]ݟ1L <of-k`'C,3+U]UCcte팵U"_r"07;)3>rxLlE@#3+tg){9hMҘZx(xơޡ03eɵk5XW+Kv;i4zė¨Yi/OxT_ $rZ\G㊧{8ɘ%bKWݘ V'Qvb?8T4Z}Sd6=MSկvF}Xbmw[]`aSpƣ-7ص&)FK,)
-Xe;7; If6^=K$[^>|;*KeZ o?շVq_v9۪ȴ%= Ov
-1K;|Bt^, OUaZ/,9J9bĥ[}q]wܟׯfn|5D3 6<Mv;Uă/GC)4 -6fΤ7MUT|rѳި,k|^
+xR{Twa*<ʏ &HBRBed $!M@Vr
+D "Q
+a-} \rLb&1"|UE=|e2>,ǻ,,x12;
+.b 1/_a*bbR|"bE ,S!6{~{)_,D0u 1+wD :c)(&4JXG/G #Zhq2P) 6^$
+%a3
+^Vol&,cp2 S}',n F(#rLھ)[]uE?Y46vAXɕ|OҜ/|
+/^eKΫYY]<5.oNɔ{Y֒J7;4R>w|io:c# &7K>d\M*4hmTN
+'ݩ}l0fxrKt]do}(i{]?qn6gu$2g+|;/f_E6 V߻W'VUx_p>~N}{rΘuSyF'eCE'y?ZF~Ky(1'GȝfqKҊ
+ ψ+O L[㘄 CюdY̱$RH +e"U,u}mW霧]OLhUh+*8?;)7=`dL\eP3't6HMҘ:(?xƱ(+u뵛\W;Kv&;i2zHDQ{_U0 Mu
+N'bŞiRN)]Wݱ$T%\l>YuX~ݡњSDhw9\joԿ% r,t1n|1u:[BR"z!`]lgs쳦kH
++GDeZwۏCk 5tڟw^i7xG
+=IvE8Cb,:ӏxk+]BH1;Sv FH?LvTj9^Nj5rفVawv )N'6}m߳thL%X0SİފK[YLFX\TS]pZj̧LZSk.UWHEŚɿܗ]\v/W޹w_>( !R@
endstream
endobj
78 0 obj
@@ -2557,7 +2560,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-32 -250 1048 750]
-/FontName/OVQWOV+CMMI10
+/FontName/GWGRXM+CMMI10
/ItalicAngle -14.04
/StemV 72
/FontFile 77 0 R
@@ -2570,21 +2573,24 @@ endobj
/Length1 942
/Length2 2785
/Length3 533
-/Length 3459
+/Length 3458
>>
stream
-xRy<mckdDƘ13̌eH"Rk']VBVZP!;<~?qy\}>
-I4%$  
-`NƃOs {Ԅ%p$w"(!U`?y՘
-!
-! 
-jtVyYNN*ˊ_r~/5V|;$e+s&xwB_oHpRw5l\Tk u$ω8u[n5*1{*dVH䐙V}Z5;yR"AMO~u::iɃI~71LqqJgV}~BL(MMvWG&%`];y?%:_xddU"(p5DAGƽ_ DՌ#IM &"Ű(fu5a U\1K0֑\P
-L8Svo8EwC`7JFM#Kc׸.]33loe-vbWs@j׍F
-> -/7E;[&8)|z<G>-ņ9r
-E8|F@a[JGolNhn٤Ό vwY@ksz78=ҵ8.T% ?3rku ;JrOA2:D办W퇰j #i TtH,$ܜI☵쇮[RZy%隢s8B۞r\Ǜ9Q9Ec[s.[~Wػf{T~
-sX;ZTGJH[( 8inlQ_\.ADeW}LkJ]cLmZBYFH]w׌3xy{jR(uJ(tY7pME쳽 xXQN"uQVB@BT;>=V!t+q-wL5Ǩ|b\7*s5NHՆp}۪)םPrh @- Tg~{FA7̨,3i">e>.Fԕ|[oU Ӿc\HgMjyNfM|6O3^%0 Dc MUd_w:kيrrrmfxX qrװɥ|pU!K~#Nd]z̺$TH'o2!?LS(# ©՞p3S<Z7w I\7\PVG8 Kj' -o |릏(RXЉ7w.5ۻpu=SPx0ٱVl
-OR/<1LcOUmAHsOFdfr Ωkr]oݱ5,;5&`>Y}Lb˪`ycjͪQ.tvQ fVO3Ť.
-NLnW.]_=2=[h '6ܘc|8#Z[6N[89qF\`fWIܓ^pxw*8{}vYfS)V4+}ۢ솰\y^F)BZs3-n*#}OtCy}g;8;?̻V0[8VqSZ>evMH`y$VȲuJç1O*SfkBgrCPMGpI%̥VhSӑ`pZEƬm*yӗe|Gk0? A,FR<!
+xRy<mێ:QRnlv"R437&c ZDʒF**%RBBe+e-[zz8<>SZZIOv$ ,,LqG K#IX 55
+RA< A"<G@ a˔N~>A
+ T`ēID:!d{ ͿmxCg%&e}h  A
+T 9 O=jJ 8}*0ʟ<jLpO$wOpőgK l> #aF(@C DkF$O y
+`H
+
+&
+o
+9^< uyuv,DP%}ÇzVױl5+u~,*)=q!90~ 2HM+`EKsۭ4^840pg kbDM⍥z3#:Ӗ9 9kayfv.D't:ӟ}yp>kS`‘ڽs8s?,^*xQ:jUdBYin<{<cL!V
+__Oa'v?Eq]oVۓsyϦhW$GAbG':cqΪBNo|/<PR=5bVAg4lrW֓ R'ȁBF8?е<.T% ?{3zsu w˖n,\*te=ᵖ{G2n&$
+؜Ibꇮ,4jT]Y\eO]o|͜^MY׭.]aJ-˅7_ ;GJX(
+8iabXR.IDmW=L{J}Sl-TZǡ"9FH]weWyyR) JMߋO J3i8bMپDbJ\(޾BhU~eg)!wF!NF >3N1l;᫫q2#wL-;K͐|B<w*k%^H͖pmۺ%σP|h @- Ԥg}F\T|fTryFW4TK.SF&;U S~,bސ]+6|!̦ V%=lAgG4*K`xU籃i~
+W񮸓ԷiՋK.zU)K}#N\|ʲ,TD'o: .m
+6LQ^W{0o%Zjup-~n+Yy(yywaFiG]HVADm'ǁiXwjXfe ^q. !ORJz"wc239&a7Co4 wPTLO]]d*t->Zt:KmU)nըVS{zq(^5=ط!T{˜,n9"$k'[[T׭ )Apx~zŁ:GV8*[˾lKNF
+(?|
endstream
endobj
85 0 obj
@@ -2594,7 +2600,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-27 -250 1122 750]
-/FontName/JAYYKT+CMR7
+/FontName/YFKMCR+CMR7
/ItalicAngle 0
/StemV 79
/FontFile 84 0 R
@@ -2604,26 +2610,34 @@ endobj
84 0 obj
<<
/Filter[/FlateDecode]
-/Length1 985
-/Length2 3523
+/Length1 1003
+/Length2 3713
/Length3 533
-/Length 4217
+/Length 4415
>>
stream
-xUi< IȖx,c0d+ 3fa]d'5dY"{ٲ+ٕH~|λ9湮u/7UAPxQ*2
- DƁ ?%i/Ep'H:/$H< Q  E?ߨgpu FԦ"hXW"
-;6ޜۑ,:\mAi^G<Y)g}MCkW5#M ʅ; d#׼tDSި!-}%oa%ÎLEM4̕ p|M 4>;5:cW]WnT-b^Cdn/}bС%4lLE\C_}*¢ԯz=Li4[k=ͤ (8:$(r+*ڼL,L Ie00
-Ż{)|4;QEo^IbgUL}uS~X3J/R,Dk`{|/m"})_Ա@e:IcDŽ.JZ\QheKz*Sa+JRùJ/tY^F2 ~7׿"V98jݬ(fOx$6"l~8  1DȱSkO<}Vj-ػwN X|[2Ѩ,{2-dq<`4(X(~r!}rk)d!BB~r_Ux$Eo)ш(fΠqxy,+t1_U]|/iB έR D*c1oJVmַ^px5LXeӫVeƊfufb2y[oq?!gS;>̼kVW]եcB/8+8 L}v.X2]avmC0
-a*6gT!:Ili7cY=[axޮ=?6%'%ې=&$B9}({2cċΜ@qHnzJ'wd͛=E]k 1cz+2rzcspAo2*ō Jx=; |:O`\!2urBusv|ЙKj&= /V:$H3x 4ݯ4(&se9{!,ah4an5 j#@w$󪈠w"GO/VbFN(\+Șb.q+ͮ8ly;UU
-!%*{v^gw$tv8Cz
-ιٙmV~Vvv(n q-&oXxrPT)#SEs]=M57?.S3Fv&"n1%d+3zR;`vNfw!mb#j@v>*
-;́i837E<#83;SܙÇ
-DbȘ*ws@Ϝ(;ޫO;K',>Y_wU7{&$BI5#sXJ-:Տo/ѭe)VE9S\&_bEf$пIkS.ט.yix$oZ1Cjz'/r܀;b/}PҊ=no;ʾ6|"{ZŰdupW7Vщ}'C5X_5-h_K^Q վr.z^pS9Z>Ȧ:Mbxa`/Ȏc=[-c >1GibևNY#lր os*_7m_[|u`(/KKU@Mtߝ\7kqFȨ>l%Hz&ZEl, ʹD}rNݜgu7vBa@M+
-#Scqz]Iv(Ґ.VnA3U"kyaOM #z<kٞ:QGx 9uj&IR7JiEėnbmp4N5R.vI`^g{8[xtZ7%67UV@*Em OA}/ۮz[wD*^pWU-1vJ),u0alC# JL?gL޿ia~x%۩JѼ
-}>yT(Kx.EiF=JN׎$}"3o)rW\]1$B~[sw==O2N굛l?GqwF}Mk`sY,Iri8gxJ¼κξ5P}1,"/1O*S }}7Lu:pKcyoH")|$jLE=77<%"Ku+5=gJHe~y{U@:Ma+8K^0fK--Ln(~4$܉vX|ic
-?~ y0N!}&-6Ȝ>cTxo(9+ϙ4 N9|yEo=V:BM[Gq16<pg&v9l>+}3Z #JZO
-Ź?0tiikM=<alz]w wsx. < )67~x{1Ӊ!> =qc5ej_ `
-J#"\70xiV`Ϥ5]ilҴ╀#Jr!ઇBڌ€
+xTy<EVvnfDY+K֬a 1kWo EY]kvt;||}] qv( ()
+WãD4{ND)
+Ӛ.
+vwgTǠ*X
+ 
+&"{8Ga4A*۟ ںj"6gL]C'¤^%T
+;K!XHH
+@0vģE!@q_i{ǿ(
+!lݐ2.BfjklIbʹ+/䞖Ε{Y̦y~Y6m믎m-勠kbl ew^
+Qd6r=O}n6?k@gO˳Ss R< N57c-sxFX^p|8|tZXrIk;0PDiBT|s d" _`ϣb/gۼloxӰe;.ڀ9YV6BpEMB`l3Azfh"%wq7Y<tk1|7t1'+R+U-F 'F卵C/λ>ByJPu Jz=e.Hau^~&qmB|[(0%QKʑuvaf.|>8k8Y-^_ɶwbNn˝ ʮ(upJIcf4 o=9k5?AL yyͤTUQ85z\=RЦ}N$ȋV6ͪ}}5}{9?]AH'g4PhJghބ#[iL1^QpeJ~^|
+@ky^^[\$C*ZK1!]{g~F
+ZetMy lfpU:Պ"^m?of '%;Lyepw+&dw\==nRBSߩ>ҳ[R%PDݸE):~ki'@UeEnw6@R0qXF.o3T]}
+螮qۘ o,8 *_{`LPanv@qaʕ:L^{aE7ܬIz'ms-\*/gG;xKE?QY8ݡx17%HJ "ZI诛:MS}~%9JɆ4&n|Lc|i+Vaa@)}ٓb/Zy(5.pW KU{i
+R3¿ȥ
+t
++nhUd~--,j@y'Lt5V-ˋvߨ(]Kn
+~3^my_ɲЗs-\3{q3doe4o{+h [sLVjX
+
+xjA{ŒK]:uhS*<^>-tGȮfxZSMO =~WH}\:f Vb^t&bTDC\nڥtjx糐V X"RS;^ڷ5D1eگ#RS됤p'kN
+Gw}C' Zʱeɨ74Gme9l w9+.N
+cȍ99bQІ)OEi;녒nkX9򑖺 #j{a|BAE/X\Gj `nuQg&Ohx[!"Ԟ!QN䵾z37Jn#:QM nfɿJct nό(α]σn'eRs5pZ5ƏP5dN/5޵1)MA+ЁV0p6L&<]s&jJ W>fŹ?Zr鹒)!CmFt
+Qv`k1>]7Ι׶ʣlu=BKN>?|XH%U1FTA1\6gi_Ʋ\~jqI"cf`)Pf蹡?r={,:]4߻bޮYflA%Tg?Dpaհ2P)W@d*~ q+E
endstream
endobj
104 0 obj
@@ -2633,7 +2647,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-15 -951 1252 782]
-/FontName/ZAJUJN+CMSY7
+/FontName/FKUFBP+CMSY7
/ItalicAngle -14.035
/StemV 93
/FontFile 103 0 R
@@ -2649,15 +2663,16 @@ endobj
/Length 1447
>>
stream
-xR}8TY"Fپ#GEYf^&R 1B1̽\w4<hmSI)bCEj"2JK=ն}݋Ϟ}߱g N4NU(aYYRqphPGGT2
-S
-͟R!Rpj&R\zИ6:8
-`a$*:\%NC-d.bl IV0=>64\\Hu lG
-P{=Ϸ+1#U EAyLo0j(a͜n|s3TZg 5!!M@
-{z 9MV^'o-Y?EFtAGߵ3u%$ I,wS`nW=1of^qṳ9hzT#y:wS rUFt_9[,o,Zj6qgW/
-^Q^mz% Zγz\v,nCeMUY[創: fLjjNQg#p}ĀS,[vh!=)8ZF{3;79\ׇD}ʸ#4Tά#:]ɺMdk{{noӯWe>7~ ܈jƅo۝8$Lk=I"冪 C
-W(/O~6~3ImE eֽ޿-gI̱o+24=ޯʹ6Ur WqNJf$yDjT&R:F4!k)tۖZ,wv03J?z{ɲnV{%?(u\>bqU1 \0 )rxDo#7-3ﭭ?ޝr48ar,Uex[Y^},cd٥fM,ݛ:"5𔞅E]6iKST? }cZKT Q:![c>-jxbޠr޿Jmx0 *bSoZqgfG Pe_fS?﵍e%OR2;|r)-8V]
-b^/*gn:KpsMVM<Э@b/( FѤ,M
+xR}XLYNh}+m:E[(TIM*9Mwg޺ɌǮ
+(*ai+WE6<ڽSas~=ywl)zF9+.lm=(8Ixb4t
+*@y
+E`%p F
+Y\?y 2^q5TKPaJ.`L+4HeRHC!pЛJqr(Mc
+\" d
+,h/\ 8-
+NquףۄB #~ρO/Jk;I!ƪB +/~䅵~=հs˭eA*|;S2*4<3 Vml~ZUs9r]@]);b.$Ei[UfGR.V4.k)[,/Zv0T7Na%ݨI_tؾQbv7LGmZ>)&ͯ[mk8ޓReY2)\<DUYk'Vs(ƥ/Yw)#{zk7n_Kp=WxJЪ.9u>ku@Ţ [7~Z~:QZ ,aj )n_k^q5#Us3OA P ,&5|kRJ~YmqLR)-8V՟
+bY',3(
+9u.[eMV5MW rOHhRQrnu9
endstream
endobj
107 0 obj
@@ -2667,7 +2682,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[0 -250 1171 750]
-/FontName/ANYURY+CMMI7
+/FontName/ETNNCI+CMMI7
/ItalicAngle -14.04
/StemV 81
/FontFile 106 0 R
@@ -2683,15 +2698,16 @@ endobj
/Length 2630
>>
stream
-xRy8{PE2Fˌa BYd9Ed^ɐQFٷ$mJ&8X|]_绾{<~~^ ҌH9ZQ4$1,lFp *HA%CC}`?`u4+`08`A bR!_?m}A*M (&
-LǑ"
-ŭ$#!pU~5 %0NRS_9D}זF Afd_ 1z(:lD'HZ$w"o͇!7C;kӉ
-
-[]+
- TȢT2]fVtwA&BSRy!W^G6zz%6G@w>0Ohckf9/^qg:~RkbNHMh=gRdn}9hr{(ǃ Kƥs8c6ӎU5>Fo@.T(ɣ/*+F%}T
-v#bn=>L*(}@ ,r8D
-JU嶋ڃuJ ΆCzD$ cͥ^W=Eӏq lQ7B#4ҳ2 R,L<(ypb]S/d^A3:~zQKfBg5r 82qk[a]+]Zzӏ<qdly|۫'[<xōlQ ^=\"3Bz=E(Y1>}80Q 2)e8>]JϪEw&op^2GR)6\M *62gJZCMQ\Y: ZvxtdtnP$>{d b1Eƹ{Mr2E3-cg#TpRe([__{7/ѷK硲_&<|6nda\rҪeWY0-QLb$G%Xfc"`'ߞt囚Y-{{H*LkOiE+u?W:3SԽCE"l O[e?s /NzgOSrآ;vGo:=юQ%c3[EBhK?(je`T=;͵y$
-aas[8/VW~A>L@,V>ŷ[e׻KuW267V';{p)9>>pqoii̾xFjãW36ϡO~RJ{槙<nWH6Vc\Ôt [Xމ;Uʮ=<Y"KQ\Qh@ڨx([_;`f
+xR{8TF؊ e.sb̶ݺfa1f4f&C"[ȥd*ʥU4&lCg>w~{yuqCZS辠DbQXsH
++dI|FKN7
+Cl
+M'JfoA@/`cC
+7uۯ;^=b9&Wt/_x ^۲O1D} >rXFPr'yGHf?ky3)NQNa-n$:ę Z?6H3oiU2OnۉAa/GcXˤ_7fm-B}ܤ w sSYGHze3pր'Vcܐ ۔b%6!/(5.lhh+w 1͕>Z) MsaQӭ6fTeftݮS#(zߴbU\X[-<Yӳƻ ~60:j8X`gXLsGEyh.Y(i7qC]!Fp}35r}>m09,R%ON+徇X=JwW֬U#]l/&mm+]57gZa+^Ռ{+Oq=+\z #Cс)_.y:bdQ=ipo [|{J)EUoY>bBG m"($sٶ6ݰwr.馷?~SF$ؗ̄M+۞qtO(~VV[΋gmwmZYQʸco^)R}3B/;n`6W"k(1;jlB͇ߥߞ|:&G tH^Nmy
+oW ']xy9=qt{ ^$Hn'ϧvOFWid~4%&3J׉3ά*ѫ']+DިSRu: O5K[gM8
+P؆TJ@>޷t$.&.?qG.08tzw~,OHxn6 jNrd iElBv+SвDW)ΚS(_g)D'gNGP#}γGDS'b[aaEE HwrìeZO6=y# lu[m2c])t\${l67BJ 6$Dd+}Z>2Y0Qk
+i w!c_<JGWGiI+ 
+o9G|Ǧlm}/EfNy葝= 'dcؿ #JK5{g76. j>r JvhHVd9T\_ZjIj>1sn{IQV,i&.g|3KsC2ZC<2eޛ&MOq&OGLVhcni)djt ˅X2Wɼh߽D([G3x;
+Q&Q?sI`}F2kBquJrPfaa>y] c"țNN<wy%|`dBf`qok
endstream
endobj
114 0 obj
@@ -2701,7 +2717,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-5 -232 545 699]
-/FontName/WSNUNX+CMTT8
+/FontName/QCLRYW+CMTT8
/ItalicAngle 0
/StemV 76
/FontFile 113 0 R
@@ -2714,25 +2730,37 @@ endobj
/Length1 1070
/Length2 4122
/Length3 533
-/Length 4834
+/Length 4833
>>
stream
-xWXSkA),N({M $ tQPT4DDEl4Qˉ߹9Ϲ;Yff?3^BV62:h;hed
- X ^ l( H 
-}xR # (Q 0;b
- @ϛF] HQJ'aV J.}}-jVM A uDgp0_Gje s2/kA}/8WKS
-EгږxvFDC:I>L12Kʾ^{vb g^Vٷ[Ֆ1QHh49 b]G+5$+W$-pY-ֻт_xRMZf`8.(rݧ5Z 0;=S!Dd }
-Tp w;ilt6f0_~䛝D뮿.xyrhImƗQ2#7͢{!3#tR![f͇h{KfGfiҔ;&F=[ѲX.%G_h%m.ށxˆccwZX,jo0ʄ2&pt'ނHãˣ))4\g-}8gvFzp͗
-[V+?:(s33cBDZ >]'vvtH 9|o]AG0qR1PD-.
-4״ rd]$4s)ˣCp
-Ky܃ 9C|L);'/;Iݖq]U/}cB6,#][g=(Lp/싈Ktw2cK4ԘMt~k]_3Ӕ?<x3~
-Ն3Y&W' dR n,L./H/U
-8
-Zt;?unꯝ=`,Y`Ǽ  ΔsI=ٻ߄vkqh=b7TTeϜxg%ZC|z@Q~̸Ja=Aq UJAsƷ;k] 2'&RsJSN9uXm|Tk.Ωv\)Jkmׇy:ӸO3w<IerjbV&8ŭb{y
-]qv?'Sxih+ )et̯*O:5|;v)WʏhC6Ud!v&B-(nnuH1J¥c Q*a-_UbnHCZ /F@|mT44IsTsv',m3}~83vQWH\7QfW֘nFb׎x7Sѹ҆fY<,~ "x(|JYŮ.{6I1$v;KM/dfXKfѽ$14( AssUٓv8*pL?̹u]x ߋt['W߬4VPN$+̡.ϤcQ%>. \˽ķ=~~Wt4kuHZp0:8VdAQ;6XzQQ=#ZSdƈym*s噰|ڸ*eE}-.[L睄Y) ~jIl6q~h"!]#}@J.c=xT.(0|/ @ޙ%s͉iٔs)..OKs ]# B{,嵣KvC`~wG__94Daolh*4ۯ_XdX8gjN;
-]RBE3 ,QlIG'LTJz.n?y% ˜
-OÞP2B$x+JX۶nM.)&'&zglE.j .CUD6y3\4VVΥi FY*Iꟸ
-ތ4[$lxTƽc+|gi |@2Gƞu0ѵ74D'k>m$Sc4*[qcC&x'֝$'Rdfsf28Z+{n ,?Kt$H"$@ 8dz
+xWXSkA)Y ^Jd`:((MA*
+Ho"Mi"6(mHz|{{wnssֺYyg̼따. qD9y @^PAN'H"3@A @W
+
+
+__(fCu'TT$ PJ*@A
+0
+
+px sa.
+ SW iԥ{a$pah
+|Xqjzmi+ZRٸ=t?߫q~6ooI$oI
+iWGYN@tWsK{ ~Q4/70C*zU]b@J0_蓨w
+gͶhF CdroT1]8xC9"tGjMf&5LϬXwQ*p{~5n-@Fm"=G/hyc_ԼRsX6f
+?k.W NVD{& YOc8G
+{\\gL,V@c~`
+ͭ)1zw}4ykZyCg@X0\ʉc
+YA2b 8g8 axTfҕl2MjCC䙘gˣږ_;;z?~͇=2hqh\6yxŠw[%-r&3pT$ΗqR[itte,mѬ.TaŖ-uhri)IA*oxÆԸȽ=:!YIE{ u#uYS]BKgkN&#Dz.6`}/6䇁ީıg hORuY (|B3+KoxRgq>aN˗j]4}u ) t9yZkoƊ5yc"6,&]al[hCSkc$#2GucI9,y쮗Qwb/+6*U<֟l%{x{Kcia.Nf| 䚓' ];&=|T[筪x ZQߕwNzֱ<Klv]t
+lE]`aqeދ-X,9j>%z3 gi++f{y+?hir㟜;|7wZ G$ޤ &Y6rg xG,qo?xP+^r$Or~ұD0Q:Ϊuʙh۟&ɔ3בe~?`^-ͽVD͠(Zj2O-ds!^òXKN 6# -|dg]Cx]=M-=b,ohi)\b*ϊZRXi}L;յ'ٳ.i(XH?wKdX>kagF9!yIA"Ł{ZB#]?Xn4c6 ߔ05}/w._ԣ(`:6"|cݤ@KvHЍKϢl3]
+f{ /goA70S{ :/B~4P0՛HK*6OQf}DLtø1<<p~b Ncù?k@j(S^͗X:`
+?v.ϸʕ\ZQǜdnTGe@@iEmLO8 (+ \a7N HJeZ(K<~\io/'F4%o'4MqwR Ȁ7nt 1|zˏ:gc֏y3lq}wb+TVd1n^FM^QvZ)6X~7ʙ^9y /ӯ-z>x}&%c)au̖r],BtApͱvEԉxqbݙ:zb1ia⨲@98>y>Iڤ D9!*F[jLE#:v}g7H73X?Æ`,mj $TWZ5R@WݺC\4ڏO vgوGxsvrh]9:Xmc\7qZ-̈>0uAqڇI5*[!ϛ&:.#u&'x*#5N~qZkzRg)q\)Fg}׏y&ӄʕOw x S>-ƭLrH}=n5A+ J{° Ӑf̃SB\*Aj7ZN=\3
+ZF@;$Ѓf4#F rVYtL@
+I)*H#+-a j%2"
+8kK֌н-s ;<h0xhܽSB\M7@pt$i/trEG喨 /aģa'%WH3, %%X5B([ a7t2Ga\^5A[â'`^/bKs(/\+>nvÈb0z WÂOeibZ./*o:U0Jh>\aZMmzih6Y~Q>eQl2lޏD$u|ylP!ZD2Wh$l1ﵯ⇊&B~xoܪuyf ``!f|]=)];w*c~y4zciF %^g
+C~`9b؋RY
+9tI I󁾫hgݘhSOLmuCȵ
+<znoz SkoVӫ(UH eP[3xYT[#J-,fp@0F4gYS$]KtǘU_;MFz8׸_,gxw騘"jj* c,vHLCkMZ;|i6%Fq,y`^k[֜V
+a{bF>j].!Md0{jfJ|\eyo haI-YhMXͥZ=GyI\kc.^v2; zyFF?[ʙNx1&{}SKiHqcrwesWq=A Y]=Sqm YWD=@oνyKayiѪ[$bbgM
+z@2G2Ɵu1u׵D[&g=k,WgW 4C[`CxB l3.@sHzn
+O4y,Π{dB>?"ʋWezV S` O$@HE
endstream
endobj
133 0 obj
@@ -2742,7 +2770,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-2000 -2000 2040 2040]
-/FontName/WUFVHX+LCIRCLE10
+/FontName/IWPXPG+LCIRCLE10
/ItalicAngle 0
/StemV 40
/FontFile 132 0 R
@@ -2759,13 +2787,13 @@ endobj
>>
stream
xSU uLOJu+53Rq rq54P0300RUu.JM,sI,IR04RO.Q02V02222*
-J-,+2T*S00E(RUp/,L(QpeQ똛ZX /91G!8?93ROA1'G!X!(8,5EP!%蔤<.}'<!)P)"4T
+J-,+2T*S00E(RUp/,L(QpeQ똛ZX /91G!8?93ROA1'G!X!(8,5EP!%蔤<.}'<!)P)"4T
3JB* `fu>02+ @! T0V,y)y
Ff
EE\t*T*d楤V(V
>C; -h$ڹ& ZHfw6o_1j;[.jis ܦn5{!^~LɶԖ;gُѹWV\=DߊKgkrN7nӶg<x>A
R# 76N>T%<' X%\lgSʛo<]k.c&n\rj^ݤУQo_zi*=~goEX^)߅$O_,swVhoIo\4Z$wϼzW>u{oX55@#ҡhS?sYg%E. a3\.zGn[R'2 >^xPVEɣgm\^48]l_ vok.OgAgKƆ7YQ2iCaNoo~L&u _[묌Mv69I{U=ٹrkQM|.wwxWrjv|M۾cmȞ"yZ2&
-6~.-zR?*19aZW:G?3J?,W>UDZ[>L\qR&Lo!+n:fzy ί$-"F)7jq:zӳbU;4::YqFVug+bۇ]R k5OX[yMó KR_>Ss[:wzf53wWֶdF*Q9R:m:ZΔj5Qp5sT>pTytԓ#'wݫpGDuɒ)2Q9E%E\\
+6~.-zR?*19aZW:G?3J?,W>UDZ[>L\qR&Lo!+n:fzy ί$-"F)7jq:zӳbU;4::YqFVug+bۇ]R k5OX[yMó KR_>Ss[:wzf53wWֶdF*Q9R:m:ZΔj5Qp5sT>pTytԓ#'wݫpGDuɒ)2Q9E%E\\
endstream
endobj
136 0 obj
@@ -2775,7 +2803,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-24 -250 1110 750]
-/FontName/GCRFCN+CMMI8
+/FontName/RNOWPB+CMMI8
/ItalicAngle -14.04
/StemV 78
/FontFile 135 0 R
@@ -2791,16 +2819,15 @@ endobj
/Length 2342
>>
stream
-x{<T6F;Ř1mAe*#ʥ53M%RLM$!%rDrKE?s;<yu5wRI 7Hf\c
-ClFr@bÛi\`,,V0h3"K]ʁ|R@bNGd M4&@e!
-qAfRW#Ȁx\`_&cp(4
-0Y,?L)2L ;$ 0ã#p7 < k]V<N$tD .pkt7tIN+ ;R33㩮Z!7<gD"Rhʊ[DP∨3k[ZPVuU^WG'k52>+omRщ3LNZlhM.M+uv.wkD
-uՁr{mJmy!W7HJ[<z1QCwK2u[7dmK%궷km<~3+_1r阨5̏O_6niO|KrMIʝ GQpõvlKE cj_ku)RrQY8lI5=kZoߏ]oH|%xE|
-3a5ET3vk_|
-::(Wjxi
- ;?yY"԰3fع `MVSq7l=q0(ly송j'ޮw ͧ9vGg7Jǵ#_)_喙MD0ɴ<q13S/\w 'kdNx^.]l|vINܐgh@dsrt64tK%WK)z|qnU[Txa`:;$ aۇ
-L,0ثgslX>ѫ-?}mm% 
-ݏzXpr]Ur~<ɴdoVƣ_IBXsǭB+t;3Ww-#>/Ǜ(ö9mA^%ɜel="vMDSEO՞&ݼ.RM ϽlqYMӱꭶ톺&&fo#)o 8eD}YFL̯Nbs2oVڧ4k68"ͪ{P:>MSM]geiYY1qXUt }g QG"܆RR9W 2PN1Th< nz6V^ODa?Ќ 1qY!* v}`凔['zNm>NR~aV/X1ZEVVBtTxXcM.ƍϻeEu{eroz:;[~ԅ<tHŗX-\c/׿~1x+ @>YgNl[ W˶pSj)RDE +] ܇jPSsfro#F^enu?c^ѾO*OׄGD\7z~Y`xd /V`mP\FXyE2}a=u|!2-7艄'nbN2Eȱ3bA)q
+x{<Tv2-F;Ř1ݠAe12Fc&KI%RLTEHJ䲉DRIiw>]y]j:QI /Hf\c
+ClFp@bö4.H0`+ b%q.`
+@\k@bNG7
+Cd(d8A\z
+fsG
++^-M:uY H^WS@N)s9iꍪq ݺ[`(gQ)gIFFњb C{reGʥbGvQg5fX-{<g#nq&n7LG<-9|adwŧ*YN0BnKeګ3cZmDgWkZ߻le3LjGHqFP>vi>nS:b4<qF* \JuO7/#˯ _Q>); ?vhlΖ}Vy5=9pEB}{O r .5NQ珁1bmJuY4J!Nzxݺ|  `sǛ
+Qѣc7q<򨙮[8sUw/N`zFўmCGDDn\1<}r Y`xd45^9qfyJԪCOSNw7\WJ7._+Y'ytDh
+=)5 w*"VP5z6GwI]My '>G|ީ9(51CW:H*5^I7]M7Sfbi(4w'˃y.8l}!QI#)gC i}?#Q'<͵'JjnÀWs<'wdfnt9Sݯ]\OЙ eh@
+r
endstream
endobj
143 0 obj
@@ -2810,7 +2837,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[14 -250 1077 750]
-/FontName/HVFCTG+CMCSC10
+/FontName/BGZLHZ+CMCSC10
/ItalicAngle 0
/StemV 72
/FontFile 142 0 R
@@ -2823,20 +2850,25 @@ endobj
/Length1 885
/Length2 2464
/Length3 533
-/Length 3092
+/Length 3091
>>
stream
-xi<ǣ!2s2]"Kv/I{ƌHZ$IR֬e+'k5A gtzΛ9{]H:(`Iޠ HQF u
- A:j:j `D
- %}|)7&`
-
- dߥ.w {֜&1D ~A&x*S0
-Re7X6Lsϖy-A_ZC8ve%=ז|5/9 }6 {}x[CɹЭnf.N 5q0r1[7^"iJ9Bf4-c==6=2_ȥ<O63>5O81V9jOyK/_`54?w]%jAa]uUDcdtGqm`jyfI-o~m+{i02sbя{$<7,8ۘ퍺2kNdc :l☫>DVETUt;n۹" Gw,5n޷S=g ͝|67wnaoMO/ dlݑ0oQ5B.i]Z.~Gnc_Rᖋ1, QVhA{]rZ;WM )7a?oxۻJ/v+5Telo44P%e<Fj3zfrapN!?+:[A\_fҭ0]+](6
-S2zB{X@gL䟀-nKbHp. Is'4Zr؜`Q*::y͆+uukSq.
-(%ibze/K|-=n_O5%7-;z>{}9}7LꐸM<dgh́lcf[}ɷxa`*A}t',4Gef/]rd9v8[3YK-YtU?xtҀ؞MV9~D3ų1'PmV`Pْ?ЦTNW㟰;Р{[V->29Q<d|wv6_y&}p:)hسG>KN4<$uj{4hl>=8SWoJ/W4'glX*'=9:h)χsd%
-yq:Xx0iLs\n#&9ɩW0RSfoU =嬶v[:/ >B'"sz⬴֎!iY *B>!UxZgGoWsϠڕ
-DZ>M%ӭ;7XמOa259qVNjyS0GWSW2Sߴ(Gp}\0$Ͷ&lj~*2q]O[_3սrE1闋|ЇE !a\b'loj|d,]-ThMHO[Y=r6 $6{Vȷ5qN^ljd-!]\Q5ku^lZr {j 1}P9+vaT]WoJ؝[1Gտ$-ֻfZXqц|+~f@ڡabIAIK'X5GL`#m}cEJ^QzR.4bu礐Ln^wNg腛h;2+u x~ϲ2q~:($lCi Uf`~sl_ɩؖK5Wo&d苸<7UERRm >D<8#_̵̝Y!@8N C”b⩕o˒fRynZ9ͭ6IuxhLZ_c.S^Onh~UX[$=u'* k$O/qUV^anl+TyX'jz]\c8tҩ`9:B P=Sv⣞z([ jAS *L
-iC2<ז |Mb@Y/j|DH',8̟;?ABd_8$We;Fd]pd 5z ڛҿ1]{I)A'A>y
+xi<ǣ!MvbȒd_c114$IʚlآdM4({"LuzNys>~sw]}]iq;%}, 4&)JHe6`hehgD
+z7WfD L@/@S`Ē
+ϚQ<FM
+ 8Hn1&
+?#m)!6ȿ1"2
+!$Cx~v!":&! bD,H@*3\H0J
+ygK?j[Z}K䆈i٨}/i7/W 0mX<=Y'r#ݦs=c0`OhW˫PmѾl[KSs[#qIAFloԤ/ӆtB&Ua3\aHdMUE'Ⱦ$^ێŲƣ^we0匷}ٌZ}+[Q6 ք,70 ֈ9z&eqXCD浫uia"nwd77.n9)BOa%GjBs5k:8մ.rNK:bρCUF&q+KCU_R&c6çk,]Dț&tZ2_`TY}kE4nqߔzV1^~P@Q嘢m*ߑW>~SZQDIʉ~^VOd.x:?.;>7~R]U,;qz
+"׬^]2B)[΍\οX2A:/[)ݷrq#hꢿZSFe;i{o?i_a_ U:,e]!O)\5lG}.Z#[Z(鼫C__I`q>U~q2և.9xΜ ;*H֔pI#]۪''rUDsv-LhI3P'%Wōyx)S9vO9$ߠs[V->2b9 2:Afq[x>8sb#%k}ڵ=w4hl>38]WkoB/_4'kdP*%+59X)ϛsd%?nWs<y>^miDzto_"nϾX9'z=;LB4 _en0sD/wWN&sBuf 7/(j;
+PD$ش
+*fd trB -ҚZ.{^mҖQ+
+G](.Ofx"`VDwZOtcn,\[I\4]vwQ•<TV- ΓμŃOccsFEfu3)HNϔ0}bn5,kx~Iؖ:kNZP+ N.67
+ӊ8[t}hM{U'iBO/.l]O٩V~
+Q!x &tJ8|Dg9Lw6a١p%C 0%sH/MB|8R
+ZJ1})ӵ6a T< d3maJ|t P'_^;{E͸pǽ.z113a=Zp
+K
+\Rb{t[eI[9\Ia~ooG<." 0Md?9
endstream
endobj
150 0 obj
@@ -2846,7 +2878,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-341 -250 1304 965]
-/FontName/ITRDAB+CMR5
+/FontName/YBQGDB+CMR5
/ItalicAngle 0
/StemV 89
/FontFile 149 0 R
@@ -2862,14 +2894,15 @@ endobj
/Length 1855
>>
stream
-x{<%M\Fc]27&f۠Ku1 Of\E{lhi&㶋(ueOisy{9o_y?~{;20
- Xp!,`y ]
-&^=GA" K@aa/.fBpH:y<G$K
-M?]<y}D;ܪh%7GO.ZiН{;GqcHk~J[
-jD uiၞC|<M+y9cyȂޥ57ʋg~d:.6RobzSb6͊թM8ͩO99U+?mFJe0Fi_ہ>{YYc'3R^|->nQRߌNdNks,cĠ3=}We! Bb ^_}q^T.#ls4"h~( 5/ ܞYQ(x0d Dg93O1gu1j=ŏ+&?׿'G> ;Bj{9˶b-9[Ug)LqSJoEfrwV1h㲈ѱvJaeABǣ
--~o 婞v}l].}-JIYkʾa:G7[S= sEc-isA7eKd_-Ԫc):'kOפ aZ&2o
-=o(R m Lw 6 [[LdWLu.MDCɊ1y\I-q|Χ"xʔw,6aWIYWL&m NM9M;eb٪2򧪂ɦaa*`YzTn욾 7^?% $6eoxDxVzDH\#͎"p4йDݏu5/͈
-@/53i3J%#ELL6UHiy;M _Hz< (ᏩoNڞ *Л_{MA##Ag&kKTr8[J; W)W<["<*?J?n6ȗy€<̡"Q_dр
+x{<%M\Fc]27&f۠Ku1 Of\E{lh%MmQR9˞,y{9o_y?~{;20
+ Xp!,`y ]
+&^=GA" K@aa/.fBpH:y<G$K
+Mȣ
+k4G:
+o…4AVo
+$ [YN9ݡDvax2I omɑ}OCO$^/T:x^ֵY`d_uk_?Vd^j
+<c?fK\p,a(A>)6e2M5gvV?({av-SnDl"Ini)`s(nlD
+ET&7BvM_jBϛTi7<"<TZQ"g$yTQf[fLr\Ǻɚ] fE^Wי}Y%2xǢS&ZfOv&f/w[=ĄUΕlNڞ *Л_{MAAg&kKTr9[Jׇf W)W<_&<*?J?a6ėz€<̡"Q_|у
endstream
endobj
161 0 obj
@@ -2879,7 +2912,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[21 -944 1448 791]
-/FontName/TJJPKH+CMSY5
+/FontName/WUTMGY+CMSY5
/ItalicAngle -14.035
/StemV 101
/FontFile 160 0 R
@@ -2896,9 +2929,9 @@ endobj
>>
stream
xSU uLOJu+53Rp 4U03RUu.JM,sI,IR04Tp,MW04U002224RUp/,L(Qp2WpM-LNSM,HZRRZZTeh\ǥrg^Z9D8
-@WT*qmKdgaqn99~ A!S U[PZZZ4<6Ԕ\tYϒĜdǼT]C=cSDf[fEjJ@fIrBZbNq*X<5/);D?+Cɀ̼ʂTj0RQfB!P!Xh%d+)$%Vr
+@WT*qmKdgaqn99~ A!S U[PZZZ4<6Ԕ\tYϒĜdǼT]C=cSDf[fEjJ@fIrBZbNq*X<5/);D?<4=Rɀ̼ʂTj0RQfB!P!Xh%d+)$%Vr
iE\X543T+-saz)PADBҰU]h^fai!$KRJF0~Z&0\SS+RfdבU]'0K=jAM~cϝ;ya3o^h͙sl}x,[cl|{}Z2,+iO%⮰%:.po殺Qۄ ^PZTjc'>Dr8V|]P:Y͹oK*n'=>yT{EW^%NnvSm/%ifVō~ %7Nuʽ+3J~s I.5NUh+K\>;!}^=/x95KЊލ ޺i
-?KԤӴs|=:nu5Կz?a9룖mr/g9TfI~g<]9cȤ _/ZrHg1z ?udgy2lG&DĜd=) \:SzN4-k°[6Z[w|lR<Q6W܃}/3{#f>w-vq{ ޅ<?e1[uk&yLQn\G!/=(8݌WNgDȲ>#ɸy-~_E|j@!5`XXTX
+?KԤӴs|=:nu5Կz?a9룖mr/g9TfI~g<]9cȤ _/ZrHg1z ?udgy2lG&DĜd=) \:SzN4-k°[6Z[w|lR<Q6W܃}/3{#f>w-vq{ ޅ<?e1[uk&yLQn\G!/=(8݌WNgDȲ>#ɸy-~_E|j@!5`XXTX
endstream
endobj
164 0 obj
@@ -2908,7 +2941,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[37 -250 1349 750]
-/FontName/CCGVHN+CMMI5
+/FontName/ZREWPU+CMMI5
/ItalicAngle -14.04
/StemV 90
/FontFile 163 0 R
@@ -2921,15 +2954,16 @@ endobj
/Length1 771
/Length2 1364
/Length3 533
-/Length 1944
+/Length 1942
>>
stream
-xiXSWX *˰(9@Te@#!W\$4AP ZTdGpC -PE">cK~gr{.͏BCa7/ Ti S8c0C|
-pdCIM .C,߅-(eÑɀ0  |iʓFenEX Ib86Tz,`Ks7![_wm-@yBc/txf!Bޗ]O0. d+sjD!"EC̽F‹uD"LvIc |8o54# `Rt|0W>e!| cq'ςE
- ZXK=-
-Gܗ`A|옽qߞ'^ 54P;z|3ՊQԺG)Q׾fIdaBz.qiJntkO| y <9-_+Z~DQA
-?n~Qֳ-9>E9ʤF#8zj⾵/NVq ].Y-ArlЭBrKet1m$҄ڮf⬆ %ox 7ﲼST^oNW6:' &
-(Tt^Z<ؕSB"ה  &f`p
+xiTSIe1(,# -!7l0€FCr$pIEiDTdAAvD7DYZT\A&(J+Hu b#g3g͙[ﭷz|,4vE"ٌLN^^V@: 3wf`* Z!@
+ ނBVj3xWO 
+` x,-Kl^0  \pa@$[AKu$,"`
+zr!^Y8$mcr _L2*6]yvT3};Դ`Vi"BoΝxleM8fgKrdW_ngF_~e]dwS"==ӽ٧ͭN5>a ru ~A̳{</w>%ۓ=VD%Ld- r/g85GEcǰ>'ׂ~Jd*ףF
+=#6=HS`g=7,K0'F?xbVv.!tLQR|W/)i:QZ[Z^zD%TJe4>NŻ:y}ז ڠZ*=
+m*L%,6<33Ej\|E u:3S=S)G#qs&s]|~فĂ^~?}6 M䵬S[ `
+e2W[iC㪓k7L:>>I^y'(* W~zġ1-5ſ﷢CGVI< I6r=[g$k:A'gBw,TlEO滒=tj_S[€Ʌ
endstream
endobj
179 0 obj
@@ -2939,7 +2973,7 @@ endobj
/Ascent 850
/Descent -200
/FontBBox[-35 -250 1148 750]
-/FontName/DRACLL+CMTI9
+/FontName/BSWRLP+CMTI9
/ItalicAngle -14.04
/StemV 70
/FontFile 178 0 R
@@ -2949,39 +2983,35 @@ endobj
178 0 obj
<<
/Filter[/FlateDecode]
-/Length1 923
-/Length2 3025
+/Length1 943
+/Length2 3095
/Length3 533
-/Length 3693
+/Length 3771
>>
stream
-xRi<}V ";=a,YB3]3eKZlQ-;P>oɖ-kLw~y\ח8</Q!3Zx3G"R(U
-
-vPʀJTD ß ^
-C8
- BDLD{{U^\-$@K'
-O҃@D]
-@LB"þ/UAIٟ
- K"c4Q4| Bu!y4 Eoa$bٟKQd?|I~q9ZBև?g7hCkTSdH[vvhA?KKeלV{>崫hЉ{0<J͠N'`cߎ7'k`ZwO(\@g}V7Ak$ʲ;6
-@=r;Z~WBN\|qߨf}Sό>.G<4x0s/zdTm ȶ*tIW$.>}`OM^n~e'Rqy>못8C:g" 3ΡwT0#Yn~ `s3$ְuByDc`jL"}l:݅pdN{.3ˣ8=[%c>Yҫ&\Ueoa\Zc
-~>\>b&p*Kg޾W}/{0u[_v{K-FT-X߁ٌYq+[S>I[c>6Ycj~u* У+Cz)E<OUvwXvqƒX2W䥿aDjU{\9tI8ћ s/3d_t{
-SpXMcD >S&ڹ\rC'|Doz>qPbaط!}iJIqSgw=slߌ.G,XF)vX?5 D2=\++"w7ʗ,}#[/`ZR9G=맢ЏMw0⅔,a!7ǬuH0</r:DJ|852X"Qu(H9W\zv .$r_e횱?JGy޷}z={26LFW;UD)qO[- ]!X/bu㴤'uS29KgVSl1=w<D,'5ĜMSn+TjP-S>JC-{isQVIU;&>3oRxg)[&etuaP~k’g3Os<a<6?d.MȨ܂(kf|&z:jgRi uxX}UY,vU23 념u' set7FĽǧy4΍|"QoJ2~ϒ; RbCD=WĄ+).S.s\.Cc&@o,竖]㱧xhpZ;y)̵"{aǒ4g4ZesT:c}*=87cڐ+Q%%V1$\ؕy)OKEzVU]6i)y}}*v '߇ڸcw:{IlٺkW^#þU,ȶed:VO1v)wvQXVB :#GJ54;ւ&܌V>K6 j |.FCϲkt/:&#
->SI7RD1%GXj's쩠zaWB]]gb.%hXJ_ez'ξ衔
-+﫫p==,3:È1B@|뚸"s.f WyR2-t.c,sbxWٷ!-avf ;݋Sn #.yUʁ%9%Vo8ғU`_
-N %\Mҭj gp]ڙ11lpT὾RBgwlOJF7y85W2Vِk脉c͛":__뭦Ca'VtB+qehجrTOƢQfD iWg'9B<%u!cm_:דGv?[\ʑȥ)gm^8FxT=3قKI#9ᶯӠa9'q<2Y2y_1َZ,l;j'k[;е#ͥsg0γӗڅ1O{fW<qKjmo1pK
-`s[W ,}Z/R1\izjbePo6s;~ICT&u9S b۱'pչ"v *0a3ZU+Pwa3<?Qʮć41}ى>O =%Ij2YBW{(<5/ɾJw}
-YN̋П}
-4,zmKD3K
-E҂U
-G uk59pγ6)97> hk<*PM0Ug)6()aw_'Vg^j=;]"T>H_Oȸ'ަ~Y܍G@ya*dFAKp d
-Gb?z{?G_ 8U7tQxu8ka#X2%_1s
+xRWXSۺTJPXAJ TA tAB!(E^-^Ao"("zv_}};Ye919$ձDGPH K¥J
+
+,CAgIDX_%oERsԔX"`A'ԈHRc/~7צFh/e;
+Sןoʹ"Gpr
+i
+?:_ G} b ip4|+-}PvN<WTT*@~>`M6B{Kӛ:j:̌kv/(f(l3|di/J;{}iQ~KQqk>߸6~eҡNClenW!rã$J7 ^9w:*RX;o5LWJ1wS$^X"XNVD(6
+}n%"ۙA>%}?Pcœ]sA4KfuinMSݟ]WE$\>DuBt|aUL:3h"pMp^>l7|{yJE7h<ym+9' ݩ [~4Db!(c;EPemV*M;2.8
+"!U7%`ф&azG'$r-ncL NgWrbOH g4t ~9XK2o޻(Idbky/<!#q7%&?<Pnt]BȚdq V/Z^bIԍE>ItbPf+zL]&~'یe>eC u_lqV FCsZ1ξܭMhDpYc5T3N7Fpo?ːO*_?~鮿}NŽ\;b?k
+&g
+s$hi6C*}Ε=9e ec9cU\Tu9znSFYҭTN ~coXD}]M-&V|O]\Rrcp]3_]4TO.|%ě,yUMyڶO]ؕAlc_y4 3%k}hS]v
+lE5-Dp ?$dS4DIIr#~UU5aY:vmB^+l[ȵ`eʎ
+5jHYeM-<X&r |SQȥuFK3.|]~h&<Ą3\ןe}xwC+hy<QW%֑ǒ Q2HZv'aYUx 
+0v<_ŝ7:Şa4hNNug|)?N3UrFk,GmPV Io>)lwv(跒23[wzN]nKhbAkWq-POlCqӵ %W9|9<">XظҠnSTl6l9΢% 1Jh_V*IiaZJ3Q=o{VzEGjCn3m
+Pd(שo̊bk:wO15Ӱc2E·[+y =k0q o q osڗӞg$dd*.QtTz D9sʴg*eo*ۣOx[ˆh0Vc{\O󼊮3Hwg6vvGhdaՕw)r_ޭ$xd
+Yu}v<-*&ot"_'ɇu3k ⚷eBZYg M
+ \-/Tfpd/rC”MB3oɞ@⥝B_fFio$T$U2Ѕ{N@1tI,6IwnD5)eM6Ο:wD|c}㉣_Q ,U?<əaԟLq 5-(bds):j5+Я@CK/bnu 2A3qo\^ղߔ`6MiQ8嫫Eg\)eONkr<t17X^J-qRrNmse2@+MPombغ k5^Mg kGZ>ZEIX0#d72{C"6\Lo0_~}enȡNޝncTYWgo9c?Źn'jĬhH= 궀&@4O(N-4֛=lS
endstream
endobj
1 0 obj
<<
-/Creator( TeX output 2004.11.15:0922)
+/Creator( TeX output 2006.02.03:1049)
/Producer(dvipdfm 0.13.2c, Copyright \251 1998, by Mark A. Wicks)
-/CreationDate(D:20041115092509-08'00')
+/CreationDate(D:20060203104920-08'00')
>>
endobj
5 0 obj
@@ -3263,199 +3293,199 @@ endobj
xref
0 194
0000000000 65535 f
-0000330651 00000 n
-0000334016 00000 n
-0000333664 00000 n
-0000333869 00000 n
-0000330815 00000 n
+0000333127 00000 n
+0000336492 00000 n
+0000336140 00000 n
+0000336345 00000 n
+0000333291 00000 n
0000016129 00000 n
-0000174339 00000 n
-0000174155 00000 n
+0000175402 00000 n
+0000175218 00000 n
0000000009 00000 n
-0000178208 00000 n
-0000178021 00000 n
+0000179270 00000 n
+0000179083 00000 n
0000000985 00000 n
-0000181073 00000 n
-0000180878 00000 n
+0000182135 00000 n
+0000181940 00000 n
0000001966 00000 n
-0000183520 00000 n
-0000183334 00000 n
+0000184582 00000 n
+0000184396 00000 n
0000002900 00000 n
-0000189591 00000 n
-0000189397 00000 n
+0000190569 00000 n
+0000190375 00000 n
0000003801 00000 n
-0000191766 00000 n
-0000191578 00000 n
+0000192744 00000 n
+0000192556 00000 n
0000004791 00000 n
-0000196949 00000 n
-0000196763 00000 n
+0000198273 00000 n
+0000198087 00000 n
0000005774 00000 n
-0000203277 00000 n
-0000203090 00000 n
+0000205362 00000 n
+0000205175 00000 n
0000006726 00000 n
-0000206665 00000 n
-0000206476 00000 n
+0000208749 00000 n
+0000208560 00000 n
0000007700 00000 n
-0000214705 00000 n
-0000214515 00000 n
+0000216788 00000 n
+0000216598 00000 n
0000008630 00000 n
-0000224679 00000 n
-0000224491 00000 n
+0000226762 00000 n
+0000226574 00000 n
0000009551 00000 n
-0000239987 00000 n
-0000239794 00000 n
+0000242209 00000 n
+0000242016 00000 n
0000010453 00000 n
-0000241858 00000 n
-0000241672 00000 n
+0000244081 00000 n
+0000243895 00000 n
0000011376 00000 n
-0000252498 00000 n
-0000252311 00000 n
+0000254921 00000 n
+0000254734 00000 n
0000012361 00000 n
-0000255699 00000 n
-0000255513 00000 n
+0000258121 00000 n
+0000257935 00000 n
0000013333 00000 n
-0000333769 00000 n
+0000336245 00000 n
0000014318 00000 n
-0000333819 00000 n
+0000336295 00000 n
0000015937 00000 n
-0000330918 00000 n
+0000333394 00000 n
0000023162 00000 n
-0000258998 00000 n
-0000258811 00000 n
+0000261619 00000 n
+0000261432 00000 n
0000016190 00000 n
-0000263419 00000 n
-0000263233 00000 n
+0000266041 00000 n
+0000265855 00000 n
0000017115 00000 n
-0000274104 00000 n
-0000273909 00000 n
+0000276079 00000 n
+0000275884 00000 n
0000017843 00000 n
-0000282653 00000 n
-0000282468 00000 n
+0000284858 00000 n
+0000284673 00000 n
0000018808 00000 n
-0000292730 00000 n
-0000292540 00000 n
+0000294934 00000 n
+0000294744 00000 n
0000019535 00000 n
0000020275 00000 n
0000023046 00000 n
-0000331023 00000 n
+0000333499 00000 n
0000026567 00000 n
-0000294774 00000 n
-0000294580 00000 n
+0000296978 00000 n
+0000296784 00000 n
0000023224 00000 n
0000024154 00000 n
0000026439 00000 n
-0000331128 00000 n
+0000333604 00000 n
0000030530 00000 n
-0000298533 00000 n
-0000298347 00000 n
+0000300736 00000 n
+0000300550 00000 n
0000026629 00000 n
0000027578 00000 n
0000030413 00000 n
-0000331233 00000 n
+0000333709 00000 n
0000087051 00000 n
0000030592 00000 n
0000086946 00000 n
-0000331512 00000 n
+0000333988 00000 n
0000114813 00000 n
0000087113 00000 n
0000114732 00000 n
-0000331617 00000 n
+0000334093 00000 n
0000117375 00000 n
0000114875 00000 n
0000117246 00000 n
-0000331722 00000 n
-0000122908 00000 n
-0000303060 00000 n
-0000302864 00000 n
+0000334198 00000 n
+0000123104 00000 n
+0000305462 00000 n
+0000305266 00000 n
0000117438 00000 n
-0000304814 00000 n
-0000304621 00000 n
+0000307216 00000 n
+0000307023 00000 n
0000118433 00000 n
0000119413 00000 n
-0000122740 00000 n
-0000331830 00000 n
-0000126790 00000 n
-0000307746 00000 n
-0000307559 00000 n
-0000122972 00000 n
-0000123959 00000 n
-0000126613 00000 n
-0000331938 00000 n
-0000130298 00000 n
-0000126854 00000 n
-0000130131 00000 n
-0000332224 00000 n
-0000133810 00000 n
-0000130362 00000 n
-0000133704 00000 n
-0000332332 00000 n
-0000136817 00000 n
-0000133874 00000 n
-0000136711 00000 n
-0000332440 00000 n
-0000141048 00000 n
-0000312893 00000 n
-0000312696 00000 n
-0000136881 00000 n
-0000314911 00000 n
-0000314716 00000 n
-0000137538 00000 n
-0000138523 00000 n
-0000140857 00000 n
-0000332548 00000 n
-0000145624 00000 n
-0000317558 00000 n
-0000317368 00000 n
-0000141112 00000 n
-0000142096 00000 n
-0000145407 00000 n
-0000332656 00000 n
-0000150779 00000 n
-0000320954 00000 n
-0000320765 00000 n
-0000145688 00000 n
-0000146681 00000 n
-0000150635 00000 n
-0000332944 00000 n
-0000154561 00000 n
-0000150843 00000 n
-0000154455 00000 n
-0000333052 00000 n
-0000164049 00000 n
-0000323120 00000 n
-0000322924 00000 n
-0000154625 00000 n
-0000324589 00000 n
-0000324395 00000 n
-0000155648 00000 n
-0000156638 00000 n
-0000163892 00000 n
-0000333160 00000 n
-0000169049 00000 n
-0000164113 00000 n
-0000168918 00000 n
-0000333268 00000 n
-0000171766 00000 n
-0000169113 00000 n
-0000171624 00000 n
-0000333376 00000 n
-0000174091 00000 n
-0000326843 00000 n
-0000326648 00000 n
-0000171830 00000 n
-0000172782 00000 n
-0000173998 00000 n
-0000331419 00000 n
-0000331338 00000 n
-0000332129 00000 n
-0000332046 00000 n
-0000332847 00000 n
-0000332764 00000 n
-0000333567 00000 n
-0000333484 00000 n
-0000333948 00000 n
-0000333971 00000 n
-0000333993 00000 n
+0000122912 00000 n
+0000334306 00000 n
+0000127070 00000 n
+0000310148 00000 n
+0000309961 00000 n
+0000123168 00000 n
+0000124155 00000 n
+0000126893 00000 n
+0000334414 00000 n
+0000130578 00000 n
+0000127134 00000 n
+0000130411 00000 n
+0000334700 00000 n
+0000134090 00000 n
+0000130642 00000 n
+0000133984 00000 n
+0000334808 00000 n
+0000137097 00000 n
+0000134154 00000 n
+0000136991 00000 n
+0000334916 00000 n
+0000141328 00000 n
+0000315294 00000 n
+0000315097 00000 n
+0000137161 00000 n
+0000317312 00000 n
+0000317117 00000 n
+0000137818 00000 n
+0000138803 00000 n
+0000141137 00000 n
+0000335024 00000 n
+0000145903 00000 n
+0000319959 00000 n
+0000319769 00000 n
+0000141392 00000 n
+0000142376 00000 n
+0000145686 00000 n
+0000335132 00000 n
+0000151058 00000 n
+0000323354 00000 n
+0000323165 00000 n
+0000145967 00000 n
+0000146960 00000 n
+0000150914 00000 n
+0000335420 00000 n
+0000154840 00000 n
+0000151122 00000 n
+0000154734 00000 n
+0000335528 00000 n
+0000164328 00000 n
+0000325520 00000 n
+0000325324 00000 n
+0000154904 00000 n
+0000326989 00000 n
+0000326795 00000 n
+0000155927 00000 n
+0000156917 00000 n
+0000164171 00000 n
+0000335636 00000 n
+0000169328 00000 n
+0000164392 00000 n
+0000169197 00000 n
+0000335744 00000 n
+0000172070 00000 n
+0000169392 00000 n
+0000171928 00000 n
+0000335852 00000 n
+0000175154 00000 n
+0000329241 00000 n
+0000329046 00000 n
+0000172134 00000 n
+0000173086 00000 n
+0000175061 00000 n
+0000333895 00000 n
+0000333814 00000 n
+0000334605 00000 n
+0000334522 00000 n
+0000335323 00000 n
+0000335240 00000 n
+0000336043 00000 n
+0000335960 00000 n
+0000336424 00000 n
+0000336447 00000 n
+0000336469 00000 n
trailer
<<
/Size 194
@@ -3463,5 +3493,5 @@ trailer
/Info 1 0 R
>>
startxref
-334114
+336590
%%EOF
diff --git a/Master/texmf-dist/doc/latex/coordsys/putfile. b/Master/texmf-dist/doc/latex/coordsys/putfile.
index 141479c77db..b57c7952bc6 100644
--- a/Master/texmf-dist/doc/latex/coordsys/putfile.
+++ b/Master/texmf-dist/doc/latex/coordsys/putfile.
@@ -8,7 +8,7 @@
##
##
## This is the coordsys and logsys packages
-## Copyright 2000-04 by Mogens Lemvig Hansen,
+## Copyright 2000-06 by Mogens Lemvig Hansen,
## mlhansen@uniserve.com
##
## This program may be distributed and/or modified under the
@@ -23,8 +23,8 @@
##
putfile := proc(fn::{string, list(string), set(string)},
P::specfunc(anything, PLOT) )
- option `Copyright 2000-04 by Mogens Lemvig Hansen`;
- description "version 1.0";
+ option `Copyright 2000-06 by Mogens Lemvig Hansen`;
+ description "version 1.1";
local L, fns, i, V, scl, FH, ttl, pt, path, ext;
global StringTools;
L := [args[3..-1]];
@@ -87,8 +87,8 @@ putfile := proc(fn::{string, list(string), set(string)},
if scl <> [1,1] then fprintf(FH, "%% scaled %a\n", scl) fi;
V := [ map2(op, 1, L[i]), map2(op, 2, L[i]) ];
V := map( u-> min(op(u))..max(op(u)), V );
- fprintf(FH, "%% horizontal range: %f..%f\n", op(V[1]));
- fprintf(FH, "%% vertical range: %f..%f\n", op(V[2]));
+ fprintf(FH, "%% horizontal range: %f .. %f\n", op(V[1]));
+ fprintf(FH, "%% vertical range: %f .. %f\n", op(V[2]));
for pt in L[i] do
fprintf(FH, "%f \t%f\n", op(pt));
od;
@@ -96,8 +96,8 @@ putfile := proc(fn::{string, list(string), set(string)},
end try end do;
end;
`putfile/grabcurves` := proc(x)
- option `Copyright 2000-04 by Mogens Lemvig Hansen`;
- description "version 1.0";
+ option `Copyright 2000-06 by Mogens Lemvig Hansen`;
+ description "version 1.1";
local L;
if op(0, x) = 'CURVES' then
L := [ op(x) ];
@@ -109,8 +109,8 @@ end;
end;
`putfile/cleancurve` := proc(CC::list, V::list)
local C, B, pts, pt, m, i;
- option `Copyright 2004 by Mogens Lemvig Hansen`;
- description "version 1.0";
+ option `Copyright 2004-06 by Mogens Lemvig Hansen`;
+ description "version 1.1";
C := select(type, CC, ['numeric', 'numeric']);
if nops(C) < 1 then error "no numeric points in %1", C fi;
B := C[1];
@@ -147,13 +147,13 @@ end;
fi;
pts := [pts];
if C[i-1][1] < C[i][1] then
- pts := sort(pts, (u,v)->evab(u[1]<v[1]));
+ pts := sort(pts, (u,v)->evalb(u[1]<v[1]));
elif C[i-1][1] > C[i][1] then
- pts := sort(pts, (u,v)->evab(u[1]>v[1]));
+ pts := sort(pts, (u,v)->evalb(u[1]>v[1]));
elif C[i-1][2] < C[i][2] then
- pts := sort(pts, (u,v)->evab(u[2]<v[2]));
+ pts := sort(pts, (u,v)->evalb(u[2]<v[2]));
elif C[i-1][2] > C[i][2] then
- pts := sort(pts, (u,v)->evab(u[2]>v[2]));
+ pts := sort(pts, (u,v)->evalb(u[2]>v[2]));
else
error "cannot happen";
fi;
diff --git a/Master/texmf-dist/doc/latex/dramatist/README b/Master/texmf-dist/doc/latex/dramatist/README
index eaef1166440..f02b5d7bf2e 100644
--- a/Master/texmf-dist/doc/latex/dramatist/README
+++ b/Master/texmf-dist/doc/latex/dramatist/README
@@ -1,8 +1,8 @@
This package contains the following files:
- `dramatist.readme': this file.
- `dramatist.dtx': the package source file.
- `dramatist.ins': the installation driver file.
+ - `Readme': this file.
+ - `dramatist.dtx': the package source file.
+ - `dramatist.ins': the installation driver file.
In order to get file `dramatist.sty' you have to run tex on
`dramatist.ins' (you'll get also the example files).
@@ -62,6 +62,25 @@ v1.2 Added support for `poemscol' package.
Added various hooks for user customization.
+v1.2a Fixed a bug in the vertical spacing of \DramPer.
+
+ Changed name of counter 'linenumber' to 'verselinenumber'
+ in order to mantain compatibility with package 'poemscol'.
+
+v1.2c Fixed a conflict with the spanish extension of `babel'.
+
+ Fixed a bug in macro \direct: issuing a \<name> command
+ at the end of this macro no more produces unwanted spaces.
+
+ Fixed a typo in the author e-mail address.
+
+v1.2d Fixed a bug in the spacing of characters' groups inside a
+ dramatis personae list.
+
+ Fixed a bug with \dirdelimiter.
+
+ Fixed a bug with \speaksdel inside a verse drama environment.
+
- Bugs Report -
Please report any bugs you find, sending an e-mail to this
diff --git a/Master/texmf-dist/doc/latex/dramatist/dramatist.pdf b/Master/texmf-dist/doc/latex/dramatist/dramatist.pdf
index 4e75a97a818..98d004d3b51 100644
--- a/Master/texmf-dist/doc/latex/dramatist/dramatist.pdf
+++ b/Master/texmf-dist/doc/latex/dramatist/dramatist.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/dramatist/marlowe-poemscol.tex b/Master/texmf-dist/doc/latex/dramatist/marlowe-poemscol.tex
index caf5351a433..3767f128025 100644
--- a/Master/texmf-dist/doc/latex/dramatist/marlowe-poemscol.tex
+++ b/Master/texmf-dist/doc/latex/dramatist/marlowe-poemscol.tex
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% dramatist.dtx
-%% Copyright (C) 2003-2004 Massimiliano Dominici
+%% Copyright (C) 2003-2005 Massimiliano Dominici
%% \CharacterTable%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
%% Digits \0\1\2\3\4\5\6\7\8\9
diff --git a/Master/texmf-dist/doc/latex/dramatist/marlowe-verse.tex b/Master/texmf-dist/doc/latex/dramatist/marlowe-verse.tex
index 32747b53455..38189340559 100644
--- a/Master/texmf-dist/doc/latex/dramatist/marlowe-verse.tex
+++ b/Master/texmf-dist/doc/latex/dramatist/marlowe-verse.tex
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% dramatist.dtx
-%% Copyright (C) 2003-2004 Massimiliano Dominici
+%% Copyright (C) 2003-2005 Massimiliano Dominici
%% \CharacterTable%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
%% Digits \0\1\2\3\4\5\6\7\8\9
diff --git a/Master/texmf-dist/doc/latex/dramatist/schiller.tex b/Master/texmf-dist/doc/latex/dramatist/schiller.tex
index 80c5765506b..5d048fa43ac 100644
--- a/Master/texmf-dist/doc/latex/dramatist/schiller.tex
+++ b/Master/texmf-dist/doc/latex/dramatist/schiller.tex
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% dramatist.dtx
-%% Copyright (C) 2003-2004 Massimiliano Dominici
+%% Copyright (C) 2003-2005 Massimiliano Dominici
%% \CharacterTable%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
%% Digits \0\1\2\3\4\5\6\7\8\9
diff --git a/Master/texmf-dist/doc/latex/egplot/egplot.README b/Master/texmf-dist/doc/latex/egplot/egplot.README
index 4a54c40137b..f2ae89b43d4 100644
--- a/Master/texmf-dist/doc/latex/egplot/egplot.README
+++ b/Master/texmf-dist/doc/latex/egplot/egplot.README
@@ -24,3 +24,7 @@
% v1.00 1998/06/17 First release
% v1.01 1998/06/25 Fixed bug with german option and negative tic mark
% values
+% v1.02 1998/07/08 egplot now supports gnuplot-3.5 and gnuplot-3.6beta
+%
+% automatic filename generation (numbering) for multiple
+% egpfile-environments in one document
diff --git a/Master/texmf-dist/doc/latex/egplot/manual.ps.gz b/Master/texmf-dist/doc/latex/egplot/manual.ps.gz
index 229782b378a..2c80eeef149 100644
--- a/Master/texmf-dist/doc/latex/egplot/manual.ps.gz
+++ b/Master/texmf-dist/doc/latex/egplot/manual.ps.gz
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/filecontents/README b/Master/texmf-dist/doc/latex/filecontents/README
index 01953808af7..7a0aa7970a5 100644
--- a/Master/texmf-dist/doc/latex/filecontents/README
+++ b/Master/texmf-dist/doc/latex/filecontents/README
@@ -1,11 +1,11 @@
- +--------------------------------------------+
- | FILECONTENTS: |
- | |
+ +--------------------------------------------+
+ | FILECONTENTS |
+ | |
| Improved version of LaTeX2e's filecontents |
- | and filecontents* environments |
- | |
- | By Scott Pakin, scott+fc@pakin.org |
- +--------------------------------------------+
+ | and filecontents* environments |
+ | |
+ | By Scott Pakin, scott+fc@pakin.org |
+ +--------------------------------------------+
Description
@@ -35,14 +35,15 @@ information on installing packages.
Copyright and license
---------------------
-Copyright (C) 2004 Scott Pakin, scott+fc@pakin.org
+
+Copyright (C) 2006 Scott Pakin, scott+fc@pakin.org
This package may be distributed and/or modified under the conditions
-of the LaTeX Project Public License, either version 1.2 of this
+of the LaTeX Project Public License, either version 1.3b 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.
+and version 1.3b or later is part of all distributions of LaTeX
+version 2006/01/07 or later.
diff --git a/Master/texmf-dist/doc/latex/filecontents/filecontents.pdf b/Master/texmf-dist/doc/latex/filecontents/filecontents.pdf
index aad4a3d71a6..0249ccf3fbb 100644
--- a/Master/texmf-dist/doc/latex/filecontents/filecontents.pdf
+++ b/Master/texmf-dist/doc/latex/filecontents/filecontents.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/footbib/footbib.dvi b/Master/texmf-dist/doc/latex/footbib/footbib.dvi
deleted file mode 100644
index 967cd634973..00000000000
--- a/Master/texmf-dist/doc/latex/footbib/footbib.dvi
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/footbib/footbib.pdf b/Master/texmf-dist/doc/latex/footbib/footbib.pdf
new file mode 100644
index 00000000000..7edbc299e78
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/footbib/footbib.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jurabib/jbtest.pdf b/Master/texmf-dist/doc/latex/jurabib/jbtest.pdf
new file mode 100644
index 00000000000..ba634f10a86
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/jurabib/jbtest.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/maybemath/README b/Master/texmf-dist/doc/latex/maybemath/README
index cd3cb9857c1..7d3fdf8f3b6 100644
--- a/Master/texmf-dist/doc/latex/maybemath/README
+++ b/Master/texmf-dist/doc/latex/maybemath/README
@@ -1,8 +1,8 @@
maybemath LaTeX style, by Andy Buckley <andy@insectnation.org>
--------------------------------------------------------------
-maybemath provides LaTeX macros for making math bold or italic according to
-context.
+maybemath provides LaTeX macros for making math bold, upright, italic
+or sans-serif according to context.
The \maybebm and \maybeit macros can be used in math expressions to make
the arguments typeset as bold or italic respectively if the surrounding
@@ -17,6 +17,15 @@ of contents usually replicate the title in normal width.
be italicised if the surrounding text is. \maybeitsubscript is provided to
shift subscripts to the left if the expression is italicised.
+\maybesf makes the argument typeset with \mathsf{} if the surrounding text
+context is sans-serif. Note that there is no sans-serif italic math font,
+so this command is not compatible with any italic-forcing commands.
+
+A convenience macro, \maybebmsf is available for handling boldness and
+sans-serif issues at the same time, as these are probably the most frequent
+problematic environments. Other combined handling is possible with nested
+use of the above commands.
+
Thanks to Viet-Trung Luu on comp.text.tex for providing the first steps
to solving this problem.
diff --git a/Master/texmf-dist/doc/latex/metaobj/license.txt b/Master/texmf-dist/doc/latex/metaobj/license.txt
index 4c164b36df7..d79c68c99df 100644
--- a/Master/texmf-dist/doc/latex/metaobj/license.txt
+++ b/Master/texmf-dist/doc/latex/metaobj/license.txt
@@ -6,4 +6,4 @@ It implements many of PSTricks' features.
It is released under the LPPL.
-Denis Roegel, 14 June 2001.
+Denis Roegel, 3 August 2003
diff --git a/Master/texmf-dist/doc/latex/metaplot/README b/Master/texmf-dist/doc/latex/metaplot/README
index bee9ed74584..47158a5d4b1 100644
--- a/Master/texmf-dist/doc/latex/metaplot/README
+++ b/Master/texmf-dist/doc/latex/metaplot/README
@@ -14,8 +14,7 @@ potentially in flux. Bug reports and other suggestions would be
most welcome!
The documentation currently consists of a preprint of a paper on
-MetaPlot, to be given at Practical TeX 2004, provided as
-metaplot_preprint.pdf.
+MetaPlot given at Practical TeX 2004, as metaplot_preprint.pdf.
A set of examples of MetaPlot usage are also given in the /examples
directory; these currently consist of the figures for the afore-
@@ -25,8 +24,8 @@ files needed to produce them.
---------------------------------------------------------------------
Changelog:
-Version 0.9
- Initial CTAN release.
+Version 0.9 Initial CTAN release.
+Version 0.91 Bugfix (bounding box of plots set to 0.0-1.0)
---------------------------------------------------------------------
License information:
@@ -45,7 +44,4 @@ the Gnu Public License (GPL).
Author:
Metaplot is written by Brooks Moses. Bug reports, feature requests,
-and any other suggestions should be directed to bmoses@stanford.edu.
-This address is expected to cease existing in spring of 2004; check
-on CTAN for an updated version of this README file with an updated
-email address after that date.
+and any other suggestions should be directed to metaplot@dpdx.net.
diff --git a/Master/texmf-dist/doc/latex/mwcls/CZYTAJ b/Master/texmf-dist/doc/latex/mwcls/CZYTAJ
index 9464819f011..c51138fa83a 100644
--- a/Master/texmf-dist/doc/latex/mwcls/CZYTAJ
+++ b/Master/texmf-dist/doc/latex/mwcls/CZYTAJ
@@ -3,7 +3,7 @@
Moje Wasne KLaSy dokumentw dla LaTeXa 2e
==========================================
-Copyright 2000-2002 by Marcin Woli\'nski <wolinski@gust.org.pl>
+Copyright 2000-2003 by Marcin Woli\'nski <wolinski@gust.org.pl>
Pliki w tej paczce mog by dystrybuowane i/lub modyfikowane na
diff --git a/Master/texmf-dist/doc/latex/mwcls/README b/Master/texmf-dist/doc/latex/mwcls/README
index 0e7d40b85f4..b27f33b86c1 100644
--- a/Master/texmf-dist/doc/latex/mwcls/README
+++ b/Master/texmf-dist/doc/latex/mwcls/README
@@ -3,7 +3,7 @@
My oWn document CLaSses for LaTeX 2e
====================================
-Copyright 2000-2002 by Marcin Woli\'nski <wolinski@gust.org.pl>
+Copyright 2000-2003 by Marcin Woli\'nski <wolinski@gust.org.pl>
Files in this bundle may be distributed and/or modified under the
diff --git a/Master/texmf-dist/fonts/source/public/dingbat/dingbat.mf b/Master/texmf-dist/fonts/source/public/dingbat/dingbat.mf
index 6d93e280c62..cc4c96c6a01 100644
--- a/Master/texmf-dist/fonts/source/public/dingbat/dingbat.mf
+++ b/Master/texmf-dist/fonts/source/public/dingbat/dingbat.mf
@@ -1,19 +1,19 @@
% Dingbat characters as of 3-3-89 by Doug Henderson
% To be run with plain.bas.
-% Last modified on 3-20-96 by Marcus Ohlhaut (MO)
-
+% Last modified on 3-27-89
+
font_size=10pt#; % make the pxl or pk files be in ...\pixel\pxl1500
-
+
def clear_all =
clearit; clearxy;
enddef;
-
+
%%%
% turn pt,in,cm etc. into pixel values
%%%
-
+
mode_setup;
-
+
%%%
% define your variables here
%%%
@@ -44,25 +44,25 @@ flu_height#:=30pt#;
anchor_height#:=150pt#/anchor_scale;
anchor_width#:=130pt#/anchor_scale;
anchor_depth#:=0pt#;
-
-
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
% Very thin weight stroke for flouron (not advised for < 600dpi)
%thinish#:=.25pt#;
%thinthick#:=.45pt#;
%thickish#:=.75pt#;
-
+
% Normal weight stroke for flouron
thinish#:=.5pt#;
thinthick#:=1pt#;
thickish#:=1.5pt#;
-
+
% Heavy weight stroke for flouron
%thinish#:=1pt#;
%thinthick#:=2pt#;
%thickish#:=2.5pt#;
-
+
% Strokes widths for the flower from 1-12 (= 1 pixel - 4.5pt)
flower_one#:=.25;
flower_two#:=.5;
@@ -80,11 +80,11 @@ hand_scale=6;
hand_width#:=110pt#/hand_scale;
hand_height#:=80pt#/hand_scale;
hand_depth#:=0pt#;
-
+
%%%
% define your pixels here, do this for each variable defined above
%%%
-
+
define_pixels(glyph_width,glyph_height,uniform_square,triangle_size);
define_pixels(check_width,check_height,check_depth,dash,thinish,thickish);
define_pixels(thinthick,flu_width,flu_height,a,b);
@@ -93,11 +93,11 @@ define_pixels(flower_six,flower_seven,flower_eight,flower_nine,flower_ten);
define_pixels(flower_eleven,flower_twelve);
define_pixels(hand_width,hand_height,hand_depth,dash);
define_pixels(anchor_height,anchor_weight,anchor_depth);
-
+
%%%
% define a macro which pauses until the user hits the return key
%%%
-
+
def
whoa= s0:= readstring;
enddef;
@@ -120,11 +120,11 @@ pickup pensquare scaled 1.6pt;
chunkypen:=savepen;
pickup pencircle scaled .35pt;
ringpen:=savepen;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Let the dingbat characters begin
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"Anchor for TUG dingbat contest";
beginchar("O",anchor_width#,anchor_height#,anchor_depth#);
%%%
@@ -138,7 +138,7 @@ beginchar("O",anchor_width#,anchor_height#,anchor_depth#);
x6=x14=x18=x19=90/130w; % x6 x14 x18 x19
x27=x28=x45=54/130w; % x27 x28 x45
x17=x35=x56=66/130w; % x17 x35 x56
-
+
x7=107/130w; % x7
x8=114/130w; % x8
x10=112/130w; % x10
@@ -150,25 +150,25 @@ beginchar("O",anchor_width#,anchor_height#,anchor_depth#);
x21=65/130w; % x21
x23=55/130w; % x23
x24=50/130w; % x24
-
+
x29=53/130w; % x29
x30=48/130w; % x30
x32=21/130w; % x32
x33=26/130w; % x33
-
+
%%%
% y variables
%%%
y1=y10=65/150h; % y1 y10
y2=y8=43/150h; % y2 y8
y3=y7=45/150h; % y3 y7
-
+
y4=y6=25/150h; % y4 y6
y5=13/150h; % y5
y21=y23=130/150h; % y21 y23
y22=136/150h; % y22
y45=y56=20/150h; % y45 y56
-
+
y18=y26=y27=y35=118/150h; % y18 y26 y27 y35
y19=y20=y24=y25=124/150h; % y19 y20 y24 y25
y17=y28=40/150h; % y17 y28
@@ -177,7 +177,7 @@ beginchar("O",anchor_width#,anchor_height#,anchor_depth#);
y14=y31=38/150h; % y14 y31
y13=y32=50/150h; % y13 y32
y12=y33=54/150h; % y12 y33
-
+
%%%
% path assignments
%%%
@@ -186,7 +186,7 @@ beginchar("O",anchor_width#,anchor_height#,anchor_depth#);
z7--z8--z10--z12--z13 & z13..z14..z16..z17 &
z17--z35--z18--z19--cycle;
ring_of_anchor = z20..z22..z24;
-
+
tilted_anchor = the_anchor rotated akilter;
tilted_ring = ring_of_anchor rotated akilter;
%%%
@@ -196,7 +196,7 @@ beginchar("O",anchor_width#,anchor_height#,anchor_depth#);
fill the_anchor;
pickup ringpen;
draw ring_of_anchor;
-
+
%%%
% after clearing previous path (upright anchor) fill the tilted path
%%%
@@ -206,13 +206,13 @@ beginchar("O",anchor_width#,anchor_height#,anchor_depth#);
%showit;
%message"When thru viewing, press Enter to continue";
%whoa;
-
+
labels(range 1 thru 4,45,5,56,range 6 thru 19);
labels(range 20 thru 33,35);
-
+
endchar;
-
-
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
"Hand pointer to the left";
beginchar("N",hand_width#,hand_height#,hand_depth#);
@@ -245,7 +245,7 @@ beginchar("N",hand_width#,hand_height#,hand_depth#);
x26=62.5/110w; % x26
x27=75/110w; % x27
x28=74/110w; % x28
-
+
%%%
% y variables
%%%
@@ -274,21 +274,21 @@ beginchar("N",hand_width#,hand_height#,hand_depth#);
y26=71/80h; % y26
y27=72/80h; % y27
y28=67/80h; % y28
-
+
collar=z1..z2..z3 & z3..z4..z5..z6..z7 & z7..z8..z9 & z9..z10..z1;
thumb=z25..z26..z27..z28..z24;
index_finger=z4..z25..z24..z23..z22..z21..z19..z20;
the_bird=z17--z16..z18..z19;
ring_finger=z14--z13..z15..z16;
pinky_finger=z6..z11..z1112 & z1112..z12..z13;
-
+
pickup razorpen;
-
+
draw collar; draw thumb; draw index_finger;
draw the_bird; draw ring_finger; draw pinky_finger;
labels(range 1 thru 11,1112,range 12 thru 28);
endchar;
-
+
"Flowery flouron";
beginchar("J",flu_width#,flu_height#,0);
% first stroke = x1 thru x8
@@ -326,9 +326,9 @@ beginchar("J",flu_width#,flu_height#,0);
penlabels(range 1 thru 19);
flower_x:=currentpicture;
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"Right flower";
beginchar("K",flu_width#,flu_height#,0);
currentpicture:=currentpicture+flower_x;
@@ -336,24 +336,24 @@ beginchar("K",flu_width#,flu_height#,0);
currentpicture:=currentpicture shifted (w,0);
flower_y:=currentpicture;
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
"Flipped left flower--matches J";
beginchar("L",flu_width#,flu_height#,0);
currentpicture:=currentpicture+flower_y;
currentpicture:=currentpicture reflectedabout((0,.5[0,h]),(1,.5[0,h]));
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"Flipped right flower--matches K";
beginchar("M",flu_width#,flu_height#,0);
currentpicture:=currentpicture+flower_x;
currentpicture:=currentpicture reflectedabout((0,.5[0,h]),(1,.5[0,h]));
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"DLA satelite dish";
beginchar("I",a#,b#,0);
numeric zero; zero=0;
@@ -365,7 +365,7 @@ beginchar("I",a#,b#,0);
x11=1/10(x2-x1); y11=9/10(b); x12=3/10(x2-x1);
y12=.53(b); x13=9/10(x2-x1); y13=5/10(b);
y10=4.5/10(b);
-
+
% draw the bottom platform of the dish
pickup pensquare xscaled .5pt yscaled .5pt
filldraw z1--z2--z3--z4--cycle;
@@ -382,9 +382,9 @@ beginchar("I",a#,b#,0);
% draw z11--z13;
labels(range 1 thru 13);
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"Left flouron";
beginchar("E",flu_width#,flu_height#,0);
pickup pencircle;
@@ -410,9 +410,9 @@ beginchar("E",flu_width#,flu_height#,0);
penlabels(range 1 thru 18);
holdit:=currentpicture;
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"Right flouron";
beginchar("F",flu_width#,flu_height#,0);
currentpicture:=currentpicture+holdit;
@@ -421,25 +421,25 @@ beginchar("F",flu_width#,flu_height#,0);
currentpicture:=currentpicture shifted (w,0);
holdem:=currentpicture;
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"Flipped left flouron--matches F";
beginchar("G",flu_width#,flu_height#,0);
currentpicture:=currentpicture+holdem;
currentpicture:=currentpicture reflectedabout((0,.5[0,h]),(1,.5[0,h]));
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"Flipped right flouron--matches E";
beginchar("H",flu_width#,flu_height#,0);
currentpicture:=currentpicture+holdit;
currentpicture:=currentpicture reflectedabout((0,.5[0,h]),(1,.5[0,h]));
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"Check mark";
beginchar("D",check_width#,check_height#,check_depth#);
pickup pencircle;
@@ -449,9 +449,9 @@ beginchar("D",check_width#,check_height#,check_depth#);
penstroke z1e--z2e--z3e;
penlabels(1,2,3);
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"Square (filled) with dots border design";
beginchar("C",triangle_size#,triangle_size#,0);
x1=x3=good.x(1/2triangle_size);
@@ -461,7 +461,7 @@ x5=x6=good.x(3/10triangle_size);
x7=x8=good.x(7/10triangle_size);
x9=x10=good.x(2/10triangle_size);
x12=x11=good.x(8/10triangle_size);
-
+
y1=good.y(1/10triangle_size);
y9=y12=good.y(2/10triangle_size);
y5=y8=good.y(3/10triangle_size);
@@ -469,18 +469,18 @@ y2=y4=good.y(1/2triangle_size);
y6=y7=good.y(7/10triangle_size);
y10=y11=good.y(8/10triangle_size);
y3=good.y(9/10triangle_size);
-
+
pickup razorpen;
fill z1..z5..z2 & z2..z6..z3 & z3..z7..z4 & z4..z8..z1..cycle;
pickup bigdotpen;
drawdot z9; drawdot z12; drawdot z10; drawdot z11;
-
+
labels(range 1 thru 12);
-
+
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"Square (unfilled) with dots border design";
beginchar("B",triangle_size#,triangle_size#,0);
x1=x3=good.x(1/2triangle_size);
@@ -490,7 +490,7 @@ beginchar("B",triangle_size#,triangle_size#,0);
x7=x8=good.x(7/10triangle_size);
x9=x10=good.x(2/10triangle_size);
x12=x11=good.x(8/10triangle_size);
-
+
y1=good.y(1/10triangle_size);
y9=y12=good.y(2/10triangle_size);
y5=y8=good.y(3/10triangle_size);
@@ -498,24 +498,24 @@ beginchar("B",triangle_size#,triangle_size#,0);
y6=y7=good.y(7/10triangle_size);
y10=y11=good.y(8/10triangle_size);
y3=good.y(9/10triangle_size);
-
+
pickup bigpen;
draw z1..z5..z2;
draw z2..z6..z3;
draw z3..z7..z4;
draw z4..z8..z1;
-
+
pickup bigdotpen;
drawdot z9; drawdot z12; drawdot z10; drawdot z11;
pickup lildotpen;
erase drawdot z9; erase drawdot z12; erase drawdot z10;erase drawdot z11;
-
+
labels(range 1 thru 12);
-
+
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"Z border design";
beginchar("Z",glyph_width#,glyph_height#,0);
pickup bigger;
@@ -529,18 +529,18 @@ y1=y2=0;
y7=y8=1/3good.y(glyph_height);
y3=y4=2/3good.y(glyph_height);
y5=y6=good.y(glyph_height);
-
+
draw z5--z6--z7--z8;
draw z1--z2--z3--z4;
%draw bot z5--z3;
%draw top z1--z7;
-
+
labels(range 1 thru 8);
-
+
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"S border design";
beginchar("S",glyph_width#,glyph_height#,0);
pickup bigger;
@@ -549,158 +549,140 @@ x1=x6=x7=0;
x2=x3=x8=good.x(glyph_width);
x4=good.x(2/8glyph_width);
x5=good.x(6/8glyph_width);
-
+
y1=y2=0;
y5=y6=good.y(1/3glyph_height);
y3=y4=good.y(2/3glyph_height);
y7=y8=good.y(glyph_height);
-
+
draw z1--z2--z3--z4;
draw z5--z6--z7--z8;
%draw top z1--z6;
%draw bot z8--z3;
cullit;
-
+
labels(range 1 thru 8);
-
+
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"Overlapping thick\thin line border design--- character 1 (top-left)";
beginchar("a",uniform_square#,uniform_square#,0);
-
+
x1=x2=good.x(1/10uniform_square);
x3=x4=good.x(4/10uniform_square);
x5=x8=good.x(uniform_square);
x6=x7=good.x(2/10uniform_square);
-
+
y1=y6=good.y(0);
y2=y3=good.y(6/10uniform_square);
y7=y8=good.y(8/10uniform_square);
y4=y5=good.y(9/10uniform_square);
-
+
pickup chunkypen;
draw z1--z2--z3--z4--z5;
pickup bigpen;
draw z6--z7--z8;
p1:=currentpicture;
-
+
labels(range 1 thru 8);
-
+
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"Overlapping thick\thin line border design--- character 2 (top-middle)";
beginchar("b",uniform_square#,uniform_square#,0);
-
+
x1=x3=good.x(0);
x2=x4=good.x(uniform_square);
-
+
y1=y2=good.y(9/10uniform_square);
y3=y4=good.y(8/10uniform_square);
-
+
pickup chunkypen;
draw z1--z2;
pickup bigpen;
draw z3--z4;
p2:=currentpicture;
-
+
labels(1,2,3,4);
-
+
endchar;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"Overlapping thick\thin line border design--- character 3 (top-right)";
beginchar("c",uniform_square#,uniform_square#,0);
-
+
x1=x6=good.x(0);
x2=x3=good.x(6/10uniform_square);
x7=x8=good.x(8/10uniform_square);
x4=x5=good.x(9/10uniform_square);
-
+
y1=y2=good.y(9/10uniform_square);
y6=y7=good.y(8/10uniform_square);
y3=y4=good.y(6/10uniform_square);
y5=y8=good.y(0);
-
+
pickup chunkypen;
draw z1--z2--z3--z4--z5;
pickup bigpen;
draw z6--z7--z8;
p3:=currentpicture;
-
+
labels(range 1 thru 8);
-
+
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"Overlapping thick\thin line border design--- character 4 (middle-left)";
beginchar("d",uniform_square#,uniform_square#,0);
-
+
x1=x2=good.x(1/10uniform_square);
x3=x4=good.x(2/10uniform_square);
y1=y3=good.y(0);
y2=y4=good.y(uniform_square);
-
+
pickup chunkypen;
draw z1--z2;
pickup bigpen;
draw z3--z4;
p4:=currentpicture;
-
+
labels(1,2,3,4);
-
+
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% (MO) The following commented-out lines are Doug's original definitions.
-%
-% "Overlapping thick\thin line border design--- character 5 (middle-right)";
-% beginchar("e",uniform_square#,uniform_square#,0);
-% currentpicture:=currentpicture + p4;
-% currentpicture:=currentpicture reflectedabout((.5[0,0],0),(.5[0,0],1));
-% endchar;
-%
-% They have been replaced by
-
+
"Overlapping thick\thin line border design--- character 5 (middle-right)";
beginchar("e",uniform_square#,uniform_square#,0);
-x1=x2=good.x(9/10uniform_square);
-x3=x4=good.x(8/10uniform_square);
-y1=y3=good.y(0);
-y2=y4=good.y(uniform_square);
-pickup chunkypen;
-draw z1--z2;
-pickup bigpen;
-draw z3--z4;
-p4:=currentpicture;
-labels(1,2,3,4);
+currentpicture:=currentpicture + p4;
+currentpicture:=currentpicture reflectedabout((.5[0,0],0),(.5[0,0],1));
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"Overlapping thick\thin line border design--- character 6 (bottom-left)";
beginchar("f",uniform_square#,uniform_square#,0);
currentpicture:=currentpicture + p1;
currentpicture:=currentpicture
reflectedabout((0,.5[0,uniform_square]),(1,.5[0,uniform_square]));
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"Overlapping thick\thin line border design--- character 7 (bottom-middle)";
beginchar("g",uniform_square#,uniform_square#,0);
currentpicture:=currentpicture + p2;
currentpicture:=currentpicture
reflectedabout((0,.5[0,uniform_square]),(1,.5[0,uniform_square]));
endchar;
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
"Overlapping thick\thin line border design--- character 8 (bottom-right)";
beginchar("h",uniform_square#,uniform_square#,0);
currentpicture:=currentpicture + p3;
diff --git a/Master/texmf-dist/metapost/metaplot/metaplot.mp b/Master/texmf-dist/metapost/metaplot/metaplot.mp
index d26c938d6ce..3bd6219a35a 100644
--- a/Master/texmf-dist/metapost/metaplot/metaplot.mp
+++ b/Master/texmf-dist/metapost/metaplot/metaplot.mp
@@ -1,5 +1,5 @@
% METAPLOT: primary plot routines for the METAPLOT package.
-% Copyright(C) 2004, Brooks Moses
+% Copyright(C) 2004-2005, Brooks Moses
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -12,7 +12,7 @@
%
% This work has the LPPL maintenance status "author-maintained".
%
-% Version 0.9.
+% Version 0.91.
%
% The n < 1.0 release number indicates that this is a beta release;
% the author at present makes no assurances that the command syntax
@@ -20,7 +20,7 @@
% release.
%
% Bug reports, feature requests, and all other suggestions should
-% be directed to Brooks Moses, bmoses@stanford.edu.
+% be directed to Brooks Moses via metaplot@dpdx.net.
% Load MetaPlot axes macros
@@ -63,6 +63,15 @@ def plot_instantiate(suffix inst)(suffix plot_object) =
% Pointer-function to plot_object's plots, scaled and positioned.
vardef inst.plot(suffix name) =
+ begingroup
+ save xleft; save xright; save ybot; save ytop;
+ xleft = min(xpart(llcorner plot_object.name), 0.0);
+ xright = max(xpart(urcorner plot_object.name), 1.0);
+ ybot = min(ypart(llcorner plot_object.name), 0.0);
+ ytop = max(ypart(urcorner plot_object.name), 1.0);
+ setbounds plot_object.name to
+ (xleft,ybot)--(xright,ybot)--(xright,ytop)--(xleft,ytop)--cycle;
+ endgroup;
plot_object.name xscaled inst.pagewidth yscaled inst.pageheight
shifted inst.llft
enddef;
diff --git a/Master/texmf-dist/source/latex/ccaption/ccaption.dtx b/Master/texmf-dist/source/latex/ccaption/ccaption.dtx
index d8d92d7135d..a7ebcb96ed6 100644
--- a/Master/texmf-dist/source/latex/ccaption/ccaption.dtx
+++ b/Master/texmf-dist/source/latex/ccaption/ccaption.dtx
@@ -126,6 +126,7 @@
% \cs{caption} with subfigure option}
% \changes{v3.1c}{2003/11/14}{Made \cs{label} work after \cs{contcaption}}
% \changes{v3.2}{2005/03/21}{Support for bilingual captions in longtable}
+% \changes{v3.2a}{2005/03/29}{Fix bicaption labels}
%
% \def\dtxfile{ccaption.dtx}
% \def\fileversion{v2.6c} \def\filedate{2000/03/15}
@@ -139,6 +140,7 @@
% \def\fileversion{v3.1b} \def\filedate{2002/10/18}
% \def\fileversion{v3.1c} \def\filedate{2003/11/14}
% \def\fileversion{v3.2} \def\filedate{2005/03/21}
+% \def\fileversion{v3.2a} \def\filedate{2005/03/29}
% \newcommand*{\Lpack}[1]{\textsf {#1}} ^^A typeset a package
% \newcommand*{\Lopt}[1]{\textsf {#1}} ^^A typeset an option
% \newcommand*{\file}[1]{\texttt {#1}} ^^A typeset a file
@@ -434,7 +436,7 @@
% \captionstyle{\centerlastline\\}
% \captiontitlefont{\scshape}
% \setlength{\belowcaptionskip}{10pt}
-% \ifx #1\@empty \caption{#2}\else \caption[#1]{#2}}
+% \ifx\@empty#1 \caption{#2}\else \caption[#1]{#2}}
% \end{verbatim}
% \textbf{NOTE:} Any code that involves the |@| sign must be either in
% a package (|.sty|) file or enclosed between a |\makeatletter| \ldots
@@ -1892,7 +1894,7 @@
% \begin{macrocode}
%<*usc>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ccaption}[2005/03/21 v3.2 Extended captioning and new floats]
+\ProvidesPackage{ccaption}[2005/03/29 v3.2a Extended captioning and new floats]
% \end{macrocode}
% In an attempt to avoid name clashes with other packages, all internal
@@ -2428,6 +2430,7 @@
% name in
% language 2, and short and long in language 2. Both texts are put
% into the List of as numbered entries.
+% \changes{v3.2a}{2005/03/29}{Fix empty check in \cs{bitwonumcaption}}
% \begin{macrocode}
\newcommand{\bitwonumcaption}[6][\@empty]{%
\begingroup
@@ -2439,7 +2442,7 @@
% \end{macrocode}
% Do the optional labeling.
% \begin{macrocode}
- \ifx #1\@empty\else
+ \ifx\@empty#1\else
\label{#1}
\fi
% \end{macrocode}
@@ -2471,6 +2474,7 @@
% short and long in language 1, name in
% language 2, and short and long in language 2. Both texts are put
% into the List of, but only the first is numbered.
+% \changes{v3.2a}{2005/03/29}{Fix empty check in \cs{bionenumcaption}}
% \begin{macrocode}
\newcommand{\bionenumcaption}[6][\@empty]{%
\begingroup
@@ -2482,7 +2486,7 @@
% \end{macrocode}
% Do the optional labeling.
% \begin{macrocode}
- \ifx #1\@empty\else
+ \ifx\@empty#1\else
\label{#1}
\fi
% \end{macrocode}
@@ -2514,6 +2518,7 @@
% short and long in language 1, name in
% language 2, and long in language 2.
% Only the first text is put into the List.
+% \changes{v3.2a}{2005/03/29}{Fix empty check in \cs{bicaption}}
% \begin{macrocode}
\newcommand{\bicaption}[5][\@empty]{%
\begingroup
@@ -2525,7 +2530,7 @@
% \end{macrocode}
% Do the optional labeling.
% \begin{macrocode}
- \ifx #1\@empty\else
+ \ifx\@empty#1\else
\label{#1}
\fi
% \end{macrocode}
@@ -3809,6 +3814,18 @@
% The definition of |\@if@contemptyarg| is based on the improved version
% that Donald supplied, only the macro names being changed.
%
+% For checking if an optional argument is present I used code along the
+% lines: \\
+% \verb?\newcommand{\com}[4][\@empty]{...? \\
+% \verb?\ifx \@empty#1\else %argument present? \\
+% Unfortunately I was not consistent, as Benjamin Bayart found\footnote{Email
+% to me on 2005/03/29.} when he used an optional argument that started with
+% a double character, like \verb?\bicaption[ccapt3]{...?, which caused
+% nasty things to happen. In these cases I had coded: \\
+% \verb?\ifx #1\@empty\else %argument present? \\
+% I really should have known better as this results in TRUE with
+% \verb?apt3? being left dangling (and typeset).
+%
% \bibliographystyle{alpha}
%
% \begin{thebibliography}{MCCG95}
diff --git a/Master/texmf-dist/source/latex/cdpbundl/cdpbundl.dtx b/Master/texmf-dist/source/latex/cdpbundl/cdpbundl.dtx
index e74d31c7c6d..01d80c3291d 100644
--- a/Master/texmf-dist/source/latex/cdpbundl/cdpbundl.dtx
+++ b/Master/texmf-dist/source/latex/cdpbundl/cdpbundl.dtx
@@ -5,7 +5,7 @@
%
% This file is part of a work named "C.D.P. Bundle".
%
-% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
+% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
%
% The C.D.P. Bundle may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -31,10 +31,12 @@
% \fi
%
% \def\filename{cdpbundl.dtx}
-% \def\fileversion{0.33}
-% \def\filedate{2005/01/01}
-% \def\docdate {2005/01/01}
-% \def\doclongdate{January~1, 2005}
+% \def\fileversion{0.34}
+% \def\filedate{2006/01/01}
+% \def\docdate {2006/01/01}
+% \def\doclongdate{January~1, 2006}
+%
+% \CheckSum{4829}
%
% \changes{0.30}{2001 Jul 01}{First release of the C.D.P. Bundle}
% \changes{0.31}{2001 Dec 01}{Added support for the \protect\opz{usePS}
@@ -45,8 +47,13 @@
% \protect\packlass{\protect\articoletteracdp} class and of the
% \protect\packlass{\protect\cdpaddon} package to make it compatible
% with the \protect\packlass{\protect\hyperref} package}
+% \changes{0.34}{2006 Jan 01}{Improved interaction with the
+% \protect\packlass{\protect\hyperref} package}
+% \changes{0.34}{2006 Jan 01}{Corrected positioning of floats
+% in float pages}
+% \changes{0.34}{2006 Jan 01}{Added \protect\texttt{\protect\bslash place}
+% command}
%
-% \CheckSum{4756}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -73,7 +80,7 @@
% \DoNotIndex{\setlength,\setcounter,\addtolength}
% \DoNotIndex{\expandafter,\do,\relax,\advance,\multiply,\divide}
% \DoNotIndex{\DeclareOption,\ExecuteOptions,\ProcessOptions}
-% \DoNotIndex{\",\.\@}
+% \DoNotIndex{\",\.,\@}
%
% \IndexPrologue{
% \section{\indexname}
@@ -81,6 +88,7 @@
% is described, the ones underlined to the code line of the
% definition, the rest to the code lines where the entry is used.
% }
+% \setcounter{IndexColumns}{2}
%
% \GlossaryPrologue{\section{Change History}}
%
@@ -117,6 +125,9 @@
% \newcommand*{\fopz}{$}
% \newcommand*{\packlass}[1]{{\normalfont\ttfamily #1}}
% \newcommand*{\filedir}[1]{{\normalfont\ttfamily #1}}
+% \newcommand*{\env}[1]{{\normalfont\ttfamily #1}}
+% \newcommand*{\cnt}[1]{{\normalfont\ttfamily #1}}
+% \newcommand*{\sty}[1]{{\normalfont\ttfamily #1}}
% \newcommand*{\eqref}[1]{(\ref{#1})}
%
% \DeclareFixedFont{\lhnss}{OT1}{cmss}{m}{n} {12}
@@ -131,7 +142,7 @@
% The C.D.P.~Bundle\thanks{This file has version
% \fileversion, release date \filedate;
% last documentation update: \docdate.
-% Copyright \copyright~1999--2005 by G.~Mezzetti
+% Copyright \copyright~1999--2006 by G.~Mezzetti
% (see page~\pageref{S:Copy}).}
% }
% \author{G. Mezzetti}
@@ -164,7 +175,7 @@
% \label{S:Copy}
% \vspace{-\parskip}
%
-% Copyright \copyright~1999--2005 by Gustavo \textsc{Mezzetti}. All
+% Copyright \copyright~1999--2006 by Gustavo \textsc{Mezzetti}. All
% rights are reserved, except as noted below.
%
% This document has been produced by feeding to a \LaTeX\ typesetting
@@ -255,13 +266,13 @@
% on the top of their first page. These classes and packages serve to
% prepare this kind of letters: they can print the letterhead, both in
% black-and-white and in color, depending on what the user requires,
-% but they can do many, many other things too.
+% but they can do many other things too.
%
% \subsection{Credits and disclaimer}
%
% The \packlass{\letteracdp} document class was originally based on
% the \packlass{letter} standard \LaTeX\ class. During the time, it
-% went through so many deep revisions, that by now it bears
+% went through so many deep revisions, that by now it retains
% practically no relation with the original \packlass{letter} class;
% but we want to acknowledge the ``historical'' source anyway. The
% \packlass{\articoletteracdp} document class uses some ideas borrowed
@@ -294,7 +305,7 @@
% available through the world-wide web). The only pieces of
% information you will find in this part are how to install those
% classes and packages and how to generate this documentation. This
-% part, however, specifies to what extent, and under which conditions,
+% part, however, specifies to what extent, and under what conditions,
% you are allowed to use and distribute the classes and packages
% presented in this document.
%
@@ -389,7 +400,7 @@
% black-and-white if you don't load this package. Experience by trial
% and error has shown that some configuration work may be necessary in
% order to obtain (more or less) correctly-\null looking colors in the
-% seal. This happens because different printers can render color hues
+% seal. This happens because different printers may render color hues
% in different ways, sometimes producing surprising results.
%
% The configuration mechanism works as follows. For each printer
@@ -407,12 +418,12 @@
%
% The task of a color definition file is simply to define two colors
% called "slight@col" and "strong@col" (when the definition file is
-% read, the "@"~characters are treated as ordinary letters).
+% read, the "@"~characters are treated as ordinary letters):
% "slight@col" is the color used to paint the inner of the D and of
% the P in the seal, "strong@col" is the color used to draw the lines.
% You define these colors by means of the "\definecolor" command: see
-% \textsl{\LaTeX book} \cite[Section~7.3 and
-% Subsection~C.14.3]{LaTeXbook} for information about colors and the
+% the \textsl{\LaTeX book} \cite[Section~7.3 and
+% Subsection~C.14.3]{LaTeXbook} for information on colors and the
% "\definecolor" command.
%
% The file \filedir{\example}, too, contains comments which explain
@@ -481,7 +492,7 @@
%
% The \filedir{\cdpshues} file should contain only zero or one (but
% preferably one!) "\DeclareCDPSealHuesDefault" command. This command
-% can be used only here, and only once, since it deactivates itself
+% may be used only here, and only once, since it deactivates itself
% when executed, and also stops \LaTeX\ from reading any further in
% the configuration file. In its unique (mandatory) argument, one
% puts the name, \emph{without} the extension \filedir{.def}, of the
@@ -489,10 +500,10 @@
% your configuration file, because the effect of any other command is
% undefined.
%
-% The \filedir{\cdpshues} file included in the C.D.P. Bundle contains
-% comments that help you to modify it in order to declare your new
-% default color definition file(s). The recommended way of doing this
-% is:
+% The \filedir{\cdpshues} file included in the C.D.P. Bundle contains
+% comments that help you to modify it in order to declare your
+% personal default color definition file. The recommended way of
+% doing this is:
% \begin{enumerate}
% ^^A ( paren match
% \renewcommand*{\labelenumi}{\theenumi)}
@@ -546,15 +557,18 @@
% gracefully even if the file is absent.
%
% The \packlass{\adiseal} package expects to find the image of the ADI
-% seal in a file in Encapsulated PostScript format called
-% \filedir{\adiseal.eps}. The image should be exactly \( 60\,\mbox{bp}
-% \) wide and \( 42\,\mbox{bp} \) tall; larger images will be clipped,
-% smaller images will not be well aligned. The resolution is not
-% fixed by the \packlass{\adiseal} package, but of course the best
-% results are obtained when it matches the target printer resolution.
-% I don't think that with this information you will be able to
-% manifacture the correct image by yourself, but at least you can
-% check if a file that you have does (not) fit!
+% seal in a file in Encapsulated PostScript (EPS) format called
+% \filedir{\adiseal.eps}, unless PDF output is being generated, in
+% which case a file in Portable Document Format (PDF) named
+% \filedir{adiseal.pdf} is searched for instead. The image should be
+% exactly \( 60\,\mbox{bp} \) wide and \( 42\,\mbox{bp} \) tall;
+% larger images will be clipped, smaller images will not be well
+% aligned. The resolution is not fixed by the \packlass{\adiseal}
+% package, but of course the best results are obtained when it matches
+% the target printer resolution. I don't think that with this
+% information you will be able to manifacture the correct image by
+% yourself, but at least you can check whether a file you have got does
+% (not) fit!
%
% Of course, even if I cannot distribute it under the \LaTeX\
% Project Public License, still I have prepared and made available on
@@ -636,11 +650,13 @@
%\address{
% Revinu~J. \textsc{Drofnats}\\
% Department of Farm Ecology\\
-% University of St.\thinspace Anford\\
+% University of St.\,Anford\\
% Haga Alto, CA~94321 (U.S.A.)
%}
-%\signature{R.~J.~Drofnats\\Professor}
-%\date{January~1, 2005} % as usual, date is optional, default is \today
+%\signature{R.~J. Drofnats\\Professor}
+%\date{January~1, 2006} % as usual, date is optional, default is \today
+%% Place where the letter is written (optional):
+%\place{St.\,Anford}
%
%% Since we are writing in English, we redefine a couple of words:
%\renewcommand*{\subjectname}{Subject:}
@@ -661,9 +677,7 @@
% This is the optional subject of the letter.
%]
%
-%% A string to be prepended to the date can be specified in an optional
-%% argument to the \opening command:
-%\opening[St.\thinspace Anford,]{Dear Prof.~Reid,}
+%\opening{Dear Prof.~Reid,}
%
%this letter is typeset using a \texttt{letterhead} environment, so it
%will be printed with the letterhead of the \emph{Coordinamento} above
@@ -831,10 +845,10 @@
%
% \item[\iopz{noPS}\eopz{usePS}\fopz]
% The \opz{noPS} option requests that the CDP seal be typest using
-% only the standard \LaTeX\ fonts, so that the output be printable on
+% only the standard \LaTeX\ fonts, so that the output is printable on
% any kind of printer, even without a PostScript interpreter. On the
% other hand, the \opz{usePS} option requests that it be printed using
-% PostScript commands: this enhances its graphical quality, but
+% PostScript commands: this improves its graphical quality, but
% printing the seal will require a PostScript interpreter. The
% default is \opz{noPS}. \emph{Warning:} If you use this option with
% the \packlass{\cdpaddon} package, parts of the seal will be
@@ -972,11 +986,6 @@
\EnableCrossrefs
\CodelineIndex
% \end{macrocode}
-% A two-column index is better than a three-column one, because we
-% have some rather long entries.
-% \begin{macrocode}
-\setcounter{IndexColumns}{2}
-% \end{macrocode}
% If you don't want to include the second part of this document,
% \emph{Implementation}, uncomment the line containing the command
% "\OnlyDescription".
@@ -986,8 +995,8 @@
% Finally, setting "\hfuzz" and "\vfuzz" to 0~points is only one
% of the many neurotic symptoms of the author!
% \begin{macrocode}
-\hfuzz=0pt
-\vfuzz=0pt
+\hfuzz = 0pt
+\vfuzz = 0pt
% \end{macrocode}
% Now input this same file, using \DS\ conventions.
% \begin{macrocode}
@@ -1040,12 +1049,12 @@
% will eventually be removed, I hope!
% \begin{macrocode}
\ProvidesClass{letteracdp}
- [2005/01/01 v0.33 (**incomplete**)]
+ [2006/01/01 v0.34 (**incomplete**)]
% \end{macrocode}
% Print a copyright message on the terminal, just below the name
% of the class.
% \begin{macrocode}
-\typeout{Copyright (C) 1999-2005 by Gustavo MEZZETTI,
+\typeout{Copyright (C) 1999-2006 by Gustavo MEZZETTI,
all rights reserved.}
% \end{macrocode}
%
@@ -1063,9 +1072,9 @@
% \subsection{Initial code}
%
% \begin{macro}{\Coordinamento}
-% Define the following macros near the beginning of the code, so
-% it will be easy to change them. The first is the full name of
-% the \emph{Coordinamento}:
+% Define the following macros near the beginning of the code, so it
+% will be easy to change them. The first one is the full name of the
+% \emph{Coordinamento}:
% \begin{macrocode}
\newcommand*\Coordinamento{%
Coordinamento dei Dottorandi e dei Dottori di Ricerca
@@ -1074,7 +1083,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\CoordinamentoWWW}
-% The second is its web address:
+% The second one is its web address:
% \begin{macrocode}
\newcommand*\CoordinamentoWWW{%
http://www.dei.unipd.it/\string~assdott/%
@@ -1191,7 +1200,7 @@
% \counterindex{emptyaddrlabels}
% The following five counters are used in connection with the
% address labels optionally printed at the end of a compiled file.
-% The \texttt{emptyaddrlabels} counter holds the number of labels to
+% The \cnt{emptyaddrlabels} counter holds the number of labels to
% leave blank when starting to print (the first sheet of) the address
% labels; this is useful if some labels on the same sheet have already
% been peeled off.
@@ -1200,37 +1209,37 @@
% \end{macrocode}
% \counterindex{addrlabelrows}
% A single sheet of address labels contains many labels. For example,
-% in the well-known (in the U.S.) Avery 5352 format each sheet contains
-% ten labels, organized in two columns and five rows. Other formats
-% contain different number of rows and columns of labels. To cope with
-% all these different formats, the number of rows and columns of labels
-% is kept in two counters: \texttt{addrlabelrows} holds the number of
-% rows
+% in the well-known (in the U.S.) Avery 5352 format each sheet
+% contains ten labels, organized in two columns and five rows. Other
+% formats contain different number of rows and columns of labels. To
+% cope with all these different formats, the number of rows and
+% columns of labels is kept in two counters: \cnt{addrlabelrows} holds
+% the number of rows
% \begin{macrocode}
\newcounter{addrlabelrows}
% \end{macrocode}
% \counterindex{addrlabelcolumns}
-% and \texttt{addrlabelcolumns} holds the number of columns.
+% and \cnt{addrlabelcolumns} holds the number of columns.
% \begin{macrocode}
\newcounter{addrlabelcolumns}
% \end{macrocode}
% \counterindex{label}
-% The \texttt{addrlabelrows} and \texttt{addrlabelcolumns} counters
-% are usually set once for all by the code provided in a suitable
+% The \cnt{addrlabelrows} and \cnt{addrlabelcolumns} counters are
+% usually set once for all by the code provided in a suitable
% "\DeclareOption" declaration, as the result of the user's request of
% one of the options devoted to specifying the address label format
-% (\opz{105x37labels}, etc.). In some exceptional circumstances,
-% they can also be reset by the user, but even in this case, once set
-% they are not changed any more. They are therefore not real
-% ``counters'', but rather (style) parameters. The following two
-% counters, instead, are ``real'', \emph{running} counters: they hold a
-% running index which identifies the current label. The \texttt{label}
-% counter holds the index of a label inside a given letter
+% (\opz{105x37labels}, etc.). In some exceptional circumstances, they
+% can also be reset by the user, but even in this case, once set they
+% are not changed any more. They are therefore not real ``counters'',
+% but rather (style) parameters. The following two counters, instead,
+% are ``real'', \emph{running} counters: they hold a running index
+% which identifies the current label. The \cnt{label} counter holds
+% the index of a label inside a given letter
% \begin{macrocode}
\newcounter{label}[letter]
% \end{macrocode}
% \counterindex{totallabel}
-% while the \texttt{totallabel} counter holds the global index of a
+% while the \cnt{totallabel} counter holds the global index of a
% label, that is, the index of the label in the whole document.
% \begin{macrocode}
\newcounter{totallabel}
@@ -1351,24 +1360,24 @@
% precaution is taken. This can be useful if one wants to alter the
% default behavior, \emph{e.g.}, to have letters that are two-folded
% rather then three-folded, or to allow folded letters also when using
-% a paper format, like A5, that normally does not allow it. Useful,
+% a paper format, like A5, that normally does not allow them. Useful,
% sure, but it rises a problem: the algorithm that decides where to
-% split the text between the part that must go above the folding
-% and the part that must go below it requires that the value of
+% split the text between the part that must go above the folding and
+% the part that must go below it requires that the value of
% "\foldedheight" lie within a certain range. Obviously we cannot ask
-% the user to know what range is acceptable, so we adopt the
-% following solution: we define an ``internal backup'' of
-% "\foldedheight", called "\@folding@ht" for historical reasons;
-% then, the user is asked to call the macro "\checkfoldedheight"
-% (see below) whenever (s)he changes the value of "\foldedheight";
-% this macro check the new value and, if it is OK, copies it in the
-% internal dimension "\@folding@ht" (actually, after some scaling
-% conversions), otherwise it sets an internal flag which disables
-% folded letters and issues a warning. A slight variant of
-% "\checkfoldedheight", which differs only in the warning
-% produced, is called automatically at the "\begin{document}", so
-% the user is \emph{not} required to call "\checkfoldedheight" if
-% the changes to "\foldedheight" are made in the preamble.
+% the user to know what range is acceptable, so we adopt the following
+% solution: we define an ``internal backup'' of "\foldedheight",
+% called "\@folding@ht" for historical reasons; then, the user is
+% asked to call the macro "\checkfoldedheight" (see below) whenever
+% (s)he changes the value of "\foldedheight"; this macro checks the
+% new value and, if it is OK, copies it in the internal dimension
+% "\@folding@ht" (actually, after some scaling conversions), otherwise
+% it sets an internal flag which disables folded letters and issues a
+% warning. A slight variant of "\checkfoldedheight", which differs
+% only in the warning produced, is called automatically at the
+% "\begin{document}", so the user is \emph{not} required to call
+% "\checkfoldedheight" if the changes to "\foldedheight" are made in
+% the preamble.
% \begin{macrocode}
\@newrigidlength\@folding@ht
% \end{macrocode}
@@ -1684,6 +1693,15 @@
\do\@signature@style
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\@place}
+% The place where the letter is written: starting from version~0.34,
+% this macro is used as the default value for the optional argument of
+% "\@makeopening", "\makedate", etc. It is logically and functionally
+% analogous to "\@date".
+% \begin{macrocode}
+\do\@place
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\@begin@letter@hook}
% This hook is executed when a letter starts, at the very end of the
% process of setting up the ``letter-making'' environment, just
@@ -1711,7 +1729,7 @@
% \end{macrocode}
% \end{macro}
%
-% The following macros are defined only inside a \texttt{subject}
+% The following macros are defined only inside a \env{subject}
% environment. We want that they cause an error if used outside of that
% environment, but we also want to be sure that their names are not
% already defined. We achieve this by calling "\@ifdefinable", and
@@ -1750,9 +1768,8 @@
% changed from the default when a ``presentation'' is entered.
% We'll discuss all this later on.
% \begin{macro}{\@b@frompenalty}
-% This is the penalty inserted at the beginning of a
-% \texttt{sender} environment---the environment used to typeset the
-% sender address.
+% This is the penalty inserted at the beginning of a \env{sender}
+% environment---the environment used to typeset the sender address.
% \begin{macrocode}
\do\@b@frompenalty
% \end{macrocode}
@@ -1765,7 +1782,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@e@frompenalty}
-% This is the penalty inserted at the end of a \texttt{sender}
+% This is the penalty inserted at the end of a \env{sender}
% environment.
% \begin{macrocode}
\do\@e@frompenalty
@@ -1773,7 +1790,7 @@
% \end{macro}
% \begin{macro}{\@b@topenalty}
% This is the penalty inserted at the beginning of an
-% \texttt{addressee} environment---the environment used to typeset the
+% \env{addressee} environment---the environment used to typeset the
% addressee address.
% \begin{macrocode}
\do\@b@topenalty
@@ -1787,21 +1804,21 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@e@topenalty}
-% This is the penalty inserted at the end of an \texttt{addressee}
+% This is the penalty inserted at the end of an \env{addressee}
% environment.
% \begin{macrocode}
\do\@e@topenalty
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@b@subjpenalty}
-% This is the penalty inserted at the beginning of a \texttt{subject}
+% This is the penalty inserted at the beginning of a \env{subject}
% environment---the environment used to typeset the subject.
% \begin{macrocode}
\do\@b@subjpenalty
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@e@subjpenalty}
-% This is the penalty inserted at the end of a \texttt{subject}
+% This is the penalty inserted at the end of a \env{subject}
% environment.
% \begin{macrocode}
\do\@e@subjpenalty
@@ -1871,24 +1888,24 @@
% the letterhead and of the footer.
% \begin{macro}{\@logo@box@base}
% This holds the main part of the CDP seal; more precisely, that
-% part that appears both in the \ldots\texttt{letterhead}\ldots\ and in
-% the \texttt{logo}\ldots\ page styles.
+% part that appears both in the \ldots\sty{letterhead} and in the
+% \sty{logo}\ldots page styles.
% \begin{macrocode}
\newsavebox\@logo@box@base
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@logo@box@addS}
% This holds the part of the CDP seal that should be added to the
-% part contained in "\@logo@box@base" in order to obtain the seal as
-% it appears in the \texttt{logo}\ldots\ page styles.
+% part contained in "\@logo@box@base" to obtain the seal as it appears
+% in the \sty{logo}\ldots page styles.
% \begin{macrocode}
\newsavebox\@logo@box@addS
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@logo@box@addL}
% This holds the part of the CDP seal that should be added to the
-% part contained in "\@logo@box@base" in order to obtain the seal as
-% it appears in the \ldots\texttt{letterhead}\ldots\ page styles.
+% part contained in "\@logo@box@base" to obtain the seal embedded
+% in the \ldots\sty{letterhead} page styles.
% \begin{macrocode}
\newsavebox\@logo@box@addL
% \end{macrocode}
@@ -1902,10 +1919,10 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@name@and@WWW@box}
-% This holds the footer used in the \texttt{firstletterhead} and
-% \texttt{foldedletterhead} page styles, which contains the full name
-% of the \emph{Coordinamento} and its web address. This ends the
-% block of box registers, too.
+% This holds the footer used in the \sty{firstletterhead} and
+% \sty{foldedletterhead} page styles, which contains the full name of
+% the \emph{Coordinamento} and its web address. This ends the block
+% of box registers, too.
% \begin{macrocode}
\newsavebox\@name@and@WWW@box
% \end{macrocode}
@@ -1915,14 +1932,14 @@
% It is possible to specify several addresses (both for the sender
% and the addressee) as well as several signatures; the various parts
% are separated by "\and" commands. Strictly speaking, it is an error
-% to expand the token "\and" anywhere but inside the \texttt{sender},
-% \texttt{addressee}, and \texttt{signatureenv} environments (the
+% to expand the token "\and" anywhere but inside the \env{sender},
+% \env{addressee}, and \env{signatureenv} environments (the
% environments used to produce the sender address, the addressee
% address, and the signature, repectively); hence, the correct thing
% to do here would be to initialize "\and" to produce an error
% message, and then redefine it in the various environments, as
-% required in each case. But alas, the code for \packlass{\letteracdp} is
-% still incomplete, and this is one of the things I still have to
+% required in each case. But alas, the code for \packlass{\letteracdp}
+% is still incomplete, and this is one of the things I still have to
% finish: I don't know exactly how to handle a misplaced "\and", so,
% for now, I simply decide to ignore it.
% \begin{macrocode}
@@ -1933,9 +1950,9 @@
% meaning.
% \end{macro}
% \begin{macro}{\andcc}
-% Only inside an \texttt{addressee} environment, the token "\andcc"
-% can be used in place of "\and" to separate addresses of persons to
-% which the letter is sent as a carbon copy. Its default definition,
+% Only inside an \env{addressee} environment, the token "\andcc" may
+% be used in place of "\and" to separate addresses of persons to which
+% the letter is sent as a carbon copy. Its default definition,
% however, is to act as "\and".
% \begin{macrocode}
\@ifdefinable\andcc{\def\andcc{\and}}
@@ -1971,7 +1988,7 @@
% Set "\parindent" to 0~points.
% \item[L (for ``leave indent'').]
% The value of "\parindent" that was in effect outside of the
-% current \ldots\texttt{letter}\ldots\ environment is retained.
+% current \ldots\env{letter}\ldots\ environment is retained.
% \item[O (sorry, I don't remember for what).]
% Set "\parindent" to the width of the last line of the salutation
% (\emph{i.e.}, the argument of "\opening" or "\makeopening"); if the
@@ -1996,8 +2013,8 @@
%\end{verbatim}
% when you want to declare that the address has intentionally be
% left void; when the address is actually typeset (and this happens
-% inside an \texttt{addressee} environment), the command "\voidisOK"
-% will be expanded, causing the warning to be suppressed. As for the
+% inside an \env{addressee} environment), the command "\voidisOK" will
+% be expanded, causing the warning to be suppressed. As for the
% command "\and", the right thing to do would be to define this
% command only inside the environments in which it can be used; but
% there are complications arising from the fact that the text
@@ -2007,9 +2024,9 @@
% to "\@empty", so that it will be ignored when it occurs out of place.
% (We do not "\let" it equal to "\relax" because the latter could
% confuse an "\ignorespaces"; on the contrary, "\@empty" disappears
-% upon "\write" and "\mark" operations, and this is quite OK.)
-% Where appropriate, "\voidisOK" will be redefined to achieve the
-% desired effect.
+% upon "\write" and "\mark" operations, and this is quite OK\@.) Where
+% appropriate, "\voidisOK" will be redefined to achieve the desired
+% effect.
% \begin{macrocode}
\@ifdefinable\voidisOK{\let\voidisOK\@empty}
% \end{macrocode}
@@ -2025,9 +2042,7 @@
% terms of the font-dependent units like ``em''. Of course, the
% hanging indentation includes this horizontal space; note,
% however, that if "\subjectname" is empty than the
-% "\subjectnamegap" space is not taken into account (older versions
-% of the class left this space even when "\subjectname" was empty,
-% but this bug has now been corrected).
+% "\subjectnamegap" space is not taken into account.
% \begin{macrocode}
\newcommand*\subjectnamegap{.5em}
% \end{macrocode}
@@ -2059,12 +2074,12 @@
% contains more than one line, the lines are aligned at their
% midpoint. In order to accomodate the various conventions, the token
% "\signaturealignment" is inserted at the beginning of the
-% \texttt{signatureenv} environment (the environment one uses to
-% typeset the signature); it is the responsability of the surrounding
-% \ldots\texttt{letter}\ldots\ environment to "\let" this token equal
-% to "\raggedright", "\centering", etc., as required by the particular
+% \env{signatureenv} environment (the environment one uses to typeset
+% the signature); it is the responsability of the surrounding
+% \ldots\env{letter}\ldots\ environment to "\let" this token equal to
+% "\raggedright", "\centering", etc., as required by the particular
% letter being produced. This makes it easy, for instance, to define
-% an \texttt{asletter} (anglo-saxon letter) environment that prints
+% an \env{asletter} (anglo-saxon letter) environment that prints
% letters that obey the U.S. conventions. The default setting given
% here has no special meaning: it just sets the signature ragged
% right.
@@ -2322,6 +2337,11 @@
% \subsection{Option processing}
%
% Nothing special to note here.
+%
+% \emph{Begin to think (v.~0.34):} should I change the defaults as
+% follows: \opz{boldsubject} in place of \opz{mediumsubject},
+% \opz{italicsignature} in place of \opz{uprightsignature},
+% \opz{shortindent} in place of \opz{indent}?
% \begin{macrocode}
\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,%
mediumsubject,uprightsignature,noPS,indent,105x37labels}
@@ -2343,9 +2363,8 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% \begin{macrocode}
\if@use@eepic@
% \end{macrocode}
-% We check whether the \packlass{eepic} package exists on the
-% system: if it does, we load it, otherwise we force the
-% "\if@use@eepic@" flag to false and issue a warning.
+% If the \packlass{eepic} package is not available, force the switch
+% to false and warn the user.
% \begin{macrocode}
\IfFileExists{eepic.sty}{%
\RequirePackage{eepic}%
@@ -2369,27 +2388,40 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
%
% \subsubsection{More initializations}
%
-% The following initializations have not been put in the
-% \emph{Initial code} section because it is traditional to put
-% them here; moreover, some of them actually require that the code
-% for the options has already been executed, so they must be put
-% here!
+% Some of the following initializations could have been put in the
+% \emph{Initial code} section, but some others require that the code
+% for the options have already been executed.
%
% \begin{macro}{\date}
-% I was ready to swear that I had copied the following
-% redefinition of the "\date" command from the standard
-% \packlass{letter} class\ldots{} Anyway, we redefine "\date" in
-% order to make the changes to the date local instead of global:
-% this is useful if one of the letters has a date which is
-% different from the others. An explicative comments is left in
-% the code too (because "\date" is a command defined in the
-% \LaTeX\ kernel).
+% We redefine "\date" in order to make the changes to the date local
+% instead of global: this is useful if one of the letters has a date
+% which is different from the other ones. Since "\date" is a kernel
+% command, an explicative comment is left in % the code too.
% \begin{macrocode}
%% Command \date redefined to make changes to date local.
\def\date#1{\def\@date{#1}}
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\place}
+% This command records the place where the letter is written (added
+% in version~0.34): it is analogous to "\date". Starting from
+% version~0.34, this should be used instead of the optional argument
+% of "\opening", "\makedate", etc.\ (however, the optional argument of
+% those commands may still be used, for compatibility). Note that the
+% comma is added automatically, but only if the argument of "\place"
+% is nonempty.
+% \begin{macrocode}
+\newcommand*\place[1]{%
+ \ifx \@empty #1\@empty % if #1 is empty
+ \let\@place\@empty
+ \else
+ \def\@place{#1,}%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+%
% Usual loading of the suitable \filedir{.clo} file; see the
% documentation of, \emph{e.g.}, the standard \packlass{letter}
% class for explanations about the following three lines of code.
@@ -2407,7 +2439,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\thelabel}
-% The printed form of the \texttt{label} counter is changed to include
+% The printed form of the \cnt{label} counter is changed to include
% also the number of the letter it refers to. Note that we do not
% change "\p@label" (the prefix used only when printing
% \emph{references} to the counter), but actually the command used to
@@ -2439,15 +2471,15 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% We now initialize the style parameters that contain the penalties
% inserted around the address blocks and the subject. This values
% will never be used in practice, because usually the address blocks
-% and the subject are wrapped up in a \ldots\texttt{presentation}
+% and the subject are wrapped up in a \ldots\env{presentation}
% environment, and these environments completely redefine the values
% of these style parameters. The values given here will be used only
-% when a \texttt{sender}, \texttt{addressee}, or \texttt{subject}
-% environment is used without being wrapped in a presentation. These
-% values allow a page break without penalty before each of the blocks
-% and at the end of the subject, mildly discourage a break after the
-% address blocks, and discourage rather strongly a break at an "\and"
-% or "\andcc" token.
+% when a \env{sender}, \env{addressee}, or \env{subject} environment
+% is used without being wrapped in a presentation. These values allow
+% a page break without penalty before each of the blocks and at the
+% end of the subject, mildly discourage a break after the address
+% blocks, and discourage rather strongly a break at an "\and" or
+% "\andcc" token.
% \begin{macrocode}
\@b@frompenalty\z@
\@i@frompenalty\@highpenalty
@@ -2654,8 +2686,8 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% just what the class does, and the final visual effect is, let
% me say, pretty good indeed\ldots
%
-% To sum up, the strategy for setting the page layout parameters
-% should be as follows:
+% To sum up, the strategy for setting the page layout parameters is
+% the following:
%
% \begin{enumerate}
%
@@ -3042,8 +3074,8 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% issue a warning and set the "\if@do@fold@" switch to false: the
% following two macros, which are used below, take care of this,
% providing two different types of warning. They take two arguments,
-% used to modify the warning printed to the user: argument \#1 will be
-% either the word ``short'' or the word ``tall'', and argument \#2
+% used to modify the warning printed to the user: argument "#1" will be
+% either the word ``short'' or the word ``tall'', and argument "#2"
% will contain text giving further help.
%
% \begin{macro}{\@folding@ht@warn}
@@ -3425,8 +3457,9 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% called directly by the user). The code passed in~"#1" is executed
% before the core initializations provided by "baseletter", but inside
% the group implied by this environment; the code passed in~"#2" is
-% executed as the last thing. Other arguments will be picked up by the
-% "\x@baseletter" or "\y@baseletter" macro.
+% executed as the last thing (just before "\@begin@letter@hook"). Other
+% arguments will be picked up by the "\x@baseletter" or
+% "\y@baseletter" macro.
% \begin{macrocode}
\newenvironment{baseletter}[2]{%
#1%
@@ -3441,7 +3474,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\cleardoubleemptypage
\c@page\@ne
\refstepcounter{letter}%
- \typeout{Letter \number\c@letter}%
+ \typeout{\lettername \space \number\c@letter}%
\interlinepenalty 200 % smaller than the TeXbook value
\parskip\medskipamount
% \end{macrocode}
@@ -3543,7 +3576,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\@baseletter
}}
\@ifdefinable\y@baseletter{\long\def\y@baseletter#1{%
- \@cut@andcc #1\andcc @@@%
+ \@cut@andcc #1\andcc\@@@
\def\theaddresseeaddress{#1}%
\@baseletter
}}
@@ -3567,16 +3600,16 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\the\@lett@decl
\@begin@letter@hook
}
-\@ifdefinable\@cut@andcc{\long\def\@cut@andcc#1\andcc#2@@@{%
- \@cut@and #1\and @@@%
+\@ifdefinable\@cut@andcc{\long\def\@cut@andcc#1\andcc#2\@@@{%
+ \@cut@and #1\and\@@@%
}}
-\@ifdefinable\@cut@and{\long\def\@cut@and#1\and#2@@@{%
- \@cut@nl #1\\@@@%
+\@ifdefinable\@cut@and{\long\def\@cut@and#1\and#2\@@@{%
+ \@cut@nl #1\\\@@@%
}}
-\@ifdefinable\@cut@nl{\long\def\@cut@nl#1\\#2@@@{%
- \@cut@par #1\par @@@%
+\@ifdefinable\@cut@nl{\long\def\@cut@nl#1\\#2\@@@{%
+ \@cut@par #1\par\@@@%
}}
-\@ifdefinable\@cut@par{\long\def\@cut@par#1\par#2@@@{%
+\@ifdefinable\@cut@par{\long\def\@cut@par#1\par#2\@@@{%
\def\theaddresseename{#1}%
}}
\newcommand*\stopbreaks{%
@@ -3919,14 +3952,31 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
}{%
\endnormalpresentation
}
+% \end{macrocode}
+%
+% \begin{environment}{normalpresentation}
+% The environment for making a normal presentation:
+% \begin{macrocode}
\newenvironment*{normalpresentation}{%
\cleardoublepage
\@setup@pres
}{%
- \par
+% \end{macrocode}
+% \changes{0.34}{2006 Jan 01}{At the end of the environment,
+% changed \protect\texttt{\protect\bslash par} into
+% \protect\texttt{\protect\bslash @@par}}
+% Changed the following line from "\par" to "\@@par" (v.~0.34):
+% \begin{macrocode}
+ \@@par
\addpenalty\@e@prespenalty
\addvspace\belowpresentationvspace
}
+% \end{macrocode}
+% \end{environment}
+%
+% \begin{macro}{\@nofoldwarning}
+% Warning issued when folded presentations are not allowed:
+% \begin{macrocode}
\@ifdefinable\@nofoldwarning{\def\@nofoldwarning{%
\ClassWarning{\@letteracdp}{%
The paper format you chose does not allow\MessageBreak
@@ -3936,59 +3986,213 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
Warning issued%
}%
}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{environment}{foldedpresentation}
+% The environment for making a folded presentation, possibly
+% splitting it into two parts: the part the actually fits in the folded
+% flap, and the other, which is merged with the text below the
+% folding. I~think it's better to include some comments here.
+% \begin{macrocode}
\newenvironment*{foldedpresentation}{%
+% \end{macrocode}
+% Are folded letters currently allowed?
+% \begin{macrocode}
\if@do@fold@
+% \end{macrocode}
+% \emph{Yes.} First, assure that we are at the beginning of a page;
+% note that \emph{numbered} pages, here, are inserted if there is a gap
+% to fill in.
+% \begin{macrocode}
\cleardoublepage
+% \end{macrocode}
+% The contents of the presentation will be saved in "\box0": set up
+% parameters, color support\ldots
+% \begin{macrocode}
\setbox\z@\vbox\bgroup
\@setup@pres
+% \end{macrocode}
+% \changes{0.34}{2006 Jan 01}{Added setting of
+% \protect\texttt{\protect\bslash boxmaxdepth}
+% at the beginning of the environment}
+% Added the following line (v.~0.34), even if the depth of "\box0"
+% will be checked later:
+% \begin{macrocode}
+ \boxmaxdepth\maxdepth
+% \end{macrocode}
+% \ldots color support, we were saying\ldots
+% \begin{macrocode}
\color@begingroup
+% \end{macrocode}
+% The reason for this "\penalty" will be explained later~($*$):
+% \begin{macrocode}
\penalty-\@M
- \prevdepth\z@
+% \end{macrocode}
+% \changes{0.34}{2006 Jan 01}{Removed a superfluous setting of
+% \protect\texttt{\protect\bslash prevdepth}
+% from the beginning of the environment}
+% Removed the following line (v.~0.34): we have no need to insert
+% interline glue here, and it is even wrong to do it; we will insert the
+% "\topskip" glue below with a trick (which, in any case, would remove
+% the---incorrect---interline glue inserted here). Why did I include
+% this redundant statement?
+%\begin{verbatim}
+%\prevdepth\z@
+%\end{verbatim}
+% \begin{macrocode}
\else
+% \end{macrocode}
+% \emph{No.} Inform the user and substitute a normal presentation.
+% \begin{macrocode}
\@nofoldwarning
\normalpresentation
\fi
}{%
+% \end{macrocode}
+%
+% When the presentation ends, if we were making a folded
+% presentation\ldots
+% \begin{macrocode}
\if@do@fold@
+% \end{macrocode}
+% \ldots finish off the box\ldots
+% \begin{macrocode}
\@@par
\color@endgroup
+% \end{macrocode}
+% \ldots and save its "\prevdepth" for later.
+% \begin{macrocode}
\global\dimen@i\prevdepth
+% \end{macrocode}
+% Insert the equivalent of "\foldingfilbreak[0]": if possible, the
+% "\vsplit" that will later split the presentation should try to split
+% it here (\emph{i.e.}, not to split it at all).
+% \begin{macrocode}
\@f@ldingfilbreak\@fold@basepenalty
+% \end{macrocode}
+% But "\vsplit" might prefer to split the box at the implicit
+% "\penalty-10000" inserted at its end; avoid this, since it would
+% defeat the "\vfil" of "\@f@ldingfilbreak":\nobreak\space($**$)
+% \begin{macrocode}
\vskip\maxdimen % "discourage" the break at the \penalty-10000
+% \end{macrocode}
+% End of "\vbox".
+% \begin{macrocode}
\egroup
+% \end{macrocode}
+% Now "\box0" contains the presentation, but it lacks the due
+% "\topskip" glue atop. Of course, we could have inserted the
+% equivalent (in normal circumstances) of the "\topskip" glue by
+% setting \[ "\prevdepth" := "\topskip"-"\baselineskip" \] at the
+% beginning of "\box0", but this does not work always, since it could
+% insert the "\lineskip" glue instead. We are admittedly whimsical
+% here, but, in order to achieve exactly the same result yielded by
+% the "\topskip" glue machinery operated in the main vertical list, we
+% use the following trick of "\vsplit"'ting "\box0" to \texttt{0pt}.
+% A legal breakpoint exists for this: it is the "\penalty-10000"
+% inserted above in~($*$)! This breakpoint comes first in "\box0" and
+% it is mandatory, so the "\vsplit" operation will stop immediately
+% (without consuming time); nothing will be actually split off,
+% everything will remain in "\box0", but with "\splittopskip" glue
+% added at the top! Moreover, although we set "\boxmaxdepth" inside
+% "\box0", we check again for possible excess depth (can't figure out
+% how it could creep in, however). So:
+% \begin{macrocode}
\splitmaxdepth\maxdepth
\splittopskip\topskip
\setbox\tw@\vsplit\z@ to\z@
+% \end{macrocode}
+% The real splitting of the presentation is done by the following
+% "\vsplit": the baseline of the first line possibly remaining in
+% "\box0" after the "\vsplit" must be at a distance of
+% "\@below@folding@skip" from the folding, plus the "\parskip" glue
+% and, of course, the normal interline glue (we are in mid-page now).
+% \begin{macrocode}
\splittopskip\baselineskip
\advance\splittopskip\@below@folding@skip
\advance\splittopskip\parskip
\setbox\tw@\vsplit\z@ to\@folding@ht
+% \end{macrocode}
+% Now "\box2" contains the part of the presentation that does fit
+% in the folded flap; we append this box to the page (actually, it is the
+% first thing contributed since the "\cleardoublepage"). Since
+% this box already includes "\topskip" glue at the
+% top, no further interline glue must be inserted above it.
+% \begin{macrocode}
\nointerlineskip
\box\tw@
+% \end{macrocode}
+% Thanks to the above setting of "\splitmaxdepth", we are sure that
+% the depth of the previous box is small; so the following line will
+% take us exactly on the edge of the fold, with null depth\ldots
+% \begin{macrocode}
{\baselineskip\@above@folding@margin \nobreak\null}%
+% \end{macrocode}
+% \ldots where we insert a costly, yet feasible breakpoint.
+% \begin{macrocode}
\penalty\@highpenalty
+% \end{macrocode}
+% If everything fitted in the folded flap, nothing remained in
+% "\box0".
+% \begin{macrocode}
\ifvoid\z@
+% \end{macrocode}
+% In that case, just leave appropriate blank space (the "\prevdepth"
+% is already zero, so the interline glue of the following line will be
+% correct).
+% \begin{macrocode}
\vskip\@below@folding@skip
+% \end{macrocode}
+% Otherwise, take the part that did not fit out of "\box0"\ldots
+% \begin{macrocode}
\else
\unvbox\z@
+% \end{macrocode}
+% \ldots so it is now in the list of ``recent contributions''
+% ("\unvbox" does not exercise the page builder); remove the
+% "\vskip\maxdimen" added in~($**$) just to fool "\vsplit", as well as
+% the items added by the virtual "\foldingfilbreak[0]".
+% \begin{macrocode}
\unskip % remove "\vskip\maxdimen"
\unpenalty % remove "\penalty\@fold@basepenalty"
\unskip % remove "\vskip \dimen@ plus 1fil minus ..."
\unskip % remove "\vskip -\skip@"
\unpenalty % remove "\penalty 10000"
+% \end{macrocode}
+% Now the list of ``recent contributions'' contains exactly what the
+% user put in the presentation (and did not fit in the folded flap).
+% Restore "\prevdepth" and conclude as if it were a normal
+% presentation: this makes a perfectly seamless join with the
+% following material, as if the folded presentation had been a normal
+% one, extending down to this spot in the page. ^^A ( paren match
+% Not bad, uhu?~:-)
+% \begin{macrocode}
\prevdepth\dimen@i
\addpenalty\@e@prespenalty
\addvspace\belowpresentationvspace
+% \end{macrocode}
+% Ah, yes, also inform the user of what happened:
+% \begin{macrocode}
\ClassWarning{\@letteracdp}{%
Some text that did not fit into the folded flap\MessageBreak
was moved into the main text below the folding;\MessageBreak
warning issued%
}%
\fi
+% \end{macrocode}
+% If we were not making a folded presentation, then conclude a
+% normal one.
+% \begin{macrocode}
\else
\endnormalpresentation
\fi
}
+% \end{macrocode}
+% \end{environment}
+%
+% Back to uncommented code.
+% \begin{macrocode}
\newcommand*\iffoldedallowed{%
\if@do@fold@
\expandafter\@firstoftwo
@@ -4004,6 +4208,11 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\makesubject\relax
\end{normalpresentation}%
}
+% \end{macrocode}
+%
+% \begin{macro}{\@f@ldingfilbreak}
+% The ``upper half'' of "\@foldingfilbreak".
+% \begin{macrocode}
\@ifdefinable\@f@ldingfilbreak{\def\@f@ldingfilbreak#1{%
\ifdim\prevdepth<\maxdepth
\dimen@ -\prevdepth
@@ -4016,6 +4225,10 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\vskip \dimen@ \@plus 1fil\@minus \@above@folding@shrink
\penalty #1%
}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
\@ifdefinable\@foldingfilbreak{\def\@foldingfilbreak#1#2{\par
\@f@ldingfilbreak#1%
\vskip -\dimen@ \@plus -1fil\@minus -\@above@folding@shrink
@@ -4036,8 +4249,8 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\@esphack
\fi
}
-\newcommand*\foldingfilbreak[2][\z@]{%
- \@foldingfilbreak{\@fold@getpen{#1}}{#2}%
+\newcommand*\foldingfilbreak[1][\z@]{%
+ \@foldingfilbreak{\@fold@getpen{#1}}%
}
\newcommand*\makefoldedpresentation{%
\if@do@fold@
@@ -4074,9 +4287,9 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\nobreak\medskip
\fi
}}
-\newcommand*\makedate [1][]{\@make@date{#1}NN}
-\newcommand*\maketopdate [1][]{\@make@date{#1}NY}
-\newcommand*\makebottomdate[1][]{\@make@date{#1}YN}
+\newcommand*\makedate [1][\@place]{\@make@date{#1}NN}
+\newcommand*\maketopdate [1][\@place]{\@make@date{#1}NY}
+\newcommand*\makebottomdate[1][\@place]{\@make@date{#1}YN}
\@ifdefinable\@empty@signature{\def\@empty@signature{%
\ClassWarning{\@letteracdp}{%
Empty signature%
@@ -4174,7 +4387,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\@opening
}%
}
-\newcommand*\@opening[1][]{%
+\newcommand*\@opening[1][\@place]{%
\makepresentation
\maketopdate[#1]%
\@cdp@reserved
@@ -4254,11 +4467,63 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\newcommand*\PS{%
\ps\@ifstar{\@PS@rubber}{\@PS@rigid}%
}
+% \end{macrocode}
+%
+% \begin{macro}{\stopletter}
+% User-level hook invoked (before anything else) when a letter ends.
+% \begin{macrocode}
\newcommand*\stopletter{}
% \end{macrocode}
+% \end{macro}
%
% \subsubsection{Address labels}
%
+% This part of the code should probably be detached and put in a
+% separte file to be loaded on demand.
+%
+% The general idea is the following:
+% \begin{itemize}
+% \item
+% a \env{labels} (or \env{baselabels}, see below) environment
+% produces one or more sheets of address labels;
+% \item
+% inside \env{labels}, several \env{labelgroup} environments wrap up
+% the address labels pertaining to each letter (a letter may have
+% several address labels associated with it, if it has several
+% addressees);
+% \item
+% inside each \env{labelgroup} environment, individual labels are
+% produced with the "\basemlabel" command.
+% \end{itemize}
+% The \env{labels} environment takes care of such things like jumping
+% to a new page, etc.; the \env{labelgroup} environment merely changes
+% the way address labels are numbered, but does not otherwise affect
+% the printout.
+%
+% The user may either:
+% \begin{enumerate}
+% \renewcommand*{\theenumi}{(\Alph{enumi})}
+% \renewcommand*{\labelenumi}{\theenumi}
+% \item\label{autolabels}
+% include a "\makelabels" declaration in the preamble, to have
+% address labels generated automatically via the \filedir{.aux}
+% file; in this case, appropriate commands are written in the
+% \filedir{.aux} file by each
+% \env{baseletter} environment, which, when the \filedir{.aux} file
+% is re-read at the "\end{document}", automatically generate the
+% required environments and commands (\env{labels},
+% \env{labelgroup}, etc.); \emph{or}
+% \item\label{handlabels}
+% produce the address labels ``by hand'', including directly in the
+% source file, where (s)he want the address label sheets to appear, a
+% \env{labels} environment, containing the appropriate
+% \env{labelgroup} environments, containing, in turn, the individual
+% "\basemlabel" commands.
+% \end{enumerate}
+% In principle, it is also possible to mix \ref{autolabels}
+% and~\ref{handlabels} (and to have several \env{labels}
+% environments, too), but this has no practical utility.
+%
% \begin{macrocode}
\newcommand*\returnaddress{\thesenderaddress}
\@ifdefinable\@emptyaddrlabels@err{\def\@emptyaddrlabels@err{%
@@ -4294,6 +4559,14 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\@emptyaddrlabels@err
\fi\fi
}
+% \end{macrocode}
+%
+% \begin{environment}{baselabels}
+% This is the actual environment for producing sheets of address
+% labels: the \env{labels} environment (see below) is simply a wrapper
+% that offers to the user the opportunity of changing some settings
+% before invoking \env{baselabels}.
+% \begin{macrocode}
\newenvironment*{baselabels}{%
\cleardoubleemptypage
\c@page\@ne
@@ -4350,7 +4623,28 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
}{%
\@killglue\clearpage
}
+% \end{macrocode}
+% \end{environment}
+%
+% \begin{environment}{labels}
+% It is the user-level environment for producing one or more sheets of address labels.
+% Its default definition simply invokes \env{baselables}, but the
+% user may redefine it to set some style parameters. For example:
+%\begin{verbatim}
+%\renewenvironment{labels}{%
+% \baselabels
+% \setlength\fboxrule{.2pt}%
+% \addtolength\fboxsep{-2\fboxrule}%
+%}{\endbaselabels}
+%\end{verbatim}
+% will draw a thin border around each address label.
+% \begin{macrocode}
\newenvironment*{labels}{\baselabels}{\endbaselabels}
+% \end{macrocode}
+% \end{environment}
+%
+% Back to uncommented code.
+% \begin{macrocode}
\let\@beginlabels=\relax
\let\@endlabels=\relax
\newenvironment*{labelgroup}{\stepcounter{letter}}{}
@@ -4371,7 +4665,18 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\stepcounter{totallabel}%
\stepcounter{label}%
}
+% \end{macrocode}
+%
+% \begin{macro}{\ifactuallabel}
+% Macro for the user: "\ifactuallabel{"\meta{FOO}"}{"\meta{BAR}"}"
+% executes \meta{FOO} if the label is not being skipped, \meta{BAR}
+% otherwise.
+% \begin{macrocode}
\let\ifactuallabel\@firstoftwo
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
\newcommand\basemlabel[2]{%
\begingroup
\def\startaddrlabel{\par
@@ -4526,6 +4831,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\newcommand*\enclname {Allegati:}
\newcommand*\PSname {P.S.:}
\newcommand*\headtoname {A:}
+\newcommand*\lettername {Lettera}
\newcommand*\today{\number\day~\ifcase\month\or
gennaio\or febbraio\or marzo\or aprile\or maggio\or giugno\or
luglio\or agosto\or settembre\or ottobre\or novembre\or dicembre\fi
@@ -4554,8 +4860,8 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1996/06/01] % LaTeX2e is required!
\ProvidesClass{articoletteracdp}
- [2005/01/01 v0.33 (development)]
-%% \typeout{Copyright (C) 1999-2005 by Gustavo MEZZETTI,
+ [2006/01/01 v0.34 (development)]
+%% \typeout{Copyright (C) 1999-2006 by Gustavo MEZZETTI,
%% all rights reserved.}
% \end{macrocode}
%
@@ -4577,6 +4883,21 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\do\if@loX@in@toc@
% \end{macrocode}
%
+% \begin{macro}{\@letter@bookmark}
+% Support for pdf\TeX\slash\packlass{\hyperref}. If pdf\TeX\ is
+% being used to typeset the document, if the \packlass{\hyperref}
+% package is loaded, and if the user does not ask us to avoid it, we
+% shall generate a ``level~0'' bookmark for each letter we shall
+% typeset (sections are of level~1, so they will be bookmarked under
+% letters). This command serves to this purpose: it is defined either
+% as "\@gobbletwo", if such bookmarks are \emph{not} being generated,
+% or as a suitable invocation of "\pdfbookmark" if they are. To begin
+% with, we set the former alternative, which makes it act as a no-op.
+% \begin{macrocode}
+\@ifdefinable\@letter@bookmark{\let\@letter@bookmark\@gobbletwo}
+% \end{macrocode}
+% \end{macro}
+%
% Space above and below captions for figures and tables.
% \begin{macrocode}
\newlength\abovecaptionskip
@@ -4605,20 +4926,51 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\@toc@in@toc@false
\@loX@in@toc@false
}
+% \end{macrocode}
+% The option \opz{letterbookmarks} causes the bookmarks for letters to
+% be generated. Upon expansion, the 2~arguments of
+% "\@letter@bookmark" will become arguments of "\pdfbookmark". We
+% also need to ask the \packlass{\hyperref} package to generate closed
+% bookmarks. Note that the user can later overwrite this setting;
+% note also that nothing will happen if \packlass{\hyperref} is not
+% loaded later.
+% \begin{macrocode}
+\DeclareOption{letterbookmarks}{%
+ \def\@letter@bookmark{\pdfbookmark[0]}%
+ \PassOptionsToPackage{bookmarksopen=false}{hyperref}%
+}
+% \end{macrocode}
+% The option \opz{noletterbookmarks} supresses the bookmarks for
+% letters.
+% \begin{macrocode}
+\DeclareOption{noletterbookmarks}{%
+ \let\@letter@bookmark\@gobbletwo
+}
+% \end{macrocode}
+% The option \opz{openletterbookmarks} causes the bookmarks for
+% letters to be generated and to be presented open to the reader. We
+% ask the \packlass{\hyperref} package to generate open bookmarks, but
+% only one level deep. Note that the user can later overwrite this
+% setting. This is made the default option, below.
+% \begin{macrocode}
+\DeclareOption{openletterbookmarks}{%
+ \def\@letter@bookmark{\pdfbookmark[0]}%
+ \PassOptionsToPackage{bookmarksopen,bookmarksopenlevel=1}{hyperref}%
+}
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{letteracdp}}
% \end{macrocode}
%
% \subsection{Option processing}
%
% \begin{macrocode}
-\ExecuteOptions{plaintoc}
+\ExecuteOptions{plaintoc,openletterbookmarks}
\ProcessOptions\relax
% \end{macrocode}
%
% \subsection{Class loading}
%
% \begin{macrocode}
-\LoadClass{letteracdp}[2005/01/01]
+\LoadClass{letteracdp}[2006/01/01]
% \end{macrocode}
%
% \subsection{Main code}
@@ -4634,20 +4986,33 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\newcounter{table}[letter]
% \end{macrocode}
%
-% The \packlass{\hyperref} package generates references to paragraphs
-% that include also the "\subsection" and the "\subsubsection" number,
-% because it assumes that paragraphs are numbered within subsubsections.
-% While, on one hand, it is not necessary to actually have subsections
-% numbered within sections, subsubsections numbered within subsection,
-% and paragraphs numbered within subsubsections, on the other, to assure
-% compatibility with \packlass{\hyperref} one must at least
-% \emph{define} the \texttt{subsection} and \texttt{subsubsection}
-% counters, to assure that the \packlass{\hyperref} package may safely
-% mention them. We do this here, so that \packlass{\articoletteracdp}
-% can be used together with \packlass{\hyperref}.
+% Stuff for dealing with the \packlass{\hyperref} package. The
+% problem is our non-standard hierarchy of sectioning commands, with
+% paragraphs placed directly below sections. In this version (0.34) we
+% choose a different approach than the one we adopted in version 0.33,
+% redefining "\theHparagraph"; of course, this must be done
+% \emph{after} \packlass{\hyperref} has been loaded, and we could not
+% find any better place for this than the "\AtBeginDocument" hook.
+% Within the same hook, we also redefine "\theHsection" (the counter
+% used by \packlass{\@hyperref} to generate hyperlinks to sections) so
+% that sections with the same number, but included in different
+% letters, will have different anchors; we fix the bookmark level for
+% paragraphs, too.
+% \begin{macrocode}
+\AtBeginDocument{%
+ \def\theHletter{\arabic{letter}}%
+ \@ifpackageloaded{hyperref}{%
+ \def\theHparagraph{\theHsection.\arabic{paragraph}}%
+ \def\theHsection{\theHletter.\arabic{section}}%
+ \def\toclevel@paragraph{2}%
+ }{%
+% \end{macrocode}
+% If the \packlass{\@hyperref} package is not loaded, we assure that
+% "\@letter@bookmarks" acts as a no-op:
% \begin{macrocode}
-\newcounter{subsection}
-\newcounter{subsubsection}
+ \let\@letter@bookmark\@gobbletwo
+ }%
+}
% \end{macrocode}
%
% \begin{macro}{\hyper@last}
@@ -4657,12 +5022,13 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% redefinition of "\@starttoc", possibly writing unwanted
% \filedir{.toc}, \filedir{.lof}, and \filedir{.lot} files, and (much
% worse) causing trouble if the letter happens to contain more than one
-% "\tableofcontents", "\listoffigures", or "\listoftables". Of course,
-% this means that the user must be informed that (s)he has to delete the
-% old files by hand.~\mbox{:-(}^^A ) paren match
-% \spacefactor\sfcode`. \space
-% Note, anyway, that the automatic check made by \packlass{\hyperref}
-% would not work with the C.D.P. Bundle in any case, so\ldots
+% "\tableofcontents", "\listoffigures", or "\listoftables". Of
+% course, this means that the user must be informed that (s)he has to
+% delete the old files by hand.~\mbox{:-(}^^A ) paren match
+% \spacefactor\sfcode`. \space Note, anyway, that the automatic check
+% made by \packlass{\hyperref} would not work with the C.D.P. Bundle
+% in any case (because it looks for \filedir{.toc}, \filedir{.lof},
+% etc.\ files, not for, say, \filedir{.toc1}, etc.), so\ldots
% \begin{macrocode}
\@ifdefinable\hyper@last{\let\hyper@last\relax}
% \end{macrocode}
@@ -4697,7 +5063,24 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\@nobreakfalse
\endgroup
}
+% \end{macrocode}
+%
+% The "\@begin@letter@hook" macro is invoked whenever a letter
+% starts; we want (possibly, see above) a bookmark to be generated for
+% the letter. Note that we use "\theletter" for the letter number
+% presented to the user, and "\theHletter" for the number used to
+% generate the anchor.
+% \begin{macrocode}
\g@addto@macro\@begin@letter@hook{%
+ \edef\@cdp@reserved{%
+ \noexpand\@letter@bookmark
+ {\lettername\space\theletter}{letter.\theHletter}%
+ }%
+ \@cdp@reserved
+% \end{macrocode}
+%
+% Actions for closing a set of toc/lof/lot file and opening another:
+% \begin{macrocode}
\if@filesw
{\escapechar\m@ne
\immediate\write\@out@table@list{\string\}^^J\string\{}%
@@ -4706,6 +5089,10 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
{\string\@deferred@clopen{\number\c@letter}}%
\fi
}
+% \end{macrocode}
+%
+% Uncommented code.
+% \begin{macrocode}
\@ifdefinable\@deferred@open {\let\@deferred@open \@gobble}
\@ifdefinable\@deferred@close {\let\@deferred@close \@empty}
\@ifdefinable\@deferred@clopen{\let\@deferred@clopen\@gobble}
@@ -4768,7 +5155,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% \begin{macrocode}
\@ifdefinable\@addfullstop{\long\def\@addfullstop#1{%
{\nonfrenchspacing\ignorespaces#1\unskip
- \ifnum\spacefactor>\@m \else.\fi \/}%
+ \ifnum \spacefactor>\@m \else.\fi \/}%
}}
\newcommand*\nopunct{\spacefactor 1001\relax}
% \end{macrocode}
@@ -4792,17 +5179,27 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\setlength \dblfloatsep {\bigskipamount}
\@msetlength\dbltextfloatsep {2}{\bigskipamount}
\setlength \@fptop {\z@ plus 1 fil}
-\setlength \@fpsep {\bigskipamount}
+\setlength \@fpsep {1\bigskipamount plus 2 fil}
\setlength \@fpbot {\z@ plus 1 fil}
-\setlength \@dblfptop {\z@ plus 1 fil}
-\setlength \@dblfpsep {\bigskipamount}
-\setlength \@dblfpbot {\z@ plus 1 fil}
+\setlength \@dblfptop {\@fptop}
+\setlength \@dblfpsep {\@fpsep}
+\setlength \@dblfpbot {\@fpbot}
\setlength\abovecaptionskip{\medskipamount}
\setlength\belowcaptionskip{\z@skip}
% \end{macrocode}
%
% \subsubsection{Title, section heads, figures, bibliography\ldots}
%
+% \begin{macro}{\maketitle}
+% Without the \packlass{\@hyperref} package, the "\maketitle"
+% command can take the same optional argument as "\maketopdate", for
+% specifying a short string to be prepended to the date; and in this
+% case, the new "\place" declaration will be automatically honored.
+% But the former feature will break if \packlass{\@hyperref} is
+% loaded, and no remedy seems feasible for this, since
+% \packlass{\@hyperref} assumes that "\maketitle" hasn't got any
+% arguments. Note also that a period is automatically added to the
+% title.
% \begin{macrocode}
\newcommand*\maketitle{%
\begingroup
@@ -4817,6 +5214,11 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\setcounter{footnote}{\z@}%
\maketopdate
}
+% \end{macrocode}
+% \end{macro}
+%
+% Uncommented code.
+% \begin{macrocode}
\setcounter{secnumdepth}{\tw@}
\def\@seccntformat#1{\csname the#1\endcsname .\enspace}
\ifcase \@ptsize\relax
@@ -4966,6 +5368,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% \section{The code for the \packlass{\adiseal} package}
%
% This part of the file goes into \filedir{\adiseal.sty}.
+% \emph{Very obsolete:} eliminate?
% \begin{macrocode}
%<*adipk>
% \end{macrocode}
@@ -4975,7 +5378,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1998/06/01] % LaTeX2e is required!
\ProvidesPackage{adiseal}
- [2005/01/01 v0.33 (development)]
+ [2006/01/01 v0.34 (development)]
\@ifdefinable\@adiseal{\def\@adiseal{adiseal}}
% \end{macrocode}
%
@@ -4994,25 +5397,35 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
}
% \end{macrocode}
% \end{macro}
+%
% \begin{macro}{\@seal@graph@file}
+% \changes{0.34}{2006 Jan 01}{Got rid of the \filedir{.eps} extension
+% in the name of the file of the ADI seal: thus, the extension
+% \filedir{.eps} or \filedir{.pdf} will be automatically supplied
+% by the \packlass{epsgif} package according to the actual
+% typesetting engine employed (\TeX\ or pdf\TeX)}
% The name of the file which contains the image of the ADI seal is
% also kept in a macro, to allow customization, but this macro is not
-% made accessible to the user. Note the image must be contained in a
-% file in Encapsulated PostScript format, and that it should be exactly \(
-% 60\,\mbox{bp} \) wide and \( 42\,\mbox{bp} \) tall.
+% made accessible to the user. \emph{Note:} the image must be contained
+% in a file in Encapsulated PostScript format or, for pdf\TeX, in
+% Portable Document Format, and it should be exactly \( 60\,\mbox{bp} \)
+% wide by \( 42\,\mbox{bp} \) tall. The appropriate file extension
+% will be supplied by the \packlass{epsfig} package.
% \begin{macrocode}
\@ifdefinable\@seal@graph@file{\def\@seal@graph@file{%
- adiseal.eps% must be an Encapsulated PostScript file
+ adiseal% must be an EPS or a PDF file
}}
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\if@use@pixmap@}
% The following switch is used to implement the
% \iopz{nopixmap}\eopz{usepixmap}\fopz\space mutually exclusive
% options: see subsection~\ref{sS:adisealoptdec} for details.
% \begin{macrocode}
\@ifdefinable\if@use@pixmap@{\newif\if@use@pixmap@}
% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\@temp@adiseal}
% A ``scratch'' macro, used as a temporary storage in the sequel.
@@ -5065,7 +5478,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
}%
}
\if@use@pixmap@
- \IfFileExists{\@seal@graph@file}{%
+ \IfFileExists{\@seal@graph@file.eps}{%
\IfFileExists{epsfig.sty}{%
\RequirePackage{epsfig}%
}{%
@@ -5186,14 +5599,14 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
%<*adicl>
% \end{macrocode}
%
-% The purpose of this file is simply to supply ``glue code'' to
-% support the legacy \packlass{\lettcdpadi} class. The document
-% class is ``redirected'' to \packlass{\letteracdp}, and the
-% \packlass{\adiseal} package is automatically loaded. Options are
+% The purpose of this file is simply to supply ``glue code'' to
+% support the legacy \packlass{\lettcdpadi} class. The document
+% class is ``redirected'' to \packlass{\letteracdp}, and the
+% \packlass{\adiseal} package is automatically loaded. Options are
% properly shunted, too.
%
-% It should be time to expunge this file from the Bundle, perhaps
-% [v0.33], but it is also true that it uses so few
+% It should be time to expunge this file from the Bundle, perhaps
+% [v0.33], but it is also true that it occupies so few
% bytes\ldots\space(that is, an entire block of the disk!).
%
% \subsection{Identification}
@@ -5201,7 +5614,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1998/06/01] % LaTeX2e is required!
\ProvidesClass{lettcdpadi}
- [2005/01/01 v0.33 (development)]
+ [2006/01/01 v0.34 (development)]
% \end{macrocode}
%
% \subsection{Initial code}
@@ -5225,8 +5638,8 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% \subsection{Class and package loading}
%
% \begin{macrocode}
-\LoadClass{letteracdp}[2005/01/01]
-\RequirePackage{adiseal}[2005/01/01]
+\LoadClass{letteracdp}[2006/01/01]
+\RequirePackage{adiseal}[2006/01/01]
% \end{macrocode}
%
% \subsection{Main code}
@@ -5251,7 +5664,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1998/06/01] % LaTeX2e is required!
\ProvidesPackage{cdpaddon}
- [2005/01/01 v0.33 (development)]
+ [2006/01/01 v0.34 (development)]
\@ifdefinable\@cdpaddon{\def\@cdpaddon{cdpaddon}}
% \end{macrocode}
%
@@ -5316,7 +5729,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% Again, we use one of the ``scratch'' macro to save memory (the other
% ``scratch'' macro is used as well inside).
% \begin{macrocode}
-\def\@temp@cdpaddon@a#1printer:#2,#3@@@{%
+\def\@temp@cdpaddon@a#1printer:#2,#3\@@@{%
\def\@temp@cdpaddon@b{#1}%
\ifx\@temp@cdpaddon@b\@empty
\def\@cdpaddon@printer{#2}%
@@ -5333,7 +5746,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% a \opz{printer:}\ldots\ option requesting a color definition file.
% \begin{macrocode}
\DeclareOption*{%
- \expandafter\@temp@cdpaddon@a\CurrentOption,printer:,@@@%
+ \expandafter\@temp@cdpaddon@a\CurrentOption,printer:,\@@@%
}
% \end{macrocode}
%
@@ -5718,11 +6131,12 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\let\@temp@cdpaddon@a\@undefined
}
% \end{macrocode}
-% The following line informs the \packlass{\hyperref} package that the
-% bookmark level for paragraphs should be~2.
-% \begin{macrocode}
- \def\toclevel@paragraph{2}
-% \end{macrocode}
+% The following line has been removed from the code, since the
+% bookmark level for paragraphs is now fixed in the file
+% \filedir{\articoletteracdp.cls} (v.~0.34).
+%\begin{verbatim}
+%\def\toclevel@paragraph{2}
+%\end{verbatim}
% If hyperlinks are not requested, we can release "\@temp@cdpaddon@a"
% right now.
% \begin{macrocode}
@@ -5764,16 +6178,16 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% ``transparent'' to the "\spacefactor", just like parentheses
% (the "\spacefactor" is saved in "\count@").
% \begin{macrocode}
-\DeclareRobustCommand*{\facesmile}{\@face\smile}
-\DeclareRobustCommand*{\facefrown}{\@face\frown}
+\DeclareRobustCommand*\facesmile{\@face\smile}
+\DeclareRobustCommand*\facefrown{\@face\frown}
% \end{macrocode}
% \end{macro}
% \end{macro}
%
% \begin{macro}{\@face}
-% The low-level command that draws the face ("\bigcirc"), the eyes, and
-% the mouth: the latter is passed as an argument, so it can be a
-% "\smile" or a "\frown".
+% The low-level command that draws the face ("\bigcirc"), the eyes,
+% and the mouth: the latter is passed as an argument, so it can be
+% either a "\smile" or a "\frown".
% \begin{macrocode}
\@ifdefinable\@face{\def\@face#1{%
\leavevmode
@@ -5819,7 +6233,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
%%% the name and the release date, respectively, of your file.
%%% Note that the extension ".def" must be included in the file name,
%%% and that the date is in the format YYYY/MM/DD.
-\ProvidesFile{cdpshues-example.def}[2005/01/01 Printer-dependent file]
+\ProvidesFile{cdpshues-example.def}[2006/01/01 Printer-dependent file]
%%%
%%% Define here the colors to use to draw the C.D.P. seal;
%%% "slight@col" is the color used to paint the inner of the D and
@@ -5838,7 +6252,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% \filedir{\epson}.
% \begin{macrocode}
%<*epson>
-\ProvidesFile{epson-stylus-740.def}[2005/01/01 Printer-dependent file]
+\ProvidesFile{epson-stylus-740.def}[2006/01/01 Printer-dependent file]
\definecolor{slight@col}{rgb}{.8,1,.8}
\definecolor{strong@col}{rgb}{0,.266667,0}
%</epson>
@@ -5849,7 +6263,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
% This part of the file goes into the definition file \filedir{\hplj}.
% \begin{macrocode}
%<*hplj>
-\ProvidesFile{hp-laserjet-4500.def}[2005/01/01 Printer-dependent file]
+\ProvidesFile{hp-laserjet-4500.def}[2006/01/01 Printer-dependent file]
\definecolor{slight@col}{cmyk}{.1,0,.1,0}
\definecolor{strong@col}{cmyk}{.5,0,.5,.5}
%</hplj>
diff --git a/Master/texmf-dist/source/latex/cdpbundl/cdpbundl.ins b/Master/texmf-dist/source/latex/cdpbundl/cdpbundl.ins
index 45876cc9e48..c19b8da1ee8 100644
--- a/Master/texmf-dist/source/latex/cdpbundl/cdpbundl.ins
+++ b/Master/texmf-dist/source/latex/cdpbundl/cdpbundl.ins
@@ -3,7 +3,7 @@
%
% This file is part of a work named "C.D.P. Bundle".
%
-% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
+% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
%
% The C.D.P. Bundle may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,7 +25,7 @@
% only part of the Work" in the sense of the LaTeX Project Public
% License, and is not allowed.
%
-% January 1, 2005
+% January 1, 2006 (vers. 0.34)
%
\input docstrip
@@ -58,7 +58,7 @@
This is a generated file.
It is part of a work named "C.D.P. Bundle".
-Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
+Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
The C.D.P. Bundle may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/source/latex/coordsys/coordsys.dtx b/Master/texmf-dist/source/latex/coordsys/coordsys.dtx
index 9249a7d662f..1221d4950f1 100644
--- a/Master/texmf-dist/source/latex/coordsys/coordsys.dtx
+++ b/Master/texmf-dist/source/latex/coordsys/coordsys.dtx
@@ -1,6 +1,6 @@
% \iffalse
% This is the coordsys package, coordsys.dtx
-% Copyright 2000--04 by Mogens Lemvig Hansen.
+% Copyright 2000--06 by Mogens Lemvig Hansen.
%
% Run first coordsys.ins then this file, coordsys.dtx,
% through LaTeX and read the documentation in coordsys.dvi
@@ -20,9 +20,29 @@
\usepackage{url,varioref,color,coordsys,logsys}
\IfFileExists{eepic.sty}{\usepackage{epic,eepic}}{\relax}
\CodelineIndex%\EnableCrossrefs
-\OnlyDescription
+%\OnlyDescription
\MakeShortVerb{\"}
\makeatletter
+\DoNotIndex{\@circlefnt, \@empty, \@ifpackageloaded, \@ifstar,
+\@tempcnta, \@tempcntb, \@tempdima, \@tempdimb, \@tempdimc,
+\@wholewidth, \\, \addtocounter, \addtolength, \advance,
+\afterassignment, \arabic, \baselineskip, \char,
+\color@begingroup, \color@endgroup, \colorbox, \count@,
+\DeclareOption, \def, \divide, \edef, \ensuremath,
+\ExecuteOptions, \fontdimen, \frac, \hbox, \hfill, \hrule, \hskip,
+\hspace, \hss,
+\if, \else, \fi, \ifdim, \fi, \ifnum, \fi, \ifx, \repeat,
+\ignorespaces, \leaders, \leavevmode, \let, \line, \lineskip,
+\loop, \makebox, \mbox, \MessageBreak, \multiply, \multiput, \n,
+\NeedsTeXFormat, \newcommand, \newif, \next, \offinterlineskip,
+\p@, \PackageError, \PackageWarning, \PassOptionsToPackage,
+\phantom, \ProcessOptions, \providecommand, \ProvidesPackage,
+\put, \raisebox, \relax, \renewcommand, \RequirePackage, \rule,
+\scriptsize, \setcounter, \setlength, \settodepth, \settoheight,
+\settowidth, \space, \stepcounter, \string, \t, \textfont, \the,
+\thicklines, \thinlines, \unitlength, \value, \vbox, \vector,
+\vee, \vfill, \vrule, \vskip, \vss, \wedge, \width, \z@}
+
\newcommand{\nextlinelabel}[2][1]{\@bsphack
\@tempcnta\c@CodelineNo
\advance\@tempcnta#1\relax
@@ -375,7 +395,7 @@
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
-% \def\fileversion{1.3} \def\filedate{2004/11/15} \def\docdate{\filedate}
+% \def\fileversion{1.4} \def\filedate{2006/02/03} \def\docdate{\filedate}
% \title{The \textsf{coordsys} and \textsf{logsys} Packages\thanks{This
% file describes version \fileversion, \filedate.}}
% \author{\copyright\ Mogens Lemvig Hansen\thanks{%
@@ -409,7 +429,8 @@
%
% \subsection{One Dimension}
% \DescribeMacro{\numbline}
-% The "\numbline" command typesets a number line. For example,
+% The "\numbline" command typesets a number line.\index{number line|(usage}
+% For example,
% \begin{quote}
% \begin{verbatim}
% \begin{picture}(200,20)(-75,-15)
@@ -469,7 +490,7 @@
% "\vnumbline*"\oarg{spacing}\marg{from}\marg{to}
% \end{quote}
% The syntax is similar to that of the "\numbline" command
-% \vpageref[above]{numblinesyntax}.
+% \vpageref[above]{numblinesyntax}.\index{number line|)usage}
% \begin{quote}
% \begin{minipage}{.2\linewidth}
% \begin{picture}(20,100)(-17,20)
@@ -486,7 +507,8 @@
%
% \subsection{Two Dimensions}
% \DescribeMacro{\coordsys}
-% Use the "\coordsys" command to typeset coordinate systems.
+% Use the "\coordsys"\index{coordinate system>with intersecting axes|usage}
+% command to typeset coordinate systems.
% \begin{quote}
% \begin{picture}(200,110)(-50,-50)
% \coordsys(-50,-50)(150,60)
@@ -517,7 +539,8 @@
% styles. All the coordinate-system-drawing commands have similar syntax.
%
% \DescribeMacro{\fcoordsys}\DescribeMacro{\fcoordsys*}
-% The "\fcoordsys" command typesets framed coordinate systems; that is, the
+% The "\fcoordsys"\index{coordinate system>framed|usage}
+% command typesets framed coordinate systems; that is, the
% axes are at the left and bottom edges of the system.
% \begin{quote}
% "\fcoordsys"\oarg{h-spacing}\oarg{v-spacing}\parg{ll}\parg{ur}\\
@@ -533,7 +556,8 @@
% \end{quote}
%
% \DescribeMacro{\bcoordsys}\DescribeMacro{\bcoordsys*}
-% The "\bcoordsys" command typesets boxed coordinate systems.
+% The "\bcoordsys"\index{coordinate system>boxed|usage}
+% command typesets boxed coordinate systems.
% \begin{quote}
% "\bcoordsys"\oarg{h-spacing}\oarg{v-spacing}\parg{ll}\parg{ur}\\
% "\bcoordsys*"\oarg{h-spacing}\oarg{v-spacing}\parg{ll}\parg{ur}
@@ -566,7 +590,8 @@
% part of the \textsf{amsmath} package).
%
% \DescribeMacro{\coordgrid}
-% The "\coordgrid" command typesets a coordinate grid.
+% The "\coordgrid"\index{grid|(usage}\index{grid>dotted|usage}
+% command typesets a coordinate grid.
% \begin{quote}
% \begin{picture}(300, 125)
% \coordgrid(0,0)(300,125)
@@ -586,16 +611,19 @@
% \end{picture}
% \end{quote}
% If you load the \textsf{color} package before the \textsf{coordsys}
-% package, the labels will be printed on a white background.
+% package, the labels will be printed on a
+% white background.\index{labels>background of|usage}
%
% Typesetting pretty grids with dotted lines is not easy.
-% If a grid does come out ugly, try to increase "\unitlength"
+% If a grid does come out ugly,\index{grid>ugly|usage}
+% try to increase "\unitlength"
% to allow for more dots between the lines.
% You may also reduce the size of the dots;
% see the "\gridstyle" command \vpageref[below]{gridstyle}.
% \DescribeMacro{\coordgrid*}
% Alternatively you can use the "\coordgrid*" command which
-% typesets a coordinate grid with solid lines. You could then use the
+% typesets a coordinate grid with solid lines.\index{grid>solid|usage}
+% You could then use the
% \textsf{color} package to colour the grid, say, gray; again, see
% the "\gridstyle" command \vpageref[below]{gridstyle}.
%
@@ -607,11 +635,12 @@
% typeset coordinate grids with a syntax similar to that of
% the "\coordsys" command \vpageref[above]{coordsyssyntax}.
% The starred version uses solid lines;
-% the un-starred version uses dotted lines.
+% the un-starred version uses dotted lines.\index{grid|)usage}
%
% \DescribeMacro{\gridstyle}\label{gridstyle}
% The default size of the dots is the with of "\thinlines"
-% and "\thicklines". If you intend to print your grids at a
+% and "\thicklines".\index{grid>size of dots|usage}\index{grid>style|(usage}
+% If you intend to print your grids at a
% sufficiently high resolution, you should reduce the size of the
% dots by issuing a "\gridstyle" command. On my 600\,dpi printer,
% these sizes look nice for points:
@@ -637,7 +666,8 @@
% \end{picture}
% \end{quote}
%
-% If you make grids for the screen, I recommend using colour. For example,
+% If you make grids for the screen, I recommend using
+% colour.\index{grid>coloured|usage} For example,
% \begin{quote}
% \begin{verbatim}
% \definecolor{gray}{gray}{0.5}
@@ -664,13 +694,15 @@
% \meta{thick declaration}.
% The current "\gridstyle" applies to all types of grids:
% dotted, solid, regular, or logarithmic.
-% The default style is "\gridstyle{\thinlines}{\thicklines}".\label{defaultgridstyle}
+% The default style is
+% "\gridstyle{\thinlines}{\thicklines}".\label{defaultgridstyle}\index{grid>style|)usage}
%
%
% \subsection{Bells and Whistles}
% \subsubsection{Manual Labels}
% \DescribeMacro{\sethlabel}\DescribeMacro{\setvlabel}
-% All the number-line and coordinate-system commands format the labels using
+% All the number-line and coordinate-system commands format the
+% labels\index{labels>manual|usage}\index{manual labels|usage} using
% the commands "\sethlabel" (for labels on horizontal axes) and
% "\setvlabel" (for labels on vertical axes). If you set labels manually,
% you should use the same commands for a uniform appearance.
@@ -701,8 +733,9 @@
% \subsubsection{Thick Tick Density}
% \DescribeMacro{\hthickratio}
% \DescribeMacro{\vthickratio}
-% By default every fifth tick mark is thick. You can change that by
-% redefining
+% By default every fifth tick mark is
+% thick.\index{thick ticks|usage}\index{ticks>ratio of thick|usage}
+% You can change that by redefining
% the commands "\hthickratio" and "\vthickratio".
% \begin{quote}
% \begin{verbatim}
@@ -718,7 +751,8 @@
%
% \subsubsection{Different Scales on the Two Axes}
% \DescribeMacro{\rescaleby}
-% LaTeX\ (the \textsf{picture} environment) does not support different scales
+% LaTeX\ (the \textsf{picture} environment) does not support different
+% scales\index{labels>re-scaled|usage}\index{scaling labels|usage}
% on the two axes; "\unitlength" is used for both the
% horizontal and the vertical direction.
% However, you may create the \emph{appearance} of different scales by
@@ -740,12 +774,15 @@
% \end{quote}
% That is,
% \begin{quote}
-% "\rescaleby"\oarg{opt}\marg{num}\marg{den}\marg{cmd}
+% "\rescaleby"\oarg{symb}\marg{num}\marg{den}\marg{cmd}
% \end{quote}
-% multiplies the labels by $\frac{\meta{num}}{\meta{den}}$;
-% both \meta{num} and \meta{den} should be positive integers.
-% If the optional argument is present, each label will also
-% be multiplied by \meta{opt} (which may be a non-integer).
+% multiplies the labels by $\frac{\meta{num}}{\meta{den}}\meta{symb}$;
+% both \meta{num} and \meta{den} must be integers;
+% and \meta{den} must be positive.\footnote{Multiplying the labels by
+% a negative number does not reverse the arrows, so I suggest using
+% boxed coordinate systems in that case.}
+% The optional argument, if present, represents a symbolic
+% (non-numeric) scale factor; see the example below.
% The last argument, \meta{cmd}, must be one of "\hlabel"
% or "\vlabel".
%
@@ -776,7 +813,7 @@
% As you can affect the width of the dots or lines of a
% "\coordgrid" with a "\gridstyle" command,
% so you can affect the width of the tick marks with a
-% "\tickstyle" command:
+% "\tickstyle"\index{ticks>style of|usage} command:
% \begin{quote}
% "\tickstyle"\marg{thin declaration}\marg{thick declaration}
% \end{quote}
@@ -793,7 +830,8 @@
% \texttt{\textbackslash tickstyle}.}
%
% \DescribeMacro{\ticklength}
-% The "\ticklength" command controls the length of the tick marks.
+% The "\ticklength" command controls the length of the
+% tick marks.\index{ticks>length of|usage}
% \begin{quote}
% \begin{verbatim}
% \tickstyle{\thinlines\renewcommand{\ticklength}{4pt}}
@@ -808,7 +846,8 @@
% Note that the \emph{command} "\ticklength" must be changed with
% "\renewcommand".
%
-% If you prefer tick marks just on the outside of the coordinate axes, load
+% If you prefer tick marks\index{ticks>style of|usage}
+% just on the outside of the coordinate axes, load
% \textsf{coordsys} with the \textsf{outside} option.
% \begin{quote}
% \begin{verbatim}
@@ -838,7 +877,8 @@
%
% \subsection{One Dimension}
% \DescribeMacro{\logline}
-% The "\logline" command typesets a horizontal, logarithmic number line.
+% The "\logline" command typesets a horizontal, logarithmic number
+% line.\index{number line>logarithmic|(usage}
% \begin{quote}
% \begin{verbatim}
% \logline{-60}{210}
@@ -873,7 +913,8 @@
% The "\logline" command only typesets an axis; it does not change the
% way \LaTeX\ and the \textsf{picture} environment interprets coordinates.
% The equation below gives the relationship between the coordinate to
-% "\put", $x_p$, and the apparent coordinate, $x_a$.
+% "\put", $x_p$, and the apparent coordinate,
+% $x_a$.\index{labels>logarithmic|usage}
% \[
% x_p = \meta{spacing} \log_{10} x_a.
% \]
@@ -899,12 +940,13 @@
% "\vlogline*"\oarg{spacing}\marg{from}\marg{to}
% \end{quote}
% The syntax is similar to that of the "\logline" command
-% \vpageref[above]{loglinesyntax}.
+% \vpageref[above]{loglinesyntax}.\index{number line>logarithmic|)usage}
%
%
% \subsection{Two Dimensions}
% \DescribeMacro{\logsys}
-% Use the "\logsys" command to typeset logarithmic coordinate systems.
+% Use the "\logsys"\index{coordinate system>logarithmic|(usage}
+% command to typeset logarithmic coordinate systems.
% \begin{quote}
% \begin{picture}(220,125)(-70,-65)
% \logsys[5](-50,-50)(150,60)
@@ -980,7 +1022,8 @@
% thick tick marks (powers of $10$) on the vertical axis;
% the default is 50 units.
% The starred version omits the labels.
-% All the arguments must be integers.
+% All the arguments must be
+% integers.\index{coordinate system>logarithmic|)usage}
%
% \DescribeMacro{\loggrid}
% \DescribeMacro{\loggrid*}
@@ -988,7 +1031,8 @@
% \DescribeMacro{\semiloggrid*}
% \DescribeMacro{\logloggrid}
% \DescribeMacro{\logloggrid*}
-% The "\loggrid", "\loggrid*", "\semiloggrid",
+% The "\loggrid",\index{grid>logarithmic|(usage}
+% "\loggrid*", "\semiloggrid",
% "\semiloggrid*", "\logloggrid", and "\logloggrid*" commands
% typeset logarithmic grids.
% \begin{quote}
@@ -1019,7 +1063,7 @@
% thick tick marks (the powers of $10$) on logarithmic axes.
% The starred versions use solid lines;
% the un-starred versions use dotted lines.
-% All the arguments must be integers.
+% All the arguments must be integers.\index{grid>logarithmic|)usage}
%
%
% \section{Filling the Coordinate Systems}
@@ -1111,7 +1155,8 @@
%
%
% \subsection{Curves}
-% For plotting curves I recommend the \textsf{epic} and
+% For plotting curves\index{curves|(usage}
+% I recommend the \textsf{epic} and
% \textsf{eepic} packages.\footnote{Both are old \LaTeX209 packages that work
% fine in \LaTeXe. The \textsf{eepic} package re-implements the \textsf{epic}
% package making use of \textsc{PostScript}. The \textsf{eepic} package
@@ -1119,14 +1164,14 @@
% I especially like \textsf{(e)epic}'s "\putfile" command which allows
% you to calculate your plot with some external program, export the points to
% plot to a text file, and import that file to have \LaTeX\ draw the plot.
-% For external program I use Maple.
+% For external program I use Maple.\index{curves>with Maple|usage}
% The \textsf{coordsys} package includes a piece of
% Maple code that exports a Maple plot in the form "\putfile" expects.
% You can therefore take advantage of Maple adaptive plotting
% algorithm\footnote{Maple cleverly calculates more points where the curve
% wiggles.} in your \LaTeX\ plots.
%
-% Here is how it works:
+% Here is how it works:\index{putfile|usage}
% In Maple, read in the file \url{putfile} which is part of the
% \textsf{coordsys} package.
% \begin{verbatim}
@@ -1196,14 +1241,15 @@
%
% To draw a curve that requires (or looks best with) different scales on
% the two axes, you can use the "scale" option to
-% "putfile" in Maple:
+% "putfile"\index{curves>scaled|(usage}\index{putfile>scale|(usage}
+% in Maple:
% \begin{verbatim}
% > plot( (x+2)*(x-1)*(x-2), x=-3..4 );
% > putfile( "cubic.put", %, scale=[10, 1] );
% \end{verbatim}
% Now all the $x$-coordinates in "cubic.put" are $10$ times larger
% than they should be. Thus re-scale the horizontal labels
-% by~$\frac{1}{10}$.
+% by~$\frac{1}{10}$.\index{labels>re-scaled|(usage}\index{scaling labels|(usage}
% \begin{quote}
% \begin{verbatim}
% \rescaleby{1}{10}{\hlabel}
@@ -1268,7 +1314,8 @@
% \fi
% \end{quote}
%
-% If the plot contains more than one curve, "putfile" generates
+% If the plot contains more than one curve,
+% "putfile"\index{putfile>multiple curves|usage} generates
% one file for each. You can of course specify multiple curves
% directly, but they can also be the result of the "discont"
% option to "plot".
@@ -1316,7 +1363,10 @@
% \fi
% \end{quote}
%
-% For logarithmic plots scaling is almost always necessary. Consider the
+% For logarithmic plots
+% scaling\index{curves>logarithmic|usage}\index{scaling labels>logarithmic|usage}
+% is almost always necessary.
+% Consider the
% graph of $y=\frac{1}{1+e^{-x}}$ for $x$ running from $-10$ to $10$.
% The $y$-coordinates extend over five powers of $10$, so scale by $4$
% to make it comparable to the range of $x$-coordinates.
@@ -1355,8 +1405,10 @@
% \end{picture}
% \fi
% \end{quote}
+% \index{curves>scaled|)usage}\index{putfile>scale|)usage}%
+% \index{labels>re-scaled|)usage}\index{scaling labels|)usage}
%
-% Use the "putfile" command as follows:
+% Use the "putfile" command as follows:\index{putfile>syntax|usage}
% \begin{quote}
% "putfile(" \meta{filename}"," \meta{PLOT structure} [","
% \meta{options} ] ");"
@@ -1369,7 +1421,7 @@
% as is. (So if you do not want "putfile" to meddle with your filename,
% give it in a set.)
%
-% The only possible option is
+% The only possible option is\index{putfile>scale|(usage}
% \begin{quote}
% "scale" "=" "[" \meta{number}"," \meta{number} "]"
% \end{quote}
@@ -1389,11 +1441,11 @@
% you should use the optional \meta{spacing} argument to
% the command that draws the coordinate system, say
% "\logsys[30]("\dots
-% \end{itemize}
+% \end{itemize}\index{putfile>scale|)usage}\index{curves|)usage}
%
%
% \section{Installation}
-% Extract the \url{.sty} files from
+% Extract\index{installation|usage} the \url{.sty} files from
% the \url{.dtx} file by running \url:coordsys.ins: through \LaTeX.
% Then generate the documentation for the \textsf{coordsys} and
% \textsf{logsys} packages
@@ -1435,17 +1487,21 @@
%
% \section{Acknowledgements}
% Thank you to Scott Pakin
-% (\url{pakin@uiuc.edu}) for his input on the implementation of Euclid's
+% for his input on the implementation of Euclid's
% algorithm.
%
% Thank you to Svend Daugaard Pedersen
-% (\url{Svend@DaugaardPedersen.dk})
% for catching an error in the logarithmic systems
% and for suggestions that led to "\gridstyle".
%
-% Thank you to Staffan Lundberg who found an error in my understanding
+% Thank you to Staffan Lundberg
+% who found an error in my understanding
% of Maple's structured types and thus prompted me to polish the
-% Maple code for "pufile".
+% Maple code for "putfile".
+%
+% Thank you to Jan Hegewald
+% whose questions led to an improved description and implementation
+% of "\rescaleby".
%
%
% \StopEventually{
@@ -1460,7 +1516,7 @@
% \begin{macrocode}
%<*coordsys>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{coordsys}[2004/11/15 version 1.3]
+\ProvidesPackage{coordsys}[2006/02/03 version 1.4]
% \end{macrocode}
%
% \subsubsection{Declaration of Options}
@@ -1606,18 +1662,18 @@
% which should be either "\hlabel" or "\vlabel".
% After
% \begin{quote}
-% "\rescaleby"\oarg{opt}\marg{num}\marg{den}"{\hlabel}"
+% "\rescaleby"\oarg{symb}\marg{num}\marg{den}"{\hlabel}"
% \end{quote}
% the result of "\hlabel"\marg{x} should be
-% $\frac{\meta{num}\times \meta{x}}{\meta{den}} \meta{opt}$.
+% $\frac{\meta{num}\times \meta{x}}{\meta{den}} \meta{symb}$.
% \begin{macrocode}
\newcommand{\rescaleby}[4][]{\renewcommand{#4}[1]{{%
\count@=##1\relax
- \ifnum\count@<0\count@=-\count@\fi
\ifnum\count@=0\relax
\@tempcntb=1\relax
\else
\multiply\count@ #2\relax
+ \ifnum\count@<0\count@=-\count@\fi
\@EuclidGCD{\count@}{#3}%
\count@=##1\relax
\multiply\count@ #2\relax
@@ -2337,6 +2393,7 @@
\def\coordsys@c{}%
\fi\fi\fi
% \end{macrocode}
+% \begin{macro}{\coordsys@w}\begin{macro}{\coordsys@h}
% Finally, "\put" the pieces down. Here "\coordsys@w" is the vertical
% coordinate of the last typeset horizontal axis (usually~$0$),
% and "\interval@line" is defined by "\intervalthickness" below.
@@ -2350,7 +2407,7 @@
\fi
\next}
% \end{macrocode}
-% \end{macro}
+% \end{macro}\end{macro}\end{macro}
%
% \begin{macro}{\vinterval}
% \begin{macro}{\vinterv@l}
@@ -2450,6 +2507,7 @@
% \end{macro}\end{macro}
%
% \begin{macro}{\intervalthickness}
+% \begin{macro}{interval@line}\begin{macro}{\vinterval@line}
% The "\intervalthickness" command defines the two commands "\interval@line"
% and "\vinterval@line" that draw the thick line indicating the interval.
% \begin{macrocode}
@@ -2476,7 +2534,7 @@
}%
}
% \end{macrocode}
-% \end{macro}
+% \end{macro}\end{macro}\end{macro}
%
% Then a few defaults for "\interval" and "\vinterval".
% \begin{macrocode}
@@ -2490,7 +2548,7 @@
% \begin{macrocode}
%<*euclid>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{euclidgcd}[2004/11/15 version 1.3]
+\ProvidesPackage{euclidgcd}[2006/02/03 version 1.4]
\newcommand{\EuclidGCD}[2]{%
\@EuclidGCD{#1}{#2}%
\the\@tempcnta}
@@ -2536,7 +2594,7 @@
% \begin{macrocode}
%<*logsys>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{logsys}[2004/11/15 version 1.3]
+\ProvidesPackage{logsys}[2006/02/03 version 1.4]
% \end{macrocode}
%
% \subsubsection{Options}
@@ -2551,7 +2609,7 @@
% \subsubsection{Package Loading}
% The \textsf{logsys} package extends the \textsf{coordsys} package.
% \begin{macrocode}
-\RequirePackage{coordsys}[2004/11/15]
+\RequirePackage{coordsys}[2006/02/03]
% \end{macrocode}
%
% \subsubsection{Main Code}
@@ -3034,8 +3092,8 @@
%<*putfile>
putfile := proc(fn::{string, list(string), set(string)},
P::specfunc(anything, PLOT) )
- option `Copyright 2000-04 by Mogens Lemvig Hansen`;
- description "version 1.0";
+ option `Copyright 2000-06 by Mogens Lemvig Hansen`;
+ description "version 1.1";
local L, fns, i, V, scl, FH, ttl, pt, path, ext;
global StringTools;
% \end{macrocode}
@@ -3118,7 +3176,7 @@ putfile := proc(fn::{string, list(string), set(string)},
% Finally, extract the title, if any.
% The title will be included as a comment.
% Since the title could be a multi-line string, we must insert "%" characters
-% before any new-lines.
+% after any new-lines.
% \begin{macrocode}
ttl := select(type, [op(P)], 'specfunc'('anything', 'TITLE'));
if nops(ttl) = 1 then
@@ -3140,8 +3198,8 @@ putfile := proc(fn::{string, list(string), set(string)},
if scl <> [1,1] then fprintf(FH, "%% scaled %a\n", scl) fi;
V := [ map2(op, 1, L[i]), map2(op, 2, L[i]) ];
V := map( u-> min(op(u))..max(op(u)), V );
- fprintf(FH, "%% horizontal range: %f..%f\n", op(V[1]));
- fprintf(FH, "%% vertical range: %f..%f\n", op(V[2]));
+ fprintf(FH, "%% horizontal range: %f .. %f\n", op(V[1]));
+ fprintf(FH, "%% vertical range: %f .. %f\n", op(V[2]));
for pt in L[i] do
fprintf(FH, "%f \t%f\n", op(pt));
od;
@@ -3163,8 +3221,8 @@ end;
% "putfile/grabcurves" will flatten to one sequence of \meta{curve}s
% \begin{macrocode}
`putfile/grabcurves` := proc(x)
- option `Copyright 2000-04 by Mogens Lemvig Hansen`;
- description "version 1.0";
+ option `Copyright 2000-06 by Mogens Lemvig Hansen`;
+ description "version 1.1";
local L;
if op(0, x) = 'CURVES' then
L := [ op(x) ];
@@ -3182,8 +3240,8 @@ end;
% \begin{macrocode}
`putfile/cleancurve` := proc(CC::list, V::list)
local C, B, pts, pt, m, i;
- option `Copyright 2004 by Mogens Lemvig Hansen`;
- description "version 1.0";
+ option `Copyright 2004-06 by Mogens Lemvig Hansen`;
+ description "version 1.1";
% \end{macrocode}
% Remove any non-numeric points.
% \begin{macrocode}
@@ -3233,13 +3291,13 @@ end;
% \begin{macrocode}
pts := [pts];
if C[i-1][1] < C[i][1] then
- pts := sort(pts, (u,v)->evab(u[1]<v[1]));
+ pts := sort(pts, (u,v)->evalb(u[1]<v[1]));
elif C[i-1][1] > C[i][1] then
- pts := sort(pts, (u,v)->evab(u[1]>v[1]));
+ pts := sort(pts, (u,v)->evalb(u[1]>v[1]));
elif C[i-1][2] < C[i][2] then
- pts := sort(pts, (u,v)->evab(u[2]<v[2]));
+ pts := sort(pts, (u,v)->evalb(u[2]<v[2]));
elif C[i-1][2] > C[i][2] then
- pts := sort(pts, (u,v)->evab(u[2]>v[2]));
+ pts := sort(pts, (u,v)->evalb(u[2]>v[2]));
else
error "cannot happen";
fi;
diff --git a/Master/texmf-dist/source/latex/coordsys/coordsys.ins b/Master/texmf-dist/source/latex/coordsys/coordsys.ins
index 439f205d738..6533a29459e 100644
--- a/Master/texmf-dist/source/latex/coordsys/coordsys.ins
+++ b/Master/texmf-dist/source/latex/coordsys/coordsys.ins
@@ -1,51 +1,51 @@
-% The coordsys and logsys packages, version 1.3.
-% Run first this file, coordsys.ins, then coordsys.dtx
-% through LaTeX and read the documentation in coordsys.dvi
-%
-\input docstrip.tex
-\preamble
-
-
- This is the coordsys and logsys packages
- Copyright 2000-04 by Mogens Lemvig Hansen,
- mlhansen@uniserve.com
-
-This program may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either version 1.3
-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 2003/12/01 or later.
-
-This program consists of the files coordsys.dtx and coordsys.ins
-
-\endpreamble
-\generate{\file{coordsys.sty} {\from{coordsys.dtx}{coordsys}}
- \file{logsys.sty} {\from{coordsys.dtx}{logsys}}
-% \file{euclidgcd.sty}{\from{coordsys.dtx}{euclid}}
- }
-
-{\catcode`\#=12\gdef\MetaPrefix{##}}
-\preamble
-
-
- This is the coordsys and logsys packages
- Copyright 2000-04 by Mogens Lemvig Hansen,
- mlhansen@uniserve.com
-
-This program may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either version 1.3
-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 2003/12/01 or later.
-
-This program consists of the files coordsys.dtx and coordsys.ins
-
-\endpreamble
-\nopostamble
-\generate{\file{putfile.} {\from{coordsys.dtx}{putfile}}
- }
-\endbatchfile
+% The coordsys and logsys packages, version 1.4.
+% Run first this file, coordsys.ins, then coordsys.dtx
+% through LaTeX and read the documentation in coordsys.dvi
+%
+\input docstrip.tex
+\preamble
+
+
+ This is the coordsys and logsys packages
+ Copyright 2000-06 by Mogens Lemvig Hansen,
+ mlhansen@uniserve.com
+
+This program may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+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 2003/12/01 or later.
+
+This program consists of the files coordsys.dtx and coordsys.ins
+
+\endpreamble
+\generate{\file{coordsys.sty} {\from{coordsys.dtx}{coordsys}}
+ \file{logsys.sty} {\from{coordsys.dtx}{logsys}}
+% \file{euclidgcd.sty}{\from{coordsys.dtx}{euclid}}
+ }
+
+{\catcode`\#=12\gdef\MetaPrefix{##}}
+\preamble
+
+
+ This is the coordsys and logsys packages
+ Copyright 2000-06 by Mogens Lemvig Hansen,
+ mlhansen@uniserve.com
+
+This program may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+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 2003/12/01 or later.
+
+This program consists of the files coordsys.dtx and coordsys.ins
+
+\endpreamble
+\nopostamble
+\generate{\file{putfile.} {\from{coordsys.dtx}{putfile}}
+ }
+\endbatchfile
diff --git a/Master/texmf-dist/source/latex/dramatist/dramatist.dtx b/Master/texmf-dist/source/latex/dramatist/dramatist.dtx
index 456d100e210..64b27a31ae3 100644
--- a/Master/texmf-dist/source/latex/dramatist/dramatist.dtx
+++ b/Master/texmf-dist/source/latex/dramatist/dramatist.dtx
@@ -1,6 +1,6 @@
%\iffalse
%% dramatist.dtx
-%% Copyright (C) 2003-2004 Massimiliano Dominici
+%% Copyright (C) 2003-2005 Massimiliano Dominici
%
% This program is free software; you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
@@ -49,6 +49,7 @@
\makeatother
\OnlyDescription
\EnableCrossrefs
+\CodelineIndex
\RecordChanges
\providecommand\envname[1]{\textsf{#1}}
\providecommand\clsname[1]{\textsf{#1}}
@@ -60,7 +61,7 @@
\end{document}
%</driver>
%\fi
-% \CheckSum{1008}
+% \CheckSum{523}
%% \CharacterTable%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
%% Digits \0\1\2\3\4\5\6\7\8\9
@@ -88,6 +89,18 @@
%environment (\envname{CharacterGroup}) for characters groups in
%the \emph{Dramatis Person\ae} list; added various hooks for user
%customization.}
+%\changes{v1.2a}{2005/05/21}{Fixed a bug in the vertical spacing of
+%\cs{DramPer}. Changed name of counter \textsf{linenumber} in
+%\textsf{verselinenumber} in order to mantain compatibility with
+%package \pkgname{poemscol}}
+%\changes{v1.2c}{2005/07/26}{Fixed two bugs: now the package works
+%correctly with the spanish extension of \pkgname{babel} and a
+%\cs{\meta{name}} command at the end of a \cs{direct} macro no more gives
+%an unwanted space. Fixed a typo in the author e-mail address.}
+%\changes{v1.2d}{2005/12/01}{Fixed three bugs: restored a missing
+%backslash in \cs{dirdelimiter}; customized lengths in character groups
+%inside a Dramatis Personae list now work correctly; \cs{speaksdel} is
+%now appended to characters' label in verse drama environment too.}
%
%\DoNotIndex{\@afterheading,\@afterindentfalse,\@break@tfor,\@empty}
%\DoNotIndex{\@ifstar,\@let@token,\@namedef,\@nameuse,\@nil}
@@ -113,7 +126,7 @@
%
%\title{The \Filename{dramatist} package\thanks{This file has version
%number \fileversion{} dated \filedate{}.} \\User Guide}
-%\author{Massimiliano Dominici\\\texttt{mlgdominici@intrefree.it}}
+%\author{Massimiliano Dominici\\\texttt{mlgdominici@interfree.it}}
%\date{\filedate}
%\maketitle
%
@@ -499,8 +512,9 @@
%
% \begin{macrocode}
%<*dramatist>
-\ProvidesPackage{dramatist}[2004/05/10 v1.2 Package for typesetting drama -- Author: Massimiliano Dominici]
+\ProvidesPackage{dramatist}[2005/12/01 v1.2d Package for typesetting drama -- Author: Massimiliano Dominici]
\NeedsTeXFormat{LaTeX2e}
+\RequirePackage{xspace}
% \end{macrocode}
%\subsection{Conditionals, options and counters}
%The following line checks wether a class defining |\if@openright|
@@ -599,7 +613,7 @@
\@drversetrue
\if@poemscol
\begin{poem}
- \setcounter{linenumber}{\value{storelineno}}
+ \setcounter{verselinenumber}{\value{storelineno}}
\setcounter{printlineindex}{\value{storeprintlineindex}}
\else
\begin{verse}
@@ -613,7 +627,7 @@
\fi
\if@poemscol
\end{poem}
- \setcounter{storelineno}{\value{linenumber}}
+ \setcounter{storelineno}{\value{verselinenumber}}
\setcounter{storeprintlineindex}{\value{printlineindex}}
\else
\end{verse}
@@ -813,10 +827,7 @@
%The macro |\Character| performs three different tasks. First,
%it creates, being \meta{name} the third argument, the command
%|\|\meta{name}, for use in stage directions; in order to achieve
-%this task it uses |\@namedef|, and a new defined command,
-%|\intsp@ce|, which takes care of inserting spaces when needed and
-%which is inspired by |\text@command| (both for this and for
-%|\@namedef| see the latex source).
+%this task it uses |\@namedef| (see the latex source).
%
%In second place it creates a |\|\meta{name}|speaks| command, used
%for printing the speaker's name. It uses, for this purpose a
@@ -843,10 +854,10 @@
\def\@xcharacter[#1]#2#3{%
\stepcounter{character}
\@character{#2}{#3}
- \n@me@ppend@nddef{persona}{\roman{character}}{\castfont #1}
+ \n@me@ppend@nddef{persona}{@\Roman{character}}{\castfont #1}
}
\def\@character#1#2{%
- \@namedef{#2}{{\namefont #1}\intsp@ce{#1}\check@spr}
+ \@namedef{#2}{{\namefont #1}\xspace}
\n@me@ppend@nddef{#2}{\@ppendname}{%
\if@drverse
{\speakstab\speaksfont{#1}\speaksdel\par\nobreak\addvspace{-\parskip}}
@@ -876,7 +887,7 @@
% \begin{macrocode}
\newenvironment{CharacterGroup}[1]{%
\stepcounter{character}
- \newcounter{g\roman{character}}
+ \newcounter{g\Roman{character}}
\grouplist{#1}
}{}
% \end{macrocode}
@@ -887,9 +898,9 @@
% \begin{macrocode}
\newsavebox{\tbox}
\newcommand\grouplist[1]{%
- \global\n@me@ppend@nddef{persona}{\roman{character}}{%
+ \global\n@me@ppend@nddef{persona}{@\Roman{character}}{%
\begin{lrbox}{\tbox}
- \begin{minipage}[c]{.65\textwidth}\raggedright
+ \begin{minipage}[c]{\CharWidth}\raggedright
\leftmargini=0pt
\begin{list}{}{\itemsep=0pt}
\dogrouplist
@@ -898,14 +909,14 @@
\end{lrbox}
\parbox{\CharWidth}{\usebox{\tbox}}%
\parbox{\ParenWidth}{$\left.\rule{0pt}{\ht\tbox}\right\}$}
- \parbox{\CastWidth}{\castfont #1}}
+ \parbox{\CastWidth}{\castfont #1\strut}}
}
% \end{macrocode}
% \begin{macrocode}
\newcommand{\dogrouplist}{%
- \ifnum\value{g\roman{temp}}>\value{gtemp}
+ \ifnum\value{g\Roman{temp}}>\value{gtemp}
\stepcounter{gtemp}
- \item\@nameuse{gpersona\Roman{temp}\roman{gtemp}}
+ \item\@nameuse{gpersona@\Roman{temp}@\Roman{gtemp}}\strut
\dogrouplist
\fi
\setcounter{gtemp}{0}
@@ -920,16 +931,16 @@
%argument is, obviously, mandatory.
% \begin{macrocode}
\newcommand\GCharacter[3]{
- \stepcounter{g\roman{character}}
- \global\@namedef{#3}{{\namefont #2}\intsp@ce{#2}\check@spr}
+ \stepcounter{g\Roman{character}}
+ \global\@namedef{#3}{{\namefont #2}\xspace}
\global\n@me@ppend@nddef{#3}{\@ppendname}{%
\if@drverse
- {\speakstab\speaksfont #2\par\nobreak\addvspace{-\parskip}}
+ {\speakstab\speaksfont #2\speaksdel\par\nobreak\addvspace{-\parskip}}
\else
- \item[#2]
+ \item[#2\speaksdel]
\fi}
- \global\n@me@ppend@nddef{gpersona\Roman{character}}{%
- \roman{g\roman{character}}}{\castfont #1}
+ \global\n@me@ppend@nddef{gpersona@\Roman{character}}{%
+ @\Roman{g\Roman{character}}}{\castfont #1}
}
% \end{macrocode}
%\end{macro}
@@ -947,69 +958,6 @@
\fi}
% \end{macrocode}
%\end{macro}
-%\begin{macro}{\intsp@ce}
-%For details about this code you may have a look to
-%\Filename{ltfntcmd.dtx}.
-% \begin{macrocode}
-\let \nospace \relax
-% \end{macrocode}
-% \begin{macrocode}
-\let \check@spr \@empty
-% \end{macrocode}
-% \begin{macrocode}
-\def \intsp@ce #1{%
- \def \reserved@a {#1}%
- \ifx \reserved@a \@empty
- \let \check@spr \@empty
- \else
- \ifx \reserved@a \space
- \let \check@spr \@empty
- \else
- \check@nospace@ #1\nospace\@nil
- \fi
- \fi
-}
-% \end{macrocode}
-% \begin{macrocode}
-\def \check@nospace@ #1#2\nospace#3\@nil {%
- \let \check@spr \maybe@sp
- \def \reserved@a {\nospace}%
- \def \reserved@b {#1}%
- \def \reserved@c {#3}%
- \ifx \reserved@a \reserved@b
- \ifx \reserved@c \@empty
- \else
- \let \check@spr \@empty
- \fi
- \else
- \ifx \reserved@c \@empty
- \else
- \let \check@spr \@empty
- \fi
- \fi
-}
-% \end{macrocode}
-% \begin{macrocode}
-\def \maybe@sp {\futurelet\@let@token\maybe@sp@}
-\def \maybe@sp@ {%
- \@tempswatrue
- \expandafter\@tfor\expandafter\reserved@a\expandafter:\expandafter=%
- \nospacelist
- \do \t@st@sp
- \if@tempswa \space \fi
-}
-\def \t@st@sp {%
- \expandafter\let\expandafter\reserved@b\expandafter=\reserved@a\relax
- \ifx\reserved@b\@let@token
- \@tempswafalse
- \@break@tfor
- \fi
-}
-% \end{macrocode}
-% \begin{macrocode}
-\def \nospacelist {,.;:?!)}
-% \end{macrocode}
-%\end{macro}
%\begin{macro}{\DramPer}
%\changes{v1.1}{2004/01/19}{\cs{DramPer} is now defined in a standard
%way and has an optional argument (to use for footnotes and the
@@ -1050,7 +998,7 @@
\newcommand{\dodramperlist}{%
\ifnum\value{character}>\value{temp}
\stepcounter{temp}
- \item\@nameuse{persona\roman{temp}}
+ \item\@nameuse{persona@\Roman{temp}}\strut
\dodramperlist
\fi
}
@@ -1073,9 +1021,9 @@
\newcommand{\@direct}[1]{%
\if@drverse
\vskip2\normallineskip
- \parbox[b]{\dirwidth}{\dirdelimiter{\emph{#1}}}\@centercr
+ \parbox[b]{\dirwidth}{\dirdelimiter{{\itshape #1}}}\@centercr
\else
- \dirdelimiter{\emph{#1}}\unskip
+ \dirdelimiter{{\itshape #1}}\unskip
\fi
}
% \end{macrocode}
@@ -1083,7 +1031,7 @@
\newcommand{\@sdirect}[1]{%
\if@drverse
\vskip2\normallineskip
- \parbox[b]{\dirwidth}{\dirdelimiter{\emph{#1}}}\\!
+ \parbox[b]{\dirwidth}{\dirdelimiter{\itshape #1}}\\!
\else
\starrederror
\fi
@@ -2125,8 +2073,8 @@
%free software license, such as the GNU General Public License,
%to permit their use in free software.
%
-%\StopEventually{
-%\begin{thebibliography}{10}
+% \StopEventually{
+% \begin{thebibliography}{10}
% \bibitem{knuth} Donald Knuth.
% \newblock \emph{The \TeX book},
% \newblock Addison--Wesley, Reading, MA, 1996.
@@ -2137,10 +2085,10 @@
% \bibitem{ver} Peter Wilson
% \newblock \emph{Typesetting simple verse with \LaTeX},
% \newblock (Available from CTAN, \texttt{macros/latex/contrib/supported/verse})
-%\end{thebibliography}
-%\PrintChanges
-%\PrintIndex
-%}
+% \end{thebibliography}
+% \PrintChanges
+% \PrintIndex
+% }
%\iffalse
%<*schiller>
%\fi
@@ -2794,6 +2742,7 @@ And, when I die, here shall my spirit walk.\\!
%\iffalse
%</vmarlowe>
%\fi
+%\iffalse
%<*pmarlowe>
%\fi
% \begin{macrocode}
@@ -3136,5 +3085,6 @@ And, when I die, here shall my spirit walk.\verseline
%</pmarlowe>
%\fi
%\Finale
+% \PrintIndex \PrintChanges
\endinput
diff --git a/Master/texmf-dist/source/latex/egplot/egplot.drv b/Master/texmf-dist/source/latex/egplot/egplot.drv
index 57a1dcc6089..10f5c5b4b36 100644
--- a/Master/texmf-dist/source/latex/egplot/egplot.drv
+++ b/Master/texmf-dist/source/latex/egplot/egplot.drv
@@ -32,7 +32,7 @@
%% Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% \CheckSum{376}
+%% \CheckSum{449}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -52,6 +52,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage{doc}
+\usepackage{multicol}
\IfFileExists{mflogo.sty}%
{\usepackage{mflogo}%
\def\GP{\textsf{gnuplot}}%
@@ -60,7 +61,7 @@
{\def\GP{\textsf{gnuplot}}%
\def\EMP{\textsf{EMP}}%
\def\EGP{\textsf{egplot}}}
-\usepackage{egplot}
+\usepackage[gnuplot35]{egplot}
\setlength{\parindent}{0pt}
\def\manindex#1{\SortIndex{#1}{#1}}
\EnableCrossrefs
diff --git a/Master/texmf-dist/source/latex/egplot/egplot.dtx b/Master/texmf-dist/source/latex/egplot/egplot.dtx
index 78f345b9a8b..5e875969676 100644
--- a/Master/texmf-dist/source/latex/egplot/egplot.dtx
+++ b/Master/texmf-dist/source/latex/egplot/egplot.dtx
@@ -19,7 +19,7 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-%% \CheckSum{376}
+%% \CheckSum{449}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -40,8 +40,14 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% \changes{v1.00}{1998/06/17}{First released version}
-% \changes{v1.01}{1998/06/25}{Fixed bug with \texttt{german} option and negative tic
-% mark values}
+% \changes{v1.01}{1998/06/25}{Fixed bug with \texttt{german} option and
+% negative tic mark values}
+% \changes{v1.02}{1998/07/08}{Added options \texttt{gnuplot35} and
+% \texttt{gnuplot36beta} to allow output of
+% syntax of \GP{}-3.5.\\
+% Added numbering of \GP{} files to allow multiple
+% \texttt{egpfile} environments w/o explicitly
+% defined names in one document.}
%
% \MakeShortVerb{\|}
%
@@ -70,7 +76,10 @@
% enable the user to let \GP{} do calculations and insert the result values
% into the generated output.
% \end{abstract}
-%
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \begin{multicols}{2}
+% \tableofcontents
+% \end{multicols}
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \vfill
% \section*{Copying}
@@ -90,7 +99,7 @@
% Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
%
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% \newpage
+%
% \def\topfraction{0.9}
% \def\bottomfraction{0.9}
% \def\textfraction{0.1}
@@ -130,13 +139,14 @@
% In addition to the image inclusion commands \EGP{} provides the user with
% commands to let \GP{} do calculations and include the results into the
% document. Unfortunately these features are implemented with the UN*X text utils
-% and so they are only usable if these are installed on the system. Since the
+% and so they are only usable if these are installed on the system. If the user
+% does not provide a name for the \GP{} file the
% names for the PostScript and the result values files are built by appending
-% the figure/calculation number and a three letter extension (|.eps| or |.val|)
-% to |\jobname| the user has to choose a |\jobname| that is short enough so
-% that the generated filenames fit into the conventions of certain operating
-% systems.
-%
+% the number of the \GP{} file, the figure/calculation number and a three
+% letter extension (|.eps| or |.val|) to |\jobname|. So the user has to
+% choose a |\jobname| that is short enough so that the generated
+% filenames fit into the conventions of certain operating systems.
+%
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \section{Usage}
%
@@ -145,13 +155,28 @@
% \label{sec:options}
%
% \DescribeMacro{Options}
-% Besides the options of the |graphicx| package the option |german| is
-% recognized by the \EGP{} package.
-%
-% If |german| is specified the calculated values and the tic labels of the
-% diagrams are changed to show a `,' as decimal point character. The default is
-% a `.'. This feature is also implemented with UN*X text utils and is only
-% available if they are installed on the system.
+% Besides the options of the |graphicx| package \EGP{} recognizes the following
+% options:
+% \begin{description}
+% \item[|german|:] If |german| is specified the calculated values and the tic labels of the
+% diagrams are changed to show a `,' as decimal point
+% character. The default is a `.'. This feature is also
+% implemented with UN*X text utils and is only available if
+% they are installed on the system.
+% \item[|gnuplot35|:] If |gnuplot35|~(default) is specified the \GP{} commands
+% generated by |egplot| will be compatible with the syntax
+% of the official \GP{} version~3.5. Of course the user
+% has to look for the right syntax in his \GP{} code
+% himself. Special care has to be taken for the
+% |\egpprelude{|\dots|}| and the |\egpfigepilog{|\dots|}|
+% commands since these are used to implement the missing
+% |reset| command of \GP{}-3.5.
+% \item[|gnuplot36beta|:] If |gnuplot36beta| is specified the \GP{} commands
+% generated by |egplot| will use the features of the
+% beta version \GP{}~3.6beta. As mentioned above the user
+% has to look for the right syntax in his \GP{} code
+% himself.
+% \end{description}
%
% \subsection{Commands and Environments}
% \label{sec:commands}
@@ -260,11 +285,13 @@
% This command can be used for e.g. |replot|ting the figure to the screen or
% |reset|ing to the defaults after every figure.
%
-% The default is:
+% The defaults are as follows:
% \begin{quote}
-% \qquad{}|reset|
+% \begin{tabular}{lll}
+% Option: & none, |gnuplot35| & |gnuplot36beta| \\
+% & |load "reset.gp"| & |reset| \\
+% \end{tabular}
% \end{quote}
-%
%
% \subsubsection{Calculating}
% \label{sec:calculations}
@@ -307,8 +334,9 @@
% \label{sec:procedure}
%
% After \LaTeX{} has done it's job for the first time you have to invoke \GP{}
-% on the generated file~(default: |\jobname.gp|). Then another \LaTeX{} run is
-% necessary to include the figures and the results into the output.
+% on the generated file~(default: |\jobnameX.gp|, where |X| is a number). Then
+% another \LaTeX{} run is necessary to include the figures and the results into
+% the output.
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \subsection{Examples}
% \label{sec:examples}
@@ -414,7 +442,8 @@
% \begin{macrocode}
$f(\pi/4)=\egpshowval[sin_quarter_pi]{sin(pi/4)}$
% \end{macrocode}
-% and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}$.
+% and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}\footnote{I
+% couldn't figure out how to remove the trailing space, yet. Any hints ?}$
% \begin{macrocode}
and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}$.
\end{egpfile}
@@ -481,10 +510,10 @@ and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}$.
%
% \begin{macrocode}
%<*style>
-\def\fileversion{v1.01}
+\def\fileversion{v1.02a}
\NeedsTeXFormat{LaTeX2e}
\gdef\filename{egplot.sty}%
-\gdef\filedate{1998/06/20}%
+\gdef\filedate{1998/07/08}%
\gdef\filemaintainer{Axel Probst}%
% \end{macrocode}
%
@@ -493,19 +522,32 @@ and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}$.
\ProvidesPackage{egplot}[\filedate\space\fileversion\space
Encapsulated gnuplot LaTeX Package (\filemaintainer)]
% \end{macrocode}
-% Every option we don't understand is sent down to |graphicx|:
+%
+% Load the required packages:
% \begin{macrocode}
-\RequirePackage{graphicx}[1994/12/15]
\RequirePackage{verbatim}
\RequirePackage{ifthen}
+% \end{macrocode}
%
+% Now the options are specified:
+% \begin{macrocode}
\newboolean{egp@german}
\setboolean{egp@german}{false}
\DeclareOption{german}{%
\setboolean{egp@german}{true}}
+\newboolean{egp@oldgp}
+\setboolean{egp@oldgp}{true}
+\DeclareOption{gnuplot35}{%
+ \setboolean{egp@oldgp}{true}}
+\DeclareOption{gnuplot36beta}{%
+ \setboolean{egp@oldgp}{false}}
+% \end{macrocode}
%
+% Every option we don't understand is sent down to |graphicx|:
+% \begin{macrocode}
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{graphicx}}
\ProcessOptions
+\RequirePackage{graphicx}[1994/12/15]
% \end{macrocode}
%
% \begin{macro}{\egpwrite}
@@ -527,14 +569,20 @@ and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}$.
% This environment encloses each \GP{} input file. The single optional
% argument gives the name of the file.
% \begin{macrocode}
-\newcommand{\egpfile}[1][\jobname]{%
+\newcounter{egpfilenum} % 1998-03-07
+\setcounter{egpfilenum}{0} % 1998-03-07
+\newcommand{\egpfile}[1][\jobname\theegpfilenum_]{%
\def\theegpfile{#1}%
+ \ifthenelse{\equal{\theegpfile}{\jobname\theegpfilenum_}}{%
+ \stepcounter{egpfilenum}%
+ \def\theegpfilename{\jobname\theegpfilenum.gp}}{%
+ \def\theegpfilename{\theegpfile.gp}}
% \end{macrocode}
% Open the \GP{} file.
% \begin{macrocode}
\if@egpio
- \immediate\openout\@outegp=\theegpfile.gp\relax
- \egpwrite{\egpcomment\space \theegpfile.gp -- %
+ \immediate\openout\@outegp=\theegpfilename\relax
+ \egpwrite{\egpcomment\space \theegpfilename -- %
do not edit, generated automatically by \jobname.tex^^J}
% \end{macrocode}
% append the defined prelude and write it out:
@@ -622,20 +670,26 @@ and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}$.
% \begin{macrocode}
\def\egp@{%
\egp@start%
- \egpwrite{print 'generating picture ---- \theegpfile\theegpfig.eps'^^J%
- set output '\theegpfile\theegpfig.eps'^^J}
+ \ifthenelse{\boolean{egp@oldgp}}
+ {\egpwrite{\egpcomment\space --- \theegpfile\theegpfig.eps ---}}
+ {\egpwrite{print 'generating picture ---- \theegpfile\theegpfig.eps'}}
+ \egpwrite{set output '\theegpfile\theegpfig.eps'}
\egp@includegraphics{\theegpfile}{\theegpfig}%
\egpcmds}
\def\egp@x#1{%
- \egp@start%
- \egpwrite{print 'generating picture ---- \theegpfile\theegpfig.eps'^^J%
- set output '\theegpfile\theegpfig.eps'^^J}
- \egp@includegraphicx[#1]{\theegpfile}{\theegpfig}%
- \egpcmds}
+ \egp@start%
+ \ifthenelse{\boolean{egp@oldgp}}
+ {\egpwrite{\egpcomment\space --- \theegpfile\theegpfig.eps ---}}
+ {\egpwrite{print 'generating picture ---- \theegpfile\theegpfig.eps'}}
+ \egpwrite{set output '\theegpfile\theegpfig.eps'}
+ \egp@includegraphicx[#1]{\theegpfile}{\theegpfig}%
+ \egpcmds}
\def\egp@def{%
\egp@start%
- \egpwrite{print 'generating picture ---- \theegpfile\theegpfig.eps'^^J%
- set output '\theegpfile\theegpfig.eps'^^J}
+ \ifthenelse{\boolean{egp@oldgp}}
+ {\egpwrite{\egpcomment\space --- \theegpfile\theegpfig.eps ---}}
+ {\egpwrite{print 'generating picture ---- \theegpfile\theegpfig.eps'}}
+ \egpwrite{set output '\theegpfile\theegpfig.eps'}
\egpcmds}
% \end{macrocode}
% \end{macro}
@@ -668,7 +722,7 @@ and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}$.
\def\egp@checkfile{%
\ifx\theegpfile\relax
\errhelp={Outside an egpfile environment, I have no clue as to where^^J%
- the GNUPlot commands should go. I will use egpdefault.gp^^J%
+ the gnuplot commands should go. I will use egpdefault.gp^^J%
for this graph, but you'd better fix your code!}%
\errmessage{I detected a egp environment outside of egpfile}%
\egpfile[egpdefault]
@@ -686,7 +740,7 @@ and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}$.
{\includegraphics{#1#2.eps}}%
{\typeout{%
egp: File #1#2.eps\space not found:^^J%
- egp: Process #1.gp with GNUPlot and then %
+ egp: Process \theegpfilename\space with gnuplot and then %
reprocess this file.}}}
\newcommand{\egp@includegraphicx}[3][scale=1]{%
\leavevmode
@@ -694,7 +748,7 @@ and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}$.
{\includegraphics[#1]{#2#3.eps}}%
{\typeout{%
egp: File #2#3.eps\space not found:^^J%
- egp: Process #2.gp with GNUPlot and then %
+ egp: Process \theegpfilename\space with gnuplot and then %
reprocess this file.}}}
% \end{macrocode}
% \end{macro}
@@ -733,13 +787,15 @@ and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}$.
\def\endegp{%
\endegpcmds
\ifthenelse{\boolean{egp@german}}{%
- \egpwrite{!sed -e '/[0-9]*[.][0-9]*)\ .show/s/[.]/,/' \theegpfile\theegpfig.eps >\theegpfile\theegpfig.tmp^^J}
+ \egpwrite{!sed -e '/[0-9]*[.][0-9]*)\ .show/s/[.]/,/' %
+ \theegpfile\theegpfig.eps >\theegpfile\theegpfig.tmp}
\egpwrite{!cp \theegpfile\theegpfig.tmp \theegpfile\theegpfig.eps}
\egpwrite{!rm -f \theegpfile\theegpfig.tmp}}
{}
\expandafter\ifx\expandafter*\the\egp@figepilog*\else
\egpwrite{\the\egp@figepilog}%
- \fi}
+ \fi
+ \egpwrite{}}
\def\endegpx{\endegp}
\def\endegpdef{\endegp}
% \end{macrocode}
@@ -792,11 +848,13 @@ and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}$.
\egp@checkfile
\global\expandafter\advance\csname c@egpcalc\endcsname \@ne
\egpc@@def{\egp@@name}%
- \egpwrite{print 'calculating value ----- \theegpfile\theegpcalc.val'^^J%
- set term table; set output '\theegpfile\theegpcalc.tmp'^^J%
+ \ifthenelse{\boolean{egp@oldgp}}
+ {\egpwrite{\egpcomment\space --- \theegpfile\theegpcalc.val ---}}
+ {\egpwrite{print 'calculating value ----- \theegpfile\theegpcalc.val'}}
+ \egpwrite{set term table; set output '\theegpfile\theegpcalc.tmp'^^J%
set samples 2^^J%
set zero 0^^J%
- plot [0:0] \egp@expression^^J}
+ plot [0:0] \egp@expression}
% \end{macrocode}
%
% Here intensive usage of UN*X text utils is made to extract the calculated
@@ -811,10 +869,16 @@ and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}$.
%
% \begin{macrocode}
\ifthenelse{\boolean{egp@german}}{%
- \egpwrite{!tail -3 \theegpfile\theegpcalc.tmp | head -1 | cut -f 2 -d' ' | sed -e 's/[.]/{,}/' >\theegpfile\theegpcalc.val^^J}}
- {\egpwrite{!tail -3 \theegpfile\theegpcalc.tmp | head -1 | cut -f 2 -d' ' >\theegpfile\theegpcalc.val^^J}}
- \egpwrite{!rm -f \theegpfile\theegpcalc.tmp^^J%
- reset^^J}}
+ \egpwrite{!tail -3 \theegpfile\theegpcalc.tmp | head -1 |%
+ cut -f 2 -d' ' | sed -e 's/[.]/{,}/' %
+ >\theegpfile\theegpcalc.val}}
+ {\egpwrite{!tail -3 \theegpfile\theegpcalc.tmp | head -1 |%
+ cut -f 2 -d' ' >\theegpfile\theegpcalc.val}}
+ \egpwrite{!rm -f \theegpfile\theegpcalc.tmp}
+% \ifthenelse{\boolean{egp@oldgp}}{%
+% \egpwrite{load "reset.gp"}}{%
+% \egpwrite{reset}}
+ \egpwrite{}}
% \end{macrocode}
% \end{macro}
%
@@ -833,11 +897,12 @@ and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}$.
% avoid this but I don't know how. Any wizards out there?
% \begin{macrocode}
\newcommand{\egp@includevalue}[2]{%
+% \InputIfFileExists{#1#2.val}{\ignorespaces}%
\IfFileExists{#1#2.val}%
{\input{#1#2.val}}%
{\typeout{%
egp: File #1#2.val\space not found:^^J%
- egp: Process #1#2.gp with GNUPlot and then %
+ egp: Process \theegpfilename\space with gnuplot and then %
reprocess this file.}}}
% \end{macrocode}
% \end{macro}
@@ -847,8 +912,8 @@ and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}$.
% \begin{macrocode}
\newcommand{\egpshowval}[2][*]{%
\def\egp@@name{#1}%
- \def\egp@expression{#2}
- \egp@calc
+ \def\egp@expression{#2}%
+ \egp@calc%
\egp@includevalue{\theegpfile}{\theegpcalc}}
% \end{macrocode}
% \end{macro}
@@ -870,10 +935,20 @@ and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}$.
% \end{macrocode}
% \end{macro}
%
+% Define the file prelude:
+% If the user specifies that the official version \GP{}-3.5 is used a file with
+% the name |reset.gp| is generated at the start of the \GP{} run. Wherever a
+% |reset| is done in the \GP{}-3.6 file this file is |load|ed instead.
% \begin{macrocode}
-\egpfigprelude{set terminal postscript eps monochrome dashed "Helvetica" 17}
+\ifthenelse{\boolean{egp@oldgp}}
+ {\egpprelude{save "reset.gp"}}
+ {\relax}
% \end{macrocode}
%
+% Define the default prelude for the figures:
+% \begin{macrocode}
+\egpfigprelude{set terminal postscript eps monochrome dashed "Helvetica" 17}
+% \end{macrocode}
% To get e.g. Computer Modern as font for the axis tics you can specify the
% name of a CM-Type-1 font file as fontname option of the \GP{} postscript
% terminal.
@@ -885,12 +960,20 @@ and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}$.
% \end{quote}
% To see the correct font in the Postscript file you have to use the
% appropriate fontmap when calling dvips or you have to download the file
-% |cmss17.pfb| as header file. The error message of dvips can then be ignored.
+% |cmss17.pfb| as header file. The error message of dvips can then be
+% ignored.\\
+%
+%
%
% Reset all options to their default values after every |egp|, |egpx| and
% |egpdef| environment.
+% As mentioned above the file |reset.gp| that is generated at the start of the
+% \GP{} run is |load|ed to implement the new |reset| command of \GP{}-3.6beta
+% if the user didn't specify |gnuplot36beta| as package option.
% \begin{macrocode}
-\egpfigepilog{reset}
+\ifthenelse{\boolean{egp@oldgp}}{%
+ \egpfigepilog{load "reset.gp"}}{%
+ \egpfigepilog{reset}}
% \end{macrocode}
%
% You can configure \EGP{} by putting the appropriate commands in the file
@@ -913,6 +996,7 @@ and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}$.
%<*driver>
\documentclass[a4paper]{article}
\usepackage{doc}
+\usepackage{multicol}
% \end{macrocode}
%
% \begin{macrocode}
@@ -927,7 +1011,8 @@ and get $\frac{\sqrt{2}}{2}=\fbox{\egpuseval{sin_quarter_pi}}$.
% \end{macrocode}
%
% \begin{macrocode}
-\usepackage{egplot}
+\usepackage[gnuplot35]{egplot}
+%\usepackage[gnuplot36beta]{egplot}
% \end{macrocode}
% \begin{macrocode}
\setlength{\parindent}{0pt}
diff --git a/Master/texmf-dist/source/latex/egplot/egpman.drv b/Master/texmf-dist/source/latex/egplot/egpman.drv
index 538540e8ea0..e7c5a08b24f 100644
--- a/Master/texmf-dist/source/latex/egplot/egpman.drv
+++ b/Master/texmf-dist/source/latex/egplot/egpman.drv
@@ -32,7 +32,7 @@
%% Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% \CheckSum{376}
+%% \CheckSum{449}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -52,6 +52,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage{doc}
+\usepackage{multicol}
\IfFileExists{mflogo.sty}%
{\usepackage{mflogo}%
\def\GP{\textsf{gnuplot}}%
@@ -60,7 +61,7 @@
{\def\GP{\textsf{gnuplot}}%
\def\EMP{\textsf{EMP}}%
\def\EGP{\textsf{egplot}}}
-\usepackage{egplot}
+\usepackage[gnuplot35]{egplot}
\setlength{\parindent}{0pt}
\def\manindex#1{\SortIndex{#1}{#1}}
\OnlyDescription
diff --git a/Master/texmf-dist/source/latex/filecontents/filecontents.dtx b/Master/texmf-dist/source/latex/filecontents/filecontents.dtx
index 730a9615d3c..09c421bc605 100644
--- a/Master/texmf-dist/source/latex/filecontents/filecontents.dtx
+++ b/Master/texmf-dist/source/latex/filecontents/filecontents.dtx
@@ -1,15 +1,17 @@
% \iffalse meta-comment
%
-% Copyright (C) 2004 Scott Pakin <scott+fc@pakin.org>
+% Copyright (C) 2006 Scott Pakin <scott+fc@pakin.org>
% -------------------------------------------------------
%
% This package may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.2
+% conditions of the LaTeX Project Public License, either version 1.3b
% 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.
+%
+% and version 1.3b or later is part of all distributions of LaTeX
+% version 2006/01/07 or later.
%
% \fi
%
@@ -20,11 +22,12 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{filecontents}
%<*package>
- [2004/08/16 v1.1 Create an external file from within a LaTeX document]
+ [2006/03/11 v1.1a Create an external file from within a LaTeX document]
%</package>
%
%<*driver>
\documentclass{ltxdoc}
+\input{filecontents.inc}
\EnableCrossrefs
\CodelineIndex
\RecordChanges
@@ -63,6 +66,9 @@
% \maketitle
%
% \changes{v1.0}{2001/07/31}{Initial version}
+% \changes{v1.1a}{2006/03/11}{%
+% Clarified/corrected the \texttt{\string\string\string\documentclass}
+% restriction as per Robin Fairbairns's suggestion}
%
% ^^A The following were copied verbatim from source2e.tex.
% \DoNotIndex{\def,\long,\edef,\xdef,\gdef,\let,\global}
@@ -84,10 +90,10 @@
%
% ^^A The following are specific to filecontents.dtx.
% \DoNotIndex{\@currenvir,\@gobble,\@gobblefour,\@ifundefined,\@makeother}
-% \DoNotIndex{\@undefined,\day,\do,\E,\end,\I,\if@tempswa,\L,\LaTeX,\loop}
-% \DoNotIndex{\MessageBreak,\month,\newenvironment,\number,\repeat}
-% \DoNotIndex{\reserved@b,\reserved@c,\two@digits,\year}
-% \DoNotIndex{\*,\^}
+% \DoNotIndex{\@undefined,\active,\chardef,\day,\do,\dospecials,\E,\end,\I}
+% \DoNotIndex{\if@tempswa,\L,\LaTeX,\loop,\MessageBreak,\month}
+% \DoNotIndex{\newenvironment,\number,\repeat,\reserved@b,\reserved@c}
+% \DoNotIndex{\two@digits,\year,\*,\^}
%
% ^^A Define some commands to help delineate my changes.
% \newcommand{\startfcchanges}{^^A
@@ -145,18 +151,26 @@
% into the file.
% \end{quotation}
%
+% \noindent
+% (The comment about |filecontents| being valid only before
+% |\documentclass| is, in fact, untrue. |filecontents| is allowed
+% anywhere in the document's preamble.)
+%
+% \bigskip
+%
% The \textsf{filecontents} package provides a hacked-up version of the
% |filecontents| and |filecontents*| environments that lifts the two
% restrictions stated above, namely that existing files are never
% overwritten and that |filecontents| must be used before the
-% |\documentclass| declaration. \textsf{filecontents} is therefore a
-% more convenient way to write external files from within a \LaTeX\
-% document than is provided by default by the \LaTeXe\ kernel.
+% |\documentclass| declaration (really, the |\begin{document}|).
+% \textsf{filecontents} is therefore a more convenient way to write
+% external files from within a \LaTeX\ document than is provided by
+% default by the \LaTeXe\ kernel.
%
%
% \paragraph{Sample usage}
% |filecontents| works much like |verbatim|, except that it takes
-% a (mandatory) filename argument:
+% a mandatory filename argument:
%
% \begin{verbatim}
% \begin{filecontents}{myfile.tex}
@@ -184,16 +198,16 @@
% |filecontents*| is therefore useful for writing non-\LaTeX\ files such as
% Encapsulated PostScript files.
%
-% If you use the \textsf{ltxtable} package, you may find
+% If you use the \textsf{ltxtable} package you may find
% \textsf{filecontents} particularly useful. \textsf{ltxtable} is a
% crude conglomeration of \textsf{longtable}, which allows tables to
% cross page boundaries, and \textsf{tabularx}, which enables tables to
% stretch to a specified width. \textsf{ltxtable}'s interface is a bit
% cumbersome, however; it requires that the |longtable| environment be
-% contained in a separate file. With the \textsf{filecontents} package,
-% you can create this file right before the |\LTXtable| invocation,
-% which is far more convenient than having to place the table manually
-% within a separate file.
+% contained in a separate file. With the \textsf{filecontents} package
+% you can create this file right before the |\LTXtable| invocation---a
+% far more convenient alternative than having to manually place the
+% table within a separate file.
%
%
% \StopEventually{^^A
@@ -237,8 +251,8 @@
% \end{macrocode}
%
% \startfcchanges
-% In the original code, a pre-existing file would not be overwritten.
-% In the new version, the file existence check is used solely to decide
+% In the original code a pre-existing file would not be overwritten.
+% In the new version the file existence check is used solely to decide
% whether to output ``\texttt{Writing file `\textrm{\meta{filename}}'}''
% or ``\texttt{Overwriting file `\textrm{\meta{filename}}'}''. Control
% flow then always falls through to what used to be the |\ifeof| case
diff --git a/Master/texmf-dist/source/latex/filecontents/filecontents.ins b/Master/texmf-dist/source/latex/filecontents/filecontents.ins
index a88cd8a68d3..5800b1bfd20 100644
--- a/Master/texmf-dist/source/latex/filecontents/filecontents.ins
+++ b/Master/texmf-dist/source/latex/filecontents/filecontents.ins
@@ -3,16 +3,18 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright (C) 2004 Scott Pakin <scott+fc@pakin.org>
+%% Copyright (C) 2006 Scott Pakin <scott+fc@pakin.org>
%% -------------------------------------------------------
%%
-%% This package 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
+%% This package may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, either version 1.3b 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.
+%%
+%% and version 1.3b or later is part of all distributions of LaTeX
+%% version 2006/01/07 or later.
%%
%% --------------- start of docstrip commands ------------------
%%
@@ -26,16 +28,18 @@
This is a generated file.
-Copyright (C) 2004 Scott Pakin <scott+fc@pakin.org>
+Copyright (C) 2006 Scott Pakin <scott+fc@pakin.org>
-------------------------------------------------------
-This package 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
+This package may be distributed and/or modified under the conditions
+of the LaTeX Project Public License, either version 1.3b 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.
+
+and version 1.3b or later is part of all distributions of LaTeX
+version 2006/01/07 or later.
\endpreamble
diff --git a/Master/texmf-dist/source/latex/footbib/footbib.dtx b/Master/texmf-dist/source/latex/footbib/footbib.dtx
index 6b5cc08abe1..dfe812c8255 100644
--- a/Master/texmf-dist/source/latex/footbib/footbib.dtx
+++ b/Master/texmf-dist/source/latex/footbib/footbib.dtx
@@ -1,12 +1,24 @@
% \iffalse
-%% File: footbib.dtx Copyright (C) 1997 Eric Domenjoud
+%%
+%% File: footbib.dtx Copyright (C) 1997-2005 Eric Domenjoud
%%
%% Eric Domenjoud,
%% CRIN/CNRS & INRIA Lorraine
%% E-mail: Eric.Domenjoud@loria.fr
%%
-\def\fileversion{2.0.1}
-\def\filedate{1999/05/06}
+% This program 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.
+%
+% This program consists of the files footbib.dtx and footbib.ins
+
+
+\def\fileversion{2.0.4}
+\def\filedate{2004/06/04}
%<*driver>
%%
%% To produce the documentation, do the following:
@@ -40,7 +52,7 @@
%</driver>
% \fi
%
-% \CheckSum{2050}
+% \CheckSum{2068}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -102,7 +114,7 @@
% \index{#1s:\levelchar{\protect\ttfamily#2}\encapchar usage}\@esphack}
% \newcommand\SpecialMainNonMacroIndex[2]{^^A
% \@bsphack\special@index{#2\actualchar{\string\ttfamily\space#2}
-% (#1)\encapchar main}^^A
+% (#1)\encapchar main}^^A
% \index{#1s:\levelchar{\protect\ttfamily#2}\encapchar main}\@esphack}
% \newcommand*\NonM@cro@[1]{\m@cro@\iffalse{#1}^^A
% \let\SpecialMainEnvIndex\fb@tmp\ignorespaces}
@@ -138,14 +150,14 @@
% \newcommand\FbIndex{\Fb@Index\SpecialIndex}
% \newcommand\FbMainIndex{\Fb@Index\SpecialMainIndex}
% \newenvironment{FbPatch}[1]
-% {\vskip-\MacrocodeTopsep$\m@th \setbox\z@\hbox{$\braceld$}^^A
+% {\vskip-\MacrocodeTopsep$\setbox\z@\hbox{$\braceld\m@th$}^^A
% \braceld\leaders\vrule \@height\ht\z@ \@depth\z@\hfill
% \lower.5ex\hbox{\kern1em{\tt footbib} #1\kern1em}^^A
-% \leaders\vrule\@height\ht\z@\@depth\z@\hfill\bracerd$^^A
-% \vskip-\MacrocodeTopsep}
-% {\vskip-\MacrocodeTopsep$\m@th \setbox\z@\hbox{$\braceld$}^^A
-% \bracelu\leaders\vrule\@height\ht\z@\@depth\z@\hfill\braceru$^^A
-% \vskip-\MacrocodeTopsep}
+% \leaders\vrule\@height\ht\z@\@depth\z@\hfill\bracerd\m@th$^^A
+% \nobreak\vskip-\MacrocodeTopsep\nobreak}
+% {\nobreak\vskip-\MacrocodeTopsep$\setbox\z@\hbox{$\braceld\m@th$}^^A
+% \bracelu\leaders\vrule\@height\ht\z@\@depth\z@\hfill\braceru\m@th$^^A
+% \nobreak\vskip-\MacrocodeTopsep}
%\makeatother
%
% \newcommand\LATEX{({\let\TeX\relax\LaTeX})\TeX}
@@ -184,7 +196,7 @@
% the unit.
%
% The mechanism used to put a reference only once in each citation
-% unit may require several runs of \LaTeX\ before the references find
+% unit may require several runs of \LaTeX\ (usually at least two) before the references find
% their exact place. If necessary, \LaTeX\ will issue, near the end
% of the document, a warning saying
% \begin{center}
@@ -194,10 +206,17 @@
% Using |footbib| in a document \meta{doc}|.tex| produces a file
% \meta{doc}|.fb.aux|. One must pass the argument \meta{doc}|.fb| to \BibTeX\
% to produce the bibliography which will be put in the file
-% \meta{doc}|.fb.bbl|.
+% \meta{doc}|.fb.bbl|. The exact sequence of commands is
+% \begin{trivlist}\leftskip=\leftmargini\parindent=0pt\item[]
+% |latex|~\meta{doc}\\
+% |bibtex|~\meta{doc}|.fb|\\
+% |latex|~\meta{doc}\\
+% |latex|~\meta{doc}\\
+% \dots
+% \end{trivlist}
%
% \begin{description}
-% \item[Note:] This name might cause some
+% \item[Note:] The name \meta{doc}|.fb.aux| might cause some
% problem on systems which do not allow a double extension in
% a file name or put a limit on the length of file names.
% A user command is provided to change it (see section~\ref{sec:custom}).
@@ -400,7 +419,7 @@
% \item[] \DescribeMacro{\footcitelabel}^^A
% \DescribeMacro{\putfootcitelabel}^^A
% \DescribeMacro{\footcitelistformat}^^A
-% The list of citations in the text may not be typeseted in
+% The list of citations in the text may not be typeset in
% one step as done by the |\cite| command of \LaTeX.
% The reason is that the command which creates the text of
% the foot reference must be inserted after each citation.
@@ -445,7 +464,7 @@
% |\putfootcitelabel{\footcitelabel{|label $n$|}}|\\
% \meta{insertion of the text of reference $n$}\\
% |\putfootcitelabel{|\meta{end of list}|}|
-% \end{trivlist}
+% \end{trivlist}
%
% Each component of the list may be redefined as follows:
% \begin{trivlist}\leftskip=\leftmargini\parindent=0pt\item[]
@@ -511,7 +530,7 @@
% may be redefined by |\renewcommand*\footreflabel[1]{|\ldots|}|.
% \item[] \DescribeMacro{\footrefstyle}
% The label and the text of the reference at the bottom of
-% the page are typeseted in the style defined by the command
+% the page are typeset in the style defined by the command
% |\footrefstyle| which may be redefined in the preamble by
% |\renewcommad\footrefstyle{|\dots|}|. The default definition
% is |\normalfont\footnotesize|.
@@ -636,7 +655,8 @@
\@addtocurcol\else\@reinserts\@addmarginpar\fi}\@latexbug\ifnum
\outputpenalty<\z@\if@nobreak\nobreak\else\addpenalty\interlinepenalty
\fi\fi\fi\fi}
-\@tempa\@doclearpage{\ifvoid\footins\setbox\@tempboxa\vsplit\@cclv to\z@
+\@tempa\@doclearpage{\ifvoid\footins\ifvbox\@kludgeins{\setbox\@tempboxa
+ \box\@kludgeins}\fi\setbox\@tempboxa\vsplit\@cclv to\z@
\unvbox\@tempboxa\setbox\@tempboxa\box\@cclv\xdef\@deferlist{\@toplist
\@botlist\@deferlist}\global\let\@toplist\@empty\global\let\@botlist
\@empty\global\@colroom\@colht\ifx\@currlist\@empty\else\@latexerr
@@ -650,14 +670,14 @@
\@opcol\clearpage\fi}
\@tempa\@makecol{\ifvoid\footins\setbox\@outputbox\box\@cclv\else\setbox
\@outputbox\vbox{\boxmaxdepth\@maxdepth\@tempdima\dp\@cclv\unvbox\@cclv
- \vskip-\@tempdima\vskip\skip\footins\color@begingroup\normalcolor
- \footnoterule\unvbox\footins\color@endgroup}\fi\xdef\@freelist{\@freelist
+ \vskip\skip\footins\color@begingroup\normalcolor\footnoterule\unvbox
+ \footins\color@endgroup}\fi\let\@elt\relax\xdef\@freelist{\@freelist
\@midlist}\global\let\@midlist\@empty\@combinefloats\ifvbox\@kludgeins
\@makespecialcolbox\else\setbox\@outputbox\vbox to\@colht{\@texttop\dimen@
\dp\@outputbox\unvbox\@outputbox\vskip-\dimen@\@textbottom}\fi\global
- \maxdepth\@maxdepth}\@tempa\@reinserts{\ifvoid\footins\else\insert\footins
- {\unvbox\footins}\fi\ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins
- }\fi}
+ \maxdepth\@maxdepth}
+\@tempa\@reinserts{\ifvoid\footins\else\insert\footins{\unvbox\footins}\fi
+ \ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins}\fi}
\fi
\if@tempswa
\PackageError{footbib}{the output routine of LaTeX changed}
@@ -741,8 +761,10 @@
% \end{macro}
%
% \subsubsection{Declaration and processing of options}
+% {\MacroFont
% \begin{option}{oneside}
% \begin{option}{twoside}
+% \leavevmode\vspace{-1.2\baselineskip}
% \begin{macrocode}
\DeclareOption{oneside}{\fb@twosidefalse}
\DeclareOption{twoside}{\fb@twosidetrue}
@@ -750,6 +772,7 @@
% \end{option}
% \end{option}
% \begin{option}{firstcite}
+% \leavevmode\vspace{-1.2\baselineskip}
% \begin{macrocode}
\DeclareOption{firstcite}{\fb@firstcitetrue}
\DeclareOption{firstcite(page)}{\fb@firstcitetrue\fb@pagenumtrue}
@@ -762,6 +785,7 @@
% \end{option}
% \begin{option}{citeonce}
% \begin{option}{citeonce*}
+% \leavevmode\vspace{-1.2\baselineskip}
% \begin{macrocode}
\DeclareOption{citeonce}{\fb@citeoncetrue}
\DeclareOption{citeonce(page)}{\fb@pagecitetrue}
@@ -782,6 +806,7 @@
% \begin{option}{crossrefs}
% \begin{option}{crossrefs*}
% \begin{option}{nocrossrefs}
+% \leavevmode\vspace{-1.2\baselineskip}
% \begin{macrocode}
\DeclareOption{crossrefs}{\fb@crossrefstrue\fb@xcrossrefstrue}
\DeclareOption{crossrefs*}{\fb@crossrefstrue\fb@xcrossrefsfalse}
@@ -793,6 +818,7 @@
%
% \begin{option}{split}
% \begin{option}{nosplit}
+% \leavevmode\vspace{-1.2\baselineskip}
% \begin{macrocode}
\DeclareOption{split}{\fb@nosplitfalse}
\DeclareOption{nosplit}{\fb@nosplittrue}
@@ -815,6 +841,7 @@
\let\fb@nosplittrue\@undefined \let\fb@nosplitfalse\@undefined
\let\fb@checksec\@undefined
% \end{macrocode}
+% }
%
% \begin{macro}{\chapter}
% \begin{macro}{\part}
@@ -968,7 +995,7 @@
% so that their expansion produces the same character with a catcode
% 12 (other). Then an expansion of the key yields a
% \emph{verbatim} copy of it. This mechanism allows the list of keys
-% to contain itself commands which expands in the normal way.
+% to contain itself commands which expand in the normal way.
% All characters which may both be active in the document and appear in the
% key of a reference must be treated in this way. Since \BibTeX\ allows almost
% any character in a key, it is safer to consider all
@@ -1010,7 +1037,7 @@
% citations and as input to \BibTeX.
% The commands |\footbibliographystyle| and |\footbibliography| do an
% immediate |\write| to this file. However, since these commands may
-% be used in the preamble, it may happen that this file is not yet open for
+% be used in the preamble, this file might not yet be open for
% writing at the time they are used. We must wait until the end of the
% preamble before opening the auxiliary file to give the user a chance to
% define its name with |\footbibliographyname|. Therefore, we define the
@@ -2088,6 +2115,9 @@
% \end{macrocode}
% \end{FbPatch}
% \begin{macrocode}
+ \ifvbox\@kludgeins
+ {\setbox \@tempboxa \box \@kludgeins}%
+ \fi
\setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa
\setbox\@tempboxa\box\@cclv
\xdef\@deferlist{\@toplist\@botlist\@deferlist}%
@@ -2178,6 +2208,7 @@
% \begin{macrocode}
}%
\fi
+ \let\@elt\relax
\xdef\@freelist{\@freelist\@midlist}%
\global \let \@midlist \@empty
\@combinefloats
diff --git a/Master/texmf-dist/source/latex/footbib/footbib.ins b/Master/texmf-dist/source/latex/footbib/footbib.ins
index 6f5d166ff7a..b8a775220e4 100644
--- a/Master/texmf-dist/source/latex/footbib/footbib.ins
+++ b/Master/texmf-dist/source/latex/footbib/footbib.ins
@@ -1,9 +1,19 @@
-%% File: footbib.ins Copyright (C) 1997 Eric Domenjoud
+%% File: footbib.ins Copyright (C) 1997-2003 Eric Domenjoud
%%
%% Eric Domenjoud,
%% CRIN/CNRS & INRIA Lorraine
%% E-mail: Eric.Domenjoud@loria.fr
%%
+%% This program 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.
+%%
+%% This program consists of the files footbib.dtx and footbib.ins
+%%
%% To produce the LaTeX package `footbib.sty' process this file with TeX
\def\batchfile{footbib.ins}
diff --git a/Master/texmf-dist/tex/latex/ccaption/ccaption.sty b/Master/texmf-dist/tex/latex/ccaption/ccaption.sty
index f816c75102f..ba1087b2cda 100644
--- a/Master/texmf-dist/tex/latex/ccaption/ccaption.sty
+++ b/Master/texmf-dist/tex/latex/ccaption/ccaption.sty
@@ -23,7 +23,7 @@
%% This work consists of the files listed in the README file.
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ccaption}[2005/03/21 v3.2 Extended captioning and new floats]
+\ProvidesPackage{ccaption}[2005/03/29 v3.2a Extended captioning and new floats]
\newif\if@contsubfigxx
\@contsubfigxxfalse
@@ -207,7 +207,7 @@
\newcommand{\bitwonumcaption}[6][\@empty]{%
\begingroup
\@if@contemptyarg{#2}{\caption{#3}}{\caption[#2]{#3}}
- \ifx #1\@empty\else
+ \ifx\@empty#1\else
\label{#1}
\fi
\setlength{\abovecaptionskip}{0pt}
@@ -222,7 +222,7 @@
\newcommand{\bionenumcaption}[6][\@empty]{%
\begingroup
\@if@contemptyarg{#2}{\caption{#3}}{\caption[#2]{#3}}
- \ifx #1\@empty\else
+ \ifx\@empty#1\else
\label{#1}
\fi
\setlength{\abovecaptionskip}{0pt}
@@ -241,7 +241,7 @@
\newcommand{\bicaption}[5][\@empty]{%
\begingroup
\@if@contemptyarg{#2}{\caption{#3}}{\caption[#2]{#3}}
- \ifx #1\@empty\else
+ \ifx\@empty#1\else
\label{#1}
\fi
\setlength{\abovecaptionskip}{0pt}
diff --git a/Master/texmf-dist/tex/latex/cdpbundl/adiseal.sty b/Master/texmf-dist/tex/latex/cdpbundl/adiseal.sty
index 0429bd51229..a78c119a25c 100644
--- a/Master/texmf-dist/tex/latex/cdpbundl/adiseal.sty
+++ b/Master/texmf-dist/tex/latex/cdpbundl/adiseal.sty
@@ -9,7 +9,7 @@
%% This is a generated file.
%% It is part of a work named "C.D.P. Bundle".
%%
-%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
+%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
%%
%% The C.D.P. Bundle may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -48,13 +48,13 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}[1998/06/01] % LaTeX2e is required!
\ProvidesPackage{adiseal}
- [2005/01/01 v0.33 (development)]
+ [2006/01/01 v0.34 (development)]
\@ifdefinable\@adiseal{\def\@adiseal{adiseal}}
\newcommand*\ADIWWW{%
http://www.math.unipd.it/\string~favero/adipd/%
}
\@ifdefinable\@seal@graph@file{\def\@seal@graph@file{%
- adiseal.eps% must be an Encapsulated PostScript file
+ adiseal% must be an EPS or a PDF file
}}
\@ifdefinable\if@use@pixmap@{\newif\if@use@pixmap@}
\@ifdefinable\@temp@adiseal{}
@@ -71,7 +71,7 @@
}%
}
\if@use@pixmap@
- \IfFileExists{\@seal@graph@file}{%
+ \IfFileExists{\@seal@graph@file.eps}{%
\IfFileExists{epsfig.sty}{%
\RequirePackage{epsfig}%
}{%
diff --git a/Master/texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls b/Master/texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls
index e4b14d03b97..25b17bbf96a 100644
--- a/Master/texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls
+++ b/Master/texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls
@@ -9,7 +9,7 @@
%% This is a generated file.
%% It is part of a work named "C.D.P. Bundle".
%%
-%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
+%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
%%
%% The C.D.P. Bundle may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -48,8 +48,8 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}[1996/06/01] % LaTeX2e is required!
\ProvidesClass{articoletteracdp}
- [2005/01/01 v0.33 (development)]
-%% \typeout{Copyright (C) 1999-2005 by Gustavo MEZZETTI,
+ [2006/01/01 v0.34 (development)]
+%% \typeout{Copyright (C) 1999-2006 by Gustavo MEZZETTI,
%% all rights reserved.}
\@ifdefinable\@out@table@list{}
\@ifdefinable\@in@table@list{}
@@ -58,6 +58,7 @@
\def\do#1{\@ifdefinable#1{\newif#1}}
\do\if@toc@in@toc@
\do\if@loX@in@toc@
+\@ifdefinable\@letter@bookmark{\let\@letter@bookmark\@gobbletwo}
\newlength\abovecaptionskip
\newlength\belowcaptionskip
\DeclareOption{titlepage}{%
@@ -79,16 +80,35 @@
\@toc@in@toc@false
\@loX@in@toc@false
}
+\DeclareOption{letterbookmarks}{%
+ \def\@letter@bookmark{\pdfbookmark[0]}%
+ \PassOptionsToPackage{bookmarksopen=false}{hyperref}%
+}
+\DeclareOption{noletterbookmarks}{%
+ \let\@letter@bookmark\@gobbletwo
+}
+\DeclareOption{openletterbookmarks}{%
+ \def\@letter@bookmark{\pdfbookmark[0]}%
+ \PassOptionsToPackage{bookmarksopen,bookmarksopenlevel=1}{hyperref}%
+}
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{letteracdp}}
-\ExecuteOptions{plaintoc}
+\ExecuteOptions{plaintoc,openletterbookmarks}
\ProcessOptions\relax
-\LoadClass{letteracdp}[2005/01/01]
+\LoadClass{letteracdp}[2006/01/01]
\newcounter{section}[letter]
\newcounter{paragraph}[section]
\newcounter{figure}[letter]
\newcounter{table}[letter]
-\newcounter{subsection}
-\newcounter{subsubsection}
+\AtBeginDocument{%
+ \def\theHletter{\arabic{letter}}%
+ \@ifpackageloaded{hyperref}{%
+ \def\theHparagraph{\theHsection.\arabic{paragraph}}%
+ \def\theHsection{\theHletter.\arabic{section}}%
+ \def\toclevel@paragraph{2}%
+ }{%
+ \let\@letter@bookmark\@gobbletwo
+ }%
+}
\@ifdefinable\hyper@last{\let\hyper@last\relax}
%% Command \title and \author redefined to make changes local.
\def\title#1{\def\@title{#1}}
@@ -111,6 +131,11 @@
\endgroup
}
\g@addto@macro\@begin@letter@hook{%
+ \edef\@cdp@reserved{%
+ \noexpand\@letter@bookmark
+ {\lettername\space\theletter}{letter.\theHletter}%
+ }%
+ \@cdp@reserved
\if@filesw
{\escapechar\m@ne
\immediate\write\@out@table@list{\string\}^^J\string\{}%
@@ -176,7 +201,7 @@
\@ifdefinable\@temp@table@list{\let\@temp@table@list\@empty}
\@ifdefinable\@addfullstop{\long\def\@addfullstop#1{%
{\nonfrenchspacing\ignorespaces#1\unskip
- \ifnum\spacefactor>\@m \else.\fi \/}%
+ \ifnum \spacefactor>\@m \else.\fi \/}%
}}
\newcommand*\nopunct{\spacefactor 1001\relax}
\setcounter{topnumber}{\tw@}
@@ -195,11 +220,11 @@
\setlength \dblfloatsep {\bigskipamount}
\@msetlength\dbltextfloatsep {2}{\bigskipamount}
\setlength \@fptop {\z@ plus 1 fil}
-\setlength \@fpsep {\bigskipamount}
+\setlength \@fpsep {1\bigskipamount plus 2 fil}
\setlength \@fpbot {\z@ plus 1 fil}
-\setlength \@dblfptop {\z@ plus 1 fil}
-\setlength \@dblfpsep {\bigskipamount}
-\setlength \@dblfpbot {\z@ plus 1 fil}
+\setlength \@dblfptop {\@fptop}
+\setlength \@dblfpsep {\@fpsep}
+\setlength \@dblfpbot {\@fpbot}
\setlength\abovecaptionskip{\medskipamount}
\setlength\belowcaptionskip{\z@skip}
\newcommand*\maketitle{%
diff --git a/Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty b/Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty
index c9e0a36d4df..44c9edd9999 100644
--- a/Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty
+++ b/Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty
@@ -9,7 +9,7 @@
%% This is a generated file.
%% It is part of a work named "C.D.P. Bundle".
%%
-%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
+%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
%%
%% The C.D.P. Bundle may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -48,7 +48,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}[1998/06/01] % LaTeX2e is required!
\ProvidesPackage{cdpaddon}
- [2005/01/01 v0.33 (development)]
+ [2006/01/01 v0.34 (development)]
\@ifdefinable\@cdpaddon{\def\@cdpaddon{cdpaddon}}
\def\do#1{\@ifdefinable#1{\newif#1}}
\do\if@using@cdp@
@@ -75,7 +75,7 @@
}{%
\@temp@cdpaddon@a
}
-\def\@temp@cdpaddon@a#1printer:#2,#3@@@{%
+\def\@temp@cdpaddon@a#1printer:#2,#3\@@@{%
\def\@temp@cdpaddon@b{#1}%
\ifx\@temp@cdpaddon@b\@empty
\def\@cdpaddon@printer{#2}%
@@ -88,7 +88,7 @@
\DeclareOption{hypertext}{\@use@hyper@true}
\DeclareOption{plaintext}{\@use@hyper@false}
\DeclareOption*{%
- \expandafter\@temp@cdpaddon@a\CurrentOption,printer:,@@@%
+ \expandafter\@temp@cdpaddon@a\CurrentOption,printer:,\@@@%
}
\ExecuteOptions{color,plaintext}
\ProcessOptions\relax
@@ -287,7 +287,6 @@
}%
\let\@temp@cdpaddon@a\@undefined
}
- \def\toclevel@paragraph{2}
\else
\let\@temp@cdpaddon@a\@undefined
\fi
@@ -306,8 +305,8 @@
\let\@back@folding@tag\@undefined
\let\@cdpaddon@printer\@undefined
\let\@temp@cdpaddon@b\@undefined
-\DeclareRobustCommand*{\facesmile}{\@face\smile}
-\DeclareRobustCommand*{\facefrown}{\@face\frown}
+\DeclareRobustCommand*\facesmile{\@face\smile}
+\DeclareRobustCommand*\facefrown{\@face\frown}
\@ifdefinable\@face{\def\@face#1{%
\leavevmode
\count@\spacefactor
diff --git a/Master/texmf-dist/tex/latex/cdpbundl/cdpshues-example.def b/Master/texmf-dist/tex/latex/cdpbundl/cdpshues-example.def
index 631e6de7f9f..01a14f34de3 100644
--- a/Master/texmf-dist/tex/latex/cdpbundl/cdpshues-example.def
+++ b/Master/texmf-dist/tex/latex/cdpbundl/cdpshues-example.def
@@ -9,7 +9,7 @@
%% This is a generated file.
%% It is part of a work named "C.D.P. Bundle".
%%
-%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
+%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
%%
%% The C.D.P. Bundle may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -59,7 +59,7 @@
%%% the name and the release date, respectively, of your file.
%%% Note that the extension ".def" must be included in the file name,
%%% and that the date is in the format YYYY/MM/DD.
-\ProvidesFile{cdpshues-example.def}[2005/01/01 Printer-dependent file]
+\ProvidesFile{cdpshues-example.def}[2006/01/01 Printer-dependent file]
%%%
%%% Define here the colors to use to draw the C.D.P. seal;
%%% "slight@col" is the color used to paint the inner of the D and
diff --git a/Master/texmf-dist/tex/latex/cdpbundl/cdpshues.cfg b/Master/texmf-dist/tex/latex/cdpbundl/cdpshues.cfg
index a2eee85af1c..f65f2ccba85 100644
--- a/Master/texmf-dist/tex/latex/cdpbundl/cdpshues.cfg
+++ b/Master/texmf-dist/tex/latex/cdpbundl/cdpshues.cfg
@@ -9,7 +9,7 @@
%% This is a generated file.
%% It is part of a work named "C.D.P. Bundle".
%%
-%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
+%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
%%
%% The C.D.P. Bundle may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/cdpbundl/epson-stylus-740.def b/Master/texmf-dist/tex/latex/cdpbundl/epson-stylus-740.def
index 98df00cb29a..96e5d7a64a6 100644
--- a/Master/texmf-dist/tex/latex/cdpbundl/epson-stylus-740.def
+++ b/Master/texmf-dist/tex/latex/cdpbundl/epson-stylus-740.def
@@ -9,7 +9,7 @@
%% This is a generated file.
%% It is part of a work named "C.D.P. Bundle".
%%
-%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
+%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
%%
%% The C.D.P. Bundle may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -46,7 +46,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesFile{epson-stylus-740.def}[2005/01/01 Printer-dependent file]
+\ProvidesFile{epson-stylus-740.def}[2006/01/01 Printer-dependent file]
\definecolor{slight@col}{rgb}{.8,1,.8}
\definecolor{strong@col}{rgb}{0,.266667,0}
\endinput
diff --git a/Master/texmf-dist/tex/latex/cdpbundl/hp-laserjet-4500.def b/Master/texmf-dist/tex/latex/cdpbundl/hp-laserjet-4500.def
index 3a84a5d2125..780ed1786c4 100644
--- a/Master/texmf-dist/tex/latex/cdpbundl/hp-laserjet-4500.def
+++ b/Master/texmf-dist/tex/latex/cdpbundl/hp-laserjet-4500.def
@@ -9,7 +9,7 @@
%% This is a generated file.
%% It is part of a work named "C.D.P. Bundle".
%%
-%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
+%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
%%
%% The C.D.P. Bundle may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -46,7 +46,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesFile{hp-laserjet-4500.def}[2005/01/01 Printer-dependent file]
+\ProvidesFile{hp-laserjet-4500.def}[2006/01/01 Printer-dependent file]
\definecolor{slight@col}{cmyk}{.1,0,.1,0}
\definecolor{strong@col}{cmyk}{.5,0,.5,.5}
\endinput
diff --git a/Master/texmf-dist/tex/latex/cdpbundl/lettcdpadi.cls b/Master/texmf-dist/tex/latex/cdpbundl/lettcdpadi.cls
index 6989683ca08..a63114dd94d 100644
--- a/Master/texmf-dist/tex/latex/cdpbundl/lettcdpadi.cls
+++ b/Master/texmf-dist/tex/latex/cdpbundl/lettcdpadi.cls
@@ -9,7 +9,7 @@
%% This is a generated file.
%% It is part of a work named "C.D.P. Bundle".
%%
-%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
+%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
%%
%% The C.D.P. Bundle may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -48,13 +48,13 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}[1998/06/01] % LaTeX2e is required!
\ProvidesClass{lettcdpadi}
- [2005/01/01 v0.33 (development)]
+ [2006/01/01 v0.34 (development)]
\DeclareOption{nopixmap} {\PassOptionsToPackage{nopixmap} {adiseal}}
\DeclareOption{usepixmap}{\PassOptionsToPackage{usepixmap}{adiseal}}
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{letteracdp}}
\ProcessOptions\relax
-\LoadClass{letteracdp}[2005/01/01]
-\RequirePackage{adiseal}[2005/01/01]
+\LoadClass{letteracdp}[2006/01/01]
+\RequirePackage{adiseal}[2006/01/01]
\endinput
%%
%% End of file `lettcdpadi.cls'.
diff --git a/Master/texmf-dist/tex/latex/cdpbundl/letteracdp.cls b/Master/texmf-dist/tex/latex/cdpbundl/letteracdp.cls
index a4a6536873d..ec49dbdb124 100644
--- a/Master/texmf-dist/tex/latex/cdpbundl/letteracdp.cls
+++ b/Master/texmf-dist/tex/latex/cdpbundl/letteracdp.cls
@@ -9,7 +9,7 @@
%% This is a generated file.
%% It is part of a work named "C.D.P. Bundle".
%%
-%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
+%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>.
%%
%% The C.D.P. Bundle may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -48,8 +48,8 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}[1997/06/01] % LaTeX2e is required!
\ProvidesClass{letteracdp}
- [2005/01/01 v0.33 (**incomplete**)]
-\typeout{Copyright (C) 1999-2005 by Gustavo MEZZETTI,
+ [2006/01/01 v0.34 (**incomplete**)]
+\typeout{Copyright (C) 1999-2006 by Gustavo MEZZETTI,
all rights reserved.}
\@ifdefinable\@letteracdp{\def\@letteracdp{letteracdp}}
\newcommand*\Coordinamento{%
@@ -144,6 +144,7 @@
\do\thesubject
\do\@subject@style
\do\@signature@style
+\do\@place
\do\@begin@letter@hook
\do\@end@letter@hook
\def\do#1{\@ifdefinable#1{\let#1\@undefined}}
@@ -292,6 +293,13 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\fi
%% Command \date redefined to make changes to date local.
\def\date#1{\def\@date{#1}}
+\newcommand*\place[1]{%
+ \ifx \@empty #1\@empty % if #1 is empty
+ \let\@place\@empty
+ \else
+ \def\@place{#1,}%
+ \fi
+}
\input{size1\@ptsize.clo}
\setlength\lineskip{\p@}
\setlength\normallineskip{\p@}
@@ -715,7 +723,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\cleardoubleemptypage
\c@page\@ne
\refstepcounter{letter}%
- \typeout{Letter \number\c@letter}%
+ \typeout{\lettername \space \number\c@letter}%
\interlinepenalty 200 % smaller than the TeXbook value
\parskip\medskipamount
\ifx\@indent@pref L\else
@@ -765,7 +773,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\@baseletter
}}
\@ifdefinable\y@baseletter{\long\def\y@baseletter#1{%
- \@cut@andcc #1\andcc @@@%
+ \@cut@andcc #1\andcc\@@@
\def\theaddresseeaddress{#1}%
\@baseletter
}}
@@ -789,16 +797,16 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\the\@lett@decl
\@begin@letter@hook
}
-\@ifdefinable\@cut@andcc{\long\def\@cut@andcc#1\andcc#2@@@{%
- \@cut@and #1\and @@@%
+\@ifdefinable\@cut@andcc{\long\def\@cut@andcc#1\andcc#2\@@@{%
+ \@cut@and #1\and\@@@%
}}
-\@ifdefinable\@cut@and{\long\def\@cut@and#1\and#2@@@{%
- \@cut@nl #1\\@@@%
+\@ifdefinable\@cut@and{\long\def\@cut@and#1\and#2\@@@{%
+ \@cut@nl #1\\\@@@%
}}
-\@ifdefinable\@cut@nl{\long\def\@cut@nl#1\\#2@@@{%
- \@cut@par #1\par @@@%
+\@ifdefinable\@cut@nl{\long\def\@cut@nl#1\\#2\@@@{%
+ \@cut@par #1\par\@@@%
}}
-\@ifdefinable\@cut@par{\long\def\@cut@par#1\par#2@@@{%
+\@ifdefinable\@cut@par{\long\def\@cut@par#1\par#2\@@@{%
\def\theaddresseename{#1}%
}}
\newcommand*\stopbreaks{%
@@ -1135,7 +1143,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\cleardoublepage
\@setup@pres
}{%
- \par
+ \@@par
\addpenalty\@e@prespenalty
\addvspace\belowpresentationvspace
}
@@ -1153,9 +1161,9 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\cleardoublepage
\setbox\z@\vbox\bgroup
\@setup@pres
+ \boxmaxdepth\maxdepth
\color@begingroup
\penalty-\@M
- \prevdepth\z@
\else
\@nofoldwarning
\normalpresentation
@@ -1248,8 +1256,8 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\@esphack
\fi
}
-\newcommand*\foldingfilbreak[2][\z@]{%
- \@foldingfilbreak{\@fold@getpen{#1}}{#2}%
+\newcommand*\foldingfilbreak[1][\z@]{%
+ \@foldingfilbreak{\@fold@getpen{#1}}%
}
\newcommand*\makefoldedpresentation{%
\if@do@fold@
@@ -1281,9 +1289,9 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\nobreak\medskip
\fi
}}
-\newcommand*\makedate [1][]{\@make@date{#1}NN}
-\newcommand*\maketopdate [1][]{\@make@date{#1}NY}
-\newcommand*\makebottomdate[1][]{\@make@date{#1}YN}
+\newcommand*\makedate [1][\@place]{\@make@date{#1}NN}
+\newcommand*\maketopdate [1][\@place]{\@make@date{#1}NY}
+\newcommand*\makebottomdate[1][\@place]{\@make@date{#1}YN}
\@ifdefinable\@empty@signature{\def\@empty@signature{%
\ClassWarning{\@letteracdp}{%
Empty signature%
@@ -1381,7 +1389,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\@opening
}%
}
-\newcommand*\@opening[1][]{%
+\newcommand*\@opening[1][\@place]{%
\makepresentation
\maketopdate[#1]%
\@cdp@reserved
@@ -1713,6 +1721,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels}
\newcommand*\enclname {Allegati:}
\newcommand*\PSname {P.S.:}
\newcommand*\headtoname {A:}
+\newcommand*\lettername {Lettera}
\newcommand*\today{\number\day~\ifcase\month\or
gennaio\or febbraio\or marzo\or aprile\or maggio\or giugno\or
luglio\or agosto\or settembre\or ottobre\or novembre\or dicembre\fi
diff --git a/Master/texmf-dist/tex/latex/clefval/clefval.sty b/Master/texmf-dist/tex/latex/clefval/clefval.sty
index 374e8c2e1ca..f65e8c3a2e8 100644
--- a/Master/texmf-dist/tex/latex/clefval/clefval.sty
+++ b/Master/texmf-dist/tex/latex/clefval/clefval.sty
@@ -31,7 +31,7 @@
\newcommand*{\@setTheValue}[2]{%
\ifx#1\relax
\protect\G@refundefinedtrue
- \nfss@text{\reset@font\bfseries^^a0????}%
+ \nfss@text{\reset@font\bfseries????}%
\@latex@warning{Valeur de #2 en page \thepage\space non d\'efinie}%
\else #1\null \fi}
\newcommand*{\TheValue}[1]{\expandafter\@setTheValue\csname
diff --git a/Master/texmf-dist/tex/latex/coordsys/coordsys.sty b/Master/texmf-dist/tex/latex/coordsys/coordsys.sty
index 82f4fbaefc6..f4490f483e3 100644
--- a/Master/texmf-dist/tex/latex/coordsys/coordsys.sty
+++ b/Master/texmf-dist/tex/latex/coordsys/coordsys.sty
@@ -8,7 +8,7 @@
%%
%%
%% This is the coordsys and logsys packages
-%% Copyright 2000-04 by Mogens Lemvig Hansen,
+%% Copyright 2000-06 by Mogens Lemvig Hansen,
%% mlhansen@uniserve.com
%%
%% This program may be distributed and/or modified under the
@@ -22,7 +22,7 @@
%% This program consists of the files coordsys.dtx and coordsys.ins
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{coordsys}[2004/11/15 version 1.3]
+\ProvidesPackage{coordsys}[2006/02/03 version 1.4]
\newcommand{\ticklength}{\relax}
\newcommand{\vtickmark}{\relax}
\newcommand{\htickmark}{\relax}
@@ -75,11 +75,11 @@
\newcommand{\vlabel}[1]{#1}%
\newcommand{\rescaleby}[4][]{\renewcommand{#4}[1]{{%
\count@=##1\relax
- \ifnum\count@<0\count@=-\count@\fi
\ifnum\count@=0\relax
\@tempcntb=1\relax
\else
\multiply\count@ #2\relax
+ \ifnum\count@<0\count@=-\count@\fi
\@EuclidGCD{\count@}{#3}%
\count@=##1\relax
\multiply\count@ #2\relax
diff --git a/Master/texmf-dist/tex/latex/coordsys/logsys.sty b/Master/texmf-dist/tex/latex/coordsys/logsys.sty
index 0bdd97daa09..ac8a978bba7 100644
--- a/Master/texmf-dist/tex/latex/coordsys/logsys.sty
+++ b/Master/texmf-dist/tex/latex/coordsys/logsys.sty
@@ -8,7 +8,7 @@
%%
%%
%% This is the coordsys and logsys packages
-%% Copyright 2000-04 by Mogens Lemvig Hansen,
+%% Copyright 2000-06 by Mogens Lemvig Hansen,
%% mlhansen@uniserve.com
%%
%% This program may be distributed and/or modified under the
@@ -22,12 +22,12 @@
%% This program consists of the files coordsys.dtx and coordsys.ins
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{logsys}[2004/11/15 version 1.3]
+\ProvidesPackage{logsys}[2006/02/03 version 1.4]
\DeclareOption{centred}{\PassOptionsToPackage{centred}{coordsys}}
\DeclareOption{outside}{\PassOptionsToPackage{outside}{coordsys}}
\DeclareOption{inside}{\PassOptionsToPackage{inside}{coordsys}}
\ProcessOptions
-\RequirePackage{coordsys}[2004/11/15]
+\RequirePackage{coordsys}[2006/02/03]
\newcommand{\loglabel}[1]{%
\ifnum #1=-2\relax \frac{1}{100}%
\else\ifnum #1=-1\relax \frac{1}{10}%
diff --git a/Master/texmf-dist/tex/latex/dpfloat/dpfloat.sty b/Master/texmf-dist/tex/latex/dpfloat/dpfloat.sty
index 8865453fc04..15eea00940d 100644
--- a/Master/texmf-dist/tex/latex/dpfloat/dpfloat.sty
+++ b/Master/texmf-dist/tex/latex/dpfloat/dpfloat.sty
@@ -1,13 +1,37 @@
-% double-page float package
+% ========================================================================
+%
+% Copyright (c) 2006 The University of Washington
%
-% Copyright University of Washington
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% 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.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Jim Fox, fox@washington.edu
+%
+% ========================================================================
+%
+%
+% double-page float package
%
% Jim Fox
-% fox@u.washington.edu
-% http://weber.u.washington.edu/~fox/
+% fox@washington.edu
+% http://staff.washington.edu/fox/
+%
+
%
+% Version history
+%
+% 2006/10/05: fix footer placement (suggestion by Mark Henning (mh@homolog.de)
+% 1997/09/21: original
+
-\ProvidesPackage{dpfloat}[1997/09/21]
+\ProvidesPackage{dpfloat}[2006/10/05]
\NeedsTeXFormat{LaTeX2e}
% This package allows you to format a double-page figure or table
@@ -71,8 +95,8 @@
\let\old@xtryfc\@xtryfc
\def\@xtryfc #1{%
\expandafter\if\csname LP:\string#1\endcsname L%
- \ifodd\count0\global\@colht\z@
- \typeout{I moved a leftpage float from page \the\count0.}%
+ \ifodd\count0\global\@fpmin\maxdimen
+ \typeout{dpfloat moved a leftpage float from page \the\count0.}%
\fi\fi
\old@xtryfc #1}
@@ -83,4 +107,8 @@
\fi
+% assure that any remaining floats are printed
+\def\@dpf@mtlist{}
+\AtEndDocument{\ifx\@deferlist\@dpf@mtlist\else\ifodd\count0\else\typeout{dpfloat added a blank page}\clearpage\ \clearpage\fi\fi}
+
% end of dpfloat
diff --git a/Master/texmf-dist/tex/latex/dramatist/dramatist.sty b/Master/texmf-dist/tex/latex/dramatist/dramatist.sty
index 74d814fc64d..eee9a2f05cb 100644
--- a/Master/texmf-dist/tex/latex/dramatist/dramatist.sty
+++ b/Master/texmf-dist/tex/latex/dramatist/dramatist.sty
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% dramatist.dtx
-%% Copyright (C) 2003-2004 Massimiliano Dominici
+%% Copyright (C) 2003-2005 Massimiliano Dominici
%% \CharacterTable%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
%% Digits \0\1\2\3\4\5\6\7\8\9
@@ -37,8 +37,9 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
%%
-\ProvidesPackage{dramatist}[2004/05/10 v1.2 Package for typesetting drama -- Author: Massimiliano Dominici]
+\ProvidesPackage{dramatist}[2005/12/01 v1.2d Package for typesetting drama -- Author: Massimiliano Dominici]
\NeedsTeXFormat{LaTeX2e}
+\RequirePackage{xspace}
\@ifundefined{if@openright}{\newif\if@openright}{}
\newif\if@drverse
\newif\if@poemscol
@@ -81,7 +82,7 @@
\@drversetrue
\if@poemscol
\begin{poem}
- \setcounter{linenumber}{\value{storelineno}}
+ \setcounter{verselinenumber}{\value{storelineno}}
\setcounter{printlineindex}{\value{storeprintlineindex}}
\else
\begin{verse}
@@ -95,7 +96,7 @@
\fi
\if@poemscol
\end{poem}
- \setcounter{storelineno}{\value{linenumber}}
+ \setcounter{storelineno}{\value{verselinenumber}}
\setcounter{storeprintlineindex}{\value{printlineindex}}
\else
\end{verse}
@@ -213,10 +214,10 @@
\def\@xcharacter[#1]#2#3{%
\stepcounter{character}
\@character{#2}{#3}
- \n@me@ppend@nddef{persona}{\roman{character}}{\castfont #1}
+ \n@me@ppend@nddef{persona}{@\Roman{character}}{\castfont #1}
}
\def\@character#1#2{%
- \@namedef{#2}{{\namefont #1}\intsp@ce{#1}\check@spr}
+ \@namedef{#2}{{\namefont #1}\xspace}
\n@me@ppend@nddef{#2}{\@ppendname}{%
\if@drverse
{\speakstab\speaksfont{#1}\speaksdel\par\nobreak\addvspace{-\parskip}}
@@ -229,14 +230,14 @@
\newcommand{\@ppendname}{speaks}
\newenvironment{CharacterGroup}[1]{%
\stepcounter{character}
- \newcounter{g\roman{character}}
+ \newcounter{g\Roman{character}}
\grouplist{#1}
}{}
\newsavebox{\tbox}
\newcommand\grouplist[1]{%
- \global\n@me@ppend@nddef{persona}{\roman{character}}{%
+ \global\n@me@ppend@nddef{persona}{@\Roman{character}}{%
\begin{lrbox}{\tbox}
- \begin{minipage}[c]{.65\textwidth}\raggedright
+ \begin{minipage}[c]{\CharWidth}\raggedright
\leftmargini=0pt
\begin{list}{}{\itemsep=0pt}
\dogrouplist
@@ -245,27 +246,27 @@
\end{lrbox}
\parbox{\CharWidth}{\usebox{\tbox}}%
\parbox{\ParenWidth}{$\left.\rule{0pt}{\ht\tbox}\right\}$}
- \parbox{\CastWidth}{\castfont #1}}
+ \parbox{\CastWidth}{\castfont #1\strut}}
}
\newcommand{\dogrouplist}{%
- \ifnum\value{g\roman{temp}}>\value{gtemp}
+ \ifnum\value{g\Roman{temp}}>\value{gtemp}
\stepcounter{gtemp}
- \item\@nameuse{gpersona\Roman{temp}\roman{gtemp}}
+ \item\@nameuse{gpersona@\Roman{temp}@\Roman{gtemp}}\strut
\dogrouplist
\fi
\setcounter{gtemp}{0}
}
\newcommand\GCharacter[3]{
- \stepcounter{g\roman{character}}
- \global\@namedef{#3}{{\namefont #2}\intsp@ce{#2}\check@spr}
+ \stepcounter{g\Roman{character}}
+ \global\@namedef{#3}{{\namefont #2}\xspace}
\global\n@me@ppend@nddef{#3}{\@ppendname}{%
\if@drverse
- {\speakstab\speaksfont #2\par\nobreak\addvspace{-\parskip}}
+ {\speakstab\speaksfont #2\speaksdel\par\nobreak\addvspace{-\parskip}}
\else
- \item[#2]
+ \item[#2\speaksdel]
\fi}
- \global\n@me@ppend@nddef{gpersona\Roman{character}}{%
- \roman{g\roman{character}}}{\castfont #1}
+ \global\n@me@ppend@nddef{gpersona@\Roman{character}}{%
+ @\Roman{g\Roman{character}}}{\castfont #1}
}
\newcommand\speaker[1]{%
\if@drverse
@@ -273,53 +274,6 @@
\else
\item[#1\speaksdel]
\fi}
-\let \nospace \relax
-\let \check@spr \@empty
-\def \intsp@ce #1{%
- \def \reserved@a {#1}%
- \ifx \reserved@a \@empty
- \let \check@spr \@empty
- \else
- \ifx \reserved@a \space
- \let \check@spr \@empty
- \else
- \check@nospace@ #1\nospace\@nil
- \fi
- \fi
-}
-\def \check@nospace@ #1#2\nospace#3\@nil {%
- \let \check@spr \maybe@sp
- \def \reserved@a {\nospace}%
- \def \reserved@b {#1}%
- \def \reserved@c {#3}%
- \ifx \reserved@a \reserved@b
- \ifx \reserved@c \@empty
- \else
- \let \check@spr \@empty
- \fi
- \else
- \ifx \reserved@c \@empty
- \else
- \let \check@spr \@empty
- \fi
- \fi
-}
-\def \maybe@sp {\futurelet\@let@token\maybe@sp@}
-\def \maybe@sp@ {%
- \@tempswatrue
- \expandafter\@tfor\expandafter\reserved@a\expandafter:\expandafter=%
- \nospacelist
- \do \t@st@sp
- \if@tempswa \space \fi
-}
-\def \t@st@sp {%
- \expandafter\let\expandafter\reserved@b\expandafter=\reserved@a\relax
- \ifx\reserved@b\@let@token
- \@tempswafalse
- \@break@tfor
- \fi
-}
-\def \nospacelist {,.;:?!)}
\newcommand{\DramPer}{%
\@ifundefined{if@openright}{\clearpage}{%
\if@openright\cleardoublepage\else\clearpage\fi}
@@ -342,7 +296,7 @@
\newcommand{\dodramperlist}{%
\ifnum\value{character}>\value{temp}
\stepcounter{temp}
- \item\@nameuse{persona\roman{temp}}
+ \item\@nameuse{persona@\Roman{temp}}\strut
\dodramperlist
\fi
}
@@ -351,15 +305,15 @@
\newcommand{\@direct}[1]{%
\if@drverse
\vskip2\normallineskip
- \parbox[b]{\dirwidth}{\dirdelimiter{\emph{#1}}}\@centercr
+ \parbox[b]{\dirwidth}{\dirdelimiter{{\itshape #1}}}\@centercr
\else
- \dirdelimiter{\emph{#1}}\unskip
+ \dirdelimiter{{\itshape #1}}\unskip
\fi
}
\newcommand{\@sdirect}[1]{%
\if@drverse
\vskip2\normallineskip
- \parbox[b]{\dirwidth}{\dirdelimiter{\emph{#1}}}\\!
+ \parbox[b]{\dirwidth}{\dirdelimiter{\itshape #1}}\\!
\else
\starrederror
\fi
diff --git a/Master/texmf-dist/tex/latex/egplot/egplot.sty b/Master/texmf-dist/tex/latex/egplot/egplot.sty
index 2989278caa1..169d4279745 100644
--- a/Master/texmf-dist/tex/latex/egplot/egplot.sty
+++ b/Master/texmf-dist/tex/latex/egplot/egplot.sty
@@ -32,7 +32,7 @@
%% Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% \CheckSum{376}
+%% \CheckSum{449}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -50,22 +50,28 @@
%% Right brace \} Tilde \~}
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\fileversion{v1.01}
+\def\fileversion{v1.02a}
\NeedsTeXFormat{LaTeX2e}
\gdef\filename{egplot.sty}%
-\gdef\filedate{1998/06/20}%
+\gdef\filedate{1998/07/08}%
\gdef\filemaintainer{Axel Probst}%
\ProvidesPackage{egplot}[\filedate\space\fileversion\space
Encapsulated gnuplot LaTeX Package (\filemaintainer)]
-\RequirePackage{graphicx}[1994/12/15]
\RequirePackage{verbatim}
\RequirePackage{ifthen}
\newboolean{egp@german}
\setboolean{egp@german}{false}
\DeclareOption{german}{%
\setboolean{egp@german}{true}}
+\newboolean{egp@oldgp}
+\setboolean{egp@oldgp}{true}
+\DeclareOption{gnuplot35}{%
+ \setboolean{egp@oldgp}{true}}
+\DeclareOption{gnuplot36beta}{%
+ \setboolean{egp@oldgp}{false}}
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{graphicx}}
\ProcessOptions
+\RequirePackage{graphicx}[1994/12/15]
{\catcode`\#=11\gdef\egpcomment{#}}
\def\egpwrite#1{%
\if@egpio
@@ -75,11 +81,17 @@
\newif\if@egpio
\@egpiotrue
\newwrite\@outegp
-\newcommand{\egpfile}[1][\jobname]{%
+\newcounter{egpfilenum} % 1998-03-07
+\setcounter{egpfilenum}{0} % 1998-03-07
+\newcommand{\egpfile}[1][\jobname\theegpfilenum_]{%
\def\theegpfile{#1}%
+ \ifthenelse{\equal{\theegpfile}{\jobname\theegpfilenum_}}{%
+ \stepcounter{egpfilenum}%
+ \def\theegpfilename{\jobname\theegpfilenum.gp}}{%
+ \def\theegpfilename{\theegpfile.gp}}
\if@egpio
- \immediate\openout\@outegp=\theegpfile.gp\relax
- \egpwrite{\egpcomment\space \theegpfile.gp -- %
+ \immediate\openout\@outegp=\theegpfilename\relax
+ \egpwrite{\egpcomment\space \theegpfilename -- %
do not edit, generated automatically by \jobname.tex^^J}
\expandafter\ifx\expandafter*\the\egp@prelude*\else
\egpwrite{\the\egp@prelude;}%
@@ -116,20 +128,26 @@
\egp@def}
\def\egp@{%
\egp@start%
- \egpwrite{print 'generating picture ---- \theegpfile\theegpfig.eps'^^J%
- set output '\theegpfile\theegpfig.eps'^^J}
+ \ifthenelse{\boolean{egp@oldgp}}
+ {\egpwrite{\egpcomment\space --- \theegpfile\theegpfig.eps ---}}
+ {\egpwrite{print 'generating picture ---- \theegpfile\theegpfig.eps'}}
+ \egpwrite{set output '\theegpfile\theegpfig.eps'}
\egp@includegraphics{\theegpfile}{\theegpfig}%
\egpcmds}
\def\egp@x#1{%
- \egp@start%
- \egpwrite{print 'generating picture ---- \theegpfile\theegpfig.eps'^^J%
- set output '\theegpfile\theegpfig.eps'^^J}
- \egp@includegraphicx[#1]{\theegpfile}{\theegpfig}%
- \egpcmds}
+ \egp@start%
+ \ifthenelse{\boolean{egp@oldgp}}
+ {\egpwrite{\egpcomment\space --- \theegpfile\theegpfig.eps ---}}
+ {\egpwrite{print 'generating picture ---- \theegpfile\theegpfig.eps'}}
+ \egpwrite{set output '\theegpfile\theegpfig.eps'}
+ \egp@includegraphicx[#1]{\theegpfile}{\theegpfig}%
+ \egpcmds}
\def\egp@def{%
\egp@start%
- \egpwrite{print 'generating picture ---- \theegpfile\theegpfig.eps'^^J%
- set output '\theegpfile\theegpfig.eps'^^J}
+ \ifthenelse{\boolean{egp@oldgp}}
+ {\egpwrite{\egpcomment\space --- \theegpfile\theegpfig.eps ---}}
+ {\egpwrite{print 'generating picture ---- \theegpfile\theegpfig.eps'}}
+ \egpwrite{set output '\theegpfile\theegpfig.eps'}
\egpcmds}
\def\egp@start{%
\egp@checkfile
@@ -141,7 +159,7 @@
\def\egp@checkfile{%
\ifx\theegpfile\relax
\errhelp={Outside an egpfile environment, I have no clue as to where^^J%
- the GNUPlot commands should go. I will use egpdefault.gp^^J%
+ the gnuplot commands should go. I will use egpdefault.gp^^J%
for this graph, but you'd better fix your code!}%
\errmessage{I detected a egp environment outside of egpfile}%
\egpfile[egpdefault]
@@ -152,7 +170,7 @@
{\includegraphics{#1#2.eps}}%
{\typeout{%
egp: File #1#2.eps\space not found:^^J%
- egp: Process #1.gp with GNUPlot and then %
+ egp: Process \theegpfilename\space with gnuplot and then %
reprocess this file.}}}
\newcommand{\egp@includegraphicx}[3][scale=1]{%
\leavevmode
@@ -160,7 +178,7 @@
{\includegraphics[#1]{#2#3.eps}}%
{\typeout{%
egp: File #2#3.eps\space not found:^^J%
- egp: Process #2.gp with GNUPlot and then %
+ egp: Process \theegpfilename\space with gnuplot and then %
reprocess this file.}}}
\def\egpcmds{%
\begingroup
@@ -175,13 +193,15 @@
\def\endegp{%
\endegpcmds
\ifthenelse{\boolean{egp@german}}{%
- \egpwrite{!sed -e '/[0-9]*[.][0-9]*)\ .show/s/[.]/,/' \theegpfile\theegpfig.eps >\theegpfile\theegpfig.tmp^^J}
+ \egpwrite{!sed -e '/[0-9]*[.][0-9]*)\ .show/s/[.]/,/' %
+ \theegpfile\theegpfig.eps >\theegpfile\theegpfig.tmp}
\egpwrite{!cp \theegpfile\theegpfig.tmp \theegpfile\theegpfig.eps}
\egpwrite{!rm -f \theegpfile\theegpfig.tmp}}
{}
\expandafter\ifx\expandafter*\the\egp@figepilog*\else
\egpwrite{\the\egp@figepilog}%
- \fi}
+ \fi
+ \egpwrite{}}
\def\endegpx{\endegp}
\def\endegpdef{\endegp}
\def\egp@@def#1{%
@@ -200,16 +220,21 @@
\egp@checkfile
\global\expandafter\advance\csname c@egpcalc\endcsname \@ne
\egpc@@def{\egp@@name}%
- \egpwrite{print 'calculating value ----- \theegpfile\theegpcalc.val'^^J%
- set term table; set output '\theegpfile\theegpcalc.tmp'^^J%
+ \ifthenelse{\boolean{egp@oldgp}}
+ {\egpwrite{\egpcomment\space --- \theegpfile\theegpcalc.val ---}}
+ {\egpwrite{print 'calculating value ----- \theegpfile\theegpcalc.val'}}
+ \egpwrite{set term table; set output '\theegpfile\theegpcalc.tmp'^^J%
set samples 2^^J%
set zero 0^^J%
- plot [0:0] \egp@expression^^J}
+ plot [0:0] \egp@expression}
\ifthenelse{\boolean{egp@german}}{%
- \egpwrite{!tail -3 \theegpfile\theegpcalc.tmp | head -1 | cut -f 2 -d' ' | sed -e 's/[.]/{,}/' >\theegpfile\theegpcalc.val^^J}}
- {\egpwrite{!tail -3 \theegpfile\theegpcalc.tmp | head -1 | cut -f 2 -d' ' >\theegpfile\theegpcalc.val^^J}}
- \egpwrite{!rm -f \theegpfile\theegpcalc.tmp^^J%
- reset^^J}}
+ \egpwrite{!tail -3 \theegpfile\theegpcalc.tmp | head -1 |%
+ cut -f 2 -d' ' | sed -e 's/[.]/{,}/' %
+ >\theegpfile\theegpcalc.val}}
+ {\egpwrite{!tail -3 \theegpfile\theegpcalc.tmp | head -1 |%
+ cut -f 2 -d' ' >\theegpfile\theegpcalc.val}}
+ \egpwrite{!rm -f \theegpfile\theegpcalc.tmp}
+ \egpwrite{}}
\def\egpc@@def#1{%
\global\e@namedef{egp@k:f:#1}{\theegpfile}%
\global\e@namedef{egp@k:v:#1}{\theegpcalc}}
@@ -218,12 +243,12 @@
{\input{#1#2.val}}%
{\typeout{%
egp: File #1#2.val\space not found:^^J%
- egp: Process #1#2.gp with GNUPlot and then %
+ egp: Process \theegpfilename\space with gnuplot and then %
reprocess this file.}}}
\newcommand{\egpshowval}[2][*]{%
\def\egp@@name{#1}%
- \def\egp@expression{#2}
- \egp@calc
+ \def\egp@expression{#2}%
+ \egp@calc%
\egp@includevalue{\theegpfile}{\theegpcalc}}
\newcommand{\egpuseval}[1]{%
\@ifundefined{egp@k:f:#1}%
@@ -231,8 +256,13 @@
{\egp@includevalue{\@nameuse{egp@k:f:#1}}{\@nameuse{egp@k:v:#1}}}}
\newcommand{\egpassign}[2]{%
\egpwrite{#1=#2}\egpshowval{#1}}
+\ifthenelse{\boolean{egp@oldgp}}
+ {\egpprelude{save "reset.gp"}}
+ {\relax}
\egpfigprelude{set terminal postscript eps monochrome dashed "Helvetica" 17}
-\egpfigepilog{reset}
+\ifthenelse{\boolean{egp@oldgp}}{%
+ \egpfigepilog{load "reset.gp"}}{%
+ \egpfigepilog{reset}}
\InputIfFileExists{egplot.cfg}
{\typeout{egp: Using configuration file 'egplot.cfg'}}
{}
diff --git a/Master/texmf-dist/tex/latex/filecontents/filecontents.sty b/Master/texmf-dist/tex/latex/filecontents/filecontents.sty
index 01a4b5be38d..8936cc18ebc 100644
--- a/Master/texmf-dist/tex/latex/filecontents/filecontents.sty
+++ b/Master/texmf-dist/tex/latex/filecontents/filecontents.sty
@@ -8,20 +8,22 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2004 Scott Pakin <scott+fc@pakin.org>
+%% Copyright (C) 2006 Scott Pakin <scott+fc@pakin.org>
%% -------------------------------------------------------
%%
-%% This package 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
+%% This package may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, either version 1.3b 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.
+%%
+%% and version 1.3b or later is part of all distributions of LaTeX
+%% version 2006/01/07 or later.
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{filecontents}
- [2004/08/16 v1.1 Create an external file from within a LaTeX document]
+ [2006/03/11 v1.1a Create an external file from within a LaTeX document]
\begingroup%
\catcode`\*=11 %
\catcode`\^^M\active%
diff --git a/Master/texmf-dist/tex/latex/footbib/footbib.sty b/Master/texmf-dist/tex/latex/footbib/footbib.sty
index 8a1210399a9..739f984a06e 100644
--- a/Master/texmf-dist/tex/latex/footbib/footbib.sty
+++ b/Master/texmf-dist/tex/latex/footbib/footbib.sty
@@ -20,14 +20,16 @@
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
-%% File: footbib.dtx Copyright (C) 1997 Eric Domenjoud
+%%
+%% File: footbib.dtx Copyright (C) 1997-2005 Eric Domenjoud
%%
%% Eric Domenjoud,
%% CRIN/CNRS & INRIA Lorraine
%% E-mail: Eric.Domenjoud@loria.fr
%%
-\def\fileversion{2.0.1}
-\def\filedate{1999/05/06}
+
+\def\fileversion{2.0.4}
+\def\filedate{2004/06/04}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{footbib}[\filedate\space v\fileversion\space(E.Domenjoud)]
\@makeother\`
@@ -56,7 +58,8 @@
\@addtocurcol\else\@reinserts\@addmarginpar\fi}\@latexbug\ifnum
\outputpenalty<\z@\if@nobreak\nobreak\else\addpenalty\interlinepenalty
\fi\fi\fi\fi}
-\@tempa\@doclearpage{\ifvoid\footins\setbox\@tempboxa\vsplit\@cclv to\z@
+\@tempa\@doclearpage{\ifvoid\footins\ifvbox\@kludgeins{\setbox\@tempboxa
+ \box\@kludgeins}\fi\setbox\@tempboxa\vsplit\@cclv to\z@
\unvbox\@tempboxa\setbox\@tempboxa\box\@cclv\xdef\@deferlist{\@toplist
\@botlist\@deferlist}\global\let\@toplist\@empty\global\let\@botlist
\@empty\global\@colroom\@colht\ifx\@currlist\@empty\else\@latexerr
@@ -70,14 +73,14 @@
\@opcol\clearpage\fi}
\@tempa\@makecol{\ifvoid\footins\setbox\@outputbox\box\@cclv\else\setbox
\@outputbox\vbox{\boxmaxdepth\@maxdepth\@tempdima\dp\@cclv\unvbox\@cclv
- \vskip-\@tempdima\vskip\skip\footins\color@begingroup\normalcolor
- \footnoterule\unvbox\footins\color@endgroup}\fi\xdef\@freelist{\@freelist
+ \vskip\skip\footins\color@begingroup\normalcolor\footnoterule\unvbox
+ \footins\color@endgroup}\fi\let\@elt\relax\xdef\@freelist{\@freelist
\@midlist}\global\let\@midlist\@empty\@combinefloats\ifvbox\@kludgeins
\@makespecialcolbox\else\setbox\@outputbox\vbox to\@colht{\@texttop\dimen@
\dp\@outputbox\unvbox\@outputbox\vskip-\dimen@\@textbottom}\fi\global
- \maxdepth\@maxdepth}\@tempa\@reinserts{\ifvoid\footins\else\insert\footins
- {\unvbox\footins}\fi\ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins
- }\fi}
+ \maxdepth\@maxdepth}
+\@tempa\@reinserts{\ifvoid\footins\else\insert\footins{\unvbox\footins}\fi
+ \ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins}\fi}
\fi
\if@tempswa
\PackageError{footbib}{the output routine of LaTeX changed}
@@ -639,6 +642,9 @@
\ifvoid\footins\else\@tempswafalse\fi
\ifvoid\fb@ins\else\@tempswafalse\fi
\if@tempswa
+ \ifvbox\@kludgeins
+ {\setbox \@tempboxa \box \@kludgeins}%
+ \fi
\setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa
\setbox\@tempboxa\box\@cclv
\xdef\@deferlist{\@toplist\@botlist\@deferlist}%
@@ -701,6 +707,7 @@
\fi
}%
\fi
+ \let\@elt\relax
\xdef\@freelist{\@freelist\@midlist}%
\global \let \@midlist \@empty
\@combinefloats
diff --git a/Master/texmf-dist/tex/latex/jurabib/frjbbib.ldf b/Master/texmf-dist/tex/latex/jurabib/frjbbib.ldf
index 59d490eb047..b2c0c20324c 100644
--- a/Master/texmf-dist/tex/latex/jurabib/frjbbib.ldf
+++ b/Master/texmf-dist/tex/latex/jurabib/frjbbib.ldf
@@ -115,7 +115,7 @@
\def\transby{par}%
\def\fromgerman{de l'allemand}%
\def\fromenglish{de l'anglais}%
- \def\fromfrench{du fran^^e7ais}%
+ \def\fromfrench{du franais}%
\def\fromdutch{du n\'eerlandais}%
\def\fromspanish{de l'espagnol}%
\def\fromitalian{de l'italien}%
diff --git a/Master/texmf-dist/tex/latex/lcd/lcd.sty b/Master/texmf-dist/tex/latex/lcd/lcd.sty
index f80140d1a9c..68d40c6696b 100644
--- a/Master/texmf-dist/tex/latex/lcd/lcd.sty
+++ b/Master/texmf-dist/tex/latex/lcd/lcd.sty
@@ -133,19 +133,19 @@
\DefineLCDchar{rb}{01000001000010000010001000010001000}
\DefineLCDchar{alpha}{00000000000100110101100101001001101}
\begingroup
-\catcode`\~=11 \catcode`\$=11 \catcode`\^^b5=11 \catcode`\^^b0=11
-\catcode`\^^b7=11 \catcode`\^^e4=11 \catcode`\^^f6=11 \catcode`\^^fc=11
-\catcode`\^^df=11 \catcode`\"=11 \catcode`\#=11 \catcode`\&=11
+\catcode`\~=11 \catcode`\$=11 \catcode`\=11 \catcode`\=11
+\catcode`\=11 \catcode`\=11 \catcode`\=11 \catcode`\=11
+\catcode`\=11 \catcode`\"=11 \catcode`\#=11 \catcode`\&=11
\catcode`\^=11 \catcode`\_=11
\DefineLCDchar{$}{00100011111010001110001011111000100}%$
\DefineLCDchar{#}{01010010101111101010111110101001010}
-\DefineLCDchar{^^b5}{00000100011000110001100111110110000}
-\DefineLCDchar{^^b0}{11100101001110000000000000000000000}
-\DefineLCDchar{^^b7}{00000000000000001100011000000000000}
-\DefineLCDchar{^^e4}{01010000000111000001011111000101111}
-\DefineLCDchar{^^f6}{01010000000111010001100011000101110}
-\DefineLCDchar{^^fc}{01010000001000110001100011001101101}
-\DefineLCDchar{^^df}{00000011101000111110100011111010000}
+\DefineLCDchar{}{00000100011000110001100111110110000}
+\DefineLCDchar{}{11100101001110000000000000000000000}
+\DefineLCDchar{}{00000000000000001100011000000000000}
+\DefineLCDchar{}{01010000000111000001011111000101111}
+\DefineLCDchar{}{01010000000111010001100011000101110}
+\DefineLCDchar{}{01010000001000110001100011001101101}
+\DefineLCDchar{}{00000011101000111110100011111010000}
\DefineLCDchar{"}{01010010100101000000000000000000000}
\DefineLCDchar{&}{01100100101010001000101011001011101}
\DefineLCDchar{^}{00100010101000100000000000000000000}
@@ -205,9 +205,9 @@
\linethickness{0.7\unitlength}}
\newcommand*\@LCDend{\end{picture}}
\newcommand*\do@LCDspecials{%
- \catcode`\~=11 \catcode`\$=11 \catcode`\^^b5=11 \catcode`\^^b0=11
- \catcode`\^^b7=11 \catcode`\^^e4=11 \catcode`\^^f6=11 \catcode`\^^fc=11
- \catcode`\^^df=11 \catcode`\"=11 \catcode`\&=11 \catcode`\#=11
+ \catcode`\~=11 \catcode`\$=11 \catcode`\=11 \catcode`\=11
+ \catcode`\=11 \catcode`\=11 \catcode`\=11 \catcode`\=11
+ \catcode`\=11 \catcode`\"=11 \catcode`\&=11 \catcode`\#=11
\catcode`\^=11 \catcode`\_=11 \catcode`\%=11 \obeyspaces}
\newcommand*\calc@LCDsize[2]{\@tempcnta#1\multiply\@tempcnta10\relax
\@tempcntb#2\multiply\@tempcntb6\advance\@tempcntb2\relax}
diff --git a/Master/texmf-dist/tex/latex/maybemath/maybemath.sty b/Master/texmf-dist/tex/latex/maybemath/maybemath.sty
index 0b88a0c127f..0cbe49e8550 100644
--- a/Master/texmf-dist/tex/latex/maybemath/maybemath.sty
+++ b/Master/texmf-dist/tex/latex/maybemath/maybemath.sty
@@ -1,9 +1,11 @@
-\ProvidesPackage{maybemath}[2004/11/29]
+\ProvidesPackage{maybemath}[2005/2/22]
+\RequirePackage{amsmath}
\RequirePackage{bm}
+%\RequirePackage{xspace}
-%% A few commands for making math fonts bold or italic
-%% according to the context of surrounding text. It is
-%% particularly useful for avoiding problems with math
+%% A few commands for making math fonts bold, upright, italic
+%% or sans-serif according to the context of surrounding text.
+%% It is particularly useful for avoiding problems with math
%% boldness in section titles causing unwanted boldness
%% in e.g. the table of contents.
%%
@@ -17,35 +19,74 @@
%% Author: Andy Buckley <andy@insectnation.org>
+%% Mode names for bold, ext-bold, italic and sans-serif contexts
+\def\@boldname{b}%
+\def\@boldexname{bx}%
+\def\@italname{it}%
+\def\@sfname{cmss}%
+
+
%% Use the bold symbol if reqd for math fonts
-\DeclareRobustCommand{\maybebm}[1]{%
- \def\boldname{b}%
- \def\boldexname{bx}%
- \ifx\f@series\boldname%
- \boldsymbol{#1}%
- \else\ifx\f@series\boldexname%
- \boldsymbol{#1}%
+\DeclareRobustCommand{\maybebm}[1]{\ensuremath{%
+ \ifx\f@series\@boldname%
+ {{\bm{#1}}}%
+ \else\ifx\f@series\@boldexname%
+ {{\bm{#1}}}%
\else%
- #1%
+ {{#1}}%
\fi\fi%
-}
+}}
%% Use \mathrm if not in italic context
-%% (``backward logic'' for a reason)
-\def\italname{it}%
-\DeclareRobustCommand{\maybeit}[1]{%
- \ifx\f@shape\italname%
+\DeclareRobustCommand{\mayberm}[1]{\ensuremath{%
+ \ifx\f@shape\@italname%
{#1}%
\else%
{\mathrm{#1}}%
\fi%
-}
+}}
+
+%% Use \mathit if in italic context
+\DeclareRobustCommand{\maybeit}[1]{\ensuremath{%
+ \ifx\f@shape\@italname%
+ {\mathit{#1}}%
+ \else%
+ {#1}%
+ \fi%
+}}
+
+%% Use \mathrm if not in italic context
+%% and \mathit if in italic context
+\DeclareRobustCommand{\maybeitrm}[1]{\ensuremath{%
+ \ifx\f@shape\@italname%
+ {\mathit{#1}}%
+ \else%
+ {\mathrm{#1}}%
+ \fi%
+}}
%% Maybe-italic subscript shifting
-\DeclareRobustCommand{\maybeitsubscript}[1]{%
- \ifx\f@shape\italname%
- {\!\!#1}%
+\DeclareRobustCommand{\maybeitsubscript}[1]{\ensuremath{%
+ \ifx\f@shape\@italname%
+ {\!\mspace{1mu}#1}%
+ \else%
+ {#1}%
+ \fi%
+}}
+
+%% Maybe-sans font change
+\DeclareRobustCommand{\maybesf}[1]{\ensuremath{%
+ \ifx\f@family\@sfname%
+ {\mathsf{#1}}%
\else%
{#1}%
\fi%
-} \ No newline at end of file
+}}
+
+%% Convenience command for following bold and sans-serif contexts
+\DeclareRobustCommand{\maybebmsf}[1]{%
+ {\maybebm{\maybesf{#1}}}%
+}
+
+%% For reference purposes :-)
+%\DeclareRobustCommand{\maybemath}{\texttt{maybemath}\xspace}
diff --git a/Master/texmf-dist/tex/latex/pdfscreen/pdfscreen.sty b/Master/texmf-dist/tex/latex/pdfscreen/pdfscreen.sty
index 6a16d6e5190..f2c93522cb1 100644
--- a/Master/texmf-dist/tex/latex/pdfscreen/pdfscreen.sty
+++ b/Master/texmf-dist/tex/latex/pdfscreen/pdfscreen.sty
@@ -990,7 +990,6 @@
\newcounter{slide}
\newcounter{slideoverlay}
\newenvironment{slide}{%
- \clearpage\begingroup\parindent0pt%
\stepcounter{slide}%
\stepcounter{slideoverlay}%
\ifnum\theslideoverlay=11\setcounter{slideoverlay}{1}
@@ -998,7 +997,7 @@
\PDFSCR@Warning{Overly counter reset to zero}\fi\fi
\ifx\@overlay\@empty\else
\PDFSCR@Warning{Overly file is \@overlay.pdf}\fi
- %\noindent\begin{minipage}[c][\textheight][c]{\textwidth}
+ \noindent\begin{minipage}[c][\textheight][c]{\textwidth}
\newcommand\realnormalsize{%
\@setfontsize\realnormalsize\@xiipt{14.5}%
\abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@
@@ -1053,8 +1052,7 @@
\renewcommand\huge{\@setfontsize\huge{40}{48}}
\let\Huge=\huge
}
-{\endgroup%\end{minipage}
-}
+{\end{minipage}}
%
\long\def\buttonbox#1{%
\leavevmode
@@ -1256,15 +1254,6 @@
\setcounter{secnumdepth}{4}
\fi
%%
-
-\def\includesrc#1{\begingroup\pdfcompresslevel=0
- \immediate\pdfobj
- stream attr {/Type /SourceFile /SourceName (#1)}
- file{#1}
- \pdfcatalog{/SourceObject \the\pdflastobj\space 0 R}
- \endgroup
- \pdfcompresslevel=9}
-
\endinput
%%
%% End of file pdfscreen.sty
diff --git a/Master/texmf-dist/tex/latex/pst-bar/pst-bar.sty b/Master/texmf-dist/tex/latex/pst-bar/pst-bar.sty
index ed014a1471c..09377686fff 100644
--- a/Master/texmf-dist/tex/latex/pst-bar/pst-bar.sty
+++ b/Master/texmf-dist/tex/latex/pst-bar/pst-bar.sty
@@ -3,4 +3,5 @@
\input{pst-bar.tex}
\ProvidesFile{pst-bar.tex}
[\filedate\space v\fileversion\space `pst-bar' (ahr)]
+\IfFileExists{pst-bar.pro}{\@addtofilelist{pst-bar.pro}}{}% hv 2006-01-20
\endinput
diff --git a/Master/texmf-dist/tpm/ccaption.tpm b/Master/texmf-dist/tpm/ccaption.tpm
index d97172fdcd4..62fd2b07002 100644
--- a/Master/texmf-dist/tpm/ccaption.tpm
+++ b/Master/texmf-dist/tpm/ccaption.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/ccaption.zip">
<TPM:Name>ccaption</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/11 23:51:37</TPM:Date>
+ <TPM:Date>2005/03/29 19:14:00</TPM:Date>
<TPM:Version>3.2</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>Continuation headings and legends for floats.</TPM:Title>
@@ -19,15 +19,15 @@ provided for specifying your own captioning styles.
<TPM:Author>Peter R. Wilson</TPM:Author>
<TPM:Size>562373</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="24649">
+ <TPM:RunFiles size="24647">
texmf-dist/tex/latex/ccaption/ccaption.sty
texmf-dist/tpm/ccaption.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="390239">
+ <TPM:DocFiles size="391839">
texmf-dist/doc/latex/ccaption/README
texmf-dist/doc/latex/ccaption/ccaption.pdf
</TPM:DocFiles>
- <TPM:SourceFiles size="147485">
+ <TPM:SourceFiles size="148425">
texmf-dist/source/latex/ccaption/ccaption.dtx
texmf-dist/source/latex/ccaption/ccaption.ins
</TPM:SourceFiles>
diff --git a/Master/texmf-dist/tpm/cdpbundl.tpm b/Master/texmf-dist/tpm/cdpbundl.tpm
index fb8fcf22258..d89ab771cb1 100644
--- a/Master/texmf-dist/tpm/cdpbundl.tpm
+++ b/Master/texmf-dist/tpm/cdpbundl.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/cdpbundl.zip">
<TPM:Name>cdpbundl</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/11 23:51:41</TPM:Date>
+ <TPM:Date>2005/12/31 23:00:00</TPM:Date>
<TPM:Version></TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>Business letters in the Italian style</TPM:Title>
@@ -24,7 +24,7 @@ contents, etc., independant from the other ones.
<TPM:Author>Gustavo Mmezzetti</TPM:Author>
<TPM:Size>1011922</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="95092">
+ <TPM:RunFiles size="96073">
texmf-dist/tex/latex/cdpbundl/adiseal.sty
texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls
texmf-dist/tex/latex/cdpbundl/cdpaddon.sty
@@ -36,13 +36,13 @@ texmf-dist/tex/latex/cdpbundl/lettcdpadi.cls
texmf-dist/tex/latex/cdpbundl/letteracdp.cls
texmf-dist/tpm/cdpbundl.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="692070">
+ <TPM:DocFiles size="692929">
texmf-dist/doc/latex/cdpbundl/00readme.txt
texmf-dist/doc/latex/cdpbundl/README
texmf-dist/doc/latex/cdpbundl/manifest.txt
texmf-dist/doc/latex/cdpbundl/overview.pdf
</TPM:DocFiles>
- <TPM:SourceFiles size="224760">
+ <TPM:SourceFiles size="241674">
texmf-dist/source/latex/cdpbundl/cdpbundl.dtx
texmf-dist/source/latex/cdpbundl/cdpbundl.ins
</TPM:SourceFiles>
diff --git a/Master/texmf-dist/tpm/chem-journal.tpm b/Master/texmf-dist/tpm/chem-journal.tpm
index 446bc0d271a..22e5ecc2c0f 100644
--- a/Master/texmf-dist/tpm/chem-journal.tpm
+++ b/Master/texmf-dist/tpm/chem-journal.tpm
@@ -19,7 +19,7 @@ Chemistry Chemical Physics.
<TPM:Author>Joerg-Ruediger Hill</TPM:Author>
<TPM:Size>72575</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="72575">
+ <TPM:RunFiles size="72613">
texmf-dist/bibtex/bst/chem-journal/jcc.bst
texmf-dist/bibtex/bst/chem-journal/jpc.bst
texmf-dist/bibtex/bst/chem-journal/pccp.bst
diff --git a/Master/texmf-dist/tpm/clefval.tpm b/Master/texmf-dist/tpm/clefval.tpm
index 670f33aab63..b1cb5e4e600 100644
--- a/Master/texmf-dist/tpm/clefval.tpm
+++ b/Master/texmf-dist/tpm/clefval.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/clefval.zip">
<TPM:Name>clefval</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/11 23:51:46</TPM:Date>
+ <TPM:Date>2004/05/26 16:43:00</TPM:Date>
<TPM:Version>1.0</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>Key/value support with a hash.</TPM:Title>
@@ -20,7 +20,7 @@ protect them.
<TPM:Author>Yvon Henel, Josselin Noirel</TPM:Author>
<TPM:Size>399187</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="3927">
+ <TPM:RunFiles size="3924">
texmf-dist/tex/latex/clefval/clefval.sty
texmf-dist/tpm/clefval.tpm
</TPM:RunFiles>
diff --git a/Master/texmf-dist/tpm/coordsys.tpm b/Master/texmf-dist/tpm/coordsys.tpm
index 2ec412863c6..01abf9188a9 100644
--- a/Master/texmf-dist/tpm/coordsys.tpm
+++ b/Master/texmf-dist/tpm/coordsys.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/coordsys.zip">
<TPM:Name>coordsys</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/11 23:51:58</TPM:Date>
+ <TPM:Date>2006/11/09 11:38:02</TPM:Date>
<TPM:Version>1.0</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>Draw cartesian coordinate systems.</TPM:Title>
@@ -16,17 +16,17 @@ environment.
<TPM:Author></TPM:Author>
<TPM:Size>489740</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="33379">
+ <TPM:RunFiles size="33382">
texmf-dist/tex/latex/coordsys/coordsys.sty
texmf-dist/tex/latex/coordsys/logsys.sty
texmf-dist/tpm/coordsys.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="344207">
+ <TPM:DocFiles size="346702">
texmf-dist/doc/latex/coordsys/README
texmf-dist/doc/latex/coordsys/coordsys.pdf
texmf-dist/doc/latex/coordsys/putfile.
</TPM:DocFiles>
- <TPM:SourceFiles size="112154">
+ <TPM:SourceFiles size="115166">
texmf-dist/source/latex/coordsys/coordsys.dtx
texmf-dist/source/latex/coordsys/coordsys.ins
</TPM:SourceFiles>
diff --git a/Master/texmf-dist/tpm/dingbat.tpm b/Master/texmf-dist/tpm/dingbat.tpm
index e30ff4fea4b..0784b66579c 100644
--- a/Master/texmf-dist/tpm/dingbat.tpm
+++ b/Master/texmf-dist/tpm/dingbat.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/dingbat.zip">
<TPM:Name>dingbat</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/11 23:52:19</TPM:Date>
+ <TPM:Date>2001/04/27 18:30:00</TPM:Date>
<TPM:Version>1.0</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>A dingbat symbol font.</TPM:Title>
@@ -15,7 +15,7 @@ for use in plain TeX and in LaTeX.
<TPM:Author></TPM:Author>
<TPM:Size>186229</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="40453">
+ <TPM:RunFiles size="40077">
texmf-dist/fonts/source/public/dingbat/ark10.mf
texmf-dist/fonts/source/public/dingbat/dingbat.mf
texmf-dist/fonts/tfm/public/dingbat/ark10.tfm
diff --git a/Master/texmf-dist/tpm/dpfloat.tpm b/Master/texmf-dist/tpm/dpfloat.tpm
index 29bdf730acf..3c109e666d3 100644
--- a/Master/texmf-dist/tpm/dpfloat.tpm
+++ b/Master/texmf-dist/tpm/dpfloat.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/dpfloat.zip">
<TPM:Name>dpfloat</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/09 00:44:40</TPM:Date>
+ <TPM:Date>2001/04/27 12:26:00</TPM:Date>
<TPM:Version></TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>Support for double-page floats.</TPM:Title>
@@ -18,7 +18,7 @@ floats will appear side-by-side in a two-sided document.
<TPM:Author>Jim Fox</TPM:Author>
<TPM:Size>4859</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="3555">
+ <TPM:RunFiles size="4556">
texmf-dist/tex/latex/dpfloat/dpfloat.sty
texmf-dist/tpm/dpfloat.tpm
</TPM:RunFiles>
diff --git a/Master/texmf-dist/tpm/dramatist.tpm b/Master/texmf-dist/tpm/dramatist.tpm
index 83f9dd2208e..f476a48e896 100644
--- a/Master/texmf-dist/tpm/dramatist.tpm
+++ b/Master/texmf-dist/tpm/dramatist.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/dramatist.zip">
<TPM:Name>dramatist</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/11 23:52:27</TPM:Date>
+ <TPM:Date>2006/11/09 11:42:32</TPM:Date>
<TPM:Version>0.0</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>Typeset dramas, both in verse and in prose.</TPM:Title>
@@ -19,18 +19,18 @@ list.
<TPM:Author>Massimiliano Dominici</TPM:Author>
<TPM:Size>519444</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="15811">
+ <TPM:RunFiles size="14793">
texmf-dist/tex/latex/dramatist/dramatist.sty
texmf-dist/tpm/dramatist.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="377142">
+ <TPM:DocFiles size="331237">
texmf-dist/doc/latex/dramatist/README
texmf-dist/doc/latex/dramatist/dramatist.pdf
texmf-dist/doc/latex/dramatist/marlowe-poemscol.tex
texmf-dist/doc/latex/dramatist/marlowe-verse.tex
texmf-dist/doc/latex/dramatist/schiller.tex
</TPM:DocFiles>
- <TPM:SourceFiles size="126491">
+ <TPM:SourceFiles size="125750">
texmf-dist/source/latex/dramatist/dramatist.dtx
texmf-dist/source/latex/dramatist/dramatist.ins
</TPM:SourceFiles>
diff --git a/Master/texmf-dist/tpm/egplot.tpm b/Master/texmf-dist/tpm/egplot.tpm
index 7ea1e7c941c..85df3c8f735 100644
--- a/Master/texmf-dist/tpm/egplot.tpm
+++ b/Master/texmf-dist/tpm/egplot.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/egplot.zip">
<TPM:Name>egplot</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/11 23:52:37</TPM:Date>
+ <TPM:Date>2006/11/09 11:45:25</TPM:Date>
<TPM:Version></TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>No caption.</TPM:Title>
@@ -16,15 +16,15 @@ generated with gnuplot.
<TPM:Author>Axel Probst</TPM:Author>
<TPM:Size>292147</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="10288">
+ <TPM:RunFiles size="11465">
texmf-dist/tex/latex/egplot/egplot.sty
texmf-dist/tpm/egplot.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="237516">
+ <TPM:DocFiles size="151649">
texmf-dist/doc/latex/egplot/egplot.README
texmf-dist/doc/latex/egplot/manual.ps.gz
</TPM:DocFiles>
- <TPM:SourceFiles size="44343">
+ <TPM:SourceFiles size="48482">
texmf-dist/source/latex/egplot/egplot.drv
texmf-dist/source/latex/egplot/egplot.dtx
texmf-dist/source/latex/egplot/egplot.ins
diff --git a/Master/texmf-dist/tpm/filecontents.tpm b/Master/texmf-dist/tpm/filecontents.tpm
index 2ab0aaebc42..7b45842deae 100644
--- a/Master/texmf-dist/tpm/filecontents.tpm
+++ b/Master/texmf-dist/tpm/filecontents.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/filecontents.zip">
<TPM:Name>filecontents</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/11 23:53:18</TPM:Date>
+ <TPM:Date>2006/03/12 02:47:00</TPM:Date>
<TPM:Version></TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>
@@ -24,15 +24,15 @@ filecontents/filecontents* anywhere.
<TPM:Author>Scott Pakin</TPM:Author>
<TPM:Size>146581</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="4662">
+ <TPM:RunFiles size="4674">
texmf-dist/tex/latex/filecontents/filecontents.sty
texmf-dist/tpm/filecontents.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="126890">
+ <TPM:DocFiles size="183118">
texmf-dist/doc/latex/filecontents/README
texmf-dist/doc/latex/filecontents/filecontents.pdf
</TPM:DocFiles>
- <TPM:SourceFiles size="15029">
+ <TPM:SourceFiles size="15490">
texmf-dist/source/latex/filecontents/filecontents.dtx
texmf-dist/source/latex/filecontents/filecontents.ins
</TPM:SourceFiles>
diff --git a/Master/texmf-dist/tpm/footbib.tpm b/Master/texmf-dist/tpm/footbib.tpm
index ab162d974fc..7e84e724eac 100644
--- a/Master/texmf-dist/tpm/footbib.tpm
+++ b/Master/texmf-dist/tpm/footbib.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/footbib.zip">
<TPM:Name>footbib</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/21 00:25:32</TPM:Date>
+ <TPM:Date>2005/05/19 07:50:46</TPM:Date>
<TPM:Version>2.0.3</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>Bibliographic references as footnotes.</TPM:Title>
@@ -23,12 +23,12 @@ Any standard bibliography style may be used.
<TPM:Author>Eric Domenjoud</TPM:Author>
<TPM:Size>214223</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="26266">
+ <TPM:RunFiles size="26423">
texmf-dist/tex/latex/footbib/footbib.sty
texmf-dist/tpm/footbib.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="98664">texmf-dist/doc/latex/footbib/footbib.dvi</TPM:DocFiles>
- <TPM:SourceFiles size="89293">
+ <TPM:DocFiles size="261220">texmf-dist/doc/latex/footbib/footbib.pdf</TPM:DocFiles>
+ <TPM:SourceFiles size="90858">
texmf-dist/source/latex/footbib/footbib.dtx
texmf-dist/source/latex/footbib/footbib.ins
</TPM:SourceFiles>
diff --git a/Master/texmf-dist/tpm/jurabib.tpm b/Master/texmf-dist/tpm/jurabib.tpm
index fbbb6d722c4..3eeb3c70766 100644
--- a/Master/texmf-dist/tpm/jurabib.tpm
+++ b/Master/texmf-dist/tpm/jurabib.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/jurabib.zip">
<TPM:Name>jurabib</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/21 00:25:32</TPM:Date>
+ <TPM:Date>2006/11/09 12:25:19</TPM:Date>
<TPM:Version>0.52p</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>
@@ -29,7 +29,7 @@ bibliography entries is possible by the special language field.
<TPM:Author>Jens Berger</TPM:Author>
<TPM:Size>1515565</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="541038">
+ <TPM:RunFiles size="541032">
texmf-dist/bibtex/bib/jurabib/book.bib
texmf-dist/bibtex/bib/jurabib/comment.bib
texmf-dist/bibtex/bib/jurabib/jbtest.bib
@@ -53,12 +53,13 @@ texmf-dist/tex/latex/jurabib/ptjbbib.ldf
texmf-dist/tex/latex/jurabib/spjbbib.ldf
texmf-dist/tpm/jurabib.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="524148">
+ <TPM:DocFiles size="586421">
texmf-dist/doc/latex/jurabib/changes.txt
texmf-dist/doc/latex/jurabib/docs/english/jbendoc.dvi
texmf-dist/doc/latex/jurabib/docs/english/jbendoc.tex
texmf-dist/doc/latex/jurabib/docs/german/jbgerdoc.dvi
texmf-dist/doc/latex/jurabib/docs/german/jbgerdoc.tex
+texmf-dist/doc/latex/jurabib/jbtest.pdf
texmf-dist/doc/latex/jurabib/jbtest.tex
texmf-dist/doc/latex/jurabib/jbtest.url
texmf-dist/doc/latex/jurabib/jbtestbt.tex
diff --git a/Master/texmf-dist/tpm/lcd.tpm b/Master/texmf-dist/tpm/lcd.tpm
index 0fd8cf0b421..2c73d37d793 100644
--- a/Master/texmf-dist/tpm/lcd.tpm
+++ b/Master/texmf-dist/tpm/lcd.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/lcd.zip">
<TPM:Name>lcd</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/11 23:03:17</TPM:Date>
+ <TPM:Date>2006/11/09 11:48:55</TPM:Date>
<TPM:Version></TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>Alphanumerical LCD-style displays.</TPM:Title>
@@ -15,7 +15,7 @@ Assumes 8-bit input in its internal verbatim-style environment.
<TPM:Author></TPM:Author>
<TPM:Size>131572</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="12898">
+ <TPM:RunFiles size="12835">
texmf-dist/tex/latex/lcd/lcd.sty
texmf-dist/tpm/lcd.tpm
</TPM:RunFiles>
diff --git a/Master/texmf-dist/tpm/maybemath.tpm b/Master/texmf-dist/tpm/maybemath.tpm
index a74af6caa61..2fd71477396 100644
--- a/Master/texmf-dist/tpm/maybemath.tpm
+++ b/Master/texmf-dist/tpm/maybemath.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/maybemath.zip">
<TPM:Name>maybemath</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/09 00:44:40</TPM:Date>
+ <TPM:Date>2005/01/25 17:16:00</TPM:Date>
<TPM:Version>1.0</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>
@@ -28,11 +28,11 @@ if the expression is italicised.
<TPM:Author>unknown</TPM:Author>
<TPM:Size>79829</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="3037">
+ <TPM:RunFiles size="3951">
texmf-dist/tex/latex/maybemath/maybemath.sty
texmf-dist/tpm/maybemath.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="76792">
+ <TPM:DocFiles size="77282">
texmf-dist/doc/latex/maybemath/README
texmf-dist/doc/latex/maybemath/maybemath.pdf
texmf-dist/doc/latex/maybemath/maybemath.tex
diff --git a/Master/texmf-dist/tpm/metaobj.tpm b/Master/texmf-dist/tpm/metaobj.tpm
index a4fdd760f5f..b589acfc101 100644
--- a/Master/texmf-dist/tpm/metaobj.tpm
+++ b/Master/texmf-dist/tpm/metaobj.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/metaobj.zip">
<TPM:Name>metaobj</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/09 00:49:07</TPM:Date>
+ <TPM:Date>2003/08/02 02:05:44</TPM:Date>
<TPM:Version></TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>
diff --git a/Master/texmf-dist/tpm/metaplot.tpm b/Master/texmf-dist/tpm/metaplot.tpm
index e8c62b320e0..d81db91a634 100644
--- a/Master/texmf-dist/tpm/metaplot.tpm
+++ b/Master/texmf-dist/tpm/metaplot.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/metaplot.zip">
<TPM:Name>metaplot</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/09 00:49:07</TPM:Date>
+ <TPM:Date>2005/03/13 00:42:00</TPM:Date>
<TPM:Version>1.0</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>Plot-manipulation macros for use in Metapost.</TPM:Title>
@@ -27,12 +27,12 @@ suggestions would be most welcome!
<TPM:Author>unknown</TPM:Author>
<TPM:Size>565467</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="16715">
+ <TPM:RunFiles size="17542">
texmf-dist/metapost/metaplot/axes.mp
texmf-dist/metapost/metaplot/metaplot.mp
texmf-dist/tpm/metaplot.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="548752">
+ <TPM:DocFiles size="549634">
texmf-dist/doc/latex/metaplot/README
texmf-dist/doc/latex/metaplot/examples/cap1.cc
texmf-dist/doc/latex/metaplot/examples/cap1.mp
diff --git a/Master/texmf-dist/tpm/mwcls.tpm b/Master/texmf-dist/tpm/mwcls.tpm
index 91a891f219a..0e46a967199 100644
--- a/Master/texmf-dist/tpm/mwcls.tpm
+++ b/Master/texmf-dist/tpm/mwcls.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/mwcls.zip">
<TPM:Name>mwcls</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/11 23:55:23</TPM:Date>
+ <TPM:Date>2003/05/09 19:35:32</TPM:Date>
<TPM:Version>0.65</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>Polish-oriented document classes.</TPM:Title>
diff --git a/Master/texmf-dist/tpm/pdfscreen.tpm b/Master/texmf-dist/tpm/pdfscreen.tpm
index 30b3b8058f2..5cf95801237 100644
--- a/Master/texmf-dist/tpm/pdfscreen.tpm
+++ b/Master/texmf-dist/tpm/pdfscreen.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/pdfscreen.zip">
<TPM:Name>pdfscreen</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/09 00:44:40</TPM:Date>
+ <TPM:Date>2000/07/10 12:03:27</TPM:Date>
<TPM:Version>1.5</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>Support screen-based document design.</TPM:Title>
@@ -19,7 +19,7 @@ document without any extra effort.
<TPM:Author>C. V. Radhakrishnan</TPM:Author>
<TPM:Size>1065600</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="208367">
+ <TPM:RunFiles size="208085">
texmf-dist/tex/latex/pdfscreen/but.pdf
texmf-dist/tex/latex/pdfscreen/button.pdf
texmf-dist/tex/latex/pdfscreen/left.pdf
diff --git a/Master/texmf-dist/tpm/pst-bar.tpm b/Master/texmf-dist/tpm/pst-bar.tpm
index 1dc65a71a8c..f481f6d3e86 100644
--- a/Master/texmf-dist/tpm/pst-bar.tpm
+++ b/Master/texmf-dist/tpm/pst-bar.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/pst-bar.zip">
<TPM:Name>pst-bar</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/01/09 00:44:09</TPM:Date>
+ <TPM:Date>2004/09/15 14:58:00</TPM:Date>
<TPM:Version>1.0</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>Produces bar charts using pstricks.</TPM:Title>
@@ -20,13 +20,13 @@ that beta releases typically carry.
<TPM:Author>unknown</TPM:Author>
<TPM:Size>126659</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="14855">
+ <TPM:RunFiles size="15379">
texmf-dist/dvips/pst-bar/pst-bar.pro
texmf-dist/tex/generic/pst-bar/pst-bar.tex
texmf-dist/tex/latex/pst-bar/pst-bar.sty
texmf-dist/tpm/pst-bar.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="111804">
+ <TPM:DocFiles size="111823">
texmf-dist/doc/generic/pst-bar/LICENSE
texmf-dist/doc/generic/pst-bar/README
texmf-dist/doc/generic/pst-bar/pst-bar-doc.pdf
diff --git a/Master/texmf-dist/tpm/rsc.tpm b/Master/texmf-dist/tpm/rsc.tpm
index cf5f4722d29..f9f74e91bcf 100644
--- a/Master/texmf-dist/tpm/rsc.tpm
+++ b/Master/texmf-dist/tpm/rsc.tpm
@@ -11,7 +11,7 @@
<TPM:Author></TPM:Author>
<TPM:Size>20797</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="20797">
+ <TPM:RunFiles size="28105">
texmf-dist/bibtex/bst/rsc/rsc.bst
texmf-dist/tpm/rsc.tpm
</TPM:RunFiles>
diff --git a/Master/texmf/lists/footbib b/Master/texmf/lists/footbib
index 9809b2c04b1..5e62476964d 100644
--- a/Master/texmf/lists/footbib
+++ b/Master/texmf/lists/footbib
@@ -1,4 +1,4 @@
-texmf-dist/doc/latex/footbib/footbib.dvi
+texmf-dist/doc/latex/footbib/footbib.pdf
texmf-dist/source/latex/footbib/footbib.dtx
texmf-dist/source/latex/footbib/footbib.ins
texmf-dist/tex/latex/footbib/footbib.sty
diff --git a/Master/texmf/lists/jurabib b/Master/texmf/lists/jurabib
index 2f216816413..0d6c5d4b563 100644
--- a/Master/texmf/lists/jurabib
+++ b/Master/texmf/lists/jurabib
@@ -3,6 +3,7 @@ texmf-dist/doc/latex/jurabib/docs/english/jbendoc.dvi
texmf-dist/doc/latex/jurabib/docs/english/jbendoc.tex
texmf-dist/doc/latex/jurabib/docs/german/jbgerdoc.dvi
texmf-dist/doc/latex/jurabib/docs/german/jbgerdoc.tex
+texmf-dist/doc/latex/jurabib/jbtest.pdf
texmf-dist/doc/latex/jurabib/jbtest.tex
texmf-dist/doc/latex/jurabib/jbtest.url
texmf-dist/doc/latex/jurabib/jbtestbt.tex