summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/latex/upmethodology/README36
-rw-r--r--Master/texmf-dist/doc/latex/upmethodology/VERSION2
-rw-r--r--Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf1755
-rw-r--r--Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex15
-rw-r--r--Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls4
-rw-r--r--Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty92
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check4
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
8 files changed, 977 insertions, 932 deletions
diff --git a/Master/texmf-dist/doc/latex/upmethodology/README b/Master/texmf-dist/doc/latex/upmethodology/README
new file mode 100644
index 00000000000..169614ff9f2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/upmethodology/README
@@ -0,0 +1,36 @@
+-----------------
+TEX-UPMETHODOLOGY
+-----------------
+
+1. Presentation
+---------------
+
+tex-upmethodology is a (La)TeX style which permits to create Unified Process methodology (UP or RUP) based documents (document version, history, authors, validators, specification, task management, helping tools...)
+
+Because the tex-upmethodology package is based on external definitions of layouts and styles, it is also succesfully used as a base to write scientific documents such as reports, engineering thesis, master thesis, and PhD thesis. An example of PhD thesis styles may be found at: http://www.multiagent.fr/ThesisStyle
+
+
+2. Installation
+---------------
+
+a) Copy the content of the directory inside one of your texmf directory, usually "/usr/share/texmf/tex/latex/upmethodology" or "$HOME/.texmf" on Unix operating systems.
+
+b) Update the LaTeX databases from the command line:
+
+ $> mktexlsr
+ $> update-updmap --quiet
+
+
+3. Author
+---------
+
+Stéphane GALLAND <galland@arakhne.org>
+http://www.arakhne.org/homes/galland.html
+
+
+4. License
+----------
+
+GNU LESSER GENERAL PUBLIC LICENSE.
+
+
diff --git a/Master/texmf-dist/doc/latex/upmethodology/VERSION b/Master/texmf-dist/doc/latex/upmethodology/VERSION
index 0054e52f676..56ad744aa8a 100644
--- a/Master/texmf-dist/doc/latex/upmethodology/VERSION
+++ b/Master/texmf-dist/doc/latex/upmethodology/VERSION
@@ -1 +1 @@
-upmethodology-20130815
+upmethodology-20130817
diff --git a/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf b/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf
index ffe68515225..8ff3ab91eb7 100644
--- a/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf
+++ b/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.pdf
@@ -573,7 +573,7 @@ endobj
>>
stream
xڍUMo@W>x; R(4AHq6"<¨(y;f,z%^K\`5>peeO_+C7s)]K_x$e_OɄzuVJHsA1$w1Mkz˾ETpkPˉw&؄Qr#l]e!K 78ٸj7 dkmOp /@XQln ܕrf;n>Sw|f =p9Y8$[YY~<.&nAfP45dmy(~պ6J8J;X6k2PV9<?Q+m=ro-SJv@\+}A@8ǜ@'9̉RD)d%D)BtkU,}Wff^.Ej:|sjPϵ u/]$ \l<./*GA4?&.~Z]^E)67 Im7
-X:Fw %RFyuD3҅$WM
+X:Fw %RFyuD3҅$M
endstream
endobj
378 0 obj <<
@@ -677,23 +677,21 @@ endobj
/ProcSet [ /PDF /Text ]
>> endobj
406 0 obj <<
-/Length 2329
+/Length 2487
/Filter /FlateDecode
>>
stream
-x[[s~ׯ@ߤrKVv&LBP
-έ{#!"[6o`p]+\ Ej
-.޼%G 񸻏T)+Cϗ7|NՌ
-|i^կw{SnZ(a ,zJ:28"Qd`ZD-H@%"P7ĈhHVJdUؑh}zw'!!͐;;$S[溆 ኈx[L}^o>g/dь,yR6~H6"_~+O5`jl*`u{8Atdud2 sGJ97hƫ:ΙxHB&{K4Q3HBQHڙ}R$<90uÌbBgti
-e89Dr`}
-PS lSyiaf ~ALpk
-p!
- V>ò At1@* B v z`>pYƀhO!~JMf
-@j)2Z:?NA6
-) ۴pEJ2?!mpmN72͐!n
-@lX41}`y A,wFm۲!iθTpP0I}.ۧM8o6p,pT3 zRzCm-(T`5D
-%ۏy;18,%<QxQQ"@W#GwEs6+_d8"(vy^mo+ t1XC:H1$/áaAd#,cA0#࿇p
-Ì3S#zE^038eT}4,nAD2fqO>BY#mI櫸H56x*S\TI^nP
+x[[s~ׯ@ߤrKVv&LBP
+C8P0a.h2m#(c@4̞fHMf
+cHK`//X\AO8QD;{i BC G%<
+Cjt,J
+<a%(]%̮JC;CxFA3j|ФqRݱ^?>OwAH2xN[(2'g BFj^DFx`?X+b,CC>FR3B8B.bw6-fFL/}yH QaKO2
+ɉ=
+ r=rNa
+gC*/&y$K$k
+:{TkD @1C | !ώo(,,0Imݛ3=\<%\?@9MR_YwP˃r}.Erh!K/_Q-Q}gt^$
+!jOwstmp)UB"Icrjp{{V N2Jՠ :Ҕje;oZA$_ݬz+?nqmPiA#={ Eu Eڵ%
+5߿f'Q
endstream
endobj
405 0 obj <<
@@ -1899,7 +1897,7 @@ endobj
/ProcSet [ /PDF /Text /ImageC ]
>> endobj
594 0 obj <<
-/Length 999
+/Length 1000
/Filter /FlateDecode
>>
stream
@@ -1908,8 +1906,8 @@ L n)Z]iA/^Y6(f-Ϸ*śA[pY#r'i:u ZxU}GH
뒿KhH$WG!
d!2ť?o:ENϊ6нVa
J'qP ;W\e//J}/r0Jt&O-rT6*AHmY#&ч -BYdMXa
-Jp5TTGsLێAPaUďVu-/iP,:UJQfe8hga Ֆzօw߬}K7:( 3h]k潟vF>GpSG(JNWqѠ9kјJs%W7=G&賗+E WHu b!$uicǔzNjeevz6X>]]bl?=tt{.nl="NحD(ұ,֬h! Pmg=֏}y=a5dfĴ X8NE'sdZ0XzAWw_|K YwoNw(WnQCG T"Eu 퉥`aX>8
-L!QET dELfm\^v58(dm#ԁ_
+Jp5TTGsLێAPaUďVu-/iP,:UJQfe8hga Ֆzօw߬}K7:( 3h]k潟vF>GpSG(JNWqѠ9kјJs%W7=G&賗+E WHu b!$uicǔzNjeevz6X>]]bl?=tt{.nl="NحD(ұ,֬h! Pmg=֏y=a5dfĴ 7Y8NM's7dZ0XٚBgw_K YwoNw(W-n'QCG T"Eu 퉥`iX>8
+L!QET dELfm\^v58(dm'ԁ_
endstream
endobj
593 0 obj <<
@@ -2025,25 +2023,22 @@ endobj
/ProcSet [ /PDF ]
>> endobj
622 0 obj <<
-/Length 2432
+/Length 2431
/Filter /FlateDecode
>>
stream
xZo6_5`7_+R׫(A[Ȯ'6fH3# pqpf83!i'44a4Q&Fb(K/(\ZHm7L;|^ hX
- W*i<6˔+9w-m{f.VᔒlFg Hʶ8oR$X͝R3"YZu}6o.SFAVNꚙI J4`A(CRy7y5"&VP- HH"9l/!g'҅3ZPb8 ؊tnƵL`~¤&͟uY~à]EmS]~
-[w^~]Pv!o+O9qm߬(
-Bxf &~37)UQc-BLwF?.(K?2n~,s# ]y
-ȹz@N=BKhu/e>,Q]9 )!0Ȣ䚣TcJ\lEׂW)p|#d~
-~
-8aʰ%P|
-lZ? ~3w:_|aG@5T'~jf8D(
-pQj
-"5iz OEWSLs$ʮN
-ŁJ>{~Z;Tuy A$_(XŜҘq(AL-
-S35Vȃ]c]+.ŘZn_@%F%`|1eK e!&֠Vq ?`opSW~RRH;]wEDM93uve
-7vHws Fly&RqfuXSLxPPڙgIiONsi|i^tۺ6PCZUq4!n(K#x6-x(8s
-xF6Zja%=sA~Rًmvm PN=T0?47ϩR1 ٓWSCH<~?/և PA~—y8~r;z4&\<0! vv5A!3o7lW
-(|`+,S3컺 o*yxkFw7f䏽>fAVoȤA:(3K}_"e0a KSS:Et^p1oҰa!T#KeJ36z!Ɠ 4BXZX0GgySxd6?޼{w'B@${iq <f?1
+ W*i<6˔+9w-m{f.VᔒlFg Hʶ8oR$X͝R3"YZu}6o.SFAVN5S h&,P&=ۇ
+vn5"jD=M Z(n"Dr0:^2C$Ofݿ gn{p6n܌kI;Lw%S?A뻼 Eۼ
+P5z@ț2ʘAhŻl TW1Ft4jW.j}p/k@bW˻C]1fp¸;U.$ۼ= mزo
+؈% |K>b31R.Ca&j [ϋ=JR.gG<:(DH}ڐ8|$S 2݌ϊq_W9E 3Țzȷ(ztӾf_Yn!fI6J]vͻ .aCo_Vr
+ѧÞ;)76/}6UAUuǓ++.}s灜z8\e_$/[}PY sNSfC`*!QgkE-95GSǖ@ˋRzyWFNU iGSX 
+\9z>/_V&vV!05ˀN 8X`qwO%`vEk9M
+bxF+..@.,a*ׄg[Cc6
+~ƁAh1_TSJw8/@#S<|I*>e2Z0oрիĈ@%+|v9HQ D+>91c 2Q*$2JZ ,gk"BMǺW\1ܾJ=J5@Ic˖|((B:LA@
+H7~঒x.7Vw;] t.grg!ny hnr)%3xAM6̌8cw(< 15b3ϒ#҂vT!uQmQChPCyPbG*l[@6Pq1!g člpu7<J"z4zM`~i o<S"cgڳ'3 0yp,^-Ul
+_&% /p,w"hM~y+
+b2DaƫCNF ˔gl)1lC''h?xϵJ)`@Y&m~yOH$(x̮2
endstream
endobj
621 0 obj <<
@@ -2182,20 +2177,22 @@ endobj
/ProcSet [ /PDF /Text /ImageC ]
>> endobj
636 0 obj <<
-/Length 2953
+/Length 3104
/Filter /FlateDecode
>>
stream
-x[K۸W(h,oދ-'x`83L(RKR4(n*)WYv>4=xq/Ȃ (cHD(d> FX]ۇ$R-Y*Eb\w/6gbon
-(1tZdM:VΈUϊ? !rA8b\ErI7K?Q/@h3>g@-I/]P]TKzMZa\ K},Flb o(joߥW+rܦVg7CZe6mM/iUwvtBܽKmF[ShYWD,/'Bv)+,dŭyH(+)jp藾hI'yk"xC
-@/B1uc Lȧ-
-;*QUecVary״~QN6ڵ:Y1X?Y(ec_OG8 u R7{i>% ?c`< ši Sء8W3x}|78r֢H_B`]V⻲0×И_ee#1%}K[-2̖FVS-v/ńoS%C`0YRxd|1.N!B!.< ,PJH}<oqfӹ4("ꨧ'
-5Z)gۤoTh~%Us2>p4*||qX0bqabqy1N)]t.z  L4(P4!J, 9=t4M u E,/1dz;&`xSD =vv`UBzQAp2@ˈ!N!&=ۀ]
-&
-Y1zpaMe)(֡
-:4#aCb.8\:7-J]0 1yäFHn
-&qt:V O`xf6PŸH"'SNno҇`.t)ɡGά;t'UeY*zp`{R!Ke~ ~Gke*n&{E;uuWU&ڲ-j?Nt[ ]<Q#/hLQ=Y: ΄fRa
-?ɇE v<I?1B2e_ ]A`k/a긽8$QꦒD0gK4$Yuۗ}53/B
+x[ݓ۶_>U7c!&i2nMORBRs.~1L;x ]bī
+{F"+."gQcv_7Idd|wa*BLF GTr@,zXq*bO Qb3ʵ
+zٰqFlzV^"W#%][E))W!Hvz|x6+a%0:ET#!I+q c2GǬʢX`(0Ć`0 }z\>8=) *;is_ʼ|L+{cZ6ښRF*!bm}ށ*Π]iP>e.+VR; >HF7ΰD?Q M<[R
+{UƬ„ &i,f}Wu7"8"lkuaP*⭿̟p6Щ<XlJ ~0"x@ م5Cqn(qa 弃E-ƶŏea"3I#F2Hؘۇ_ee#1%}K[_2FVr8s-v;s胋bt]}!0C,w<E2
+y byݦAw~ CC>wKV[跸d\zbuApG5 N|5#-CҋcUljs4i/I\uFmL $t\\?X\X\b?9aJC;*&H 4<i(4iKCxO; E4cB]CCy44PxDrlp(1'b"XCT!a.L42b"}oDSt6 #nCfmFA#"\gS1g4/:4 pR_M}m PKg: JT(;_u[@H tCG#\=PQh2 5wQ0;&Ɋ
+.]Ba~)("..{ txs:9qK]b?"p;n7H鶗.FߥwmZ7_ǘOTN|2W(syB^ALLu_;o!8mRS_PŸH"OX/ݜvfФxBٽtӥ$74V`
+@$먒M@w !W- .an~ \KlL"]8anN`yTWVUnM55oѸ+Yg_y0Crn}Z[xNiqcV`E_z\pV3%]rd؆ G"?C.s
+| Q(z
+(t"BY
+!V]QSnۯ#"* 3,™f-lM'֊r3WS7<_NS.
+ݯ^0*U"K}{v&O7]q츺Q a]QJ;o%^jGj_O6/g vb҃u*#~ @GC@}Xź,[K{k8k)iX@Ȱ2uxNx =,$S%
+MWVVÅdvpڱ!Qh$" ɄyV5߽|__+Y qM
endstream
endobj
635 0 obj <<
@@ -2215,7 +2212,7 @@ endobj
/D [635 0 R /XYZ 70.866 469.149 null]
>> endobj
118 0 obj <<
-/D [635 0 R /XYZ 70.866 235.229 null]
+/D [635 0 R /XYZ 70.866 211.318 null]
>> endobj
634 0 obj <<
/Font << /F116 384 0 R /F117 385 0 R /F143 394 0 R /F61 409 0 R /F120 386 0 R /F159 408 0 R /F127 388 0 R /F147 397 0 R >>
@@ -2223,19 +2220,22 @@ endobj
/ProcSet [ /PDF /Text /ImageC ]
>> endobj
640 0 obj <<
-/Length 2371
+/Length 2487
/Filter /FlateDecode
>>
stream
-xZs۸_Gc&>\z&mNg.@ )$}/ö\3ɌIo~W/+D"RHD(dRdO2_}KūJz[] a'
-2VH!ث.ߟduq48yr5UC
-(~$,Qs.&yuL%H .^SQK  p̏iqtv"r+jC.?RZ?aLG7{I]ήJ256a&EO Xz~*[믝>hu| {ý̴MSPo7jOu]5c>g!2i6h^uw=WMnHMav![@R ~bđskع'lG@qq[Z*$V 
-C_wo3fO{Mhe2?WtK a=-Cbԥ臵ٱţ0!|GER
-L8ҭ}u7MZ}@RUe N<:fjH:-Fhپ!s p 5fbΠ)n"=FD*F
-3{N=i`nocQjˤ2.*,"v-,E!epeZ౯ypkxsd
-o+ƜXYeǭu;fI{Iרfq>֩)SKi,K(LgǬ?Js3{7O}lk`sy x$TBt %1mY?MIbBg */U{¼S&9ucƍUs,*I!jW9s@ f֤ۧ:#3S:8X@  aዉ\V[0IoS\cY*,9-H)eE </8w4ZU^V?H!܄H{
-){@3<<Ckg2/?5mj Q}
-U<͇o~~;vš=%D0
+xڽZs۸_Gc"HO&Mz빝$y)HY/Ö̘$/,~ .v x_` (zG1)[d}A Rdb7uwG
+r%M.Y<h9b%S%u޾;+̉HƼosY ܔ.W,Z~7šۘ(v2"osOږ>}OcSf9ĺ.$P.L>F$B*n!%`a⍨Y 7rO ^ŁJQivi0ZXb9hH=k>6ߝte q;y~or5}
+R$gOYj=>\vuZw+ a2`K߰ \H<ng9E&?PV?RՃ=ôl^άUlll;6Fc%m8͂ Ty~914_[sDhː 2[K1vSsn~#qg"z%ȏvUfkjswYoL2<cX6ې-,"J~b$Jzs+X٬VAqqgftK2A> ?Oog=j- d~+[wJ^f"DqBy|V[AA*Sm
+ώOMǷ>>og
+
+XΪ`T'3 q>CzFo۳rL6f&M֖u) =2_|"2L-2\%Rt<<(\9>! Ɍ=lE/ر Ǎ[fi]YGx9G\g7Mxa"c.YkjV"19n)ß{ɠA[[ Aׇ㯀NBY+6Mk Y,{qܯ3_틒ZvOBKos<2JG¼S&=} αxERQ 2Ÿc{sPHbϚL𩎔t4!J 0#ep#Auꦨ!"[)a*_ٕk$< Drc^V"ُN"4ÁZƲ/퐨aC3k61;ɖSqMڙA=sCeP[
+J*1S)뚩W>L 7Wx/怉'x㠓MGrU Ai"[)D EfR˪q΃6/ aO8ϫ,:Y)WB#?2,`j/?K&]aL*
+L|e^ODGp )Th|ʲ?C4GFS6NfUhTܲ㫫L}ٝŃ;Zwj;PP[<xcI:a1dy_Zۓ^/@=;ӎ])ߘP`1s1nc]
+-܁Y2^
+
+FeeY[1
+"ngP5#q<8$ Xuٶa<NQg(imVw4mpti^Ӳi ޵:-P_U9/qP K0#,qeſc)k`
endstream
endobj
639 0 obj <<
@@ -2263,19 +2263,20 @@ endobj
/ProcSet [ /PDF /Text /ImageC ]
>> endobj
647 0 obj <<
-/Length 2330
+/Length 2381
/Filter /FlateDecode
>>
stream
-xے۶}ozBwC2]gNl~ %$޴(zݴ  h 8" EJ(0VO7Qʵ ñ]$KH}y}P,QIQ G=$zS&`\D
-18
-1g5̽0&n)^ĿZ]$bu McIYor!=d{?6[6b=\wZ<oޖ{+X;bUYw9lヤܭ}Rp8'no;h71]ڍeivW3L6yF-{``O܌vVM70]S͑RCmY7SœP(J'C#I|z>W}҆,UVgOB,XX]ps
-S14`>ec[ջCX0 ׌ ~of2+\D[=ĵLWEZ
-i-NyK؝OYae23sB;s2eZ.̥͙݊?HN N<u4 _fWU^Q+ŘF'c1_Dc0
-}6>Y$|8Cĉakz` v6s!C(TP60S>)ۼ@lutݸ3jf:ZY
-˖$col`u=#fb[--?hԋ6]jLKbDPsg3%޻$ <'3blⷼ*uQ;@ 6 @mfmX4K
-vH 7 6bnTyaKNxz2՝Ε*r#_^٩ۊVt<H)ϥO
-sU{5P4 _f-Zj_+ioɕ6zi8Wmaj$ nkw^{IU9l{f {~.ltn+MVyPzf5.KW ^ye/5aҡ3Yqd/iJ ^n{-a&{p=b|If9_o0Vb[s- "G-AD*nʃCYz 7m2C7K ERY6M;󻄋%z^[ڜ`t/Wi={Z\ZX2<UO ȡ!rTLNuwTZYg%ԗ(9p<bmWByč+JhIkzj-3B8#X̩fPWIB0} ?
+xے۶}BozBwC2]gNOk?P%qB2Ie7-$^7mg:;qn mgx<#3.bD)d}ÈREoi=}_ZbR"fG<[
+3|
+<w~@cRU(ԁ#ʁ/v U1UT>@1JED/2MdhŜ -dca*6`bS&nłHlZESZ& lgWi%#ržrkA mGsdL_'K'4B%"iO}2ݤezX_D:&JfW7p H
+5Mi9ɐp +יDU_ i;H&Ԋ.)MC(9Dj̪,ĬFT&uH
+a1! xt*;XVuI5ÅWIe Vs~[6 :Q܄ bzr#N)&B qU݆G* \<0vꤼxvOhr%ԕe: ^cZOٺ޹=sPl/owz {{[p
+E9Cu?T`$nt9qAb&dU'PHw
+Byo[}\~$Xh@90Aٱ DFy:&63yͨn Z̋c959-{Cf`ǿ ?9Q@y[%Wy-"z{?>P3-biL+}fǶw*a |^hVلk~
+'Z˖S۰5-eÞ͇)0rǖկva.mV5/QN9Fʫb1zqӹz( xfvBA?Yt`ɒ3Wq`ӸZ7-gCC:@92$B%e3Cͺ &G7h <=f#{8B==/2 qӟ5 qI] 㿼nyLCL /AtMvZvׇÐ"cpLmtu/v ð?AyUf*"L0+'Sx^m\&~Wl؜*i"qe[\SŽHE`006"ʖY՟J=Gniڹ_lH<"bge41['GJص[Z~MDĈt-r'fJsYAx6)gxoYYLrt4
+)lh6mPR9GM}M{o)MC-&n0h+H7 T#)wST]\TKgYghµ>}gCtSFM/-vw !NK*vBl6f{v
+qa
endstream
endobj
646 0 obj <<
@@ -2653,20 +2654,21 @@ endobj
/ProcSet [ /PDF /Text /ImageC ]
>> endobj
676 0 obj <<
-/Length 3518
+/Length 3616
/Filter /FlateDecode
>>
stream
-xڽn6}NsDR$tb%Bm˵&=DJb;I
- "!N7cq*Reeۏ[:yWсD.d&c\h,Oɝ^L o&?Ȟ2")1<Y7o?P*'T6]NTD)'
-|y*HLojf^yGRAM[PfIn9Ռh{ 㘨 HERKy>v 0Id%9A`xLMfLӀACp
-,
-GCɚ֬ Ǚ:0`=z P>D-ؓ˔H; )籝N|JI/c|H EX*_Ch"S”+/W1X m~a(j/_9EjSfm%+l{6)mOpcڙݫ;xrcy
-cW5f|0_26HQYBd!x:]at JI6C;幝hכ,:h%t,9HOd…RG8K KluP (ЎJ
-3@v19omBilX4.%%WT$ꁓ(c ! ޖU6
-AGjRk 馈raL+G݃+\RJԼu9-z2[Mc] fxs=fVZ52SuLs'7"(3YZPY]5&f馲QgJb9HlLoRPrמ fJV#b5Q#/պP{6*B n~+S#ϔ -yJwWFPmR?3eRN*\JR2gJ@8p`fd >?AVK
-W)^bnVug4+6zm?c%I:mb u^BLcg5]f]],l8>m\gns
-)@"w_p)>5<C, $?lAtgJ2Y`k3ҭKD+E'R80^l ua_M[ Q;Ӯ$T d47+NFLNFAmy9_[U$R1竧Q$PgrPp'F簷.9
+xk6{~?EM)}]^^ѻn+~-j[!R~ KQpf8d=_1NDp!&Fb(,w~E 2vIwl_2䛏;6yW7=!B\%.+
+,amBi#PV٣e1#,&Z BOZ*761c
+Xb@S*(y[l
+ uJ 8酐>jHZh\;Nv`]x`x,϶>xN
+J/*7zr >D Iz{BdDMAl
+0:Zcc{ۡJOFX4p9K ! `fK FD,Yrc^ع@DB>2D?yfQ:K]rZQt:[L|R:" ^O$ ܏O:E.h X4['
+21fMQeWnڪdzxt>}[.&/NOw+cwBko7Hp)]60==`}84ށTcGrpzz H6^tp1qt[w .Q9x`\謝+qE,Xgͱ&]K+ba=K{Rk,ec;l@u<agf^|
+E ϼhDLB} ͅSEtSu_Cl^uLglw
+j;!Y/*v#ƓEvE%`y~bm82_RG3cͧM3y:,.h"ǒ`&vCy3ʅ',=nDd,ꜭg֧.W*ڎH="庁f 7y aJzZ0Nd5`WlKeO}ZhמZcbȷy4
+NDN @a4r
+
endstream
endobj
675 0 obj <<
@@ -2675,20 +2677,13 @@ endobj
/Resources 674 0 R
/MediaBox [0 0 595.913 842.74]
/Parent 633 0 R
-/Annots [ 672 0 R 673 0 R ]
+/Annots [ 672 0 R ]
>> endobj
672 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 1]/H/I/C[1 0 0]
-/Rect [99.567 357.291 114.013 368.324]
-/A << /S /GoTo /D (figure.5.3) >>
->> endobj
-673 0 obj <<
-/Type /Annot
-/Subtype /Link
-/Border[0 0 1]/H/I/C[1 0 0]
-/Rect [98.373 50.007 112.819 61.04]
+/Rect [99.567 346.911 114.013 357.945]
/A << /S /GoTo /D (figure.5.3) >>
>> endobj
677 0 obj <<
@@ -2698,13 +2693,13 @@ endobj
/D [675 0 R /XYZ 70.866 722.455 null]
>> endobj
678 0 obj <<
-/D [675 0 R /XYZ 70.866 676.77 null]
+/D [675 0 R /XYZ 70.866 676.029 null]
>> endobj
679 0 obj <<
-/D [675 0 R /XYZ 70.866 659.884 null]
+/D [675 0 R /XYZ 70.866 657.125 null]
>> endobj
146 0 obj <<
-/D [675 0 R /XYZ 70.866 332.71 null]
+/D [675 0 R /XYZ 70.866 320.768 null]
>> endobj
674 0 obj <<
/Font << /F116 384 0 R /F117 385 0 R /F143 394 0 R /F61 409 0 R /F159 408 0 R /F198 680 0 R /F127 388 0 R /F147 397 0 R >>
@@ -2712,21 +2707,21 @@ endobj
/ProcSet [ /PDF /Text /ImageC ]
>> endobj
684 0 obj <<
-/Length 2434
+/Length 2451
/Filter /FlateDecode
>>
stream
-xZYsF~ׯ#YY1+I9JR bDd
-&j1mc6]@g8cBO9")nIg ~U{+4^Q)<[1D83?Y/TΒ3F
-$|Lr!>!!Y"B\ ?c\H/|v2$\2Ⱥ.'$⹽EH*) sW[Ilv&p/xd ʩV q\8q%>kmX$>9_(㬪
-R1|z*lK؁ kEy{J99"%<yHUT'rHجtOls)}5Qn2I 3VG)o͡q
-D/Wן/7t=v]7[ 绐yS!V{ᬜdc;|C"ʼn͝+"
- z#fMN͞0CVwILUz
-H?"U<bXכ} !rS8tqnKY.Pӱןo>K#ojZwu@Dz[ETtmh
-\L]:AsV|є{z_}G)b%[zb
-Z[oz>;Ի۲\`Mϛ*msyS5E4ӅT楉yu5'fKJRv|Ġ85ݟy 4;c
-:z /EYj@@XvҴ7zD9@ n&2@s,LȦa"0 ]\6(YSC>=;ϥy6'\x_09R]J'n19nvdxQBphU*⧻Y\
-7-"*~9 wH c2RBVk:msꥴ^|,1"c~ܕAaKFC ? 81qFDhOI#eS'ce~^Au=l""f.^_~ UEJ_pF`"y K=&mD 
+xZYsF~ׯ#U1sN)͡TyD$jI@
+j(a
+eiϞP
+a=Pݦ^z}ԽA }Tz2(jU.|{DF)UO~WTݥ`"mf]YWv۫ D8# e-v_/0H{0/ڑM};}XϙVI9[O_p?[ftvHwiff<u\s4T\*a 7dsV&)$vyo63iC2REann6eH4lE}Gք"t6輋0$vq"4ƃES;4}sX^ V#@螚eD81&A dT,%HAOFFLCS
+RXj9]E
+b{]cׂ
+qcZf)ߐAFR4 mE=b[ 56%l_ýȯK"f-l eM u#~횲Zy OcHnD$C(ׯFDd-SqC^^4!JiJ
+y&#<˜]ǘO6fmץ wjD)?MaJ&RjPD~;/ eQQd+}G;: U6Tբ_¥qsuK8hԀhՍ bFq1rVREpOǦ=-T=c
+[7ƒ\ȶMaכF#XP}_Wi7-y͞D׫T<ɇ7`]LfI|-q`)w:Gq9:GCuupv@qyXP{2q˯MFGԫb4)@&Dfhރ-W.vӞ`k ⫸A[N^<uDЪ#_܏T]:˙tMO?LQhXuZ:
+(aaY_9F"|, WE'6=^&
+p+U?z&
endstream
endobj
683 0 obj <<
@@ -2735,13 +2730,20 @@ endobj
/Resources 682 0 R
/MediaBox [0 0 595.913 842.74]
/Parent 687 0 R
-/Annots [ 681 0 R ]
+/Annots [ 673 0 R 681 0 R ]
+>> endobj
+673 0 obj <<
+/Type /Annot
+/Subtype /Link
+/Border[0 0 1]/H/I/C[1 0 0]
+/Rect [126.719 378.696 141.165 389.729]
+/A << /S /GoTo /D (figure.5.3) >>
>> endobj
681 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 1]/H/I/C[1 0 0]
-/Rect [127.145 217.069 141.59 228.053]
+/Rect [127.145 164.745 141.59 175.729]
/A << /S /GoTo /D (figure.5.3) >>
>> endobj
685 0 obj <<
@@ -2751,34 +2753,28 @@ endobj
/D [683 0 R /XYZ 233.157 468.642 null]
>> endobj
150 0 obj <<
-/D [683 0 R /XYZ 99.213 378.012 null]
+/D [683 0 R /XYZ 99.213 325.687 null]
>> endobj
154 0 obj <<
-/D [683 0 R /XYZ 99.213 179.253 null]
+/D [683 0 R /XYZ 99.213 126.929 null]
>> endobj
682 0 obj <<
-/Font << /F116 384 0 R /F117 385 0 R /F159 408 0 R /F127 388 0 R /F231 686 0 R /F181 568 0 R /F61 409 0 R /F143 394 0 R /F147 397 0 R >>
+/Font << /F116 384 0 R /F117 385 0 R /F159 408 0 R /F127 388 0 R /F231 686 0 R /F181 568 0 R /F143 394 0 R /F61 409 0 R /F147 397 0 R >>
/XObject << /Im1 379 0 R /Im2 651 0 R >>
/ProcSet [ /PDF /Text /ImageC ]
>> endobj
692 0 obj <<
-/Length 2437
+/Length 2522
/Filter /FlateDecode
>>
stream
-x]6}6pf)R-rkAe[-o,I ?D2eٻ )~ g!N N^pe,B"I}ÈRfJmtk|$?~)X*G4z8Y/
-ڒfqQev}"Q<
--jvVnK(\ n$C HEn&TQ=&5euI0n*I9CSD?u?,EBd"fS: i>]ٸt2Ӫpa2M-ؙ+*c]Խ Ce&HϨ9@"_QqP)h0LY4c'UX=`Noۆk
--Y~(M9 z~l~\6a7
-kPZA3iِj@@tyL2e+i
-ٕIgzTMB@D4#OA^DP;IJYL=ZM1w6zZ?AX@/SԽV/"mzzz N;Ez gzbz9MIM/9ȅE_Y w64!7|WqykEXq'6zxumh?4 : |R; !?pSVy]!em$
-* C)~NQsXAwH, -qa8gï3/HBNC'[_kVϩǭ^Ozl!
-qx^-E:Lݏ "Jӄ.*o))@ I$FRo9~dսs2^qe=r"w%IpzyiͬM1LcE$Au Ӣ0_8lm60lR8pg6{ݳ9Qh+}N:U I_Te3cQg`vt $Xp0H3uv7ܖҞ>&`t㤞) 0iwbXPf?k%@#Otʉt \C\\}yc|[%Z%<vBJtS_>:j1UH;gJ Lu RY-ǥ3yVUe;et[xNuyf_?-ѧGt}]D )frK3,\
-Ya
-àN5ܖ;@@my0 B
-/j.Z9P+-<x%c_/LMœPHEUץ_!08Nuׯ@T:oӅzhI[ ߓr/V/2H&0箐!uC*0W5zez>Wi րIUj
-:2gXϸe8ώR_]TDA
-Dj5r+yQ1a!ʫ=cr4o {QNOGWrH}C!A[-xCk"_6GB&솣
+x]۸}Z/P3Sw!-ڻ-"Ƀ֖mlycɷɿ IѢLcwX`MQpf8C,a&,*#\D+M4else%yɴW?oXكLd* O%.&sx y<DrE2`N~ tCsW?1&9S@nhJ4M4cq'&wrN~]}'Em[&_ڲn.ܷ/ HIMпn`hV?ݶޔuk7y\U>춈ռtHοŦ׳z]U:`i7lX$S1)0%Wn_}(IQ1J'K;x(vŦl]c]3}Sz@.)D GH|<%Ln۩`: v]9/w'IP*kǧTw'$F2GNE'DdoJ:!}>z(+h66ƍ'M[vtbٮzhANsOqq/}N0&e/Qgn^Kh{X0N%(9a#[¦$B$P~/eCiN(@F̞&ymNPnylbLiS!(C9"ɇ٤ 0ڵ1,Dr1h-c<`/tZָ-dS̀CfP6U[3)@Vјץ]uT=ڨ:7e3
+cCK>?KdO1P*/L|C}0Ag0<O b?vB@^s⏭-m!C$8i9ze0ҿn&_x!82>Lg$7jd
++t?,xGsqk+nJ X!
+|;ֵS0I=ʮttaTk?#"ͦSug95*lw:N
+ů
+B|V{6HJk
+aUe 1ڞo޽{u
endstream
endobj
691 0 obj <<
@@ -2792,24 +2788,29 @@ endobj
/D [691 0 R /XYZ -2.134 859.047 null]
>> endobj
158 0 obj <<
-/D [691 0 R /XYZ 70.866 363.076 null]
+/D [691 0 R /XYZ 70.866 323.014 null]
>> endobj
690 0 obj <<
-/Font << /F61 409 0 R /F143 394 0 R /F116 384 0 R /F159 408 0 R /F120 386 0 R /F193 628 0 R /F117 385 0 R /F147 397 0 R >>
+/Font << /F116 384 0 R /F143 394 0 R /F61 409 0 R /F159 408 0 R /F120 386 0 R /F193 628 0 R /F117 385 0 R /F147 397 0 R >>
/XObject << /Im1 379 0 R >>
/ProcSet [ /PDF /Text /ImageC ]
>> endobj
696 0 obj <<
-/Length 2126
+/Length 2220
/Filter /FlateDecode
>>
stream
-xZY8~_n`S6dfg @2j[%G3~"EE-*U_]ppꟷWE$vi(aL$Fѧw7h  ҈ Ƙx1P "4GT
-ލK_q%Y4x_#ބ&2az{wYgT#~! ]<[8QW=]PL8kFj5ME7YUQ ^#El)V)>L9Z<-( _]oLuWt
-w bov QmoZ7mvF3^UEQ>/vhÔG6Av؁qO/,^QN.ˑѰsE̞[悌xǔ0J'ÜH98yG"/B|XZ(<*(HSyv`S%؅wf` z c1"#4?AZ@0 dzk?ڶ={O$%$Q>$u՘(CoMbKnيoIz/zˬ)"N/<}$>|Blb"|for7yZLgUYnB`mL
-
-q&f dMH~"M:n*@)0(4C6]UFRbBp*H 6ά}5ji2
-NVmᔢ85&j5m{BӾ*`logJ_j`?{7+/rJNOh
+xZo8_8}굽^
+ز-,7)ôiqIh8ͧu7Wz/BdVDHkD P[YF~%@!A1KbX1Dhn , ޭ+_Dh&_V#ބ ALo^]Yc[UuH*s|g'IO#^ZdMFⲧ%M!xT˪uQBl)V)9L5Z<-( _]oQL6J+D8"O$J{-W_0kّrRD:fBL(Jn?%|3e:;mĩ@ 3`Wϲ7۹$FZRi5*6٭0Q{ѧXtzĺ#o6ۥVrajEz>T"2z0MΝe_ _Ϳ0V*Lƀ yI$ ={*
+Pع&E$p䢺$PZ^Go;(izύd:VZ ?^~(
+ֶPV",o ($TPͧGbHUZxI)A/ioԻc  J2#(0(šAtvֆcgwFD eg11~v(=Hok1ܥ$+N$#R&@a |ϏygBk'NF$64iJF\@@)w /fuHT }?ʦZm3PH:C6]UJJ= SADiجC[ Wa
+ܹ+(R3:win[!lls+fKjPa$k-RìiDFNgqɎz.Wifj5 8Lg`.0__hwamȊ=w˗P4&kcef-EfK?{a$QM\`ޮ>PnD孌H=eh(8aԮtx65k/%8Hn$
+O!.#27l;+v()ECq.
+&|-pO({WeLPgݾ)mW[ͫ}ӣ?iW[y٧Swz
+*zXZ %~+[q=^N}R5:P}xd4:k]u޶#OŴ:m<EKn7uGD
+RR*~#$Ώ~bBcw,\z}f~B;4,#pi?A
+Dd
+<Ԝw
endstream
endobj
695 0 obj <<
@@ -2824,30 +2825,30 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 1]/H/I/C[1 0 0]
-/Rect [138.057 708.258 152.503 719.292]
+/Rect [138.057 684.092 152.503 695.126]
/A << /S /GoTo /D (table.5.1) >>
>> endobj
689 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 1]/H/I/C[1 0 0]
-/Rect [174.301 708.258 186.256 719.292]
+/Rect [174.301 684.092 186.256 695.126]
/A << /S /GoTo /D (table.5.1) >>
>> endobj
697 0 obj <<
/D [695 0 R /XYZ 26.213 859.047 null]
>> endobj
554 0 obj <<
-/D [695 0 R /XYZ 291.386 551.892 null]
+/D [695 0 R /XYZ 291.386 528.844 null]
>> endobj
162 0 obj <<
-/D [695 0 R /XYZ 99.213 466.455 null]
+/D [695 0 R /XYZ 99.213 447.044 null]
>> endobj
166 0 obj <<
-/D [695 0 R /XYZ 99.213 395.803 null]
+/D [695 0 R /XYZ 99.213 379.412 null]
>> endobj
170 0 obj <<
-/D [695 0 R /XYZ 99.213 96.563 null]
+/D [695 0 R /XYZ 99.213 96.06 null]
>> endobj
694 0 obj <<
/Font << /F116 384 0 R /F117 385 0 R /F61 409 0 R /F143 394 0 R /F120 386 0 R /F193 628 0 R /F159 408 0 R /F147 397 0 R >>
@@ -3530,24 +3531,10 @@ endobj
/Filter /FlateDecode
>>
stream
-xr6_ʝ;fIltqHčD$U(ɊLv2cA-#"G$"FH &lsFr-k(.m>{!?
-1)GTr xGsG@tנSb&༎H3
-WNٿ['z9Qb /_DW!W?vBH^(ǜ"HR#dqa(WjD
-H7ZjJ~e
-3&.HXq%'Op
-wj$r߲%7 <92]fIe<G.pJg+wv xH
-2I& 􅢩!46@
-DߎbSuAvMN4
-ZL>|~X[|RL2w?VIX,kWSBmsywΫՇ1&̶զjɶ给qỏF<>onGVyIdD*Zc{ pŽr>c? )
-QN }L. :HL
-}үZ@ŵ
- vP7cɐ2-G
-e3s K`t tM~_{B x!oIPy^|.}J\ct@sgל ąN`B|aZ=KhK Eh*{]̍T;x =SH&#v<[{
-MЮKtܴ7Eig"14 551mF-Cl_N_<̧V]~;Yڷ;3g t⇁V1V1֎K05)Vt7\1`yu\[,Sn6lB>~H&K6v6f{R;p)0"6+̡ 4+W8P&۾
-?k_(0mS#4΅`d߸ %A "6if޼ɋ1=Pw0,5oc[ QԹPwZpy *#FJ?nM)-Eyj=aO
- c2{Q4<MQ3$]ݚ)jTWա\GX"of xFnAr ]3THyA4Yi#A:$lN
-HAQ&ƫcESBz ʠte|{Lo/ m3݆JM
-7>n|~ oM-{IIn>w'0iLu%b{FNH1zq6mS@5^h<m*)LfJ؏
+xr6_ʝ;fIltqHčD$U ɊLv2cA-#"G$"FH &lsFD6 s#Q]>|rC-)bRES㏀%qt߀n"N:z H(7(Kxaꅘٿ !(FHaK)xdDGw("n4ЪMJ y$_{t@$ IF=2Iy5m'(`
+LtY*[Shl3 Ow9LGw Zy
+K*͗:ض3[ bHvcֈ]~Z^!,ݭWHWh}X2m}SV{&CH@lScVnԁ1.n:z*MEtc>3rR֮ݙYxi7ǧ7 tc͸SSE^ ފWI-0Ttn ?)n.Ӎ@Gڴ4쎽\)܏-Js(i4˫:>9"ԬIzlW됂e'm{S`Ӻ- {6Yd7h33Ad`4-vݛ!y3}jzEv݁o $:N>oAch<^Q́)EŁѳN&L
+-Okt>T&֡[3 eWʪ> t 2f֒;'psK"M_o F N."CFg`:Z?%Z^@oiC! r^vPI%Ͷ˺:W"㣛~j{y{a\`/e-&ICچa`2:S}hlQ))r,&+qC8)M텶ѦPMa2S|xHIp3Ҽy;#
endstream
endobj
756 0 obj <<
@@ -6315,9 +6302,9 @@ endobj
/OpenAction 377 0 R
>> endobj
950 0 obj <<
-/Author()/Title()/Subject()/Creator(LaTeX with hyperref package)/Producer(upmethodology 2013/05/17)/Keywords()
-/CreationDate (D:20130815163014+02'00')
-/ModDate (D:20130815163014+02'00')
+/Author()/Title()/Subject()/Creator(LaTeX with hyperref package)/Producer(upmethodology 2013/08/15)/Keywords()
+/CreationDate (D:20130817130647+02'00')
+/ModDate (D:20130817130647+02'00')
/Trapped /False
/PTEX.Fullbanner (This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009/Debian) kpathsea version 5.0.0)
>> endobj
@@ -6325,380 +6312,380 @@ xref
0 951
0000000398 65535 f
0000000015 00000 n
-0000054930 00000 n
-0000386850 00000 n
+0000055088 00000 n
+0000387625 00000 n
0000000060 00000 n
0000000092 00000 n
-0000056169 00000 n
-0000386729 00000 n
+0000056327 00000 n
+0000387504 00000 n
0000000134 00000 n
0000000180 00000 n
-0000058838 00000 n
-0000386633 00000 n
+0000058996 00000 n
+0000387408 00000 n
0000000225 00000 n
0000000271 00000 n
-0000058898 00000 n
-0000386559 00000 n
+0000059056 00000 n
+0000387334 00000 n
0000000319 00000 n
0000000350 00000 n
-0000058958 00000 n
-0000386472 00000 n
+0000059116 00000 n
+0000387247 00000 n
0000000398 00000 n
0000000452 00000 n
-0000059018 00000 n
-0000386385 00000 n
+0000059176 00000 n
+0000387160 00000 n
0000000500 00000 n
0000000552 00000 n
-0000060875 00000 n
-0000386298 00000 n
+0000061033 00000 n
+0000387073 00000 n
0000000600 00000 n
0000000650 00000 n
-0000060935 00000 n
-0000386187 00000 n
+0000061093 00000 n
+0000386962 00000 n
0000000698 00000 n
0000000741 00000 n
-0000060995 00000 n
-0000386113 00000 n
+0000061153 00000 n
+0000386888 00000 n
0000000794 00000 n
0000000844 00000 n
-0000061055 00000 n
-0000386026 00000 n
+0000061213 00000 n
+0000386801 00000 n
0000000897 00000 n
0000000943 00000 n
-0000061115 00000 n
-0000385939 00000 n
+0000061273 00000 n
+0000386714 00000 n
0000000996 00000 n
0000001046 00000 n
-0000062641 00000 n
-0000385852 00000 n
+0000062800 00000 n
+0000386627 00000 n
0000001099 00000 n
0000001149 00000 n
-0000062701 00000 n
-0000385765 00000 n
+0000062860 00000 n
+0000386540 00000 n
0000001202 00000 n
0000001253 00000 n
-0000062761 00000 n
-0000385678 00000 n
+0000062920 00000 n
+0000386453 00000 n
0000001306 00000 n
0000001351 00000 n
-0000062821 00000 n
-0000385591 00000 n
+0000062980 00000 n
+0000386366 00000 n
0000001404 00000 n
0000001455 00000 n
-0000064008 00000 n
-0000385504 00000 n
+0000064167 00000 n
+0000386279 00000 n
0000001508 00000 n
0000001558 00000 n
-0000064068 00000 n
-0000385417 00000 n
+0000064227 00000 n
+0000386192 00000 n
0000001611 00000 n
0000001657 00000 n
-0000064127 00000 n
-0000385330 00000 n
+0000064286 00000 n
+0000386105 00000 n
0000001711 00000 n
0000001758 00000 n
-0000064187 00000 n
-0000385256 00000 n
+0000064346 00000 n
+0000386031 00000 n
0000001812 00000 n
0000001862 00000 n
-0000065028 00000 n
-0000385144 00000 n
+0000065187 00000 n
+0000385919 00000 n
0000001905 00000 n
0000001948 00000 n
-0000068570 00000 n
-0000385034 00000 n
+0000068728 00000 n
+0000385809 00000 n
0000001994 00000 n
0000002043 00000 n
-0000068630 00000 n
-0000384960 00000 n
+0000068788 00000 n
+0000385735 00000 n
0000002091 00000 n
0000002132 00000 n
-0000068689 00000 n
-0000384873 00000 n
+0000068847 00000 n
+0000385648 00000 n
0000002180 00000 n
0000002216 00000 n
-0000072277 00000 n
-0000384799 00000 n
+0000072435 00000 n
+0000385574 00000 n
0000002264 00000 n
0000002306 00000 n
-0000074657 00000 n
-0000384672 00000 n
+0000074815 00000 n
+0000385447 00000 n
0000002352 00000 n
0000002403 00000 n
-0000074717 00000 n
-0000384556 00000 n
+0000074875 00000 n
+0000385331 00000 n
0000002452 00000 n
0000002509 00000 n
-0000074778 00000 n
-0000384491 00000 n
+0000074936 00000 n
+0000385266 00000 n
0000002563 00000 n
0000002619 00000 n
-0000078230 00000 n
-0000384399 00000 n
+0000078539 00000 n
+0000385174 00000 n
0000002668 00000 n
0000002710 00000 n
-0000078291 00000 n
-0000384307 00000 n
+0000078600 00000 n
+0000385082 00000 n
0000002759 00000 n
0000002809 00000 n
-0000078352 00000 n
-0000384229 00000 n
+0000078661 00000 n
+0000385004 00000 n
0000002858 00000 n
0000002894 00000 n
-0000081251 00000 n
-0000384099 00000 n
+0000081676 00000 n
+0000384874 00000 n
0000002941 00000 n
0000002988 00000 n
-0000081312 00000 n
-0000384020 00000 n
+0000081737 00000 n
+0000384795 00000 n
0000003037 00000 n
0000003107 00000 n
-0000081373 00000 n
-0000383927 00000 n
+0000081798 00000 n
+0000384702 00000 n
0000003156 00000 n
0000003187 00000 n
-0000084626 00000 n
-0000383834 00000 n
+0000085102 00000 n
+0000384609 00000 n
0000003236 00000 n
0000003271 00000 n
-0000117614 00000 n
-0000383703 00000 n
+0000118090 00000 n
+0000384478 00000 n
0000003320 00000 n
0000003376 00000 n
-0000121960 00000 n
-0000383624 00000 n
+0000122377 00000 n
+0000384399 00000 n
0000003430 00000 n
0000003493 00000 n
-0000122142 00000 n
-0000383531 00000 n
+0000122560 00000 n
+0000384306 00000 n
0000003547 00000 n
0000003613 00000 n
-0000125337 00000 n
-0000383452 00000 n
+0000125934 00000 n
+0000384227 00000 n
0000003667 00000 n
0000003717 00000 n
-0000125398 00000 n
-0000383359 00000 n
+0000125995 00000 n
+0000384134 00000 n
0000003766 00000 n
0000003798 00000 n
-0000128390 00000 n
-0000383266 00000 n
+0000129072 00000 n
+0000384041 00000 n
0000003847 00000 n
0000003877 00000 n
-0000131438 00000 n
-0000383135 00000 n
+0000132214 00000 n
+0000383910 00000 n
0000003926 00000 n
0000003962 00000 n
-0000131499 00000 n
-0000383056 00000 n
+0000132275 00000 n
+0000383831 00000 n
0000004016 00000 n
0000004062 00000 n
-0000131560 00000 n
-0000382977 00000 n
+0000132336 00000 n
+0000383752 00000 n
0000004116 00000 n
0000004160 00000 n
-0000133821 00000 n
-0000382846 00000 n
+0000134596 00000 n
+0000383621 00000 n
0000004209 00000 n
0000004277 00000 n
-0000133882 00000 n
-0000382767 00000 n
+0000134657 00000 n
+0000383542 00000 n
0000004331 00000 n
0000004384 00000 n
-0000136450 00000 n
-0000382688 00000 n
+0000137225 00000 n
+0000383463 00000 n
0000004438 00000 n
0000004492 00000 n
-0000139071 00000 n
-0000382595 00000 n
+0000139846 00000 n
+0000383370 00000 n
0000004541 00000 n
0000004574 00000 n
-0000139132 00000 n
-0000382502 00000 n
+0000139907 00000 n
+0000383277 00000 n
0000004624 00000 n
0000004687 00000 n
-0000142363 00000 n
-0000382409 00000 n
+0000143138 00000 n
+0000383184 00000 n
0000004737 00000 n
0000004777 00000 n
-0000142486 00000 n
-0000382316 00000 n
+0000143261 00000 n
+0000383091 00000 n
0000004827 00000 n
0000004867 00000 n
-0000148882 00000 n
-0000382223 00000 n
+0000149657 00000 n
+0000382998 00000 n
0000004917 00000 n
0000004949 00000 n
-0000151081 00000 n
-0000382130 00000 n
+0000151856 00000 n
+0000382905 00000 n
0000004999 00000 n
0000005036 00000 n
-0000151142 00000 n
-0000382037 00000 n
+0000151917 00000 n
+0000382812 00000 n
0000005086 00000 n
0000005128 00000 n
-0000151203 00000 n
-0000381944 00000 n
+0000151978 00000 n
+0000382719 00000 n
0000005178 00000 n
0000005216 00000 n
-0000191845 00000 n
-0000381827 00000 n
+0000192620 00000 n
+0000382602 00000 n
0000005266 00000 n
0000005329 00000 n
-0000191906 00000 n
-0000381748 00000 n
+0000192681 00000 n
+0000382523 00000 n
0000005384 00000 n
0000005448 00000 n
-0000191966 00000 n
-0000381655 00000 n
+0000192741 00000 n
+0000382430 00000 n
0000005503 00000 n
0000005570 00000 n
-0000194574 00000 n
-0000381562 00000 n
+0000195349 00000 n
+0000382337 00000 n
0000005625 00000 n
0000005692 00000 n
-0000194635 00000 n
-0000381469 00000 n
+0000195410 00000 n
+0000382244 00000 n
0000005747 00000 n
0000005817 00000 n
-0000194696 00000 n
-0000381390 00000 n
+0000195471 00000 n
+0000382165 00000 n
0000005872 00000 n
0000005945 00000 n
-0000196622 00000 n
-0000381259 00000 n
+0000197397 00000 n
+0000382034 00000 n
0000005992 00000 n
0000006044 00000 n
-0000196683 00000 n
-0000381180 00000 n
+0000197458 00000 n
+0000381955 00000 n
0000006093 00000 n
0000006153 00000 n
-0000196744 00000 n
-0000381049 00000 n
+0000197519 00000 n
+0000381824 00000 n
0000006202 00000 n
0000006248 00000 n
-0000199540 00000 n
-0000380970 00000 n
+0000200315 00000 n
+0000381745 00000 n
0000006302 00000 n
0000006340 00000 n
-0000199601 00000 n
-0000380891 00000 n
+0000200376 00000 n
+0000381666 00000 n
0000006394 00000 n
0000006429 00000 n
-0000199662 00000 n
-0000380798 00000 n
+0000200437 00000 n
+0000381573 00000 n
0000006478 00000 n
0000006518 00000 n
-0000199723 00000 n
-0000380705 00000 n
+0000200498 00000 n
+0000381480 00000 n
0000006567 00000 n
0000006603 00000 n
-0000199784 00000 n
-0000380612 00000 n
+0000200559 00000 n
+0000381387 00000 n
0000006652 00000 n
0000006692 00000 n
-0000203371 00000 n
-0000380519 00000 n
+0000204146 00000 n
+0000381294 00000 n
0000006741 00000 n
0000006784 00000 n
-0000203432 00000 n
-0000380426 00000 n
+0000204207 00000 n
+0000381201 00000 n
0000006833 00000 n
0000006872 00000 n
-0000206046 00000 n
-0000380295 00000 n
+0000206821 00000 n
+0000381070 00000 n
0000006921 00000 n
0000006982 00000 n
-0000206107 00000 n
-0000380216 00000 n
+0000206882 00000 n
+0000380991 00000 n
0000007036 00000 n
0000007081 00000 n
-0000206168 00000 n
-0000380123 00000 n
+0000206943 00000 n
+0000380898 00000 n
0000007135 00000 n
0000007183 00000 n
-0000206229 00000 n
-0000380044 00000 n
+0000207004 00000 n
+0000380819 00000 n
0000007237 00000 n
0000007279 00000 n
-0000206290 00000 n
-0000379965 00000 n
+0000207065 00000 n
+0000380740 00000 n
0000007328 00000 n
0000007364 00000 n
-0000211626 00000 n
-0000379835 00000 n
+0000212401 00000 n
+0000380610 00000 n
0000007411 00000 n
0000007464 00000 n
-0000211687 00000 n
-0000379756 00000 n
+0000212462 00000 n
+0000380531 00000 n
0000007513 00000 n
0000007559 00000 n
-0000211748 00000 n
-0000379663 00000 n
+0000212523 00000 n
+0000380438 00000 n
0000007608 00000 n
0000007656 00000 n
-0000211809 00000 n
-0000379570 00000 n
+0000212584 00000 n
+0000380345 00000 n
0000007705 00000 n
0000007756 00000 n
-0000245660 00000 n
-0000379477 00000 n
+0000246435 00000 n
+0000380252 00000 n
0000007805 00000 n
0000007862 00000 n
-0000247182 00000 n
-0000379398 00000 n
+0000247957 00000 n
+0000380173 00000 n
0000007911 00000 n
0000007947 00000 n
-0000249685 00000 n
-0000379268 00000 n
+0000250460 00000 n
+0000380043 00000 n
0000007994 00000 n
0000008046 00000 n
-0000249746 00000 n
-0000379189 00000 n
+0000250521 00000 n
+0000379964 00000 n
0000008095 00000 n
0000008140 00000 n
-0000249807 00000 n
-0000379096 00000 n
+0000250582 00000 n
+0000379871 00000 n
0000008189 00000 n
0000008236 00000 n
-0000249868 00000 n
-0000379017 00000 n
+0000250643 00000 n
+0000379792 00000 n
0000008285 00000 n
0000008341 00000 n
-0000253236 00000 n
-0000378887 00000 n
+0000254011 00000 n
+0000379662 00000 n
0000008388 00000 n
0000008441 00000 n
-0000253297 00000 n
-0000378808 00000 n
+0000254072 00000 n
+0000379583 00000 n
0000008490 00000 n
0000008539 00000 n
-0000253358 00000 n
-0000378729 00000 n
+0000254133 00000 n
+0000379504 00000 n
0000008588 00000 n
0000008638 00000 n
-0000258783 00000 n
-0000378599 00000 n
+0000259558 00000 n
+0000379374 00000 n
0000008686 00000 n
0000008735 00000 n
-0000258844 00000 n
-0000378520 00000 n
+0000259619 00000 n
+0000379295 00000 n
0000008785 00000 n
0000008825 00000 n
-0000261061 00000 n
-0000378427 00000 n
+0000261836 00000 n
+0000379202 00000 n
0000008875 00000 n
0000008914 00000 n
-0000261122 00000 n
-0000378348 00000 n
+0000261897 00000 n
+0000379123 00000 n
0000008964 00000 n
0000009001 00000 n
-0000265439 00000 n
-0000378256 00000 n
+0000266214 00000 n
+0000379031 00000 n
0000009049 00000 n
0000009098 00000 n
-0000268444 00000 n
-0000378178 00000 n
+0000269219 00000 n
+0000378953 00000 n
0000009146 00000 n
0000009188 00000 n
0000010033 00000 n
@@ -6707,578 +6694,578 @@ xref
0000009240 00000 n
0000021954 00000 n
0000022015 00000 n
-0000375046 00000 n
-0000375537 00000 n
-0000374873 00000 n
-0000374449 00000 n
-0000375396 00000 n
-0000376542 00000 n
+0000375821 00000 n
+0000376312 00000 n
+0000375648 00000 n
+0000375224 00000 n
+0000376171 00000 n
+0000377317 00000 n
0000023397 00000 n
0000023217 00000 n
0000022241 00000 n
0000023336 00000 n
-0000376105 00000 n
-0000374272 00000 n
-0000373947 00000 n
-0000374121 00000 n
+0000376880 00000 n
+0000375047 00000 n
+0000374722 00000 n
+0000374896 00000 n
0000000399 00000 f
0000000401 00000 f
-0000026083 00000 n
+0000026241 00000 n
0000000402 00000 f
0000000611 00000 f
-0000026257 00000 n
-0000026491 00000 n
-0000025936 00000 n
+0000026415 00000 n
+0000026649 00000 n
+0000026094 00000 n
0000023526 00000 n
-0000026430 00000 n
-0000375219 00000 n
-0000375964 00000 n
-0000026916 00000 n
-0000026797 00000 n
-0000026697 00000 n
-0000028410 00000 n
-0000028561 00000 n
-0000028710 00000 n
-0000028862 00000 n
-0000029016 00000 n
-0000029170 00000 n
-0000029324 00000 n
-0000029478 00000 n
-0000029632 00000 n
-0000029791 00000 n
-0000029950 00000 n
+0000026588 00000 n
+0000375994 00000 n
+0000376739 00000 n
+0000027074 00000 n
+0000026955 00000 n
+0000026855 00000 n
+0000028568 00000 n
+0000028719 00000 n
+0000028868 00000 n
+0000029020 00000 n
+0000029174 00000 n
+0000029328 00000 n
+0000029482 00000 n
+0000029636 00000 n
+0000029790 00000 n
+0000029949 00000 n
0000030108 00000 n
-0000030267 00000 n
-0000030426 00000 n
+0000030266 00000 n
+0000030425 00000 n
0000030584 00000 n
-0000030743 00000 n
-0000030902 00000 n
-0000031061 00000 n
-0000031221 00000 n
-0000031381 00000 n
-0000031530 00000 n
-0000031682 00000 n
-0000031834 00000 n
-0000031988 00000 n
-0000032141 00000 n
-0000032290 00000 n
-0000032442 00000 n
-0000034816 00000 n
-0000032660 00000 n
-0000028063 00000 n
-0000026957 00000 n
-0000032599 00000 n
-0000034968 00000 n
-0000035122 00000 n
-0000035276 00000 n
-0000035428 00000 n
-0000035582 00000 n
-0000035736 00000 n
-0000035890 00000 n
-0000036043 00000 n
-0000036202 00000 n
-0000036361 00000 n
-0000036520 00000 n
-0000036674 00000 n
-0000036828 00000 n
-0000036982 00000 n
-0000037141 00000 n
+0000030742 00000 n
+0000030901 00000 n
+0000031060 00000 n
+0000031219 00000 n
+0000031379 00000 n
+0000031539 00000 n
+0000031688 00000 n
+0000031840 00000 n
+0000031992 00000 n
+0000032146 00000 n
+0000032299 00000 n
+0000032448 00000 n
+0000032600 00000 n
+0000034974 00000 n
+0000032818 00000 n
+0000028221 00000 n
+0000027115 00000 n
+0000032757 00000 n
+0000035126 00000 n
+0000035280 00000 n
+0000035434 00000 n
+0000035586 00000 n
+0000035740 00000 n
+0000035894 00000 n
+0000036048 00000 n
+0000036201 00000 n
+0000036360 00000 n
+0000036519 00000 n
+0000036678 00000 n
+0000036832 00000 n
+0000036986 00000 n
+0000037140 00000 n
0000037299 00000 n
-0000037453 00000 n
-0000037612 00000 n
+0000037457 00000 n
+0000037611 00000 n
0000037770 00000 n
-0000037923 00000 n
-0000038078 00000 n
-0000038233 00000 n
-0000038388 00000 n
-0000038542 00000 n
-0000038697 00000 n
-0000038852 00000 n
-0000039007 00000 n
-0000039162 00000 n
-0000039322 00000 n
-0000039482 00000 n
-0000039641 00000 n
-0000039801 00000 n
-0000039961 00000 n
-0000040113 00000 n
-0000040264 00000 n
-0000040416 00000 n
-0000042521 00000 n
-0000040634 00000 n
-0000034389 00000 n
-0000032811 00000 n
-0000040573 00000 n
-0000042680 00000 n
-0000042834 00000 n
-0000042988 00000 n
-0000043142 00000 n
-0000043295 00000 n
-0000043449 00000 n
-0000043603 00000 n
-0000043762 00000 n
-0000043921 00000 n
+0000037928 00000 n
+0000038081 00000 n
+0000038236 00000 n
+0000038391 00000 n
+0000038546 00000 n
+0000038700 00000 n
+0000038855 00000 n
+0000039010 00000 n
+0000039165 00000 n
+0000039320 00000 n
+0000039480 00000 n
+0000039640 00000 n
+0000039799 00000 n
+0000039959 00000 n
+0000040119 00000 n
+0000040271 00000 n
+0000040422 00000 n
+0000040574 00000 n
+0000042679 00000 n
+0000040792 00000 n
+0000034547 00000 n
+0000032969 00000 n
+0000040731 00000 n
+0000042838 00000 n
+0000042992 00000 n
+0000043146 00000 n
+0000043300 00000 n
+0000043453 00000 n
+0000043607 00000 n
+0000043761 00000 n
+0000043920 00000 n
0000044079 00000 n
-0000044233 00000 n
-0000044385 00000 n
-0000044538 00000 n
-0000044692 00000 n
-0000044846 00000 n
-0000045000 00000 n
-0000045154 00000 n
-0000045306 00000 n
-0000045460 00000 n
-0000045614 00000 n
-0000045768 00000 n
-0000045920 00000 n
-0000046074 00000 n
-0000046228 00000 n
-0000046380 00000 n
-0000046535 00000 n
-0000046690 00000 n
-0000046845 00000 n
-0000046998 00000 n
-0000047212 00000 n
-0000042150 00000 n
-0000040813 00000 n
-0000047151 00000 n
-0000376659 00000 n
-0000047643 00000 n
-0000047463 00000 n
-0000047363 00000 n
-0000047582 00000 n
-0000048595 00000 n
-0000048748 00000 n
-0000048901 00000 n
-0000049054 00000 n
-0000049206 00000 n
-0000049481 00000 n
-0000048424 00000 n
-0000047684 00000 n
-0000049359 00000 n
-0000049420 00000 n
-0000084564 00000 n
-0000117552 00000 n
-0000125275 00000 n
-0000208189 00000 n
-0000245598 00000 n
-0000049925 00000 n
-0000049745 00000 n
-0000049645 00000 n
-0000049864 00000 n
-0000050831 00000 n
-0000050983 00000 n
-0000051135 00000 n
-0000051287 00000 n
-0000051439 00000 n
-0000051713 00000 n
-0000050660 00000 n
-0000049966 00000 n
-0000051591 00000 n
-0000051652 00000 n
-0000072215 00000 n
-0000131376 00000 n
-0000142424 00000 n
-0000148943 00000 n
-0000256414 00000 n
-0000052144 00000 n
-0000051964 00000 n
-0000051864 00000 n
-0000052083 00000 n
-0000054529 00000 n
-0000054693 00000 n
-0000054989 00000 n
-0000054382 00000 n
-0000052185 00000 n
-0000054869 00000 n
-0000374731 00000 n
-0000376776 00000 n
-0000055503 00000 n
-0000055323 00000 n
-0000055223 00000 n
-0000055442 00000 n
-0000056228 00000 n
-0000055989 00000 n
-0000055544 00000 n
-0000056108 00000 n
-0000056645 00000 n
-0000056465 00000 n
-0000056365 00000 n
-0000056584 00000 n
-0000058588 00000 n
-0000060632 00000 n
-0000059078 00000 n
-0000058449 00000 n
-0000056686 00000 n
-0000058777 00000 n
-0000061175 00000 n
-0000060493 00000 n
-0000059284 00000 n
-0000060814 00000 n
-0000062881 00000 n
-0000062461 00000 n
-0000061381 00000 n
-0000062580 00000 n
-0000376893 00000 n
-0000064247 00000 n
-0000063828 00000 n
-0000063045 00000 n
-0000063947 00000 n
-0000065088 00000 n
-0000064848 00000 n
-0000064411 00000 n
-0000064967 00000 n
-0000065505 00000 n
-0000065325 00000 n
-0000065225 00000 n
-0000065444 00000 n
-0000068206 00000 n
-0000068357 00000 n
+0000044237 00000 n
+0000044391 00000 n
+0000044543 00000 n
+0000044696 00000 n
+0000044850 00000 n
+0000045004 00000 n
+0000045158 00000 n
+0000045312 00000 n
+0000045464 00000 n
+0000045618 00000 n
+0000045772 00000 n
+0000045926 00000 n
+0000046078 00000 n
+0000046232 00000 n
+0000046386 00000 n
+0000046538 00000 n
+0000046693 00000 n
+0000046848 00000 n
+0000047003 00000 n
+0000047156 00000 n
+0000047370 00000 n
+0000042308 00000 n
+0000040971 00000 n
+0000047309 00000 n
+0000377434 00000 n
+0000047801 00000 n
+0000047621 00000 n
+0000047521 00000 n
+0000047740 00000 n
+0000048753 00000 n
+0000048906 00000 n
+0000049059 00000 n
+0000049212 00000 n
+0000049364 00000 n
+0000049639 00000 n
+0000048582 00000 n
+0000047842 00000 n
+0000049517 00000 n
+0000049578 00000 n
+0000085040 00000 n
+0000118028 00000 n
+0000125872 00000 n
+0000208964 00000 n
+0000246373 00000 n
+0000050083 00000 n
+0000049903 00000 n
+0000049803 00000 n
+0000050022 00000 n
+0000050989 00000 n
+0000051141 00000 n
+0000051293 00000 n
+0000051445 00000 n
+0000051597 00000 n
+0000051871 00000 n
+0000050818 00000 n
+0000050124 00000 n
+0000051749 00000 n
+0000051810 00000 n
+0000072373 00000 n
+0000132152 00000 n
+0000143199 00000 n
+0000149718 00000 n
+0000257189 00000 n
+0000052302 00000 n
+0000052122 00000 n
+0000052022 00000 n
+0000052241 00000 n
+0000054687 00000 n
+0000054851 00000 n
+0000055147 00000 n
+0000054540 00000 n
+0000052343 00000 n
+0000055027 00000 n
+0000375506 00000 n
+0000377551 00000 n
+0000055661 00000 n
+0000055481 00000 n
+0000055381 00000 n
+0000055600 00000 n
+0000056386 00000 n
+0000056147 00000 n
+0000055702 00000 n
+0000056266 00000 n
+0000056803 00000 n
+0000056623 00000 n
+0000056523 00000 n
+0000056742 00000 n
+0000058746 00000 n
+0000060790 00000 n
+0000059236 00000 n
+0000058607 00000 n
+0000056844 00000 n
+0000058935 00000 n
+0000061333 00000 n
+0000060651 00000 n
+0000059442 00000 n
+0000060972 00000 n
+0000063040 00000 n
+0000062620 00000 n
+0000061539 00000 n
+0000062739 00000 n
+0000377668 00000 n
+0000064406 00000 n
+0000063987 00000 n
+0000063204 00000 n
+0000064106 00000 n
+0000065247 00000 n
+0000065007 00000 n
+0000064570 00000 n
+0000065126 00000 n
+0000065664 00000 n
+0000065484 00000 n
+0000065384 00000 n
+0000065603 00000 n
+0000068364 00000 n
+0000068515 00000 n
0000000612 00000 f
0000000613 00000 f
0000000614 00000 f
0000000615 00000 f
0000000616 00000 f
0000000759 00000 f
-0000071692 00000 n
-0000071846 00000 n
-0000072000 00000 n
-0000068749 00000 n
-0000068059 00000 n
-0000065546 00000 n
-0000068509 00000 n
-0000072337 00000 n
-0000071537 00000 n
-0000068913 00000 n
-0000072154 00000 n
-0000375680 00000 n
-0000074838 00000 n
-0000074477 00000 n
-0000072543 00000 n
-0000074596 00000 n
-0000377010 00000 n
-0000078413 00000 n
-0000078050 00000 n
-0000075016 00000 n
-0000078169 00000 n
-0000081434 00000 n
-0000081071 00000 n
-0000078619 00000 n
-0000081190 00000 n
-0000376247 00000 n
-0000084198 00000 n
-0000084350 00000 n
-0000084687 00000 n
-0000084051 00000 n
-0000081640 00000 n
-0000084503 00000 n
-0000116746 00000 n
-0000116899 00000 n
-0000087888 00000 n
-0000117052 00000 n
-0000117210 00000 n
-0000117675 00000 n
-0000087725 00000 n
-0000084865 00000 n
-0000117368 00000 n
-0000117429 00000 n
-0000117490 00000 n
-0000107568 00000 n
-0000107835 00000 n
-0000107882 00000 n
-0000108397 00000 n
-0000108719 00000 n
-0000108981 00000 n
-0000109306 00000 n
-0000109581 00000 n
-0000109852 00000 n
-0000109947 00000 n
-0000113977 00000 n
-0000115535 00000 n
-0000121598 00000 n
-0000121750 00000 n
-0000122202 00000 n
-0000121451 00000 n
-0000117852 00000 n
-0000121899 00000 n
-0000122021 00000 n
-0000122081 00000 n
-0000376391 00000 n
-0000125062 00000 n
-0000125459 00000 n
-0000124923 00000 n
-0000122408 00000 n
-0000125214 00000 n
-0000375823 00000 n
-0000377127 00000 n
-0000131011 00000 n
-0000131163 00000 n
-0000128451 00000 n
-0000128210 00000 n
-0000125692 00000 n
-0000128329 00000 n
-0000131620 00000 n
-0000130864 00000 n
-0000128657 00000 n
-0000131315 00000 n
-0000134004 00000 n
-0000133580 00000 n
-0000131826 00000 n
-0000133699 00000 n
-0000133760 00000 n
-0000133943 00000 n
-0000136511 00000 n
-0000136148 00000 n
-0000134196 00000 n
-0000136267 00000 n
-0000136328 00000 n
-0000136389 00000 n
-0000139193 00000 n
-0000138830 00000 n
-0000136703 00000 n
-0000138949 00000 n
-0000139010 00000 n
-0000142150 00000 n
-0000142547 00000 n
-0000142011 00000 n
-0000139399 00000 n
-0000142302 00000 n
-0000377244 00000 n
-0000145686 00000 n
-0000145506 00000 n
-0000142724 00000 n
-0000145625 00000 n
-0000148669 00000 n
-0000149004 00000 n
-0000148530 00000 n
-0000145892 00000 n
-0000148821 00000 n
-0000374590 00000 n
-0000154287 00000 n
-0000166474 00000 n
-0000166545 00000 n
-0000178771 00000 n
-0000151264 00000 n
-0000150886 00000 n
-0000149224 00000 n
-0000151020 00000 n
-0000192027 00000 n
-0000154153 00000 n
-0000151428 00000 n
-0000191784 00000 n
-0000165300 00000 n
-0000177597 00000 n
-0000190610 00000 n
-0000194757 00000 n
-0000194394 00000 n
-0000192244 00000 n
-0000194513 00000 n
-0000196805 00000 n
-0000196442 00000 n
-0000194935 00000 n
-0000196561 00000 n
-0000377361 00000 n
-0000199845 00000 n
-0000199360 00000 n
-0000196969 00000 n
-0000199479 00000 n
+0000071850 00000 n
+0000072004 00000 n
+0000072158 00000 n
+0000068907 00000 n
+0000068217 00000 n
+0000065705 00000 n
+0000068667 00000 n
+0000072495 00000 n
+0000071695 00000 n
+0000069071 00000 n
+0000072312 00000 n
+0000376455 00000 n
+0000074996 00000 n
+0000074635 00000 n
+0000072701 00000 n
+0000074754 00000 n
+0000377785 00000 n
+0000078722 00000 n
+0000078359 00000 n
+0000075174 00000 n
+0000078478 00000 n
+0000081859 00000 n
+0000081496 00000 n
+0000078928 00000 n
+0000081615 00000 n
+0000377022 00000 n
+0000084674 00000 n
+0000084826 00000 n
+0000085163 00000 n
+0000084527 00000 n
+0000082065 00000 n
+0000084979 00000 n
+0000117222 00000 n
+0000117375 00000 n
+0000088364 00000 n
+0000117528 00000 n
+0000117686 00000 n
+0000118151 00000 n
+0000088201 00000 n
+0000085341 00000 n
+0000117844 00000 n
+0000117905 00000 n
+0000117966 00000 n
+0000108044 00000 n
+0000108311 00000 n
+0000108358 00000 n
+0000108873 00000 n
+0000109195 00000 n
+0000109457 00000 n
+0000109782 00000 n
+0000110057 00000 n
+0000110328 00000 n
+0000110423 00000 n
+0000114453 00000 n
+0000116011 00000 n
+0000122164 00000 n
+0000125506 00000 n
+0000122621 00000 n
+0000122025 00000 n
+0000118328 00000 n
+0000122316 00000 n
+0000122438 00000 n
+0000122499 00000 n
+0000377166 00000 n
+0000125659 00000 n
+0000126056 00000 n
+0000125359 00000 n
+0000122827 00000 n
+0000125811 00000 n
+0000376598 00000 n
+0000377902 00000 n
+0000131787 00000 n
+0000131939 00000 n
+0000129133 00000 n
+0000128892 00000 n
+0000126289 00000 n
+0000129011 00000 n
+0000132395 00000 n
+0000131640 00000 n
+0000129339 00000 n
+0000132091 00000 n
+0000134779 00000 n
+0000134355 00000 n
+0000132601 00000 n
+0000134474 00000 n
+0000134535 00000 n
+0000134718 00000 n
+0000137286 00000 n
+0000136923 00000 n
+0000134971 00000 n
+0000137042 00000 n
+0000137103 00000 n
+0000137164 00000 n
+0000139968 00000 n
+0000139605 00000 n
+0000137478 00000 n
+0000139724 00000 n
+0000139785 00000 n
+0000142925 00000 n
+0000143322 00000 n
+0000142786 00000 n
+0000140174 00000 n
+0000143077 00000 n
+0000378019 00000 n
+0000146461 00000 n
+0000146281 00000 n
+0000143499 00000 n
+0000146400 00000 n
+0000149444 00000 n
+0000149779 00000 n
+0000149305 00000 n
+0000146667 00000 n
+0000149596 00000 n
+0000375365 00000 n
+0000155062 00000 n
+0000167249 00000 n
+0000167320 00000 n
+0000179546 00000 n
+0000152039 00000 n
+0000151661 00000 n
+0000149999 00000 n
+0000151795 00000 n
+0000192802 00000 n
+0000154928 00000 n
+0000152203 00000 n
+0000192559 00000 n
+0000166075 00000 n
+0000178372 00000 n
+0000191385 00000 n
+0000195532 00000 n
+0000195169 00000 n
+0000193019 00000 n
+0000195288 00000 n
+0000197580 00000 n
+0000197217 00000 n
+0000195710 00000 n
+0000197336 00000 n
+0000378136 00000 n
+0000200620 00000 n
+0000200135 00000 n
+0000197744 00000 n
+0000200254 00000 n
0000000760 00000 f
0000000762 00000 f
-0000202788 00000 n
+0000203563 00000 n
0000000763 00000 f
0000000765 00000 f
-0000202962 00000 n
+0000203737 00000 n
0000000766 00000 f
0000000000 00000 f
-0000203136 00000 n
-0000203493 00000 n
-0000202633 00000 n
-0000200065 00000 n
-0000203310 00000 n
-0000205833 00000 n
-0000206351 00000 n
-0000205694 00000 n
-0000203685 00000 n
-0000205985 00000 n
-0000208250 00000 n
-0000208009 00000 n
-0000206515 00000 n
-0000208128 00000 n
-0000209325 00000 n
-0000209145 00000 n
-0000208442 00000 n
-0000209264 00000 n
-0000211412 00000 n
-0000213048 00000 n
-0000225238 00000 n
-0000245267 00000 n
-0000211870 00000 n
-0000211273 00000 n
-0000209489 00000 n
-0000211565 00000 n
-0000377478 00000 n
-0000245721 00000 n
-0000212909 00000 n
+0000203911 00000 n
+0000204268 00000 n
+0000203408 00000 n
+0000200840 00000 n
+0000204085 00000 n
+0000206608 00000 n
+0000207126 00000 n
+0000206469 00000 n
+0000204460 00000 n
+0000206760 00000 n
+0000209025 00000 n
+0000208784 00000 n
+0000207290 00000 n
+0000208903 00000 n
+0000210100 00000 n
+0000209920 00000 n
+0000209217 00000 n
+0000210039 00000 n
+0000212187 00000 n
+0000213823 00000 n
+0000226013 00000 n
+0000246042 00000 n
+0000212645 00000 n
0000212048 00000 n
-0000245416 00000 n
-0000245477 00000 n
-0000245537 00000 n
-0000247243 00000 n
-0000247002 00000 n
-0000245898 00000 n
-0000247121 00000 n
-0000247687 00000 n
-0000247507 00000 n
-0000247407 00000 n
-0000247626 00000 n
-0000249472 00000 n
-0000249929 00000 n
-0000249333 00000 n
-0000247728 00000 n
-0000249624 00000 n
-0000250373 00000 n
-0000250193 00000 n
-0000250093 00000 n
-0000250312 00000 n
-0000253026 00000 n
-0000253418 00000 n
-0000252887 00000 n
-0000250414 00000 n
-0000253175 00000 n
-0000377595 00000 n
-0000256476 00000 n
-0000256234 00000 n
-0000253582 00000 n
-0000256353 00000 n
-0000258904 00000 n
-0000258603 00000 n
-0000256668 00000 n
-0000258722 00000 n
-0000261183 00000 n
-0000260881 00000 n
-0000259068 00000 n
-0000261000 00000 n
-0000262256 00000 n
-0000262076 00000 n
-0000261347 00000 n
-0000262195 00000 n
-0000262700 00000 n
-0000262520 00000 n
-0000262420 00000 n
-0000262639 00000 n
-0000265500 00000 n
-0000265259 00000 n
-0000262741 00000 n
-0000265378 00000 n
-0000377712 00000 n
-0000266884 00000 n
-0000266704 00000 n
-0000265720 00000 n
-0000266823 00000 n
-0000268505 00000 n
-0000268264 00000 n
-0000267062 00000 n
-0000268383 00000 n
-0000268656 00000 n
-0000268679 00000 n
-0000268702 00000 n
-0000268725 00000 n
-0000268840 00000 n
-0000269167 00000 n
-0000269394 00000 n
-0000373500 00000 n
-0000269855 00000 n
-0000270739 00000 n
-0000270831 00000 n
-0000270998 00000 n
-0000271676 00000 n
-0000272063 00000 n
-0000272208 00000 n
-0000272231 00000 n
-0000272704 00000 n
-0000272937 00000 n
-0000273623 00000 n
-0000275228 00000 n
-0000275441 00000 n
-0000276831 00000 n
-0000277046 00000 n
-0000279228 00000 n
-0000279479 00000 n
-0000281513 00000 n
-0000281745 00000 n
-0000286483 00000 n
-0000286750 00000 n
-0000290108 00000 n
-0000290363 00000 n
-0000291763 00000 n
-0000291992 00000 n
-0000294006 00000 n
-0000294308 00000 n
-0000304481 00000 n
-0000305039 00000 n
-0000306459 00000 n
-0000306690 00000 n
-0000309773 00000 n
-0000310017 00000 n
-0000313557 00000 n
-0000313802 00000 n
-0000316205 00000 n
-0000316472 00000 n
-0000331640 00000 n
-0000332053 00000 n
-0000351476 00000 n
-0000352032 00000 n
-0000366779 00000 n
-0000367174 00000 n
-0000373240 00000 n
-0000377805 00000 n
-0000377923 00000 n
-0000378033 00000 n
-0000378103 00000 n
-0000386921 00000 n
-0000387105 00000 n
-0000387290 00000 n
-0000387475 00000 n
-0000387663 00000 n
-0000387830 00000 n
-0000388000 00000 n
-0000388168 00000 n
-0000388336 00000 n
-0000388506 00000 n
-0000388675 00000 n
-0000388845 00000 n
-0000389014 00000 n
-0000389184 00000 n
-0000389349 00000 n
-0000389528 00000 n
-0000389729 00000 n
-0000389925 00000 n
-0000390129 00000 n
-0000390339 00000 n
-0000390543 00000 n
-0000390745 00000 n
-0000390947 00000 n
-0000391149 00000 n
-0000391363 00000 n
-0000391600 00000 n
-0000391836 00000 n
-0000392082 00000 n
-0000392326 00000 n
-0000392568 00000 n
-0000392768 00000 n
-0000392879 00000 n
-0000392987 00000 n
+0000210264 00000 n
+0000212340 00000 n
+0000378253 00000 n
+0000246496 00000 n
+0000213684 00000 n
+0000212823 00000 n
+0000246191 00000 n
+0000246252 00000 n
+0000246312 00000 n
+0000248018 00000 n
+0000247777 00000 n
+0000246673 00000 n
+0000247896 00000 n
+0000248462 00000 n
+0000248282 00000 n
+0000248182 00000 n
+0000248401 00000 n
+0000250247 00000 n
+0000250704 00000 n
+0000250108 00000 n
+0000248503 00000 n
+0000250399 00000 n
+0000251148 00000 n
+0000250968 00000 n
+0000250868 00000 n
+0000251087 00000 n
+0000253801 00000 n
+0000254193 00000 n
+0000253662 00000 n
+0000251189 00000 n
+0000253950 00000 n
+0000378370 00000 n
+0000257251 00000 n
+0000257009 00000 n
+0000254357 00000 n
+0000257128 00000 n
+0000259679 00000 n
+0000259378 00000 n
+0000257443 00000 n
+0000259497 00000 n
+0000261958 00000 n
+0000261656 00000 n
+0000259843 00000 n
+0000261775 00000 n
+0000263031 00000 n
+0000262851 00000 n
+0000262122 00000 n
+0000262970 00000 n
+0000263475 00000 n
+0000263295 00000 n
+0000263195 00000 n
+0000263414 00000 n
+0000266275 00000 n
+0000266034 00000 n
+0000263516 00000 n
+0000266153 00000 n
+0000378487 00000 n
+0000267659 00000 n
+0000267479 00000 n
+0000266495 00000 n
+0000267598 00000 n
+0000269280 00000 n
+0000269039 00000 n
+0000267837 00000 n
+0000269158 00000 n
+0000269431 00000 n
+0000269454 00000 n
+0000269477 00000 n
+0000269500 00000 n
+0000269615 00000 n
+0000269942 00000 n
+0000270169 00000 n
+0000374275 00000 n
+0000270630 00000 n
+0000271514 00000 n
+0000271606 00000 n
+0000271773 00000 n
+0000272451 00000 n
+0000272838 00000 n
+0000272983 00000 n
+0000273006 00000 n
+0000273479 00000 n
+0000273712 00000 n
+0000274398 00000 n
+0000276003 00000 n
+0000276216 00000 n
+0000277606 00000 n
+0000277821 00000 n
+0000280003 00000 n
+0000280254 00000 n
+0000282288 00000 n
+0000282520 00000 n
+0000287258 00000 n
+0000287525 00000 n
+0000290883 00000 n
+0000291138 00000 n
+0000292538 00000 n
+0000292767 00000 n
+0000294781 00000 n
+0000295083 00000 n
+0000305256 00000 n
+0000305814 00000 n
+0000307234 00000 n
+0000307465 00000 n
+0000310548 00000 n
+0000310792 00000 n
+0000314332 00000 n
+0000314577 00000 n
+0000316980 00000 n
+0000317247 00000 n
+0000332415 00000 n
+0000332828 00000 n
+0000352251 00000 n
+0000352807 00000 n
+0000367554 00000 n
+0000367949 00000 n
+0000374015 00000 n
+0000378580 00000 n
+0000378698 00000 n
+0000378808 00000 n
+0000378878 00000 n
+0000387696 00000 n
+0000387880 00000 n
+0000388065 00000 n
+0000388250 00000 n
+0000388438 00000 n
+0000388605 00000 n
+0000388775 00000 n
+0000388943 00000 n
+0000389111 00000 n
+0000389281 00000 n
+0000389450 00000 n
+0000389620 00000 n
+0000389789 00000 n
+0000389959 00000 n
+0000390124 00000 n
+0000390303 00000 n
+0000390504 00000 n
+0000390700 00000 n
+0000390904 00000 n
+0000391114 00000 n
+0000391318 00000 n
+0000391520 00000 n
+0000391722 00000 n
+0000391924 00000 n
+0000392138 00000 n
+0000392375 00000 n
+0000392611 00000 n
+0000392857 00000 n
0000393101 00000 n
-0000393223 00000 n
-0000393342 00000 n
-0000393447 00000 n
-0000393485 00000 n
-0000393684 00000 n
+0000393343 00000 n
+0000393543 00000 n
+0000393654 00000 n
+0000393762 00000 n
+0000393876 00000 n
+0000393998 00000 n
+0000394117 00000 n
+0000394222 00000 n
+0000394260 00000 n
+0000394459 00000 n
trailer
<< /Size 951
/Root 949 0 R
/Info 950 0 R
-/ID [<729A22BACE99547932F2802F9D472DE1> <729A22BACE99547932F2802F9D472DE1>] >>
+/ID [<5A6930179BED965283065517C55F432D> <5A6930179BED965283065517C55F432D>] >>
startxref
-394020
+394795
%%EOF
diff --git a/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex b/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
index 6674523648b..9cb76588f6e 100644
--- a/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
+++ b/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
@@ -13,6 +13,7 @@
\incsubversion{\makedate{31}{05}{2013}}{Fixing some grammar and syntax problems.}{\upmpublic}
\incsubversion{\makedate{06}{07}{2013}}{Add the macro \texttt{{\textbackslash}ifdocumentauthor}.}{\upmpublic}
\incsubversion{\makedate{15}{08}{2013}}{Add the macros: \texttt{{\textbackslash}textup}, \texttt{{\textbackslash}textsubscript}, \texttt{{\textbackslash}textdown}, \texttt{{\textbackslash}textsubscript}, \texttt{{\textbackslash}Emph}. Add the environments \texttt{enumdescription}, \texttt{enumdescriptionx}.}{\upmpublic}
+\incsubversion{\makedate{17}{08}{2013}}{Update the second parameter of \texttt{{\textbackslash}mfigurewtex} to have the same semantic as for \texttt{{\textbackslash}mfigure}.}{\upmpublic}
\addauthorvalidator*[galland@arakhne.org]{St{\'e}phane}{Galland}{Original Author}
@@ -178,7 +179,7 @@ This section contains the list of all the package dependencies for the \texttt{u
\item \texttt{pifont}
\item \texttt{setspace}
\item \texttt{txfonts}
-\item \texttt{keyval}
+\item \texttt{xkeyval}
\item \texttt{hyphenat}
\end{itemize}
@@ -401,14 +402,14 @@ To redefine these extensions, you must invoke:\\
\section{Figures}
It may be verbose to put \LaTeX\ code to include a figure inside your document. To simplify your life, you could include a figure with the following macros: \\
-\texttt{{\textbackslash}mfigure[position]\{options\}\{filename\}\{caption\}\{label\}} \\
-\texttt{{\textbackslash}mfigure*[position]\{options\}\{filename\}\{caption\}\{label\}} \\
+\texttt{{\textbackslash}mfigure[position]\{include\_graphics\_options\}\{filename\}\{caption\}\{label\}} \\
+\texttt{{\textbackslash}mfigure*[position]\{include\_graphics\_options\}\{filename\}\{caption\}\{label\}} \\
These two macros permits to include an image in your document. The parameters are:
\begin{itemize}
\item \texttt{position}: is the desired position of the figure (see {\textbackslash}begin\{figure\}[position]). It could be \texttt{t} (top of the page), \texttt{b} (bottom of the page), \texttt{h} (at the macro location if possible) or \texttt{H} (at macro location);
-\item \texttt{options}: are the options passed to \texttt{{\textbackslash}includegraphics};
+\item \texttt{include\_graphics\_options}: are the options passed to \texttt{{\textbackslash}includegraphics};
\item \texttt{filename}: is the filename passed to \texttt{{\textbackslash}includegraphics};
@@ -506,14 +507,14 @@ Figure~\figref{figure_and_tex} gives an example of a floating figure combined wi
\subsection{Floating figure with embedded \TeX\ macros}
To put a floating figure with \TeX\xspace macro inside, you may use one of the macros:
-\texttt{{\textbackslash}mfigurewtex[position]\{width\}\{filename\}\{caption\}\{label\}} \\
-\texttt{{\textbackslash}mfigurewtex*[position]\{width\}\{filename\}\{caption\}\{label\}}
+\texttt{{\textbackslash}mfigurewtex[position]\{include\_graphics\_options\}\{filename\}\{caption\}\{label\}} \\
+\texttt{{\textbackslash}mfigurewtex*[position]\{include\_graphics\_options\}\{filename\}\{caption\}\{label\}}
The parameters are:
\begin{itemize}
\item \texttt{position}: is the desired position of the figure (see {\textbackslash}begin{figure}[position]). It could be \texttt{t} (top of the page), \texttt{b} (bottom of the page), \texttt{h} (at the macro location if possible) or \texttt{H} (at macro location);
-\item \texttt{width}: is the width length of the figure;
+\item \texttt{include\_graphics\_options}: are the options to pass to \texttt{{\textbackslash}includegraphicswtex}. For ascendent compatibility, if you pass a length without a key, e.g. \texttt{\{.8{\textbackslash}linewidth\}}, the length is assumed to be the width of the figure;
\item \texttt{filename}: is the name of the file of the figure (see \texttt{{\textbackslash}includegraphicswtex} for details);
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls
index e6c94c2816a..3ff04be2020 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls
@@ -1,6 +1,6 @@
% Document class for Unified Process Methodology
%
-% Copyright (c) 2006-2009 Stephane GALLAND <galland@arakhne.org>
+% Copyright (c) 2006-2013 Stephane GALLAND <galland@arakhne.org>
%
% This program is free library; you can redistribute it and/or modify
% it under the terms of the GNU Lesser General Public License as
@@ -17,7 +17,7 @@
% write to the Free Software Foundation, Inc., 59 Temple Place - Suite
% 330, Boston, MA 02111-1307, USA.
-\global\edef\upm@package@docclazz@ver{2013/05/17}
+\global\edef\upm@package@docclazz@ver{2013/08/15}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{upmethodology-document}[\upm@package@docclazz@ver]
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
index db7d1e20c61..9e5c1ca4c24 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
@@ -17,7 +17,7 @@
% write to the Free Software Foundation, Inc., 59 Temple Place - Suite
% 330, Boston, MA 02111-1307, USA.
-\global\edef\upm@package@fmt@ver{2013/08/15}
+\global\edef\upm@package@fmt@ver{2013/08/17}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-fmt}[\upm@package@fmt@ver]
@@ -84,7 +84,7 @@
\upm@lang@@
-\RequirePackage[final]{graphicx}
+\RequirePackage{graphicx}
\RequirePackage{subfigure}
\RequirePackage{tabularx}
\RequirePackage{multicol}
@@ -96,7 +96,7 @@
\RequirePackage{varioref}
\RequirePackage{txfonts}
\RequirePackage{relsize}
-\RequirePackage{keyval}
+\RequirePackage{xkeyval}
\RequirePackage{hyphenat}
%----------------------------------------
@@ -230,64 +230,65 @@
% http://www.arakhne.org/autolatex
%
-% Private macros for \includegraphicswtex
-\providecommand{\upm@figtex@includewtex@extensions}{}
-\define@key{upmethodologyincludewtex}{width}{%
- \gdef\upm@figtex@includewtex@width{#1}%
-}
-\define@key{upmethodologyincludewtex}{height}{%
- \gdef\upm@figtex@includewtex@height{#1}%
+%-----
+%\DeclareGraphicsExtensionsWtex{coma separated extensions}
+\providecommand{\DeclareGraphicsExtensionsWtex}[1]{%
+ \xdef\@autolatex@wtfig@extensions{\zap@space#1 \@empty}%
}
+\DeclareGraphicsExtensionsWtex{.pdftex_t,.pstex_t,.pdf_tex,.ps_tex}
-%
-\newcommand{\upm@figtex@includewtex@searchinpath}[1]{%
+\providecommand{\@autolatex@wtfig@searchinpath}[1]{%
\IfFileExists{#1}{%
- \protected@edef\upm@figtex@includewtex@cmd{\protect\resizebox{\upm@figtex@includewtex@width}{\upm@figtex@includewtex@height}{\protect\input{#1}}}%
+ \protected@edef\@autolatex@wtfig@tmp{\protect\resizebox{\@autolatex@wtfig@width}{\@autolatex@wtfig@height}{\protect\input{#1}}}%
}{%
- \@for\upm@figtex@includewtex@pathtmp:=\Ginput@path\do{%
- \ifx\upm@figtex@includewtex@cmd\relax%
- \IfFileExists{\upm@figtex@includewtex@pathtmp#1}{%
- \protected@edef\upm@figtex@includewtex@cmd{\protect\resizebox{\upm@figtex@includewtex@width}{\upm@figtex@includewtex@height}{\protect\input{\upm@figtex@includewtex@pathtmp#1}}}%
+ \@for\@autolatex@wtfig@pathtmp:=\Ginput@path\do{%
+ \ifx\@autolatex@wtfig@tmp\relax%
+ \IfFileExists{\@autolatex@wtfig@pathtmp#1}{%
+ \protected@edef\@autolatex@wtfig@tmp{\protect\resizebox{\@autolatex@wtfig@width}{\@autolatex@wtfig@height}{\protect\input{\@autolatex@wtfig@pathtmp#1}}}%
}{}%
\fi%
}%
}%
}
-%-----
-%\DeclareGraphicsExtensionsWtex{coma separated extensions}
-\providecommand{\DeclareGraphicsExtensionsWtex}[1]{%
- \xdef\upm@figtex@includewtex@extensions{\zap@space#1 \@empty}%
+\define@key[autolatex]{withtex}{width}{%
+ \gdef\@autolatex@wtfig@width{#1}%
+}
+\define@key[autolatex]{withtex}{height}{%
+ \gdef\@autolatex@wtfig@height{#1}%
}
-\DeclareGraphicsExtensionsWtex{.pdftex_t,.pstex_t,.pdf_tex,.ps_tex}
%-----
-%\includefigurewtex{width=xx,height=yy}{filename}
-\providecommand{\includegraphicswtex}[2][width=\linewidth]{%
+%\includefigurewtex[width=xx,height=yy]{filename}
+\providecommand{\includefigurewtex}[2][width=\linewidth]{%
\begingroup%
- \gdef\upm@figtex@includewtex@width{!}
- \gdef\upm@figtex@includewtex@height{!}
- \setkeys{upmethodologyincludewtex}{#1}%
+ \gdef\@autolatex@wtfig@width{!}%
+ \gdef\@autolatex@wtfig@height{!}%
+ \setkeys[autolatex]{withtex}{#1}%
%
- \global\let\upm@figtex@includewtex@cmd\relax%
+ \global\let\@autolatex@wtfig@tmp\relax%
+ \global\let\@autolatex@wtfig@ext\relax%
+ \global\let\@autolatex@wtfig@path\relax%
\filename@parse{#2}%
\ifx\filename@ext\relax%
- \@for\upm@figtex@includewtex@exttmp:=\upm@figtex@includewtex@extensions\do{%
- \upm@figtex@includewtex@searchinpath{#2\upm@figtex@includewtex@exttmp}%
+ \@for\@autolatex@wtfig@exttmp:=\@autolatex@wtfig@extensions\do{%
+ \@autolatex@wtfig@searchinpath{#2\@autolatex@wtfig@exttmp}%
}%
\else%
- \upm@figtex@includewtex@searchinpath{#2}%
+ \@autolatex@wtfig@searchinpath{#2\@autolatex@wtfig@exttmp}%
\fi%
%
- \ifx\upm@figtex@includewtex@cmd\relax%
+ \ifx\@autolatex@wtfig@tmp\relax%
\errmessage{Package autolatex: File not found '#2', needed for figure inclusion.}%
\else%
- \upm@figtex@includewtex@cmd%
+ \@autolatex@wtfig@tmp%
\fi%
%
\endgroup%
}
+\global\let\includegraphicswtex\includefigurewtex
+
%----------------------------------------
% ENVIRONMENT FOR IMAGES INCLUDING TeX EXPRESSIONS
%----------------------------------------
@@ -313,10 +314,21 @@
\global\protected@edef\upm@figtex@dyncaption@remove{\upm@figtex@dyncaption@remove\protect\upm@figtex@figremove{#1}}%
}
+\let\upm@fmt@figtex@nil\@nil
+\def\upm@fmt@figtex@parseparams#1=#2\upm@fmt@figtex@nil{\gdef\@tmp{#2}}
+
\newcommand{\upm@mfigurewtex}[5][ht]{
\begin{figure}[#1]%
\begin{center}%
- \includegraphicswtex[width=#2]{#3}%
+ % Providing an ascendent compatibility on the second parameter:
+ % - Prefered value of the parameter: a list of key/value pairs;
+ % - Old fashion value of the parameter: the value for the "width" key.
+ {\upm@fmt@figtex@parseparams #2====\upm@fmt@figtex@nil}%
+ \ifthenelse{\equal{\@tmp}{===}}{%
+ \includegraphicswtex[width=#2]{#3}%
+ }{%
+ \includegraphicswtex[#2]{#3}%
+ }%
\caption{#4}%
\label{fig:#5}%
\end{center}%
@@ -326,7 +338,15 @@
\newcommand{\upm@mfigurewtexstar}[5][ht]{
\begin{figure*}[#1]%
\begin{center}%
- \includegraphicswtex[width=#2]{#3}%
+ % Providing an ascendent compatibility on the second parameter:
+ % - Prefered value of the parameter: a list of key/value pairs;
+ % - Old fashion value of the parameter: the value for the "width" key.
+ {\upm@fmt@figtex@parseparams #2====\upm@fmt@figtex@nil}%
+ \ifthenelse{\equal{\@tmp}{===}}{%
+ \includegraphicswtex[width=#2]{#3}%
+ }{%
+ \includegraphicswtex[#2]{#3}%
+ }%
\caption{#4}%
\label{fig:#5}%
\end{center}%
@@ -334,7 +354,7 @@
\upm@figtex@restore%
}
%-----
-%\mfigurewtex[position]{width}{filename}{caption}{label}
+%\mfigurewtex[position]{options}{filename}{caption}{label}
\def\mfigurewtex{\@ifstar\upm@mfigurewtexstar\upm@mfigurewtex}
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 807c54a6698..eea5cf4decf 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -741,7 +741,7 @@ sub do_tlp {
# the first one we come across, since we'll only find the first one
# on CTAN and we don't want to try to match subdir suffixes.
next if grep { $_ eq $basefile } @tl_basefiles;
-warn "checking tl file $file -> $basefile\n";
+#warn "checking tl file $file -> $basefile\n";
push (@tl_basefiles, $basefile);
# No point in comparing our pdfs now, too many are different.
@@ -774,7 +774,7 @@ warn "checking tl file $file -> $basefile\n";
}
chomp (my @ctan_files = `find $ctan_dir/ -name $basefile`);
-warn "ctan find $basefile: @ctan_files\n";
+#warn "ctan find $basefile: @ctan_files\n";
# the trailing / is so we dereference a symlink on CTAN.
next if @ctan_files > 1; # if more than one file by same name, skip
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 5d50e723c74..92db576c761 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -303,6 +303,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'cweb', "die 'skipping, programs'",
'cwpuzzle', "die 'skipping, in crossword package'",
'cyklop', "&MAKEcopy",
+ 'datatooltk', "die 'skipping, Java installation'",
'dejavu', "&MAKEcopy",
'deleq', "die 'skipping, nosell license'",
'deproc', "die 'skipping, for latex 2.09'",
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 12:47:36 +0000