From 10448afa6c23c9403daf4f67ebd5d01b556b531a Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Wed, 25 Nov 2009 21:47:49 +0000 Subject: mfpic update (1.02 2009/10/29) Also prevent ctan2tds from using MAKEflatten with a tds-ready tree. git-svn-id: svn://tug.org/texlive/trunk@16164 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/mfpic/README | 6 +- Master/texmf-dist/doc/generic/mfpic/README.mfpic | 139 - Master/texmf-dist/doc/generic/mfpic/changes.txt | 28 +- Master/texmf-dist/doc/generic/mfpic/coil.mps | 4 +- Master/texmf-dist/doc/generic/mfpic/data.dat | 37 - .../texmf-dist/doc/generic/mfpic/examples/data.dat | 37 + .../doc/generic/mfpic/examples/forfun.tex | 160 + .../doc/generic/mfpic/examples/lapictures.tex | 206 ++ .../doc/generic/mfpic/examples/pictures.tex | 204 ++ Master/texmf-dist/doc/generic/mfpic/forfun.tex | 160 - Master/texmf-dist/doc/generic/mfpic/install.txt | 4 +- Master/texmf-dist/doc/generic/mfpic/lapictures.tex | 206 -- Master/texmf-dist/doc/generic/mfpic/mfpcard.pdf | Bin 154513 -> 155987 bytes Master/texmf-dist/doc/generic/mfpic/mfpcard.tex | 4 +- Master/texmf-dist/doc/generic/mfpic/mfpdoc.sty | 8 +- Master/texmf-dist/doc/generic/mfpic/mfpguide.pdf | Bin 381856 -> 386179 bytes Master/texmf-dist/doc/generic/mfpic/mfpguide.tex | 2 +- Master/texmf-dist/doc/generic/mfpic/mfpic-doc.pdf | 3518 ++++++++++---------- Master/texmf-dist/doc/generic/mfpic/mfpic-doc.tex | 16 +- Master/texmf-dist/doc/generic/mfpic/pictures.tex | 204 -- Master/texmf-dist/metafont/mfpic/grafbase.mf | 58 +- Master/texmf-dist/metapost/mfpic/dvipsnam.mp | 2 +- Master/texmf-dist/metapost/mfpic/grafbase.mp | 58 +- .../texmf-dist/source/generic/mfpic/grafbase.dtx | 60 +- Master/texmf-dist/source/generic/mfpic/mfpic.dtx | 21 +- Master/texmf-dist/source/generic/mfpic/mfpic.ins | 2 +- Master/texmf-dist/tex/generic/mfpic/mfpic.sty | 4 +- Master/texmf-dist/tex/generic/mfpic/mfpic.tex | 17 +- Master/texmf-dist/tex/generic/mfpic/mfppatch.tex | 4 +- 29 files changed, 2542 insertions(+), 2627 deletions(-) delete mode 100644 Master/texmf-dist/doc/generic/mfpic/README.mfpic delete mode 100644 Master/texmf-dist/doc/generic/mfpic/data.dat create mode 100644 Master/texmf-dist/doc/generic/mfpic/examples/data.dat create mode 100644 Master/texmf-dist/doc/generic/mfpic/examples/forfun.tex create mode 100644 Master/texmf-dist/doc/generic/mfpic/examples/lapictures.tex create mode 100644 Master/texmf-dist/doc/generic/mfpic/examples/pictures.tex delete mode 100644 Master/texmf-dist/doc/generic/mfpic/forfun.tex delete mode 100644 Master/texmf-dist/doc/generic/mfpic/lapictures.tex delete mode 100644 Master/texmf-dist/doc/generic/mfpic/pictures.tex (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/generic/mfpic/README b/Master/texmf-dist/doc/generic/mfpic/README index 42a2aa57bb0..fae3fccf6ef 100644 --- a/Master/texmf-dist/doc/generic/mfpic/README +++ b/Master/texmf-dist/doc/generic/mfpic/README @@ -1,5 +1,5 @@ %%% File: README -%%% A part of mfpic 1.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% MFpic defines a command group \mfpic...\endmfpic (optionally in LaTeX @@ -16,7 +16,7 @@ features added since the previous official release (0.9). See the manual mfpic-doc.pdf for more detailed instructions and descriptions of features. -This is mfpic version 1.00. +This is mfpic version 1.02. LEGALITIES ---------- @@ -131,6 +131,8 @@ NEW FEATURES since Version 0.9 -- Better(?) handling of the filename argument of \opengraphsfile. + -- bugfix in \vectorfield. + \sig Dan Luecking (luecking at uark dot edu) Department of Mathematical Sciences diff --git a/Master/texmf-dist/doc/generic/mfpic/README.mfpic b/Master/texmf-dist/doc/generic/mfpic/README.mfpic deleted file mode 100644 index 42a2aa57bb0..00000000000 --- a/Master/texmf-dist/doc/generic/mfpic/README.mfpic +++ /dev/null @@ -1,139 +0,0 @@ -%%% File: README -%%% A part of mfpic 1.00 2009/09/22 -%%% - -MFpic defines a command group \mfpic...\endmfpic (optionally in LaTeX -an environment, mfpic) and drawing commands to be used inside this group. -When TeX (or LaTeX) is run on a file containing those commands, a -MetaPost (or Metafont) source file is created. When that file is correctly -processed by MetaPost (or Metafont), and LaTeX or TeX is run again, the -result is a figure in the TeX document at the location of each -environment. - -See install.txt for initial setup and brief installation instructions. -See mfpguide.pdf for a short tutorial. See below for a summary of -features added since the previous official release (0.9). See the -manual mfpic-doc.pdf for more detailed instructions and descriptions -of features. - -This is mfpic version 1.00. - -LEGALITIES ----------- -All files of the core mfpic distribution (listed below) may be -distributed and/or modified under the conditions of the LaTeX Project -Public License, either version 1.3c 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.3c or later is part of all distributions of LaTeX version -2008/12/01 or later. - -While every effort has been made to make mfpic useful, it comes with no -warranty, expressed or implied. - -MANIFEST --------- -Here is a list, plus explanation of purpose, of all files in the mfpic -distribution. Read it *before* trying to process any of the example -files. These, and the files generated by running tex on mfpic.ins, -constitute the mfpic distribution to which the LPPL applies. - -The four files marked with * below are the only ones essential -for using all the facilities of mfpic. - -All the *.tex files in the doc directory (except the plainTeX file -mfpcard.tex) require the LaTeX style file mfpdoc.sty. The mfpic manual -is mfpic-doc.pdf. - -Source files: ------------- -*mfpic.dtx Contains mfpic.sty and mfpic.tex -*grafbase.dtx Contains grafbase.mf, grafbase.mp and dvipsnam.mp -*mfpic.ins The unpacking script: run tex or latex on it. It reads - in mfpic.dtx and grafbase.dtx and produces the only - required run-time files: mfpic.sty, mfpic.tex, - grafbase.mf, grafbase.mp, and dvipsnam.mp - -TeX/LaTeX code: --------------- -*mfpic.tex Basic TeX/LaTeX code -*mfpic.sty LaTeX2e \usepackage wrapper for mfpic.tex -*mfppatch.tex patches and bugfixes. (Not actually required unless - there are some patches.) - -MetaPost/Metafont code: ----------------------- -*grafbase.mp MetaPost macros supporting mfpic -*dvipsnam.mp Color definitions for MetaPost, input by grafbase.mp -*grafbase.mf Metafont macos supporting mfpic - -Documentation: -------------- - changes.txt Summary of 17 years of changes - install.txt Basic information on installation - README This file. - mfpguide.pdf Precompiled tutorial (usletter paper size) - mfpic-doc.pdf Precompiled manual (usletter paper size) - mfpcard.pdf Precompiled reference card (usletter, landscape). - mfpdoc.sty LaTeX style used by the next two - mfpguide.tex LaTeX source for mfpguide.pdf, requires mfpdoc.sty and - the mfpic package. - mfpic-doc.tex LaTeX source for mfpic-doc.pdf, requires mfpdoc.sty. - coil.mps Figure included in mfpic-doc.tex - mfpcard.tex reference card source, should fit on two sides of - either USletter or A4, rotated. Plain TeX. - -Examples: --------- - pictures.tex Running tex on it produces pics.mp - lapictures.tex Running latex on it produces same pics.mp - data.dat Sample data file needed for above two - forfun.tex Example of \mfsrc: running tex on it produces fun.mp - - -This distribution, the latest updates, and some past versions, should also be -available at my web site: - -http://comp.uark.edu/~luecking/tex/mfpic.html - - -NEW FEATURES since Version 0.9 -------------------------------- - - -- Color functions cmyk() and gray() produce colors in the cmyk and - grayscale color models, if the MetaPost version is at least 1.000. - Extensive changes needed in grafbase, almost none in mfpic itself. - Also cyan, magenta and yellow now predefined to be cmykcolor. - - -- Color functions makecmyk, makergb and makegray force the conversion - of their argument to the indicated color model. - - -- Command \setfilenametemplate to set the file names for the graphics - output by MetaPost. Does not support putting the system time/date - in the name, even though MetaPost does. - - -- Commands \mfmode and \mfresolution to set the Metafont printer mode - and resolution, if pictures are to be created by Metafont. - - -- Commands \cbeziers and \closedcbeziers. The cubic equivalents of - the quadratic \qbeziers and \closedqbeziers. - - -- Command \pshcircle produces a circle in the hyperbolic geometry of - the unit disk or (star form) the upper half-plane. If you don't - know what that means, don't worry, it's for complex function - theorists (like me). - - -- Command \brownianmotion simulates Brownian motion. - - -- \mfpverbtex is now cumulative when used prior to \opengraphsfile. - - -- Better(?) handling of the filename argument of \opengraphsfile. - -\sig -Dan Luecking (luecking at uark dot edu) -Department of Mathematical Sciences -University of Arkansas -Fayetteville, Arkansas 72701-1201 -U.S.A. diff --git a/Master/texmf-dist/doc/generic/mfpic/changes.txt b/Master/texmf-dist/doc/generic/mfpic/changes.txt index 9b50e3ed4b9..a85ad63b71d 100644 --- a/Master/texmf-dist/doc/generic/mfpic/changes.txt +++ b/Master/texmf-dist/doc/generic/mfpic/changes.txt @@ -1,5 +1,5 @@ %%% File: changes.txt -%%% A part of mfpic 1.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% Summaries of changes. @@ -882,8 +882,32 @@ pdfLaTeX). Also have it check for both epsf.tex and epsf.sty under non-pdf, non-LaTeX (though both files should be identical). Rename mfpman.tex/pdf to mfpic-doc.tex/pdf. - Prepared release mfpic100.zip, placed on personal web site. Prepared mfpic.tds.zip for release. +1.01 +Correct bug in vectorfield (upperbounds of xpos+raxis and ypos+taxis +should have been xpos-raxis and ypos-taxis). To prevent recurrence, +added definitions + xlow = xneg+laxis + xhigh = xpos-raxis + ylow = yneg+baxis + yhigh = ypos-taxis +Replaced frequent occurence of these combinations with the +abbreviations. + +Correct minor error in mfpic.dtx affecting only the documentation. + +Prepared release mfpic101.zip, placed on personal web site. +Prepared mfpic.tds.zip for release. + +1.02 +Add work-around for verbatimtex (added a commented blank line after +user-supplied verbatimtex material). Metapost comments out final eol in +a verbatimtex group, also ignoring trailing spaces, also ignoring blank +lines. This causes problems if user ends one verbatimtex with an +assignment, and then follows with another verbatimtex before any btex's. +These two verbatimtex's are then effectively concatenated, contrary to a +user's expectation that a line end separates them. + diff --git a/Master/texmf-dist/doc/generic/mfpic/coil.mps b/Master/texmf-dist/doc/generic/mfpic/coil.mps index d8fb9cd6ec0..2fcf2345302 100644 --- a/Master/texmf-dist/doc/generic/mfpic/coil.mps +++ b/Master/texmf-dist/doc/generic/mfpic/coil.mps @@ -1,6 +1,6 @@ %!PS -%%BoundingBox: 0 0 33 7 -%%HiResBoundingBox: 0 0 32.87663 6.37607 +%%BoundingBox: 0 0 33 7 +%%HiResBoundingBox: 0 0 32.87663 6.37607 %%Creator: MetaPost 0.901 %%CreationDate: 2006.05.23:1308 %%Pages: 1 diff --git a/Master/texmf-dist/doc/generic/mfpic/data.dat b/Master/texmf-dist/doc/generic/mfpic/data.dat deleted file mode 100644 index a8713ed42c0..00000000000 --- a/Master/texmf-dist/doc/generic/mfpic/data.dat +++ /dev/null @@ -1,37 +0,0 @@ -### File: data.dat -### A part of mfpic 1.00 2009/09/22 -### -# A file of data to plot a function curve -# ("#", not "%", must be comment character when this is read.) - - -# --10% 11.68# This is a comment - -9% 9.62 - -8.5% 8.445 - -8% 8.28 - -7.5% 5.865 unused: random list, of, words,,, - -7% 5.5 -# This is not a blank line - -5.5% 3.445 - -5% 1 - -4.5% 1.965 - -4% 2.14 - -3.5% 2.985 - -2.5% -1.215 - -2% 1.52 - -0.5% 1.545 - 0% 0.42 - 0.5% -0.435 - 1% 0.96 - 2.5% -1.235 - 3% 0.94 - 3.5% 0.165 - 4% 0.28 - 5% 1.1 - 5.5% 3.145 - 6% 1.94 - 6.5% 5.505 - 7% 3.44 - 9.5% 8.925 - 10% 9.84 diff --git a/Master/texmf-dist/doc/generic/mfpic/examples/data.dat b/Master/texmf-dist/doc/generic/mfpic/examples/data.dat new file mode 100644 index 00000000000..e1b61e08d80 --- /dev/null +++ b/Master/texmf-dist/doc/generic/mfpic/examples/data.dat @@ -0,0 +1,37 @@ +### File: data.dat +### A part of mfpic 1.02 2009/10/29 +### +# A file of data to plot a function curve +# ("#", not "%", must be comment character when this is read.) + + +# +-10% 11.68# This is a comment + -9% 9.62 + -8.5% 8.445 + -8% 8.28 + -7.5% 5.865 unused: random list, of, words,,, + -7% 5.5 +# This is not a blank line + -5.5% 3.445 + -5% 1 + -4.5% 1.965 + -4% 2.14 + -3.5% 2.985 + -2.5% -1.215 + -2% 1.52 + -0.5% 1.545 + 0% 0.42 + 0.5% -0.435 + 1% 0.96 + 2.5% -1.235 + 3% 0.94 + 3.5% 0.165 + 4% 0.28 + 5% 1.1 + 5.5% 3.145 + 6% 1.94 + 6.5% 5.505 + 7% 3.44 + 9.5% 8.925 + 10% 9.84 diff --git a/Master/texmf-dist/doc/generic/mfpic/examples/forfun.tex b/Master/texmf-dist/doc/generic/mfpic/examples/forfun.tex new file mode 100644 index 00000000000..31c3acd5953 --- /dev/null +++ b/Master/texmf-dist/doc/generic/mfpic/examples/forfun.tex @@ -0,0 +1,160 @@ +%%% File: forfun.tex +%%% A part of mfpic 1.02 2009/10/29 +%%% +\nopagenumbers +\input mfpic.tex +\usemetapost +\usetruebbox +\opengraphsfile{fun} + +\mfpicunit=1bp + +\noindent +\mfpic{-1.25}{118.5}{-11.25}{40} +% +% "meta"-ness: +% +\mfsrc{h:=25; % height of "m" These are graph units + s:=10; % width of stems +} +% +% Calculate key points: +% +% "m" +% +\mfsrc{% + z1=(0,0); + y1=y2=y5=y6=y9=y10; + x2-x1=x6-x5=x10-x9=s; + x6-x1=x10-x5=h; + z15-z1=z3-z2=z4-z5=z7-z6=z8-z9=z11-z10=(0,h/2); + y12=y1+h; x12=.5[x6,x9]; + y14=y12; x14=.5[x2,x5]; + z13= arcppp(z7,z14,z15) intersectionpoint arcppp(z11,z12,z4);} +% +% "f" +% +\mfsrc{% + z21=z10; % start "f" at "m"'s end + z22=z21+(s,0); + z23=z22+(0,h-s); + z24=z23+(3s/4,0); + z25=z24+(0,s); + z26=z23+(0,s); + z27=z26+(0,s/4); + z28=z27+(s/4,0)+ (s/4)*dir(30); + z29=z28+s*dir(30); + x30=x21; y30=y27;}% +% +% "p" +% +\mfsrc{% + x31=x24; + y31=y21; + z32=z31-(0,s); + z33=z32+(s,0); + z35=(x33,h/2); + z39=z31+(h,h)/2; %center of round part + z34=(z33--z35) intersectionpoint (fullcircle scaled h shifted z39); + z36=z39+(h/2,0); + z37=z31+(0,h/2);}% +% +% "i" +% +\mfsrc{% + z41=(x36,y31); + z42=z41+(s,0); + z43=z42+(0,h); + z44=z41+(0,h); + x45=0.5[x41,x42]; y45=y43 + s/2 +3/50;}% Center of dot +% +% "c" +% +\mfsrc{% + z51=z42; + z52=z51+(h,h)/2; %center + z53=z52+(h/2)*dir(15); + z54=z52-(h/2,0); + z55=z52+(h/2)*dir(-15); + z56=z52+(s/4)*dir(-15); + z57=z52-(s/4,0); + z58=z52+(s/4)*dir(15);}% +% +\penwd{2.5*\the\mfpicunit} +\mfsrc{% +% +% Calculate bounding box +% +% Need to account for half the thickness of pen; +% penwd is in absolute units so we need to convert. +% This is a displacement, so use invvconv (not invzconv): + begingroup + save border,ll,ur; + pair border,ll,ur; border:= invvconv((penwd,penwd))/2; + ll=(0,y32)-border; + ur=(x55,y27+5s/4)+border;} +% +\gfill[yellow]\rect{ll,ur} % background +\mfsrc{endgroup;} +% +\fillcolor{blue} +\drawcolor{green} +% +% "m" +\mftitle{m} +\draw\gfill\lclosed + \connect + \lines{z15,z1,z2,z3} + \arc[s]{z3,z4,-180} + \lines{z4,z5,z6,z7} + \arc[s]{z7,z8,-180} + \lines{z8,z9,z10,z11} + \arc[t]{z11,z12,z13} + \arc[t]{z13,z14,z15} + \endconnect +% +% "f" +\mftitle{f} +\draw\gfill\lclosed + \connect + \lines{z21,z22,z23,z24,z25,z26,z27} + \arc[s]{z27,z28,-150} + \lines{z28,z29} + \arc[s]{z29,z30,150} + \endconnect +% +% "p" +\mftitle{p} +\draw\gfill\lclosed + \connect + \lines{z31,z32,z33,z34} + \arc[t]{z34,z36,z37} + \endconnect +\draw\gfill[yellow]\circle{z39,(h/2-s)} +% +% "i" +\mftitle{i} +\draw\gfill\polygon{z41,z42,z43,z44} +\draw\gfill\circle{z45,s/2} +% +% "c" +\mftitle{c} +\draw\gfill\lclosed + \connect + \arc[t]{z53,z54,z55} + \arc[t]{z56,z57,z58} + \endconnect +% uncoment to exhibit the points +%\pointsize2bp +%\pointfillfalse +%\penwd{.2pt} +%\point{z1,z2,z3,z4,z5,z6,z7,z8,z9,z10,z11,z12,z13,z14} +%\point{z21,z22,z23,z24,z25,z26,z27,z28,z29,z30} +%\point{z31,z32,z33,z34,z35,z36,z37} +%\point{z41,z42,z43,z44,z45} +%\point{z51,z52,z53,z54,z55,z56,z57,z58} +% done +\endmfpic + +\closegraphsfile % {fun} +\bye diff --git a/Master/texmf-dist/doc/generic/mfpic/examples/lapictures.tex b/Master/texmf-dist/doc/generic/mfpic/examples/lapictures.tex new file mode 100644 index 00000000000..7de2656d1b1 --- /dev/null +++ b/Master/texmf-dist/doc/generic/mfpic/examples/lapictures.tex @@ -0,0 +1,206 @@ +%%% File: lapictures.tex +%%% A part of mfpic 1.02 2009/10/29 +%%% +% Magnify to same scale as pictures.tex : +% (Use of \mag is against the law of LaTeX, but Bugs Bunny set a precedent.) +\mag=1200 +\documentclass{article} + +%%!!!!!!!!!!!!!!!!!!!!!!!!!!! +% adjust these to your liking: +\setlength{\paperheight}{11truein} +\setlength{\paperwidth}{8.5truein} + +% Default plainTeX margins +\setlength{\textwidth}{\paperwidth} +\addtolength{\textwidth}{-2truein} +\setlength{\textheight}{\paperheight} +\addtolength{\textheight}{-2.1truein} +\setlength{\headheight}{0in} +\setlength{\headsep}{0in} +\setlength{\oddsidemargin}{0in} +\setlength{\evensidemargin}{\oddsidemargin} +\setlength{\footskip}{\baselineskip} + +% Use the metafont option if you prefer. +\usepackage[metapost,raggedcaptions]{mfpic} + +\ifx\pdfoutput\UndEfInEd +\else + \setlength{\pdfpageheight}{\paperheight} + \setlength{\pdfpagewidth}{\paperwidth} +\fi + +\opengraphsfile{pics} + +\setlength{\mfpframesep}{0pt} +\headshape{1}{1}{true} +\newcommand{\vs}{\bigskip\filbreak} +%\renewcommand\raggedright{\rightskip 0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax} +\begin{document} +\mftitle{Commutative Diagram example.} + +% A-----D +% |\ /| +% | C-F | +% |/ \| +% B.....E + +\noindent +\begin{mfpframe} +\begin{mfpic}[12]{0}{10}{0}{10} +\tlabeljustify{cc} +\tcaption[2.0,1.0]{{\it Figure 1:} Commutative diagram example.} +\tlabels{(1,9){A} + (1,1){B} + (3,5){C} + (9,9){D} + (9,1){E} + (7,5){F}} +\setrender{\arrow\draw\trimpath{6pt}} +\lines{(1,9), (1,1)} % A -> B. +\lines{(1,9), (3,5)} % A -> C. +\lines{(3,5), (1,1)} % C -> B. +\lines{(1,9), (9,9)} % A -> D. +\lines{(9,9), (9,1)} % D -> E. +\lines{(9,9), (7,5)} % D -> F. +\lines{(7,5), (9,1)} % F -> E. +\lines{(3,5), (7,5)} % C -> F. +% B- - ->E : +%\dotted\arrow[r90][b-12pt]\arrow[b15pt]\reverse\arrow\lines{(1.5,1), (8.5,1)} +\arrow\arrow[b10pt]\reverse\arrow\dotted\trimpath{6pt}\lines{(1,1), (9,1)} +\end{mfpic} +\end{mfpframe} + +\vs + +\mftitle{Function Plot with Cartesian Axes.} + +\noindent +\begin{mfpframe} +\begin{mfpic}[20]{-3}{3}{-3}{3} +\axes +\function{-2,2,0.1}{((x**3)-x)/3} +\tcaption{{\it Figure 2:} Function Plot with Cartesian Axes.} +\end{mfpic} +\end{mfpframe} + +\vs + +\mftitle{Parametric Function Plot, and Filled Circle.} + +\noindent +\begin{mfpframe} +\begin{mfpic}[30]{-1.5}{1.5}{-1}{1} +\parafcn{0,6,0.1}{cosd(150t)*dir(90t)} +\gfill\circle{(0,0),0.25} +\tcaption{{\it Figure 3:} Parametric Function Plot, and Filled Circle.} +\end{mfpic} +\end{mfpframe} + +\vs + +\mftitle{Bar Graph.} + +\noindent +\begin{mfpframe} +\begin{mfpic}[20]{-0.5}{4}{-0.5}{4} +\axes +\shade\draw\rect{(0,0),(1,0.5)} +\darkershade +\shade\draw\rect{(1,0),(2,1)} +\hatch\draw\rect{(2,0),(3,2)} +\tcaption{{\it Figure 4:} Bar Graph.} +\end{mfpic} +\end{mfpframe} + +\vs + +\mftitle{Pie Chart.} + +\noindent +\begin{mfpframe} +\begin{mfpic}[30]{-1.3}{1.7}{-1}{1.1} +\gfill\sector{(0.3,0.2), 1, 0,60} +\shade\sector{(0,0), 1, 60,105} +\turtle{(0,0), \plr{(1,105)}} +\sector{(0,0), 1, 60,360} +\tcaption{{\it Figure 5:} Pie Chart.} +\end{mfpic} +\end{mfpframe} + +\noindent Unindented text here. + +\vs + +\mftitle{Circle with Arrow.} + +\noindent +\begin{mfpframe} +\begin{mfpic}[20]{-2}{2}{-1}{1} +\arrow\circle{(0,0),1} +\tcaption{{\it Figure 6:} Circle with Arrow.} +\end{mfpic} +\end{mfpframe} + +\vs + +\mftitle{Use of hatch, draw, lclosed, connect, curve, point, lines, + dotted, reverse.} + +\noindent +\begin{mfpframe} +\begin{mfpic}[20]{-3}{3}{-3}{3} +\hatch\draw\lclosed\connect +\curve{(1,0), (1,0.5), (1,1), (0,1.5)} +\point{(0,0)} +\endconnect +\lines{(-1,1), (-1,-1), (1,-1.5)} +\point{(0,0)} +\dotted\reverse\lines{(-2,2), (-2,-2), (2,-3)} +\tcaption{{\it Figure 7:} Use of hatch, draw, lclosed, connect, + curve, point, lines, dotted, reverse.} +\end{mfpic} +\end{mfpframe} + +\vs + +\mftitle{Simpler variant of the previous figure.} + +\noindent +\begin{mfpframe} +\begin{mfpic}[40]{-1}{1}{-1}{1} % Was `[20]'. +\tcaption{{\it Figure 8:} Simpler variant of the previous figure.} +\hatch\draw\lclosed\connect +\curve{(1,0), (0.5,0.25), (0.5,0.5), (0,0.75)} +\point{(0,0)} +\endconnect +\reverse\lines{(-0.5,0.5), (-0.5,-0.5), (0.5,-0.75)} +\tcaption{{\it Figure 8:} Simpler variant of the previous figure.} +\end{mfpic} +\end{mfpframe} + +\vs + +\mftitle{Graph of data from file.} + +\noindent +\begin{mfpframe} +\begin{mfpic}[6]{-10}{10}{-2}{12} + \makepercentother + \using{#1% #2 #3}{(#1,#2)} + \makepercentcomment + \mfpdatacomment\# + \fcncurve\datafile{data.dat} + \axes +\tcaption{{\it Figure 9:} Example of a graph drawn from data in a file} +\end{mfpic} +\end{mfpframe} + +\closegraphsfile + +\end{document} + +%%% +%%% EOF lapictures.tex +%%% diff --git a/Master/texmf-dist/doc/generic/mfpic/examples/pictures.tex b/Master/texmf-dist/doc/generic/mfpic/examples/pictures.tex new file mode 100644 index 00000000000..493de537393 --- /dev/null +++ b/Master/texmf-dist/doc/generic/mfpic/examples/pictures.tex @@ -0,0 +1,204 @@ +%%% File: pictures.tex +%%% A part of mfpic 1.02 2009/10/29 +%%% +\magnification=\magstep1 + +\newdimen\paperheight +\newdimen\paperwidth +%%!!!!!!!!!!!!!!!!!!!!!!!!!!! +% adjust these to your liking: +\paperheight 11truein +\paperwidth 8.5truein + +% Default plainTeX margins +\hsize \paperwidth +\advance\hsize -2 truein +\hoffset 0 truein +% +\vsize\paperheight +\advance\vsize -2.1 truein +\voffset 0 truein + +\input mfpic +%% Comment this if you prefer metafont: +\usemetapost +\useraggedcaptions +\ifx\pdfoutput\UndEfInEd +\else + \pdfpageheight=\paperheight + \pdfpagewidth=\paperwidth +\fi + +\opengraphsfile{pics} + +\mfpframesep0pt +\headshape{1}{1}{true} + +\def\vs{\bigskip\filbreak} + +\mftitle{Commutative Diagram example.} + +% A-----D +% |\ /| +% | C-F | +% |/ \| +% B.....E + +\noindent +\mfpframe +\mfpic[12]{0}{10}{0}{10} +\tlabeljustify{cc} +\tcaption[2.0,1.0]{{\it Figure 1:} Commutative diagram example.} +\tlabels{(1,9){A} + (1,1){B} + (3,5){C} + (9,9){D} + (9,1){E} + (7,5){F}} +\setrender{\arrow\draw\trimpath{6pt}} +\lines{(1,9), (1,1)} % A -> B. +\lines{(1,9), (3,5)} % A -> C. +\lines{(3,5), (1,1)} % C -> B. +\lines{(1,9), (9,9)} % A -> D. +\lines{(9,9), (9,1)} % D -> E. +\lines{(9,9), (7,5)} % D -> F. +\lines{(7,5), (9,1)} % F -> E. +\lines{(3,5), (7,5)} % C -> F. +% B- - ->E : +\arrow\arrow[b10pt]\reverse\arrow\dotted\trimpath{6pt}\lines{(1,1), (9,1)} +\endmfpic +\endmfpframe + +\vs + +\mftitle{Function Plot with Cartesian Axes.} + +\noindent +\mfpframe +\mfpic[20]{-3}{3}{-3}{3} +\axes +\function{-2,2,0.1}{((x**3)-x)/3} +\tcaption{{\it Figure 2:} Function Plot with Cartesian Axes.} +\endmfpic +\endmfpframe + +\vs + +\mftitle{Parametric Function Plot, and Filled Circle.} + +\noindent +\mfpframe +\mfpic[30]{-1.5}{1.5}{-1}{1} +\parafcn{0,6,0.1}{cosd(150t)*dir(90t)} +\gfill\circle{(0,0),0.25} +\tcaption{{\it Figure 3:} Parametric Function Plot, and +Filled Circle.} +\endmfpic +\endmfpframe + +\vs + +\mftitle{Bar Graph.} + +\noindent +\mfpframe +\mfpic[20]{-0.5}{4}{-0.5}{4} +\axes +\shade\draw\rect{(0,0),(1,0.5)} +\darkershade +\shade\draw\rect{(1,0),(2,1)} +\hatch\draw\rect{(2,0),(3,2)} +\tcaption{{\it Figure 4:} Bar Graph.} +\endmfpic +\endmfpframe + +\vs + +\mftitle{Pie Chart.} + +\noindent +\mfpframe +\mfpic[30]{-1.3}{1.7}{-1}{1.1} +\gfill\sector{(0.3,0.2), 1, 0,60} +\shade\sector{(0,0), 1, 60,105} +\turtle{(0,0), \plr{(1,105)}} +\sector{(0,0), 1, 60,360} +\tcaption{{\it Figure 5:} Pie Chart.} +\endmfpic +\endmfpframe + +\noindent Unindented text here. + +\vs + +\mftitle{Circle with Arrow.} + +\noindent +\mfpframe +\mfpic[20]{-2}{2}{-1}{1} +\arrow\circle{(0,0),1} +\tcaption{{\it Figure 6:} Circle with Arrow.} +\endmfpic +\endmfpframe + +\vs + +\mftitle{Use of hatch, draw, lclosed, connect, curve, point, lines, + dotted, reverse.} + +\noindent +\mfpframe +\mfpic[20]{-3}{3}{-3}{3} +\hatch\draw\lclosed\connect +\curve{(1,0), (1,0.5), (1,1), (0,1.5)} +\point{(0,0)} +\endconnect +\lines{(-1,1), (-1,-1), (1,-1.5)} +\point{(0,0)} +\dotted\reverse\lines{(-2,2), (-2,-2), (2,-3)} +\tcaption{{\it Figure 7:} Use of hatch, draw, lclosed, connect, + curve, point, lines, dotted, reverse.} +\endmfpic +\endmfpframe + +\vs + +\mftitle{Simpler variant of the previous figure.} + +\noindent +\mfpframe +\mfpic[40]{-1}{1}{-1}{1} % Was `[20]'. +\tcaption{{\it Figure 8:} Simpler variant of the previous figure.} +\hatch\draw\lclosed\connect +\curve{(1,0), (0.5,0.25), (0.5,0.5), (0,0.75)} +\point{(0,0)} +\endconnect +\reverse\lines{(-0.5,0.5), (-0.5,-0.5), (0.5,-0.75)} +\tcaption{{\it Figure 8:} Simpler variant of the previous figure.} +\endmfpic +\endmfpframe + +\vs + +\mftitle{Graph of data from file.} + +\noindent +\mfpframe +\mfpic[6]{-10}{10}{-2}{12} + \makepercentother + \using{#1% #2 #3}{(#1,#2)} + \makepercentcomment + \mfpdatacomment\# + \fcncurve\datafile{data.dat} + \axes +\tcaption{{\it Figure 9:} Example of a graph drawn from data in a file} +\endmfpic +\endmfpframe + +\closegraphsfile + +\end + +%%% +%%% EOF pictures.tex +%%% diff --git a/Master/texmf-dist/doc/generic/mfpic/forfun.tex b/Master/texmf-dist/doc/generic/mfpic/forfun.tex deleted file mode 100644 index 1875c18d7be..00000000000 --- a/Master/texmf-dist/doc/generic/mfpic/forfun.tex +++ /dev/null @@ -1,160 +0,0 @@ -%%% File: forfun.tex -%%% A part of mfpic 1.00 2009/09/22 -%%% -\nopagenumbers -\input mfpic.tex -\usemetapost -\usetruebbox -\opengraphsfile{fun} - -\mfpicunit=1bp - -\noindent -\mfpic{-1.25}{118.5}{-11.25}{40} -% -% "meta"-ness: -% -\mfsrc{h:=25; % height of "m" These are graph units - s:=10; % width of stems -} -% -% Calculate key points: -% -% "m" -% -\mfsrc{% - z1=(0,0); - y1=y2=y5=y6=y9=y10; - x2-x1=x6-x5=x10-x9=s; - x6-x1=x10-x5=h; - z15-z1=z3-z2=z4-z5=z7-z6=z8-z9=z11-z10=(0,h/2); - y12=y1+h; x12=.5[x6,x9]; - y14=y12; x14=.5[x2,x5]; - z13= arcppp(z7,z14,z15) intersectionpoint arcppp(z11,z12,z4);} -% -% "f" -% -\mfsrc{% - z21=z10; % start "f" at "m"'s end - z22=z21+(s,0); - z23=z22+(0,h-s); - z24=z23+(3s/4,0); - z25=z24+(0,s); - z26=z23+(0,s); - z27=z26+(0,s/4); - z28=z27+(s/4,0)+ (s/4)*dir(30); - z29=z28+s*dir(30); - x30=x21; y30=y27;}% -% -% "p" -% -\mfsrc{% - x31=x24; - y31=y21; - z32=z31-(0,s); - z33=z32+(s,0); - z35=(x33,h/2); - z39=z31+(h,h)/2; %center of round part - z34=(z33--z35) intersectionpoint (fullcircle scaled h shifted z39); - z36=z39+(h/2,0); - z37=z31+(0,h/2);}% -% -% "i" -% -\mfsrc{% - z41=(x36,y31); - z42=z41+(s,0); - z43=z42+(0,h); - z44=z41+(0,h); - x45=0.5[x41,x42]; y45=y43 + s/2 +3/50;}% Center of dot -% -% "c" -% -\mfsrc{% - z51=z42; - z52=z51+(h,h)/2; %center - z53=z52+(h/2)*dir(15); - z54=z52-(h/2,0); - z55=z52+(h/2)*dir(-15); - z56=z52+(s/4)*dir(-15); - z57=z52-(s/4,0); - z58=z52+(s/4)*dir(15);}% -% -\penwd{2.5*\the\mfpicunit} -\mfsrc{% -% -% Calculate bounding box -% -% Need to account for half the thickness of pen; -% penwd is in absolute units so we need to convert. -% This is a displacement, so use invvconv (not invzconv): - begingroup - save border,ll,ur; - pair border,ll,ur; border:= invvconv((penwd,penwd))/2; - ll=(0,y32)-border; - ur=(x55,y27+5s/4)+border;} -% -\gfill[yellow]\rect{ll,ur} % background -\mfsrc{endgroup;} -% -\fillcolor{blue} -\drawcolor{green} -% -% "m" -\mftitle{m} -\draw\gfill\lclosed - \connect - \lines{z15,z1,z2,z3} - \arc[s]{z3,z4,-180} - \lines{z4,z5,z6,z7} - \arc[s]{z7,z8,-180} - \lines{z8,z9,z10,z11} - \arc[t]{z11,z12,z13} - \arc[t]{z13,z14,z15} - \endconnect -% -% "f" -\mftitle{f} -\draw\gfill\lclosed - \connect - \lines{z21,z22,z23,z24,z25,z26,z27} - \arc[s]{z27,z28,-150} - \lines{z28,z29} - \arc[s]{z29,z30,150} - \endconnect -% -% "p" -\mftitle{p} -\draw\gfill\lclosed - \connect - \lines{z31,z32,z33,z34} - \arc[t]{z34,z36,z37} - \endconnect -\draw\gfill[yellow]\circle{z39,(h/2-s)} -% -% "i" -\mftitle{i} -\draw\gfill\polygon{z41,z42,z43,z44} -\draw\gfill\circle{z45,s/2} -% -% "c" -\mftitle{c} -\draw\gfill\lclosed - \connect - \arc[t]{z53,z54,z55} - \arc[t]{z56,z57,z58} - \endconnect -% uncoment to exhibit the points -%\pointsize2bp -%\pointfillfalse -%\penwd{.2pt} -%\point{z1,z2,z3,z4,z5,z6,z7,z8,z9,z10,z11,z12,z13,z14} -%\point{z21,z22,z23,z24,z25,z26,z27,z28,z29,z30} -%\point{z31,z32,z33,z34,z35,z36,z37} -%\point{z41,z42,z43,z44,z45} -%\point{z51,z52,z53,z54,z55,z56,z57,z58} -% done -\endmfpic - -\closegraphsfile % {fun} -\bye diff --git a/Master/texmf-dist/doc/generic/mfpic/install.txt b/Master/texmf-dist/doc/generic/mfpic/install.txt index 886d65f1785..9c7bc1f9e35 100644 --- a/Master/texmf-dist/doc/generic/mfpic/install.txt +++ b/Master/texmf-dist/doc/generic/mfpic/install.txt @@ -1,8 +1,8 @@ %%% File: install.txt -%%% A part of mfpic 1.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% -This is version 1.00 of mfpic. See README.txt for a list of files and a +This is version 1.02 of mfpic. See README.txt for a list of files and a brief description of each. Generating and installing the files diff --git a/Master/texmf-dist/doc/generic/mfpic/lapictures.tex b/Master/texmf-dist/doc/generic/mfpic/lapictures.tex deleted file mode 100644 index 0b5303289c6..00000000000 --- a/Master/texmf-dist/doc/generic/mfpic/lapictures.tex +++ /dev/null @@ -1,206 +0,0 @@ -%%% File: lapictures.tex -%%% A part of mfpic 1.00 2009/09/22 -%%% -% Magnify to same scale as pictures.tex : -% (Use of \mag is against the law of LaTeX, but Bugs Bunny set a precedent.) -\mag=1200 -\documentclass{article} - -%%!!!!!!!!!!!!!!!!!!!!!!!!!!! -% adjust these to your liking: -\setlength{\paperheight}{11truein} -\setlength{\paperwidth}{8.5truein} - -% Default plainTeX margins -\setlength{\textwidth}{\paperwidth} -\addtolength{\textwidth}{-2truein} -\setlength{\textheight}{\paperheight} -\addtolength{\textheight}{-2.1truein} -\setlength{\headheight}{0in} -\setlength{\headsep}{0in} -\setlength{\oddsidemargin}{0in} -\setlength{\evensidemargin}{\oddsidemargin} -\setlength{\footskip}{\baselineskip} - -% Use the metafont option if you prefer. -\usepackage[metapost,raggedcaptions]{mfpic} - -\ifx\pdfoutput\UndEfInEd -\else - \setlength{\pdfpageheight}{\paperheight} - \setlength{\pdfpagewidth}{\paperwidth} -\fi - -\opengraphsfile{pics} - -\setlength{\mfpframesep}{0pt} -\headshape{1}{1}{true} -\newcommand{\vs}{\bigskip\filbreak} -%\renewcommand\raggedright{\rightskip 0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax} -\begin{document} -\mftitle{Commutative Diagram example.} - -% A-----D -% |\ /| -% | C-F | -% |/ \| -% B.....E - -\noindent -\begin{mfpframe} -\begin{mfpic}[12]{0}{10}{0}{10} -\tlabeljustify{cc} -\tcaption[2.0,1.0]{{\it Figure 1:} Commutative diagram example.} -\tlabels{(1,9){A} - (1,1){B} - (3,5){C} - (9,9){D} - (9,1){E} - (7,5){F}} -\setrender{\arrow\draw\trimpath{6pt}} -\lines{(1,9), (1,1)} % A -> B. -\lines{(1,9), (3,5)} % A -> C. -\lines{(3,5), (1,1)} % C -> B. -\lines{(1,9), (9,9)} % A -> D. -\lines{(9,9), (9,1)} % D -> E. -\lines{(9,9), (7,5)} % D -> F. -\lines{(7,5), (9,1)} % F -> E. -\lines{(3,5), (7,5)} % C -> F. -% B- - ->E : -%\dotted\arrow[r90][b-12pt]\arrow[b15pt]\reverse\arrow\lines{(1.5,1), (8.5,1)} -\arrow\arrow[b10pt]\reverse\arrow\dotted\trimpath{6pt}\lines{(1,1), (9,1)} -\end{mfpic} -\end{mfpframe} - -\vs - -\mftitle{Function Plot with Cartesian Axes.} - -\noindent -\begin{mfpframe} -\begin{mfpic}[20]{-3}{3}{-3}{3} -\axes -\function{-2,2,0.1}{((x**3)-x)/3} -\tcaption{{\it Figure 2:} Function Plot with Cartesian Axes.} -\end{mfpic} -\end{mfpframe} - -\vs - -\mftitle{Parametric Function Plot, and Filled Circle.} - -\noindent -\begin{mfpframe} -\begin{mfpic}[30]{-1.5}{1.5}{-1}{1} -\parafcn{0,6,0.1}{cosd(150t)*dir(90t)} -\gfill\circle{(0,0),0.25} -\tcaption{{\it Figure 3:} Parametric Function Plot, and Filled Circle.} -\end{mfpic} -\end{mfpframe} - -\vs - -\mftitle{Bar Graph.} - -\noindent -\begin{mfpframe} -\begin{mfpic}[20]{-0.5}{4}{-0.5}{4} -\axes -\shade\draw\rect{(0,0),(1,0.5)} -\darkershade -\shade\draw\rect{(1,0),(2,1)} -\hatch\draw\rect{(2,0),(3,2)} -\tcaption{{\it Figure 4:} Bar Graph.} -\end{mfpic} -\end{mfpframe} - -\vs - -\mftitle{Pie Chart.} - -\noindent -\begin{mfpframe} -\begin{mfpic}[30]{-1.3}{1.7}{-1}{1.1} -\gfill\sector{(0.3,0.2), 1, 0,60} -\shade\sector{(0,0), 1, 60,105} -\turtle{(0,0), \plr{(1,105)}} -\sector{(0,0), 1, 60,360} -\tcaption{{\it Figure 5:} Pie Chart.} -\end{mfpic} -\end{mfpframe} - -\noindent Unindented text here. - -\vs - -\mftitle{Circle with Arrow.} - -\noindent -\begin{mfpframe} -\begin{mfpic}[20]{-2}{2}{-1}{1} -\arrow\circle{(0,0),1} -\tcaption{{\it Figure 6:} Circle with Arrow.} -\end{mfpic} -\end{mfpframe} - -\vs - -\mftitle{Use of hatch, draw, lclosed, connect, curve, point, lines, - dotted, reverse.} - -\noindent -\begin{mfpframe} -\begin{mfpic}[20]{-3}{3}{-3}{3} -\hatch\draw\lclosed\connect -\curve{(1,0), (1,0.5), (1,1), (0,1.5)} -\point{(0,0)} -\endconnect -\lines{(-1,1), (-1,-1), (1,-1.5)} -\point{(0,0)} -\dotted\reverse\lines{(-2,2), (-2,-2), (2,-3)} -\tcaption{{\it Figure 7:} Use of hatch, draw, lclosed, connect, - curve, point, lines, dotted, reverse.} -\end{mfpic} -\end{mfpframe} - -\vs - -\mftitle{Simpler variant of the previous figure.} - -\noindent -\begin{mfpframe} -\begin{mfpic}[40]{-1}{1}{-1}{1} % Was `[20]'. -\tcaption{{\it Figure 8:} Simpler variant of the previous figure.} -\hatch\draw\lclosed\connect -\curve{(1,0), (0.5,0.25), (0.5,0.5), (0,0.75)} -\point{(0,0)} -\endconnect -\reverse\lines{(-0.5,0.5), (-0.5,-0.5), (0.5,-0.75)} -\tcaption{{\it Figure 8:} Simpler variant of the previous figure.} -\end{mfpic} -\end{mfpframe} - -\vs - -\mftitle{Graph of data from file.} - -\noindent -\begin{mfpframe} -\begin{mfpic}[6]{-10}{10}{-2}{12} - \makepercentother - \using{#1% #2 #3}{(#1,#2)} - \makepercentcomment - \mfpdatacomment\# - \fcncurve\datafile{data.dat} - \axes -\tcaption{{\it Figure 9:} Example of a graph drawn from data in a file} -\end{mfpic} -\end{mfpframe} - -\closegraphsfile - -\end{document} - -%%% -%%% EOF lapictures.tex -%%% diff --git a/Master/texmf-dist/doc/generic/mfpic/mfpcard.pdf b/Master/texmf-dist/doc/generic/mfpic/mfpcard.pdf index 3eee3ae8b99..77863b632dc 100644 Binary files a/Master/texmf-dist/doc/generic/mfpic/mfpcard.pdf and b/Master/texmf-dist/doc/generic/mfpic/mfpcard.pdf differ diff --git a/Master/texmf-dist/doc/generic/mfpic/mfpcard.tex b/Master/texmf-dist/doc/generic/mfpic/mfpcard.tex index 1cbd58fb29d..271c7e6e866 100644 --- a/Master/texmf-dist/doc/generic/mfpic/mfpcard.tex +++ b/Master/texmf-dist/doc/generic/mfpic/mfpcard.tex @@ -1,5 +1,5 @@ %%% File: mfpcard.tex -%%% A part of mfpic 1.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% % (Ask your driver to print so that longer dimension is horizontal.) \newdimen\paperlongside @@ -201,7 +201,7 @@ \centerline{(Copyright 2000--2009 by Daniel Luecking)} \medskip -This information was prepared for version 1.00 of \prog{mfpic}. +This information was prepared for version 1.02 of \prog{mfpic}. \section{Preamble commands} diff --git a/Master/texmf-dist/doc/generic/mfpic/mfpdoc.sty b/Master/texmf-dist/doc/generic/mfpic/mfpdoc.sty index 75b57d8c6ff..c8ddf980392 100644 --- a/Master/texmf-dist/doc/generic/mfpic/mfpdoc.sty +++ b/Master/texmf-dist/doc/generic/mfpic/mfpdoc.sty @@ -1,7 +1,7 @@ %%% File: mfpdoc.sty -%%% A part of mfpic 1.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% -\ProvidesPackage{mfpdoc}[2009/09/22 v1.00 macros for mfpic documentation] +\ProvidesPackage{mfpdoc}[2009/10/29 v1.02 macros for mfpic documentation] \newif\if@chapters \@chaptersfalse @@ -21,8 +21,8 @@ \pdftrue \fi\fi\fi} -\newcommand\mfpversion{1.00} -\newcommand\mfpdate {2009/09/22} +\newcommand\mfpversion{1.02} +\newcommand\mfpdate {2009/10/29} %% Text size: diff --git a/Master/texmf-dist/doc/generic/mfpic/mfpguide.pdf b/Master/texmf-dist/doc/generic/mfpic/mfpguide.pdf index 70e2e9cf3a0..5eb414b8352 100644 Binary files a/Master/texmf-dist/doc/generic/mfpic/mfpguide.pdf and b/Master/texmf-dist/doc/generic/mfpic/mfpguide.pdf differ diff --git a/Master/texmf-dist/doc/generic/mfpic/mfpguide.tex b/Master/texmf-dist/doc/generic/mfpic/mfpguide.tex index 402a2859704..b9f08b507a2 100644 --- a/Master/texmf-dist/doc/generic/mfpic/mfpguide.tex +++ b/Master/texmf-dist/doc/generic/mfpic/mfpguide.tex @@ -1,5 +1,5 @@ %%% File: mfpguide.tex -%%% A part of mfpic 1.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% % Tutorial on mfpic \documentclass[letterpaper]{article} diff --git a/Master/texmf-dist/doc/generic/mfpic/mfpic-doc.pdf b/Master/texmf-dist/doc/generic/mfpic/mfpic-doc.pdf index 615b566057c..c8861311ffe 100644 --- a/Master/texmf-dist/doc/generic/mfpic/mfpic-doc.pdf +++ b/Master/texmf-dist/doc/generic/mfpic/mfpic-doc.pdf @@ -592,22 +592,15 @@ endobj << /S /GoTo /D [394 0 R /XYZ null null null ] >> endobj 429 0 obj << -/Length 2117 +/Length 2116 /Filter /FlateDecode >> stream -x[[F~_#:}KֱNRd6VU#! - !h:LpnܺO7V\׆z#%fK2; J3R'SIOw%R_dJoy¼8{J#7HhZu~(5nݞf ' -b]J9,eU,oҼ< )=(֥&$Fy .)5WAqїΡUC5>ߵ[D<7s]V,КgƟEa3'WZ_}5q@8hǟ>8(T0ZE_6䭖!<}# BS$J E Z7C1}H_!9LS2t׹7=5isIR$6-IpYG{.]&.xQ71^Z'T Ҍ{*l֩B}JD/ۊx I@nI45_i i=d:fq0\P$6 *ߟHAvX҇jH<ɼ?"& 6|"ۅ%crGm):?3헚_ƶ5[Tm1<=I6+jF>60d, _x RH -zewYT#È we LS}$P Cw0Xi_LG#wZ؆/{Suz81eXtkK.ȟ%?u0vcCu2eiz4^z. ׵٤ҷJSOJxdppMV.*p^u *|;G)NQ-t/J|&5 -n]G3߯t>iԋtEG񣍓UudvqEFǎYy(Nvqͻ+ أ>Q/F3eA,{3 £_;ʿ.}gAov4ʫw t $x ) -7QޠИgEn-b6Xz*>G7ěo3ڻsm<[L؋Ww$ HUg\=h&憔S|7dKY=Vz,ҤښBƨ"=U˨_7H(ڳ)^)E}9I'AS*(v֮Fvt{׈vP\.v}6es1-$e9+w&bQF F*]( c=aH;:uM+r/j狽h-h 0y)t7e@%yk}] <rФZT&ۋq0nt&gB +x[[F~_#}ˮc6l*;$6<A3/"8|߹un<콽Ջ7z#%fK2{ﳟ J3Ro&SIᝆp2Rh^0/3`d!C%CJqO u)Ƭ }Ȃ @mJ "zuDa\6*߅?dUKHɭÑИX5Gxƣ +u *DmAvbot9_f~~z ,43*]{Y.VQ _PS>O0;(@|*yI7a/[yooJ!V1iQ$)?&E6!Oy^{琉2JS}^5\S?4Q>@+3OlE-gn1 >g5A!@L!@ ?Wu=;qg. +U1VQ׭=y%f$OfД)6H)CPL/|җ-ouӔ )u] Pr?M.ch0zBFN?YL)a MJ'9R3>!>#O2oHyɂoļM$$vmI`jof[N?Cff뗱m͖(f[ =mzvÊ,Ѽ 4C*/gz1m0aRYe<>:C2~`#`^H,>5H 1$ V ʅ#rӹ_x)֣ZUߤ$Gq@:x֗@LBAq:Bu3$Q[-6Q0tkodF0pb%JH4C)UNۓxB`7'pzI0}-(q]}0cbi'>8!pG+7#OT4Ð]E;cku# q@ȝ80\FݼNv V`<ڒ3ü':c} OUWSI"O] &v #KW~uqCalm+;rȻapzڭD9s枸x+bu&̢yZu 2ikY$cuU=R͞kdjdfdՅ$(w-U6M!N\IƾY̢?ף8[`^ɈV'nMwN&,M6vQOw|FK6Z;@)9iQ 3/v οI#EQk΀ YYo稒>v5)e݄fZm+hՕ'vzߑ.?zc(~qvʱn쏎2hAH#3= |e`ɮ8y~%aTС={wR;sF@^P>eAVtQxoG_9͎Fyn/!aR0cq& +vȭ[l٦KCx=O'x߱?~0bF{wg{Apc L+xDܐrl4JOQT[S՛Ba@m*PgSȡ Rv6lakr޵N~TQV]#U;-ߡ$(\l Icc ZvI4rW&YME@DC/(U3_xQ6{<{~wuTu-4W7^&{,/[;+?ffa2Rfn/IV+3{Q2 gpQnG%%.[QȨw) .T:ͼρA@)Ym../x ,ǵXz6@-N.'G2\#B_\~RFo bz $X\@X ]$iwzYw;L)Go+];dS-%+#ht6Zٳ.v<,: +!O Rw3@y rai J Ѭ^6wVQnv1_uzPNFIDv-[Uxnw3UD]&6l=trnf%ep2w3%AoDD+k|xv]zujJͽJ`^'^z7 8^{d +/2|LŮù>^C%57l:*E`%~ ֈNl;wAeFeM0pvHv3@|e;YOBYJ1[$Su4⩭5I2o͠T,9d=г(7tŹ:k IԡOGzMgRiK%yN8CgˤH -.$ZV%bɒFUE{L>mHw#$^!/ILqd 1sה.ܵ*RRx9 ;|5 .!'^΢dB/O'lܭln!~hHTU_+m#4$fTעX /+Ş>^8Җ;pHLJrW܍qcmbvZK:K -ng؄! ng?qjQ~l]*8[UኜGqn8-!{Cpv⒛_" ^P^aް)$}Q\k)ibgbPqy=:|8"l-$4L5r A@DI|sSxNhvD8|I*dY<8sݰ&UcXxލV;jE߬؏ǠRYדrI,(cWw>)~}f)ov%v$E&9<%=\&Jgh[*U[(je:Z>uX -f7 " tE7CM\ȶ `Cb :e -m1>{Oq(\ -C`/[ݞ|_n0p(Zfmce&8*!oʷj{xܟ$XڔɈϦMeVsCunfm<>uZة;umW|S-QN#R+?f;58wz=KWJ +.$ZV%'"],Y`Tpڧ n݋5?ɖv ;laSg'n .'?nh`v B(ŵNA){v)n أs  BBD{Ys; @ DT>7o7{&jL4ȃӉPG˴d=':M?4a=L[`]噉`6QobF|ֻINMlJ{TVaE :'0Tn3@ZE뎝s^٦[a ͧI0u>ʱ^Z$p1Ֆb\56 v&ſI endstream endobj 487 0 obj << @@ -1899,7 +1890,7 @@ endobj /ProcSet [ /PDF /Text ] >> endobj 583 0 obj << -/Length 3154 +/Length 3155 /Filter /FlateDecode >> stream @@ -1915,8 +1906,9 @@ x %;w\oE$ -!1MBT+|trVQݐ rDv]"HTVE;-7e,v!“n| ВIviYtiyi V˞Afv5:r";K&',EёT|q'Q5U /Wg/S k K6RSTR}sO=hЛ#T0 eda.Id{סR  * suSEY G9,Q~I%[c؇n U2J i`IŨNc)K־_G -6>&CP8JĂ]bD! 1]+ˠ^h8E!Zi|Mή4-F(#|y8 sN%̕GbIwVH!A{lNPcUgRh<k qE57R4 ])-d3ˋE!vZ%FĔ2WoγkHVnή;5Ò.2U,h=1 ]w%4]lN mlIv`Lp QeW)TҪI%. }XaImnVh+S`:/ t;kSl!@g@8^D[xdJ~Үw 8:Xؖ)s`<}.>tΝb)IQ<O8Um@ #cae%Ky"hkQ@b~KP~2GKL'&TY/׈F(0 -ȱXd) کٟ]V mAV&={?ͮ +6>&CP8JĂ]bD! 1]+ˠ^h8E!Zi|Mή4-F(#|y8 sN%̕GbIwVH!A{lNPcUgRh<k qE57R4 ])-d3ˋE!v䍰)U\Ы 5$w+@gםa|@PMK{*MQL x(ib+et{AhcKSf G?`0΍7b,XJVM*qmH +DHjwB[%X9`*}P xILp!]Xb :S.i%Jvƻ WJ|0Ӗv}_ou`8¶LscOPts<KIi(h ?7\ ,;,O_AsX +[*<*^e>5^ڄy8\F4BAgxVG"OXw@N\wHn\e%z6ݓͰ endstream endobj 582 0 obj << @@ -4112,23 +4104,25 @@ endobj /ProcSet [ /PDF /Text ] >> endobj 909 0 obj << -/Length 4345 +/Length 4332 /Filter /FlateDecode >> stream -x[K6WeY@Fsڻ= @ۀJVJ)WRvu}EQtw撢( 3y oɃ"MM"n7o6VIYHEF7zM;U#_n,tMi37<ӥAl~I=*#G 4PQ| ~oۭΓMV%3x0؛[ns3rG=_OMYGM3 78 ;;LQv4|#JC'$]y<5Ftp\`*IbZ(ׁ ҍ<%8tߌկn &i0t<[Ld2%*K(Lxyi;ό@U3VAZ8x&ɔpd4MD7a 'S5TyMNcݵe#dD , jhOQN>{Fp*j`{*[0~gz̞[xe(OC=t+K-K cZ nUꖬƣzY:͛ƅnĦ+{iVEr TuZWf/"N -l7%]q떯`K@*^mn,Q=ZFl2UsRv<@ C](y*h&ḙ2Xe4, -2 !7rI\bɼ7#wc_? ;~`OTdԚ|S7VNЯ[o"$sEU$3PQ".ᵠAHۛr9~?r%!_coD-00fNS{84h}=QlIFd:8M=P6Sy Ha\s# ;n=L~aDE>ٜɇCٴ+Ú,aLSGKRC2@fOrzֈɎ;J{%| 0uIQլǓ1UXװvm̤"2q^ǑEW3:i -|6wD8Foϸ b}Y}=.,TAJ/K̞\J˥No*9zF 1Uu8KOAd,q3Ee"?ANoMOC\M9hP,8cu3y[g^ 4NVtyXjҟTcI{YhON68&DbtR_&fc/YdWZ=|6+E#e\ټ`ks ?֭{S>p/oJ&\K#Hv[uJj#JQ*3(hf/ң|rLz(88SA3 42nfyv-6*bŖ#OE.3*$ ĔQ+LCU$ߔ.udvO1_\2v9j/gͲ-m]7Smp 4@XjZc%L^[T& }c43LZN -3"s,. ?sB9iYJp RgRd6=\ hzv;+HW-%5cr4@jA{&uIub <#mv9^qMn[7{NUr"sO1n|ڽH30IŲkHSu10tuM񎏌h ?!x OŮ:|6drw%iL7 rS}V8}C2Eς -kD"'ƌ|2dU\ȐU%cթ[s2/pj~E F"gP| 0‹5\pxbbx͟Z O٣d^lXM..{rپ#4)\%k*S֏M $H׶a]=;M]SϕY˙'״qͧnJYS.ٚG~bEa8ւtxJB;F1;Jf%;`b<@<\rÒ65W'(Roat[ /BjqW]30]0:Yn턼Fa,w.pgQ. -p{St̰ O#!HBͯMr vvdeYcUAtmn5$ 5?L aйV0KaR1P-0<|ToLͫIѶ!Mn/KۘQPc*OC(0Er@w V Mwv_?H⧦tCזFT <8SM396Nie0-%8h3KՃTAyԽ rb= CtrcSR-!8.!Ǥ"9cxad#c{gey<ܑեoWve.Oc>je$D,^zT*~ ]|Q)Wv Ζ&q* $4V]:&;T5epcUvgBs^R.sϊ0`{'yy D.U]kS=PB.r7י ?sMK.w;h~U6WȗqNzq.EBXWb((Þ ӗȇ~%㉶Z>n7QAx~#{ ߔ|/(nR@c*yo1m].!gi- +x[[㸱~_/'<"u[6M&ؓ`ve,H4Oݨ[3=Ţ(*"<7od*OpLݤp̓~fnuo+}*>Ufb61Wo~} H~46%ʤ`LdA3SzxמiPq(Mi2|@CI#AtlHe"]mw5Y)xc;{{wT\]}T;[s }_Pu͞mٽ-QlPh\[!r|VkDZonFhU\{.(H7J(RQ9ʟ%ih8=1dJ&4ЎPTgPlԜ8t/l%g0ULM):V5qȯag[NtτўmZ:g*6zhGOʒQ>g8x27b0P P|v-TmǢyñLVοA{W-qUƣz +F͛ƅnĦ+{72s&r ޔ˴>6f-"JF;4b|8,"[5|[jxIڡ@heKoa@)LIp芓sǎqq*٦J%P慾y/HN_z[[~Ƈݠ%V۾rr~}݆oeh$!/U/Pz$)JGFD H6}ל&!=qog=_ΏP}Ϗ||y gm#0s$Lq1ya}˃߽;Tb(-/{$ {pڳ3Uyge"\Co7*nЯW-o@$g&@sN/~~Q +R*LM8EʭVq (|޺M`Z/-iQk.}5VE-V'*3^]߃àgdP(?$ZBPͽNU]`XC.p )Ssa4,j_D UM8oHszkkϘq`L>POvhbYxcn: +#l4&TH?ptjj4Op„'d|xFҸ F3OyE t)) c LCx)3Ɣ'kGү>MgHߐ,[Ǒ@rxF]?Mjo^ww=T~ǭǣm/UgsiyqFp!si"X$%L `|IjH/ft2>[2tp:<\pAy%~z^] Y<0[=K;)621jQԵ{Mo]{ *'3d/O5e>LD5;οnЇ<5/G䠱+ECUi,3}O"}3׶<{ϼhs8YF#ReǮ,AZ 7E!@P/m+By|RiNg$S LmV + +Io~f%d QmHÑ&6_*W~d:ఁi^PhK[#p7Sl1C #z^ITj]/ޓgZͬU"=y t{`EPzΠKڳ@*=wb:APHbѱ`0U!]t<^[_>Z +ayHqg3 ++4rg_ѼҜwPk Whɫ:g슏7|O,Rm*'A~zn-dע~xs|~:*%>F!O_p|Il0< Uq^ J'*cb6&QB/2$) pRkq f[摁Jw,um@ TnߴЏ{M+{;6U㢃 !mOWUJ[nrn. MprlK5_jϦ cNy:1RE@1qr";j>swݳ 5z=gRQ-h/{B aˣUӌ3ҁuV "*KGgbo}c +a '=欙k5זX;>cfcFf am|=4 qr +Çdָj0%2X4l?V}[LPz~E F뢈d9@'i9:- +ĝ?Ke'oyȚjO8,m$$+w+<$rYݩ9h[2e;F B)|9^5" l.v)jO\E{ 4PIJD4)TZ* [Lq\uH]+Nv%0D#>k6դh۸P!70 Zz!xb29ԛ;YK4,Gj"mihs(~(٢obW˓V|88'3|b2w7XWpK DܼCW+E{l6'~D"$yVx0d> ae*4B #Xs3mS7?A}hT'IDd]Z\䙀, ϒ)f1t]'h5 +T?}x66`y iq^x,g!dOݫ8´\&+pĔPp踻̎TUj$y=WNf8m<}G\i:4x j$}=ĥå6x<ijSB-!8.!GB9cg΅c{+$͹s?D-*Sӭ[n#> 1CnP.#Gmh53&ӎvrmV(.hylˊ2LqK3TRJ !9_.sϊ6wBWxpHXE(l9@8uX [!zc n3)Gⶓf]Ýw9Hh~U86W4q$a\0">"N{X׫'>waOc endstream endobj 908 0 obj << @@ -4148,32 +4142,37 @@ endobj /D [908 0 R /XYZ 108 507.935 null] >> endobj 913 0 obj << -/D [908 0 R /XYZ 108 245.669 null] +/D [908 0 R /XYZ 108 233.714 null] >> endobj 907 0 obj << /Font << /F92 432 0 R /F105 437 0 R /F118 517 0 R /F93 433 0 R /F88 436 0 R /F11 570 0 R >> /ProcSet [ /PDF /Text ] >> endobj 917 0 obj << -/Length 3731 +/Length 3462 /Filter /FlateDecode >> stream -xڽێ}oF}ۤ Eɤ Y ̱յ%C3;X{nm8na!yxxxdگ՗/>{ܬ2'I_ SD~ ]VVqz4!U: 5MUfbF#_nn ?ln4odQL: ܳ\"WVWe~,*̌â6:q@+4̊,YD0Z݆ʄ5?egmq>Te7,Â&V&O܂?hS[n:n vU_d{Fe:0*Ct>[GIn_g~~ytװV;ZOɷZ58닶޾iNӑ=!z]o?Ap {H~#|!<[Cޥ,ukt"DrpmȨnqg۞;9ïhX\_}9!wERk!P-7}U oۍzżӠdǯQ5rb3_ULSY"8%:E -'2T'w-N<26F:M4az@#r28UqqiE"f$@ ÈNl09Is'/O6@n jl[6&#CD ->\_C؏$ W(@"ǭlox-c궣)/XWTq:0ܱi[ƎN)x0|ǫ W)|рzp'uӞ$LC-dHj<ؓz?7:`Sv>BSÏ13c;?<)r$K;,ڶ-8޷2` ƿNU6&3zeoT(]CP*$תmꓭ{Ž/eTyi[Ml}Ýl[`8Z3&-۹ -dW{o(є  7I>)r\H[0o˾V6;iyROb̛Y,̺At(6&@3έb;G~ >|!}vD -,djǠNW I7 ӊ9 [s -Yt B Aj;nD -kWxa\>1V8S7?ĥ!iğBl4HL[ -BKkN7v.i8(mj'ac}8%3pEF'Q j|@ 5mb0!,ny .i0A(4l98E zԔkNDZO;TY2JwaA*N+񑢂+H౪I -$*3 {ރDr#lڢּ=xDQt=|> hA,$A@l# -~BI7"(l#Zfz5ijbײ/4ⅤoN D4X1o;З"pke { |Z SC<0b#Wx鳁*3t%,PIမqMe& G!s ZakSh}LlI,SF ` -*D'SZ7CYpFP_\CEz.>=L w$`Y)L? C3kZ|IE)*͟df%Չ3ITjcpf`VP9+l!~ rg(d6!1*E8ФHH$1l:"3m킁X[0%Hc >gKxx_=:c L -|M~ۿ_dn0ᐄO#z01 [8\keA#Cn;۲bjXٵ+M+bN?*JDy{JBwBp4Bߒ\Uc\xƷ-PI.JaJ ;v@C?Qpts!+V-9|kBs:9̀JE7 B,J2,"[` :RpD@ FŎGt\s20j@ |r#!\3\y>7]ް=TM7A0vq:wIVodݽhCKsmY5Vg/gםX13g.(X$i/ۭm?H[tn)8hOU(ͷxfD`?9땯&[>pOS<Ш~aSxS߆(U2+O 2+ߢ 7AN'x%]g,6$&C,`&>s}hg8ٲ波>V.rnvD}Ps9'[ č=%>a aO纲|@( -q"j v Sm4'LS5Bc9Vݍ^lC'&`]{!#2a)WS|8_䋂%JMy V~ō|zM"͖䠌ojn+IKlKxx&2]f|3l>iP|^ U{$5%+AhHV U[z5*@yL=Y'?ec|z?~?'Go&8{8p|(YHwS^UJa>H/ZRL|Hۢl*Y\Ϯ4ypiMKkXo}$*>Ε\lC{;FEϽD٢qLz$ w&`E CL{t%0ؔJ+:RclT''|%B72#]`$)쟌/K^xURh]yY jä4(F]SܕmT>6P3=V,p[Wٽ> +xڽk + "g]\"If,smdɐ[;/˦î8{ +6M՗w&3Teqn7:H1&,H6wmAlrWZ(XM 2ћw~ kGv6 eٸ{+ ȾZ.VIH;[76?lcXЦ$݆*Т  bmJ3DѶ8m^m8]svk,kj{`}NjFޫzwr9TbY3?Kxwlk}AnMn| _/0(Sg ZeQħ-ՑAV&=WacMvOl/NuNP5{Xn]FE5?Ϥ:Jw~[J ^ C;nh?jMFnCe讝`ƨPrP, Ŕ-Hp@Z2~({ke߻I+r^m)6>dm1EN:B}Yif$gޣHZl dޕ5*86@Nc&Z ЄOIɂIȕ;G!ldT8J2QiWh6q|rف˺+z6у7Bq…5>P<04E + +vv}~ b] ]lpY.! +rPMdsr20-OrsN1Nl2ʌN@ d%Z<'@q+5TB1M|-oJȢsP=M i,IӚ/h2T^()rRNDZO۪4;pXA&fI5sF +^@&-X'Vq.=_> 6Kj>+xX%arf`7( &Z?V`gp?VʍШ(6E[9aLBQcfT+b!CRls,{O;Y61p*)5RI*4/EV؁W.s'0Os'+f ]:hMlA7h0m&+NA>݂%h,9h U vtA}s%E6=XH\GkϠw!LJ`Ik̮i3v5V܅V5uX/3W,& 0J9"+J! 2BiǘAb{"Cdc- ^wN[H^d^v\l5(:lZ.xϢ!b8hRt h[*X*;ʧ児xm +gf1&clyk! xz3l]D`P +:$'x(wt-Y<0hс%26 f^oҥd.9ɔ1K)B—jI8"w@7z "M_l&L6TxtڽR1+;OtzaEN njbHB*0i^΢<k0~ 3({ I)SX)4PJ^iXBW:/wfLOλU:PT#T` +[oC}Ƕv&о%a6*R]F"c(%Gt lQxk i>)Rk"-Uގq$]6g+swA4E]Ӎl语cq[$YCw:>hfЖ-.l[~Kн+/J$n_j=9pA*k{]FէKOyE{.j6ߢ "~?%+@p+Lf6-0C&jJbڮ+c/gV۰ ufSʷ(J ?W7` L]Pxbt_oDfBdteEsxS7nyv<Ϯ?5ApgrVҦ>g*}NvO(ޚ0|t;4Uy}RX;.Xap(!u qrT]= u[(3?Aݔן)rt+6ش ͫ[z)ξْQpMý`/dblkՅs +0<&2CfW8L&F?qoۆ?(Y + fGBDb߱(چ?yw6 endstream endobj 916 0 obj << @@ -4188,135 +4187,149 @@ endobj /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] -/Rect [157.582 192.227 177.009 203.131] +/Rect [157.582 172.893 177.009 183.797] /A << /S /GoTo /D (subsection.4.11) >> >> endobj 918 0 obj << /D [916 0 R /XYZ 107 721.862 null] >> endobj 919 0 obj << -/D [916 0 R /XYZ 108 445.866 null] ->> endobj -206 0 obj << -/D [916 0 R /XYZ 108 176.95 null] ->> endobj -920 0 obj << -/D [916 0 R /XYZ 108 154.271 null] +/D [916 0 R /XYZ 108 426.88 null] >> endobj 915 0 obj << /Font << /F92 432 0 R /F105 437 0 R /F88 436 0 R /F93 433 0 R /F118 517 0 R >> /ProcSet [ /PDF /Text ] >> endobj -926 0 obj << -/Length 3500 +924 0 obj << +/Length 3433 /Filter /FlateDecode >> stream -xɒ>_T !5);IeTa*SbB -Ib=o=N*ʅ~孾~oJU( -VJ{`?z6[?ЀXha6r/ _o&0ٸz)?&±\?gZaGWAx׎eQ&, -p^C84(A~&XmM̹uʨfй9Bw.wlھp](e4Cл m[3>6QXklR`=W|$4g7lEI1m$e#j#OQCKE /h ("h#&}VmH"=q_(59TdH Q@qwyc=*vP>إd" T -)$kLzAOàKHbrT9rNG>L]`JG ݏ~:J8X:2褵<{oP7 UG[==m@0c DwRԖصC Gm.cș?@Oiy9G*IN?Qc0ca8 .G޴5C%1P5kA%- u6)}_"f)Zx3wLF/z&3WTsmЎ yJnK7 -K}ɖ:,:]G3 pv87a ?mPMR%Y'`qULih,߉7E%zď08C߬v!?$f@ݎnjgPJI%\dIj[S->?TFR\~'9&Qj0&sFEL^:O2`S 5 V{Tl0, k9z `pD U߼ͪ7<;3Vd)w2Dž1 x?=sGӧc؍7b]?g8KEkxsLJ)%J)u8!IBs !:UNsͽJbGລ/'!77%KYTUyAmg Ϫ*k\wT1m8s)\$w偲P:*vsnt:N6M0fjzlg!K/&=gqEJv$OolzLmGb(A𡘁{V3CZSS> #鿘]o%L!;-׌ݹm.XT鹂'Kcf [ -Ȍrđu܀AT~S?`ʢ)@wÔY}iÓj+L8&gɼWO)t{BO#I]#[B O<=f)(N ϛcIk~Tk9]sSky0>vlo'cYY3gN`4ڕ#lhŘ3ԭErbo'M"jhvDƋ?l|} -3ӦB~Xkҗ#Bwޱ^ 1'D͝S% V#wf7<[ #$= m@Omg:/%fq?AWM{ Bǥkds]knÿvݤ[vަ>O8\No}]b`vEJN'x݈NSx~W?eb#fBïe@Z%4=.~F`')_e`px4$~0zFHU vZXmwk;k'0yxBia,-{H8ykZƢmȂ52D{ +g"G9gGx3ֳDb돧❟ +2s ҅EAV +á1GiU4ث[S ܱQ}h=N0x-5lYA%LΜj@+ۦJ/q=p|d{_#QVdd.вSSj67!(+s){ S>ϰ`o.B~7^ }3oM,(٪ƹ5^:rtH<,wH€(>e_qLW+֜vf)cMTum ̞#CgF +3L8 neehu<4Yo"AFF~ < ܌<#9W1ޭ`=XnXmFZ\hbUr]gu+/2a#F#F@E]'p{vw}+caDܛ {xj(dGtՂ!.!<GЀ +#ݼ +nrglHO];= ΆN +>LcVAGhXE'-!(ri#{Z\A4 +n|峫WAF`CyjOz!gswŊ,Pb^B0u0퇱L5>11؜{R`s#w:|cN22Z;(yT_Ⰱ*K82j)@K,$Փ#υ-٠!CGoHKsiWwMU+J+ + Y悭uX +#H-9sHT.y4Ljl& 7&sLgםATp%߫b!ߖ@1\=yJNZ2w#bįk8=ZsN wKPCS|h,ckk$ef: ȆopX+n ֿe]݃HE}eP_b=aw TȻ]&d^bsRg h`% -t)8.?l\yd2{'K $B967S)ᄐxW@z*هTeZwL_} RE u~$f"Îljʢ)Dv.C`4Vl)^1}Th܅Vҹm#O#ﰈʬaǹ]X-2zŬȤ''NUB-T{ =ZŦ ގcX9 r![94)}gzL}l~g#&Ve_~o~Ƀ7?|-/` o~͏ʃS]!`2Pcݔ[{#0RGBRtRnoJj4;Fx$!P/4?M5MΩ32^e&ږpvy.r2eZG-d`|pђ-򱕼H@ +_}U-꫞pJ`Li\3܀^sa}w*M2aJ$..2[xMp>IS 5 endstream endobj -925 0 obj << +923 0 obj << /Type /Page -/Contents 926 0 R -/Resources 924 0 R +/Contents 924 0 R +/Resources 922 0 R /MediaBox [0 0 612 792] /Parent 897 0 R -/Annots [ 921 0 R 922 0 R 923 0 R ] +/Annots [ 920 0 R 921 0 R ] >> endobj -921 0 obj << +920 0 obj << /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] -/Rect [401.494 515.467 415.939 526.371] +/Rect [401.494 445.719 415.939 456.623] /A << /S /GoTo /D (subsection.4.4) >> >> endobj -922 0 obj << +921 0 obj << /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] -/Rect [433.384 515.467 447.83 526.371] +/Rect [433.384 445.719 447.83 456.623] /A << /S /GoTo /D (subsection.4.5) >> >> endobj -923 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [339.022 114.053 360.94 124.957] -/A << /S /GoTo /D (subsubsection.4.7.1) >> +925 0 obj << +/D [923 0 R /XYZ 107 721.862 null] >> endobj -927 0 obj << -/D [925 0 R /XYZ 107 721.862 null] +206 0 obj << +/D [923 0 R /XYZ 108 684 null] >> endobj -928 0 obj << -/D [925 0 R /XYZ 108 400.025 null] +926 0 obj << +/D [923 0 R /XYZ 108 662.864 null] >> endobj -929 0 obj << -/D [925 0 R /XYZ 108 318.496 null] +927 0 obj << +/D [923 0 R /XYZ 108 330.277 null] >> endobj -930 0 obj << -/D [925 0 R /XYZ 108 152.847 null] +928 0 obj << +/D [923 0 R /XYZ 108 248.748 null] >> endobj -924 0 obj << +922 0 obj << /Font << /F92 432 0 R /F105 437 0 R /F93 433 0 R /F118 517 0 R /F88 436 0 R >> /ProcSet [ /PDF /Text ] >> endobj -933 0 obj << -/Length 3697 +932 0 obj << +/Length 3698 /Filter /FlateDecode >> stream -x[Ks-* L<{$M%WN\e@p4,sHVqO7 A -@яPrq{\|/xcEΌzw .25Ivqn.h cQd4JX^9T^UmcwUƅ-[$w{ޗ} ti >\toʲq#Es[nhpWm&몶o$ʕlph;W/yۇ}>9g&Mik-3rvΔ?WNIF] ts%.otY -tn \#Kʛcr? -6-oipE](y_vgYB3^ >ID]~bN٣Ш#bɻjۤdI-O2O2;RM {W/&+&cJC*4id>n*P\Xk9vW y:Id\\n[ ٞvYʌ`œ%"gnϸs#o`8dY:Z*F$4 -':\R=@NbD@t1cA NzX/ 2W~P. 2d+fvMt_cwJgJe4e2lche٦Ww/O_LQNa汐=ګhW ZmO@i2d09Xfښcl1X}8I΄Qq[3Vwm)BL-=XmCTy@|(|$9>Q30<ⴀzj>QaPöT~]Q,X h|['a<ǽ@ -T͟,c^-kHrdTl0,P#טX,=lA]A&$ǬŖ#(M$ϖ[&> @ۡxpnu"Iᆵ;+`yp`1'"JXĸ1@ -a1UB4u! }β)ؙ9L^ }vbAl(HUQkײGjp#u~V(?7nX)Z6e 6Cx_5CUcO-B,}^tgz#`"F Y_yHͪ;6S)eO'.gR$ -VF{cՆks^wK}ѹySMϤ w6 A#)n<4k)a|{R%f,JXp^ "W]M4}0_ {ommOI& Y_D2jbYFwXb8#-SB [#W R=j2G{['u - ]Eexk,h3p- cΤ|dO%I"3?[s5Y1ՊAEPi j-]?Peou{\04~דg`qxl&IIxbtB6,m6)z >L:eTL{?f1-D+`pDhnuQ vhg`F -OǢA6>B\:JdFu̻+!(@76KJ.:>jPy_}[BO9R7qe(te] ՔEpcN/I5N"^`[OrEbs]3fmj+tH[׋cu"Ihፁb#ڎM@~ph'85a!t&!`X\:hS)7kȳzLVΙ!?le"3}$Q}.ɀ$&݋}h-RuĘhvP͏kŌZd9č^ō%8}6Q)):.*x,ba\m) -zR4R/Ք«vD\Wn*T \ W}R T@.%[{vq5G9KPϘp O2b T;xƖ\s >S%`Ew -ХwC bf14f]+T"ejZO"C xuғTJ,,pP0ѣ*W<-pQSN8x.|,3?Gh+we<T @ ܏)Vĸ 7zb58T6`2bh6u.`ywNDb]Ap:ΰt~{U̒0ԫJIW&0$L) _l"f[+__n*v0׸XfzY+dZ&nk37f=(h( f޿1]&_CJY*;1Jn"{kƴߛ= Ș[J%u}}_0VVD!;Ymf=]ݰVkАnha ^ӾM;ޜ:Ӧ˛hv4L/*˫.ϨIƭVvhi#u>2v[!XMa#jcoNM'_W5TŮ/Fp~-ߴ,'K +Pͫ6ݾofi*iJ՝fQ}޷މEO"NLJ#0 i܅9Y ^Ef#u|'p/; ɍ5 0#}i&гʎ4áro'95EPӘjL1]&gBX윀cVYZis*, )P\[3$E3Pj?l`zE,f<6)=th8/=t:pmM]Q>n`dBSf7IY!3g @;{v4 d3qi}f/D <{&ɠ>|U̙N.d];`]e>2qL˄P񰩉v6 ]8f U"dm.{+%2 c0Ko'>r0?z T`=3)N=Ùrd:p*<шG ; j.H3h%g +;9&z^!p8*~P.2|gvt_bw J#Vң~,N 9Xp_>BW;M^_ fjtO΅xQ|~ bhN @D +ثk>||1=s)dg|<Ե/*!pf/d=&G/NYxPH +oh偂[BG xh5Kxat@=(YZ]~ +?Q.x4) +< +$PpS5F><@}w;%|Nynl 7S=P.Akƞ^ɺL)0>/N:c`wUI[_ڴ4VΨÛ+#d0om,Y` !Y\%}@G 8`lTG_B)hdǷd~^BxU+pd& wN}@0 ζ4 >@#C0%ZL -`p%XHLQ]W6kb>*'^J$d`@y@ ]S'`Ƿh"LAl%aA6l4LB_f1Z +R5% !'#gI9 ,y1'AQ27Xٲ (rlfJo1oʢ;x +vn hR5J|_x7/דحO1c S}w2^N)mbf|yu*< +L +1 *e1؛}u sզM[ГgOC"9ʇH6 ک0]AFӌ[ԫR|l|@؊&}iW')rvX}@d1_Tq`!'ѣ"or/T'%GV|^@3Cyh vF@vyۢX;RKg9PU[e Xx(_@-nEh6ir&j-dCQVD,{RH'Kcl> c0j,LODA5羚J]2ZV.JyDu"LY;%u[7xrIJ΋v&tgPxVU00G;0H^,1ʙm~(M&49 +to +!qol-w8ypgf#`AȨce`źH? 3ܝ+`o]~^,TPnj>\^-|4 ۚ + xjZz8 epߵ.39%]R4e~ѷ*z$fc4=B +٤-̪M?op:C\5hMX^HH&"}}MW[Iyڐ L\ض7'%\xQ3bac40rD+`pEJ?xo&2mƌ[40}Z HyBE޶ſm:Z2LL[\ =!Ha?(,)xVG$qݣR׺5)-#04Lb"no1 ǹ19;L,p|0򭥢:|Mβj+_dseHtL3r +H/7  k0.E=RU ~v\o:}#Y2!B0lz˷\9ljxZכ5Y^em6 :e^*3ޗp8N1?%FpIL No7D )z1?!)u,8-ڎ쨴1u6(yD/0 |^Eq"̌g3$pz %ic܃qv]%k} 'T'O+D\{Z-<th)z B%DAE2e5g=o\,X8ބʸUyn7f3\3%.Ųx?ݒWЂ ~.FL/ eX;%@N|ES=C+Hc4Z%xr( +WRJ,pPؐ*|3/yZdΏSxr?օ]xYfA&yӘ<PF վmv~_߾/ endstream endobj -932 0 obj << +931 0 obj << /Type /Page -/Contents 933 0 R -/Resources 931 0 R +/Contents 932 0 R +/Resources 930 0 R /MediaBox [0 0 612 792] /Parent 897 0 R +/Annots [ 929 0 R ] +>> endobj +929 0 obj << +/Type /Annot +/Subtype /Link +/Border[0 0 0]/H/I/C[1 0 0] +/Rect [339.022 611.856 360.94 622.76] +/A << /S /GoTo /D (subsubsection.4.7.1) >> +>> endobj +933 0 obj << +/D [931 0 R /XYZ 107 721.862 null] >> endobj 934 0 obj << -/D [932 0 R /XYZ 107 721.862 null] +/D [931 0 R /XYZ 108 650.65 null] >> endobj 210 0 obj << -/D [932 0 R /XYZ 108 684 null] +/D [931 0 R /XYZ 108 604.782 null] >> endobj 935 0 obj << -/D [932 0 R /XYZ 108 624.174 null] +/D [931 0 R /XYZ 108 545.121 null] >> endobj 214 0 obj << -/D [932 0 R /XYZ 108 367.299 null] +/D [931 0 R /XYZ 108 288.245 null] >> endobj 936 0 obj << -/D [932 0 R /XYZ 108 283.144 null] +/D [931 0 R /XYZ 108 204.09 null] >> endobj -931 0 obj << -/Font << /F92 432 0 R /F103 434 0 R /F105 437 0 R /F93 433 0 R /F118 517 0 R /F88 436 0 R /F11 570 0 R >> +930 0 obj << +/Font << /F92 432 0 R /F105 437 0 R /F93 433 0 R /F118 517 0 R /F103 434 0 R /F88 436 0 R /F11 570 0 R >> /ProcSet [ /PDF /Text ] >> endobj 939 0 obj << @@ -4324,26 +4337,20 @@ endobj /Filter /FlateDecode >> stream -x[Yܶ~طp40N~SlQ;)k.ØC Ru= 4xb+HN/<@huhЫ+zg|ˌ_$cy]1U&W\U4zagCBX"SrhU|j[X}j "S1T$P;sw{~枱7:ХL#d,Hq[3YKFUA:KH$@JyWk٬ymv+=225IL|k_6M-뼳,\sޕMmlau?>1oUeen8u<|bi4ѷb*4℈Xm ,Uv0)ߺ9Q96<ÒW00R䚕 24_wE.@^ځ6'fgZ%iI -o`NeSSwLIj&А|/_3ώ210tP'vO|25B0]o6@Bh-} -DCkj|hڲ`˭!u{hLu]TtKx2|ŗ/3b%2e"yZP!8W;oqJh #w5S!*8( 8[c{l׷ڢw۾j튬{ya٢ -BzG$)(%@:XgR)) e]w{xU{FO.3, ǾPa6:@;"Z'/O&g| Y5>f̽8aJ`,4[dK -",0W! ͬv?K[,y,%J*/6Ak[3[bm̐LV7<ʖē}0Xv -~ -!F!lc_Kdg4UM_{6myS'ܝSS95s,l"&Ї~jm.b!(Q&BIPfFC%45<+g14;ɒؔ H!AfA#xTϘ}>%\a3rAN0Zz;;QsSJ1v1 -].n:P!Q̂aU(? _ R^`NnX,*Wsvl(όƄ! &KOy+_c&) 7/c:m۴%?@GqhU I><٘`sHϱ12F-'m/wA].<2 Orl`p"i6kKmpZ6 'c>4DgmfUy} XAW -%/̼Y]uuK7 VTP`!8cOztbtޝ#wf{S0f&MS,}|<./ "x[8ObwR$OzΗfB M]vOByp=y$A|y03CJ$#Jp^l~(=4doJ_uAf\Me~,; @fEy"v^D|;P#${acd".%EhU^Ḇ=%aS0j1ݴ:7l 0QM9"puӘ.:!4N=)_uQwlfiY};&,p43 -rb)ěmbO6;$0!q!]yם͏KUb6w}oMWA#$bpx= :ZQ1#\rسHN! T|)LXgV$9,]b 32PhSiS.ӔND;A4%zr^;`k.+hh0yu{(;d_DZ,c3 8McB$Pc.x>bKsKbĴ6ψ&3; - H9dk-4N i`r.~muszMos4Q9,x*wx7nv}Ew$n8.qoCd4IY_uD4Oq#d -. / 8VnV}Ұwo͂ -p[؇clq}}/Zcoκʛrs>)="|vn`),[ zt,k:x-xc[=+~~e6sF\/@H%*j"U %X @E2PU9 !` xfi$刂8Nva}@ª+4W?,}q;GFidQWQPD`LwlQlInۅyhF^i?MGQV-|QW0X2R560\RXL{TG^7C]m:7 a|~?@bӃ4; tnzTG[;qlpRH v\ٶG@=hU#Lݜ7}1܄e£&Zcfߢ`6"#΢|Y ^e f8|h3-aYg__wȚ,UiEE5H;7-HǚHP/vI/ypl답t|ީMPT+'+X hqKҐinˢFb*ʬ0++RMsƿ5UfU=Z}^ NL Dswd8ib3u:uH#I$y:7mg {Oir,WvЪ!͏\2i +h@"NīL\*2++ :"PyvМ MS`~Oe×we/`=Vhv̭C+0S{UEwgq 3T:Fc;ML{b%5 ta$2i ׁp8a;?F_C +um +g:W#4t,G01daF68HGFXZG00r6NNaFjd&!%čhm@5kۯ4R;n;^UyY'" +-$`NSTdO%cOCV4ڨ w[',*9xU)t𨌂>xmtPc?=;;zXêCoe Yf鮛B3VƎ' +IFRbpvs.Uhs2Sɽ8d!!&D i LL<)KKYZl4>bm4fiа6;׸Bg&(ւĽ5gI"+cҘFک\7|zKk_4M<=)} =qhW I.ٴdڏmc؛!@91mTvWlwmx!H?N3BRRRcL+ɞ1];;Hx ![i {L b66j)xcRcuy7Kf6X1\,m +yKC^JAI<~Ć#3AS _mmJ/`83+ӧӟLo:^~f8 k$gcG,ytm6b=oϮÖ)Op'Op5񋝤_KG]N$֜Y`! O6ٛdXvšTAHםL~L@!5 hZd_ +b\0=zT)},Z0YtRm,`r "qtd^e6Gq:ԣK}e +{X{O)[gexGe1?XbsȌ\O]wVv;w#u~#Jп6nrR$x”]onUX 3B'wFZpMw ߚJjU/%Fe?'ָJ#!dAfZ?ve1Әڨؗ_Qm^?(4[:v~Y~MdF{jOG[qi^z"D<2мX(Vqt=LՉ⏗nQS' +1Ct%1G + +u"&뺛ȏe葯mgVr)ݛ2Ш12)fonvJW5:R\!Qp_}ۂ^Si;闽@BCظ/c`dv&^NSE \Na 6ބﰸr|0nMg>Qg| r~֫ʖK{cxlkU\e yrv,(H]="}f?N endstream endobj 938 0 obj << @@ -4357,44 +4364,37 @@ endobj /D [938 0 R /XYZ 107 721.862 null] >> endobj 218 0 obj << -/D [938 0 R /XYZ 108 684 null] +/D [938 0 R /XYZ 108 615.99 null] >> endobj 222 0 obj << -/D [938 0 R /XYZ 108 613.973 null] +/D [938 0 R /XYZ 108 546.127 null] >> endobj 941 0 obj << -/D [938 0 R /XYZ 108 590.501 null] +/D [938 0 R /XYZ 108 522.655 null] >> endobj 942 0 obj << -/D [938 0 R /XYZ 108 513.973 null] +/D [938 0 R /XYZ 108 446.127 null] >> endobj 937 0 obj << -/Font << /F92 432 0 R /F103 434 0 R /F118 517 0 R /F105 437 0 R /F11 570 0 R /F93 433 0 R /F124 545 0 R >> +/Font << /F92 432 0 R /F105 437 0 R /F11 570 0 R /F103 434 0 R /F118 517 0 R /F93 433 0 R /F124 545 0 R >> /ProcSet [ /PDF /Text ] >> endobj 946 0 obj << -/Length 3044 +/Length 3213 /Filter /FlateDecode >> stream -xZY~  ulΓcwE  ֈYԒԌK>̰GuuuuWEWW}Ww$ J<*gFWh7pnL"#qf4ի׫M:o|7 {Fo*~_ LWDH4yC-,G7j1:Ib'08+I La&Th«U<迦%MD./a|Gq ,~d#v-+, -92qj >آf]Q˸[mvn[&}Srcg&<ߨ({UCەѤMD:lVM^Ti'wmg_%q6^bAZ%fM{I=lqZǓ#yҁ&TI~`SZ^"rna]ۮ -ƞ;~k[Ґ2犜[Ů#cndh7QD7kqgNeZ1x+L!w(>E5u~P!mխ{i'k.Ҿ0r7tvMQ5n$g[cQtRK+1uV8SOi-$C!~?t%oImWK75q' -%H#}+h x~ l>~c X@* D?V# Hpyz*=95'ؖYX.S1x{ ҝ-ZaXfbgٜM; <$*yQ Z'rA~l7E֋i<4{ٸt%lnOeR `!,F@?epK h)ahGH e.[Y}<ǫ&@|_7׷?ۈ=gfXq AUiIz3=ȅ}F A >HCt6Ek*A^WD@a 쳆]p]*bqFFG{J !j4pZ,x%mkI %τ}kGVRm HZVqM -]ZuWG^8xsx%"Qo`Md5P e8o=J -O9UGu)I~}lCfNI\¹H8DEyR-Zoў;[27PE'-4}w@5ay82+Bm -I/Znk&<2MJ&,*/}<7w[U5ũ.peoȦ/^e2IAQo/;u)u]}|P_^{skg~TS%^T# ;^T2dcޤ1CYcrݒ!@sp= d蔒<%GC灼k{nhiJ;Kbr8.($LYyQ,&`^dT{!WV!ˌ9 \ =H)X*8e!奜+~Y4Y2'*P}(l,7P\Ej9Un~a.YZ=57ViVk~g0n#XH n8 ?%@: aJ+B3b+cRVN-}5HD@u)ՙ`8-%@ o[&sTi@8$,r=7 ~`Bwz ;kri@.᎟NBCDɖlwgt +xۮ}ml .)ZY9V*K$,οwn.4 [!9$sܻ;g?* CnXELn7;bhBti`\ F_|م>7co_!ĄÀ?DK0߬,Gf$ñ\aMJ`,vQvba˲N g T\SPsXtSzc\ &d2zL{;K}hI[xVhG]ltx.2i|x*8 gT'O2Lk)zr#^JpZ%Acڦ>5l$i96s-#/uKZɘ,Aq%iLO2ILhRdETҞ!ײB`DtcԸr.W=:b3* +HE^,G8-ލ/ ‹Cr_ aA˰ +͝cӰ൬B< RnCSAh)p !J2gHR-ҙZ"\[Ðw@2kZo"ͥ= Ҷ#!<|&lEC :uz:1pS2g2 ږ=3 TbPpH) +?N[KE`0pj^ # )UJ≯p4qHfX39:,q xqU1CVWn8'>,  U%=d[!yt+n*7H.Nv.mǕi);вvoP?^:5yyU+u1GBXYQF6$]Ue9mF?sh)?2_==~^*h멳NcX3)BTA!yS|8"󨁆!w|3Yqi;(e[,c= 9/ $-C @I[nw gxzRʲ`)ͥmٕJLmP/jF {$A+ʴ"d[~%G5jB-Oc@ʋv'(kBshӌܬF"zxvMUT7i30M3% +!@Br4ƺJJ(Jy(āwp⋵,Z敯2;ij+M>QSϦ*Csh["ǥebREmJb"nX{p,}[н#^9FjdhzT8A\ZE!S!kĖ*`հK/r.5,.`#mue։kqHz-H󡗅K+L[ ՍBos +ĺU/0q5zvеWT6/ϖY9 !/cxn7^}Q~f֏7lk=toK*\+)xCtfC^Ru~)NPm6+P] HD`>^ +IV1FY K%˃1㤍,yJ !lȾ"ÁB9S(iJ:ND,!/WT)|$%UVvP6l zSB,ܧCa{'Q+D +mOļ&d5?а e8o*qXf^]sVĺϔG_C,63֤j.}$QQ}?7 G!(`'%.)j +TR(eUSJ=>n p]w2ZK7Ӣ6#͕M*{Z=iBTW#qR h@l[J*ؽBkÀD/OLȻIͥǗϟ7=hUwqnNz-l6hIc2v9GtooprM9{\Da_$X2qQ0[$OlXw*Y߻ d̤1w1QMf$ s2Y4JI_^Ķ䈰c<7!L6R֔=S|޽~;D)qlfȆk^ew~-"C@@{NUJuy- +a_mV=añ̉)}(#e;@^yqI\DkWA3sL1|Eb` vw{0`: |od  EZLFpgXhS>شxz=Rzb8 W;-=XI}_ \־W M0J-݌`]=ltQIg*>@MxRw旿?/Am?0 endstream endobj 945 0 obj << @@ -4408,31 +4408,31 @@ endobj /D [945 0 R /XYZ 107 721.862 null] >> endobj 226 0 obj << -/D [945 0 R /XYZ 108 684 null] +/D [945 0 R /XYZ 108 617.746 null] >> endobj 948 0 obj << -/D [945 0 R /XYZ 108 624.932 null] +/D [945 0 R /XYZ 108 559.252 null] >> endobj 949 0 obj << -/D [945 0 R /XYZ 108 405.376 null] +/D [945 0 R /XYZ 108 348.374 null] >> endobj 944 0 obj << -/Font << /F92 432 0 R /F118 517 0 R /F105 437 0 R /F93 433 0 R /F88 436 0 R >> +/Font << /F92 432 0 R /F105 437 0 R /F118 517 0 R /F93 433 0 R /F88 436 0 R >> /ProcSet [ /PDF /Text ] >> endobj 953 0 obj << -/Length 2774 +/Length 2942 /Filter /FlateDecode >> stream -xM۸_,?;ݗbA v޽Û?M,ai͌ "Lx~0_̄Xr | f߾}?_FWޏ/$ ?L Y*gCDo 8d@:|)y&^ ߪLJa,`igKĪ}s]yg oi(mz.BӜ=Q7r;>8ф7#{M) +Pٞ*K^#y?[j kvvRMZ 6DQe.>UG&X! g >#ϖ4 -Q;z VFJepß-3_&S&cghhn 0(ӨB[yy(k;k]^m]umNR$9,NG -u,:_!9^v(i =|_ce{6T< ]Ct&`jvI#벬P*MY!Pةbkts}3* 43ieR(SM+zn3-Vg+w.="!"X)bVtdI>TeB~B o>X,sj峙N_e #*L;uvԬE]dP6[$)5p6 uvϫ𽓝B>0"[F\a\2 8rZNm50&,Jq_O{U ܆ph){ nv3MTMS6 "L8}ʫ8@AUHo.=e, s,  ϕ^ZI8Ȫ -cq+"ɔ.+Os{eغ{ӭkFwm4ty|0fC+yo%T\SsZ` 8'Ttw=&0i3'5 ȉ=;O *dH2!k'8d?eu^k8[]=[j,2]6l )ݙts7o0Se#îO稶2^[Yrt:[<- ("k5oO;MJp.<ǽZkr>ɑ)z~ Q&ff6 -UwCPMJw;-6P3zMV⇽4)0lg}#U5}10S o?#r%@AbM: !=lq8,]꒴! }w9lMߗh6%KDE]I؟m^(pNkp1L8|gvF~1qNA&e7.z} FvxÆcVTz2@'׎ >0.T(St16",ᣬ=.Ɔ){;F~EE}~m]ieTC>hciy=v%LSddiHvl@c[)\zs0m]Lvgq.h^F^H6NpɔogkgpmNcw3Pqq֥XdcI !>.ӽcOS0)\8/׸#-1Apb>4qÐ%)QY?MjWiW5)a$ԿCy]Wy=A;<医޻H?;\z󴁅~g:KϯwĄQZ=8_$Q^Eo_UJoE_UzNc-x/]޲,|rkxzH%_y_>W\7:~_e# 9Ux>Oص {ֱ3. ]ﮙL1=)U,<1a7`䱫(`]FS [@3yo2b`W9UEҪt}[L& "侣eDF ۔׫tMˢH -qbj'F@BnWnĒrJj$M _l0hFBQNA`ԑNmO؜/$`TCdʦxmO4B>7>~yLLFWXV?f&7YP 9S1"n|x :X,o'ѭ›膦x -9TB%mJSi+D]Դ j[P^<]pFll+gm{9n b(im9W0M?S>bbb0|}r=v1~w ȭPWt -]?EK[%Vq_n=yH mǨオ:XHՓg/[gb!qr'}#?vO{<-Yܫu|xOܼ +x˒۸Q399˩r6nIܡH- %hf;$ Fр8,7ywHXEf^|?Xz&[ V7bcqdݻM-| $8,# FV"RtG&c fIdi,axzR +`qIc$b#6-2o?Xj\v{ ֲ=fy~QЇ=K;$ +bٴU2jGi06D,!*kP`IݪDb>#}`-xfH-B%z۴Λ۞EAbJ tᜥaHc[ jӹxv5Ϳ, +jzםV;0, )"wUǾOkgmയ:'|Ʊe#Ўx^emۦ*VYߺ| 0*?6[wX]ecsVE|'mx @J"@UW dE}tŃNE*#McO.^oj{SA` X]mh仼ŭjuXI}&)]떙mԮ9$0~~h3 +xٝDrx';GC5qD,8qh/L!Ke@3S՘ɵځ`WUk獄䮮NqũzdEziS[e5ZwO F^-9tTnҮgWUuUe]\@U*3(:D ~Tn<i蒺A]o]]c8&cZ=ơiQS-}мVP0ECZcbwZ` 7xQOzD{kE6_sl#Qe6ì1} ̆]CdM҂ 1 J^h]w# v܌0`>-re+euu%(&,r htWH)7n[аZHz:Ki(Ϊk-*F0@g6J|Ø "K|9bqUw(e@`=;d.6F=7sbXEgC` )q[kl>!.M &"1&J,MIDڐi7Ea.$d}<6H,-NѦ09*W۩cQAo4e`f}-O# sɨp0KXUtF>HL2RD7vX'e R:Fkl0?ri* B5~,CJG(jHF¨I*[}9e#JlhP0Q㪷 jg!BO2)ӽI"ͮպSw}vw=f'8.H0HSr#FqoL8#8uv YB!S4e}dW +wR08V|j%cK IGm3ՄX{mHrcINJ3!>ӣ0?Fk'LY*z/vר#-Dρpb>8]}{aȒ?^?;9>4cb-#Z]]aVMWH& HJ3Ec/]|$BmutLˢHWDN̉&𭫀o%rJw~d +ɥRaN%@Vt#Q@I/'z42!.^'vM޷:vwyi"픭j[zߪ;34[#|Ec1^5l!dj]dvե(/_8QVe*__Agnpԗ}ti/ZV|ejkb0 -wr,ғp"wCM]:+]зU{7>fwtK>*d՗8h_U_WM]&eF,g3:?,tE,-ls@~B֕r|=_(5 :y,r[ֱB1%_aj88/k'a.Ɂ#}ئd;W#ȍЭ.E[S9wyElU; ˳σpn9' endstream endobj 952 0 obj << @@ -4447,42 +4447,37 @@ endobj /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] -/Rect [137.718 447.114 152.164 458.018] +/Rect [137.718 411.249 152.164 422.153] /A << /S /GoTo /D (subsection.4.4) >> >> endobj 954 0 obj << /D [952 0 R /XYZ 107 721.862 null] >> endobj 955 0 obj << -/D [952 0 R /XYZ 108 403.403 null] +/D [952 0 R /XYZ 108 367.538 null] >> endobj 951 0 obj << /Font << /F92 432 0 R /F105 437 0 R /F93 433 0 R /F118 517 0 R /F124 545 0 R /F11 570 0 R >> /ProcSet [ /PDF /Text ] >> endobj 958 0 obj << -/Length 3350 +/Length 3413 /Filter /FlateDecode >> stream -xڭZY~_7KayA%R#")gdž{j^ji˨Y}Tuux畷ϞmFQz:(V1^zW^Bo?O ұ8Tb4w]䭿aoT;ɱ`R?>^G ~\UG)+uOba=o[t* C ov~*Q5?\|Ǟ[-n1u͗SY +M˒rtWܜ7v")u B5YU\2έF*<ZV*k#XӜ -9=d-3Ǧ^ld8Y⽃Gpp]^ŕMͫ;C!s C!5*\eK[Y|(/֋C^*lڼdu5_j&c:6lTE{-潻.0OHK#$tzLNi9 y=vE |HD"s"r w*bBٹ"m.MZsTH13S!96 /Mǻd fUYCm,t;A#› -yfq[{)7aN>8n8ݹ\0q_kԲ#:hvvp78`_{sWv 6  8 a 2?7Zuȑ5/q/zm%ǴƦ1T2>;pi]\d -Xh{ӳ4FE?8mP_7;!2&K:eoς \7ZEf?&h#6Q&{4.;XHB`"d -aT/u,Nqh1vY{v)rRLBUMϗ}5=$@Zy5іS[s\Ukk C5`@k l y1eC -dv %z\b3t-HyjdBS[GKpꬤ24CʼnDN.@U;)BE혪A> d5Dl@[u7$~Բc  ^$v,%gyq0#NXX(I-M1DZ撸7NU&\닳 Y6@ls%:t}7sWw-9|i㎎?/>mM;<ϓ$(KKNnZ%ᇸ}3}n/1 -1ީ}aV8Y 2Ȣϸ,_+wwXh?aRf ~06FE8雲hYNAk_n7s#Ov'}"‹Ec);CfL]bj|Tťa4)erWSA2)VwRw*!,LG[s} l\{x`w)U -őXʡUY'dZ6GEC G$_4FEѢR:7ZbU]=LN?OuH6#xR1.Ld-@{5K a`󴸭YTі - G )=ȩ -n.2,w yI22E2Ct*e`ALlˑge?>/ -xD̨cYUNe3~\A\z{x0l!;'X zX l8*LDY3&v]phKREX:aĆ5cO1+s%2|ڟ bU<E:Y(DN6 -bٵw9 D{u6J7f׋Z wE t}s!}\6HmJg+Dt1 ,p9IR_/x^]zVOԲH!!7U3\[&鐕6+8~<ڊIhYpl+~lt*lGĝB{8ț=v"tvjןl4(f/;{xwޜ b8gy΋l)4ai*%mm8VT v62ܡ=r]1c P %Dd}b>73¡*pd4 ݡ(E-GS6퓤5[f(yyp~ oWMu#Oor'O +xڭZY~_1of 6AGjPLR恵yueԬ>'xx~7|ʓ$zx<< Sa=៫hA>_o4!U:5'BX}zoor>eƍ,SmףppVaBC&tЍt~O _9 O",TK-2ܴxp2@b‡2A$2fu>o, xa*kMTdP>O>w?nxk/,0Í;iB8>YyM/_Z]1B")xbճ^C;~ yB7Nkʂ0;2duK^;1jkt2/v?_u2`ZW5gG=,QIPqGwN/]t {"1qtÇA<螋ϔewY +Y9Ve!$,)3T +MPhFyE`Q4K>4 5J8nMh~ZZyB>[pPZ&jϫ=2ί(&*@k@ge䱵q;Ne6-S,d2 >rd?mOoL0B ikF]D*f4Vq ,z 'W0[!}$gDri#,| .{y3TD%3Tb6M:gؼa{ u̼p!W0w *S_{g2MOc<٣$$KK^nZe}?mnA1>ܨB>VnY("s`d\/N=,iϘTd*E l&q~8We$p `yj|<뻝-<s/ph8{J'm LptLKTW +qHʾ|WF3Zfk﫰*&%J`.Z%x`F@ܥG]4{}\zηx`wL-K'eq$rhUI7s uDk|GQIƭN XxW௓shZ1`.Ld-@{5 qⴘYTі + #9=vE4m]CyLa/@$V6Lmѫ +m+J)oYP:0ed>OsPV9'}Z?ѿp]؄\?rBa挘?XpP0v>򹬋j1g<D`+f\F-TA/l`N]TuL~a X+y/L 8 ^C\94fݿ!s,# 47@a"70F~ǟa)caw?L@8ֻ(i&"GA/سeZ3'6xIZi_+TȬ0?\ VL dՃ Y^&l0Vvťa~B@l.OQe׋R rze/t|ճ>.{3O_>MԘIN|͜(gWsJOeܱ!7Ug"eN[[f:&8lYDOdbnf"D"hV<[[ ǣu!7#L& ĦsS}ZCosIA¤!/g_ e 7ۮl)> endobj 775 0 obj << -/D [957 0 R /XYZ 318.135 178.677 null] +/D [957 0 R /XYZ 318.135 149.274 null] >> endobj 956 0 obj << /Font << /F92 432 0 R /F105 437 0 R /F118 517 0 R /F93 433 0 R /F8 585 0 R /F11 570 0 R >> @@ -5325,10 +5320,12 @@ m` )ч"P:0!4~u}qk-2kv ;;yMָBSYO| L#&r@2C=&>" %׉"=&DiA }9 9jw# e4eo:䀆I:q9×M.KdD019.U"d@71r}n%e =W`/2JDnpZmW|5w GDYh0&wޑvAcI7^^Uxes\h2?Ng<31CKRɋ{!05\7l.a|NB%d߃FPr1 0nR6Qd4 Lۄ +m$\id{LPԇPZh9**q{z,?ɇY/tS@&q~L0K7,3 Rv!&`ׅKC6I@Pl;ڹHAm=a;Nc&֫k?=P!hs΅a vfb.<9ڋ,]ڲSyVOcMo.&1abq:/du0SGHN|~!0 dzD  q׺X= r>!ڡ+Xŕ'n9'} D` EH=6Q4>guuK&L "MFqkG?Nx$3Sz5ΧfϑێFz* ʐΟ -q*E\SѪ)R@97nj (w{83`N'ˋ[vT2!h^R uQ;*ZD=F]`-*5:z7>] &G04uɏf`(˅:i=t Z_8?51uC̲}Anc{C!#12tr4ʋgu? +6Y \J@9 {N{)9̈W0Yr?hX?OGn2_45c+ƴx?FCSI8ГOTp^M>.<9ڋ,]ڲSyVOcMo.&1abq:/du0SGHN|~!0 dzD  q׺X= r>!ڡ+Xŕ'n9'} D` EH=6Q4>guuK&L "MFqkG?Nx$3Sz5ΧfϑێFz* ʐΟ -q*Ah)r=LցO0Jxqᓌŭ_|;Bp4}(-S"eaA·%CdgN3ۮoQ*`|x&<.b@0qKT?sg60G@5Q|aF1>J@jj('6n*0^>g+ED?_By2# ZNVY Jh]?4ڜ.wo/פq7";'PXr#i H%MDq2Mro`/1-0a`<>ڃ! _XXŵi- +9'".Z*p`-s/S],}ƤA,T9K9Csh Č_2>#=sPf.Vo(H@W)i݌ZZA 'BfZȓ&œ__7}äGQ4=Իs"D}EEzS1C#Z\_|f{L"v+\M20@ +xYۇR"r6E R)M$Bʳ}+ЛH=]ZH&8a ɫ<Sn~f[e +Oe HdrB|@SQOO +y\*ME79N;g*=ڄm2Pdɺ#XGtVquBCݴŞ/s }̘! +fjnkt7_o=tơQdvZ:s@M9Nݳ endstream endobj 1097 0 obj << @@ -5377,18 +5374,18 @@ endobj /Filter /FlateDecode >> stream -xێ۸=_1>ኤP M)tfmz%d{nC#}#ϡݿuarUi|uQ2xQvu*Q^_ϴ S:Zh׷Yu7ClUTi/RU׷ƬvY{O 6q]+BP%j$p!XEX%@˭U.|Mعcٹzw6]yW*`SRE{u>cU&~oQd)kfVlA0"K#&X QVˑU,1jul%Yy`yںMy8<2jhDkY]۹mĆl0gaorfhy=y˲Jcm#[SX1X"ISmQ;l(Bt a!fȳi}L T8IG5aTeMvcVffCwũ2h=r{թM|_lJ,O-mu=C+;b#uD^lkq~wLt+*$|[۞ ?H&p:PY tkR]EO:t'󂡤Vټlk Y3L gB$TQ0,s0| Ěs&sUڴa0L+W0=%e4dc'_xv3me{{-mic) OG%?:Wʜ$BY$Af_G*IteLp/tPr>jo$Kȱ kmb58'(~H f@#~WJzkYqv$݋ ^-}BLFnB[X4:($>IWa9u؞qaqTО5PQ#?5dTkEGJ -B2dsϥΏ1Nз@5 1ϵ\u -|#vU_,bJ C',ogd$"r bTƥm=b{~lI. {Pj_d/P"Z=_zh`mb.O1^Cpe=PՐ~!-Σ)\2nfdRoЃzUSp){ZGIxB\hL6Qz4f#?(.dl1/*<0 -6Sz - zͬ0ő|^1e KXe><׎Y?ʳE=K,ƈ -1WK3s5](B! [DZUY-6 nDp'dWޗ@]pr8YtjCv&b UH -FIy"TUx>23G 9eyl!3X3u+aPW>૲3Q >˶<ij 2e&2OU+mfZ3Q6Foe2yyع7j<-"PVjm%/8mS/&}! DUc3"b hW?E `l-[s $3& c-p>ac{cgMsw{Iomb@!@(zѧl4ۈPObd9>siXs_+1gU?ZK{'^ + p}[f[4Ш$M7VHLp]tGns`.cbV {۲+ܢP6ΖR=gPd%]f-rǯKw^~D~ 1~7. fӣ _;(hq8~Gŏ{?+gY8qdP*T5kky޽ol g.'ɠ# 6=d)6HF{ɯ$`HY 7S2b;9S9+§&EԷZRl}NZ NJiV͂p왦*ϒakRBȣt^<3$ܵ?+hV3`Rծl@|8]$X/Cw:w)T~'@ dא HQq3n%|$ %S:]VԵ-Vc QVD/xi9bD"A|nSѝ0ٗuZ)G:Pq,dn6-|lY2d`ڤr{;84?W :( 4>68Gr<*T<4΋!u#K[۲&^/%N83wI40ՠ!:1:,)KӪkh[-{.2e1 | 41:t2 Vs=()I߫B&ŐҤ+1HO|><՗d wD$CK*؝AC xsBc{B% eg73IQኤd6ElQ[Mյ$C {ύxhd/uD9ttp]߼.U4wW:ʕ1U"ʮWX׷:JdJgVӂBYk65f +?eQ +3֘߮3 soS~_&P:<_?!z%4]rjD]ZmdY"N~84hʅi;w,;W+jA6WljRChvSgs-5eجUYbJ-FdqdÄVk$j9%&^mں.-$+,OC[C)GUu^h~5kk;Mғؐ, ЛM -^'oY6:Y a, mzwuk +"kU$ cjۺ-p|ǃ!t<%T!# y6~qH; +w{'ˇs4V&?nAl.8UXn~/ܜv:ɂ+M sgHsspeG |d ߷np]]5h`ݞp 1qsEg9Hxh);d>h3?__\&W6WFF@w%kIoR̾/UsMyՋ5&.t,E*S2?Gnmb %GG0Emt/m9J|ڳ:*q~䧆G/Qic@0xoo ~{8_cz#bL<8(Droʓ(s1ΎQKBȌ2fs÷ϥ֏1Oй@9 +2 Պ|uҎ*|#vU>eͩ>_,bJ C/,ogd$"r rTƵmMb|~lI. P_d0P#Z=_zhamLbO1^Cpe=PՐ!MΣ)\2~fdRoЅzUSp){jZ GIxB\hM>Q~f$U?(.dl1*<0v 6Sz + zͬ0ő^1e KXf><׎Y?ʳE=k,Έ +1Wk3s5]( B! [DZWY-6 Dp+dWޗ@mp8YjCv&5 UH +Fy"TUx>23G 9eyl!3X3+aPW>૲3Q >̶<ij 2e&2Oe$,TmgZ3Q6Foe2yyع7ac{cgMs{IOpmb@!@(zѧl4ۈPObd9>siXs_.+1TgU?[L{'_+ p}[h[4Ш$M7VHLp]tGs`.cbV {۲;ܢP6ΖR=gPd%]f-rǯKw^~D~ 1~7. fӣ _[(hq8~Gŏ{?+gY8qdP*T6kky޽ol g.'ˠ# 6=d6H G{ɯ$`HY 7S3b;9S9+§.EZRЅNz NJV͂pl*ϒakRBȣt^<3$ܵ?+hV3`Rծl@|8]$X/C:)T~'@ dߐ ;HQq3n%|$ %S:݁VԶ-Vc QVD/xi9b\E"A|nSѥ0ٗuZ)G:Pq,dn6-| mY2d`ڤr};84?W:( 4Fv8Gr<*T<4΋!u#K[۲&^1%N83I40ՠ!:3:,)[Ӫkh[-{.2e1 | 41:t2 Vs=k))I߫B&ŐҤ+1HO|><՗d D$CK*؝AC xsBc{B% egW5IQ> endobj 1558 0 obj << -/Length 1400 +/Length 1399 /Filter /FlateDecode >> stream -xZ˒6WlW$@e2JTڻI2ȶ21Bx3[Kbj|꾥0XaÛ -0*!AY"0Lǟg/~~F?fs +z|==뮿v׷'}&;' ^$C~A/ǘDQ~Xn|iwEOt ~|>͑`!Y EEO: -ADq p$ H3;Xs|[u^+49-,( >|龓e/E -_գBJH_Cװ/-r HQv#~|Q_Ѳ{)f (,,`4#B܉HI}W۬>ǿ)Hif‘q%J e=i8kbKVѭIqH!=7`LsGk֥!ؑ+*0j)DhkHئrQüUy1ॼ0jjLkK53͏` w<_KZoZ  ˗zt3.%Z -~k"Œ$껐8w#*= ("XpQz1x?l|O -{(uQMM]H,_0ݦ$رC[xc ao WӢı+(iu -6UbIxe^z;?#ӭ0lo d~ӗ}}M dB=ڸv}hl_8*!Q"OWc%?+WfLk^%+3K3ҩybtk$ ƈZ$r@")v)ʡ*SUW*2 vm^Xc*{GET8AԆ|;)w7f/O*钕_c/n.tfhV5r,XY񞁌ahr$O(zΌ[f<U3cj9GK-;m|sd ẎA?cBj&rr9mΜPmLlV\+휯 le3rQ[ŕ1Z9e -(If%v3rJ{mT}hr9e Jly3}ٛl8UcTʷֶ4[6hѮqmJ1Ɋkw-6-St%*=趌ݎ' zƵhO:̃ QC-itI뫶nuW{N>_]lgfYbQZޟ)؊ :cTtTCy 4G/U.u'1W,k֒%XB"Q:6~/ +xZ˒6WlW$@e2JTڻI2ȶ2!<-Kbj|꾥0XaÛ +0*!AY"0Lǟg/~F?fs +z|??믿׷'}&;' ^$C8~AQ/ǘDQzXl~)EOt ~|>͑`!YגJ拞 t**40aMafP0H@2x+ ͑bw-ݱ88&W +hsZj- 1SYQܤ|尓龗/G Y|u9R a, L# JXe0e=i8kbKVѭIqH!=7`LsGk%6!ؑ+*0jY%!a_pRʋ1/V UeB[c8-\rh(i~T4|-hj@2|/_wTpԖh)ꭉt7ӒhB܍T<4dU׋Q{S.QtV=7QԱG9 Vv"X||w`qWn"/؆BU4%X:VTb_λOǮ=W`[rSPI}/oKo燱}q2י_~zb_י~PeO.]F[1d]5 BD(qy\d{[nıus_p_rq"s)sF*6 &FF`H{L":[rU Nɟ˺4U}윪 +'9mfnZZ]?8򍦇-I "7TIyK&6}yeI;~y + mx4p0Ьj X)M=Ӄir$OJzΌ[f> +/A << /S /GoTo /D (page.50) >> >> endobj 1520 0 obj << /Type /Annot @@ -8389,7 +8384,7 @@ endobj /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [393.472 446.12 405.428 456.633] -/A << /S /GoTo /D (page.50) >> +/A << /S /GoTo /D (page.51) >> >> endobj 1524 0 obj << /Type /Annot @@ -8739,15 +8734,11 @@ endobj /ProcSet [ /PDF /Text ] >> endobj 1665 0 obj << -/Length 1604 +/Length 1601 /Filter /FlateDecode >> stream -xZ[sF~Q7{6NiNJA[}V + ^cqssم҃۳^] @9zӌ_ ||`,~8H]zK=/~|" #ŀor;.$^(?| | !(sgus~ ŢzI5o}) D3bg/giЇJk$G![żU׿bD|:{x-9|ޕz~סJ< >L2J -;F?#B*~bY*iD"ޱRBZz3; -ځ] Bz_ZF|%\h)>'.bYU"* :aq";bU(_MZtsѱ>#E &X GL _f@8qC*8'%KAc*IayB(ѭ4&[iJDMH%nȲ=$݋MƷK3M|o&&{c>T<(Zyl(_Fys,ruBl`sL܉v+r^_`큯m;i|] mJR'ʏhZ2P¤D_FUt֮UZ$i|h$,ۋ2,ũV)ckUP^HWbOR6)rpҧȲh'ZN('qھ^[ah}\{ 7nn7ߡ+9qWV=fns`>ԪTRM\/J,:V-& ls;gP?db -Q -Da2cLA)аmL0|Y)?$he.{./ww óvٵ4zFޖ||sJ0hqQ}JlF&;J$W"k-B'AEӜv6c!LK* aR.A[i97K*S-iJUīxfD9ʬhNm[{ԓEveԵ%Z[?dzՏw~.M4~OG*Jĩb:NsR=)C|љ{Nñы:uMM~G=:k-S}p0G!c=ri@چ `]UlFG+vV; N+ְo4V|%/訰;lS{k{lR]j_$p^z6 wLۃG[b&L'&,7gL +xZ[sF~Q7{6NiNJA[}W + ^cqssم҃\ @9z_ ׿||`,~k}`U DP[iLb`&hfK(YeiY{H2oofML`|xPoPYY~YE+sL܉v+r^_`큯m;i|] mJR&ʏhZ2P¤D_FUt֮UZ$i|h$,ۋ2,ũV)ckUP^HWbOR6)rpҧȲh'ZN('qھ^[ah}\{ 7nn7ߡ+9qWV=fns`>ԪTRz&%MegSI˃B21("ns0UE1&JKˠChmL0|Y)?$he.C]Fɓ_!gk-KiF+z-J;aZǕ،Lv;ITD2Z:N9%<Im.CpU6%\p!rl7n"7U1[.,;쫨W}7̈nsϕYќ*ڶ۹'u&/kG5J&w~.M4~OG*Jĩb:NsR;)C|љ{Nñы:mGMM~G=:k-S}p0[!c=ri@چ `]UlFG+vV; N+ְo4V|%/訰;lSzk{lR]j_$p^z6 wLۃG[b&L'&,wgEL endstream endobj 1664 0 obj << @@ -10692,7 +10683,10 @@ endobj stream xZ[s6~ў*HH=IiI;N3iXp+hWh1ًH0˂79sC|oWn"(:+Co>_!a DHSqP}w>Qo7A@ `bG[ D>i(~ Qom/emKLG~k(CʵC0ځboDš0Dt]> ';wHҳW2yPU꫏꫷WDy?ݬ{6Vw:@&#ʆzh$s9nDsL@TdJ/A!풴Vף5ٞAF%/Ċ"El jܦ Gϫ,|nEvALS0fő{ZYd=.CYBSr>CyG&ygS$ͬYY#;5AH"q>q5_@? [CqQ8yGL\5eq6vવa:b]_b :z&rl-[/M+(tvyڅME=[33QӼOܩ%D2uv1cSFXz!wJGE+AtʲF1&`Њh|xC"Fܥz"&v!9H͛2ۋ2mA4E[IڋTԆ#;ced#gM'oߨu=I2U4ΘMðE99~+^*j~j*=;87U,h{^lI@8锓!r^7BH_})`*(mlxВo d%KRn}?J0 +!mD(d mZlJ= Щ@zEv;(IT8!I,fb$ި|n!tj)$knh.хKgL *-vsSm,LpQn{D2%u>/emKLG~k(CʵC0ځboD%48% w*>Yظi]'q6uN2:́鏴v'&I$5'n9|DrKz(;.Tw7J^'Ȕ>\68LVL>Cՠ K DGDy^0`Cɷsn.OTp2'r_t}&5zB;#HfT@"n?r s*Uyـˣ6BO1nYhh%2(uYYV( Z1wo~=B\HA/\Cd.D"ySf{@湾-ȓ޼h ;I{ +p}g,l|{쾉1ո!)bTFӿwi('ok^5WOMŴ`Gc +C oϋ = G2r2:DnF5[KoC!;YE%-mOVZ!dY*_߭g endstream endobj 1922 0 obj << @@ -12535,7 +12529,7 @@ endobj /Type /Pages /Count 6 /Parent 1979 0 R -/Kids [893 0 R 900 0 R 908 0 R 916 0 R 925 0 R 932 0 R] +/Kids [893 0 R 900 0 R 908 0 R 916 0 R 923 0 R 931 0 R] >> endobj 943 0 obj << /Type /Pages @@ -13353,7 +13347,7 @@ endobj /Limits [(page.41) (page.46)] >> endobj 1994 0 obj << -/Names [(page.47) 902 0 R (page.48) 910 0 R (page.49) 918 0 R (page.5) 542 0 R (page.50) 927 0 R (page.51) 934 0 R] +/Names [(page.47) 902 0 R (page.48) 910 0 R (page.49) 918 0 R (page.5) 542 0 R (page.50) 925 0 R (page.51) 933 0 R] /Limits [(page.47) (page.51)] >> endobj 1995 0 obj << @@ -13493,7 +13487,7 @@ endobj /Limits [(section*.89) (section*.93)] >> endobj 2029 0 obj << -/Names [(section*.94) 913 0 R (section*.95) 919 0 R (section*.96) 920 0 R (section*.97) 928 0 R (section*.98) 929 0 R (section*.99) 930 0 R] +/Names [(section*.94) 913 0 R (section*.95) 919 0 R (section*.96) 926 0 R (section*.97) 927 0 R (section*.98) 928 0 R (section*.99) 934 0 R] /Limits [(section*.94) (section*.99)] >> endobj 2030 0 obj << @@ -13633,8 +13627,8 @@ endobj >> endobj 2063 0 obj << /Author()/Title()/Subject()/Creator(LaTeX with hyperref package)/Producer(pdfTeX-1.40.10)/Keywords() -/CreationDate (D:20090930121457-05'00') -/ModDate (D:20090930121457-05'00') +/CreationDate (D:20091029155503-05'00') +/ModDate (D:20091029155503-05'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.1415926-1.40.10-2.2 (Web2C 2009) kpathsea version 5.0.0) >> endobj @@ -13642,590 +13636,590 @@ xref 0 2064 0000000000 65535 f 0000000015 00000 n -0000036067 00000 n -0000708110 00000 n +0000036066 00000 n +0000708173 00000 n 0000000060 00000 n 0000000090 00000 n -0000036119 00000 n -0000708040 00000 n +0000036118 00000 n +0000708103 00000 n 0000000140 00000 n 0000000162 00000 n -0000036175 00000 n -0000707956 00000 n +0000036174 00000 n +0000708019 00000 n 0000000212 00000 n 0000000235 00000 n -0000036232 00000 n -0000707870 00000 n +0000036231 00000 n +0000707933 00000 n 0000000286 00000 n 0000000310 00000 n -0000041378 00000 n -0000707797 00000 n +0000041377 00000 n +0000707860 00000 n 0000000361 00000 n 0000000384 00000 n -0000052143 00000 n -0000707671 00000 n +0000052142 00000 n +0000707734 00000 n 0000000430 00000 n 0000000457 00000 n -0000052196 00000 n -0000707597 00000 n +0000052195 00000 n +0000707660 00000 n 0000000508 00000 n 0000000576 00000 n -0000052253 00000 n -0000707510 00000 n +0000052252 00000 n +0000707573 00000 n 0000000627 00000 n 0000000684 00000 n -0000056424 00000 n -0000707423 00000 n +0000056423 00000 n +0000707486 00000 n 0000000735 00000 n 0000000804 00000 n -0000056479 00000 n -0000707336 00000 n +0000056478 00000 n +0000707399 00000 n 0000000855 00000 n 0000000912 00000 n -0000056536 00000 n -0000707249 00000 n +0000056535 00000 n +0000707312 00000 n 0000000963 00000 n 0000001015 00000 n -0000061074 00000 n -0000707162 00000 n +0000061073 00000 n +0000707225 00000 n 0000001066 00000 n 0000001147 00000 n -0000061127 00000 n -0000707075 00000 n +0000061126 00000 n +0000707138 00000 n 0000001198 00000 n 0000001273 00000 n -0000061184 00000 n -0000706988 00000 n +0000061183 00000 n +0000707051 00000 n 0000001324 00000 n 0000001386 00000 n -0000061241 00000 n -0000706901 00000 n +0000061240 00000 n +0000706964 00000 n 0000001437 00000 n 0000001503 00000 n -0000061298 00000 n -0000706814 00000 n +0000061297 00000 n +0000706877 00000 n 0000001555 00000 n 0000001640 00000 n -0000065565 00000 n -0000706727 00000 n +0000065564 00000 n +0000706790 00000 n 0000001692 00000 n 0000001736 00000 n -0000065622 00000 n -0000706653 00000 n +0000065621 00000 n +0000706716 00000 n 0000001788 00000 n 0000001821 00000 n -0000070629 00000 n -0000706527 00000 n +0000070628 00000 n +0000706590 00000 n 0000001867 00000 n 0000001919 00000 n -0000070682 00000 n -0000706453 00000 n +0000070681 00000 n +0000706516 00000 n 0000001970 00000 n 0000002008 00000 n -0000070739 00000 n -0000706366 00000 n +0000070738 00000 n +0000706429 00000 n 0000002059 00000 n 0000002085 00000 n -0000073324 00000 n -0000706292 00000 n +0000073323 00000 n +0000706355 00000 n 0000002136 00000 n 0000002184 00000 n 0000076926 00000 n -0000706163 00000 n +0000706226 00000 n 0000002230 00000 n 0000002260 00000 n 0000076979 00000 n -0000706089 00000 n +0000706152 00000 n 0000002311 00000 n 0000002353 00000 n 0000086831 00000 n -0000705961 00000 n +0000706024 00000 n 0000002404 00000 n 0000002439 00000 n 0000092268 00000 n -0000705883 00000 n +0000705946 00000 n 0000002496 00000 n 0000002545 00000 n 0000096789 00000 n -0000705791 00000 n +0000705854 00000 n 0000002602 00000 n 0000002649 00000 n 0000101657 00000 n -0000705699 00000 n +0000705762 00000 n 0000002706 00000 n 0000002753 00000 n 0000119002 00000 n -0000705607 00000 n +0000705670 00000 n 0000002810 00000 n 0000002856 00000 n 0000127574 00000 n -0000705515 00000 n +0000705578 00000 n 0000002913 00000 n 0000002939 00000 n 0000135436 00000 n -0000705437 00000 n +0000705500 00000 n 0000002996 00000 n 0000003041 00000 n 0000140139 00000 n -0000705307 00000 n +0000705370 00000 n 0000003093 00000 n 0000003129 00000 n 0000140197 00000 n -0000705228 00000 n +0000705291 00000 n 0000003186 00000 n 0000003230 00000 n 0000148429 00000 n -0000705135 00000 n +0000705198 00000 n 0000003287 00000 n 0000003340 00000 n 0000152504 00000 n -0000705042 00000 n +0000705105 00000 n 0000003397 00000 n 0000003438 00000 n 0000152620 00000 n -0000704963 00000 n +0000705026 00000 n 0000003495 00000 n 0000003530 00000 n 0000156978 00000 n -0000704832 00000 n +0000704895 00000 n 0000003582 00000 n 0000003624 00000 n 0000157035 00000 n -0000704753 00000 n +0000704816 00000 n 0000003681 00000 n 0000003717 00000 n 0000161399 00000 n -0000704660 00000 n +0000704723 00000 n 0000003774 00000 n 0000003843 00000 n 0000171074 00000 n -0000704581 00000 n +0000704644 00000 n 0000003900 00000 n 0000003926 00000 n 0000175914 00000 n -0000704450 00000 n +0000704513 00000 n 0000003978 00000 n 0000004016 00000 n 0000180529 00000 n -0000704371 00000 n +0000704434 00000 n 0000004073 00000 n 0000004100 00000 n 0000192512 00000 n -0000704278 00000 n +0000704341 00000 n 0000004157 00000 n 0000004222 00000 n 0000201364 00000 n -0000704185 00000 n +0000704248 00000 n 0000004279 00000 n 0000004329 00000 n 0000201480 00000 n -0000704106 00000 n +0000704169 00000 n 0000004386 00000 n 0000004414 00000 n 0000201537 00000 n -0000703975 00000 n +0000704038 00000 n 0000004466 00000 n 0000004509 00000 n 0000201595 00000 n -0000703896 00000 n +0000703959 00000 n 0000004566 00000 n 0000004604 00000 n 0000207055 00000 n -0000703803 00000 n +0000703866 00000 n 0000004661 00000 n 0000004699 00000 n 0000221817 00000 n -0000703724 00000 n +0000703787 00000 n 0000004756 00000 n 0000004804 00000 n 0000234498 00000 n -0000703593 00000 n +0000703656 00000 n 0000004856 00000 n 0000004896 00000 n 0000234556 00000 n -0000703514 00000 n +0000703577 00000 n 0000004953 00000 n 0000004985 00000 n -0000253356 00000 n -0000703435 00000 n +0000257224 00000 n +0000703498 00000 n 0000005042 00000 n 0000005085 00000 n -0000262106 00000 n -0000703343 00000 n +0000261764 00000 n +0000703406 00000 n 0000005137 00000 n 0000005193 00000 n -0000262218 00000 n -0000703251 00000 n +0000261880 00000 n +0000703314 00000 n 0000005245 00000 n 0000005280 00000 n -0000266301 00000 n -0000703120 00000 n +0000265962 00000 n +0000703183 00000 n 0000005333 00000 n 0000005371 00000 n -0000266355 00000 n -0000703041 00000 n +0000266019 00000 n +0000703104 00000 n 0000005429 00000 n 0000005492 00000 n -0000269978 00000 n -0000702962 00000 n +0000269811 00000 n +0000703025 00000 n 0000005550 00000 n 0000005588 00000 n -0000280856 00000 n -0000702870 00000 n +0000280923 00000 n +0000702933 00000 n 0000005641 00000 n 0000005672 00000 n -0000292139 00000 n -0000702753 00000 n +0000292206 00000 n +0000702816 00000 n 0000005725 00000 n 0000005764 00000 n -0000292197 00000 n -0000702674 00000 n +0000292264 00000 n +0000702737 00000 n 0000005822 00000 n 0000005849 00000 n -0000296419 00000 n -0000702581 00000 n +0000296486 00000 n +0000702644 00000 n 0000005907 00000 n 0000005937 00000 n -0000299985 00000 n -0000702488 00000 n +0000300052 00000 n +0000702551 00000 n 0000005995 00000 n 0000006032 00000 n -0000304362 00000 n -0000702395 00000 n +0000304429 00000 n +0000702458 00000 n 0000006090 00000 n 0000006137 00000 n -0000312476 00000 n -0000702302 00000 n +0000312543 00000 n +0000702365 00000 n 0000006195 00000 n 0000006244 00000 n -0000317616 00000 n -0000702209 00000 n +0000317683 00000 n +0000702272 00000 n 0000006302 00000 n 0000006361 00000 n -0000325510 00000 n -0000702116 00000 n +0000325577 00000 n +0000702179 00000 n 0000006419 00000 n 0000006453 00000 n -0000333377 00000 n -0000702037 00000 n +0000333444 00000 n +0000702100 00000 n 0000006511 00000 n 0000006544 00000 n -0000354750 00000 n -0000701919 00000 n +0000354817 00000 n +0000701982 00000 n 0000006591 00000 n 0000006621 00000 n -0000354805 00000 n -0000701840 00000 n +0000354872 00000 n +0000701903 00000 n 0000006673 00000 n 0000006710 00000 n -0000354864 00000 n -0000701747 00000 n +0000354931 00000 n +0000701810 00000 n 0000006762 00000 n 0000006798 00000 n -0000354923 00000 n -0000701654 00000 n +0000354990 00000 n +0000701717 00000 n 0000006850 00000 n 0000006889 00000 n -0000358052 00000 n -0000701561 00000 n +0000358119 00000 n +0000701624 00000 n 0000006941 00000 n 0000006992 00000 n -0000361604 00000 n -0000701468 00000 n +0000361671 00000 n +0000701531 00000 n 0000007044 00000 n 0000007107 00000 n -0000361663 00000 n -0000701336 00000 n +0000361730 00000 n +0000701399 00000 n 0000007159 00000 n 0000007222 00000 n -0000361722 00000 n -0000701257 00000 n +0000361789 00000 n +0000701320 00000 n 0000007279 00000 n 0000007315 00000 n -0000366368 00000 n -0000701164 00000 n +0000366435 00000 n +0000701227 00000 n 0000007372 00000 n 0000007416 00000 n -0000366427 00000 n -0000701085 00000 n +0000366494 00000 n +0000701148 00000 n 0000007473 00000 n 0000007510 00000 n -0000375120 00000 n -0000700953 00000 n +0000375187 00000 n +0000701016 00000 n 0000007562 00000 n 0000007614 00000 n -0000375179 00000 n -0000700874 00000 n +0000375246 00000 n +0000700937 00000 n 0000007671 00000 n 0000007705 00000 n -0000377650 00000 n -0000700795 00000 n +0000377717 00000 n +0000700858 00000 n 0000007762 00000 n 0000007796 00000 n -0000394839 00000 n -0000700702 00000 n +0000394906 00000 n +0000700765 00000 n 0000007848 00000 n 0000007910 00000 n -0000467369 00000 n -0000700583 00000 n +0000467432 00000 n +0000700646 00000 n 0000007962 00000 n 0000008007 00000 n -0000467427 00000 n -0000700504 00000 n +0000467490 00000 n +0000700567 00000 n 0000008064 00000 n 0000008097 00000 n -0000467486 00000 n -0000700411 00000 n +0000467549 00000 n +0000700474 00000 n 0000008154 00000 n 0000008192 00000 n -0000467549 00000 n -0000700318 00000 n +0000467612 00000 n +0000700381 00000 n 0000008249 00000 n 0000008298 00000 n -0000467612 00000 n -0000700225 00000 n +0000467675 00000 n +0000700288 00000 n 0000008355 00000 n 0000008393 00000 n -0000483883 00000 n -0000700132 00000 n +0000483946 00000 n +0000700195 00000 n 0000008450 00000 n 0000008477 00000 n -0000483942 00000 n -0000700039 00000 n +0000484005 00000 n +0000700102 00000 n 0000008534 00000 n 0000008579 00000 n -0000484001 00000 n -0000699946 00000 n +0000484064 00000 n +0000700009 00000 n 0000008636 00000 n 0000008683 00000 n -0000484064 00000 n -0000699853 00000 n +0000484127 00000 n +0000699916 00000 n 0000008740 00000 n 0000008772 00000 n -0000500407 00000 n -0000699760 00000 n +0000500470 00000 n +0000699823 00000 n 0000008829 00000 n 0000008864 00000 n -0000500466 00000 n -0000699667 00000 n +0000500529 00000 n +0000699730 00000 n 0000008922 00000 n 0000008956 00000 n -0000500525 00000 n -0000699574 00000 n +0000500588 00000 n +0000699637 00000 n 0000009014 00000 n 0000009049 00000 n -0000500588 00000 n -0000699481 00000 n +0000500651 00000 n +0000699544 00000 n 0000009107 00000 n 0000009142 00000 n -0000500651 00000 n -0000699388 00000 n +0000500714 00000 n +0000699451 00000 n 0000009200 00000 n 0000009237 00000 n -0000514202 00000 n -0000699295 00000 n +0000514265 00000 n +0000699358 00000 n 0000009295 00000 n 0000009337 00000 n -0000514261 00000 n -0000699202 00000 n +0000514324 00000 n +0000699265 00000 n 0000009395 00000 n 0000009419 00000 n -0000514320 00000 n -0000699123 00000 n +0000514383 00000 n +0000699186 00000 n 0000009477 00000 n 0000009501 00000 n -0000011766 00000 n -0000012146 00000 n -0000012298 00000 n -0000012455 00000 n -0000012612 00000 n -0000012768 00000 n -0000012925 00000 n -0000013077 00000 n -0000013234 00000 n -0000013391 00000 n -0000013548 00000 n -0000013704 00000 n -0000013861 00000 n -0000014018 00000 n -0000014174 00000 n -0000014331 00000 n -0000014487 00000 n -0000014645 00000 n -0000014801 00000 n -0000014959 00000 n -0000015111 00000 n -0000015268 00000 n -0000015425 00000 n -0000015582 00000 n -0000015734 00000 n -0000015891 00000 n -0000016046 00000 n -0000016208 00000 n -0000016369 00000 n -0000016531 00000 n -0000016693 00000 n -0000016855 00000 n -0000017017 00000 n -0000019903 00000 n -0000017344 00000 n +0000011765 00000 n +0000012145 00000 n +0000012297 00000 n +0000012454 00000 n +0000012611 00000 n +0000012767 00000 n +0000012924 00000 n +0000013076 00000 n +0000013233 00000 n +0000013390 00000 n +0000013547 00000 n +0000013703 00000 n +0000013860 00000 n +0000014017 00000 n +0000014173 00000 n +0000014330 00000 n +0000014486 00000 n +0000014644 00000 n +0000014800 00000 n +0000014958 00000 n +0000015110 00000 n +0000015267 00000 n +0000015424 00000 n +0000015581 00000 n +0000015733 00000 n +0000015890 00000 n +0000016045 00000 n +0000016207 00000 n +0000016368 00000 n +0000016530 00000 n +0000016692 00000 n +0000016854 00000 n +0000017016 00000 n +0000019902 00000 n +0000017343 00000 n 0000009568 00000 n -0000017174 00000 n -0000017232 00000 n -0000695844 00000 n -0000694395 00000 n -0000695668 00000 n -0000017286 00000 n -0000695021 00000 n -0000696558 00000 n -0000696725 00000 n -0000020065 00000 n -0000020227 00000 n -0000020389 00000 n -0000020551 00000 n -0000020708 00000 n -0000020870 00000 n -0000021032 00000 n -0000021194 00000 n -0000021351 00000 n -0000021513 00000 n -0000021675 00000 n -0000021837 00000 n -0000021999 00000 n -0000022156 00000 n -0000022318 00000 n -0000022480 00000 n -0000022642 00000 n -0000022798 00000 n -0000022960 00000 n -0000023121 00000 n -0000023278 00000 n -0000023434 00000 n -0000023592 00000 n -0000023755 00000 n -0000023917 00000 n -0000024075 00000 n -0000024233 00000 n -0000024396 00000 n -0000024559 00000 n -0000024722 00000 n -0000024885 00000 n -0000025048 00000 n -0000025211 00000 n -0000025374 00000 n -0000025537 00000 n -0000025689 00000 n -0000025845 00000 n -0000026001 00000 n -0000026158 00000 n -0000026314 00000 n -0000026471 00000 n -0000026627 00000 n -0000026789 00000 n -0000026951 00000 n -0000027113 00000 n -0000027270 00000 n -0000028652 00000 n -0000027490 00000 n -0000019403 00000 n -0000017470 00000 n -0000027432 00000 n -0000028814 00000 n -0000028971 00000 n -0000029128 00000 n -0000029290 00000 n -0000029452 00000 n -0000029614 00000 n -0000029776 00000 n -0000029938 00000 n -0000030100 00000 n -0000030262 00000 n -0000030424 00000 n -0000030586 00000 n -0000030749 00000 n -0000030912 00000 n -0000031075 00000 n -0000031237 00000 n -0000031400 00000 n -0000031562 00000 n -0000031782 00000 n -0000028376 00000 n -0000027590 00000 n -0000031724 00000 n -0000035855 00000 n -0000036350 00000 n -0000035723 00000 n -0000031854 00000 n -0000036009 00000 n -0000696020 00000 n -0000036288 00000 n -0000041012 00000 n -0000041166 00000 n -0000041558 00000 n -0000040872 00000 n -0000036464 00000 n -0000041320 00000 n -0000041435 00000 n -0000041497 00000 n -0000045964 00000 n -0000045794 00000 n -0000041685 00000 n -0000045906 00000 n -0000047184 00000 n -0000047014 00000 n -0000046077 00000 n -0000047126 00000 n -0000696843 00000 n -0000051611 00000 n -0000051767 00000 n -0000051929 00000 n -0000052310 00000 n -0000051463 00000 n -0000047283 00000 n -0000052085 00000 n -0000695188 00000 n -0000696386 00000 n -0000695506 00000 n -0000060706 00000 n -0000056593 00000 n -0000056254 00000 n -0000052479 00000 n -0000056366 00000 n -0000694854 00000 n -0000060860 00000 n -0000061417 00000 n -0000060566 00000 n -0000056762 00000 n -0000061016 00000 n -0000061355 00000 n -0000065188 00000 n -0000065350 00000 n -0000065679 00000 n -0000065048 00000 n -0000061599 00000 n -0000065507 00000 n -0000070263 00000 n -0000070417 00000 n -0000070920 00000 n -0000070123 00000 n -0000065861 00000 n -0000070571 00000 n -0000694106 00000 n -0000070796 00000 n -0000694687 00000 n -0000070858 00000 n -0000073381 00000 n -0000073154 00000 n -0000071087 00000 n -0000073266 00000 n -0000696961 00000 n +0000017173 00000 n +0000017231 00000 n +0000695907 00000 n +0000694458 00000 n +0000695731 00000 n +0000017285 00000 n +0000695084 00000 n +0000696621 00000 n +0000696788 00000 n +0000020064 00000 n +0000020226 00000 n +0000020388 00000 n +0000020550 00000 n +0000020707 00000 n +0000020869 00000 n +0000021031 00000 n +0000021193 00000 n +0000021350 00000 n +0000021512 00000 n +0000021674 00000 n +0000021836 00000 n +0000021998 00000 n +0000022155 00000 n +0000022317 00000 n +0000022479 00000 n +0000022641 00000 n +0000022797 00000 n +0000022959 00000 n +0000023120 00000 n +0000023277 00000 n +0000023433 00000 n +0000023591 00000 n +0000023754 00000 n +0000023916 00000 n +0000024074 00000 n +0000024232 00000 n +0000024395 00000 n +0000024558 00000 n +0000024721 00000 n +0000024884 00000 n +0000025047 00000 n +0000025210 00000 n +0000025373 00000 n +0000025536 00000 n +0000025688 00000 n +0000025844 00000 n +0000026000 00000 n +0000026157 00000 n +0000026313 00000 n +0000026470 00000 n +0000026626 00000 n +0000026788 00000 n +0000026950 00000 n +0000027112 00000 n +0000027269 00000 n +0000028651 00000 n +0000027489 00000 n +0000019402 00000 n +0000017469 00000 n +0000027431 00000 n +0000028813 00000 n +0000028970 00000 n +0000029127 00000 n +0000029289 00000 n +0000029451 00000 n +0000029613 00000 n +0000029775 00000 n +0000029937 00000 n +0000030099 00000 n +0000030261 00000 n +0000030423 00000 n +0000030585 00000 n +0000030748 00000 n +0000030911 00000 n +0000031074 00000 n +0000031236 00000 n +0000031399 00000 n +0000031561 00000 n +0000031781 00000 n +0000028375 00000 n +0000027589 00000 n +0000031723 00000 n +0000035854 00000 n +0000036349 00000 n +0000035722 00000 n +0000031853 00000 n +0000036008 00000 n +0000696083 00000 n +0000036287 00000 n +0000041011 00000 n +0000041165 00000 n +0000041557 00000 n +0000040871 00000 n +0000036463 00000 n +0000041319 00000 n +0000041434 00000 n +0000041496 00000 n +0000045963 00000 n +0000045793 00000 n +0000041684 00000 n +0000045905 00000 n +0000047183 00000 n +0000047013 00000 n +0000046076 00000 n +0000047125 00000 n +0000696906 00000 n +0000051610 00000 n +0000051766 00000 n +0000051928 00000 n +0000052309 00000 n +0000051462 00000 n +0000047282 00000 n +0000052084 00000 n +0000695251 00000 n +0000696449 00000 n +0000695569 00000 n +0000060705 00000 n +0000056592 00000 n +0000056253 00000 n +0000052478 00000 n +0000056365 00000 n +0000694917 00000 n +0000060859 00000 n +0000061416 00000 n +0000060565 00000 n +0000056761 00000 n +0000061015 00000 n +0000061354 00000 n +0000065187 00000 n +0000065349 00000 n +0000065678 00000 n +0000065047 00000 n +0000061598 00000 n +0000065506 00000 n +0000070262 00000 n +0000070416 00000 n +0000070919 00000 n +0000070122 00000 n +0000065860 00000 n +0000070570 00000 n +0000694169 00000 n +0000070795 00000 n +0000694750 00000 n +0000070857 00000 n +0000073380 00000 n +0000073153 00000 n +0000071086 00000 n +0000073265 00000 n +0000697024 00000 n 0000082011 00000 n 0000082319 00000 n 0000077094 00000 n 0000076756 00000 n -0000073521 00000 n +0000073520 00000 n 0000076868 00000 n -0000694251 00000 n +0000694314 00000 n 0000077036 00000 n 0000082165 00000 n 0000082766 00000 n @@ -14280,7 +14274,7 @@ xref 0000101714 00000 n 0000101771 00000 n 0000101829 00000 n -0000697079 00000 n +0000697142 00000 n 0000105788 00000 n 0000105942 00000 n 0000110203 00000 n @@ -14328,7 +14322,7 @@ xref 0000127516 00000 n 0000127632 00000 n 0000127690 00000 n -0000697197 00000 n +0000697260 00000 n 0000131738 00000 n 0000131336 00000 n 0000127904 00000 n @@ -14367,9 +14361,9 @@ xref 0000152091 00000 n 0000148671 00000 n 0000152384 00000 n -0000696200 00000 n +0000696263 00000 n 0000152562 00000 n -0000697315 00000 n +0000697378 00000 n 0000156597 00000 n 0000156758 00000 n 0000157151 00000 n @@ -14415,7 +14409,7 @@ xref 0000171384 00000 n 0000175856 00000 n 0000175972 00000 n -0000277275 00000 n +0000277342 00000 n 0000179666 00000 n 0000179828 00000 n 0000179987 00000 n @@ -14431,7 +14425,7 @@ xref 0000180756 00000 n 0000180814 00000 n 0000180872 00000 n -0000697433 00000 n +0000697496 00000 n 0000185040 00000 n 0000185489 00000 n 0000184908 00000 n @@ -14469,7 +14463,7 @@ xref 0000197532 00000 n 0000201306 00000 n 0000201422 00000 n -0000694540 00000 n +0000694603 00000 n 0000201653 00000 n 0000206836 00000 n 0000207113 00000 n @@ -14482,12 +14476,12 @@ xref 0000207265 00000 n 0000211433 00000 n 0000211491 00000 n -0000695355 00000 n +0000695418 00000 n 0000211549 00000 n 0000211607 00000 n 0000211665 00000 n 0000211723 00000 n -0000697551 00000 n +0000697614 00000 n 0000216057 00000 n 0000216219 00000 n 0000216381 00000 n @@ -14537,7 +14531,7 @@ xref 0000234754 00000 n 0000239508 00000 n 0000239566 00000 n -0000697669 00000 n +0000697732 00000 n 0000243640 00000 n 0000244090 00000 n 0000243508 00000 n @@ -14547,1168 +14541,1168 @@ xref 0000243917 00000 n 0000243975 00000 n 0000244033 00000 n -0000248999 00000 n -0000248655 00000 n +0000248986 00000 n +0000248642 00000 n 0000244229 00000 n -0000248767 00000 n -0000248825 00000 n -0000248883 00000 n -0000248941 00000 n -0000253082 00000 n -0000253471 00000 n -0000252950 00000 n -0000249138 00000 n -0000253240 00000 n -0000253298 00000 n -0000253413 00000 n -0000257326 00000 n -0000257483 00000 n -0000257639 00000 n -0000258032 00000 n -0000257178 00000 n -0000253597 00000 n -0000257800 00000 n -0000257858 00000 n -0000257916 00000 n -0000257974 00000 n -0000262334 00000 n -0000261936 00000 n -0000258158 00000 n -0000262048 00000 n -0000262160 00000 n -0000262276 00000 n -0000266529 00000 n -0000266131 00000 n -0000262487 00000 n -0000266243 00000 n -0000266413 00000 n -0000266471 00000 n -0000697787 00000 n -0000270148 00000 n -0000269808 00000 n -0000266683 00000 n -0000269920 00000 n -0000270032 00000 n -0000270090 00000 n -0000273261 00000 n -0000273534 00000 n -0000273129 00000 n -0000270274 00000 n -0000273418 00000 n -0000273476 00000 n -0000277337 00000 n -0000277105 00000 n -0000273674 00000 n -0000277217 00000 n -0000281199 00000 n -0000280686 00000 n -0000277475 00000 n -0000280798 00000 n -0000280910 00000 n -0000280967 00000 n -0000281025 00000 n -0000281083 00000 n -0000281141 00000 n -0000285004 00000 n -0000284313 00000 n -0000281339 00000 n -0000284425 00000 n -0000284483 00000 n -0000284541 00000 n -0000284599 00000 n -0000284657 00000 n -0000284715 00000 n -0000284773 00000 n -0000284831 00000 n -0000284889 00000 n -0000284946 00000 n -0000287973 00000 n -0000288655 00000 n -0000287841 00000 n -0000285130 00000 n -0000288134 00000 n -0000288192 00000 n -0000288250 00000 n -0000288308 00000 n -0000288366 00000 n -0000288423 00000 n -0000288481 00000 n -0000288539 00000 n -0000288597 00000 n -0000697905 00000 n -0000296082 00000 n -0000292373 00000 n -0000291850 00000 n -0000288793 00000 n -0000291962 00000 n -0000292021 00000 n -0000292080 00000 n -0000292255 00000 n -0000292314 00000 n -0000296598 00000 n -0000295947 00000 n -0000292500 00000 n -0000296243 00000 n -0000296303 00000 n -0000296359 00000 n -0000296478 00000 n -0000296538 00000 n -0000299709 00000 n -0000300167 00000 n -0000299573 00000 n -0000296725 00000 n -0000299865 00000 n -0000299925 00000 n -0000300044 00000 n -0000300103 00000 n -0000304477 00000 n -0000304187 00000 n -0000300306 00000 n -0000304302 00000 n -0000304417 00000 n -0000307826 00000 n -0000308168 00000 n -0000307690 00000 n -0000304604 00000 n -0000307989 00000 n -0000308049 00000 n -0000308108 00000 n -0000317073 00000 n -0000312535 00000 n -0000312300 00000 n -0000308295 00000 n -0000312416 00000 n -0000698027 00000 n -0000317231 00000 n -0000317395 00000 n -0000317735 00000 n -0000316918 00000 n -0000312701 00000 n -0000317556 00000 n -0000317675 00000 n -0000321654 00000 n -0000321298 00000 n -0000317874 00000 n -0000321414 00000 n -0000321474 00000 n -0000321534 00000 n -0000321594 00000 n -0000325286 00000 n -0000325629 00000 n -0000325149 00000 n -0000321806 00000 n -0000325450 00000 n -0000325569 00000 n -0000329371 00000 n -0000333161 00000 n -0000329715 00000 n -0000329234 00000 n -0000325769 00000 n -0000329535 00000 n -0000329595 00000 n -0000329655 00000 n -0000337764 00000 n -0000333620 00000 n -0000333024 00000 n -0000329867 00000 n -0000333317 00000 n -0000333436 00000 n -0000333496 00000 n -0000333556 00000 n -0000337928 00000 n -0000342276 00000 n -0000338206 00000 n -0000337618 00000 n -0000333747 00000 n -0000338086 00000 n -0000338146 00000 n -0000698152 00000 n -0000342851 00000 n -0000342139 00000 n -0000338333 00000 n -0000342432 00000 n -0000342492 00000 n -0000342548 00000 n -0000342608 00000 n -0000693958 00000 n -0000342668 00000 n -0000342728 00000 n -0000342788 00000 n -0000347169 00000 n -0000347332 00000 n -0000347795 00000 n -0000347023 00000 n -0000342991 00000 n -0000347495 00000 n -0000347555 00000 n -0000347615 00000 n -0000347675 00000 n -0000347735 00000 n -0000351729 00000 n -0000351313 00000 n -0000347922 00000 n -0000351429 00000 n -0000351489 00000 n -0000351549 00000 n -0000351609 00000 n -0000351669 00000 n -0000354982 00000 n -0000354574 00000 n -0000351856 00000 n -0000354690 00000 n -0000358111 00000 n -0000357876 00000 n -0000355096 00000 n -0000357992 00000 n -0000361781 00000 n -0000361428 00000 n -0000358264 00000 n -0000361544 00000 n -0000698277 00000 n -0000366152 00000 n -0000366550 00000 n -0000366015 00000 n -0000361933 00000 n -0000366308 00000 n -0000366486 00000 n -0000370673 00000 n -0000370953 00000 n -0000370536 00000 n -0000366664 00000 n -0000370829 00000 n -0000370889 00000 n -0000374904 00000 n -0000375302 00000 n -0000374767 00000 n -0000371094 00000 n -0000375060 00000 n -0000375238 00000 n -0000377709 00000 n -0000377474 00000 n -0000375457 00000 n -0000377590 00000 n -0000380479 00000 n -0000380630 00000 n -0000380781 00000 n -0000380932 00000 n -0000381083 00000 n -0000381233 00000 n -0000381384 00000 n -0000381535 00000 n -0000381686 00000 n -0000381837 00000 n -0000381986 00000 n -0000382137 00000 n -0000382287 00000 n -0000382438 00000 n -0000382589 00000 n -0000382740 00000 n -0000382891 00000 n -0000383041 00000 n -0000383192 00000 n -0000383342 00000 n -0000383493 00000 n -0000383642 00000 n -0000383793 00000 n -0000383943 00000 n -0000384094 00000 n -0000384244 00000 n -0000384395 00000 n -0000384544 00000 n -0000384694 00000 n -0000384845 00000 n -0000384996 00000 n -0000385147 00000 n -0000385297 00000 n -0000385448 00000 n -0000385599 00000 n -0000385749 00000 n -0000385900 00000 n -0000386051 00000 n -0000386201 00000 n -0000386351 00000 n -0000386502 00000 n -0000386652 00000 n -0000386802 00000 n -0000386951 00000 n -0000387102 00000 n -0000387252 00000 n -0000387403 00000 n -0000387554 00000 n -0000387702 00000 n -0000387853 00000 n -0000388004 00000 n -0000388155 00000 n -0000388306 00000 n -0000388456 00000 n -0000388606 00000 n -0000388755 00000 n -0000388906 00000 n -0000389056 00000 n -0000389207 00000 n -0000389358 00000 n -0000389509 00000 n -0000389659 00000 n -0000389810 00000 n -0000389961 00000 n -0000390112 00000 n -0000390262 00000 n -0000390413 00000 n -0000390564 00000 n -0000390715 00000 n -0000390865 00000 n -0000391015 00000 n -0000391166 00000 n -0000391317 00000 n -0000391465 00000 n -0000391616 00000 n -0000391766 00000 n -0000391917 00000 n -0000392067 00000 n -0000392217 00000 n -0000392368 00000 n -0000392519 00000 n -0000392670 00000 n -0000392821 00000 n -0000392971 00000 n -0000393121 00000 n -0000393272 00000 n -0000393423 00000 n -0000393574 00000 n -0000393725 00000 n -0000393876 00000 n -0000394027 00000 n -0000394177 00000 n -0000394327 00000 n -0000394477 00000 n -0000394628 00000 n -0000397681 00000 n -0000394897 00000 n -0000379496 00000 n -0000377810 00000 n -0000394779 00000 n -0000397832 00000 n -0000397982 00000 n -0000398133 00000 n -0000398284 00000 n -0000398435 00000 n -0000398586 00000 n -0000398737 00000 n -0000398887 00000 n -0000399038 00000 n -0000399187 00000 n -0000399337 00000 n -0000399486 00000 n -0000399636 00000 n -0000399786 00000 n -0000399937 00000 n -0000400088 00000 n -0000400239 00000 n -0000400389 00000 n -0000400540 00000 n -0000400691 00000 n -0000400842 00000 n -0000400992 00000 n -0000401143 00000 n -0000401293 00000 n -0000401444 00000 n -0000401595 00000 n -0000401745 00000 n -0000401896 00000 n -0000402047 00000 n -0000402198 00000 n -0000402347 00000 n -0000402498 00000 n -0000402648 00000 n -0000402799 00000 n -0000402949 00000 n -0000403100 00000 n -0000403251 00000 n -0000403402 00000 n -0000403553 00000 n -0000403704 00000 n -0000403855 00000 n -0000404006 00000 n -0000404156 00000 n -0000404307 00000 n -0000404457 00000 n -0000404607 00000 n -0000404757 00000 n -0000404907 00000 n -0000405058 00000 n -0000405209 00000 n -0000405360 00000 n -0000405511 00000 n -0000405662 00000 n -0000405813 00000 n -0000405964 00000 n -0000406114 00000 n -0000406265 00000 n -0000406416 00000 n -0000406567 00000 n -0000406717 00000 n -0000406867 00000 n -0000407017 00000 n -0000407168 00000 n -0000407319 00000 n -0000407470 00000 n -0000407621 00000 n -0000407772 00000 n -0000407922 00000 n -0000408072 00000 n -0000408222 00000 n -0000408373 00000 n -0000408523 00000 n -0000408674 00000 n -0000408824 00000 n -0000408975 00000 n -0000409125 00000 n -0000409273 00000 n -0000409424 00000 n -0000409574 00000 n -0000409725 00000 n -0000409875 00000 n -0000410026 00000 n -0000410177 00000 n -0000410328 00000 n -0000410479 00000 n -0000410630 00000 n -0000410781 00000 n -0000410931 00000 n -0000411082 00000 n -0000411233 00000 n -0000411383 00000 n -0000411532 00000 n -0000411682 00000 n -0000411832 00000 n -0000411981 00000 n -0000412130 00000 n -0000412280 00000 n -0000412429 00000 n -0000412578 00000 n -0000412728 00000 n -0000415834 00000 n -0000412939 00000 n -0000396644 00000 n -0000395025 00000 n -0000412879 00000 n -0000698402 00000 n -0000415985 00000 n -0000416135 00000 n -0000416286 00000 n -0000416437 00000 n -0000416588 00000 n -0000416739 00000 n -0000416889 00000 n -0000417039 00000 n -0000417190 00000 n -0000417339 00000 n -0000417490 00000 n -0000417640 00000 n -0000417790 00000 n -0000417941 00000 n -0000418091 00000 n -0000418241 00000 n -0000418392 00000 n -0000418543 00000 n -0000418693 00000 n -0000418843 00000 n -0000418993 00000 n -0000419144 00000 n -0000419293 00000 n -0000419443 00000 n -0000419591 00000 n -0000419741 00000 n -0000419892 00000 n -0000420043 00000 n -0000420192 00000 n -0000420341 00000 n -0000420492 00000 n -0000420642 00000 n -0000420792 00000 n -0000420942 00000 n -0000421093 00000 n -0000421244 00000 n -0000421395 00000 n -0000421546 00000 n -0000421697 00000 n -0000421848 00000 n -0000421996 00000 n -0000422147 00000 n -0000422297 00000 n -0000422448 00000 n -0000422598 00000 n -0000422749 00000 n -0000422900 00000 n -0000423051 00000 n -0000423202 00000 n -0000423353 00000 n -0000423504 00000 n -0000423655 00000 n -0000423805 00000 n -0000423956 00000 n -0000424106 00000 n -0000424257 00000 n -0000424408 00000 n -0000424558 00000 n -0000424707 00000 n -0000424858 00000 n -0000425008 00000 n -0000425159 00000 n -0000425310 00000 n -0000425461 00000 n -0000425611 00000 n -0000425762 00000 n -0000425912 00000 n -0000426063 00000 n -0000426213 00000 n -0000426364 00000 n -0000426515 00000 n -0000426666 00000 n -0000426817 00000 n -0000426968 00000 n -0000427118 00000 n -0000427268 00000 n -0000427419 00000 n -0000427570 00000 n -0000427720 00000 n -0000427871 00000 n -0000428021 00000 n -0000428171 00000 n -0000428322 00000 n -0000428473 00000 n -0000428623 00000 n -0000428774 00000 n -0000428924 00000 n -0000429074 00000 n -0000429225 00000 n -0000429376 00000 n -0000429527 00000 n -0000429678 00000 n -0000429829 00000 n -0000429980 00000 n -0000430131 00000 n -0000430282 00000 n -0000430432 00000 n -0000433279 00000 n -0000433430 00000 n -0000430642 00000 n -0000414824 00000 n -0000413053 00000 n -0000430582 00000 n -0000433581 00000 n -0000433732 00000 n -0000433882 00000 n -0000434033 00000 n -0000434182 00000 n -0000434333 00000 n -0000434484 00000 n -0000434635 00000 n -0000434786 00000 n -0000434937 00000 n -0000435088 00000 n -0000435239 00000 n -0000435390 00000 n -0000435541 00000 n -0000435692 00000 n -0000435843 00000 n -0000435993 00000 n -0000436144 00000 n -0000436295 00000 n -0000436445 00000 n -0000436596 00000 n -0000436747 00000 n -0000436895 00000 n -0000437045 00000 n -0000437195 00000 n -0000437345 00000 n -0000437495 00000 n -0000437645 00000 n -0000437796 00000 n -0000437947 00000 n -0000438097 00000 n -0000438247 00000 n -0000438398 00000 n -0000438547 00000 n -0000438698 00000 n -0000438848 00000 n -0000438999 00000 n -0000439149 00000 n -0000439299 00000 n -0000439450 00000 n -0000439601 00000 n -0000439752 00000 n -0000439903 00000 n -0000440054 00000 n -0000440205 00000 n -0000440356 00000 n -0000440507 00000 n -0000440658 00000 n -0000440809 00000 n -0000440959 00000 n -0000441110 00000 n -0000441260 00000 n -0000441411 00000 n -0000441561 00000 n -0000441712 00000 n -0000441863 00000 n -0000442014 00000 n -0000442165 00000 n -0000442315 00000 n -0000442466 00000 n -0000442617 00000 n -0000442768 00000 n -0000442919 00000 n -0000443070 00000 n -0000443221 00000 n -0000443372 00000 n -0000443523 00000 n -0000443674 00000 n -0000443824 00000 n -0000443975 00000 n -0000444126 00000 n -0000444277 00000 n -0000444428 00000 n -0000444578 00000 n -0000444729 00000 n -0000444880 00000 n -0000445030 00000 n -0000445181 00000 n -0000445330 00000 n -0000445481 00000 n -0000445632 00000 n -0000445783 00000 n -0000445933 00000 n -0000446082 00000 n -0000446232 00000 n -0000446381 00000 n -0000446531 00000 n -0000446680 00000 n -0000446831 00000 n -0000446979 00000 n -0000447127 00000 n -0000447276 00000 n -0000447427 00000 n -0000447578 00000 n -0000447728 00000 n -0000447879 00000 n -0000448029 00000 n -0000448180 00000 n -0000449170 00000 n -0000449321 00000 n -0000448390 00000 n -0000432251 00000 n -0000430769 00000 n -0000448330 00000 n -0000449471 00000 n -0000449622 00000 n -0000449772 00000 n -0000449923 00000 n -0000450073 00000 n -0000450223 00000 n -0000450374 00000 n -0000450525 00000 n -0000450675 00000 n -0000450826 00000 n -0000450976 00000 n -0000451127 00000 n -0000451278 00000 n -0000451489 00000 n -0000448907 00000 n -0000448490 00000 n -0000451429 00000 n -0000454155 00000 n -0000454310 00000 n -0000454464 00000 n -0000454619 00000 n -0000454774 00000 n -0000454929 00000 n -0000455082 00000 n -0000455237 00000 n -0000455392 00000 n -0000455547 00000 n -0000455701 00000 n -0000455856 00000 n -0000456012 00000 n -0000456167 00000 n -0000456320 00000 n -0000456476 00000 n -0000456630 00000 n -0000456785 00000 n -0000456939 00000 n -0000457094 00000 n -0000457249 00000 n -0000457404 00000 n -0000457559 00000 n -0000457714 00000 n -0000457869 00000 n -0000458024 00000 n -0000458179 00000 n -0000458334 00000 n -0000458489 00000 n -0000458644 00000 n -0000458799 00000 n -0000458955 00000 n -0000459110 00000 n -0000459265 00000 n -0000459419 00000 n -0000459573 00000 n -0000459728 00000 n -0000459881 00000 n -0000460036 00000 n -0000460191 00000 n -0000460345 00000 n -0000460500 00000 n -0000460655 00000 n -0000460810 00000 n -0000460965 00000 n -0000461118 00000 n -0000461272 00000 n -0000461427 00000 n -0000461582 00000 n -0000461737 00000 n -0000461892 00000 n -0000462045 00000 n -0000462199 00000 n -0000462354 00000 n -0000462508 00000 n -0000462663 00000 n -0000462818 00000 n -0000462973 00000 n -0000463128 00000 n -0000463282 00000 n -0000463436 00000 n -0000463591 00000 n -0000463745 00000 n -0000463900 00000 n -0000464053 00000 n -0000464208 00000 n -0000464363 00000 n -0000464518 00000 n -0000464673 00000 n -0000464828 00000 n -0000464983 00000 n -0000465138 00000 n -0000465292 00000 n -0000465447 00000 n -0000465602 00000 n -0000465757 00000 n -0000465911 00000 n -0000466066 00000 n -0000466222 00000 n -0000466377 00000 n -0000466531 00000 n -0000466686 00000 n -0000466841 00000 n -0000466997 00000 n -0000467153 00000 n -0000470171 00000 n -0000467675 00000 n -0000453262 00000 n -0000451576 00000 n -0000467309 00000 n -0000470327 00000 n -0000470482 00000 n -0000470638 00000 n -0000470793 00000 n -0000470948 00000 n -0000471103 00000 n -0000471258 00000 n -0000471413 00000 n -0000471569 00000 n -0000471723 00000 n -0000471879 00000 n -0000472033 00000 n -0000472189 00000 n -0000472344 00000 n -0000472500 00000 n -0000472656 00000 n -0000472812 00000 n -0000472968 00000 n -0000473124 00000 n -0000473280 00000 n -0000473436 00000 n -0000473592 00000 n -0000473748 00000 n -0000473904 00000 n -0000474060 00000 n -0000474215 00000 n -0000474371 00000 n -0000474526 00000 n -0000474682 00000 n -0000474838 00000 n -0000474994 00000 n -0000475150 00000 n -0000475305 00000 n -0000475461 00000 n -0000475617 00000 n -0000475773 00000 n -0000475929 00000 n -0000476085 00000 n -0000476241 00000 n -0000476397 00000 n -0000476553 00000 n -0000476708 00000 n -0000476864 00000 n -0000477020 00000 n -0000477176 00000 n -0000477332 00000 n -0000477488 00000 n -0000477644 00000 n -0000477800 00000 n -0000477954 00000 n -0000478108 00000 n -0000478263 00000 n -0000478418 00000 n -0000478572 00000 n -0000478726 00000 n -0000478880 00000 n -0000479035 00000 n -0000479188 00000 n -0000479343 00000 n -0000479497 00000 n -0000479652 00000 n -0000479807 00000 n -0000479960 00000 n -0000480115 00000 n -0000480270 00000 n -0000480425 00000 n -0000480579 00000 n -0000480733 00000 n -0000480889 00000 n -0000481044 00000 n -0000481199 00000 n -0000481354 00000 n -0000481507 00000 n -0000481661 00000 n -0000481816 00000 n -0000481971 00000 n -0000482125 00000 n -0000482280 00000 n -0000482434 00000 n -0000482588 00000 n -0000482743 00000 n -0000482896 00000 n -0000483050 00000 n -0000483205 00000 n -0000483359 00000 n -0000483514 00000 n -0000483668 00000 n -0000486825 00000 n -0000484127 00000 n -0000469251 00000 n -0000467776 00000 n -0000483823 00000 n -0000486980 00000 n -0000487135 00000 n -0000487289 00000 n -0000487443 00000 n -0000487597 00000 n -0000487751 00000 n -0000487905 00000 n -0000488059 00000 n -0000488212 00000 n -0000488365 00000 n -0000488519 00000 n -0000488676 00000 n -0000488834 00000 n -0000488990 00000 n -0000489147 00000 n -0000489305 00000 n -0000489463 00000 n -0000489621 00000 n -0000489778 00000 n -0000489930 00000 n -0000490088 00000 n -0000490245 00000 n -0000490403 00000 n -0000490561 00000 n -0000490718 00000 n -0000490876 00000 n -0000491034 00000 n -0000491192 00000 n -0000491350 00000 n -0000491508 00000 n -0000491665 00000 n -0000491822 00000 n -0000491976 00000 n -0000492132 00000 n -0000492288 00000 n -0000492443 00000 n -0000492599 00000 n -0000492755 00000 n -0000492910 00000 n -0000493066 00000 n -0000493221 00000 n -0000493377 00000 n -0000493531 00000 n -0000493686 00000 n -0000493841 00000 n -0000493997 00000 n -0000494153 00000 n -0000494308 00000 n -0000494463 00000 n -0000494618 00000 n -0000494772 00000 n -0000494927 00000 n -0000495080 00000 n -0000495236 00000 n -0000495390 00000 n -0000495546 00000 n -0000495702 00000 n -0000495858 00000 n -0000496012 00000 n -0000496167 00000 n -0000496322 00000 n -0000496477 00000 n -0000496632 00000 n -0000496787 00000 n -0000496942 00000 n -0000497096 00000 n -0000497251 00000 n -0000497405 00000 n -0000497559 00000 n -0000497714 00000 n -0000497869 00000 n -0000498024 00000 n -0000498177 00000 n -0000498332 00000 n -0000498486 00000 n -0000498641 00000 n -0000498795 00000 n -0000498950 00000 n -0000499105 00000 n -0000499260 00000 n -0000499415 00000 n -0000499571 00000 n -0000499727 00000 n -0000499882 00000 n -0000500037 00000 n -0000500193 00000 n -0000503146 00000 n -0000500714 00000 n -0000485914 00000 n -0000484214 00000 n -0000500347 00000 n -0000698527 00000 n -0000503301 00000 n -0000503454 00000 n -0000503609 00000 n -0000503764 00000 n -0000503918 00000 n -0000504073 00000 n -0000504228 00000 n -0000504381 00000 n -0000504535 00000 n -0000504689 00000 n -0000504845 00000 n -0000504998 00000 n -0000505153 00000 n -0000505308 00000 n -0000505462 00000 n -0000505616 00000 n -0000505771 00000 n -0000505926 00000 n -0000506081 00000 n -0000506235 00000 n -0000506389 00000 n -0000506543 00000 n -0000506697 00000 n -0000506852 00000 n -0000507007 00000 n -0000507162 00000 n -0000507316 00000 n -0000507471 00000 n -0000507624 00000 n -0000507780 00000 n -0000507933 00000 n -0000508085 00000 n -0000508241 00000 n -0000508396 00000 n -0000508551 00000 n -0000508706 00000 n -0000508861 00000 n -0000509016 00000 n -0000509171 00000 n -0000509326 00000 n -0000509481 00000 n -0000509635 00000 n -0000509788 00000 n -0000509943 00000 n -0000510099 00000 n -0000510254 00000 n -0000510410 00000 n -0000510566 00000 n -0000510722 00000 n -0000510878 00000 n -0000511034 00000 n -0000511189 00000 n -0000511345 00000 n -0000511498 00000 n -0000511654 00000 n -0000511809 00000 n -0000511965 00000 n -0000512121 00000 n -0000512277 00000 n -0000512432 00000 n -0000512587 00000 n -0000512741 00000 n -0000512896 00000 n -0000513051 00000 n -0000513207 00000 n -0000513362 00000 n -0000513518 00000 n -0000513674 00000 n -0000513830 00000 n -0000513986 00000 n -0000514379 00000 n -0000502379 00000 n -0000500801 00000 n -0000514142 00000 n -0000514466 00000 n -0000514491 00000 n -0000514515 00000 n -0000693228 00000 n -0000514555 00000 n -0000515007 00000 n -0000693830 00000 n -0000515135 00000 n -0000515273 00000 n -0000515321 00000 n -0000515485 00000 n -0000515565 00000 n -0000515813 00000 n -0000516367 00000 n -0000516843 00000 n -0000517227 00000 n -0000517793 00000 n -0000518368 00000 n -0000519017 00000 n -0000519968 00000 n -0000526937 00000 n -0000527166 00000 n -0000534589 00000 n -0000534843 00000 n -0000542206 00000 n -0000542457 00000 n -0000551790 00000 n -0000552137 00000 n -0000559304 00000 n -0000559526 00000 n -0000567019 00000 n -0000567266 00000 n -0000576493 00000 n -0000576752 00000 n -0000586628 00000 n -0000586907 00000 n -0000605682 00000 n -0000605950 00000 n -0000612462 00000 n -0000612779 00000 n -0000625478 00000 n -0000626064 00000 n -0000627908 00000 n -0000628139 00000 n -0000631496 00000 n -0000631753 00000 n -0000647027 00000 n -0000647425 00000 n -0000668508 00000 n -0000669143 00000 n -0000678013 00000 n -0000678290 00000 n -0000692866 00000 n -0000698616 00000 n -0000698736 00000 n -0000698857 00000 n -0000698965 00000 n -0000699047 00000 n -0000708219 00000 n -0000708423 00000 n -0000708638 00000 n -0000708845 00000 n -0000709033 00000 n -0000709205 00000 n -0000709376 00000 n -0000709545 00000 n -0000709714 00000 n -0000709885 00000 n -0000710055 00000 n -0000710226 00000 n -0000710396 00000 n -0000710567 00000 n -0000710741 00000 n -0000710918 00000 n -0000711093 00000 n -0000711270 00000 n -0000711444 00000 n -0000711618 00000 n -0000711805 00000 n -0000712016 00000 n -0000712226 00000 n -0000712437 00000 n -0000712647 00000 n -0000712858 00000 n -0000713072 00000 n -0000713289 00000 n -0000713503 00000 n -0000713717 00000 n -0000713934 00000 n -0000714149 00000 n -0000714363 00000 n -0000714565 00000 n -0000714768 00000 n -0000714970 00000 n -0000715173 00000 n -0000715374 00000 n -0000715575 00000 n -0000715778 00000 n -0000715980 00000 n -0000716183 00000 n -0000716385 00000 n -0000716588 00000 n -0000716790 00000 n -0000716993 00000 n -0000717195 00000 n -0000717398 00000 n -0000717588 00000 n -0000717812 00000 n -0000718035 00000 n -0000718256 00000 n -0000718484 00000 n -0000718711 00000 n -0000718938 00000 n -0000719189 00000 n -0000719464 00000 n -0000719733 00000 n -0000720000 00000 n -0000720267 00000 n -0000720534 00000 n -0000720803 00000 n -0000721078 00000 n -0000721345 00000 n -0000721492 00000 n -0000721610 00000 n -0000721725 00000 n -0000721841 00000 n -0000721962 00000 n -0000722088 00000 n -0000722213 00000 n -0000722336 00000 n -0000722463 00000 n -0000722593 00000 n -0000722728 00000 n -0000722850 00000 n -0000722972 00000 n -0000723094 00000 n -0000723188 00000 n -0000723228 00000 n -0000723393 00000 n +0000248754 00000 n +0000248812 00000 n +0000248870 00000 n +0000248928 00000 n +0000252800 00000 n +0000253073 00000 n +0000252668 00000 n +0000249125 00000 n +0000252958 00000 n +0000253016 00000 n +0000256853 00000 n +0000257010 00000 n +0000257452 00000 n +0000256713 00000 n +0000253199 00000 n +0000257166 00000 n +0000257278 00000 n +0000257336 00000 n +0000257394 00000 n +0000261489 00000 n +0000261995 00000 n +0000261357 00000 n +0000257578 00000 n +0000261649 00000 n +0000261707 00000 n +0000261822 00000 n +0000261938 00000 n +0000266193 00000 n +0000265792 00000 n +0000262148 00000 n +0000265904 00000 n +0000266077 00000 n +0000266135 00000 n +0000697850 00000 n +0000269985 00000 n +0000269641 00000 n +0000266347 00000 n +0000269753 00000 n +0000269869 00000 n +0000269927 00000 n +0000273266 00000 n +0000273539 00000 n +0000273134 00000 n +0000270111 00000 n +0000273423 00000 n +0000273481 00000 n +0000277404 00000 n +0000277172 00000 n +0000273679 00000 n +0000277284 00000 n +0000281266 00000 n +0000280753 00000 n +0000277542 00000 n +0000280865 00000 n +0000280977 00000 n +0000281034 00000 n +0000281092 00000 n +0000281150 00000 n +0000281208 00000 n +0000285071 00000 n +0000284380 00000 n +0000281406 00000 n +0000284492 00000 n +0000284550 00000 n +0000284608 00000 n +0000284666 00000 n +0000284724 00000 n +0000284782 00000 n +0000284840 00000 n +0000284898 00000 n +0000284956 00000 n +0000285013 00000 n +0000288040 00000 n +0000288722 00000 n +0000287908 00000 n +0000285197 00000 n +0000288201 00000 n +0000288259 00000 n +0000288317 00000 n +0000288375 00000 n +0000288433 00000 n +0000288490 00000 n +0000288548 00000 n +0000288606 00000 n +0000288664 00000 n +0000697968 00000 n +0000296149 00000 n +0000292440 00000 n +0000291917 00000 n +0000288860 00000 n +0000292029 00000 n +0000292088 00000 n +0000292147 00000 n +0000292322 00000 n +0000292381 00000 n +0000296665 00000 n +0000296014 00000 n +0000292567 00000 n +0000296310 00000 n +0000296370 00000 n +0000296426 00000 n +0000296545 00000 n +0000296605 00000 n +0000299776 00000 n +0000300234 00000 n +0000299640 00000 n +0000296792 00000 n +0000299932 00000 n +0000299992 00000 n +0000300111 00000 n +0000300170 00000 n +0000304544 00000 n +0000304254 00000 n +0000300373 00000 n +0000304369 00000 n +0000304484 00000 n +0000307893 00000 n +0000308235 00000 n +0000307757 00000 n +0000304671 00000 n +0000308056 00000 n +0000308116 00000 n +0000308175 00000 n +0000317140 00000 n +0000312602 00000 n +0000312367 00000 n +0000308362 00000 n +0000312483 00000 n +0000698090 00000 n +0000317298 00000 n +0000317462 00000 n +0000317802 00000 n +0000316985 00000 n +0000312768 00000 n +0000317623 00000 n +0000317742 00000 n +0000321721 00000 n +0000321365 00000 n +0000317941 00000 n +0000321481 00000 n +0000321541 00000 n +0000321601 00000 n +0000321661 00000 n +0000325353 00000 n +0000325696 00000 n +0000325216 00000 n +0000321873 00000 n +0000325517 00000 n +0000325636 00000 n +0000329438 00000 n +0000333228 00000 n +0000329782 00000 n +0000329301 00000 n +0000325836 00000 n +0000329602 00000 n +0000329662 00000 n +0000329722 00000 n +0000337831 00000 n +0000333687 00000 n +0000333091 00000 n +0000329934 00000 n +0000333384 00000 n +0000333503 00000 n +0000333563 00000 n +0000333623 00000 n +0000337995 00000 n +0000342343 00000 n +0000338273 00000 n +0000337685 00000 n +0000333814 00000 n +0000338153 00000 n +0000338213 00000 n +0000698215 00000 n +0000342918 00000 n +0000342206 00000 n +0000338400 00000 n +0000342499 00000 n +0000342559 00000 n +0000342615 00000 n +0000342675 00000 n +0000694021 00000 n +0000342735 00000 n +0000342795 00000 n +0000342855 00000 n +0000347236 00000 n +0000347399 00000 n +0000347862 00000 n +0000347090 00000 n +0000343058 00000 n +0000347562 00000 n +0000347622 00000 n +0000347682 00000 n +0000347742 00000 n +0000347802 00000 n +0000351796 00000 n +0000351380 00000 n +0000347989 00000 n +0000351496 00000 n +0000351556 00000 n +0000351616 00000 n +0000351676 00000 n +0000351736 00000 n +0000355049 00000 n +0000354641 00000 n +0000351923 00000 n +0000354757 00000 n +0000358178 00000 n +0000357943 00000 n +0000355163 00000 n +0000358059 00000 n +0000361848 00000 n +0000361495 00000 n +0000358331 00000 n +0000361611 00000 n +0000698340 00000 n +0000366219 00000 n +0000366617 00000 n +0000366082 00000 n +0000362000 00000 n +0000366375 00000 n +0000366553 00000 n +0000370740 00000 n +0000371020 00000 n +0000370603 00000 n +0000366731 00000 n +0000370896 00000 n +0000370956 00000 n +0000374971 00000 n +0000375369 00000 n +0000374834 00000 n +0000371161 00000 n +0000375127 00000 n +0000375305 00000 n +0000377776 00000 n +0000377541 00000 n +0000375524 00000 n +0000377657 00000 n +0000380546 00000 n +0000380697 00000 n +0000380848 00000 n +0000380999 00000 n +0000381150 00000 n +0000381300 00000 n +0000381451 00000 n +0000381602 00000 n +0000381753 00000 n +0000381904 00000 n +0000382053 00000 n +0000382204 00000 n +0000382354 00000 n +0000382505 00000 n +0000382656 00000 n +0000382807 00000 n +0000382958 00000 n +0000383108 00000 n +0000383259 00000 n +0000383409 00000 n +0000383560 00000 n +0000383709 00000 n +0000383860 00000 n +0000384010 00000 n +0000384161 00000 n +0000384311 00000 n +0000384462 00000 n +0000384611 00000 n +0000384761 00000 n +0000384912 00000 n +0000385063 00000 n +0000385214 00000 n +0000385364 00000 n +0000385515 00000 n +0000385666 00000 n +0000385816 00000 n +0000385967 00000 n +0000386118 00000 n +0000386268 00000 n +0000386418 00000 n +0000386569 00000 n +0000386719 00000 n +0000386869 00000 n +0000387018 00000 n +0000387169 00000 n +0000387319 00000 n +0000387470 00000 n +0000387621 00000 n +0000387769 00000 n +0000387920 00000 n +0000388071 00000 n +0000388222 00000 n +0000388373 00000 n +0000388523 00000 n +0000388673 00000 n +0000388822 00000 n +0000388973 00000 n +0000389123 00000 n +0000389274 00000 n +0000389425 00000 n +0000389576 00000 n +0000389726 00000 n +0000389877 00000 n +0000390028 00000 n +0000390179 00000 n +0000390329 00000 n +0000390480 00000 n +0000390631 00000 n +0000390782 00000 n +0000390932 00000 n +0000391082 00000 n +0000391233 00000 n +0000391384 00000 n +0000391532 00000 n +0000391683 00000 n +0000391833 00000 n +0000391984 00000 n +0000392134 00000 n +0000392284 00000 n +0000392435 00000 n +0000392586 00000 n +0000392737 00000 n +0000392888 00000 n +0000393038 00000 n +0000393188 00000 n +0000393339 00000 n +0000393490 00000 n +0000393641 00000 n +0000393792 00000 n +0000393943 00000 n +0000394094 00000 n +0000394244 00000 n +0000394394 00000 n +0000394544 00000 n +0000394695 00000 n +0000397748 00000 n +0000394964 00000 n +0000379563 00000 n +0000377877 00000 n +0000394846 00000 n +0000397899 00000 n +0000398049 00000 n +0000398200 00000 n +0000398351 00000 n +0000398502 00000 n +0000398653 00000 n +0000398804 00000 n +0000398954 00000 n +0000399105 00000 n +0000399254 00000 n +0000399404 00000 n +0000399553 00000 n +0000399703 00000 n +0000399853 00000 n +0000400004 00000 n +0000400155 00000 n +0000400306 00000 n +0000400456 00000 n +0000400607 00000 n +0000400758 00000 n +0000400909 00000 n +0000401059 00000 n +0000401210 00000 n +0000401360 00000 n +0000401511 00000 n +0000401662 00000 n +0000401812 00000 n +0000401963 00000 n +0000402114 00000 n +0000402265 00000 n +0000402414 00000 n +0000402565 00000 n +0000402715 00000 n +0000402866 00000 n +0000403016 00000 n +0000403167 00000 n +0000403318 00000 n +0000403469 00000 n +0000403620 00000 n +0000403771 00000 n +0000403922 00000 n +0000404073 00000 n +0000404223 00000 n +0000404374 00000 n +0000404524 00000 n +0000404674 00000 n +0000404824 00000 n +0000404974 00000 n +0000405125 00000 n +0000405276 00000 n +0000405427 00000 n +0000405578 00000 n +0000405729 00000 n +0000405880 00000 n +0000406031 00000 n +0000406181 00000 n +0000406332 00000 n +0000406483 00000 n +0000406634 00000 n +0000406784 00000 n +0000406934 00000 n +0000407084 00000 n +0000407235 00000 n +0000407386 00000 n +0000407537 00000 n +0000407688 00000 n +0000407839 00000 n +0000407989 00000 n +0000408139 00000 n +0000408289 00000 n +0000408440 00000 n +0000408590 00000 n +0000408741 00000 n +0000408891 00000 n +0000409042 00000 n +0000409192 00000 n +0000409340 00000 n +0000409491 00000 n +0000409641 00000 n +0000409792 00000 n +0000409942 00000 n +0000410093 00000 n +0000410244 00000 n +0000410395 00000 n +0000410546 00000 n +0000410697 00000 n +0000410848 00000 n +0000410998 00000 n +0000411149 00000 n +0000411300 00000 n +0000411450 00000 n +0000411599 00000 n +0000411749 00000 n +0000411899 00000 n +0000412048 00000 n +0000412197 00000 n +0000412347 00000 n +0000412496 00000 n +0000412645 00000 n +0000412795 00000 n +0000415901 00000 n +0000413006 00000 n +0000396711 00000 n +0000395092 00000 n +0000412946 00000 n +0000698465 00000 n +0000416052 00000 n +0000416202 00000 n +0000416353 00000 n +0000416504 00000 n +0000416655 00000 n +0000416806 00000 n +0000416956 00000 n +0000417106 00000 n +0000417257 00000 n +0000417406 00000 n +0000417557 00000 n +0000417707 00000 n +0000417857 00000 n +0000418008 00000 n +0000418158 00000 n +0000418308 00000 n +0000418459 00000 n +0000418610 00000 n +0000418760 00000 n +0000418910 00000 n +0000419060 00000 n +0000419211 00000 n +0000419360 00000 n +0000419510 00000 n +0000419658 00000 n +0000419808 00000 n +0000419959 00000 n +0000420110 00000 n +0000420259 00000 n +0000420408 00000 n +0000420559 00000 n +0000420709 00000 n +0000420859 00000 n +0000421009 00000 n +0000421160 00000 n +0000421311 00000 n +0000421462 00000 n +0000421613 00000 n +0000421764 00000 n +0000421915 00000 n +0000422063 00000 n +0000422214 00000 n +0000422364 00000 n +0000422515 00000 n +0000422665 00000 n +0000422816 00000 n +0000422967 00000 n +0000423118 00000 n +0000423269 00000 n +0000423420 00000 n +0000423571 00000 n +0000423722 00000 n +0000423872 00000 n +0000424023 00000 n +0000424173 00000 n +0000424324 00000 n +0000424475 00000 n +0000424625 00000 n +0000424774 00000 n +0000424925 00000 n +0000425075 00000 n +0000425226 00000 n +0000425377 00000 n +0000425528 00000 n +0000425678 00000 n +0000425829 00000 n +0000425979 00000 n +0000426130 00000 n +0000426280 00000 n +0000426431 00000 n +0000426582 00000 n +0000426733 00000 n +0000426884 00000 n +0000427035 00000 n +0000427185 00000 n +0000427335 00000 n +0000427486 00000 n +0000427637 00000 n +0000427787 00000 n +0000427938 00000 n +0000428088 00000 n +0000428238 00000 n +0000428389 00000 n +0000428540 00000 n +0000428690 00000 n +0000428841 00000 n +0000428991 00000 n +0000429141 00000 n +0000429292 00000 n +0000429443 00000 n +0000429594 00000 n +0000429745 00000 n +0000429896 00000 n +0000430047 00000 n +0000430198 00000 n +0000430349 00000 n +0000430499 00000 n +0000433345 00000 n +0000433496 00000 n +0000430709 00000 n +0000414891 00000 n +0000413120 00000 n +0000430649 00000 n +0000433647 00000 n +0000433798 00000 n +0000433948 00000 n +0000434099 00000 n +0000434248 00000 n +0000434399 00000 n +0000434550 00000 n +0000434701 00000 n +0000434852 00000 n +0000435003 00000 n +0000435154 00000 n +0000435305 00000 n +0000435456 00000 n +0000435607 00000 n +0000435758 00000 n +0000435909 00000 n +0000436059 00000 n +0000436210 00000 n +0000436361 00000 n +0000436511 00000 n +0000436662 00000 n +0000436813 00000 n +0000436961 00000 n +0000437111 00000 n +0000437261 00000 n +0000437411 00000 n +0000437561 00000 n +0000437711 00000 n +0000437862 00000 n +0000438013 00000 n +0000438163 00000 n +0000438313 00000 n +0000438464 00000 n +0000438613 00000 n +0000438764 00000 n +0000438914 00000 n +0000439065 00000 n +0000439215 00000 n +0000439365 00000 n +0000439516 00000 n +0000439667 00000 n +0000439818 00000 n +0000439969 00000 n +0000440120 00000 n +0000440271 00000 n +0000440422 00000 n +0000440573 00000 n +0000440724 00000 n +0000440875 00000 n +0000441025 00000 n +0000441176 00000 n +0000441326 00000 n +0000441477 00000 n +0000441627 00000 n +0000441778 00000 n +0000441929 00000 n +0000442080 00000 n +0000442231 00000 n +0000442381 00000 n +0000442532 00000 n +0000442683 00000 n +0000442834 00000 n +0000442985 00000 n +0000443136 00000 n +0000443287 00000 n +0000443438 00000 n +0000443589 00000 n +0000443740 00000 n +0000443890 00000 n +0000444041 00000 n +0000444192 00000 n +0000444343 00000 n +0000444494 00000 n +0000444644 00000 n +0000444795 00000 n +0000444946 00000 n +0000445096 00000 n +0000445247 00000 n +0000445396 00000 n +0000445547 00000 n +0000445698 00000 n +0000445849 00000 n +0000445999 00000 n +0000446148 00000 n +0000446298 00000 n +0000446447 00000 n +0000446597 00000 n +0000446746 00000 n +0000446897 00000 n +0000447045 00000 n +0000447193 00000 n +0000447342 00000 n +0000447493 00000 n +0000447644 00000 n +0000447794 00000 n +0000447945 00000 n +0000448095 00000 n +0000448246 00000 n +0000449236 00000 n +0000449387 00000 n +0000448456 00000 n +0000432317 00000 n +0000430836 00000 n +0000448396 00000 n +0000449537 00000 n +0000449688 00000 n +0000449838 00000 n +0000449989 00000 n +0000450139 00000 n +0000450289 00000 n +0000450440 00000 n +0000450591 00000 n +0000450741 00000 n +0000450892 00000 n +0000451042 00000 n +0000451193 00000 n +0000451344 00000 n +0000451555 00000 n +0000448973 00000 n +0000448556 00000 n +0000451495 00000 n +0000454218 00000 n +0000454373 00000 n +0000454527 00000 n +0000454682 00000 n +0000454837 00000 n +0000454992 00000 n +0000455145 00000 n +0000455300 00000 n +0000455455 00000 n +0000455610 00000 n +0000455764 00000 n +0000455919 00000 n +0000456075 00000 n +0000456230 00000 n +0000456383 00000 n +0000456539 00000 n +0000456693 00000 n +0000456848 00000 n +0000457002 00000 n +0000457157 00000 n +0000457312 00000 n +0000457467 00000 n +0000457622 00000 n +0000457777 00000 n +0000457932 00000 n +0000458087 00000 n +0000458242 00000 n +0000458397 00000 n +0000458552 00000 n +0000458707 00000 n +0000458862 00000 n +0000459018 00000 n +0000459173 00000 n +0000459328 00000 n +0000459482 00000 n +0000459636 00000 n +0000459791 00000 n +0000459944 00000 n +0000460099 00000 n +0000460254 00000 n +0000460408 00000 n +0000460563 00000 n +0000460718 00000 n +0000460873 00000 n +0000461028 00000 n +0000461181 00000 n +0000461335 00000 n +0000461490 00000 n +0000461645 00000 n +0000461800 00000 n +0000461955 00000 n +0000462108 00000 n +0000462262 00000 n +0000462417 00000 n +0000462571 00000 n +0000462726 00000 n +0000462881 00000 n +0000463036 00000 n +0000463191 00000 n +0000463345 00000 n +0000463499 00000 n +0000463654 00000 n +0000463808 00000 n +0000463963 00000 n +0000464116 00000 n +0000464271 00000 n +0000464426 00000 n +0000464581 00000 n +0000464736 00000 n +0000464891 00000 n +0000465046 00000 n +0000465201 00000 n +0000465355 00000 n +0000465510 00000 n +0000465665 00000 n +0000465820 00000 n +0000465974 00000 n +0000466129 00000 n +0000466285 00000 n +0000466440 00000 n +0000466594 00000 n +0000466749 00000 n +0000466904 00000 n +0000467060 00000 n +0000467216 00000 n +0000470234 00000 n +0000467738 00000 n +0000453325 00000 n +0000451642 00000 n +0000467372 00000 n +0000470390 00000 n +0000470545 00000 n +0000470701 00000 n +0000470856 00000 n +0000471011 00000 n +0000471166 00000 n +0000471321 00000 n +0000471476 00000 n +0000471632 00000 n +0000471786 00000 n +0000471942 00000 n +0000472096 00000 n +0000472252 00000 n +0000472407 00000 n +0000472563 00000 n +0000472719 00000 n +0000472875 00000 n +0000473031 00000 n +0000473187 00000 n +0000473343 00000 n +0000473499 00000 n +0000473655 00000 n +0000473811 00000 n +0000473967 00000 n +0000474123 00000 n +0000474278 00000 n +0000474434 00000 n +0000474589 00000 n +0000474745 00000 n +0000474901 00000 n +0000475057 00000 n +0000475213 00000 n +0000475368 00000 n +0000475524 00000 n +0000475680 00000 n +0000475836 00000 n +0000475992 00000 n +0000476148 00000 n +0000476304 00000 n +0000476460 00000 n +0000476616 00000 n +0000476771 00000 n +0000476927 00000 n +0000477083 00000 n +0000477239 00000 n +0000477395 00000 n +0000477551 00000 n +0000477707 00000 n +0000477863 00000 n +0000478017 00000 n +0000478171 00000 n +0000478326 00000 n +0000478481 00000 n +0000478635 00000 n +0000478789 00000 n +0000478943 00000 n +0000479098 00000 n +0000479251 00000 n +0000479406 00000 n +0000479560 00000 n +0000479715 00000 n +0000479870 00000 n +0000480023 00000 n +0000480178 00000 n +0000480333 00000 n +0000480488 00000 n +0000480642 00000 n +0000480796 00000 n +0000480952 00000 n +0000481107 00000 n +0000481262 00000 n +0000481417 00000 n +0000481570 00000 n +0000481724 00000 n +0000481879 00000 n +0000482034 00000 n +0000482188 00000 n +0000482343 00000 n +0000482497 00000 n +0000482651 00000 n +0000482806 00000 n +0000482959 00000 n +0000483113 00000 n +0000483268 00000 n +0000483422 00000 n +0000483577 00000 n +0000483731 00000 n +0000486888 00000 n +0000484190 00000 n +0000469314 00000 n +0000467839 00000 n +0000483886 00000 n +0000487043 00000 n +0000487198 00000 n +0000487352 00000 n +0000487506 00000 n +0000487660 00000 n +0000487814 00000 n +0000487968 00000 n +0000488122 00000 n +0000488275 00000 n +0000488428 00000 n +0000488582 00000 n +0000488739 00000 n +0000488897 00000 n +0000489053 00000 n +0000489210 00000 n +0000489368 00000 n +0000489526 00000 n +0000489684 00000 n +0000489841 00000 n +0000489993 00000 n +0000490151 00000 n +0000490308 00000 n +0000490466 00000 n +0000490624 00000 n +0000490781 00000 n +0000490939 00000 n +0000491097 00000 n +0000491255 00000 n +0000491413 00000 n +0000491571 00000 n +0000491728 00000 n +0000491885 00000 n +0000492039 00000 n +0000492195 00000 n +0000492351 00000 n +0000492506 00000 n +0000492662 00000 n +0000492818 00000 n +0000492973 00000 n +0000493129 00000 n +0000493284 00000 n +0000493440 00000 n +0000493594 00000 n +0000493749 00000 n +0000493904 00000 n +0000494060 00000 n +0000494216 00000 n +0000494371 00000 n +0000494526 00000 n +0000494681 00000 n +0000494835 00000 n +0000494990 00000 n +0000495143 00000 n +0000495299 00000 n +0000495453 00000 n +0000495609 00000 n +0000495765 00000 n +0000495921 00000 n +0000496075 00000 n +0000496230 00000 n +0000496385 00000 n +0000496540 00000 n +0000496695 00000 n +0000496850 00000 n +0000497005 00000 n +0000497159 00000 n +0000497314 00000 n +0000497468 00000 n +0000497622 00000 n +0000497777 00000 n +0000497932 00000 n +0000498087 00000 n +0000498240 00000 n +0000498395 00000 n +0000498549 00000 n +0000498704 00000 n +0000498858 00000 n +0000499013 00000 n +0000499168 00000 n +0000499323 00000 n +0000499478 00000 n +0000499634 00000 n +0000499790 00000 n +0000499945 00000 n +0000500100 00000 n +0000500256 00000 n +0000503209 00000 n +0000500777 00000 n +0000485977 00000 n +0000484277 00000 n +0000500410 00000 n +0000698590 00000 n +0000503364 00000 n +0000503517 00000 n +0000503672 00000 n +0000503827 00000 n +0000503981 00000 n +0000504136 00000 n +0000504291 00000 n +0000504444 00000 n +0000504598 00000 n +0000504752 00000 n +0000504908 00000 n +0000505061 00000 n +0000505216 00000 n +0000505371 00000 n +0000505525 00000 n +0000505679 00000 n +0000505834 00000 n +0000505989 00000 n +0000506144 00000 n +0000506298 00000 n +0000506452 00000 n +0000506606 00000 n +0000506760 00000 n +0000506915 00000 n +0000507070 00000 n +0000507225 00000 n +0000507379 00000 n +0000507534 00000 n +0000507687 00000 n +0000507843 00000 n +0000507996 00000 n +0000508148 00000 n +0000508304 00000 n +0000508459 00000 n +0000508614 00000 n +0000508769 00000 n +0000508924 00000 n +0000509079 00000 n +0000509234 00000 n +0000509389 00000 n +0000509544 00000 n +0000509698 00000 n +0000509851 00000 n +0000510006 00000 n +0000510162 00000 n +0000510317 00000 n +0000510473 00000 n +0000510629 00000 n +0000510785 00000 n +0000510941 00000 n +0000511097 00000 n +0000511252 00000 n +0000511408 00000 n +0000511561 00000 n +0000511717 00000 n +0000511872 00000 n +0000512028 00000 n +0000512184 00000 n +0000512340 00000 n +0000512495 00000 n +0000512650 00000 n +0000512804 00000 n +0000512959 00000 n +0000513114 00000 n +0000513270 00000 n +0000513425 00000 n +0000513581 00000 n +0000513737 00000 n +0000513893 00000 n +0000514049 00000 n +0000514442 00000 n +0000502442 00000 n +0000500864 00000 n +0000514205 00000 n +0000514529 00000 n +0000514554 00000 n +0000514578 00000 n +0000693291 00000 n +0000514618 00000 n +0000515070 00000 n +0000693893 00000 n +0000515198 00000 n +0000515336 00000 n +0000515384 00000 n +0000515548 00000 n +0000515628 00000 n +0000515876 00000 n +0000516430 00000 n +0000516906 00000 n +0000517290 00000 n +0000517856 00000 n +0000518431 00000 n +0000519080 00000 n +0000520031 00000 n +0000527000 00000 n +0000527229 00000 n +0000534652 00000 n +0000534906 00000 n +0000542269 00000 n +0000542520 00000 n +0000551853 00000 n +0000552200 00000 n +0000559367 00000 n +0000559589 00000 n +0000567082 00000 n +0000567329 00000 n +0000576556 00000 n +0000576815 00000 n +0000586691 00000 n +0000586970 00000 n +0000605745 00000 n +0000606013 00000 n +0000612525 00000 n +0000612842 00000 n +0000625541 00000 n +0000626127 00000 n +0000627971 00000 n +0000628202 00000 n +0000631559 00000 n +0000631816 00000 n +0000647090 00000 n +0000647488 00000 n +0000668571 00000 n +0000669206 00000 n +0000678076 00000 n +0000678353 00000 n +0000692929 00000 n +0000698679 00000 n +0000698799 00000 n +0000698920 00000 n +0000699028 00000 n +0000699110 00000 n +0000708282 00000 n +0000708486 00000 n +0000708701 00000 n +0000708908 00000 n +0000709096 00000 n +0000709268 00000 n +0000709439 00000 n +0000709608 00000 n +0000709777 00000 n +0000709948 00000 n +0000710118 00000 n +0000710289 00000 n +0000710459 00000 n +0000710630 00000 n +0000710804 00000 n +0000710981 00000 n +0000711156 00000 n +0000711333 00000 n +0000711507 00000 n +0000711681 00000 n +0000711868 00000 n +0000712079 00000 n +0000712289 00000 n +0000712500 00000 n +0000712710 00000 n +0000712921 00000 n +0000713135 00000 n +0000713352 00000 n +0000713566 00000 n +0000713780 00000 n +0000713997 00000 n +0000714212 00000 n +0000714426 00000 n +0000714628 00000 n +0000714831 00000 n +0000715033 00000 n +0000715236 00000 n +0000715437 00000 n +0000715638 00000 n +0000715841 00000 n +0000716043 00000 n +0000716246 00000 n +0000716448 00000 n +0000716651 00000 n +0000716853 00000 n +0000717056 00000 n +0000717258 00000 n +0000717461 00000 n +0000717651 00000 n +0000717875 00000 n +0000718098 00000 n +0000718319 00000 n +0000718547 00000 n +0000718774 00000 n +0000719001 00000 n +0000719252 00000 n +0000719527 00000 n +0000719796 00000 n +0000720063 00000 n +0000720330 00000 n +0000720597 00000 n +0000720866 00000 n +0000721141 00000 n +0000721408 00000 n +0000721555 00000 n +0000721673 00000 n +0000721788 00000 n +0000721904 00000 n +0000722025 00000 n +0000722151 00000 n +0000722276 00000 n +0000722399 00000 n +0000722526 00000 n +0000722656 00000 n +0000722791 00000 n +0000722913 00000 n +0000723035 00000 n +0000723157 00000 n +0000723251 00000 n +0000723291 00000 n +0000723456 00000 n trailer << /Size 2064 /Root 2062 0 R /Info 2063 0 R -/ID [<2CC5733293B73571013CD3AFE7B4FF18> <2CC5733293B73571013CD3AFE7B4FF18>] >> +/ID [<50ED2FD98DEB9FED94155E2A5D547BFF> <50ED2FD98DEB9FED94155E2A5D547BFF>] >> startxref -723710 +723773 %%EOF diff --git a/Master/texmf-dist/doc/generic/mfpic/mfpic-doc.tex b/Master/texmf-dist/doc/generic/mfpic/mfpic-doc.tex index bee22641385..73b5b1fafd7 100644 --- a/Master/texmf-dist/doc/generic/mfpic/mfpic-doc.tex +++ b/Master/texmf-dist/doc/generic/mfpic/mfpic-doc.tex @@ -1,5 +1,5 @@ %%% File: mfpic-doc.tex -%%% A part of mfpic 1.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% % Documentation of mfpic macros \documentclass[letterpaper]{article} @@ -3998,10 +3998,12 @@ This writes a \mfc{verbatimtex} block to the \file{.mp} file. It makes sense only if the \opt{mplabels} option is used and so only for \MP{}. The \meta{\TeX{}-cmds} in the argument are written to the \file{.mp} file, preceded by the \MP{} command \mfc{verbatimtex} and followed by -\mfc{etex}. Line breaks within the \meta{\TeX{}-cmd} are preserved. The -\cs{mfpverbtex} command must come before any \cs{tlabel} that is to be -affected by it. Any settings common to all \env{mfpic} environments -should be in a \cs{mfpverbtex} command preceding all such environments. +\mfc{etex}. Line breaks within the \meta{\TeX{}-cmd} are preserved. +There is also a linebreak between the end of \meta{\TeX-cmds} and the +\mfc{etex}. The \cs{mfpverbtex} command must come before any \cs{tlabel} +that is to be affected by it. Any settings common to all \env{mfpic} +environments should be in a \cs{mfpverbtex} command preceding all such +environments. It may be issued at any point after \mfp{} is loaded, and any number of times. If it is issued after \cs{opengraphsfile}, its contents are @@ -6130,11 +6132,11 @@ with the \cs{opengraphsfile} commands reading of these booleans. \end{cd} This expands to the current \mfp{} version multiplied by 100. At this -writing, it produces `\texttt{100}' because the version is 1.0. It can +writing, it produces `\texttt{102}' because the version is 1.02. It can be used to test the version: \begin{verbatim} \ifx\mfpicversion\undefined \def\mfpicversion{0}\fi -\ifnum\mfpicversion>70 ... \else ... \fi +\ifnum\mfpicversion<70 ... \else ... \fi \end{verbatim} \cs{mfpicversion} was added in version 0.7. diff --git a/Master/texmf-dist/doc/generic/mfpic/pictures.tex b/Master/texmf-dist/doc/generic/mfpic/pictures.tex deleted file mode 100644 index 17dec8f4e73..00000000000 --- a/Master/texmf-dist/doc/generic/mfpic/pictures.tex +++ /dev/null @@ -1,204 +0,0 @@ -%%% File: pictures.tex -%%% A part of mfpic 1.00 2009/09/22 -%%% -\magnification=\magstep1 - -\newdimen\paperheight -\newdimen\paperwidth -%%!!!!!!!!!!!!!!!!!!!!!!!!!!! -% adjust these to your liking: -\paperheight 11truein -\paperwidth 8.5truein - -% Default plainTeX margins -\hsize \paperwidth -\advance\hsize -2 truein -\hoffset 0 truein -% -\vsize\paperheight -\advance\vsize -2.1 truein -\voffset 0 truein - -\input mfpic -%% Comment this if you prefer metafont: -\usemetapost -\useraggedcaptions -\ifx\pdfoutput\UndEfInEd -\else - \pdfpageheight=\paperheight - \pdfpagewidth=\paperwidth -\fi - -\opengraphsfile{pics} - -\mfpframesep0pt -\headshape{1}{1}{true} - -\def\vs{\bigskip\filbreak} - -\mftitle{Commutative Diagram example.} - -% A-----D -% |\ /| -% | C-F | -% |/ \| -% B.....E - -\noindent -\mfpframe -\mfpic[12]{0}{10}{0}{10} -\tlabeljustify{cc} -\tcaption[2.0,1.0]{{\it Figure 1:} Commutative diagram example.} -\tlabels{(1,9){A} - (1,1){B} - (3,5){C} - (9,9){D} - (9,1){E} - (7,5){F}} -\setrender{\arrow\draw\trimpath{6pt}} -\lines{(1,9), (1,1)} % A -> B. -\lines{(1,9), (3,5)} % A -> C. -\lines{(3,5), (1,1)} % C -> B. -\lines{(1,9), (9,9)} % A -> D. -\lines{(9,9), (9,1)} % D -> E. -\lines{(9,9), (7,5)} % D -> F. -\lines{(7,5), (9,1)} % F -> E. -\lines{(3,5), (7,5)} % C -> F. -% B- - ->E : -\arrow\arrow[b10pt]\reverse\arrow\dotted\trimpath{6pt}\lines{(1,1), (9,1)} -\endmfpic -\endmfpframe - -\vs - -\mftitle{Function Plot with Cartesian Axes.} - -\noindent -\mfpframe -\mfpic[20]{-3}{3}{-3}{3} -\axes -\function{-2,2,0.1}{((x**3)-x)/3} -\tcaption{{\it Figure 2:} Function Plot with Cartesian Axes.} -\endmfpic -\endmfpframe - -\vs - -\mftitle{Parametric Function Plot, and Filled Circle.} - -\noindent -\mfpframe -\mfpic[30]{-1.5}{1.5}{-1}{1} -\parafcn{0,6,0.1}{cosd(150t)*dir(90t)} -\gfill\circle{(0,0),0.25} -\tcaption{{\it Figure 3:} Parametric Function Plot, and -Filled Circle.} -\endmfpic -\endmfpframe - -\vs - -\mftitle{Bar Graph.} - -\noindent -\mfpframe -\mfpic[20]{-0.5}{4}{-0.5}{4} -\axes -\shade\draw\rect{(0,0),(1,0.5)} -\darkershade -\shade\draw\rect{(1,0),(2,1)} -\hatch\draw\rect{(2,0),(3,2)} -\tcaption{{\it Figure 4:} Bar Graph.} -\endmfpic -\endmfpframe - -\vs - -\mftitle{Pie Chart.} - -\noindent -\mfpframe -\mfpic[30]{-1.3}{1.7}{-1}{1.1} -\gfill\sector{(0.3,0.2), 1, 0,60} -\shade\sector{(0,0), 1, 60,105} -\turtle{(0,0), \plr{(1,105)}} -\sector{(0,0), 1, 60,360} -\tcaption{{\it Figure 5:} Pie Chart.} -\endmfpic -\endmfpframe - -\noindent Unindented text here. - -\vs - -\mftitle{Circle with Arrow.} - -\noindent -\mfpframe -\mfpic[20]{-2}{2}{-1}{1} -\arrow\circle{(0,0),1} -\tcaption{{\it Figure 6:} Circle with Arrow.} -\endmfpic -\endmfpframe - -\vs - -\mftitle{Use of hatch, draw, lclosed, connect, curve, point, lines, - dotted, reverse.} - -\noindent -\mfpframe -\mfpic[20]{-3}{3}{-3}{3} -\hatch\draw\lclosed\connect -\curve{(1,0), (1,0.5), (1,1), (0,1.5)} -\point{(0,0)} -\endconnect -\lines{(-1,1), (-1,-1), (1,-1.5)} -\point{(0,0)} -\dotted\reverse\lines{(-2,2), (-2,-2), (2,-3)} -\tcaption{{\it Figure 7:} Use of hatch, draw, lclosed, connect, - curve, point, lines, dotted, reverse.} -\endmfpic -\endmfpframe - -\vs - -\mftitle{Simpler variant of the previous figure.} - -\noindent -\mfpframe -\mfpic[40]{-1}{1}{-1}{1} % Was `[20]'. -\tcaption{{\it Figure 8:} Simpler variant of the previous figure.} -\hatch\draw\lclosed\connect -\curve{(1,0), (0.5,0.25), (0.5,0.5), (0,0.75)} -\point{(0,0)} -\endconnect -\reverse\lines{(-0.5,0.5), (-0.5,-0.5), (0.5,-0.75)} -\tcaption{{\it Figure 8:} Simpler variant of the previous figure.} -\endmfpic -\endmfpframe - -\vs - -\mftitle{Graph of data from file.} - -\noindent -\mfpframe -\mfpic[6]{-10}{10}{-2}{12} - \makepercentother - \using{#1% #2 #3}{(#1,#2)} - \makepercentcomment - \mfpdatacomment\# - \fcncurve\datafile{data.dat} - \axes -\tcaption{{\it Figure 9:} Example of a graph drawn from data in a file} -\endmfpic -\endmfpframe - -\closegraphsfile - -\end - -%%% -%%% EOF pictures.tex -%%% diff --git a/Master/texmf-dist/metafont/mfpic/grafbase.mf b/Master/texmf-dist/metafont/mfpic/grafbase.mf index 2532e17cc3c..e3f6e5632b8 100644 --- a/Master/texmf-dist/metafont/mfpic/grafbase.mf +++ b/Master/texmf-dist/metafont/mfpic/grafbase.mf @@ -22,7 +22,7 @@ %% with mfpic: plain TeX, LaTeX, plain Metafont and plain MetaPost. %% %%% File: grafbase.dtx -%%% A part of mfpic 1.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% if (known grafbaseversion) or (known grafbase): message "Grafbase (" & jobname & "): You have loaded grafbase more " @@ -32,7 +32,7 @@ fi boolean grafbase; grafbase := true; string fileversion, filedate; -fileversion := "1.00"; filedate := "2009/09/22"; +fileversion := "1.02"; filedate := "2009/10/29"; message " Loading grafbase macros, version " & fileversion & " " & filedate & "."; @@ -59,7 +59,7 @@ def checkversions (expr g)= fi enddef; -checkversions (100); +checkversions (102); if unknown base_name : input plain; elseif not string base_name: input plain; @@ -1860,17 +1860,27 @@ def axes (expr hlen) = xaxis (hlen); yaxis (hlen); enddef; laxis := baxis := raxis := taxis := 0; -vardef axisline.x = (xneg + laxis, 0)--(xpos - raxis, 0) enddef; -vardef axisline.y = (0, yneg + baxis)--(0, ypos - taxis) enddef; -vardef axisline.l = axisline.y shifted (xneg + laxis, 0) enddef; -vardef axisline.b = axisline.x shifted (0, yneg + baxis) enddef; -vardef axisline.r = axisline.y shifted (xpos - raxis, 0) enddef; -vardef axisline.t = axisline.x shifted (0, ypos - taxis) enddef; +vardef xlow = xneg + laxis enddef; +vardef xhigh = xpos - raxis enddef; +vardef ylow = yneg + baxis enddef; +vardef yhigh = ypos - taxis enddef; + +vardef axisline.x = (xlow, 0)--(xhigh, 0) enddef; +vardef axisline.y = (0, ylow)--(0, yhigh) enddef; +vardef axisline.l = axisline.y shifted (xlow, 0) enddef; +vardef axisline.b = axisline.x shifted (0, ylow) enddef; +vardef axisline.r = axisline.y shifted (xhigh, 0) enddef; +vardef axisline.t = axisline.x shifted (0, yhigh) enddef; vardef axis@# (expr len) = headpath (len, 0, 0) axisline@# enddef; vardef borderrect = - rect((xneg+laxis,yneg+baxis),(xpos-raxis,ypos-taxis)) + rect((xlow,ylow),(xhigh,yhigh)) +enddef; + +vardef inbounds (expr Z) = + (xpart Z >= xlow ) and (ypart Z >= ylow ) and + (xpart Z <= xhigh) and (ypart Z <= yhigh) enddef; numeric inside, outside, centered, onleft, onright, ontop, onbottom; @@ -1898,10 +1908,10 @@ enddef; def xmarks = axismarks ( 90, xtick, origin, right) enddef; def ymarks = axismarks (-90, ytick, origin, up) enddef; -def lmarks = axismarks (-90, ltick, (xneg + laxis, 0), up) enddef; -def bmarks = axismarks ( 90, btick, (0, yneg + baxis), right) enddef; -def rmarks = axismarks ( 90, rtick, (xpos - raxis, 0), up) enddef; -def tmarks = axismarks (-90, ttick, (0, ypos - taxis), right) enddef; +def lmarks = axismarks (-90, ltick, (xlow, 0), up) enddef; +def bmarks = axismarks ( 90, btick, (0, ylow), right) enddef; +def rmarks = axismarks ( 90, rtick, (xhigh, 0), up) enddef; +def tmarks = axismarks (-90, ttick, (0, yhigh), right) enddef; path griddotpath; griddotpath := fullcircle; def grid = vargrid (0.5bp) enddef; @@ -1909,8 +1919,8 @@ vardef vargrid (expr dsize, xsp, ysp) = save gdot, gridpic; picture gdot, gridpic; gdot := setdot (griddotpath, dsize); gridpic := nullpicture; - for n = ceiling ((xneg + laxis)/xsp) upto floor ((xpos - raxis)/xsp): - for m = ceiling ((yneg + baxis)/ysp) upto floor ((ypos - taxis)/ysp): + for n = ceiling ((xlow)/xsp) upto floor ((xhigh)/xsp): + for m = ceiling ((ylow)/ysp) upto floor ((yhigh)/ysp): picdot (gridpic, gdot, zconv ((n*xsp, m*ysp))); endfor endfor @@ -1919,13 +1929,13 @@ enddef; def vgrid = vargrid enddef; def hgridlines (expr ysp) = - for n = ceiling ((yneg + baxis)/ysp) upto floor ((ypos - taxis)/ysp): - safedraw zconv ((xneg + laxis, n*ysp)--(xpos - raxis, n*ysp)); + for n = ceiling ((ylow)/ysp) upto floor ((yhigh)/ysp): + safedraw zconv ((xlow, n*ysp)--(xhigh, n*ysp)); endfor enddef; def vgridlines (expr xsp) = - for n = ceiling ((xneg + laxis)/xsp) upto floor ((xpos - raxis)/xsp): - safedraw zconv ((n*xsp, yneg + baxis)--(n*xsp, ypos - taxis)); + for n = ceiling ((xlow)/xsp) upto floor ((xhigh)/xsp): + safedraw zconv ((n*xsp, ylow)--(n*xsp, yhigh)); endfor enddef; def gridlines (expr xsp, ysp) = @@ -1940,8 +1950,8 @@ def vectorfield (expr len, xsp, ysp) (text fcn) (text cond) = enddef; vardef mkvectorfield (expr len, xsp, ysp) (suffix vf, isOK) = - for n = ceiling ((xneg + laxis)/xsp) upto floor ((xpos - raxis)/xsp): - for m = ceiling ((yneg + baxis)/ysp) upto floor ((ypos - taxis)/ysp): + for n = ceiling ((xlow)/xsp) upto floor ((xhigh)/xsp): + for m = ceiling ((ylow)/ysp) upto floor ((yhigh)/ysp): if isOK (n*xsp,m*ysp): arrowdraw (len) (vf(n*xsp,m*ysp)); fi endfor endfor @@ -1949,8 +1959,8 @@ enddef; def plrvectorfield (expr len, rsp, tsp) (text fcn) (text cond) = save _vf, _is_OK, _A, _B, _C, _D; - _A := xneg + laxis; _B := xpos + raxis; - _C := yneg + baxis; _D := ypos + taxis; + _A := xlow; _B := xhigh; + _C := ylow; _D := yhigh; vardef _vf (expr r,t) = ((0,0)--(fcn)) shifted (r*dir t) enddef; vardef _is_OK (expr r,t) = save _X, _Y; _X := r*cosd t; _Y := r*sind t; diff --git a/Master/texmf-dist/metapost/mfpic/dvipsnam.mp b/Master/texmf-dist/metapost/mfpic/dvipsnam.mp index 0529714a4d1..8e4baee0d23 100644 --- a/Master/texmf-dist/metapost/mfpic/dvipsnam.mp +++ b/Master/texmf-dist/metapost/mfpic/dvipsnam.mp @@ -22,7 +22,7 @@ %% with mfpic: plain TeX, LaTeX, plain Metafont and plain MetaPost. %% %%% File: grafbase.dtx -%%% A part of mfpic 1.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% if unknown grafbaseversion: if unknown mpversion: diff --git a/Master/texmf-dist/metapost/mfpic/grafbase.mp b/Master/texmf-dist/metapost/mfpic/grafbase.mp index b231060dd5c..38c587d7b03 100644 --- a/Master/texmf-dist/metapost/mfpic/grafbase.mp +++ b/Master/texmf-dist/metapost/mfpic/grafbase.mp @@ -22,7 +22,7 @@ %% with mfpic: plain TeX, LaTeX, plain Metafont and plain MetaPost. %% %%% File: grafbase.dtx -%%% A part of mfpic 1.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% if (known grafbaseversion) or (known grafbase): message "Grafbase (" & jobname & "): You have loaded grafbase more " @@ -32,7 +32,7 @@ fi boolean grafbase; grafbase := true; string fileversion, filedate; -fileversion := "1.00"; filedate := "2009/09/22"; +fileversion := "1.02"; filedate := "2009/10/29"; message " Loading grafbase macros, version " & fileversion & " " & filedate & "."; @@ -59,7 +59,7 @@ def checkversions (expr g)= fi enddef; -checkversions (100); +checkversions (102); if unknown base_name : input plain; elseif not string base_name: input plain; @@ -1820,17 +1820,27 @@ def axes (expr hlen) = xaxis (hlen); yaxis (hlen); enddef; laxis := baxis := raxis := taxis := 0; -vardef axisline.x = (xneg + laxis, 0)--(xpos - raxis, 0) enddef; -vardef axisline.y = (0, yneg + baxis)--(0, ypos - taxis) enddef; -vardef axisline.l = axisline.y shifted (xneg + laxis, 0) enddef; -vardef axisline.b = axisline.x shifted (0, yneg + baxis) enddef; -vardef axisline.r = axisline.y shifted (xpos - raxis, 0) enddef; -vardef axisline.t = axisline.x shifted (0, ypos - taxis) enddef; +vardef xlow = xneg + laxis enddef; +vardef xhigh = xpos - raxis enddef; +vardef ylow = yneg + baxis enddef; +vardef yhigh = ypos - taxis enddef; + +vardef axisline.x = (xlow, 0)--(xhigh, 0) enddef; +vardef axisline.y = (0, ylow)--(0, yhigh) enddef; +vardef axisline.l = axisline.y shifted (xlow, 0) enddef; +vardef axisline.b = axisline.x shifted (0, ylow) enddef; +vardef axisline.r = axisline.y shifted (xhigh, 0) enddef; +vardef axisline.t = axisline.x shifted (0, yhigh) enddef; vardef axis@# (expr len) = headpath (len, 0, 0) axisline@# enddef; vardef borderrect = - rect((xneg+laxis,yneg+baxis),(xpos-raxis,ypos-taxis)) + rect((xlow,ylow),(xhigh,yhigh)) +enddef; + +vardef inbounds (expr Z) = + (xpart Z >= xlow ) and (ypart Z >= ylow ) and + (xpart Z <= xhigh) and (ypart Z <= yhigh) enddef; numeric inside, outside, centered, onleft, onright, ontop, onbottom; @@ -1858,10 +1868,10 @@ enddef; def xmarks = axismarks ( 90, xtick, origin, right) enddef; def ymarks = axismarks (-90, ytick, origin, up) enddef; -def lmarks = axismarks (-90, ltick, (xneg + laxis, 0), up) enddef; -def bmarks = axismarks ( 90, btick, (0, yneg + baxis), right) enddef; -def rmarks = axismarks ( 90, rtick, (xpos - raxis, 0), up) enddef; -def tmarks = axismarks (-90, ttick, (0, ypos - taxis), right) enddef; +def lmarks = axismarks (-90, ltick, (xlow, 0), up) enddef; +def bmarks = axismarks ( 90, btick, (0, ylow), right) enddef; +def rmarks = axismarks ( 90, rtick, (xhigh, 0), up) enddef; +def tmarks = axismarks (-90, ttick, (0, yhigh), right) enddef; path griddotpath; griddotpath := fullcircle; def grid = vargrid (0.5bp) enddef; @@ -1869,8 +1879,8 @@ vardef vargrid (expr dsize, xsp, ysp) = save gdot, gridpic; picture gdot, gridpic; gdot := setdot (griddotpath, dsize); gridpic := nullpicture; - for n = ceiling ((xneg + laxis)/xsp) upto floor ((xpos - raxis)/xsp): - for m = ceiling ((yneg + baxis)/ysp) upto floor ((ypos - taxis)/ysp): + for n = ceiling ((xlow)/xsp) upto floor ((xhigh)/xsp): + for m = ceiling ((ylow)/ysp) upto floor ((yhigh)/ysp): picdot (gridpic, gdot, zconv ((n*xsp, m*ysp))); endfor endfor @@ -1879,13 +1889,13 @@ enddef; def vgrid = vargrid enddef; def hgridlines (expr ysp) = - for n = ceiling ((yneg + baxis)/ysp) upto floor ((ypos - taxis)/ysp): - safedraw zconv ((xneg + laxis, n*ysp)--(xpos - raxis, n*ysp)); + for n = ceiling ((ylow)/ysp) upto floor ((yhigh)/ysp): + safedraw zconv ((xlow, n*ysp)--(xhigh, n*ysp)); endfor enddef; def vgridlines (expr xsp) = - for n = ceiling ((xneg + laxis)/xsp) upto floor ((xpos - raxis)/xsp): - safedraw zconv ((n*xsp, yneg + baxis)--(n*xsp, ypos - taxis)); + for n = ceiling ((xlow)/xsp) upto floor ((xhigh)/xsp): + safedraw zconv ((n*xsp, ylow)--(n*xsp, yhigh)); endfor enddef; def gridlines (expr xsp, ysp) = @@ -1900,8 +1910,8 @@ def vectorfield (expr len, xsp, ysp) (text fcn) (text cond) = enddef; vardef mkvectorfield (expr len, xsp, ysp) (suffix vf, isOK) = - for n = ceiling ((xneg + laxis)/xsp) upto floor ((xpos - raxis)/xsp): - for m = ceiling ((yneg + baxis)/ysp) upto floor ((ypos - taxis)/ysp): + for n = ceiling ((xlow)/xsp) upto floor ((xhigh)/xsp): + for m = ceiling ((ylow)/ysp) upto floor ((yhigh)/ysp): if isOK (n*xsp,m*ysp): arrowdraw (len) (vf(n*xsp,m*ysp)); fi endfor endfor @@ -1909,8 +1919,8 @@ enddef; def plrvectorfield (expr len, rsp, tsp) (text fcn) (text cond) = save _vf, _is_OK, _A, _B, _C, _D; - _A := xneg + laxis; _B := xpos + raxis; - _C := yneg + baxis; _D := ypos + taxis; + _A := xlow; _B := xhigh; + _C := ylow; _D := yhigh; vardef _vf (expr r,t) = ((0,0)--(fcn)) shifted (r*dir t) enddef; vardef _is_OK (expr r,t) = save _X, _Y; _X := r*cosd t; _Y := r*sind t; diff --git a/Master/texmf-dist/source/generic/mfpic/grafbase.dtx b/Master/texmf-dist/source/generic/mfpic/grafbase.dtx index 9d7c4bd010b..2f37e8a20ef 100644 --- a/Master/texmf-dist/source/generic/mfpic/grafbase.dtx +++ b/Master/texmf-dist/source/generic/mfpic/grafbase.dtx @@ -1,6 +1,6 @@ % \iffalse %%% File: grafbase.dtx -%%% A part of mfpic 1.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% % ------------------------------------------------------------------- % @@ -19,7 +19,7 @@ % %<*driver> \ProvidesFile{grafbase.dtx} - [2009/09/22 v1.00. Metafont/post macros to interface with mfpic.]% + [2009/10/29 v1.02. Metafont/post macros to interface with mfpic.]% \documentclass[draft]{ltxdoc} \usepackage{docmfp} @@ -185,7 +185,7 @@ fi boolean grafbase; grafbase := true; string fileversion, filedate; -fileversion := "1.00"; filedate := "2009/09/22"; +fileversion := "1.02"; filedate := "2009/10/29"; message " Loading grafbase macros, version " & fileversion & " " & filedate & "."; @@ -232,7 +232,7 @@ def checkversions (expr g)= fi enddef; -checkversions (100); +checkversions (102); % \end{macrocode} % @@ -4899,17 +4899,27 @@ def axes (expr hlen) = xaxis (hlen); yaxis (hlen); enddef; % \begin{macrocode} laxis := baxis := raxis := taxis := 0; -vardef axisline.x = (xneg + laxis, 0)--(xpos - raxis, 0) enddef; -vardef axisline.y = (0, yneg + baxis)--(0, ypos - taxis) enddef; -vardef axisline.l = axisline.y shifted (xneg + laxis, 0) enddef; -vardef axisline.b = axisline.x shifted (0, yneg + baxis) enddef; -vardef axisline.r = axisline.y shifted (xpos - raxis, 0) enddef; -vardef axisline.t = axisline.x shifted (0, ypos - taxis) enddef; +vardef xlow = xneg + laxis enddef; +vardef xhigh = xpos - raxis enddef; +vardef ylow = yneg + baxis enddef; +vardef yhigh = ypos - taxis enddef; + +vardef axisline.x = (xlow, 0)--(xhigh, 0) enddef; +vardef axisline.y = (0, ylow)--(0, yhigh) enddef; +vardef axisline.l = axisline.y shifted (xlow, 0) enddef; +vardef axisline.b = axisline.x shifted (0, ylow) enddef; +vardef axisline.r = axisline.y shifted (xhigh, 0) enddef; +vardef axisline.t = axisline.x shifted (0, yhigh) enddef; vardef axis@# (expr len) = headpath (len, 0, 0) axisline@# enddef; vardef borderrect = - rect((xneg+laxis,yneg+baxis),(xpos-raxis,ypos-taxis)) + rect((xlow,ylow),(xhigh,yhigh)) +enddef; + +vardef inbounds (expr Z) = + (xpart Z >= xlow ) and (ypart Z >= ylow ) and + (xpart Z <= xhigh) and (ypart Z <= yhigh) enddef; % \end{macrocode} @@ -5021,10 +5031,10 @@ enddef; % \begin{macrocode} def xmarks = axismarks ( 90, xtick, origin, right) enddef; def ymarks = axismarks (-90, ytick, origin, up) enddef; -def lmarks = axismarks (-90, ltick, (xneg + laxis, 0), up) enddef; -def bmarks = axismarks ( 90, btick, (0, yneg + baxis), right) enddef; -def rmarks = axismarks ( 90, rtick, (xpos - raxis, 0), up) enddef; -def tmarks = axismarks (-90, ttick, (0, ypos - taxis), right) enddef; +def lmarks = axismarks (-90, ltick, (xlow, 0), up) enddef; +def bmarks = axismarks ( 90, btick, (0, ylow), right) enddef; +def rmarks = axismarks ( 90, rtick, (xhigh, 0), up) enddef; +def tmarks = axismarks (-90, ttick, (0, yhigh), right) enddef; % \end{macrocode} % @@ -5044,8 +5054,8 @@ vardef vargrid (expr dsize, xsp, ysp) = save gdot, gridpic; picture gdot, gridpic; gdot := setdot (griddotpath, dsize); gridpic := nullpicture; - for n = ceiling ((xneg + laxis)/xsp) upto floor ((xpos - raxis)/xsp): - for m = ceiling ((yneg + baxis)/ysp) upto floor ((ypos - taxis)/ysp): + for n = ceiling ((xlow)/xsp) upto floor ((xhigh)/xsp): + for m = ceiling ((ylow)/ysp) upto floor ((yhigh)/ysp): picdot (gridpic, gdot, zconv ((n*xsp, m*ysp))); endfor endfor @@ -5063,13 +5073,13 @@ def vgrid = vargrid enddef; % \DescribeRoutine{gridlines}\gbc{gridlines} draws both. % \begin{macrocode} def hgridlines (expr ysp) = - for n = ceiling ((yneg + baxis)/ysp) upto floor ((ypos - taxis)/ysp): - safedraw zconv ((xneg + laxis, n*ysp)--(xpos - raxis, n*ysp)); + for n = ceiling ((ylow)/ysp) upto floor ((yhigh)/ysp): + safedraw zconv ((xlow, n*ysp)--(xhigh, n*ysp)); endfor enddef; def vgridlines (expr xsp) = - for n = ceiling ((xneg + laxis)/xsp) upto floor ((xpos - raxis)/xsp): - safedraw zconv ((n*xsp, yneg + baxis)--(n*xsp, ypos - taxis)); + for n = ceiling ((xlow)/xsp) upto floor ((xhigh)/xsp): + safedraw zconv ((n*xsp, ylow)--(n*xsp, yhigh)); endfor enddef; def gridlines (expr xsp, ysp) = @@ -5110,8 +5120,8 @@ def vectorfield (expr len, xsp, ysp) (text fcn) (text cond) = enddef; vardef mkvectorfield (expr len, xsp, ysp) (suffix vf, isOK) = - for n = ceiling ((xneg + laxis)/xsp) upto floor ((xpos - raxis)/xsp): - for m = ceiling ((yneg + baxis)/ysp) upto floor ((ypos - taxis)/ysp): + for n = ceiling ((xlow)/xsp) upto floor ((xhigh)/xsp): + for m = ceiling ((ylow)/ysp) upto floor ((yhigh)/ysp): if isOK (n*xsp,m*ysp): arrowdraw (len) (vf(n*xsp,m*ysp)); fi endfor endfor @@ -5119,8 +5129,8 @@ enddef; def plrvectorfield (expr len, rsp, tsp) (text fcn) (text cond) = save _vf, _is_OK, _A, _B, _C, _D; - _A := xneg + laxis; _B := xpos + raxis; - _C := yneg + baxis; _D := ypos + taxis; + _A := xlow; _B := xhigh; + _C := ylow; _D := yhigh; vardef _vf (expr r,t) = ((0,0)--(fcn)) shifted (r*dir t) enddef; vardef _is_OK (expr r,t) = save _X, _Y; _X := r*cosd t; _Y := r*sind t; diff --git a/Master/texmf-dist/source/generic/mfpic/mfpic.dtx b/Master/texmf-dist/source/generic/mfpic/mfpic.dtx index fcc42f917cb..6fa82af9255 100644 --- a/Master/texmf-dist/source/generic/mfpic/mfpic.dtx +++ b/Master/texmf-dist/source/generic/mfpic/mfpic.dtx @@ -1,6 +1,6 @@ % \iffalse %%% File: mfpic.dtx -%%% A part of mfpic 1.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% % ------------------------------------------------------------------- % @@ -22,7 +22,7 @@ % %\ProvidesPackage{mfpic} %<*sty> - [2009/09/22 v1.00. Macros for drawing with Metafont/MetaPost.]% + [2009/10/29 v1.02. Macros for drawing with Metafont/MetaPost.]% % %<*driver> \documentclass[draft]{ltxdoc} @@ -136,7 +136,7 @@ % % This file documents the source code. See \file{mfpic-doc.pdf} (source % \file{mfpic.doc.tex} for the user documentation or \file{mfpguide.pdf} -% (source \file{}mfpguide.tex}) for an introductory guide. +% (source \file{mfpguide.tex}) for an introductory guide. % \end{abstract} % % \StopEventually{\PrintIndex} @@ -170,9 +170,9 @@ \ifx\mfpfileversion\UndEfInEd\else\expandafter\endinput\fi% {% \catcode\lq\.12 \catcode\lq\/12% - \gdef\mfpfileversion{1.00}% - \gdef\mfpfiledate{2009/09/22}% - \gdef\mfpicversion{100}% + \gdef\mfpfileversion{1.02}% + \gdef\mfpfiledate{2009/10/29}% + \gdef\mfpicversion{102}% }% % \end{macrocode} % @@ -1577,7 +1577,8 @@ if unknown Apricot: input dvipsnam.mp; fi\@nl verbatimtex\@nl \ifmfp@verbtex \the\mfp@verbtex\@nl \fi - \the\mfp@commonverbatimtex\@nl + \relax\@nl + \the\mfp@commonverbatimtex \def\noexpand\everylabel{\the\mfp@toks}\@nl etex;\@nl \mfp@ifdefined\mfp@settemplate\mfp@settemplate{}% @@ -5242,7 +5243,7 @@ \@nl beginmfpic(\number\mfp@count); \mfp@p\space\mfp@lineno. \mfp@ifmpost - {\@nl verbatimtex + {\@nl verbatimtex \relax \bgroup\font\noexpand\MFPcfont=\fontname\@tcurr\relax etex;}{}}% % \end{macrocode} @@ -5917,7 +5918,7 @@ % \begin{macrocode} \mfp@DBlog{Definition of closure of mfpic environment.}% \newdef\endmfpic{\every@endmfpic - \mfsrc{\mfp@ifmpost{\@nl verbatimtex \egroup\space etex;}{}\@nl + \mfsrc{\mfp@ifmpost{\@nl verbatimtex \relax\egroup\space etex;}{}\@nl endmfpic; \mfp@p\space(\number\mfp@count) \mfp@lineno.\@nl \mfp@p\mfp@d\mfp@d\mfp@d\@nl}% \ifmfpicdebug\wlog{}\wlog{Mfpic: ENTERED endmfpic.}\wlog{}\fi @@ -6315,7 +6316,7 @@ \endgroup \mfp@ifopengraphsfile {\mfp@ifmpost - {\mfsrc{ verbatimtex\@nl \the\mfp@toks}\mfcmd{etex}}% + {\mfcmd{verbatimtex\@nl\the\mfp@toks\@nl\mfp@p\@nl etex}}% {\mfp@noMP@error\mfpverbtex}% \global\mfp@verbtexfalse\global\mfp@verbtex{}}% {\edef\mfp@tempa{\the\mfp@verbtex\the\mfp@toks}% diff --git a/Master/texmf-dist/source/generic/mfpic/mfpic.ins b/Master/texmf-dist/source/generic/mfpic/mfpic.ins index c980a7c1dbb..baf542747d9 100644 --- a/Master/texmf-dist/source/generic/mfpic/mfpic.ins +++ b/Master/texmf-dist/source/generic/mfpic/mfpic.ins @@ -1,5 +1,5 @@ %%% File: mfpic.ins -%%% A part of mfpic 1.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% \input docstrip \keepsilent diff --git a/Master/texmf-dist/tex/generic/mfpic/mfpic.sty b/Master/texmf-dist/tex/generic/mfpic/mfpic.sty index c70a1325105..37b29b10756 100644 --- a/Master/texmf-dist/tex/generic/mfpic/mfpic.sty +++ b/Master/texmf-dist/tex/generic/mfpic/mfpic.sty @@ -22,10 +22,10 @@ %% with mfpic: plain TeX, LaTeX, plain Metafont and plain MetaPost. %% %%% File: mfpic.dtx -%%% A part of mfpic 1.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% \ProvidesPackage{mfpic} - [2009/09/22 v1.00. Macros for drawing with Metafont/MetaPost.]% + [2009/10/29 v1.02. Macros for drawing with Metafont/MetaPost.]% \DeclareOption{draft}{\mfpicdraft}% \DeclareOption{final}{% \mfpicfinal\PassOptionsToPackage{final}{graphics}}% diff --git a/Master/texmf-dist/tex/generic/mfpic/mfpic.tex b/Master/texmf-dist/tex/generic/mfpic/mfpic.tex index 7cabca9b5bf..a57afbb51d5 100644 --- a/Master/texmf-dist/tex/generic/mfpic/mfpic.tex +++ b/Master/texmf-dist/tex/generic/mfpic/mfpic.tex @@ -22,14 +22,14 @@ %% with mfpic: plain TeX, LaTeX, plain Metafont and plain MetaPost. %% %%% File: mfpic.dtx -%%% A part of mfpic 1.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% \ifx\mfpfileversion\UndEfInEd\else\expandafter\endinput\fi% {% \catcode\lq\.12 \catcode\lq\/12% - \gdef\mfpfileversion{1.00}% - \gdef\mfpfiledate{2009/09/22}% - \gdef\mfpicversion{100}% + \gdef\mfpfileversion{1.02}% + \gdef\mfpfiledate{2009/10/29}% + \gdef\mfpicversion{102}% }% \let\mfpsaveplus\+% \let\+\tabalign% @@ -526,7 +526,8 @@ if unknown Apricot: input dvipsnam.mp; fi\@nl verbatimtex\@nl \ifmfp@verbtex \the\mfp@verbtex\@nl \fi - \the\mfp@commonverbatimtex\@nl + \relax\@nl + \the\mfp@commonverbatimtex \def\noexpand\everylabel{\the\mfp@toks}\@nl etex;\@nl \mfp@ifdefined\mfp@settemplate\mfp@settemplate{}% @@ -1357,7 +1358,7 @@ \@nl beginmfpic(\number\mfp@count); \mfp@p\space\mfp@lineno. \mfp@ifmpost - {\@nl verbatimtex + {\@nl verbatimtex \relax \bgroup\font\noexpand\MFPcfont=\fontname\@tcurr\relax etex;}{}}% \newdef\tlabel{\mfp@nullopt\mfp@label}% @@ -1561,7 +1562,7 @@ #1\mfp@scratch}% \mfp@DBlog{Definition of closure of mfpic environment.}% \newdef\endmfpic{\every@endmfpic - \mfsrc{\mfp@ifmpost{\@nl verbatimtex \egroup\space etex;}{}\@nl + \mfsrc{\mfp@ifmpost{\@nl verbatimtex \relax\egroup\space etex;}{}\@nl endmfpic; \mfp@p\space(\number\mfp@count) \mfp@lineno.\@nl \mfp@p\mfp@d\mfp@d\mfp@d\@nl}% \ifmfpicdebug\wlog{}\wlog{Mfpic: ENTERED endmfpic.}\wlog{}\fi @@ -1746,7 +1747,7 @@ \endgroup \mfp@ifopengraphsfile {\mfp@ifmpost - {\mfsrc{ verbatimtex\@nl \the\mfp@toks}\mfcmd{etex}}% + {\mfcmd{verbatimtex\@nl\the\mfp@toks\@nl\mfp@p\@nl etex}}% {\mfp@noMP@error\mfpverbtex}% \global\mfp@verbtexfalse\global\mfp@verbtex{}}% {\edef\mfp@tempa{\the\mfp@verbtex\the\mfp@toks}% diff --git a/Master/texmf-dist/tex/generic/mfpic/mfppatch.tex b/Master/texmf-dist/tex/generic/mfpic/mfppatch.tex index b0bc7f5f5c6..520905b1159 100644 --- a/Master/texmf-dist/tex/generic/mfpic/mfppatch.tex +++ b/Master/texmf-dist/tex/generic/mfpic/mfppatch.tex @@ -1,7 +1,7 @@ %%% File: mfppatch.tex -%%% A part of mfpic 1.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% -\def\mfp@versionpatched{1.00}% +\def\mfp@versionpatched{1.02}% \def\mfp@patchinfo{% \Mfpic@warn{This patch is only for mfpic version \mfp@versionpatched!\@nl}}% \let\mfp@dopatches\endinput -- cgit v1.2.3