summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-11-14 03:01:05 +0000
committerNorbert Preining <norbert@preining.info>2023-11-14 03:01:05 +0000
commite20928a0f9f4a7faa8bb21915e761e11e34f04ff (patch)
tree32b28652fc038d4e06485fe1eb5a25517d15ef87 /macros/latex
parent88ed039ed13674ce7440cc57dba288cf166796fe (diff)
CTAN sync 202311140301
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/abntexto/README4
-rw-r--r--macros/latex/contrib/abntexto/abntexto.cls410
-rw-r--r--macros/latex/contrib/abntexto/abntexto.pdfbin219363 -> 258189 bytes
-rw-r--r--macros/latex/contrib/abntexto/abntexto.tex101
-rw-r--r--macros/latex/contrib/bfh-ci/DEPENDS.txt26
-rw-r--r--macros/latex/contrib/bfh-ci/README.md7
-rw-r--r--macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer-Sidebar.pdfbin50847 -> 50827 bytes
-rw-r--r--macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer.pdfbin40858 -> 40946 bytes
-rw-r--r--macros/latex/contrib/bfh-ci/doc/DEMO-BFHFactsheet.pdfbin50392 -> 50392 bytes
-rw-r--r--macros/latex/contrib/bfh-ci/doc/DEMO-BFHLetter.pdfbin13805 -> 13777 bytes
-rw-r--r--macros/latex/contrib/bfh-ci/doc/DEMO-BFHProjektProposal.pdfbin57404 -> 57401 bytes
-rw-r--r--macros/latex/contrib/bfh-ci/doc/DEMO-BFHPub.pdfbin92276 -> 92276 bytes
-rw-r--r--macros/latex/contrib/bfh-ci/doc/DEMO-BFHSciPoster.pdfbin46637 -> 46618 bytes
-rw-r--r--macros/latex/contrib/bfh-ci/doc/DEMO-BFHThesis.pdfbin41534 -> 41534 bytes
-rw-r--r--macros/latex/contrib/bfh-ci/example/DEMO-BFHSciPoster.tex36
-rw-r--r--macros/latex/contrib/bfh-ci/tex/beamercolorthemeBFH.sty4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/beamerfontthemeBFH.sty4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/beamerinnerthemeBFH.sty4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH-sidebar.sty4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH.sty4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/beamerthemeBFH.sty4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-a0paper.clo4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-a1paper.clo4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-a2paper.clo4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-a3paper.clo4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-a4paper.clo4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-a5paper.clo4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-a6paper.clo2
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-beamerarticle.cfg4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-factsheet.cfg4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-layout-boxes.cfg4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-layout-listings.cfg4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-layout-rules.cfg4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-layout-tabular.cfg4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-layout-terminal.cfg4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfh-projectproposal.cfg4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhbeamer.cls4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhcolors.sty4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhfonts.sty4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhhkb-doc.cfg311
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhlayout.sty9
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhletter.sty4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhlettersize9.5pt.clo2
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhmodule.sty5
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhpub.cls5
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhsciposter.cls4
-rw-r--r--macros/latex/contrib/bfh-ci/tex/bfhthesis.cls10
-rw-r--r--macros/latex/contrib/diffcoeff/README.txt18
-rw-r--r--macros/latex/contrib/diffcoeff/diffcoeff.pdf6986
-rw-r--r--macros/latex/contrib/diffcoeff/diffcoeff.sty67
-rw-r--r--macros/latex/contrib/diffcoeff/diffcoeff.tex298
-rw-r--r--macros/latex/contrib/hfutexam/CHANGELOG.md3
-rw-r--r--macros/latex/contrib/hfutexam/hfutexam.cls6
-rw-r--r--macros/latex/contrib/hfutexam/hfutexam.pdfbin217180 -> 217066 bytes
-rw-r--r--macros/latex/contrib/hfutexam/hfutexam.tex2
-rw-r--r--macros/latex/contrib/hfutexam/hfutexam_simple.pdfbin112298 -> 112305 bytes
-rw-r--r--macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdfbin9664421 -> 9706655 bytes
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCCAN.tex2
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCCalculsFractions.tex40
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCCalculsFractionsoldv1.tex192
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCCritere.tex127
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex24
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCDefiCalc.tex13
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCDefiTables.tex2
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCDistributivite.tex20
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCEcrireunQCM.tex32
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCErathostene.tex80
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCFractionNombre.tex30
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCGeometrie.tex6
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCKakuro.tex2
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCKenKen.tex2
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCMotsCodes.tex4
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCNotionFonction.tex24
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCNumberHive.tex6
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCProgrammeCalcul.tex157
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCProprietesDroites.tex34
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCPythagore.tex41
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCQuestionsFlash.tex1
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCQuestionsRelier.tex11
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCRangementNombres.tex41
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCRapido.tex1
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCReperage.tex743
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCRepresenterFraction.tex2
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCRepresenterTableur.tex6
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex97
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCSommeAngles.tex2
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCStatistiques.tex13
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCTableauxUnites.tex48
-rw-r--r--macros/latex/contrib/profcollege/latex/ProfCollege.sty68
-rw-r--r--macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp11
-rw-r--r--macros/latex/contrib/profcollege/metapost/PfCScratch.mp22
-rw-r--r--macros/latex/contrib/sim-os-menus/README.md7
-rw-r--r--macros/latex/contrib/sim-os-menus/doc/sim-os-menus-doc.pdfbin0 -> 399589 bytes
-rw-r--r--macros/latex/contrib/sim-os-menus/doc/sim-os-menus-doc.tex362
-rw-r--r--macros/latex/contrib/sim-os-menus/tex/sim-os-menus.sty469
-rw-r--r--macros/latex/contrib/tagpdf/README.md4
-rw-r--r--macros/latex/contrib/tagpdf/ex-AF-file.pdf24
-rw-r--r--macros/latex/contrib/tagpdf/ex-alt-actualtext.pdfbin34295 -> 34295 bytes
-rw-r--r--macros/latex/contrib/tagpdf/ex-attribute.pdf14
-rw-r--r--macros/latex/contrib/tagpdf/ex-formula-problem.pdf14
-rw-r--r--macros/latex/contrib/tagpdf/ex-list.pdf14
-rw-r--r--macros/latex/contrib/tagpdf/ex-mc-manual-para-split-obsolete.pdf14
-rw-r--r--macros/latex/contrib/tagpdf/ex-softhyphen.pdf14
-rw-r--r--macros/latex/contrib/tagpdf/ex-spaceglyph-listings.pdf14
-rw-r--r--macros/latex/contrib/tagpdf/ex-structure-obsolete.pdf14
-rw-r--r--macros/latex/contrib/tagpdf/ex-tagpdf-template.pdf50
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-backend.dtx8
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-checks.dtx4
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-code.pdfbin1610585 -> 1610615 bytes
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-data.dtx18
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx6
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx6
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx4
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-roles.dtx4
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-space.dtx4
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-struct.dtx6
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-tree.dtx4
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf-user.dtx4
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf.dtx10
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf.pdfbin1092932 -> 1092921 bytes
-rw-r--r--macros/latex/contrib/tagpdf/tagpdf.tex17
-rw-r--r--macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty2
-rw-r--r--macros/latex/contrib/xcolor/ChangeLog11
-rw-r--r--macros/latex/contrib/xcolor/README.md4
-rw-r--r--macros/latex/contrib/xcolor/xcolor-2022-06-12.sty1465
-rw-r--r--macros/latex/contrib/xcolor/xcolor.dtx428
-rw-r--r--macros/latex/contrib/xcolor/xcolor.pdfbin864625 -> 863950 bytes
-rw-r--r--macros/latex/contrib/xcolor/xcolor2.pdfbin91583 -> 91691 bytes
128 files changed, 8260 insertions, 5071 deletions
diff --git a/macros/latex/contrib/abntexto/README b/macros/latex/contrib/abntexto/README
index 9392f77fc8..8a02781587 100644
--- a/macros/latex/contrib/abntexto/README
+++ b/macros/latex/contrib/abntexto/README
@@ -1,6 +1,6 @@
Public Domain Software
-2023-10-13
-3.0.2-beta
+2023-11-13
+3.1.0-beta
Elayson Abreu
abntexto.classe@gmail.com
diff --git a/macros/latex/contrib/abntexto/abntexto.cls b/macros/latex/contrib/abntexto/abntexto.cls
index 4cb87e638b..bdfd09ff5e 100644
--- a/macros/latex/contrib/abntexto/abntexto.cls
+++ b/macros/latex/contrib/abntexto/abntexto.cls
@@ -1,6 +1,6 @@
%! Public Domain Software
-%! 2023-10-13
-%! 3.0.2-beta
+%! 2023-11-13
+%! 3.1.0-beta
%! Elayson Abreu
%! abntexto.classe@gmail.com
@@ -27,25 +27,25 @@
% Identificação do formato \TeX\ e da classe, carregando a classe |article| e os únicos pacotes do |abntexto|.
-% \begin{code} !------------------------------------------------
+% \begin{code}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{abntexto}[2023-10-13 3.0.2-beta Preparation of works in ABNT standards]
+\ProvidesClass{abntexto}[2023-11-13 3.1.0-beta Preparation of works in ABNT standards]
\LoadClass{article}
\RequirePackage{geometry}
\RequirePackage{graphicx}
-% \end{code} !------------------------------------------------
+% \end{code}
% Um atalho para |\ClassError|.
-% \begin{code} !------------------------------------------------
+% \begin{code}
\def\tnba@error#1{\ClassError{abntexto}{#1}{}}
-% \end{code} !------------------------------------------------
+% \end{code}
% Condicionais para identificação da extensão TeX.
-% \begin{code} !------------------------------------------------
+% \begin{code}
\newif \iftnba@PDFTEX
\newif \iftnba@XETEX
\newif \iftnba@LUATEX
@@ -54,58 +54,38 @@
\tnba@PDFTEXtrue \else
\tnba@XETEXtrue \fi \else
\tnba@LUATEXtrue \fi
-% \end{code} !------------------------------------------------
+% \end{code}
% \sec FONTE TIPOGRÁFICA
-% Apenas o tamanho 12\,pt está definido. Defina outros usando |\definefontsize{<id>}{<definições>}|.
-
-% \begin{code} !------------------------------------------------
-\def\definefontsize#1#2{\@namedef{tnba@fontsize@#1}{#2}}
-\def\setfontsize#1{\ifcsname tnba@fontsize@#1\endcsname
- \def\tnba@setfontsizehook{\csname tnba@fontsize@#1\endcsname}\else
- \tnba@error{Tamanho de fonte "#1" desconhecido. Defina um novo usando \noexpand\definefontsize}\fi
-}
-
-\@onlypreamble \definefontsize
-\@onlypreamble \setfontsize
+% O tamanho 12\,pt foi definido ao final deste manual e é o tamanho padrão da classe. Com ele foi definido um tamanho menor |\small|.
+% \begin{code}
\def\sizedef#1#2#3#4{\DeclareRobustCommand#1{\fontsize{#2}{#3}\selectfont#4\relax}}
\def\spacing#1{\def\currspacing{#1}%
\@tempdima=\f@size pt \baselineskip=#1\@tempdima \ignorespaces
}
-\def\currspacing{1.5}
-\def\tnba@setfontsizehook{}
-
\AddToHook{begindocument}{%
- \tnba@setfontsizehook
- \normalsize
- \@tempdima=\f@size pt \baselineskip=\currspacing\@tempdima
+ \@tempdima=\f@size pt \baselineskip=\currspacing\@tempdima \relax
}
\def\singlesp{\baselineskip=\normalbaselineskip}
\def\onehalfsp{\spacing{1.5}}
\def\doublesp{\spacing{2}}
-% \end{code} !------------------------------------------------
+% \end{code}
% \sec \emph{LAYOUT}
% O estilo de página |\pretextual| omite a numeração de página e desliga o modo |twoside| porque os elementos pré-textuais que compreendem as folhas da capa à do sumário, devem constar no anverso da página, ou seja, na “frente” da folha.
-% A instrução |\textual| põe a numeração de página no topo direito nas páginas ímpares e no topo esquerdo em paginas pares. Além disso, |twoside| vai espelhar as margens horizontais.
+% A instrução |\textual| põe a numeração de página no topo direito nas páginas ímpares e no topo esquerdo em páginas pares. Além disso, |twoside| vai espelhar as margens horizontais.
+
+% Por algum motivo, |\newgeometry| reseta |\baselineskip| e |\parindent|, então temos de repetir estas instruções.
-% \begin{code} !------------------------------------------------
+% \begin{code}
\def\pretextual{%
- \newgeometry{
- twoside=false,
- left = 3cm,
- top = 3cm,
- right = 2cm,
- bottom = 2cm
- }%
- \spacing{1.5}%
\let\@oddhead=\empty
\let\@evenhead=\empty
\let\@oddfoot=\empty
@@ -120,38 +100,37 @@
bottom = 2cm
}%
\spacing{1.5}%
+ \parindent=1.5cm
\def\@oddhead{\hfil\small\thepage}%
\def\@evenhead{\small\thepage\hfil}%
- \def\@oddfoot{}%
- \def\@evenfoot{}%
- \parindent=1.5cm
}
-% \end{code} !------------------------------------------------
+% \end{code}
% \sec SUMÁRIO
% Aqui, a macro |\extline| foi baseada em |\@dottedtocline|, do kernel do LaTeX. Ela não é uma instrução privada, ou seja, com prefixo interno, porque existe a chance de o leitor querer redefiní-la.
-% \begin{code} !------------------------------------------------
+% \begin{code}
\def\extpagenumwidth{1.55em}
\def\extrightmargin{2.55em}
\def\extline#1#2#3#4#5{%
\begingroup
- \parindent=0pt \leftskip=#1
+ \parindent=0pt \leftskip=#1\relax
\rightskip=\extrightmargin\relax \parfillskip=-\rightskip
- #3{\advance\leftskip#2\relax \hskip-#2\relax #4}%
+ #3{\global\advance\leftskip#2\relax \hskip-#2\relax #4}%
\nobreak\extleaders\nobreak
\hbox to\extpagenumwidth{\hfil #5\kern-1pt\kern1pt}\nbpar
\endgroup
+ \global\leftskip=0pt
}
\def\extleaders{\leaders\hbox{$\mathsurround=0pt \mkern4.5mu\hbox{.}\mkern4.5mu$}\hfill}
\def \l@part {\addpenalty{-300}\addvspace{2.25em plus1pt}%
\extline{0pt}{\toclabelwidth}{\def\extleaders{\hfil}\tocpartfont}}
\def \l@chapter {\addpenalty{-300}\addvspace{1em plus1pt}%
- \extline{0pt}{\toclabelwidth}{\def\extleaders{\hfil}\tocchapterfont}}
+ \extline{0cm}{\toclabelwidth}{\def\extleaders{\hfil}\tocchapterfont}}
\def \l@section {\addpenalty{-300}\addvspace{1em plus1pt}%
\extline{0pt}{\toclabelwidth}{\def\extleaders{\hfil}\tocsectionfont}}
\def \l@subsection {\vskip0pt plus.2pt
@@ -164,19 +143,27 @@
\extline{0pt}{\toclabelwidth}{\tocsubparagraphfont}}
\def\toclabelbox#1{\hbox to\toclabelwidth{#1\hss}}
-% \end{code} !------------------------------------------------
+% \end{code}
% \sec SECIONAMENTO
+% Nesta parte estão definidos os comandos secionais. Nenhum destes comandos são internos, caso o leitor queira redefiní-los.
+
% O comando |\hangfrom| é oriundo do kernel. Ele vai ser útil na formatação das seções.
-% \begin{code} !------------------------------------------------
+% A ideia de usar |\nonum| e |\notoc| ao invés de * vem do Op\TeX\ (muitas outras implementações aqui foram inspiradas nele).
+
+% \begin{code}
+\newif\ifnotoc
+\newif\ifnonum
+
\let\hangfrom=\@hangfrom
\def\nbpar{{\interlinepenalty=10000\par}}
\def\trytextual{\textual \let\textual=\relax}
-% \end{code} !------------------------------------------------
+\def\nonum{\global\nonumtrue}
+\def\notoc{\global\notoctrue}
+\def\resetnonumnotoc{\global\notocfalse \global\nonumfalse}
-% \begin{code} !------------------------------------------------
\newcount\countseclevel
\newcount\countpart
@@ -194,11 +181,7 @@
\def\thesubsubsection{\thesubsection .\the\countsubsubsection}
\def\theparagraph{\thesubsubsection .\the\countparagraph}
\def\thesubparagraph{\theparagraph .\the\countsubparagraph}
-% \end{code} !------------------------------------------------
-
-% Nesta parte estão definidos os comandos secionais. Nenhum destes comandos são internos, caso o leitor queira redefiní-los.
-% \begin{code} !------------------------------------------------
\def\recountchapter {\countsection=0 \recountsection}
\def\recountsection {\countsubsection=0 \recountsubsection}
\def\recountsubsection {\countsubsubsection=0 \recountsubsubsection}
@@ -210,12 +193,12 @@
\centering\huge\bfseries Parte \thepart
\vskip20pt
\Huge\bfseries #1\nbpar
- \endgroup
+ \endgroup
}
\def\printchapter#1{%
\begingroup
- \raggedright\huge\bfseries Capítulo \thechapter
- \vskip20pt
+ \raggedright\huge\bfseries
+ \ifnonum \else Capítulo \thechapter \vskip20pt \fi
\Huge\bfseries #1\nbpar
\endgroup
}
@@ -223,6 +206,8 @@
\hangfrom{\sectionfont\thesection\quad}%
\sectionfont{#1}\nbpar
}}
+\def\printnonumsection#1{{\centering\sectionfont{#1}\par}}
+
\def\printsubsection#1{{%
\hangfrom{\subsectionfont\thesubsection\quad}%
\subsectionfont{#1}\nbpar
@@ -239,19 +224,13 @@
\hangfrom{\subparagraphfont\thesubparagraph\quad}%
\subparagraphfont{#1}\nbpar
}}
-% \end{code} !------------------------------------------------
+% \end{code}
% A instrução |\setlabel| ensina a forma como |\label|'s devem ser referenciados. O comando |\setlabel| será útil em outros contextos.
-% \begin{code} !------------------------------------------------
-\def\partlevel {-1}
-\def\chapterlevel {0}
-\def\sectionlevel {1}
-\def\subsectionlevel {2}
-\def\subsubsectionlevel {3}
-\def\paragraphlevel {4}
-\def\subparagraphlevel {5}
+% As referências cruzadas (\emph{cross ref}) serão impressas por meio de |\ref| conforme |\cfpart|, |\cfchapter| etc. O leitor pode querer redefiní-los.
+% \begin{code}
\def\setlabel#1{\def\@currentlabel{#1}}
\def\cfpart {parte\,\thepart}
@@ -261,29 +240,63 @@
\def\cfsubsubsection {subseçao\,\thesubsubsection}
\def\cfparagraph {subseçao\,\theparagraph}
\def\cfsubparagraph {subseçao\,\thesubparagraph}
+% \end{code}
+
+% Por meio de |\trytextual|, a instrução |\textual| é iniciada automaticamente na primeira chamada de |\section|, |\chapter| ou |\part|, conforme o nível secional principal.
-\def\part#1{\cleardoublepage\trytextual \leavevmode\vfil
- \global\advance\countpart by1
- \countseclevel=\partlevel\relax \setlabel\cfpart
- \addtoext{toc}{part}{\protect\toclabelbox{\thepart}#1}%
+% É mais provável que o usuário queira redefinir comandos como |\printsection|, |\printsubsection| ao invés de seus invólucros maiores, neste caso, |\section| e |\subsection|.
+
+% \begin{code}
+\def\partlevel {-1}
+\def\chapterlevel {0}
+\def\sectionlevel {1}
+\def\subsectionlevel {2}
+\def\subsubsectionlevel {3}
+\def\paragraphlevel {4}
+\def\subparagraphlevel {5}
+
+\def\part#1{\ifnonum\else\cleardoublepage\fi \ifnonum\else\trytextual\fi
+ \leavevmode\vfil
+ \ifnonum \else
+ \global\advance\countpart by1
+ \fi
+ \countseclevel=\partlevel\relax \ifnonum \else \setlabel\cfpart \fi
+ \ifnotoc \else
+ \addtoext{toc}{part}{\ifnonum \else \protect\toclabelbox{\thepart}\fi #1}%
+ \fi
\printpart{#1}%
\markpart{#1}%
+ \resetnonumnotoc
\newpage
}
-\def\chapter#1{\cleardoublepage\trytextual \leavevmode\vskip\abovechapter\relax
- \global\advance\countchapter by1 {\globaldefs=1 \recountchapter}%
- \countseclevel=\chapterlevel\relax \setlabel\cfchapter
- \addtoext{toc}{chapter}{\protect\toclabelbox{\thechapter}#1}%
+\def\chapter#1{\ifnonum\else\cleardoublepage\fi \ifnonum\else\trytextual\fi
+ \leavevmode\vskip\abovechapter\relax
+ \ifnonum \else
+ \global\advance\countchapter by1 {\globaldefs=1 \recountchapter}%
+ \fi
+ \countseclevel=\chapterlevel\relax \ifnonum \else \setlabel\cfchapter \fi
+ \ifnotoc \else
+ \addtoext{toc}{chapter}{\ifnonum \else \protect\toclabelbox{\thechapter}\fi #1}%
+ \fi
\printchapter{#1}%
\markchapter{#1}%
+ \resetnonumnotoc
\par\nobreak \vskip\belowchapter\relax
}
-\def\section#1{\trytextual \addpenalty{-300}\addvspace\abovesection
- \global\advance\countsection by1 {\globaldefs=1 \recountsection}%
- \countseclevel=\sectionlevel\relax \setlabel\cfsection
- \addtoext{toc}{section}{\protect\toclabelbox{\thesection}#1}%
- \printsection{#1}%
+\def\section#1{\ifnonum\else\trytextual\fi \addpenalty{-300}\addvspace\abovesection
+ \ifnonum \else
+ \global\advance\countsection by1 {\globaldefs=1 \recountsection}%
+ \fi
+ \countseclevel=\sectionlevel\relax \ifnonum \else \setlabel\cfsection \fi
+ \ifnotoc \else
+ \addtoext{toc}{section}{\ifnonum \else \protect\toclabelbox{\thesection}\fi #1}%
+ \fi
+ \ifnonum
+ \printnonumsection{#1}\else
+ \printsection{#1}%
+ \fi
\marksection{#1}%
+ \resetnonumnotoc
\par\nobreak \vskip\belowsection\relax % Esse \par é necessário.
}
\def\subsection#1{\addpenalty{-300}\addvspace\abovesubsection
@@ -315,34 +328,54 @@
\printsubparagraph{#1}%
\par\nobreak \vskip\belowsubparagraph\relax
}
-% \end{code} !------------------------------------------------
+% \end{code}
% O |\@starttoc| pode ser usado não apenas para criar sumários, mas também listas em geral, como listas de figuras, tabelas etc. as quais são armazenadas em arquivos de extensão predefinida, a saber, |.toc|, |.lof|, |.lot| entre outros. Portanto, |\makeext| parece ter mais valor semântico.
-% \begin{code} !------------------------------------------------
+% Comandos como |\printbibliography| e |\printglossaries| já vêm com título embutido. Mas este título precisa estar inserido na macro secional principal, |\section| ou |\chapter|, dependendo de |\usechapters|/|\useparts| estar ativado ou não. Por este motivo foi definido o ambiente |corrprint|.
+
+% \begin{code}
+\def\makeext#1{\@starttoc{#1}}
+\def\maketoc{\makeext{toc}}
\def\corrprint#1{\begingroup
- \addtoext{toc}{section}{#1}%
- \def\section##1##2{\heading{##2}}%
+ \def\tmp{section}%
+ \ifx\mainsecname\tmp
+ \let\origsection=\section
+ \def\chapter##1##2{\nonum \origsection {##2}}%
+ \def\section##1##2{\nonum \origsection {##2}}%
+ \else
+ \edef\mainsecname{orig\mainsecname}%
+ \let\origchapter=\chapter
+ \let\origsection=\section
+ \def\chapter##1##2{\nonum \csname\mainsecname\endcsname {##2}}%
+ \def\section##1##2{\nonum \csname\mainsecname\endcsname {##2}}%
+ \fi
+
}
\def\endcorrprint{\par\endgroup}
+\def\mainsecname{section}
+\def\mainseclevel{\sectionlevel}
+\def\maintocfont{\tocsectionfont}
+
\def\usechapters{%
\def\l@section{\extline{0pt}{\toclabelwidth}{\tocsectionfont}}%
\def\thesection{\thechapter.\the\countsection}%
+ \def\mainsecname{chapter}%
\def\mainseclevel{\chapterlevel}%
\def\maintocfont{\tocchapterfont}%
- \def\begcorrprint##1{\begingroup
- \addtoext{toc}{chapter}{##1}%
- \def\section####1####2{\heading{####2}}%
- }%
}
\def\useparts{\usechapters
\def \l@chapter {\addpenalty{-300}\addvspace{1em plus1pt}%
\extline{0pt}{\toclabelwidth}{\tocchapterfont}}%
}
+% \end{code}
-\def\makeext#1{\@starttoc{#1}}
+% Quando |\usechapters| está ativo, o LaTeX, por algum motivo, exige a criação do contador |\c@chapter|.
+
+% \begin{code}
+\newcount\c@chapter
\AddToHook{begindocument}{%
\pdfstringdefDisableCommands{\def\toclabelbox#1{#1 }}%
@@ -355,11 +388,11 @@
{}%
}
\def\marksubsection#1{\markright{\MakeUppercase{\thesubsection\quad #1}}}
-% \end{code} !------------------------------------------------
+% \end{code}
% Os comandos a seguir são usados pelo |hyperref.sty| na criação de \emph{bookmarks} em PDFs.
-% \begin{code} !------------------------------------------------
+% \begin{code}
\def\toclevel@part {\partlevel}
\def\toclevel@chapter {\chapterlevel}
\def\toclevel@section {\sectionlevel}
@@ -368,14 +401,13 @@
\def\toclevel@paragraph {\paragraphlevel}
\def\toclevel@subparagraph {\subparagraphlevel}
-\def\mainseclevel{\sectionlevel}
\def\toclevel@appendix {\mainseclevel}
\def\toclevel@annex {\mainseclevel}
-% \end{code} !------------------------------------------------
+% \end{code}
% A definição de |\addtoext| depende de o |hyperref.sty| estar presente ou não.
-% \begin{code} !------------------------------------------------
+% \begin{code}
\def\addtoext#1#2#3{\noindent % Esse \noindent é necessário.
\setcounter{section@level}{\countseclevel}%
\NR@gettitle{#3}%
@@ -391,27 +423,19 @@
\let\pdfstringdefDisableCommands=\@gobble
}%
}
-% \end{code} !------------------------------------------------
-
-% A macro |\heading| serve para produzir títulos não contados, como “Sumário”, “Lista de figuras”, “Apêndice” etc.
-
-% \begin{code} !------------------------------------------------
-\def\heading#1{{\centering \sectionfont{#1}\par}%
- \vskip\belowsection\relax
-}
-% \end{code} !------------------------------------------------
+% \end{code}
% Aqui estão definidos |\appendix| e |\annex|.
-% \begin{code} !------------------------------------------------
+% \begin{code}
\newcount\countappendix
\newcount\countannex
\def\theappendix{\@Alph\countappendix}
\def\theannex{\@Alph\countannex}
-\def\appendixlabelbox#1{\hbox to\appendixlabelwidth{Apêndice~#1~---~\hss}}
-\def\annexlabelbox#1{\hbox to\annexlabelwidth{Anexo~#1~---~\hss}}
+\def\appendixlabelbox#1{\hbox to\appendixlabelwidth{Apêndice~#1~---\hss}}
+\def\annexlabelbox#1{\hbox to\annexlabelwidth{Anexo~#1~---\hss}}
\AddToHook{begindocument}{\pdfstringdefDisableCommands{%
\def\appendixlabelbox#1{Apêndice #1 }%
@@ -423,27 +447,34 @@
\def \l@annex {\addpenalty{-300}\addvspace{1em plus1pt}%
\extline{0pt}{\annexlabelwidth}{\def\extleaders{\hfil}\maintocfont}}
+\def\cfappendix{Apêndice~\theappendix}
+\def\cfannex{Anexo~\theannex}
+
\def\appendix#1{\newpage \global\advance\countappendix by1
\addtoext{toc}{appendix}{\protect\appendixlabelbox{\theappendix}#1}%
- \heading{Apêndice~\theappendix~---~#1}%
+ \setlabel\cfappendix
+ \par\nointerlineskip
+ \begingroup
+ \def\abovesection{0pt}%
+ \nonum\notoc \csname\mainsecname\endcsname {Apêndice~\theappendix~---~#1}%
+ \endgroup
}
\def\annex#1{\newpage \global\advance\countannex by1
\addtoext{toc}{annex}{\protect\annexlabelbox{\theannex}#1}%
- \heading{Anexo~\theannex~---~#1}%
+ \setlabel\cfannex
+ \par\nointerlineskip
+ \begingroup
+ \def\abovesection{0pt}%
+ \nonum\notoc \csname\mainsecname\endcsname {Anexo~\theannex~---~#1}%
+ \endgroup
}
-% \end{code} !------------------------------------------------
-
-% Quando |\usechapters| está ativo, o LaTeX, por algum motivo, exige a criação do contador |\c@chapter|.
-
-% \begin{code} !------------------------------------------------
-\newcount\c@chapter
-% \end{code} !------------------------------------------------
+% \end{code}
% \sec CITAÇÕES
% Se o pacote |csquotes| estiver carregado, ele definirá sua própria versão de |\enquote|, do contrário, o |abntexto| criará uma.
-% \begin{code} !------------------------------------------------
+% \begin{code}
\AddToHook{begindocument}{%
\@ifpackageloaded{csquotes}{}{\protected\def\enquote#1{``#1''}}%
}
@@ -453,13 +484,13 @@
{\noindent\leftskip=4cm \small \ignorespaces#1\unskip \nbpar}%
\vskip\baselineskip
}
-% \end{code} !------------------------------------------------
+% \end{code}
% \sec ALÍNEAS
% Estas linhas não foram baseadas no ambiente |list| do LaTeX, portanto não podem ser personalizadas por pacotes como |enumitem|, por exemplo.
-% \begin{code} !------------------------------------------------
+% \begin{code}
\newcount\counttopicsdepth
\newcount\counttopics
\newcount\countsubtopics
@@ -493,40 +524,41 @@
\hbox to\topicslabelwidth{\topicsmakelabel\hfil}%
\ignorespaces
}
-% \end{code} !------------------------------------------------
+% \end{code}
% \sec TABELAS
-% Na classe |article| o ambiente |table| inicia o modo flutuante, mas nesta classe ele é sinônimo de |tabular| porque faz mais sentido para min.
+% Na classe |article| o ambiente |table| inicia o modo flutuante, mas nesta classe ele é sinônimo de |tabular| porque faz mais sentido para min. Além disso, a classe não suporta objetos flutuantes. O comando |\place| põe o conteúdo no local especificado.
-% \begin{code} !------------------------------------------------
+% \begin{code}
\let\table=\undefined \let\endtable=\undefined
\newenvironment{table}[1]{\begin{tabular}{#1}}{\end{tabular}}
-% \end{code} !------------------------------------------------
+% \end{code}
% \sec ÁREAS DE LEGENDA
-% \begin{code} !------------------------------------------------
+% \begin{code}
+\def\@nameedef#1{\expandafter\edef\csname#1\endcsname}
+
\def\definelegendplace#1#2#3#4{\expandafter\newcount\csname count#1\endcsname
\@namedef{#1name}{#2}%
- \expandafter\edef\csname the#1\endcsname
- {\noexpand\the\csname count#1\endcsname}%
- \expandafter\edef\csname cf#1\endcsname
- {\unexpanded{#3}\expandafter\noexpand\csname the#1\endcsname}%
+ \@nameedef{the#1}{\noexpand\the\csname count#1\endcsname}%
+ \@nameedef{cf#1}{\unexpanded{#3}\expandafter\noexpand\csname the#1\endcsname}%
\@namedef{#1ext}{#4}%
- \expandafter\edef\csname l@#4i\endcsname
- {\noexpand\extline{0pt}{\csname #4labelwidth\endcsname}{\expandafter\noexpand\csname #4ifont\endcsname}}%
+ \@nameedef{l@#4i}{\noexpand\extline{0pt}%
+ {\csname #4labelwidth\endcsname}%
+ {\expandafter\noexpand\csname #4ifont\endcsname}}%
\@namedef{#4labelwidth}{5.4em}%
- \@namedef{#4labelbox}##1{\hbox to\csname #4labelwidth\endcsname{#2~##1~---\hss}}%
+ \@nameedef{#4labelbox}##1{\hbox to\csname #4labelwidth\endcsname{#2~##1~---\hss}}%
\AddToHook{begindocument}{%
\pdfstringdefDisableCommands{\@namedef{#4labelbox}##1{##1 }}%
}%
- \@namedef{#4ifont}##1{##1}%
+ \@namedef{#4ifont}{\maintocfont}%
\@namedef{make#4}{\makeext{#4}}%
}
-% \end{code} !------------------------------------------------
+% \end{code}
-% \begin{code} !------------------------------------------------
+% \begin{code}
\newdimen\placewidth \AddToHook{begindocument}{\placewidth=.43\linewidth}
\newdimen\savedplacewidth
@@ -662,21 +694,21 @@
}}
\AddToHook{begindocument}{\let\c@table=\counttable}
-% \end{code} !------------------------------------------------
+% \end{code}
% \sec NOTAS DE RODAPÉ
% As notas de rodapé também foram modificadas.
-% \begin{code} !------------------------------------------------
+% \begin{code}
\def\@makefnmark{\hbox{\@textsuperscript{\selectfont\@thefnmark}}}
\def\@makefntext#1{\hangfrom{\@makefnmark\kern2pt}\small #1}
\def\footnoterule{\kern18pt \hrule width5cm \kern2.6pt }
-% \end{code} !------------------------------------------------
+% \end{code}
% \sec IDENTIFICAÇÃO DO TRABALHO
-% \begin{code} !------------------------------------------------
+% \begin{code}
\def\Enter{\@ifnextchar[\tnba@Enter{\tnba@Enter[]}}
\def\tnba@Enter[#1]{\vskip#1\baselineskip}
@@ -694,7 +726,7 @@
\def\indexcardbar{\def\xindexcardbar{\hrule\kern1cm}}
\def\judgeline#1{{\centering \rule{.7\linewidth}{.6pt}\\ #1\par}\Enter[1.5]}
-% \end{code} !------------------------------------------------
+% \end{code}
% \sec A VÍRGULA COMO SEPARADOR DECIMAL
@@ -702,7 +734,7 @@
% As linhas abaixo são uma cópia da implementação do pacote |icomma|.
-% \begin{code} !------------------------------------------------
+% \begin{code}
{\catcode`,=13
\gdef,{\futurelet\@let@token\tnba@smartcomma}
}
@@ -716,24 +748,24 @@
\mathchardef\tnba@mathcomma=\mathcode`\,%
\mathcode`\,="8000
}
-% \end{code} !------------------------------------------------
+% \end{code}
% Abaixo está definido um ajuste para que o |hyperref| não crie conflitos com |\MakeUppercase| nas entradas do sumário.
-% \begin{code} !------------------------------------------------
+% \begin{code}
\iftnba@XETEX \else
\AddToHook{begindocument/before}{
\let\tnba@hyper@linkstart=\hyper@linkstart
\protected\def\hyper@linkstart#1#2{\lowercase{\tnba@hyper@linkstart{#1}{#2}}}
}
\fi
-% \end{code} !------------------------------------------------
+% \end{code}
% \sec COMANDOS OBSOLETOS
-% O |abntexto| emitirá um aviso ou erro caso um destes comandos esteja obsoleto ou inexistente.
+% O |abntexto| emitirá um aviso ou erro caso um destes comandos seja usado.
-% \begin{code} !------------------------------------------------
+% \begin{code}
\def\tnba@undefcmd#1{\def#1{\tnba@error{%
O comando "\noexpand#1" não existe mais%
}}}
@@ -743,51 +775,51 @@
\tnba@undefcmd \extlineshape
\tnba@undefcmd \advcount
-
-\tnba@obscmd \sectionuppercase {\def\sectionfont{\MakeUppercase}}
-\tnba@obscmd \tociuppercase {\def\tocifont{\MakeUppercase}}
-\tnba@obscmd \sectionspaces {\def\abovesection{valor}\def\belowsection{valor}}
-\tnba@obscmd \subsectionspaces {\def\abovesubsection{valor}\def\belowsubsection{valor}}
+\tnba@undefcmd \definefontsize
+\tnba@undefcmd \setfontsize
+\tnba@undefcmd \fontsizedef
+\tnba@undefcmd \paper
+\tnba@undefcmd \papersizedef
+\tnba@undefcmd \startseci
+\tnba@undefcmd \startsecii
+\tnba@undefcmd \startseciii
+\tnba@undefcmd \startseciv
+\tnba@undefcmd \startsecv
+\tnba@undefcmd \sectionuppercase
+\tnba@undefcmd \tociuppercase
+
+\tnba@obscmd \sectionspaces {\def\abovesection{valor}\def\belowsection{valor}}
+\tnba@obscmd \subsectionspaces {\def\abovesubsection{valor}\def\belowsubsection{valor}}
\tnba@obscmd \subsubsectionspaces {\def\abovesubsubsection{valor}\def\belowsubsubsection{valor}}
-\tnba@obscmd \paragraphspaces {\def\aboveparagraph{valor}\def\belowparagraph{valor}}
-\tnba@obscmd \subparagraphspaces {\def\abovesubparagraph{valor}\def\belowsubparagraph{valor}}
-\tnba@obscmd \fontsizedef \definefontsize
-\tnba@obscmd \paper \setlayout
-\tnba@obscmd \papersizedef \definepapersize
-\tnba@obscmd \startseci \printsection
-\tnba@obscmd \startsecii \printsubsection
-\tnba@obscmd \startseciii \printsubsubsection
-\tnba@obscmd \startseciv \printparagraph
-\tnba@obscmd \startsecv \printsubparagraph
+\tnba@obscmd \paragraphspaces {\def\aboveparagraph{valor}\def\belowparagraph{valor}}
+\tnba@obscmd \subparagraphspaces {\def\abovesubparagraph{valor}\def\belowsubparagraph{valor}}
\tnba@obscmd \qt \enquote
\tnba@obscmd \quote \Enquote
-% \end{code} !------------------------------------------------
+% \end{code}
% \sec INICIALIZAÇÃO
-% Aqui o |abntexto| define as configurações padrões. Note que |\pretextual| deve ser carregado após |\begin{document}| para evitar múltiplas chamadas deste, caso seja redefinido pelo usuário ou escritor de pacotes.
+% Aqui o |abntexto| define as configurações padrões. Note que |\pretextual| foi carregado após |\begin{document}| para evitar múltiplas chamadas deste, caso seja redefinido pelo usuário ou escritor de classes.
-% \begin{code} !------------------------------------------------
-\definefontsize{12pt}{%
- \sizedef\normalsize{12pt}{14.5pt}{%
- \abovedisplayskip=12pt plus3pt minus7pt
- \belowdisplayskip=\abovedisplayskip
- \abovedisplayshortskip=0pt plus3pt
- \belowdisplayshortskip=6.5pt plus3.5pt minus3pt
- }%
- \sizedef\small{10pt}{12pt}{%
- \abovedisplayskip=10pt plus2pt minus5pt
- \belowdisplayskip=\abovedisplayskip
- \abovedisplayshortskip=0pt plus3pt
- \belowdisplayshortskip=6pt plus3pt minus3pt
- }%
+% \begin{code}
+\sizedef\normalsize{12pt}{14.5pt}{%
+ \abovedisplayskip=12pt plus3pt minus7pt
+ \belowdisplayskip=\abovedisplayskip
+ \abovedisplayshortskip=0pt plus3pt
+ \belowdisplayshortskip=6.5pt plus3.5pt minus3pt
+}
+\sizedef\small{10pt}{12pt}{%
+ \abovedisplayskip=10pt plus2pt minus5pt
+ \belowdisplayskip=\abovedisplayskip
+ \abovedisplayshortskip=0pt plus3pt
+ \belowdisplayshortskip=6pt plus3pt minus3pt
}
-\setfontsize{12pt}
\spacing{1.5}
\geometry{
a4paper,
+ twoside=false,
left=3cm,
top=3cm,
right=2cm,
@@ -798,21 +830,19 @@
\parindent=0pt
\parskip=0pt
-\def\maintocfont {\tocsectionfont}
-
-\def\tocpartfont #1{\bfseries\MakeUppercase{#1}}
-\def\tocchapterfont #1{\bfseries\MakeUppercase{#1}}
-\def\tocsectionfont #1{\bfseries\MakeUppercase{#1}}
-\def\tocsubsectionfont #1{\itshape#1}
-\def\tocsubsubsectionfont #1{\scshape#1}
-\def\tocparagraphfont #1{#1}
-\def\tocsubparagraphfont #1{#1}
+\def\tocpartfont {\bfseries\MakeUppercase}
+\def\tocchapterfont {\bfseries\MakeUppercase}
+\def\tocsectionfont {\bfseries\MakeUppercase}
+\def\tocsubsectionfont {\itshape}
+\def\tocsubsubsectionfont {\scshape}
+\def\tocparagraphfont {}
+\def\tocsubparagraphfont {}
-\def\sectionfont #1{\bfseries\MakeUppercase{#1}}
-\def\subsectionfont #1{\itshape#1}
-\def\subsubsectionfont #1{\scshape#1}
-\def\paragraphfont #1{#1}
-\def\subparagraphfont #1{#1}
+\def\sectionfont {\bfseries\MakeUppercase}
+\def\subsectionfont {\itshape}
+\def\subsubsectionfont {\scshape}
+\def\paragraphfont {}
+\def\subparagraphfont {}
\def\abovechapter {50pt}
\def\abovesection {\baselineskip}
@@ -845,11 +875,9 @@
\def\appendixlabelwidth{9.2em}
\def\annexlabelwidth{7.3em}
-\def\maketoc{\makeext{toc}}
-
\def\topicslabelwidth{4ex}
\AddToHook{begindocument}{\pretextual}
\endinput
-% \end{code} !------------------------------------------------
+% \end{code}
diff --git a/macros/latex/contrib/abntexto/abntexto.pdf b/macros/latex/contrib/abntexto/abntexto.pdf
index feb6a20420..a1f9ae0fac 100644
--- a/macros/latex/contrib/abntexto/abntexto.pdf
+++ b/macros/latex/contrib/abntexto/abntexto.pdf
Binary files differ
diff --git a/macros/latex/contrib/abntexto/abntexto.tex b/macros/latex/contrib/abntexto/abntexto.tex
index b9210f5b0e..32dc5e19d7 100644
--- a/macros/latex/contrib/abntexto/abntexto.tex
+++ b/macros/latex/contrib/abntexto/abntexto.tex
@@ -9,6 +9,7 @@
\usepackage{unicode-math}
\usepackage[colorlinks,linktoc=page]{hyperref}
\usepackage{listings}
+\usepackage{microtype}
\makeatletter
@@ -47,8 +48,8 @@
\def\verbbox#1{\place{\verbframe{#1}}}
\def\verbframe#1{%
- \hbox{{\color{leftbar}\vrule width1pt}\kern\hh\vbox{%
- \hbox{\vbox{\advance\hsize-1pt \advance\hsize-\hh \verbfont #1}}%
+ \hbox{{\color{leftbar}\vrule width3pt}\kern\hh\vbox{%
+ \hbox{\vbox{\advance\hsize-3pt \advance\hsize-\hh \verbfont #1}}%
}}%
}
\def\verbfont{\sloppy\ttfamily\small\singlesp}
@@ -58,7 +59,7 @@
\chardef\savedttchar=`#1%
\chardef\savedttcharc=\catcode`#1%
\bgroup\lccode`\~=`#1%
- \lowercase {\egroup\def~}{\leavevmode\hbox\bgroup\setverb\adef{ }{\ }%
+ \lowercase {\egroup\def~}{\leavevmode\hbox\bgroup\color{blue!90!black}\setverb\adef{ }{\ }%
\ttfamily\readverb}%
\bgroup\lccode`\~=`#1\lowercase{\egroup\def\readverb ##1~}{##1\egroup}%
\catcode`#1=13
@@ -66,7 +67,7 @@
\verbchar{|}
\AddToHook{begindocument}{\adef{<}{\begingroup \setverb\startmeta}}
-\def\startmeta#1>{\ttfamily$\langle${\rmfamily\itshape #1\/}$\rangle$\endgroup}
+\def\startmeta#1>{\normalcolor\ttfamily$\langle${\rmfamily\itshape #1\/}$\rangle$\endgroup}
% MISC
% ================================================
@@ -85,7 +86,7 @@
\setmathfont{texgyretermes-math.otf}
\def\tocsectionfont#1{\bfseries#1\mdseries}
-\def\sectionfont#1{\bfseries#1}
+\def\sectionfont{\bfseries}
\def\appendixlabelwidth{6.7em}
\def \l@section {\addpenalty{-300}\addvspace{.5em plus1pt}
@@ -120,10 +121,10 @@
\par}
\vskip3in
-{\centering\large\ttfamily 3.0.2-beta\par}
+{\centering\large\ttfamily 3.1.0-beta\par}
\newpage
-\heading{Sumário}
+\nonum\notoc\section{Sumário}
\maketoc
\newpage
@@ -175,27 +176,25 @@ Digite as linhas em \ref{cd:início} e use |abntexto|.
\end{document}
\endverb
-O arquivo exemplo.tex, disponível no CTAN, mostra como elaborar os elementos pré-textuais.
+O arquivo |exemplo.tex|, disponível no CTAN, mostra como elaborar os elementos pré-textuais.
\section{Fonte tipográfica}
-O tamanho da fonte é 12\,pt de imediato e pode ser configurado com o comando |\setfontsize{<id>}| sendo que 12\,pt é a única opção disponível. Além disso, com os seletores de tamanho |\normalsize| e |\small| que configuram 12\,pt e 10\,pt, nessa ordem, é possível mudar o tamanho da fonte no corpo do documento.
-
-Mas, se você deseja outro tamanho de fonte, crie-o usando |\definefontsize{<id>}{<definições>}| e |\sizedef<seletor>{<tamanho>}{<entrelinha natural>}|. Em <definições>, o seletor |\normalsize| deve estar presente por meio de |\sizedef|, caso contrário, a classe mostrará um erro.
+O tamanho da fonte é 12\,pt de imediato e pode ser configurado redefinindo |\normalsize| por meio de |\sizedef|. Além disso, com os seletores de tamanho |\normalsize| e |\small| que configuram 12\,pt e 10\,pt, nessa ordem, é possível mudar o tamanho da fonte no corpo do documento.
O espaçamento é de um e meio e pode ser alterado para dois com |\spacing{2}|, por exemplo. Os atalhos |\singlesp|, |\onehalfsp| e |\doublesp| estão disponíveis. Note que o espaçamento simples não tem o mesmo valor que o espaçamento um, portanto, |\singlesp| é diferente de |\spacing{1}|! Os atalhos |\onehalfsp| e |\doublesp| tem o mesmo significado de |\spacing{1.5}| e |\spacing{2}|.
-A limitação do comando |\spacing| é que ele só pode ser usado após um seletor de tamanho, porque este redefine a entrelinha. Por exemplo, |\small\onehalfsp| é correto e |\onehalfsp\small| ineficaz.
+A limitação do comando |\spacing| é que ele só pode ser usado após um seletor de tamanho, porque este redefine a entrelinha. Por exemplo, |\small\onehalfsp| é correto, porém |\onehalfsp\small| é ineficaz.
\section{\emph{Layout}}
A folha é A4 por padrão e as margens esquerda e direita são de 3\,cm, 2\,cm para páginas ímpares e de 2\,cm, 3\,cm para páginas pares, respectivamente. Além disso, as margens superior e inferior têm, nessa ordem, 3\,cm, 2\,cm para todo o documento. As margens foram ajustadas com o pacote |geometry|.
-Existem dois comandos que configuram o \emph{layout} da página: |\pretextual| que, além de desabilitar o modo |twoside|, remove a numeração de página e é executado automaticamente logo após |\begin{document}| e o comando |\textual| que também é executado automaticamente logo antes da primeira chamada de |\section| por meio de |\trytextual|. Dessa forma, a numeração de página será posta no topo da página e as margens passarão a ser espelhadas.
+Existem dois comandos que configuram o \emph{layout} da página: |\pretextual| que, além de desabilitar o modo |twoside|, remove a numeração de página e é executado automaticamente logo após |\begin{document}| e o comando |\textual| que também é executado automaticamente na primeira chamada de |\section| por meio de |\trytextual|. Dessa forma, a numeração de página será posta no topo da página e as margens passarão a ser espelhadas.
\section{Sumário}
-Os comandos que mudam a fonte das entradas no ToC (Table of Contents) são |\tocsectionfont|, |\tocsubsectionfont|, \dots, |\tocsubparagraphfont| (ver \ref{cd:contents}).
+Os comandos que configuram a fonte tipográfica das entradas no ToC (Table of Contents) são |\tocsectionfont|, |\tocsubsectionfont|, \dots, |\tocsubparagraphfont| (ver \ref{cd:contents}).
\legend{code}{Aparência do sumário} \src\me
\label{cd:contents}
@@ -204,12 +203,13 @@ Os comandos que mudam a fonte das entradas no ToC (Table of Contents) são |\toc
\usepackage{xcolor}
-\def \tocsectionfont #1{\color{red}\itshape\MakeUppercase{#1}}
-\def \tocsubsectionfont #1{\color{blue}\bfseries#1}
+\def \tocsectionfont {\color{red}\itshape\MakeUppercase}
+\def \tocsubsectionfont {\color{blue}\bfseries}
\begin{document}
- \heading{Sumário}
+ \nonum\notoc\section{Sumário}
\maketoc
+ \newpage
\section{Título}
\subsection{Título}
@@ -229,12 +229,12 @@ Também há como alterar o espaço vertical acima e abaixo das seções usando |
\usepackage{xcolor}
-\def \sectionfont #1{\color{blue}\scshape#1}
-\def \subsectionfont #1{\color{red}\itshape#1}
-\def \subsubsectionfont #1{\color{yellow}\sffamily#1}
+\def \sectionfont {\color{blue}\scshape}
+\def \subsectionfont {\color{red}\itshape}
+\def \subsubsectionfont {\color{yellow}\sffamily}
\begin{document}
- \heading{Sumário}
+ \nonum\notoc\section{Sumário}
\maketoc
\section{Texto}
@@ -243,6 +243,10 @@ Também há como alterar o espaço vertical acima e abaixo das seções usando |
\end{document}
\endverb
+O usuário pode querer utilizar capítulos no trabalho. O |abntexto| disponibiliza a instrução |\chapter| para capítulos, porém não em conformidade com a Norma, mas no estilo da classe |book|. Para ativá-los é preciso chamar a instrução |\usechapters| no preâmbulo do documento. Também é possível usar |\part| em conjunto com o comando |\useparts|. Este útlimo contém |\usechapters| em sua definição, portanto, ao chamar |\useparts|, você também estará chamando |\usechapters|.
+
+Os níveis secionais |\section|, |\chapter| e |\part| estão sujeitos a |\nonum| que remove a numeração do título e |\notoc| que instrui o título a não ingressar no sumário.
+
\section{Alíneas}
Use o ambiente |topics| para criar alíneas. Ele dispõe de dois níveis sendo que o segundo usa um travessão como marcador conforme o exemplo em \ref{cd:topics}. Naturalmente, é permitido usar |\label| após um item.
@@ -253,7 +257,7 @@ Use o ambiente |topics| para criar alíneas. Ele dispõe de dois níveis sendo q
\begin{topics}
\item \label{al:x} 1
\begin{topics}
- \item x
+ \item \label{subal:x} x
\item y
\item z
\end{topics}
@@ -264,7 +268,7 @@ Use o ambiente |topics| para criar alíneas. Ele dispõe de dois níveis sendo q
\section{Áreas de legenda}
-Use |\place{<obj>}| para inserir áreas de legenda como mostrado em \ref{cd:place}. Mas existem condições: |\place| deve vir por último e |\label| precisa estar depois de |\legend{<tipo de obj>}{<legenda>}|. Além disso, existe a possibilidade de alterar o espaço vertical acima e abaixo de uma área de legenda com |\def\aboveplace{<valor>}| e |\def\belowplace{<valor>}|.
+Use |\place{<obj>}| para inserir áreas de legenda como mostrado em \ref{cd:place}. Mas existem condições: |\place| deve constar em último lugar e |\legend{<tipo de obj>}{<legenda>}| deve preceder |\label|. Além disso, existe a possibilidade de alterar o espaço vertical acima e abaixo de uma área de legenda com |\def\aboveplace{<valor>}| e |\def\belowplace{<valor>}|.
\legend{code}{Áreas de legenda} \src\me
\label{cd:place}
@@ -279,9 +283,46 @@ Use |\place{<obj>}| para inserir áreas de legenda como mostrado em \ref{cd:plac
\end{document}
\endverb
-O leitor pode querer definir uma nova área de legenda usando, por exemplo, a instrução |\definelegendplace{diagram}{Diagrama}{diag.\,#1}{lod}| criará o comando |\makelod| para escrever no documento as entradas do arquivo auxiliar .lod.
+O leitor pode querer definir uma nova área de legenda usando, por exemplo, a instrução |\definelegendplace{diagram}{Diagrama}{diag.\,#1}{lod}| que criará o comando |\makelod| para escrever no documento as entradas do arquivo auxiliar .lod. Por exemplo, |\definelegendplace| foi usado para criar as áreas de legenda para tabelas e figuras nesta classe.
+
+O |abntexto| também tem suporte nativo para inserção de figuras lado a lado. Elas se comportam como caracteres então podemos usar |\hfil| para centralizá-las. Veja o exemplo no \ref{cd:multiple} e o resultado logo em seguida.
+
+Até o momento, a classe não tem suporte para objetos flutuantes.
+
+\legend{code}{Figuras lado a lado} \src\me
+\label{cd:multiple}
+\begverb
+ \legend{figure}{Duas figuras}
+ \begin{multiplace}
+ \sublegend{figure}{Um título}
+ \src{\texttt{www.site.com.br}. Acesso em 01 jan. 2020.}
+ \label{fig:teste1}
+ \hfil \subplace{\includegraphics[width=\linewidth]{example-image-a}}
+ \sublegend{figure}{Outro título}
+ \src{\texttt{www.site.com.br}. Acesso em 01 jan. 2020.}
+ \label{fig:teste2}
+ \hfil \subplace{\includegraphics[width=\linewidth]{example-image-b}}
+ \end{multiplace}
+
+ Ver \ref{fig:teste1} e \ref{fig:teste2}.
+\endverb
+
+\legend{figure}{Duas figuras}
+\begin{multiplace}
+ \sublegend{figure}{Um título}
+ \src{\texttt{www.site.com.br}. Acesso em 01 jan. 2020.}
+ \label{fig:teste1}
+ \hfil \subplace{\includegraphics[width=\linewidth]{example-image-a}}
+ \sublegend{figure}{Outro título}
+ \src{\texttt{www.site.com.br}. Acesso em 01 jan. 2020.}
+ \label{fig:teste2}
+ \hfil \subplace{\includegraphics[width=\linewidth]{example-image-b}}
+\end{multiplace}
+
+Ver \ref{fig:teste1} e \ref{fig:teste2}.
-\section{Formatação de {\ttfamily\textbackslash\lowercase{cite}} e referências}
+\section{Formatação de {\mdseries\ttfamily\textbackslash\lowercase{cite}} e referências}
+\label{section}
Até o momento o |abntexto| não possui macros para formatação de |\cite| e referências. Utilize |\usepackage[style=abnt]{biblatex}|.
@@ -313,8 +354,6 @@ Pode-se alterar a largura dos rótulos das entradas de apêndice/anexo no sumár
\printbibliography
\end{corrprint}
-\newpage
-
\appendix{Glossário}
Você pode criar glossários com o pacote |glossaries|, como em \ref{cd:gloss}.
@@ -322,6 +361,8 @@ Você pode criar glossários com o pacote |glossaries|, como em \ref{cd:gloss}.
\legend{code}{Glossário} \src\me
\label{cd:gloss}
\begverb
+\documentclass{abntexto}
+
\usepackage{lipsum}
\usepackage{glossaries}
@@ -347,6 +388,8 @@ O |glossaries.sty| também serve para criar uma lista de siglas, conforme \ref{c
\legend{code}{Siglas} \src\me
\label{cd:acro}
\begverb
+\documentclass{abntexto}
+
\usepackage[acronym]{glossaries}
\makenoidxglossaries
@@ -369,6 +412,7 @@ O |glossaries.sty| também serve para criar uma lista de siglas, conforme \ref{c
\endverb
\appendix{\emph{Feedback}}
+
Sugestões, relatos de \emph{bugs} e doações são bem-vindas.
Chave PIX: {\ttfamily abntexto.classe@gmail.com}
@@ -393,6 +437,8 @@ Chave PIX: {\ttfamily abntexto.classe@gmail.com}
\def\leftsep{5mm}
\lstnewenvironment{code}{\lstset{
+% language=TeX, Definir uma linguagem não está funcionando aqui.
+ basicstyle=\verbfont,
frame=single,
framerule=0pt,
framesep=\codesep,
@@ -403,7 +449,6 @@ Chave PIX: {\ttfamily abntexto.classe@gmail.com}
numbers=left,
numbersep=6pt,
numberstyle=\fontsize{8pt}{9pt}\selectfont,
- basicstyle=\verbfont,
commentstyle=\color{blue}\bfseries,
comment=[l]{\%},
columns=fullflexible,
diff --git a/macros/latex/contrib/bfh-ci/DEPENDS.txt b/macros/latex/contrib/bfh-ci/DEPENDS.txt
new file mode 100644
index 0000000000..4eee2a66f9
--- /dev/null
+++ b/macros/latex/contrib/bfh-ci/DEPENDS.txt
@@ -0,0 +1,26 @@
+hard adjustbox
+hard amsmath
+hard amssymb
+hard anyfontsize
+hard beamer
+hard fontawesome
+hard fontspec
+hard geometry
+hard graphics
+hard handoutwithnotes
+hard hyperref
+hard iftex
+hard koma-script
+hard l3kernel
+hard l3packages
+hard listings
+hard nunito
+hard pgf
+hard qrcode
+hard sourceserifpro
+hard tabularx
+hard tcolorbox
+hard translations
+hard url
+hard xcolor
+hard zref
diff --git a/macros/latex/contrib/bfh-ci/README.md b/macros/latex/contrib/bfh-ci/README.md
index eb24c321a4..05ece994a4 100644
--- a/macros/latex/contrib/bfh-ci/README.md
+++ b/macros/latex/contrib/bfh-ci/README.md
@@ -2,7 +2,7 @@
Copyright (C) Marei Peischl <marei@peitex.de> & Andreas Habegger <andreas.habegger@bfh.ch>, 2021–2023
-bfh 2023/13/07 v2.1.5
+bfh 2023/10/20 v2.2.0
***************************************************************************
@@ -100,4 +100,7 @@ BFH-CI uses the translations package to provide translations for specific elemen
* v2.1.4 (2022/11/15)
- Fix french translations
* v2.1.5 (2023/03/07)
- - Small layout adjustments in project proposals \ No newline at end of file
+ - Small layout adjustments in project proposals
+* v2.2.0 (2023/10/20)
+ - Add hkbdocumentation template and hkb-doc mode to support HKB project documentation
+ - fix BFHNoteBox to be used with bfhbeamer
diff --git a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer-Sidebar.pdf b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer-Sidebar.pdf
index 8d6e5bbf79..5f3e20cc8c 100644
--- a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer-Sidebar.pdf
+++ b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer-Sidebar.pdf
Binary files differ
diff --git a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer.pdf b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer.pdf
index 0bb9e0cfc5..6d89ef3881 100644
--- a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer.pdf
+++ b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHBeamer.pdf
Binary files differ
diff --git a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHFactsheet.pdf b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHFactsheet.pdf
index f69cd18e14..f9c0c49224 100644
--- a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHFactsheet.pdf
+++ b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHFactsheet.pdf
Binary files differ
diff --git a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHLetter.pdf b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHLetter.pdf
index f18748c58c..9d451d7ad9 100644
--- a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHLetter.pdf
+++ b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHLetter.pdf
Binary files differ
diff --git a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHProjektProposal.pdf b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHProjektProposal.pdf
index fb126c2d0d..12213ad145 100644
--- a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHProjektProposal.pdf
+++ b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHProjektProposal.pdf
Binary files differ
diff --git a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHPub.pdf b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHPub.pdf
index b3969bc66e..dd340ade03 100644
--- a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHPub.pdf
+++ b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHPub.pdf
Binary files differ
diff --git a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHSciPoster.pdf b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHSciPoster.pdf
index ca21c15947..efb541c3b3 100644
--- a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHSciPoster.pdf
+++ b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHSciPoster.pdf
Binary files differ
diff --git a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHThesis.pdf b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHThesis.pdf
index 1cf95b2ff4..0f1b45c635 100644
--- a/macros/latex/contrib/bfh-ci/doc/DEMO-BFHThesis.pdf
+++ b/macros/latex/contrib/bfh-ci/doc/DEMO-BFHThesis.pdf
Binary files differ
diff --git a/macros/latex/contrib/bfh-ci/example/DEMO-BFHSciPoster.tex b/macros/latex/contrib/bfh-ci/example/DEMO-BFHSciPoster.tex
index d322428f4b..75c9e9ea17 100644
--- a/macros/latex/contrib/bfh-ci/example/DEMO-BFHSciPoster.tex
+++ b/macros/latex/contrib/bfh-ci/example/DEMO-BFHSciPoster.tex
@@ -12,12 +12,12 @@
% invert-colors % Orange/Blau im title,footer,logo getauscht. einzeln anwählbar über invert-title-colors,invert-footer-colors,invert-logo-colors
]{bfhsciposter}
-%Sprache
+%% Sprache
\usepackage[nswissgerman]{babel}
\usepackage[autostyle]{csquotes}
-%Makros für dieses Beispieldokument. Im Allgemeinen nicht notwendig.
+%% Makros für dieses Beispieldokument. Im Allgemeinen nicht notwendig.
\newcommand{\tbs}{\textbackslash}
\newcommand{\repl}[1]{<\textit{#1}>}
\let\code\texttt
@@ -33,12 +33,12 @@
der Berner Fachhochschule}
\author{Marei Peischl\inst{*}\thanks{kontakt@peitex.de} \and der \TeX-Löwe}
\institute{\inst{*}pei\TeX{} \TeX{}nical Solutions, Hamburg, Deutschland}
-%\inst kann in den Autor und Institutsfeldern genutzt werden um eine Zuordnung zu ermöglichen. Bei Nummerierung ist der Nutzer dafür verantwortlich Konflikte mit \thanks zu vermeiden.
-%\titlegraphic{\includegraphics[width=10cm]{example-image}}
+%% \inst kann in den Autor und Institutsfeldern genutzt werden um eine Zuordnung zu ermöglichen. Bei Nummerierung ist der Nutzer dafür verantwortlich Konflikte mit \thanks zu vermeiden.
+%% \titlegraphic{\includegraphics[width=10cm]{example-image}}
\footerqrcode{https://www.peitex.de}
\footer{Fusszeile: Falls neben den Logos andere Angaben erforderlich sind}
-%Instituts/Sponsorenlogos von links nach rechts
+%% Instituts/Sponsorenlogos von links nach rechts
\footergraphics{
\includegraphics[height=\height]{example-image}
\includegraphics[height=\height]{example-image}
@@ -59,7 +59,7 @@
Dieses Dokument verwendet unterschiedliche Boxentypen. Dies ist selbstverständlich für die praktische Verwendung nicht empfehlenswert. Dieser Modus dient lediglich Demonstrationszwecken.
\end{posterboxenv}
-% Titelei
+%% Titelei
\begin{posterboxenv}[title=Titelei]{name=title, row=2, span=2, rowspan=2}
Die Definition des Titelblockes lehnt sich an die Standard-\LaTeX{}-Strukturierung mit Hilfe von \macro{maketitle} an.
@@ -68,7 +68,7 @@
Zusätzlich zu den Titeldaten stehen über \macro{setqrcode} und \macro{setfoot} Makros zur Verfügung, die die Fusszeile füllen.
\end{posterboxenv}
-% Fusszeile
+%% Fusszeile
\begin{posterboxenv}[title=Fusszeile]{name=footer,below=title, span=2, rowspan=2 }
Die Fusszeile ist grundsätzlich aktiviert, kann jedoch mit Hilfe der Klassenoption \code{footer=false} ausgeschaltet werden. In diesem Fall werden jedoch mit \macro{thanks} übergebene zusätzliche Titeldaten nicht angezeigt.
@@ -81,7 +81,7 @@
Der Abstand zwischen Logo und den Inhalten des Fußes, sowie zu den Logos und dem QRcode im Fuß wird über die Länge \macro{footerhsep} gesteuert. Änderung ist über \macro{setlength} möglich.
\end{posterboxenv}
-% Platzierung der Boxen
+%% Platzierung der Boxen
\begin{posterboxenv}[title=Platzierung der Boxen]{name=positioning, below=footer, span=2}
Bei der \pck{poster}-Bibliothek des \pck{tcolorbox} Paketes, werden die Boxen manuell positioniert.
@@ -90,7 +90,7 @@
Diese Mechanismen ermöglichen auch, Querverweise einfacher zu positionieren. Hierfür ist ein Blick in die \pck{tcolorbox}-Dokumentation hilfreich.
\end{posterboxenv}
-% Eine Box im Stil BFH-framed
+%% Eine Box im Stil BFH-framed
\begin{posterboxenv}[title=Eine Box im Stil BFH-framed, BFH-framed]{name=framed, column=3, row=2, span=2}
Die Boxen können in verschiedenen Varianten gestaltet werden. Die Voreinstellung entspricht den offiziellen Vorgaben, jedoch kann es aus unterschiedlichen Gründen notwendig sein, eine klarere Abgrenzung zu setzen (lobale Klassenoption \code{boxstyle=framed} oder lokaler Stil \code{BFH-framed}).
\end{posterboxenv}
@@ -102,34 +102,34 @@
Einstellung dieser Option ist sowohl über die Nutzung der globalen Klassenoption \code{style=colored} als auch durch die Verwendung des lokalen Stils\code{BFH-colored} möglich.
\end{posterboxenv}
-%
-% Box ohne Titel mit Abbildung
+
+%% Box ohne Titel mit Abbildung
\begin{posterboxenv}[BFH-colored]{name=colored-notitle,column=3,row=4, rowspan=2}
\includegraphics[width=\linewidth]{example-image}
\captionof{figure}{Ein Beispielbild, in einer Box ohne Titel (\code{framed-notitle}). In diesem Fall sind der Stil {BFH} und BFH-colored identisch}
\end{posterboxenv}
-% Box ohne Titel
+%% Box ohne Titel
\begin{posterboxenv}[BFH-framed]{name=notitle, column=4, below=colored}
Ein Beispiel für den Stil \code{framed} ohne einen eigenen Titel.
\end{posterboxenv}
-% Box mit Verweis
+%% Box mit Verweis
\begin{posterboxenv}[title=Box mit Verweis,BFH-framed]{name=verweis,column=4, above=row6}
Beispielbox mit Pfeil, um zwei Boxen miteinander zu verknüpfen oder Leseabzweigungen zu generieren.
\end{posterboxenv}
-%Zwischen den Boxen kann direkt TikZ-Code eingegeben werden. Das Namensschema der Boxen als Koordinaten lautet
-% TCBPOSTER@<boxname>.ankerpunkt
-% Für genauere Erläuterungen zur Syntax, bietet die tikz-Anleitung genauere Angaben, weitere benannte Koordinaten finden sich in der tcolorbox-Dokumentation
+%% Zwischen den Boxen kann direkt TikZ-Code eingegeben werden. Das Namensschema der Boxen als Koordinaten lautet
+%% TCBPOSTER@<boxname>.ankerpunkt
+%% Für genauere Erläuterungen zur Syntax, bietet die tikz-Anleitung genauere Angaben, weitere benannte Koordinaten finden sich in der tcolorbox-Dokumentation
\draw[BFH-Orange,line width=4pt,->] ([yshift=-1cm]TCBPOSTER@verweis.east) -| ([xshift=1cm]TCBPOSTER@colored.east) -- (TCBPOSTER@colored.east);
-% Relative Positionierung
+%% Relative Positionierung
\begin{posterboxenv}[title=Relative Positionierung,BFH-framed]{name=relative, column=4, between=notitle and verweis}
Diese Box wird zwischen den beiden Boxen \code{notitle} und \code{verweis} platziert.
\end{posterboxenv}
-% Papierformat
+%% Papierformat
\begin{posterboxenv}[title=Papierformat]{name=paper,column=3,span=2,below=row5}
Die Klasse \cls{BFHsciposter} unterstützt die Papierformate A0, A1, A2 und A3. Der Wert wird über die Klassenoption \code{paper} ausgewählt:
diff --git a/macros/latex/contrib/bfh-ci/tex/beamercolorthemeBFH.sty b/macros/latex/contrib/bfh-ci/tex/beamercolorthemeBFH.sty
index b07c382d07..ff0cff9fc3 100644
--- a/macros/latex/contrib/bfh-ci/tex/beamercolorthemeBFH.sty
+++ b/macros/latex/contrib/bfh-ci/tex/beamercolorthemeBFH.sty
@@ -1,4 +1,4 @@
-%% This is file `beamercolorthemeBFH.sty' version 2.1.5 (2023/03/07),
+%% This is file `beamercolorthemeBFH.sty' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesPackage{beamercolorthemeBFH}[2023/03/07 v2.1.5 BFH-CI beamer color theme, CI of Bern University of Applied Sciences]
+\ProvidesPackage{beamercolorthemeBFH}[2023/10/20 v2.2.0 BFH-CI beamer color theme, CI of Bern University of Applied Sciences]
% ====================
% Dependencies
diff --git a/macros/latex/contrib/bfh-ci/tex/beamerfontthemeBFH.sty b/macros/latex/contrib/bfh-ci/tex/beamerfontthemeBFH.sty
index 5ee5c10952..6a5fc6e9f2 100644
--- a/macros/latex/contrib/bfh-ci/tex/beamerfontthemeBFH.sty
+++ b/macros/latex/contrib/bfh-ci/tex/beamerfontthemeBFH.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerfontthemeBFH.sty' version 2.1.5 (2023/03/07),
+%% This is file `beamerfontthemeBFH.sty' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesPackage{beamerfontthemeBFH}[2023/03/07 v2.1.5 BFH-CI beamer font theme, CI of Bern University of Applied Sciences]
+\ProvidesPackage{beamerfontthemeBFH}[2023/10/20 v2.2.0 BFH-CI beamer font theme, CI of Bern University of Applied Sciences]
% ====================
% Dependencies
diff --git a/macros/latex/contrib/bfh-ci/tex/beamerinnerthemeBFH.sty b/macros/latex/contrib/bfh-ci/tex/beamerinnerthemeBFH.sty
index 7d31e0de6f..14d4666184 100644
--- a/macros/latex/contrib/bfh-ci/tex/beamerinnerthemeBFH.sty
+++ b/macros/latex/contrib/bfh-ci/tex/beamerinnerthemeBFH.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerinnerthemeBFH.sty' version 2.1.5 (2023/03/07),
+%% This is file `beamerinnerthemeBFH.sty' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesExplPackage{beamerinnerthemeBFH}{2023/03/07}{2.1.5}{BFH-CI beamer inner theme, CI of Bern University of Applied Sciences}
+\ProvidesExplPackage{beamerinnerthemeBFH}{2023/10/20}{2.2.0}{BFH-CI beamer inner theme, CI of Bern University of Applied Sciences}
\RequirePackage{l3keys2e}
diff --git a/macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH-sidebar.sty b/macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH-sidebar.sty
index 7b79a10200..5e77f17d64 100644
--- a/macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH-sidebar.sty
+++ b/macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH-sidebar.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerouterthemeBFH-sidebar.sty' version 2.1.5 (2023/03/07),
+%% This is file `beamerouterthemeBFH-sidebar.sty' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesPackage{beamerouterthemeBFH-sidebar}[2023/03/07 v2.1.5 BFH-CI beamer outer theme sidebar variant, CI of Bern University of Applied Sciences]
+\ProvidesPackage{beamerouterthemeBFH-sidebar}[2023/10/20 v2.2.0 BFH-CI beamer outer theme sidebar variant, CI of Bern University of Applied Sciences]
\mode<presentation>
\useoutertheme{BFH}
diff --git a/macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH.sty b/macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH.sty
index ca985f7786..706d7a3d55 100644
--- a/macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH.sty
+++ b/macros/latex/contrib/bfh-ci/tex/beamerouterthemeBFH.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerouterthemeBFH.sty' version 2.1.5 (2023/03/07),
+%% This is file `beamerouterthemeBFH.sty' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesPackage{beamerouterthemeBFH}[2023/03/07 v2.1.5 BFH-CI beamer outer theme, CI of Bern University of Applied Sciences]
+\ProvidesPackage{beamerouterthemeBFH}[2023/10/20 v2.2.0 BFH-CI beamer outer theme, CI of Bern University of Applied Sciences]
\RequirePackage{l3keys2e}
diff --git a/macros/latex/contrib/bfh-ci/tex/beamerthemeBFH.sty b/macros/latex/contrib/bfh-ci/tex/beamerthemeBFH.sty
index e31e9cfc6e..56ffc39933 100644
--- a/macros/latex/contrib/bfh-ci/tex/beamerthemeBFH.sty
+++ b/macros/latex/contrib/bfh-ci/tex/beamerthemeBFH.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerthemeBFH.sty' version 2.1.5 (2023/03/07),
+%% This is file `beamerthemeBFH.sty' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesPackage{beamerthemeBFH}[2023/03/07 v2.1.5 BFH-CI beamer theme, CI of Bern University of Applied Sciences]
+\ProvidesPackage{beamerthemeBFH}[2023/10/20 v2.2.0 BFH-CI beamer theme, CI of Bern University of Applied Sciences]
% ====================
% Dependencies
% ====================
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-a0paper.clo b/macros/latex/contrib/bfh-ci/tex/bfh-a0paper.clo
index 7f4cbdfcba..f85a72c429 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-a0paper.clo
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-a0paper.clo
@@ -1,4 +1,4 @@
-%% This is file `bfh-a0paper.clo' version 2.1.5 (2023/03/07),
+%% This is file `bfh-a0paper.clo' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesExplFile{bfh-a0paper.clo}{2023/03/07}{2.1.5}{bfh-ci~size~adjustments~for~a0paper}
+\ProvidesExplFile{bfh-a0paper.clo}{2023/10/20}{2.2.0}{bfh-ci~size~adjustments~for~a0paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
\cs_set:Nn \ptxcd_title_fontsize: {{126bp}{165bp}}
\cs_set:Nn \ptxcd_subtitle_fontsize: {{38bp}{55bp}}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-a1paper.clo b/macros/latex/contrib/bfh-ci/tex/bfh-a1paper.clo
index 49ddb4701c..6e7c610b2c 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-a1paper.clo
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-a1paper.clo
@@ -1,4 +1,4 @@
-%% This is file `bfh-a1paper.clo' version 2.1.5 (2023/03/07),
+%% This is file `bfh-a1paper.clo' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesExplFile{bfh-a1paper.clo}{2023/03/07}{2.1.5}{bfh-ci~size~adjustments~for~a1paper}
+\ProvidesExplFile{bfh-a1paper.clo}{2023/10/20}{2.2.0}{bfh-ci~size~adjustments~for~a1paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
\cs_set:Nn \ptxcd_title_fontsize: {{90bp}{108bp}}
\cs_set:Nn \ptxcd_subtitle_fontsize: {{27bp}{32.5bp}}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-a2paper.clo b/macros/latex/contrib/bfh-ci/tex/bfh-a2paper.clo
index 5e6f3031fb..10532d4493 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-a2paper.clo
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-a2paper.clo
@@ -1,4 +1,4 @@
-%% This is file `bfh-a2paper.clo' version 2.1.5 (2023/03/07),
+%% This is file `bfh-a2paper.clo' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesExplFile{bfh-a2paper.clo}{2023/03/07}{2.1.5}{bfh-ci~size~adjustments~for~a2paper}
+\ProvidesExplFile{bfh-a2paper.clo}{2023/10/20}{2.2.0}{bfh-ci~size~adjustments~for~a2paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
\cs_set:Nn \ptxcd_title_fontsize: {{64bp}{77bp}}
\cs_set:Nn \ptxcd_subtitle_fontsize: {{19.5bp}{23.4bp}}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-a3paper.clo b/macros/latex/contrib/bfh-ci/tex/bfh-a3paper.clo
index 3ddcfbbf5d..070b99f236 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-a3paper.clo
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-a3paper.clo
@@ -1,4 +1,4 @@
-%% This is file `bfh-a3paper.clo' version 2.1.5 (2023/03/07),
+%% This is file `bfh-a3paper.clo' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesExplFile{bfh-a0paper.clo}{2023/03/07}{2.1.5}{bfh-ci~size~adjustments~for~a1paper}
+\ProvidesExplFile{bfh-a0paper.clo}{2023/10/20}{2.2.0}{bfh-ci~size~adjustments~for~a1paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
\cs_set:Nn \ptxcd_title_fontsize: {{46bp}{55.2bp}}
\cs_set:Nn \ptxcd_subtitle_fontsize: {{19.5bp}{23.4bp}}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-a4paper.clo b/macros/latex/contrib/bfh-ci/tex/bfh-a4paper.clo
index 7f6386bf99..5220a030e1 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-a4paper.clo
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-a4paper.clo
@@ -1,4 +1,4 @@
-%% This is file `bfh-a4paper.clo' version 2.1.5 (2023/03/07),
+%% This is file `bfh-a4paper.clo' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesExplFile{bfh-a0paper.clo}{2023/03/07}{2.1.5}{bfh-ci~size~adjustments~for~a4paper}
+\ProvidesExplFile{bfh-a0paper.clo}{2023/10/20}{2.2.0}{bfh-ci~size~adjustments~for~a4paper}
\cs_set:Nn \ptxcd_setup_base_sizes: {
\dim_gset:Nn \g_ptxcd_rule_height_dim {2.5mm}
\dim_gset:Nn \g_ptxcd_rule_arc_dim {.5mm}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-a5paper.clo b/macros/latex/contrib/bfh-ci/tex/bfh-a5paper.clo
index 6ed16667ec..736339559f 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-a5paper.clo
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-a5paper.clo
@@ -1,4 +1,4 @@
-%% This is file `bfh-a5paper.clo' version 2.1.5 (2023/03/07),
+%% This is file `bfh-a5paper.clo' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesExplFile{bfh-a5paper.clo}{2023/03/07}{2.1.5}{bfh-ci~size~adjustments~for~a5paper}
+\ProvidesExplFile{bfh-a5paper.clo}{2023/10/20}{2.2.0}{bfh-ci~size~adjustments~for~a5paper}
\cs_set:Nn \ptxcd_setup_base_sizes: {
\dim_gset:Nn \g_ptxcd_rule_height_dim {2.5mm}
\dim_gset:Nn \g_ptxcd_rule_arc_dim {.5mm}%
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-a6paper.clo b/macros/latex/contrib/bfh-ci/tex/bfh-a6paper.clo
index 47c9b59884..9c15bff895 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-a6paper.clo
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-a6paper.clo
@@ -1,4 +1,4 @@
-%% This is file `bfh-a6paper.clo' version 2.1.5 (2023/03/07),
+%% This is file `bfh-a6paper.clo' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-beamerarticle.cfg b/macros/latex/contrib/bfh-ci/tex/bfh-beamerarticle.cfg
index 0bf8db6b9d..72cde708f5 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-beamerarticle.cfg
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-beamerarticle.cfg
@@ -1,4 +1,4 @@
-%% This is file `bfh-beamerarticle.cfg' version 2.1.5 (2023/03/07),
+%% This is file `bfh-beamerarticle.cfg' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesFile{bfh-beamerarticle.cfg} [2023/03/07 v2.1.5 beamerarticle configuration for bfhlayout]
+\ProvidesFile{bfh-beamerarticle.cfg} [2023/10/20 v2.2.0 beamerarticle configuration for bfhlayout]
\let\orig@titlegraphic\titlegraphic
\let\titlegraphic\@undefined
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-factsheet.cfg b/macros/latex/contrib/bfh-ci/tex/bfh-factsheet.cfg
index b2a75c2c6e..720478c8f8 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-factsheet.cfg
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-factsheet.cfg
@@ -1,4 +1,4 @@
-%% This is file `bfh-factsheet.cfg' version 2.1.5 (2023/03/07),
+%% This is file `bfh-factsheet.cfg' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesFile{bfh-factsheet.cfg}[2023/03/07 v2.1.5 factsheet configuration for bfhlayout]
+\ProvidesFile{bfh-factsheet.cfg}[2023/10/20 v2.2.0 factsheet configuration for bfhlayout]
\KOMAoptions{headsepline=false}
\clearpairofpagestyles
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-layout-boxes.cfg b/macros/latex/contrib/bfh-ci/tex/bfh-layout-boxes.cfg
index 4e3a9e5fd9..b3d2c96c66 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-layout-boxes.cfg
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-layout-boxes.cfg
@@ -1,4 +1,4 @@
-%% This is file `bfh-layout-boxes.cfg' version 2.1.5 (2023/03/07),
+%% This is file `bfh-layout-boxes.cfg' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -29,7 +29,7 @@
%% ============================================================================
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{bfh-layout-boxes.cfg}[2023/03/07 v2.1.5 boxes configuration for bfhlayout]
+\ProvidesFile{bfh-layout-boxes.cfg}[2023/10/20 v2.2.0 boxes configuration for bfhlayout]
\RequirePackage{bfhcolors}
\RequirePackage{fontawesome}
\PassOptionsToPackage{most}{tcolorbox}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-layout-listings.cfg b/macros/latex/contrib/bfh-ci/tex/bfh-layout-listings.cfg
index 68fd2df114..7004118cde 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-layout-listings.cfg
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-layout-listings.cfg
@@ -1,4 +1,4 @@
-%% This is file `bfh-layout-listings.cfg' version 2.1.5 (2023/03/07),
+%% This is file `bfh-layout-listings.cfg' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesFile{bfh-layout-listings.cfg}[2023/03/07 v2.1.5 listings configuration for bfhlayout]
+\ProvidesFile{bfh-layout-listings.cfg}[2023/10/20 v2.2.0 listings configuration for bfhlayout]
\RequirePackage{bfhcolors}
%% Hack to fix issue with float env used in listings package
%% ref. : https://tex.stackexchange.com/questions/51867/koma-warning-about-toc
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-layout-rules.cfg b/macros/latex/contrib/bfh-ci/tex/bfh-layout-rules.cfg
index 8b8f5a242b..747332de29 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-layout-rules.cfg
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-layout-rules.cfg
@@ -1,4 +1,4 @@
-%% This is file `bfh-layout-rules.cfg' version 2.1.5 (2023/03/07),
+%% This is file `bfh-layout-rules.cfg' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesExplFile{bfh-layout-rules.cfg}{2023/03/07}{2.1.5}{rules configuration for bfhlayout}
+\ProvidesExplFile{bfh-layout-rules.cfg}{2023/10/20}{2.2.0}{rules configuration for bfhlayout}
\int_if_exist:NF \g_ptxcd_paper_int {
\int_new:N \g_ptxcd_paper_int
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-layout-tabular.cfg b/macros/latex/contrib/bfh-ci/tex/bfh-layout-tabular.cfg
index 6fbc317383..7fcbf4e0e9 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-layout-tabular.cfg
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-layout-tabular.cfg
@@ -1,4 +1,4 @@
-%% This is file `bfh-layout-tabular.cfg' version 2.1.5 (2023/03/07),
+%% This is file `bfh-layout-tabular.cfg' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesExplFile{bfh-layout-tabular.cfg}{2023/03/07}{2.1.5}{tabular and tabularray configuration for bfhlayout}
+\ProvidesExplFile{bfh-layout-tabular.cfg}{2023/10/20}{2.2.0}{tabular and tabularray configuration for bfhlayout}
\colorlet{BFH-table}{BFH-LightGreen!10}
\colorlet{BFH-tablehead}{BFH-LightGreen!50}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-layout-terminal.cfg b/macros/latex/contrib/bfh-ci/tex/bfh-layout-terminal.cfg
index f208ea1d67..9544b8c3fa 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-layout-terminal.cfg
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-layout-terminal.cfg
@@ -1,4 +1,4 @@
-%% This is file `bfh-layout-tabular.cfg' version 2.1.5 (2023/03/07),
+%% This is file `bfh-layout-tabular.cfg' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -29,7 +29,7 @@
%% ============================================================================
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{bfh-layout-terminal.cfg}[2023/03/07 v2.1.5 terminal configuration for bfhlayout]
+\ProvidesFile{bfh-layout-terminal.cfg}[2023/10/20 v2.2.0 terminal configuration for bfhlayout]
\RequirePackage{bfhcolors}
\RequirePackage{tcolorbox}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfh-projectproposal.cfg b/macros/latex/contrib/bfh-ci/tex/bfh-projectproposal.cfg
index 3dc924f0c1..97eea44fad 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfh-projectproposal.cfg
+++ b/macros/latex/contrib/bfh-ci/tex/bfh-projectproposal.cfg
@@ -1,4 +1,4 @@
-%% This is file `bfh-projectproposal.cfg' version 2.1.5 (2023/03/07),
+%% This is file `bfh-projectproposal.cfg' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesFile{bfh-projectproposal.cfg}[2023/03/07 v2.1.5 projectproposal configuration for bfhlayout]
+\ProvidesFile{bfh-projectproposal.cfg}[2023/10/20 v2.2.0 projectproposal configuration for bfhlayout]
\KOMAoptions{headsepline=false}
\clearpairofpagestyles
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhbeamer.cls b/macros/latex/contrib/bfh-ci/tex/bfhbeamer.cls
index 96329c1410..90ca633c01 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhbeamer.cls
+++ b/macros/latex/contrib/bfh-ci/tex/bfhbeamer.cls
@@ -1,4 +1,4 @@
-%% This is file `bfhbeamer.cls' version 2.1.5 (2023/03/07),
+%% This is file `bfhbeamer.cls' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -29,7 +29,7 @@
%% ============================================================================
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{bfhbeamer}[2023/03/07 v2.1.5 BFH-CI beamer layout, CI of Bern University of Applied Sciences]
+\ProvidesClass{bfhbeamer}[2023/10/20 v2.2.0 BFH-CI beamer layout, CI of Bern University of Applied Sciences]
\RequirePackage{l3keys2e}
\PassOptionsToPackage{table}{xcolor}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhcolors.sty b/macros/latex/contrib/bfh-ci/tex/bfhcolors.sty
index 97321471a6..288580fec5 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhcolors.sty
+++ b/macros/latex/contrib/bfh-ci/tex/bfhcolors.sty
@@ -1,4 +1,4 @@
-%% This is file `bfhcolors.sty' version 2.1.5 (2023/03/07),
+%% This is file `bfhcolors.sty' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -29,7 +29,7 @@
%% ============================================================================
%%
\RequirePackage{expl3}
-\ProvidesExplPackage{bfhcolors}{2023/03/07}{2.1.5}{color setup for BFH-CI, CI of Bern Universitry of Applied Sciences}
+\ProvidesExplPackage{bfhcolors}{2023/10/20}{2.2.0}{color setup for BFH-CI, CI of Bern Universitry of Applied Sciences}
\RequirePackage{l3keys2e}
\tl_new:N \g__ptxcd_colormode_tl
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhfonts.sty b/macros/latex/contrib/bfh-ci/tex/bfhfonts.sty
index a6ee8000a7..5f41d47ca4 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhfonts.sty
+++ b/macros/latex/contrib/bfh-ci/tex/bfhfonts.sty
@@ -1,4 +1,4 @@
-%% This is file `bfhfonts.sty' version 2.1.5 (2023/03/07),
+%% This is file `bfhfonts.sty' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -29,7 +29,7 @@
%% ============================================================================
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bfhfonts}[2023/03/07 v2.1.5 BFH-CI (fonts Module)]
+\ProvidesPackage{bfhfonts}[2023/10/20 v2.2.0 BFH-CI (fonts Module)]
\RequirePackage{iftex}
\RequirePackage{anyfontsize}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhhkb-doc.cfg b/macros/latex/contrib/bfh-ci/tex/bfhhkb-doc.cfg
new file mode 100644
index 0000000000..2effb93b65
--- /dev/null
+++ b/macros/latex/contrib/bfh-ci/tex/bfhhkb-doc.cfg
@@ -0,0 +1,311 @@
+%% This is file `bfhhkb-doc.cfg' version 2.2.0 (2023/10/20),
+%% it is part of
+%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
+%% ----------------------------------------------------------------------------
+%%
+%% Copyright (C) 2021-2023 by
+%% Marei Peischl <marei@peitex.de>
+%% Andreas Habegger <andreas.habegger@bfh.ch>
+%%
+%% ============================================================================
+%% This work 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/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainers of this work are
+%% Marei Peischl <bfh-ci@peitex.de>
+%% Andreas Habegger <andreas.habegger@bfh.ch>
+%%
+%% The development respository can be found at
+%% https://gitlab.ti.bfh.ch/bfh-latex/bfh-ci/
+%% Please use the issue tracker for feedback!
+%%
+%% ============================================================================
+%%
+\ProvidesExplFile{bfh-beamerarticle.cfg} {2023/10/20}{2.2.0}{hkb-doc module for bfhthesis}
+\RenewDocumentCommand{\titlegraphic}{sm}{
+ \IfBooleanTF{#1}{
+ \tl_gset:Nn \g_ptxcd_titleimage_code_tl {
+ \hbox_set:Nn \l__ptxcd_titlegraphic_box {\raisebox{\depth}{#2}}
+ \box_resize_to_ht:Nn \l__ptxcd_titlegraphic_box {\height}
+ \dim_compare:nTF {\box_wd:N \l__ptxcd_titlegraphic_box - \width > \c_zero_dim}
+ {
+ \dim_set:Nn \l_tmpa_dim {.5\box_ht:N \l__ptxcd_titlegraphic_box - .5\height}
+ \clipbox{0pt~\dim_eval:n{\l_tmpa_dim}~0pt~\dim_eval:n{\l_tmpa_dim}}{\box_use:N \l__ptxcd_titlegraphic_box}
+ }{
+ \box_use:N \l__ptxcd_titlegraphic_box
+ }
+ }
+ }{
+ \tl_gset:Nn \g_ptxcd_titleimage_code_tl {#2}
+ }
+}
+
+\cs_new:Nn \__ptxcd_title_tabular_entry:n {
+ \tl_if_in:nnTF {#1} {= } {
+ \__ptxcd_title_tabular_entry:w #1 \q_stop
+ } {
+ \text_titlecase_first:n {#1}\\
+ }
+}
+
+\cs_new:Npn \__ptxcd_title_tabular_entry:w #1 = #2 \q_stop {
+ \text_titlecase_first:n {#1}\unskip :& #2 \\
+}
+
+\seq_new:N \g__ptxcd_projectData_seq
+\newcommand*{\ProjectData}[1]{
+ \seq_gset_from_clist:Nn \g__ptxcd_projectData_seq {#1}
+}
+
+\colorlet{BFH-Title}{black}
+
+\newkomafont{titledata}{\normalfont\footnotesize}
+\setkomafont{disposition}{\bfseries}
+\addtokomafont{subtitle}{\mdseries\LARGE}
+\addtokomafont{caption}{\tiny}
+\setkomafont{caption}{\footnotesize}
+\setkomafont{captionlabel}{\usekomafont{caption}\bfseries}
+
+\setkomafont{pageheadfoot}{\footnotesize}
+\setkomafont{footnote}{}
+\setkomafont{pagenumber}{\fontsize{6pt}{6pt}\selectfont}
+
+\colorlet{BFH-textaccentcolor}{.}
+
+\cs_if_exist:NTF \chapter {
+ \RedeclareSectionCommand[
+ beforeskip=0pt
+ ]{chapter}
+ \setkomafont{chapter}{\LARGE}
+ \setkomafont{section}{\Large}
+ \setkomafont{subsection}{\large}
+ \setkomafont{subsubsection}{\mdseries}
+ \setkomafont{paragraph}{\mdseries}
+ \setkomafont{subparagraph}{\mdseries}
+} {
+ \setkomafont{section}{\LARGE}
+ \setkomafont{subsection}{\large}
+ \setkomafont{subsubsection}{\mdseries}
+ \setkomafont{paragraph}{\mdseries}
+ \setkomafont{subparagraph}{\mdseries}
+}
+
+\AddToHook{begindocument/end}{
+ \defcaptionname{swissgerman,nswissgerman,german,ngerman}{\refname}{Literaturverzeichnis}
+ \defcaptionname{swissgerman,nswissgerman,german,ngerman}{\bibname}{Literaturverzeichnis}
+}
+
+\RedeclareSectionCommand[
+ style=section,
+ runin=false,
+ afterskip=0pt
+]{paragraph}
+
+\RedeclareSectionCommand[
+ style=section,
+ runin=false,
+ afterskip=0pt
+]{subparagraph}
+
+\RequirePackage{tabularx}
+
+
+\renewcommand*{\maketitle}[1][1]{
+ \def\and{,~ }
+ \cs_if_exist_use:N \ptxcd_pass_TitleData:
+ \if@titlepage
+ \begin{titlepage}
+ \KOMAoptions{fontsize=11pt}
+ \setcounter{page}{%
+ #1%
+ }%
+ \def\thefootnote{\fnsymbol{footnote}}
+ \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
+ \thispagestyle{empty}%TODO title.
+ \vspace*{-2cm}
+ \tl_if_eq:cnTF {BFH-optional-Logo} {true} {
+ \raisebox{.75mm}{\includegraphics[height=17mm]{example-image}}
+ \hspace{1.25cm}\includegraphics[height=19mm]{example-image}
+ }{
+ \raisebox{.75mm}{\includegraphics[height=17mm]{HKB_Markenzeichen}}
+ \hspace{1.25cm}\includegraphics[height=19mm]{CRC_Logo}
+ }
+ \par
+ \vspace{2.15cm}
+ \begingroup
+ \def\width{\dimexpr14.75cm}
+ \def\height{\dimexpr11.1cm}
+ \tl_if_empty:NTF \g_ptxcd_titleimage_code_tl {
+ \rule{0pt}{\height}
+ } {
+ \g_ptxcd_titleimage_code_tl
+ }
+ \par
+ \endgroup
+ \vspace{1.7cm}
+
+ \begingroup
+ \usekomafont{disposition}
+ {\usekomafont{title}\@title\par}
+ \endgroup
+
+ \ifx\@subtitle\@empty\else{\vspace{.2\baselineskip}\usekomafont{subtitle}\@subtitle\par}\fi
+
+ \vfill
+ \usekomafont{titledata}
+ \begin{tabularx}{\linewidth}{@{}l@{\hspace{1.6em}}X@{}}%
+ \seq_map_function:NN \g__ptxcd_projectData_seq \__ptxcd_title_tabular_entry:n
+ \end{tabularx}
+ \vspace*{-2\baselineskip}
+
+ \@thanks\let\@thanks\@empty
+ \if@twoside
+ \@tempswatrue
+ \if@tempswa
+ \next@tpage
+ \begin{minipage}[t]{\textwidth}
+ \@uppertitleback
+ \end{minipage}\par
+ \vfill
+ \begin{minipage}[b]{\textwidth}
+ \@lowertitleback
+ \end{minipage}\par
+ \@thanks\let\@thanks\@empty
+ \fi
+ \fi
+ \ifx\@dedication\@empty
+ \else
+ \next@tdpage\null\vfill
+ {\centering\usekomafont{dedication}{\@dedication \par}}%
+ \vskip \z@ \@plus3fill
+ \@thanks\let\@thanks\@empty
+ \cleardoubleemptypage
+ \fi
+ \end{titlepage}
+ \setcounter{footnote}{0}%
+ \global\let\and\relax
+ \cleardoublepage
+ \else
+ \par
+ \@tempcnta=%
+ #1%
+ \relax\ifnum\@tempcnta=1\else
+ \ClassWarning{\KOMAClassName}{%
+ Optional argument of \string\maketitle\space ignored\MessageBreak
+ in `titlepage=false' mode%
+ }%
+ \fi
+ \ifx\@uppertitleback\@empty\else
+ \ClassWarning{\KOMAClassName}{%
+ non empty \string\uppertitleback\space ignored
+ by \string\maketitle\MessageBreak
+ in `titlepage=false' mode%
+ }%
+ \fi
+ \ifx\@lowertitleback\@empty\else
+ \ClassWarning{\KOMAClassName}{%
+ non empty \string\lowertitleback\space ignored
+ by \string\maketitle\MessageBreak
+ in `titlepage=false' mode%
+ }%
+ \fi
+ \begingroup
+ \let\titlepage@restore\relax
+ \def\thefootnote{\fnsymbol{footnote}}
+ \next@tdpage
+ \ifx\@extratitle\@empty
+ \ifx\@frontispiece\@empty\else \mbox{}\fi
+ \else
+ \@makeextratitle
+ \fi
+ \ifx\@frontispiece\@empty
+ \ifx\@extratitle\@empty\else\next@tdpage\fi
+ \else
+ \next@tpage
+ \@makefrontispiece
+ \next@tdpage
+ \fi
+ \if@twocolumn
+ \twocolumn[\@maketitle]
+ \else
+ \@maketitle
+ \fi
+ \ifx\titlepagestyle\@empty\else\thispagestyle{\titlepagestyle}\fi
+ \global\let\@thanks\@empty
+ \endgroup
+ \fi
+}
+
+
+\clearpairofpagestyles
+\ofoot[\pagemark]{\pagemark}
+
+% disable adjustment of \labelitemi
+\RemoveFromHook{begindocument/end}[bfh-ci-label]
+
+% margins
+\dim_if_exist:NF \g_ptxcd_innerMargin_dim {
+ \dim_new:N \g_ptxcd_innerMargin_dim
+ \dim_new:N \g_ptxcd_outerMargin_dim
+ \dim_new:N \g_ptxcd_bottomMargin_dim
+ \dim_new:N \g_ptxcd_topMargin_dim
+ \dim_new:N \g_ptxcd_topLogoMargin_dim
+ \dim_new:N \g_ptxcd_columnSep_dim
+ \RequirePackage{geometry}
+}
+\dim_gset:Nn \g_ptxcd_columnSep_dim {4mm}
+
+\dim_gset:Nn \g_ptxcd_topMargin_dim {26mm}
+\dim_gset:Nn \g_ptxcd_bottomMargin_dim {15mm}%20mm}
+\dim_gset:Nn \g_ptxcd_innerMargin_dim {35mm}
+\dim_gset:Nn \g_ptxcd_outerMargin_dim {28mm}%12mm}
+\dim_gset:Nn \g_ptxcd_topLogoMargin_dim {25mm}
+
+\geometry{
+ includefoot,
+ % footskip=\dim_eval:n {\footskip+\baselineskip},
+ top=\g_ptxcd_topMargin_dim,
+ inner=\g_ptxcd_innerMargin_dim,
+ outer=\dim_eval:n {\g_ptxcd_outerMargin_dim},
+ bottom=\dimexpr\g_ptxcd_bottomMargin_dim-\dp\strutbox,
+ columnsep= \g_ptxcd_columnSep_dim,
+}
+
+
+\KOMAoptions{
+ bibliography=totoc,
+ listof=totoc,
+ parskip=full,
+ fontsize=9bp,
+ headsepline=false,
+ captions=nooneline,
+ footwidth=\dimexpr\textwidth+13mm,
+}
+
+\DeclareTOCStyleEntries[beforeskip=1ex]{tocline}{section,subsection,subsubsection,paragraph,subparagraph}
+
+\cs_if_exist:NTF \chapter {
+ \DeclareTOCStyleEntries[beforeskip=\baselineskip]{tocline}{chapter}
+}{
+ \DeclareTOCStyleEntries[beforeskip=\baselineskip]{tocline}{section}
+}
+
+
+\setcounter{secnumdepth}{\subparagraphnumdepth}
+\setcounter{tocdepth}{\subparagraphnumdepth}
+
+\raggedbottom
+
+\iftutex
+ \setsansfont{texgyreheros}[Scale=1.1,LetterSpace=1.3]
+\fi
+\renewcommand*{\familydefault}{\sfdefault}
+
+\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhlayout.sty b/macros/latex/contrib/bfh-ci/tex/bfhlayout.sty
index 8764fa6d19..262a81985f 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhlayout.sty
+++ b/macros/latex/contrib/bfh-ci/tex/bfhlayout.sty
@@ -1,4 +1,4 @@
-%% This is file `bfhlayout.sty' version 2.1.5 (2023/03/07),
+%% This is file `bfhlayout.sty' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -29,7 +29,7 @@
%% ============================================================================
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bfhlayout}[2023/03/07 v2.1.5 BFH style package (layout)]
+\ProvidesPackage{bfhlayout}[2023/10/20 v2.2.0 BFH style package (layout)]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Process Options created for bfharticle
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -277,10 +277,11 @@
%% ============================== BFH Item List ==============================
%%
\@ifundefined {scr@fnt@labelitemi}{\newkomafont{labelitemi}{}}{}
-\setkomafont{labelitemi}{\color{BFH-Orange}}
+
\cs_new:Nn \__ptxcd_itemlabel: {{\ifvmode\leavevmode\fi\usekomafont{labelitemi}\raise1.25pt\hbox{$\blacktriangleright$}}}
+\AddToHook{begindocument/end}[bfh-ci-label]{\renewcommand*{\labelitemi}{\__ptxcd_itemlabel:}\setkomafont{labelitemi}{\color{BFH-Orange}}}
\newcommand*{\bfhitemlabel}{\__ptxcd_itemlabel:\quad}
-\renewcommand*{\labelitemi}{\__ptxcd_itemlabel:}
+
%%
%%
%% ===================== Set fonts for caption, chapter etc. ==================
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhletter.sty b/macros/latex/contrib/bfh-ci/tex/bfhletter.sty
index 8ded1fc173..55c15c63b1 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhletter.sty
+++ b/macros/latex/contrib/bfh-ci/tex/bfhletter.sty
@@ -1,4 +1,4 @@
-%% This is file `bfhletter.sty' version 2.1.5 (2023/03/07),
+%% This is file `bfhletter.sty' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
%%
%% ============================================================================
%%
-\ProvidesPackage{bfhletter}[2023/03/07 v2.1.5 letter layouts for BFH-CI, CI of Bern University of Applied Sciences]
+\ProvidesPackage{bfhletter}[2023/10/20 v2.2.0 letter layouts for BFH-CI, CI of Bern University of Applied Sciences]
\PassOptionsToPackage{fromlogo=true,refline=false,addrfield=topaligned,pagenumber=botright}{scrletter}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhlettersize9.5pt.clo b/macros/latex/contrib/bfh-ci/tex/bfhlettersize9.5pt.clo
index c994878dc8..59dfcae401 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhlettersize9.5pt.clo
+++ b/macros/latex/contrib/bfh-ci/tex/bfhlettersize9.5pt.clo
@@ -1,4 +1,4 @@
-%% This is file `bfhlettersize9.5pt.clo' version 2.1.5 (2023/03/07),
+%% This is file `bfhlettersize9.5pt.clo' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhmodule.sty b/macros/latex/contrib/bfh-ci/tex/bfhmodule.sty
index a81178e728..d7bf6febc7 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhmodule.sty
+++ b/macros/latex/contrib/bfh-ci/tex/bfhmodule.sty
@@ -1,4 +1,4 @@
-%% This is file `bfhmodule.sty' version 2.1.5 (2023/03/07),
+%% This is file `bfhmodule.sty' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -29,7 +29,7 @@
%% ============================================================================
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplPackage{bfhmodule}{2023/03/07}{2.1.5}{BFH module package -- modular extensions for bfh-ci}
+\ProvidesExplPackage{bfhmodule}{2023/10/20}{2.2.0}{BFH module package -- modular extensions for bfh-ci}
\msg_new:nnn {bfhmodule} {module-not-found} {
You~tried~to~load~the~BFH~layout~module~#1.\\
@@ -51,6 +51,7 @@
\file_if_exist_input:nF {bfh-layout-##1.cfg}
{\msg_error:nnn {bfhmodule} {module-not-found} {##1}}
\seq_gpush:Nn \g__ptxcd_module_seq {##1}
+ \ExplSyntaxOff
}
}
\ExplSyntaxOff
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhpub.cls b/macros/latex/contrib/bfh-ci/tex/bfhpub.cls
index f645991142..1c6164eec6 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhpub.cls
+++ b/macros/latex/contrib/bfh-ci/tex/bfhpub.cls
@@ -1,4 +1,4 @@
-%% This is file `bfhpub.cls' version 2.1.5 (2023/03/07),
+%% This is file `bfhpub.cls' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -31,7 +31,7 @@
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplClass{bfhpub}
-{2023/03/07}{2.1.5}{Publications using Corporate Design of BFH (BFH-CI)}
+{2023/10/20}{2.2.0}{Publications using Corporate Design of BFH (BFH-CI)}
\RequirePackage{l3keys2e}
@@ -54,6 +54,7 @@
class .initial:n = scrartcl,
department .choice:,
department / default .code:n = \str_gset:Nn \g_ptxcd_department_str {default},
+ department / hkb-doc .code:n = \str_gset:Nn \g_ptxcd_department_str {hkb-doc}\tl_gset:Nn \g_ptxcd_pub_class_tl {scrartcl},
department .initial:n = default,
department / unknown .code:n = {
\str_gset:Nx \g_ptxcd_department_str {\l_keys_value_tl}
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhsciposter.cls b/macros/latex/contrib/bfh-ci/tex/bfhsciposter.cls
index 328b45ca07..ca3d9d7876 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhsciposter.cls
+++ b/macros/latex/contrib/bfh-ci/tex/bfhsciposter.cls
@@ -1,4 +1,4 @@
-%% This is file `bfhsciposter.cls' version 2.1.5 (2023/03/07),
+%% This is file `bfhsciposter.cls' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -30,7 +30,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\ProvidesExplPackage{bfhsciposter}{2023/03/07}{2.1.5}{Scientific poster layout of BFH}
+\ProvidesExplPackage{bfhsciposter}{2023/10/20}{2.2.0}{Scientific poster layout of BFH}
\RequirePackage{l3keys2e}
\prop_new:N \g_ptxcd_clsopts_prop
diff --git a/macros/latex/contrib/bfh-ci/tex/bfhthesis.cls b/macros/latex/contrib/bfh-ci/tex/bfhthesis.cls
index a42fef48a5..f403cc104e 100644
--- a/macros/latex/contrib/bfh-ci/tex/bfhthesis.cls
+++ b/macros/latex/contrib/bfh-ci/tex/bfhthesis.cls
@@ -1,4 +1,4 @@
-%% This is file `bfhthesis.cls' version 2.1.5 (2023/03/07),
+%% This is file `bfhthesis.cls' version 2.2.0 (2023/10/20),
%% it is part of
%% BFH-CI -- Corporate Design for Bern University of Applied Sciences
%% ----------------------------------------------------------------------------
@@ -30,7 +30,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\ProvidesExplClass{bfhthesis}{2023/03/07}{2.1.5}{Theses using Corporate Design of BFH (BFH-CI), CI of Bern University of Applied Sciences}
+\ProvidesExplClass{bfhthesis}{2023/10/20}{2.2.0}{Theses using Corporate Design of BFH (BFH-CI), CI of Bern University of Applied Sciences}
\RequirePackage{l3keys2e}
@@ -53,6 +53,7 @@
class .initial:n = scrbook,
department .choice:,
department / default .code:n = \str_gset:Nn \g_ptxcd_department_str {default},
+ department / hkb-doc .code:n = \str_gset:Nn \g_ptxcd_department_str {hkb-doc}\tl_gset:Nn \g_ptxcd_pub_class_tl {scrartcl},
department .initial:n = default,
department / unknown .code:n = {
\str_gset:Nx \g_ptxcd_department_str {\l_keys_value_tl}
@@ -123,8 +124,9 @@
\tl_new:N \g__ptxcd_signature_tl
\newcommand*{\setupSignature}[1]{\tl_gset:Nn \g__ptxcd_signature_tl {#1}}
-\newcommand*{\SignatureBox}[1]{%
- \keyval_parse:NNn \__ptxcd_signature_no_image:n \__ptxcd_signature_image:nn {#1}
+\NewDocumentCommand{\SignatureBox}{sm}{%
+ \IfBooleanT{#1}{\raisebox{-\height}}
+ {\keyval_parse:NNn \__ptxcd_signature_no_image:n \__ptxcd_signature_image:nn {#2}}
}
\cs_new:Nn \__ptxcd_signature_no_image:n {
diff --git a/macros/latex/contrib/diffcoeff/README.txt b/macros/latex/contrib/diffcoeff/README.txt
index c37619c34f..50169664db 100644
--- a/macros/latex/contrib/diffcoeff/README.txt
+++ b/macros/latex/contrib/diffcoeff/README.txt
@@ -10,10 +10,8 @@ version. The latest version of this license is in
http://www.latex-project.org/lppl.txt
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Version 5.3 of diffcoeff fixes a bug that arose in the use
-of the differential in beamer, introduces an alternative way
-of specifying orders of differentiation and reintroduces the
-override option.
+Version 5.4 of diffcoeff adds to the configurability of the
+differential and adjusts documentation accordingly.
Version 5.0 of diffcoeff introduced many interface incompat-
ibilities with version 4, which is still available through
@@ -24,15 +22,13 @@ the mleftright package.
Manifest
%%%%%%%%
-Changed files:
README.txt this document
-diffcoeff.sty LaTeX .sty file (current version, v5.1)
-diffcoeff.pdf documentation for current version, v5.1
-diffcoeff.tex LaTeX source of documentation for v5.3
-diffcoeff5.def definition file for v5.1
+diffcoeff.sty LaTeX .sty file
+diffcoeff.pdf documentation for current version
+diffcoeff.tex LaTeX source of documentation
+diffcoeff5.def definition file
-Unchanged files
-diffcoeff4.sty LaTeX .sty file, v4.2
+diffcoeff4.sty LaTeX .sty file for v4.2
diffcoeff4.pdf documentation for v4.2
diffcoeff4.tex LaTeX source of documentation for v4.2
diffcoeff-doc.def definition file for v4.2
diff --git a/macros/latex/contrib/diffcoeff/diffcoeff.pdf b/macros/latex/contrib/diffcoeff/diffcoeff.pdf
index 06469b8e85..5e9ac01e22 100644
--- a/macros/latex/contrib/diffcoeff/diffcoeff.pdf
+++ b/macros/latex/contrib/diffcoeff/diffcoeff.pdf
@@ -58,7 +58,7 @@ endobj
<< /S /GoTo /D (subsubsection.2.2.2.1) >>
endobj
40 0 obj
-(\376\377\0002\000.\0002\000.\0002\000.\0001\000\040\000A\000l\000t\000e\000r\000n\000a\000t\000i\000v\000e\000\040\000m\000e\000t\000h\000o\000d)
+(\376\377\0002\000.\0002\000.\0002\000.\0001\000\040\000A\000l\000t\000e\000r\000n\000a\000t\000i\000v\000e\000\040\000m\000e\000t\000h\000o\000d\000\040\000\050\000c\000o\000l\000o\000n\000\040\000n\000o\000t\000a\000t\000i\000o\000n\000\051)
endobj
41 0 obj
<< /S /GoTo /D (subsection.2.2.3) >>
@@ -118,7 +118,7 @@ endobj
<< /S /GoTo /D (subsubsection.2.2.5.2) >>
endobj
80 0 obj
-(\376\377\0002\000.\0002\000.\0005\000.\0002\000\040\000A\000l\000t\000e\000r\000n\000a\000t\000i\000v\000e\000\040\000m\000e\000t\000h\000o\000d)
+(\376\377\0002\000.\0002\000.\0005\000.\0002\000\040\000A\000l\000t\000e\000r\000n\000a\000t\000i\000v\000e\000\040\000m\000e\000t\000h\000o\000d\000\040\000\050\000c\000o\000l\000o\000n\000\040\000n\000o\000t\000a\000t\000i\000o\000n\000\051)
endobj
81 0 obj
<< /S /GoTo /D (subsubsection.2.2.5.3) >>
@@ -455,14 +455,13 @@ endobj
endobj
304 0 obj
<<
-/Length 359
+/Length 371
/Filter /FlateDecode
>>
stream
-xuRMK@WqosS
-CA=dSWۦ}vR^̼7` &L32 H4=ր3Ayꎽ.};/>GRsEi<HY)*Y?e 12 Hf
-}{i-,+hu1b0-"d` ͖Oa4,V/ٍqE }]|J1 TcjDAޒ "6&v4 Um0nzRy>lc}n ;s
-Ԍew<NQ=HTp0KϿ6Gub%Êx)O.f3e*=8._׳
+xuRKK@Wqfwn*TAD<njMJwۊbd`K[1nfyUίUЁDY0i 8S0w\glCd/-1OFn<HY.
+Qe% 12f
+ }yJׂ?`e1b;a~~GSLZQBZL}icP-rcbNmJIs.Ra]&ya:BdCn#i8 H&Cŏ< cwo@*/xu[aG4xa\G{Cp)=|0@樠Ї+J/=Mծ7y(c>fHu/!tYJ+TQϟ9/g_`w
endstream
endobj
302 0 obj
@@ -486,22 +485,21 @@ endobj
endobj
303 0 obj
<<
-/Font << /F35 307 0 R /F34 308 0 R /F58 309 0 R /F73 310 0 R >>
+/Font << /F39 307 0 R /F38 308 0 R /F62 309 0 R /F77 310 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
314 0 obj
<<
-/Length 1322
+/Length 1325
/Filter /FlateDecode
>>
stream
-xڭWݏ4_Tl ;$tBW!}Hw\Ҕ$݂ߙ]o p<O癟4yHhÊzm&dOx.HFu8'd['waj\o}50 ?Dl8# !&_(Jh.Ӵz#(OK?(hIY !ςYID!-j%(!QΤ7QW<O? ί.ǰyhGk_Cٟ׹HoP~e2=A.MHe
-hI0p-$̓bk0S &'YCh^'JˍΣu1nPQ^
-NC-G6Ǧ/rw?{kR)GVh_sGCl M6:zB 8!^J%58WoW d4a W/ IծniR!LD'ONMrGm4ikN㉦DFx?+%n$ R2{(b;x]c:~IVDf %GҋՂ!F oh)v9+E`Y uK-fCɒy!*&]3ta6 :z̕ y?{h) v'یU%Dx}cQRh^+#80t*ֳ
- !N=bsPE@#2la's#4;|5
-Z6.O# mÄH}T1I
-xfE :3-)M_d d_'ZΠv/hvjߚ3+G q)nb` ;aOe,|
+xڭWK6W(1˷)ڠI"@P(
+A]6Jrvݢ3$͕͡'<>|>O+v,O
+Rh> ՉHƓmܤ?솱/q}I!d)X?~_uf_l򅢄;M;7[A!M bHQ$PUxJ"r Q<kmQ+QD r&rLĿey7^0v~5p<coG{?}XEE9G[6!CNbY`*S~\+#<K͚ ײYNAܛ]_*(fs:`2}ho0ԋfkLub(ᨴܸ<Zc_0 otgimo7.@6U\eJU6 lC^-:\h4^-{{G\3GDps"3eL
+k16`iWf5=J` R.AO3g<^ޮX1ф%\g
+ !O=bsPE@#2la's#4;|5
endstream
endobj
313 0 obj
@@ -515,7 +513,7 @@ endobj
endobj
312 0 obj
<<
-/Font << /F74 315 0 R /F75 316 0 R /F33 317 0 R /F90 318 0 R /F76 319 0 R /F78 320 0 R /F38 321 0 R /F41 322 0 R >>
+/Font << /F78 315 0 R /F79 316 0 R /F37 317 0 R /F94 318 0 R /F80 319 0 R /F82 320 0 R /F42 321 0 R /F45 322 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
@@ -525,18 +523,19 @@ endobj
/Filter /FlateDecode
>>
stream
-xڥn]_>Jc΍3D_u>4h>LZZVrIzd+s=l<$YM<I2 HZ~ l&QfM nȜ\)*Izoby֨`E.np)m+d:%}{[iUepCv{~"զ;uݿ޼r9Kv2YȻ3F/Έ+?KU7}(`y#x 9MjetG<x̑Ga<A5 "ުsQN4(0@_Fіbד0L89+tP܉BsY5txlF*B5`S2g>d:{<40k>dRjl[arIIpӱ{pC}LǮ|\y>݂A&
-."Kp6in'Ĵ„Ng2}w L"[_d
-FQiR+GW qw
-'i w'%B_٤8uX
+xڥn]_>Jc΍3D_u>4h>LZZVrIzd+s=l<$YM<I2 HZ~ l&QfM nȜ\)*Izobyؤ`E.np)m+d:%}{[iUepCv{~"զ;uݿ޼f9Kv2YȻ3X3VQn0Q0ct<``&5˲|:Yu#@DsE<ȣWsqڏD^Loչ('Sdesz O/#h
+N}@:hyD!ӏùT:<6{x!YBPg3q2=GQw2]560i9ФfX~=y>r&c>NTon^fΥFr8|4[obZaBNv3G}_&Mr/2VEZSˏ4ޕiDzǸ;3Z!BNrt̳nl`FB1)-@
+_%
+W *<?g{ڹR֗YT.xV6*kKYͶ1JbAuc \
+#-Yrw\ҩ/^٤8uX
I|.1Exp -
-|-Wmm|h%8z=wiPI~ǫ+waV,˜|s(>Ybuֻ.-uWj7NzEEi!ȯibB%igj `;#!TB\$˜mvj+1l XWqA du&:>0ӥ"֟7yaf]1 DcdP|4{6NS 0U rGw7%Jc MLeUr
+|-Wmm|h%8z=wiPI~ǫ+waV,˜|s(>Ybuֻ.-uWj7NzEEi!ȯibB%igj `;#!TB\$˜mvj+1l XWqA du&:>0ӥ"֟7yaf]1 DcdP|4{6NS 0U rGw7%Jc MLeUr
~I5j 29zjyl=tn`BU
Uf޽㠢)/8<gh6` #_4+p`ݭА(˩)wiY
A<9@ PׯqBF`dFWL^l`# 2җ=cK/B
…(`Xz:C*Ob-;~)EkdGBK
Uguy g|Y*('pWMXRCЄ/)XS["oZFќ?x $~sfp=L 7دA3
-?nN~;
+?n'
endstream
endobj
326 0 obj
@@ -579,24 +578,23 @@ endobj
endobj
325 0 obj
<<
-/Font << /F74 315 0 R /F33 317 0 R /F75 316 0 R /F38 321 0 R /F78 320 0 R /F41 322 0 R /F76 319 0 R >>
+/Font << /F78 315 0 R /F37 317 0 R /F79 316 0 R /F42 321 0 R /F82 320 0 R /F45 322 0 R /F80 319 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
365 0 obj
<<
-/Length 1373
+/Length 1389
/Filter /FlateDecode
>>
stream
-xY]sF}੅BoyrMg:S,d&4 $,Jk{瞽
-:a}mvrfK9Lg*<RK3Wt k @rRsT-V-<_b澇5[V7 6O|1#ҽ
-$cflBݏxa~W
-v%7fbDn, RN]/""Zؼ;d 4pQS*uJ\Bǘp
-y>FZN"JݛM<OՊ[U\[)";$Die<6
-@PEh
- bg
- J^ 1j٭# # ס}Xq忉50"L|Mħprh˓\aepQU>ķ)P}N {7H׫E Vlm\u)F.&pޔ&M٧q)~ryJj-0DI(*Ṱ6?U'iGlyHWS,5.  Aͩq1B0鬮?oj~F[G*
+xY]sF}੅Boh\'qәN2K+ ͂2I} ,v9{٫Y9s}oWb`H gt!Äl|v#ȭ߳?.,:ja-9qsRsT/V/<?}k`RuW)lcF̥{!bgDRG(
+1v?z8r5YIؕ]1rgaS~CXD-!:R]%REOj+=?IIr4ׅT717
+13
+hq+o-pmBӗ". Ƣ=VḁJ2#q&Eതч1HID{Ii2eld~ J:c9~ (<AAj&0;͖y^aひy~ƇP`c՝Tpe?O6R*r)ahY07,m^T6+p K<==dr fS*r,',z~&hE $/ )E9$Q'G#-SUR67Mk,B+uG#>wݫmjQ+X^inm*Mn3ƝlRQ%vޣFQ4#
+vJB!wS; 'flGyb4XM"PdTT lfTB-:On@8Z4fXH
+0/(=U&gVW )e x@}4g'[WZFYZL\uTAsOH:k?Q۬JZռ Խ$HW=Q?, ~/AĢ̋+כ,d/2jJ3qZbŃF2x4>}8L0EIP&*ejMv腞iPkI;}c[hmSecU #B8B87=dFn&Z\6׈bȉ, 7_uPW
+h Czndog 2
endstream
endobj
364 0 obj
@@ -695,7 +693,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [202.511 397.21 330.614 406.066]
+/Rect [202.511 394.72 404.227 406.675]
/A << /S /GoTo /D (subsubsection.2.2.2.1) >>
>>
endobj
@@ -785,7 +783,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [202.511 277.659 330.614 286.514]
+/Rect [202.511 275.168 404.227 287.123]
/A << /S /GoTo /D (subsubsection.2.2.5.2) >>
>>
endobj
@@ -909,25 +907,22 @@ endobj
endobj
363 0 obj
<<
-/Font << /F92 368 0 R /F74 315 0 R /F33 317 0 R /F75 316 0 R >>
+/Font << /F96 368 0 R /F78 315 0 R /F37 317 0 R /F79 316 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
413 0 obj
<<
-/Length 1600
+/Length 1601
/Filter /FlateDecode
>>
stream
-xZ[sF~#6}i*Ǚz2SO%I۸ga.+l/!8~=h9rG/;fo(yDfK̩GCAl<1fLIG Y8k̅'p$ѻ7I.cBƿϮ^I^~ H$}WW7*oDœr#\J=mm
-jIO6}`W1梌&Dayt#@a \BƊdl1$+mە
-_L
-1.
-_ h+wlWӈKYμ;k2I_J OX!"k"|p3<Lv2nr #ZDxCq"U$Xk=P)z>^ÏU8C1d-!~(MC
-)|8\;
-СϑEӄ.yX !-^zԛ07`ȹVaT}
-ɦWv+?nT6}fmS_ˍ=+#`͚0OLP{ӳށ8ξP8hc7
- u#^.$v"<_
+xZrF+DU$T\SXf& ,5 \O he[dc{ǹ}|>_wɧgL_R9'LS%"&g"p1cHǏЏ#J3quȅ'p$ћ7I.bBoN_J(Ar%I_//Uވ9FJnssیG1^q?4qm?<®beE
+ en/3ynMog 邦\ٰGpBA2d<^//.(R6Ok*FZX2]M]/}>7;WrKIz'e'
+IfO[!ڮ10#rqRP&(u0|ҩ*eaj;*xBF35
+)ոFwYp×Y- #eA&m{F {{5RT?hg{*.**x&>T@Sm\x/x!u%aVI`^$rl
+c_"m> ]yC.&[ܽzWa3nnS !OMD/wW 0l&TmSˍ=+#`͚0OLPzӳށ78ξP8hco7
+ u#^.$w"4_
endstream
endobj
412 0 obj
@@ -1334,29 +1329,25 @@ endobj
endobj
411 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F74 315 0 R >>
+/Font << /F37 317 0 R /F79 316 0 R /F78 315 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
418 0 obj
<<
-/Length 1775
+/Length 1779
/Filter /FlateDecode
>>
stream
xڽXn6}WO^WQjm)
-fWҮ`%Q;á䕬NhpyxW_Nd 9"i"J1Ł%3"
-:l5\@4[XhZ(mKD ljZgM$_feYY&/
-ԙLZ vmR&}[}^K%h9?*VzԪz?6?( bU13qɸIh7+5S gZWf`O jL f#9m?:KYJeI%ƛZ"!~7
-rz{U87[$x
-Ot6stUS6&W8حVjCx(Bo>7ntL8Tμof[CU9l) ZmLx2ı ЯL!j
-3? 0-8VM噗4J$ҊB?>ߑJܒV)Jz&e8K [>MJ3#a#v[4ZR
-%Bkʻͧ'&$^vREGԴ9T e^ypH;%k3`*O۪tFboRqPpK1
-.|uw&LXDz*ӖWIK`<&02o6rz5#PHGooSؗs)ͮ< |Wc,򍞏saDM&MHCN,$ß/?z S a 2y)r_V٭D_{z(ZdegY@8}#9 R=]iNaNW%GQqg|rF7r(5;eki4=c[ t$]"Bf$K_ ?! 6(;DФ4tWʑ|
-
-_]zAbgW[{Jb#%A-y.ëUWM VOuo:ƙ6D(MĉJ[ Y$ SIđ[!8s"q @ӌln&bS߅I:3tCGZT
-tO
-~i4֣Y8E=XギBKrw}prJQ<%(-ăeWA'94`+
+fWҮ`%Q;á䕬NhpyxW_N@rEWE b6KfD\eu!=y*kBifc+p:aдMQ"0v}Դ&A’HF~,憖eeQ욼(X?g3i-reJmyM/C_0h p62fZQJs4裠%VŸ(%&߬L6؞i]V`=A.ƫIn3\0<{甶îO,m3ge+eB&Voj#$Yo
+@ (<AF!өV]COmn(ܛ^+b[ F>.kx2jp߸-2P V
+<;jaVNnuV尥(jW1D*/ [Cf^2ŧR0k)h,b$X5ig^V*nH+zG )<|G*QcpK
+[+s
+C+7g(pzI]B
+=QӞkLS1ܗ6{{mGC!h_`:x<mұ HC].(8AMB0a˪L[{\%/ h w hDH4˼fڠq@!~Ma_;lP}4v/]wΏp7z>®_7υ5_7v'4i ;Pꒀ3$^L1;D畧}YUdnz~a~h:eYJ
+,#18&lP@B>]!*Gq$+g[x(|u=]mAy(%|rFw
+'2ɧ&pޏ|^mA }NY݋Y_]]f*f66xq}Ã &OwGPLǘ*FpZgb88FDϚ\8OtF=7ߒk䍆[7Sa0AiYg%,; :  u% ~zzD$4&Μ>H_Vq)`7ԟ7\sc`87і
endstream
endobj
417 0 obj
@@ -1410,28 +1401,20 @@ endobj
endobj
416 0 obj
<<
-/Font << /F92 368 0 R /F75 316 0 R /F33 317 0 R /F90 318 0 R /F100 420 0 R /F96 423 0 R /F95 425 0 R /F97 426 0 R >>
+/Font << /F96 368 0 R /F79 316 0 R /F37 317 0 R /F94 318 0 R /F104 420 0 R /F100 423 0 R /F99 425 0 R /F101 426 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
434 0 obj
<<
-/Length 2249
+/Length 2236
/Filter /FlateDecode
>>
stream
-xڭX]s۸}ϯ[/`Ӧ}k7'es"Q^8
-aP>>vձqE瘌e
-ְq{eRiѶC?]-+cyJaܪXrXL./d`S+P~E2 9L[,+X 8K;=@GwDzEiɌ5sO uҊ;::u_uC.=(Қ<%K<ē~+?;:bת-QVk-mz7M "|cDX6lvbR0UiCO9`~2:^y*:sk7'l%*$X'}
-XoS$òb
-i`yvq~\9א\ĔӶLg~)cc،?C \[h/_0̨_r5CDqN;>qdE~﫶QϨS@pcfi}Il<0f/NPtզᅤ/=@qq KBP~#Breg;)}oy 2_MtPvBͩi(MGwd?HcT/әsʘ{;~K³
-`Ñ.--rB9:ۆFjr13F E]4Sml} CؖPut|M_DMхVL7:Xʯ:h`\ش) ef$2TGe}164 !}P
-
-3(еV1ai ͙5vp2
-^W2e.hfs&G PnʟNUSPڗuq(:¼EbшUJSW-YH*;s=ۖK9],e^1H&ᴽhC0񴮫<yev*h;S4UE=$p6}cQ7@!@v*ѻY1k
-O3Gv@T!"qWt]_;ʓ"}Cy=LYDn+~pk>LJv;skq@8𙈒HVfW8E&X:C`Ypm޼)z@$BjɄgdsxCfV
-I2ٽ+2i c߲#CQU=ygؼsk(#<9adB5Sk a-H`Pv u&,IFS]۠)_?-}۪|eܟ#Tsr̨[>.8 nԯlЫ& 0#yyRϏ 4%l{p)cO1%9Iug{F1C̓-~ U!!Ơ7}/٣stJfImapQj<wN/j2Ӑƌ|p Kj!~O1P 7-N ŠNW|aUF"1xEN>T>(ZB/y)߶]n30+K WHZ]ƋbR eKbpE$}I=
-P:1,Pw{ EL TnLK1PovG-᱉zZ
+xX˒۸+ Uea"
+'n β\ FQp‹kѳ3h/7 IZ-L)P&?R.Q&PJSJ}N)R^Sz5ճBG̭gjO<Gy39E6B <.(pP)w>N=<ԁA<YY|gCWS|)}؟eJ]ZCzVmqwړG+N{ѯql뾡C`ZS,qa ?f5~|6ZZ<1|%" hʬ\SDKgV> ͛D"fLb%PF05K2ٽ"^x阌7,"Dc*_BrDX^E9 P
+fF~ůU@:#Ąj,Pz҆Tky6G*FoObK߶ )gsٸ
+fD&#P1'D
endstream
endobj
433 0 obj
@@ -1521,34 +1504,27 @@ endobj
endobj
432 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F100 420 0 R /F38 321 0 R /F44 441 0 R /F45 442 0 R /F41 322 0 R /F76 319 0 R >>
+/Font << /F37 317 0 R /F79 316 0 R /F104 420 0 R /F42 321 0 R /F48 441 0 R /F49 442 0 R /F45 322 0 R /F80 319 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
447 0 obj
<<
-/Length 3013
+/Length 3012
/Filter /FlateDecode
>>
stream
-xZK6ϯr3|J0
-?]WM]yY!þF/3k9&J.iBf!qa?!QUI' Ⱦ~JU}`6a2-FX Rggi3U~jHԻ8ֳ`-?wS踗l]gE[HYj&twH85y;Ě#W ;794$hfg)9"xu<Vd"_KZ==y_=xWP
-ax%f\97u)-znَ/w]|h]Fb'T9ֹ5Vqέɟ(9d1ZSҙhnՄG"/( C}=#.}M]jOJ-$i,D&8
-DslzϘ37;S6>aߦL`G8t}_bA)8M~ 1ρbB"H
-چi"-WD
-8' K{rS3czO@Y0^:ltx.dfO{YR2E'x
-8<:N EMP(Y ⌗mIOR CS
-0~Q-zUZ|[-eT|w7Rkm7n$+[y788j&ow2|s|.oUM&D"hH@C<ݖؤMn=QHlې0Li|oW;:?MZzǜ5}8V&44{p0o.ĭgzN8Y |"}ʣHj3'lEqm*j((zH&hr ۀhcm5/y*ZE`a5,b#=x ` 7aΝdҰuվ&!tDzvjڥ3X8l}_g‹USHS{Yyb40ng2BCP1fA"vɌ̦8k[Pl*nŵ4=XzDvR
-1%ƒ_%F/$?v)bHhD2P
-V7C#@δGJ.n$8ZOE8?l8QU:/>]
-
- (W1[jDL p2cABH&bT \^g="t2
-
-hllXB.姥PFI){TW܋"WM "B@x D`
-?O*V|<ӦG̾.Ͻ}
-#.RjtD&-x@*tm͋ DD
-vHz{и߿HM>ML7΄k!fV#f\bƪȌ ln]=Mi<G47;y [X9U>ђ0wզڅ~9Űf;s8w,ל}lx}8"l^oMWk?z >4ttv+sR
-ZQ{ Ļ_\%U!na;.?G UJO-Ӯࢳ iA`:0,NЀiʫ 2|Y? PKb?@Zͺ" z_d%!˷wtkG%q'W:{QSc6߮0pS0mh(ǂuLlQyXT٢ >ďI<6v5K*g8sas '3.rC<NOn\ 7KpbN=|)!NGtb8YOdV
+xZK6ϯr+|J0
+,l)]ǴPo\Cjv~ &/HIintFǽ(Pgz]VswwxeBB\u4k+go`X^rkgdžMd ssJ$N^7C!.G%-6ղ:lo
++2h ( Bo0C.\Ŷ et<lvhW<jwX qYLun~M{:/4Vџ(Yd>\s)㙧hnGՁ$/+/t.z(F:]( %rH Xz'Lq1g=sl|/bEMO1H>\qV/1
+'npΘ;8H,Bsd2 aP(%Oސ߽D41p,[#et 7& C~<Sp6- wʐН2!XQHV(IN(LA' p,XbOk<#|
+T’` sM%{c 2ݖ|Җ}.9FΠ?r" on~_(thB
+Qe3^'NZz<EO@" ^1<.t֎M +UMjU˺\ի9n?AHd{ ȋV^nRfճݱl /Cr^u]IH h(IIM ޔ´@b}b0E}^oH>*whuyHt9/X5~8W&85p
+A?̙nNT.N%!ME1'a?s]PL0=AC77 kmQ]'
+&?
+`l/Hj
+(=+Ep@o!4 C"RPeBa/{6+݁Ub_`sOs/Tw:T)!]%ѭI-Hya@Q.Cx"IZo)Gђ&j0DYlHqČ1"2z_V~eoB/N9/!՘Њbl+wS7(Uv<9aS_sY;m ys:*5ն,tPӹR-Z r9S5
+ZQ{ _\U!ja;6=& UROMl?Ek iA`<0gyQ˝BWd@Ρյ&0pU:HJ}qoVRP1K&K*Z%/r*UtlLߦut6Or,W4H+ŞE,*C섐Nk(nu^ Q{|D"\c{hsǦk=:> !lzg @2i>6))ሖ<kẗS^6"࿬ G
endstream
endobj
446 0 obj
@@ -1597,34 +1573,32 @@ endobj
endobj
445 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F38 321 0 R /F44 441 0 R /F45 442 0 R /F41 322 0 R /F76 319 0 R /F92 368 0 R /F101 449 0 R /F78 320 0 R /F100 420 0 R /F77 453 0 R >>
+/Font << /F37 317 0 R /F79 316 0 R /F42 321 0 R /F48 441 0 R /F49 442 0 R /F45 322 0 R /F80 319 0 R /F96 368 0 R /F105 449 0 R /F82 320 0 R /F104 420 0 R /F81 453 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
457 0 obj
<<
-/Length 3519
+/Length 3513
/Filter /FlateDecode
>>
stream
-xڵZms_~<=1;Lf22t4̔'{#_g"iXi]>@%YU~|sk!<5m”MQV&B%7o~^Ll5-SY՗{SR&P|mq5vߕP]inǦ.4q<7c*۴POj[ՇkWE_9r.^kkV?ewok+W]%_]s|uCXbtuawިuT5ؕ[_CMuV/SWa,C6͡ ̗D[4SƑ$d<teS4"YTd]f%\Ȕkhd,٢HEnu0A?2Vʲ4İXA)xIy I490 n"l!6Yj퉩w
-:͍Qɚ4 YÚ_Ed[4RB7*͹H6̜0sq=FOXZimTkp??_3j $2-bZ[&kЛY` 8|&,5TسCA*keV_"KғYd~)3cfqCNf|SL6òo5˦S.)D!̠easa#~laTd^ɿԝO]ma # B06<(Ⰽ<UœDD|t8JΌw VM_רY;W!R'~kC1i{ HGE9Wݠq.۩-PmHL7N^ۧCÜڗ1UNKF-c:j2k.t<#+OWغ !,{qT>ܷMG2ˆ5nSYCShsŵgv3\bGYa0tj?TY2F'<!p{ U0wΉ28şQgR ,la^E6瘷b"-6#V."Y጑ge^,_}=~25נ\㌘Pt[Roϥ ӘZm/.Xm9,u+K3
-~6uW9$~
-~&~$gj6|!8Q01s<tqΉ0|ދ saQ T88!'tق@HE;O28tp [ 8"mLY x
-G(n(VOP vֻm[l:}"-윂;EW\<cTu.O96cme
-N'VooM[Ĕ.],~JD9+Bָ
-W5 L2bV@.IDIBRbړ|~|s6](0P1:UA5=g%ʺsĴK30
-3*Dff ZjH5y"Ť^adYY 4DQYpWH
--,垸;Gpg~$S'3T:)Y9d).i|jwHՀ&cUU-wܗmѻP5]y )!aKW_7&r26À2f<)7hxWXDP'X1x
-9<^ۢ|&؍ ixx /m-٦ޗM(Cp.t7c~2=m|USwWJXF<].WVruucZH]HLc_"ؐlzY.h򶏁?cgMD:
-'7 d+#ED/R=
-bnyX>(RA6BU/]u|~XPۅv`nrI
-Q~O`6> /eo@CTb)kgt\n
- qB[nyXAU1N0%+P&q _DCP44ۙ46<~xyCII
-0Ϭċ1ts. ΥGEo_|!1eK3|l<$H,l=HeuEjixvu*\}e`'{/
-Ȋtp{.?DRO.'f^r$׃3 =0 4M^"^WkCn/b!B>Z%*\D 87=N)JL!TylpO>޹7GYiǷ;ޱq )W݆Ao Wή
-vvxKC0h"2ku>|ՕYa܉򇩽K|0A<;pmW?.RPzg=KP[G c]n
-H/&ޞ0po)*w[?V퐪pn~jew lg̡Y4ֆp)St
+xڵZms_~<=1;Lf22t4̔'{#_g"iXi]>@%YU~|ska<5m”MQV&B%7o~^Ll5-SY՗{SR&P|mq5vߕP]inǦ.4q<7c*۴POj[ՇkWE_9r.^kkV?ewok+W]%_]s|uCXbtuawިuT5ؕ[_CMuV/SWa,C6͡ ̗De>6i#SIy誦SiD6Ȭ u+f K),,K97fYE#&>a"5ɛxe8Εeia5/3&R&4!I4hsa&!D؊Cdm³ShyKUiLџÚ_Ed[4RB7*͹H6̜0sq=&RB5S#V2џ꟯^} _}5 G1-5,P0U>_ʇTYd*ȡ 2MdbJ,{?1E8HСS`3f>BF0`Xv-_ft굀e0(Tl1l8lİ-VӞl5i`-,aDDfFETӓJb8ڂGəqna٪u5z
+c0Y5XJdoXb6Ox r}8&m!)77
+ںt;ewp;ܗeWriskt(~sQ2iɨeLGXmSsy񹼄y2GdcWuAC#XTmraQP|Թo#kT*ekf- '۫*5%
+k g=?gǹ0 T`
+9
+8O)NՐj>3?EI)'("Ú-4?Vhe_"
+6JCIa%p?s2c@`ܕdd5
+[P'e4+,1EsՅ>՝/Ё@Pd ~N-z7+OqA88#<l0P_J&6rՄ^nWTvPƬ`gT6ft
+wJ5JY?WS_7GW}u CUQnL p5 psvKR"..o(3|HL
+c^Qx`v]T֤*]-<F!9 3 GKMspX D։ʃT NnRGWF^z
+)Dy!*|Ǯ: wg?,D~B;0K
+9$
+=]Ac9y;@G|K=dlP1oI{vCMkxk<}3L II<]p2Ep|.x>t
+2n?bD4ֹg'd*f_H/ʴQ&J~^N0>icOqƧ;bxOgX7LpQKtImC^UIxro?]
+g0\n7!EEٔ5Q3V.À@U78-t<D 1N0%+P&q _DCP44ۙ46<~xqCII
+0Ϭċ1ts. ΥGEo_|!1eK3|l<$H,l=HeuEjixvu*\}e0D~"EY.^ ?3!R%H~r!u"H5gF{r aTiEmև^0B LQ1$
endstream
endobj
456 0 obj
@@ -1673,29 +1647,27 @@ endobj
endobj
455 0 obj
<<
-/Font << /F33 317 0 R /F45 442 0 R /F41 322 0 R /F78 320 0 R /F76 319 0 R /F77 453 0 R /F38 321 0 R /F101 449 0 R /F44 441 0 R /F102 462 0 R /F100 420 0 R /F81 464 0 R /F75 316 0 R >>
+/Font << /F37 317 0 R /F49 442 0 R /F45 322 0 R /F82 320 0 R /F80 319 0 R /F81 453 0 R /F42 321 0 R /F105 449 0 R /F48 441 0 R /F106 462 0 R /F104 420 0 R /F85 464 0 R /F79 316 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
469 0 obj
<<
-/Length 2442
+/Length 2443
/Filter /FlateDecode
>>
stream
-xڭYm۸B@?|%%zEzhfHb˶HfCz!)Yr7>_Lghm"p}͟rIΌItR,5Yd%D}mqz$oife<ZeBJ]-O(gƯN*sWzڑ*5"M*
-KYTzEwk;ƍk׮ʦNL\the]Z}Yvs ;B<Id)bTgOT1`YVŖ]/.-9udEvŧ]ni{mumq.D~qubeSiltJByvZ('xhLp&x6h t)kʛuP{{htm逹eWՇP"Tܭ,O)$wv%{z`T ayJbRK1IЋՠn$n~ 2`KBYRzJk.˜ׂ^,
- =3<3'LPN H~:lsP%cHɇm{9)(ؘ#aAtñ)۶>uSPf? MTو}mw4Ne?ڐV%0?v~wOj#Z xu\P_Ljp-/WEg҉1d?mXT%SD}Ku>DBi. N:8Όy:gv L|vyt\ AUW/kǦlmbq82R&ɩmVաh
- /NFvIRwT3
-s,p_,>X.wѻ;35/J3B!iQҫ
-p0py|G
-ߺS2+OF6rc1PՄ6qJh9P .v YC53{RdfD5O麔ajLo3S|l4j͔:G2Q;XEzo43Ӛ0gZ p&57@G#0R?9J0$<!AT7m*La/XT9P"Ң_
-6fUŢR>̘y!A29)>[$5E
-(ʝ2ET`c
-gayǣ$DE6s&Y"ew$
-}RzQiV/䖉BGgEEEPSb3@mxЂ}Њ5Wõ,u; !EUKBUޫ
-,҉QƊj](Q2'HKT)}^zc# @Sg.mW$ǞsiacHy2߾FiiUd)D2S~/^_d+?"Z$0
-
+xڭYm۸B@?|%%zEzhfHbӶHfCz!)[r7>_,/!gghp۫?&#vXf$%KIn7塳\eL^Ygd '{_+1?/˱~zV$+4avPVEmW+?Te` ܏,]{="u+{f_kZsi:5Sf3xzgjgrr ZIAu 4lcjT{Olq-f6+€K
+v=On0/mznۮ -On %mbh\4_|־ǭตQFs2xXLp&x~<2R0^' \TYpWUpzAS2dkhw^X[tU(%2W:`/T2L" ."N|No""2ӀG? ׉aEF
+82)rogPEҫ6dmK[PVMh%'v#D}Ku~BBiR.,Az
+4l* !@na/竇Zo\b8w̏adwӳYVyWP6!qrJK<zPTӈ@‰r0 \+jHΘ @UR'<YKrV:m%qiً̙P@6Kz=ws#3P y lpx/jCZX>ht'<YG{Rhr5_:ACmzYVa[Rӱt[v p)&>w]>:{ĈLl7)X^ ;ZZ-/hxq\'
+ӁOXL=!>=qT[5Ƈn8g͝zεrTCj꧋fg~Q9ž"=Isy[WJpp4@4MֻA1tSjunJ/rѐ;ZE|"n4wT#:)8R?->&$+}Ø>2/?x>|BioAu[*Lh/`
+>rWEjoqqMuecI<
+.Y$5ʩf}f5 _QLBv,U)e_Hj)2nBh7~o6A{!`c
+|gL>Qr SHz@*(w ]+a>:}'݆I^0q2fNjY>ecI024Ѵ^.-#Ŷ ϋD'NUwaw5'a` 5̃PܻGZ
+p#q)6EUOBU>
+VrG
+!;׶uY@Oײ 
endstream
endobj
468 0 obj
@@ -1768,26 +1740,28 @@ endobj
endobj
467 0 obj
<<
-/Font << /F92 368 0 R /F75 316 0 R /F33 317 0 R /F38 321 0 R /F41 322 0 R /F80 471 0 R /F76 319 0 R /F78 320 0 R /F90 318 0 R /F74 315 0 R /F100 420 0 R /F96 423 0 R /F95 425 0 R /F107 474 0 R >>
+/Font << /F96 368 0 R /F79 316 0 R /F37 317 0 R /F42 321 0 R /F45 322 0 R /F84 471 0 R /F80 319 0 R /F82 320 0 R /F94 318 0 R /F78 315 0 R /F104 420 0 R /F100 423 0 R /F99 425 0 R /F111 474 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
488 0 obj
<<
-/Length 2357
+/Length 2356
/Filter /FlateDecode
>>
stream
-xڽYIoW[^  M@aD˘ Tu59C%KI.Cھ{xt./޽ϒ`E*rDR0GetJ͛/mvݝvg\#O
-Z Ȇ .W٤K;|jnLO:7b1%$+3 i2S2>_eHQ\cOLX5ַ
-~¤zl.POuXr,z2d7%rd y~o9TAS`X=4_T:t)+F}}5s!H1Db??Ud"f2vdBN#J|"ߪ;:֍ה(L 7k&𸞧%ǼBxuv3'@>_qCzЦ\iK}ӁNw}PU.lsjLIpQsRIUr_F0=y5S)r' Rmym` ݇+ GBJ~9;uX|twb8=98#IGxFROggo>'hxu cYdM} SuJ9W>s~*WGe9t=. ]5SBPu.8鴪T\ev.(
-*m2g=6{W`u[ -t!'큚ndZxt q|f3O+O@e⽞'"Xţ1x~$I/G3u_QE,@۠W9Lr:``w8O@*@n`\H8wipo҇u#y!9{>6xiT:֍
-Z({ZqC')>T
-CFXu ̗LҎBѐ ϦJ*N(Rs>-
-o!!1S
+xڽYIoW[^  M@aD˘ Tu59C%KI.Cھ{xt./޽ϊ`E*rDR0GetJ͛/mvݝvg\#O
+Ԥ:=`
+Ib3V_#qۍ4ۈxw
+YK}$`:wMn^FnHݜ%):Wj2Q2zDY_dxƤ5aRI||˨0„P& =SyC c @gqqdoH{$^[?cJ"U,,3 .9={.?ĆL#a SA؀%㠲ڥ>C5
+^2(.1s'n[
+ \vx\Sc^!<}:߇P qaQ`!=hSEl }k*95$8(Y9*g/QQ#m9Keqq_P)<60ÉQ N飌j
+@[@Ν: ,>; 1NƤ#PBUQ'C74ԋ,{2O]O:en+S?
+hLyQ⮚i!:tZG*B2c^6ĺc+bn-WUņtӐ΋@Mx2K
+m+Ҝ&9wTՍo0S;'LF Scl \70.M;4_UoúLv U4*]
XJB{#B=`[ۻ
-JprEm_MteN=תvwy|;]΋`"S/WE# Pҁie:/ryśUDp.$ѿF@w' W7rVtnsqt2)_$Q\Fi\mGGw]#껶9&a
-eZ5dt݊/a.CCmt܈X }~k/ l_h_kgnfӪ`3SHˠ W=6P4Kz.jR˰YH4-%R&"ݯOF( & 
+JprEm_MteN=תvwy|;]΋sqܗ"ՑLg{Zٱ΋\^|f ! f]sqG%t`:y m[Gg^J,E i\mGGw]#껶9&a
+eZ5dt݊/a.CCmt܈X }~k/ l_h_kgnfӪZȟB*]>g\깰θ
endstream
endobj
487 0 obj
@@ -1893,7 +1867,7 @@ endobj
endobj
486 0 obj
<<
-/Font << /F75 316 0 R /F33 317 0 R /F101 449 0 R /F100 420 0 R /F92 368 0 R /F76 319 0 R /F78 320 0 R /F38 321 0 R /F41 322 0 R >>
+/Font << /F79 316 0 R /F37 317 0 R /F105 449 0 R /F104 420 0 R /F96 368 0 R /F80 319 0 R /F82 320 0 R /F42 321 0 R /F45 322 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
@@ -1903,12 +1877,15 @@ endobj
/Filter /FlateDecode
>>
stream
-xڭZKFϯ!@8n`x/ mqM ߪ&ER=ë ꪯ_ݮ ?__FUr+f%b5IeVջj.׊l[uwuq)}H]:uIpX)W0 dvhjh.E)Ô>]@es?qfOm{˵&4?ȜI/p#Z+6MLKfnnhLJ^Z^WW\BDQUs p.t
-.0FH}͈M,P(* s zɉ8< zUSR+`<DxHw򦌛qؕ3]]t @r?nH%p[*Wn~ g5wEr%nDQ_ni % 8cwv)YG'i{S#fXڍN9<KchxJ=RR*nr!'hXt{v3)&7Bp)p6ۃpP$~Ӕ i76a#};$8O㤏 oq> bnKc7 Dj'cFόe贞m^gMJϺq"3=WC8Y`&k2R ,zL*Pd8L
-L
- F5QXP<ZM
-I0J r۞J~d
-bvk_?ϵN2wZGXD07O_819MLeO'.b|3L1r:' p >?ׅ
+xڭZKoFW@hX}@3‘(;FU]Mzl_GuW_W+wW*Yn]VB)_YTfu]Ϫz˶UPgRT r{ BfH=UEs-MTz-]V X6׿[OCYjm뵑&7f'9<_FV6{Om>7]k[vSb-Yd-~#WpJL.Vk!Xn(p .xuQxJ6Hi{ڔK],'$ac恵pUۆ|cK$d`Ku>3m8]"kr[[ML#eCmE3s:@#,S. )`10*>ֱm+Uq5j<6Xb4RihtVur}L=\ꨐL{h\.;xc-rl>!q?4k+6gX-"i3]׳A~w9_ /Ŕ+jsz _mn)czXI͌GۭW?]f991N#v'Ì=BP8gf A
+xm{95,σɣ'<bZE_W}QWj5y N7s
+f3wG9
+%aQ"p*QpDLԱk%DlыXz(<6T){q[5y6Ls>5\/\Q0%B5XT<b<_V (dB,/9GJZ듅h ϋnes.\ f{ ,n!cPgy6q4Pa \<ʥB\n ]J
+hY\^GY}%XYd̦bao wvrq˘\FiCFȀnN/,[)cxW$В ztmpon_b<sv>[Va%p? 2H*N#a}$m
+#46tU砚:9Gg
+a;CϾt賸*'*⁓'$fFd;BWm+U]Ӱmj"68xx,N 76E9էQV@)6>Fi"yQ΄g'VR8"oձkc6LTH3D/PX~O c\y_Ľ?/ǂ6(4#l(َ?{ t{jwW1?.QmG<Sh ] sWm$N;!PCߧ@5LI*,ftĴ`͙ӥBBEsvh=&H"{z`{FN82h#d"| 1|zX i!ҹQQ&G}9"8:q@ݔ+o:7@vI]17pGh1JhTn)憴n_="JL fs p 'ڧWE>L% &2/ NY<xFb5r6hWhh#10C/"s?c9c՗d##‹b~JIQ$#f/Sxhv;9R@֊IC{e(ա
+\:)Qa[0Z6NSֿ#|W3bjtT&=CŌ8 t@QRbC A~4:iBs)j ]~I,ǙOe11FHGd9UL\.Fdzg6
+a|sNii&t)aZF@_- 8vB%Z8 NFb3L
endstream
endobj
492 0 obj
@@ -1926,7 +1903,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [353.711 554.046 368.434 564.839]
+/Rect [353.711 555.93 368.434 566.723]
/A << /S /GoTo /D (section.3.4) >>
>>
endobj
@@ -1937,35 +1914,33 @@ endobj
endobj
26 0 obj
<<
-/D [492 0 R /XYZ 133.768 331.839 null]
+/D [492 0 R /XYZ 133.768 332.471 null]
>>
endobj
491 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F38 321 0 R /F44 441 0 R /F41 322 0 R /F101 449 0 R /F100 420 0 R /F78 320 0 R /F92 368 0 R >>
+/Font << /F37 317 0 R /F79 316 0 R /F42 321 0 R /F48 441 0 R /F45 322 0 R /F105 449 0 R /F104 420 0 R /F82 320 0 R /F96 368 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
506 0 obj
<<
-/Length 3666
+/Length 3656
/Filter /FlateDecode
>>
stream
-xZYo6~_D ):& c
-frצFaK0 W-iat8"EʂR"ߜ\9u%v-rYsϽ5w|ʻኧlp$Ѝy}3i~Yz۵g@S[8qA"ZRZv[\TH=ˮVZ1H[mXPa
-#Y:$n6
-ibv6V"0'EFΜim|njndux^)8z@ ˦wm(Z`Y%:]1B
-
-kuG@`/ʠ)4wGCA*2B~~F~R ˙6-a`:'L<9`ā \:2~T %6r_kH-/9+DȚ!$s Q[ts
-DO-SQ`H>
-=i )Ԛ%فBԣ Y1
-Vmr$l~LmOx:E699
-;%N)%Pt7.M0$l˦
-'5;s/ IJ̀
-;o}ɑUi+v˒0 35,h%Y%62) Eb[GtK ] UpŽ2Co 161#Ha&dq8gmUpǪw88869<rT`K.9O9&&~vv88zOeښc(f*RN6Ja>V5{pS_2{#|GnNj 8
-h{{.gÑ"ˢWP8ٮs# zvquH$֋'c)|ĈۣK^= K4J]^\)m'Gje0\ WBoa~ߧi&sV;Ej'7.um.SFtpǁ(5SjR%j$~z,63G%o[coѱ<?İ~>>
-2l P[4_D-DQ\t]u;p@v?ҺB @$2~ Cg{Q󽵵"21/LJߚOMha?sR9(NǎxV}l67L( ,Ά$s+̾6o!_g!.SP;\LvNRΉ%Aϐ7ӗ؍XZ]PVONc죄,uyg|'LRx'3d9&{f0lG!o\|pSޚ-Hz{(MNRj3}"6)6] ~YD(?P#3JebۂS`DZ0n )[&.C+8bxӫ޳l{!M,fAJ}<#rTW^I,"esÝZ U.\dOVZO
+xZYo6~_  R$uL0 .
+:yHbGlqfEV)[woN㉺D[,΀t;>V]p]68F޼>ۚ,
+,3)o-i?pA"Z|)l5.TpeW}t+-r6,ζVʨm&ϣSCzΓMNcO$"Ou#&h(Gt+in7(<~Zd}ZYɊ$7aVN 9| ( Sq
+367:OAZחMP ĕHa,%%4FH@-8vb^}{+ȍZIb 0Q/:Ha;zd"Wϯh7.k3sR&N>Fo4rؐ߇S5\ۢ+|" ؒ8.+R-bk>-$Dm=́`FPUO{rT$ /UTdTF68#%gq_5p$ pk؏k_ljG[_5f~32"\w$zqۇҀC_yӣYGgx[פ͆ 4,3Ysti HHx@zP<QOYX2-
+GShvxj)pth\MŰY~h]w$SKf=
+yAxZsKJ5{Ox$V-%A8"
+*B*h5Tٺ:aMv4SSD#5ftBB'~r@3^q,rw,fwKM$q
+U0'yd]*]g'-5w8<ΩQD`iFf#p*.Md3Ω VӨp0:O>+cnVszJȳy`EcJ9]mvaՍO9)S"O4N.Tsxaep0г7][^_6-'̈́v|=^ dZ ǹT =krqxDdL1AB覝8-O9u6(<1?bSoz`GVX60RXPi0[+ xS 3
+Xڲ̼g_^{@}nq@FGz~va}f=}!^ܺWL
+AZ(5]q߯È%gxU"5tql a{*lJw-H!@lZ| ErIuU
+vE󗝔j]ElSl< /Q~8J̢8 קሴi6&SMG쀱wMM{DŽ7yJ, 0=V Lћ#*{ Cz a.dVZ
+
endstream
endobj
505 0 obj
@@ -1992,7 +1967,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [327.469 509.179 333.931 521.392]
+/Rect [327.469 508.919 333.931 521.133]
/A << /S /GoTo /D (Hfootnote.4) >>
>>
endobj
@@ -2001,7 +1976,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [383.035 485.545 397.758 496.338]
+/Rect [383.035 485.286 397.758 496.078]
/A << /S /GoTo /D (section.3.3) >>
>>
endobj
@@ -2010,7 +1985,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [423.28 485.545 438.002 496.338]
+/Rect [423.28 485.286 438.002 496.078]
/A << /S /GoTo /D (section.3.4) >>
>>
endobj
@@ -2019,7 +1994,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [285.981 316.574 316.201 327.367]
+/Rect [285.981 315.795 316.201 326.587]
/A << /S /GoTo /D (subsubsection.2.2.1.1) >>
>>
endobj
@@ -2028,7 +2003,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [303.033 262.374 317.756 273.167]
+/Rect [303.033 261.248 317.756 272.041]
/A << /S /GoTo /D (section.3.3) >>
>>
endobj
@@ -2037,7 +2012,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [342.597 262.374 357.319 273.167]
+/Rect [342.597 261.248 357.319 272.041]
/A << /S /GoTo /D (section.3.4) >>
>>
endobj
@@ -2046,7 +2021,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [350.019 151.982 364.742 162.774]
+/Rect [350.019 152.155 364.742 162.948]
/A << /S /GoTo /D (section.3.3) >>
>>
endobj
@@ -2055,7 +2030,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [390.264 151.982 404.986 162.774]
+/Rect [390.264 152.155 404.986 162.948]
/A << /S /GoTo /D (section.3.4) >>
>>
endobj
@@ -2076,7 +2051,7 @@ endobj
endobj
504 0 obj
<<
-/Font << /F33 317 0 R /F100 420 0 R /F41 322 0 R /F80 471 0 R /F38 321 0 R /F76 319 0 R /F78 320 0 R /F90 318 0 R /F75 316 0 R /F101 449 0 R /F44 441 0 R /F96 423 0 R /F95 425 0 R /F109 509 0 R /F107 474 0 R >>
+/Font << /F37 317 0 R /F104 420 0 R /F45 322 0 R /F84 471 0 R /F42 321 0 R /F80 319 0 R /F82 320 0 R /F94 318 0 R /F79 316 0 R /F105 449 0 R /F48 441 0 R /F100 423 0 R /F99 425 0 R /F113 509 0 R /F111 474 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
@@ -2086,11 +2061,19 @@ endobj
/Filter /FlateDecode
>>
stream
-xڽYo6B x>h-RܗI+P=6vvs(&!93ofy xwWnc,dmqfKdb& }H~JfUǿoT|f@x[oN#h|;3$ >p#|(&=D'7( 3 J2)z4U u"kbF.KtDɁl\Ĝ]DQ<^p=X)Pq)vJimPeOw͵ێ-].ڝ5LagʽېU]ikʼiŕURXT4>벡lf`e QR¢9ne=S\d@lm  ^tzZ#Y.h*փ-
-"4gREW~6Q}qXJ'$DVQQP;!yzΒLIsr{Xx<v9+2y@PBp$ uٌ+rZ9}%ȥ. (*F 3ke
-#jhɼ(rJO[0naW/yk#P;ꑠpPгݖc
-}ݦƿnޙUȪmqenV&cy+&)APրz]
-_րzzgo4e:xgֲ(<$qM!Do{w?
+xڽYݏ6߿BX3(5+p/C$@l Շ+ 7ádɦ͡.)3 
+~.սIMiX&]J RfU?T|f@WJONc( r38dF(IF>6DD9Q$F&HVXճ/`FTܨU&r=#i:QD J6xR,\Yf<z\1D+dBOVvJ*PmPeOw-ێ-].&Gٯr6dUWd'V$2/F&m]X#T;Q?!FMϺl(ۆY?XHң#p1{,&K#9{-n?܃&x(~R.itE}$emJP^W\Yj]V!hV@ەJ8hBv^;*B>PL
+}kefXd&fw^1$)B$%@*#\f\+Z,mnP6̬kC M_txBc3;2TK{]ѠgT2s
+&_i`8r=U= 3';cnxS`˿ígDP ):=IpĻE]?= 0.vru^?xx8RKE:y K`ȁWE,%}%T*g,#KiXW<6'?7So>qs@q)3&y!
+rXdO$0_nKj    ɨ-x;3HE =)3
+ e`Ky-
+E;"F"Q 7ӎ͎P:~ۓh=. ~|Ѿo
+V [R`,UzsD2 MLx5}
+)}A=!5
+xCse9A%6MN>c1]i.F:neu&)wa
+t si QIuEbܺmS|-^u|U|@͹ORFX6暹#ZE$Y#ܥVXuVUA,
+wEWȽ8!E~Gb;9>dڵf\
+Xqp㚭ns{Q)Bkܧ#Ny<#N悟X#-wxmj)j[<v[ov >k2>4DP:t6z=`^җuށMyY-_Xk8yJ(fۇx
endstream
endobj
515 0 obj
@@ -2108,7 +2091,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [448.801 198.117 463.523 209.242]
+/Rect [448.801 199.585 463.523 210.71]
/A << /S /GoTo /D (section.1.1) >>
>>
endobj
@@ -2117,7 +2100,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [369.502 186.162 399.722 197.231]
+/Rect [369.502 187.63 399.722 198.699]
/A << /S /GoTo /D (subsubsection.2.2.4.3) >>
>>
endobj
@@ -2128,36 +2111,40 @@ endobj
endobj
30 0 obj
<<
-/D [515 0 R /XYZ 133.768 375.783 null]
+/D [515 0 R /XYZ 133.768 378.373 null]
>>
endobj
34 0 obj
<<
-/D [515 0 R /XYZ 133.768 173.286 null]
+/D [515 0 R /XYZ 133.768 174.685 null]
>>
endobj
514 0 obj
<<
-/Font << /F75 316 0 R /F38 321 0 R /F44 441 0 R /F78 320 0 R /F41 322 0 R /F33 317 0 R /F74 315 0 R /F90 318 0 R /F110 518 0 R /F92 368 0 R >>
+/Font << /F79 316 0 R /F42 321 0 R /F48 441 0 R /F82 320 0 R /F45 322 0 R /F37 317 0 R /F78 315 0 R /F94 318 0 R /F114 518 0 R /F96 368 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
522 0 obj
<<
-/Length 2027
+/Length 1980
/Filter /FlateDecode
>>
stream
-xYKs6W5 8ә3M9toDYl%!ؚN{J cOڋ-K`oe$Yq "9'XkHPϒSv1pY9_|v ~AGW|*O 8hcwщ0(S8,3D"&u2!e9ᙓ4AZ cQ$?[r 1kuFj.Y"J%bx'*Kf0)* yo1͙=!HPhfg1"烝JRq$1 ] T̹Đ&+~#
- q,N30bp K 7?:e'
-ܵkFWٽjFfUzmAus
-![GQ_ bթ{~)S&:6W[DSxNІOev0n~QN l<Tuqϭx1 Ač
-^Z/n
-7ڲ^Ղ*`2/M*Vd %7nuTu4OWEO0n?(#Z<[F ЙP SL`\@%HdU~wARP޵E
-QND<x?Ȁ<eqOa:$+WPq{ (!+~V,*c5#WȪ 7U {{dF.8LgY7+{ sL
-ҪH$:=Ð*ʴ
- . >.]7Ǒq,eOev;Gq,Ƌx_"i$<sUl#S U+ ߉wYXL5T#Nv6qZyc(-v3z h~˦r;x4{ru#"Ʈ!M&33g9 o[
-},lah%!_.A"34-KBΉo `7d=9#SαK ٹs[|V|az.;UtZ-۬.Njk`M7st/@é2i)g-۩6ukK0\>M01mqU}l|6nv!^mܘ_m}/D녀Ļ72ߓ[f*;'S[;LooG.$H=MJ#bhi
+xYM6!S d{[kc[=;Ӎ}m5 }h,bW<{ُWgp}dTvΨ1*S zn)7d?}|4\$_SȐ럾}#X"ZHhwGg"Zw,(+IY^Ic Sp$%8'ñ<[N֙ԣՇ+
+]f0E]ݼͳ&r>z]F}~O0{q-1O4sN#}|(`
+B ] 5)DjN6fNvB4'RKyA(bpx5lRS-fc~p$}~#/ν/_BfsgW+ SM&ߵ岊r Dr
+-4Y*Jms}v{z2k"tj\E7x S~}pjaJ#z)8=C}_K>tR3 ~ݚa'G]Hojz$ۜt_;α~݈`֫.f!uMx[7~
+/l"6fϩ-. L9} >|:mKD6Yzp P RCxˈI!7lV ZleȝW ^R1ZD/Q!Keabp=t6(/F472 rIuǶHuꦒ0" fa6e'i/<LvG"Kۭ7:Ku>A)X/M%<j/
+W9v1=Zތ= wQ$,q/bAc:5=ʫQ ͉aἚSʛs\(|$0
+ʁ Gǿrd`zB\obtPj0$7s ̸ls/|X6jx 7;L{:4cAA¢m]Ww
+ K!~z-w$ ^z w wӺ UsL  M 8f u8Йbȕ!MMG^t/pCT]y^U
+UD &!
+1.4bD7"
+*0O8 5QPV~}5mFP51Ϟؓ<'7r3lXm%y>vC5#əkH~ ('L{=Ô*
+,A; n/<|Blgc= :
+ t;6!B!΋d>{uD,]uظ5
+#qkЗ59%:u\}q#ոݣCeO1
endstream
endobj
521 0 obj
@@ -2175,7 +2162,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [211.623 271.296 234.094 282.089]
+/Rect [211.623 281.947 234.094 292.74]
/A << /S /GoTo /D (subsection.2.2.5) >>
>>
endobj
@@ -2186,34 +2173,33 @@ endobj
endobj
38 0 obj
<<
-/D [521 0 R /XYZ 133.768 258.396 null]
+/D [521 0 R /XYZ 133.768 269.003 null]
>>
endobj
520 0 obj
<<
-/Font << /F75 316 0 R /F38 321 0 R /F44 441 0 R /F76 319 0 R /F41 322 0 R /F78 320 0 R /F33 317 0 R /F100 420 0 R /F74 315 0 R >>
+/Font << /F79 316 0 R /F42 321 0 R /F48 441 0 R /F80 319 0 R /F45 322 0 R /F82 320 0 R /F37 317 0 R /F104 420 0 R /F78 315 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
526 0 obj
<<
-/Length 2227
+/Length 2223
/Filter /FlateDecode
>>
stream
-xڭY[~_ۡlV:)D;o;ii:@L'?U.C7 }y1]+`SooUJw22: 2*˂OD$K΅
-oa^eE]nS'+yW 銴)Y-4%O"Xtd-xx ˴qR"jh≆ߟIzpSrKW+$WT~/
-17yvęR?@Yy,
-ZZI]L@R[ݮIKzM;qƎǕѰ[4(K8Zp͠-
-Nx̦>Kwl^OOvX
-fUweF2w wn]o[76O0@[ |qOG^;QGGG1﹌qHFƽ v Ι=յQ"6zq>I 벬md ֓ E[@4Y[ȨU#`
-Z%K"iݶ+(.ZRn_H1u$0%#5
-,3Hz%6Zwk:/vf) H5Up!dڛb4s  #{u=VijIyu_VAR
-Po
-u͠DB^ KXSxg{&iQ0&!؞j "76U0 \t
-00{ x
-_ 1!ɴ#~պ{_]k{^PFE$ӂHp2Uvܺ2 GYyI==mU7X9
-ឺBe#F̏-ZcU/d3:o0 OgBQ@c
+xڭYKܸϯ-4o^r
+ Cx5.]z2uwW*.
+=o]Zpp`::HV0
+ 9=nw%X q?v sk1>=م.5͛tuepMom4/̅mP{Im$|g2LsߟPg$=^ډ28vk; BbEmf|.NcGz݄Jd V C[@4Y[peSCCw0Ғӕ̚`6>têʇଷ klvyn켿&_ʀehxę
+㷍.vf)Hf55p!fu`} 8ag]5n1ZkQEӖUDͩ_k0CKX:6d?> 8X3
+7)s {7
+4R\gnx^clBLT/0&h6`R@k-}lLNn[{NXP7ЁAiK}9_Q^#<Yr2gp^ֻ(Fn`o,sEj+7x"i-s$LB|“&!?3]D7R"7&3Zt%45'wJ H5w
+.FˑśEMeB{ȹ'v.J9Y8h~5?
+nQ"gګA }1Ʒ?|_~ç*/ww^C /p-l}!!@] d(&x&,2u,f
+fĚzU dΆ*';pCG.g. t
+ka%"?~i4O*URnH Yv4(NPAJGے:sPk@W]^_ys+:2e5+CƐq
endstream
endobj
525 0 obj
@@ -2237,23 +2223,22 @@ endobj
endobj
524 0 obj
<<
-/Font << /F92 368 0 R /F33 317 0 R /F100 420 0 R /F75 316 0 R /F41 322 0 R /F76 319 0 R /F38 321 0 R /F44 441 0 R /F78 320 0 R >>
+/Font << /F96 368 0 R /F37 317 0 R /F104 420 0 R /F79 316 0 R /F45 322 0 R /F80 319 0 R /F42 321 0 R /F48 441 0 R /F82 320 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
532 0 obj
<<
-/Length 2122
+/Length 2254
/Filter /FlateDecode
>>
stream
-xڽYo_{k\p@smQמ@KTĆ:[ o?H2ڢɮf33YSBhxs}&f0!HMUFP:r‰ ldLf-a<mj 3#~[ډLqWXRӮv 1G%3Dk*O (fHfʅb6|`/liYpw-
-v5~iHa[q݂8PU9
-da<U8ul)ώ5Pzv P&U]=pOW:Or{}Ε[t+_
-L[mlqM,]RJlc޳W.!"0nP+d۪wN=l5q3㭿eB~X,Wn67oRE_ۻW1:VDj>ENcKjF"#bs%
-\mO7W_Є%\SY4]}H5qID&wŹU\'\L(KDR3щ "Ja chb5Fb!4L<<{̉$I<MmDp(31(Í./#]:E,αuqb gO`^pSI((3zsg\OO`
-cl Pxf
-?x"j|z¾<i[枽v/瓞j&aj@ɼo
+xڽYo_{w#.%p@Q{@?.oIPdyly%bw{gHJm:NEvIG!9SDopwcE95*bBTgV)BEw>A"aLn+n}Lú‰~Sm<إ[VE:ۏF ˈrӟW򸰬ʹn]쫅bqe@
+·㨍!TxDǿ.ޒYl롶W:DBuӸX$DJ߭Q`kl* N(9>sWFɨ,;CscnV&"Q\^޽;|}_}y}{{&8"R~p,s҄fAȀqNT=pz͗h")I4R$L?h HDYlX7q|wަ,-Iٞf(!g CL4 G 8Q2OEfsGcaP`7Mt&d>ĸhR"U!1qG4`#xp& K2-
+(@QR?F\~-vKt5_6 e`T@ABap1Ʊ`u4GK4,z7AjgQ[7Tw33 09iXI-`tl6bGhC
+$A5Puok[7n󒢱 . 5Y&7uSt8?FgNЏя%nezܾ)!σ3w_Wp82/9GK>ys b]6薒;p\?x 'ᔇDWE^Sa
+JnA^yխ /| 
+wƗh),p󺞺U/_`欢Kiiz"Zھ`IF7HT6]VxWP6<-<W*)a tTrl"cN`%@3c)D!MR^m@~eʥQ;wB>FkFx"xWTcM!rL=S:7@RE>S'psxK
endstream
endobj
531 0 obj
@@ -2271,7 +2256,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [158.522 190.332 173.245 201.125]
+/Rect [158.522 223.736 173.245 234.529]
/A << /S /GoTo /D (section.3.3) >>
>>
endobj
@@ -2280,7 +2265,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [177.341 190.332 192.063 201.125]
+/Rect [177.341 223.736 192.063 234.529]
/A << /S /GoTo /D (section.3.4) >>
>>
endobj
@@ -2296,50 +2281,49 @@ endobj
endobj
50 0 obj
<<
-/D [531 0 R /XYZ 133.768 339.343 null]
+/D [531 0 R /XYZ 133.768 362.686 null]
>>
endobj
54 0 obj
<<
-/D [531 0 R /XYZ 133.768 177.388 null]
+/D [531 0 R /XYZ 133.768 211.119 null]
>>
endobj
530 0 obj
<<
-/Font << /F74 315 0 R /F33 317 0 R /F100 420 0 R /F75 316 0 R /F38 321 0 R /F44 441 0 R /F41 322 0 R /F76 319 0 R /F45 442 0 R /F78 320 0 R /F92 368 0 R >>
+/Font << /F78 315 0 R /F37 317 0 R /F104 420 0 R /F79 316 0 R /F42 321 0 R /F48 441 0 R /F45 322 0 R /F80 319 0 R /F49 442 0 R /F82 320 0 R /F96 368 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-538 0 obj
+539 0 obj
<<
-/Length 2517
+/Length 2661
/Filter /FlateDecode
>>
stream
-xYmo_*"J2AC^ڳNeG)Β%i pvvfU\qYodQf W6: I"Lp .ÏBHr.O{٧_U4f)rr0,6Ӭgy$" BEY{^)'L,<T2㒹2TdߢŁ(i{:q H$JDIS,1cG
-u@H
-~9  KH%Hf7NI:ޟIV"xoS5i`.u 7:tHID+2:ܮm?*ZOd:?q5$,XXqw]7"IffD/fFߍq+Ūif"Xy5ϻj!J
-ЬAUY_ؿp5L&D<y{5پ͵†a{[vE[z&mYULM^mo%?ovӤQZD-E˴M*bJq7wc=oڢʦ&Ji[2T K$gx`1!'GBz%F
-j1[s_G@+uOTZ7۩M,T),JXsھ
-H uS._NBXm61n
-=GȦȹ
-8G57 c̡ò^"\3sOSr>fux"q/((jr.h,Ȼg1xbkc:QW9ɃR%.8 0urCp|О #OY&9)59b- o1ӑ{yLy'Eo˙O#&xfi'Cgaɘ+0{FP/񻢯
-½7[ew
-ew ;*t@;@-nSqEБOf8zk:n)pbBYΝ ]He9O? *]'.1` ٯFQ@F(x,&ߌwT5~0{C\7Ko@8jr,g'KK"Ab*z
-a%dd%4IBvЍWnFXIh>4n WqG> _J D8EDϩ&+gS^IQJoioo[ o W?'xpUlʧ CQ+OȦ{?n3wU,aDUsL)cCC鶜p.J?jA E/d"cOcwtGωC!c]W{ ۖ8g sSyڢu\w >8}sSu=_te§@ໟkZ
+xYmoܸ_T[dI)AC6NPq[yWkilg8VZ/wh Ù<3T\QIߝ| Q&825i`*:8 2Iwh=qPiRٰX[%c2[7am]/ B~D$6f4,6M;贐Wƫ}=E +<C6m^Ve}IK` E!r-j{X&q64_MAN"Ӱӆ7eU17k|W'y;~MjũEr]L_+Kn4-lj8!C ,Q:🝕^vdHH^\bfotΪu{g+Xj#ϑNU*՚nn|O&c,J$GFd6N)8b+сx޷s!$ש[R 'D_NBXmV`7؆sDG-i2+~V2:5=z
+aG /xGނuC@]F[5ً3$Y/:vs."Jpধ 5ޯrKRijMcEVQʌ@)j*lBA4#1=R JX;ӓ/'("46`=9;5^"@Ec1| _8NK3YH{n og
+ t`ކ9h
+T\DD`o=pi(!mrc#tB
+ߚvr88C:',bnU7!]ڥLt2VBkΗE:xV%ψd6CDV8LCc! GCz *d$B,PX>w">ujב|Kf22WΥ$
+z re@7g"OS2 3́ȄyG5 "J
+_0Z5 - ~n5ёd:|+,S;yYEQ{?3A{R6P''7ɨחTMv8Û|N
+ Rl+@}-GyGUEvx%ah%=Q}YQQn{ZwG1J tմޭs`.|\tdfs|owCpʉ e;w6t!?dkWV.uC9ԇ?dDš #T< )~q.7/4j&v~e4>}C\i%eQ#Ƴ#̒tR#.iHJJ `*z.!GÛ90vH]k}iAaZ ə\ l"iP+2=2D v&aX"*9,=g<[:'& F
+R[ZM-o >"O<b;n-wxi-Saa(j^3{;Eq.aĸh>3HaIt[db 4ҿ}5\ (&Kya6zMD:,
+ܑB
+sSyڪw\/ ,>8܅sSu}&,΄OmѼkZ
-"mu._c
-:{(M :(M˰ I׻TTd*'..$hnT. %M_,v'ndnB=^(46dM !y]
-Z ]T21૪u:T5wq{IŔz|O#ұdK~z.T/i3\3pO UCjA¨J$v:r*&"1_1^M+IqϿ\\~ћ'O$?Hm*$~܆K4._6ȭYz/b\WQhݨ\0&QbxF H Hc
-:^LbUuWS$PJ&7Y̩
-$>SPTPKm[nǕ ^j7Y;;N2W}7 NX~n)!_Sl/Vb_׍u3*Gu٭zh-6 [ۡŒƷ*
+:;
+N]5uYO*
+^_'lndnz,6uη劄 lȫ4(nuUв
+?{BKUN7R@$w@;r\B^?"G)Fl-:E`A;lWRU`7A_nXy^0](^a螅I_G7gqSKmC}}Q"($0O3}ʕ>.OJU6t>ތ#L% ~,b]]b8LFYͦx@ڍH>acψS=Uo2ebDL
endstream
endobj
-537 0 obj
+538 0 obj
<<
/Type /Page
-/Contents 538 0 R
-/Resources 536 0 R
+/Contents 539 0 R
+/Resources 537 0 R
/MediaBox [0 0 612 792]
/Parent 511 0 R
/Annots [ 534 0 R 535 0 R ]
@@ -2350,7 +2334,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [188.85 415.459 219.07 427.414]
+/Rect [188.85 480.942 219.07 492.897]
/A << /S /GoTo /D (subsubsection.3.3.2.3) >>
>>
endobj
@@ -2359,45 +2343,46 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [241.416 415.459 256.139 427.414]
+/Rect [241.416 480.942 256.139 492.897]
/A << /S /GoTo /D (section.3.4) >>
>>
endobj
-539 0 obj
+540 0 obj
<<
-/D [537 0 R /XYZ 132.768 705.06 null]
+/D [538 0 R /XYZ 132.768 705.06 null]
>>
endobj
-536 0 obj
+58 0 obj
+<<
+/D [538 0 R /XYZ 133.768 211.653 null]
+>>
+endobj
+537 0 obj
<<
-/Font << /F75 316 0 R /F38 321 0 R /F44 441 0 R /F45 442 0 R /F76 319 0 R /F41 322 0 R /F33 317 0 R /F100 420 0 R /F90 318 0 R /F101 449 0 R /F78 320 0 R >>
+/Font << /F37 317 0 R /F104 420 0 R /F94 318 0 R /F105 449 0 R /F49 442 0 R /F45 322 0 R /F42 321 0 R /F80 319 0 R /F82 320 0 R /F79 316 0 R /F48 441 0 R /F78 315 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
545 0 obj
<<
-/Length 2845
+/Length 2758
/Filter /FlateDecode
>>
stream
-xڭY۸8 C%C6Oܝ֦mamɫG6A3J]G<Cfg?_ūe,Ke:ZτR̤v&I̮Vdi&.B$|;\.Yšm._OJBXlF ~m/2IECO7hVW0GH3lrBMI:[x"59PyE\˼uac wQYۿ/]P%1˒RvpK1/q\eX {j;|{ V`d2.l!AaIwBE"?\5>㴁/7ϡx%_~j
- ^{P8=4cB*&`)S*뉥iY"0 qKɬ݅5>3i5%0nl~g+Tfgt,^e"K@$5$P %N4"B$g֊A(M
-Z lY'5ぐ*;h;CiNA7ڄeY&zd$"KY4іSg=z'ZspW[mWӴM/֓ V2gB,hvis0i 硫CL7.GN|U3UK  R>~[m
-8`|\Mwg0\Gh$ ;. l}2Irb_Ơ! TA_?_IƁ%DOL xqY,#@Y
-f|L
-1pZ>oHdͱ^#(*5w XKg6m6LKqx'g̪A k6I:S[]ޤ9ļj@/@4w%Do>Ѵ8
-,lt[ >,3>79.iCo[=.֮d:V{=c "FEe,7u^n܋"jM"<2}
-{6/eC/QZ'uѶ|yN
-\? 4}/~Ϗ|^~OԿ+.N0bpD&_`t&+PYh,29 iFy)wAeΰSgF D8籸=
-Bĥ6cBɧ:fI5 p^j[)e̬@꫘u55C(ȃMf1
-$fX"i G)ËIhep7[o@Q4B݋۾wҵ}Zڹ]MGM g~s]g6lK+[
-
-5ee߃QPk]N(>~obZVdn˂$ ZXkUheHYdGACV%'\\m~
-BV.2pf‡ɔ#zzC8=v80u,nRhZhLL/p 3e):`M#7!kCm
-g2%590-vta]]/8* ;TˮƯ"R#az#lTgt*Ⱦ[>]y9&k+bC*b~pkg
-Aԇཁ*ւqfd:<>JY[LM;dLv[AuP;[|ow4H.E˂dRiLB<b:xeX,9i킝ΈcL2P9.Ju(bTFpO=ZZx߄{-ӭ9
-.zhKHm@tܻ"X"
-!@!k%`n/MJ߹&EL笙y)кU3$L<q()Ik (XEVx?K5ճ- h(xM o'vҋ][V\ m~'_oj
+xڵZoܸb %QCOIz'kkZiG tA/^3<eڭ ~uOʬ2%2Y]mWB)ftĆI6W_N,_4@kN,=es)"Ҵ{;䭥}m^[h;ss۾,Vڡ'JEeadASz=w?@Ե,8yzsIm͢i/!Fꝗ a+AzGo7a7\wE[zZGh8mWk EM}sB-w7xp~cr_1kTYKR|Bk|V4b=K ɤ3 2fiЁI.bDTE}Uׁ {[/LuL$l$.­o]Tnhv ;E> |WVsjCg
+2f"1@Nm13&@)cR<nO` 2ܴb)3γ |6lbd2LˌG.G%M]wK8piC`I>=:jGpn,<y}֑Y8ْ}\u^}uM^EG/WgWu{[??^bk޿)ZX@ӗqi=~m}n?/zC˟oBX>f}-
+QBr)R@a
+x[)eHn$jh-z_?d
+6=[j|3z*er7
+nhOpr瘅K4
+r1ev7E߃R*<[ }
+w30:{R$s|JOQ+A%T@|cT{^aeQ技S}q;pu1>(:.gFeЩzՠ AF̱C8#ϑL8\jI }Q */
+ L>ULsU@!g6 juVD,[lBM&0*Al;H 'С ԟTq5W=VtXT2myuPW8
+ f/ۢZ<(X"{|hŠM
+ UT="r?DL~J!/ЛS@ēOA\ ̓h \ęA鬤lie>CTibSȋG(;J|``\r ?;HiuQŀgt_)p[*m)^hJCLĢhv])}2vI3H1f&@Y9.kgmBA 5gl@1'=9(A죆W䂙KKs (X,*)[ wP5\ D7&4Gy S pi-_.tyڌTS
+pC醝fpe>Hy()(bQ vPDRyLud3^P0a}!vzrW+h}^8šO
+bwE_O jd 7Rɽ_|xd'mEoc-
+|D ]_V<),h7UJ%4 AF_rATAsFTg50:G\,D طYm
endstream
endobj
544 0 obj
@@ -2407,15 +2392,15 @@ endobj
/Resources 543 0 R
/MediaBox [0 0 612 792]
/Parent 547 0 R
-/Annots [ 540 0 R 541 0 R 542 0 R ]
+/Annots [ 536 0 R 541 0 R 542 0 R ]
>>
endobj
-540 0 obj
+536 0 obj
<<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [202.434 518.409 217.157 530.364]
+/Rect [202.434 629.838 217.157 641.793]
/A << /S /GoTo /D (section.3.3) >>
>>
endobj
@@ -2424,7 +2409,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [158.507 306.032 188.727 317.987]
+/Rect [158.507 422.442 188.727 434.397]
/A << /S /GoTo /D (subsubsection.2.2.3.1) >>
>>
endobj
@@ -2433,7 +2418,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [228.171 154.704 242.893 165.496]
+/Rect [228.171 271.114 242.893 281.907]
/A << /S /GoTo /D (section.1.1) >>
>>
endobj
@@ -2442,45 +2427,46 @@ endobj
/D [544 0 R /XYZ 132.768 705.06 null]
>>
endobj
-58 0 obj
-<<
-/D [544 0 R /XYZ 133.768 667.198 null]
->>
-endobj
62 0 obj
<<
-/D [544 0 R /XYZ 133.768 505.464 null]
+/D [544 0 R /XYZ 133.768 616.894 null]
>>
endobj
66 0 obj
<<
-/D [544 0 R /XYZ 133.768 257.499 null]
+/D [544 0 R /XYZ 133.768 373.909 null]
>>
endobj
543 0 obj
<<
-/Font << /F74 315 0 R /F33 317 0 R /F75 316 0 R /F38 321 0 R /F44 441 0 R /F45 442 0 R /F41 322 0 R /F76 319 0 R /F78 320 0 R /F110 518 0 R >>
+/Font << /F37 317 0 R /F78 315 0 R /F45 322 0 R /F79 316 0 R /F42 321 0 R /F48 441 0 R /F80 319 0 R /F82 320 0 R /F49 442 0 R /F114 518 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
552 0 obj
<<
-/Length 2418
+/Length 2713
/Filter /FlateDecode
>>
stream
-xX[oܶ~P /+^K
-`E+nWKGIcNJg
-qPh޶ͫsn)zlG
-[ .h+^]z
-r˄suJ Z>>/1j.0XNV#)<8lz7=5DY
-:tH[9lG~;Ѷ#F͆tȑ2~lWcn҆
-N8P_9PH @eWO_i<RH 5[29#C~ '/|p޾mn]^*c*IJ#,9Q4
-5e^c374x:z;}U񳣴-}>D/njy} WkVb^,^#Ȃr<C',?BޠÉr<1
-&  Iq2'^: \J
-y6Ô)+snV<D3ű>. mEIpG9 DP-+NyQ\
-|,p8vBpneyOMWDza@h2FRö׫5:BFD%u\Y.p]+
-m6s;[
+xYmo6_\xY "sC[ʮ+dwHN~p($ӎh8oy׋xY߮ξ
+lqY4]di.NWū~WnvoR
+(^/SlnxWxbPwW'y?7$)TJA\IfDX(
+ĩ4,KK#X3_q~Lg:{&$^ȅJHud*՛x& &5[G
+◳&V'g96 eHȻFh)/hq0TL3hkse ʮHawY ћf WQ
+(%t &ӡ%%{TIqn)*3*i T1նF7M\Frn[t42Qub>jWtQ{SJ+x5I{J"͐\(V8x" Q1!mXiX2\xSTW(BjuhRRYuyԔ\Doϕyjcu捎<^}4b|4@Hu2N8Be䂦S][-7ʹfaՕFDzu}le9-kP'_R}Yfa)&*7:P|Оpuղѡ7X7XQWEe$Ηy.9r'>ÿ́ԹvK
+ 927mVֱH/ir[[OZﺄɁ#
+4  f-((ZeJN rk
+'UO %sqS\,v<YMyïV+03RuQ&-Nڤpn[< "՝mtMCmއى[ݬC]to5r[/WnW|!d|P0y*
+>͞VqzJy*%JI"1<LBC?Qr Պiy:!{0VdvAn\pSG?mh7bEzX\Sƚ~٦x $DqticY-b/[AVզqa~@9e-C?G Ce xb!/;Ods<@ekʒc!4ƧH |
+Te?ިy^1wT:Te u}[rNMFWkd[PUykd[9k5r+Gn
+y-L>\LG.yDn= U#`]y3R%2OuW\3U ̈pp4uU
+FͨڊDX;\^/2DT]YyW\Sȸ7>/Z[Ț 'u l_iㄋ<qe,1u8o#hܖw)8-E:F;/Y5W=mÖ(UZ%PWqCGwӐB7` FvZvWX0ѝOx0u4o{7p2h$u0uzCjա=`)ͮdN ܅Z1Z(]IύNO]<!}XCΠ's!;`2
+4-u=ldDL8 .{&㨭jM B ddbוaxa}m ~Խ,
+5$}a!Y
+uԅ~34Onr?_; 2R<$GO,Z'zS myiP
+ʀO*Xtb4 T>0hD#7hel(APBhOU>=^iAݰ옏#G=Gb)Fy`iJ
+cLp F=
endstream
endobj
551 0 obj
@@ -2490,7 +2476,7 @@ endobj
/Resources 550 0 R
/MediaBox [0 0 612 792]
/Parent 547 0 R
-/Annots [ 548 0 R ]
+/Annots [ 548 0 R 549 0 R ]
>>
endobj
548 0 obj
@@ -2498,10 +2484,19 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [390.804 433.498 405.526 445.453]
+/Rect [390.804 551.686 405.526 563.641]
/A << /S /GoTo /D (section.3.3) >>
>>
endobj
+549 0 obj
+<<
+/Type /Annot
+/Subtype /Link
+/Border[0 0 0]/H/I/C[1 0 0]
+/Rect [288.224 182.033 318.444 192.826]
+/A << /S /GoTo /D (subsubsection.2.2.5.2) >>
+>>
+endobj
553 0 obj
<<
/D [551 0 R /XYZ 132.768 705.06 null]
@@ -2509,28 +2504,31 @@ endobj
endobj
70 0 obj
<<
-/D [551 0 R /XYZ 133.768 409.214 null]
+/D [551 0 R /XYZ 133.768 527.96 null]
>>
endobj
550 0 obj
<<
-/Font << /F75 316 0 R /F38 321 0 R /F44 441 0 R /F41 322 0 R /F78 320 0 R /F45 442 0 R /F33 317 0 R /F92 368 0 R /F100 420 0 R /F76 319 0 R >>
+/Font << /F79 316 0 R /F42 321 0 R /F48 441 0 R /F45 322 0 R /F82 320 0 R /F49 442 0 R /F37 317 0 R /F96 368 0 R /F104 420 0 R /F80 319 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
557 0 obj
<<
-/Length 2429
+/Length 2570
/Filter /FlateDecode
>>
stream
-xڭYKs6WU#!x
- /7xvR
-g𬊏u1Mhk={p*m`#•
-A:5G(`{&)73_E<PzZ]drzVAcmqXc찡OZ׆Au8r,î6mM:<>LBALp+;/_᯷U~ݸ(SZ⭆Xr H<r"O'geLE%5R<AC>GwHz*t =N,+h_0sCH8q*Mk^Ҍ׆0Dr[>U^PcGGqaWE:6b\$#HPo8{fi=
-ꈙTНיHn1Uc,WRsxj5F}qF?F)hga|w9GoCYZ=ʼUsBp1Y.] ~ ٘@ k4xr_2\[>vqLnRA2Uk~GW *KBB)[]:P&ڇ&|qavxU3wOȧ3 Pt3,/yDcמ)=
-W=@ /`j5Jͽ#ж ~DP;ů]_ A /
-uB*A6F)Xuk)F͇ oٗo P:
+xYKsWqTA(dSQjs+|pf͐2ɱu zصh4&"Y,ﮤYXfS.7 .%3iHaBzqWWEy,]s͹Ȗ? ,|tٴa_.aq[|2~s"4R3T ωTmM:?_u~'{9-?(@'5q嚾upOy
+j
+vE[4Ԣ wWJO- ;@,'_df˴At@Uݺ=vj1"xLLZ,7-sd\1ԜrRd蔏~_^p9uo̐y3dw45ٝ'jY?4Ep˸4r ȋ]s4,b~@8A gP
+\-c(ŤA]{QkD.] 4xD[c+cSOۡ;m찦(a냣,aUI rؔٓ]X;XvODzv _}[ga I1 =B=eB(f,'#ٕE"/3l$a?t~|"iCdM}: >-|Y7}L^T3d$NsW
+6ōn]n3)K΅rG4<_ 3l;J)& ʕJR`IE-qI /iaH(K8Rg;E $@L SC,}!]8#Nᶤ7aLz 0
+#e>sbIxHW i=(N,$RT sB1\`}{ _g;'au.ϴf Tb$Fˬ7`iùNo6rVA6B)Z 3c2A-urHx>sCU50_'-Ȫ:x:cbqęp1S֠0$@R݀,Bloa/~yxHJi09q$S,NHJZ3BfrVg ?MwHr# ^Ha
+Hg,
+`;ÇV)60}M=#H
+H1J>G Q&{T"TѢ`4"Xuh'ZL"$H[ҥ-]`s*m3@LB~PPq!^Jncy"QY9 w^l D7v=uzi_9Vr b-cF%!m"m}*ʵCԁRfOUo?F$͇N 4-\wYY6FQ_9Xm_!^Ax -z<n4^=F(
+\u|ЭxuWٽL`'һ
endstream
endobj
556 0 obj
@@ -2540,16 +2538,16 @@ endobj
/Resources 555 0 R
/MediaBox [0 0 612 792]
/Parent 547 0 R
-/Annots [ 549 0 R ]
+/Annots [ 554 0 R ]
>>
endobj
-549 0 obj
+554 0 obj
<<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [288.224 593.973 318.444 605.928]
-/A << /S /GoTo /D (subsubsection.2.2.5.2) >>
+/Rect [431.76 234.373 438.222 246.31]
+/A << /S /GoTo /D (Hfootnote.5) >>
>>
endobj
558 0 obj
@@ -2559,161 +2557,150 @@ endobj
endobj
74 0 obj
<<
-/D [556 0 R /XYZ 133.768 324.67 null]
+/D [556 0 R /XYZ 133.768 487.878 null]
+>>
+endobj
+78 0 obj
+<<
+/D [556 0 R /XYZ 133.768 300.03 null]
+>>
+endobj
+559 0 obj
+<<
+/D [556 0 R /XYZ 149.011 130.443 null]
>>
endobj
555 0 obj
<<
-/Font << /F33 317 0 R /F41 322 0 R /F76 319 0 R /F78 320 0 R /F75 316 0 R /F38 321 0 R /F44 441 0 R /F100 420 0 R /F74 315 0 R /F80 471 0 R >>
+/Font << /F37 317 0 R /F45 322 0 R /F104 420 0 R /F79 316 0 R /F78 315 0 R /F42 321 0 R /F48 441 0 R /F80 319 0 R /F82 320 0 R /F84 471 0 R /F94 318 0 R /F100 423 0 R /F99 425 0 R /F113 509 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-563 0 obj
+564 0 obj
<<
-/Length 2830
+/Length 2671
/Filter /FlateDecode
>>
stream
-xZs~_RsB$yI3m:Li>LiYCRe[,H2}vn!/"
-f,?7ŞQwS4-Uρ ?C: (hC-?7XkHݓ:Kzʛ{+i+Z_ {_+;ln<4iCy;qX0UzBSo-f:u[7ތf[}IKJL-D`(6x_v74؉zC'㢦lzaWБAaЌܙXm 12Z
-w#u?:*SPg5T/l$ifnt.,/,Ϝ#g&Pe| ?_PJyEN'b=*jn)w\*;~֞}E=+^P%3:YBSa`@uO#aH
-[ 0(zNbza,za.wB~:,chڴ%Gv5OMCaaeS;̰e"#hR]Y{ĔYHL'H2],s G
-ӂ`HF\<3[(T.ePG6*oʶ+ko^%E̓T7.
-)Q55<#nm<LdxSk䱝9"'1Rq5:>s"C҂
-g@0~o)$C$ue!gl S:y˜FՌ܅6/Dz)3Or4iOzDm5T; mFCGӫ&`Qa1{Ǫ+k3ҫH;∉+8EB#b8$.17'$B3nJ}0_F>glIRy`ϮɊST
-٨ -tCS~KBK8Q{>[ƒys[N=%G
-@7W
-^r 5fWNɒ\l}^jYzC)Gi%Ñ_}ѕU#Ko`ZTW j3DU`ΈjJ3ǃGeZPj |]G|hxNx3
+xڭYo_R$zEsȽ8%$bˁ,䕓}˙ٙ|GG^ _~xdQ2+mtDjIT&^EB Wz}A\|y8?͟` <[3zkOnf7׿Nˑ )%˲/IGK,i-@~YR0JZ3L97 ŸK
+iEԪ3_J䑈d#ud` rwG+-Lei"ca _WRe",܆C[?t(Y$h)-ՁƥVShQ8>9*;hiUN&gT$,L2\0<^0S2?E]n0U-{8߯<vĩd$+'2 1o{XC^$׬_n ՟ zL8ם ۼl
+GWq]b5Gp,-`K`q;~_%$L.|Y:REC3p4i[\{"bN'J3cMTa/ug-p7EAU2a"*tZ6[dh:5[F3uU5yl כ L[b㼡1m/|焷n|UQ.!V=S&sI=(NEfbv|P.w$\\j/$M t62Y*?pzS`7Gн39Ptcł\~0SDŒu@hM@]o"W@LOBz}T>2; Iר< ACMDw4<3z% \6G6ʦ-KgNd
+i%wE=o<=l=r}r@2plȕ*jeNh&к<d`W8ZH KEuQtqyf n7N>z >Avb[+rFh^Q1JNf/'x\e])Dva@B.=*Ale#q]v8#tG8.ө 8wf;ATČBcՖ;!͠sD\yKq"XC6n8\9K2=f.AZxMI6^pL:I^
+cȼ8jz;A!沐c)$$G7h˂;}n!ebz}xh"c}
+RPd((+ ttZCmH"a C3|d.Y(Rq6o˶pet 0f-źHihYN_R,I#p+4 Et6sawVoh6RaW9Dz'Y z!?XPR9Z굙S-
+
+|%;/dgR,llh*8Bv-( ,*-+GȏN̙[{?c`o—tUpWCu5` P2up+_MW?؈
endstream
endobj
-562 0 obj
+563 0 obj
<<
/Type /Page
-/Contents 563 0 R
-/Resources 561 0 R
+/Contents 564 0 R
+/Resources 562 0 R
/MediaBox [0 0 612 792]
/Parent 547 0 R
-/Annots [ 554 0 R 559 0 R 560 0 R ]
->>
-endobj
-554 0 obj
-<<
-/Type /Annot
-/Subtype /Link
-/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [431.76 600.047 438.222 611.984]
-/A << /S /GoTo /D (Hfootnote.5) >>
+/Annots [ 560 0 R 561 0 R ]
>>
endobj
-559 0 obj
+560 0 obj
<<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [220.36 358.578 226.821 371.068]
+/Rect [220.36 528.844 226.821 541.334]
/A << /S /GoTo /D (Hfootnote.6) >>
>>
endobj
-560 0 obj
+561 0 obj
<<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [444.381 334.668 474.601 346.623]
+/Rect [444.381 504.934 474.601 516.889]
/A << /S /GoTo /D (subsubsection.2.2.5.2) >>
>>
endobj
-564 0 obj
-<<
-/D [562 0 R /XYZ 132.768 705.06 null]
->>
-endobj
-78 0 obj
+565 0 obj
<<
-/D [562 0 R /XYZ 133.768 667.198 null]
+/D [563 0 R /XYZ 132.768 705.06 null]
>>
endobj
82 0 obj
<<
-/D [562 0 R /XYZ 133.768 436.236 null]
+/D [563 0 R /XYZ 133.768 606.502 null]
>>
endobj
-565 0 obj
+566 0 obj
<<
-/D [562 0 R /XYZ 149.011 147.646 null]
+/D [563 0 R /XYZ 133.768 283.933 null]
>>
endobj
-566 0 obj
+567 0 obj
<<
-/D [562 0 R /XYZ 149.011 138.182 null]
+/D [563 0 R /XYZ 149.011 149.454 null]
>>
endobj
-561 0 obj
+562 0 obj
<<
-/Font << /F74 315 0 R /F33 317 0 R /F90 318 0 R /F75 316 0 R /F38 321 0 R /F44 441 0 R /F41 322 0 R /F78 320 0 R /F76 319 0 R /F80 471 0 R /F100 420 0 R /F96 423 0 R /F95 425 0 R /F109 509 0 R >>
+/Font << /F79 316 0 R /F42 321 0 R /F48 441 0 R /F45 322 0 R /F80 319 0 R /F78 315 0 R /F37 317 0 R /F104 420 0 R /F94 318 0 R /F82 320 0 R /F84 471 0 R /F100 423 0 R /F99 425 0 R /F113 509 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-569 0 obj
+570 0 obj
<<
-/Length 2724
+/Length 2865
/Filter /FlateDecode
>>
stream
-xYo_:X'"EuQW[\Z4/r"D|ĻP0pp8ŋEEr};YiכP*J]FRz~7}^_˦ur첤NܷeW.1Зkv6{rvf)<TmqӡٲVy]y6o?U}ˏUVBDnqX[lj0"QCѼne9wÞ׷]V'gےN]"&“2mϼLhY=,[bk<gpm}F+p>X.GZL-fϋ~i-K[GwuR1=Qr]+y$A'0մm6~{!Vx)=^_5{*=-/۶Z{m[%߄# <M&YRG6~"VWͥ8?9Zr$x|k(n!BkGjhuO,=j}ȁui={OQ7Jr_EC: p{8-spjv
-umusI^l\j!kuHCy`_'g7]VqM,ߕ)F:aɅ 't'<Ww$PKck|;*Vw7=-=w윾y)K&%Ƞ%̝}!!ܽt}'nߺٿWwXx}sWǫn<`‡rE#?ot+bόe*﩯0Q GT|QUfDԀ@hGJff"#9uvNEB$ÑwBIjXpz
-@mObf6~N>qVv9AFݖ%:˙!٠!O,
-/>z%Ba%_e_0)_/%I޼7yeb^b^+kq5a#c} Х9ҔAaj<D|̷:Ia&6ǤDn)|U׼Yt7Ž~Q"@w7$
-Q7bڕ͡\Xt 3M$
-`Pxs-__>/T9ɕ̙f,JؚOox jH%X<W\}K5øq:_<ȡNzv4Kvk:DȺI70/Wc>z}5GT)xJsJeueW;߻BK߬.uei2.k;hX6V? 2_mTydW9_b7ɇѱb*UY!TO*]M+9鬶&Z#PR%uDy._I
-hP F4-ʵȀO.q;?_?}hBMMhBER@M QL`
-!~ mV`nI44k4;mR 3uuǰ)emv>rg:2H_t& I jn3LxR##Md|tD[|–>!k]-+NA#X
-_zbU@-ohHi8Nv
-L7"D2 zl9%OuIR(Cltu؝7>I@(<y
-T#CE+:|T6>S^?Wx\bO<Ioo1T~ɷSo&,$0ɩON3ʧ3M4AaZIooh=P8hwSU Np os0:~k.6nVϹc5.f%3Q^sFԵ+<#7sRv\ݐN) aryCծk^
- 3FjI2-]K$ n
+xZ[ۺ~_j5+^E6(SiszA&Ql9+Ķ\[[u]koӜXE ù|tyN|/~Nc3^L,3vbtƄԓ&a 4,R#f2u$~hMAˤ%Q™dV\Ɖ88W͔_"SlQ0ZEde,͆" I&Ӟ°Q3MF$VSnr*MoL,FwOНND~JMfdL:;CW'?/H@ƂNI@I[TufBEm9S5D-Ӟ<R)ۜIw<"ŀC!MӸv,sOoq :Τ8Hm(SgH8. &/%SR_B/!f/qFxɗ˝^ /uBxQxɬ0VKeiU]/d&o[YRxWeABABZj^.b-ED cm>٤(]19,6T}Y߂'6eVX\d})䮜,3eFs0 Z@%ЬfSlr}[R'tUʫNslY]Ί^ R F*>4 S0lsSWt%F@?x?~kg'zvn|Ŗb[]B$uIv `j۬r6=I*9gUi,_ϊү5"C/Et] K[PG[oGݺo?Rڌ'$r XFҚCJowV!-w |Ke+ $].6 LϽh0$AV4h&ɼm{ӄ3 ף1 aL客ּm9~$_Wʧ"ܢڮX>X'Y UAĚR$
+Lvq# -[PcƵ.&*$
+hYAX Ǔ%ũCfcslM #Dp H5QïVs(A`Y?@*x
+OΊ`OO;s珣n ]y=@ÛPS|ie%.l<q֌,;~r"I
+1ǩ7~1XQ*"5@09:IP5.Rt xQi7
+>:_&׫M T?ч(֧A ,w-߶lŶňzͰ
endstream
endobj
-568 0 obj
+569 0 obj
<<
/Type /Page
-/Contents 569 0 R
-/Resources 567 0 R
+/Contents 570 0 R
+/Resources 568 0 R
/MediaBox [0 0 612 792]
/Parent 547 0 R
>>
endobj
-570 0 obj
-<<
-/D [568 0 R /XYZ 132.768 705.06 null]
->>
-endobj
571 0 obj
<<
-/D [568 0 R /XYZ 133.768 607.435 null]
+/D [569 0 R /XYZ 132.768 705.06 null]
>>
endobj
86 0 obj
<<
-/D [568 0 R /XYZ 133.768 345.171 null]
+/D [569 0 R /XYZ 133.768 542.336 null]
>>
endobj
-567 0 obj
+568 0 obj
<<
-/Font << /F33 317 0 R /F41 322 0 R /F74 315 0 R /F75 316 0 R /F38 321 0 R /F44 441 0 R /F76 319 0 R /F78 320 0 R /F80 471 0 R /F100 420 0 R >>
+/Font << /F42 321 0 R /F48 441 0 R /F45 322 0 R /F80 319 0 R /F82 320 0 R /F84 471 0 R /F37 317 0 R /F79 316 0 R /F104 420 0 R /F78 315 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
574 0 obj
<<
-/Length 2333
+/Length 2518
/Filter /FlateDecode
>>
stream
-xY[o~P:$EJA[4)6ARE||Y] e+i(3ánkmQhf8|C3o1Og D]m={*j]x(gSlk)ş~{՚c.zIp^?/?#.C=+$3(`Z͚:qM 8I b 3 v1i6#
-'hKZ!ظs8>J: aS Áv2Izźh.gVDoq{db >^V]0o{,='Q #3<*"Ϙlʦ'>6c򂏽K!hfoB; [ MgrtތV.3uoP7yş x&BQ ր|z{芦->z~g',;KT+j:O
-+I1{f7}p&X`6T:o[0ԁ\5k6rG yo>iGm6zf{l ,aJ)oz[j- >!.i %u1fM[x8ٴ|H*bàH$Mo{6'+,|6h&]ɪ+w60~!H8TŞI#;dgWj;Q3iY8i~NlAZ0cQa&EL2ϿnTSy$=nxOM47o?F{Gܖd=q?.ywD˷j{gڞ?nR^9JPVn+
-1>(
+xڝn]_<y+rl Ljmx Ӯ8QC<&$gOUWm}TWUWz/z>$ e= μX'Tڻy6>l}-~V߽]1/'ވ3/ c>wH.2 2)=_A;ޟ0]
+0[paMq 4tb.xv_P+]^1$Rl
+d('I@ B$AZ% d /@7?u]m}M]}~({BڔbܗpBƛەne̎f+6;yշ4jJ-w%<ޗ ͫT僁=yCMl זOUdifn#wgmvH2Tf0%%ʓDbz|ZE[YEh
+[?VE؏y\<i($!'sjA^$& xʎfyu@!u/5XE,RPh< h@x$in=c^mzڂW-X_ޙ*y7mUY=zz; tg|'LAs|
+QZMKc›}Z" 8f("vL XN2<w[ 9XV|䵬!ֻQpԆA1΂$̬mA:{QK690 KeuTr-n57Sk!~oýipX)kR MUѨ >
+aoF[w"ެ]
+uiBq>5+TFL $@Qt.c\ecϏXIAs@˯4b(q% M%Y \b]ҧ@_@;":#;/']E{_'$.KjhBS;\,Sq6X⎭xBB?S?"L+}M9,h]~~,@( :L35xE0wi{R}In6SSPB AUZ@:,<QXj@*$w67P@!,C~Vr:- ;jC2DH g"q)S
+6yKMh
+
+ g[) fڷFoxi@d^%VUY8`Ld,ԟc*6ƽ;ߕEg^&oV4-8a53XS]|\'O̴X2<1i:6hY {Yԁ2M{WمO#@Z֣$\#M^ ++
endstream
endobj
573 0 obj
@@ -2732,148 +2719,170 @@ endobj
endobj
90 0 obj
<<
-/D [573 0 R /XYZ 133.768 395.454 null]
+/D [573 0 R /XYZ 133.768 599.663 null]
+>>
+endobj
+94 0 obj
+<<
+/D [573 0 R /XYZ 133.768 195.481 null]
>>
endobj
572 0 obj
<<
-/Font << /F75 316 0 R /F38 321 0 R /F44 441 0 R /F41 322 0 R /F76 319 0 R /F80 471 0 R /F78 320 0 R /F33 317 0 R /F100 420 0 R /F74 315 0 R >>
+/Font << /F79 316 0 R /F42 321 0 R /F48 441 0 R /F45 322 0 R /F80 319 0 R /F82 320 0 R /F84 471 0 R /F78 315 0 R /F37 317 0 R /F104 420 0 R /F83 576 0 R /F81 453 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-579 0 obj
+582 0 obj
<<
-/Length 2631
+/Length 2858
/Filter /FlateDecode
>>
stream
-xڥYKs W6tTdkgk7C>j -QR)RCRk;.|h4%JCx4@?
-8=ɞȑ6ڲxr[=kYȾ-m[Va֛;j˹o\2ɮh{7l,/!2IbA1I;F(}G ihUܨ.P5 Utg&;60uTԁȩ ^.$Jp<V)'QnOO_.[#YKEaޟUCSwa[(ǐذf8Qi\@_E'g Mӕl
-&/,SBi~+-l
-zBsMPeDy`9WIl]*FKHf-WլkEjp[34.\^AK2B)EyW&jF21 0avZXm>`0wsz!uz)N~V.#QҫF[OuRyw<ow,}хy:V6{/TB-y$m'tkr;X=<Ш[VtP[x
-ǃ&P%9X'%p]T;/V0i"5Bcq ߻M-u
-, \x!ǏS " o{a@BB(W z:zMYۺySENdV*\+xK4!y ,ٳ]Mot $/OchCGQN,ZחdWDcj#>5r#|GdG"x&_C1uGWl
-ӝO|qXyrydqQ<yǀD]|}
-(^SMRzu=n0 
-,?+!-D
-56nW,8GwSVՖG1ˆBxeglđrk (ZU<QT(yـ=E)Qk~т?;Ջj,&] QōAo4\vari]skJq$K۰w Cij|RՎGx&ai!emZ$ށ^㫳Ub
-Jy wzƍtAʱ<,=~{6쐤V?UX kE?Ú*,Z,pZ"<g%,<gıц;jkP!͖&+>U_l)v\#-,;>s> C#E>$? 6yCϪ*j>S&&Dך 7,a:^;@T}QO+₾&1SB"p5D~rM:hN2)mE+9xWK2T;vm6%F/ukl31, ,W'D*Ti8qjBUI\>
+xڽYo8~_*@Ob]l{t<ݽSl%V#$7%[8^,porv7_/d|t}r:]Δ1"K,uͮߓn{9Y<4UWr[ƺT뢾߽#QVjd|z|̓Fi,w+ N %AմX/r3}X(R~>^:MUe˂;phEAKya3O(6 ! oT?iRv&ilnyJ[QG6)&][TW-?X {YI:Jzte m%hw]ؾ{{4Y}UVES,:}ߋJz6Ω6mWleϮEQ/p񃻲Fkʶvjuu_alyjV{؟Lw/N\VO?W> G\2F C⏦B'I&p%\-͵0/<K3Yә
+R 0(II6<
+JH\5e^hhl9[b!Lgazdtz ]-EA)ͫxs^;.YTS:a$nhW$'&q$sh
+mEC4 =ן/wJ>gKL yyZ h1S˥0Xq]1jo`v3
+'-Ѣn:v)
+~;$!`]s7?~P;wIǚ o| 8sICshXg! K D:D)NYMdX-c7:joe"?-:ʗ.C\4>bo,yU8 I <:2Yr)zOeu)~ZqbR&ېvOܶdIeE%e
+AxހGWlGLj
+ sƶOFk},5E`eS"@
+ 2<]:X$,:);5)& },)MxUpIAa$w)Zp [K_0:cP<pV(A#'f'S8К
+U?vԁ3onqľ</Q'.$NE{z[ jS
+ Hv@bCy>js6f؞YLBR@qƟ-X)_)Yt9qDO֋6\/Ÿ2Rg=%2@&]owF^ubV6U*e@#G,"L0$\uRu>Y.4cYSȥ.({1l4طaq 1PnNRĉ0Rji}}U(>hp@ ~K }FأR}Eav2T,;9YS,ю 8vg\*YF
+}A U_%rPV 4>dyJUilO(iT`Y\6`|ap2M**ĿI7w=dh8e=Q&}M㹪OdN>b\r}㯀9Y
endstream
endobj
-578 0 obj
+581 0 obj
<<
/Type /Page
-/Contents 579 0 R
-/Resources 577 0 R
+/Contents 582 0 R
+/Resources 580 0 R
/MediaBox [0 0 612 792]
-/Parent 582 0 R
-/Annots [ 576 0 R ]
+/Parent 584 0 R
+/Annots [ 577 0 R 578 0 R ]
>>
endobj
-576 0 obj
+577 0 obj
<<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [427.713 185.715 442.436 197.67]
+/Rect [427.713 407.968 442.436 419.923]
/A << /S /GoTo /D (equation.1.2.1) >>
>>
endobj
-580 0 obj
+578 0 obj
<<
-/D [578 0 R /XYZ 132.768 705.06 null]
+/Type /Annot
+/Subtype /Link
+/Border[0 0 0]/H/I/C[1 0 0]
+/Rect [383.831 116.319 390.805 127.112]
+/A << /S /GoTo /D (chapter.3) >>
>>
endobj
-94 0 obj
+583 0 obj
<<
-/D [578 0 R /XYZ 133.768 536.276 null]
+/D [581 0 R /XYZ 132.768 705.06 null]
>>
endobj
98 0 obj
<<
-/D [578 0 R /XYZ 133.768 163.306 null]
+/D [581 0 R /XYZ 133.768 385.778 null]
>>
endobj
-577 0 obj
+580 0 obj
<<
-/Font << /F75 316 0 R /F38 321 0 R /F44 441 0 R /F41 322 0 R /F76 319 0 R /F79 581 0 R /F77 453 0 R /F80 471 0 R /F33 317 0 R /F100 420 0 R /F74 315 0 R /F78 320 0 R /F81 464 0 R >>
+/Font << /F37 317 0 R /F79 316 0 R /F45 322 0 R /F42 321 0 R /F48 441 0 R /F80 319 0 R /F82 320 0 R /F85 464 0 R /F78 315 0 R /F104 420 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-587 0 obj
+590 0 obj
<<
-/Length 2610
+/Length 2670
/Filter /FlateDecode
>>
stream
-xڭYݏ۸߿Bo1oR hm=mCkVb[In.%Kl{9$3 ͓'\k-eVf>1LrJަ녰.]}~fH Ccq5t
-_q)X5ĮN녖6m7Vžڕk .mMZ?kҥ3>TX{>->:dDvVu,`Z*֓J},wT*}w*_~CXQk&4N-lSAV[k8"f<E:,D8z89lA?:}TO E[nI3 t6,s`:02D1+2jFffb05է+480<܄q0{T擇0t(˼P&o9c,&89.c5ɼ4Ms3,dFh7=/|tp_fi͛wԁ&9/{f],ҟP&✢&
- vw#<gPXJͭkS[6n-D-Ń;4A:?lۨ3WqjU˪Xg`8v#}Sm3#Rnĝtw{"K;n82ikv!cCعK9"ji薌ESWW;%5Z-XfYa?°ْA]2,7fmͦ:lWmYiD\jc`)nSĶ^QQ`[T[5f[~:umY1^ofiX.JZ}84.}WxLe`X˳2A1g]F}o}&=s*' -bERHiSNFdlPbu {;ؑ ܈$Ҝ /V9~Zg@fd.0.>wng"AR\
-p%a
-ӄIAK_aP`}*2c &/`#ox.$L[JqV{ z%`
-}3@q>ݎ8G]&0[+lځ.iұ-|}wdGE{SpšQ@BeUgn5mW"P,lyk]VsC5J-?I4
-g<-8.; T]F:O9H⍿+Mgvѡ2 Ԕl@G (@wj79QxtcPmˢyC<0]x+?=d`1<\2;
+xڵYmoH~(%(JQdlOʗ_z<xs_+$,d\cf "cT&΃E*.~_PƘ0m*6"pT~i#mXtD~Uw:n2Қn-=N/p0 S>=)zy`+4K`wnwYZeᾑaSҾ̈*?
+1yc=PEix#Dq@@=㡪GsxOK<}_wmsX.=Ua\ہ#yJ$sSG+sg]}}[q~߬0#
+\J0d4',:[^>_#EbЮix @"
+f=
+5nº(mN9"Ⱥ#}Ml&(tn^ X}ڻJ
+,g(sB+.Χ;XXI{uhOĠiP9<"~*Q[
+n=Y8-^Ba ]Aهjc˿5H"
+Ƃ+qޜz:nbJX%j~ad *]J(cGwgAMhW+ICzd5@>{kе>YVny`؎E ;{ׂF/} RܧCS˾Q+~$Adove@y!Ͳ
+Yܲ(_B}HI:\uŦt8ڒԣ!2x״Zq;4+~Ɩmn}D
+DDJ^aOb ?T~O辣7E٢t,NUV$AA0ʀPO;>%ZƧT
endstream
endobj
-586 0 obj
+589 0 obj
<<
/Type /Page
-/Contents 587 0 R
-/Resources 585 0 R
+/Contents 590 0 R
+/Resources 588 0 R
/MediaBox [0 0 612 792]
-/Parent 582 0 R
-/Annots [ 583 0 R 584 0 R ]
+/Parent 584 0 R
+/Annots [ 579 0 R 585 0 R 586 0 R ]
>>
endobj
-583 0 obj
+579 0 obj
<<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [383.831 444.496 390.805 455.289]
-/A << /S /GoTo /D (chapter.3) >>
+/Rect [153.7 618.436 183.92 629.229]
+/A << /S /GoTo /D (subsubsection.2.2.1.1) >>
>>
endobj
-584 0 obj
+585 0 obj
<<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [153.7 396.675 183.92 407.468]
-/A << /S /GoTo /D (subsubsection.2.2.1.1) >>
+/Rect [217.406 198.826 232.128 209.619]
+/A << /S /GoTo /D (section.3.4) >>
>>
endobj
-588 0 obj
+586 0 obj
+<<
+/Type /Annot
+/Subtype /Link
+/Border[0 0 0]/H/I/C[1 0 0]
+/Rect [191.218 150.452 205.941 162.407]
+/A << /S /GoTo /D (equation.1.2.2) >>
+>>
+endobj
+591 0 obj
<<
-/D [586 0 R /XYZ 132.768 705.06 null]
+/D [589 0 R /XYZ 132.768 705.06 null]
>>
endobj
102 0 obj
<<
-/D [586 0 R /XYZ 133.768 302.179 null]
+/D [589 0 R /XYZ 133.768 520.325 null]
>>
endobj
-585 0 obj
+588 0 obj
<<
-/Font << /F41 322 0 R /F38 321 0 R /F33 317 0 R /F76 319 0 R /F75 316 0 R /F44 441 0 R /F78 320 0 R /F92 368 0 R /F100 420 0 R >>
+/Font << /F37 317 0 R /F79 316 0 R /F42 321 0 R /F48 441 0 R /F45 322 0 R /F80 319 0 R /F82 320 0 R /F96 368 0 R /F104 420 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
594 0 obj
<<
-/Length 2965
+/Length 1864
/Filter /FlateDecode
>>
stream
-xZ[۸~_ՠcEJŢ{Adчv;XHbc54L`{υ%[LveH|x"YJ|ճJ-8.n7 TlaMKeūo2[׹z)$8Z㑷d!"5|tݚI}슾\Uu`۟=O͈)d%0Kfո͆I'k@Y;^{lDS6Puh1x3geL (kIK%fb"΍ͮi*Q` ,j5O5˃>>ݾ- xe-z/@[Y\xD^JdxzZf3#dz/.l ^ 1BVx"9F9H3H Yz*[R&QKZ*)dݷ^jEee!@ubi_rm޵0%õ ޲=opH@m}o+CkN/ךf[Škiס OKR;RT ܼv&QU$*UW~i<֟W_'(LBVCp[p3o֣pO_/SF($OwM5H@ o|3=r[$ ' *MQB#Nǽ7t+<‚\$IUb aiN%%/ܡfYvuSj酑5nn~Εq5:UJ@,P[zG&\'^cZ2l'O[[nSZmQߑ7]nB=yܡXiuo}w^K+H݂;?*4B{ \1ߣ԰B҇|.l(쇈S(
-@ÌwpL5/ctzDUr^fi
-C뀟l`=:hP=06\o** :u<D hx",%I.٭$Pck>4
-5^[t:|FC FK;l)z@aT"a@/k^w,G@A}G'
-}W}5 9D;Is/gc&>x3sa/W7 .:ibի7b XA
-΍yN3ހxj\> KxS.œ{C'H}E6[v>czS,8OV,2Z2k5D_CkG#8B;lTK
-^~܊`Wj^nf,*{,LG|C:4hg䁰r0OSSBS\\;Lm־ZMU'ړq"Q ˳_2J}ڠ|Dg~qz/ǯ k}Hf{<IOSe)d' 8e ?,`V d~I9oHGSfر9aK#)hpcUAN"ܜ"eᆽ½<l&;0=zY& ,&`-ԔUn$}#7u}-c
-}!%?$ʍ%s;Эu"Hpv\Ry;bWGP֧"QͦCqB /drd"LΗߍb>,縬ʮo|t:]@vΧ@Ly>ͅRt8 ;l?QuAS\SR
-d_β)bd#m>A\`Ƞdc&+@*
+xXKoW',IYlnIGl)xUWSeڞdE`uuu=R%YEǿ\\yR)ܬȝOͅ6Y%v?TB<ݕu]󸻔iUͥªzeڎ-<myӔ͊VЕˡunynw]E<eۛ )Ea$BkOKӏ8
+Y7rIK^mfY;tΨSEX#
+chbB%NDh&ID*r'ܜ:Ygxl6G ,W&h.vsx!%2Q\/pdx%+|:.|)n<l-d!(aNU~9>LNx"oS<,F
+D_BBʈ C-;~<7^^6PuD(d]n <.xq[IS/<恧^&Ԍد3[>Ap[+{&~;)ڮ2pf2#Wz|n#(:|;8FC\ G<K$3*--BLoI^H{^d/VBraM:jeWW u4;1<\i:6/Gzԕ`'Ҹ#}@dĎ̢ dO8~ڴ=O]7U~v @̅ܨ㧉'W݌JlM 9\%eh^ uOB ]“xpqLsKLb*KIꅑhmGYYek0b8rDa{G垠i <<p<SO(1y~"1=g'Z̉ ͦ杀,W5 =.#GηtC _juEt iH jiG t}Y718^ˋS4"SzR1>HmϪ^V˚\3/^>Q=q™0~ Atsi ᐶ$~NrY"?cBe3)R&X;ƒx'T}4bgB&G%ˏ
+͞ 8:?#9F*kR~]B|r!_VD/f-f-T
+Ly xQt;&Z̫
+~5sx9to ly%d|
+`[#jAx G޾&?
+"QPJsv,cENP_ƨxCP|dg(yrշBb|)R)~~+^q#&'ZA~xF+^Wx_בܫig;{ c)o #+DqςU= VڽjIҟEL;E;U\"bD+;9 G[I
endstream
endobj
593 0 obj
@@ -2882,34 +2891,16 @@ endobj
/Contents 594 0 R
/Resources 592 0 R
/MediaBox [0 0 612 792]
-/Parent 582 0 R
-/Annots [ 589 0 R 590 0 R 591 0 R ]
->>
-endobj
-589 0 obj
-<<
-/Type /Annot
-/Subtype /Link
-/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [217.406 546.705 232.128 557.498]
-/A << /S /GoTo /D (section.3.4) >>
->>
-endobj
-590 0 obj
-<<
-/Type /Annot
-/Subtype /Link
-/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [191.218 498.331 205.941 510.286]
-/A << /S /GoTo /D (equation.1.2.2) >>
+/Parent 584 0 R
+/Annots [ 587 0 R ]
>>
endobj
-591 0 obj
+587 0 obj
<<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [286.819 374.87 301.541 386.825]
+/Rect [286.819 563.41 301.541 575.365]
/A << /S /GoTo /D (section.3.4) >>
>>
endobj
@@ -2920,28 +2911,21 @@ endobj
endobj
592 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F38 321 0 R /F41 322 0 R /F76 319 0 R /F100 420 0 R /F44 441 0 R /F45 442 0 R >>
+/Font << /F37 317 0 R /F42 321 0 R /F80 319 0 R /F45 322 0 R /F104 420 0 R /F79 316 0 R /F48 441 0 R /F49 442 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
602 0 obj
<<
-/Length 2448
+/Length 2352
/Filter /FlateDecode
>>
stream
-xڍYKϯ)ܲH M` I`׀9-ujǎ+{"W=qp ে d9JEYjmdE<o62/mILж88&ydDy[mَOt
-mf ozHeh6%C:I(OeiX:Omy>3R+VG"KqV$XiꁇmC_z.pX+ ǴD#$fOi/9q՜걀tRQlc(DkS ig
-D)(,SbqBIL1 ףL/J./􇙮46EbzrhzpXMP0 HI{Q&7"+Gq"ז#$tՓ8vsc;*F4#(񘤁 m/ j6B V$¶A9!J%a6TXW#1lg%eXE[/zl=J^ kTͅ -y OHT ®^_d=1k\Qͭgr}xt+OܦrJL<u-O?I&a_3Pv(i—wx݊E鞓CʟS ]{ݱyٶJR[JpJ_[<
-^ТC#$&D`4|Rf7v2i&rs9nY/uԻ3-7BuؾMVʎ[ھ)p =_dsKmSq`Kv0۫8\-E::[כyil-OV|.Ék˳?aډHCy( 'b$0x%zG i
- &( <I
-]bu㍫r)ֵe([(Mߗa"ʸ*$ ݫιb1ؗ/_mp9Y<K]ʙrE.2a?̟tً5 2P4@GunaJQhNmSx+b=
-o -,8ʓd۞ |1˜!O\{Iس;kʡ0Du=}?}Cy4gwcR7>pؗh5^gtrE jFE\!kC7{:PIt;C˟.tJqr|p%f9>ۥlWަCrO9 l1x(p
-t=k Aq {q
-y*W}̷i yɤ,eG|Zy /3t;"=Otup@[*s"(2;bmo~N/a$m@t&sѤ+뒏kpSτh`fMMvom͑;;rdIΪs8ߠBx 7Dž@}Z1_ԯ~z㞒۾Bk*Y>;=殔S({wcZt jLJk%L_] L
-XCEP ˳\z˽z
-UxvAh䏮w%}Sq,] 80?ntG'SFTzWt}ӤLHm\^hOJC
-fM\VGIl2+~{ఈ{>蔖]
+xڍXKϯ)~M9l dv G4RBR9ı~_1KNIP<&y<&BmbLȓCqgw~S٨/c:-l!XtZԛ|iX ܡ:k3B$YǾlsq}ڭzNEi<02"xwȤ,E&Blu3ki7n_7XW)U!bs:s/Mj<ޒDʋo|v ʧduop'U$LvB &O::Ӳ(`B%2LPtl6T1HӾЁi$tm͚vD|rhzLER(C[^nCJEw\ai!7"3G"sf:ĻDYZsbuvT"O-i1Dءct Z:_#曳k /jk>ht7="D2R:bVLoc>llaT .w犲{i\~FR\\㵠?mݞhCm>rԈڨx;lϳ)h@_<Yey`zih.ѝtm~y;w=7jiؐ@E\A,Vz\8Eֱ+6VHc»@x_G6Twx='cS11~fDo{۝#]~Gi &j lƫz7k3M5Z&O/)S+R{mXf-us1K\AOWq+erB:eW/sKID"C9E(L':oBk,,۶U;n;BR7N Zo0Pt;rhP {G u Uk9`ػeٜOW,W$gL9Qޫg
+sc+dvywMÛR7thtI5 |؅犦[@{ﮧxZfqXy*]M}L#,O O-@ G(.^fd?BҒ;]UKy\jzOϼ$ˮjLn&z*=kjxė6pRUȺFrd (:_ꙅu0؎.]{QYv\@
+ނZƖ
+ NNMqRm^ޭ  x|gB 2A2vio
+ "|m:?]Q
endstream
endobj
601 0 obj
@@ -2950,7 +2934,7 @@ endobj
/Contents 602 0 R
/Resources 600 0 R
/MediaBox [0 0 612 792]
-/Parent 582 0 R
+/Parent 584 0 R
/Annots [ 596 0 R 597 0 R 599 0 R 598 0 R ]
>>
endobj
@@ -2959,7 +2943,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [451.225 352.434 457.687 364.371]
+/Rect [215.672 340.479 222.134 352.415]
/A << /S /GoTo /D (Hfootnote.7) >>
>>
endobj
@@ -2968,7 +2952,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [213.469 304.337 219.93 316.55]
+/Rect [335.317 304.337 341.779 316.55]
/A << /S /GoTo /D (Hfootnote.8) >>
>>
endobj
@@ -2977,7 +2961,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [330.688 304.337 345.411 316.55]
+/Rect [463.753 304.337 478.476 316.55]
/A << /S /GoTo /D (section.3.3) >>
>>
endobj
@@ -2986,7 +2970,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [220.278 116.845 226.505 128.303]
+/Rect [220.278 128.247 226.505 139.704]
/A << /S /GoTo /D (chapter.4) >>
>>
endobj
@@ -3002,39 +2986,46 @@ endobj
endobj
110 0 obj
<<
-/D [601 0 R /XYZ 133.768 290.32 null]
+/D [601 0 R /XYZ 133.768 280.579 null]
>>
endobj
604 0 obj
<<
-/D [601 0 R /XYZ 149.011 149.075 null]
+/D [601 0 R /XYZ 149.011 160.476 null]
>>
endobj
605 0 obj
<<
-/D [601 0 R /XYZ 149.011 130.146 null]
+/D [601 0 R /XYZ 149.011 141.547 null]
>>
endobj
600 0 obj
<<
-/Font << /F92 368 0 R /F75 316 0 R /F33 317 0 R /F90 318 0 R /F100 420 0 R /F96 423 0 R /F95 425 0 R /F97 426 0 R /F107 474 0 R >>
+/Font << /F96 368 0 R /F79 316 0 R /F37 317 0 R /F94 318 0 R /F104 420 0 R /F100 423 0 R /F99 425 0 R /F101 426 0 R /F111 474 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
611 0 obj
<<
-/Length 2651
+/Length 2704
/Filter /FlateDecode
>>
stream
-xڥYY~ׯ@I2&' Dȃ@g \]Gjꪯ&&"yodqf6R8urcM27FTEowJHNk/O-.?oǝ^83Ɗ8Kf')3ʝ՛
-2it Om^eSZuUޝ"ޠqyќ=OpH6h܊/\: E#t&Hz|Tl$.o2xDAX/08X4s0q:TaD.Y7
- e 
-]uph}ٜoGVfJ2sdn;GnB4 XixDʺ5| Di߽#DXއٺrT'y$/?""b+iGxAr I Ӗ=8!ꢅ3,K2456y;HʾEL>N{َTY% @,e:ՠn> 'xYac"t&+`.97GGd\
-LB8m%Թ"Odt\+x],ӕb"F*WP?QG
-dj?#ݭ5:,eFxa&H^CU GwrBGZ6
-O
-ofS`ҒYbZJX%eߦ$B.3i! ~&&
+xڥYY6~w M}ڍwֈCr7GZHj;xI<JEXtsܤ|s\NaWg3|s\e:)>VjN_m1<NwUǹ m.\vf\g8)m
+*^_//M6:%l%PZǔNa+5
+xd?Vx(W'S,NƊ<vldzp|M,6ih`󧕥aedDn#~5{T>[XMZU~^\B;vpסmNW[t߆J&{+%eQK:i 54.es[MF2uYےSjT C)I.Zxh]iDn.nur#R Ak i/Ro`U%Q>А~<52]=&=O0?ܵ9DUY#y
+稏 FϙV
+JEXal>nNKEW&o'횶 ]D
+3m1sa֣g eQ3.jrRpv
+
+Ft 3$vTӳȌƿ`7€蟂p`|@a|
+( ST= lpFwwp,s+D=8J}5.+tN3㘌1I|*0Jch݅8;r!Hxp Pm"ٙaw0!.16 ,@HaOtg:|*-+B?Z(ox@x > }Ҟ2(Tt7g0+ZW_!՝!,W; I zyC6
+Իn΀b/_Hѐ$JZb(b|zݳ?H1LWCuAhClNH0D{Y4\p0Γy82p>~9nq(-o 9
+ynNːN4?iDș{ E׏mNt&ܣʫl i䅎ܣꭉQ[Ti=ʨ'q_{4_ R Pt`顱@k&2T?C
+I'4}: J
+P5 +N uzl>xUژpV *H]NN1@UV\TB)8|A;;^.k&¨|\" J9^zѶ\_럪ˏM"+?Tfz50˹IЙįl=[&QnHlBʋEI
+ z~"Cqu28ODjO{a3apeZM\%Ab2n,+(^(tѬʾ ՁWЕzE͔AhA+-!wPi4&J:0JXpӴ j Vmj$?]95ڪS)| >d
+c
endstream
endobj
610 0 obj
@@ -3043,7 +3034,7 @@ endobj
/Contents 611 0 R
/Resources 609 0 R
/MediaBox [0 0 612 792]
-/Parent 582 0 R
+/Parent 584 0 R
/Annots [ 606 0 R 607 0 R 608 0 R ]
>>
endobj
@@ -3052,7 +3043,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [137.594 385.612 152.317 396.405]
+/Rect [137.594 363.225 152.317 374.017]
/A << /S /GoTo /D (section.1.2) >>
>>
endobj
@@ -3061,7 +3052,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [223.108 301.926 237.83 312.718]
+/Rect [223.108 279.538 237.83 290.331]
/A << /S /GoTo /D (table.caption.7) >>
>>
endobj
@@ -3070,7 +3061,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [160.3 223.314 175.023 234.106]
+/Rect [160.3 201.254 175.023 212.047]
/A << /S /GoTo /D (table.caption.7) >>
>>
endobj
@@ -3086,106 +3077,115 @@ endobj
endobj
114 0 obj
<<
-/D [610 0 R /XYZ 133.768 263.51 null]
+/D [610 0 R /XYZ 133.768 241.451 null]
>>
endobj
615 0 obj
<<
-/D [610 0 R /XYZ 133.768 172.73 null]
+/D [610 0 R /XYZ 133.768 151.813 null]
>>
endobj
616 0 obj
<<
-/D [610 0 R /XYZ 133.768 152.955 null]
->>
-endobj
-617 0 obj
-<<
-/D [610 0 R /XYZ 133.768 133.181 null]
+/D [610 0 R /XYZ 133.768 132.8 null]
>>
endobj
609 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F44 441 0 R /F54 614 0 R /F100 420 0 R /F92 368 0 R /F110 518 0 R >>
+/Font << /F37 317 0 R /F79 316 0 R /F48 441 0 R /F58 614 0 R /F104 420 0 R /F96 368 0 R /F114 518 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-624 0 obj
+623 0 obj
<<
-/Length 2651
+/Length 2712
/Filter /FlateDecode
>>
stream
-xڭZK Wf5j$SCT-jC&ѤHҌ'.Wpu
-W_Z̘(1 _uae P4,UV i83JRLhͿ^L\%,1¬nw+.%L23v%Okv1JMq
-ล iuo4p$a2MgrQ"5H%0L)9X*IГ3U,Qp1ONDܭ7(}^UyuOjƀWozB1-n/p%eb-PE ɋ SvuQ8=v{p\!eErY7D _ g2SyyZ0_+?ywf#-(6_l5?{Ę<UYH>9
-[>x:ud# WmT@t[kY,қ 6
-ԕ- $Y+n."mDzv]aYð'm܂/v.e{@q!5Z-TLu'fvBFAU;-hUŽ<w7l9q\Q$HKM+uqߝC̓=09̮5
-6B}Z
-0iARH$
-toT<ۧ!Ϡ-׏F.&2ZTuZ Rv j㊋aW.?g`cV7 ^F1[to3}+< ~:u0~?V)B#!֧l!Sf\9j#vi0|eI%ڞM5ۚfZ#\,Bv|?[ߘ)><e_@R1ݺT >8MTK1 n4+Yȇ"Ghhp
-3U5k^L;5~.zyCc>cli"mFl,1缧i4|G'<>#o-u뒆儔Qg$B-74ɿgV*
+xڭn_k¹lЇM[ݺOK#^R9sIQXs=s7&\=7/2Z%,1¬+4K^1!._H߇[PIqgvyu>7RA"h=A4f۴ܔ2m[|_kq`;(j2#纇s[zxx; `[E|/ڦ^s*dDIpWlן_}78?<T,J%E\7(bQLh_~⊜%c̉l 6JM@lo԰x r A͋6kv -A $us(iWTEšⰣi)/C)mwV<8 8KWa[gA)lۦ‘
+@k6m¶<7Q7_3Ӫ*t#Pzh'x@G<G!XR#eK憎V2\إiId2YC9ضtvd.)aA/lTWAJ&w$aA.Gb0 uFjEv-pxݒ2(Sޯ^)mʲ'-휻G G9O
+aQ<ܦ2oD™ϻ,(@d," Z~9n
+
+ģadPXxfP #pvAj;Om#eQ-n"$G s3! y)w;KX6]X =!~ءP M3'S܇B/9!s t  ø1 -)ΟRtB!sRvY":p;CN;pAz L{rN:-i7P37i#Uiǃ\d<vbZ
+o,ZpXgA>?Ҭy(Ї̟CEHK:病!08~gQfWP3-f;pD4Ս*rӴߋ ah Dx] Wz
+SuB@ -;KȀ)UM=cr^<]6)u23s
+W<cƳ1ӎP;$˕$8vH=ۻJ}S 'G-h(D`]:o໏xXAtեD,-ۧ-\
+>\dCX!9Ctש pIYWp
+ ^9!K ldd:1ߓ1/sԗ0!xcnT<`ۧ!ן+/pNO2y:51Rn LjAO.3p0+qɅ.ϱY"]s4Nf
+NakOS)Y2厄[KͶ)3.Ih~ ti % 'c%&LNG;us4R(Ҏx?/f\At;k9\ y o9~VJo4w>|=ʆqTKK,C #xI4Dx
+Tv!>$݃.^O̟:_R&Eeg_\drӸPCt|8Mh!澿L:PnB8 \@SBJ% ,4NM
+a$.6(ĸA
+# Ԉ# D\oDgp [ؒg#99`U7!6.5L[sKO5,z9 55 ! tAT4JX1bei9s0ñō e/!qft}8~iRoQ~G<ޔߦ>b4O~G|m FRw8 Vɨ-ܗaa<K @]\ aD#Kz{QL%dIx0͓)B335̋"
+'bWʈ(.c1pik_'bZ\#[oQ q)3 6#_Z<Kzi86>a绛i
endstream
endobj
-623 0 obj
+622 0 obj
<<
/Type /Page
-/Contents 624 0 R
-/Resources 622 0 R
+/Contents 623 0 R
+/Resources 621 0 R
/MediaBox [0 0 612 792]
-/Parent 582 0 R
-/Annots [ 619 0 R 620 0 R 621 0 R ]
+/Parent 584 0 R
+/Annots [ 618 0 R 619 0 R 620 0 R ]
>>
endobj
-619 0 obj
+618 0 obj
<<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [265.905 496.28 280.627 507.073]
+/Rect [265.905 477.318 280.627 488.11]
/A << /S /GoTo /D (table.caption.7) >>
>>
endobj
-620 0 obj
+619 0 obj
<<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [172.873 330.21 187.595 341.003]
+/Rect [172.873 312.946 187.595 323.739]
/A << /S /GoTo /D (table.caption.7) >>
>>
endobj
-621 0 obj
+620 0 obj
<<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [409.132 269.881 423.854 281.836]
+/Rect [409.132 252.617 423.854 264.572]
/A << /S /GoTo /D (section.3.4) >>
>>
endobj
+624 0 obj
+<<
+/D [622 0 R /XYZ 132.768 705.06 null]
+>>
+endobj
625 0 obj
<<
-/D [623 0 R /XYZ 132.768 705.06 null]
+/D [622 0 R /XYZ 133.768 667.198 null]
>>
endobj
-622 0 obj
+621 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F100 420 0 R /F74 315 0 R /F101 449 0 R >>
+/Font << /F37 317 0 R /F104 420 0 R /F79 316 0 R /F78 315 0 R /F105 449 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
628 0 obj
<<
-/Length 945
+/Length 943
/Filter /FlateDecode
>>
stream
-xŘKs:|
--εNt\vIB+!LV1vOϑd
-4Ԃ0]
-eRB싋A.;Iz3ZE7, a:>
->56W) VIt닗υ
+xŘr8z
+Tc_8x*%RPҐ]T=j17[C PJD
+.!pŠ
+#p}Epab?z?k5Pv`X&!%ľuIʓ>ؾѺO£9dyNȏٿ3l`9qR(LfD3UZk(Qm|S. 
+˪XV}UZ`e քCp}sj5ȕ UY)ʺG .ʠb"$Ya7p/9:D Qn*D](BІx1+Kݐlu DCAk\_-jY}='y,ƜBaʒ&ߣ.;k~H3<m;m,&ÕJ4J@v]jul?F}ScxAKuAvO"g"f3:6!NqqH!LB 3ݱYҠn\Rf]npLG_Z/1G
+bIdžH+xu(͙c:C`6%CT5'ST7ݤE
+-t~xa] m,JəT:P%Dr j$/7:,Ir}-xl-X{\O܏sd/lOÐ*dI$yލ9b"T+ޢ>yT!(yؕd4/rIW#l,6ٖYK+-d#G5nfњf37u$jYuE%qOayΙ} /7Q(uiE
+TT$"
endstream
endobj
627 0 obj
@@ -3202,31 +3202,35 @@ endobj
/D [627 0 R /XYZ 132.768 705.06 null]
>>
endobj
-618 0 obj
+617 0 obj
<<
/D [627 0 R /XYZ 133.768 599.024 null]
>>
endobj
626 0 obj
<<
-/Font << /F33 317 0 R /F115 630 0 R /F73 310 0 R >>
+/Font << /F37 317 0 R /F119 630 0 R /F77 310 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
635 0 obj
<<
-/Length 2939
+/Length 2904
/Filter /FlateDecode
>>
stream
-xZێܸ}[fG`,&^dYًRO+V:coO6c/(]$N]8I%я7eZ6ֲH FoDwi((a78? ~x#lPLlm}wK#n]Iλ5m@oOU#YeR-Tu]Խˇw0|u\$LdvuCX)E1,K2M^rcH%˔
-%~CLb+!i-A$$E,MAjgyY.V:!X4`},XdY:!4f<4F
-zڼw](vJ,Ԩp18,E[To| AGg]6aPF j"`J @:>wB"~L]w[FCPu&vI ,ά,[
-xSj>bϻ/]sL99pe O':q۶|:f ^%S||86<4`of
-bY{63<A
-#Xb1k3(D-tW.Qy88ߩx,/LLsٳ@@#meC#g? t%d*]Ŏv¶:LI@v[zEC
-S҉u3۾Yn̉9ef PkH/S&9o<R=ڴ=c<?("y=r;Z~Ǻġ D-PU?W6 9V$ Ŗ*fBmU@7M}zo\8+lu aPTVnRo_م@ Ne2jpm·M=R Qdr}ۆ[~lq"2Yk`]}Z~ՠL=\Q,s8/ X+LR%ԝ|(oq_~CclwYcM.z‚38_9gp]nJ<x&i{lNW:ڥi5~;m4R#]a
-V1Lj%",
+xڵZY8~_ڌxdv3y[2ږBd+,o]tv )H`gE&=߼yV%V1xYPc|&Ż퇌ɻ_G^p䫷\Lͮ[romm[lM{^tRfbܴu祶+"򇪘om%PON4?uubmLWuY 4NuN)gD*E~\TŦ#wKɤ+x5t40kŒiI J hWhi+@cj(K' DoA$%I"~P_'N\[
+yXi#,o8 k0Ed4F
+sP]&nEO(_RX`ןJGJ%B.udjJΣmLNe@B~
+OrOa8Yp_#=!7yUysB7Wbrh)$1.?+y 0/9K-pB
+O4b_n(M艉&Ō5+(k4lho`)~FgiE޶~RhLLM
+:gG
+#m?ŀ~}ICܺMᙏ0wO]ĀZ'a͗ Cj^ajԷzH
+L{SxheĸMSPGi4O
+ґ B2XQuD%H#f{n?o*? `b{H
+Fr>0c\
+ ۧY%H¾ T|KH;rjhZhRB~(F!zk9$iU @Oa
+Y.ǠN2x>&sy drmbCB;)!^?Ū[~ˉJeDljkdB[WrL>f= ,L)hq^_+)W|4/XB.‡e ȃ|IYo]GZ=F h}zCdd a7{xzJʧ0̢37 3O#eJf̝@Oc=c~ܧ80^mR4F%SvαΏ(}NPAЧ59s򅜢]i pV89ǯ椊56Vbz:h|<]%Bfegb̗CE fń2|zUG>b.#r=A]<|VNC  a]͙1Ujݤʭ62E'x4ytVolM};:<D#|~Ɇ[>q?68B]63f&eQeS Ęp̧R
endstream
endobj
634 0 obj
@@ -3244,7 +3248,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [393.959 506.301 416.43 518.257]
+/Rect [393.959 469.195 416.43 481.151]
/A << /S /GoTo /D (subsection.3.3.3) >>
>>
endobj
@@ -3255,25 +3259,30 @@ endobj
endobj
633 0 obj
<<
-/Font << /F74 315 0 R /F75 316 0 R /F33 317 0 R /F101 449 0 R /F38 321 0 R /F78 320 0 R /F41 322 0 R /F76 319 0 R /F100 420 0 R /F80 471 0 R /F79 581 0 R >>
+/Font << /F78 315 0 R /F79 316 0 R /F37 317 0 R /F105 449 0 R /F42 321 0 R /F82 320 0 R /F45 322 0 R /F80 319 0 R /F104 420 0 R /F84 471 0 R /F83 576 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
639 0 obj
<<
-/Length 2500
+/Length 2628
/Filter /FlateDecode
>>
stream
-xY[o~-dz
-"EvDm>`60^o1Hy U_=F< nN24{Y(5DwUc]bOw,Rf3;vKEJ5 REɂ|%V_iRys8 DY^rW;4bzhTcSӼy#2kbj4>ړ-ItQ5\D ~)z%Z~reqމx54WTغsk.|"~(4OE+fq=Z7$,`2M'Q/ ϙEXmmOUz`"ڋUڔiCViOh|_7Ӌud5Ӻc>%EyK}w U,~)jD?)/bgWB3)'m
-Dn¥Cpfy
-fBF3 r$
-k7
-U.н*^AMMPHi) !m(H2;'R1nTMn7Ao݋7O( 2`MΧS2>W{e]QnQK]}u '!:URt I)6!jKb$fx` 5ɡ
-k-WP9NS&ihoGvejwYq
-W.s8P߿U!7 !mG6odpS?. e籠xz.`᯿x;Äas*n%e`ecưrCpWh9epju]x  fW!Nr{k!;N@sZ4wL~՝"Pa!*
-j)d|K/9 |Q|O+܁L}2'#5FoԎ}5,h}CL<.:f6 |\rθ0PŕXpɷ,|!L)P*@Ҋg]
+xY[~_[iiQ(%7? `v}忧4s"兆/U_ݺyOw|,Yn"KmY2LPE?C>'Ev?=eT?Sp =G?֧a(cK)/HqA.д'`DZjBLqNrd\%*MY:u (eB(j>sί)pQH7uKϗ,P%OY^ÏvUaO6cKqtT5{f%m[
+*7F3K% .T `%̓e`ش9lġ<S{lNv>QGA旺sс]CĄa՞luFfP6ĩ%겸D+*lݺ5q9_ח]slNDӸv|uk%t$,`QTˀ*,33(8U[rƭ
+g1
+|О`2kW?)bV6 v66'y4N _Ɗyv߽
+6:P{,|&Ё&
+閜,p-E7:F/\)`܎ܗ}ݣG!4.q)kt;n+t!
+ĚF qk,b+.#/Xad; X N˙V"2 SנsJ
+Sdf.7`7mw-|W<k8Ɇ[C@}L'?h[8+Bۇ1CtxJ'30akV Fת>43AO: 4\JćO " i]y`[Dqqc3EiKd:]x\sIcsh0S:wk]^;ŽK*M,u\cS>Ƭ3`*,>Ҭɏv˖)v Ws0~
+ۤB*9#!RSGJ2,s|)֟,cD*ȍ
+ƛD|sK4DF3tu* -+7U_ɝkUGK)ۮ*ĝNߜ)(>$qG8@*}C; :  YdL$S5@tG :Q- }`䥣
+rEt:xʈ̝>m)zC-hOS<
+j54Ŭ59eu[X[3h
+
+G38߿7˃pƛCK6dpS?/puIJX.eL@'ogMqt+);-3e):ߠ M!N~w|Շ@+F3˷vPrk8Bh;6"EDh3ACEBURL&-,^!t!Oi><s{>a0Iʔ׬%_$<PtEć|goљ6`j'|sŪ[ 6AYl!L)vP*@Ҋg
endstream
endobj
638 0 obj
@@ -3292,27 +3301,25 @@ endobj
endobj
637 0 obj
<<
-/Font << /F41 322 0 R /F76 319 0 R /F33 317 0 R /F74 315 0 R /F75 316 0 R /F110 518 0 R /F38 321 0 R /F78 320 0 R >>
+/Font << /F78 315 0 R /F37 317 0 R /F45 322 0 R /F80 319 0 R /F79 316 0 R /F114 518 0 R /F42 321 0 R /F82 320 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
645 0 obj
<<
-/Length 2642
+/Length 2643
/Filter /FlateDecode
>>
stream
-xڭYI-r7Dc K lVZ-俧E&9I܊EVW a.}T,HVOY%:eBnS~Uu"W6uvYR(+`/~F$j )rYor>@G*׹\4j\ASznS`\Ao60kj9:؉e˿Rf /y6KO$/حsI=:k0*f(pG&θVݵhvb*,d)fZA'j첽k*!04VXn%q$LbX@2aMʔDvStvͦ=5um@JE6UpWQ_aSidRn(5dn"!ôw]u CE 7m\P? ~nȹt&"?dyOg66{3.2` ӌPY*W/D,o *\|ǁ$0|yV=-=kΤGOafe[B|P_O&cs%ݛ,d2
-azMkAJ#uN{LU9W~4Q)S v]vS WG6У!Rrey j2$ͽ]uwHtxT.80=cK
-AP 1Rȋ[!߼[ T̰9,/1iX<b'UZ\jщ 9YwanFYh@""un:QX4ES؜bbHnDڦHUU\>d&eh#`@(U:a3se@
--99,f!.g7lA8a`#Z<!Rw|l/q}~iB n!)RaϤԨz[S@|G2uI8})q||Ѻ"`BP9| cŎnB& ,0M{B8S,Ȗ +@
-ԯ^ f77qbTIUjc`ZEzIpI]N_I6ͩ!bGTc&ۉtE7\xˁ l yFdiK-`
-YgiBXEh`8 jdb9x!v !*^ BLA,K-T¸Ig}/,3ƀ.*
-l>-[+R?B <
-=qM#;xT\E$CpQ 7.=[7|: `vlX˱]
-0c#TR B XX<3 aIR|"YSu-_ԐTnjLLs6@+p`=␐G8z93 AFf
-~ys}Y C+[oR5(m. GLh&qQ"`=L8fTKlfuU[T`DkKN
-ğ+ܾ[eKT&v_(b J 4/a_N6I d9H G
+xڭYI-r7Dc K lVZ-俧E&9I܊EVW a.}Ԭ,HVOY%:eBnS~Uu"W6uvY2QH%3V_I3I#"$F=yMSe.}>G5UsiԸ j= ]maՆsfu8h*69q_b^5
+md=I^[E璆{u4aTF=Q
+ݎnM$qkѼJTOY SXʹ6Ӄr#KOe{ 6TC`h6aFK
+0,IŰOeÆ)Bt| M{j΁<m9ίZ¦jɤ$Pk:pɠݔ+EBi|H)A0Ї^o<p/'< i~sLE~( 幡$-lmf
+T(TWPGD6t\ G]{tؐzva/Ws0^#:W% qa}̤V*~~Y" ;@[I(@%~[=fʓ4zYAMy4SZEȋD{]>
+jBda)~1L}۵8:RNlɺ p;6B7FrOwIŌ¢!(-Cp+&6}MLG*> 0)E# >FA.o yVW[ >O. @toC+F~2mo瑯Ï ٘wkYb^+`ɔw o[2 :5`3嬙K
+%\ϑA^B̌63f8ibo1g؜9DPhw͙O9oFe1 w9 $I
+ۮ8QN:9H du9_>TfH +v=u26o7i` 8mjh A==bAF/d]u__U~d4A;MT̕0{L?=Ș.+\Nh7\΀S]P\NrJhN =3Nl&X3,rD5]LgKED3"NP_BLFhfBQUBC }xS:K *@4phT# !DcQ(NbB`4}^lM:xad5tiV~
+4֖
endstream
endobj
644 0 obj
@@ -3336,26 +3343,27 @@ endobj
endobj
643 0 obj
<<
-/Font << /F74 315 0 R /F33 317 0 R /F75 316 0 R /F38 321 0 R /F41 322 0 R /F92 368 0 R /F110 518 0 R >>
+/Font << /F78 315 0 R /F37 317 0 R /F79 316 0 R /F42 321 0 R /F45 322 0 R /F96 368 0 R /F114 518 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
657 0 obj
<<
-/Length 1956
+/Length 1958
/Filter /FlateDecode
>>
stream
-xK6+t\T [nд@=dFkk򣒜9,ٲ.rЋEIC΃3IF\#ןn^^ Yb5<b!ʪHFc|;IEݗ$BĂ&2~ϳm|VQ!X=2OX\x,BMV O|)&|}Y0ʼYp&SŒD05A- E_r}+i@0 ҂)x4]^}D|Qb2bQ\3"J!pZzX%1 q4IJ3 K$&bib r4n%OebԠ$m^`̤I#V)\(gYR盱5/r[vY5܎) }PƞmWo,g8l?p'+a<RMvp:IWx`Zف
-76?
-R0OC]DV ?Z0&{D,9Z 4%ʃjMZ'j=ߒjC# xJb  +'f3إ 'H`[S$L ;<fm bktwLD=Gi:]FQMU)T`Yؔ`"
-+Jx?lE}_Zp=R)
-#zL~?B9I
-*J OO#sѧYO@CK~E9lK&| O]6\YSdh0[7ɺ^,UAtok^CO.i0\̦:;{y=+_FVLquO=!_%g;CFr@βќ=3{8I%Mpa`Q}IK$3p̊|dΟzM
-AYp^U6m5tڴ{p29:~*P$j{,097 +S<FQͰ9]exuwlv)R=D*უox d*ST*(mOi^ழ6A]`,t>Gx
-bV00׾<t)lu2E5APLL, \պgHJM|w\1uB^aok@lʼ weQ7hzނGe &l^_U3Rf38v@=m
-[z@(!)lpBw`ӻjV͝Qq]f"<ÒKBpت?8Ҿ^wNIwP*a)iz"wꥁr-84F530%Ƒ( 8R|l&\CL0wT:Ejj <
-K #uC@)p\}>Au史ExVcgw xg|F8 ꎵc#o%-GQ[V=պhkaRiH*!I*EiGVAZq05քP[jۚ@Z!
+xK6+t\T [nд@=dFkk򣒜9,ٲ.rЋECp8i=0%Vs#JImt;>ƷT}O!D,aH)<ۖM
+WUx>aq^K7Y&<|o̚|mgkk#C̛g"J8%H*s_^3RP^/7~obPM#2H'͠mD&zˈiFFets;:Θ(iJp %)xOI8U:NX${HK('!u,y*WvATY/Qf0f$J`L,Iގ͗Mr,V^ǔ>KcɫY^3&y.=vOVøt(qǴ Xe3om~<
+Odkgz%
+G2VA.  sqGY;6f,gKNp`6
+rzgP~Vѽ-bzq<T;KNpS0``~ [F0iN
+A9t̶| Yc~1Fc[s"&a}4Y-%-1+M
+ma.Ϋlk$i:0Pݪ|BphX/xaq.оswmv!R=DX*ძo[*ʩT QYQci۞ӼaW gc'OضZ!COa;)t{
+E$1.ʔ2@`꾭xX|IoP}Dž9X~Q7,ƻ$̛VuC08Ge&0ټ̿df$%g!qn{tBr\ Iۜ,t6f*eV/^J@Q`(z=%TR KHף?S/ D;l104@홁q_,tǗ5Dq Αc l*w&{ 1:Q.s`HMϽ#ssNi4xJsbO'9TPb *Wvr3@F@͸Q' z
+vS"q~ܘHOab }0O-Bf[mpi2NO`CZ;޾9BݕfYrdpջmuSAЏv[7♠RDFp4OZaKcMp! aJ㰅9\x,gp!PKw߆O6 u$7ֱ2
+](><<v+-uEK] u?YNǩRWtH]Ѻl" 6>;jwwsK w"B9e`zZ7lvy<g]+;:y
+({Peأ,6leM)XYA{]F2&$D .&k
endstream
endobj
656 0 obj
@@ -3482,27 +3490,24 @@ endobj
endobj
655 0 obj
<<
-/Font << /F33 317 0 R /F95 425 0 R /F107 474 0 R /F73 310 0 R /F115 630 0 R /F75 316 0 R /F100 420 0 R /F92 368 0 R /F110 518 0 R >>
+/Font << /F37 317 0 R /F99 425 0 R /F111 474 0 R /F77 310 0 R /F119 630 0 R /F79 316 0 R /F104 420 0 R /F96 368 0 R /F114 518 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
669 0 obj
<<
-/Length 2621
+/Length 2622
/Filter /FlateDecode
>>
stream
-xڭ]۸=@QDF#(=\s\}8ť@6m%Wqp(ZMGqگիg{w7ERƫ݊ 4_2c@%XTەZ"Vu*6v:}<Uf_<)9o8Hp&rbPň߮S_G饣$Ī`EEƒXB ¾=hwA";W|X4PUR{Rz̓!qPִ ;uWᾡ}ˆ;:
-uZK1r#[ wkhj7>`ifhwTk`&LjBJ-IYp
-Avq*Z-޼z &6c
-Ħ(`YssӃ3jL/w@u˶4ͼD.;*&sA!GdF/c͐<S7"o471id5m9ʆ,x{cWYkvJ_`{hMk.
-tA ޏOo9*=K5rWN^oc])`U,CwqiB.X$K#9Jw(͂kG2cfʘ8ܢ;nXiZ;>Qv!@PBH&h6&Ƅt lKXǽ#A9HLTB۲HմX)n6eY7Vf:QY󡴅}۵͑VΔs@P
-Z$`m
-(e?8`S<V,X(I205(N-FCkj5Y +ֽ`b3Kt$KT(oOcNrˉuntY&Д( -1vB!+s+ᦄw&Sr>@jub
-;umiI
-V(%&wE,#J#zQEGվ_QR#rG7;tɠl#ھK~y2|>4OatGUԒ?>8^ݸŦ6.Nf3߽7C88ϮrU+UT/2a<?.
-ADzk( L{OEEi:-]t]`(@iKDbDGHj.|HӒ, 7/O @3ɉ]|I_> ۤ# 
-dn. Qe(;[כ6dvt'+ @I3껦rj*R;q4a&A FxvHBv>]vfSeAR/KٱPX۽s?w;S~3BPI0}_W-
+xڭ]۸=@QDF#(Jt{溹pHKpmV#K(eP/5=h_EW"nl9+4^V\&|"]nW,YiZ@]u(dlu[~Xg"P<aShS:mΓb8_FSg"h/i%^(:%u^:JB
+VdqHa\H*; ۃ{'$S}ˇuA
+}Be<eM;pSw7lhS- ՙ]CЦݖj-Ҕt,nyNQ2]ײk֩WCQqX9-5 h45
+2{Z8 U5g(X StzK@ n9X!3\EvśWV[<b ~0Xґp"Sp2P<hIEf0Eiv3V:D2Aq)(y?t&/F7\Ps";NƢ<ʼn^0!Q찋'L$u,M2\HJUc(`h_iY1_ą.d[@sKL9sҳ)+
+Xpǜc)Bn|ٖƀH%v_v\d.2Wўelt>RB7CxjFCԑ#"4Zِwotxl!=k 6NQa lvퟵ)[|E.ni[q,q (WXȫ1*{莜"n,+RdYJ`%Hݾq S[t +Mޠt'*5hJȓT4S`c"u lKXǽ#A9HLTB۲HմX)n6eY7Vf6QY󡴅}۵͑VΔs@P
+IOJ3Ҷʶ.>Tʊ 4k((6v-. chbBe-RbKȵtv̊cLةkKKU]G()0+btUכ-=bň;* VkNEe]~0Σ7!)Xw^_Z ?2:ĥ\I {uR~T8OΔg{]oqp*5]cHV
+z0C`ܨ<vG'
+!5WyAP' Rcv,v8Δ~HYR_$]Lf>/
endstream
endobj
668 0 obj
@@ -3592,24 +3597,32 @@ endobj
endobj
667 0 obj
<<
-/Font << /F92 368 0 R /F110 518 0 R /F33 317 0 R /F100 420 0 R /F75 316 0 R >>
+/Font << /F96 368 0 R /F114 518 0 R /F37 317 0 R /F104 420 0 R /F79 316 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
678 0 obj
<<
-/Length 2931
+/Length 2928
/Filter /FlateDecode
>>
stream
-xڝYK۸ϯ-T/Lʕvf3%)\({
-HS)Jrd%^ɕJba\Ԋ m{y>^ϫXh"=@\)js8$:xM>:_XJAs%[ N=cvA@WpNBo ,uR$peD ,h;#\=OLV2sF=I .ur&]- {]jr2V35:8ak@QKZt8"bցhE W?CĀN`lNK;ŧ9uEOcZAT{Jj> N'Et]Cb@_!=T  gb gh
- 8KBCE=/~}SU >{lAosXz(O/->
-A@MU) <=RF/oVJک;<Fɞ( gUXQNmQ#U1c5_οP3.hgD+yxi~os( 2 $id8nu뫫fRBrZ܆`C@  Gj'<_!YL-ąĊ$3gqaW,#kgYmF *{4#t@] [aʨo͖~.7h5J%%ΚƐvJZ
-(:_jDV
-ƃ&%AM:.$
- 8>9d7's8f_.^pI󻂷o(B.ir&1AIn+4mx")s礯^KW _tO\ Bbu&DF|D[@N$Z^R;#H`YUuMs#zH3wt
-Ce ~we`bo}y7s2x<%\Z 2N;OVx:YJY{.L)9Ͷ'iS{ K,)&$Y4>}C.3jm<]:ak?΀3GLGt= -OYD\(3\:\F44p}eFve [q.`xAr֡[*[4b}yC,>a3lw厐5NsqAXpቃZ8V}U?NdP.s7?
+xڥ˒۸>_[%
+=BDFav<ɚWD.\){oXf?+C BZ'҄+ÚNm>RD PόjzZ-pZV^myP(mNX\d[wm^˷~g
+}+%)=YpȪ-Ekr
+ءj}Be58 :eϚ?cr5GP#pش/spB)G*CVk('wo뛻FwGO=DF҃ H""7X1LB*WBUQ{X3e@  V2_q?|AR@q"7wQ͟H(0=cH_f7 ps Ft:ռIDkHB|"0%挠>s#SDZؕF XCE,H;t \3f$J$i
+{6-P<* z,fePm1EiC#W)6ΙrU f8"/|>d t)@=/*-e}0dPJU->Gl0xZYQ]ԲA@}Lʢ\#o >Q;)Fyc$~8ը)v3:b^ !>+I
+{X53-`/n)QIj^a,
+'T\8^P{/v2a N_M^]J3' ݷ|L 5Q{l~/Ťx\'Qp ݐ"镝Lh޼xK~ji1Sҁ`4d9f) 2 cD p,-O I%O/ nO1F gA_$ V|%a2M?O/Q]Q<xS#bF@O{fY}`
+YQ+D;Te XtЃAzKس0U,>Z2c
+כX2ž`}h
+ɎI56~YEL%8s
+ 0!flCP3'?|WyCI
+$SYm㵾^2H`9ɨKK$`bbV8OJ(!W@!g;98Nqq%c'",
+
+B䴡<s %gH[يȪYP!}1Ns9?Q3Y(\$F:l GZ|.>oM⢥/-7]G=vcgmtG4ډE/$Y,plT.lO>^ \.KA pd< KfK6YK-JnjwyCn"‰/<>#EY(7ػ#CUֵO}|
+`XEF
+1C}}DRwO;^p;^yi@XO'ԸZ'}Zʯ!!+><>XJ3-Ъ*DJZ@[ȾHE%3wH$Uf5=еB8
endstream
endobj
677 0 obj
@@ -3627,7 +3640,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [411.365 308.475 426.088 319.268]
+/Rect [411.365 309.281 426.088 320.074]
/A << /S /GoTo /D (section.5.4) >>
>>
endobj
@@ -3636,7 +3649,7 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [301.48 284.565 316.202 295.357]
+/Rect [301.48 285.371 316.202 296.163]
/A << /S /GoTo /D (section.5.3) >>
>>
endobj
@@ -3647,34 +3660,32 @@ endobj
endobj
138 0 obj
<<
-/D [677 0 R /XYZ 133.768 271.773 null]
+/D [677 0 R /XYZ 133.768 272.501 null]
>>
endobj
676 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F38 321 0 R /F44 441 0 R /F45 442 0 R /F41 322 0 R /F78 320 0 R /F100 420 0 R /F92 368 0 R /F110 518 0 R >>
+/Font << /F37 317 0 R /F79 316 0 R /F42 321 0 R /F48 441 0 R /F49 442 0 R /F45 322 0 R /F82 320 0 R /F104 420 0 R /F96 368 0 R /F114 518 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
683 0 obj
<<
-/Length 2931
+/Length 2937
/Filter /FlateDecode
>>
stream
-xYYoH~ϯqEb !$i:3s6o4k:u,9vhۛHonod. XǻN&q]jvyLe?4=7O>oVO{/UsÃ_J)U@ȳVhlCdlycמv/rZeF{L#nGn hqAc 
-H0;fؠd͒`Qq>p:n h0
-N#ynP$@6P}40^Gsd罋Zn.Zx$*$ p[
-AIPEjWnpւrp&o|+ b8W)f{RQm[mF?$C&xK/j.\ 6'cSFc/737[PgΫlNPZ4/hܾ#R`,yM_XtM4YK5O\)sZ@]~
-{6fD
-[ yok
-qք+4޷,T2T~/%g6[qEVxigC\ܩ9MF*4MDnCW*zA"0զL5ZȂ"]0pO\7<U68Xw
- L5酳fFkPA!)cgA
-EȐiQ8IlgW|zFjN#fvUb"*qvJ9g!ti0oj)X"m`Zx;nJ| f,:s<wSfDɦ,&78´}Nq]$MA;Dtfy 9[@SzŒ&bB !!@;`Iz> $?_Ǹt(l@Fi 2Z
- FNQ_"*y3h
-*w,*Z'T'5 Da^DZ'dް0oܱ)BcՕY01R
-֘Rcٷ[P&boUXxH,jy.M@_{gVA1։Åp7"!&L0+PV|"
-
+xYYoH~-=͋" ܁ !$i*vubm}s9vǙxŵW:u']Dʯo>|vE\:wʘ8K]Xvn`<AQy
+Z=u=waϛMV\X4q<kE+9?$67=IP],uXԽW<RH=V*s
+.NP@ ީ(mM )x8itMDIt8Ȁmh`<zdK#_7ǮߺV.66eQAnk:_BGD/IwIM$"j̾"
+{ekBfJ٤
+C}C/9Eix&=Y^0h/5J#~;
+`3zM
+џ=w`\‡ .
+c/n+ ޾G)"IĮ8.qWuU !R.|2O4,'o;/Vگ<tVv_
+I+9P%&%YMVb*}K SLW$*}Y@J Kج K܅!MNIY((C :ـB@GO5Wؒ.xd- Byˡ[nWnɯR|ߣfD ļ^E
+G.?ct4o MUhS͙p+Aߝrc' -`d\^v(?[mlw4jK(nWT &ʻ,̜WlVB6ݲ;@
+p`jZPI^ A
endstream
endobj
682 0 obj
@@ -3713,25 +3724,26 @@ endobj
endobj
681 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F100 420 0 R /F74 315 0 R /F110 518 0 R /F117 686 0 R /F92 368 0 R >>
+/Font << /F37 317 0 R /F79 316 0 R /F104 420 0 R /F78 315 0 R /F114 518 0 R /F121 686 0 R /F96 368 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
690 0 obj
<<
-/Length 2044
+/Length 2037
/Filter /FlateDecode
>>
stream
-xڵX]&}_:5" @HINz+$;oi+ϽRo/M .p8@w;7W߿Pb<Mq8'*vT$rwS^F<S^e_ WTBX.KThtuip-zζehk3\]_ )֡&<%*Y [D|6x Lgh ԎΨ xCsz3ɳdD%1CNdh
-Jrvɥ_>搞|E9fdV>/L/f5 0yqu6k)i%Kjcx26hvW4b).:>spxe-⤱-NPM)˓. $D4s kA~"GqQa>x7\`m<.yV\<s0Fu(KXWW
-M_®U.rI~-Oqd.v69g,#@,gnG̍@J#c$"<ޱyo *f]I2Dp=lbl 
-Xm|^ qgM(U]f@y$uVns`&3P,?Y O
-\4ſQP0,pn Q ?[vϸ%Fé}Y'E*辐7 \a.#ATq3&5n9~a#hg\?N.w)tNBn(N,Y
-zZyyI ~DFeWb
-ηe3l8JXl3 ;7b˖LMJ7Y "nИYT/B&p) .!عL
-R ;9nn*#{8y>A4Xe 6`e١n3+P.hq;x`w/ϐq_>pvT4]Lػb:㸗:!|/_iƾ<C9.J6W
-(`2o+eqƀK ?s$5ǣ$(. .hFOM Y! 8=$ϊh7Y}Bӣ~J^)WGnzmp
+xX]ܶ}_
+1Ήy$3EREwe:~iߛX_jJ +8~nvT<fh{/>4vg+3 FpPS.J9{oL
+"h1wyIR(AFX"N$Ψ
+xCwzҕ s7!'Yh
+J
+!1Rd~=7Cz .ml]5L/f5Z~VUJltSMU=dd,=ؠ6ڮ7M~ 9Kpѱ;+-+ޣj4wyͥq`}.E4)a\ա44?p7܈`ɶitLmkO .^8ODߝm(ˠDF7`5㱯?.d=93sͅ]BՒ[q;].\lЌzH\䜱(fd>s?8bnB=pL;yj>Fb!ھРaf8,cpIgoʦ{[xЦlǤ4F45~פ✰l-,_(Dʣ=TtCI2b4V=> fUK_X^q(;=Գ
+ƣE c0}Ս!aKv9Dx8x<#Kbc~t5M11WؠLUL %6t[gG9P~Ai2]5N"S@y%7KfֺV^
+Owт/ȉ\v%H@\
+ObNQ!XL8tzo1^@HAyh=,uם*{ms
+/4zTqG_(lظy~]I-(H6gH-P^Y? K+eIHïA@P J 'L2+/ͽ>3ւ̀9 3_֦YltG0=QLՕo3 Y69sNp 4HGN~zvoAծP~σYN֭HEE޽~~ǽ '5d{/*{S75}̵ qATw9M@o^w]@NWG7#0uߚ!#(o5oY 8H]Gi4}}Zahɏ]\e{
endstream
endobj
689 0 obj
@@ -3755,34 +3767,31 @@ endobj
endobj
693 0 obj
<<
-/D [689 0 R /XYZ 133.768 456.287 null]
+/D [689 0 R /XYZ 133.768 458.279 null]
>>
endobj
694 0 obj
<<
-/D [689 0 R /XYZ 133.768 261.312 null]
+/D [689 0 R /XYZ 133.768 263.305 null]
>>
endobj
688 0 obj
<<
-/Font << /F74 315 0 R /F33 317 0 R /F44 441 0 R /F41 322 0 R /F78 320 0 R /F38 321 0 R /F75 316 0 R /F45 442 0 R /F76 319 0 R >>
+/Font << /F78 315 0 R /F37 317 0 R /F48 441 0 R /F45 322 0 R /F82 320 0 R /F42 321 0 R /F79 316 0 R /F49 442 0 R /F80 319 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
697 0 obj
<<
-/Length 2111
+/Length 2103
/Filter /FlateDecode
>>
stream
-xڽkoe 'whuJr 6=3 xױ߯a`fn/,]TW`3]}RAƲD&:J1A&U\UxH'q3Wzߖ}C[[v6Wuf}a'aޖyi_/&(Ͳ4spbpHgg1Iwvg <DL4`Y^P9+E\b âA OYE  ?>67~}aS{ބ9 XEJ)ݿh$ܵf4[ žfpc|!;dH"%~J_XnY=m?<%윳4w-?&#k1eDhf$Yj2bp& ?8A]}< D q0 طk4TuL²
-~:E摖If?zbQF͘<GOL UNb&bA4+S͘PGήIMe-J!z0uV4V* \B| 2LtԭrɬDf}mG! :ـҍYA
-]ny,-\g]WՓY
-
-{Gubɹmzx5JNTS[(vUh8
-DZBZ¦|=^wXͫ(hU[WA9\5o Ь"DLr?bB=ҕ#HGk۪+μh6sť  1ܓ!(MOPAhXz#Ab)ܜ7q3*f`T(Τo-飞gbQc,myai5tr><)iN~c))0A" ?VC06t2N\bqϑoLbt<am( I=-H[ʊ 2Kc(~=Awv%S9C^Qg101,%Eck+?c`WEj{*}z4PA{m`5f^uF*uka^{u TE ЦC %E;gL4yS(|@
-V:|sC"rLKeU mnDZJ,ܖun!. 'N ]P
-|O9n:!%C{FO"9X<~wƟ, W&3R$<WUP4˝T*0VcK2hƩ_ی)e}1m9~GWuMYaEoF0\ƅA
+xY_o ϧp:e@qašȥW'dx$GǞx--Q$EHzxp?|2AƲD&:J1A&UExH'q+Wzߔ Huӗ~mw|_֏Uy[Ja<w?l"L4prZ3W3 +΀uztֺiA$M̴NH^ula)ae޶Ȁ BAһ|4H%slG/V(cuz킭D'DU6o;}aS{
+򹘭 XEJ)'ݿwxI8k˛$N($oD4' ُ1</$S
+$
+'ᇢ]Pl%V b;wi"H%⠽ ^fN f)N
+)X3榼jm^<l8iZX2jLg8upրII7Fϳ$Ĕsz-jԜq7 аvxۗ,`EQz2vJjpQm]Dxpټʦ&B^2P1Qk4 DWxG?%9M "UiWy'P nKK?Wb8'CRQа*3+{[<ٱbn@3jT,%-=޵QOʳkoNA u[^X 'O~JSW
endstream
endobj
696 0 obj
@@ -3801,40 +3810,41 @@ endobj
endobj
150 0 obj
<<
-/D [696 0 R /XYZ 133.768 560.383 null]
+/D [696 0 R /XYZ 133.768 562.376 null]
>>
endobj
699 0 obj
<<
-/D [696 0 R /XYZ 133.768 530.058 null]
+/D [696 0 R /XYZ 133.768 532.05 null]
>>
endobj
154 0 obj
<<
-/D [696 0 R /XYZ 133.768 306.57 null]
+/D [696 0 R /XYZ 133.768 308.562 null]
>>
endobj
695 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F41 322 0 R /F78 320 0 R /F44 441 0 R /F38 321 0 R /F45 442 0 R /F74 315 0 R /F110 518 0 R /F100 420 0 R >>
+/Font << /F37 317 0 R /F79 316 0 R /F45 322 0 R /F82 320 0 R /F48 441 0 R /F42 321 0 R /F49 442 0 R /F78 315 0 R /F114 518 0 R /F104 420 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
702 0 obj
<<
-/Length 2126
+/Length 2120
/Filter /FlateDecode
>>
stream
-xڽY[o6~ϯC@;=8^P[XrֶRIΥ9 I9-:<Q&ܾFwaݕQBu4[DLb2 Ͳ:0}J&&L 4ˌiB /H`&I4P-_/HB#qʼnI"-6/oh%"ѣ#\G\|.;$8Nd)L+yGt@tƨ)(vNdāzb$A]v^S'Jl'ǵ 'Ӊ#zD1eis2g(ba.20W˪o҃
-g(>x
-$L$ /HxeU>l3ƽX-DٔSEpaDp6".'Sx=6~37YuG/yvy]Ut02UyZm|mTyp/WrMXlL$ d)h.QHS+(p&Ik\_K+v󦁃PsD@ԭEI9S<3͕̊\wO86|FW!9ۂP׭ xTh$QK1GAZHd!JS-$ʒ-/]jC*} a;90\dLM,o4+/bf1"$d^c!Z%A
-Ozpk*N2_eMj|9b{dWs4eMDu wn
-UɮY"~2:,nx|܍޸fwXn/zC? JmWf=.*OĿ>d FMt޸3\\aS xP~DƸgH>Z꒏
-3OOO*)L0YZ O9LuPwAnB}$c8<~[">S$qʇzkVaӮdu}{dڌkl Cǝ.Kݙ E[J%be9UZ#$j브+{n~A,,
-
-bvyUb Y(<PKQ [(P28RMB5E GZp(tG)
-xȯ"A?.9+
+xڽYo6B
+Tb.ߤnw-
+ܣbɉZJ%9~3$eKk~Lyfh$4 _/}<HN. m B%Er~]]|v@ 0q?Q2c
+OzpkNhm*yi*ry]ɢl**˖DVpubO.KE j WPFdxT3ϰ/
+qóa m?S?
+ vB{ޯXoPj ! ^
+UɮY"~8OdMusx|FolP,Sfa K?jn=(n˦O?U>o7sfݷ-~&_.A O. Lq `!NyY s*)L{~c ր,p-s/uܗPw(7šE1Rh2 5DR}HPp+ e2jQ- vM$+@X[Chqg(fwfgapK 3}eYڮ PXe_s`dx&t+>;z0є-4=|gs?q|07 6ߌ/վ!Q@e?MI1<j6jP"9":P|]>aq;p :h+AsDf!X7x+O ,'\NfD+f|Clڇ%1[1YUe }GkOVߔ@
+e
+8ZZZy `p:ـ o
+y._C^fp:x1ܵ*n)Sꊘ[ȊLA/ %o]#ՄdDQGx$((҂CA >JYDfE6"J95
endstream
endobj
701 0 obj
@@ -3858,21 +3868,29 @@ endobj
endobj
700 0 obj
<<
-/Font << /F38 321 0 R /F44 441 0 R /F41 322 0 R /F76 319 0 R /F78 320 0 R /F33 317 0 R /F75 316 0 R /F74 315 0 R /F45 442 0 R /F100 420 0 R >>
+/Font << /F42 321 0 R /F48 441 0 R /F45 322 0 R /F80 319 0 R /F82 320 0 R /F37 317 0 R /F79 316 0 R /F78 315 0 R /F49 442 0 R /F104 420 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
706 0 obj
<<
-/Length 2186
+/Length 2194
/Filter /FlateDecode
>>
stream
-xڭn_
-Q’vo8WZ?I G; Fv8LeZ],LS^=YUI >MKB.?"U?]_|Hy$"JZ 3onnyT!Xu=:>\wZs.eu(Պ-ìB}J,V,CKDU՘,6/]Y7^iіem &-ufyK劥 :) 𝪾/` H eGTn%S2WlS=D0K|N˅4>|\)Зqgc<cPfB'Kː pc pb*nLIF2 l$B2>ǀ(0r Jfv.(a5=®3jҿ,,>d1E? &Ԝ&fHcGWe.)vqلap'$<HA_ӱW;tMhqY!iDC c=,b{0L/p{#} . !5˵>[_ A13!ynmӸ*<s>rrĹ\tݓomЀf5So_3HIC.Д<)&˦v@s/Nbpgf[C<ֻ8N`
-1L=3WϡS<v>q*9XC̵7_
-@MK*=93/} /qSX0'j
-9C{=t!\MG^CorZh%JPUB#ʓ:oN95\ǧm@YIݐ\w0 HbH cl$'Te柟RTbҒY1OpKO ¯<)NesO WFR#sp+pHY
+xڭXo_
+%8 }IIx^L3F1 'DTĕ3K:θ>8e,[
+&噞h< )K&YT΢i
+2jLbRh2`"S9]f+~9_PifD>+qF6|(Y
+;VOkUXw-t2e UcFʖ7
+" {G1=Lot:`(9c̩Ai9(doR<$ /XK) _lo;"G,\0h(i4#}-qm#
+s1(tN3e(1"c}!6Q
+~ΧH&ADH'32l
+` k*=9 _tAbY^$]cs0'hyq
+/MBN
+ U(`6q%g^QWQޕo
+wx{:q;纯eM·sr tzʥMw7={֗_pá(]@57UEl:0k݇Og)$yf]6&6؀ԑ~ T" dĵ8$(3ߞ|d"LYĜ%'(xʠ~~
+,fK+?FRGLq[vƿHX
endstream
endobj
705 0 obj
@@ -3891,29 +3909,26 @@ endobj
endobj
162 0 obj
<<
-/D [705 0 R /XYZ 133.768 502.7 null]
+/D [705 0 R /XYZ 133.768 502.977 null]
>>
endobj
704 0 obj
<<
-/Font << /F75 316 0 R /F33 317 0 R /F38 321 0 R /F44 441 0 R /F41 322 0 R /F78 320 0 R /F76 319 0 R /F74 315 0 R /F45 442 0 R >>
+/Font << /F79 316 0 R /F37 317 0 R /F42 321 0 R /F48 441 0 R /F45 322 0 R /F82 320 0 R /F80 319 0 R /F78 315 0 R /F49 442 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
710 0 obj
<<
-/Length 1781
+/Length 1783
/Filter /FlateDecode
>>
stream
-xڥXKoFWX},Z)zh>%HK6Q>H-C-ٙo8F8ś+Ƣ ezP"HQ&ut_-R7bs;MT*뭝X4K-h-mB8`fǽ*?\%IK-a|i:aR:"."qm/v#7:e@2ZRΑL8bu
- *򑳼^ Q_F)[x]veSɯZM_*^~wv*A֢B!x2RF wTt'Ф t[ͼT=KQFcX~nSWEWVM?4ܩvG`"ܻ xks3C Q$&UvK-{0&0F4R6M
-&1]c˷
-;ghwP [|h Ѥւ`)f=wvfVV۽P@F27R+]D2£ [қ qf@ڝ=S <bi+Vܱ4u ::fNBy*Œ _p}P;C'/ HK>Wh.Ty-e륋5"e縇^`%seV"%rK)\NE~\ 'kOa-;$|^-@C4 '5U gĎʝDTp쾝hc?'벮=1а 't>IQfe3z"Zh<zK'3$/E%60Rߗ~HR9 )衑#Qsxj
-38?`Yey {& \:M&*7i속*a ‚pfF0ٱGK('<IVE
-\'wg("G|ї`?A
->B4+PgJM 4/TK;^L '$B0M.S
- dq:?P-@Cٶl(*tک쬭O ^,L^b@`XAb9n[7ˡ\HUSt39Cv5f2I*Uqr֝JQϭ͓q[U_5[ͤBNTa~QǘZ BËW94h\#'lEfZur`G![i1фmfCy@}tC>??=wޅzpCvDkpE)]=m@O
+xڥXKoFWX},Z)zh>"%HK6U>H-)ZV틖7Olv%zP$@Q&, 1 f䌅ZUZNdz(R 2wKyS2L[aajAwWQA C0teXf;/Í(HX:V s$%!(N6߁DmfqNKxu5򁳴f$ X71-)[xUE]ZuWfvbiZҿ[[ k
+apM<,X?l2NlJ3*WņHJUCx4`kBzve>g BB;
+7WuSdoT.V! ,_Ψvi 5)}x x,iySgjcOij%^@
+̗v
+^L 'dB06u7_
endstream
endobj
709 0 obj
@@ -3932,40 +3947,43 @@ endobj
endobj
166 0 obj
<<
-/D [709 0 R /XYZ 133.768 593.195 null]
+/D [709 0 R /XYZ 133.768 592.513 null]
>>
endobj
708 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F74 315 0 R /F38 321 0 R /F41 322 0 R /F44 441 0 R /F45 442 0 R >>
+/Font << /F37 317 0 R /F79 316 0 R /F78 315 0 R /F42 321 0 R /F45 322 0 R /F48 441 0 R /F49 442 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-716 0 obj
+717 0 obj
<<
-/Length 2883
+/Length 2979
/Filter /FlateDecode
>>
stream
-xYoܸ~_*O!J!h{ˡ}(@wFv Ci58wWO")jHf,?<֋BVz!6̈́rxpc]hݴHn[n6<՟+nջe[]]&)mu.;/qu<7]ت,<uQRyiEU$pXJQ~,owtrNE4p31D.T* DBgj#&yjqz)CtHW-ՠ8t9=hCj]bh^~cD%ВyW;SF6z%irwq||W-mΟ6#BV_c&SHb@ZPl2r2ψE|X,zښEu9w߳Thr
-6=ES'`YȰ.&eBK {Og^B."JEKXn޾O+e][7uK'? ddQ
-^6oPb Լ K*B*eI**~-BITZ~$)v*8.KHj@ "B3Vx0<qW!T%n*4O *+U nC}mOxI0S"%|sm+IdL
-ke%
- S4\v"Ofo[!ko37at=s>h OvdX`)4mc/
-u,N,8q.)2Rd=80ޔ<[Nuҙ
- @ߑq;qFWN^漢Z~𿈦Xx5dͳ0IpDLk= S1
- ]mY}X`SF"4Gym9](H-DK9D[7AlP.,NųSc8'׆IpU+Mqǟ<} :yOQ4*Љ=ɟ6.f~<td.b$ @o]2}ϒw7>M'O7RfF a#%?j[Z4m_rų:XK~M姼S:sVuz|!g.aӫ4/
- s4}ydSWDY
+xZo_̽& h{%>hcIeDb;,uh\oF⋫_9~*Yd,..6 Kl&aRz.-chS7`vW͵嗂)hϗYm ncյr4,.Wl[DTE5}8GmGϪ]"凋H,3ĽI6S*fL)3F~`"2ӈ|^M ҃|NJEWWyt]DS􊃗n4zԺ@|~<9o,%˔
+&̠՗$XӬ'@fVd@w<鸿!m&tkHe,lMDO S,MLOs݆zB
+6B%DGrUhkg\}:C 2hee;{/<,]\;*NT-ޞ@*'ۍ$+$ #^v*@1k2;x<P)O *֠ ޮ҉ݞwQlϰQ=Q#=#lY
+-,O.VJ$K|Ja Jp[* J׬#*.K36Q o|h(!k['J¤KM6-< x.쩈'1 38 AH@xu/GxٮGx+j?fi`hA E4AJ,=oۺ-𠴂δ G/SFi,Oqiˡҵx%'w&%J
+hs@5"q\T=+AE-}7+
+g^`%Z+@Y
+Tϳ҂Z')G=`gF}Ǯk8~@`ˑn@~59d>̅~ kW{r6wQ9zۡ*!RUϼgMվ:kowW9͖CV­wP߆
+L2a!om<g| K4};u.?l
+6X&QlJrŪApm!urb,BR߰|~߰ߔ`a
+A/FpgIm(t@'M ݄AmR H]ɴەn׫sjp[T]>y!WoIq.p:VX47ixhqU~Zicj{m%V,8dr]ћsx޼rbcekub4ϨTF=+~o {7Lg1<?ŧi+E\v9Nk0Y^k&Yε7^ëR:_qt&*P;6̱\vUKy6ȼhizq@ɴeP}'d1˶F0i0h9`I +N^/'0O;3 uF
+Rz NMI "G©NAQd.A1$,Tyo2=W/$rH`O8 4v`*_:g\F+ך
+ vjS '^6Jn2뾒%8 } -G-gD\\=
endstream
endobj
-715 0 obj
+716 0 obj
<<
/Type /Page
-/Contents 716 0 R
-/Resources 714 0 R
+/Contents 717 0 R
+/Resources 715 0 R
/MediaBox [0 0 612 792]
/Parent 712 0 R
-/Annots [ 713 0 R ]
+/Annots [ 713 0 R 714 0 R ]
>>
endobj
713 0 obj
@@ -3973,168 +3991,174 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [367.673 230.436 382.395 242.391]
+/Rect [326.801 346.553 349.272 357.346]
+/A << /S /GoTo /D (subsection.4.1.3) >>
+>>
+endobj
+714 0 obj
+<<
+/Type /Annot
+/Subtype /Link
+/Border[0 0 0]/H/I/C[1 0 0]
+/Rect [367.673 219.758 382.395 231.713]
/A << /S /GoTo /D (section.4.1) >>
>>
endobj
-717 0 obj
+718 0 obj
<<
-/D [715 0 R /XYZ 132.768 705.06 null]
+/D [716 0 R /XYZ 132.768 705.06 null]
>>
endobj
170 0 obj
<<
-/D [715 0 R /XYZ 133.768 522.798 null]
+/D [716 0 R /XYZ 133.768 527.492 null]
>>
endobj
174 0 obj
<<
-/D [715 0 R /XYZ 133.768 205.537 null]
+/D [716 0 R /XYZ 133.768 194.927 null]
>>
endobj
-714 0 obj
+715 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F38 321 0 R /F44 441 0 R /F45 442 0 R /F41 322 0 R /F76 319 0 R /F78 320 0 R /F100 420 0 R /F74 315 0 R >>
+/Font << /F37 317 0 R /F79 316 0 R /F42 321 0 R /F48 441 0 R /F49 442 0 R /F45 322 0 R /F80 319 0 R /F82 320 0 R /F104 420 0 R /F78 315 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-720 0 obj
+721 0 obj
<<
/Length 2350
/Filter /FlateDecode
>>
stream
-xڵY[oܸ~+#C)0P,)RXtKfF4{p'€Iz;m=^hzNE^BɤwHx2RȻϼǐd:X?fsc4/m6~R"daHȞjև=V4WeO \qw7qwqiJ]S=߽(}k]WmYNHe!6@L7`g|f~r;gvBcViDwygsng;l:[9|\4mg_fʯ@_v{~k< A<~b5ޞN˟M.E-^秙l3r|2c?Yų1#"7ߚBVHBdX5<p&@to'XD" <ƯWŢl9l.N9aDN5㔄(S: \LҍS$9q\cޜ)Iv=ۂm`\X5S [)|X(hC3];dvys<z쯳{>]b#~|rH3AXMP;ExLRBAzCmșf9S/IDpZ`⭫x?I=ꕕ2i?M&_dE1a2:U1Kk
-DsCB]Wf"I"װII%{_pɦs(f̼1Bp&r4i6nPuhD BGz]Y~WwiiƲ)\i!7N8a|KUBhᄨ/2KqVźeXBFQaduG>O'yy3p nŔ?#/e8
-D
-(QpZla٢
-a2ާ Fu6ſUoo.hq `
-.h>L LqC4v]j{0vA1</J{p '3H OE1f25]ouXfcH,Y2 !mbݗ)'@Rm-vg|Ѩ@T``:qWoҾP!5m]f =XզZ܆:#
- sh:jQ[L&B!P)ޘBQѷQ]mڲ?;@vW,UbbH^p6tϥaE28A_ƅޤt&w Yr .ՏE{(Q^(ţ<m]d:Gq Ps~58$T5 UUT@: N(r.+*g
-8UO| KQhP3 C>8Kx^0C~B96i!H18^AtJB3]JTP\GńFN
-$rK?0Z^ XUŅk).Ġow,) g3
-r`9s8b/9&g, 0&lueTcG9lDr$nzt|fϰ^((_LX,
-cHv(;N]@\H|%ǹciЈG鶶dɖnT2rec%~k,}2r1;6 2E^xPI
-AA<cޛfQX DZ}QM]~6sCՀSc<f+$%lԸ *6bs]C
+xڵY[o~ϯ`bER$U @NEE۠/3Td[dytH{IɒMg2S,~C`/WB* H&uł$"}| ?E\d:׋m7mm2d%BF"HSzhղ.m̕y٥Sc~?˴7Vݶ^~6'&SZklbg|U.C\Mz#50Ɯ$?ј>nBuv8rѴ[txTXہz9ڮkg.UN;w*cStn,7yI-ސ,r>h!=?MXdÓnlY3"q['+$: nM< *d~\I Z/ɣ6a+ &U"w2'
+M8״S"{N<rS$pq$"ɉZ<LшEMql+©,HuI8SКܑg7FnȮl,x_eu],F4g0MoxSG$w)"'/W8L(`R& 5 V4`ܟDfiD(s\6b2b8ɊNiuIjQU'v՟A$(%I"N@EsFM7a]Q9D{mCP1u/Nu~ DAĄI%wcY_D~k/ 0A&Bipnl}ko5Z8!̑rإUj0+#ܼcәqx!nΘ&B#ex΍4͉
+PiqE'e&`` S9K} 6
+=T$U
+lt!X~&M1ưnKV >R'zzx4A\%(!l4l)D"0fPHTKWS(>#0??v8m[3bhn
+^建*v8CZ,3~CP}pTbJ IkP8Ԝ/[8<9_$R
+>>if,sQ.&C؀@9G^B y<WJ詃jtȎJw~Oq ,1~`ʱUEˊceYRMfdyT0 Tx8vq<BM!4x tQ4j$j|+1+>^iKp4v[iec|~4ܮn%o8 9g6UY5rxTL3por-Jbd_ʚ0#`֔F5V*fԛFI,Goޜ/$Yvˑn|_ . ɫ}Nqsi<Z{bRh|>1 |<"2>4
+cHf;=چ>]@\,eQy.!2{?.EHF?Ju5kN6wf$V4ȕn3yPX?'e5;6 29pA$䠠iSfkPZ FZ}fPu]y۶sCՀ`<f ,$35l4 *V.bs]C
endstream
endobj
-719 0 obj
+720 0 obj
<<
/Type /Page
-/Contents 720 0 R
-/Resources 718 0 R
+/Contents 721 0 R
+/Resources 719 0 R
/MediaBox [0 0 612 792]
/Parent 712 0 R
>>
endobj
-721 0 obj
+722 0 obj
<<
-/D [719 0 R /XYZ 132.768 705.06 null]
+/D [720 0 R /XYZ 132.768 705.06 null]
>>
endobj
178 0 obj
<<
-/D [719 0 R /XYZ 133.768 361.117 null]
+/D [720 0 R /XYZ 133.768 366.099 null]
>>
endobj
-718 0 obj
+719 0 obj
<<
-/Font << /F75 316 0 R /F33 317 0 R /F38 321 0 R /F44 441 0 R /F41 322 0 R /F102 462 0 R /F76 319 0 R /F78 320 0 R /F92 368 0 R /F100 420 0 R >>
+/Font << /F79 316 0 R /F37 317 0 R /F42 321 0 R /F48 441 0 R /F45 322 0 R /F106 462 0 R /F80 319 0 R /F82 320 0 R /F96 368 0 R /F104 420 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-727 0 obj
+728 0 obj
<<
/Length 1982
/Filter /FlateDecode
>>
stream
-xڵXK |fҋ
-)ǧ?6Nޟ[4+Ž0rOӷwȰ͋m۪6xnۜ5=aooOZOS\ŶzscE@,·,@QBU
-nb^ȶ#۪&]]"R<tZ>l^ã|z}UoO勋: H IQ'<f" SQ^bO+.h3 (5:)@YjB3%ZΦWr x( Rl `#"g
-$ZxT&:ȣ#ݣ*EEa3/\;I{RPɀ.,t$Y'gudi.:Ӭ
->@S$%<<,MKӪq7fI WD ۅmK~k1P6 :,iݰ뻹 7ϨN1{čڵix A
-ʍEcB8թD-
- r
-V=}wP)W N@`6E~ :g//p61Qq퍓fpe$AقOCJkR*>SʖCAn,\ M&GdfŘƓq~]C?,GtM3p5ĭRiF~Hsze?zNcp5x)ETu[S2 Mѯ W~B!@gIN(skwv{bCgQqЅ"^Iб 64mYզ=<ԄLrݚ1{XJ<,14~E
-2JF5x
-I<k49Xg\rAW]JqBE>D X'EO3Z[qB SCj;
-A&jP]o_cԀY uk -.|.n3_Μ߾Շ~u?(4csO>o?_ 5^
+xڵX[~_!/2p̈IT
+Dbx|?c@tfw7
+5_lOWR #t>}yg jݼضJoW\f?Yß'2]_՛+H+Rb9u>d7ot+]f2~ ֛l;m:oҪ; ee!/ҩG}-|V>ׇGֻJ\ȘVixwD_d,zIrO3/)9Ry6g)ρRl+PYJN
+Δ"n0ow$x$
+͒NXjD%lЁt.? &G^9xrʃet/r`P`:<DLpT:S<L鑫JfnNGW&O炚 0Rqt(G u0m5b)21Sd0Ľ+ '͓J"fMeN'#Y!|1 !-mIv
+Ӛ 99+tALO'qgAoZV5i7CYc.xl[[8u\ݶY<>vW.AdI˭]%!|FMv @Rb<ήMKC'X1FJ$|*Eh~+|~k3A>)Gr-Z58;3&3-|X>ڜ>p|Y)2aqݴnJW 1cLrIjZk ODA7G+&wI*I02.Z8^5C7\[,!-{ruy~&{usQxuޅ 2ƸaWu[߰M xT\{h ΣLrL+pzO^! oTq)meˡk 7^hL"
+pFPbLpɸh졟xԭ{Oe,#\妘G8~q2e q K_\^A<bS\'<E)y^J&U֔Xa9}sSkՀ߸P@#3P$'skwv sYTHBEt}}jӞ|Ai^)};&wn͊=, z kj"
+$Vԁv
+H}Pɻ޾hΩ
+ͨ]0ʎsKqUxw=}}Los:V %I9̟%xxm9ӓ,#\
+<gBWt4"YXmO2c*L)c晢JM $ q
endstream
endobj
-726 0 obj
+727 0 obj
<<
/Type /Page
-/Contents 727 0 R
-/Resources 725 0 R
+/Contents 728 0 R
+/Resources 726 0 R
/MediaBox [0 0 612 792]
/Parent 712 0 R
-/Annots [ 722 0 R 723 0 R ]
+/Annots [ 723 0 R 724 0 R ]
>>
endobj
-722 0 obj
+723 0 obj
<<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [210.524 283.993 240.744 294.786]
+/Rect [210.524 285.546 240.744 296.339]
/A << /S /GoTo /D (subsubsection.3.3.2.3) >>
>>
endobj
-723 0 obj
+724 0 obj
<<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [137.594 148.376 160.065 160.331]
+/Rect [137.594 149.501 160.065 161.456]
/A << /S /GoTo /D (subsection.3.3.1) >>
>>
endobj
-728 0 obj
+729 0 obj
<<
-/D [726 0 R /XYZ 132.768 705.06 null]
+/D [727 0 R /XYZ 132.768 705.06 null]
>>
endobj
182 0 obj
<<
-/D [726 0 R /XYZ 133.768 407.876 null]
+/D [727 0 R /XYZ 133.768 409.428 null]
>>
endobj
-725 0 obj
+726 0 obj
<<
-/Font << /F75 316 0 R /F33 317 0 R /F38 321 0 R /F44 441 0 R /F45 442 0 R /F41 322 0 R /F76 319 0 R /F92 368 0 R /F100 420 0 R >>
+/Font << /F79 316 0 R /F37 317 0 R /F42 321 0 R /F48 441 0 R /F49 442 0 R /F45 322 0 R /F80 319 0 R /F96 368 0 R /F104 420 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-733 0 obj
+734 0 obj
<<
/Length 2526
/Filter /FlateDecode
>>
stream
-xڭYK`D$88H0lHv<p|hى؏ꪯ7OxÇR,ʬF(%6XDRCex#Nt[}~fd]4 pp<ӻmJ̻5H9;s\}{ٙVNL(.=iq'6`)QQf <!opn̝7l|#4m>з_1|p=w+8Vx Є<ۧzI`Y^XXif'|dH!+]G>0᫕A{$Oy[mS0_ Nj=ndeR78y7TŹλp@M;
-C{Щz>KI
-To&NKČ@0-n쩛uXR%8o 7~̪HG"Рjz)='m3w-\8ނ:v$UH,H'x
-Cp~u:uN|꼺Lƍh21Pi㒺"Iwd3w]7C;Gt8 nw
- {$+ Ļ9OkGھGQ\ni{C
-̈m$^E@1DP-0h)"`) I*8KRjQJ:+d<1b&sqp,KvMP""!%v.NF
-Kje11Ꮋ`8idst$Dl-=8DAxz$BH=0Vf]9PhUL0IȣUמa;qkaz4>"98n'`HW.ugΟ-{-O腢>\Ӯ9> Uɟ۵{x]se?dzW}YQ9RZJPcA8#8\R$ a
-bw 0(,`{ e|>4֦(*bW R"VőN/"Σq˲O
-M6+-xϟLP+EB,ƷaQ>
-CTJ[;4OţY, ^FvC<yXuJ!>o #t<xޓ)*Lti9ZS-ւ:ao?~䀂o?@Aא p73xuH伲揓W+ӻ'Lo9(9BG7"Zmqul&ӟNT6ѝRrQP Tݙmt\hmIq>\}&bj|Ʉa1;.cէQ.Sj p6 tuu/lqEo+<02L7{~xwQ0HQ`,gx0
+xڭYK`D$88H0lHv<p|hى؏ꪯ7OxÇJ6YYi7P*Jl&2rFۗt\N{?Zi>W$xwE۔<wOkrYw< 3_.fgZEJ81Pp]_Q@ZcλCNpGnvBDw,yrDn L1w>Ҵݶ@~
+nM#=IʋbZazASD3jS>aUpn#*;!Ԍt"GKCW0^gx~wc6L>Yx?XalEEBdK줅]bB<DeYa_cŌ%
+K`ey[##^ [CtgB4$x~j;nR
+!,ŇU P&Q{]WZ~T_6hVZ ϧnCtM `6ZeI]3+xDW+uFP^t-
+j5ڐB"'ɪEtecc4wp oHb[zp ˃m7FI֑z`̎r>8fs`G!=vҡi*|EsLqN4\H?[[o͟/ 5 E}]r|l1^1?k%5 $gƯ8sRǂpFqXIx#
+S@%۟7`)&3ŬP]X\DC+E&
+Fn!z
+6xKxL]VԳ<FEnQ`F<V䞿UMRpQ)3j)3BhWDh
+TȖ$^mq?˜HՐU1/FCwQ^:%dQU\XH.B@͊p '6C˶|Xσ3) Sh`Vu5˂׶%O(VE]yRH-Dޣ$~o
+DZNtpzVT`cCO߆ie'9%PP@@
+=. Ǟ_4g3]T; 0Rj%6%y_sy0
endstream
endobj
-732 0 obj
+733 0 obj
<<
/Type /Page
-/Contents 733 0 R
-/Resources 731 0 R
+/Contents 734 0 R
+/Resources 732 0 R
/MediaBox [0 0 612 792]
/Parent 712 0 R
-/Annots [ 724 0 R 729 0 R ]
+/Annots [ 725 0 R 730 0 R ]
>>
endobj
-724 0 obj
+725 0 obj
<<
/Type /Annot
/Subtype /Link
@@ -4143,7 +4167,7 @@ endobj
/A << /S /GoTo /D (subsection.3.4.1) >>
>>
endobj
-729 0 obj
+730 0 obj
<<
/Type /Annot
/Subtype /Link
@@ -4152,51 +4176,48 @@ endobj
/A << /S /GoTo /D (section.4.1) >>
>>
endobj
-734 0 obj
+735 0 obj
<<
-/D [732 0 R /XYZ 132.768 705.06 null]
+/D [733 0 R /XYZ 132.768 705.06 null]
>>
endobj
186 0 obj
<<
-/D [732 0 R /XYZ 133.768 350.449 null]
+/D [733 0 R /XYZ 133.768 350.449 null]
>>
endobj
-731 0 obj
+732 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F100 420 0 R /F92 368 0 R /F110 518 0 R >>
+/Font << /F37 317 0 R /F79 316 0 R /F104 420 0 R /F96 368 0 R /F114 518 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-737 0 obj
+738 0 obj
<<
-/Length 1657
+/Length 1658
/Filter /FlateDecode
>>
stream
-xڝW6WhkF$EQBK$HQ!@6Ym!RT6i[^m3o n,$}swꝔw,_dJ3!^|^y\JmZ|YV|#'2mCeZ,K۲
+xڝW6WhkF$EQBK$HQ!@6Ym!RT6i[^m3o n,$}swԋw,_dJ3!^|^y\JmZ|YV|#'2mCeZ,K۲
3{cCqn/j)(BOng>ZF]nh>$[{͋ -g
-7"<;ucMzH~-?WG!l<LĽv@1v軲۽zՅDƙ;&tKglIQ$UքK'*
-#dblԧ\*铷fzݲ_?,+t\д-ith`MYSmGkaLzk4ujܖc0;]Hz(-wiH9˜3M 5&AB˶ /nhW7-qՅBw2y@KƮ5CǶ0PEU?һ=.cnh[ *)6q1)yaPsh<2 8<'fQ,KK#{
-ĕ"E|Ou Xu7EwpjBq{m
-ø>42c#W?'=LWΥ!T1 |!ߌM־`qmb
-AW!eV
-w4$|P
-G80fa!!vH dkD˳:[# E X6!܅b_y| ,ִ X%!cr>hͩRÙWk\L✑nLxcGnFOT>W* <L
-_7$ ?ы7hsYr?mjAx"gyGS4ܱimd{P.</\R~yQ9ϘJ-y,El߉q,WŐ4ڍYJ^=@HBcA} c)#{oT>3P&[i_|yvMVN|
+7"<;ucMzH~-?WG!l<LĽv@1v軲۽z 3 wL|?liē`I*O OT2^ݿL
+D,dh#/M'ZХsf0]F4؜1OT,'ov[fe~x7[-XVi[Ҿ! ۶*4?! 2}7F?P6m9n3NߵkbyyF̙8|`izZn™D 4|lRЌWx}ӢyW],t'dZ3~l
+š1PT#2A1Fy"1z`{2q=<6=@ |M=#S s}RAorh4@ 0Pu{x~m<6Haܶ2\HeȢ=1J%ewEL{ry0#-r+.j8ޥ_]>y@k(B<atƻU.=[aSz@FbfN\/O0sJ,ԙ -eЩO'GCL A2d'#ɼwf|@ qh@\)PħOT۹]wc^Oq0!׿צm$Қf#탒f0xoKx,3&;rS~q3(YKd~\BH(شn &
+Cb 5
+߆'$3K(*O)y| ];7Q Ю?&3';g5 yB>`8꺁$}XH)0H9a'~6򬴆E=nxrc mwWo_/K%5(IةuO5??ZsTp՚4Ӭ8g[:Qѓ%"ϕJy|5B G |vOͰ5\%eO(yDH"Yp? wlZsB@rnkl4<&9T_;nbx<kx3sCK#bwbe`9KU1+MvcG'|8)RP:~(jP_EBXިoO'ߖgbW,yfUonx}\
endstream
endobj
-736 0 obj
+737 0 obj
<<
/Type /Page
-/Contents 737 0 R
-/Resources 735 0 R
+/Contents 738 0 R
+/Resources 736 0 R
/MediaBox [0 0 612 792]
/Parent 712 0 R
-/Annots [ 730 0 R ]
+/Annots [ 731 0 R ]
>>
endobj
-730 0 obj
+731 0 obj
<<
/Type /Annot
/Subtype /Link
@@ -4205,94 +4226,91 @@ endobj
/A << /S /GoTo /D (subsection.3.3.1) >>
>>
endobj
-738 0 obj
+739 0 obj
<<
-/D [736 0 R /XYZ 132.768 705.06 null]
+/D [737 0 R /XYZ 132.768 705.06 null]
>>
endobj
-735 0 obj
+736 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F100 420 0 R >>
+/Font << /F37 317 0 R /F79 316 0 R /F104 420 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-741 0 obj
+742 0 obj
<<
-/Length 1805
+/Length 1746
/Filter /FlateDecode
>>
stream
-xX[~_
-aһ]XCgFH⇫`&U }D$?6f*>w $Ԡ:ߔe:y0vCV8 YXdޗ`>B4X(Äu eW`p)~@lS#Pyٱc`nSRP^M)gj;aP'mX%7
-8&+H, )c R=Rߕ^M;Fw}<ze̶}g2sCu8vq-4&k3E8u%8piBZ"7{qBd.+ mO+G@zਸjK%N`ta՞XR2}3ršǍ|0V?fu@t6>*#t)aU6$ =*!bEDM?<S$5~<fxhޡ7S.%xnsq/oYlfԄj?bʽl@"-QG?|n$Z3g8ʷ 2,YaU_
-Kr>/?BŇQ8I~84t nm4/!g!Rү!<i ]T<:x?#3"QTюw}{s\PΖ&l0?aiWbџʅ\zy165ޞ\/-m;Dٯ>0s}[w}GRkMPGT93V>yENJyHƲL8>tI>(Clv>b4'-e"M-cgz[[ Mc0~VDr乴 8M+qq҉Vǫ]| S? ?B?hUw4\eS~AѬr74yyHTW/hy&$)JS);ۂqN
+xXo6~_h7Æb-0ŖIGK@=w#IF?Qי8%Zs],#&1:Tʉb:XDm[ԳDNjn$&5NQ"32&*?P!2_5nrY,M e$\{e*SŢlʿ^nДn(O^`^װߜ;&dr9Lw&?0!6ψHA6e[?uC\*ˀ҄ghF c$S>|n_h|#&fqk̸+aC^DM
+6Y*0=rMUu)r hڭFl}*b.( ES% :rXHlO5.7dc<f IdټO,1%:uNҩ _~{U[[ cb]mԊЬ՛׿XGc)zRDI8ᨲأ^׼ϫ# :yA$yU+w.tLЭ &Bh ^.P5 E}L!5.K!
+]}Ifp '
+@?VqaEY{F6q.w^)ܨ8UGA]!Bi%]zo-`Pnhx_ZH+*@3
+&f" QpTDۀ
+,ؠ)ibD椾%v_g6^4bג(#!aG4Z'8,n:5Z<\`ޝ6Q^L:|Z+hi7QcHF}F(4
+; j\00`H4!5$`H94F P-<Or.7K W58|D mj6RU(%{bXIJ`K y.O<xh[^햿 ݭ2q[z,9nKSpR`hM]4˾
+^U=SEG5{<_kKppj1RE
+: 71 GURT`7wG_E>nJUy'ͼ.q[Xr/.K^b]>ݶ-nR€/Mp$?6XEG~d&'뜨D"FB>_C`AB%@Ҍ5><&f5a2V"1%#P~b䰍@S N>MJ,NOk$TAM2'sO ScB8[Z3]h|d%tㆇG E[USSxE^;`C\\{MBb양޻Đl<6/n\fQaH<L/8d^<}M<6zơJM71#`BIckx{lэD4EJrbnp{|-1Tl8"4r_nW[NP7ߏ/e7l5}_p
+ !ڑ햻m]^];/4y-|U]O&E [F6jܥ4G
endstream
endobj
-740 0 obj
+741 0 obj
<<
/Type /Page
-/Contents 741 0 R
-/Resources 739 0 R
+/Contents 742 0 R
+/Resources 740 0 R
/MediaBox [0 0 612 792]
-/Parent 744 0 R
+/Parent 745 0 R
>>
endobj
-742 0 obj
+743 0 obj
<<
-/D [740 0 R /XYZ 132.768 705.06 null]
+/D [741 0 R /XYZ 132.768 705.06 null]
>>
endobj
190 0 obj
<<
-/D [740 0 R /XYZ 133.768 667.198 null]
+/D [741 0 R /XYZ 133.768 667.198 null]
>>
endobj
194 0 obj
<<
-/D [740 0 R /XYZ 133.768 417.236 null]
+/D [741 0 R /XYZ 133.768 417.355 null]
>>
endobj
-739 0 obj
+740 0 obj
<<
-/Font << /F92 368 0 R /F33 317 0 R /F75 316 0 R /F38 321 0 R /F41 322 0 R /F57 743 0 R /F80 471 0 R /F76 319 0 R /F44 441 0 R >>
+/Font << /F96 368 0 R /F37 317 0 R /F79 316 0 R /F42 321 0 R /F45 322 0 R /F61 744 0 R /F84 471 0 R /F80 319 0 R /F48 441 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-753 0 obj
+752 0 obj
<<
-/Length 2499
+/Length 2812
/Filter /FlateDecode
>>
stream
-xYKa2_$` }嶲 &=U,ic6bJrX,~X
-~\^K,E.%Kb:aBf oVFjOmN>D>jK_oWka|W7N,氂ϧ+]>qu5Ev[x:;jŻHʼaYW5dx<u!oZsRűS ZTaQa+&iD:wȔ)k!߭Zj[~c5>~ʶPϛP",#O$D$f1HsX
-i T$zI‡W>83YhuJC, 2eę21 Z-@ODK
-Tېt %ۓ I2kXUzynt$f
-ufoV)>cu}Ṛi_ȑyle)K"3Q%L
-h‰
-q#8ݸ*Z R("G0e~qĻ kYiy*Z'Z[W6fx}uPs{*nA v8ٝK5xAȃ[8x
-lѓ~٬B?P>wнujh>R/m}pRU #n:jAugG
- YU|
-} baYEbէj0޽Tf,W$\
+xڽZK۸ϯaaiW.[N%TG#Q3RҘ<3t v|"Fvg?_O,ή3愜YTfv__&j\(.]Q(߮._W.`4K*._p'v2*VyX?rdUdT2xUFp".[&*=R{' W*l!gB |7EVo%K+a_yEݶ.&(掾C0پlhv64h Uykv0_o5{>f [|m߄+'nsTxŀ*n5wC~srBLhœ
+ ʗtÍ"4KuJPA`l3`$ED[& ݆ZUi+tkU]8!i[t1sL;]G SV`on{K }4yn.,n.FMd:؜$ǃc k.nU q)eg]Kf%<]3ϊ_Kᇖ>g VӯÜKη3$,lj:"h#U.%n@d+zya7(ab~U"t;@o$;7D1:|
+ΨtU7T=hYmng2<]!h Vr5QT}Q[Gʣzu?=t0!;mxG;OY9Sxt tmxڌa\8ߞ+(oQNLTW*́;U0AC\
+eGuAmbSٞs=pԩ$X#*r>Ek|Ttjq[>f(+1 vHC 'C/5=Bl-Ѕ!Љ
+ck,6D
+rТU3F7{KXzH # 2ZK!hIӪ̕62on3J PV# H*mNh;j!<,5[cJ-Reb"WgqbGȂK ;qMW{dX Qa`T?l lL&k:8eڍ%fj= J , M~Qk*2r~`YdH
+x*+MH[DƆEf @ux] ~-Z/m8 .>Nl,nk{BhWfVHC69qarט+#\|fudB&?l0i$zŶ$PX d/0,
+Fҫ9 r* 5
+_Q_ 5H
+p"FB^M6=';(M`aB8!P E@r> 7:X Z!`K $j1
endstream
endobj
-752 0 obj
+751 0 obj
<<
/Type /Page
-/Contents 753 0 R
-/Resources 751 0 R
+/Contents 752 0 R
+/Resources 750 0 R
/MediaBox [0 0 612 792]
-/Parent 744 0 R
-/Annots [ 745 0 R 746 0 R 747 0 R 748 0 R ]
->>
-endobj
-745 0 obj
-<<
-/Type /Annot
-/Subtype /Link
-/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [321.487 534.197 351.707 546.152]
-/A << /S /GoTo /D (subsubsection.4.1.3.1) >>
+/Parent 745 0 R
+/Annots [ 746 0 R 747 0 R 748 0 R ]
>>
endobj
746 0 obj
@@ -4300,8 +4318,8 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [153.7 466.451 183.92 478.406]
-/A << /S /GoTo /D (subsubsection.3.3.2.6) >>
+/Rect [137.594 427.154 160.065 437.946]
+/A << /S /GoTo /D (subsection.4.1.3) >>
>>
endobj
747 0 obj
@@ -4309,8 +4327,8 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [247.508 372.906 262.231 383.699]
-/A << /S /GoTo /D (table.caption.15) >>
+/Rect [230.911 402.69 261.131 414.645]
+/A << /S /GoTo /D (subsubsection.4.1.3.1) >>
>>
endobj
748 0 obj
@@ -4318,68 +4336,56 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [355.693 205.534 378.164 216.326]
-/A << /S /GoTo /D (subsection.5.2.6) >>
+/Rect [240.036 277.265 254.759 288.057]
+/A << /S /GoTo /D (table.caption.15) >>
>>
endobj
-754 0 obj
+753 0 obj
<<
-/D [752 0 R /XYZ 132.768 705.06 null]
+/D [751 0 R /XYZ 132.768 705.06 null]
>>
endobj
198 0 obj
<<
-/D [752 0 R /XYZ 133.768 453.506 null]
+/D [751 0 R /XYZ 133.768 358.142 null]
>>
endobj
-755 0 obj
-<<
-/D [752 0 R /XYZ 305.624 423.688 null]
->>
-endobj
-202 0 obj
+754 0 obj
<<
-/D [752 0 R /XYZ 133.768 192.589 null]
+/D [751 0 R /XYZ 305.624 328.046 null]
>>
endobj
-751 0 obj
+750 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F38 321 0 R /F44 441 0 R /F41 322 0 R /F102 462 0 R /F100 420 0 R /F76 319 0 R /F92 368 0 R /F110 518 0 R /F73 310 0 R /F115 630 0 R >>
+/Font << /F37 317 0 R /F79 316 0 R /F42 321 0 R /F48 441 0 R /F45 322 0 R /F106 462 0 R /F104 420 0 R /F80 319 0 R /F96 368 0 R /F114 518 0 R /F77 310 0 R /F119 630 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-759 0 obj
+760 0 obj
<<
-/Length 2500
+/Length 2569
/Filter /FlateDecode
>>
stream
-xڵYKܸW7M!J &: b/zZԐԞ5ߞ*p<C.͇E_Un7?7޾r,氉fқD&Q̶m\% ,iJ$^8Dy&ow2QS5}LǡꇪT&ri(謁
- v'7mnvP8fvW-C~qv;
-ȥ,rGM$,QHcåP_?]\t.Du~)v8.
-w^qjڮ(].2RK)Sv4VGtwuՃ .,jnXhpaSYbρ$辪9 qALsO/4 d)-?>,6 1lZgd1˫trWT{8qIU0eʢ,@EEUSeDw ݣP"/jfxQۙΰEג
-? ǼS;=" ]dۺ\R9aK_OU߃C
-1m}Ӣp
-OpJ|wd8
-EDL0B
-'%ޢSi%`i:Sv#"IGC%4 b4xnEupNa 2~;<Ms]!g - L,c
-৅B`K O&/ai*>c~%$dJ^)V<<KI( A2,f\PW`J+ELOɂZJuMyNE [xuA$*^,<7ֲZl1׷P|DnUj!g#X}`/c7']v:͋
-dn;0[_\n uºP+h
-/VK0t$)KEK@V@;ڶ׃8}IRaZ :٧޻B m>NJj֭!r!GJ.-NiHF,<`NXDgR]
-I}ҚVܑʔԸb'ڐѪduiGמwuLf҉R; q3{q.RvG'^C+z}4#դPoʍaߖf(W1 RoW BcC^O,jvf4~9Kx]:>_q 6`k1,D+ + cCk; &\_9ؗ\N;eA`4eYGg+w-Rq+Ol2zLrFo]58/ْarNcd^?/`49RfZB"X%TXG 2d>?ϞUX/ˢh/u{CTc W68$.P'NJlfl3IvSSFN$+A[L)]iSs^oqfhV
--}KmKL^h&|oO
-_H};99_o."0a
-t1DLH&Wn \eÝ v!3OI8ɪl7.o$
+xڵYK6!@l`̑c`6r lFINoG{1eX,U)ZݬՏvuR OVWU,3|qVWVb58D5/W|n`a+/fc"fOUWzmxk]ߘd(q$Y -
+%Rx.ʝMO{]Ow{ՖK6YP@֔ip*rz|mua"dߴjj"/;.TH㺲UQ~0f+X`RWeLy&_JY$UQEuPH2O=CɌX=̮58ZB8#<slpV#W6C3]spTƲ w=a"| ҿW)xNޙKOڬ88iNuۙg.R=%Z7+z׏ b%Zd<Y 1  XFaT1Q]*L2&}tB+AӔck:3DE ͦfA{n0UqG,x9iFG YT>5-;ݗǯ-u~_M?Tqw
+5tppjLԹ|q7XSW ran1gq2:raQ<nZW+
+Lb8#*ܸnꭏVTA…Nqg0jyepjAjtNjF \J /\+kSpRZC0r
+XaLa
+0PK)l )E585_ؘ %+Y'㩝~H`)[HPvW<c<ҧ ]YkRrp
+t@\˥cl/E&teu޸t혲S#Jy5pH*_,-g4`}>PIBqh \iƢ9,I ъZUv'Ly90uۢ|4Ȭ*-f?}BŀlD7[x> ly,sv8|5RHVOyݟO OBM1xڪ"[\$tdZL+X,&Az"`i3.o/u5*E%^BFCFfip# @|/z QW9<9@ {à?G͙
+N/[`Y J"z X)7/G<߶ea:_b68B+N߆#f7V@J?E}8V90:q,rl:?``#:=mAӢf`Ш0¤\ T[G{Jsψ9{zg srWetԅ*Q.)If{jp5'R!Zuk_a%VTAvd;␒hTYH~hzkңR`/ljuy̑RM' K7I)e}_']L_<O4M(myAM{Gb`4)qd5Xg0S6LW%Spt'껐4 /̛mgB$;$\wM.]). Lmй&ўID:DgA%ɵ$ZӇ*F@F&^ gsapmSNG@\E0'yUg a]KE8îil5\(glh. -Kn)eT\WXP8Q
+d7Hɐ]`\rط <;k)$x}Y<"̞Frf:feJ #F6-mѨo4j白RIB-"`PuQ6UB{%X}<@gv+
endstream
endobj
-758 0 obj
+759 0 obj
<<
/Type /Page
-/Contents 759 0 R
-/Resources 757 0 R
+/Contents 760 0 R
+/Resources 758 0 R
/MediaBox [0 0 612 792]
-/Parent 744 0 R
-/Annots [ 749 0 R 750 0 R 756 0 R ]
+/Parent 745 0 R
+/Annots [ 749 0 R 755 0 R 756 0 R 757 0 R ]
>>
endobj
749 0 obj
@@ -4387,282 +4393,270 @@ endobj
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [303.471 641.793 325.943 653.748]
+/Rect [355.693 618.436 378.164 629.229]
+/A << /S /GoTo /D (subsection.5.2.6) >>
+>>
+endobj
+755 0 obj
+<<
+/Type /Annot
+/Subtype /Link
+/Border[0 0 0]/H/I/C[1 0 0]
+/Rect [303.471 501.633 325.943 513.588]
/A << /S /GoTo /D (subsection.4.1.3) >>
>>
endobj
-750 0 obj
+756 0 obj
<<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [276.629 574.601 299.1 585.394]
+/Rect [276.629 434.714 299.1 445.506]
/A << /S /GoTo /D (subsection.2.2.5) >>
>>
endobj
-756 0 obj
+757 0 obj
<<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [299.377 486.653 329.597 497.722]
+/Rect [299.377 347.313 329.597 358.382]
/A << /S /GoTo /D (subsubsection.4.1.3.1) >>
>>
endobj
-760 0 obj
+761 0 obj
<<
-/D [758 0 R /XYZ 132.768 705.06 null]
+/D [759 0 R /XYZ 132.768 705.06 null]
>>
endobj
-761 0 obj
+202 0 obj
<<
-/D [758 0 R /XYZ 133.768 667.198 null]
+/D [759 0 R /XYZ 133.768 605.61 null]
>>
endobj
762 0 obj
<<
-/D [758 0 R /XYZ 133.768 638.804 null]
+/D [759 0 R /XYZ 133.768 530.941 null]
>>
endobj
763 0 obj
<<
-/D [758 0 R /XYZ 133.768 571.612 null]
+/D [759 0 R /XYZ 133.768 498.781 null]
>>
endobj
764 0 obj
<<
-/D [758 0 R /XYZ 133.768 515.821 null]
+/D [759 0 R /XYZ 133.768 431.862 null]
+>>
+endobj
+765 0 obj
+<<
+/D [759 0 R /XYZ 133.768 376.344 null]
>>
endobj
206 0 obj
<<
-/D [758 0 R /XYZ 133.768 454.06 null]
+/D [759 0 R /XYZ 133.768 271.819 null]
>>
endobj
-757 0 obj
+758 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F38 321 0 R /F41 322 0 R /F92 368 0 R /F100 420 0 R /F44 441 0 R /F76 319 0 R >>
+/Font << /F37 317 0 R /F79 316 0 R /F104 420 0 R /F96 368 0 R /F42 321 0 R /F45 322 0 R /F48 441 0 R /F80 319 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-767 0 obj
+768 0 obj
<<
-/Length 2348
+/Length 2258
/Filter /FlateDecode
>>
stream
-xڽYYoF~_<>xe Y"X F^2 @Qo(QKRc+FVuuRۖ`a_pW{ww^UTKɲ4_IƄLVwCwJDG͉&@NklfO~gxַ8SN]OJGq۴4؛G]X)kT5o4*{{9bf~ٴ旻֜"qB;P AӀ݊o"|BIp
-RʨAHiT rd,\n7nC7,^wċ{u&9oxԑ4eT,Xg6q[#,
-<~5xjx{ݹWN|*}
-5ĘNp@)&rңg|ƿeeLf4 o q੸bS٧:/O¡b`>߀1'q.ҵރKH|
-φWXx>kc(KEi.IJ 
-Xy]B,YzEvY٨>*VErZJ+f'AQV\EҗD<TƸcv
-΁GKG\e'9ߟ-%{X=Li'9lSezr":hY<AyIt)/#z^1KE16j)l9ţFۚJ:\ch
-k_qM~h'o #I ݃PאnB|A*S{시f -
+xڽYݓ 3̊$2I4O;%#[Y-|knIB H
+BYmXge z띬bBɞo*܄R);'ʞ%(7CQuʧuãkGGώyjXqʌJh3<ϧ֥4AVݮhhpe /?7" -Y-H41O뎺 :; JM Dv2J³Dk1
+-:ǻUw4ʈ wSf@w>7!C+֕[P~ynŚڶm8D8s[=Ys`[MѶe>m_}x
+R!s1{ 2,Vn̺n *c3VbS'h[Mź%Pק:
+0&[Xn`C`2̤OgzAKEz^5 qy <ZqHR5;s5s)/
+X,J<OaTAKgOC80|+տZ."fE / )Q*1%\>`x e‰tŠt婄0/^ ʶprTbC_#ƭPQ;EѤ[
+k2jZQ
endstream
endobj
-766 0 obj
+767 0 obj
<<
/Type /Page
-/Contents 767 0 R
-/Resources 765 0 R
+/Contents 768 0 R
+/Resources 766 0 R
/MediaBox [0 0 612 792]
-/Parent 744 0 R
->>
-endobj
-768 0 obj
-<<
-/D [766 0 R /XYZ 132.768 705.06 null]
+/Parent 745 0 R
>>
endobj
-210 0 obj
+769 0 obj
<<
-/D [766 0 R /XYZ 133.768 507.581 null]
+/D [767 0 R /XYZ 132.768 705.06 null]
>>
endobj
-765 0 obj
+766 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F38 321 0 R /F44 441 0 R /F102 462 0 R /F41 322 0 R /F74 315 0 R /F100 420 0 R /F76 319 0 R >>
+/Font << /F79 316 0 R /F42 321 0 R /F48 441 0 R /F45 322 0 R /F37 317 0 R /F80 319 0 R /F106 462 0 R /F84 471 0 R /F61 744 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-771 0 obj
+772 0 obj
<<
-/Length 2349
+/Length 2598
/Filter /FlateDecode
>>
stream
-xڝYKܸ WQ]qsŗ$R&Nyk[a{j=
-|CG,걚%2|%"]3qw_QCh yO3mֱ:02auo;Uf zƌ#b\aSF/̨\@^wM9>13,Fݳb cH! =1i
-=s²+NW)ٸnEHkc{q&O~-Ar< Z*=k@4y+X^=$ Ns@jU7~R@9#3) Jz
-q.|syp21 |AXT].^bN!1jA=pZUg! w)oX dX(sZ`!+v# |[ /
+xYK#WC ;~NM \6УFCnyvvz_gV t EE꫏p 7*t_}6I7boHtGP:#BnwRFalvSֶj |V' Yf'Sӌs ]7[vLڮ<@{[pmh|uV
+֜*(؉k\y8mgGm_Wݪ$xE`Yq}jASeKM{:b3T(2@t,R^jS‚O\T\j|362&k-?=\ n] 0#Ņ\g7j1 ?ſC;g{Wتa$͏vu|V{t,xvG<J3!It ܹ)ZR,O:'`8EDp@}kHA]+hT4鱂z ѱ- Ld}'Z4/klqWg3тiU{&.("rɇ
+ԥF'`_&spt0  XR\{TGw>{FP~a?X#I<3|E_OC.,Ǒ%2`E #lG9YHItR"ITϞIu NJl;oGEe]1ψjSh2 џr<`#C2n@;.g|:8C2vNRa΃Ђ4ä뵠p*"6pJh>0ɸ+`Z_/C<"gv 5z?odloݴq8txg ΍%-?uhxV=U0%Y^+֑ɌR3kRu(TlnvHC:߂6 (
+_ELL/Q$ A7VP≻r08Vk3H#&ijf>=}E'dI:h##HF-Lp#i$'HFd<{%(U4GώD"L""j.6nG;?uY(
+WqÉD8C*)ooa d:_'Y _{NRJa,i~,O߇f3Ki.3 Ax蔧0tǣ<"Frv3G9?z猔̹r #0- Oq0`N >|O2<˶+lCN }Nt~c^Nt Թu:;:Ag,"4<靲x TJ(]Pk}1"SQܵ̕l`=wTe?L߹Q0ˊ AtuhL[/w&]WP ژ'(" ӄk|/^kP~>MTw:r8a#}
+D
+kKIUXKOgυC>6 {[\KJ.28#;jH0`n
+r():pL50Գp’4|"-B;.>>U`Y칿\:$Kh_$!=G
+9
+u:"6<Ae`Ki= %=Ϝ: -_P]FjRkߛ(6叙;i`(}M eQEsCwl.b%//oVEف#n$&{l Vǜ֧
+w,+ؐA
+CTmƚ+es5! hewޜw޼U /lj¶bfy np#eǍ@PEG yՙ{SΗz^F=TzNI[_ܰ~vX6<ˁ7kpQr,:V.M5d<ŧ y L'@nĬ2Mn/T#SgOazҙh>Ј*!|AZ.HK
+zP rT6P)F_J2" TZ.G,fg"H ċDf[&N\zf$&h JRMn檯rZ{)-^}$ʪχ(`5/M R6:αSR -c.nW$*tF%E
endstream
endobj
-770 0 obj
+771 0 obj
<<
/Type /Page
-/Contents 771 0 R
-/Resources 769 0 R
+/Contents 772 0 R
+/Resources 770 0 R
/MediaBox [0 0 612 792]
-/Parent 744 0 R
->>
-endobj
-772 0 obj
-<<
-/D [770 0 R /XYZ 132.768 705.06 null]
->>
-endobj
-214 0 obj
-<<
-/D [770 0 R /XYZ 133.768 667.198 null]
->>
-endobj
-218 0 obj
-<<
-/D [770 0 R /XYZ 133.768 435.671 null]
+/Parent 745 0 R
>>
endobj
773 0 obj
<<
-/D [770 0 R /XYZ 133.768 363.483 null]
->>
-endobj
-774 0 obj
-<<
-/D [770 0 R /XYZ 133.768 343.558 null]
+/D [771 0 R /XYZ 132.768 705.06 null]
>>
endobj
-775 0 obj
-<<
-/D [770 0 R /XYZ 133.768 311.124 null]
->>
-endobj
-776 0 obj
+210 0 obj
<<
-/D [770 0 R /XYZ 133.768 255.887 null]
+/D [771 0 R /XYZ 133.768 667.198 null]
>>
endobj
-222 0 obj
+214 0 obj
<<
-/D [770 0 R /XYZ 133.768 201.023 null]
+/D [771 0 R /XYZ 133.768 324.172 null]
>>
endobj
-769 0 obj
+770 0 obj
<<
-/Font << /F92 368 0 R /F33 317 0 R /F100 420 0 R /F75 316 0 R >>
+/Font << /F78 315 0 R /F37 317 0 R /F79 316 0 R /F104 420 0 R /F42 321 0 R /F45 322 0 R /F48 441 0 R /F80 319 0 R /F96 368 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-782 0 obj
+778 0 obj
<<
-/Length 2324
+/Length 2702
/Filter /FlateDecode
>>
stream
-xڵYKFϯm~NmewkשR]gnm5C_MÎs6Ah
-paRy񟫋/P<a /TƕJ<Y.޼˓5JLErIw3# ,׋9&RB&\f"/W?Cei>*1
--FSӰ%/%ϳA Ru/X:MhH[ 8$_,ۅҩ*v%[w_8"mç \
-Vx/ˍ^6 2e&s"c"R=OKk(@,V'ZeD=%Le
-ՙ_ 
-`& *#8 |@V^x:S9RY H)tex8Fߺ1=`!=uvl5j luFNGAQ3O3J -PHiR0ÖAT:
-'ihv;{+mVh!CtWw }vL{tE-eϗ ZONcO\`
-qCgBkzg:>+9i3Ys5PяzF`]VA'EV
-Q+2ԁ"Q™ȉh3Q"+Ͳ?PkeѾK-'vCeWxkWW;T[.J_lA[gtH
-tTkz'<}͍d};:rβ'X8-rsќB,>bW*B8Ƿ]B9mڑDpݙaf*R"4 aK:WwG ygup3-J!to[^<81EpwO
-ck'8i+8+(Z܋l ^ߢgd T aQO~
-sd 3fκiMhɎ f־?b:a3g5XMXp]o]Ѓ;&!n)ݑ:T0Ժɕ̃/P:9TTcY
-<QA[G8/K&;?ˤ.2$ 5I0 eV%TӬOܴ
+xڵYKsܸW̑SěܭT'qʮ=$^l!GC-ɱu Fe6* `_77x}yuUj6Tk:l̚dceBUy)ƙ8:z edUp+i7)K0r$^Nqtw܊$Xlyyr8 /R]CU4ںΚ3~m*)hNmC8H۪g!&}pЗm5Nܖ =2MB1 i<`F(phō"‚n%rzK`w vm r
+?ų8Xt=*Oh7EʒdNeW;L6B F}?t- {YGO˅a B:]5L:n.gALX Ao&c*,3B0
+ԮmRFu?]C3Z2]mÔR*Hr]޸o.1e/`r=!CM'H3nQa8:k8Xb2H2M~(}Ȋ%J^`4A^tpxJߙ~;@jxn5}9JA 7tF2*BDih!^
+$8$q|`ssV֖ϰw8,o:炪8J>*V-hIC54A-It"NGZ*ǽ8}Xqd
+> l0C ?W|ZC'G!H ͙U ؘQv֣g ?Cd#
+g*NWSөNHtCakڮΪ<E|w@@Q%Zn! y]/ ..\]SƩjOzBuYCdZHԮzTQUKf0I/E>d'8U5@2{PX6R F^04c4S@rn?D MZMBӨ/
+ӱXQŗ ygb%@l욅jN>2aqmVig?inGw/v(Ie\ H \7(o}{ ,$daCEbȌ 8cYa<N̠MU­r lө
+Qs92Lո2^ˀ=!U/$?;JzƍC0zUɳ<
+H5.T| a('b>.upEHlhڌ1!icx=$][#nj΋*LJ6IomG b g.V.={cm6
+DQ9T@#"R>.-i>h-6OQvG8`$j{H95+#E@B,
endstream
endobj
-781 0 obj
+777 0 obj
<<
/Type /Page
-/Contents 782 0 R
-/Resources 780 0 R
+/Contents 778 0 R
+/Resources 776 0 R
/MediaBox [0 0 612 792]
-/Parent 744 0 R
-/Annots [ 777 0 R 778 0 R 779 0 R ]
+/Parent 745 0 R
+/Annots [ 774 0 R ]
>>
endobj
-777 0 obj
+774 0 obj
<<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [222.325 347.994 237.048 356.85]
-/A << /S /GoTo /D (table.caption.16) >>
+/Rect [435.089 259.063 457.56 271.018]
+/A << /S /GoTo /D (subsection.3.3.3) >>
>>
endobj
-778 0 obj
+779 0 obj
<<
-/Type /Annot
-/Subtype /Link
-/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [280.489 286.281 295.212 297.074]
-/A << /S /GoTo /D (table.caption.16) >>
+/D [777 0 R /XYZ 132.768 705.06 null]
>>
endobj
-779 0 obj
+218 0 obj
<<
-/Type /Annot
-/Subtype /Link
-/Border[0 0 0]/H/I/C[1 0 0]
-/Rect [153.7 250.416 176.172 261.209]
-/A << /S /GoTo /D (subsection.5.2.5) >>
+/D [777 0 R /XYZ 133.768 667.198 null]
>>
endobj
-783 0 obj
+780 0 obj
<<
-/D [781 0 R /XYZ 132.768 705.06 null]
+/D [777 0 R /XYZ 133.768 597.058 null]
>>
endobj
-226 0 obj
+781 0 obj
<<
-/D [781 0 R /XYZ 133.768 451.122 null]
+/D [777 0 R /XYZ 133.768 577.133 null]
>>
endobj
-784 0 obj
+782 0 obj
<<
-/D [781 0 R /XYZ 322.811 420.749 null]
+/D [777 0 R /XYZ 133.768 544.699 null]
>>
endobj
-230 0 obj
+783 0 obj
<<
-/D [781 0 R /XYZ 133.768 237.694 null]
+/D [777 0 R /XYZ 133.768 489.462 null]
>>
endobj
-785 0 obj
+222 0 obj
<<
-/D [781 0 R /XYZ 133.768 164.362 null]
+/D [777 0 R /XYZ 133.768 434.598 null]
>>
endobj
-786 0 obj
+784 0 obj
<<
-/D [781 0 R /XYZ 133.768 144.399 null]
+/D [777 0 R /XYZ 322.811 226.712 null]
>>
endobj
-780 0 obj
+226 0 obj
+<<
+/D [777 0 R /XYZ 133.768 212.744 null]
+>>
+endobj
+776 0 obj
<<
-/Font << /F75 316 0 R /F38 321 0 R /F44 441 0 R /F41 322 0 R /F33 317 0 R /F100 420 0 R /F92 368 0 R /F110 518 0 R /F73 310 0 R /F115 630 0 R >>
+/Font << /F96 368 0 R /F37 317 0 R /F79 316 0 R /F104 420 0 R /F42 321 0 R /F48 441 0 R /F45 322 0 R /F77 310 0 R /F119 630 0 R /F114 518 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
789 0 obj
<<
-/Length 1851
+/Length 2327
/Filter /FlateDecode
>>
stream
-xXK6!u_"Tmf5[nzi[Y[HrwJܜ'M >YM7n eR"yrIҬP:ɵaBnܧ>mFO?HXkW7侐+
-3=p}tv(u7 &v)<Lj(ilhViVuiCUoi9zM%^2:%L*WcU,*Vdx$"!"]m㾧9#E UGa~|jVtЖjKȒ3s 3chJ.SU]匫9X¦EttB 8vWp:47˶9:m:j"=8zdmG788CZ􄲚#M^pRH)o$V&KYOVe_vNE1p@k#Z-@Dr~~޺ڬ&< C[18
-8vn \DڇL}L-znVl4orU~ޟ
- 烳 +oiDX
-0b~&
-h̒7çb$v<џ"ifpqvL
-:{L"n<GX^<Z0D(81yƬP_/AT_c*fsyoI
-X5ǎQV!fbPrvkA_{⼹SN.(u7pIx04 +(9kQԍ0#Mf2w\e6Y}u_(ʕ{!Y+z/w7?'
-e"-;ps%kX&/( P
-}ϛS:F$`*%䀺]gP=x!4> F0=`2697P a\wB@/ ^=lp^z0  vOO=@bVc{+>hK[>-\}{B0
+xڵYKϯaP~񱁁lx l8RK.EjIcz4)qǖȉbfm$&ϿݼxEnIEQj3ѻjKt|u\n7X$Qxm3Bц+A,4!+r`ළcwR*+Ef-vu3T7:P%B3oPN ;/b _:m)(T봀Tq3塂iDvzh2\PY<TeMI8 (siL y~(O_kp]:0U:Z!t/ObeFiwʀZ,UTF
+@@%?^MyAoK#
+cQp:K7~}x*3"H5ߊ"scUyI ƋSҌ6U]jqam\avl-%S媽͞/P LY,Ze}9@.*O$[CP՞ćSjScv̡պ>bl(yVh13Q$Sm&0ji 8ڕ#z1o~]\`AxfVȏ L!}sΞ
+%Sp$iZ2Ie_NBx(?o,A >.R#LfGGBq
+VGSe?7 JO֮i_.,R'
+S4n@ö[6
+sd$l=7uN6iC6e cbM:aIܚi@rﵢc!&!107 8cs,gw(N l"L^j1[mw*h
+hB"Ņzpz& ds;~2bAu-mXS6?zP ._1*R4*4HaMe&d\'JT [sEm*X@*h Qs?HIVT:Ώ| r' MEBe%]&Li)T1F@c;;׻~جGuӁtG+,R \g<J>rȘl;90Pp~AlP@!#Op2ARJ|\UE͒/oe[ٽR=mYy|" 6PJ3\Sg(ECHHN ớU6+RaMz>5F<Tdk2s@1?Zɏ_eFT;Njq۷{ԒW{ʏ
+sT4EFag4m|dfxΰfIi}nM7Va@7ŕv8MCW&c2-FZ
+TQĜw;I.Xts U6'%
+\tHKMK?qM>D1 Q:'X1uN`I9|5怉tX^0x3مA<A*"<NM%)ݹ?4|7*('pM~% Y+OcEjsϪb %+{O/dr%d&Ehy!ְE=}d[:?a&#d4B3/S%t?%(;8! -tSk-/GV\$L=NrE~cӅ
+t{߆*P@61٭Еds02s|{G 1-@<IU"zۇd EL|O It}rAt"ճMp \
endstream
endobj
788 0 obj
@@ -4671,7 +4665,35 @@ endobj
/Contents 789 0 R
/Resources 787 0 R
/MediaBox [0 0 612 792]
-/Parent 792 0 R
+/Parent 794 0 R
+/Annots [ 775 0 R 785 0 R 786 0 R ]
+>>
+endobj
+775 0 obj
+<<
+/Type /Annot
+/Subtype /Link
+/Border[0 0 0]/H/I/C[1 0 0]
+/Rect [173.584 654.302 188.307 665.095]
+/A << /S /GoTo /D (table.caption.16) >>
+>>
+endobj
+785 0 obj
+<<
+/Type /Annot
+/Subtype /Link
+/Border[0 0 0]/H/I/C[1 0 0]
+/Rect [280.489 618.436 295.212 629.229]
+/A << /S /GoTo /D (table.caption.16) >>
+>>
+endobj
+786 0 obj
+<<
+/Type /Annot
+/Subtype /Link
+/Border[0 0 0]/H/I/C[1 0 0]
+/Rect [153.7 582.571 176.172 593.364]
+/A << /S /GoTo /D (subsection.5.2.5) >>
>>
endobj
790 0 obj
@@ -4679,814 +4701,847 @@ endobj
/D [788 0 R /XYZ 132.768 705.06 null]
>>
endobj
+230 0 obj
+<<
+/D [788 0 R /XYZ 133.768 569.819 null]
+>>
+endobj
791 0 obj
<<
-/D [788 0 R /XYZ 133.768 667.198 null]
+/D [788 0 R /XYZ 133.768 496.101 null]
+>>
+endobj
+792 0 obj
+<<
+/D [788 0 R /XYZ 133.768 476.069 null]
+>>
+endobj
+793 0 obj
+<<
+/D [788 0 R /XYZ 133.768 445.188 null]
>>
endobj
787 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F38 321 0 R /F44 441 0 R /F41 322 0 R >>
+/Font << /F37 317 0 R /F79 316 0 R /F104 420 0 R /F96 368 0 R /F42 321 0 R /F48 441 0 R /F45 322 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-795 0 obj
+797 0 obj
<<
-/Length 906
+/Length 1311
/Filter /FlateDecode
>>
stream
-xڅVKs8 WHX,_^N;{-遶h[$ۛ/!вh@G
-BsX>S|(iAx,C=aSuw u5?H|t]bKှyl {7C;hnM:ﴙPtDJs}l0ʵA=v] E;vb3`;wJ~a•jL [my9N?տKəZOyN< euǾGmlٸ"HXpu ̎'4{|S
+xVKs6WH͘ N$K[hᐔǓ],D6 ,A_Y6̦" 6'6Ḧ́LM܄Tyˋ:JD>#Έ7g}cRD3xaOAu<uCG^TeMRMQpQWn𺮜xQ_rꮼz`3͵ԓD3i$0 I8 bѰXq0l 3ALXb<:RJC !z-LH7[G!ۂ
+x H !TuBME.:]65[l8Ra#B큄ƒ5|,ds?aUA|ԡ%cmXrTs5M}%
+@:umM%6c ߚ[dwE&\DAʥ
+t&qI
endstream
endobj
-794 0 obj
+796 0 obj
<<
/Type /Page
-/Contents 795 0 R
-/Resources 793 0 R
+/Contents 797 0 R
+/Resources 795 0 R
/MediaBox [0 0 612 792]
-/Parent 792 0 R
+/Parent 794 0 R
>>
endobj
-796 0 obj
+798 0 obj
<<
-/D [794 0 R /XYZ 132.768 705.06 null]
+/D [796 0 R /XYZ 132.768 705.06 null]
>>
endobj
234 0 obj
<<
-/D [794 0 R /XYZ 133.768 667.198 null]
+/D [796 0 R /XYZ 133.768 495.004 null]
>>
endobj
-793 0 obj
+795 0 obj
<<
-/Font << /F92 368 0 R /F33 317 0 R /F100 420 0 R /F75 316 0 R >>
+/Font << /F79 316 0 R /F37 317 0 R /F42 321 0 R /F48 441 0 R /F45 322 0 R /F96 368 0 R /F104 420 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-799 0 obj
+801 0 obj
<<
-/Length 1430
+/Length 1432
/Filter /FlateDecode
>>
stream
-xڭW6+82)$$ NWJ>A쨊)z˕OZ0bg6 $ZO$WIrBD"aZ e:T.:cyebtMKYg%>-XS𧩍3Q
--t0U"\E|ڝ⇝cZ㱁1Ŀӧ@G.sNzrՄ S3P
->TH[{8)^Т΍JULsXi")' /bQAƂC a1`v_Xg
-uNO"u;þ'$/ и7qp ֋A?xluMPy0ߏ^A
+xڭW6+82)r+N%l vT0rӭn`3ZORQ۫ܽz>71JwU X& t&+cqlǩ4-iJ$LhŸml4EnaS-Ei2}E*mSiSYhv20G]?`ǣÑT4eOۊ ̵
+x
+*
endstream
endobj
-798 0 obj
+800 0 obj
<<
/Type /Page
-/Contents 799 0 R
-/Resources 797 0 R
+/Contents 801 0 R
+/Resources 799 0 R
/MediaBox [0 0 612 792]
-/Parent 792 0 R
+/Parent 794 0 R
>>
endobj
-800 0 obj
+802 0 obj
<<
-/D [798 0 R /XYZ 132.768 705.06 null]
+/D [800 0 R /XYZ 132.768 705.06 null]
>>
endobj
238 0 obj
<<
-/D [798 0 R /XYZ 133.768 667.198 null]
+/D [800 0 R /XYZ 133.768 667.198 null]
>>
endobj
242 0 obj
<<
-/D [798 0 R /XYZ 133.768 452.466 null]
->>
-endobj
-801 0 obj
-<<
-/D [798 0 R /XYZ 133.768 373.963 null]
->>
-endobj
-802 0 obj
-<<
-/D [798 0 R /XYZ 133.768 355.693 null]
+/D [800 0 R /XYZ 133.768 452.466 null]
>>
endobj
803 0 obj
<<
-/D [798 0 R /XYZ 133.768 336.871 null]
+/D [800 0 R /XYZ 133.768 373.963 null]
>>
endobj
804 0 obj
<<
-/D [798 0 R /XYZ 133.768 306.093 null]
+/D [800 0 R /XYZ 133.768 355.693 null]
>>
endobj
805 0 obj
<<
-/D [798 0 R /XYZ 133.768 274.762 null]
+/D [800 0 R /XYZ 133.768 336.871 null]
>>
endobj
806 0 obj
<<
-/D [798 0 R /XYZ 133.768 243.984 null]
+/D [800 0 R /XYZ 133.768 306.093 null]
>>
endobj
807 0 obj
<<
-/D [798 0 R /XYZ 133.768 225.161 null]
+/D [800 0 R /XYZ 133.768 274.762 null]
>>
endobj
808 0 obj
<<
-/D [798 0 R /XYZ 133.768 194.937 null]
+/D [800 0 R /XYZ 133.768 243.984 null]
>>
endobj
809 0 obj
<<
-/D [798 0 R /XYZ 133.768 144.66 null]
+/D [800 0 R /XYZ 133.768 225.161 null]
>>
endobj
-797 0 obj
+810 0 obj
<<
-/Font << /F92 368 0 R /F33 317 0 R /F75 316 0 R /F110 518 0 R >>
-/ProcSet [ /PDF /Text ]
+/D [800 0 R /XYZ 133.768 194.937 null]
>>
endobj
-812 0 obj
+811 0 obj
<<
-/Length 1780
-/Filter /FlateDecode
+/D [800 0 R /XYZ 133.768 144.66 null]
>>
-stream
-xYێ6}W(
-@[mMMJeɐA3J˚F9Ù3#.mf|+>՛+!,aI(u:J(ga1z~~#hVo:yRL)K>k42氳B)=7ŚmV͖R3G+X""z`4QpCHu`Xav5b, xo09giTn@! LjwjzӀb)
-|ɔ8fv/,\d&'&."K $RO8TKs}YmkD/
-*UKO~
-endstream
endobj
-811 0 obj
+799 0 obj
<<
-/Type /Page
-/Contents 812 0 R
-/Resources 810 0 R
-/MediaBox [0 0 612 792]
-/Parent 792 0 R
+/Font << /F96 368 0 R /F37 317 0 R /F79 316 0 R /F114 518 0 R >>
+/ProcSet [ /PDF /Text ]
>>
endobj
-813 0 obj
+814 0 obj
<<
-/D [811 0 R /XYZ 132.768 705.06 null]
+/Length 1633
+/Filter /FlateDecode
>>
+stream
+xXK6W(
+@Sٷ$e+%Cwkj(ɒiz97CfFgVoftƄ a.l?0!?u}w/“" "[:K>O R d'?9-ByJ |zʚɹ6)<75."Abl5-CIX,gKHB|##
+
+su6iM`"UAũibr m
+)qz.I.X ʯ&$kS3!5T. 3#.I+EEj>Iύq1]
+5[ߗUb*tmatU!i*ϓ8'2!G>’A*&Bh!v{?Z7AV|Ȉ`3)R=p0Am;IBe0|9ea*JhhK!](tnTʒZ!Ą{8@=JJEk (^bp(qCF\k-ZY|0zmUvļ)6s`ŞZ H'3156o0tTK"x@_jH
+%d]"M_0)u1ce#iբ1C>f[9Y׽'Ut9Q"J,y ,Ll?ߗ3^|ħיU Z:a/0DKzDJ
+)tOBv`괡c=Ω
+Tfmot킶^g
+ҍ-j̡6⣏cA3\%uiO@FW(i< *żA
+B=׽
+E~, eaG]4. $;LW&[03Z8c](WԲv[/d1#P-к鮌
+XO͍50͞w_62p军h(AgI
+endstream
endobj
-814 0 obj
+813 0 obj
<<
-/D [811 0 R /XYZ 133.768 649.1 null]
+/Type /Page
+/Contents 814 0 R
+/Resources 812 0 R
+/MediaBox [0 0 612 792]
+/Parent 794 0 R
>>
endobj
815 0 obj
<<
-/D [811 0 R /XYZ 133.768 628.842 null]
+/D [813 0 R /XYZ 132.768 705.06 null]
>>
endobj
816 0 obj
<<
-/D [811 0 R /XYZ 133.768 608.917 null]
+/D [813 0 R /XYZ 133.768 648.767 null]
>>
endobj
817 0 obj
<<
-/D [811 0 R /XYZ 133.768 565.634 null]
+/D [813 0 R /XYZ 133.768 628.842 null]
>>
endobj
818 0 obj
<<
-/D [811 0 R /XYZ 133.768 549.141 null]
+/D [813 0 R /XYZ 133.768 608.917 null]
>>
endobj
819 0 obj
<<
-/D [811 0 R /XYZ 133.768 521.799 null]
+/D [813 0 R /XYZ 133.768 565.081 null]
>>
endobj
820 0 obj
<<
-/D [811 0 R /XYZ 133.768 505.305 null]
+/D [813 0 R /XYZ 133.768 549.141 null]
>>
endobj
821 0 obj
<<
-/D [811 0 R /XYZ 133.768 453.499 null]
+/D [813 0 R /XYZ 133.768 521.799 null]
>>
endobj
822 0 obj
<<
-/D [811 0 R /XYZ 133.768 402.247 null]
+/D [813 0 R /XYZ 133.768 505.305 null]
>>
endobj
823 0 obj
<<
-/D [811 0 R /XYZ 133.768 362.397 null]
+/D [813 0 R /XYZ 133.768 453.499 null]
+>>
+endobj
+824 0 obj
+<<
+/D [813 0 R /XYZ 133.768 402.247 null]
+>>
+endobj
+825 0 obj
+<<
+/D [813 0 R /XYZ 133.768 362.397 null]
>>
endobj
246 0 obj
<<
-/D [811 0 R /XYZ 133.768 253.735 null]
+/D [813 0 R /XYZ 133.768 253.735 null]
>>
endobj
-810 0 obj
+812 0 obj
<<
-/Font << /F110 518 0 R /F33 317 0 R /F75 316 0 R /F100 420 0 R /F44 441 0 R /F38 321 0 R /F92 368 0 R >>
+/Font << /F114 518 0 R /F37 317 0 R /F79 316 0 R /F104 420 0 R /F48 441 0 R /F42 321 0 R /F96 368 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-826 0 obj
+828 0 obj
<<
-/Length 751
+/Length 750
/Filter /FlateDecode
>>
stream
-xVMs0WpL%#pӺӏǓKdF| g<J"ĹdI]=z[/iu6[$C&bo!0bh1*.}
-1DlP >[X!'& ]4,/TY#ST:[DK`03,`N<<bHĒ5j/E
-
-QF]\UE9
-!]C^
-)ve>/:!]c_kStRٽ\ 7em?(WTr%l
+xVMo0Wpb8R[Z v YdsZd ތg z~>[,S!SJzc4Poy>juD(r#CMZ_j̉ $ F! &/(sU5zհ.q0e%PIZVK
endstream
endobj
-825 0 obj
+827 0 obj
<<
/Type /Page
-/Contents 826 0 R
-/Resources 824 0 R
+/Contents 828 0 R
+/Resources 826 0 R
/MediaBox [0 0 612 792]
-/Parent 792 0 R
+/Parent 794 0 R
>>
endobj
-827 0 obj
+829 0 obj
<<
-/D [825 0 R /XYZ 132.768 705.06 null]
+/D [827 0 R /XYZ 132.768 705.06 null]
>>
endobj
250 0 obj
<<
-/D [825 0 R /XYZ 133.768 667.198 null]
+/D [827 0 R /XYZ 133.768 667.198 null]
>>
endobj
254 0 obj
<<
-/D [825 0 R /XYZ 133.768 300.063 null]
+/D [827 0 R /XYZ 133.768 300.063 null]
>>
endobj
-824 0 obj
+826 0 obj
<<
-/Font << /F92 368 0 R /F110 518 0 R /F75 316 0 R /F33 317 0 R >>
+/Font << /F96 368 0 R /F114 518 0 R /F79 316 0 R /F37 317 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-830 0 obj
+832 0 obj
<<
-/Length 859
+/Length 1031
/Filter /FlateDecode
>>
stream
-xڭVn0+tRIQ
-4MPF/itDj %MZJ)FQXpgΧ@q?P6$%ND>Yέ[[
-)ʞ~Ҽeͳ2C|2^pά7̞Oiݛ9m_aH?AHXljE|$>PCC'0?|WbsEBllCۜ7صPV:xh21;X_K-y+;q:
-(jN;nZY9̢U'T 4NyBG*+KkO`3WJ"=xԼz>tA`[d7jnN;}6#5k4\ضL9}Ymw' w>94Vy+3 B{8b46\scǚT6$FtgL :r*9sct
-hPa =SBv(y =9^feɌ0Y4Y6ň,.G̏bmzΎ#K_\O DDcqū @>.
+xڭWK6Q^\)@$hPF.IaHEޡ(ْB+"0`><3|gx{/~ 1J'
+oH<#L6ޯZjWX!*(_aav_<iqFO oj8-|[ءhJMEeT ETI)j%WM[ew>abvLmvulƁɼQn2-i؟$2%
+Mw/dP} %!d2a_b7x}.U>!Q:cv %<@i(f&ϦOgfj+G
+#ˇ 6liY7=2<r"e<QtKͤX2v1" Bo|ݪ6W^ O?>86Qhw,
endstream
endobj
-829 0 obj
+831 0 obj
<<
/Type /Page
-/Contents 830 0 R
-/Resources 828 0 R
+/Contents 832 0 R
+/Resources 830 0 R
/MediaBox [0 0 612 792]
-/Parent 792 0 R
+/Parent 794 0 R
>>
endobj
-831 0 obj
+833 0 obj
<<
-/D [829 0 R /XYZ 132.768 705.06 null]
+/D [831 0 R /XYZ 132.768 705.06 null]
>>
endobj
258 0 obj
<<
-/D [829 0 R /XYZ 133.768 569.35 null]
+/D [831 0 R /XYZ 133.768 569.35 null]
>>
endobj
262 0 obj
<<
-/D [829 0 R /XYZ 133.768 481.229 null]
+/D [831 0 R /XYZ 133.768 469.274 null]
>>
endobj
-828 0 obj
+830 0 obj
<<
-/Font << /F75 316 0 R /F74 315 0 R /F110 518 0 R /F33 317 0 R /F92 368 0 R >>
+/Font << /F79 316 0 R /F78 315 0 R /F114 518 0 R /F37 317 0 R /F96 368 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-834 0 obj
+836 0 obj
<<
-/Length 806
+/Length 1042
/Filter /FlateDecode
>>
stream
-xUAo0Wpjv LZiSN΄L@fa~{,pe81fd B`"bBI|w)Đ@\]"ck˯_YH{V5($wƖ- H9*=@qyN=#7ϝCWT-?e9|:ݺl@z%8?
-wQo
+xVM6Q.J.%h6Pl\-V"Y$;%Z'Hz1)z8ߛy$X$ۻ((*HŁf\43a±'4gO޽ÚEcz3Dcdlmy24[}63фz0a5GCnL_ZUE.-FoYDiuՅLP,U4D'xpL4_v8l
+" R><lb\錆;yV7veUW5l7|뉗 ܷ2A3VG Ra2 ,2y ̰ڡ\T FH I\tK34v%ڡ$*Id&.brc\q­cI79}Xe8!˪;D3BYz"U,xȊq&U3SD,1_J']@b5{U֪]I ?Gu=dA0Т' +}L1å ZHY$Dx,J<\ňa1 n>pOdc"`d;("yXЍbx(G;R~<EX2>.\sfui%dʆHM(wQ =͊g$b <Ob=\vTˏPW|NZbx{|s]:o[SG;O=]r)8NS(_(tPs"DI!bD1VPњ~}$JB/J)QD%-(1BۅH)Lz~K/TFzvS= $V_IQu^V\o qCt#ߣ8V^zQ٠0&ǭKZBi;iK}(I];^x<zwjg."[/t%u޴~:GE6CcAя .0Zj2D
endstream
endobj
-833 0 obj
+835 0 obj
<<
/Type /Page
-/Contents 834 0 R
-/Resources 832 0 R
+/Contents 836 0 R
+/Resources 834 0 R
/MediaBox [0 0 612 792]
-/Parent 836 0 R
+/Parent 838 0 R
>>
endobj
-835 0 obj
+837 0 obj
<<
-/D [833 0 R /XYZ 132.768 705.06 null]
+/D [835 0 R /XYZ 132.768 705.06 null]
>>
endobj
266 0 obj
<<
-/D [833 0 R /XYZ 133.768 667.198 null]
+/D [835 0 R /XYZ 133.768 667.198 null]
>>
endobj
270 0 obj
<<
-/D [833 0 R /XYZ 133.768 590.811 null]
+/D [835 0 R /XYZ 133.768 578.856 null]
>>
endobj
274 0 obj
<<
-/D [833 0 R /XYZ 133.768 393.101 null]
+/D [835 0 R /XYZ 133.768 369.191 null]
>>
endobj
278 0 obj
<<
-/D [833 0 R /XYZ 133.768 316.936 null]
+/D [835 0 R /XYZ 133.768 281.07 null]
>>
endobj
-832 0 obj
+834 0 obj
<<
-/Font << /F74 315 0 R /F110 518 0 R /F75 316 0 R /F33 317 0 R /F92 368 0 R >>
+/Font << /F78 315 0 R /F114 518 0 R /F79 316 0 R /F37 317 0 R /F96 368 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-839 0 obj
+841 0 obj
<<
-/Length 830
+/Length 921
/Filter /FlateDecode
>>
stream
-xڵV[o0~߯ "A%v2M}cHxB8&U`rEJa y)3 ,XdאAymc461D)7d[NjlJJRȒtB e
-Q*YFb4Ha ` OX
-je޹|Q=>1JXo>@:Tk>yi^ em)ڕŮĐƜD4C l@XQS &e*ϗs3tILeyf}ΕvY>}4dU:UMTvEK1#FoˬvE4GmoVP.MV4~G7-I8F6ST_F>S[NWN|01SRg7lz\ӜߍjҍNh|J(n\Bʞ? ?x({q՘x _SGOisߢwe*Uunw''9%':7?9l[:gD]2S b/!zqc}8&?}
+xڽV]8}_KUX`[T[a5JuIdTUf<T6/6=$$xwA*̓炉`]'X)f1EO̧m*B #$=Bإ:U="Jqf:#>BLCtʏѽ4zCU
+4݆`ydSYMSom+x/sчB]-acv3o )Vow'zc0~Ӂ/uh)|yuf2/= 3_4q"9f84cph:?DfDseiTYr sY i87Ҽp#m\>._s 8ֵuSgԲ34$1z[eۙ+?m%HfKgLAfRGAzeTߜ6FwG 1._v9QBٝ
+PܺT~LOŒipz̄>qF~t6VoL޵J}Ue-f̆D' /,m, /q
endstream
endobj
-838 0 obj
+840 0 obj
<<
/Type /Page
-/Contents 839 0 R
-/Resources 837 0 R
+/Contents 841 0 R
+/Resources 839 0 R
/MediaBox [0 0 612 792]
-/Parent 836 0 R
+/Parent 838 0 R
>>
endobj
-840 0 obj
+842 0 obj
<<
-/D [838 0 R /XYZ 132.768 705.06 null]
+/D [840 0 R /XYZ 132.768 705.06 null]
>>
endobj
282 0 obj
<<
-/D [838 0 R /XYZ 133.768 667.198 null]
+/D [840 0 R /XYZ 133.768 617.384 null]
>>
endobj
286 0 obj
<<
-/D [838 0 R /XYZ 133.768 484.356 null]
+/D [840 0 R /XYZ 133.768 410.065 null]
>>
endobj
-837 0 obj
+839 0 obj
<<
-/Font << /F92 368 0 R /F110 518 0 R /F33 317 0 R /F75 316 0 R >>
+/Font << /F79 316 0 R /F96 368 0 R /F114 518 0 R /F37 317 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-843 0 obj
+845 0 obj
<<
-/Length 646
+/Length 653
/Filter /FlateDecode
>>
stream
-xڥVM0WpD1JR)=ԭT-́,ue 8v{ `SCHr{3-#6,v􌵹mF\_4m3CS x7ԃU lɑ+P~dYMo AQ!R=yq
-e>Tq>E/zf)} Hp HIʯ#ʭC(?HDG^jѼ,uy|'Uۄ*[Qm9-lWG¨v!+ڭF
- xz3Z,[4 AB|:
-At(;1R2* rvpLZŽ o@䐽Yƣej`KCst%9_ _%}+0WQMmZ
-{m/E1{;GJݔ|'~xrBz16WUC%v$
+xڥVMo0WpYA5|%nWZ-Ċ0Vlc̛gL-Lvq5=Ӷǰ,_ܕaٮ ͟%p-&/
+SN$@SD*!MKUqP )OK`yV7+\߬YIdEpML)Qŷ}y)%܍**ў33GK/4,Z&4lyAgþpi-HMiw&UX,h
+@w5.u9|Me]c,Ke YbN!U@ U Iy΢Uj` GMK]
+ Ov*7]k&EI ˟y8?ۧ߻s:'Pѽ$89`.T|4/nJPNyzԊ@u_i0mcN OSՓ,\< _ \̂rE RA%ma4y)ׁ.w
endstream
endobj
-842 0 obj
+844 0 obj
<<
/Type /Page
-/Contents 843 0 R
-/Resources 841 0 R
+/Contents 845 0 R
+/Resources 843 0 R
/MediaBox [0 0 612 792]
-/Parent 836 0 R
+/Parent 838 0 R
>>
endobj
-844 0 obj
+846 0 obj
<<
-/D [842 0 R /XYZ 132.768 705.06 null]
+/D [844 0 R /XYZ 132.768 705.06 null]
>>
endobj
-841 0 obj
+843 0 obj
<<
-/Font << /F75 316 0 R /F33 317 0 R >>
+/Font << /F79 316 0 R /F37 317 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-847 0 obj
+849 0 obj
<<
-/Length 547
+/Length 536
/Filter /FlateDecode
>>
stream
-xڽVAo0Wp֨!8aR/UIĭ!&4x3ipgc[e[aY> 7ط7YAl=^eESC9՝4O,Wp|AS2e!pm74r GOw $z
-G,O+  %1U7$7jP6vM5/w4XEsfMGi=Uћ
-s]ԈsE(TVD Yz=;^wԩרX`RFgAW!K뤈*hT\hG)E&&tvHur.zN7ӭ/jCr31cS0S^*:~W &^efPAUF:5Ij~a>gӚaȫr+{!3D2lkt aojϊ:6p\#`Jsh^V~?՜\p,]Ol[o\1G5`N&;`4
+xڽVMo0+|Y-4 ĐC/ەVI:k`p״|3ތc:Qf @/8((:~?
+XSeznvz0E.ԿIo OZ c{r5䬨j5ddiU@bFZd)ѫdr=+0/;2?ԌbN3E%F(sa`.(G=mbX5i.=wLٜY <(ONqNqĹq&VoBc"+MqVoPRVQzGD:-N\* `k(+RMg'hVr:n N0GBJlHG_mys8}-cFZ[^QqS[@
+=/<>7L 驺>ξAx:#Tuԯbp
endstream
endobj
-846 0 obj
+848 0 obj
<<
/Type /Page
-/Contents 847 0 R
-/Resources 845 0 R
+/Contents 849 0 R
+/Resources 847 0 R
/MediaBox [0 0 612 792]
-/Parent 836 0 R
+/Parent 838 0 R
>>
endobj
-848 0 obj
+850 0 obj
<<
-/D [846 0 R /XYZ 132.768 705.06 null]
+/D [848 0 R /XYZ 132.768 705.06 null]
>>
endobj
-845 0 obj
+847 0 obj
<<
-/Font << /F75 316 0 R /F33 317 0 R >>
+/Font << /F79 316 0 R /F37 317 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-851 0 obj
+853 0 obj
<<
-/Length 696
+/Length 709
/Filter /FlateDecode
>>
stream
-xUo0Rt16Iivȭ&qQUEgNjZҎvr?{?{ g].ofio{0R/g±7ޭx0 z
-ɁdM ZVO
- w7 JܼWn9ީCoAQSY
-zpyB2$'I@ǟyvM22'G:5i Ү6oH&Ff==X{MT8Jn#idH rИx݅85;"D0B@Wc#+#_
-#J*#Uus0'•}L%8?!SNIEʏdd*% V3<J5nYcq<~WdQ(+EQ35{QVrDg
-Q\5xPTڋ}@=}0mWj-}dV-\%{ٍt=j9z߇6txҾ6)&Uا /}nTzKψ@o'#Mު ]L ȦctabxQU4W"9yڃ4T7KaΗ3{FAW%gm~2
+xVo eĝzN6ZDS蜶a!x?x8Xq$,( u
+%%U*H@F] YC/%uMRv7>RwqH3e6);Efj敯h#7W}A8Pwhh'@y\[H틁jI_eZP;ᖮlGz=X8'' [vw}h-0J#{rT@h& orW0Q
+ji4g#R
endstream
endobj
-850 0 obj
+852 0 obj
<<
/Type /Page
-/Contents 851 0 R
-/Resources 849 0 R
+/Contents 853 0 R
+/Resources 851 0 R
/MediaBox [0 0 612 792]
-/Parent 836 0 R
+/Parent 838 0 R
>>
endobj
-852 0 obj
+854 0 obj
<<
-/D [850 0 R /XYZ 132.768 705.06 null]
+/D [852 0 R /XYZ 132.768 705.06 null]
>>
endobj
290 0 obj
<<
-/D [850 0 R /XYZ 133.768 460.681 null]
+/D [852 0 R /XYZ 133.768 388.95 null]
>>
endobj
-849 0 obj
+851 0 obj
<<
-/Font << /F75 316 0 R /F92 368 0 R /F33 317 0 R >>
+/Font << /F79 316 0 R /F96 368 0 R /F37 317 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-855 0 obj
+857 0 obj
<<
-/Length 1240
+/Length 683
/Filter /FlateDecode
>>
stream
-xڭWKs6Wh)1C<MNzr<S$D$Ȃ]Ń)Cnb<ۥ,v`֯|HE$LJE($b],nxGK/vla5 1K/?/|(bVn8-JNEg֬1
-jS܈̾}4==.RqE\I&q0
-W:c̨@(u|{.## P%ٖ]}xiQR7y N-//7c}`RQ+4ISBo euWLtm靼Ea>[vUgZ9ǧoYM !%./IڍQlbL NޯY^ zefUSҎ߷~
-Jf
-Lb*\ Y/Õw@Wz(jx\PD]m{wWH0HᆵyŅIlо240FI͋KF;=YHpaɗa)qDBfk̄萭KLJ3cT/ʃMH!EA<ǔqP7zqC^b3ԇ0/K
-s Zʃ~ 3qVk_]W*E?"$J=kP ":h~Ԝ7=N63IC9Z֩ʶ1SE׭B%LTW9E[] o4'!+X+AXVh75)r*4To ]8taH2UY.FH984"dP.ڎ|s.HNr nGXݦ% gV (}`&ad?q v `yO.
+xڵV[o0~@*%UMqє.iC,760*`'@ܺlwn9`a_,%WwÑ12Gn5m ;Sl̺=.bFR2%J~) >ͧ
+/
+pci-%NҮB`&YγN??qr\Wӿ"5@;.U]-UMyTpn.b}g9q6f(^$\xvhMnowNMŘ?i[zi&k\ڔ3TI|-iZU#t&W&pCX%yLl.fgN-/ݣ=l:9мLL#
endstream
endobj
-854 0 obj
+856 0 obj
<<
/Type /Page
-/Contents 855 0 R
-/Resources 853 0 R
+/Contents 857 0 R
+/Resources 855 0 R
/MediaBox [0 0 612 792]
-/Parent 836 0 R
+/Parent 838 0 R
>>
endobj
-856 0 obj
-<<
-/D [854 0 R /XYZ 132.768 705.06 null]
->>
-endobj
-294 0 obj
+858 0 obj
<<
-/D [854 0 R /XYZ 133.768 234.917 null]
+/D [856 0 R /XYZ 132.768 705.06 null]
>>
endobj
-853 0 obj
+855 0 obj
<<
-/Font << /F75 316 0 R /F92 368 0 R /F110 518 0 R /F33 317 0 R /F100 420 0 R >>
+/Font << /F79 316 0 R /F37 317 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-859 0 obj
+861 0 obj
<<
-/Length 2372
+/Length 2362
/Filter /FlateDecode
>>
stream
-xڵYݏ ͗>rC{=$*K]dɕlKgdI!CrI9onݛo~r<R46NzsWm~ݹ;8[5r+68m9] oM=nE=S=>xj㈻Sӳ1*}c<cwo~J;Y}woyUeʦt-Y}CVњD/9b4D0JYJOɐb2Ww"Lw6O۝:zPq:jWd;;?kMֽӛar4n]Cqn!d/w[Nc)wnSxõRO"i,%~qj-^)5nW?:h<X4g|qZB̥h>tH95пp|}l1S _'9Y`%[4~9d\d}UӇ'>oMN_ 1ޅ !ƃ;i/U?00U>^P.3@>vY4 W^h1z!Y%vHδ1DIl
-hc +=MlYE/ iNG9M7]!R4T" :,q?ns~_.2ǏLNo*DRfRij8*
-T'Q>YtG,%9Lh %zNpVegzj'ϙ^U"zX۴#IbEafUyp}7wLEHcQbuȗZh|DOqԂœlD[&R&iKZvC|ENQ;xY]w{@\m2'LXI Y <\5q-He לVA 8Rl0²ER[;49u?,y8÷Qw)~gݖX^}`IqQ3;IŴ:a<ΧG><'
-1DB!<#zxoWw2;.oqQUK4x5|,\6:OiV z\:*:j$V!@_LZnj. ~ÊE¢0Xay]XT,Jj_\fTOwI;}cw `șZ?"aGp4ExUeCD.}@\(:fN25ҕE% kY$y,^eUX8֭nRSGϻָIOc"EeOm!5I,Щ$;^e,1֟^(y%Aq!ull[eM@
-ovcQ!ϊkih?KW2ix*)f>k'G! ?9\[GW=BD$ήsa.?n kWKoҺ g铛3}SSfu*f*eI>4$Pn+$`ŸSHJXfTv8<BS 8h3<Sl/ Jz`+^P}2{
+xڭYKh`X lˤHEή$=c_3ʪ*I== 4_%Xlwca͛o(i9qTeq"Xuo\.E
+ le>s!?-i}:Ӭq&)~x_ }۴ق^X&;<$ZYwҨZMSKWMM߽ 0EbihIoXŅ}>S%wBDT ;̰ MOuFC 3:iE}:b0d*+Lyۋ<j,߀Y̔WtoO_ɣhs.;903C/8@ #JG<j:l8aEQă,q+񋦻C3vC0~Y(Csz(o/4$>h\Ǩ'ّFFgxIZIR<?Q&D?'}vY9
+\Q"r/ HewVUxŲAtTv^!/ #6dXĄ~fYoDr6ye_ΖlݟtZL6"悯S~=]:0UL63zZSQ&]
+b'qe=!I
+r%WrJ> 'fF#TF5鬰`R4MMu!\IiU(@5W g<~^~>nP \Sv/w8( -1WVPц?Evy=mWer-dy+-VE!-CSaSic բ$p vpۏAe&v
+Od
+~x
+=~)4RԐ0# *PQӔ[*"LX($T|1ai:BECetI\XW?Uц·"_pN2etthX&p7 u3VjJ
+zC/ +O߼<QHH,΄>0r_H#SQ\ְb)_+aq*v5)UF_ &;ɑe/?}25f1_Xa#teJ\9DF
+l,j ln
+)`Gl
+ī\3c0=7U+o1
endstream
endobj
-858 0 obj
+860 0 obj
<<
/Type /Page
-/Contents 859 0 R
-/Resources 857 0 R
+/Contents 861 0 R
+/Resources 859 0 R
/MediaBox [0 0 612 792]
-/Parent 867 0 R
->>
-endobj
-860 0 obj
-<<
-/D [858 0 R /XYZ 132.768 705.06 null]
+/Parent 866 0 R
>>
endobj
-298 0 obj
+862 0 obj
<<
-/D [858 0 R /XYZ 133.768 409.152 null]
+/D [860 0 R /XYZ 132.768 705.06 null]
>>
endobj
-861 0 obj
+294 0 obj
<<
-/D [858 0 R /XYZ 133.768 343.44 null]
+/D [860 0 R /XYZ 133.768 667.198 null]
>>
endobj
-862 0 obj
+298 0 obj
<<
-/D [858 0 R /XYZ 133.768 319.032 null]
+/D [860 0 R /XYZ 133.768 303.645 null]
>>
endobj
863 0 obj
<<
-/D [858 0 R /XYZ 133.768 267.78 null]
+/D [860 0 R /XYZ 133.768 237.933 null]
>>
endobj
864 0 obj
<<
-/D [858 0 R /XYZ 133.768 227.375 null]
+/D [860 0 R /XYZ 133.768 213.525 null]
>>
endobj
865 0 obj
<<
-/D [858 0 R /XYZ 133.768 199.48 null]
+/D [860 0 R /XYZ 133.768 162.273 null]
>>
endobj
-866 0 obj
-<<
-/D [858 0 R /XYZ 133.768 148.228 null]
->>
-endobj
-857 0 obj
+859 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R /F100 420 0 R /F92 368 0 R /F38 321 0 R /F41 322 0 R /F76 319 0 R >>
+/Font << /F96 368 0 R /F114 518 0 R /F79 316 0 R /F37 317 0 R /F104 420 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-870 0 obj
+869 0 obj
<<
-/Length 1122
+/Length 1797
/Filter /FlateDecode
>>
stream
-xڭVK6ϯ"xTnʤKR٩\f l+`$Z`cpZmhSt3cin^&'&߼TSģ6s+' אGQ`Ũ^vA(&JSUF9^9%IEGYⶢ,@/QrT:h6΂F6Z2,u)ba]-<%YI\s?<J{lʌ?Pɽ꾻eՖP6Gi:[pUnd׉}F)au }7cmΜ (zIN(Qˆe`w^Ue[}M V
-Q Ԯ"M~ rD
-yC%$M9W@0^B0N~T0Xfc F~z?Ӊ[Ծ/a&{&MHFy[9RpZkܹQYKa:}bKN>ȶ[鏢GICEu^01+1</$luWok,Zt~<D`촹b*kˇ ^yl[$Ŝ?sb"aHB ! ij☐Ev(n8EA4=zmeӼv shjgOja,U
-+}_94Θ5xp<Hr +aNuN}ZOxc|ˮ>sRbR(#4K=FےU+ܨqﺗ϶v7@N
-W&*v {`pM@l>z7XDiƤ#;
+xڭXKQS6ax*+$ODBx)R&Ӎ)Rv ?t36ww?dqZ0)Fe0>֛_RV1|HTnM]L0تk0MO4燬~St}m{uB޶Yia-p2qUlYJoM̮uIb[/HHO/O6̼xݨ/sm0C(\ ibgޞSYҌd.1| !ұ3UH Jܸkͫ(r[uǣYpo_&7)XZōO`L4]jQD0#(@J ~:4AdE%_ (8mtk !L\ߟ{0i<v(­~OYQƏ 5GH`Pig T
+v`v`*i&09X0+qY$@V`Q
+g̗k q_ \P)/*h<,Mi!S}ń /+{㶅 .k Nb}PvvU5.lԘ|
+cuOTsm4͚Kv!<_Wu
+ɴ,!m fPgIf桀Io͸(#5Ӌ=PW>]՞C nX}ʃdr˛H33Q+(q{.
+ Bkٶ<dFu` aoe
+XA$Ͱ>
+kƽ%dyᷮb>LcA*Ϣ`% 7(ɡ{"Ϯ+=Ѓ~F~smMkݞp
+_e/a7^.&2ŴN5Sto BghIz5rwsֵ$-B*_(#-<3J 0FJt?-8t#(:v^/ӫ*s`wu;9mG jCc]$/8ղ;BY_jrqUVB0ΓW_Q0RCA%DUkKSw#fvTl6x( im;֫]B,ᢸuGi!}U9-\-a &$"1(8t;4%#sCo!sdP:od;гzwP
endstream
endobj
-869 0 obj
+868 0 obj
<<
/Type /Page
-/Contents 870 0 R
-/Resources 868 0 R
+/Contents 869 0 R
+/Resources 867 0 R
/MediaBox [0 0 612 792]
-/Parent 867 0 R
+/Parent 866 0 R
+>>
+endobj
+870 0 obj
+<<
+/D [868 0 R /XYZ 132.768 705.06 null]
>>
endobj
871 0 obj
<<
-/D [869 0 R /XYZ 132.768 705.06 null]
+/D [868 0 R /XYZ 133.768 667.198 null]
>>
endobj
872 0 obj
<<
-/D [869 0 R /XYZ 133.768 667.198 null]
+/D [868 0 R /XYZ 133.768 640.797 null]
>>
endobj
873 0 obj
<<
-/D [869 0 R /XYZ 133.768 652.752 null]
+/D [868 0 R /XYZ 133.768 589.545 null]
>>
endobj
874 0 obj
<<
-/D [869 0 R /XYZ 133.768 636.812 null]
+/D [868 0 R /XYZ 133.768 561.096 null]
>>
endobj
875 0 obj
<<
-/D [869 0 R /XYZ 133.768 618.879 null]
+/D [868 0 R /XYZ 133.768 545.156 null]
>>
endobj
876 0 obj
<<
-/D [869 0 R /XYZ 133.768 596.961 null]
+/D [868 0 R /XYZ 133.768 529.215 null]
>>
endobj
877 0 obj
<<
-/D [869 0 R /XYZ 133.768 569.619 null]
+/D [868 0 R /XYZ 133.768 511.283 null]
>>
endobj
878 0 obj
<<
-/D [869 0 R /XYZ 133.768 539.178 null]
+/D [868 0 R /XYZ 133.768 489.365 null]
>>
endobj
879 0 obj
<<
-/D [869 0 R /XYZ 133.768 517.26 null]
+/D [868 0 R /XYZ 133.768 462.023 null]
>>
endobj
880 0 obj
<<
-/D [869 0 R /XYZ 133.768 489.918 null]
+/D [868 0 R /XYZ 133.768 431.582 null]
>>
endobj
881 0 obj
<<
-/D [869 0 R /XYZ 133.768 462.023 null]
+/D [868 0 R /XYZ 133.768 409.664 null]
>>
endobj
882 0 obj
<<
-/D [869 0 R /XYZ 133.768 443.537 null]
+/D [868 0 R /XYZ 133.768 382.322 null]
>>
endobj
883 0 obj
<<
-/D [869 0 R /XYZ 133.768 421.619 null]
+/D [868 0 R /XYZ 133.768 354.426 null]
>>
endobj
884 0 obj
<<
-/D [869 0 R /XYZ 133.768 393.724 null]
+/D [868 0 R /XYZ 133.768 335.94 null]
>>
endobj
885 0 obj
<<
-/D [869 0 R /XYZ 133.768 366.382 null]
+/D [868 0 R /XYZ 133.768 314.022 null]
>>
endobj
-868 0 obj
+886 0 obj
<<
-/Font << /F33 317 0 R /F75 316 0 R >>
-/ProcSet [ /PDF /Text ]
+/D [868 0 R /XYZ 133.768 286.127 null]
>>
endobj
-886 0 obj
-[472.2 555.6 805.6 916.7 1138.9 1277.8]
+887 0 obj
+<<
+/D [868 0 R /XYZ 133.768 258.785 null]
+>>
endobj
888 0 obj
-[777.8 277.8 333.3 277.8 500 500 500 500 500 500 500 500 500 500 500 277.8 277.8 777.8 777.8 777.8 472.2 666.7 666.7 666.7 638.9 722.2 597.2 569.5 666.7 708.3 277.8 472.2 694.5 541.7 875 708.3 736.1 638.9 736.1 645.8 555.6 680.6 687.5 666.7 944.4 666.7 666.7 611.1 288.9 500 288.9 555.6 666.7 277.8 480.6 516.7 444.5 516.7 444.5 305.6 500 516.7 238.9 266.7 488.9 238.9 794.5 516.7 500 516.7 516.7 341.7 383.3 361.1]
+<<
+/D [868 0 R /XYZ 133.768 228.897 null]
+>>
endobj
889 0 obj
-[525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525]
+<<
+/D [868 0 R /XYZ 133.768 206.426 null]
+>>
+endobj
+867 0 obj
+<<
+/Font << /F37 317 0 R /F79 316 0 R /F42 321 0 R /F45 322 0 R /F80 319 0 R >>
+/ProcSet [ /PDF /Text ]
+>>
endobj
890 0 obj
-[611.1 611.1]
+[472.2 555.6 805.6 916.7 1138.9 1277.8]
endobj
892 0 obj
-[533.6 588.2 758.1 480.3 1228 880.8]
+[777.8 277.8 333.3 277.8 500 500 500 500 500 500 500 500 500 500 500 277.8 277.8 777.8 777.8 777.8 472.2 666.7 666.7 666.7 638.9 722.2 597.2 569.5 666.7 708.3 277.8 472.2 694.5 541.7 875 708.3 736.1 638.9 736.1 645.8 555.6 680.6 687.5 666.7 944.4 666.7 666.7 611.1 288.9 500 288.9 555.6 666.7 277.8 480.6 516.7 444.5 516.7 444.5 305.6 500 516.7 238.9 266.7 488.9 238.9 794.5 516.7 500 516.7 516.7 341.7 383.3 361.1]
endobj
893 0 obj
[525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525]
endobj
894 0 obj
+[611.1 611.1]
+endobj
+896 0 obj
+[533.6 588.2 758.1 480.3 1228 880.8]
+endobj
+897 0 obj
+[525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525]
+endobj
+898 0 obj
[770.8 786.1 829.2 741.7 712.5 851.4 813.9 405.6 566.7 843 683.3 988.9 813.9 844.4 741.7 844.4 800 611.1 786.1 813.9 813.9 1105.5 813.9 813.9 669.5 319.4 500 319.4 555.5 813.9 319.4 613.3 580 591.1 624.5 557.8 535.5 641.1 613.3 302.2 424.4 635.5 513.3 746.7 613.3 635.5 557.8 635.5 602.2 457.8 591.1 613.3 613.3 835.6 613.3 613.3 502.2 500 277.8 500 555.5 188.9 813.9 813.9 786.1 786.1 829.2 741.7 741.7 851.4 683.3 683.3 683.3 813.9 813.9 813.9 844.4 800 800 611.1 611.1 611.1 786.1 786.1 813.9 813.9 813.9 669.5 669.5 669.5 931.7 405.6 624.5 537.5 613.3 613.3 591.1 591.1 624.5 557.8 557.8 641.1 513.3 513.3 513.3 613.3 613.3 613.3 635.5 602.2 602.2 457.8 457.8 457.8 591.1 591.1 613.3 613.3 613.3 502.2 502.2 502.2 696.4 319.4 523.6 813.9 813.9 813.9 813.9 813.9 813.9 813.9 975 786.1 741.7 741.7 741.7 741.7 405.6 405.6 405.6 405.6 829.2 813.9 844.4 844.4 844.4 844.4 844.4 1091.7 844.4 813.9 813.9 813.9 813.9 813.9 683.3 1222.2 613.3 613.3 613.3 613.3 613.3 613.3 735.5 591.1 557.8 557.8 557.8 557.8 302.2 302.2 302.2 302.2 624.5 613.3 635.5 635.5 635.5 635.5 635.5 824.4 635.5 613.3 613.3 613.3 613.3]
endobj
-895 0 obj
+899 0 obj
[531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531 531.3 531.3 531 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3]
endobj
-897 0 obj
+901 0 obj
[892.9 339.3 892.9 585.3 892.9 585.3 892.9 892.9 892.9 892.9 892.9 892.9 892.9 1138.9 585.3 585.3 892.9 892.9 892.9 892.9 892.9 892.9 892.9 892.9 892.9 892.9 892.9 892.9 1138.9 1138.9 892.9 892.9 1138.9 1138.9 585.3 585.3 1138.9 1138.9 1138.9 892.9 1138.9 1138.9 708.3 708.3 1138.9 1138.9 1138.9 892.9 329.4 1138.9 769.8 769.8 1015.9 1015.9 0 0 646.8 646.8 769.8 585.3 831.4 831.4 892.9 892.9 708.3 917.6 753.4 620.2 889.5 616.1 818.4 688.5 978.7 646.5 782.2 871.7 791.7 1342.7 935.6 905.8 809.2 935.9 981 702.2 647.8 717.8 719.9 1135.1 818.9 764.4 823.1 769.8 769.8 769.8 769.8 769.8 708.3 708.3 523.8 523.8 523.8 523.8 585.3 585.3 462.3 462.3 339.3 585.3 585.3 708.3 585.3 339.3 938.5 859.1 954.4]
endobj
-898 0 obj
+902 0 obj
[736.1 1083.3 736.1 1083.3 1083.3 1083.3 1083.3 1083.3 1083.3 1083.3 1361.1 736.1 736.1 1083.3 1083.3 1083.3 1083.3 1083.3 1083.3 1083.3 1083.3 1083.3 1083.3 1083.3 1083.3 1361.1 1361.1 1083.3 1083.3 1361.1 1361.1 736.1 736.1 1361.1 1361.1 1361.1 1083.3 1361.1 1361.1 875 875 1361.1 1361.1 1361.1 1083.3 441]
endobj
-900 0 obj
+904 0 obj
[881.9 755.6 723.6 904.2 900 436.1 594.5 901.4 691.7 1091.7 900 863.9 786.1 863.9 862.5 638.9 800 884.7 869.4 1188.9 869.4 869.4 702.8 319.5 570.8 319.5 575 319.5 319.5 559 638.9 511.1 638.9 527.1 351.4 575 638.9 319.5 351.4 607 319.5 958.3 638.9 575 638.9 607 473.6 453.6 447.2 638.9 607 830.6 607 607 511.1]
endobj
-901 0 obj
+905 0 obj
[1027.8 402.8 472.2 402.8 680.6 680.6 680.6]
endobj
-903 0 obj
+907 0 obj
[777.8]
endobj
-905 0 obj
+909 0 obj
[458.3 458.3 416.7 416.7 472.2 472.2 472.2 472.2 583.3 583.3 472.2 472.2 333.3 555.6 577.8 577.8 597.2 597.2 736.1 736.1 527.8 527.8 583.3 583.3 583.3 583.3 750 750 750 750 1044.4 1044.4 791.7 791.7 583.3 583.3 638.9 638.9 638.9 638.9 805.6 805.6 805.6 805.6 1277.8 1277.8 811.1 811.1 875 875 666.7 666.7 666.7 666.7 666.7 666.7 888.9 888.9 888.9 888.9 888.9 888.9 888.9 666.7 875 875 875 875 611.1 611.1 833.3 1111.1 472.2 555.6 1111.1 1511.1 1111.1 1511.1 1111.1 1511.1 1055.6 944.5 472.2 833.3 833.3 833.3 833.3 833.3 1444.5 1277.8 555.6 1111.1 1111.1 1111.1 1111.1 1111.1 944.5 1277.8 555.6 1000 1444.5 555.6 1000 1444.5 472.2 472.2 527.8 527.8 527.8 527.8 666.7 666.7 1000]
endobj
-906 0 obj
+910 0 obj
[777.8 277.8 777.8 500 777.8 500 777.8 777.8 777.8 777.8 777.8 777.8 777.8 1000 500 500 777.8 777.8 777.8 777.8 777.8 777.8 777.8 777.8 777.8 777.8 777.8 777.8 1000 1000 777.8 777.8 1000 1000 500 500 1000 1000 1000 777.8 1000 1000 611.1 611.1 1000 1000 1000 777.8 275 1000 666.7 666.7 888.9 888.9 0 0 555.6 555.6 666.7 500 722.2 722.2 777.8 777.8 611.1 798.5 656.8 526.5 771.4 527.8 718.7 594.9 844.5 544.5 677.8 762 689.7 1200.9 820.5 796.1 695.6 816.7 847.5 605.6 544.6 625.8 612.8 987.8 713.3 668.3 724.7 666.7 666.7 666.7 666.7 666.7 611.1 611.1 444.4 444.4 444.4 444.4 500 500 388.9 388.9 277.8 500 500 611.1 500 277.8 833.3 750 833.3]
endobj
-907 0 obj
+911 0 obj
[493.7 329.2 493.7 548.6 329.2 329.2 493.7 274.3 877.8 603.5 548.6 548.6 493.7 452.6 438.9 356.6 576 493.7 713.2]
endobj
-908 0 obj
+912 0 obj
[531.3 1062.5 0 414.9 295.1 324.7 619.8 590.3 590.3 885.4 885.4 531.3 295.1 403.1 885.4 531.3 885.4 826.4 295.1 413.2 413.2 531.3 826.4 295.1 354.2 295.1 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 531.3 295.1 295.1 826.4 826.4 826.4 501.8 826.4 795.9 752.1 767.4 811.1 722.6 693.1 833.5 795.9 382.6 545.5 825.4 663.5 972.9 795.9 826.4 722.6 826.4 781.6 590.3 767.4 795.9 795.9 1091 795.9 795.9 649.3 295.1 531.3 295.1 555.6 795.9 295.1 531.3 590.3 472.2 590.3 472.2 324.7 531.3 590.3 295.1 324.7 560.7 295.1 885.4 590.3 531.3 590.3 560.7 414.1 419.1 413.2 590.3 560.7 767.4 560.7 560.7]
endobj
-909 0 obj
+913 0 obj
[611.1 611.1 611.1 611.1 611.1]
endobj
-910 0 obj
+914 0 obj
[511.1 1022.2 0 408.5 306.7 306.7 613.3 562.2 587.8 881.7 894.4 511.1 306.7 400.7 817.8 500 817.8 766.7 306.7 408.9 408.9 511.1 766.7 306.7 357.8 306.7 511.1 511.1 511.1 511.1 511.1 511.1 511.1 511.1 511.1 511.1 511.1 306.7 306.7 777.8 766.7 777.8 511.1 766.7 743.4 703.9 715.6 755 678.4 652.8 773.6 743.4 385.5 525 768.9 627.2 896.7 743.4 766.7 678.4 766.7 729.5 562.2 715.6 743.4 743.4 998.9 743.4 743.4 613.3 306.7 500 306.7 555.6 743.4 306.7 511.1 460 460 511.1 460 306.7 460 511.1 306.7 306.7 460 255.5 817.8 562.2 511.1 511.1 460 421.7 408.9 332.2 536.7 460 664.5 463.9 485.6]
endobj
-911 0 obj
+915 0 obj
[656.2 625 625 937.5 937.5 562.5 342.6 462.5 937.5 562.5 937.5 875 312.5 437.5 437.5 562.5 875 312.5 375 312.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 562.5 312.5 312.5 894.4 875 894.4 531.2 875 849.5 799.7 812.5 862.2 738.4 707.2 884.2 879.6 419 581 880.7 675.9 1067.2 879.6 844.9 768.5 844.9 839.2 625 782.4 864.6 849.5 1162 849.5 849.5 687.5 312.5 575 312.5 555.6 849.5 312.5 546.9 625 500 625 513.3 343.7 562.5 625 312.5 343.7 593.7 312.5 937.5 625 562.5 625 593.7 459.5 443.7 437.5 625 593.7 812.5 593.7 593.7 500]
endobj
-912 0 obj
+916 0 obj
[444.4 405.9 437.5 496.5 469.4 353.9 576.2 583.3 602.6 494 437.5 570 517 571.4 437.2 540.3 595.8 625.7 651.4 622.5 466.3 591.4 828.1 517 362.8 654.2 1000 1000 1000 1000 277.8 277.8 500 500 500 500 500 500 500 500 500 500 500 500 277.8 277.8 777.8 500 777.8 500 530.9 750 758.5 714.7 827.9 738.2 643.1 786.3 831.3 439.6 554.5 849.3 680.6 970.1 803.5 762.8 642 790.6 759.3 613.2 584.4 682.8 583.3 944.4 828.5 580.6 682.6 388.9 388.9 388.9 1000 1000 416.7 528.6 429.2 432.8 520.5 465.6 489.6 477 576.2 344.5 411.8 520.6 298.4 878 600.2 484.7 503.1 446.4 451.2 468.8 361.1 572.5 484.7 715.9 571.5 490.3 465.1 322.5 384 636.5 500]
endobj
-913 0 obj
+917 0 obj
[625 833.3 777.8 694.5 666.7 750 722.2 777.8 722.2 777.8 722.2 583.3 555.6 555.6 833.3 833.3 277.8 305.6 500 500 500 500 500 750 444.5 500 722.2 777.8 500 902.8 1013.9 777.8 277.8 277.8 472 833.3 500 833.3 777.8 277.8 388.9 388.9 500 777.8 277.8 333.3 277.8 500 500 500 500 500 500 500 500 500 500 500 277.8 277.8 277.8 777.8 472.2 472.2 777.8 750 708.3 722.2 763.9 680.6 652.8 784.7 750 361.1 513.9 777.8 625 916.7 750 777.8 680.6 777.8 736.1 555.6 722.2 750 750 1027.8 750 750 611.1 277.8 472 277.8 500 277.8 277.8 500 555.6 444.5 555.6 444.5 305.6 500 555.6 277.8 305.6 527.8 277.8 833.3 555.6 500 555.6 527.8 391.7 394.5 388.9 555.6 527.8 722.2 527.8 527.8 444.5 500 1000 500 500 500]
endobj
-914 0 obj
+918 0 obj
[742.7 647.8 600.1 519.3 476.1 519.8 588.6 544.1 422.8 668.8 677.6 694.6 572.8 519.8 668 592.7 662 526.8 632.9 686.9 713.8 756 719.7 539.7 689.9 950 592.7 439.2 751.4 1138.9 1138.9 1138.9 1138.9 339.3 339.3 585.3 585.3 585.3 585.3 585.3 585.3 585.3 585.3 585.3 585.3 585.3 585.3 339.3 339.3 892.9 585.3 892.9 585.3 610.1 859.1 863.2 819.4 934.1 838.7 724.5 889.4 935.6 506.3 632 959.9 783.7 1089.4 904.9 868.9 727.3 899.7 860.6 701.5 674.8 778.2 674.6 1074.4 936.9 671.5 778.4 462.3 462.3 462.3 1138.9 1138.9 478.2 619.7 502.4 510.5 594.7 542 557.1 557.3 668.8 404.2 472.7 607.3 361.3 1013.7 706.2 563.9 588.9 523.6 530.4 539.2 431.6 675.4 571.4 826.4 647.8 579.4 545.8]
endobj
-915 0 obj
+919 0 obj
[877 781.7 754 843.3 815.5 877 815.5 877 815.5 677.6 646.9 646.9 970.3 970.3 323.4 354.2 569.4 569.4 569.4 569.4 569.4 843.3 507.9 569.4 815.5 877 569.4 1013.9 1136.9 877 323.4 323.4 538.4 938.5 569.4 938.5 877 323.4 446.4 446.4 569.4 877 323.4 384.9 323.4 569.4 569.4 569.4 569.4 569.4 569.4 569.4 569.4 569.4 569.4 569.4 323.4 323.4 323.4 877 538.7 538.7 877 843.3 798.6 815.5 860.1 767.9 737.1 883.9 843.3 412.7 583.3 874 706.4 1027.8 843.3 877 767.9 877 829.4 631 815.5 843.3 843.3 1150.8 843.3 843.3 692.4 323.4 538.4 323.4 569.4 323.4 323.4 569.4 631 507.9 631]
endobj
-916 0 obj
+920 0 obj
[569.4 569.4 569.4 569.4 569.4 569.4 569.4 569.4 569.4 323.4 323.4 892.9 877 892.9 538.7 877 843.3]
endobj
-917 0 obj
+921 0 obj
[500 1000 0 391.7 277.8 305.6 583.3 555.6 555.6 833.3 833.3 500 277.8 373.8 833.3 500 833.3 777.8 277.8 388.9 388.9 500 777.8 277.8 333.3 277.8 500 500 500 500 500 500 500 500 500 500 500 277.8 277.8 777.8 777.8 777.8 472.2 777.8 750 708.3 722.2 763.9 680.6 652.8 784.7 750 361.1 513.9 777.8 625 916.7 750 777.8 680.6 777.8 736.1 555.6 722.2 750 750 1027.8 750 750 611.1 277.8 500 277.8 555.6 750 277.8 500 555.6 444.5 555.6 444.5 305.6 500 555.6 277.8 305.6 527.8 277.8 833.3 555.6 500 555.6 527.8 391.7 394.5 388.9 555.6 527.8 722.2 527.8 527.8 444.5 500 277.8 500 555.6 166.7 750 750 722.2 722.2 763.9 680.6 680.6 784.7 625 625 625 750 750 750 777.8 736.1 736.1 555.6 555.6 555.6 722.2 722.2 750 750 750 611.1 611.1 611.1 838.9 361.1 555.6 484]
endobj
-918 0 obj
+922 0 obj
[525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525]
endobj
-919 0 obj
+923 0 obj
[575 1150 0 449.7 319.5 351.4 670.8 638.9 638.9 958.3 958.3 575 350 481.5 958.3 575 958.3 894.4 319.5 447.2 447.2 575 894.4 319.5 383.3 319.5 575 575 575 575 575 575 575 575 575 575 575 319.5 319.5 894.4 894.4 894.4 543.1 894.4 869.4 818.1 830.6 881.9 755.6 723.6 904.2 900 436.1 594.5 901.4 691.7 1091.7 900 863.9 786.1 863.9 862.5 638.9 800 884.7 869.4 1188.9 869.4 869.4 702.8 319.5 575 319.5 555.6 869.4 319.5 559 638.9 511.1 638.9 527.1 351.4 575 638.9 319.5 351.4 607 319.5 958.3 638.9 575 638.9 607 473.6 453.6 447.2 638.9 607 830.6 607 607 511.1]
endobj
-920 0 obj
+924 0 obj
[399.7 399.7 513.9 799.4 285.5 342.6 285.5 513.9 513.9 513.9 513.9 513.9 513.9 513.9 513.9 513.9 513.9 513.9 285.5 285.5 799.4 799.4 799.4 485.3 799.4 770.7 727.9 742.3 785 699.4 670.8 806.5 770.7 371 528.1 799.2 642.3 942 770.7 799.4 699.4 799.4 756.4 571 742.3 770.7 770.7 1056.1 770.7 770.7 628.1 285.5 513.9 285.5 555.6 770.7 285.5 513.9 571 456.8 571 457.2 314 513.9 571 285.5 314 542.4 285.5 856.4 571 513.9 571 542.4 402 405.4 399.7 571 542.4 742.3 542.4 542.4]
endobj
-921 0 obj
+925 0 obj
[272 326.4 272 489.6 489.6 489.6 489.6 489.6 489.6 489.6 489.6 489.6 489.6 489.6 272 272 761.6 761.6 761.6 462.4 761.6 734 693.4 707.2 747.8 666.2 639 768.2 734 353.2 503 761.2 611.8 897.2 734 761.6 666.2 761.6 720.6 544 707.2 734 734 1006 734 734 598.4 272 500 272 555.6 734 272 489.6 544 435.2 544 435.2 299.2 489.6 544 272 299.2 516.8 272 816 544 489.6 544 516.8 380.8 386.2 380.8 544 516.8 707.2]
endobj
-922 0 obj
+926 0 obj
[525.4 499.3 499.3 749 749 458.6 249.7 321.6 772.1 458.6 772.1 719.9 249.7 354.1 354.1 458.6 719.9 249.7 301.9 249.7 458.6 458.6 458.6 458.6 458.6 458.6 458.6 458.6 458.6 458.6 458.6 249.7 249.7 761.6 719.9 761.6 432.5 719.9 693.3 654.3 667.6 706.6 628.2 602.1 726.3 693.3 327.6 471.5 719.4 576 850 693.3 719.9 628.2 719.9 680.4 510.9 667.6 693.3 693.3 954.5 693.3 693.3 563.1 249.7 500 249.7 555.6 693.3 249.7 458.6 510.9 406.4 510.9 406.4 275.8 458.6 510.9 249.7 275.8 484.7 249.7 772.1 510.9 458.6 510.9 484.7 354.1 359.4 354.1 510.9 484.7 667.6]
endobj
-923 0 obj
+927 0 obj
[514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6 514.6]
endobj
-924 0 obj
+928 0 obj
<<
/Length1 1169
/Length2 6544
@@ -5531,7 +5586,7 @@ f?xʲDF(w!U:J4OlJUoPQ4ħ
Zs$x(
endstream
endobj
-925 0 obj
+929 0 obj
<<
/Type /FontDescriptor
/FontName /OIUXCD+esint10
@@ -5544,145 +5599,121 @@ endobj
/StemV 40
/XHeight 431
/CharSet (/acute/ring)
-/FontFile 924 0 R
+/FontFile 928 0 R
>>
endobj
-926 0 obj
+930 0 obj
<<
-/Length1 2563
-/Length2 29376
+/Length1 2608
+/Length2 29649
/Length3 0
-/Length 30881
-/Filter /FlateDecode
->>
-stream
-xڴeT]5; h] 4ָ;݃wM-hpw =L2޿bATڧι&Wd7ʀ]Y
-_
-$]~Pt 03C[o_S1S{Wg g1 [d왕uY\<\'.$
-zq{K[ dG1i>G\:w hfctv+ Z
-9N g?=dmMX!qC" 1oݟ ]? q?, R7t;/_Rz.~VV@< 6_R___Ri/fv
-BX(=oo
-Ez0-_fT^O}dK40!>֍0ft+tD-ٸ%DQzx~`|.Z*X$(X؀C':Ԩ.%޻dێϦ^CxW'lLl,毞!/;GR'.7
-r*D(,d*TS;˙"#fU
-6ch*9]&/Wpn
-|pݿ28id)NSZ#Oj癫0elOq:Zj΄}V>=}{]j7}51C=b
-XjACnLτd"+C_SbF|.iCZ} vG]Bs
-&-M=8ױK!Zv-庀$a؃#J) Ô1;~,LVV[*ϓH΄_|-jRKmc7g
-/>YרsI
-@¦C݆HIyLpN7H-:MjtNu)Ku|Ix;(n%CcL{ qA qY?RV]%;HG `F(Lm/^V4Z:
-Qfž [LqodjlD+pjen0TA*gt_Ύ6MLOӡD*TSr PZC9j@fXt;7uR҆|:j槑7YL),Mc!Qt"tC_lSlni(KnY=d$ƺekO
-|;R L}b;ǣG\
--rJ@ւ5))+veC#Skl>^ᯈr֎<1 +:C)s5/8{ :
-*?(Y{"3f̖^Kr@b9"^zCz+/33 ~j"^kiy <Gm ,J~OfES^8tCxm}~]Uw$Yȃwٖ@ԡѧ#<؇~I7T`'Q2[-: ua$&ڷI坃iP/(q=ȝ{Ɍs?}o|V.jρ5}_b>&&f4X-ÇS"^v uvW8ί4%Csϱʏʹc )#[ݤ}Z-r.wnhkx̱=Dr9b-Ļu6QL\MNBz;> D=*6&1͆Y ("?rMJ׻46@q/mFYNʘK9Ԩ,()IG=#0k_y#&1d|v,bA&8vUE8<Q6G7"cLU*XO-1fQd} E5%JGdy-{ƞi!oZ۷@oxʃF WjඖpK۪WSʸm Od,/K$<BΔ3ڛMNBv!,@qRR'i~_W#+/`M|!s/-a?u'M";wKL>_Z;Xz攼7 ſFeQ
-B;5ޡnH*N)YuF/vqlU" KMg=)i}ͬ9~eUSM;{4ޑ$dPXV%SOtml' ?
-S#oFM
-"**!O$ 3@,obkq 4LkRךr_$$1PqyŎ\ ..PgB9D,.¦&tDd8ǾaWg{s u#%ה&~lZ)r>n~p"$ݹkMƾrT9?U;
-Nn~Nc͊GLK̆a=TgS'%lAQ1u}$?m>3Jz#p6s
-0*)Œjs'94ôFĦ
-7 9isAL;cS̴6L5=Q] 4"7ưo
-WΊ7] ֚¼&Q<4jMsvNu1(h!L qP-f>ۄ]ZR~%uawzt 3kpݾdo8/I(0<8ٚn=3օ8-٘, Rꧦ^I(]EuyaU6#ҼÁ<$i;xGfmI];q{Ӯ*; ^ u<yI<o>j,9}TPj'>\q<}.0:0(P8&~@^F9UP,C i5qvNI!vlQeԟ"^U6w0c;_zND\ O%Tl kSa6Y*bb|C}v9b(Lwp pD.^(i1Orp 4ʩ 2YO9Vs7p~Ic>ǔ^'{q l 7@$<}2,9CO#+,r.[#@00(:,;EMR{Ah^o9坷=o[i4_ᱲ,m[׻ g4 1Y V睄ߤ
-d~6I4c[Wn(.53vF^֜0Y#"rP>GUGv,p[M#= prPCٞIWS^orQ[,OX
-F$a" anG g5
-ȚhSu`^ MϤ-r<6F:dmޢol-zk?Ff bf
-VR04 ӫI'{H&uJPȿ&Xi<>ʟ>g,8G, Sv)4܁~f5N˅,3-"e Z(h6Ѡ=
-ۨ:Vў
-h%;qS`X3%?i94S%΃xҩ#hn"vm/,7_\`CJϚmR= t{%>VaGِ#IX[_˶[ f~/XF=r-+cI1G$kûkRw :N -Ė4e/
-aMogZz
-_TdSEɝMy񂋈#)t'լ2ТL
-[H(zw?fLsw6^Y`qz`p3Zw, MGbqE YE>GH5D"m)Գ7χ?3(!r|,۽MkNY~׎$j5EEET'{48JÕ -bȑUG TeH@USԜA8M/. NJ˚#<02M'n%Ҧ:g!Ӟ\8CuUCC}͍?*ӈe>E!o k3BENԱ8+:lT>[627|CGX]E5& ;L050
-T.CXqI OR4ܝFF;~K.0zes6E_إqh//gJwZ%~ xع򕏬Mu}*أ'qӼΙzE[uA e:m(o7~j^E*RcOCu)K!~|`߻ !
-z(Uc1Cκd;&OG0Q؞nZ9"ԓ͕A0Vcaw _}x#5bXf&f_`7FML v⑩fQ86JlU{`]kTlA x,֠KWfEA|WμrmD^(SH6+7(WμcUA}fMֺؓ$qqi{R+zI2H`2&4H̀DԽ]z^1zEWK4פ:.Mv{ANXǏ}Q;R)klQv\PG@GQ#*<y{+|JJ@*
-Ȍ_Y(*?;+2@"]7#z3Qtğ*#9[/ x8١<4|.
-)%UWŰ&:'ɝjUc5{ Tm "՜ {ͶRM5>LiDfLORUӋh;!whzjU<%%l):!qj j"vs}uӠ<lcμbe`6;GNa͏T@a|ŕxX/8&D[_oDVcf]\h40#plm#cm!2l}[kKˠ1L 5hʡ  d8{C,>(
-K\zf=j%
-/󬵹0tӡYst?ePm$a wx|ec0ęod)' U*h}jO+;P%0=T%@ȱi6e|LC)JYf=+^R3%\lqJ8
-`Gp'5U!qD U3nF ["D*HxcYL]Gfr+ +)DV*鹐
-OYe3< lsq&[UD[d,
-
-RPL5WN7h$el LKH]>!آ?n5&~.IO|X~/}>weϢ2}O/9@Gﲳ1VRzy{Z8Ո=6:)},Ma9
-"c!U[j/}i%OS
-߯\͂@8VuZR,3Fpt0?˔*!E~o)&WF~te NNbe[@3V1g 2UBka
-X'͏&K:o'W헄nA"Z/F7cq͌ j?_$
- zhȧCe3EMEYļFc Eii`I}zAu_*<r:td1ud{\h„g>ZkϫD_xjGm:g}`_Y\BZ9Iur dz[9!a=xkÑt^11t<;FS_2F)wxu
-FVQdGd'ĺ8y.r_.BT \KmIwPdN
-`oi5Zonw{epxUS.,u~X\>4O{d#L&#{\6aR/IVI.Nuɫ.*/tm, |"k _H
-˅)ITZ: oRX -d"U- ך{7lI9ujLhjĒ#pnt])(N?D}5#ˑ@F']Yu9eC+a@lr^NI淸m⡝ՕO0prZv*[eo,
-#EbMF?hSx xLAn;]}/;K3Sg;ޠ=Z73{p⿸5|^pSĄv"0HrI9'U?&P ŵ(mlSwS
-*pòPShm8žOe Y
-|[%0p˾4<v ?a*kl)u3L릻X]U9n՜D{5/*2M@]Mr#k S)a sPI sp$ΊIQ۵^  _cw ʚzY|ޔ~%>WqpP HX/.i5YfUg!"*KhHߗ2gX\6a&fjc7-՜N;+%$ϛot A-%N':lDic%>ukk_=<1WZd»RG
-_ͻZy8dT#ZeD2Ɉ28!)$k7CxO zN}[6᳴09U}֊KWtGcU~Jt_֦Z+2!Zd-zyi4_w>p+Ɍ>3g&㶽݅طHvUgFEp$&:AB>=Tn]_>]-vJ0/ey7/Gf2t#j[g=5Zވ;x" V9pMQ1ynqd_8#MTi9lFEH~{`v̱C, `ѸE
-f')m۟DF2}˧}6߈X xIlzYDM\34bEtӾipvf|l%ֹ"UJ第Y8_sH짊>F,OH@S_`MԻ` ;Sg7tiP9{Ya8,)ZpF~SJj`E_IOtDe8hr.R6$z4j^S6z4j>G52M|8,g8<^fһu=SvKnt*ҷmi?j2,ikL+;ݩnu 8P<6B
-0U!j#R֮86A=D a
-%οKҫKh/=c諡Uh_0X%=yo}lRwh" -6;O`7>IcbJ_:wS/O uWCTo#;ٛx݉
-)g=CU[8$j[$O1g]V~sOaQ1LəIpDx[.WY'$NQE#ΡA8l+QQ1SߚTO}tg 6K!::(&Kk3\QYd!>YyMu>n\nR?1Z{2"k;xr
-LO<u 8h@::On(9)ܛ%a WvLj1oKUe䜅`BUoD*2nT|
-,N|\|w(#]n%k_DabEl|ٛIf=dN.~M4t $3d(1b}P1V?bN)a$kmW폐btTTbN>_pP]R{/+qD W4'F=(r>8,f\htUV9> xɅ);g.~j p ah? NVtyp쵋mJ3_~{Wc!~k((&zs-nyT#[P@V[?g 69ίD?h2=5d3ITF"002]2>ӞH}Ch Nl^.`E5q" ͂BU9T>Eʚqb\DeSJ"5\ߧ|K-}I<`ԙ& lV6t[k&ppUE란)M6nG 4<h>e7\EkHbwbҍZZd;@r;ςG-ܙ+' "cՓ~ 9[frW\c3/q'24uGhDpWKK3N
-}Boݼ.-~;oƘ|ޙa`|{r]ڀIY=ֹuٸE% ~o<zfjĄ{|F.N[Mԁ}e/rA9?lu)+W܈`Nġ+gFKhhtRhLK6PaSvY/-V Q̌Мc._rQEL]8'akC˛dw$fcw
-|?Yy`0*ZDzйf#LSD"Y!~9mhBS.c{']}O3-aR:aм?& h1:5bl: n"|+UX|ଁm}t1cAͬx0yʷ
-Dop!Tr[)՛wJLP\/%Sn R7&M.T 6tHU)b;,›xnD|(r-j %D)\42P;Ō{$vZ4٠0:YҊ
-v>=9l]ΐokRzO:p$D/tcxɱ&M$vbjRW\pU仟er= ږj2uwɆNڋWu.T,憟VVS|]OV;hJW{# ˪!LG>ng 4KãmHQU)@-̨K/ys<“iABRUua] b*mԜ_6 nk-A3uVNJNEyW3H`(,"{/KNԕiOn"|L|<YEyi5+nlD J3MN3]G'MQ7:7S,ӉKNɩgRa{ U>}Mk'fg-(͖54v^eϏSp{/ym\CV(Y^kgmzu$EYS1 Mg:6veLs<$©/F!&^bD#Ύ@Y"tP4>gyxAupB[2~tNt?_10_;**/@-/LhX6g̶3yy%hs\KBOdM긩YZo1>Wyb(\]^J$a@VWΧ-|L:&bu-[Jj =)S0hq6yߏY %6!?R ސ}A `d$AI4 n$?Ŵ8:G,clsX#*,q-JUܜI삵8 ` ,-RIr,{^#uȀ!<YۋOY#'qN͕0
--50sn]U2SI^hി^2a@|wUB4$[?28ܶ߻>?tY'Y!pY38?#_ȥг3,3ī,9DZ_$8
-BlWPP-ӓ8/樓{N#Eۗ!5!#̀K~꓾nFCaZk09[-2 >WT2/Fl~#RVBoHxEι,:_1~~.m>AI΍ &WRC3;/LG^dt!5d,Hj,&<g.V7}J`t_dYkA-2r_un?:)=i 0͂?؀Vr='%mp:qQ!FMoYz5h2e$v8O(߼ /yM)4B\_w0ݷ[ /FX܉W$W/<w[4SY@&;lv[B,jE OvYak` uNil^6"omCNzP"
-PJCk_.f<W%=Qo46|N
-0`awUdMP\`Qn' Df>űཀྵ,TK7sk9N0VJ.u6.`/ƟKY;JK*cxg 2,ṢaHg~nאT>0]OJ>cH(b9;>[HE {NnGDrels؆AMhR@$ԞL*6<PЈ^QF 1#*`! HOXED)lK`,%ƠANcR?~F&LCShRB_^<əg[%v92L0X߆BomqĨߒMF`zaF
-eKڑ:$a~O9*3FX@;n(4igH;iH1]5(C}]\-5OHPB/AvJ"$ԗX&O#f:ip!k8dlTw9g!:h]FqC4lrK5NFl pZ\IUvaxb3Io?se\trژ7-~#>b\`>d8V0#+pӅ%a]&~u(1V99܇">=M@gRH.a% k'+_Q6rxV,e7?Pv*V2oq= ( s?{m/<϶oh]*{S3"5BMw
->^S~|> ,J
-*2I-7ujE\Q;D[(+{,QH&[/>ӱt,ޭ2L;QxLr? [(Rr=`2$8f]2[E:)1bD|ibg<9g2IQ[*9B+N !i)ĥߢ WFVQTVSg.ߑO򘘝a(ۡhdR}),eX:
-6y~0B;H,PrOލxenuإt8)wbL!E&5m1ndxw` AMN9OTI0ʃhikpXPyϏ>&Wv0̺e0 =~qǻS\ၸilIp xoMG#M:? dMQ,v*Z^|
-1hI"ĕVَ
-I>/X{zfE@e8Yp.5RAzvh%.z:чu>Nl51TAʼn6X-^_Fv JW\)F9=+bz.B
-n41o]dfq{*a o Ry$q
- \Gp΢}ژg D2Ҩi͑fRal~7b> ,bqLA  1+:<c6E!h:Q<{|QVTf\\Nckd̂%߲2fl=q>V&oI?q
-@4
-XW 'F d[n|FfG
-. l[R.|CzMpJoK"a&mICc3M/;D xM٬%$'o0L~:z{{rPO~.๯jNt#f m}B 3i['+_7]T:"+_EDV+bp?zV$|<'Q3/R
-wwqc6eNʐ몱=F#s`u
-i[9lHfҙ-A%ufVyNA,& .| $5+W> A,eg7MyW  j=B0gU {n0^gt]p2nu5Uw;bnx s,Bכ+ 7 _(|pCtJ<H2(⧫]z}>z;VAY璚30mb+}b
-..¦S,u!?
-Ҡ[Њ8I y`|k 9*f^1q@b; )';B&o]J0N@Hȱ@FPЎ@&[I 4>r;>[&qN
-B+6fn|N|O+V|"r/`1@LrX6)|jTB0ցm!At[$v>cW=
--'m # j) uV)o8]O MXL6؉9@AXKm):bXkKf /,^4 q$(B1*az&K$J Ȉ6k݇O=9IA0H>uPό6w{X\|-Hg=bi.*!KZ_)y+i. On#DЅ,bbo'I"%TEd
-F~Q,D&&cU9!pV(N,6;Nq,
-o6
-:(3[Ms.b$2'
-*S?Џ6daTk {
-afCGN7ϻ :+!:SPZF$晐⎏ VA,r.':CspUʵ.ɨM`_d5?\Q\/s}`tuL}GO13qO!U4L2ȭ iPJ"ɲ
-95Z!s_wVα:j dj q'E9m~Kqa8A5HMk^B(vgW,%}| ET.b49-Yڀ!U@^"6r/5)Dg-z;#=P7漚;ㄿުKpm. aջDXn'adJiENGŚ-֛{q9,V[ 23U@b7|0_/_t!0qvBH2gh'ad{2l>3$s
-Ttje-Uי Vox@HЉ֕S˨;)1W#SmLJdzh-ܼu ї2\w
-BR 8գ?6yی G,Q
-i)(x"AqFg!1Γ iW+J `[+t6"K^- sE(9*;]oOI؉
-_$_H> WfK: "[BK]9'0$RϫC!e5mYD
-9qIN|\ w3н
-pNxiH|4`ؒlK<a755IgjBoӗ:إxG*KĀiV'{U nfd$#Dg⚻4A~jG?S{7 L
-ƒ}?k-, [MR5^v]̟
-ptX2ؤ 3νKi$ A4UE᧸+$14=5?pFzVdUD" rv++Z39q]-#uؘErabDRu}9D˳<PSbm^$W9(4nCKGH#/PTӐj/2B%:l~#jp6hp&
-.CP'3
-PR# b|-F\{yV8.pb~z;# wٞe=‹!<^]CzY.*
-ūaA㗹i=_eFBP)@89WTg_FT./M⣭'EЦf8$G(
-
-j8Ц=JD*RCRJe yud@lRwmqe-vkNu1»ΪL(-V,ru[fS$FVa8t(2):wԸ)N*V5;Y k8m\B~M*c[ =fPTe^uǮw\LY9k Vk*%U2w<ˣzlfqAָmNHkf&B$j0EE*E\D,M+ 0왇c?щ n /M9 "*qh*&:ίWԮڀдpNel
-wW9O<~'<nPH <}#IEv> ?_0#GUa6j.0JbHBlv>
-nu:J3/Ӓ] Ͷ8
-s䈎/J<?ֲ]w<ӳݐ H
-SX%E*ɯ̺ӟ/uL~aP>v+ :Aٛ,?-&i[Ki i9J.I)2H>j uvA1+Ai5W U$5qW' 64 BA,
- {k jkMC
-"-LǔYcHe wTQYu㘼D8噺!t`+Gח;a Ĵ_<}@17uu]T!/k. E3>-67x]$GZ
-~ofeoRGEEe;aۛ
-d&,l<5,ܷul+s,rvrtSQP_wtoGVd`
-\/YL8]FO85%Q,|,;Ά-˪;9kȉz;|3H5P6Ha1ղjY ALϳvVFTKGjŗAJ|@F/V8(Q͊—ؐ_۫ZαW}(Bȑ5!wu#f[׸
-ucdBZlIx羜g1Ħ\Dscgv|W}=$~;  RuZ+'Rtԓ
-nrze㗍WN{\#tm QUϰd|| ZX# ޳S{0fӊlU+(MX @1ܩ ɳ97.m @E:1z:US$Lbh7)3U 5Qmps"ȋvF<{x@x^«Ta
- K&
-{\s+"JujAl^5tIӿSh1{a'ŒמO|h{2Q` Vql1&׭_ػGK"cG2ucq젼&#麷\_'錊ׂrL?6FfUKԒ;n϶҃CK _Y8t Bʉ+IC+bS$H%'qQ{5t몛d=Шߑ2R}sS:a:u1JǏk?+=,WO;_%lh5@H%Ĵ #O'Qp
-Jq/zEf΂-xBNN{
-r^r3FϢy?<Wc{D&\X
-JĄ ҧwk@,^=`:ѨyZ+i ~XJF$| 7ߙ@gkw_ PMEDe);Ĵn*dQdWg H *hW%A\MZQ1tzpf-̑<7{~^vKJBXfZWs:1A4nJir[O}oVDb!@7FkAw҉M+Qvg=[7Y!
+/Length 31177
+/Filter /FlateDecode
+>>
+stream
+xڴuX> %0twwww
+s99;+#`fg lJbrRLcRCԱcvvww>1IE~
+R);3 -o$A,3v`7;nbϢerpIbBc
+4?9[lm`c/`
+3 vETqmZ*'D*f
+PZ/$;+ho%hJw=D`^~υs+ekqr_ Zv~y2[1 gH|P5oUCLdAkP}S)G™/L<>):\xOohRo /1]`q46>ѪF-o7{Za+\<;Ħ?*c])D:rΝ> IA-{%Y a/|:@061Ë,0* r "8.WQ|]cʱh"_w#"t?RnZ: ]Z~-DYƺ}{RIb.`G69l!)5/9;Vgid\s" Vɛ6>뉗!3.[!}1؊^M*-ϵd腝xἷg8^9:!1aZ5{|dl}]y@ڂ@S.Sx2Z%T B!yG[ 1cRQh{
+Y}~=jtfCOPVNl3=,Cm
+B `Sj!ϐGc!ai}˹
+e$;REdf/:=3ɜ[o;>"(貿jqod9?Xʇ%}¹ /WKk2côo}L%
+喖bZ3=bLk[>bA=)dxokK-o*Vb 7|Z$XI>$W3@_ 342sf˿Wc?3Mgz Ua,ѩ,Ee^5G&ռOuVywz\{:XTJ0%/dky=+2]8l~G~3Jj0~+[1sW}OY\SUށ[jߕzc$@#oYnD&nq;頋y .4n(5bQӘ<oq&1 ɫU h>$ nakz1C7ͤM~|mr ,?-EI
+ϱ%MsK8ov]SX׷iߍ8hv&wcCW|_XPol˞e&j,;JzFW⩺PSт~~tfaXOT{9(Z/8BI7Hÿ|e5r?fKyEy1É uBUr)jf¯Ҝ
+v,yPߝɝ
+FF zh )r}JXXuEvlnѠ"; 6P6|V C.hYpĎ3TՊk,@Ld>ŵ.]à ò(©),tܵs`9er_C4u"e~r VBU֟zCq V6pF~ѱVsv rq;}7#=V_De
+4 I/jKuacV(E8ϧf#gsNEsvKY&#-*Y2>̿,~ڑ\`?9rtN6i/_ժc'2dɏZ<6JvH^i.|RMudل
+oE,XfCL!Wn.[Zޠ' {<0;*W֝X~v!YO;ъFH<!˜GRxJ϶?hZ7AyoA7:.< Q4{6tVLc2#ZO] 5ɻ1Ū7!Q[q#rP4[E-Cs<Js<tʆ<$9DX"ʭF\*I
+~'I< QA?;gcnwڌWٞbl;^ߛM3&.ض| 4p|…O
+e\u@\ڬy'B~EPgjE+["=}ô<q~_šL7GDݏ^T]Oڢe$Om"Ak{;53]p'5%
+&uҼ>zS7
++Z[j""gjMR6t}:>}3uhE֡Oob_<g"r;&eumxaB2<ܠ$bǶS?v-x .`-jgχzŽlh_ЧzЭo袣IBt]н9i>-hصj[y{ӒY쨌+OI!v(!<
+?Q{ls߈]xچϯ0ݼ/1xoDs41Ć&.g;*,w K d/zj܃CX&] 5[Z\[{74QHS|UTQ}yMCm{;TfFhD$F|c%4-,G _AX {Ph2@,΅[.>NdMgyBR%ը@ti
+sY
+z`JGRI'[=)K{ƉK1Ch̫p<>oX* PJukQ8+ '/HL?Es9cׇs/LlKdQLm7]&}`7AsFb^jPqC별$9}̎!Krew<{<VdYo۬rW%uKV8UU4'ncV:(?pgU|˓?7>Ir f=%1F҈.0z3۩΋f.6^ V e"O
+G5 U bKP -m~ C[Y+
+)TT"d7v~.>DK=U{pwIz;%85,5!yr̅Ie)(
+',`>f RFsUDX{h)ux--G 䙄R npc;Nua%^6֊R=XAzbt]! n`BJȄjb>( f"d9J1ʓSv,XJ tG
+*\xJ-dR/RF!И 0%9)iA{wQyhQ ]YP`TWHIq-`&=T><0N ;rAƳu5sYE 3=Kei %k}#}  yY4c^o_O8=m]JY1+$jy۹3kQ]o1*39M:B{gDӞ[7R('iPƝxE3RwS
+|~b,x5Ru$ S@Yt5vb3L"W{E.vk*xj@VF~>N|ԯ:^%(ڜ{?f.XV$=xp
+5s_J:fў2H+paD#%/i9S߳%Xhn"VM o\@rmb% tG>fAgٰIX+k;@=z&/85+cb<-vG6 k#k9wڎ~D ǥ/d~}ogך]
+~HgozkSey
+MU3]yq9}4`z f=3qrƺ?:Qh=
+^<Jg:Q3h)c2X9)t{ż6ؘɤ09oy>*zf&}cvn돓3ͨD18Y
+f5b- v<.x^u~z%Am4 Z`;JT>Hc)nC;9YC нK*Ε\DMMsve]×.ċMfZ'{=WDIZ\$)m{HS(CKU4=nލU%n);x<RKux2tYCQ>pDd҈zf9z
+-;h@:!p(t1LH܉G嫰 v2"8 :oʉgy2У̗0= ;gDN5-r6>OUzo#3XD$#L ڍ3 OaZ5/签4>0Ձbɇ"KdpaoƟb^kԾ aWJ5*U|J& t-yDa~G=]Ja%a\`tƷ47>6
+%%ڻVğiw ?G^;Jq* B<ɩy[䓋 *U̷62`ꌵ\&uWTp5S?6
+Wq4}0J18¶w>6IYG'h,ԩygVY~݇h(BZ Ώ
+F)( X-uuCrHdz, *2ֆ*Xݘ>qi|*RDP])6`|36
+ ܢAr#b=kBO Qs4yk+EŅ s~B X{j:A8[CpD;C%TNklYHMHK&Q ,QVxkɈM씭9Ør?} c, .|ssAg 0pEۻt}іpJ!DL~tOˀy(k3$jiTI28_B-`fkTx:ck7';MG],OVD6ѭUL{Zӿ?'VÚBL\3^Y[JχN!`AVO!x,Vg 5N٪$?$%a8 :.-ߩ̞a\?8ս@phAAFfs)I&Rp:10P^! +
+݋_
+ -1`1B76Hz`~91Q-eDc6f7Wstj\Ck^io^W^'1xC~UcgнeO7B0؛M!- %10'34^ onb[8XUs~ݿ=H2qG2qפKʌ84~e(Z_=tir)n4ʺdX7<;ѝsqݠ0bRxko%W ?p} IյM?y
+`w n] &{9fI@pA5{|e&ĦӝpleoN7'H^$bkXFfྸy
+ uaR.҈ϙ3xB󪴮7Aq逬YQT}y'ﶀ,\D4LsHkDpj"!svhl31VA{~܄N2Wpc׼dwG]wVem7Ȕy,&vRS:AˮmܩhUgY1o
+͏VLkx(v<&^f^4wE\'
+3ONvw
+t}?{5o$gpla˲~q>? .xy;脫sH8h2bN 1ouÙfTwq߱NQ>%eEØJ.6]G?.S-lI_G9-@yO) domOj)%P0yCA`4CM\lŘϚ^C)⹓f`#~Ӵs2}!o2u/5AXc?/lu (-[I1,{oee#߱ EE5W1XBS&n+.ZȜ
+fBVֱxRQ#B@0llE9練K`e$ے(ûQ>8هػƇ@'~&9eJx< X%++d緘~4Sm fnt!P{羗^}1Z#׹K][g SO7`x!y z١>FѨwPxΝ~Eω9.j7< * gKIi8XAJ|ŝc
+s̙ T34>O[8UlrΑ#8.맪=JIQ38j롄A㫹W+oMB_u[:n2O`0 1LH:Bi6b~&Wۖ}Ҹ!+\q}-[rGYÏv\Q#%\*HX,;ZXE;/ŏ*v!'@G<{Xcܦ\6@̰X _;Pf@%˶ΞŏuՂIAͮ{!To'CJKË,rے i?JJ.ado ԺRFzFbгzߦJB6\G`C ]΍( '3fH΄$ثePh:+!˶>15af1ɓ\嚪5a
+=u d;jZL
+r9jqѢHUqP0&|4P*GIGRU;UQ+p0B3Ĕ`ה
+E}oW;y2@.G*P+n=eCUDV3 OK>Œ
+^a7yˠ@ٝ_{)h <?yy{]&FAK|;/݃++HHf:|3Ml9^C[F
+[2q_qhq'|yi!K̉oS5 ڸ'jguv)wTI#gu&5[6'VLKWSs[nQ.$u_gZ?PTĺ/:MF+'W&ZiX5"5Z_芺_7"Me+<7/(I*'eKS. QI;^^:7 "V8gɊAZ慮5l- r'bp\.c2c^;ij{Bk4|y!@ bTIߧDXT؉!C^j|IF*oϷMPgmłȒr;'m|-e VJڼS`Zl)r,ZSB
+`LOAd"!V&NuyqOg#X6>R:YR4z<=7ͼ>ׂFDȿgɱwrlON/yuhҞ=>jC9Te,]rbK!,Z [n'JT=[)j.^.o9Qj}M[3Gy"8c]Y[Ns9Y~([?"hh=-ssK󸝙=8>M6"R=ZEE:^ ?%IW%R2qe)}UPobK^`Yuv8Y.;YIY]]@6XN߅ ͪcwZaO1l$ rf7D]{{i.(L5A&qG+~t|7AXt*۸~LH#\,ףk>Ѽ'$aM{eGs_n{IN0_,-G)J;>{%*m„ok0cAIv;j֫"."I7^Q'ɪvhgPr0õH$jX6B2 F1./4,"ur
+fJoaҋB(Z62Ew_#Td4 p<me\Ѿ3~m%ٺUTm魧HB}aPvhtpՄ7^iNrP䆴6֟B@9!D+U{4lShb֗Ѣ]~ĕ*\F\}s6+1 x/3^JY,Z]]hnksal۶m۶۶m;'yb۶Ķ9o[mCWZzvt#h_Z`Rt>UZ#M8 M+Zb߸`JwF"KM?D+y }O:JlK; vׅ&`3!|xzKk*zȣ }[+x$n/DjZ*˱DrΞ0ŻIydQSigq+s |X߆ta`" ų9_D0Mpn_մ2SI^ht^2a@|wWCV4❤X?284ܻܶ>?v['[!pY38? _ȥг0ԭ0$.;DZ_$8
+BnWPT-ӓ8h{N؋&-HԈבTgޥ<K_ 2]guQx+ e/F웼l~i+RVBoIxEι,
+y2e$v8O,IغyO-2B\ p4X
+u-q솗 lX.>w[Lqw3Np%uTYՊfE%<Cg4&Pm.EQ񧻇 TsġD DTB֐9\y.~I.~qDzo'hn32` [CO#͞K?lŢ*N Df9űi̪VKɝ0wo=M0VJ.w6)d/KYm?NO`xV(
+ܰqd0?whHX* n$' 1urIq,XH {NDd|qe-TrځAMhV@$ԞJ.1<PԈYUF 1+&h) HOXEL%lG`,%ΠIAcZ8O{
+!\*S/+Ԥrx3Kv Zc6dZK  U%g(Uk郭}k*3njW׽l73:
+(|
+};QZ)vM7x?HѤU7D2i-KA]b1搌{V~OVvX )P1<Ct+2kn$ & K~>a]2D1\'&XťRR3Jщx W%/NIl+%H%֟At~ؚ
+
+<XjX#ڪ\Ե
+/{>"erezѭC*s;}({$Kt-IV\es|vI0Kp
+ P j5ŸpߛAX|فGsDrznHt[[3Mw\3dmyB+N \֍ai)̄¤ߢDSΫG#`R+N*i3 M'yL̮0ViP4x
+1hIĕVŮ
+j>Fky6z$87@P*ešŶQD*k#<mQ.PMB[M 7H] 7>礆A <T_KOa$}x^~?R̽Ȋc]zC\t{M7p~c6A V39Sbon = ;uz0tȟ]8`_BI ~=ᚆG H\J&H9*Ťh%uNNQ15wX\#=F $ &$ 3|nE}}7"^]}%_'t;l(uY6Zr~z\M&U$VuZh%KH}
+uJ-=c_쉡Ο6QC`ʦD$39bPl
+n41o[dfs{*a o Ry$ nq
+ \I@pΦ}\` D2Ҩki͕fRcl}/0b> ,f*qNA  1/><g6E!W #Bux $t= ͸ǹR#!Ș sKȿmevȏ3 ~ }dM
+ hM8,4h*C!}z6kN&0EIS=f϶3EPIvZH6
+d[i|Fa#
+8ǽ.ǜ֒o̩WC"fdR?ߪ
+f/waxots:.زkDdy}rDI^>{s@n0vj=ibew$D✄LAF/fwƒ}v9UwCTE6-| e%=]y8U`)ۣrrCc챤r™H
+FcprFsKjY ]8\ɇ=9h^w?(dP"0݈YB[s C6|}$J0$4,8i79ϽK܏K _=|9qs4.dˤVy=ɿ޵`2KcHsh9rI/bm%>hBj⹵' fR]RG/zɓ/:č-aƾ3y^sC]ed &8$)u`2!"lS%EM a>^~1r#إqIZ-?5"] 2X6ߙ0>h(duO0e?p6BIdTh.8~O LI6wrG3#/4>.q@n3J:+U٣չE IiTX95{32 L>;B=?tˠ9̮y6cA~C8=eED$C͓vtߨeI#>z_{+c"z̆OqT) C8:y$p AW3|74=FN1'oU)(Scm!WI==7Vse,0 h#jx'nG~";Tp^'LDk%p;)Y~6W0}xUXupE˖<q5w۝o%xaRc/A O } HؤGC?r䖹A[8Ytj+tPvj]r75ЩKBe
+9F
+U+S%ppI9}E,_yk0ͣ_!8%17UEͨ"l :Ҡs0ua8$ Lજ`陣n6U>?
+ bX'8 Bo<d(+]Y6Mf|58"B4$C<^eYF,2 T 6!iDIŚ>ۼBBz|M_`&S4@%{f|_D$RpR?V<`@Q׆,
+nsyݜuoW2-F!llyV`Qz%Sg
+Jό<Rq
+pEʳsRRXK
+j̴8I.>yK(*o; !D2Xcܕt8-Nƙz猄SWKf2J(V
+VU,Esb&QPa,{!s\Ah ed4YR_ŕYswĂ`gQXzR#sƇD /L
+Ƒ}?k-,XMQ+)zY87ttU/cf !!>IIi㫉0E-OuW\Mb`6wgԤkX͆YM]L/`Z hH
+a+ (fͼ
+wej9[G֟\i|$hYg%ëKG)6a!. ଏOL3_:+61\B0c&v (^!ٚ'&sN4#*f3oDE:)#RgP4T_P u{or WbѾCh{!&T`Ǯ#6eb_H`/<CS7v]L/1Xi,>KG)iڧ}$Ca/7>stX@vsiSf۽UeWt(25܌ku U:e\$Seӟ6+BՑV65I&b]yU$Ko7Q=?4'[4ݜ.h.AK%x/^@UASpC(l\æ!>m]*̿u.wU9¼oŋm=ܙ)v1iP`.b5BuݞM\SDdmxpi2u.řsJCjN
+3E4C$I6q ү6 - 2?x+e Gn\s~s椤F:PDYyDB3_#N{VX2XZ,2"Hq<Qn5ޝT
+hU0ʧ說^,"M{R-_TIC P$NEb] =42K_^ 23cώ%ﶏ<819ZlǨA?յ)~C&0
+̧xcg:?db] Iͽp6~[`}W%ޤc_HZsN`oH`+qIX-6Up},nQ.xT_yLDKj DElM;xbM׃z?j
+ϻG7S8Ĥ$_jPǖѺPVKqqAr?s&KSҸ4E>н1oi!~h<}Zbbi+ԎFNGe'HZSŇupM]|;n*{NUm)O\&0|?DIțL%@0BZ_$+Q/X @2~XYoNF; m; PZ^](yeu| ӹ_
+i(/SK͹Zԯʞ2g93EFӷ"[WmȜB߉賮mrc\[ݢ$_;7a
+rNmGlOphJ0ȟޖ.qTy;&
+:
+BV?":E0^L̵4 t4jD\&j$"7}f6p:j)G]em[ { c/ Ye^rtn̦:T&F̈́N D9%Qq. [c?BM-1u-#x(߃7BQ?ńR*{!|D'V:x}BYИ@T:M?o4A}!dLr]%=NeDi5ߞq@H% k4l˯3 @Ͳ(W]gqg+UÉ(kkpm g9 pgL!9rXG2by*tD7]stqk]Tir]KPu4\9BA(r9lA5+&Wt.t=ǜ|}"r%9W1@ą`x]Ui/u]\@ K]WI=2-9,Tdoو_t5u$8JW&sc-.5L#βF GNdG5Q
+o쨒AZ" RbA႘8}Ƅ޶Sqse0@UbB&Eͻ3e2%ɘ?CぐdGJInDcΈ9Fnl(c BOm
+Tظ!ftOFI@a\zuyemxLhɐj`RʸOܔ&N:f37|bL Oi7ZpI ?&bDZ4&9*"jk nO씛".(͋/E&`P"E)#Y ;< P<3Ep9 ~f
+?1&_#FEQu-2#hS\k`-bxSjN  )a%'d?a:51
+Ot| A­OQ·z=2
endstream
endobj
-927 0 obj
+931 0 obj
<<
/Type /FontDescriptor
-/FontName /KKYZJG+LMRoman10-Bold
+/FontName /HCXCTZ+LMRoman10-Bold
/Flags 4
/FontBBox [-486 -295 1607 1133]
/Ascent 686
@@ -5691,11 +5722,11 @@ endobj
/ItalicAngle 0
/StemV 114
/XHeight 444
-/CharSet (/A/B/C/D/E/F/I/L/N/O/P/R/S/T/U/a/ampersand/asterisk/b/backslash/c/colon/comma/d/e/eight/endash/f/ff/fi/five/four/g/h/hyphen/i/j/k/l/m/n/o/one/p/period/q/question/quoteright/r/s/seven/six/t/three/two/u/v/w/x/y/z)
-/FontFile 926 0 R
+/CharSet (/A/B/C/D/E/F/I/L/N/O/P/R/S/T/U/a/ampersand/asterisk/b/backslash/c/colon/comma/d/e/eight/endash/f/ff/fi/five/four/g/h/hyphen/i/j/k/l/m/n/o/one/p/parenleft/parenright/period/q/question/quoteright/r/s/seven/six/t/three/two/u/v/w/x/y/z)
+/FontFile 930 0 R
>>
endobj
-928 0 obj
+932 0 obj
<<
/Length1 2513
/Length2 27928
@@ -5817,7 +5848,7 @@ Sg
3$L?_}N&3 ňTVDG
endstream
endobj
-929 0 obj
+933 0 obj
<<
/Type /FontDescriptor
/FontName /LQAAZY+LMRoman12-Bold
@@ -5830,10 +5861,10 @@ endobj
/StemV 109
/XHeight 444
/CharSet (/A/C/D/E/G/H/I/J/M/O/P/R/S/T/V/a/ampersand/b/c/colon/comma/d/e/f/ff/fi/five/four/g/h/hyphen/i/j/k/l/m/n/o/one/p/parenleft/parenright/period/quoteright/r/s/semicolon/six/slash/t/three/two/u/v/w/x/y/z)
-/FontFile 928 0 R
+/FontFile 932 0 R
>>
endobj
-930 0 obj
+934 0 obj
<<
/Length1 1908
/Length2 21326
@@ -5924,7 +5955,7 @@ f7*6R/][LPKǐg1xˈ kǠ[f
*9M Y>pCsOj(P%6[e?N4S>y o)3IjsP%-o#\Cya퀾 o'<zQg9,w(7KlU?A
endstream
endobj
-931 0 obj
+935 0 obj
<<
/Type /FontDescriptor
/FontName /OMCPZF+LMRomanCaps10-Regular
@@ -5937,10 +5968,10 @@ endobj
/StemV 89
/XHeight 431
/CharSet (/B/C/H/S/a/c/e/h/i/l/n/o/p/r/s/t/udieresis)
-/FontFile 930 0 R
+/FontFile 934 0 R
>>
endobj
-932 0 obj
+936 0 obj
<<
/Length1 2102
/Length2 3356
@@ -5969,7 +6000,7 @@ xڵUy<׎[(ۍl1,C3ǎXK!JHdO*"=(iI
x~ 3gl*gϘ8׺#w<'-/a3laNF6(E ?l%?$p/۪5 麲LˁneMNY}]졄oe S߮aB߈3ɔёjGcDo 2NZiqky6&GvOGWT}ܔHܢ˥۸jR/AA~ޏ@{$+K){ ݖd"sT@˚ȿoŤUuTN(߁
endstream
endobj
-933 0 obj
+937 0 obj
<<
/Type /FontDescriptor
/FontName /DLABCR+LMMathExtension10-Regular
@@ -5982,10 +6013,10 @@ endobj
/StemV 69
/XHeight 431
/CharSet (/angbracketleftbigg/angbracketrightbigg/bracketleftbig/bracketleftbigg/bracketrightbig/bracketrightbigg/parenleftBigg/parenleftbig/parenleftbigg/parenrightBigg/parenrightbig/parenrightbigg/radicalbig/slashbig/slashbigg/vextendsingle)
-/FontFile 932 0 R
+/FontFile 936 0 R
>>
endobj
-934 0 obj
+938 0 obj
<<
/Length1 2355
/Length2 10626
@@ -6046,7 +6077,7 @@ xnu7Y{Z?ַӼ |Jt1th%ݙ7ߒՌg4՗M[,a!G8;m*6Riz
tϓlͷm&2+CZQ'2=
endstream
endobj
-935 0 obj
+939 0 obj
<<
/Type /FontDescriptor
/FontName /LJFRVQ+LMMathItalic10-Regular
@@ -6059,10 +6090,10 @@ endobj
/StemV 60
/XHeight 431
/CharSet (/A/B/D/E/F/L/N/P/S/T/U/V/X/Y/a/b/c/comma/d/delta/epsilon/eta/f/k/m/n/partialdiff/period/phi/psi/q/r/rho/s/slash/t/theta/u/v/vector/w/x/y/z)
-/FontFile 934 0 R
+/FontFile 938 0 R
>>
endobj
-936 0 obj
+940 0 obj
<<
/Length1 1685
/Length2 2275
@@ -6082,7 +6113,7 @@ SPˤ-%uRr
C$$,<y,\
endstream
endobj
-937 0 obj
+941 0 obj
<<
/Type /FontDescriptor
/FontName /ZBFYGJ+LMMathItalic5-Regular
@@ -6095,10 +6126,10 @@ endobj
/StemV 84
/XHeight 431
/CharSet (/i/n)
-/FontFile 936 0 R
+/FontFile 940 0 R
>>
endobj
-938 0 obj
+942 0 obj
<<
/Length1 2137
/Length2 8040
@@ -6149,7 +6180,7 @@ nr}{g+8L(] D+>~3bnj:,Ðh?>]mPFm%u_yO#cV
o|{fpmC.yѰqaRr2jya6R|^8y/A-y^
endstream
endobj
-939 0 obj
+943 0 obj
<<
/Type /FontDescriptor
/FontName /UYOFJR+LMMathItalic7-Regular
@@ -6162,164 +6193,159 @@ endobj
/StemV 72
/XHeight 431
/CharSet (/F/N/S/T/U/V/alpha/b/beta/comma/delta/epsilon/f/h/i/j/k/l/m/n/partialdiff/pi/psi/r/slash/t/v/x/y/z)
-/FontFile 938 0 R
+/FontFile 942 0 R
>>
endobj
-940 0 obj
+944 0 obj
<<
-/Length1 3009
-/Length2 35332
+/Length1 2986
+/Length2 35284
/Length3 0
-/Length 37014
+/Length 36951
/Filter /FlateDecode
>>
stream
xڴuX>L7H78twwwwI3t 4]RJ tto߿ý~ZO Pэ`ʤr7u3r"QQIMl%M݀
-1G+{ -~m){_t4s@
+1G+{ -~m){_t4s@
0uu5Fb; <@v8X:"j(7Eo `x
-8_m
-^qBMt_ɟMJl$OY+(Ki]E;9݁|^fRȡ_k] y*o%lخ^mDmn/wqѦbK3&a#p]Xې%"QYXRw.kZAm$V2
-p9si523*Rk7 ;{Jxֹ!п~uJF;\C:䝴77^ id|+x^dV’}<ofX 12O_T_`r9{c+D&0oGs}pxqL_-_p4Гډѡ&CW k"g/CAJ@8 jeDJ<ur|E珴a$kڥ.=j;?EpEe,XTRp
-nuϠ(^NOoi7-@6iqozLjAg]Ҁ"~8O5NFX.Qkv@B4#WM7(1KY_T t>nc7 bwP5tvoޯClp+Ge 0E)3tZd܏="B*T4R\,qxV )$B!K
-<fK/Ϭ69>2SGJ7e 1mȵiR:o_F`Lw!Y, AU_?NΏ M~g'}f\Tcv>g 6͓O }/!ZxΒ@.v0J/:rH^`<+GrtfLՅ 鸮W 4!‰ f݆^LV)5~nKχӸ(.׮<h1Pʑ}+,4F֣(XSuԬ.KV X0ZV]wxr[Ir*k<3n8Q20}~O
-uҪV1^&l|+*XG eI5<e6hX{fg-yTbRvSt/SS. G(6 roU\XBj^Dm4*_5۷@z! K{QTETD@AK5;;[CyM7/ʉGTɗ)5CDɆUÉ'=eM6
-8`¤'%Z">uK1WeI!eIU
->ci -J1kY6t.oã
-;e/iå.Wnˆg(5ZM9R'g^+ '!S+iFhgƅFYOdlb1-B+? mr{Bbފ^9ttƮa~st-!m )J
-|4/E,(e)^jd9wes^a d!6F bɢ~E˗W *xbH@"9|VK^
-
-fQesqh~!3|*߻Bp_t#+zvh-eWOT?md^rGa1 +1D4'1a:!X`
-JT,R|BtTy&)өإR @j#bl:"˶}4J^y̟%Juͯm(ˆ-GS[s%yBn2&0<peCxjsCR`xp^mtXN{|!;_S️pkfeCmwdf!ic2=MҳaPTY&NT?<-Urwd{m,~3v!<DJ
-rl0"b?K]?g;E{g>i\c_-+: Ad(UۅU\EdBVϗ\jBE#fr"6qȏr,jf`w1ė~͑+y8J@4J<3ؐa \ۻ-r%to\99 #%"#Sڷ0!+rI.cDŎY7P8ULU۸VHZzGjC=
-.ԱÆ\cSٕ#ፇ.RҚ[>PET[;߯?4zAT1KuO_i/2`P烢k]|~hP* Ǭ4j{/eOX '6uj3bm/f니
-IPK0vL%a.+'aBX)Wd-UW\υ) 6sZzA[rvL XkL3fN%]óv8SlN+>~<>
-s{V.V͗L9Z=٬kp# gVA?.0I89uZvDPL T'O 1uͶvᄔ(Y5hMϧT5ia]qMGr'q/fvj;~Xs&F#|Vwܕh t4-j%7Q )GۜwMHXN.U=.n;ձ'﮽W7%/{o@ݙU^jʏ[E < W;oU l?!XS%A`
-jȸ *.ض&*g>K4><
-DBw4~h,"5#cr0 (J>1T :gS)F=";N^):@~
-ξrPYS@FDntt(:4,*,öri[~ubK, ;k\O>?A,dqpWwK4%|vVCd&}P1[/%-{Ln݀6Wf3b.pqx20r-jW"N>aCsaͺۆe7G%2]?)"kmc4HݤM1FauC]ύoڃFٞP{|ٹ\xzi'G=X6".l |i 83T$m5>,5#<gZF0 %5E-gFC5+|dX]PM0:SX2ڷ) mY%) N`
-nA c۟/;i&qr\zAD!Nr=I{?tt>S 1!ĺF&J;-p(L@4LG˱$w@6'V!ٙn^3MQ8>}Ғ\v|(Ia,?'CuWRafSj~lk^%*]Paۂd5wdrN=S$wKD@԰z92/p&Ԥi-\+횻4a..ՅU〜W$ O%\xk Xd&?Jޒ}j&LN, Yjcq{?ȩD_þıM]~m
-PQ;уXɄrHXNy['{!RoZz#> 5FM;՚n~ߑd/jҧIDy oy۔hJfqpNѪכ4_r*vlT8H˧Q!wLupICsȿ결Rfz]pGh+c(;%"-I苇X]>5 Gƣޝ˦%Yi:մ:׶gWĢM?cGf3
-g(9_`|zn> N2wfpF0 n?RR|Jg!aBl/$v}]Sb<RڨGI%%ҋd/_6A z%Z!V3J70O
-,xJ.sDO#Go
-{SDiQJ%iSf3u)]qsb嬏Kԧʥi섮I -
-uI4瞰.۵,%a?.MCwLv 1mywU}Ovk$'EKV%5$M $6F *c|BFڙ q@Cи
-'U^jT=Axeq\gp+g6y+\4
-*6b< ( " rLƨL jmy,
-c0H)IVzA[R<xweZ>'_iT] (61OV籮˅OhH/hGrpTFz}I
-w^OyN!)$c33Tqޏ8X^08
-)V+eͯfJ+Z×#V J|ˌ$wjAett =+]2G{r]ƜXm)]nft?_?4'sxmCN
-7K+G}gB XF
-ǐUo]~,o&/3Uh|k;iIќ ђPh؍g,{-Ɏ\6tb
-[>mhB-y1$Ls}֫Pu^id۾cX]T/s{I2JxZ4g5V AViOID!^BKc&Xw1mK2^I&ذrv7ޱ0u%QtvX
-q0'"so/,ms|}ڄW9̂Rk2g8č,idvtLT<hښj^/*ӮȄ>.h|.TQ~W *mg0\eI@Ә
-HJ7s
-P+(/*mT=Gc
-ondg!jR cĀmɗwVkpųR#0̹uraK29#8#ZS m9͢F,E4pօ YB/́bL8[:0*lL)B֓ǾNTrCٚ*KuA,Iw`~A#튖 YP:C4sS^(@Ǧl##
-z+#V_Y\
-]JM.F7a1E~͜;Krb~o;\q.쬅ec{rϖO]ձ-ڜ@KC!}KH r8zmQmB# 6/a8rBZc铢˺rE|4O^lұ7/z Ȍ ZTec) ɢ3Gϟm7Zx?8wgH3t@UO 5dPhM&Н^Ḋ)2߬lNw"|7/\=Xꝵwxf!7|be^H]GMBvU?--vN)NNA wQ/R"X@WЇ
-12$ND-(&yAV לL\uGak).'pQW_85W!7K@iKtWȥn#wR%I "/G 00ls
-3:,"g03֫_Yg'ڿ>)n0SF+*y]^BbUlj7.J({XTjl'9#X 
-hdڪ7<3qk*3'܌Xcu`-[u իV?& x1bN?,jl[βe,Dr!QXx0@&#fZN^k79ziId>Ž4УPRr
-ni ݶıyľXH$ J [ }B9O[KY$ `ƔHf ERP,bF^ fۜĹiJTq fh *!M`Cf x=B4J]AA,=`"1@ e*޵<IZE}!Wmu"+6 ;D<9-赬T/~)WZAڧ6Щهt1_-;T jKL ߏL3E1yK/%[QoѤŔ8 URdijg5:WdkYJd`։'3/ ;
-){$Z7O qQبg /a[\P?R4p$b$,:ZAdk}W˼љǐ Um\u pl*m{qQ/v/BݦrrZ_ra"6XMg;6\P{&)ӣXL$33n^Jܽ_3C8q" aG2T"ږg2?/;Ǻq.G8yɒ%({M勷4Eo9~j-߽h%Y[]aʵLt҂lk}*U5ҧyU/~QȻa,ZD)L1}!!?.?z ]i򞝉
-=Ki;)-wEH[uZbJ]
-+?u ^#cˎXc+"˸Jj6ܭMl']J ]oTY^2/HX;SݲHݎf ~Omζ5 }g*Ikk|f 3x+WĊ=!p\1iپP8dw4/AHYۨr;HgqcVYG.[KIi4&8=j㘥a
-w3Ɂ<F,}@>Arc689@GNZ#:T'~zD5 ̲̋ ͂
-;K$Qf%yD=jɦL:f-+|oGT{( 1,O_5B(VblM[@^(SІf]CJEJg8#`y\3 Nf}Dklt|`kqi5㨶 帤 7rĭZXǥ1Dn>U (hZԦΤe'ٳB8NIR!]?T]
-oTHjN"ϡ0,#TKtD<GMa Oq$:_Jqr8Hh"ÿT#]+ SEHGY*=[9&|@o^&sQ[맦j\!V0A(,ʾs "/gpp S*;nP^jYc2 9vya{I<O=ͅ
-r H;pdI1ejh(K*.J1W&QVHw+feEll5I*u h}kb^[˚(K?r}4-ؤҬfw|+)H4d)8ЙܓY {#Z42<Bb28?T1x+3h! JLL>z ]%\,GaGw<O>~ jzW{MfY
-&K7@"*SAj0ڠVSJmEr[6 }]`_d䥔6sʑ͟+$C yH::vroE6M jR{J][Wܺd#ѹ E}( <gyno0\4٦ձ/g4{=%x%Ơ]/JUR]40Sd\:OoDwCUR5񍦏z,3ݻJVb6=7:PYOq\'
- (pif.
-6\=7.)d:O ¾p'Ix;I]#*c!AdYٳtϴr);yL嘸F e\aʟ~ U1Y:NCX5;A3S@V"T+ʎ{
-sбH}#*SB&,ۺ!^ȮYUfiYcK7G9Z=[/Nlaz[eJҝM)=,t82Vq18+0 Ѧb-</)a?? wFyP1'T*®z=0A8ဆ
-d&_t9oh;4;U >$yj`sq#YW^H~h
-O |hH3#my/xe&xDfܤ=
-Qл6YoKdDL1%c\=#&E>c;e
-]NK(3qʾ&2mۨ1BߒN7|>Y4Ru`cUdϗfLz}M5Fo5HGY>)0zF{UA|AK߼s> λ]!sŇ~Bb VN[SpֈPs5
-fl1&>.Ոٱ6"SGto&\_?nrU`H)ʨJ?vIJ{vp:hz]:#7O0!`f G#%(
-YP$>j.`\Aa"͗'1IjQ :<˖>vH |/OJH{6$c'qD=`|lI0-%yX-p(׾yΏJ_z"S<#j;xtP3Ȕ#EWRLé48:f=BvMUfӉZp|mb'vfy|&ǜ^Ygev tN}yz:$Qp7jGKwsx3֠]FC3X87ڗmna(i"(x EV4ʑ[6cA 8]3Z sEa,iKw}> iQ&iM+c^Y;Nrrꏘry[! 4p=j<ݓ|3V)0~FG.ٯ(,ک47F'.83Goڦ?vQr? 0 r _4&Ae.ix2G,h}qU+a"}Dq
-xyUW{uNۿ y(|4&v4k"ݢz8<kV/'y6{(gj(v"( &ι|0ia[H
-J1Q9FerR1L_N3l*Kܨğ#<2xaKC*C "}1u<h<F{ަV#0gd-}6نsAEuCH^,`D%Kg@?p{uLE$ؕ1>N@~}]%3"Ɔ6$+|F']njש-WTę4
-;b
-9u>$Hj[ .YԌLW Օ+E,2@0GĦo(gkrhi\*&5o[Y4)<+BDA6::^S(CT㚙hP YGQF96.ed]…}(Z2\A;YWd7A}8^˲x 1/j ? olfLe
-L*MqQqĝ
-%&>Ddn2jv5[{nCKxȲKDzu;ÆxAj/r 9o9unf
-}$؝DBfԚNwM gy.l٠Y߉ϴk8~+'eva ~7K(h^ow"➨l3equh}Ŗe4)|D Zdy $|^rAܜ1Em4-`#MY$a3#6i~]":m+Ԕ8$-=w*,N
-ju`vJܸ- ɚ?ןs\Mbo_B]r2diCkTlI&FWLcݴN!{wV7v)yI19ת֩ 0*\R,0Vq]h4=W&g7|; '[5ڥϵI?,bGO~U;{R0>PPׂL
-]vĻ[;yh+QQy5q>Xn:i
-EWW:R`ɲ_-u)RX1*>#I`>C@UU )
-(;0z2%jj[x)A*qvC~&Au=ShNe y(zi-Z KLPr
- N07:% h
-C< /OPT q<!y|V)k=^˂ei3Qt(+kH2Ԙ㘸e2˩;GhKq[;)ԗQT#}rQ
-Z0prff'2<-`y?xҷ\-\ž8{, :
- ~ы۟TJF]ˬwz8U+86:J Hzߨ
-Rh
-C(6*lۗca<i>Okh?svtV^?_梙kRRTvqD' ;ڣI^-9O#596l.Nd8o)K>`{t;yoVjE+9O{$ R]?G?8'YoeU3LX͕X3qS@89T,!/^/A22\Ƙ kIHKE71s~YϩEo0<e4,rI]ҁkG^Q)L;нQ?#D[oeIOtMD|fDtp>>нSl'SXJVHSDѰ4ye2?,&SI2s]
-;zgeuvNSdE6
-epcf )U䍽L6Wicn!)eR{TVL,ujQ­4Ni+5E3J?4/tL "x_' !.#ZZ $̍Ĩ+,ڿ嚳et[mRأWw>S۽s#x4FϜ
-rϓc5탠"-~4r=;t!`O#ے\qt1Hv{p̯#RB` m 'Y^;NJu4{gl~1L. _t&p~r}?tfEEWyX `$8AWZ߯H}6gfr
-2=a~wnj.aR|-~3:)Tk5zHQA5~f:'@#z-`F_qX*cgj&;x6S+M1_~v/yJ;'*D1wWJ>^spd@H6 L|8?O1f'K@/t"אY,KKۺ!Lȑlԟxٚɏ}P$י3 ^0XWu'uCu>,V^
-Do0[?>N|AtU8E
-&@P3p7xߡ l~7ԭTؑ0ETQ+74y0K"%ۧFy
-{ro`ꢮq`FG껕3*ǰĉb+0/ECɼ<92u_Kd.;SgS<U 8gTۨjPҼYIHrEU@r21+tVxigfl)#{H+"q`ƀj8I
-{!*ɻ"h[P}rMʢkםqnjŲ-$k)gp]6)k~k"r3j{*֮eߟ#tVtN6G*K>B>.(El$Uζy)*]اQQّc+@Dᙟe"$_390n#Xɂ#+: !A~|.gu $-{Wh?˥oҟsG
-iE€xL:}0lOP(_-3smxyj3/#k>Dq. MiL*7 ;2c*faI2k%!A}_PrEҢu$csa%\`C/<טّQGݔRtc'T q[noَ^u0nZ0032*N%H\) %6~ެv޷Eqht1Y]꒦UG:
-5G*S.>dEH#"yxFذD],"̱ޜW]DTB #-8d
-%58I0!O;Xp]ZrHǺ/\Vų<+\Z{^)٢ ^ZP#eX3v}q9kk0v~i:6`N`pjM0z_ஒ,5GPRZ
-L;a_;9 _ю{ɲ<+텹sz}w~Gƣ׌#ߕ nɱA\c@s"/$Fp'9beUԮf=fINnp?M a Hr-bUf-5 }r+XMUj 'bkx~p\Ovq$wsSs ht(f&Ĩo_x ⱁ&͒m־WI=h
-o/6Bsᕮ$HQss{  R=h_->w,UsN^Ph0%C!5_N{<^}Q!J(73*Oegy7VYv [
-Pfֺ8UM '3[&C|<iϳ7I,y֐S>wV7Yv\M?aEQ.EJ)R6&<#:s> ``v 51:rRu>vԪ/ƳXjSI<&{ ĻL}Ċ*av~R';A;t*fŊ6rdhaޱ
-i8QN@͉ݏ
-/xI4BAR̔EJ_C9U%6-*rCcRhkTpqby`BzZNWdʉ'e:xCLC3qI ٘ ZT*_^kI=|9-']-O{ &IX#/ kc&l).1%HE:"}e̍VMce" ʧMYڭ
-)[t@)C4guf˹i/!iQ'h>M)tz6O嗻1
-5x.!@Xiɋ
-Փ._ׁ'b/j}[.:̻vi-.pٌҤu3|M-/1*_v@#,vWmiQ/ ,~.nݢg@(rzdoeMNi_<gA2u qPqV:dOo{1 sGI"$fvݡNY!œiV;nvOIl*g>;IoR
-į˵\;.-A_0=Ԯ1* w+m[Oh-+V.UvL<hR h넁)*+  2#)ѳxLZRUm_"903{K32d)o3k:%bw掑O'`ܹ, +D@P[ajclWĶI)0L6-wMy L˧`WwKq0T6U^w1sР7v=Zw#{md>Mi"7wJ2
-䗮u  >"]A
-IR<Re
-
-lvj~K\ﭳnS,+eTsb\nDHX~}Q(=D9!stԟdT7;q.GXYߌS|bQRy~oZ BBi1 k2}(QHq
-Izrh_0C7'2)1&uI=#! 씌fW- ] :G' )GPdv̀<flWl@`fɺ˅x5Qr+K*%D7a}K~(bbz/.,G*<sucd?_q4ls.o@_\
-s;gj"BQ=N !~k
-HU+H{9TYo\3yZ*?苷d}~~RIEIl
-=*,=:mB o+]{;.EfM'uXUl]Xrmߋ8S O`\Zʥ?RD'0cGhŬc)_MPqYk>4s5V*n .2PV(Sٷ㝔;H tI\ w9$YQ
-Xra<%)!RUfT<Vm$DAZ!-N
-GR02W l +5%YC Q8cay`fa$:;_R$L2E3a"]XZ%hr}6T썇[+T^F>BW\[XDz 97hw]oм7Pdd7 lG[ + [#%dv#m hl-2'5$pX1Γ|lg|-p<r(>iHkFŲ"\c DR.1"Ak]%Ϥg\W9)'[@"quMvs٘`*`h@4pExYEښ]cyxARRg3oI CYv:]fDF"ƺP2R;$¯>H)V˜ڌr-3/`-mVA1<fȒUܷ4M w#O]b
-%ͷ*
-QtCYvj߼-0TˊZ $>TV!Oe_Z#Y^L_t:<c/9KiB,"~y&q(=;P-2NS9PuWZE@\]\ ;j^$BCS
-ڐM(
-|{9N^^Ig?O}z)0aMعvg愆Ipb
-G#'4l /0zצƢݠ
->B| L9 ϳEK[&G9w=ɮL^Х eǕ5fsm/v9E=,^vlwwGa ]It!a 1~H)mBcbHjAUϻ&BGq@EF:'/ipw_~cu ww;А!.{[/q
-q2>s4ۈ^»љׇGwF:lD"wPx.Y> Gl> E{x, 8$gGsMQBH!il3و}7!>=z̺
-3܄fqv%6;@}3uf
-e-5#\iB:Ky$DgWd+3r"%\|Tvl"S8qUSBlbGQx:HMȒva-*r ޜ#; IiG/EVITZl
-/֗ffY'kҞpe'YKMf8(fpCnw!4Ń5{wۈ
-2f"t~} i^Q<p%M6DqGC?mՊpGwV
-xO8cͺ>qN8 f#x_!J|(t~9CH- 9(4jnaD\ ͂g9l}G
-;ے36HMޡ5UYqez
-;A^yw*Bj}P7Hx9Mqf%&c+O[\.B8@­=H%VaO^O4hHH}UP)m>fmWՊ;wT
-k 1 JKƠyRΡא^`5>:v#nȚ9uj;c<I-l'7ל :5q櫫M\(k}\W\{Fn9s٬
-=pb
-~$x[)fnvz[)E3u&ذ\ï(ķHDчO)kFhQT@D;@8kO
-`LuX#d#_cƅYGdX;a-Xi*G,:rd
-(UrJJa=Z]}ۈ(
-ߵ\8U@P!![[5< Ǽ=B7t$ZISaZ\yX#4.ڴSqY#Rv>0\/ƒ]Q"*zkc)*bDiZhexSe~Vm'
-b۩JBh+~b+N#aucoxTB֋y%>Ѯɟx|VUtIϼe7>4مğ:p<sfVwB$M3}"ku6ذiS`Hw u/pk V)VM3P |\~=FO0Ѷ(R, 6pD:D,6Anqa <|cqn`מYqV
-LhvWE *
-Dk6#Nwpnrx˝q9督*1DC+б\i+3ۤ.e/XbPl~ ;܀f#xZUaxJWǼHiP{#S/m+Qb@mBFJ(ݹZ ^%)Lg=|a\) ՄGU4el68NNʄ]B4(V7h6qr)A2$gLZmFҲ)yY2_+/
-iѻ5RafH
- `CV<x[۱S>$PS
-3ET&c<K<K@Ɲտ_p~6.a`:
-fkU!4ܜl6'7{KMܟ0zp_lyϜ_3xvܼR{hAvL F'"V:S;@u:2ʋ{?W.Q }[ú7X
-6:ry+S.FQ=r̶/h cv5>ƙe$Oa.u??0-+?b*
-^32x#ܵT3'OK& wE:7љQDvV0Rr]1-}Idqqpc6)|.7'm"{e h֩'l/T1K U]8\/UY@<Ӟyԯ$uqZpї(lR
+@p3=`f"79p$ߩ}~zu9> k:ul,?LL;ˀ|gTx;y2qw ;/<_<ok;[{=r
+>pNg5'4F%Z;b_0ST4+,ekvZD'l#Zlt{Î6[1) sچ.yŒsY[:7xjC& $$AQK@L(MJ4`L-q\jItQg8gY4z !{
+K
+xDzoןF7nL"I:FžNX䑤SQ A׫ݰXAc(CsU)gW˙0HQpZAh؁{]Uz5 yWR4bݹz!欄JH#[qP0d?'ð)}+5J,!>֦|z
+
+P
+Ė C^;w5
+g@)E1EU]~w5H)!1)qV:%&Q6o_29RI#}gkB[T*\=\]"Yi eҪtaXAPVz"]OBGl=.Sv<e~ +x+#h
++OI̡DZf! gO ||;bSԡs[ŸL io2FLgjUpC'Fur~
+xH15mI~{;F :[N"Ùx@Ũq5uM^2y!bh/mAA_ʒ JHm$q;Oh4'x~f_D<*;%])JEY"~lu92V1rUgӶp.^H!YP+E.p43QjXpPkA ]h AjT1tվy؇~j.4#o[W^66Z#lkkv"BHq ĥFa'޻x'Ҡ
+&7*[(}x3K%2%}g+}M'մq.G%lt |9 SG !.B f/Gaa+N]
+ jn>P17[zyf5ao9y>P)k08iuEeLkd:Ց-(8~2Je{d l
+e4 Qur~<gohC?=o4۝t=xdfبgi|]Ho{iWbKw Prٰ+Pď|ё38 ĴG*l~p_1=4 g.\NuZ !Nl 56zetL1tC}\=V~>EuvAR[ae!186ڰ@RuJV?fuvYyƂֺxbÓJSY㙁5uÉ {NN~HXw:_ kW-{ yF&](&CfZ|itɽ
+ryX
+_"QݡkyPN<JO=$"O6N<7)hy
+ ZlZ\
+?;ZDxBฦ.=$>y^G vV Y[Pcų7O,4@˝rDzr Ө2/T]D91ML"ľ0˯(]Ό+jùU30K,Ba`Gӯ ֤\˂\82xU
+3!잌8GAV/ gS׉w%>sC$}_[F`uCAW+ym')Ƿ$>"K<"
+ˏsmZpQg-p[y:M "d0"JvQ[oXr|fDe⻍ M)wGK랮ZxksUE3i@Z,mY4@&Z/bb5(^ި&^|Hӡy7t!?&ӥZ6ӞӁPt Dj;,㐥a#O4GU<KVvx@ <̬3^DG3m?t^H3KWAu9{>N8cy%&FT#ϏGe~$m^v\1Hj_9zE',ZCQ̈́xچ;5WҠAcnklЮG5Ť
+!ʊX#GDHl7FxOϏm#5!ޡG/r`!e!XzHŇ9p˵FUnѪiOX{"@\WDI=C= `YD t?P7Ϋ^4c%y+tt^)B)^}nޖ>T c P& Zn: N(~`Me 8޳vT9|0r>9iyfr՚ 1O%_XTExsBk;{?=1/û#dZƥQ1
+#t笕%U 䰨a6jgdLۍ=(
+X]<bP3FZj_}|0]Z6(_Y&Fbz%7&i)V|
+FAjd! ߧuUf>4d
+}{}g::6)euNj䮓L0tToA?YVbouۉ ݑxӗSGX?+5 r=!.c[%!h"WJ@0LMtW h9[~K:{]oK9 1\#Պ振7c,OI}d
+9\EƓ[^k7!4oN{p3-N[i`ߪK`jiA5u̔a4K~BW;5d7SV4*ۭ+<@ !oSiYKCsh)/b&/~ m} d6 d< aX,&Qt>y  rǽF ΂VZnw,ʼ$#:pYa[<3RTb 4t7IN5.J VcOt_h?s\Q:c(QШo~mKGq_6l9"+awϳ?dffuA66+PÃ|~X|j#r܋%Os7 4Zz}X{6}--4oW#3 QE5O˷a/i(G[*22qr!iΗ˼K'޻\4/ncÞ "U2\hBIdNj
+.n6!׷/c-_* :R31!|+OV1-wKzHNUxE{Zc҈`8}i.7jFNcQXc{YJY<؁-8MJJnY9i]"4,FuW\.|0x?u*'R\xRb-_6+Gxvu[D~pdT3sw[!3o4]3OQ
+5ER4?oV0|Wt6D' 5Ϯ o<t)ܪ*Rޡ~⧂QwX"ǭ#}J{9Z=<%_0+FR d?fLV{){:J`>$ѿT+v[o ~0[_D' P`H*w])+d. spX9q
+
+O"/7<n_z.LIyvԦ " "ݔcJZc.'4p*Ǚ`s:^I{Q[wrld!5 ֲ''Pfݐ
+M
+[PT=!?sϘL1 E|qz]JY*'ȗ2VxA+"kY
+<Vlȼa?BIJbW?LE@4nኺq<f9 T]tv&\4\c+i|r@pt9602Sw=4&C-Ancu)u~%"6Vp퐃Κ*]E5
+ "
+qДIEܠ %52VډoD<t߅`a:ڼ\m&>
+AEMlthz:铖|v3}FIg4[g9OFFx~33J'Pd[* T>$ݨĽ#(4tʷ5:%ᨾ[JOO ˑ8y17&Mk2^lܥ1H swW.䴼2t&i6hx+=_ .zC^cX$3@EVV$MSc|0avbHpRs DN'R%mzkS0ډĺN&[Fw"7>P x az
+׃LN4jb-ܩDu?${Q+>O%28̛exۦLM'FPzP5x\<%sVͿS9cCyDb\>-'ꇗ \eKkDF@T`'2;"G_` wG ة-iIB_<Ƣ%<߯m)N875L%X6,Jө5׹ ]>C"4Ĥl;21P8Dɩ"
+y=PB56i~~V o1pœDHT]}t7]F̘{"Ҭq<'v(+$NkdQwlu${DV_Σݙt-С1qPf ֧tSw&z
+ꍆFJ<=kWOkvփs  6OSt!  )cLy-QAJYM jaŻ+. $O9J8ڰOg@A﵉ye,=u].GECzG;z t%P4Rk 7HKB
+ ꩢ]FE"CѝF>e53%(p Rz2MI|= %7=ubkz@r>[tAZ(\JC̗̲/E/)Ew\icb6Z\zX*%mOhv^s?9i e1QP*} 't
+I!ukE~ToҨQL9Z)k~=4SZjP\fT$yW*cY)=/Ӆz4<D~oOr3{A;k+:wW7_ տ_7X9jd>?PeDJ25*V`=<z<ml*cy3yB-t]-K_IK挔LD[Wn|<[g9kIvrKVJmC3zlS%a|^=dCrL#ҧzyK1Uj բ9[^L_}J"
+\hG7(ĺi[IjmoN25Ds턮MWIpd-ps%V9F=~{ah3&<`Z8!$n< fAO'eA 48DeWpxQv= F&dw E+Dp1#ObWiK?8IԨ /K,V@RS]AI}9V\l96(M)c2ٚѠ*HriX#vjU`}sì$&8{DqPc<@UJ#$oGNN<#PZ@+zO_!weέKK[bQy6nnsi5g)BK.LO~ie٪X-iLߘ,VIg+dJ|P=wT!^3 bIz yolWD/OȂpkߥB:6ͼ Gd Q^ol\AN:B P|@B> p}р[,
+7 Ck2lB3%*7eh#\* |wbS]X3;5F~/9ǼFjCixoN/Ͳ' T-/R*i#Κ~/O[ :$~!Z)240RUbߣ4g&gSM4Oq; q٨Nl\W۳m ?8!:Ww5Xie,8zwa BQYF~wi:p781Xqx;Ϸ4F\$DI2'*2ƮJ!hg2SPb*0'MRW?P`o6+D{؄E#_٨=o8 g"bŸ@c#5ubj"ycsW o#l2K4Xkayn>Ķ!ޑ`oL8loNΌ`!N2wAuSoR:5Ab]Δa}F(ѰƝ./ v'ˈw@1 Z_dK")$Ӂ80SjLWj-hrO5 #fFg(u,Rk|}U^0#{9o䪈CHuYE(fg-,/+Ϡ{|誎miǏlt^28{^BZc9k2o۞]X} QD-hd2N^֕+zL9}bH~AfHբ
+P/ON)toH}u9x=hC-&+=C%q|2_!'bDk2"b>MfesЭtQ۸42칅RݼÓ5 ,B:Jl_m)ly@wJq"~hwJٔ<:_
+_;=NqA=j,Q
+9ID>^:6M[[~B.ue/Afn|H"
+d>| ۴\فl-K
+'ڴh&1_.5(Z'ų!k? 90ߏW)7{č7
+'g3N5C$MM,VH(6[@]W n[ 2KM{7\y.Qڨ
+R<gyJ e/SqO*;JnSA\Nhߡ rtqiGez+}O> >żN ]l>lj9Q[RgZ4~<draM-@^J~)*N2xc&-\YbZ &KP;!$XR"N<9|Y@Woܹ͆VH)$}ݾL}nF=#mxy XN-d$'~; #a
+"[=EX<l޸}0_pj52}ԭE kfSi؋w^?b}Ζ~64 ɵj?۱5IB`" ,ɞv2V$elj>Aնt<ۤy8=s)/>]hOe?H?~,@nbu4-_-z wPk]_F(Yr"H swW]/tf$D U<e[[OV9?>ͫ}G `A%JaC? QwGU֋o(J۔L.T1f^¤NIDnu-BZ4 CW*x텢ٝ L
+<Q#6؏\X=Lf^dmpltؽ\ ʐvw#4Dy}#I~Xχ|`4#YcCkbrƓ@vÒ\ kq%GW<>t"ʗ_2sǞ3>t{B]PSn%m ˂oDoj
+Zb^G5t[#׭Duo fPb>"Tm%F 
+WLN?eF<UΘ& G "A:galXm"QwvE"/θ%JɬݯrGHSD4Bf0AXA/Zߩ|yuiDe{??6lG#Ռ٪ySG''uMy.d+p|ZGiAT9dqhκGdQ K;J'Fz8A`I)V]̡߅P-yY!:- /[F #BBLg5tomQtc/O8i(-ͰfL˴ѹ7ܓ@7[udtyb?8تf;He&]T#N. m^KTY&wԏ2.c'QK6] Vg6h9^{[7>C\8aIw`~)B[dkxBf64—r DP,R>C!.83Vmqw43&Zc3L_8(uLK#tG=g0,%](&nW:.%&wcm@AӢ6v&-#8?XϞ͸/qM W~ͿϦBVwyaʿ^#9j,Nx#DuPABfFyZA\5(B=z <T:a3q+܏~2:_?5U
+ |5,BaQ8?KN|8{ހK]Ta.7wbR[q 3,M}m.<V}[@0߁$O͔T,XUC+mD^R!otIUZ2yDR#_!4,-WcKf+Hj0VϮc@[xX DYBn&f57CF^IAҤ!&M&L_,цlJꆦr=9I[F ]P¨db%kf*b9
+ĀX<E$ׅm}AvmPӻrݓn2wz5-P7)_Ha*Qr 2VԮ7??%=ܘR"o{,L۲mv '?%#/cVl'\'H.^@$=b(1Fѱ{+iQ
+܋hUں}%M-
+Faи59Uv#%|ᚤe6}i>%߫ -(4ꭟD|y%T"j(§!9"zXyz# MIֈo4}c%޽Ul3\ѯX-b<zS>L/VAN3s V(9
+$PbȢq'ƪI$ ɮvWZPv K UE9uPڤ6yfPn԰FvMu02OsF;X>2\ٚLnqg KM,PlLGqLg}A"<ď{lm'$u]I6kyI l890ȃ91W)vt 4@4~??[4r-Y_9lb_BtqWSUutlQ}Qv塵WLI߃kGBkHt:fRbų1߷N{`[{;d/_yGF<T&63^y0@ۉ@ީj(}!iSɚB2C|65oHJ4[v{\>t7T풡0aܷ%yG{_DL¿ƣIN~T ]QkF ~StjDC9-٠um[Λ6x0Ż-38#0P6,&=!U%Ɋ}줅|[z%#:gi,1.!,O5g/Vrf^"DI9S4iF4t Mɢ]?*&x4}of;0~k1~CT@=
+I1ѻ5ګ
+[w \3tC`=epC yp+>{_vuEG"=|5/]DØFzbWFW1Řx>Ţ 03h%94$=ZPתslm$<+1} Q?Wv Ki\gb9l>O?óGYg6}ܩ)=Ezjhź`,} XtŁCja'}9mFe Kvq؂}Ȅ!} 72v*` #lV.>I;8^u*
+ .č?}I?-N=Sܑ?Rz0[h+l{ Ot xv$Ӕ$#pvO ef6ovQ,]dc/`N7QLraTe;bY=;c
+T0k.H~ 'Bf0a~bzƣ
+}BY/ArdhgN t\oQP? *F]G
+Lp*AV,hлao7<O_c-9.uvv?_k,v )LyL]NT>4opδm "kۭå]e0e4,gfy:&yCвHʐ5URb}AAwh?U!B*OȈT ߛB]ev1ܕ=p߉U6~}dl;Bk2’8Dt1 h3
+d״fMFQ[V L#JSHlqrd`5>ͱ}mBz񟫱nDj=?mL,Ru¨1u@,(q]F{Dxj 脁@AC76,kF :X{_9[XޢGSo0qI$k`,#H|gk!vG;/E֗."\+^$r)5\g8~7]_ ݙeZ!"N-:X%a(<o-(
+mdQ32]$TWxod[QHH˺Q˦Mp (GҼm bҤ +_
+@~xMJlp
+yRmfzͼC0rg @Fظu whaH#s}di_aU(}-7ļ\[%Z<|&i2d?.j`$ +5 `첰1 $)=mV~01+~ܡ' i }) pԉE-̒_dzV/oG#dP&1ɥ&"5 p[qW 6įsRGu_2ۑIF: R{m/ q{[͙['w3?ŐU,' <E \zkU6wig ͊N|UVkܐAW?)?.[@T\GJ7w/ .De0!E>.t d-SyH-
+m(!ʈ()giq
+B,ĨVfؕђs)!Ǯŷd,z+79;]*6ظWePϖDnbqy^4)?U¸wwjuZ(~7s~m:
+_ӷ]\ݍ-"zzW,%u-дPm"ۤ'ђ*Ѥ|oA_|峝C>t jaaI˩/jʷΗ˳Kr{iOS(
+sHjiKg5
+ ePq ~9WҷЮgpH9nbu6T[ "3>o2!ݢyNze/
+^)N4-'镹srD9.U)^
+`qWSXR;>d˿ɔKD\n ]QKU0mSHLM:exb.tx3aRj7t,z3Bu;PAJa!(،D6,;$ÌEU[ƍ*"$;4hRrH$-=/Z(-N,BQ.ᔆ3J#T hR/eDѾu\@#Pc^֎c76y,uap;̳R_FS 8uF Fn#DaUgzb((螚ky|щHʴX4E)JvsH4s {A8P_
+w#oc|$0Kl$W7}WJq P\sh/ b
+Ȓ/c$h
+ѽWýh
+WtaZAy0
+X(o d +kXiNCb`/:
+'`qOLLYj2ok=*\6wf Z.o'<}߲\z/닼gp^~]LLQ]CLM(lscxao{K̢q
+mS̗]K/JJAQ`3D!g0\, ê=%+5)le;̏S IӋ:5d= жnS}==r$9"^fvc_,?ufi5U'}IPzCK܃3 E6}*5yT|cbN\;6iV@}7zob os5._ ;n
+Y?>kCHVJ)! 24] *ܽQ?#~ >0Uw)f ZJy%W{ܑE9ʒ64N@q9- /D=IO]Sبסkpi`Ȋ}PjWq$CL" uuS*X1zMP$'^ߙšΘ>⺋Z;'ߕ|~/i,dkVV0XAStr0o cHj,9 1} flv;h`pT|2p&7KcfTQ%dV{ <)lL2M&nyX٩
+7rF66L2`/pkRpQ[B1;gG8].7,}ҵZsκ}cE Xfkd'$Z@;|Cc
+~;ƒ*M}Ù…Yv*1XX/o :?ӗqVlr0~ >}{v!؏$1 F_kYT e|uW&]`>HhF>ro!kC Nr׎;دjupc
+_?VA=*
+^C[EJ)
+O~1گ9`6boi9uP^.оuBsigwg'\8U='u;,aJa^9)+ әYx5hs6ư+i% c'a$vZgJ[X~s0'sgمMi0z@?ECj| rtfel^[+0xq`~-fX&GKLw죎y<?zh si\$#uΊ9_luWTF.s(!ǫBC
+B[ӵ/cU7xJwe`VyC" O.j2U<V!bj5xazF 'Ցd4D]HEKCjQuHy.1àơ^[~
+q M_"?k<W"qo;8<a)5ZNz1\S\*>s*t|Q $@lb|0Tڳ"0[@iqqPqo޼"R
+U^dԼ
+zt]Ⱶ61f(j]5gj`Vi2l3.sF0TzKt~BV ٝV/SW 2~*u_,e45/˟P%"F
+)
+ryh LOگQ^BOmH4lk@*R9]q@lT)!SՇk$V [pa-Eg 6S!?Awc2$e-.7^lcqmP
+{qP1ȟX $
+0UTD%C70ɝ [Л2Y$5;O`P,ʾ^GiP[:pOԶ7@[.!{'e7Vs}dDuC'q
+;LA:44C0LW( =,ok7qʀmkZ7/zM|<idZM[ n"oK=riB|n;̏+*%01QcF 2xnֳC9rd#A,O{`W L%A ͔T`x0fԧi΋,7u!ĻA|dDtWঌ\9P** μΝ/Kw
+aLAMWcsweԐ sG6Tg2jd\:pAX O'nM&'{/s~׼S}Ӻl,/t]#Vkh8z2+74CĆQG f6dcGdc K>S@i6ު8vG7K+yw+A8[a+^ljuokO>64m b/Q#2\io N)@F UE~F5sJJKw:kG>qOYBVsg7P~NϏ8Q}26-"96h+Cz,8hNIJpPǺX?}R5tLii $ ؛au
+ 6 \uzף0R~@|tvQ
+bL&E}AǪl<?v6=](*xxMrpnQ'lyQХ8Wµ
+0/ً ɭw}[պ]lXf3&8yL@{Yʚ% aV[a.WY#P",8F(}-
+m2`LXԾ(H ?(ۦsGJw\<SgM:H^O [9tDUf5%+.P`}7l3D2ku@3qؙp0H0aJ'@X{i% +O#.od2;ɺ3LFq
+2[i#1UC @3M2ܤa{<${0'<~R+f_ߊW4EZY}5Y
+Vl2s oUe͓1U M㿞WG@o`oS ssY
+(#j'Tbl<FME)JSR6S$㛶el# @p[t<7ڙ__W"t3eGP
+XFX||ꔥ
+
+CL3/Gl.j^>:G3ڑrK>&/+W@ XS}*
+- wW*89{e[L.<uڰ.+>4XvI7o-@nrfI)*qM~āDɅ9l1eX@Vf 8pJhJ턗Q:$k P6q$HEZFWu_6SwS}8FAvHT.#e,Հl4^4$-W7ͧI5N[r7FAo]%£  yazK`:v|4"=E SuܢOEyb.•|hjMJl+8G*'`Gt?ʂOIwЦV?-z7d"+AֆX&;)L H.;!*Z{173-0wӽP&ay~W Qt׮;I4K\S:"j)MeLVg#bx<a]JAVwal`Ř@ ڵ;F"anyMֳV$Z!>zˊ@>>fg.]!}Ty:`Jʊ9ɈdJ,*0's:.gb'}zW>Ht☽q2l 4D;sH1H!z0zT5^0c~y^;zL'cWwKq0T4U\w1qР7v=Zw#{{md<Mi"7uH2
+-ҮZD,+F&x9PXGSZ5jW8Z+!BEn[o9KW:WL`Ze! @$w`a Q.2
+ɜl{
+Jt'%Nk&78H</] aAH?=\b62qMQT-^Rŋ䯧(g6 >$|s2-c2clJQ
+tfk\ ]%b4Ry;OM-k>A/4@!v-v(r 3w^7FWsߦ`[sy
+㯂4jy!/Ʀתi|#t;w"AJ 'jN.M|alhV(CI-XR b9Ϭ !{w&Bl?LDkLxA^vJ |X׀/VV: uJb<X72Lt6"qK%q72,ڤJEriHHB@`
+;fvg%rh^m|Tl8j, UI֩ĩVs9Si6PWw$ qhPVH ;__:Hq<4
+i%<4\
+? ,JZȿ#(i%;ڡ_oSeUb[2CXx-:FWy*z<i5j `@g¡{1&aR{C'D {sbh-
+PPGrOJWR:MK]XƑ[_8TSs|KRh}XgS!"Њ@'$*AkHbO:@c\Nx/8;'W
+}Cĵ&|P5+cEG}&|RWE.Yz܈xhѨ6X-f&&wH68[ [
+Rz 7{:k#upڠ
+كYՈY}C٤` }81(iZ헣ź7`}ܭ PSh^mU(z
+KQ!ݚCjSؚG]:gIn4_姥IZ<1?NPh&^y`M+U
+ )GgWExh4kD ?<*X7Ш7&+i2
+@…QHWC2 $v$b:\Ac`T,q%g̦"*Ir/ #UNиz**Q_єQ b XK9eC$%b'3"'%RĊ703N'z5 .B^V1'nS }?ڛ"S8LyV
+W?;$.`T;jbiױ}#
+"<$9
+?y]fD mS›o]FuU#yV!!)Z]O^w?4ܓ]9Jn_
+51Yq{K@6zZ %7$<c`&2 Ȧe{gبL(L a~(3aDZuKMB=3nY|  \[S^*@Q%U"|@/}qٯvMhj=f̔OaV5_19
+NB&R?SمU$ݚsov\⪂ f6EiXky81L ~#2
+ @j[` ;gv^$"joyLߒeeE8C~$d^}BMe2ig~\Rnao!j7AuoCJ@OW"׈58.Uw ^X6/7lGݴtIc75HH[yT s lm1ػٲrO@tDOC8ń)ē|rG::/X{D`r;o2P
+,;Ok䨝ըP>qo2b0 ļOIp@9}G]PV NA2 , ,B>
+<k2;_yr0 F_aӹdBd9<Hiy:
endstream
endobj
-941 0 obj
+945 0 obj
<<
/Type /FontDescriptor
-/FontName /UFAMEL+LMRoman10-Regular
+/FontName /RGQJUR+LMRoman10-Regular
/Flags 4
/FontBBox [-430 -290 1417 1127]
/Ascent 0
@@ -6328,107 +6354,118 @@ endobj
/ItalicAngle 0
/StemV 69
/XHeight 431
-/CharSet (/A/B/C/D/Delta/E/F/G/Gamma/H/I/J/K/L/M/N/O/P/Phi/R/S/T/Theta/U/V/W/X/Y/a/asterisk/b/backslash/bracketleft/bracketright/bullet/c/colon/comma/d/dieresis/dotaccent/e/eight/endash/equal/exclam/f/ff/ffi/fi/five/fl/four/g/h/hyphen/i/j/k/l/m/n/nine/o/one/p/parenleft/parenright/period/plus/q/question/quoteleft/quoteright/r/s/section/semicolon/seven/six/slash/t/three/two/u/underscore/v/w/x/y/z/zero)
-/FontFile 940 0 R
+/CharSet (/A/B/C/D/Delta/E/F/G/Gamma/H/I/J/K/L/M/N/O/P/Phi/R/S/T/Theta/U/V/W/X/Y/a/asterisk/b/backslash/bracketleft/bracketright/bullet/c/colon/comma/d/dieresis/dotaccent/e/eight/endash/equal/exclam/f/ff/ffi/fi/five/fl/four/g/h/hyphen/i/j/k/l/m/n/nine/o/one/p/parenleft/parenright/period/plus/q/question/quoteleft/quoteright/r/s/section/semicolon/seven/six/slash/t/three/two/u/v/w/x/y/z/zero)
+/FontFile 944 0 R
>>
endobj
-942 0 obj
+946 0 obj
<<
-/Length1 1904
-/Length2 20903
+/Length1 1949
+/Length2 21394
/Length3 0
-/Length 22101
-/Filter /FlateDecode
->>
-stream
-xڴxstd}v̎N*mm۶:m6;Nܙyg[Nm?ggZHAN(fkDD U6abS:[8
-ldm?cC|"2
-Q%q2%qq
-)-)$㢿ɧ!1Ӂ-G /o$/oSAa՚T9}o(o#냇(*8F)WELu*[u.-
-moe3zlA*~A]o7w]3TY w4>AQ5\Hta]f7ܯˈ,?r%CJy r]ޅ5㙱Fldω"[\vΥGC F1+; Tu;a%ٶa(0Pihw+I )`S
-pG^T("krs+oBA=3 swP8j0-B}X8y ÚstQܦ9>&/'MtkGrK[Xgg:ypj ەŜ7}>L~ż^˷Xd`w$*ďGɥɹcmCS3Gb_?tU
-Y3_BX95u8DԷ5[j514uI2k
-o3֐:Х]!l[⯗4Q xmFIݾ -'J%H[" ɧFY8`Ӣ9ifRd$%%I7M(M8޼]tӨ$y^ȯ!>bmx|u&;/3?I<UP ߖN Y!$9rq:.!<yApk}
-u |}&~Eqq33uAbY+M5&%ǧf}MF eNrS@P=ObO,0u>p()7fCuKr^W$ bS"sѹrن}sg^*uGiiAb頪~48HLȯ{a6 w1E}av7[I# s~]fk*l~;¡: =/7#;aD#](k<&5t&<ΒP!nƅ<8Zgh&ͱG2+a޳}? /0M#ˆV 0߯B \$w݇9yZZ|0U6FHûă$ ⾣oH'//KGZZ$3 g.YD0!G_XSxfީ0tu3^T畋|N߉Um̃X$"q$0&/n2<GQϼǰe"nָXL5yu܀NZҀƈ7 :/#$=YeZdCl@颌x$%)fN5+~P~s2?U_O˸{Fʺ١agEܣM\UbAk}*ƁMnՖR'nFRHA@WSˋqReQ Ds0aª[-9siȆٞ#xwW2ٵʧ6LjbK#%l8$ad^zUbW/#H"U lEH&ίSn )0ECTiӳ }pizޝ g ĘT]!f8%! Ѹ~]w#pu^hc++O/pva
-&sb[45,Q@A3IJy߿L0Ts;]\fI"  r`B1;,2暂[QqnU,]HʊYH&G`Vlq/S-{ q\rf ㇾGND 3k`qsopAIAP`t^VڧլE\CHm:kcؤ@ at4"%mPHKSnlսNE9-4R-s!jxԼܾ҆NzPt%Nwˊd¾)o aќG|*L`=s-
-`&qYޛ P6ˈX¥DE@Nw/Z̝5ȯ)<%;
-A=HȄS֢Ԗi >Rplgw(څXѱ,Okvk%;NJYqqp/My@1ho;xwlI˴3O"Ԯ>zeda@AX ۘb'y^|ځj0>&O|)NaIfŅE$07}<F/Sv:ىNqB/7mT贛4w $Yi|uec<T0xWlDq&Xo܅yݿJo/QsM/`aH0Yw Zċw)ax7wTIujYudc^(S   OfVW|=v|A^eqX9,TYM*!׸Jx`2-]hA]?0huG࢕--)[b"e jY k^7[&x2D-ի,4ݷxkͯVy2!!)o-r%
-yΌ 2,-h57[S<β=WOh'7=IK}`*Үs:،kE(g|~o~J~0`uHL;4A6{0[?H3I8-,A`P0TQˊ0p@K3ԍR.ay2N=E~>UDdcѥn8Zy!8 D2=A2}K
-`9j3\n>4 7 4$bK,.@h1W1x9`ÜPd㇆mYh[ժJfOeM|<w2
-iZh ?$k\쎐,ˉ1
-Ƽ-mCq@:Bɞ]R`jn{EOV~<
-Vå4G/
-+rl`egiu
-FwcNtW4H`AY0}B\FLn`3 rPsl?#J% cWv
-3豵Ik8m؂h@"^ڎ]ZD%^+շ..28Di5 K-)L8.Z5cqq ( q0 B̔?CE}"= >Tm\=oOzzB#U(ԓvUX5"f<)Pӳx|#Y@%r2!٫<s(#|l#yvEx`ܩFǖcՃZEH&m,*>ՙJ!'*?t&S2-@/tKGRa%1_]2HTĸn<, nCBu B0¯u1R@ ?HTe3%!l b1=F:@pHI WgbJQ)L 1Qd_2w-sP v
-ah]4b;gjogNӅ8&PSӒf;h;tRub.U~
-/!>KʈBG௦ HZ㑓t*|jg=PW~TD V 偿"Zݻ
-%jӯFhRZ8bVL9kC'.gBS q_EfT_.^A~G9yaɿ xHomLt_[| Wc5S|ѕZȩX]!QME\ګ{`%B]{_.&Yo)Ÿb
-DFU)qtDm d&RSTe$Rqt[_ \kêl<MNY3Uc
-ꏟx":ɸqpT;ztp\e
-یw@S"<)ֹTt SB<6Cq1zXc_
-ʸNuKtGDm+QkvaF+T%I>ˑ1Z :j#']M ҃[iq
-kq(Te؂ܚi21?g✷Gy"SzD)0[D "dY;%7Cyb
-!s(j$O'8MҔk&
-oTrjXK1B(~cp2:x>gKK+5;3[=Fqꚉ\i_hHYj4g =~qe~+O[2Bt̞.<v & \pc P{FǹƱMQ5]{)#]KIf[^+$GfP*u^-0pe{l)v̙@^h^lsZT
-k/GrX ,-;^6ӎWy{& gԥJO}D+\LUIi
-x)On+c0*FG$bi7 ffn0fp{&HJ?oCxDq1mZ]SSW̴c-hFdAJi<ܚHG{`2AjMi>QFc"ˮ ?MPܒX'l[w"vm1yڏȷs=(Y=3k"*upV0fǍxi3U()L ԖM8
-! ;[ Z
-)%KZY^P>
-˾6ñDuYeSS]/<L+WR*bDgҭc&bCF+iM_Oms*1^Nu+Ww{S{@wX(h+ٷm[0;7ɂޯGY}wgܵnG
-Z֨T@R^n(Iī.x$:Y3:]H9 aG/5B@Ը¨-W"Cw&lL9o f[,nmӏ2HFtAD@E,ůncS6 ,B~9$ShH͂z{}CQ;hƽO.7W9W?nl+ X]dPoEoa-H p[|:3ď#=̋e#.w8)2Um$P֓+O I r,o')[Bݳa*Y}iY^{WjubWLnhCvUg=.<m
-+mbX12u)z衈/ۈݪ* ́cqx֚|a,8ʶtY0 @#Wg+u]r|`Jƭӯ9ZDNo V$eb!%l<iu<?[/t]rl; (-}.Xi6q$H CՓ_ˬfm l5?iaxj|_AqiK[yz! O&-lo9" r} ts+ xXSҏ$[ CBE"4ϴKpߺ 6UIw41>7zD%BL aЦ|
-[0(xcI(ZixSPNGWa_ES3#Ֆ~ϖ@xCAvdžI;peeܨCqQœ6E!3+)Y
-3%Cx #==/JqR#
-/vZerصA5_4!\DM"4Z.Di#s~]Q{󏟉KL:@zk'۝1Su29°Wsɲ)hE5(f:<bZhNsgRp&%
-r1XYzՙ[E&^òmR%Ըs>!Tv;`XUϘz!tyN̺o#GmECiCMq
-qKg 2 K%T>Ca,hsJuA')ȏ23Z (>~7̓_OJo
-0v;Θ=~PHIJ#Wxrm8ttf>$f˚ 5\b¾hD~(8ڊxC)YfM~G58V
-&i8-OFlL:0|q*@+wW`Dŀ
-NCS)1~K+>ENiOa?ދV9Dha6h3HTo Ld.@t֢ -:ӎD~0WPו^d|n%{*:}jsHl-Z3ka͡b=C3{9f-0PP
-lpv]x.\f`dμ< 5QHª*py(W4G,'C1K&V$_5׌E
- ME{Lz4j008u_ &5moN7/R#`HTZ0pUGOPkŢ:7 D:q3QƇFΕKxKhFXv-1YgН|h 9PȗRrSC/!Գ<a7j&j#e/B\ُdᢑ  U\b<|rQؑpaކd.qf{=Oq
-0
-lW6䬬~uuYY52RSPC;oKR@Rڌ㪰NqyN?1Ghw3T{/$QN9^yO).vxy<4&d՛pAچūpDcMUϤe,0@y+T,͂q5-DsS;r[#R,#NHyaDr8/L5܀ZMui̚Zʛc$ \
-NE"l77M]uJp?gZ,9+UKKݕ"hd+K*!NjE /м+u%qإڵj2.V4GTɳ_LbzlHIM&,v:!W@H%9h0IxLlk
-%`f8Vq';
-Ɇ X(rub2\?CHNS+4캏JEF t?xCn0 )^ospb;(V;eX=Z|r7ܘHН8"|X#BךDdJă];8mo!EIxrh$Ԫlt, ^XlN{mnp1V> h;gј>aFC8zEU{Ӄ!|.+e6Cz?kt4>Ie5 2Qxh:e[$Sz3N^%_xgi_@d6y"L $+ͯ\lWD2,jDUY棑0wF5xx[@o2ţŶ_󠠲h"GKYVhC1~>WLI >'>NWS;ǩ[m!;iK&:WSv0q3<:K&L\mdZ= ^9g~Y届@c_Ӻy ";bnyˑZ}:wK
-/oU 6Bi5a1(
-Yʃ.lGgD-?ҎƦiGWʲғZ]nńt\l K9 K6
-"]F|3%'%78+ IH+G?Zh}
-E.pR|=0'׈:
-54PY@(-YΌ[[&EY,[cf4^ڙØ4x0|svwqK p3f@l^)y pWG`hc<{No
-wUPv"\ږ_םH<c8G`dPZ^vvFgr"گ)AJbȻ̲6P3:
-E./JV..[f}PLc48Dg7ц&"|`9M|Ka :TTFyZ> t؝C?ճ}Y]E& 9;
-sۑqcmzg좃zt<ܷ[Wz{*"{4bHK-S3tk9$G(;% #^ؤGL*I[9T
-mPQWMwV6ϒ 
-ȩ>
-{UEO)Rv)n ?~mƸ#^WhIet
- ^4&PrVH\gSw/OC\-a x&.7>u
- $+VEoE[ܜ},];͑QX
-k['G
-w[PhyHK ŧw^;kq([ƪTi :`mXt^ϩ**E
--l
-d<_
-gCօ;9.">bWidɺ?hEq׾d▔}DUr476>-y:DղY24rX֗=}h[Ra*a̼=
-jjjbD(ɧ#i{CFz\3n<
-/Xd)Z
-4ħK]D im%cLmag-nq46&:~NZҼ`㢨gu&
-
- W Iu' l;bP[2^J$ePX®]4 qϩg+SVtf8hݭFB(,Y(W;2a~K]9v>WNgt,r
-"~ѱI`zw E`J*hdn\ ?B4\ĔҸg3[UzfAzaSϚN%o+@pK[bO.e4/Sc׹^L+-Q
-gC]OH0\Bqu}Ye=Z^l5:kը0B4U E O+:s;L
->3wE
-].u9h֯zp$!X.֜u+ty
->^qƟ\\;WB9M("p-eE#"X=/'w拇l:e*\pw@: .SQr$EuvY=qi C2ٸgP=H{bLe/wyBQx|y5;UYƱK`፮ւ):#ye1O\0$+4hhnaiJI ,:%F0aix!"E'Bi Ń =ۓe%.Qrx柑 ~x
-|dkzn%b꾓a<뎶֠9eLCzܜ ½l^i2/{@9>Y~0<>I~
-ru/L1TGsysP ;`4;'Fhy( +{Q*zàz=~ Vrq໴p ybN8J~R!ʏb@SKV=2(Ti%~B pɎFxc'`kz3sxbbh++v;\3 sSZss;j1޻
+/Length 22629
+/Filter /FlateDecode
+>>
+stream
+xڴzeTk6NpwwwwwNqw-Zܡxq^33{朿J~=eIT5,́N &6fV~#;:ʉ@E%
+4:9J
+wGtlp*
+=KZ\1VWfAoX fbE80}=6"OبzQ b ckfX8#<^F(9Q#RX<H^%>'㎦:*W,h7Axv1OUƆ">Sto鈍[> pm&`c0R3H,R(gi$/D}Ҥn`H)ϽAVxq_F7Hqa,ErHQ“Q&`dd3m$ћ+d州ϯA9= j_|NAxX䮊1μe쫱aNڝ>2wbI3yΒRFjJ?-{bsG/wE`3 iNZ鄓SͥcOyU..b&bzל%vx1u
+.?әl%(-w(MmAo/ͤ;A1q[L A(h=>Fc­n>{^plWˆ*؍mbu5+
+13|?Ew2s4ĠCқj|d: =6Gȋ cTVPfY9aYIh+\cW$>mO/g^땸odWO.IDx[sk7uW,t+&Fx?Roi q]Gt-q4%!VWNF)9:/B% ~fR $8m֌N@oZ;C?[|ANEH0G9/å@)ldrhڞ()L+(Gz&Ձ#pq>&{v6 H,3mOVdN`Ĭ*LؾdOլkl[yǰEkQ W%*?鯄"^kx U4Q.e6ÝXR?%]˛mЙ}-ռ+;豗F[8QhAmx~vt$p@p)+EWsNX[Lt+-* POl3{yd*iS<*-{I 9}R^Dt`S<q惋""3ҝ%˘ЬFH-J{2%[ IKBMkdw/'}.P+h:xFa}2Q.WYc(L
+]lTy:eḿ
+) @ˎt-7UA-4-#Lr0Qf[?:IS'dkm.#{jlaMᩏ[ywvB
+)>s^d 5̎.ܛ]:٪
+ͻL@?jn8}k
+qܺ \ BQ $;CWeIm 5:K%08i)U#Ba76Ϥ(k<þ+ڮfK-'nԙJC zBR T>%%GL}ۨXNK1H Uqm;陇'L̎WMJ_>S¸ƅH-1pһ<㈚@J
+<`yh.*E:Wk|Kh5J>D'q-_bg/oAW?p*yqn!2iBO kIgjX14 S61 [G17\7UxKc: jUJIor; n!kvPYBlO#hw^Z%{½ :IĶc5b{;
+TN!"Hs1۹KjÏSceIaFXAm/ov׋_!^k
+h_f3R~JAj9~D=FۯN(9ǽM[ f(J"yz=eT.mBFPӷҕ$9omw*e.b(԰D٥m:˳^qLI7!º9,=~;r!0QI u.{(j V}؆|bPUcPCNN_=9WsbHB~&nn&=By~geno|t;66P SLYxyyH/}!P?bіJN8oKHZMZQ! uAMs~z _dkp01dZ.R3_x Ha 54w: 0Cq>oJ@dnA6ľ:g8 TC!ťԤF·JJN^V2 @̥ȉ26!ͯuRiTi"~"a&̽q`(6D?F^;oPm:dL{t5z!GEЮ i7ejf}Tp =shc"t2N0TLG<2:-$)Z;5],7yǵh ~\Z
+7ꗺܧc9EC$ >H:5)1[漬
+N)3K_g֫n^{P+Ss}h"+ΣIui#Sw774M(ULȗG:l `s#>hr<X"n?#od- RZ;yqJ-f2tGkۊ m=mED9p!Iȶa1J.2 ֓
+I=՗ٺA6c
+Rqӄ
+9Z:ϖb/kWfzٔ
+TM xb>ͳeզ=[R1U "[p.ëՋB(${bSl=鬌&gTJADzIN%_5 :Ѥ:'7PRX;69(&d{-vgU }-v.s pɩ7S\^im8sZʻޅ CSRKh+# bkec~ՔYZ!w_=T |lC _J
+* QP7m6ﮪX鞃)
+yf+ĆGMX"i`D
+ݨD^Afۋޅo|DuC~sSlߡ B0huk4KH? _&tnD| :K#iI[FO0W%$,SM>cyvH0G(7[xVp914u#jI.ҧlKN
+lT!s:9e#zzjׁq `Wg5
+NߍMJ_a!_ǛI-<D
+>o?@sKLg#Q aV–_D1
+H(`yغ&-ΥD?2crX6[W9M3ed%
+¨wi
+50wC=EACc1klMFh)}jr*S
+bWbu~xr-R~on
+yz6v7?bݞyo^D!mj',NdD4ћ.Sq׮CuCNդy-~˧~Ҧl
+9Jby
+x%織Aμ"8j]x Pr
+=xZ&txynU/_j~%D9 VhU&{8I۷u~Ɇ*~n?=KJJސOwu5/s>gh;K<Eۺu"Spw _^<W5Mė~iZ(m #FfUnXJCe䲅AeUJ'-D8 ,M&Do, 圶{ HU9airn9iUz54%"޿++;=<C?SKu`ImZ pDt8W]Bu,n'KjNRNǁW~G+&}8}'ĵ*q 6(HwN$M9M&S(Z^Qdl19]Yb2yRu
+3
+?ΫL[#Qq G9aL;ٹ@t%LiHPv* mP;=ϯI`(ʘbܶݥ`U|AeFQ_3:,<ifHr\um3&ͻdε<O.4wȭ Sh=&{1
+~h{@TR:HהjMS/}cu)I讛$an;0qO@ : ei66thwi'铃#庮v
+`2$SJ6BF<>Y`ًG⺵zfA2:bZT;w'!!<ݮU+)F:ɔ s] Y8;5L7lڍhp'rHG [m0m],ai?>`E_
+2αc~ULݍ'Ǟ_uGL8\w*22v 0rJsllџDYd7ůbT*×lYࣰ:x@
+&H)oFrItq7[F9WQ|1;Hr?0\d\g\hںϑx-AEP\e h!bp#yW8JT$EvCwG|k勵yeHT?sݓ\gvs቞Ii| xaGf:gtAC&BL䏁GB!]Ua?:I1<mCPZ,Kx4VǒGd!b6X*>w1.]%?^ތ^zǧǎ=~FۇE#h
+TmOͶPП҄0úiâ(aQv1KxK Ľc,$`(R"˴siF*4?9›U\17<flwD1Fr,ulwbfCk1GT[Wi&nɇ~T{!e<C|YqA[64{ ֗ 7\LNpWnv1}A HrJIXnno-B?ԻH{{( =ZgHy4WÌ%Ok̖m[*2øsH=}3~޳n=U >Xlp5qٞxb\?,nSm31<'Fz!?ށ;DrH4E |EIYē2J^~buқџ
+6'9Nĭz,'&"{RY(
+
+_L}qU%Owi1 ,xqgOJY?DU],lvXQ'
+
+"\Nݢk;gfQ,㼌7%O20atmOHD'Ϋ(\trHԷ\IZTDdcgh dv6ճMfYau俿B"]q gȄ(">ֱ;#E*ǝ%l<$y.6~G'4祲_jh4Ĺ(B.[UOcY(@:%@ŎtW`zfC
+yHsy0-EavW}T5C2ESHUQJmpT#zMkоVد H, z]e#ߤq\ĒؘW<Q{O5/򟿆
+.=-ǑU?x_BB2͉#ԻC>;Q!*Fde+O?rO-K)4FnEZ,k%W2GUy{
+
+}2`P6Bdn|ڪ*[&TS8(Xlj)}BLۇ((\
+BLT-2*:>~\yeJ
+/"e@ʏ/u] dp9ܶ)&]թ \$-Ӧ--uRb*3IWNX#ÖwQoP5/K
+WpH=0*9+?A~eQ}7AFnS-akme %dyqUeϜ$ksm2qr\smscl+}P͔:ݰ֓6ߨ1)bg<-a=pӍ"ۼ ^m=)4tBYa.LYAINj FN:qugIVD49eR?5yIFCp T??]WP*|6TŶPL*UꒇȬŸqD#F$mzu+&=3n+ɢ:1]|>cds&<˪ŚF2p2852 1QrU2ey*U |uNΔ4
+7/њToNK|PS >ϦfMN#\?~O* +D-o$Ÿvu?iklY˼2OoWZ>rR2d=iZQm"b!"xPOPD>+lt/Kѳ(gDUD5C5
+臸k饆J6vq1@GYU!MQ4zd0'M\Vԥ9 V; KͳG"9KJ{
+n(\iC&.QEߘ/niTx" 
+kEƐ4]O{E`+ܷjRvGmy+4ڢV8p~S[rkg|-5pt8j%|O1_$zHrdV\=\ O~J |=i1Jp4ZQ^ÄC!B|
+a"7%<'sx3F n.ASߒ+`l= L_MQ|h{7mPmk >g5䑼V‰^ϊ%Љs, [ο&J 3ON¡cC޲4=dĝ<(GB!bW3gcӇEǡr[ߋtB-@Y5x_n ?2]#=&lF&h1ħqcaTR lsEp~zEf]aUYA~AUP`;TP;h;
+2LtO"ڇ7C!=J#"0[Fӌndmh1~`r,eJ| ϛAR*OT,8qqtxjZSu0
+f֕o"f-W#|!1Dpz4p2O/U5=RGvcL`^|(==k(+DJm CGyG/u1RGN}-cضת.-o6&1'+V$.ıKHtD<1|g&QLՊaz;uaAq$q7 Q3uhV[a۞4Mu|r__aJ$;#`y߭`QSiPbaE9H}n|H ve 5 ߰ᦑUŬ#@yÍ޶Wb15nu)Qv=~Dk$j}1ܙ&d)2Jղ@[]H҆OWϾӺp?̫UJ0_Qkm.1Syfjxs='barO`+x|FƋQi֍6s;蛄+3J+l~cV]ĖLK /W`TG`xfw#jY56JaxDJE]%,v'`l0g-"ݞ1LJ5)vWtK@ǓhɱAxΗ5?fkXOF%+;+| &-4rQ[IqAιK^(WdDhXD&^0g.egs;yѨygHRX\0n!$4SMzE4\|Y&05FrYCXA]; u"GBQ.
+fȺ߮07^R_11"{P^WBTti<rQIS)Wܴ"{1/Cj 5%;zsKe/0F#M#TG_rcݺ*mdRd39
+ǐmv8XgG#hB</ǥ⚴;g{t4e%俁1#0Q:
+qnx?F萀ǔ{ *A]ŵKwlˎ0XLJqVzw>Cb|9CUB;!K 7!U#4A Hpt,b8{xO$FE:lGZW0m;T0IH #hpoRYޏ0fHaβpZɟL8y!7=ȾMb;&[0URQPgZlN=" 3}Lp|A]L3sx$ű?gXǡz^n'Ϭ$ƄQIjh9F`QE ,`1ۓ4=$19+>㖠#|ȁH{n6`@v#,cӂS%8i{\}A WE0uqm7zq\!u!Pp2|Ih]St{, ߐӤȺ,9O{6fq]25ɑlYRIЫF;)NݲA#KO;yUWжR@'Qs
+e;b3#
+G$L>cj˕&I<a j4oj@9Ɋ{vUgo\=}kF<]YJF!Ϻw*Hgubp͓;^ hc0G?jZ?dUYDڟ\oG3o+ 0bZ9|+JIm%th>|{艴؎i7QyLM-ۨNbd@&v8WMŽn*\fzW~铼=y $Q$:)kRzi+YJEP=NQƯ]ZXm_a&I?.u" S-6 a\`?.KF3e tBAREتb}Fh{;@V:b W ug'Is5#WIv(axieCoK^J1>:R$4ѴG Z<,ɕZ)Ãp*)'L?VKtۿ-nS3YnQ߸XgZF&/Ӄ]F.P@6?}) Apʧb#-PŃwԱ%T0eOl3%#˶b(oۋy?j3G:9y-O7 ߤaoq$[}+N eY0|=]m'Ԋ-+Db[|rPy]\ev
+4 ƶG"pA,k2BKb43 u-G:!AF 5ZB
+v]hxXB|t-fqA7RxSq5ۺBZ P!qw~l! T?
+/Hp m
+vemgmCALI1s&7 {n\(;|{;Њڡ'ruG^ʋS#{)G!.q_i3VD7QCbf/S꾚xJc$: j<f^֬֝
+zA&C8'>Y`c"P&LFLB;Hp , .F5oev֨do=
+0zh
+fjԺ`kG;7cO|:;8)2hLn>vrˑ<E Pq
+ଉy#UaˈbrsWJ[P;.AaAdoh ӵ"; ו8u:n׾c?diHeM"Or,<9(3}5~%w𒮲 x\5/Waw{dB*-1R+ɐ,~
+?i2h]D
+\7c- ՞<At5L;`igL$p+m}@W9?RNK-g[_%e /f8L:,P.nXO>=7; KJma~:V.2E:5jȜ]}] S&ZZѐH*Q2[h/)o i&I,x~̬lZ9%4Yҙjx$G$ tT٭`xl&.k7m/&o?#F8i ^9n6XmrHl޳; ۛhVq%+𜪣|kf#SuM? 1~* q7/~*OyM2 ›lV.0<OT ǒ_$9Q#|.\yz0_Ò
+evu"T;`@g2X/ӃL+(2.}Jٜ"@o}GΨ]xY (O
+d -VS':iBHnFtԓ#|gj%"Sc1T悒BZgF
+y]QaV^"ޒNSA2*Q96 kF+n oeh<6Ja񐔈)_7k8X4mnK%oYM-5Hꕞż# y][_FDg >SȚ gec؟T*5y*anʦ+Cq'8g\XծRt#Ev黔K_cHx|M=24 lDU$Gnt+%&㘑fNܥFW˕̪NjQ:xneKuLy7x-=p<u,.GfG\@e  U>~
++G%,*HWFC :*Ǒ
+YVbddV$ WZlR?%d亳0boHXН{tUHDXzGn/D\#k 8ib7~'ٸ;6({+C`ݙCfyOҐ.Sc0eT<з8r7p8C[s\![(14"ïf AV<]=̫RiOHx_PTb֔$LEA;?s&ڪXd, ^LZ6 ȃ(\z.rج6Ȝn *hpȤa(3 \LzrX(Mb<kĭ/{5o/EۮV輇fdY ET.r;"UbFŌqJ;˘k bc:/ߖax'ح,!k;k$:Ж47Y9LVi*?dݱMR]1Ăs1_
+Aϕ1JPgyOw"<Dv )fio#J\TKk&teu;I5$Xfsk0\hF.}n06/1EJV0;t=hg(NTv7{L<c.L W@o”2w39š趇S M}Nt|&Mrs{֩q3m~x+5ܐ@F?} c!zEA IɈ
+U|$]2m޲|<J@_yŝ<[E,7gl {>t jJTAyű L\ h1Y:TnZ4EQ'֒cT~G-L8A\T@0۝IWpo=^ c'p "Q^ـx}7akЃ 642b#\'}Y\Z3Wi8c4
+B
+`8,x5mt{`y僔T!AYH>i#enJ||GI~I;wgp<_.* g&a5AUr
+\mQe_ؘYb>yδ
+ď۽G(
+4z)vY,1촦`H+blbqZA%ll;[xya >`<jɓ# 0L,Sq?+QZL
+!(1UcYr苺]0q+83rV=m4*h5-~ER>y8e 8
+ !A:g 7ŶAoo&lVoʉ V3^d}GAXi\~XYV.!p52A΢;_Mlnu}%. .sG/BEhEub׏|w2[:/| R,S70ঽNBBi{xn2 Ԙ8n{@n_#%w8uxx8Ekb|-)
+yt_qy j8~%#Þ b hɑo1y<_
+Ca >"wF[3b4oFy'An#h>tK0MMFIw<d%/ļy#oպ1E
+0p&H.L91Y3C׻Xs5+ᚿ(v75,C-cCK\7iE#V@*Ei
+69Pp6qI:4+:KQ,hnJ>L*޿܀
endstream
endobj
-943 0 obj
+947 0 obj
<<
/Type /FontDescriptor
-/FontName /AAIZVR+LMRoman12-Regular
+/FontName /PGZMWL+LMRoman12-Regular
/Flags 4
/FontBBox [-422 -280 1394 1127]
/Ascent 689
@@ -6437,128 +6474,126 @@ endobj
/ItalicAngle 0
/StemV 65
/XHeight 431
-/CharSet (/A/P/a/comma/d/e/i/l/n/o/one/p/r/s/three/two/w/zero)
-/FontFile 942 0 R
+/CharSet (/A/N/P/a/b/comma/d/e/four/l/m/n/o/one/r/s/three/two/v/w/zero)
+/FontFile 946 0 R
>>
endobj
-944 0 obj
+948 0 obj
<<
-/Length1 2004
-/Length2 24898
+/Length1 2003
+/Length2 24719
/Length3 0
-/Length 26147
-/Filter /FlateDecode
->>
-stream
-xڴuT۶>;łw(w⮅]Cxq}9ɛgkH(IEM@RvΌL,|
-휜Nj-EO vF?x1VvnNV
-vձervwO<Q y>
-x0)=&\-fZN4^'>
- ^Tymr3MYkȉ*o'aʛ*puCB{#FOPoNbv0DoY:w{ЫaQed
-#؞ Ula/f76Ҩw 7?!*ͳɩ
-| *YXrjݦ~7]7XJ
-DbR+N5Ws\ոLZbk2
-F+6n`n}Pu\h[0/sb=>C\
-+d!hojqvkkt)8-CLs[+>p+St V>ez*f$FwR<Zs;Fd;sIBl3~NU AT1}qZτ * %"T$c/4hQқ%^RlnZߞنoBbFu_f,/41N#oނ?~;"Em՗PSo9{FW[XҪ@Io``p8vb #I{uEW#u,+w]$#KӨ1/׎7<Ssrc/\
-tN\ٮ@#ieY5nEpX#MQ1\d!=:yU,."</=ׇӧĭno2(*pd>poV4_`9_‡EK`Mp:i?]q=C%52n4O=0M*lx;"$'!pg< N4Z>Jem[㗠X0Cz#kf5gG3p0r{8}
-/ihG*YG(n{%#cЖ͋|6d1kv3Sȩ%+eXYR>Q !?xe3掵Җ,4i wq%snQ⼵H)0  ֹ$W-':^k)#Td\'#2uxʯ*y%=f2glV4`Ev
-S5g3n06AmTŽz3}zS΁S=QRo_έ6 rD6|#i':Nq'[</] >ogxM5|uAMI'u7;r
-MS2rpSj8Z&_zgy@SU<Pb>f
-3e,cuqlat>b 4tf Y3c8U^dEwoz*UlKJXR՗Ct JܶVR]#?T[!B*ȬI9>gcl9~C]\/
-=n"( :xg[$ ᙙ%FT$w_X96z䉿&Y[]:Vg<ygV^ZS2wFنjhA1}F3V FW
-]m^͔٤aWUVIB7y},"޹d<oD
-|]\`1cmlr֫!k9~/QIAGa5<O33mJ@xƛjK
--*2
-W3c8]@a'3lX$\Y}"a!K$C"%Pkw p+aG~[St {Y i9ϠBuuCӬȮרnE5u;\7Jݺ[f@^JG, 4(d/Zj/ڝt8~r[Ad]iX]ǹ]*wu }?HB&q$t+58.s×yy7 s_mθ&e<D;N^o~wr3^peEM[v.5Y^ڳ;Yp
-
-:rɞ&ʣN v0#3ӊ=_H6}~sG9&h'
-ODJRgO)=r N{<cP<a/ <5gKU CuEYYÑR,=PsWm3~%Vyv&OR3?Ўd}|.&zdxuJ{LA9$ΔZ#߽r=}]3'_9C0ܰƈ>YG<)u2ۿj):"2cu1gt,ĽWBGVYB\/^YYl4|t2rNȮA6|#8Ì;7+t;ҙ>t
-Lu)IL\m6q',`@5^m^9zP nsQLS"q%'E%8^K/ɝgdGP54Ȃuc6&sB3[b^[}Yἰ ˔E
-ta @B) יr֍e@khcUg!x1H Z&1A{`m28_$UxX6W
-IFI$0.ߚ+[JmDAڻ_b>mh%{OIPb1d}N &M&3;UdyQ b]wd:aA=dtK[D$(#mQft4, ģXekBIP 3z_JbtEF?*C9{@K,IB'^,|wu*((˨P
-'Qwt[\]{ijy$NOC
-( -pC@ֲB@lD6`17PqthDbōD$AC \=}Ϩ
-> ontx:,7Qr'UpUx*I " CSa10P6_
-MIX ܧQ@c,i`)ng"0}<_cO(!2<(i #.tlF){%܎hhw}vNGvzޔT>pL}nHwDBHg[jހ)_}|Sͤ_E}j"e%*97?V讉;jE=mX'q5[]Gpuy og R20TN/d:~Pg#iS. lB%+rr+׽tQcxpK*Rv*Kn;(R_
-}Y#0Ob:#]]'mm,an`< f@Uxǡck9å/!5y)ݟV/qa: p"qwsm1W:@@6[a9BԠ(? =90hP$v*(6a pLf2T(nΠt( Aa],B2p̸. U
-hpsWb`Q`jE?ApנdW1;=fך
-u?evA >*sGl;cN2'cɢv`NH#ydi;:i7-XR=@2@SbuG@"ز=0h¨G&˒Uy#
->|7;,Y%ib`_.
-r3Y'b+ј3iɦk f{ ^Sd۬vUdTN}]1āQ2L2;>B1qjTbq*l^a7#uk#Y2)|D/c)rU _p-_id]NrSZK
-7]~ͻQҒUi۝gVHL gpUk?-~A!s)_0j1I1ayGā5ѻݭv HˏF ^J;r=R G^O?dH/Dr|>x{q־3=Q
-ېAMޣS
-zA{&]\YIM #gTm*eCozP fL+ x3:'G2u]Hvɽg84Lūt?XzmSTQXn T7#%f E*Gxx[c8U`L_VTݴ?z>l7:)q|.1MOٵ*ϕN~ |bTiMl '7S~hǐ%zݹWlthFwT,$q(u~)BӤX>MsT#Bw+ Ngc7(ZPWc+,r|j,G)0PF!(ZGy#83mً4<l=.g
-w9 U5JkQ'pBpl_aY?:
-?/5gsj ( \# SH&063v{MRn9?\!%_t^V&Tޠ
-9x‚1x#z}mEtI JyG?
-rz3iUzR61FNfZE`E4I*kJr<ՍpY6'%
-L_@$pP.a<Ho*X b#SjmQQ$;)u]&QlXs[~ě{m;2L%]2X`vRƮ/JE tm_:Fy}L}6:cdKR0n7U0Q^_ !O+CBȰA5 @Ϻ.t4~MF5ک](󛟬-[]n\Ѹ<UkDAـO
-d.n|p$!#PgGl9ˮK{~)U7x/7>z@TE_v
-]^Yd 2"|ܛe+-)Ttt|摡h`ї(t ou,X~Wjqv>~x
-CJ#âL}ĒȑJ1,WN-B:ڔg0R<PjgJDK?=C-!-}HrBM ~7,=sVgTcOfJ
-Ɓ+[ѵM}P t9Am&{p f}͢϶e5se٠styK~H" : 0Jk=XAaToa< "~L2 O[h23HhNvJIN[e~ ;$ng
-zy #b`&.Vk;eiqCr:QsZִ5
-} k]_*jZtҼqO=Q:$YZnGs >' MfHK3HIEU~8KZ*&.$҇LYzȨ]`1xA!uy0{[U# l-j6p=[YH$Ԍ<]K"ʙ͜6`1ÚrwgyTk%n#Pベ.$­ue?5`F [^+M6/^bQ`emK2 8
-p늞vK&
-Σ$! VEGBN@JiJ't|ŕR`lBrSl s"Q \acO fc)A8,؇qEZWBCqmulE>0SQ=0좻[U=d ^uWD;V.nQPj Όws[*O}\I xez% {
-xe= u (]鹒$}E.y"@"(vτҎJѫY2-B4;B*#-k-1BWDK<Keu"c˱ Q7S΂-LӅL><:&#@SU]rFExՔEy^6$)
-·o>ts>\#DLTr=EZ-%=wՅdg~"/3x휱liwH}^3'tNa!,cJE=4)Hsn..\ L.ln1J@Kt{'|VAXPf1(=ǟVFx g G")&ek#)6A?yuU%uDxOuoGx/w8  [R୳v9 ]{e
-Ix~rSȭuV-W8Ӂ#J_NI߽JNZat]>)c#kyߜ}Y7(4&.i,fFMUv(=RH p]P4噔#e5o9<I'eKQ}A}9H2>慎K1MVcsz YuЭpiz'(DGK;.ۘEvSeiĐ/_73
-'WlR7J:y8H b\N2Se`[~^~XJ.IbƝ.3 =@@0A
-"r~!`^]V u|<o FL|0%"{GzE+PȊ]1$'z6c@
- g*Ruَ-΀i\<LNԜs$.71"=HU6 Á6w\Cprar4dg: g^JnpI
-Y^@%"U?"gy0bxNF%+q_o(l|; 9!셚Cq/#2 /<'">@}a M] V+E RoLcZN}"]$JAc -=Dsl
-WM LoܛRP@\4XM5x8n+He@{W7K ކGjzju\n&V[nrBIh[I<hr`}Kv]cF4!&*Q+w*ax6D3gq(" 49C _:Qrq_Q՗~?ȓHCM]q@j4E%տ~A1$j"UD
-\6r_eݨ'1o?q]S:7:arMi2JƮ\,=C^Rdx9<\
-mjJ}C
-XYM֮{\:ޅD9NPwA\iEwFG F7=i1V3n}ʇԨ 1.kOPtZF}~bߖER߼8 O<RP3T~AB4M%ˤ-WERv}B¥l !>gj*s[Ai5g{*<Ui#H;jzZ_-(.O9ǥ40zs6@rG\w_4
-D;
-Z_;M̔&5ܬѓB٫0o_GS#C
-:soL`׮ %-iv:֮ iGPuGDjZ' S3甊y)=oee-/˜H,~#EW#fl^nqi8---[n֚CY^__Z~KCBg.<9xv _
-RE
-Q`S`Z$L\wd
-Z(Р=w-Me C=@x;=T
-iDw {
-ﵙ=Y[y-n$:BÑre OtecLMy76R hsC$PiJVH7=K;CO)Ny%!<,lK,m첃#&V|}HM"Ըy5
-)ݭhe;Sv6:0ʥ׾* 2g2G鱜kumŹmBk&7$ uCCyfhm=HYz +6o٫5|kC`ΌmXNieI~e7%[9|Ќ V"9uޚtTo&w>M3*'K].P׾zΛx7Sd@9U3l>c[~#>$kru>0|VvRĀJ{Enp<'Lκd"a03ݔNSI\#sS o}?FF|'njT.*rtGZ-E[]9XY"R JZM4U+5n߂g D1&3l`XU߭$#0x}gfzUnl <J2PyktKX~O(KGv,^
-5v|S^>yPiуppQ#=n-w-7y/4olf\WQ~Y{\XvC Mޫ7.Z$gd2f'%tO!7mE]r{ IE[ (eJ,%@?1iF(a2Խv dmw?_K2эDbH.6:_|F|/^~Q|oN" p"DhDyCܼy]Tw6ma7)njn*o7FP)* 'R_%?ѧaU߭ wb=Fʨ^rHຫ
-1<TpKN)f.E4@q1u]ɚ,Փx$(+"iVPQWb,AP(w!˜g3o>ge&:3Dt@ë
-z<vVB\xG-FE}g7?Ƞ9t1G\)(m~
-%;r2"\}N0Ɨq71!jRkzg.$H~ku%6>U tY#GG뮔6lMH!To&MvX~J&B#Ycqߙx֓W|YԐkI%cR[n
-$1 <4ǿ S `;m!Aм+`i?b85ҜJJWCyxL06_QGOD04|ۜY UqAix2Iic7ݑƫ沾uW=C䯩
-6V c 0[\gSʱI`a!Wu&$OhM1 `/^cLqJ+}:@D7R_-n
-<sg2GIe.&msH`d%z1VxgNwE
-JJ5!9oژݛHU r!;pBnA;h[8&k]MX'bFT9xzɯrfzPuD/gQi ޒ]}p$f+2]fdu4進5:I` /,%7yJ1U9]pH
-{i=~mx`b ϤԟMmϫc9ԸblZt5Ye[ $>;+⭼MuUX8jY\N&,g^wGS)6`_jfV
-?"U?H/D.pu(Dϭ@*")OP /T0epϨEDjum(眠<|~ S[
-XLKL8CX^B1%i\qc˶ ;CWGE"ˤҶ -B9$Mb [gF*/=N>ܭߏn(mp  By~ @Y {dga]cvRx#ʨ!\wM#ZTtv1ېND~+Q*m'G0Q8 k(ai(- XM zdn)*O"sC ԬOJ(K Csn:uNJOg'9Ff98{GȐ!ƒG\&#}:+ӈ+^67}aa m|Fzhr?L"߅jW;Y ;UA_I[ľuv)K&\oͣF+Vu謈.y5(I!QG
-,T;`@g2X/ӂK~kVtwogrأ}av*-
-†43"38c0R/=!<qC~nk1z>ΉtlMerYwaP^΍G5RHO4s/+V:j%/_Rjx6tQP6.pޒʟ[~ZuaEl TBR@^r\L:)zp+}nQA+{c`q>}B}
-(N=ޓn+
-*!Q3_!W'D%''TAZA^|c^!К> eCAbt7@VϒI7]BǮn(nw@լ#nw髍T
-jXemU}HV0W&VX^\ VP"QǶte2K}/ioY :oN2#K7uZ)0=mM!I,c+Q/m-E
-uZ5t5*euola쏱:}Xg$. 셃8ȧtX)i$ŘMGy p&ӗܤ=F*%K'inܔZl %薓XDP -*KI<^>#[ƫrQ `
-{E/!~zI[ʹ~xn 47L H2)SӍqAZ$~Mu2@/ ` MhB1$sy湯>PLxTBa5DpHG<ی+@搄CWCO{sٜԒkRzL/AO9ѵE~&#O%&dyH1h5>ا
-҅pmdFJ0~^!ZJc2vpc|s *DK~n{z?annWÇ;>co?hŢ%^x]~񟯄bۘDŽ5(Z$hյSkj1\S .U%l쮑+j1kW-e4{#:}!H);dTcOsLyxgro4^R*<Djg󅩲 #Y1STc3 .[cA4fMGJ9E5҃Nrn
-% r*dB_" xmD>=3kLiK!snJv Ȩvda"J#KP'C-tG#Hs J]NR&Ed7ڽf1-!(S*S;6U1 ^ cgYҴnF=r hux~xJTF}5w+FHnj:ы_Xa
-CZ ٕ<Z"c-#"|͗s4itY5Z˙k|ώqHa -ſӞW0WE#s:_1>2rJ8j̛1jGgk[IZ+@z;+\4IE?8$_zYAE*\ܣvK'
-K 6qB:2떒KN)SR~nZiH풞*LI0S#2@^%攈d:z^^oR3oa#f ;P gDa
-jІ}ZdqNv)KI7% ]ƆhagP
-[)G{-nތTCIo_jY>IO)^WZr}
-!yD={U6,5OުÌqe6UMQqь/nsx5tvrC9-;Mt^GKOx5M#'Jirh%:j҇J 9nJ_k*S0lQ/[R
-CI(υ;*I<#! j h_tԁ2MH@(@n/38D.F<%F&f #D+!Wȶ® 3P_Enm"Cds@j 咆
-G$f+%Y
-[Zѐ5'_#HZ݋zz*FqX}쟸6{܂F K<㾓Ww!/_H ΌTG)sWb-|B}gz=67Mnbɳ=a)X
-KiB\^`avYZz# wEW+߽0"&{ǘ)>XOç\-b_U+`ɝ(ekZmPPwx G_Ra |[Izn߱a
-o{[^51&% PRNz%Iy)qӅ^BGzAD3뿰үEBq\Iaѱ΃Xk-% Y1)Cf"$L/"PrlٹvWdPsKkqb!3XF7yE"sCtku\8*
-.ԺG[ LN=YOU9@IZ6 /maȹc6<wy<)-q%ވQU+'{^~TMe[+]9z*2e6:K6Z1Jn,!X{9(Mk|QJdYT٢+vɻ0н5dy/h\YH(:!=aL=Vos8}op"@Ǯ7a/b qBVC~̿mZ.(۶{mk>G/
+/Length 25969
+/Filter /FlateDecode
+>>
+stream
+xڴuX[۶>LqwCHqww\/PPݡKq.s9IVޡc̹P)0
+A`;gF  @VNlkdȨ 2w1r2#RQ8-vF Gg  7"@dr|S=
+{o
+i8-@oDO'#WO"DGۨmĿKٙߘ毭JOMv6
+|2՝U#Wzfr
+)Jsga/60XofMmJْ3]Z,IKϼUMͻL-c]RO7wVhKÊ*"TG69v[ p?O0y߫{d:UIW#?Uܵ(.@MUYDx#8(T
+Pg۵Jie zdBP]_2k 8Qֲl-R{\@vL"=GJh
+bMkZN͓T{vԪ~l1JAUøy8OʯG_~[K(O/}H
+< xGLJz( 5_Y!'5 |+SOUwAC'c3IzdZRxWi8@y[21w\ר2iߠ#T-~2#3^yބ,@>j3cӼE$ r6knW'/c?f- ZSY&wb
+  4&ԚBIP_ SL#N?~f ;νWK=zmܶf϶l- \`@̞ߊ䵛<sQJU%1Ҩ .kW/WEws^
+^*Z-4+B#^P,N7QݚWp*jz~T&Cmȝ>/5ĕ&qd%̠H>b޾ .nh뒲|b=-y)6Di'\>)Mk֜7=ȥp~ ⃀ZpqQkM
+FȐ j&Iԋ\AX:(fRb iCͺ^;Fϭm*J@K[ ݓP6~,?Ln-WP?5윪EΜ4LvݪD.G9:E,3^Y%e^i)82kN_ FW i˯u[euvNpTa I,{=w)mBp7MGЖ
+F$i5@8V㊵2 agmЅ3BZT8t:ba~llr[Fr ; <)uJh
+=.{Fijl&}!g\^EOSo"<4> غcGT++C WC~TO:&*_'RznҜ7(uI!v^5V f0}ƌ<iuL/MI2P@&q;XZFB`t3Kg f)rc 7D'&Y)vQ3w3--i ["xa8hS ͨe \][}!EC8%@z/ -=Ҋ;sg&9g~؎n\C%(qr,9571LiTzz05JaO?8>f%R/5#.i ϓǗk\[cZ尯9itO!}[x9fűݙ7[uW\a Od?P !|7;yŽ(S"V-" ʈɟUy5DpXs~ךP}OO7, YQ_B.? 1?he# XnGwccw%mzAwsz%S@ Dj.q[f‡,5IXOJ3讝/Ismn[@gv;/D-|odYѼϴ1} {̵lϧ4mׁm?jprBCN45|;O
+97KaFXKU?H<!մ m 7D{FmΚ: m§8S"zBj^3_]SWsRuySPkݟSUZ2 u )rզzݣ+˟+0Na0װ _??4~<wlZE}j?pj6c8Qcا3zGdanvI+[\(b ]8evHIY~U+4C{\%Lp;1臼K+4Xs_=7{[? &tԂMRVl [Q'暜&APp_\Kh"+T+\etKaYB_lڕ'.Nz<vrC+c.T]I D9H?3Jv@Ŋ^Wycs+*͌IBPKtܰՃL?)?.HhS\
+fMPoyoaQћ1R`"=PawtfswT}ª;GzvDT$2^?JNTm1~!~
+(^6šXZitk^Qo|f<ąߖXxXU̺!Yl*ݯUIlNa5F `5WuP+4{a+<:oo4BDߍɇG!0(W 0r;ˮN} K<)+((yjW.4#E|hcS( Bi0j[,{+ȶ.k%*
+Fz
+Wc1ۇRÒiv]17 -_rz
+FՔtX=;Q Om I!ZuIYt_͘M0; +a-%8a_eVӉݻcx,:zS{9!Qb-vD1_9jUs! J܉@}RbVΦNꥄњLozjy4Au9)qgp V),gG$U&!A3A_UsуYo:v1)X4رj0b/ i73
+H!6jag
+>]H5xZF>KB⹈WTKB֏aBD+FmDԜ?hvԦv^cCM6׉v定'酜zl i0;/rn]V+$> :]*"@9:`*Z3y=SU3N◶.iyWr ZϰSjPʆ빢2P!xg$߸-{lAㆹ{/Yu-P4hj*XV_Ʃ\H[f.E]@B{zٺr{4>6idjCݢn鮋ߎRmϽB`ek` cGvf*ZcP2g 3@1Hљc>w%q_0$U1<G~B.G7)\!څMN&w {At*":]\Q'ˢZI
+1E='gO1%].N.߳YR/9}
+nT}z3pG.2ruGzh!z5\+5n%?&W+uq> zEi }:b #iR ^bAhU9PH(+I-S#>c/ξ`:ծFauKܪ
+
+bHQpҜVPV25RpwLW0:3]6(?qBkE9܋±t(`)V0k;v71RP_EdGP\./r=V͝OdF)|2z1c.Fj9Ieq怓<~ FR
+/s6!x^dydItΟbGi:
+R*?]kҠ7q$!Cw(D0 YAAN1pVð+=H&,*2ҩm.ѦCQBp %7{g͙e>IʃqEb\\/7nZ
+{( q(KDb'FNB5zڡz>ɓH8Ⱥ;t\6/[:[X0(HA\?9H!h5|K?<85={RZ' jvNPotϷePO;MlZ5V6<ՃLizoUus؉@#q,<bsn#]=1it6nslI6
+34kV?X֓c`f;B!+y2K,&髺@s?FGJ;<Ki5?*Z"m6ĹʞdiV+(#AgN Xu#vt{yJ"Pb>Nz-*cCZ@v2FrM>ZMCѓ8юn+c._ol2Y W̵|[ζziK末LK) dmeλ(54G
+EӧZ#%틩5ҢVn&>&7u,a^.{w1*[q)l3t۩=7:<qw}W]!Z kg_B ~y VWD
+~8$ lVZd^Ϭ]L=ke/wC 6x)?fVa0?^3{yh}=QSJfgߞ(xȇEt7B1 o6xOV]ъ&u,Ğc=pjmT/C٥C Ox= ]{b~COe]0τcUâ X:_aKҘf)v `yI$2 V);=澡$dӀ;*s]L=d\ )Y|H0m'i6,C<$iVR ?eE5OģobR|C4E%@m"ޛM
+ܧ[Oƈܪ .0]h G&)5`S ~[ ҩ}[&<#@
+f. %jE]ΠK#SVu P<^>ԟ^Fc!#=ϏqqOJOQ4fH?b|
+<aOAKlF_kxbz,TȹT`Ӑ<gOՃP}+fzi0^Ε ]i@IXM㡈8/-5swAS1=UH>T֋v4{qtZ$.kT)љ Fׂ= f2{sI(O_wKŒIOgnVCgj!Cg\If+P
+9X 8qn3W9wvm>+ 7A#x'YUsz.Iٜ^k~8y }UjD..q$rꐮ$|8'M<+RB4ͯ`^۰T vffj89Oy)hlQX<V3 +<b"C~"\R*h+bL4SP'{6fWQ4i)eWn|6Eq <Rߠ2׬9YY1M]+<RD2w~ DHybq֜H$K:?tFH ,_,*os=m8oAEl>'[f肎#gIX־矮tsvy:>L"G7BU^f.9ٚ򪠒߭U"<FoK&ğ&wi;OAB4T[SL6'te Pղl«@w3B =1%-'ҵ|*C "}̳?ďw=;4uMЭkfF@xu1Jhd'}6]f]6yl iA}g=T]OGbN3X*2_Qv>?UMxxc٢vU#lyT| q87
+qŘ_ThlG6jp*FUD7xFV`gʏg` |+M@/48v ݠ~_*w۫:ńc6)ƺw3ug?}ܝyѪp(fd;Q
+x̑\q)~R٦ Ձ!_U󽴄s4")1:Pj8c~c`j.jG%[>- h3&EYS*F7CL5gX=D%E
+ZdYKTA.u:1l$b2b@h^l U .dgn
+}8X;0w\qAnVx+ L"BCQo맥[Q\ JV?Hu#ld*~Ɖ O_mЀ@<&RY՘"UAe-֓8M?0Msb:Y@CrwpsG.f)B.iN# s,2[p(AG-g@.y#43|HX"yՊ҅d`aa+u'~jXN *ln3+V6/`+W)!ulQDD\/XHie#ղ7=sݜdr2#wL%fqC?(Ni>ؙL%(V?Q 7MWA,*/l~IgVjR3ڨCpypus:z^n027Av6o Vh@QUGLL/~v/oIs"=) =k/:T`{2q/trҷsZW]y~}3@А.ҒUW.E/قUp^uϐD|}
+)~[
+E;?)5ia\q4ف|{uG6FחCUĬ)ҵ(Z$.qB$>`!CGTLt;CtmLrp5zi7g= G>bdߠtTw}7mCV[-0o_ ?gC1s˺07ʦMU(cV" O S<.ٙ4]Jp'/6^Z=A,Z)M[ǷU}{YQ$פitCo-*Km4/(2nܧzBZϗ8!v2e%pvQ`l7k ӌ<:n"1ʃi2N*ƨ  F95EX6UE C#6J͸hVCKxD\䯑_sDyuDO}KN*}fŤ+ηLA3~_n%>]ݹn4aH[ E+ӧdL|)ܛY
+;^OK̩ZF[h}mKvÍ!KϵzOg>
+siƵŒ^Waɕ_iaT+]5B+lXmGv+V6rOx<-Dg|&yuyX 6fu#@A5+JQ*1a'Hb8tת~AF}zNzWxbʠee_
+vȪamVj*bOzQ_=>zHU<ޫxo.[QJd . @N߄Hw>ѲՌ~P=Xn|/˒**Di5+07N&&ځo6:>U:ԭ{#G;6?{6x}{잟 wӜ΋£뫭
+/h@%V~[H|!3
+ݣFA3^%:w
+ٙiqŧgWYr%P\AsD
+Vض.Rumb¦k${ C;4l֍__CTQ\R-ӈKq|9 ,ɭ12cGpulU7r7zA:Kq*"c#Jn\֥+ɪQWCҀr|oʲ!>2կ\,rH8
+3 P5O{iDdǘf$]EóK
+t-WF VC%W49>w?!/Xyڏ~ӑcsCXtlx2î*L=z_F&,~<1~[J~n#?80>f\mJ;\QZHyh÷
+?-p.+ҭ}/B̔7V; .
+yUҪkkHrW%aLOޞ.hJ̼t_pr:i%[г<DZ,˯>@|oJʧ4$@Ph!2NpFje=XQb o$t66Azlana@m4Ä'ʪkpürP, ,4'x-ӰU)h2_,:<vCbza)v? ҇5ӫy+]!@#ߣ^A^3p1
+Cd
+53b$eKKƛ_sq RU ad{220?nNnʢH~-zbEI5 22K% MM`+}tj8:9sd, (5"R}{=H ^?&eF+ Yx&e+1!v_&Urt௽ afS* `jA͑jԝytQJ
+,|$^ݻ>kʤxuPH^T)kO?`*PXs-\xThU wNQ
+hڦyٜF|7DmO=5`W/-o5ȫP 4wTT_<?~jL##R˶囦:8W|x+1Ks:ӮfuSsoYKޤP $_^-%S1i4/ޔLxaDl a,2#+=?6}VC#jE?_ץoC$Mĩ(8i-#REH/ᴏis?DLwmFnXN)%5+/3Z)?%;ܙp98oUկ,g馾:]/6Lb[ہSL>:lIɣ]q*";JkԊ۳WwPPnʻHx;aRe^KUSPT˲ἳ)2PM/`2eА^+` vbAi1kZ$bU-vV rkz7Xܻ4DSzUT[|vfJn 3!n 3Cz31Ǔrj-G?xd9fXQ] S&Py]E%ŵFczB RGm G}ʝ^z#G&>D=AG<sEhWs qr~^ָroWӼRtZKB)v&izIlD9=]h}N NBvï%,Ȼք:=̡v哊L`
+Eu#GDf5`BwQ$`Mt>H9?_uGPFx):
+/P{$TIhz;--p)B7TB&H$.Eɢ<nU>-E;-}1_PB-zw}[G
+N}A6p!r2>PUbeZ2Ӝ\8H^&
+)ޢN' I;8[~=32OKb G"˿H9ٜݒ8L<E9ЪRѰ^}C&iWOq9k_b*Us[6+o(W!V DB˔_m\ ~;ٱ &W3^-FTq^Z5IsH zݥAԸ]P# UAVa
+1qaр4(B
+ )Yqh)~|n&EZ-aтbԏ{sj/H0HZVl:_0V֞L؉P$eP|J$UcFd4iPm.O[5bh~Th$I57ى8i(! 2lP(98Y?f~̾!QR"LQ#:v `;0R:҂)*DO
+w]7"EV#agm䬪j<gu[ęO<97$<#YwOEo9|MW !G 4 j9B,м_x,8"@;yyh!ꨀ2"nC_FJ8>aGÑizEo#U3ÈJr>.
+'XD[&8Po(6=O6]2~\NhޜRL"nCF(CqY˜$EeX !i
+A-?=d ^e8 >ꙂgQB{EF ؑbxdf
+gqQ0 q%k.k'5Bv6?$
+8qS#4]@| ?ٹRM,s^*XmmsvҘ,;Y?ע0 g!YX 1Nog*C޸7061v%8Jp='l 4ޡ'G<x&lprknmlƄKA90foG1Ыע>G|
+ٕkH c\ܑvߜHx#BwRr\JSi0<'=* ISP5.Nf>=SAs22yS`=S}o#hAc V=/{QRgQRum$XEMp@Sf@ :,Mcm J5INo\cMWCܑtX U{I]C
+v
+-dAaq֠~`%6 (d 51v`jfxi/PYrv79*?S謒 h2,FL
+.-7K ^x,}U kS<Wh"I_tGW^;閬 Ԑ,"H..Gڢd:Vw_aG$,+i0?P5f.:k;#%Τ `r0+XUmzkPa9aB'Ot'f1p٫1T
+G $,R쐠vN'哋``8pX7#J2i?ku
+ rm5Ϲ7?Y'0ʵ79 usQA]oDqM4HP:岨-9ߋƅ,]qUn.}OK6;-u-g$6/Vy;Ť!oW{@V1<8ohôEBTY<޹߰;8?s5Dnv{&Z\KNU=YU;BCYUAL6Jh:5L|LZ P2757e4C2ć8(  `3t9tCX)r%/s"WG$Y32q#FWD/uxMHOةbYEn_2##* JmNܻ.[%1VkEΓ=UC [o0% maQ&;rGOE A7]\ֻ|UB]ԋ:J༂}@P#%!jx ! [569$^M!M4OTL&A {'#Rw$bL ]9GXTӃtw|@LJG=Xx3whYW=6a)rڳQU1IhJ}t&#yՕf+ ֳܳ'`IVWھ@T!ϣjeU+Jq]YBi# BdäO+,B:<-~9>CU"
+}(06B笗QX'[/60#C
+r}P߸!7h luBD]l5lE?Uբysp~hr\P v T3(9(M߈.~ceKOl` f_
+sַ+3vAZ+CCu5>3Gb10$ $˴鏷vn
+H^+ d .
+]1BN
+e#Fg),y%ޠ_gN Kw
+L]z @LBd^BswD
++n3Ay֚Mdž-Imi!XcJy#/% rסT+)J>^1CV"s A\/gQetJmB@ْzE4B!_JWNYTi]&DHx"{P9gP:#Kq)WktmҏPctʁD ROHʟ6i.5Z$
+I)ay"m$j>=AVL
+SYڸyz>.ˇ4%vcw90%
+'`M]8M#. 
+GtJRW ny1N~!(-SbkHIUntIDkqUјjxCh'αvEJe-%E7tGΨ]YzI3\ 8gS_b}^&"+uPyKV !>heh@^i=:T^+Glb5A"żVr 4^w{A%Nڒy3,]9TP%.Kp EИq`]+6
+hmU=:v>vFf8<pP/S[%d:[=b]Mwh1Jžnh=sDeOBWU
+p5)FT%4%@/Ȉ^,&ĝf.UfrÈ`1HG&U%~ijSL%dQl /Q_`S.;s b<IEFU h{^p^<sC@6}QqfҀW-}MQ0G?t
+EfRY#4^יyy⻋X{ZI_$[
+6n
+t0DqCRq vJۻ1>s{!J6Px#,uKYjP+MۀVAs"s?=
+(X֊v:3'o[~ܹm_MA6'ڥ)r"{VG 1JT%WPf<C
+]FKmpQRndDԖ:(~տI8S`Hu
+$WlEpfd߯fT<r&Vϥ
+[Y ufj @McTVu.ȕNE+ OhaiFxQӇS[P O=GBK䁆R}n;>=c
+H'C˜P E=]7ׁB̼Bx.O^4>yB!n.pb['&^G%
+en
+Ἦ\4t\D.|daPdO]=ڢx)i'~ J{bSoϻ׺kT 8cq<K^_J^gOݭ%SaϬ[nE5V#mԄFkb ')* vLAF{#aA4F coo5SoCBCL}ͪS_vwkANє'ekY&:"fճ+׫.s-=*{gխ#hۋ$Ŀ,"ˮeG8> -|7s5Moy\F,1R^_D'[ɋ/Sb|YQ\O:QEzׇ7N!Quc y_hw*fXr8s(h䝫 >|
+CouF5E(Ό ͔v*3td:]p@snJ#ssDYr,-߾1 ;XGmGϸC}ƚF\&\~Dw;SZI7$d0aTSSZ>ɋҦm3)l2?=SPe!"vt3;g,#<\آ9WΆ-IΊyv^9#(/*0 {XÂ)6ҽИwO\笵w,\lÃ_S|O.ed
+@W1_Gn.cwfWIێ=m>A襾lddFI[!
+Ľk U$&&ȬqO=zFa:GpR*p[~P"(w Peȧ
endstream
endobj
-945 0 obj
+949 0 obj
<<
/Type /FontDescriptor
-/FontName /JPPIRQ+LMRoman17-Regular
+/FontName /ITICGN+LMRoman17-Regular
/Flags 4
/FontBBox [-400 -286 1338 1125]
/Ascent 683
@@ -6567,11 +6602,11 @@ endobj
/ItalicAngle 0
/StemV 18
/XHeight 430
-/CharSet (/E/L/T/V/X/a/c/d/e/f/ff/ffi/five/g/h/i/k/l/n/o/p/period/r/s/t/three/w)
-/FontFile 944 0 R
+/CharSet (/E/L/T/V/X/a/c/d/e/f/ff/ffi/five/four/g/h/i/k/l/n/o/p/period/r/s/t/w)
+/FontFile 948 0 R
>>
endobj
-946 0 obj
+950 0 obj
<<
/Length1 1670
/Length2 13459
@@ -6641,7 +6676,7 @@ w$X<<Y6{ti<ʮC~¬9be}dQx HDFdk Exǯ^o|
ֳ%O8"{qa4d<3v-d,& `\ӍaqB{W
endstream
endobj
-947 0 obj
+951 0 obj
<<
/Type /FontDescriptor
/FontName /TXCQKG+LMRoman5-Regular
@@ -6654,10 +6689,10 @@ endobj
/StemV 106
/XHeight 431
/CharSet (/one/plus/zero)
-/FontFile 946 0 R
+/FontFile 950 0 R
>>
endobj
-948 0 obj
+952 0 obj
<<
/Length1 1704
/Length2 16333
@@ -6741,7 +6776,7 @@ $tkO~k;FgbE#Ȉ/=Uh}$x <]AQLiyTQvb/ ]
Y[WE 5Fiޞ i'ۘS C9Χ&
endstream
endobj
-949 0 obj
+953 0 obj
<<
/Type /FontDescriptor
/FontName /QRBQZR+LMRoman6-Regular
@@ -6754,41 +6789,39 @@ endobj
/StemV 83
/XHeight 431
/CharSet (/five/four/one/three/two)
-/FontFile 948 0 R
+/FontFile 952 0 R
>>
endobj
-950 0 obj
+954 0 obj
<<
-/Length1 1865
-/Length2 21565
+/Length1 1914
+/Length2 21715
/Length3 0
-/Length 22706
-/Filter /FlateDecode
->>
-stream
-xڴzeTݶ5;;')ݥk)|}=sod$O\6%:(932v nF5#RhlI;
-ə YXo!`{G+ K?9d-369XAf
-ttS?Q1[#
-V@Oo[+߂p{k󟜶+ciW
- L]
-($+%&<"; &gw翼PpXy9
-`:d0[)
-!8vB<ܭ@€oT`>ߤ
-}=}wj 9Į5;rZ}g;ZlNVsk (qJj1DC#1uŭz&})%B"5 6Ε@u)[@'@E_@jyM=HY/޵271^]uX8Gz <zrqVCVW.uLv?m'm
-HHVStN6,puWբVt³}G
-bQ^Ֆ.[ ;47LWJק-EGX5w0f1bVag<?R Sc">k⒉u)~L5W%< Mrc2AYFZFq~rlilP8
-c)! !^fS[8KNdzp+0X@GnKTbO#5ͧےϤ^EEÆJJN
-;wu,>d| D
-oNUCWv=G~gbPg|oEH4H~?LԛywVI_}^xu|>nhgLϲ'⇏*7AMM.>J4GD
-z
-ً*&NG'Btf9];Ng;4{*?&[&U:JبE(+%`v
-V%\$V爕Zc聍{ARc(TO8í*nlՏ<{Q$C4Uk>o.*sSsżݨbl ~RkKϪ[#z-ԏϼJag Pʣm 6n(bv}xX*E@oT+S%uCW~sҎ%%GH
-c~\,.A̪xK.Rd4i75Bkw"pUMQ⹂;пЁ+C5zcpL]/-hǢfCsaH.5?XqtlTK)t)`ܙO_7S- pyYGClA+]"ԒiV"vL&MeW5{\Ӹ' _]WDZqujGLf͎vX3"vyԴI-Ha
-"coZb)PmE@6)>PAWc#P
-jqQ[ 6c<FO!P֣yTjLٲ 'If;,E)f<}i}|zm Ş: QK[XkY}ҵo̝s2#Jӌl Y%$c=vU U%K{<TE]Zs>"!pAddlq'I4m^85+e/&#K̆zK&voib`Ȁ!,\P_dWXdh_޷cvʥDp/gcZ d؟~&Ua0W q*jSc
-{Q,͎rwqjz}^cdɄ̨6Un/H_Z0Kc[ BL!L
-b^q] U~?}&R.i%XXrξ3m򞘞Ρa7EK[c_A6An@B\T'BlAlqb eX6g mQ4I411@x~bw<h&ayj7{AԎ7Sˏ6cJۓS"4?e&88F5>fo-%vS=jL
-iC%tNJu'[-SezM ]n$bl*ۅA'jL&O6=?&dz9#;K<)]( <Q~۷?,XK(f4ZL+GYoVvB-r㼰 De,iB앣x=z9&T$9]ﴐiJTfڟIޱx֑ " ^sLI<O*©9k?g/ M|1R.p`ȋ-YU \N$|OϢ>)=X Nqj+ncA~Xw(I=湠bc/)40w]/u}\
+/Length 22875
+/Filter /FlateDecode
+>>
+stream
+xڴzeTm-!;Mpwwwwknܝ]O %wf̜{Ww?둷jjJ2uFQ3 P
+ rfdeb((A܌j@ [cG
+ 0v-ʦoo,,
+V@o[*ߌp{K ci
+ L]
+obTe
+|
+`feoÂwY97imJ [Y 4?bI*i3glgeo ÕF hgl2+')+w߉u6~}Q-(Ao?[?do-ij:99r.YKOR[\_j S0vt4@dyk6NN[O
+`6q|+h/l%כ=盥[`{.8x`п8<mƀm'qAB8+<9[:n90{(*6_U#mev_*osgy7__s^<
+
+2|I"ض/k-7f"ƾ(9ZL ehru92ZZI
+YSҷN2= <3C0u{F^ƽke  obnkq48y9
+~b/H\O4)
+yj…2e,I!#("#4{Xq"BS"i M☴FY<Ğ p#e-jJ"RCP/fCn̬Rp$+g:V0`6!ݖ7':GfkO % u I& !>
+v?X|` 6Չ
+t:i|# 3o].9r ]<K*UMNR;oqr(vvh(-,T~(GM8L_=gujO QQVKFF;Q㋛׿JHIV+vQ>q[Y]U\؉ūy>Ihל}2Fig9]Ut#x̋yQΥn=1U!F@[Ga!y9ÔJ23xG (mQ0 /fTU.3ߨ$3 œWJꆮ21JJXY\U&]Уb#1;\ɰin)j&ֈ%hEF٫*#
+%0s wWjpV)<:^[ُĔO]j<~~
+vRRg3o 3b[K(80q+4"V8ED}%Ӳ
+&E$MDˈůj&>qOZC2c$+ .f{3D,,u>iZE=#@2 S~N+l2SZ)|[*:4G,Ԓ:4'Eݱ=+@lȿǬy%TCG0d1ieJWOH*wXRN͖y,f ً۠5=7u:0GWמwݥk'ߘ;dUG|{u @I'DKHBszV-YwJUy@@/|EB2ሃ65,&< 9ORge~i@ן<p4kV_M:G L҆Ũ *;%CY{m_?tɂH3zѿ2 ;oK>q_Ե."?LxK!a)TԬ
+#MJ]XK`}-5f=1=7Cn 5:-,1ӿ0mܶ?8O)([E @D%ͱm@" ihѓi cb|!<y5+DL<s9) oB)o<dmv\'Dh"3U1*L4 ,q>/pj1}"gޡ[K^zԺJ0$%N}ZH<=$<:kU !#NԘL$A;mzzjMWmɎr!Gw6QyRTaq_5QN9y\k1o;u=<wYiQliRߙ?V=d3ެ 1 Zya ڑ%򉉶Y1+GQ%zյR'rLF/Hr8i!+5ɕ6ʹ?hc #Ϗ&EjLOx柔U7S=r<-R^b: ]D$ [ֹHp>E}:R<9
+{.@,&ynVJ0P,Pn#"{sA-^V5?tSh`-4#=)_8v_
p xd;JNU s݂cP:GkAv﨎r\#;6).`SYUkķ'l !d@[ B [\aaunWJ2?(59bd$%>HVnWǸdXuHt <*t3DY1>dO8=GHzZC$q8yF,A| oz.^0/BI){vjnwΡf(lj]-I7h/j[i.ݛQVơ#\%X.~d(߆޴.@ÈCzp+P><.J/J'z9pĝl~)-!AL]^e6<f-$
/!%$F_90/F*
/.Oc&{t]F_=,lن;hCwgRI,$Eo2es?\}Ó
@@ -6797,74 +6830,69 @@ kXp1BvNݿG[J.:Q:Kji59gTl# Y$)$
Dn4b>yNܒ، i“EF MyRR)EPYv\4LR[oT4q dPTقHlm5;H>qm#UgYP
΢-z&=RvP~*fulyBڒ֙ګwK?**3$¼d=Uw9<~f,-0l8.z~c +B&Np( lR%R71z໇Lj>6l1y֊ Uvwv ]{JQ&gˉ IXVS>v#\vkxwl k7ϰȴ=..O}К"ȖuGSN>7s`nK<BhA8/aHt7CM~x܊dbUcJP;%8V[JvqE0l(B}qVt[ K#jޫM=C6 Qׂ4qTi4ZUyvw09ȉ*خ odh,bg?ʪ~H)(5sQH9Yp#|.ap7s&ԙ ofhSo|qlt:ҭ3' Z &Zhgdq+ *2 OǗS0@j[㣴k1z'U%s!n$WުEb,E;.d161b:
sR $'jVޖ1)_ܒ&<|wRTlCfH>e^<
-ia˧BtXa/rRB&}b5dE*,3]*K
-XEȼ؞dE
-O8򓁹sYb?# yT*NKY(rmJշ'xT`gf'ێ:=#۠?2e# 4iE"iiR<A/R_jiȐ)`}#R-&8fE-Tt;#VPZK^f gJʵE2-<<MBǫ|Hu%hR. 94Ae
-`4LҙXJ=CHsfNɚRg\0' "4ː{f6 B}6UZDm$
-tx-& KUءn
-9up;]|@EU-̵ njѭF
- ٥Op
-^1!%[Btci6e~q AQW4m`GE=6pqBЮB&pQOz
-Bz~ǢAkm,/0a[{
-:{::!yܗX^ g`z,}kAOۧ8.z8}e+^,!<).]xuF:{=
-|ZWdL}qبr8n `cTw.Uɯ½~;06GOp6IUL6QR0{=|7}Ҳ>@ U9B%3\bض HPX %O&mpDw ?v]`99e"~NY
-Cx0bNe9##ԙ2<t*b)z1 :S%d̏鈲953ucK%I#_Tng Sd_|tK
-^&WmMt[BQy!m'G3x260F=2n eU޾#Yg+vvA rZc7IF,?!,JW5SJ@y.z\ 1iyqu3. H!2+0".= y">;9hK &j½( Qٯp]5Ť ̀e{¹ȢW~Zmǜ%ܐPv{zʃ]Ci Dz:ɩআ~^3f9}f{-/ߊCW|ˈә;V9M̈oRrTCuq]U.,5rPt 3
-yRB='ǻrp{n@AI)wx^Β+-"'jS5%te$mlig)݇aBWiZ-Xl ~Q
-1FEm-Crr[Zӟʮ|G4<\0Į]9u+߄ Oұ#7_҈wDs$=XE%_OȖ ]vϱ0;>`+u}[[_^4w^Huxn%zs(#«Ý0/Eޮc
-f_p[B3fp2鿯qd Whˉ)CsAp8^;d Y/>A;d3=Xѯd6|t_"E x͚gAT.8'2!DniMCܣ.ǀ:LH+
-N^#P] Ȃv1ОH,
-=TkGSϩjnb@mQsX#\$8?@e7N]yJmzZ0ӀOi#aErŠ+K7՜N ff3s:kI,.fnF?rsj>4/ݦMbI#-'wT@gT;Z/mEEHz_g#ajc4 >xZ;\b3JT*TԟȜ˨;1[ARd)wWFiWL'yW+}Їә,iiyUbi܁ }X)\nɡ'ʺtΎ<
-rUxWAw!=qs5U{}"# )B2
-~? *$M0:7/dzSrqBBWGh7mW#hS5b^Dް2A~449F3HzE_aVv0 `^= +vL]2%zm'}X҆;)LI+B5 \SyP 㮙Sa(Vp @E )0MI/$8Go{ϱ \T4ZX;@EOXuav<T8)ǿV|ȟ?d~2蠦%:vn,M"b qp6!ʵ~شh43>5T8T$&Q<͵č+PtY;f_N+%Rқɨtd)ȵRs<+
-!߷ PK.Q'zFW$drʿWUzA;mIjJMߓk/;b@Cc#!SXmCYP.EM 9Tݔs%ضct_i`K-!fo3ӥ5lAqH 'LUpJRA޺$6IsפXEc0 së
-57RiTW_Vo%Z夸jKkkI5M.lY?{ pE#~ mPS1>}XcT;?
-sr\gn ͸|&QPHeY*< U*i:{rc! _/brxQ+C4ix iȈВ]s״'DB WTnDUY[ifտ_KKJJ^oNA2L8YBT+i VZx_yŠҙ^kI֬IO>hF.qhmvq\c;*h[- ejI>T`WYvQ+ ~BkK w PA..ZY7̓P`Gr|&fD-.iG*gqP>yM:*G$od8i7‘-"qVyW_KVc 2ӋF0L10UswHFٙ&^ɢ1=s ɷ8t
-EM^vȕQi%*P=6k6wAr emHËl}P
-q:d'_~HZ#CD֕mݪ-u61g#^foNZB`ƨ3C֘Yy筊b]Gg Δ=XDTtM:bgqG-flwJ8Jb f&x^Mi>B&m;]6MױQȆlYY:Ifbґ
-rJ9yU}b3Ig￑q[ΐ\]>'gmQNTw%Tb7$j9jIi[=3f|#$ jC1 ]4G. A%N8.T#hkrp{Uu!UzHPJykWVuC}?nYIUMes| A>Ň<hKK|z0'ސjG^!'Z.7F`%ŹLL +.n`` mA<'Y=3s3s@NSҡQI;Ԍhxv%u donwꩵ=N_Vy /k+[e|yQ>~NT1:zz[HuCql'-5ưX+{W,,Rs94Nk,i1r7
-Ua\=EM2ڌpFw^I ҍl=\sf̋RZl=
-$t k$/
-IFx莖m(?ic,#ĕaH翑(hX.}BMC^Nh-.##ا
-0}{xLHJ t^qyVwVh+vb`( 'VVMm30}uT 0̩M\2}i9 ~m\
-0u,zRU846g0Qz/|>m*u=y/܏L~Wz[RWfZݖ39]b{7|4} eX.B$'<yE*D$>`=oJ1xi};B
- xy\B?lKL-n.R3~۫k/*hc^oS`9n#tMB>RlP/qZ'I "r?DF iz-ڂtgؤ &k"+nq=D}gƯG5H2[_6tc"1fe:"MUC5WoǬd
-%UP':ovUfQK/#;oun䵢\;ǭ4hޟJS-ٛK4 ]^dB2Z&PtX `sϻgp ſH4[<<XLmUZ ]P2-.
-M1>n.I1AU b†>\|-2wpR`(=r(Z :RM3tמ&{T$)ϝ0QĢ >]g8ձ7Nm rcN{NWYq=;s p@q5 oxA`ly"$WmQ>N7[;={jB7ㄴ&EiN~_chQ/ 4A/+v<N9]E(mX1~Q 5
-z4-K aD$GVVG(+o㉘`yN؂EKxtY8>]Fd`k@u;|TKL,Yg"#»sa{aOs>gn'U˓^vM&KHm?uv8cz&Owk99qNwLww7c-{Do unk&[S*etbc۴@
-GY d+NKYa |}
-`_ Abb]2t:l` :ߗ88% ^u{Yu%ha$O,.<wl ptL1JUX
-(~=83 nEm\GtN1טoouKI@x(Fm-.&c]h~,B͇-VqK!@p}^0=wE ad6
--4oLEk4# y%X0eSn40$#b8; IvA֥*:/p&8 nCj:LbjIup'[aPE'.@\r]ésۦ̇@y^'dǧ&)PoУL_Jaު,1)2Pdpq-_%^pt! O!alOLM$21tC9MB~9z:l>-ó#鏆ŸES|tx-l3f$1
-FjPۅ0 < ДH-ny^7t-73BCھ R{1 ΪʴtFbp8?{P|6:anbꐾ
- [ƍξ23
-eS$}]o%m*3qdY}_1'A8pFʬ46sxAf}/>}{MM-̕fve_;:U͞$]L)@gMlD$iL@Z%#RȲbm5cUX\ 'sF%BY#,b.\5ZHg^A^+>y h3a옻q/nW־QC<q<%4JuQlSmocLIR%_b
-}{^R
-NJ\;!U#<}gvHA
- __K_ѡ@Xo39R? SUJ9ЮuckEVp:aћ_Ǫ}
- kNੀ 'V] F]%pXFD|lRd}T7\1Ly|4*>L`okQnkp$ŤOKwlt ;d:K?MisL;?$mS4ofyq:8h<^4swxJk3gO/EvI c!ɗx+:I6JVP{,b!ÛW-
-==Az* ;~3.ѕ2 HS)g0+RlNt&a5Zpwse@6W^*^Z'#յnp-*_9x}ߔG6v0b}%wuQTjGb 1a: owkS'F^vSZ ޱfH1W>+ *p4n#7pf735+124z%ySuR$ѹ3KDH[+9yUP`gISŪCfuV'
- ! L۾s!PB>ilJsM*m`k\(gm_f ~3]3X+tlª E^:7XGeRaә@LN6JHnb^ei6 W{v0U&QŞ>LTm֣6v_;§pӯڇ:Dsޞإ]AنGqW%WhC缤 RmzQeZ7@Ѿ}_GTmZRﵘ]U
-QqӹloI}7S~$@uEfZU9)f౒5uqdN%stH/;x
-PfýŒ)\=(-w4G=i5UZޭ
-O>'׵
-\˶SY;r&e(
-%,^/OmC#fL@[i^e#?
-[+^VnFe4:I Y)v5u#׍jrtۓ$_A 7/CD[ 4րj2MF8
- U\Wr`@Y8
-P@hB>!Ӷ @@u8],O5|GIld<;miW_ |X|#*)5n(B!?2H(qJ*Oc,h<KkVn6u둣i==̮ f޲b&୨&9Zfhk/IFHhK-@s=u0:6Ysc{njIW3ӮDRشgcy0ҋ%Yֳ{yhTC/JG;`&bqἏ`/uڭ-dX
- _B"6c%~'lm GG۱^^
-a9
-/ Z<d
-H>_^FrʰSc֊o|y9-l|!?)".Zq+2V͗87Qtֺ#`ӉnGYK4Q3Uhu/0HboeA8x8㊚Oۉu
-XΨ,mԛ~v5XsIqd;+A?-%:d:9} ꧭbU0' DBpJl40'ʵX(Xœ%܊]HֱlfgWhrkFH6v|'Պ
-s۟nʎ9pCE%u*SGSg5p=ֲɘO29"qۉEl= [y4?өp3\i&I7CVR F٪TGy+ke>FTѓw t?j.&DiubFi'FC
+ia˧BtXa/rRB&}b5dE*,3]*K
+/4
+ˆFkdыZ>HCab ) WNF3S* ~F+R(b|%/Gг@p%"&!؇U>yԺ`Z4U)[Ci@0^Ut&TL,!9bQdM3.wܓFe?I=3!>z*-"ڶG
+1^KedjJD9L:k[~ Fg
+1ה޽cAjFj=b'ys!F y
+o^QMW.bR˅f@m2=x\dG_-cNZYnH(YFUQuq=AN!hvf4I|=R|TgpSC?/``oš+eDL͍qPg&fD7)9W*ġsS˺.*}iݚD{( ݊<)]XKUuC8=7J FܠHMOu/MgɕukNyzb~`ߴs3̔R0+VWY,n(A^!ZAb
+a9-GOR_eWMJDfz.yb׮z:oB'ؑ/i; pzZ9Ȃ, ɢ'dԅɮX^0Kו`̭/PhiB G` vλf/V:qLrwqE
+9zԑBNȗV~jio1
++Ȫ ނ-x]=eT(ae3;1i3y8#v̩@>6f%_Z5ߙGK79FՂ0GBQһ6LGɟ9Eڇ.̖xHNI
+hYK*Q6HЕi1ƐH&%r>L;}+5
+,tʠ2 aU2_f>:/V٢`?BfpsfMd _*H?is"զ!ebc@C&$ 7iY,,A2XJ-_]s%~ux<ȉJi`f@7Nw1x3H^'D.4^1mJ ۛaWDIiZsYUE%H O-ݡ[h ֍?(/E!  5V/l8fLRifSd69˽e*}[y;uR[SfROWZ<]gj\&
+~v$L5?\Բf<5Y_igS6f+j&O/L^|C6J:\WQ40]r8u(
+^QgEx_l.]{>]F+Y?ËƶҥIL?7(S}$/gC04'&hLM4jܹZ8,i vC(H~X ՠ`,Dۯ0A.IG4oXjCg(ssńsZAUWd*p5{-DrR|2q??ӅW8Ĩy#h:
+ Sfi."E tU<]_}&lnXS.S(@SQRQXmJطuZ`EdtJmSeDZWedH7$ay 'c>fsj$P[Wj>I$8P StR~8284|߈`XA1
+͢@5tٌ|_p-ܤڲKѪŢxh)AXks~.sIEem{Y91N,VK[fE7ҡƙHcl3،23J%Uc%f22aVYgkQz)}U=IUCs_/t&{C=`ZZ|28GCw`@BjV
+[rh.@"Bv;*մkE+rO\M~_1z}HzB<%9C#IS?(;Nt K9ޔ>h|ZM=&ԣy mg07,LP@
+SŊPMB&ԦnpF@zøk&cX.*B.Pr}Fj-LS'ċ5đ|Ŵs=W61h:3V)6Edn6V]"NoU ' :i <+[> djp;79Dq}Fa6Mdr6-5 O `49Uq1IbOs9q
+T]`>{wq֎Wӊl GTzzADh2j.Y
+rmc5OAJ}*(ҺKԉѕd5IA/YyUk^N[qZ~}?>a/cyFhhb?d r99jץ5c ~!
+lmԻtkOޖI>n>\
+cjsmDRmis-Ѕ#gOhЯ-j*ƧA0c|5CZpU._^>W3$ʒ
+,KR~wRVE#m<WGtOn ; 1a ElPw}"sP2je7 /a> \Z29+tH! v* <{ "Lki)[C-6Rہq1 0sQh4q@ܛj;!ڊWKтk>/]XQ:ӫ{-ɚ5(%m7.|l'[Wm4LP}2{ه
+>*0jճOavr\񮝡<*؅Ek>fy
+ِ-^;+PG9)ߐ6,R^,Q:RXN)'OO0x#PLr72.vkg̸-ʉYc$JFD:G-)" o+g̗ϳ"y$7?\TXmHq?&
+.V
+^N\
+BE4O"C5|3OyӶ4'ɻ >;
+3 n4S۰`lg7-O  AKdl@2{x`fucNo3.4Hun67b7B*4}W' }쎑ooiBNq;.2E*ǿwfh2zrwiɁKEh_L{.¿(VƬV pP.<`T7?Iq<NyCFnN eǴU.#͕qOD_b 1Q\h-5S߳h~8`K<o&A}>GOy$HVhUh"ֱCt]&mC}R.v{]~
+Li䂌/'Rd*2X6Xq%FVM0)m*hͰ(x!e@\ oVd~^Ռg?vZw<3Jy )Cc-&ѦrhO)qwo1H^#ϺdN)VbCOl;4U+{oDVvU,. @4e;3i=\)gBԑ>XǮ'rQWrY~!?h&DjkO-|Ǯ>CZ?du֦
+k۾1ܻx@JAWH欍 m[Lĝ- .M`I)+sױVq,ZesA .SH]_1ӤL2wc{B
+G7~&;oėPg©2k/f;Fwe5A
+6R )WtdP ӷ7A̴@%hwku'kfl+p}be6q WGuj\c>ɜd%~}Pg&zկ;PcZ򷻨'U/)(=Oc3pV
+)S٦QדȴWX|anG~|u)xn{m9%I{wg@Hw[%"Dr_͓WBT;zI #֯Xd!=F .D
+6?8I$+3x?)%BR/(j sAD( lϰ"Xڨ-HxFiM_pOιl&zξw*@wf
+Oazd^$E(,e0@7)cY)*_54_sk\vJ_J]!QUynGZez(2ҟ.VGF^+J͵^yjMy>8p4bDhШL6+$\oENp):lm?{&/ "Y+4MC.ȑHT&Pey(C"CE 9fuFߘjXdž %KP-©{ GC.%H:l9!t#׮2Z[\|7[ï2{MuF1D᭳L7ܰyE%:RgܥgPV"TcJ2QI2]<덮t<`h&8fa#m&O(./xq3^ۓ+Ƚ~l6hroo撝tZ &l~w/cqW
+':VBA~;-#4CwiG%H2Ki sN,cuƨ=c1i_;z 1DTyڳ<
+FD~-Lb + }d%,Șa|č"B k= iiK-x]M'e$NdP꠽S'_JN9T͒z,2";O4qxR%<j%8lmsnapZr-Znq;ٶeT6u2N 纯>gvJNf,º]īΟ䅬.kwfjQ% I ES1͡F6PP; C5-
+>Js.ս_/^h<&ŭ%n+LOb|ֲD.
+t|$KOLZO66l7y)% ^[BP6:&f,`AX?_z5ee+XsY5ђ3^)K;MADԽ]6'Z&@ .ن} 6^:8*7sѐYUlB,@q**' )*h5̽.
+%Hi(++mod̹{RHכ?f eUOhD\r zL- E
+#yˢt~r/ usٞϺ֠+yҶPr.8ǩ[XD{$kg;Q_?٭~6mn0v#R\tEPlO%H΃󊼜wFtbE5h@oZKb)$ހ_ >V7ryb/:S>I =LT7b^a Ns 8e^g><%NӅ~Z|& BȚ 3i&Ю-oX+nRS=uU^Ǫ.;So{
+s;\=z&(^:JhJbLC
+GCJa'{P]2ߴ'1G=KLͧ?.;&NW>{Hi[z]}X2D2寣i jŘN RBݺ}5g#jI{/TIђRCQ]+\RFڔYs&說$Sׯ{^p}~#9?3zF
+\#y+$6 .YC .<*M%cY¯3\P:~2wjp5F)8oR99e%ZzL8'=
+& \X_2^F2Bns/ܘX>L+_{1-֖U#M>u5SE$1EVߠFL,d|̐4!YNR})#sH˒ ΈJdv.
+Ȱ
+ gr?Z7 C1ۺ˪<K3
+g2䄕 vh$O@P7>(QAh 4<N s&_8lKDsK&kh\%JM*pG?ˋmiLQx_x3iq^.0|bڲ.>KWHs oꅁJ>B\4kJ.{V~OpUnuZClGC`Qi藮G%ju d{jGqL5&ˀ3F3UM:WE+W;'GY~[S.r. Eem3G HVC9glWnPdv>E2Q|+erQ*[(yvwm-S}Lj~D୽N9[Fjڒ'+ p)/-QjƃC>VҮgdҹ7BJ"@y%$hR3%k;Լdaz?ߊ9ө7"
+cp5m{&b m2>MCIxH:0<cQzOmҕG$QCLXJIw\\``L|{NÿOF4Wχ_,:5,ٞMMxCH֍(~O*Xv_2bṜ_V gDýTp
+mJq4mK~_AizdlͺDb4-  EBUKI__)[ x 3^ʀ#1cԀOr 11BA\9I21d]=3"3TLq]))9̙iWatyoA;j,!+sZcD$r8U!SW#'umvR4aY $[8:)j23bD-2,ehWp)tw܀(@Mօ ^LofK:^Q&E8”gWg][a=sYqsY$A+uT8Dw܌|8$FY Z ,NDȸRk$
+a
+Uxb% _!h!rk:Nrc.C)l`@{Ky΄Wu 1]qBL"[őE4A*BAavZ*<ص QfEɆ\'t+=m;6RWSl3ХUduG[6KlAz$5 'lXϼ*d8]
+φXh+ѣxJ!"H*˻?Q䲆_{?<VTX_yP^Cz[?8fCW_*tywj'n[gSoS'i-fnc=SRVwj0C| bjGO@+ ^bR;x^1!A$H T51K%
+ 6.җ-ْ@5o{#{'bw.1X&wֶyN_BQ'&&') 0 ,qLB
+B*?X 6 PЈ 4A>
+ʬBي "h*3$l31Oii)é0^?ɻyو
+g]l0=eBb!fI?&59a;;{Ŷb$U`H!OowmOK-t᧔\%<\|9׵o͓#jcJ=iSyTv6#?OA]=U(]ۭ`% [HT>AYl㾚5F Mn^yiNp4@nF-WH-/Ƙ&DL@%-7qVq24F߰^Zu/̳T!݄g7:I:G-F޾TPHCWEZf- '
endstream
endobj
-951 0 obj
+955 0 obj
<<
/Type /FontDescriptor
-/FontName /TJMOAY+LMRoman7-Regular
+/FontName /VZEWCH+LMRoman7-Regular
/Flags 4
/FontBBox [-483 -292 1562 1124]
/Ascent 689
@@ -6873,11 +6901,11 @@ endobj
/ItalicAngle 0
/StemV 79
/XHeight 431
-/CharSet (/A/Theta/d/equal/five/four/one/parenleft/parenright/plus/seven/six/three/two/zero)
-/FontFile 950 0 R
+/CharSet (/A/Theta/bracketleft/bracketright/d/equal/five/four/one/parenleft/parenright/plus/seven/six/three/two/zero)
+/FontFile 954 0 R
>>
endobj
-952 0 obj
+956 0 obj
<<
/Length1 2316
/Length2 27612
@@ -6991,7 +7019,7 @@ N|ԗ+n(dݵFֲRr+y)|lHϓfZOYb,eRv;&QEߎC"5*
gE%6g|y{7݊@> U{{خie-4Q}WaDSw.tF.g {Uy)ؼ \$,'aB'Rځs_IE#Xu_U'AnvACzDBGV T6npֽhw~4X37\ oCw.eu!,n;ag⣄ީ@dFUv{/v]k)BF!xa=ީ+<
endstream
endobj
-953 0 obj
+957 0 obj
<<
/Type /FontDescriptor
/FontName /VWFHRW+LMRoman8-Regular
@@ -7004,10 +7032,10 @@ endobj
/StemV 76
/XHeight 431
/CharSet (/A/C/E/I/O/S/T/X/a/b/c/colon/comma/d/e/endash/f/ff/fi/five/four/g/h/hyphen/i/j/k/l/m/n/o/p/parenleft/parenright/period/q/r/s/semicolon/t/u/v/w/x/y)
-/FontFile 952 0 R
+/FontFile 956 0 R
>>
endobj
-954 0 obj
+958 0 obj
<<
/Length1 2113
/Length2 24823
@@ -7117,7 +7145,7 @@ V߭:9WOOpyyݗ.?TLJVr/dSO()
hyp*gI\Qlڴ9۝NA#jg9VsoZUR![MOl
endstream
endobj
-955 0 obj
+959 0 obj
<<
/Type /FontDescriptor
/FontName /MAPAAO+LMRoman9-Regular
@@ -7130,10 +7158,10 @@ endobj
/StemV 90
/XHeight 431
/CharSet (/L/R/a/asterisk/at/b/c/comma/d/e/f/g/hyphen/i/j/k/l/m/n/o/p/parenleft/parenright/period/r/s/t/u/v/w/y)
-/FontFile 954 0 R
+/FontFile 958 0 R
>>
endobj
-956 0 obj
+960 0 obj
<<
/Length1 2190
/Length2 18652
@@ -7219,7 +7247,7 @@ z٘ϔK.zبUA挭^M~F8 Z6n<\<?Ao.tx
e6=r )w/l \:;@G㤛 DsH)/ĵ>SZ?zbUZix(5X6}>Woy1W{;xC+
endstream
endobj
-957 0 obj
+961 0 obj
<<
/Type /FontDescriptor
/FontName /GJLBWR+LMRoman10-Italic
@@ -7232,10 +7260,10 @@ endobj
/StemV 56
/XHeight 431
/CharSet (/A/C/E/N/P/S/T/X/a/b/c/d/e/endash/equal/f/ff/ffi/fi/g/h/hyphen/i/k/l/m/n/o/p/period/q/r/s/t/u/v/w/x/y)
-/FontFile 956 0 R
+/FontFile 960 0 R
>>
endobj
-958 0 obj
+962 0 obj
<<
/Length1 1743
/Length2 10877
@@ -7294,7 +7322,7 @@ C]mu!&2Tr'->n#{(wAT}_2Xk1NcB_#5)Hg y3r _c?
MaV`oҖAR6IP+c4D&}7׌HIacVi`L
endstream
endobj
-959 0 obj
+963 0 obj
<<
/Type /FontDescriptor
/FontName /QYMDQO+LMRoman8-Italic
@@ -7307,10 +7335,10 @@ endobj
/StemV 66
/XHeight 431
/CharSet (/e/h/i/o/r/t/u/w)
-/FontFile 958 0 R
+/FontFile 962 0 R
>>
endobj
-960 0 obj
+964 0 obj
<<
/Length1 1843
/Length2 16027
@@ -7380,7 +7408,7 @@ O1>;r$\ I 44ڒ#
碢*]P:Xc<)(5UITI㎅[mdJU!0&(`5XO K4Cm.`xt6 ,ySM/P77 }
endstream
endobj
-961 0 obj
+965 0 obj
<<
/Type /FontDescriptor
/FontName /PWWUQZ+LMSans10-Regular
@@ -7393,10 +7421,10 @@ endobj
/StemV 78
/XHeight 444
/CharSet (/D/S/T/a/c/e/g/i/k/n/o/plus/r/s/t)
-/FontFile 960 0 R
+/FontFile 964 0 R
>>
endobj
-962 0 obj
+966 0 obj
<<
/Length1 1945
/Length2 3427
@@ -7421,7 +7449,7 @@ c.hV=ʙ&rpºr dw (6ͽ'rM%7UDoZ$C
wGjOGbJWƠϲ>776_L!?.Ւ8#X(5P&=IJ<to,&9"v(w([]ۈ?[G{?Y!։/*7p~Yq$
endstream
endobj
-963 0 obj
+967 0 obj
<<
/Type /FontDescriptor
/FontName /GEOOUZ+LMMathSymbols10-Regular
@@ -7434,10 +7462,10 @@ endobj
/StemV 40
/XHeight 431
/CharSet (/L/arrowdblright/arrowdown/arrowsoutheast/arrowsouthwest/bar/bardbl/circlemultiply/minus/nabla/periodcentered/plusminus)
-/FontFile 962 0 R
+/FontFile 966 0 R
>>
endobj
-964 0 obj
+968 0 obj
<<
/Length1 1706
/Length2 1447
@@ -7463,7 +7491,7 @@ sʨE l+O
Y =P{koQ)k=spBVSO8mz* L35(C>L a;;;ε7u'ϴpaMa)naoy{KSx$9e䧖-jk.::4^E s_k|s0L3~.߻'ymх.Wb|Srx/ol:;Z.ܔdύE(Z;%p:tOz9`GȤIg8yxS8gos:5"(LdV4ZRWǙ]/W󪪜$&h+z`U@ń2 mЮNʱ- R`顩mKȯd{d}@_`VQuNlIhjk}]nBcI7%9υ>n\}'I<Z2֎n{[6s{YԹ&:d]s`O|] ?}tOh}'xt:) `ҹv{C%O>siI@?pa/2}:^쥲ix^ܝ#fycHؼ@RW&ٳláq VWxT{,C'~!GcA3#%{+F6!'ǧ9l~ .uY]dJW˚IqD979y#٥Tz
endstream
endobj
-965 0 obj
+969 0 obj
<<
/Type /FontDescriptor
/FontName /KAPBZZ+LMMathSymbols5-Regular
@@ -7476,10 +7504,10 @@ endobj
/StemV 56
/XHeight 431
/CharSet (/asteriskmath/prime)
-/FontFile 964 0 R
+/FontFile 968 0 R
>>
endobj
-966 0 obj
+970 0 obj
<<
/Length1 1744
/Length2 1898
@@ -7504,7 +7532,7 @@ n<x#8U8BI[cxz3+o?=cD;oseWnsˈ$MJU[
Pn6QjuU]#)' W=Z ],Uowȳj#-:zL}YQº5/ ƇHud^ǒ3K({fP7&)Mh 2;,fX3
endstream
endobj
-967 0 obj
+971 0 obj
<<
/Type /FontDescriptor
/FontName /PVOJED+LMMathSymbols7-Regular
@@ -7517,10 +7545,10 @@ endobj
/StemV 49
/XHeight 431
/CharSet (/infinity/minus/nabla/prime)
-/FontFile 966 0 R
+/FontFile 970 0 R
>>
endobj
-968 0 obj
+972 0 obj
<<
/Length1 2196
/Length2 25927
@@ -7644,7 +7672,7 @@ p͛J,7&0ZO  QUGU R>!"XHhU9aSd&҇o
8*iX?
endstream
endobj
-969 0 obj
+973 0 obj
<<
/Type /FontDescriptor
/FontName /BCROGY+LMMonoLt10-Bold
@@ -7657,10 +7685,10 @@ endobj
/StemV 83
/XHeight 431
/CharSet (/C/D/F/I/J/L/P/S/T/a/b/backslash/braceleft/braceright/c/d/e/f/five/g/h/i/j/l/m/n/o/p/parenleft/parenright/period/r/t/u/v/w/x)
-/FontFile 968 0 R
+/FontFile 972 0 R
>>
endobj
-970 0 obj
+974 0 obj
<<
/Length1 3008
/Length2 30529
@@ -7803,7 +7831,7 @@ m;>IЪCeeW).H7MꧦrVSd/j%rJ:w7Ky֪Lq&}
s_P: Otֺ7_{㋄̇:}ΣP3byP#t^~2d,ݓR
endstream
endobj
-971 0 obj
+975 0 obj
<<
/Type /FontDescriptor
/FontName /VAJJMO+LMMono10-Regular
@@ -7816,10 +7844,10 @@ endobj
/StemV 69
/XHeight 431
/CharSet (/A/B/C/D/E/F/G/I/J/K/L/M/N/O/P/R/S/T/U/V/X/Y/a/asciicircum/asterisk/at/b/backslash/bar/braceleft/braceright/bracketleft/bracketright/c/colon/comma/d/dollar/e/equal/exclam/f/five/four/g/greater/h/hyphen/i/j/k/l/less/m/n/numbersign/o/one/p/parenleft/parenright/percent/period/plus/q/quoteleft/quoteright/r/s/semicolon/six/slash/t/three/two/u/underscore/v/w/x/y/z/zero)
-/FontFile 970 0 R
+/FontFile 974 0 R
>>
endobj
-972 0 obj
+976 0 obj
<<
/Length1 1708
/Length2 16455
@@ -7896,7 +7924,7 @@ daw!IJ4[!S-'zTv꧁P12*+岫i>BI)$ѥpF6f߆Lz띊G
X߂ŋnjJ>j*\;暰I}{F^!*(|>#[L%.o#~hg?:Jo<bh=|(i6yT~9#ADџ5 25/k`~6+0Bv|Cz(JkJ?MS߂VW5~sLAIk9smԺ90wi_cCh0bcK`l K_6 ;tO;-Y#--I<e1uqϼC vVNHBm%V^ʀp
endstream
endobj
-973 0 obj
+977 0 obj
<<
/Type /FontDescriptor
/FontName /BYUMNM+LMMono12-Regular
@@ -7909,10 +7937,10 @@ endobj
/StemV 65
/XHeight 431
/CharSet (/c/d/e/f/i/o)
-/FontFile 972 0 R
+/FontFile 976 0 R
>>
endobj
-974 0 obj
+978 0 obj
<<
/Length1 2309
/Length2 24403
@@ -8001,7 +8029,7 @@ U7;\ woC֎6rڀRi9u'9OzcJ|jߘo_v<{
$4CI.0<
endstream
endobj
-975 0 obj
+979 0 obj
<<
/Type /FontDescriptor
/FontName /XBGYSK+LMMono8-Regular
@@ -8014,10 +8042,10 @@ endobj
/StemV 76
/XHeight 431
/CharSet (/C/D/F/I/P/S/a/b/backslash/c/colon/comma/d/e/eight/f/five/g/h/hyphen/i/j/k/l/m/n/nine/numbersign/o/one/p/period/q/r/s/six/slash/t/three/two/u/v/w/x)
-/FontFile 974 0 R
+/FontFile 978 0 R
>>
endobj
-976 0 obj
+980 0 obj
<<
/Length1 2277
/Length2 22098
@@ -8119,7 +8147,7 @@ u|<=/lAPeKXsKԇKˁ!/mLթ 8ĒX=T,2[3eK܌C
@xv-GnZ}R) ]VEߑI )?*Mڹ9i(+e 4)?rzXj.=s9IN +3AHL.IA` ^#F+֘dIUa%@
endstream
endobj
-977 0 obj
+981 0 obj
<<
/Type /FontDescriptor
/FontName /EIIEGG+LMMono9-Regular
@@ -8132,10 +8160,10 @@ endobj
/StemV 74
/XHeight 431
/CharSet (/D/F/I/a/b/backslash/braceleft/braceright/bracketleft/bracketright/c/comma/d/e/f/five/g/h/hyphen/i/l/m/n/o/one/p/parenleft/parenright/r/s/slash/t/three/two/u/underscore/v/y/zero)
-/FontFile 976 0 R
+/FontFile 980 0 R
>>
endobj
-978 0 obj
+982 0 obj
<<
/Length1 875
/Length2 1458
@@ -8152,7 +8180,7 @@ PpJG`Mͅa8</Ӓ:jrv)ݧPeHXV_&5o8VOI#Zq)}
Z:w:ʂT˫z/\|6kySkGQw0gP89aQ=ǚCFt3MHʋ<ڰ<83FpAdQ$=iQJ%0#xgOQ{:W,YeHzdn;'1
endstream
endobj
-979 0 obj
+983 0 obj
<<
/Type /FontDescriptor
/FontName /BJKGRW+stmary10
@@ -8165,81 +8193,80 @@ endobj
/StemV 25
/XHeight 431
/CharSet (/curlywedgeuparrow/ssearrow)
-/FontFile 978 0 R
+/FontFile 982 0 R
>>
endobj
-887 0 obj
+891 0 obj
<<
/Type /Encoding
/Differences [21/endash 27/ff/fi/fl/ffi 33/exclam 35/numbersign/dollar/percent/ampersand/quoteright/parenleft/parenright/asterisk/plus/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P 82/R/S/T/U/V/W/X/Y 91/bracketleft/backslash/bracketright/asciicircum/underscore/quoteleft/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright 159/section 252/udieresis]
>>
endobj
-904 0 obj
+908 0 obj
<<
/Type /Encoding
/Differences [0/parenleftbig/parenrightbig/bracketleftbig/bracketrightbig 12/vextendsingle 14/slashbig 18/parenleftbigg/parenrightbigg/bracketleftbigg/bracketrightbigg 28/angbracketleftbigg/angbracketrightbigg/slashbigg 32/parenleftBigg/parenrightBigg 112/radicalbig]
>>
endobj
-891 0 obj
+895 0 obj
<<
/Type /Encoding
/Differences [11/alpha/beta 14/delta 17/eta/theta 25/pi/rho 30/phi 32/psi 34/epsilon 58/period/comma 61/slash 64/partialdiff/A/B 68/D/E/F 76/L 78/N 80/P 83/S/T/U/V 88/X/Y 97/a/b/c/d 102/f 104/h/i/j/k/l/m/n 113/q/r/s/t/u/v/w/x/y/z 126/vector]
>>
endobj
-896 0 obj
+900 0 obj
<<
/Type /Encoding
/Differences [0/minus/periodcentered 3/asteriskmath 6/plusminus 10/circlemultiply 35/arrowdown 38/arrowsoutheast 41/arrowdblright 46/arrowsouthwest 48/prime/infinity 76/L 106/bar/bardbl 114/nabla]
>>
endobj
-899 0 obj
+903 0 obj
<<
/Type /Encoding
/Differences [0/Gamma/Delta/Theta 8/Phi 40/parenleft/parenright 43/plus 48/zero/one/two/three/four/five/six/seven 61/equal 68/D 91/bracketleft 93/bracketright 95/dotaccent 99/c/d 105/i 108/l 110/n/o 113/q 115/s 117/u 120/x/y/z 127/dieresis]
>>
endobj
-902 0 obj
+906 0 obj
<<
/Type /Encoding
/Differences [136/bullet]
>>
endobj
-980 0 obj
+984 0 obj
<<
-/Length 844
+/Length 859
/Filter /FlateDecode
>>
stream
-xmUMo@Wla_BZX&
-Q+K62 5fI`x;fͳضߺItճ;סqT}s=ùֵA= }vu[Uyk֍I{wQ/5qhe9xSTQO7}̽][GLrFMG}}"Im!00jEV%H^/v}0<_7RyL U~C`PރSӯ|'
-imXYӷ|4nt.kP^k?IFsuB`nlB
-=@ )U 9yI(ѥ
-S*043``ÍSqf|kiCc, pDˆzF:x0)ljsn l9u}Sr
-МQV14Ld5cY9Y?=C9돡'g ?%>O:ShYg{ΈrYgDk>[bghX|&^V|sig33qgng3tZ[Yog,g-g B|B|\3gg|2?f)<O5]TߓT+&#{U-'H8x?0.t<wtOȢ\: r
+xmUMo0WxNWHv[jWHL @UǾضߺItճ;סqT}s=ùֵA= }vu[Uyk֍I{wn_ܯk& r Gէn8A{,LEvDB``B9zK~;_q`>Wg?y o.>ݫϭAbZ%?6G_Nzy;9ذoiܰ^]0zu\~3lw#w鹺?E07H6!L@@B@q\s *<G`X
+S*0ԄEkNQFJ]r
+)q4 5'G`~ӛ>Tg ]8 i/nTv<k0Yڲ1g3K`ڐY1q22%/ dchJ(S}Y:scݜ笟PcYB?A9Os֙3\Q.4aX=Z9#>c-+>c_ZZ~Z83z3[:ޭ ߬Lg3t3-g B|B|\3gg|2?z)BXIAup*^+&#sU-'H8q_u A8{N Y6ާ=_8N
endstream
endobj
315 0 obj
<<
/Type /Font
/Subtype /Type1
-/BaseFont /KKYZJG+LMRoman10-Bold
-/FontDescriptor 927 0 R
+/BaseFont /HCXCTZ+LMRoman10-Bold
+/FontDescriptor 931 0 R
/FirstChar 21
/LastChar 122
-/Widths 919 0 R
-/Encoding 887 0 R
-/ToUnicode 980 0 R
+/Widths 923 0 R
+/Encoding 891 0 R
+/ToUnicode 984 0 R
>>
endobj
-981 0 obj
+985 0 obj
<<
-/Length 844
+/Length 859
/Filter /FlateDecode
>>
stream
-xmUMo@Wla_BZX&
-Q+K62 5fI`x;fͳضߺItճ;סqT}s=ùֵA= }vu[Uyk֍I{wQ/5qDŽ r Gէn8A{,쏘LEvDB``B9zK~;_q`>Wgy o.>ݫﭯAbZ%?6G_Nzy;9ڰoiܰ^]0zu\~3ݍܥ: ل0%1 " 0Z{q́0R0r0QK5<T`,if,1gT Hӆp1X:,p8}u
-8alSM3?r>x\i"EܰpJMkl4\?ǚc:#?^YHwuprQF^odž1BЖEQ?1^׆ƨАԗ039+ãbLi~jЙ}s~zrCOe fYJ|֟uМ8gΈrY׆}ŊϘъ1LҊkgigϘ݊og3f3|3ߊY[3 =L3f/gd ,' f)Rx jb&'W *.MGZN(:p~7a?}]TyԟE}Ư%Vu'e%
+xmUMo0WxNWHv[jWHL @UǾضߺItճ;סqT}s=ùֵA= }vu[Uyk֍I{wn_ܯk& Y_OQEi?p݃2ZkXvm95];$7os yv|~|H]0}Z7WuI[_OBnKz~lNMnvr*aeMߺiӸaӽ`Bz4g"NFsuB`nlB
+=@ )U 9yI(J5<T`, M%5֜Rh
+1gc yq( buX&
+&q,1+N978Nsk`q8 ^8% FMq.5ShzAkO ׏p$q17]}ȩ»p^`D3F?x[a 1ecf!/1g)cd?4dK^|
+МQV1Կ'1t?ƺ9Y?ГrYs֟'g)43;YgD3\ib-z3zs ,>G|ZV|ƾ3ֵ33qgng3tZ[Yog,g[3 =L3z/gd ,gz)R؇O5[TTV *M2GZN(:pTjy0:q;~E衻mO1z'X
endstream
endobj
368 0 obj
@@ -8247,22 +8274,26 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /LQAAZY+LMRoman12-Bold
-/FontDescriptor 929 0 R
+/FontDescriptor 933 0 R
/FirstChar 27
/LastChar 122
-/Widths 911 0 R
-/Encoding 887 0 R
-/ToUnicode 981 0 R
+/Widths 915 0 R
+/Encoding 891 0 R
+/ToUnicode 985 0 R
>>
endobj
-982 0 obj
+986 0 obj
<<
-/Length 845
+/Length 860
/Filter /FlateDecode
>>
stream
-xuUMo@+H.ȲrhQի ۇ6jo73o{q3fѭVO4\cpuU ZNwOwq;'ҺR^>f?4h;= a9(O)suߖÜRIQTh Lڮ9ˊ~wɛ,jo cƮUןwtZ|MÏߎN6Zw:n7nW,^e]׷IyMܵ:W ل0%1 " 0Z{q́0R0r0QK5<T`if1T(Hӆp
-8alSM3?r>x\i"EܰpJMkl4\?ǚc:7^EHOupQF^odž1BЖEQ?[0^׆ƨАԗ0 9+ãbLi~jЙ}s~zrCOe fYJ|֟uМ8gΈrYφ}ŊϘъ1LҊkgigϘ݊og3f3|3ߊY[3 =L3f/gxg ,; f)Rx jb&'W *.lMr0߫j١hGF}o.
+xuUn0+CW`$ ȡMEDlɐCUAp9Qշ̶ËEZ=p7+oU54?k];͞84wV}uwOu½vgkМ?F/ʇ簢ğn<uC̭}[4s
+"H'oGQ^10j,#m$oNgwwC\<7y֍]?wtZ|MÏߎN46Zw:n7nW,^e]׷L)/\]PG*X$D F @F@k} 89@FJuFF#`R0JRq eF)kjBS` F5(Z#.9Bkx>w{;E^
+kCX
+8alSM3?rN%NbQDa 8^#h0\?I`\~MWc?qc.\X7ьO*ezl,d mY50ymȋ,aYʘ8 xAf_14g%cxU>ob쉬f 9돱ncsO{(g1?\֟g Yg
+9LsQ.(ug^/u ?L[ V|FV|oV|3[: 3 ~!>CO!>S 33>Y^
+?a!SMV,鸞:?8ÇqG湪N$ո\2}]/pD=tM*Fu2)
endstream
endobj
509 0 obj
@@ -8270,98 +8301,101 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /OMCPZF+LMRomanCaps10-Regular
-/FontDescriptor 931 0 R
+/FontDescriptor 935 0 R
/FirstChar 66
/LastChar 252
-/Widths 894 0 R
-/Encoding 887 0 R
-/ToUnicode 982 0 R
+/Widths 898 0 R
+/Encoding 891 0 R
+/ToUnicode 986 0 R
>>
endobj
-983 0 obj
+987 0 obj
<<
-/Length 841
+/Length 857
/Filter /FlateDecode
>>
stream
xmUMo0+J! ᫊"RVmk
-N)$̛3njNelܬ=WW\?;׺v=ݩqhY]jwOҺ=po]IAu~\3FXҝA5(O)suߖcHQIܮQW Lڮ9ˊ6nK5NoغWi~r<d(Vu;_=85vѩֆu5CNmm悥+U=#)\][|, MHS"#p
+N)$W?g^,ɝظYs{ \wu4{S<.7զ7u{R޺u=slo` Kw{ҷנ_n<uC̭}[q
+"E'qoGѣ^.0j,#z7Ogw!X.O;i cƮS_wtZ|E?8/GB ; ZԲWL)\]W|, MHS"#p
+55)FњSjR@J]!5<FSb"/!\,Ѹ8"\ 2:x0)ljsn l9ux\רi"EܰpJM}4$x0.?1Yß8x! !aM4cnGym: C[1Flx L^"K~2&NCC&^кY` YecO{"CgcY =9O('=g)YB|֙Bs:S|uF:#e~,٢+>G+>3qgegK+>c]+>O+>G|FV|~+>Cѻ V|B|ƺ ~!>_Sϔ+>B|&LOrBG/}XTK5?)Nkx$sy儢 G5.[ s'~׻ 8ElUCjF
endstream
endobj
317 0 obj
<<
/Type /Font
/Subtype /Type1
-/BaseFont /UFAMEL+LMRoman10-Regular
-/FontDescriptor 941 0 R
+/BaseFont /RGQJUR+LMRoman10-Regular
+/FontDescriptor 945 0 R
/FirstChar 21
/LastChar 159
-/Widths 917 0 R
-/Encoding 887 0 R
-/ToUnicode 983 0 R
+/Widths 921 0 R
+/Encoding 891 0 R
+/ToUnicode 987 0 R
>>
endobj
-984 0 obj
+988 0 obj
<<
-/Length 841
+/Length 857
/Filter /FlateDecode
>>
stream
xmUMo0+J! ᫊"RVmk
-N)$̛3njNelܬ=WW\?;׺v=ݩqhY]jwOҺ=po]IAu~\3F;;=}kPQ/7SVk-8s擸]׷QPP]sݛ麟;l,j7O4uc׿x;P:XTv~{pjS! j֝ƍKWjY׫{FR^wwPG*X$D F @F@k} 89@FJuFF#`R0Jt
-5 5553<pb
-9LsQ.(ulgYˊx/V|V|&٭ V|N+>cv+>7+>S} ~!>_Sϔ+>cB|&LOr`B,&+jwRP{x${y儢 1~g|sGӿNu]>~?,5(z
+N)$W?g^,ɝظYs{ \wu4{S<.7զ7u{R޺u=slMoAEIxN[hEOv]ߎGB]`BvYFn$?wC\<wx֍]JSϗq C`R=~p^ޏN46Zw:n7n7,^e]׷͙S^wwPG*X$D F @F@k} 89@FJuFF#`R0JRq eF)kjBS` F5(Z#.9Bkx>wg;E^
+kCX
+8alSM3?rN%NbQDa 8>#h0\?I`\~KWc?q1Bx.B Àh'
+&+jRP׊C8ƒI\U E'j\,@sGAC>Nwq8"٦: P
endstream
endobj
309 0 obj
<<
/Type /Font
/Subtype /Type1
-/BaseFont /AAIZVR+LMRoman12-Regular
-/FontDescriptor 943 0 R
+/BaseFont /PGZMWL+LMRoman12-Regular
+/FontDescriptor 947 0 R
/FirstChar 44
/LastChar 119
-/Widths 921 0 R
-/Encoding 887 0 R
-/ToUnicode 984 0 R
+/Widths 925 0 R
+/Encoding 891 0 R
+/ToUnicode 988 0 R
>>
endobj
-985 0 obj
+989 0 obj
<<
-/Length 841
+/Length 857
/Filter /FlateDecode
>>
stream
xmUMo0+J! ᫊"RVmk
-N)$̛3njNelܬ=WW\?;׺v=ݩqhY]jwOҺ=po]IAu~\3F;;=}kPQ/7SVk-8s擸]׷QPP]sݛ麟;l,j7O4uc׿x;P:XTv~{pjS! j֝ƍKWjY׫{FR^wwPG*X$D F @F@k} 89@FJuFF#`R0Jt
-5 5553<pb
-9LsQ.(ulgYˊx/V|V|&٭ V|N+>cv+>7+>S} ~!>_Sϔ+>cB|&LOr`B,&+jwRP{x${y儢 1~g|sGӿNu]>~?,5(z6
+N)$W?g^,ɝظYs{ \wu4{S<.7զ7u{R޺u=slMoAEIxN[hEOv]ߎGB]`BvYFn$?wC\<wx֍]JSϗq C`R=~p^ޏN46Zw:n7n7,^e]׷͙S^wwPG*X$D F @F@k} 89@FJuFF#`R0JRq eF)kjBS` F5(Z#.9Bkx>wg;E^
+kCX
+8alSM3?rN%NbQDa 8>#h0\?I`\~KWc?q1Bx.B Àh'
+&+jRP׊C8ƒI\U E'j\,@sGAC>Nwq8"٦: Yi
endstream
endobj
308 0 obj
<<
/Type /Font
/Subtype /Type1
-/BaseFont /JPPIRQ+LMRoman17-Regular
-/FontDescriptor 945 0 R
+/BaseFont /ITICGN+LMRoman17-Regular
+/FontDescriptor 949 0 R
/FirstChar 27
/LastChar 119
-/Widths 922 0 R
-/Encoding 887 0 R
-/ToUnicode 985 0 R
+/Widths 926 0 R
+/Encoding 891 0 R
+/ToUnicode 989 0 R
>>
endobj
-986 0 obj
+990 0 obj
<<
-/Length 841
+/Length 856
/Filter /FlateDecode
>>
stream
xmUMo0+J! ᫊"RVmk
-N)$̛3njNelܬ=WW\?;׺v=ݩqhY]jwOҺ=po]IAu~\3
-imXU3t6no.XjR˺^o3򺛸kյ:W ل0%1 " 0Z{q́0R0r0QK5<T`if1T͟(Hӆp
-8alSM3?r>x\i"EܰpJMkl4\?皞c:/w"': fyRy(#c^g!ch"ƨ-kC^d cRx~h K^|
-МQV14Nd5cY9Y?C9돡'g ?%>O:ShYggΈrYgDg>[bghX|&^V|{ig33qgng3tZ[Yog,g-g B|B|\3gg|2?f)O5[TT+&#{U-'H888ӟ,t<z9GdEC| <
+N)$W?g^,ɝظYs{ \wu4{S<.7զ7u{R޺u=slt|7|L})JS7wj}`ݷp@`.:|Rv1k2wsf tvMR͟<›`0n7uEy{JjoNͿk~t*aUкq۸qۿ`J-zoD򺛸kյ:W ل0%1 " 0Z{q́0R0r0Qbkx,+0*NXSk0j9F)u\c?/?Q,PXL#L X,cW c rn
+q9pZ.qJ{&\ k(AIsL_S?S»p^`D3F?x[a 1ec!/1g)cd?4dK^|
+МQV1Կ'1t?ƺ9Y?ГrYs֟'g)437YgD3\ib-z3zs ,>G|ZV|ƾ3ֵ33qgng3tZ[Yog,g[3 =L3z/gd ,gz)R؇O5_TTV *M2GZN(:pTZ8:qwYн6ݢ=_3o
endstream
endobj
423 0 obj
@@ -8369,49 +8403,47 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /QRBQZR+LMRoman6-Regular
-/FontDescriptor 949 0 R
+/FontDescriptor 953 0 R
/FirstChar 49
/LastChar 53
-/Widths 909 0 R
-/Encoding 887 0 R
-/ToUnicode 986 0 R
+/Widths 913 0 R
+/Encoding 891 0 R
+/ToUnicode 990 0 R
>>
endobj
-987 0 obj
+991 0 obj
<<
-/Length 841
+/Length 856
/Filter /FlateDecode
>>
stream
xmUMo0+J! ᫊"RVmk
-N)$̛3njNelܬ=WW\?;׺v=ݩqhY]jwOҺ=po]IAu~\3
-imXU3t6no.XjR˺^o3򺛸kյ:W ل0%1 " 0Z{q́0R0r0QK5<T`if1T͟(Hӆp
-8alSM3?r>x\i"EܰpJMkl4\?皞c:/w"': fyRy(#c^g!ch"ƨ-kC^d cRx~h K^|
-МQV14Nd5cY9Y?C9돡'g ?%>O:ShYggΈrYgDg>[bghX|&^V|{ig33qgng3tZ[Yog,g-g B|B|\3gg|2?f)O5[TT+&#{U-'H888ӟ,t<z9GdECiA
+N)$W?g^,ɝظYs{ \wu4{S<.7զ7u{R޺u=slSt|7|L})JS7wj}`ݷp@`.:|Rv1k2wsf tvMR͟<›`0n7uEy{JjoNͿk~t*aUкq۸qۿ`J-zoD򺛸kյ:W ل0%1 " 0Z{q́0R0r0Qbkx,+0*NXSk0j9F)u\c?/?Q,PXL#L X,cW c rn
+q9pZ.qJ{&\ k(AIsL_S?S»p^`D3F?x[a 1ec!/1g)cd?4dK^|
+МQV1Կ'1t?ƺ9Y?ГrYs֟'g)437YgD3\ib-z3zs ,>G|ZV|ƾ3ֵ33qgng3tZ[Yog,g[3 =L3z/gd ,gz)R؇O5_TTV *M2GZN(:pTZ8:qwYн6ݢ=_;;t
endstream
endobj
318 0 obj
<<
/Type /Font
/Subtype /Type1
-/BaseFont /TJMOAY+LMRoman7-Regular
-/FontDescriptor 951 0 R
+/BaseFont /VZEWCH+LMRoman7-Regular
+/FontDescriptor 955 0 R
/FirstChar 49
/LastChar 65
-/Widths 916 0 R
-/Encoding 887 0 R
-/ToUnicode 987 0 R
+/Widths 920 0 R
+/Encoding 891 0 R
+/ToUnicode 991 0 R
>>
endobj
-988 0 obj
+992 0 obj
<<
-/Length 841
+/Length 856
/Filter /FlateDecode
>>
stream
xmUn0CƆ
-N7RIU70W?'^$Is}=}exǡ}'u]U=ow_XߓJ?)裮_o'h P=mbKLQ/?C̭:}W {pCM/6۾EzĪ۶'Yѽ3~< |OaxIM4};?n7uEYy>;JG& ߯^M~*aUaqݿhB͛foH]n-I&H8@l: ld`TYg``&Bkk0jNXXр0#` w]jG1 F60q'kgqScsnl9Ns`qKK%pNI8qJ9q4Ϯ%p 2\XWkz,_8x1g1=ia4c̓˳G6ڀ cxmcfƨog!/lmΘ8+^P_-C#[34IN؆1t?E߂ޡSrY ֟gg9433.XgB3\iafq3fts
-,>G|F/'>t3:~:83fw3;:ٝ ߜLgw3t33 ~)>CO)>SK3- ,YJa)SMV襤:?85JC4I^ E'b4><? 8Ϸ袿CF
+N7RIU񛇱~<>O\7IrՓ?]]C{t}N=COZի~{ UΝ'mR~' /@ U/1E)x2ZX]515(ln1"n۞dDv@~3D>i|'7aea|8<T(-P0~{5ƆUC珇uu棹 5oE9p]n+I&H8@l: ld`TYg``&*58`ԜR&4`4(pJ RHijFhg1YbQ.gh\Uaar;ss`q
endstream
endobj
425 0 obj
@@ -8419,25 +8451,24 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /VWFHRW+LMRoman8-Regular
-/FontDescriptor 953 0 R
+/FontDescriptor 957 0 R
/FirstChar 21
/LastChar 121
-/Widths 908 0 R
-/Encoding 887 0 R
-/ToUnicode 988 0 R
+/Widths 912 0 R
+/Encoding 891 0 R
+/ToUnicode 992 0 R
>>
endobj
-989 0 obj
+993 0 obj
<<
-/Length 841
+/Length 856
/Filter /FlateDecode
>>
stream
xmUMo0+J! ᫊"RVmk
-N)$̛3njNelܬ=WW\?;׺v=ݩqhY]jwOҺ=po]IAu~\3
-imXU3t6no.XjR˺^o3򺛸kյ:W ل0%1 " 0Z{q́0R0r0QK5<T`if1T͟(Hӆp
-8alSM3?r>x\i"EܰpJMkl4\?皞c:/w"': fyRy(#c^g!ch"ƨ-kC^d cRx~h K^|
-МQV14Nd5cY9Y?C9돡'g ?%>O:ShYggΈrYgDg>[bghX|&^V|{ig33qgng3tZ[Yog,g-g B|B|\3gg|2?f)O5[TT+&#{U-'H888ӟ,t<z9GdEC%K
+N)$W?g^,ɝظYs{ \wu4{S<.7զ7u{R޺u=slst|7|L})JS7wj}`ݷp@`.:|Rv1k2wsf tvMR͟<›`0n7uEy{JjoNͿk~t*aUкq۸qۿ`J-zoD򺛸kյ:W ل0%1 " 0Z{q́0R0r0Qbkx,+0*NXSk0j9F)u\c?/?Q,PXL#L X,cW c rn
+q9pZ.qJ{&\ k(AIsL_S?S»p^`D3F?x[a 1ec!/1g)cd?4dK^|
+МQV1Կ'1t?ƺ9Y?ГrYs֟'g)437YgD3\ib-z3zs ,>G|ZV|ƾ3ֵ33qgng3tZ[Yog,g[3 =L3z/gd ,gz)R؇O5_TTV *M2GZN(:pTZ8:qwYн6ݢ=_K~
endstream
endobj
310 0 obj
@@ -8445,23 +8476,25 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /MAPAAO+LMRoman9-Regular
-/FontDescriptor 955 0 R
+/FontDescriptor 959 0 R
/FirstChar 40
/LastChar 121
-/Widths 920 0 R
-/Encoding 887 0 R
-/ToUnicode 989 0 R
+/Widths 924 0 R
+/Encoding 891 0 R
+/ToUnicode 993 0 R
>>
endobj
-990 0 obj
+994 0 obj
<<
-/Length 843
+/Length 858
/Filter /FlateDecode
>>
stream
xmUMo0+J! ᫊"RVmk
-N)$ݪ70W?g^,ɝظYs{ \wu{S<.7զ7u{R޺>f? Kw{KTQ/7SVk-&9sQ擾]׷HRP]s6o Ogw!X.o; cƮS_wСtZ|I1?H/GBZV ; ZԲW/{FR^ww?U4H6!L@@B@q\s *<G`Rq eF)kk0j0jfx)4Ug;5Ҵ!\,18"\aD E_sN[sS9)9^
-?BXIAup*Çq G潪N$p|eO_:qw
+N)$ݪ񛇱~<>l;YtՓ; q\]UCs9|\itǡyvgu]nMߝo<y7K&½u'{0vF? 4/yY/QEixN[EOv]ߎ"IB``BvYF%H~~?a`T'?y:&?M]/AjZ%ۃS 
+ilXY3t6no.XjR˺^o̙S^ww?U4H6!L@@B@q\s *<G`X
+S*0ԄEkNQFJ]r
+)q4 5'G`~ӛ>Tg ]i/nTv<k0Yڲ1g k`ڐY1q22%/dchJ(S}Y:scݜ笟PcYB?A9Os֙3\Q.4aX=Z9#>c-+>c_ZZ~Z83z3[:ޭ ߬Lg3t3-g B|B|\3gg|2?z)BXIAup*^+&#sU-'H8q|\e A8}\Q,znS/S
endstream
endobj
420 0 obj
@@ -8469,22 +8502,24 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /GJLBWR+LMRoman10-Italic
-/FontDescriptor 957 0 R
+/FontDescriptor 961 0 R
/FirstChar 21
/LastChar 121
-/Widths 910 0 R
-/Encoding 887 0 R
-/ToUnicode 990 0 R
+/Widths 914 0 R
+/Encoding 891 0 R
+/ToUnicode 994 0 R
>>
endobj
-991 0 obj
+995 0 obj
<<
-/Length 841
+/Length 857
/Filter /FlateDecode
>>
stream
xmUn0CƆ
-N$L̛O3׍/~\kijG؞v~8y{Q>nۡ?^о:f}O*k?|RG]>3vSoX}kPQ/?qQZk롫8Dsgq~&ѣ^.2(+Gc\c<wxO.J [OCj: wWog<jimXW;vߴ~ >ZjR˦YE~3=sׁpuRA)`*R2$!`8li9UEХGSj043`4`4Ý(?I  rt\e #q5p眛[q>x \iEܰpNMk l4\? 皞c:gN5^ ELOup3%M6`^ۘ1ل150ym 1F}3&ԗ0 bKl+֌>oRa Oѷ`)w`)?\֟agYg ֙P.L(ulgYˉx/N|N|&ٝ N|N'>cv'>7'>S} ~)>_Sϔ+>cR|&L|'a9i0K)cR{XTG5;)NͽRPs<Mph=¼W7rBщ3=MS8B:~G]:(o yS
+N$L?f_,Ys..=pyp}GuYַC
+ۡ};uT~`u|;{M o` s| oUAEItFkuwhEmDzĪۣH~z?v؎rapIU4:?ë*-L=7JG6T mv^Ϳ*a]~i3hJ-fo$=sׁuRA)`*R2$!`8li9UEJ555` M5 6Ҡh
+֟Q.{s3uL(u&: XC/N|FN|NgXˉؗN|ƺN|N|&ޝ N|N'>w'>7'>S} uKR|)W|FL|OrRG/}XTG5?)Nkx$syn䄢 G5.[=MS s'~? j?El& ކ
endstream
endobj
426 0 obj
@@ -8492,23 +8527,25 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /QYMDQO+LMRoman8-Italic
-/FontDescriptor 959 0 R
+/FontDescriptor 963 0 R
/FirstChar 101
/LastChar 119
-/Widths 907 0 R
-/Encoding 887 0 R
-/ToUnicode 991 0 R
+/Widths 911 0 R
+/Encoding 891 0 R
+/ToUnicode 995 0 R
>>
endobj
-992 0 obj
+996 0 obj
<<
-/Length 843
+/Length 858
/Filter /FlateDecode
>>
stream
xmUMo0+J! ᫊"RVmk
-N7R$ݪ70W?g_,ɍehܬ=WWU\;;׺v7MOtҺ=po>fv8 | G՗_n}w̭][GL2sQ擾ݾk^!00jYV%H~~v}\; C}h{ϗC`Rރѩc~^ON6[7ݛ ZԲW/{FR^ww?U4H6!L@@B@q\s *<G`Rq eF)kk0j0jfx)4Ug;5Ҵ!\,18"\aD E_sN[sS9)9^
-?BXIAup*Çq G潪N$p|eO_:q;:'dE_kCvW
+N7R$ݪ񛇱~<>lۿYtՓиYs{
+]wwu4;ީǡoY]j7åu{R'{8F? 4/'(U_~aݝ2ZkXwmEOvDz7gos }<rO~r<&? ݛ=_NJnKzG߷Azy?9ذox6nvo.XjR˺^k̙S^ww?U4H6!L@@B@q\s *<G`X
+S*0ԄEkNQFJ]r
+)q4 5'G`~ӛ>Tg ]i/nTv<k0Yڲ1g k`ڐY1q22%/dchJ(S}Y:scݜ笟PcYB?A9Os֙3\Q.4aX=Z9#>c-+>c_ZZ~Z83z3[:ޭ ߬Lg3t3-g B|B|\3gg|2?z)BXIAup*^+&#sU-'H8q|\e A8N Y6ݧ=_}sߊ
endstream
endobj
686 0 obj
@@ -8516,24 +8553,25 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /PWWUQZ+LMSans10-Regular
-/FontDescriptor 961 0 R
+/FontDescriptor 965 0 R
/FirstChar 43
/LastChar 116
-/Widths 888 0 R
-/Encoding 887 0 R
-/ToUnicode 992 0 R
+/Widths 892 0 R
+/Encoding 891 0 R
+/ToUnicode 996 0 R
>>
endobj
-993 0 obj
+997 0 obj
<<
-/Length 844
+/Length 859
/Filter /FlateDecode
>>
stream
-xmUMo@+H.Ȳ|h%Qի ۇ6웙7X=<l;Ytգ; q\]UCs9ùֵN=CT;xoMI{
-gkpcBܝ5AUӍnZoIN\Ԩo( &TmלeE[䧷6nK5F*oغ_'m~r<t(Vu;_{c{pj緣S! +k֝ƍKWjY׫=#)/\]PG*X$D F @F@k} 89@FJuFF#`R0Jt
-5 5553<pb
-a!SM~W,:?8C8…I^U E'b|82 8ϻ޽YtїkZbu_G4
+xmUn0+CW`$ MEDBmɐCU9.g#4fѭV4\cpuU ZN;0͓;rSm|ɛ_Z7&?(XG]?_3 Gէn<uC̭}[tr
+F'}oG^ 00j,#m$?wC\<7Ry֍]?isOqC`RރۃS|'=
+ilXY3t6n.XjR˺^o?͙S^vw?U4H6!L@@B@q\s *<G`X
+S*0ԄEkNQFJ]r
+)q4 5'G`~ӛ>Tg ]i/nTv<k0Yڲ1g k`ڐY1q22%/dchJ(S}Y:scݜ笟PcYB?A9Os֙3\Q.4aX=Z9#>c-+>c_ZZ~Z83z3[:ޭ ߬Lg3t3-g B|B|\3gg|2?z)BXIAup*^+&#sU-'H8q_e A8޽_Q,znS/_g
endstream
endobj
518 0 obj
@@ -8541,24 +8579,25 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /BCROGY+LMMonoLt10-Bold
-/FontDescriptor 969 0 R
+/FontDescriptor 973 0 R
/FirstChar 40
/LastChar 125
-/Widths 893 0 R
-/Encoding 887 0 R
-/ToUnicode 993 0 R
+/Widths 897 0 R
+/Encoding 891 0 R
+/ToUnicode 997 0 R
>>
endobj
-994 0 obj
+998 0 obj
<<
-/Length 843
+/Length 858
/Filter /FlateDecode
>>
stream
xmUMo0+J! ᫊"RVmk
-N7R!ݪ70W?g_,ɝиYs{
-]7;׺v=ߩǡoݨM'opiT}IAu~\3;he?<{Q%(SVk-#&9sQ擾ݾk^!00j(+m$?Gwt>X.oTuþ{S_tpСtZ|I1?H/'BZV;ݛ ZԲW/{FR^ww?U4H6!L@@B@q\s *<G`Rq eF)kk0j0jfx)4Ug;5Ҵ!\,18"\aD E_sN[sS9)9^
-?BXIAup*Çq G潪N$p|eO_:q;:'dE_kCa
+N7R!ݪ񛇱~<>lۿYtՓ;q\]U}s9nwu4{SC<Q]jOtҺ=pou=spGx G՗_n8N[EOvDz79zK~q`T'?ywRy M]/AjZ%ۣS
+ilXYӷ|6nvo.XjR˺^k̙S^ww?U4H6!L@@B@q\s *<G`X
+S*0ԄEkNQFJ]r
+)q4 5'G`~ӛ>Tg ]i/nTv<k0Yڲ1g k`ڐY1q22%/dchJ(S}Y:scݜ笟PcYB?A9Os֙3\Q.4aX=Z9#>c-+>c_ZZ~Z83z3[:ޭ ߬Lg3t3-g B|B|\3gg|2?z)BXIAup*^+&#sU-'H8q|\e A8N Y6ݧ=_ߔ
endstream
endobj
316 0 obj
@@ -8566,26 +8605,28 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /VAJJMO+LMMono10-Regular
-/FontDescriptor 971 0 R
+/FontDescriptor 975 0 R
/FirstChar 33
/LastChar 125
-/Widths 918 0 R
-/Encoding 887 0 R
-/ToUnicode 994 0 R
+/Widths 922 0 R
+/Encoding 891 0 R
+/ToUnicode 998 0 R
>>
endobj
-995 0 obj
+999 0 obj
<<
-/Length 843
+/Length 858
/Filter /FlateDecode
>>
stream
xmUMo0+J! ᫊"RVmk
-N7R!ݪ70W?g_,ɝиYs{
-]7;׺v=ߩǡoݨM'opiT}IAu~\3;ф ~<xKTQ/7}w̭][GLrF'}}"IB``BQV%H~~?v}\<; C}h{ϗC`Rރѩc~^ON6[w>m7l7,^e]׵_&suB`ilB
-=@ )U 9yI(ѥ
-S*043``MSiv|kiCX
-МQV14Ld5cY9Y?=C9돡'g ?%>O:ShYg{ΈrYgDk>[bghX|&^V|sig33qgng3tZ[Yog,g-g B|B|\3gg|2?f)<O5]TߓT+&#{U-'H880.t<wtOȢ\: k
+N7R!ݪ񛇱~<>lۿYtՓ;q\]U}s9nwu4{SC<Q]jOtҺ=pou=spG? 4/Y/QEipݝ2ZkXwm95];$
+ UoFos <rO~<&? ݛ=_NJnKzG߷Azy?9ذomܰ\zu
+\~3&suB`ilB
+=@ )U 9yI(J5<T` M55֜Rh
+1ڟS͟ yq( buX&
+&q,1+N978Nsk`q8 ^8% FMq.5ShzAkO ׏p$q97]}ĩ»p^`D3F?x[a 1ec!/1g)cd?4dK^|
+МQV1Կ'1t?ƺ9Y?ГrYs֟'g)43;YgD3\ib-z3zs ,>G|ZV|ƾ3ֵ33qgng3tZ[Yog,g[3 =L3z/gd ,gz)R؇O5[TTV *M2GZN(:pTj0:q;qE衻mO1z ߞ
endstream
endobj
307 0 obj
@@ -8593,23 +8634,23 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /BYUMNM+LMMono12-Regular
-/FontDescriptor 973 0 R
+/FontDescriptor 977 0 R
/FirstChar 99
/LastChar 111
-/Widths 923 0 R
-/Encoding 887 0 R
-/ToUnicode 995 0 R
+/Widths 927 0 R
+/Encoding 891 0 R
+/ToUnicode 999 0 R
>>
endobj
-996 0 obj
+1000 0 obj
<<
-/Length 842
+/Length 857
/Filter /FlateDecode
>>
stream
xmUn0CƆ
-N7R!L̛O3 /~\kil9DО|w=ިqh.MW|۷oΟYߓJ?).ogoiA~Mo
-A5(QZk뾫=8Fsgq]ߍG@]dbIVto$?'C\c<N;ic].J [OCj: wWog<imXW;txش~>ZjR˦YE3=sׁpuRA)`*R2$!`8li9UEХGSj043`4`4Ý(?Q  rt\e #q5p眛[q>x \iEܰpNMk l4\? 皞c:gN5^ ELOup3%M6`^ۘ1ل150ym 1F}3&ԗ0 bKl+֌>oRa Oѷ`)w`)?\֟agYg ֙P.L(ulgYˉx/N|N|&ٝ N|N'>cv'>7'>S} ~)>_Sϔ+>cR|&L|'a9i0K)cR{XTG5;)NͽRPs<Mph=¼W7rBщ3=c8B:]?~?,uQbuDה
+N7R!L?f^,Yss..=}?y<{Q>I]VmoN?'uR|gɆ7y7ҷ*נ_~<FkuhEmw}7uUk'ѻ?~ra8*ߏw*-L=7JG6T m^Ϳ~*a]aqӿhJ-fo$=sׁuRA)`*R2$!`8li9UEJ555` M5 6Ҡh
+֟Q.{s3uL(u&: XC/N|FN|NgXˉؗN|ƺN|N|&ޝ N|N'>w'>7'>S} uKR|)W|FL|OrRG/}XTG5?)Nkx$syn䄢 G5.[=c s'a8 W)FM
endstream
endobj
474 0 obj
@@ -8617,23 +8658,29 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /XBGYSK+LMMono8-Regular
-/FontDescriptor 975 0 R
+/FontDescriptor 979 0 R
/FirstChar 35
/LastChar 120
-/Widths 895 0 R
-/Encoding 887 0 R
-/ToUnicode 996 0 R
+/Widths 899 0 R
+/Encoding 891 0 R
+/ToUnicode 1000 0 R
>>
endobj
-997 0 obj
+1001 0 obj
<<
-/Length 842
+/Length 857
/Filter /FlateDecode
>>
stream
xmUMo0+J! ᫊"RVmk
-N7R!̛3njehܬ=WWU\k];7nTtƓ7]snb}O*۾~qg;e?<}kPQ/7}w̭][Gq"E'q}GB]`BQVto$?Gwt>X.o4uþ{S_tptZ|E??8/'BZ;ݛ ZԲW&suoU4H6!L@@B@q\s *<G`Rq eF)kk0j0jfx)4Ug;5Ҵ!\,18"\aD E_sN[sS9)9^
-a!SMV,鸞:?8C8…I^U E'b6>2  8י
+N7R!W?g_,ɝиYs{
+]7;׺v=ߩǡoݨM'opiT}I:fv8cxoAEIpݝ2ZkXwm95];
+u UoFѻ9z?~q`T'?ywx M]槞/AjZ}ۣSo{༼
+ilXWӷ|6nvo.XjR˺^k3&su_U4H6!L@@B@q\s *<G`X
+S*0ԄEkNQFJ]r
+)q4} 5'G`~ӗ>Tg_c.\X7ьO*ezl,d mY50ymȋ,aYʘ8 xAf_14g%cxU>ob쉬f 9돱ncsO{(g1?\֟g Yg
+9LsQ.(ug^/u ?L[ V|FV|oV|3[: 3 ~!>CO!>S 33>Y^
+?a!SMW,:?8ÇqG湪N$ոX>n2 ۇ}}\P,zfR/
endstream
endobj
630 0 obj
@@ -8641,38 +8688,38 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /EIIEGG+LMMono9-Regular
-/FontDescriptor 977 0 R
+/FontDescriptor 981 0 R
/FirstChar 40
/LastChar 125
-/Widths 889 0 R
-/Encoding 887 0 R
-/ToUnicode 997 0 R
+/Widths 893 0 R
+/Encoding 891 0 R
+/ToUnicode 1001 0 R
>>
endobj
-998 0 obj
+1002 0 obj
<<
-/Length 846
+/Length 861
/Filter /FlateDecode
>>
stream
-xmUn@Cz ,ei#&JW6)R Ƈ}͌6v̛,W_~|ޟEcw=0e]Mcgu]7C? 䛡}9wT~x~ыa~BT}*JS?ߕUQˋ~&Xu};ˊ!X7jy6OJ*F۩S?<x|Сt٨?W|#=imXY;vtܵ~ >ZkQD~>I?]M:)6 0): ld&*뀣uFQ `r0*ԨF55`liflhh0LQ.SvZ#M
-cʀ5F+8)k97'~ 8|%%Nf'Q$a %8l0aXjW={e.5=}M5/x104c̓3#K^`m11c cԴ+[`ڐ6c6gL3C/oV–vڊ1|5cO3>چ1t?E߂ޡSrY ֟gg9433.XgBq: }63fq3fts
-,>G|F/'>t3:~:83fw3;:ٝ ߜLgw3t33 ~)>CO)>SK3- ,YJa)SM>o:?85JC4I^ E'b8<M 8Ytџ궉r2]
+xmUn@Cz ,ei#&JW6)R Ƈ}͌673o{aq7i<O_T?vO;]vO4~VM}3@ڗs/Iw
+G{O0؟~~ *DՇ_~:]oZ]50)Z{nIjU׷=KzfxZ-i^Ihy;u~guA[{8/:6P2xswjoףW1 +kΟOGk7j4݇=pn_b MLS!"q pp@fΩ8Z`&BkTQQsJ Ɩ؂Ѡh) 6Hi* c˜2wg7EA
+kC\cpWpB zE6:x 1v9/8vӺĩ8^5js7$G0acW={e~XWkzjn_81baiƘ'gG6ڀ cxmccƨiW!/lmΘ8g+S_߬-cbkTf6)| c,XO/X?CO` ?'>ψ:sh.Xgg\΄rY'=uggX|&^N|{gu3t3qggw3t:;9g,g-gKR|R|\3g[>YYJ?R}8FIupj‡i&#{u#'H8q]y A8]Q,vOmݜ
endstream
endobj
-743 0 obj
+744 0 obj
<<
/Type /Font
/Subtype /Type1
/BaseFont /OIUXCD+esint10
-/FontDescriptor 925 0 R
+/FontDescriptor 929 0 R
/FirstChar 1
/LastChar 6
-/Widths 886 0 R
-/ToUnicode 998 0 R
+/Widths 890 0 R
+/ToUnicode 1002 0 R
>>
endobj
-999 0 obj
+1003 0 obj
<<
/Length 430
/Filter /FlateDecode
@@ -8689,15 +8736,15 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /DLABCR+LMMathExtension10-Regular
-/FontDescriptor 933 0 R
+/FontDescriptor 937 0 R
/FirstChar 0
/LastChar 112
-/Widths 905 0 R
-/Encoding 904 0 R
-/ToUnicode 999 0 R
+/Widths 909 0 R
+/Encoding 908 0 R
+/ToUnicode 1003 0 R
>>
endobj
-1000 0 obj
+1004 0 obj
<<
/Length 600
/Filter /FlateDecode
@@ -8713,15 +8760,15 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /LJFRVQ+LMMathItalic10-Regular
-/FontDescriptor 935 0 R
+/FontDescriptor 939 0 R
/FirstChar 14
/LastChar 126
-/Widths 912 0 R
-/Encoding 891 0 R
-/ToUnicode 1000 0 R
+/Widths 916 0 R
+/Encoding 895 0 R
+/ToUnicode 1004 0 R
>>
endobj
-1001 0 obj
+1005 0 obj
<<
/Length 598
/Filter /FlateDecode
@@ -8732,20 +8779,20 @@ xmTM@+z&?DƉ1LF+BG
Ч }g?i{4 Z76C 0b S.0Y0XjGiʙ`2$C5%^s=j# \7c C1 ݏ7< &dL8f>0Ozʣ)LPקZFw?a ~NTKx6Ĭ# ᯋUEvi[1؀mQ]/8}&?K^
endstream
endobj
-581 0 obj
+576 0 obj
<<
/Type /Font
/Subtype /Type1
/BaseFont /ZBFYGJ+LMMathItalic5-Regular
-/FontDescriptor 937 0 R
+/FontDescriptor 941 0 R
/FirstChar 105
/LastChar 110
-/Widths 892 0 R
-/Encoding 891 0 R
-/ToUnicode 1001 0 R
+/Widths 896 0 R
+/Encoding 895 0 R
+/ToUnicode 1005 0 R
>>
endobj
-1002 0 obj
+1006 0 obj
<<
/Length 598
/Filter /FlateDecode
@@ -8761,15 +8808,15 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /UYOFJR+LMMathItalic7-Regular
-/FontDescriptor 939 0 R
+/FontDescriptor 943 0 R
/FirstChar 11
/LastChar 122
-/Widths 914 0 R
-/Encoding 891 0 R
-/ToUnicode 1002 0 R
+/Widths 918 0 R
+/Encoding 895 0 R
+/ToUnicode 1006 0 R
>>
endobj
-1003 0 obj
+1007 0 obj
<<
/Length 790
/Filter /FlateDecode
@@ -8786,15 +8833,15 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /GEOOUZ+LMMathSymbols10-Regular
-/FontDescriptor 963 0 R
+/FontDescriptor 967 0 R
/FirstChar 0
/LastChar 114
-/Widths 906 0 R
-/Encoding 896 0 R
-/ToUnicode 1003 0 R
+/Widths 910 0 R
+/Encoding 900 0 R
+/ToUnicode 1007 0 R
>>
endobj
-1004 0 obj
+1008 0 obj
<<
/Length 789
/Filter /FlateDecode
@@ -8813,15 +8860,15 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /KAPBZZ+LMMathSymbols5-Regular
-/FontDescriptor 965 0 R
+/FontDescriptor 969 0 R
/FirstChar 3
/LastChar 48
-/Widths 898 0 R
-/Encoding 896 0 R
-/ToUnicode 1004 0 R
+/Widths 902 0 R
+/Encoding 900 0 R
+/ToUnicode 1008 0 R
>>
endobj
-1005 0 obj
+1009 0 obj
<<
/Length 788
/Filter /FlateDecode
@@ -8841,70 +8888,66 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /PVOJED+LMMathSymbols7-Regular
-/FontDescriptor 967 0 R
+/FontDescriptor 971 0 R
/FirstChar 0
/LastChar 114
-/Widths 897 0 R
-/Encoding 896 0 R
-/ToUnicode 1005 0 R
+/Widths 901 0 R
+/Encoding 900 0 R
+/ToUnicode 1009 0 R
>>
endobj
-1006 0 obj
+1010 0 obj
<<
-/Length 963
+/Length 977
/Filter /FlateDecode
>>
stream
-xmVn0+C,* ȡ4Aѫ#1X6dhu9R˙$ۅa~G8͗!jy0^?~ 'uܴ71o< }R+k1O?F?hﶧzz3gYOZ8Mc1Y{N,=&ƪq;dD.F)n}RUj#<gR1Y~0oGuF[w{>t(j ef}/CPƆ 1!̛1$kU: I-"W;>['M#9&tq7Ӛ'\H38rqi"*phH(ѣ,0z4dTq8Zێ&"N%t(PsI%=D FftZB~kuly"uʸ^13 "tΘqXc'g0n^pqqϐ"rqÐ̅>Ct&5j8C4{`ǵ)y'[!o&þz⳧8s,0u
-姥.w==8)LI9z2yҐIƜ cА =s|h(Z`~>뤽t~g#OgK֭Yq1匩g8$Qfs^!g0>1g %ϰn3KOI3)YN?g9Yg%,Δ3Z֙R-4UJ%gx3>I^r&䌵gKXKKđK%g3{yəK%g%g[Kג3 =L3ג3%g}yGZ6h-C S#ܚ_* jp@L[06e~יkh +ӗo8s<ĥgv
-/a@]t_[A"B
+xmVMo:WԤd} EHLX6dh}9; rp:\.gg)W|qߤMy7ͿCtuOޏ~<=~Ο涽O|; _Xj('̻/k?X﷧h.KO?Kl?cBfC'hjEvg?@`dx']a,Aw>Zŏx_Dhmw³#6z1 ||Wlj- ϛG+cבwlƔ \SOuJҀpaZ3P@1pm@ѪâA!cQB@bIJ!
endstream
endobj
462 0 obj
<<
/Type /Font
/Subtype /Type1
-/BaseFont /KKYZJG+LMRoman10-Bold
-/FontDescriptor 927 0 R
+/BaseFont /HCXCTZ+LMRoman10-Bold
+/FontDescriptor 931 0 R
/FirstChar 68
/LastChar 122
-/Widths 900 0 R
-/Encoding 899 0 R
-/ToUnicode 1006 0 R
+/Widths 904 0 R
+/Encoding 903 0 R
+/ToUnicode 1010 0 R
>>
endobj
-1007 0 obj
+1011 0 obj
<<
-/Length 962
+/Length 975
/Filter /FlateDecode
>>
stream
-xmVn8+
-h ɨ%X8Zێ
-'U[:th鹥CK["OntZB~kul:e\ow:gLsJԋ84sy3ݾ_7~_9x<xe. 0y!Vz) ou/ Ϟṯֵ*跖` )<3'jIC&s2pBCֳ/5h~s
-I{8g 0F2|2F0Ƴ(gĉ1q#9~IȣAήa}t-c/9c]:K֟aݒggSzY%/sKY)YgJ3^i૔K%g|Lkyπ#9ûK%gx3r3͗KYKX%gkzjəz%gx%gK',S/9GZ6h-C S#ܚ_* jp@L[06e~_g!}/\XN8Jν,HN:q).~~:
+xmVnH+A )AI+J:weǁ"!G7_We{{nnpяקo0s|ܵw%2+sRw;ķż_gk؀;ҧ?cIϧaۯƘ覱9)ZxyYďP$wY:H=nz:Duh-̣ws|QZxt9_<d&l?۽yx=8{K]avvzژMMg6cӕ[)qI]Ip#`<LkH3ֹ p8ZxX4(d,jTQU`5Hl2I 8G춓@ѺCJǔ)R+X#@a
+> 1XR_}˞:+ϰnE>?sɥW_sSguxg*L%:SɥN*8=:-> G}ZN}p3u3tpggw3t:;9Ygg[3 =,3zg ϭϜ|y#W`du0_|Q`ifڂ|H2Ԗ,oH}],/o'pphʉ,g!N,i{}?v
endstream
endobj
321 0 obj
<<
/Type /Font
/Subtype /Type1
-/BaseFont /UFAMEL+LMRoman10-Regular
-/FontDescriptor 941 0 R
+/BaseFont /RGQJUR+LMRoman10-Regular
+/FontDescriptor 945 0 R
/FirstChar 0
/LastChar 127
-/Widths 913 0 R
-/Encoding 899 0 R
-/ToUnicode 1007 0 R
+/Widths 917 0 R
+/Encoding 903 0 R
+/ToUnicode 1011 0 R
>>
endobj
-1008 0 obj
+1012 0 obj
<<
-/Length 962
+/Length 975
/Filter /FlateDecode
>>
stream
-xmVn8+
+xmVnH+A )AI+J:weǁ"!G7_We{{nnpяקo0s|ܵw%2+sRw;ķż_,\
endstream
endobj
453 0 obj
@@ -8912,37 +8955,37 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /TXCQKG+LMRoman5-Regular
-/FontDescriptor 947 0 R
+/FontDescriptor 951 0 R
/FirstChar 43
/LastChar 49
-/Widths 901 0 R
-/Encoding 899 0 R
-/ToUnicode 1008 0 R
+/Widths 905 0 R
+/Encoding 903 0 R
+/ToUnicode 1012 0 R
>>
endobj
-1009 0 obj
+1013 0 obj
<<
-/Length 962
+/Length 975
/Filter /FlateDecode
>>
stream
-xmVn8+
+xmVnH+A )AI+J:weǁ"!G7_We{{nnpяקo0s|ܵw%2+sRw;ķż_"\
endstream
endobj
319 0 obj
<<
/Type /Font
/Subtype /Type1
-/BaseFont /TJMOAY+LMRoman7-Regular
-/FontDescriptor 951 0 R
+/BaseFont /VZEWCH+LMRoman7-Regular
+/FontDescriptor 955 0 R
/FirstChar 2
/LastChar 100
-/Widths 915 0 R
-/Encoding 899 0 R
-/ToUnicode 1009 0 R
+/Widths 919 0 R
+/Encoding 903 0 R
+/ToUnicode 1013 0 R
>>
endobj
-1010 0 obj
+1014 0 obj
<<
/Length 328
/Filter /FlateDecode
@@ -8957,14 +9000,14 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /BJKGRW+stmary10
-/FontDescriptor 979 0 R
+/FontDescriptor 983 0 R
/FirstChar 36
/LastChar 37
-/Widths 890 0 R
-/ToUnicode 1010 0 R
+/Widths 894 0 R
+/ToUnicode 1014 0 R
>>
endobj
-1011 0 obj
+1015 0 obj
<<
/Length 700
/Filter /FlateDecode
@@ -8979,20 +9022,20 @@ endobj
<<
/Type /Font
/Subtype /Type1
-/BaseFont /UFAMEL+LMRoman10-Regular
-/FontDescriptor 941 0 R
+/BaseFont /RGQJUR+LMRoman10-Regular
+/FontDescriptor 945 0 R
/FirstChar 136
/LastChar 136
-/Widths 903 0 R
-/Encoding 902 0 R
-/ToUnicode 1011 0 R
+/Widths 907 0 R
+/Encoding 906 0 R
+/ToUnicode 1015 0 R
>>
endobj
311 0 obj
<<
/Type /Pages
/Count 6
-/Parent 1012 0 R
+/Parent 1016 0 R
/Kids [302 0 R 313 0 R 326 0 R 364 0 R 412 0 R 417 0 R]
>>
endobj
@@ -9000,7 +9043,7 @@ endobj
<<
/Type /Pages
/Count 6
-/Parent 1012 0 R
+/Parent 1016 0 R
/Kids [433 0 R 446 0 R 456 0 R 468 0 R 487 0 R 492 0 R]
>>
endobj
@@ -9008,31 +9051,31 @@ endobj
<<
/Type /Pages
/Count 6
-/Parent 1012 0 R
-/Kids [505 0 R 515 0 R 521 0 R 525 0 R 531 0 R 537 0 R]
+/Parent 1016 0 R
+/Kids [505 0 R 515 0 R 521 0 R 525 0 R 531 0 R 538 0 R]
>>
endobj
547 0 obj
<<
/Type /Pages
/Count 6
-/Parent 1012 0 R
-/Kids [544 0 R 551 0 R 556 0 R 562 0 R 568 0 R 573 0 R]
+/Parent 1016 0 R
+/Kids [544 0 R 551 0 R 556 0 R 563 0 R 569 0 R 573 0 R]
>>
endobj
-582 0 obj
+584 0 obj
<<
/Type /Pages
/Count 6
-/Parent 1012 0 R
-/Kids [578 0 R 586 0 R 593 0 R 601 0 R 610 0 R 623 0 R]
+/Parent 1016 0 R
+/Kids [581 0 R 589 0 R 593 0 R 601 0 R 610 0 R 622 0 R]
>>
endobj
631 0 obj
<<
/Type /Pages
/Count 6
-/Parent 1012 0 R
+/Parent 1016 0 R
/Kids [627 0 R 634 0 R 638 0 R 644 0 R 656 0 R 668 0 R]
>>
endobj
@@ -9040,7 +9083,7 @@ endobj
<<
/Type /Pages
/Count 6
-/Parent 1013 0 R
+/Parent 1017 0 R
/Kids [677 0 R 682 0 R 689 0 R 696 0 R 701 0 R 705 0 R]
>>
endobj
@@ -9048,66 +9091,66 @@ endobj
<<
/Type /Pages
/Count 6
-/Parent 1013 0 R
-/Kids [709 0 R 715 0 R 719 0 R 726 0 R 732 0 R 736 0 R]
+/Parent 1017 0 R
+/Kids [709 0 R 716 0 R 720 0 R 727 0 R 733 0 R 737 0 R]
>>
endobj
-744 0 obj
+745 0 obj
<<
/Type /Pages
/Count 6
-/Parent 1013 0 R
-/Kids [740 0 R 752 0 R 758 0 R 766 0 R 770 0 R 781 0 R]
+/Parent 1017 0 R
+/Kids [741 0 R 751 0 R 759 0 R 767 0 R 771 0 R 777 0 R]
>>
endobj
-792 0 obj
+794 0 obj
<<
/Type /Pages
/Count 6
-/Parent 1013 0 R
-/Kids [788 0 R 794 0 R 798 0 R 811 0 R 825 0 R 829 0 R]
+/Parent 1017 0 R
+/Kids [788 0 R 796 0 R 800 0 R 813 0 R 827 0 R 831 0 R]
>>
endobj
-836 0 obj
+838 0 obj
<<
/Type /Pages
/Count 6
-/Parent 1013 0 R
-/Kids [833 0 R 838 0 R 842 0 R 846 0 R 850 0 R 854 0 R]
+/Parent 1017 0 R
+/Kids [835 0 R 840 0 R 844 0 R 848 0 R 852 0 R 856 0 R]
>>
endobj
-867 0 obj
+866 0 obj
<<
/Type /Pages
/Count 2
-/Parent 1013 0 R
-/Kids [858 0 R 869 0 R]
+/Parent 1017 0 R
+/Kids [860 0 R 868 0 R]
>>
endobj
-1012 0 obj
+1016 0 obj
<<
/Type /Pages
/Count 36
-/Parent 1014 0 R
-/Kids [311 0 R 443 0 R 511 0 R 547 0 R 582 0 R 631 0 R]
+/Parent 1018 0 R
+/Kids [311 0 R 443 0 R 511 0 R 547 0 R 584 0 R 631 0 R]
>>
endobj
-1013 0 obj
+1017 0 obj
<<
/Type /Pages
/Count 32
-/Parent 1014 0 R
-/Kids [680 0 R 712 0 R 744 0 R 792 0 R 836 0 R 867 0 R]
+/Parent 1018 0 R
+/Kids [680 0 R 712 0 R 745 0 R 794 0 R 838 0 R 866 0 R]
>>
endobj
-1014 0 obj
+1018 0 obj
<<
/Type /Pages
/Count 68
-/Kids [1012 0 R 1013 0 R]
+/Kids [1016 0 R 1017 0 R]
>>
endobj
-1015 0 obj
+1019 0 obj
<<
/Type /Outlines
/First 3 0 R
@@ -9256,7 +9299,7 @@ endobj
<<
/Title 240 0 R
/A 237 0 R
-/Parent 1015 0 R
+/Parent 1019 0 R
/Prev 191 0 R
/First 243 0 R
/Last 299 0 R
@@ -9367,7 +9410,7 @@ endobj
<<
/Title 192 0 R
/A 189 0 R
-/Parent 1015 0 R
+/Parent 1019 0 R
/Prev 107 0 R
/Next 239 0 R
/First 195 0 R
@@ -9562,7 +9605,7 @@ endobj
<<
/Title 108 0 R
/A 105 0 R
-/Parent 1015 0 R
+/Parent 1019 0 R
/Prev 15 0 R
/Next 191 0 R
/First 111 0 R
@@ -9776,7 +9819,7 @@ endobj
<<
/Title 16 0 R
/A 13 0 R
-/Parent 1015 0 R
+/Parent 1019 0 R
/Prev 3 0 R
/Next 107 0 R
/First 19 0 R
@@ -9804,1414 +9847,1425 @@ endobj
<<
/Title 4 0 R
/A 1 0 R
-/Parent 1015 0 R
+/Parent 1019 0 R
/Next 15 0 R
/First 7 0 R
/Last 11 0 R
/Count 2
>>
endobj
-1016 0 obj
-<<
-/Names [(Doc-Start) 306 0 R (Hfootnote.1) 424 0 R (Hfootnote.2) 473 0 R (Hfootnote.3) 508 0 R (Hfootnote.4) 510 0 R (Hfootnote.5) 565 0 R]
-/Limits [(Doc-Start) (Hfootnote.5)]
->>
-endobj
-1017 0 obj
-<<
-/Names [(Hfootnote.6) 566 0 R (Hfootnote.7) 604 0 R (Hfootnote.8) 605 0 R (Item.1) 421 0 R (Item.10) 617 0 R (Item.11) 671 0 R]
-/Limits [(Hfootnote.6) (Item.11)]
->>
-endobj
-1018 0 obj
-<<
-/Names [(Item.12) 672 0 R (Item.13) 673 0 R (Item.14) 761 0 R (Item.15) 762 0 R (Item.16) 763 0 R (Item.17) 764 0 R]
-/Limits [(Item.12) (Item.17)]
->>
-endobj
-1019 0 obj
-<<
-/Names [(Item.18) 773 0 R (Item.19) 774 0 R (Item.2) 422 0 R (Item.20) 775 0 R (Item.21) 776 0 R (Item.22) 785 0 R]
-/Limits [(Item.18) (Item.22)]
->>
-endobj
1020 0 obj
<<
-/Names [(Item.23) 786 0 R (Item.24) 791 0 R (Item.25) 801 0 R (Item.26) 802 0 R (Item.27) 803 0 R (Item.28) 804 0 R]
-/Limits [(Item.23) (Item.28)]
+/Names [(Doc-Start) 306 0 R (Hfootnote.1) 424 0 R (Hfootnote.2) 473 0 R (Hfootnote.3) 508 0 R (Hfootnote.4) 510 0 R (Hfootnote.5) 559 0 R]
+/Limits [(Doc-Start) (Hfootnote.5)]
>>
endobj
1021 0 obj
<<
-/Names [(Item.29) 805 0 R (Item.3) 436 0 R (Item.30) 806 0 R (Item.31) 807 0 R (Item.32) 808 0 R (Item.33) 809 0 R]
-/Limits [(Item.29) (Item.33)]
+/Names [(Hfootnote.6) 567 0 R (Hfootnote.7) 604 0 R (Hfootnote.8) 605 0 R (Item.1) 421 0 R (Item.10) 625 0 R (Item.11) 671 0 R]
+/Limits [(Hfootnote.6) (Item.11)]
>>
endobj
1022 0 obj
<<
-/Names [(Item.34) 814 0 R (Item.35) 815 0 R (Item.36) 816 0 R (Item.37) 817 0 R (Item.38) 818 0 R (Item.39) 819 0 R]
-/Limits [(Item.34) (Item.39)]
+/Names [(Item.12) 672 0 R (Item.13) 673 0 R (Item.14) 762 0 R (Item.15) 763 0 R (Item.16) 764 0 R (Item.17) 765 0 R]
+/Limits [(Item.12) (Item.17)]
>>
endobj
1023 0 obj
<<
-/Names [(Item.4) 437 0 R (Item.40) 820 0 R (Item.41) 821 0 R (Item.42) 822 0 R (Item.43) 823 0 R (Item.44) 861 0 R]
-/Limits [(Item.4) (Item.44)]
+/Names [(Item.18) 780 0 R (Item.19) 781 0 R (Item.2) 422 0 R (Item.20) 782 0 R (Item.21) 783 0 R (Item.22) 791 0 R]
+/Limits [(Item.18) (Item.22)]
>>
endobj
1024 0 obj
<<
-/Names [(Item.45) 862 0 R (Item.46) 863 0 R (Item.47) 864 0 R (Item.48) 865 0 R (Item.49) 866 0 R (Item.5) 438 0 R]
-/Limits [(Item.45) (Item.5)]
+/Names [(Item.23) 792 0 R (Item.24) 793 0 R (Item.25) 803 0 R (Item.26) 804 0 R (Item.27) 805 0 R (Item.28) 806 0 R]
+/Limits [(Item.23) (Item.28)]
>>
endobj
1025 0 obj
<<
-/Names [(Item.50) 872 0 R (Item.51) 873 0 R (Item.52) 874 0 R (Item.53) 875 0 R (Item.54) 876 0 R (Item.55) 877 0 R]
-/Limits [(Item.50) (Item.55)]
+/Names [(Item.29) 807 0 R (Item.3) 436 0 R (Item.30) 808 0 R (Item.31) 809 0 R (Item.32) 810 0 R (Item.33) 811 0 R]
+/Limits [(Item.29) (Item.33)]
>>
endobj
1026 0 obj
<<
-/Names [(Item.56) 878 0 R (Item.57) 879 0 R (Item.58) 880 0 R (Item.59) 881 0 R (Item.6) 439 0 R (Item.60) 882 0 R]
-/Limits [(Item.56) (Item.60)]
+/Names [(Item.34) 816 0 R (Item.35) 817 0 R (Item.36) 818 0 R (Item.37) 819 0 R (Item.38) 820 0 R (Item.39) 821 0 R]
+/Limits [(Item.34) (Item.39)]
>>
endobj
1027 0 obj
<<
-/Names [(Item.61) 883 0 R (Item.62) 884 0 R (Item.63) 885 0 R (Item.7) 440 0 R (Item.8) 615 0 R (Item.9) 616 0 R]
-/Limits [(Item.61) (Item.9)]
+/Names [(Item.4) 437 0 R (Item.40) 822 0 R (Item.41) 823 0 R (Item.42) 824 0 R (Item.43) 825 0 R (Item.44) 863 0 R]
+/Limits [(Item.4) (Item.44)]
>>
endobj
1028 0 obj
<<
-/Names [(chapter*.3) 367 0 R (chapter.1) 2 0 R (chapter.2) 14 0 R (chapter.3) 106 0 R (chapter.4) 190 0 R (chapter.5) 238 0 R]
-/Limits [(chapter*.3) (chapter.5)]
+/Names [(Item.45) 864 0 R (Item.46) 865 0 R (Item.47) 871 0 R (Item.48) 872 0 R (Item.49) 873 0 R (Item.5) 438 0 R]
+/Limits [(Item.45) (Item.5)]
>>
endobj
1029 0 obj
<<
-/Names [(equation.1.2.1) 450 0 R (equation.1.2.2) 451 0 R (equation.1.2.3) 452 0 R (equation.1.2.4) 459 0 R (equation.1.2.5) 460 0 R (equation.1.2.6) 461 0 R]
-/Limits [(equation.1.2.1) (equation.1.2.6)]
+/Names [(Item.50) 874 0 R (Item.51) 875 0 R (Item.52) 876 0 R (Item.53) 877 0 R (Item.54) 878 0 R (Item.55) 879 0 R]
+/Limits [(Item.50) (Item.55)]
>>
endobj
1030 0 obj
<<
-/Names [(equation.1.2.7) 463 0 R (page.1) 305 0 R (page.10) 494 0 R (page.11) 507 0 R (page.12) 517 0 R (page.13) 523 0 R]
-/Limits [(equation.1.2.7) (page.13)]
+/Names [(Item.56) 880 0 R (Item.57) 881 0 R (Item.58) 882 0 R (Item.59) 883 0 R (Item.6) 439 0 R (Item.60) 884 0 R]
+/Limits [(Item.56) (Item.60)]
>>
endobj
1031 0 obj
<<
-/Names [(page.14) 527 0 R (page.15) 533 0 R (page.16) 539 0 R (page.17) 546 0 R (page.18) 553 0 R (page.19) 558 0 R]
-/Limits [(page.14) (page.19)]
+/Names [(Item.61) 885 0 R (Item.62) 886 0 R (Item.63) 887 0 R (Item.64) 888 0 R (Item.65) 889 0 R (Item.7) 440 0 R]
+/Limits [(Item.61) (Item.7)]
>>
endobj
1032 0 obj
<<
-/Names [(page.2) 366 0 R (page.20) 564 0 R (page.21) 570 0 R (page.22) 575 0 R (page.23) 580 0 R (page.24) 588 0 R]
-/Limits [(page.2) (page.24)]
+/Names [(Item.8) 615 0 R (Item.9) 616 0 R (chapter*.3) 367 0 R (chapter.1) 2 0 R (chapter.2) 14 0 R (chapter.3) 106 0 R]
+/Limits [(Item.8) (chapter.3)]
>>
endobj
1033 0 obj
<<
-/Names [(page.25) 595 0 R (page.26) 603 0 R (page.27) 612 0 R (page.28) 625 0 R (page.29) 629 0 R (page.3) 414 0 R]
-/Limits [(page.25) (page.3)]
+/Names [(chapter.4) 190 0 R (chapter.5) 238 0 R (equation.1.2.1) 450 0 R (equation.1.2.2) 451 0 R (equation.1.2.3) 452 0 R (equation.1.2.4) 459 0 R]
+/Limits [(chapter.4) (equation.1.2.4)]
>>
endobj
1034 0 obj
<<
-/Names [(page.30) 636 0 R (page.31) 640 0 R (page.32) 646 0 R (page.33) 658 0 R (page.34) 670 0 R (page.35) 679 0 R]
-/Limits [(page.30) (page.35)]
+/Names [(equation.1.2.5) 460 0 R (equation.1.2.6) 461 0 R (equation.1.2.7) 463 0 R (page.1) 305 0 R (page.10) 494 0 R (page.11) 507 0 R]
+/Limits [(equation.1.2.5) (page.11)]
>>
endobj
1035 0 obj
<<
-/Names [(page.36) 684 0 R (page.37) 691 0 R (page.38) 698 0 R (page.39) 703 0 R (page.4) 419 0 R (page.40) 707 0 R]
-/Limits [(page.36) (page.40)]
+/Names [(page.12) 517 0 R (page.13) 523 0 R (page.14) 527 0 R (page.15) 533 0 R (page.16) 540 0 R (page.17) 546 0 R]
+/Limits [(page.12) (page.17)]
>>
endobj
1036 0 obj
<<
-/Names [(page.41) 711 0 R (page.42) 717 0 R (page.43) 721 0 R (page.44) 728 0 R (page.45) 734 0 R (page.46) 738 0 R]
-/Limits [(page.41) (page.46)]
+/Names [(page.18) 553 0 R (page.19) 558 0 R (page.2) 366 0 R (page.20) 565 0 R (page.21) 571 0 R (page.22) 575 0 R]
+/Limits [(page.18) (page.22)]
>>
endobj
1037 0 obj
<<
-/Names [(page.47) 742 0 R (page.48) 754 0 R (page.49) 760 0 R (page.5) 435 0 R (page.50) 768 0 R (page.51) 772 0 R]
-/Limits [(page.47) (page.51)]
+/Names [(page.23) 583 0 R (page.24) 591 0 R (page.25) 595 0 R (page.26) 603 0 R (page.27) 612 0 R (page.28) 624 0 R]
+/Limits [(page.23) (page.28)]
>>
endobj
1038 0 obj
<<
-/Names [(page.52) 783 0 R (page.53) 790 0 R (page.54) 796 0 R (page.55) 800 0 R (page.56) 813 0 R (page.57) 827 0 R]
-/Limits [(page.52) (page.57)]
+/Names [(page.29) 629 0 R (page.3) 414 0 R (page.30) 636 0 R (page.31) 640 0 R (page.32) 646 0 R (page.33) 658 0 R]
+/Limits [(page.29) (page.33)]
>>
endobj
1039 0 obj
<<
-/Names [(page.58) 831 0 R (page.59) 835 0 R (page.6) 448 0 R (page.60) 840 0 R (page.61) 844 0 R (page.62) 848 0 R]
-/Limits [(page.58) (page.62)]
+/Names [(page.34) 670 0 R (page.35) 679 0 R (page.36) 684 0 R (page.37) 691 0 R (page.38) 698 0 R (page.39) 703 0 R]
+/Limits [(page.34) (page.39)]
>>
endobj
1040 0 obj
<<
-/Names [(page.63) 852 0 R (page.64) 856 0 R (page.65) 860 0 R (page.66) 871 0 R (page.7) 458 0 R (page.8) 470 0 R]
-/Limits [(page.63) (page.8)]
+/Names [(page.4) 419 0 R (page.40) 707 0 R (page.41) 711 0 R (page.42) 718 0 R (page.43) 722 0 R (page.44) 729 0 R]
+/Limits [(page.4) (page.44)]
>>
endobj
1041 0 obj
<<
-/Names [(page.9) 489 0 R (section*.1) 328 0 R (section*.10) 687 0 R (section*.11) 692 0 R (section*.12) 693 0 R (section*.13) 694 0 R]
-/Limits [(page.9) (section*.13)]
+/Names [(page.45) 735 0 R (page.46) 739 0 R (page.47) 743 0 R (page.48) 753 0 R (page.49) 761 0 R (page.5) 435 0 R]
+/Limits [(page.45) (page.5)]
>>
endobj
1042 0 obj
<<
-/Names [(section*.14) 699 0 R (section*.2) 329 0 R (section*.4) 472 0 R (section*.5) 571 0 R (section*.9) 685 0 R (section.1.1) 6 0 R]
-/Limits [(section*.14) (section.1.1)]
+/Names [(page.50) 769 0 R (page.51) 773 0 R (page.52) 779 0 R (page.53) 790 0 R (page.54) 798 0 R (page.55) 802 0 R]
+/Limits [(page.50) (page.55)]
>>
endobj
1043 0 obj
<<
-/Names [(section.1.2) 10 0 R (section.2.1) 18 0 R (section.2.2) 22 0 R (section.3.1) 110 0 R (section.3.2) 114 0 R (section.3.3) 134 0 R]
-/Limits [(section.1.2) (section.3.3)]
+/Names [(page.56) 815 0 R (page.57) 829 0 R (page.58) 833 0 R (page.59) 837 0 R (page.6) 448 0 R (page.60) 842 0 R]
+/Limits [(page.56) (page.60)]
>>
endobj
1044 0 obj
<<
-/Names [(section.3.4) 182 0 R (section.4.1) 194 0 R (section.4.2) 222 0 R (section.5.1) 242 0 R (section.5.2) 246 0 R (section.5.3) 286 0 R]
-/Limits [(section.3.4) (section.5.3)]
+/Names [(page.61) 846 0 R (page.62) 850 0 R (page.63) 854 0 R (page.64) 858 0 R (page.65) 862 0 R (page.66) 870 0 R]
+/Limits [(page.61) (page.66)]
>>
endobj
1045 0 obj
<<
-/Names [(section.5.4) 290 0 R (section.5.5) 294 0 R (section.5.6) 298 0 R (subsection.2.2.1) 26 0 R (subsection.2.2.2) 34 0 R (subsection.2.2.3) 42 0 R]
-/Limits [(section.5.4) (subsection.2.2.3)]
+/Names [(page.7) 458 0 R (page.8) 470 0 R (page.9) 489 0 R (section*.1) 328 0 R (section*.10) 687 0 R (section*.11) 692 0 R]
+/Limits [(page.7) (section*.11)]
>>
endobj
1046 0 obj
<<
-/Names [(subsection.2.2.4) 54 0 R (subsection.2.2.5) 70 0 R (subsection.2.2.6) 102 0 R (subsection.3.2.1) 118 0 R (subsection.3.2.2) 122 0 R (subsection.3.2.3) 126 0 R]
-/Limits [(subsection.2.2.4) (subsection.3.2.3)]
+/Names [(section*.12) 693 0 R (section*.13) 694 0 R (section*.14) 699 0 R (section*.2) 329 0 R (section*.4) 472 0 R (section*.5) 566 0 R]
+/Limits [(section*.12) (section*.5)]
>>
endobj
1047 0 obj
<<
-/Names [(subsection.3.2.4) 130 0 R (subsection.3.3.1) 138 0 R (subsection.3.3.2) 146 0 R (subsection.3.3.3) 178 0 R (subsection.3.4.1) 186 0 R (subsection.4.1.1) 198 0 R]
-/Limits [(subsection.3.2.4) (subsection.4.1.1)]
+/Names [(section*.9) 685 0 R (section.1.1) 6 0 R (section.1.2) 10 0 R (section.2.1) 18 0 R (section.2.2) 22 0 R (section.3.1) 110 0 R]
+/Limits [(section*.9) (section.3.1)]
>>
endobj
1048 0 obj
<<
-/Names [(subsection.4.1.2) 202 0 R (subsection.4.1.3) 206 0 R (subsection.4.1.4) 214 0 R (subsection.4.1.5) 218 0 R (subsection.4.2.1) 226 0 R (subsection.4.2.2) 230 0 R]
-/Limits [(subsection.4.1.2) (subsection.4.2.2)]
+/Names [(section.3.2) 114 0 R (section.3.3) 134 0 R (section.3.4) 182 0 R (section.4.1) 194 0 R (section.4.2) 222 0 R (section.5.1) 242 0 R]
+/Limits [(section.3.2) (section.5.1)]
>>
endobj
1049 0 obj
<<
-/Names [(subsection.4.2.3) 234 0 R (subsection.5.2.1) 250 0 R (subsection.5.2.2) 254 0 R (subsection.5.2.3) 262 0 R (subsection.5.2.4) 270 0 R (subsection.5.2.5) 278 0 R]
-/Limits [(subsection.4.2.3) (subsection.5.2.5)]
+/Names [(section.5.2) 246 0 R (section.5.3) 286 0 R (section.5.4) 290 0 R (section.5.5) 294 0 R (section.5.6) 298 0 R (subsection.2.2.1) 26 0 R]
+/Limits [(section.5.2) (subsection.2.2.1)]
>>
endobj
1050 0 obj
<<
-/Names [(subsection.5.2.6) 282 0 R (subsubsection.2.2.1.1) 30 0 R (subsubsection.2.2.2.1) 38 0 R (subsubsection.2.2.3.1) 46 0 R (subsubsection.2.2.3.2) 50 0 R (subsubsection.2.2.4.1) 58 0 R]
-/Limits [(subsection.5.2.6) (subsubsection.2.2.4.1)]
+/Names [(subsection.2.2.2) 34 0 R (subsection.2.2.3) 42 0 R (subsection.2.2.4) 54 0 R (subsection.2.2.5) 70 0 R (subsection.2.2.6) 102 0 R (subsection.3.2.1) 118 0 R]
+/Limits [(subsection.2.2.2) (subsection.3.2.1)]
>>
endobj
1051 0 obj
<<
-/Names [(subsubsection.2.2.4.2) 62 0 R (subsubsection.2.2.4.3) 66 0 R (subsubsection.2.2.5.1) 74 0 R (subsubsection.2.2.5.2) 78 0 R (subsubsection.2.2.5.3) 82 0 R (subsubsection.2.2.5.4) 86 0 R]
-/Limits [(subsubsection.2.2.4.2) (subsubsection.2.2.5.4)]
+/Names [(subsection.3.2.2) 122 0 R (subsection.3.2.3) 126 0 R (subsection.3.2.4) 130 0 R (subsection.3.3.1) 138 0 R (subsection.3.3.2) 146 0 R (subsection.3.3.3) 178 0 R]
+/Limits [(subsection.3.2.2) (subsection.3.3.3)]
>>
endobj
1052 0 obj
<<
-/Names [(subsubsection.2.2.5.5) 90 0 R (subsubsection.2.2.5.6) 94 0 R (subsubsection.2.2.5.7) 98 0 R (subsubsection.3.3.1.1) 142 0 R (subsubsection.3.3.2.1) 150 0 R (subsubsection.3.3.2.2) 154 0 R]
-/Limits [(subsubsection.2.2.5.5) (subsubsection.3.3.2.2)]
+/Names [(subsection.3.4.1) 186 0 R (subsection.4.1.1) 198 0 R (subsection.4.1.2) 202 0 R (subsection.4.1.3) 206 0 R (subsection.4.1.4) 214 0 R (subsection.4.1.5) 218 0 R]
+/Limits [(subsection.3.4.1) (subsection.4.1.5)]
>>
endobj
1053 0 obj
<<
-/Names [(subsubsection.3.3.2.3) 158 0 R (subsubsection.3.3.2.4) 162 0 R (subsubsection.3.3.2.5) 166 0 R (subsubsection.3.3.2.6) 170 0 R (subsubsection.3.3.2.7) 174 0 R (subsubsection.4.1.3.1) 210 0 R]
-/Limits [(subsubsection.3.3.2.3) (subsubsection.4.1.3.1)]
+/Names [(subsection.4.2.1) 226 0 R (subsection.4.2.2) 230 0 R (subsection.4.2.3) 234 0 R (subsection.5.2.1) 250 0 R (subsection.5.2.2) 254 0 R (subsection.5.2.3) 262 0 R]
+/Limits [(subsection.4.2.1) (subsection.5.2.3)]
>>
endobj
1054 0 obj
<<
-/Names [(subsubsection.5.2.2.1) 258 0 R (subsubsection.5.2.3.1) 266 0 R (subsubsection.5.2.4.1) 274 0 R (subtable.3.3.1) 660 0 R (subtable.3.3.2) 661 0 R (subtable.3.3.3) 662 0 R]
-/Limits [(subsubsection.5.2.2.1) (subtable.3.3.3)]
+/Names [(subsection.5.2.4) 270 0 R (subsection.5.2.5) 278 0 R (subsection.5.2.6) 282 0 R (subsubsection.2.2.1.1) 30 0 R (subsubsection.2.2.2.1) 38 0 R (subsubsection.2.2.3.1) 46 0 R]
+/Limits [(subsection.5.2.4) (subsubsection.2.2.3.1)]
>>
endobj
1055 0 obj
<<
-/Names [(subtable.3.3.4) 663 0 R (table.caption.15) 755 0 R (table.caption.16) 784 0 R (table.caption.6) 613 0 R (table.caption.7) 618 0 R (table.caption.8) 659 0 R]
-/Limits [(subtable.3.3.4) (table.caption.8)]
+/Names [(subsubsection.2.2.3.2) 50 0 R (subsubsection.2.2.4.1) 58 0 R (subsubsection.2.2.4.2) 62 0 R (subsubsection.2.2.4.3) 66 0 R (subsubsection.2.2.5.1) 74 0 R (subsubsection.2.2.5.2) 78 0 R]
+/Limits [(subsubsection.2.2.3.2) (subsubsection.2.2.5.2)]
>>
endobj
1056 0 obj
<<
-/Kids [1016 0 R 1017 0 R 1018 0 R 1019 0 R 1020 0 R 1021 0 R]
-/Limits [(Doc-Start) (Item.33)]
+/Names [(subsubsection.2.2.5.3) 82 0 R (subsubsection.2.2.5.4) 86 0 R (subsubsection.2.2.5.5) 90 0 R (subsubsection.2.2.5.6) 94 0 R (subsubsection.2.2.5.7) 98 0 R (subsubsection.3.3.1.1) 142 0 R]
+/Limits [(subsubsection.2.2.5.3) (subsubsection.3.3.1.1)]
>>
endobj
1057 0 obj
<<
-/Kids [1022 0 R 1023 0 R 1024 0 R 1025 0 R 1026 0 R 1027 0 R]
-/Limits [(Item.34) (Item.9)]
+/Names [(subsubsection.3.3.2.1) 150 0 R (subsubsection.3.3.2.2) 154 0 R (subsubsection.3.3.2.3) 158 0 R (subsubsection.3.3.2.4) 162 0 R (subsubsection.3.3.2.5) 166 0 R (subsubsection.3.3.2.6) 170 0 R]
+/Limits [(subsubsection.3.3.2.1) (subsubsection.3.3.2.6)]
>>
endobj
1058 0 obj
<<
-/Kids [1028 0 R 1029 0 R 1030 0 R 1031 0 R 1032 0 R 1033 0 R]
-/Limits [(chapter*.3) (page.3)]
+/Names [(subsubsection.3.3.2.7) 174 0 R (subsubsection.4.1.3.1) 210 0 R (subsubsection.5.2.2.1) 258 0 R (subsubsection.5.2.3.1) 266 0 R (subsubsection.5.2.4.1) 274 0 R (subtable.3.3.1) 660 0 R]
+/Limits [(subsubsection.3.3.2.7) (subtable.3.3.1)]
>>
endobj
1059 0 obj
<<
-/Kids [1034 0 R 1035 0 R 1036 0 R 1037 0 R 1038 0 R 1039 0 R]
-/Limits [(page.30) (page.62)]
+/Names [(subtable.3.3.2) 661 0 R (subtable.3.3.3) 662 0 R (subtable.3.3.4) 663 0 R (table.caption.15) 754 0 R (table.caption.16) 784 0 R (table.caption.6) 613 0 R]
+/Limits [(subtable.3.3.2) (table.caption.6)]
>>
endobj
1060 0 obj
<<
-/Kids [1040 0 R 1041 0 R 1042 0 R 1043 0 R 1044 0 R 1045 0 R]
-/Limits [(page.63) (subsection.2.2.3)]
+/Names [(table.caption.7) 617 0 R (table.caption.8) 659 0 R]
+/Limits [(table.caption.7) (table.caption.8)]
>>
endobj
1061 0 obj
<<
-/Kids [1046 0 R 1047 0 R 1048 0 R 1049 0 R 1050 0 R 1051 0 R]
-/Limits [(subsection.2.2.4) (subsubsection.2.2.5.4)]
+/Kids [1020 0 R 1021 0 R 1022 0 R 1023 0 R 1024 0 R 1025 0 R]
+/Limits [(Doc-Start) (Item.33)]
>>
endobj
1062 0 obj
<<
-/Kids [1052 0 R 1053 0 R 1054 0 R 1055 0 R]
-/Limits [(subsubsection.2.2.5.5) (table.caption.8)]
+/Kids [1026 0 R 1027 0 R 1028 0 R 1029 0 R 1030 0 R 1031 0 R]
+/Limits [(Item.34) (Item.7)]
>>
endobj
1063 0 obj
<<
-/Kids [1056 0 R 1057 0 R 1058 0 R 1059 0 R 1060 0 R 1061 0 R]
-/Limits [(Doc-Start) (subsubsection.2.2.5.4)]
+/Kids [1032 0 R 1033 0 R 1034 0 R 1035 0 R 1036 0 R 1037 0 R]
+/Limits [(Item.8) (page.28)]
>>
endobj
1064 0 obj
<<
-/Kids [1062 0 R]
-/Limits [(subsubsection.2.2.5.5) (table.caption.8)]
+/Kids [1038 0 R 1039 0 R 1040 0 R 1041 0 R 1042 0 R 1043 0 R]
+/Limits [(page.29) (page.60)]
>>
endobj
1065 0 obj
<<
-/Kids [1063 0 R 1064 0 R]
-/Limits [(Doc-Start) (table.caption.8)]
+/Kids [1044 0 R 1045 0 R 1046 0 R 1047 0 R 1048 0 R 1049 0 R]
+/Limits [(page.61) (subsection.2.2.1)]
>>
endobj
1066 0 obj
<<
-/Dests 1065 0 R
+/Kids [1050 0 R 1051 0 R 1052 0 R 1053 0 R 1054 0 R 1055 0 R]
+/Limits [(subsection.2.2.2) (subsubsection.2.2.5.2)]
>>
endobj
1067 0 obj
<<
+/Kids [1056 0 R 1057 0 R 1058 0 R 1059 0 R 1060 0 R]
+/Limits [(subsubsection.2.2.5.3) (table.caption.8)]
+>>
+endobj
+1068 0 obj
+<<
+/Kids [1061 0 R 1062 0 R 1063 0 R 1064 0 R 1065 0 R 1066 0 R]
+/Limits [(Doc-Start) (subsubsection.2.2.5.2)]
+>>
+endobj
+1069 0 obj
+<<
+/Kids [1067 0 R]
+/Limits [(subsubsection.2.2.5.3) (table.caption.8)]
+>>
+endobj
+1070 0 obj
+<<
+/Kids [1068 0 R 1069 0 R]
+/Limits [(Doc-Start) (table.caption.8)]
+>>
+endobj
+1071 0 obj
+<<
+/Dests 1070 0 R
+>>
+endobj
+1072 0 obj
+<<
/Type /Catalog
-/Pages 1014 0 R
-/Outlines 1015 0 R
-/Names 1066 0 R
+/Pages 1018 0 R
+/Outlines 1019 0 R
+/Names 1071 0 R
/PageMode/FullScreen/PageLabels<</Nums[0<</S/D>>1<</S/D>>2<</S/D>>]>>
/OpenAction 301 0 R
>>
endobj
-1068 0 obj
+1073 0 obj
<<
-/Producer (MiKTeX pdfTeX-1.40.24)
-/Author(\376\377\000A\000n\000d\000r\000e\000w\000\040\000P\000a\000r\000s\000l\000o\000e\000,\000\040\000\050\000a\000j\000p\000a\000r\000s\000l\000o\000e\000@\000g\000m\000a\000i\000l\000.\000c\000o\000m\000\051)/Title(\376\377\000d\000i\000f\000f\000c\000o\000e\000f\000f\000\040\000\040\000a\000\040\000L\000a\000T\000e\000X\000\040\000p\000a\000c\000k\000a\000g\000e\000\040\000t\000o\000\040\000e\000a\000s\000e\000\040\000t\000h\000e\000\040\000\040\000w\000r\000i\000t\000i\000n\000g\000\040\000o\000f\000\040\000d\000i\000f\000f\000e\000r\000e\000n\000t\000i\000a\000l\000\040\000c\000o\000e\000f\000f\000i\000c\000i\000e\000n\000t\000s\000\040\000\040\000V\000e\000r\000s\000i\000o\000n\000\040\0005\000.\0003)/Subject()/Creator(LaTeX with hyperref)/Keywords()
-/CreationDate (D:20230412142048+12'00')
-/ModDate (D:20230412142048+12'00')
+/Producer (MiKTeX pdfTeX-1.40.25)
+/Author(\376\377\000A\000n\000d\000r\000e\000w\000\040\000P\000a\000r\000s\000l\000o\000e\000,\000\040\000\050\000a\000j\000p\000a\000r\000s\000l\000o\000e\000@\000g\000m\000a\000i\000l\000.\000c\000o\000m\000\051)/Title(\376\377\000d\000i\000f\000f\000c\000o\000e\000f\000f\000\040\000\040\000a\000\040\000L\000a\000T\000e\000X\000\040\000p\000a\000c\000k\000a\000g\000e\000\040\000t\000o\000\040\000e\000a\000s\000e\000\040\000t\000h\000e\000\040\000\040\000w\000r\000i\000t\000i\000n\000g\000\040\000o\000f\000\040\000d\000i\000f\000f\000e\000r\000e\000n\000t\000i\000a\000l\000\040\000c\000o\000e\000f\000f\000i\000c\000i\000e\000n\000t\000s\000\040\000\040\000V\000e\000r\000s\000i\000o\000n\000\040\0005\000.\0004)/Subject()/Creator(LaTeX with hyperref)/Keywords()
+/CreationDate (D:20231114102341+13'00')
+/ModDate (D:20231114102341+13'00')
/Trapped /False
-/PTEX.Fullbanner (This is MiKTeX-pdfTeX 4.14.0 (1.40.24))
+/PTEX.Fullbanner (This is MiKTeX-pdfTeX 4.16.0 (1.40.25))
>>
endobj
xref
-0 1069
+0 1074
0000000000 65535 f
0000000015 00000 n
-0000041581 00000 n
-0000801487 00000 n
+0000041811 00000 n
+0000805806 00000 n
0000000060 00000 n
0000000159 00000 n
-0000041641 00000 n
-0000801417 00000 n
+0000041871 00000 n
+0000805736 00000 n
0000000206 00000 n
0000000333 00000 n
-0000049316 00000 n
-0000801346 00000 n
+0000049534 00000 n
+0000805665 00000 n
0000000380 00000 n
0000000602 00000 n
-0000057909 00000 n
-0000801221 00000 n
+0000058122 00000 n
+0000805540 00000 n
0000000648 00000 n
0000000764 00000 n
-0000058032 00000 n
-0000801147 00000 n
+0000058245 00000 n
+0000805466 00000 n
0000000812 00000 n
0000000892 00000 n
-0000062527 00000 n
-0000801036 00000 n
+0000062740 00000 n
+0000805355 00000 n
0000000940 00000 n
0000001048 00000 n
-0000066386 00000 n
-0000800925 00000 n
+0000066598 00000 n
+0000805244 00000 n
0000001101 00000 n
0000001330 00000 n
-0000075474 00000 n
-0000800864 00000 n
+0000075675 00000 n
+0000805183 00000 n
0000001388 00000 n
0000001541 00000 n
-0000075535 00000 n
-0000800740 00000 n
+0000075736 00000 n
+0000805059 00000 n
0000001594 00000 n
0000001780 00000 n
-0000078246 00000 n
-0000800679 00000 n
+0000078399 00000 n
+0000804998 00000 n
0000001838 00000 n
-0000002001 00000 n
-0000080965 00000 n
-0000800555 00000 n
-0000002054 00000 n
-0000002255 00000 n
-0000083915 00000 n
-0000800481 00000 n
-0000002313 00000 n
-0000002542 00000 n
-0000083976 00000 n
-0000800407 00000 n
-0000002600 00000 n
-0000002788 00000 n
-0000084037 00000 n
-0000800283 00000 n
-0000002841 00000 n
-0000003128 00000 n
-0000091227 00000 n
-0000800209 00000 n
-0000003186 00000 n
-0000003316 00000 n
-0000091288 00000 n
-0000800122 00000 n
-0000003374 00000 n
-0000003565 00000 n
-0000091349 00000 n
-0000800048 00000 n
-0000003623 00000 n
-0000003850 00000 n
-0000094446 00000 n
-0000799923 00000 n
-0000003903 00000 n
-0000004094 00000 n
-0000097564 00000 n
-0000799849 00000 n
-0000004152 00000 n
-0000004406 00000 n
-0000101404 00000 n
-0000799762 00000 n
-0000004464 00000 n
-0000004627 00000 n
-0000101465 00000 n
-0000799675 00000 n
-0000004685 00000 n
-0000004929 00000 n
-0000104933 00000 n
-0000799588 00000 n
-0000004987 00000 n
-0000005112 00000 n
-0000107771 00000 n
-0000799501 00000 n
-0000005170 00000 n
-0000005313 00000 n
-0000111083 00000 n
-0000799414 00000 n
-0000005371 00000 n
-0000005666 00000 n
-0000111144 00000 n
-0000799339 00000 n
-0000005724 00000 n
-0000005934 00000 n
-0000114639 00000 n
-0000799262 00000 n
-0000005988 00000 n
-0000006240 00000 n
-0000122118 00000 n
-0000799130 00000 n
-0000006287 00000 n
-0000006490 00000 n
-0000122180 00000 n
-0000799051 00000 n
-0000006539 00000 n
-0000006683 00000 n
-0000126013 00000 n
-0000798920 00000 n
-0000006732 00000 n
-0000006950 00000 n
-0000140695 00000 n
-0000798841 00000 n
-0000007004 00000 n
-0000007337 00000 n
-0000144766 00000 n
-0000798748 00000 n
-0000007391 00000 n
-0000007714 00000 n
-0000144828 00000 n
-0000798655 00000 n
-0000007768 00000 n
-0000008081 00000 n
-0000148768 00000 n
-0000798576 00000 n
-0000008135 00000 n
-0000008461 00000 n
-0000148830 00000 n
-0000798445 00000 n
-0000008510 00000 n
-0000008746 00000 n
-0000152723 00000 n
-0000798327 00000 n
-0000008800 00000 n
-0000008932 00000 n
-0000156285 00000 n
-0000798262 00000 n
-0000008991 00000 n
-0000009148 00000 n
-0000156346 00000 n
-0000798130 00000 n
-0000009202 00000 n
-0000009369 00000 n
-0000161586 00000 n
-0000798051 00000 n
-0000009428 00000 n
-0000009610 00000 n
-0000161710 00000 n
-0000797958 00000 n
-0000009669 00000 n
-0000009926 00000 n
-0000164342 00000 n
-0000797865 00000 n
-0000009985 00000 n
-0000010157 00000 n
-0000167034 00000 n
-0000797772 00000 n
-0000010216 00000 n
-0000010443 00000 n
-0000169305 00000 n
-0000797679 00000 n
-0000010502 00000 n
-0000010681 00000 n
-0000172828 00000 n
-0000797586 00000 n
-0000010740 00000 n
-0000010937 00000 n
-0000172890 00000 n
-0000797507 00000 n
-0000010996 00000 n
-0000011227 00000 n
-0000175746 00000 n
-0000797428 00000 n
-0000011281 00000 n
-0000011420 00000 n
-0000178586 00000 n
-0000797311 00000 n
-0000011469 00000 n
-0000011659 00000 n
-0000181945 00000 n
-0000797246 00000 n
-0000011713 00000 n
-0000011903 00000 n
-0000186381 00000 n
-0000797113 00000 n
-0000011950 00000 n
-0000012132 00000 n
-0000186443 00000 n
-0000796996 00000 n
-0000012181 00000 n
-0000012297 00000 n
-0000190121 00000 n
-0000796917 00000 n
-0000012351 00000 n
-0000012480 00000 n
-0000190245 00000 n
-0000796824 00000 n
-0000012534 00000 n
-0000012691 00000 n
-0000194044 00000 n
-0000796692 00000 n
-0000012745 00000 n
-0000012960 00000 n
-0000196871 00000 n
-0000796627 00000 n
-0000013019 00000 n
-0000013158 00000 n
-0000199714 00000 n
-0000796534 00000 n
-0000013212 00000 n
-0000013361 00000 n
-0000199776 00000 n
-0000796455 00000 n
-0000013415 00000 n
-0000013521 00000 n
-0000200086 00000 n
-0000796338 00000 n
-0000013570 00000 n
-0000013666 00000 n
-0000203348 00000 n
-0000796259 00000 n
-0000013720 00000 n
-0000013849 00000 n
-0000203472 00000 n
-0000796166 00000 n
-0000013903 00000 n
-0000014093 00000 n
-0000207301 00000 n
-0000796087 00000 n
-0000014147 00000 n
-0000014296 00000 n
-0000209159 00000 n
-0000795968 00000 n
-0000014343 00000 n
-0000014429 00000 n
-0000209221 00000 n
-0000795889 00000 n
-0000014478 00000 n
-0000014569 00000 n
-0000212604 00000 n
-0000795758 00000 n
-0000014618 00000 n
-0000014714 00000 n
-0000213823 00000 n
-0000795679 00000 n
-0000014768 00000 n
-0000014928 00000 n
-0000213885 00000 n
-0000795547 00000 n
-0000014982 00000 n
-0000015225 00000 n
-0000215172 00000 n
-0000795482 00000 n
-0000015284 00000 n
-0000015380 00000 n
-0000215233 00000 n
-0000795350 00000 n
-0000015434 00000 n
-0000015667 00000 n
-0000216480 00000 n
-0000795285 00000 n
-0000015726 00000 n
-0000015822 00000 n
-0000216542 00000 n
-0000795153 00000 n
-0000015876 00000 n
-0000016074 00000 n
-0000216604 00000 n
-0000795088 00000 n
-0000016133 00000 n
-0000016229 00000 n
-0000216666 00000 n
-0000794995 00000 n
-0000016283 00000 n
-0000016428 00000 n
-0000217937 00000 n
-0000794916 00000 n
-0000016482 00000 n
-0000016647 00000 n
-0000217999 00000 n
-0000794823 00000 n
-0000016696 00000 n
-0000016868 00000 n
-0000220994 00000 n
-0000794730 00000 n
-0000016917 00000 n
-0000017071 00000 n
-0000222648 00000 n
-0000794637 00000 n
-0000017120 00000 n
-0000017279 00000 n
-0000225462 00000 n
-0000794558 00000 n
-0000017328 00000 n
-0000017457 00000 n
-0000017947 00000 n
-0000018182 00000 n
-0000017507 00000 n
-0000018059 00000 n
-0000018120 00000 n
-0000776238 00000 n
-0000765099 00000 n
-0000763985 00000 n
-0000769550 00000 n
-0000792784 00000 n
-0000019808 00000 n
-0000019696 00000 n
-0000018293 00000 n
-0000759524 00000 n
-0000775123 00000 n
-0000762871 00000 n
-0000767325 00000 n
-0000791042 00000 n
-0000782891 00000 n
-0000788571 00000 n
-0000781135 00000 n
-0000022532 00000 n
-0000022685 00000 n
-0000022962 00000 n
-0000022392 00000 n
-0000019971 00000 n
-0000022839 00000 n
-0000022900 00000 n
-0000024946 00000 n
-0000025097 00000 n
-0000025250 00000 n
-0000025404 00000 n
-0000025556 00000 n
-0000025710 00000 n
-0000025864 00000 n
-0000026022 00000 n
-0000026186 00000 n
-0000026344 00000 n
-0000026507 00000 n
-0000026665 00000 n
-0000026829 00000 n
-0000026990 00000 n
-0000027148 00000 n
-0000027311 00000 n
-0000027475 00000 n
-0000027637 00000 n
-0000027795 00000 n
-0000027959 00000 n
-0000028123 00000 n
-0000028287 00000 n
-0000028451 00000 n
-0000028615 00000 n
-0000028779 00000 n
-0000028943 00000 n
-0000029101 00000 n
-0000029253 00000 n
-0000029406 00000 n
-0000029560 00000 n
-0000029714 00000 n
-0000029872 00000 n
-0000032412 00000 n
-0000030152 00000 n
-0000024566 00000 n
-0000023112 00000 n
-0000030029 00000 n
-0000030090 00000 n
-0000760638 00000 n
-0000032570 00000 n
-0000032724 00000 n
-0000032882 00000 n
-0000033046 00000 n
-0000033204 00000 n
-0000033367 00000 n
-0000033531 00000 n
-0000033695 00000 n
-0000033859 00000 n
-0000034023 00000 n
-0000034186 00000 n
-0000034350 00000 n
-0000034508 00000 n
-0000034662 00000 n
-0000034819 00000 n
-0000034971 00000 n
-0000035125 00000 n
-0000035283 00000 n
-0000035441 00000 n
-0000035599 00000 n
-0000035763 00000 n
-0000035921 00000 n
-0000036079 00000 n
-0000036233 00000 n
-0000036391 00000 n
-0000036547 00000 n
-0000036705 00000 n
-0000036857 00000 n
-0000037011 00000 n
-0000037165 00000 n
-0000037323 00000 n
-0000037481 00000 n
-0000037645 00000 n
-0000037803 00000 n
-0000037967 00000 n
-0000038125 00000 n
-0000038289 00000 n
-0000038447 00000 n
-0000038605 00000 n
-0000038759 00000 n
-0000038913 00000 n
-0000039066 00000 n
-0000039280 00000 n
-0000031944 00000 n
-0000030263 00000 n
-0000039219 00000 n
-0000041366 00000 n
-0000041887 00000 n
-0000041234 00000 n
-0000039378 00000 n
-0000041520 00000 n
-0000770665 00000 n
-0000041701 00000 n
-0000041763 00000 n
-0000766213 00000 n
-0000041825 00000 n
-0000768437 00000 n
-0000771778 00000 n
-0000044545 00000 n
-0000044704 00000 n
-0000044866 00000 n
-0000045020 00000 n
-0000045179 00000 n
-0000045708 00000 n
-0000044381 00000 n
-0000042051 00000 n
-0000045337 00000 n
+0000002098 00000 n
+0000081114 00000 n
+0000804874 00000 n
+0000002151 00000 n
+0000002352 00000 n
+0000084196 00000 n
+0000804800 00000 n
+0000002410 00000 n
+0000002639 00000 n
+0000084257 00000 n
+0000804726 00000 n
+0000002697 00000 n
+0000002885 00000 n
+0000084318 00000 n
+0000804602 00000 n
+0000002938 00000 n
+0000003225 00000 n
+0000087841 00000 n
+0000804528 00000 n
+0000003283 00000 n
+0000003413 00000 n
+0000091639 00000 n
+0000804441 00000 n
+0000003471 00000 n
+0000003662 00000 n
+0000091700 00000 n
+0000804367 00000 n
+0000003720 00000 n
+0000003947 00000 n
+0000095264 00000 n
+0000804242 00000 n
+0000004000 00000 n
+0000004191 00000 n
+0000098510 00000 n
+0000804168 00000 n
+0000004249 00000 n
+0000004503 00000 n
+0000098571 00000 n
+0000804081 00000 n
+0000004561 00000 n
+0000004821 00000 n
+0000102207 00000 n
+0000803994 00000 n
+0000004879 00000 n
+0000005123 00000 n
+0000105755 00000 n
+0000803907 00000 n
+0000005181 00000 n
+0000005306 00000 n
+0000108778 00000 n
+0000803820 00000 n
+0000005364 00000 n
+0000005507 00000 n
+0000108839 00000 n
+0000803733 00000 n
+0000005565 00000 n
+0000005860 00000 n
+0000112565 00000 n
+0000803658 00000 n
+0000005918 00000 n
+0000006128 00000 n
+0000116248 00000 n
+0000803581 00000 n
+0000006182 00000 n
+0000006434 00000 n
+0000122204 00000 n
+0000803449 00000 n
+0000006481 00000 n
+0000006684 00000 n
+0000122266 00000 n
+0000803370 00000 n
+0000006733 00000 n
+0000006877 00000 n
+0000126155 00000 n
+0000803239 00000 n
+0000006926 00000 n
+0000007144 00000 n
+0000140991 00000 n
+0000803160 00000 n
+0000007198 00000 n
+0000007531 00000 n
+0000145064 00000 n
+0000803067 00000 n
+0000007585 00000 n
+0000007908 00000 n
+0000145126 00000 n
+0000802974 00000 n
+0000007962 00000 n
+0000008275 00000 n
+0000149067 00000 n
+0000802895 00000 n
+0000008329 00000 n
+0000008655 00000 n
+0000149129 00000 n
+0000802764 00000 n
+0000008704 00000 n
+0000008940 00000 n
+0000153019 00000 n
+0000802646 00000 n
+0000008994 00000 n
+0000009126 00000 n
+0000156587 00000 n
+0000802581 00000 n
+0000009185 00000 n
+0000009342 00000 n
+0000156648 00000 n
+0000802449 00000 n
+0000009396 00000 n
+0000009563 00000 n
+0000161873 00000 n
+0000802370 00000 n
+0000009622 00000 n
+0000009804 00000 n
+0000161996 00000 n
+0000802277 00000 n
+0000009863 00000 n
+0000010120 00000 n
+0000164623 00000 n
+0000802184 00000 n
+0000010179 00000 n
+0000010351 00000 n
+0000167323 00000 n
+0000802091 00000 n
+0000010410 00000 n
+0000010637 00000 n
+0000169598 00000 n
+0000801998 00000 n
+0000010696 00000 n
+0000010875 00000 n
+0000173384 00000 n
+0000801905 00000 n
+0000010934 00000 n
+0000011131 00000 n
+0000173446 00000 n
+0000801826 00000 n
+0000011190 00000 n
+0000011421 00000 n
+0000176302 00000 n
+0000801747 00000 n
+0000011475 00000 n
+0000011614 00000 n
+0000179142 00000 n
+0000801630 00000 n
+0000011663 00000 n
+0000011853 00000 n
+0000182501 00000 n
+0000801565 00000 n
+0000011907 00000 n
+0000012097 00000 n
+0000186879 00000 n
+0000801432 00000 n
+0000012144 00000 n
+0000012326 00000 n
+0000186941 00000 n
+0000801315 00000 n
+0000012375 00000 n
+0000012491 00000 n
+0000190762 00000 n
+0000801236 00000 n
+0000012545 00000 n
+0000012674 00000 n
+0000194611 00000 n
+0000801143 00000 n
+0000012728 00000 n
+0000012885 00000 n
+0000194920 00000 n
+0000801011 00000 n
+0000012939 00000 n
+0000013154 00000 n
+0000200687 00000 n
+0000800946 00000 n
+0000013213 00000 n
+0000013352 00000 n
+0000200749 00000 n
+0000800853 00000 n
+0000013406 00000 n
+0000013555 00000 n
+0000204122 00000 n
+0000800774 00000 n
+0000013609 00000 n
+0000013715 00000 n
+0000204432 00000 n
+0000800657 00000 n
+0000013764 00000 n
+0000013860 00000 n
+0000204556 00000 n
+0000800578 00000 n
+0000013914 00000 n
+0000014043 00000 n
+0000207902 00000 n
+0000800485 00000 n
+0000014097 00000 n
+0000014287 00000 n
+0000209866 00000 n
+0000800406 00000 n
+0000014341 00000 n
+0000014490 00000 n
+0000211765 00000 n
+0000800287 00000 n
+0000014537 00000 n
+0000014623 00000 n
+0000211827 00000 n
+0000800208 00000 n
+0000014672 00000 n
+0000014763 00000 n
+0000215065 00000 n
+0000800077 00000 n
+0000014812 00000 n
+0000014908 00000 n
+0000216283 00000 n
+0000799998 00000 n
+0000014962 00000 n
+0000015122 00000 n
+0000216345 00000 n
+0000799866 00000 n
+0000015176 00000 n
+0000015419 00000 n
+0000217804 00000 n
+0000799801 00000 n
+0000015478 00000 n
+0000015574 00000 n
+0000217865 00000 n
+0000799669 00000 n
+0000015628 00000 n
+0000015861 00000 n
+0000219348 00000 n
+0000799604 00000 n
+0000015920 00000 n
+0000016016 00000 n
+0000219410 00000 n
+0000799472 00000 n
+0000016070 00000 n
+0000016268 00000 n
+0000219472 00000 n
+0000799407 00000 n
+0000016327 00000 n
+0000016423 00000 n
+0000219534 00000 n
+0000799314 00000 n
+0000016477 00000 n
+0000016622 00000 n
+0000220895 00000 n
+0000799235 00000 n
+0000016676 00000 n
+0000016841 00000 n
+0000220957 00000 n
+0000799142 00000 n
+0000016890 00000 n
+0000017062 00000 n
+0000223961 00000 n
+0000799049 00000 n
+0000017111 00000 n
+0000017265 00000 n
+0000227758 00000 n
+0000798956 00000 n
+0000017314 00000 n
+0000017473 00000 n
+0000227820 00000 n
+0000798877 00000 n
+0000017522 00000 n
+0000017651 00000 n
+0000018153 00000 n
+0000018388 00000 n
+0000017701 00000 n
+0000018265 00000 n
+0000018326 00000 n
+0000780451 00000 n
+0000769161 00000 n
+0000768031 00000 n
+0000773672 00000 n
+0000797103 00000 n
+0000020017 00000 n
+0000019905 00000 n
+0000018499 00000 n
+0000763508 00000 n
+0000779321 00000 n
+0000766901 00000 n
+0000771417 00000 n
+0000795361 00000 n
+0000787157 00000 n
+0000792864 00000 n
+0000785401 00000 n
+0000022741 00000 n
+0000022894 00000 n
+0000023171 00000 n
+0000022601 00000 n
+0000020180 00000 n
+0000023048 00000 n
+0000023109 00000 n
+0000025171 00000 n
+0000025322 00000 n
+0000025475 00000 n
+0000025629 00000 n
+0000025781 00000 n
+0000025935 00000 n
+0000026089 00000 n
+0000026247 00000 n
+0000026411 00000 n
+0000026569 00000 n
+0000026732 00000 n
+0000026890 00000 n
+0000027054 00000 n
+0000027215 00000 n
+0000027373 00000 n
+0000027536 00000 n
+0000027700 00000 n
+0000027862 00000 n
+0000028020 00000 n
+0000028184 00000 n
+0000028348 00000 n
+0000028512 00000 n
+0000028676 00000 n
+0000028840 00000 n
+0000029004 00000 n
+0000029168 00000 n
+0000029326 00000 n
+0000029478 00000 n
+0000029631 00000 n
+0000029785 00000 n
+0000029939 00000 n
+0000030097 00000 n
+0000032638 00000 n
+0000030377 00000 n
+0000024791 00000 n
+0000023321 00000 n
+0000030254 00000 n
+0000030315 00000 n
+0000764637 00000 n
+0000032796 00000 n
+0000032950 00000 n
+0000033108 00000 n
+0000033272 00000 n
+0000033430 00000 n
+0000033593 00000 n
+0000033757 00000 n
+0000033921 00000 n
+0000034085 00000 n
+0000034249 00000 n
+0000034412 00000 n
+0000034576 00000 n
+0000034734 00000 n
+0000034888 00000 n
+0000035045 00000 n
+0000035197 00000 n
+0000035351 00000 n
+0000035509 00000 n
+0000035667 00000 n
+0000035825 00000 n
+0000035989 00000 n
+0000036147 00000 n
+0000036305 00000 n
+0000036459 00000 n
+0000036617 00000 n
+0000036773 00000 n
+0000036931 00000 n
+0000037083 00000 n
+0000037237 00000 n
+0000037391 00000 n
+0000037549 00000 n
+0000037707 00000 n
+0000037871 00000 n
+0000038029 00000 n
+0000038193 00000 n
+0000038351 00000 n
+0000038515 00000 n
+0000038673 00000 n
+0000038831 00000 n
+0000038985 00000 n
+0000039139 00000 n
+0000039292 00000 n
+0000039506 00000 n
+0000032170 00000 n
+0000030488 00000 n
+0000039445 00000 n
+0000041596 00000 n
+0000042117 00000 n
+0000041464 00000 n
+0000039604 00000 n
+0000041750 00000 n
+0000774802 00000 n
+0000041931 00000 n
+0000041993 00000 n
+0000770290 00000 n
+0000042055 00000 n
+0000772544 00000 n
+0000775931 00000 n
+0000044764 00000 n
+0000044923 00000 n
+0000045085 00000 n
+0000045239 00000 n
0000045398 00000 n
-0000045460 00000 n
-0000045522 00000 n
-0000045584 00000 n
-0000045646 00000 n
-0000783960 00000 n
-0000780254 00000 n
-0000792902 00000 n
-0000049098 00000 n
-0000049562 00000 n
-0000048966 00000 n
-0000045872 00000 n
-0000049255 00000 n
-0000792590 00000 n
-0000049377 00000 n
-0000049438 00000 n
-0000049500 00000 n
-0000789807 00000 n
-0000053511 00000 n
-0000053974 00000 n
-0000053379 00000 n
-0000049779 00000 n
-0000053665 00000 n
-0000053726 00000 n
-0000053788 00000 n
-0000053850 00000 n
-0000787337 00000 n
-0000053912 00000 n
-0000785029 00000 n
-0000056884 00000 n
-0000057038 00000 n
-0000058155 00000 n
-0000056728 00000 n
-0000054205 00000 n
-0000057848 00000 n
-0000786095 00000 n
-0000057970 00000 n
-0000058093 00000 n
-0000777352 00000 n
-0000057308 00000 n
-0000057579 00000 n
-0000061032 00000 n
-0000061184 00000 n
-0000061338 00000 n
-0000061497 00000 n
-0000061661 00000 n
-0000061820 00000 n
-0000061979 00000 n
-0000062143 00000 n
-0000062302 00000 n
-0000062587 00000 n
-0000060836 00000 n
-0000058398 00000 n
-0000062466 00000 n
-0000066171 00000 n
-0000066447 00000 n
-0000066039 00000 n
-0000062765 00000 n
-0000066325 00000 n
-0000070568 00000 n
-0000070722 00000 n
-0000070876 00000 n
-0000071030 00000 n
-0000071183 00000 n
-0000071347 00000 n
-0000071501 00000 n
-0000071655 00000 n
-0000071809 00000 n
-0000072148 00000 n
-0000070372 00000 n
-0000066625 00000 n
-0000071963 00000 n
-0000072024 00000 n
-0000761753 00000 n
-0000072086 00000 n
-0000793020 00000 n
-0000075095 00000 n
-0000075249 00000 n
-0000075596 00000 n
-0000074955 00000 n
-0000072406 00000 n
-0000075413 00000 n
-0000774009 00000 n
-0000078026 00000 n
-0000078307 00000 n
-0000077894 00000 n
-0000075786 00000 n
-0000078185 00000 n
-0000081026 00000 n
-0000080792 00000 n
-0000078484 00000 n
-0000080904 00000 n
-0000083546 00000 n
-0000083700 00000 n
-0000084098 00000 n
-0000083406 00000 n
-0000081203 00000 n
-0000083854 00000 n
-0000087039 00000 n
-0000087201 00000 n
-0000087416 00000 n
-0000086899 00000 n
-0000084301 00000 n
-0000087355 00000 n
-0000090694 00000 n
-0000090848 00000 n
-0000091012 00000 n
-0000091410 00000 n
-0000090546 00000 n
-0000087620 00000 n
-0000091166 00000 n
-0000793138 00000 n
-0000094231 00000 n
-0000097339 00000 n
-0000094507 00000 n
-0000094099 00000 n
-0000091600 00000 n
-0000094385 00000 n
-0000100873 00000 n
-0000097624 00000 n
-0000097207 00000 n
-0000094697 00000 n
-0000097503 00000 n
-0000101026 00000 n
-0000101179 00000 n
-0000101650 00000 n
-0000100725 00000 n
-0000097814 00000 n
-0000101343 00000 n
-0000101526 00000 n
-0000101588 00000 n
-0000104994 00000 n
-0000104698 00000 n
-0000101893 00000 n
-0000104810 00000 n
-0000104871 00000 n
-0000107832 00000 n
-0000107598 00000 n
-0000105184 00000 n
-0000107710 00000 n
-0000110866 00000 n
-0000111205 00000 n
-0000110734 00000 n
-0000108022 00000 n
-0000111022 00000 n
-0000782013 00000 n
-0000793256 00000 n
-0000114265 00000 n
-0000114417 00000 n
-0000114701 00000 n
-0000114125 00000 n
-0000111434 00000 n
-0000114578 00000 n
-0000118072 00000 n
-0000118226 00000 n
-0000118383 00000 n
-0000118597 00000 n
-0000117924 00000 n
-0000114878 00000 n
-0000118536 00000 n
-0000121446 00000 n
-0000121600 00000 n
-0000121905 00000 n
-0000121752 00000 n
-0000122365 00000 n
-0000121290 00000 n
-0000118761 00000 n
-0000122057 00000 n
-0000122241 00000 n
-0000122303 00000 n
-0000125423 00000 n
-0000125577 00000 n
-0000125734 00000 n
-0000126259 00000 n
-0000125275 00000 n
-0000122543 00000 n
-0000125890 00000 n
-0000125951 00000 n
-0000791643 00000 n
-0000126074 00000 n
-0000126135 00000 n
-0000126197 00000 n
-0000131145 00000 n
-0000129291 00000 n
-0000129448 00000 n
-0000129605 00000 n
-0000129820 00000 n
-0000129143 00000 n
-0000126411 00000 n
-0000129759 00000 n
-0000131207 00000 n
-0000130972 00000 n
-0000129946 00000 n
-0000131084 00000 n
-0000778465 00000 n
-0000793374 00000 n
-0000134458 00000 n
-0000134677 00000 n
-0000134326 00000 n
-0000131306 00000 n
-0000134616 00000 n
-0000137635 00000 n
-0000137462 00000 n
-0000134881 00000 n
-0000137574 00000 n
-0000143133 00000 n
-0000143291 00000 n
-0000140757 00000 n
-0000140522 00000 n
-0000137799 00000 n
-0000140634 00000 n
-0000143450 00000 n
-0000143607 00000 n
-0000143764 00000 n
-0000143923 00000 n
-0000144081 00000 n
-0000144237 00000 n
-0000147935 00000 n
-0000148091 00000 n
-0000144889 00000 n
-0000142945 00000 n
-0000140908 00000 n
-0000144396 00000 n
-0000144457 00000 n
-0000144519 00000 n
-0000144580 00000 n
-0000144642 00000 n
-0000144704 00000 n
-0000148248 00000 n
-0000148401 00000 n
-0000148555 00000 n
-0000149077 00000 n
-0000147771 00000 n
-0000145069 00000 n
-0000148707 00000 n
-0000148891 00000 n
-0000148953 00000 n
-0000149015 00000 n
-0000152355 00000 n
-0000152509 00000 n
-0000152785 00000 n
-0000152215 00000 n
-0000149203 00000 n
-0000152662 00000 n
-0000793492 00000 n
-0000156408 00000 n
-0000155988 00000 n
-0000152976 00000 n
-0000156100 00000 n
-0000156161 00000 n
-0000772893 00000 n
-0000156223 00000 n
-0000159045 00000 n
-0000158686 00000 n
-0000156561 00000 n
-0000158798 00000 n
-0000158859 00000 n
-0000158921 00000 n
-0000158983 00000 n
-0000161771 00000 n
-0000161413 00000 n
-0000159221 00000 n
-0000161525 00000 n
-0000161648 00000 n
-0000164404 00000 n
-0000164169 00000 n
-0000161962 00000 n
-0000164281 00000 n
-0000167094 00000 n
-0000166861 00000 n
-0000164594 00000 n
-0000166973 00000 n
-0000169367 00000 n
-0000169132 00000 n
-0000167270 00000 n
-0000169244 00000 n
-0000793610 00000 n
-0000172613 00000 n
-0000172952 00000 n
-0000172481 00000 n
-0000169517 00000 n
-0000172767 00000 n
-0000175808 00000 n
-0000175573 00000 n
-0000173142 00000 n
-0000175685 00000 n
-0000178202 00000 n
-0000178366 00000 n
-0000181572 00000 n
-0000178648 00000 n
-0000178062 00000 n
-0000175999 00000 n
-0000178525 00000 n
-0000181731 00000 n
-0000184003 00000 n
-0000182007 00000 n
-0000181432 00000 n
-0000178825 00000 n
-0000181884 00000 n
-0000184223 00000 n
-0000183871 00000 n
-0000182133 00000 n
-0000184162 00000 n
-0000186505 00000 n
-0000186208 00000 n
-0000184322 00000 n
-0000186320 00000 n
-0000779582 00000 n
-0000793728 00000 n
-0000189417 00000 n
-0000189581 00000 n
-0000189742 00000 n
-0000189901 00000 n
-0000193255 00000 n
-0000193414 00000 n
-0000190307 00000 n
-0000189261 00000 n
-0000186681 00000 n
-0000190060 00000 n
-0000190183 00000 n
-0000193571 00000 n
-0000194105 00000 n
-0000193107 00000 n
-0000190526 00000 n
-0000193735 00000 n
-0000193796 00000 n
-0000193858 00000 n
-0000193920 00000 n
-0000193982 00000 n
-0000196933 00000 n
-0000196698 00000 n
-0000194269 00000 n
-0000196810 00000 n
-0000200148 00000 n
-0000199541 00000 n
-0000197111 00000 n
-0000199653 00000 n
-0000199838 00000 n
-0000199900 00000 n
-0000199962 00000 n
-0000200024 00000 n
-0000202813 00000 n
-0000202971 00000 n
-0000203130 00000 n
-0000203658 00000 n
-0000202665 00000 n
-0000200260 00000 n
-0000203287 00000 n
-0000203410 00000 n
-0000203534 00000 n
-0000203596 00000 n
-0000206017 00000 n
-0000205782 00000 n
-0000203850 00000 n
-0000205894 00000 n
-0000205955 00000 n
-0000793846 00000 n
-0000207363 00000 n
-0000207128 00000 n
-0000206141 00000 n
-0000207240 00000 n
-0000209840 00000 n
-0000208986 00000 n
-0000207475 00000 n
-0000209098 00000 n
-0000209283 00000 n
-0000209345 00000 n
-0000209407 00000 n
-0000209469 00000 n
-0000209531 00000 n
-0000209593 00000 n
-0000209655 00000 n
-0000209717 00000 n
-0000209779 00000 n
-0000212666 00000 n
-0000211813 00000 n
-0000209952 00000 n
-0000211925 00000 n
-0000211986 00000 n
-0000212046 00000 n
-0000212108 00000 n
-0000212170 00000 n
-0000212232 00000 n
-0000212294 00000 n
-0000212356 00000 n
-0000212418 00000 n
-0000212480 00000 n
-0000212542 00000 n
-0000213947 00000 n
-0000213650 00000 n
-0000212818 00000 n
-0000213762 00000 n
-0000215295 00000 n
-0000214999 00000 n
-0000214059 00000 n
-0000215111 00000 n
-0000216728 00000 n
-0000216307 00000 n
-0000215420 00000 n
-0000216419 00000 n
-0000793964 00000 n
-0000218061 00000 n
-0000217764 00000 n
-0000216853 00000 n
-0000217876 00000 n
-0000219073 00000 n
-0000218900 00000 n
-0000218173 00000 n
-0000219012 00000 n
-0000219959 00000 n
-0000219786 00000 n
-0000219158 00000 n
-0000219898 00000 n
-0000221056 00000 n
-0000220821 00000 n
-0000220044 00000 n
-0000220933 00000 n
-0000222710 00000 n
-0000222475 00000 n
-0000221154 00000 n
-0000222587 00000 n
-0000225893 00000 n
-0000225289 00000 n
-0000222836 00000 n
-0000225401 00000 n
-0000225524 00000 n
-0000225585 00000 n
-0000225647 00000 n
-0000225708 00000 n
-0000225770 00000 n
-0000225831 00000 n
-0000794082 00000 n
-0000228287 00000 n
-0000227247 00000 n
-0000226044 00000 n
-0000227359 00000 n
-0000227420 00000 n
-0000227482 00000 n
-0000227544 00000 n
-0000227606 00000 n
-0000227668 00000 n
-0000227730 00000 n
-0000227792 00000 n
-0000227854 00000 n
-0000227915 00000 n
-0000227977 00000 n
-0000228039 00000 n
-0000228101 00000 n
-0000228163 00000 n
-0000228225 00000 n
-0000228372 00000 n
-0000756907 00000 n
-0000228429 00000 n
-0000228862 00000 n
-0000229225 00000 n
-0000757737 00000 n
-0000229256 00000 n
-0000229310 00000 n
-0000229673 00000 n
-0000230799 00000 n
-0000758018 00000 n
-0000231330 00000 n
-0000232047 00000 n
-0000758254 00000 n
-0000232373 00000 n
-0000232700 00000 n
-0000758534 00000 n
-0000232762 00000 n
-0000757430 00000 n
-0000232787 00000 n
-0000233483 00000 n
-0000234141 00000 n
-0000234272 00000 n
-0000234893 00000 n
-0000234942 00000 n
-0000235542 00000 n
-0000236099 00000 n
-0000236742 00000 n
-0000237448 00000 n
-0000238136 00000 n
-0000238721 00000 n
-0000238838 00000 n
-0000239603 00000 n
-0000239994 00000 n
-0000240566 00000 n
-0000241052 00000 n
-0000241470 00000 n
-0000242037 00000 n
-0000242134 00000 n
-0000249598 00000 n
-0000249820 00000 n
-0000280822 00000 n
-0000281261 00000 n
-0000310763 00000 n
-0000311190 00000 n
-0000333798 00000 n
-0000334072 00000 n
-0000338747 00000 n
-0000339214 00000 n
-0000351371 00000 n
-0000351745 00000 n
-0000355194 00000 n
-0000355431 00000 n
-0000364899 00000 n
-0000365231 00000 n
-0000402366 00000 n
-0000402982 00000 n
-0000425204 00000 n
-0000425486 00000 n
-0000451754 00000 n
-0000452054 00000 n
-0000466701 00000 n
-0000466946 00000 n
-0000484550 00000 n
-0000484804 00000 n
-0000507631 00000 n
-0000507942 00000 n
-0000536980 00000 n
-0000537356 00000 n
-0000563569 00000 n
-0000563900 00000 n
-0000583993 00000 n
-0000584326 00000 n
-0000596438 00000 n
-0000596685 00000 n
-0000614015 00000 n
-0000614278 00000 n
-0000619021 00000 n
-0000619377 00000 n
-0000621995 00000 n
-0000622248 00000 n
-0000625349 00000 n
-0000625612 00000 n
-0000652951 00000 n
-0000653303 00000 n
-0000685642 00000 n
-0000686236 00000 n
-0000703936 00000 n
-0000704177 00000 n
-0000730100 00000 n
-0000730475 00000 n
-0000754054 00000 n
-0000754459 00000 n
-0000756657 00000 n
-0000758599 00000 n
-0000759713 00000 n
-0000760827 00000 n
-0000761949 00000 n
-0000763063 00000 n
-0000764177 00000 n
-0000765291 00000 n
-0000766403 00000 n
-0000767515 00000 n
-0000768628 00000 n
-0000769741 00000 n
-0000770856 00000 n
-0000771969 00000 n
-0000773084 00000 n
-0000774199 00000 n
-0000775314 00000 n
-0000776429 00000 n
-0000777542 00000 n
-0000778655 00000 n
-0000779743 00000 n
-0000780453 00000 n
-0000781333 00000 n
-0000782211 00000 n
-0000783088 00000 n
-0000784158 00000 n
-0000785225 00000 n
-0000786292 00000 n
-0000787527 00000 n
-0000788763 00000 n
-0000789998 00000 n
-0000791233 00000 n
-0000791808 00000 n
-0000794168 00000 n
-0000794288 00000 n
-0000794408 00000 n
-0000794481 00000 n
-0000801595 00000 n
-0000801794 00000 n
-0000801980 00000 n
-0000802151 00000 n
-0000802321 00000 n
-0000802492 00000 n
-0000802662 00000 n
-0000802833 00000 n
-0000803002 00000 n
-0000803171 00000 n
-0000803342 00000 n
-0000803512 00000 n
-0000803679 00000 n
-0000803865 00000 n
-0000804092 00000 n
-0000804276 00000 n
-0000804447 00000 n
-0000804616 00000 n
-0000804785 00000 n
-0000804956 00000 n
-0000805126 00000 n
-0000805297 00000 n
-0000805467 00000 n
-0000805638 00000 n
-0000805808 00000 n
-0000805976 00000 n
-0000806168 00000 n
-0000806365 00000 n
-0000806565 00000 n
-0000806768 00000 n
-0000806988 00000 n
-0000807229 00000 n
-0000807472 00000 n
-0000807715 00000 n
-0000807958 00000 n
-0000808226 00000 n
-0000808503 00000 n
-0000808783 00000 n
-0000809066 00000 n
-0000809321 00000 n
-0000809556 00000 n
-0000809674 00000 n
-0000809789 00000 n
-0000809907 00000 n
-0000810023 00000 n
-0000810148 00000 n
-0000810287 00000 n
-0000810407 00000 n
-0000810539 00000 n
-0000810632 00000 n
-0000810722 00000 n
-0000810762 00000 n
-0000810942 00000 n
+0000045927 00000 n
+0000044600 00000 n
+0000042283 00000 n
+0000045556 00000 n
+0000045617 00000 n
+0000045679 00000 n
+0000045741 00000 n
+0000045803 00000 n
+0000045865 00000 n
+0000788226 00000 n
+0000784519 00000 n
+0000797221 00000 n
+0000049316 00000 n
+0000049780 00000 n
+0000049184 00000 n
+0000046091 00000 n
+0000049473 00000 n
+0000796909 00000 n
+0000049595 00000 n
+0000049656 00000 n
+0000049718 00000 n
+0000794113 00000 n
+0000053723 00000 n
+0000054186 00000 n
+0000053591 00000 n
+0000049997 00000 n
+0000053877 00000 n
+0000053938 00000 n
+0000054000 00000 n
+0000054062 00000 n
+0000791617 00000 n
+0000054124 00000 n
+0000789295 00000 n
+0000057097 00000 n
+0000057251 00000 n
+0000058368 00000 n
+0000056941 00000 n
+0000054417 00000 n
+0000058061 00000 n
+0000790361 00000 n
+0000058183 00000 n
+0000058306 00000 n
+0000781581 00000 n
+0000057521 00000 n
+0000057792 00000 n
+0000061245 00000 n
+0000061397 00000 n
+0000061551 00000 n
+0000061710 00000 n
+0000061874 00000 n
+0000062033 00000 n
+0000062192 00000 n
+0000062356 00000 n
+0000062515 00000 n
+0000062800 00000 n
+0000061049 00000 n
+0000058612 00000 n
+0000062679 00000 n
+0000066384 00000 n
+0000066659 00000 n
+0000066252 00000 n
+0000062978 00000 n
+0000066537 00000 n
+0000070770 00000 n
+0000070924 00000 n
+0000071078 00000 n
+0000071232 00000 n
+0000071385 00000 n
+0000071549 00000 n
+0000071703 00000 n
+0000071857 00000 n
+0000072011 00000 n
+0000072350 00000 n
+0000070574 00000 n
+0000066837 00000 n
+0000072165 00000 n
+0000072226 00000 n
+0000765767 00000 n
+0000072288 00000 n
+0000797339 00000 n
+0000075298 00000 n
+0000075451 00000 n
+0000075797 00000 n
+0000075158 00000 n
+0000072609 00000 n
+0000075614 00000 n
+0000778192 00000 n
+0000078180 00000 n
+0000078460 00000 n
+0000078048 00000 n
+0000075987 00000 n
+0000078338 00000 n
+0000081175 00000 n
+0000080941 00000 n
+0000078637 00000 n
+0000081053 00000 n
+0000083827 00000 n
+0000083981 00000 n
+0000084379 00000 n
+0000083687 00000 n
+0000081352 00000 n
+0000084135 00000 n
+0000087464 00000 n
+0000087626 00000 n
+0000091106 00000 n
+0000087902 00000 n
+0000087324 00000 n
+0000084582 00000 n
+0000087780 00000 n
+0000091260 00000 n
+0000091424 00000 n
+0000091761 00000 n
+0000090958 00000 n
+0000088119 00000 n
+0000091578 00000 n
+0000797457 00000 n
+0000094885 00000 n
+0000095039 00000 n
+0000095324 00000 n
+0000094745 00000 n
+0000091951 00000 n
+0000095203 00000 n
+0000098297 00000 n
+0000098693 00000 n
+0000098165 00000 n
+0000095514 00000 n
+0000098449 00000 n
+0000098631 00000 n
+0000101829 00000 n
+0000101982 00000 n
+0000102392 00000 n
+0000101689 00000 n
+0000098937 00000 n
+0000102146 00000 n
+0000102268 00000 n
+0000102330 00000 n
+0000105816 00000 n
+0000105582 00000 n
+0000102636 00000 n
+0000105694 00000 n
+0000108900 00000 n
+0000108605 00000 n
+0000106006 00000 n
+0000108717 00000 n
+0000786279 00000 n
+0000112195 00000 n
+0000112352 00000 n
+0000115715 00000 n
+0000112626 00000 n
+0000112055 00000 n
+0000109116 00000 n
+0000112504 00000 n
+0000797575 00000 n
+0000115876 00000 n
+0000116030 00000 n
+0000118564 00000 n
+0000116310 00000 n
+0000115567 00000 n
+0000112816 00000 n
+0000116187 00000 n
+0000118778 00000 n
+0000118432 00000 n
+0000116487 00000 n
+0000118717 00000 n
+0000121531 00000 n
+0000121685 00000 n
+0000121991 00000 n
+0000121838 00000 n
+0000122452 00000 n
+0000121375 00000 n
+0000118942 00000 n
+0000122143 00000 n
+0000122328 00000 n
+0000122390 00000 n
+0000125565 00000 n
+0000125719 00000 n
+0000125876 00000 n
+0000126339 00000 n
+0000125417 00000 n
+0000122632 00000 n
+0000126032 00000 n
+0000126093 00000 n
+0000795962 00000 n
+0000126217 00000 n
+0000126279 00000 n
+0000131347 00000 n
+0000129432 00000 n
+0000129589 00000 n
+0000129747 00000 n
+0000130024 00000 n
+0000129284 00000 n
+0000126491 00000 n
+0000129901 00000 n
+0000129962 00000 n
+0000131409 00000 n
+0000131174 00000 n
+0000130150 00000 n
+0000131286 00000 n
+0000782711 00000 n
+0000797693 00000 n
+0000134625 00000 n
+0000134844 00000 n
+0000134493 00000 n
+0000131508 00000 n
+0000134783 00000 n
+0000137930 00000 n
+0000137757 00000 n
+0000135048 00000 n
+0000137869 00000 n
+0000143431 00000 n
+0000143589 00000 n
+0000141053 00000 n
+0000140818 00000 n
+0000138094 00000 n
+0000140930 00000 n
+0000143748 00000 n
+0000143905 00000 n
+0000144062 00000 n
+0000144221 00000 n
+0000144379 00000 n
+0000144535 00000 n
+0000148234 00000 n
+0000148390 00000 n
+0000145187 00000 n
+0000143243 00000 n
+0000141204 00000 n
+0000144694 00000 n
+0000144755 00000 n
+0000144817 00000 n
+0000144878 00000 n
+0000144940 00000 n
+0000145002 00000 n
+0000148547 00000 n
+0000148700 00000 n
+0000148854 00000 n
+0000149376 00000 n
+0000148070 00000 n
+0000145367 00000 n
+0000149006 00000 n
+0000149190 00000 n
+0000149252 00000 n
+0000149314 00000 n
+0000152651 00000 n
+0000152805 00000 n
+0000153081 00000 n
+0000152511 00000 n
+0000149502 00000 n
+0000152958 00000 n
+0000797811 00000 n
+0000156710 00000 n
+0000156290 00000 n
+0000153272 00000 n
+0000156402 00000 n
+0000156463 00000 n
+0000777061 00000 n
+0000156525 00000 n
+0000159340 00000 n
+0000158981 00000 n
+0000156863 00000 n
+0000159093 00000 n
+0000159154 00000 n
+0000159216 00000 n
+0000159278 00000 n
+0000162058 00000 n
+0000161700 00000 n
+0000159516 00000 n
+0000161812 00000 n
+0000161935 00000 n
+0000164685 00000 n
+0000164450 00000 n
+0000162249 00000 n
+0000164562 00000 n
+0000167385 00000 n
+0000167150 00000 n
+0000164875 00000 n
+0000167262 00000 n
+0000169660 00000 n
+0000169425 00000 n
+0000167561 00000 n
+0000169537 00000 n
+0000797929 00000 n
+0000173010 00000 n
+0000173169 00000 n
+0000173508 00000 n
+0000172870 00000 n
+0000169810 00000 n
+0000173323 00000 n
+0000176364 00000 n
+0000176129 00000 n
+0000173698 00000 n
+0000176241 00000 n
+0000178758 00000 n
+0000178922 00000 n
+0000182128 00000 n
+0000179204 00000 n
+0000178618 00000 n
+0000176555 00000 n
+0000179081 00000 n
+0000182287 00000 n
+0000184560 00000 n
+0000182563 00000 n
+0000181988 00000 n
+0000179381 00000 n
+0000182440 00000 n
+0000184780 00000 n
+0000184428 00000 n
+0000182689 00000 n
+0000184719 00000 n
+0000187003 00000 n
+0000186706 00000 n
+0000184879 00000 n
+0000186818 00000 n
+0000783845 00000 n
+0000798047 00000 n
+0000190220 00000 n
+0000190379 00000 n
+0000190542 00000 n
+0000193911 00000 n
+0000190886 00000 n
+0000190072 00000 n
+0000187179 00000 n
+0000190701 00000 n
+0000190824 00000 n
+0000194070 00000 n
+0000194229 00000 n
+0000194386 00000 n
+0000194982 00000 n
+0000193755 00000 n
+0000191105 00000 n
+0000194550 00000 n
+0000194672 00000 n
+0000194734 00000 n
+0000194796 00000 n
+0000194858 00000 n
+0000197658 00000 n
+0000197485 00000 n
+0000195146 00000 n
+0000197597 00000 n
+0000200811 00000 n
+0000200514 00000 n
+0000197835 00000 n
+0000200626 00000 n
+0000203903 00000 n
+0000207366 00000 n
+0000204618 00000 n
+0000203771 00000 n
+0000200988 00000 n
+0000204061 00000 n
+0000204184 00000 n
+0000204246 00000 n
+0000204308 00000 n
+0000204370 00000 n
+0000204494 00000 n
+0000207525 00000 n
+0000207684 00000 n
+0000208150 00000 n
+0000207218 00000 n
+0000204810 00000 n
+0000207841 00000 n
+0000207964 00000 n
+0000208026 00000 n
+0000208088 00000 n
+0000798165 00000 n
+0000209928 00000 n
+0000209693 00000 n
+0000208301 00000 n
+0000209805 00000 n
+0000212446 00000 n
+0000211592 00000 n
+0000210079 00000 n
+0000211704 00000 n
+0000211889 00000 n
+0000211951 00000 n
+0000212013 00000 n
+0000212075 00000 n
+0000212137 00000 n
+0000212199 00000 n
+0000212261 00000 n
+0000212323 00000 n
+0000212385 00000 n
+0000215127 00000 n
+0000214272 00000 n
+0000212558 00000 n
+0000214384 00000 n
+0000214445 00000 n
+0000214507 00000 n
+0000214569 00000 n
+0000214631 00000 n
+0000214693 00000 n
+0000214755 00000 n
+0000214817 00000 n
+0000214879 00000 n
+0000214941 00000 n
+0000215003 00000 n
+0000216407 00000 n
+0000216110 00000 n
+0000215279 00000 n
+0000216222 00000 n
+0000217927 00000 n
+0000217631 00000 n
+0000216519 00000 n
+0000217743 00000 n
+0000219595 00000 n
+0000219175 00000 n
+0000218052 00000 n
+0000219287 00000 n
+0000798283 00000 n
+0000221019 00000 n
+0000220722 00000 n
+0000219720 00000 n
+0000220834 00000 n
+0000222038 00000 n
+0000221865 00000 n
+0000221131 00000 n
+0000221977 00000 n
+0000222913 00000 n
+0000222740 00000 n
+0000222123 00000 n
+0000222852 00000 n
+0000224022 00000 n
+0000223788 00000 n
+0000222998 00000 n
+0000223900 00000 n
+0000225057 00000 n
+0000224884 00000 n
+0000224120 00000 n
+0000224996 00000 n
+0000228068 00000 n
+0000227585 00000 n
+0000225142 00000 n
+0000227697 00000 n
+0000227882 00000 n
+0000227944 00000 n
+0000228006 00000 n
+0000798401 00000 n
+0000231422 00000 n
+0000230072 00000 n
+0000228194 00000 n
+0000230184 00000 n
+0000230245 00000 n
+0000230307 00000 n
+0000230369 00000 n
+0000230431 00000 n
+0000230493 00000 n
+0000230555 00000 n
+0000230617 00000 n
+0000230679 00000 n
+0000230741 00000 n
+0000230803 00000 n
+0000230865 00000 n
+0000230927 00000 n
+0000230989 00000 n
+0000231051 00000 n
+0000231112 00000 n
+0000231174 00000 n
+0000231236 00000 n
+0000231298 00000 n
+0000231360 00000 n
+0000231546 00000 n
+0000760876 00000 n
+0000231603 00000 n
+0000232036 00000 n
+0000232399 00000 n
+0000761706 00000 n
+0000232430 00000 n
+0000232484 00000 n
+0000232847 00000 n
+0000233973 00000 n
+0000761987 00000 n
+0000234504 00000 n
+0000235221 00000 n
+0000762223 00000 n
+0000235547 00000 n
+0000235874 00000 n
+0000762503 00000 n
+0000235936 00000 n
+0000761399 00000 n
+0000235961 00000 n
+0000236657 00000 n
+0000237315 00000 n
+0000237446 00000 n
+0000238067 00000 n
+0000238116 00000 n
+0000238716 00000 n
+0000239273 00000 n
+0000239916 00000 n
+0000240622 00000 n
+0000241310 00000 n
+0000241895 00000 n
+0000242012 00000 n
+0000242777 00000 n
+0000243168 00000 n
+0000243740 00000 n
+0000244226 00000 n
+0000244644 00000 n
+0000245211 00000 n
+0000245308 00000 n
+0000252772 00000 n
+0000252994 00000 n
+0000284292 00000 n
+0000284752 00000 n
+0000314254 00000 n
+0000314681 00000 n
+0000337289 00000 n
+0000337563 00000 n
+0000342238 00000 n
+0000342705 00000 n
+0000354862 00000 n
+0000355236 00000 n
+0000358685 00000 n
+0000358922 00000 n
+0000368390 00000 n
+0000368722 00000 n
+0000405794 00000 n
+0000406399 00000 n
+0000429149 00000 n
+0000429440 00000 n
+0000455530 00000 n
+0000455829 00000 n
+0000470476 00000 n
+0000470721 00000 n
+0000488325 00000 n
+0000488579 00000 n
+0000511575 00000 n
+0000511911 00000 n
+0000540949 00000 n
+0000541325 00000 n
+0000567538 00000 n
+0000567869 00000 n
+0000587962 00000 n
+0000588295 00000 n
+0000600407 00000 n
+0000600654 00000 n
+0000617984 00000 n
+0000618247 00000 n
+0000622990 00000 n
+0000623346 00000 n
+0000625964 00000 n
+0000626217 00000 n
+0000629318 00000 n
+0000629581 00000 n
+0000656920 00000 n
+0000657272 00000 n
+0000689611 00000 n
+0000690205 00000 n
+0000707905 00000 n
+0000708146 00000 n
+0000734069 00000 n
+0000734444 00000 n
+0000758023 00000 n
+0000758428 00000 n
+0000760626 00000 n
+0000762568 00000 n
+0000763697 00000 n
+0000764826 00000 n
+0000765963 00000 n
+0000767093 00000 n
+0000768223 00000 n
+0000769353 00000 n
+0000770480 00000 n
+0000771607 00000 n
+0000772735 00000 n
+0000773863 00000 n
+0000774993 00000 n
+0000776122 00000 n
+0000777252 00000 n
+0000778382 00000 n
+0000779512 00000 n
+0000780642 00000 n
+0000781772 00000 n
+0000782902 00000 n
+0000784007 00000 n
+0000784719 00000 n
+0000785599 00000 n
+0000786477 00000 n
+0000787354 00000 n
+0000788424 00000 n
+0000789491 00000 n
+0000790558 00000 n
+0000791807 00000 n
+0000793056 00000 n
+0000794304 00000 n
+0000795552 00000 n
+0000796127 00000 n
+0000798487 00000 n
+0000798607 00000 n
+0000798727 00000 n
+0000798800 00000 n
+0000805914 00000 n
+0000806113 00000 n
+0000806299 00000 n
+0000806470 00000 n
+0000806640 00000 n
+0000806811 00000 n
+0000806981 00000 n
+0000807152 00000 n
+0000807321 00000 n
+0000807490 00000 n
+0000807661 00000 n
+0000807831 00000 n
+0000808000 00000 n
+0000808176 00000 n
+0000808388 00000 n
+0000808586 00000 n
+0000808757 00000 n
+0000808927 00000 n
+0000809098 00000 n
+0000809268 00000 n
+0000809439 00000 n
+0000809608 00000 n
+0000809777 00000 n
+0000809948 00000 n
+0000810118 00000 n
+0000810289 00000 n
+0000810471 00000 n
+0000810670 00000 n
+0000810866 00000 n
+0000811069 00000 n
+0000811281 00000 n
+0000811520 00000 n
+0000811763 00000 n
+0000812006 00000 n
+0000812249 00000 n
+0000812509 00000 n
+0000812786 00000 n
+0000813064 00000 n
+0000813347 00000 n
+0000813616 00000 n
+0000813849 00000 n
+0000813980 00000 n
+0000814098 00000 n
+0000814213 00000 n
+0000814328 00000 n
+0000814444 00000 n
+0000814569 00000 n
+0000814708 00000 n
+0000814837 00000 n
+0000814969 00000 n
+0000815062 00000 n
+0000815152 00000 n
+0000815192 00000 n
+0000815372 00000 n
trailer
-<< /Size 1069
-/Root 1067 0 R
-/Info 1068 0 R
-/ID [<5F6D0ABB53746A33B18A069CC02A0C96> <5F6D0ABB53746A33B18A069CC02A0C96>] >>
+<< /Size 1074
+/Root 1072 0 R
+/Info 1073 0 R
+/ID [<1AB06799C3CC9390EC9EC6ABAEC940BC> <1AB06799C3CC9390EC9EC6ABAEC940BC>] >>
startxref
-811920
+816350
%%EOF
diff --git a/macros/latex/contrib/diffcoeff/diffcoeff.sty b/macros/latex/contrib/diffcoeff/diffcoeff.sty
index 7f54ac0362..ba02a301bf 100644
--- a/macros/latex/contrib/diffcoeff/diffcoeff.sty
+++ b/macros/latex/contrib/diffcoeff/diffcoeff.sty
@@ -8,10 +8,10 @@
% Andrew Parsloe ajparsloe@gmail.com
%
\DeclareRelease{v4}{}{diffcoeff4.sty}
-\DeclareCurrentRelease{}{2023/04/12}
+\DeclareCurrentRelease{}{2023/11/14}
\RequirePackage{xtemplate,mleftright}
-\ProvidesExplPackage {diffcoeff} {2023/04/12} {5.3}
+\ProvidesExplPackage {diffcoeff} {2023/11/14} {5.4}
{Write differential coefficients easily and consistently.}
\keys_define:nn { diffcoeff }
{
@@ -35,6 +35,9 @@
}
\bool_if:NT \l__diffcoeff_mLR_bool
{ \mleftright }
+\cs_if_exist:NTF \seq_map_pairwise_function:NNN
+ { \cs_set_eq:NN \__diffcoeff_braid:NNN \seq_map_pairwise_function:NNN }
+ { \cs_set_eq:NN \__diffcoeff_braid:NNN \seq_mapthread_function:NNN }
%%%%%%%%%% messages %%%%%%%%%
\cs_new:Npn \__diffcoeff_msg_autocalc:n #1
{
@@ -109,7 +112,7 @@
style-group : choice { f, s, c, j, l } = f,
style : choice { frac, tfrac, dfrac,
/, auto, big, Big, bigg, Bigg,
- _, dl
+ _, dl,d^
} = frac ,
slash-tok : tokenlist = / ,
slash-sep : tokenlist = 0 mu,
@@ -160,6 +163,7 @@
bigg = \__diffcoeff_style:nn { 5 } { bigg },
Bigg = \__diffcoeff_style:nn { 5 } { Bigg },
_ = \__diffcoeff_style:nn { 6 } {},
+ d^ = \__diffcoeff_style:nn { 6 } {},
dl = \__diffcoeff_style:nn { 7 } {},
unknown = \__diffcoeff_style:nn { 9 } {}
},
@@ -228,7 +232,7 @@
{
\msg_error:nnxx { diffcoeff } { unknown-style }
{ \l__diffcoeff_instance_tl }
- { \__diffcoeff_style_group:n { \l__diffcoeff_group_int } }
+ { \__diffcoeff_style_group_base:n { \l__diffcoeff_group_int } }
}
}
}
@@ -239,14 +243,14 @@
{
( \int_compare_p:nNn { \int_div_truncate:nn {#2} {3} } = { #1 }
&& \int_compare_p:nNn { #1 } < { 3 } ) % f,s,c
- || ( \int_compare_p:nNn { \int_div_truncate:nn {#2} {2} } < { #1 }
- && \int_compare_p:nNn { #1 } = { 3 } ) % j
- || \int_compare_p:nNn { #1 + #2 } = { 11 } % l
+ || ( \int_compare_p:nNn { \int_div_truncate:nn {#2} {2} } < { #1 }
+ && \int_compare_p:nNn { #1 } = { 3 } ) % j
+ || \int_compare_p:nNn { #1 + #2 } > { 9 } % l
}
{
\msg_warning:nnxx { diffcoeff } { wrong-style }
{ \l__diffcoeff_instance_tl }
- { \__diffcoeff_style_group:n { #1 } }
+ { \__diffcoeff_style_group_base:n { #1 } }
\int_compare:nNnTF { #1 } = { 3 }
{ \__diffcoeff_style:nn { 0 } {} }
{
@@ -261,7 +265,7 @@
\int_compare:nNnF { #1 } = { 1 }
{ \bool_set_false:N \l__diffcoeff_innerwrap_bool }
}
-\cs_new:Npn \__diffcoeff_style_group:n #1
+\cs_new:Npn \__diffcoeff_style_group_base:n #1
{ \clist_item:nn { frac, /, _, frac, dl } { #1 + 1 } }
%%%%%%%%% append? (& wrap slash diff operator?)
\cs_new_protected:Npn \__diffcoeff_append:n #1
@@ -580,7 +584,7 @@
}
\tl_set:Nx \l_tmpa_tl
{
- \seq_mapthread_function:NNN \l_tmpa_seq \l_tmpb_seq
+ \__diffcoeff_braid:NNN \l_tmpa_seq \l_tmpb_seq
\__diffcoeff_tot_order:nn
}
\exp_args:NV \tl_if_head_eq_charcode:nNTF \l_tmpa_tl +
@@ -621,8 +625,11 @@
\cs_new_protected:Npn \__diffcoeff_build:nn #1#2
{
\seq_pop_right:NN \l__diffcoeff_vars_seq \l__diffcoeff_var_tl
- \tl_put_left:Nx \l__diffcoeff_derivand_tl
- { \__diffcoeff_spaced:n { \l__diffcoeff_spaced_int } }
+ \int_compare:nNnF { \l__diffcoeff_group_int } = { 4 }
+ {
+ \tl_put_left:Nx \l__diffcoeff_derivand_tl
+ { \__diffcoeff_spaced:n { \l__diffcoeff_spaced_int } }
+ }
\__diffcoeff_wrap_and_form:nn { #2 }
{
\__diffcoeff_form_deriv:xNN
@@ -632,8 +639,9 @@
\l__diffcoeff_derivand_tl
}
}
+ % extra braces for \[ \alert{\dl x} \] in beamer
\cs_new:Npn \__diffcoeff_wrap_and_form:nn #1#2
- { % extra braces for \[ \alert{\dl x} \] in beamer
+ {
\tl_if_novalue:nTF {#1}
{{ #2 }}
{{
@@ -697,7 +705,7 @@
%%%%%%%%%% denominator %%%%%%%%%
\cs_new:Npn \__diffcoeff_build_denom:
{
- \seq_mapthread_function:NNN \l__diffcoeff_ords_seq
+ \__diffcoeff_braid:NNN \l__diffcoeff_ords_seq
\l__diffcoeff_vars_seq \__diffcoeff_build_denom_items:nn
\__diffcoeff_build_denom_item:VV \l__diffcoeff_ord_tl \l__diffcoeff_var_tl
\str_if_eq:VnF \l__diffcoeff_ord_tl { 1 }
@@ -722,14 +730,23 @@
% #1 vphantom orders #2 order #3 var
\cs_new:Npn \__diffcoeff_build_denom_difc:nnn #1#2#3
{
- \exp_not:o \l__diffcoeff_opii_tl \c_math_subscript_token
- { \mskip \l__diffcoeff_opsubnudge_tl {}#3 } ^
- {
- \mskip \l__diffcoeff_opordsep_tl \exp_not:o { \vphantom{#1} }
- \str_if_eq:nnF { #2 } { 1 }
- { \exp_not:o {#2} \mskip \l__diffcoeff_sep_adj_tl }
- }
- }
+ \exp_not:o \l__diffcoeff_opii_tl
+ \int_compare:nNnTF { \l__diffcoeff_group_int } = { 4 }
+ {
+ \str_if_eq:nnF { #2 } { 1 }
+ { ^{ \mskip \l__diffcoeff_opordsep_tl \exp_not:o {#2} } }
+ #3
+ }
+ {
+ \c_math_subscript_token { \mskip \l__diffcoeff_opsubnudge_tl {}#3 }
+ ^
+ {
+ \mskip \l__diffcoeff_opordsep_tl \exp_not:o { \vphantom{#1} }
+ \str_if_eq:nnF { #2 } { 1 }
+ { \exp_not:o {#2} \mskip \l__diffcoeff_sep_adj_tl }
+ }
+ }
+ }
\cs_generate_variant:Nn \__diffcoeff_build_denom_difc:nnn { o }
% #1 order #2 var
\cs_new:Npn \__diffcoeff_build_denom_dif:nn #1#2
@@ -760,7 +777,7 @@
%%%%%%%%%%
% #1 op+order; #2 denom; #3 diff'iand
\cs_new:Npn \__diffcoeff_form_deriv:nNN #1#2#3
- {
+ {
\bool_if:NTF \l__diffcoeff_append_bool
{ \l__diffcoeff_frac_tl { #1 } { #2 } #3 }
{ \l__diffcoeff_frac_tl { #1 #3 } { #2 } }
@@ -838,7 +855,7 @@
\DeclareChildTemplate { diffcoeff } { DIF } { DIFC }
{ style-group = c }
{
- style = _ ,
+ style = _ ,
derivand-sep = 1 mu plus 1 mu minus 1 mu ,
multi-term-sep = 1 mu ,
term-sep-adjust = 0 mu ,
@@ -948,6 +965,7 @@
{ {\l__diffcoeff_lvw_ldelim_tl #3\l__diffcoeff_lvw_rdelim_tl } } {}
\group_end:
}
+\NewDocumentCommand \difj {} { \jacob }
% differential; #1 variant ; #2 ord(s); #3 vars; #4 exponent
\NewDocumentCommand \dl { >{ \TrimSpaces } D..{} O{1} m e{^} }
{
@@ -963,4 +981,5 @@
{\c_false_bool} {#2} {} {#3} {}
\group_end:
}
+\NewDocumentCommand \difl {} { \dl }
% end of file diffcoeff.sty \ No newline at end of file
diff --git a/macros/latex/contrib/diffcoeff/diffcoeff.tex b/macros/latex/contrib/diffcoeff/diffcoeff.tex
index 1879b02eef..3735762ed0 100644
--- a/macros/latex/contrib/diffcoeff/diffcoeff.tex
+++ b/macros/latex/contrib/diffcoeff/diffcoeff.tex
@@ -1,4 +1,4 @@
-%% LyX 2.4.0-beta2 created this file. For more info, see https://www.lyx.org/.
+%% LyX 2.4.0~beta5 created this file. For more info, see https://www.lyx.org/.
%% Do not edit unless you really know what you are doing.
\documentclass[english]{report}
\usepackage{lmodern}
@@ -38,7 +38,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Textclass specific LaTeX commands.
\newenvironment{centred}%
- {\begin{center}\baselineskip=13pt\parskip=1pt }{\end{center}}
+ {\begin{center}}{\end{center}}
\newenvironment{example}%
{\begin{center}\ttfamily}{\end{center}}
@@ -86,6 +86,10 @@
lvwrap-Ldelim = \onemu\mleft [,
lvwrap-Rdelim = \mright ]
}
+% differential d^n x
+\difdef { l } { dn }{ style = d^ }
+\NewDocumentCommand \dn { m m }
+ { \dl.dn.[#1]{#2} }
% mimicking the \Braket command
% of the braket package
\difdef{ s }{ bk }
@@ -113,7 +117,7 @@
\title{\texttt{diffcoeff}~\\
a \LaTeX{} package to ease\texttt{ }the~\\
writing of differential coefficients \\
- Version 5.3}
+ Version 5.4}
\author{Andrew Parsloe\\
{\small (ajparsloe@gmail.com)}}
\maketitle
@@ -655,18 +659,18 @@ and in compact form,
For partial differentiation in more than one variable -- so-called
\emph{mixed} partial derivatives -- see \ref{subsec:Mixed-partial-derivatives}.
-\subsubsection{Alternative method}
+\subsubsection{Alternative method (colon notation)}
From version 5.3 of \texttt{diffcoeff} it is also possible to specify
-the order by the method shown in the example
+the order by the method shown here:
\begin{centred}
\verb`\[ \diffp y{x:2}, \quad \diffp y{x:n+1}. \]` $\Longrightarrow$
\[ \diffp y{x:2}, \quad \diffp y{x:n+1}. \]
\end{centred}
A colon separates the variable from its order of differentiation.
-This is really intended not for one variable, as here, but for mixed
-partial derivatives when there are a number of variables subject to
-different orders of differentiation.
+This is more relevant when there is more than one variable subject
+to different orders of differentiation -- so-called mixed partial
+derivatives.
\subsection{Appending the differentiand}
@@ -802,8 +806,8 @@ and the trailing argument is used to indicate the variables held constant:
It is easy to add a superscript to a derivative to indicate evaluation
at two points and the difference between the values:
\begin{centred}
-\verb`\[ \diff {\sin x}x[0]^{\!\!\pi/2} \]` ${\displaystyle \Longrightarrow}$
-\[ \diff{\sin x}x[0]^{\!\!\pi/2} \]
+\verb`\[ \diff {\sin x}x[0]^{\mkern-10mu\pi/2} \]` ${\displaystyle \Longrightarrow}$
+\[ \diff{\sin x}x[0]^{\mkern-9mu\pi/2} \]
\end{centred}
but to my eye either square brackets or a vertical rule are clearer
for this purpose (and do not involve nudging the subscript or superscript
@@ -910,14 +914,14 @@ are involved for different variables.
To differentiate variables to higher order, their orders need to be
specified explicitly. To do so use a comma list for the optional argument
-(or, since version 5.3, use the alternative method of \ref{subsec:Alternative-method}):
+or, since version 5.3, use the alternative method of \ref{subsec:Alternative-method}:
\begin{centred}
-\verb`$ \difcp[2,3]F{x,y,z} $` $\Longrightarrow$ $ \difcp[2,3] F{x,y,z}$,
+\verb`\[ \diffp[2,3]F{x,y,z}, \]` $\Longrightarrow$ \[ \diffp[2,3]F{x,y,z}, \]
-\verb`\[ \diffp[2,3]F{x,y,z} \]` $\Longrightarrow$ \[ \diffp[2,3]F{x,y,z}. \]
+\verb`$ \difcp F{x:2,y:3,z} $` $\Longrightarrow$ $ \difcp F{x:2,y:3,z}$.
\end{centred}
\noindent Notice that the overall order of the derivative -- 6 --
-in the second of these is again automatically calculated and inserted
+in the first of these is again automatically calculated and inserted
as a superscript on the $\partial$ symbol in the numerator.
In the example, the comma list of orders has only \emph{two} members,
@@ -930,11 +934,10 @@ in the example; the order of differentiation of $z$ is 1 by default.
But you \emph{cannot} use an order specification like \verb`[,,2]`;
instead write {\ttfamily\verb`[1,1,2]`} (which is the natural
thing to do in any case).\textbf{ }It is only the \emph{tail} of an
-order specification which can be omitted.
-
-In the other direction, if there are more orders of differentiation
-specified than there are variables, the list of orders is truncated
-to match the number of variables.
+order specification which can be omitted. In the other direction,
+if there are more orders of differentiation specified than there are
+variables, the list of orders is truncated to match the number of
+variables.
\subsubsection{Algebraic orders of differentiation}
@@ -950,7 +953,7 @@ Or again,
\[ \diffp[1,km+1,m+k-1]{F(x,y,z)}{x,y,z}. \]
\end{centred}
-\subsubsection{Alternative method}
+\subsubsection{Alternative method (colon notation)}
\label{subsec:Alternative-method}When there are two or more variables
of differentiation, particularly when subject to different orders
@@ -993,13 +996,9 @@ you can still express the total order in this form by using the override
option, entering the factorized form between angle brackets before
the differentiand:
\begin{verbatim}
- \[
- \diffp<(k+1)(m+1)>{F(x,y,z)}{x,y:km+1,z:m+k-1}
- \]
+ \[ \diffp<(k+1)(m+1)>{F(x,y,z)}{x,y:km+1,z:m+k-1}. \]
\end{verbatim}
-$\Longrightarrow$ \[
- \diffp<(k+1)(m+1)>{F(x,y,z)}{x,y:km+1,z:m+k-1}.
- \]
+$\Longrightarrow$ \[ \diffp<(k+1)(m+1)>{F(x,y,z)}{x,y:km+1,z:m+k-1}. \]
When the override option is used, the algorithm that calculates the
total order is sidestepped. It does not get called at all. In this
@@ -1173,7 +1172,7 @@ a superscript, an adjustment is made to the extra spacing. By default
\[
\diffp[2]F{x,y,z},
\]
-\verb`2 mu` of spacing is inserted between the $\partial y$ and
+Spacing of \verb`2 mu` is inserted between the $\partial y$ and
$\partial z$, but because the superscript already provides some separation
between them, only \verb`1 mu` is inserted between $\partial x^{2}$
and $\partial y$. The values used for the spacing and its adjustment
@@ -1222,7 +1221,7 @@ no. They should include the $d$: $(d\sin x)^{2}$ -- it is the differential
$d\sin x$ that is of the second order. But as the examples in the
Rogues' Gallery show -- see particularly (\ref{eq:eg3}) -- the
inclination seems to be to do otherwise. This may be because one wants
-in any case to parenthesise the variable to show that the `d' symbol
+in any case to parenthesize the variable to show that the `d' symbol
attaches to the whole variable and not just its \emph{first} character.
A second, outer pair of parentheses then seems too fussy and detracts
from comprehending the symbol `at a glance':
@@ -1235,8 +1234,8 @@ In any case, the manner of this wrapping in parentheses -- if any
-- of long variables for \emph{higher order} derivatives is customisable
(\ref{sec:ChangingDefaults}).
-For first order derivatives parenthesising does not occur automatically.
-If you want the variable of differentiation to be parenthesised, you
+For first order derivatives parenthesizing does not occur automatically.
+If you want the variable of differentiation to be parenthesized, you
need to do it yourself:
\begin{centred}
\verb`\[\diff {f(x)}{x/k}, \quad \diff {f(x)}{(x/k)}.\]` $\Longrightarrow$
@@ -1250,7 +1249,7 @@ say:
\begin{centred}
\verb`\[ \diffp[2]q{\frac 1\Theta} \]` $\Longrightarrow$ \[ \diffp[2]q{\frac 1\Theta}.\]
\end{centred}
-\noindent As noted, when differentiating to first order, parenthesising
+\noindent As noted, when differentiating to first order, parenthesizing
is up to the user:
\begin{centred}
\verb`\[ \diffp q{(\frac 1\Theta),V} \]` $\Longrightarrow$ \[ \diffp q{(\frac 1\Theta),V}. \]
@@ -1263,8 +1262,8 @@ on the facilities offered by the \verb`xtemplate` package (included
in the \LaTeX 3 bundle {\ttfamily\verb`l3packages`}). The
stuff of \verb`xtemplate` is \emph{templates}, their definition,
their manipulation. For \verb`diffcoeff` a template is a list of
-parameter values determining how a derivative looks in the pdf. The
-parameters may be broad-brush settings like whether the derivative
+parameter values determining what a derivative looks like in the pdf.
+The parameters may be broad-brush settings like whether the derivative
is built from \verb`\frac` or the slash \verb`/` or in compact form,
or whether the operator symbol is \verb`d` or \verb`\partial` (or
\verb`\nabla` or \verb`\delta` or \ldots ), or the parameters may
@@ -1324,7 +1323,7 @@ to each. In all \verb`diffcoeff` uses nine templates, the arrows
in Table~\ref{tab:DIF-defaults} indicating lines of inheritance
of default values. Only the child and grandchild templates of \verb`DIF`
are used for actual construction of derivatives (and jacobians and
-differentials). \verb`DIF` itself sits `above the fray'.
+differentials). \verb`DIF` itself `sits above the fray'.
\begin{table}
\centering{}\caption{\protect\label{tab:Template-inheritance}Template inheritance}
@@ -1356,7 +1355,7 @@ environments
\noindent\begin{minipage}[t]{1\columnwidth}%
\begin{shaded}%
\noindent Users of version 4 of \texttt{diffcoeff} will notice similarities
-with and differences from the earlier version. Some key names remain
+with and differences from that earlier version. Some key names remain
(\verb`op-symbol`), some names have changed (\verb`multi-term-sep`
for \verb`denom-term-sep`), keys beginning with an asterisk, \verb`*`,
lack a following hyphen (\verb`*derivand-sep` rather than \verb`*-derivand-sep`),
@@ -1409,7 +1408,7 @@ j}\tabularnewline
{\small derivand-sep} & {\small\texttt{3 mu plus 1 mu minus 2 mu}} & {\small f, fp, s, sp, c, cp}\tabularnewline
{\small op-symbol} & {\small\texttt{\textbackslash mathrm\{d\}}} & {\small f, fp, s, sp, c, cp, j, l}\tabularnewline
{\small op-symbol-alt} & {\small\texttt{op-symbol}} & {\small f, fp, s, sp, \phantom{{\small c, cp,}} j}\tabularnewline
-{\small op-order-nudge} & {\small\texttt{0 mu}} & {\small f, fp, s, sp, c, cp}\tabularnewline
+{\small op-order-nudge} & {\small\texttt{0 mu}} & {\small f, fp, s, sp, c, cp, \phantom{j,} l }\tabularnewline
{\small var-sup-nudge} & {\small\texttt{1 mu}} & {\small f, fp, s, sp, \phantom{{\small c, cp,} j,} l}\tabularnewline
{\small multi-term-sep} & {\small\texttt{2 mu plus 1 mu minus 1 mu}} & {\small f, fp, s, sp, c, cp, \phantom{j,} l}\tabularnewline
{\small term-sep-adjust} & {\small\texttt{-1 mu}} & {\small f, fp, s, sp, c, cp, \phantom{j,} l}\tabularnewline
@@ -1461,12 +1460,13 @@ fraction with \verb`\big/`, \verb`\Big/`, \verb`\bigg/` and \verb`\Bigg/`
respectively, not scalable
\item default in templates \verb`DIFS`, \verb`DIFSP` = \verb`/`
\end{itemize}
-\item for compact-form derivatives, \verb`\difc`, \verb`\difcp`, a choice
-of \texttt{\_} or \verb`dl`
+\item for compact-form derivatives, \verb`\difc`, \verb`\difcp`, and
+differentials, a choice of \verb`_` or \verb`dl` or \verb`d^`
\begin{itemize}
-\item \_ forms derivatives of compact form like $\difc yx$, $\difcp[1,2]{z}{x,y}$
+\item \verb`_` forms derivatives of compact form like $\difc yx$, $\difcp[1,2]{z}{x,y}$
+\item \verb`d^` is a synonym for \verb`_`
\item \verb`dl` forms differentials like $\difc.dl.{}x$ and $\difcp.dl.[2]{}{x,y,z}$
-\item default in templates \verb`DIFC`, \verb`DIFCP` = \texttt{\_}
+\item default in templates \verb`DIFC`, \verb`DIFCP` = \verb`_`
\end{itemize}
\item overall default in template \verb`DIF` = \verb`frac`
\end{itemize}
@@ -1763,11 +1763,12 @@ The command \verb`\difdef` in version 5 of \verb`diffcoeff` takes
\emph{three} mandatory arguments for defining variant forms of derivative.
Do not confuse with the command \verb`\diffdef` of earlier versions
of \verb`diffcoeff` which took \emph{two }mandatory arguments for
-this purpose. The third argument is required to identify which one
-or more of the fraction forms \verb`f`, \verb`s`, \verb`c`, \verb`fp`,
-\verb`sp`, \verb`cp` of the commands \verb`\difx`, \verb`\difxp`,
-the variant applies to. In earlier versions this was not necessary
-since there was only the one primary derivative command \verb`\diff`.\end{shaded}%
+this purpose. The additional argument is required to identify which
+one or more of the fraction forms \verb`f`, \verb`s`, \verb`c`,
+\verb`fp`, \verb`sp`, \verb`cp` of the commands \verb`\difx`,
+\verb`\difxp`, the variant applies to. In earlier versions this was
+not necessary since there was only the one primary derivative command
+\verb`\diff`.\end{shaded}%
\end{minipage}
\medskip{}
@@ -1840,11 +1841,11 @@ will apply there.\end{shaded}%
In earlier versions of \verb`diffcoeff`, if there was no explicit
\verb`def-file=<filename>` package option statement, then a file
-\verb`diffcoeff.def` was searched for and if found loaded. This is
-no longer the case. Version 5 of \verb`diffcoeff` searches for a
-\verb`.def` \emph{only if it is explicitly named} in a package option
-statement. (This decision was made at least in part to avoid conflict
-with a \verb`diffcoeff.def` file from an earlier version of \verb`diffcoeff`
+\verb`diffcoeff.def` was sought and if found loaded. This is no longer
+the case. Version 5 of \verb`diffcoeff` searches for a \verb`.def`
+\emph{only if it is explicitly named} in a package option statement.
+(This decision was made at least in part to avoid conflict with a
+\verb`diffcoeff.def` file from an earlier version of \verb`diffcoeff`
tucked away in some non-obvious place and producing obscure errors
in the current version 5.) \end{shaded}%
\end{minipage}
@@ -1876,7 +1877,7 @@ In the preamble to this document I have included the definition
}
\end{verbatim}
to give both upright- (the \verb`f`) and slash-fraction (the \verb`s`)
-forms of the acceleration. Appending tne dot-delimited name \verb`n`
+forms of the acceleration. Appending the dot-delimited name \verb`n`
to \verb`\difs`, \verb`$ \difs.n.{v^i}t $` $\Longrightarrow$ $ \difs.n.{v^i}t $,
and appending the dot-delimited name \verb`n` to \verb`\diff`,
\begin{centred}
@@ -2152,15 +2153,17 @@ empty brace pair?
\verb`$ \difc[3]f{} $` $\Longrightarrow$ $ \difc[3]f{} $
\end{centred}
Note that this is the behaviour from version 5.2 of \verb`diffcoeff`.
-In version 5.1, a brace pair alone would halt compilation; a \emph{nested
-}brace pair, \verb`{{}}`, was required.
+In version 5.1, a \emph{nested }brace pair, \verb`{{}}`, was required;
+a brace pair alone halted compilation. If you want to write `differentials
+of differentials' then this is a possible way of doing so; but see
+also the third example in \ref{subsec:Variant-differentials}.
Suppose now we define a variant form (as is done in \verb`diffcoeff5.def`),
\begin{verbatim}
\difdef { cp } { dl } { style = dl }
\end{verbatim}
-and use it to form a similar expression but without the differentiand,
-an empty argument in its place:
+and use it to form a similar expression but without the differentiand
+this time, an empty argument in its place:
\begin{centred}
\verb`$ \difcp.dl.[3,2]{}{x,y,z} $` $\Longrightarrow$ $ \difcp.dl.[3,2]{}{x,y,z} $
\end{centred}
@@ -2401,7 +2404,11 @@ a total differential,
or in integrals, like $\int\sin x\dl x$, or multi-variable integrals
like
\[
-\iiintop_{-\infty}^{\infty}V(x,y,z)\dl{x,y,z}.
+\iiintop_{-\infty}^{\infty}V(x,y,z)\dl{x,y,z},
+\]
+or, with subscripted variables, rendered more cryptically as
+\[
+\iiintop_{-\infty}^{\infty}V(x_{1},x_{2},x_{3})\dl[3]x,\text{ or }\iiintop_{-\infty}^{\infty}V(x_{1},x_{2},x_{3})\dl.dn.[3]x.
\]
They also occur in differential geometry and elsewhere in the form
of line elements like
@@ -2409,64 +2416,75 @@ of line elements like
$\dl.+.{x,y,z}^2$ \quad{}and\quad{} $c^2\dl.-.{t,x,y,z}^2$.
\end{centred}
Surely we want the `d's in these expressions to correspond to their
-form (upright or math italic) in derivatives? To this end, \verb`diffcoeff`
-provides a command \verb`\dl` to write the `d' in a differential
-in a manner consistent with the default form used in derivatives.
-In the present document, the default form is upright and so
+form (upright or math italic) in derivatives?
+
+To this end, \verb`diffcoeff` provides a command \verb`\dl` to write
+the `d' in a differential in a manner consistent with the default
+form used in derivatives. In the present document, the default form
+is upright and so
\begin{centred}
\verb`$ \dl x $` $\Longrightarrow$ $ \dl x. $
\end{centred}
-\noindent To use the command before a multi-token variable of differentiation,
+\noindent (From version 5.4 of \texttt{diffcoeff}, following the pattern
+of \verb`\diff`, \verb`\difs` and \verb`\difc`, the command \verb`\difl`
+is also available: \verb`$ \difl x $` $\Longrightarrow$ $ \difl x $.)
+To use the command before a multi-token variable of differentiation,
put the variable in braces:
\begin{centred}
\verb`$ \dl{\vec{x}},\quad \dl{\mathbf{x}} $` $\Longrightarrow$
$ \dl{\vec{x}},\quad \dl{\mathbf{x}} $.
\end{centred}
-For the triple integral above, writing the differentials required
+For the first triple integral above, writing the differentials required
not three but just the \emph{one} command:
\begin{centred}
\verb`$ \dl{x,y,z} $` $\Longrightarrow$ $ \dl{x,y,z} $.
\end{centred}
-To write the line elements I made use of a dot-delimited argument
-producing a variant form of the differential (see below \ref{subsec:Line-elements}):
+For the second triple integral, $\dl[3]x$ was just \verb`\dl[3]x`,
+and for the third I used a dot-delimited argument producing a variant
+form of the differential \verb`\dl.dn.[3]x` (which could be compacted
+further into a macro if it were to be used often); see \ref{subsec:Variant-differentials}
+below.
+
+To write the line elements I again made use of a variant form of the
+differential (and again see \ref{subsec:Line-elements}):
\begin{centred}
\verb`$ \dl.+.{x,y,z}^2 $` $\Longrightarrow$ $ \dl.+.{x,y,z}^2 $,
\verb`$ c^2\dl.-.{t,x,y,z}^2 $` $\Longrightarrow$ $ c^2\dl.-.{t,x,y,z}^2 $.
\end{centred}
-(If what you want is not $\dl[2]x$ but $\difc[2]f{}$, with the superscript
-attached to the \verb`d`, see \ref{subsec:Compact=002013form-derivatives}.)
\subsection{Template \texttt{DIFL}}
\begin{wraptable}{o}{0.5\columnwidth}%
-\begin{centering}
-\caption{\texttt{DIFL} defaults\protect\label{tab:DIFL-defaults}}
+\centering{}\caption{\texttt{DIFL} defaults\protect\label{tab:DIFL-defaults}}
\begin{center}
-\begin{tabular}{lrr}
+\begin{tabular}{lr}
\toprule
-{\small key} & {\small default} & {\small comment}\tabularnewline
+{\small key} & {\small default}\tabularnewline
\midrule
-{\small style} & {\small\texttt{dl}} & {\small locked}\tabularnewline
-{\small outer-Ldelim} & {\small\texttt{\textbackslash ,}} & \tabularnewline
-{\small outer-Rdelim} & & \tabularnewline
+{\small style} & {\small\texttt{dl}}\tabularnewline
+{\small outer-Ldelim} & {\small\texttt{\textbackslash ,}}\tabularnewline
+{\small outer-Rdelim} & \tabularnewline
\bottomrule
\end{tabular}
-\par\end{center}
-\par\end{centering}
-\end{wraptable}%
+\par\end{center}\end{wraptable}%
The differential command \verb`\dl` gives access to a template \verb`DIFL`
which inherits the default values of the fundamental template \verb`DIF`
-with the (few) changes shown in Table~\ref{tab:DIFL-defaults}. Note
-that the \verb`style` key is fixed at the value \verb`dl`; it cannot
-be changed. The \verb`outer-Ldelim` key inserts a small space before
-the differential; the \verb`outer-Rdelim` key does nothing. For the
-differential, both \verb`outer-Ldelim` and \verb`outer-Rdelim` are
-\emph{always inserted}. This differs from the derivative for which
-\verb`outer-Ldelim` and \verb`outer-Rdelim` are inserted only if
-there is a trailing optional argument. It is as if the differential
-command \verb`\dl` had a built-in empty trailing optional argument.
+with the (few) changes shown in Table~\ref{tab:DIFL-defaults}. In
+prior versions of \texttt{diffcoeff} the \verb`style` key was fixed
+at the value \verb`dl`; from the current version, 5.4, it can also
+take the value \verb`d^`. With the default style \verb`dl`, \verb`$\dl[2]x$`
+$\Longrightarrow$ $\dl[2]x$; with style \verb`d^`, \verb`$\dl[3]x$`
+$\Longrightarrow$ $\dl.dn.[3]x$, a form sometimes used when abbrviating
+the product of differentials in a multiple integral. The \verb`outer-Ldelim`
+key inserts a thin space before the differential; the \verb`outer-Rdelim`
+key does nothing. For the differential, both \verb`outer-Ldelim`
+and \verb`outer-Rdelim` are \emph{always inserted}. This differs
+from the derivative for which \verb`outer-Ldelim` and \verb`outer-Rdelim`
+are inserted only if there is a trailing optional argument. It is
+as if the differential command \verb`\dl` had a built-in empty trailing
+optional argument.
That so few of the \verb`DIF` defaults are changed in \verb`DIFL`
indicates that much of the machinery of derivative formation is irrelevant
@@ -2500,7 +2518,12 @@ as $\dl x$, $\dl{\vec{x}}$ and $\dl{x,y,z}$ respectively.
will be raised; overrides the \verb`order-spec` ; see \ref{subsec:Line-elements}
for examples of use.
\end{enumerate}
-Only the third argument is mandatory, although it may be empty.
+Only the third argument is mandatory, although it may be empty. As
+with derivatives, the square-bracket delimited order spec. can be
+replaced with colon-modified arguments in the variable specification:
+\begin{centred}
+\verb`$ \dl[3]x,\quad \dl{x:3} $` $\Longrightarrow$ $ \dl[3]x,\quad \dl{x:3} $.
+\end{centred}
\subsection{Variant forms of differential}
@@ -2534,7 +2557,8 @@ might do so is to ease the writing of expressions like $\dl.p.[3,2]{x,y,z}$
-- perhaps in a document like the present one to discuss the minutiae
of spacing in the denominators of mixed partial derivatives.
\begin{centred}
-\verb`$\dl.p.[3,2]{x,y,z}$` $\Longrightarrow$ $\dl.p.[3,2]{x,y,z}$
+\verb`$\dl.p.[3,2]{x,y,z},\quad \dl.p.{x:3,y:2,z}$` $\Longrightarrow$
+$\dl.p.[3,2]{x,y,z},\quad \dl.p.{x:3,y:2,z}$
\end{centred}
As you can see from the example, just as for mixed partial derivatives,
if more than one variable is specified but the \verb`order-spec`
@@ -2553,6 +2577,29 @@ for differentials of vectors by using the variant form \verb`\dl.b.`:
\begin{centred}
\verb`$ \dl.b.x,\quad \dl.b.{x,y,z} $` $\Longrightarrow$ $ \dl.b.x ,\quad \dl.b.{x,y,z} $.
\end{centred}
+A third example is of a differential raised to a power in which the
+superscript is attached to the \verb`d`, as provided by the definition
+\begin{verbatim}
+ \difdef { l } { dn } { style = d^ }
+\end{verbatim}
+With this definition
+\begin{verbatim}
+ \[ \iiintop_{-\infty}^{\infty}
+ V(x_{1},x_{2},x_{3})\dl.dn.[3]x.
+\end{verbatim}
+$\Longrightarrow$ \selectlanguage{english}%
+\[ \iiintop_{-\infty}^{\infty}
+ V(x_{1},x_{2},x_{3})\dl.dn.[3]x. \]If you are going to need this form of differential often, you could
+save some keystrokes with a macro definition like
+\begin{centred}
+\selectlanguage{english}%
+\verb`\NewDocumentCommand \dn { m m } { \dl.dn.[#1]{#2} }`
+\end{centred}
+In fact I have added this and the associated \selectlanguage{english}%
+\verb`\difdef` command to the preamble of the present document, so that it suffices
+to write \selectlanguage{english}%
+\verb`\dn3x` to obtain $\dn3x{}$.
+\selectlanguage{english}%
\subsubsection{Line elements}
@@ -2641,25 +2688,22 @@ above.
for writing jacobians -- not the determinant as such but the symbol
conventionally used to denote the determinant. For example
\begin{centred}
-\verb`\[ \jacob{u,v,w}{x,y,z} \]` $\Longrightarrow$ \[ \jacob{u,v,w}{x,y,z} \]
+\verb`\[ \jacob{u,v}{x,y},\quad \jacob{u,v,w}{x,y,z}. \]` $\Longrightarrow$
+\[ \jacob{u,v}{x,y},\quad \jacob{u,v,w}{x,y,z}. \]
\end{centred}
The comma lists can contain any number of variables, even one or none,
-\[
-\jacob uv,\quad\jacob{}{},
-\]
nor need the numbers in numerator and denominator be equal. \verb`\jacob`
-does \emph{not} check such things. It is perfectly possible to form
-unbalanced objects like
-\begin{centred}
-\verb`\[ \jacob{u,v,w}{x,y},\quad\jacob{u,v}{x,y,z}. \]` $\Longrightarrow$
-\[ \jacob{u,v,w}{x,y},\quad\jacob{u,v}{x,y,z}. \]
-\end{centred}
-Perhaps there are contexts where these are meaningful?
+does \emph{not} check such things. (It may be possible to exploit
+this fact when defining variant forms of jacobian, or other notations
+-- like the \verb`\Braket` example in \ref{subsec:Other-notations}.)
-\subsection{Template \texttt{DIFJ}}
+From version 5.4 of \texttt{diffcoeff}, following the pattern of \verb`\diff`,
+\verb`\difs` and \verb`\difc`, the command \verb`\difj` is also
+available and is equivalent to \verb`\jacob`.
-\begin{wraptable}{o}{0.45\columnwidth}%
-\centering{}\caption{\texttt{DIFJ} defaults\protect\label{tab:DIFJ-defaults}}
+\begin{wraptable}[8]{o}{0.45\columnwidth}%
+\centering{}\vspace{2ex}
+\caption{\texttt{DIFJ} defaults\protect\label{tab:DIFJ-defaults}}
\begin{center}
\begin{tabular}{lr}
\toprule
@@ -2671,6 +2715,10 @@ Perhaps there are contexts where these are meaningful?
\bottomrule
\end{tabular}
\par\end{center}\end{wraptable}%
+~~
+
+\subsection{Template \texttt{DIFJ}}
+
Jacobians are configurable. Like other commands of \verb`diffcoeff`,
\verb`\jacob` gives access to a template, in this case \verb`DIFJ`,
which is a child of the fundamental template \verb`DIF` and inherits
@@ -2800,7 +2848,8 @@ one mandatory argument:
generally is) empty.\newpage{}
\end{enumerate}
\begin{description}
-\item [{\texttt{\textbackslash jacob}}] jacobian with arguments and delimiters:
+\item [{\texttt{\textbackslash jacob}}] (also \verb`\difj`) jacobian
+with arguments and delimiters:
\end{description}
\begin{enumerate}
\item \verb`.name.` (optional) name of variant form of jacobian;
@@ -2808,7 +2857,8 @@ generally is) empty.\newpage{}
\item \verb`{denom}` (mandatory) comma list of variables forming the denominator.
\end{enumerate}
\begin{description}
-\item [{\texttt{\textbackslash dl}}] differential with arguments and delimiters:
+\item [{\texttt{\textbackslash dl}}] (also \verb`\difl`) differential
+with arguments and delimiters:
\begin{enumerate}
\item \verb`.name.` (optional) name of variant form of differential;
\item \verb`[order(s)]` (optional) order of differential or comma list
@@ -2839,12 +2889,9 @@ may include numbers and other keyboard characters, but not braces,
\section{Templates}
The following lists record the default values of the templates used
-by \verb`diffcoeff`. A marginal \verb`>` indicates where a setting
-differs from that in \verb`DIF`, \verb`>>` where a setting differs
-from that in \verb`DIFF`, \verb`DIFS` or \verb`DIFC` as the case
-may be. For the latter templates, only \emph{relevant }keys have been
-listed -- those which affect the appearance of the derivative (or
-jacobian or differential).
+by \verb`diffcoeff`. For templates other than \verb`DIF`, only \emph{relevant
+}keys have been listed -- those which affect the appearance of the
+derivative (or jacobian or differential).
\subsection{\texttt{DIF} (primogenitor)}
\begin{verbatim}
@@ -2881,7 +2928,7 @@ jacobian or differential).
\subsection{\texttt{DIFF} (upright-fraction derivative)}
\label{subsec:DIFF-(upright-fraction-derivative)}Relevant keys and
-default values for template \verb`DIFF`.
+default values for template \verb`DIFF`.
\begin{verbatim}
style = frac,
derivand-sep = 3 mu plus 1 mu minus 2 mu,
@@ -2906,7 +2953,8 @@ default values for template \verb`DIFF`.
\subsubsection{\texttt{DIFFP}}
-\verb`DIFF` defaults as above with these changes:
+\verb`DIFF` defaults as above with the following changes (a marginal
+\verb`>>` indicates where a setting differs from that in \verb`DIFF`):
\begin{verbatim}
>> op-symbol = \partial,
>> op-order-nudge = 1 mu,
@@ -2916,7 +2964,8 @@ default values for template \verb`DIFF`.
\subsection{\texttt{DIFS} (slash-fraction derivative)}
\label{subsec:DIFS-(slash-fraction-derivative)}Relevant keys and
-default values for template \verb`DIFS`.
+default values for template \verb`DIFS`. A marginal \verb`>` indicates
+where a setting differs from that in \verb`DIF`.
\begin{verbatim}
> style = /,
slash-tok = /,
@@ -2947,7 +2996,8 @@ default values for template \verb`DIFS`.
\subsubsection{\texttt{DIFSP}}
-\verb`DIFS` defaults as above with these changes:
+\verb`DIFS` defaults as above with the following changes (a marginal
+\verb`>>` indicates where a setting differs from that in \verb`DIFS`):
\begin{verbatim}
>> op-symbol = \partial,
>> op-order-nudge = 1 mu
@@ -2956,7 +3006,8 @@ default values for template \verb`DIFS`.
\subsection{\texttt{DIFC} (compact derivative)}
\label{subsec:DIFC-(compact-derivative)}Relevant keys and default
-values for template \verb`DIFC`.
+values for template \verb`DIFC`. A marginal \verb`>` indicates where
+a setting differs from that in \verb`DIF`.
\begin{verbatim}
> style = _ ,
> derivand-sep = 1 mu plus 1 mu minus 2 mu,
@@ -2974,7 +3025,8 @@ values for template \verb`DIFC`.
\subsubsection{\texttt{DIFCP}}
-\verb`DIFC` defaults as above with these changes:
+\verb`DIFC` defaults as above with these changes (a marginal \verb`>>`
+indicates where a setting differs from that in \verb`DIFC`):
\begin{verbatim}
>> op-symbol = \partial,
>> op-order-nudge = 1 mu
@@ -2983,7 +3035,8 @@ values for template \verb`DIFC`.
\subsection{\texttt{DIFJ} (jacobian)}
\label{subsec:DIFJ-(jacobian)}Relevant keys and default values for
-template \verb`DIFJ`.
+template \verb`DIFJ`. A marginal \verb`>` indicates where a setting
+differs from that in \verb`DIF`.
\begin{verbatim}
style = frac,
slash-tok = /,
@@ -3002,9 +3055,11 @@ template \verb`DIFJ`.
\subsection{\texttt{DIFL} (differential)}
\label{subsec:DIFL-(differential)}Relevant keys and default values
-for template \verb`DIFL`.
+for template \verb`DIFL`. A marginal \verb`>` indicates where a
+setting differs from that in \verb`DIF`.
\begin{verbatim}
op-symbol = \mathrm{d},
+ op-order-nudge = 0 mu,
var-sup-nudge = 1 mu,
multi-term-sep = 2 mu plus 1 mu minus 1 mu,
term-sep-adjust = -1 mu,
@@ -3209,6 +3264,10 @@ and definitions:
lvwrap-Ldelim = \onemu\mleft [,
lvwrap-Rdelim = \mright ]
}
+% differential d^n x
+\difdef { l } { dn }{ style=d^ }
+\NewDocumentCommand \dn { m m }
+ { \dl.dn.[#1]{#2} }
% mimicking the \Braket command
% of the braket package
\difdef{ s }{ bk }
@@ -3314,6 +3373,11 @@ by means of colon separators in the variable argument.
\item Reinstates (from v.4) the order-override option as an alternative
to \verb`\difoverride` but now angle-bracket delimited.
\end{enumerate}
+\item Version 5.4 (2023-11-08)
+\begin{enumerate}
+\item Adjusts both code and documentation about the differential to enable
+forms like $\dn[3]x$ (sometimes used in multiple integrals).
+\end{enumerate}
\end{enumerate}
\end{document}
diff --git a/macros/latex/contrib/hfutexam/CHANGELOG.md b/macros/latex/contrib/hfutexam/CHANGELOG.md
index 08fa6e7daf..6b6a6a3b25 100644
--- a/macros/latex/contrib/hfutexam/CHANGELOG.md
+++ b/macros/latex/contrib/hfutexam/CHANGELOG.md
@@ -1,5 +1,8 @@
# 更新日志
+## [1.9] - 2023/11/13
++ 修复了简易模式的标题的超链接位置不正确的问题。
+
## [1.8] - 2023/03/22
+ 修复了正文设置字体大小会导致中英文字体大小不一致的问题。
+ 将简易模式的各个部分标题添加至目录中。
diff --git a/macros/latex/contrib/hfutexam/hfutexam.cls b/macros/latex/contrib/hfutexam/hfutexam.cls
index 1d47cffcb7..aa73ae8202 100644
--- a/macros/latex/contrib/hfutexam/hfutexam.cls
+++ b/macros/latex/contrib/hfutexam/hfutexam.cls
@@ -7,7 +7,7 @@
% 编译模式: XeLaTeX
% 你可以任意修改或再次分发该文件
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{hfutexam}[2023/03/22 v1.8 HFUTExam document class by Zhang Shenxing]
+\ProvidesClass{hfutexam}[2023/11/13 v1.9 HFUTExam document class by Zhang Shenxing]
% 文档选项
\newif\ifhfut@ShiJuan\hfut@ShiJuantrue
\newif\ifhfut@DaTiZhi\hfut@DaTiZhifalse
@@ -165,11 +165,13 @@
}
\fi
\ifhfut@Simple % 简单模式页眉页脚
+ % \titleformat*{\section}{\bfseries\LARGE\hfutFontTitle}
\RequirePackage{hyperref}
\renewcommand\headrulewidth{0pt}
\renewcommand\footrulewidth{0pt}
\renewcommand{\maketitle}{%
- \addcontentsline{toc}{section}{\hfut@BiaoTi}
+ \phantomsection
+ \addcontentsline{toc}{section}{\hfut@BiaoTi}
\begin{center}\bfseries
\makebox[\linewidth][s]{\LARGE\hfutFontTitle~\hfut@BiaoTi~}
diff --git a/macros/latex/contrib/hfutexam/hfutexam.pdf b/macros/latex/contrib/hfutexam/hfutexam.pdf
index 4424f31160..c8353c0cfe 100644
--- a/macros/latex/contrib/hfutexam/hfutexam.pdf
+++ b/macros/latex/contrib/hfutexam/hfutexam.pdf
Binary files differ
diff --git a/macros/latex/contrib/hfutexam/hfutexam.tex b/macros/latex/contrib/hfutexam/hfutexam.tex
index a65dc0a794..d0081f157f 100644
--- a/macros/latex/contrib/hfutexam/hfutexam.tex
+++ b/macros/latex/contrib/hfutexam/hfutexam.tex
@@ -52,7 +52,7 @@
\XiZhuRenQianMing{}
\indent
-本模板 (2023/03/22 v1.8) 旨在为将合肥工业大学试卷的 word 格式转为\LaTeX{}格式.
+本模板 (2023/11/13 v1.9) 旨在为将合肥工业大学试卷的 word 格式转为\LaTeX{}格式.
\textbf{\color{red}使用前请注意, 如果你使用的是CTeX套装, 请彻底删除并安装MikTeX发行版, 否则编译会出错.}
如果需要的话, 你可以单独安装WinEdt编辑器.
diff --git a/macros/latex/contrib/hfutexam/hfutexam_simple.pdf b/macros/latex/contrib/hfutexam/hfutexam_simple.pdf
index cf84fa6515..c5d107a501 100644
--- a/macros/latex/contrib/hfutexam/hfutexam_simple.pdf
+++ b/macros/latex/contrib/hfutexam/hfutexam_simple.pdf
Binary files differ
diff --git a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
index de905b070a..b13797000f 100644
--- a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
+++ b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/profcollege/latex/PfCCAN.tex b/macros/latex/contrib/profcollege/latex/PfCCAN.tex
index 9e4b195e48..5334568dff 100644
--- a/macros/latex/contrib/profcollege/latex/PfCCAN.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCCAN.tex
@@ -79,7 +79,7 @@
\setsepchar{,}%
\readlist*\ListeObjetsCAN{bonbons,billes,jouets,fruits,biscuits,gâteaux,pommes,poires,pains au chocolat,cookies,croissants,muffins,brioches,saucisses,cuisses de poulet}%
\readlist*\ListePetitsObjetsCAN{bonbons,billes,biscuits,gommes,clous,vis}
-\readlist*\ListeFruitsCAN{pommes,poires,abricots,cerises,fraises,framboises,noix,pêches,nectarines,myrtilles}
+\readlist*\ListeFruitsCAN{pommes,poires,abricots,cerises,fraises,framboises,noix,pêches,nectarines,myrtilles,oranges,mandarines}
\readlist*\ListeSommetsCAN{A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z}
\newcommand\ExtraitPetitsObjets[1]{%
diff --git a/macros/latex/contrib/profcollege/latex/PfCCalculsFractions.tex b/macros/latex/contrib/profcollege/latex/PfCCalculsFractions.tex
index 06a02de387..fdf037ef81 100644
--- a/macros/latex/contrib/profcollege/latex/PfCCalculsFractions.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCCalculsFractions.tex
@@ -1,11 +1,32 @@
\setKVdefault[CalculsFractions]{Couleurs=false,Negatif=false}%
-\defKV[CalculsFractions]{Couleur=\setKV[CalculsFractions]{Couleurs}}%
+\defKV[CalculsFractions]{Couleur=\setKV[CalculsFractions]{Couleurs}\setKV[ClesSimplification]{Couleur=#1}}%
\NewDocumentCommand\tofrac{m}{%
\IfDecimal{#1}{#1}{%
\StrBefore{#1}{/}[\PfCnum]%
\StrBehind{#1}{/}[\PfCden]%
- \frac{\PfCnum}{\PfCden}%
+ \ifnum\PfCden=1\relax%
+ \num{\PfCnum}%
+ \else%
+ \frac{\num{\PfCnum}}{\num{\PfCden}}%
+ \fi%
+ }%
+}%
+
+\NewDocumentCommand\Tofrac{m}{%
+ \IfDecimal{#1}{#1}{%
+ \StrBefore{#1}{/}[\PfCnum]%
+ \StrBehind{#1}{/}[\PfCden]%
+ \ifnum\PfCden=1\relax%
+ \num{\PfCnum}%
+ \else%
+ %\PGCD{\PfCnum}{\PfCden}%
+ %\ifnum\the\pgcd>1\relax%
+ \Simplification{\PfCnum}{\PfCden}%\frac{\num{\PfCnum}}{\num{\PfCden}}%
+ %\else%
+ %\frac{\num{\PfCnum}}{\num{\PfCden}}%
+ %\fi%
+ \fi%
}%
}%
@@ -36,8 +57,10 @@
\reademptyitems%
\setsepchar{,}%
% Partie calculs
- \PGCD{\ListeFractions[1,2]}{\ListeFractions[2,2]}%
+ \PGCD{\fpeval{abs(\ListeFractions[1,2])}}{\fpeval{abs(\ListeFractions[2,2])}}%
+% pgcd=\the\pgcd%
\xdef\PfCPremierMul{\fpeval{\ListeFractions[2,2]/\the\pgcd}}%
+% PfCPremierMul=\PfCPremierMul
\xdef\PfCDeuxiemeMul{\fpeval{\ListeFractions[1,2]/\the\pgcd}}%
\xdef\PfCAddNumFin{\fpeval{(\ListeFractions[1,1])*(\PfCPremierMul)\PfCFractionOp(\ListeFractions[2,1])*(\PfCDeuxiemeMul)}}%
\xdef\PfCAddDenoFin{\fpeval{(\ListeFractions[1,2])*(\PfCPremierMul)}}%
@@ -59,14 +82,14 @@
\SSimpliTest{\fpeval{abs(\PfCAddNumFin)}}{\fpeval{abs(\PfCAddDenoFin)}}\ifthenelse{\boolean{Simplification}}{\tofrac{\PfCAddNumFin/\PfCAddDenoFin}}{\tofrac{\PfCAddSumSimp}}%
\else%
\ifnum#3=1\relax%
- \ifnum\PfCPremierMul>1\relax%
- \frac{\ListeFractions[1,1]_{\mathcolor{CouleurDenoCom}{\times\num{\PfCPremierMul}}}}{\ListeFractions[1,2]_{\mathcolor{CouleurDenoCom}{\times\num{\PfCPremierMul}}}}
+ \ifnum\fpeval{abs(\PfCPremierMul)}>1\relax%
+ \frac{\ListeFractions[1,1]_{\mathcolor{CouleurDenoCom}{\times\NumMA{\PfCPremierMul}}}}{\ListeFractions[1,2]_{\mathcolor{CouleurDenoCom}{\times\NumMA{\PfCPremierMul}}}}
\else%
\tofrac{#4}%
\fi%
\PfCFractionOp%
- \ifnum\PfCDeuxiemeMul>1\relax%
- \frac{\ListeFractions[2,1]_{\mathcolor{CouleurDenoCom}{\times\num{\PfCDeuxiemeMul}}}}{\ListeFractions[2,2]_{\mathcolor{CouleurDenoCom}{\times\num{\PfCDeuxiemeMul}}}}%
+ \ifnum\fpeval{abs(\PfCDeuxiemeMul)}>1\relax%
+ \frac{\ListeFractions[2,1]_{\mathcolor{CouleurDenoCom}{\times\NumMA{\PfCDeuxiemeMul}}}}{\ListeFractions[2,2]_{\mathcolor{CouleurDenoCom}{\times\NumMA{\PfCDeuxiemeMul}}}}%
\else%
\tofrac{#5}%
\fi%
@@ -122,7 +145,8 @@
}{\tofrac{\PfCMulPdtSimp}}%
\else
\ifnum#2=2\relax%
- \SSimpliTest{\PfCMulNumFin}{\PfCMulDenoFin}\ifthenelse{\boolean{Simplification}}{\frac{\ifnum\PfCMulNumFin<0\relax-\fi\Decomposition[Longue]{\fpeval{abs(\PfCMulNumFin)}}}{\ifnum\PfCMulDenoFin<0\relax-\fi\Decomposition[Longue]{\fpeval{abs(\PfCMulDenoFin)}}}}{\tofrac{\PfCMulPdtSimp}}%
+ %\SSimpliTest{\PfCMulNumFin}{\PfCMulDenoFin}\ifthenelse{\boolean{Simplification}}{\frac{\ifnum\PfCMulNumFin<0\relax-\fi\Decomposition[Longue]{\fpeval{abs(\PfCMulNumFin)}}}{\ifnum\PfCMulDenoFin<0\relax-\fi\Decomposition[Longue]{\fpeval{abs(\PfCMulDenoFin)}}}}{\tofrac{\PfCMulPdtSimp}}%
+ \DecompositionSimplificationSeule{\PfCMulNumFin}{\PfCMulDenoFin}%
\else%
\ifnum#2=1\relax%
\frac{\ListeFractions[1,1]\times\ifnum\ListeFractions[2,1]<0\relax(\fi\ListeFractions[2,1]\ifnum\ListeFractions[2,1]<0\relax)\fi}{\ListeFractions[1,2]\times\ifnum\ListeFractions[2,2]<0\relax(\fi\ListeFractions[2,2]\ifnum\ListeFractions[2,2]<0\relax)\fi}
diff --git a/macros/latex/contrib/profcollege/latex/PfCCalculsFractionsoldv1.tex b/macros/latex/contrib/profcollege/latex/PfCCalculsFractionsoldv1.tex
new file mode 100644
index 0000000000..0e4dac5a68
--- /dev/null
+++ b/macros/latex/contrib/profcollege/latex/PfCCalculsFractionsoldv1.tex
@@ -0,0 +1,192 @@
+\setKVdefault[CalculsFractions]{Couleurs=false,Negatif=false}%
+\defKV[CalculsFractions]{Couleur=\setKV[CalculsFractions]{Couleurs}}%
+
+\NewDocumentCommand\tofrac{m}{%
+ \IfDecimal{#1}{#1}{%
+ \StrBefore{#1}{/}[\PfCnum]%
+ \StrBehind{#1}{/}[\PfCden]%
+ \ifnum\PfCden=1\relax%
+ \num{\PfCnum}%
+ \else%
+ \frac{\num{\PfCnum}}{\num{\PfCden}}%
+ \fi%
+ }%
+}%
+
+\NewDocumentCommand\AddFraction{soommo}{%
+ \useKVdefault[CalculsFractions]%
+ \setKV[CalculsFractions]{#2}%
+ \ifboolKV[CalculsFractions]{Couleurs}{\colorlet{CouleurDenoCom}{\useKV[CalculsFractions]{Couleur}}}{\colorlet{CouleurDenoCom}{black}}%
+ \IfBooleanTF{#1}{%
+ \xdef\PfCFractionOp{-}%
+ }{%
+ \xdef\PfCFractionOp{+}%
+ }%
+ \IfDecimal{#4}{%
+ \xdef\PfCNumA{#4}%
+ \xdef\PfCNumB{1}%
+ }{%
+ \StrCut{#4}{/}\PfCNumA\PfCNumB%
+ }%
+ \IfDecimal{#5}{%
+ \xdef\PfCNumC{#5}%
+ \xdef\PfCNumD{1}%
+ }{%
+ \StrCut{#5}{/}\PfCNumC\PfCNumD%
+ }
+ \xdef\PfCAddFoo{\PfCNumA/\PfCNumB,\PfCNumC/\PfCNumD}%
+ \setsepchar[*]{,*/}\ignoreemptyitems%
+ \readlist*\ListeFractions{\PfCAddFoo}%
+ \reademptyitems%
+ \setsepchar{,}%
+ % Partie calculs
+ \PGCD{\fpeval{abs(\ListeFractions[1,2])}}{\fpeval{abs(\ListeFractions[2,2])}}%
+% pgcd=\the\pgcd%
+ \xdef\PfCPremierMul{\fpeval{\ListeFractions[2,2]/\the\pgcd}}%
+% PfCPremierMul=\PfCPremierMul
+ \xdef\PfCDeuxiemeMul{\fpeval{\ListeFractions[1,2]/\the\pgcd}}%
+ \xdef\PfCAddNumFin{\fpeval{(\ListeFractions[1,1])*(\PfCPremierMul)\PfCFractionOp(\ListeFractions[2,1])*(\PfCDeuxiemeMul)}}%
+ \xdef\PfCAddDenoFin{\fpeval{(\ListeFractions[1,2])*(\PfCPremierMul)}}%
+ \PGCD{\fpeval{abs(\PfCAddNumFin)}}{\fpeval{abs(\PfCAddDenoFin)}}\xdef\PfCAddPgcd{\the\pgcd}%
+ \xdef\PfCAddNumSimp{\fpeval{\PfCAddNumFin/\PfCAddPgcd}}%
+ \xdef\PfCAddDenoSimp{\fpeval{\PfCAddDenoFin/\PfCAddPgcd}}%
+ \xdef\PfCAddSumSimp{\PfCAddNumSimp/\PfCAddDenoSimp}%
+ \IfValueT{#6}{\xdef#6{\PfCAddSumSimp}}%
+ % Partie affichage
+ \ensuremath{%
+ \IfValueTF{#3}{%
+ \ifnum#3=4\relax%
+ %test
+ \ifboolKV[CalculsFractions]{Negatif}{%
+ \xintifboolexpr{\fpeval{\PfCAddNumSimp/\PfCAddDenoSimp}<0}{-\tofrac{\fpeval{abs(\PfCAddNumSimp)}/\fpeval{abs(\PfCAddDenoSimp)}}}{\tofrac{\PfCAddSumSimp}}%
+ }{\tofrac{\PfCAddSumSimp}}%
+ \else%
+ \ifnum#3=3\relax%
+ \SSimpliTest{\fpeval{abs(\PfCAddNumFin)}}{\fpeval{abs(\PfCAddDenoFin)}}\ifthenelse{\boolean{Simplification}}{\tofrac{\PfCAddNumFin/\PfCAddDenoFin}}{\tofrac{\PfCAddSumSimp}}%
+ \else%
+ \ifnum#3=1\relax%
+ \ifnum\fpeval{abs(\PfCPremierMul)}>1\relax%
+ \frac{\ListeFractions[1,1]_{\mathcolor{CouleurDenoCom}{\times\NumMA{\PfCPremierMul}}}}{\ListeFractions[1,2]_{\mathcolor{CouleurDenoCom}{\times\NumMA{\PfCPremierMul}}}}
+ \else%
+ \tofrac{#4}%
+ \fi%
+ \PfCFractionOp%
+ \ifnum\fpeval{abs(\PfCDeuxiemeMul)}>1\relax%
+ \frac{\ListeFractions[2,1]_{\mathcolor{CouleurDenoCom}{\times\NumMA{\PfCDeuxiemeMul}}}}{\ListeFractions[2,2]_{\mathcolor{CouleurDenoCom}{\times\NumMA{\PfCDeuxiemeMul}}}}%
+ \else%
+ \tofrac{#5}%
+ \fi%
+ \else%
+ \ifnum#3=2\relax%
+ \frac{\num{\fpeval{\ListeFractions[1,1]*\PfCPremierMul}}}{\num{\fpeval{\ListeFractions[1,2]*\PfCPremierMul}}}\PfCFractionOp\frac{\num{\fpeval{\ListeFractions[2,1]*\PfCDeuxiemeMul}}}{\num{\fpeval{\ListeFractions[2,2]*\PfCDeuxiemeMul}}}%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+ }{\tofrac{#4}\PfCFractionOp\tofrac{#5}
+ }%
+ }%
+}%
+
+\NewDocumentCommand\SousFraction{oommo}{%
+ \AddFraction*[#1][#2]{#3}{#4}[#5]%
+}%
+
+\NewDocumentCommand\MulFraction{oommo}{%
+ \useKVdefault[CalculsFractions]%
+ \setKV[CalculsFractions]{#1}%
+ \IfDecimal{#3}{%
+ \xdef\PfCNumA{#3}%
+ \xdef\PfCNumB{1}%
+ }{%
+ \StrCut{#3}{/}{\PfCNumA}{\PfCNumB}%
+ }%
+ \IfDecimal{#4}{%
+ \xdef\PfCNumC{#4}%
+ \xdef\PfCNumD{1}%
+ }{%
+ \StrCut{#4}{/}{\PfCNumC}{\PfCNumD}%
+ }%
+ \xdef\PfCMulFoo{\PfCNumA/\PfCNumB,\PfCNumC/\PfCNumD}%
+ \setsepchar[*]{,*/}\ignoreemptyitems%
+ \readlist*\ListeFractions{\PfCMulFoo}%
+ \reademptyitems
+ \setsepchar{,}%
+ % Calculs
+ \xdef\PfCMulNumFin{\fpeval{(\ListeFractions[1,1])*(\ListeFractions[2,1])}}
+ \xdef\PfCMulDenoFin{\fpeval{\ListeFractions[1,2]*\ListeFractions[2,2]}}
+ \PGCD{\fpeval{abs(\PfCMulNumFin)}}{\fpeval{abs(\PfCMulDenoFin)}}\xdef\PfCMulPgcd{\pgcd}%
+ \xdef\PfCMulNumSimp{\fpeval{\PfCMulNumFin/\PfCMulPgcd}}%
+ \xdef\PfCMulDenoSimp{\fpeval{\PfCMulDenoFin/\PfCMulPgcd}}%
+ \xdef\PfCMulPdtSimp{\PfCMulNumSimp/\PfCMulDenoSimp}%
+ \IfValueT{#5}{\xdef#5{\PfCMulPdtSimp}}%
+ \ensuremath{%
+ \IfValueTF{#2}{%
+ \ifnum#2=3\relax
+ \ifboolKV[CalculsFractions]{Negatif}{%
+ \xintifboolexpr{\fpeval{\PfCMulNumSimp/\PfCMulDenoSimp}<0}{-\tofrac{\fpeval{abs(\PfCMulNumSimp)}/\fpeval{abs(\PfCMulDenoSimp)}}}{\tofrac{\PfCMulPdtSimp}}%
+ }{\tofrac{\PfCMulPdtSimp}}%
+ \else
+ \ifnum#2=2\relax%
+ \SSimpliTest{\PfCMulNumFin}{\PfCMulDenoFin}\ifthenelse{\boolean{Simplification}}{\frac{\ifnum\PfCMulNumFin<0\relax-\fi\Decomposition[Longue]{\fpeval{abs(\PfCMulNumFin)}}}{\ifnum\PfCMulDenoFin<0\relax-\fi\Decomposition[Longue]{\fpeval{abs(\PfCMulDenoFin)}}}}{\tofrac{\PfCMulPdtSimp}}%
+ \else%
+ \ifnum#2=1\relax%
+ \frac{\ListeFractions[1,1]\times\ifnum\ListeFractions[2,1]<0\relax(\fi\ListeFractions[2,1]\ifnum\ListeFractions[2,1]<0\relax)\fi}{\ListeFractions[1,2]\times\ifnum\ListeFractions[2,2]<0\relax(\fi\ListeFractions[2,2]\ifnum\ListeFractions[2,2]<0\relax)\fi}
+ \fi
+ \fi
+ \fi
+ }{\tofrac{#3}\times\tofrac{#4}
+ }
+ }%
+}%
+
+\NewDocumentCommand\DivFraction{oommo}{%
+ \useKVdefault[CalculsFractions]%
+ \setKV[CalculsFractions]{#1}%
+ \IfDecimal{#3}{%
+ \xdef\PfCNumA{#3}%
+ \xdef\PfCNumB{1}%
+ }{%
+ \StrCut{#3}{/}{\PfCNumA}{\PfCNumB}%
+ }%
+ \IfDecimal{#4}{%
+ \xdef\PfCNumC{#4}%
+ \xdef\PfCNumD{1}%
+ }{%
+ \StrCut{#4}{/}{\PfCNumC}{\PfCNumD}%
+ }%
+ \xdef\PfCDivFoo{\PfCNumA/\PfCNumB,\PfCNumC/\PfCNumD}%
+ \setsepchar[*]{,*/}\ignoreemptyitems%
+ \readlist*\ListeFractions{\PfCDivFoo}%
+ \reademptyitems%
+ \setsepchar{,}%
+ % Calculs
+ \xdef\PfCDivNumFin{\fpeval{(\ListeFractions[1,1])*(\ListeFractions[2,2])}}%
+ \xdef\PfCDivDenoFin{\fpeval{\ListeFractions[1,2]*\ListeFractions[2,1]}}%
+ \PGCD{\fpeval{abs(\PfCDivNumFin)}}{\fpeval{abs(\PfCDivDenoFin)}}\xdef\PfCDivPgcd{\pgcd}%
+ \xdef\PfCDivNumSimp{\fpeval{\PfCDivNumFin/\PfCDivPgcd}}%
+ \xdef\PfCDivDenoSimp{\fpeval{\PfCDivDenoFin/\PfCDivPgcd}}%
+ \xdef\PfCDivPdtSimp{\PfCDivNumSimp/\PfCDivDenoSimp}%
+ \IfValueT{#5}{\xdef#5{\PfCDivPdtSimp}}%
+ \ensuremath{%
+ \IfValueTF{#2}{%
+ \ifnum#2=4\relax
+ \ifboolKV[CalculsFractions]{Negatif}{%
+ \xintifboolexpr{\fpeval{\PfCDivNumSimp/\PfCDivDenoSimp}<0}{-\tofrac{\fpeval{abs(\PfCDivNumSimp)}/\fpeval{abs(\PfCDivDenoSimp)}}}{\tofrac{\PfCDivPdtSimp}}%
+ }{\tofrac{\PfCDivPdtSimp}}%
+ \else\ifnum#2=3\relax
+ \MulFraction[][\fpeval{#2-1}]{\ListeFractions[1,1]/\ListeFractions[1,2]}{\ListeFractions[2,2]/\ListeFractions[2,1]}%
+ \else
+ \ifnum#2=2\relax%
+ \MulFraction[][\fpeval{#2-1}]{\ListeFractions[1,1]/\ListeFractions[1,2]}{\ListeFractions[2,2]/\ListeFractions[2,1]}%
+ \else%
+ \ifnum#2=1\relax%
+ \tofrac{\ListeFractions[1,1]/\ListeFractions[1,2]}\times\tofrac{\ListeFractions[2,2]/\ListeFractions[2,1]}
+ \fi
+ \fi
+ \fi
+ \fi
+ }{\tofrac{#3}\div\tofrac{#4}
+ }
+ }%
+}% \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCCritere.tex b/macros/latex/contrib/profcollege/latex/PfCCritere.tex
new file mode 100644
index 0000000000..3fd554b0ba
--- /dev/null
+++ b/macros/latex/contrib/profcollege/latex/PfCCritere.tex
@@ -0,0 +1,127 @@
+%%%
+% Criteres de divisibilite
+%%%
+\setKVdefault[Critere]{Div=2,Remarque=false,All=false,RemarqueAll=false}
+
+\NewDocumentCommand\Critere{om}{%
+ \useKVdefault[Critere]%
+ \setKV[Critere]{#1}%
+ \xdef\PfCListeARetenirCriteres{}%
+ \ifboolKV[Critere]{All}{%
+ \begin{itemize}
+ \item \CritereDeux{#2}%
+ \item \CritereTrois{#2}
+ \item \CritereQuatre{#2}
+ \item \CritereCinq{#2}
+ \item \CritereNeuf{#2}
+ \item \CritereDix{#2}
+ \end{itemize}
+ \ifx\bla\PfCListeARetenirCriteres\bla%
+ \else
+ \setsepchar{,}\ignoreemptyitems
+ \readlist*\PfCAfficheDivCriteres{\PfCListeARetenirCriteres}%
+ \xdef\PfCNumListe{}%
+ En appliquant les critères de divisibilité connus, \num{#2} est donc divisible par \num{\PfCAfficheDivCriteres[1]}%
+ \xintifboolexpr{\PfCAfficheDivCritereslen>1}{\xintFor* ##1 in{\xintSeq{2}{\PfCAfficheDivCritereslen}}\do{%
+ \xintifForLast{ et }{ ; }\num{\PfCAfficheDivCriteres[##1]}%
+ }%
+ }{}.%
+ \ifboolKV[Critere]{RemarqueAll}{\\\textbf{Remarque} : La liste des diviseurs de \num{#2} est \ListeDiviseur{#2}.}{}
+ \fi%
+ }{%
+ \IfStrEqCase{\useKV[Critere]{Div}}{%
+ {2}{\CritereDeux{#2}}%
+ {3}{\CritereTrois{#2}}%
+ {4}{\CritereQuatre{#2}}%
+ {5}{\CritereCinq{#2}}%
+ {9}{\CritereNeuf{#2}}%
+ {10}{\CritereDix{#2}}%
+ }%
+ }%
+}%
+
+\NewDocumentCommand\CritereDeux{m}{%
+ \StrRight{#1}{1}[\PfCCriDeuxUnite]%
+ Le chiffre des unités de \num{#1} est \num{\PfCCriDeuxUnite}. Donc \num{#1} %
+ \modulo{\PfCCriDeuxUnite}{2}%
+ \ifnum\remainder=0\relax%
+ est divisible par 2.%
+ \ifboolKV[Critere]{Remarque}{\\\textbf{Remarque} : $\num{#1}=\num{\fpeval{#1/2}}\times2$.}{}%
+ \xdef\PfCListeARetenirCriteres{\PfCListeARetenirCriteres,2}%
+ \else%
+ n'est pas divisible par 2.%
+ \fi%
+}%
+
+\NewDocumentCommand\CritereTrois{m}{%
+ La somme des chiffres de \num{#1} est \PfCSommeChiffres{#1}. Comme \num{\PfCSMSomme} %
+ \modulo{\PfCSMSomme}{3}%
+ \ifnum\remainder=0\relax%
+ est divisible par 3, alors \num{#1} est aussi divisible par 3.%
+ \ifboolKV[Critere]{Remarque}{\\\textbf{Remarque} : $\num{#1}=\num{\fpeval{#1/3}}\times3$.}{}%
+ \xdef\PfCListeARetenirCriteres{\PfCListeARetenirCriteres,3}%
+ \else%
+ n'est pas divisible par 3, alors \num{#1} n'est pas divisible par 3.%
+ \fi%
+}%
+
+\NewDocumentCommand\CritereQuatre{m}{%
+ \ifnum#1<100%
+ \quotient{#1}{4}%
+ \modulo{#1}{4}%
+ \ifnum\remainder=0\relax
+ Comme $\num{#1}=\num{\the\intquotient}\times4$ alors \num{#1} est divisible par 4.
+ \xdef\PfCListeARetenirCriteres{\PfCListeARetenirCriteres,4}%
+ \else
+ Comme $\num{#1}=\num{\the\intquotient}\times4+\num{\the\remainder}$ alors \num{#1} n'est pas divisible par 4.
+ \fi
+ \else
+ \StrRight{#1}{2}[\PfCCriQuatreUnite]%
+ \num{#1} se termine par \num{\PfCCriQuatreUnite}. %
+ \modulo{\PfCCriQuatreUnite}{4}%
+ \ifnum\remainder=0\relax%
+ Comme \num{\PfCCriQuatreUnite} est divisible par 4, alors \num{#1} est divisible par 4.%
+ \ifboolKV[Critere]{Remarque}{\\\textbf{Remarque} : $\num{#1}=\num{\fpeval{#1/4}}\times4$.}{}%
+ \xdef\PfCListeARetenirCriteres{\PfCListeARetenirCriteres,4}%
+ \else%
+ Comme \num{\PfCCriQuatreUnite} n'est pas divisible par 4, alors \num{#1} n'est pas divisible par 4.%
+ \fi%
+ \fi
+}%
+
+\NewDocumentCommand\CritereCinq{m}{%
+ \StrRight{#1}{1}[\PfCCriCinqUnite]%
+ Le chiffre des unités de \num{#1} est \num{\PfCCriCinqUnite}. Donc \num{#1} %
+ \modulo{\PfCCriCinqUnite}{5}%
+ \ifnum\remainder=0\relax%
+ est divisible par 5.%
+ \ifboolKV[Critere]{Remarque}{\\\textbf{Remarque} : $\num{#1}=\num{\fpeval{#1/5}}\times5$.}{}%
+ \xdef\PfCListeARetenirCriteres{\PfCListeARetenirCriteres,5}%
+ \else%
+ n'est pas divisible par 5.%
+ \fi%
+}%
+
+\NewDocumentCommand\CritereNeuf{m}{%
+ La somme des chiffres de \num{#1} est \PfCSommeChiffres{#1}. Comme \num{\PfCSMSomme} %
+ \modulo{\PfCSMSomme}{9}%
+ \ifnum\remainder=0\relax%
+ est divisible par 9, alors \num{#1} est aussi divisible par 9.%
+ \ifboolKV[Critere]{Remarque}{\\\textbf{Remarque} : $\num{#1}=\num{\fpeval{#1/9}}\times9$.}{}%
+ \xdef\PfCListeARetenirCriteres{\PfCListeARetenirCriteres,9}%
+ \else%
+ n'est pas divisible par 9, alors \num{#1} n'est pas divisible par 9.%
+ \fi%
+}%
+
+\NewDocumentCommand\CritereDix{m}{%
+ \StrRight{#1}{1}[\PfCCriDixUnite]%
+ Le chiffre des unités de \num{#1} est \num{\PfCCriDixUnite}. Donc \num{#1} %
+ \ifnum\PfCCriDixUnite=0\relax
+ est divisible par 10.%
+ \ifboolKV[Critere]{Remarque}{\\\textbf{Remarque} : $\num{#1}=\num{\fpeval{#1/10}}\times10$.}{}%
+ \xdef\PfCListeARetenirCriteres{\PfCListeARetenirCriteres,10}%
+ \else%
+ n'est pas divisible par 10.%
+ \fi%
+}% \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex b/macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex
index 41039e7ab6..39ec997a29 100644
--- a/macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex
@@ -741,6 +741,30 @@
}%
}%
+\newcommand\RecupListeTousFacteursPremier[1]{%
+ %#1 : le nombre entier \`a tester
+ \ensuremath{%
+ \newcount\anpl\newcount\bnpl\newcount\cnpl%
+ \newcount\pilebl%
+ \anpl=#1\relax%
+ \bnpl=2\relax%
+ \pilebl=2\relax%
+ \xdef\PfCPileFacteurs{}%
+ \whiledo{\the\anpl > 1}{%
+ \modulo{\the\anpl}{\the\bnpl}
+ \ifnum\remainder=0\relax
+ \cnpl=\numexpr\anpl/\bnpl\relax
+ \xdef\PfCPileFacteurs{\PfCPileFacteurs,\the\bnpl}%
+% \num{\the\bnpl}\ifnum\anpl>\bnpl,\fi%
+ \anpl=\cnpl\relax
+ \else%
+ \bnpl=\numexpr\bnpl+1\relax%
+ \pilebl=\bnpl\relax%
+ \fi%
+ }%
+ }%
+}%
+
\newcommand\ListeDiviseur[1]{%#1 : le nombre entier \`a tester
\newcount\anp\newcount\bnp%
\anp=#1%
diff --git a/macros/latex/contrib/profcollege/latex/PfCDefiCalc.tex b/macros/latex/contrib/profcollege/latex/PfCDefiCalc.tex
index 8e26111a31..619220704c 100644
--- a/macros/latex/contrib/profcollege/latex/PfCDefiCalc.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCDefiCalc.tex
@@ -8,6 +8,9 @@
\def\UpdatetoksTexteEcran#1\nil{\addtotok\toktexteecran{_}}
\def\UpdatetoksCibleEcran#1\nil{\addtotok\tokcibleecran{"#1"}}
+\newlength\Adaptation
+\newlength\Adaptationbis
+
\NewDocumentCommand\DefiCalculatrice{om}{%
\useKVdefault[DefiCalculatrice]%
\setKV[DefiCalculatrice]{#1}%
@@ -24,15 +27,19 @@
\addtotok\toktexteecran{"}
\expandafter\UpdatetoksCibleEcran#2\nil
% Dessin de la calculatrice
- \begin{tcolorbox}[nobeforeafter,left=0pt,right=0pt,top=0pt,bottom=0pt,width=69pt]
+ \setlength{\Adaptation}{7em+0.07\tabcolsep}
+ \setlength{\Adaptationbis}{6em}
+ \begin{tcolorbox}[nobeforeafter,left=0pt,right=0pt,top=0pt,bottom=0pt,width=\Adaptation]
+ \begin{center}
\setlength{\tabcolsep}{0.01\tabcolsep}
- \begin{tabular}{*{4}{m{20pt}}}
- \ifboolKV[DefiCalculatrice]{Impression}{\multicolumn{4}{c}{\Calculatrice[Ecran,Largeur=40,Impression]{\the\toktexteecran/\the\tokcibleecran}}}{\multicolumn{4}{c}{\Calculatrice[Ecran,Largeur=40]{\the\toktexteecran/\the\tokcibleecran}}}\\
+ \begin{tabular}{*{4}{c}}%m{20pt}}}
+ \ifboolKV[DefiCalculatrice]{Impression}{\multicolumn{4}{c}{\Calculatrice[Ecran,Largeur=\mpdim{\Adaptationbis}/0.5mm,Impression]{\the\toktexteecran/\the\tokcibleecran}}}{\multicolumn{4}{c}{\Calculatrice[Ecran,Largeur=\mpdim{\Adaptationbis}/0.5mm]{\the\toktexteecran/\the\tokcibleecran}}}\\
\multicolumn{1}{c}{\IfSubStr{\useKV[DefiCalculatrice]{ListeTouches}}{7}{\Calculatrice{/\faScrewdriver}}{\Calculatrice{/7}}}&\multicolumn{1}{c}{\IfSubStr{\useKV[DefiCalculatrice]{ListeTouches}}{8}{\Calculatrice{/\faScrewdriver}}{\Calculatrice{/8}}}&\multicolumn{1}{c}{\IfSubStr{\useKV[DefiCalculatrice]{ListeTouches}}{9}{\Calculatrice{/\faScrewdriver}}{\Calculatrice{/9}}}&\multicolumn{1}{c}{\IfSubStr{\useKV[DefiCalculatrice]{ListeTouches}}{/}{\Calculatrice{/\faScrewdriver}}{\Calculatrice{/$\div$}}}\\
\multicolumn{1}{c}{\IfSubStr{\useKV[DefiCalculatrice]{ListeTouches}}{4}{\Calculatrice{/\faScrewdriver}}{\Calculatrice{/4}}}&\multicolumn{1}{c}{\IfSubStr{\useKV[DefiCalculatrice]{ListeTouches}}{5}{\Calculatrice{/\faScrewdriver}}{\Calculatrice{/5}}}&\multicolumn{1}{c}{\IfSubStr{\useKV[DefiCalculatrice]{ListeTouches}}{6}{\Calculatrice{/\faScrewdriver}}{\Calculatrice{/6}}}&\multicolumn{1}{c}{\IfSubStr{\useKV[DefiCalculatrice]{ListeTouches}}{*}{\Calculatrice{/\faScrewdriver}}{\Calculatrice{/$\times$}}}\\
\multicolumn{1}{c}{\IfSubStr{\useKV[DefiCalculatrice]{ListeTouches}}{1}{\Calculatrice{/\faScrewdriver}}{\Calculatrice{/1}}}&\multicolumn{1}{c}{\IfSubStr{\useKV[DefiCalculatrice]{ListeTouches}}{2}{\Calculatrice{/\faScrewdriver}}{\Calculatrice{/2}}}&\multicolumn{1}{c}{\IfSubStr{\useKV[DefiCalculatrice]{ListeTouches}}{3}{\Calculatrice{/\faScrewdriver}}{\Calculatrice{/3}}}&\multicolumn{1}{c}{\IfSubStr{\useKV[DefiCalculatrice]{ListeTouches}}{-}{\Calculatrice{/\faScrewdriver}}{\Calculatrice{/$-$}}}\\
\multicolumn{1}{c}{\IfSubStr{\useKV[DefiCalculatrice]{ListeTouches}}{0}{\Calculatrice{/\faScrewdriver}}{\Calculatrice{/0}}}&\multicolumn{1}{c}{\IfSubStr{\useKV[DefiCalculatrice]{ListeTouches}}{.}{\Calculatrice{/\faScrewdriver}}{\Calculatrice{/.}}}&\multicolumn{1}{c}{\IfSubStr{\useKV[DefiCalculatrice]{ListeTouches}}{=}{\Calculatrice{/\faScrewdriver}}{\Calculatrice{/$=$}}}&\multicolumn{1}{c}{\IfSubStr{\useKV[DefiCalculatrice]{ListeTouches}}{+}{\Calculatrice{/\faScrewdriver}}{\Calculatrice{/$+$}}}\\
\end{tabular}
\setlength{\tabcolsep}{100\tabcolsep}
+ \end{center}
\end{tcolorbox}
}% \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCDefiTables.tex b/macros/latex/contrib/profcollege/latex/PfCDefiTables.tex
index 20c48cb593..340d598e2f 100644
--- a/macros/latex/contrib/profcollege/latex/PfCDefiTables.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCDefiTables.tex
@@ -165,7 +165,7 @@
}{%
\setsepchar[*]{§* }%
\readlist*\ListeDefiTableCode{#2}%
- \begin{NiceTabular}{>{\columncolor{gray!15}}{c}*{10}{c}}[hvlines]
+ \begin{NiceTabular}{>{\columncolor{gray!15}}{c}*{10}{c}}[hvlines,color-inside]
\rowcolor{gray!15}$\times$&\xintFor* ##1 in {\xintSeq {1}{10}}\do{%
\xintifForFirst{}{&}##1}
\\
diff --git a/macros/latex/contrib/profcollege/latex/PfCDistributivite.tex b/macros/latex/contrib/profcollege/latex/PfCDistributivite.tex
index 272e260d0a..db36fa7d34 100644
--- a/macros/latex/contrib/profcollege/latex/PfCDistributivite.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCDistributivite.tex
@@ -38,7 +38,7 @@
% y a dans un "seul calcul".
\setcounter{NbCalculDistri}{0}
-\setKVdefault[ClesDistributivite]{Cours=false,Etape=1,Lettre=x,Fleches=false,AideMul=false,Reduction=false,AideAdda=false,AideAddb=false,CouleurAide=red,CouleurFH=blue,CouleurFB=red,Somme=false,Difference=false,RAZ=false,Oppose=false,All=false,NomExpression=A,Fin=4,Numerique=false,Remarquable=false,Echange=0,Tuile=false,Vide=false,Reperes=false,Impression=false,Tableau=false}%,AideAdd=false:inutile ?
+\setKVdefault[ClesDistributivite]{Cours=false,Etape=1,Lettre=x,Lettrea=a,Lettreb=b,Lettrec=c,Lettred=d,Fleches=false,AideMul=false,Reduction=false,AideAdda=false,AideAddb=false,CouleurAide=red,CouleurFH=blue,CouleurFB=red,Somme=false,Difference=false,RAZ=false,Oppose=false,All=false,NomExpression=A,Fin=4,Numerique=false,Remarquable=false,Echange=0,Tuile=false,Vide=false,Reperes=false,Impression=false,Tableau=false}%,AideAdd=false:inutile ?
\defKV[ClesDistributivite]{CouleurReduction=\colorlet{DCReduction}{#1}\setKV[ClesDistributivite]{Reduction}}%
\newcommand\Tuile[4]{%
\ifluatex
@@ -465,9 +465,9 @@
\ifboolKV[ClesDistributivite]{Cours}{%
\ensuremath{%
\xintifboolexpr{#2==0}{%
- }{\xintifboolexpr{#3==0}{}{(}}\xintifboolexpr{#2==0}{\Tikzmark{}}{\Tikzmark{a}}
+ }{\xintifboolexpr{#3==0}{}{(}}\xintifboolexpr{#2==0}{\Tikzmark{}}{\Tikzmark{\useKV[ClesDistributivite]{Lettrea}}}
\ifboolKV[ClesDistributivite]{AideAdda}{\mathcolor{DCAide}{+(}}{}%
- \xintifboolexpr{#3==0}{\Tikzmark{}}{\xintifboolexpr{#3>0}{\xintifboolexpr{#2==0}{}{+}}{\xintifboolexpr{#3<0}{-}{}}\Tikzmark{b}}%
+ \xintifboolexpr{#3==0}{\Tikzmark{}}{\xintifboolexpr{#3>0}{\xintifboolexpr{#2==0}{}{+}}{\xintifboolexpr{#3<0}{-}{}}\Tikzmark{\useKV[ClesDistributivite]{Lettreb}}}%
\ifboolKV[ClesDistributivite]{AideAdda}{\mathcolor{DCAide}{)}}{}%
\xintifboolexpr{#2==0}{}{\xintifboolexpr{#3==0}{}{)}}%
%
@@ -476,9 +476,9 @@
%
\xintifboolexpr{\Multi==0}{\times%
\xintifboolexpr{#4<0}{(}{\xintifboolexpr{#5<0}{(}{}}}{(}%
- \Tikzmark{c}%
+ \Tikzmark{\useKV[ClesDistributivite]{Lettrec}}%
\ifboolKV[ClesDistributivite]{AideAddb}{\mathcolor{DCAide}{+(}}{}%
- \xintifboolexpr{#5>0}{\xintifboolexpr{#4==0}{}{+}}{\xintifboolexpr{#5<0}{\xintifboolexpr{#4==0}{{-}}{-}}{}}\Tikzmark{d}%
+ \xintifboolexpr{#5>0}{\xintifboolexpr{#4==0}{}{+}}{\xintifboolexpr{#5<0}{\xintifboolexpr{#4==0}{{-}}{-}}{}}\Tikzmark{\useKV[ClesDistributivite]{Lettred}}%
\ifboolKV[ClesDistributivite]{AideAddb}{\mathcolor{DCAide}{)}}{}%
\xintifboolexpr{\Multi==0}{%
\xintifboolexpr{#4<0}{)}{\xintifboolexpr{#5<0}{)}{}}}{)}%
@@ -487,21 +487,21 @@
%
\xdef\Multi{\fpeval{#2*#4}}%
\xintifboolexpr{\Multi==0}{}{%
- \xintifboolexpr{#2<0}{(-}{}a\xintifboolexpr{#2<0}{)}{}\times\xintifboolexpr{#4<0}{(-}{}c\xintifboolexpr{#4<0}{)}{}%
+ \xintifboolexpr{#2<0}{(-}{}\useKV[ClesDistributivite]{Lettrea}\xintifboolexpr{#2<0}{)}{}\times\xintifboolexpr{#4<0}{(-}{}\useKV[ClesDistributivite]{Lettrec}\xintifboolexpr{#4<0}{)}{}%
}
\xdef\Multij{\fpeval{#2*#5}}%
\xintifboolexpr{\Multij==0}{}{%
\xintifboolexpr{\Multi==0}{}{+}%
- \xintifboolexpr{#2<0}{(-}{}a\xintifboolexpr{#2<0}{)}{}\times\xintifboolexpr{#5<0}{(-}{}d\xintifboolexpr{#5<0}{)}{}%
+ \xintifboolexpr{#2<0}{(-}{}\useKV[ClesDistributivite]{Lettrea}\xintifboolexpr{#2<0}{)}{}\times\xintifboolexpr{#5<0}{(-}{}\useKV[ClesDistributivite]{Lettred}\xintifboolexpr{#5<0}{)}{}%
}%
\xdef\Multik{\fpeval{#3*#4}}%
\xintifboolexpr{\Multik==0}{}{%
\xintifboolexpr{\Multi==0}{}{+}%
- \xintifboolexpr{#3<0}{(-}{}b\xintifboolexpr{#3<0}{)}{}\times\xintifboolexpr{#4<0}{(-}{}c\xintifboolexpr{#4<0}{)}{}%
+ \xintifboolexpr{#3<0}{(-}{}\useKV[ClesDistributivite]{Lettreb}\xintifboolexpr{#3<0}{)}{}\times\xintifboolexpr{#4<0}{(-}{}\useKV[ClesDistributivite]{Lettrec}\xintifboolexpr{#4<0}{)}{}%
}%
\xdef\Multil{\fpeval{#3*#5}}%
\xintifboolexpr{\Multil==0}{}{+%
- \xintifboolexpr{#3<0}{(-}{}b\xintifboolexpr{#3<0}{)}{}\times\xintifboolexpr{#5<0}{(-}{}d\xintifboolexpr{#5<0}{)}{}%
+ \xintifboolexpr{#3<0}{(-}{}\useKV[ClesDistributivite]{Lettreb}\xintifboolexpr{#3<0}{)}{}\times\xintifboolexpr{#5<0}{(-}{}\useKV[ClesDistributivite]{Lettred}\xintifboolexpr{#5<0}{)}{}%
}%
% Fleches
\ifboolKV[ClesDistributivite]{Fleches}{%
@@ -705,7 +705,7 @@
}{%
\xintifboolexpr{\theNbCalculDistri>1}{\xintifboolexpr{\Multi<0}{(\Affichage{\Multi}{0}{0})}{\Affichage{\Multi}{0}{0}}}{\Affichage{\Multi}{0}{0}}%
\xintifboolexpr{\Multim==0}{}{%
- \xintifboolexpr{\Multim>0}{+\Affichage{0}{\Multim}{0}}{-\Affichage{0}{\fpeval{-\Multim}}{0}}%
+ \xintifboolexpr{\Multim>0}{\ifnum\Multi>0\relax{}+\fi\Affichage{0}{\Multim}{0}}{-\Affichage{0}{\fpeval{-\Multim}}{0}}%
}%
\xintifboolexpr{\Multil==0}{}{\xintifboolexpr{\Multil<0}{-\Affichage{0}{0}{\fpeval{-\Multil}}}{+\Affichage{0}{0}{\Multil}}}%
}
diff --git a/macros/latex/contrib/profcollege/latex/PfCEcrireunQCM.tex b/macros/latex/contrib/profcollege/latex/PfCEcrireunQCM.tex
index dc5d541157..188bd3a569 100644
--- a/macros/latex/contrib/profcollege/latex/PfCEcrireunQCM.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCEcrireunQCM.tex
@@ -1,7 +1,7 @@
%%%
% QCM
%%%
-\setKVdefault[ClesQCM]{Reponses=3,Solution=false,Stretch=1,Largeur=60pt,Couleur=gray!15,Titre=false,Nom=R\'eponse,NomV=Vrai,NomF=Faux,Alph=false,AlphT=false,VF=false,Depart=1,Alterne=false,Noms={A/B/C},Multiple=false,Parties={Yeux,Nez,Bouche}}%
+\setKVdefault[ClesQCM]{Reponses=3,Solution=false,Stretch=1,Largeur=60pt,Couleur=gray!15,Titre=false,Nom=R\'eponse,NomV=Vrai,NomF=Faux,Alph=false,AlphT=false,VF=false,Depart=1,Alterne=false,Noms={A/B/C},Multiple=false,Parties={Yeux,Nez,Bouche},CouleurAlt=gray!15}%
\newlength{\LargeurQCM}%
\newlength{\PfCLargeurQCM}%
\newcounter{QuestionQCM}%
@@ -12,6 +12,7 @@
\newcommand\QCMPfC[2][]{%
\useKVdefault[ClesQCM]%
\setKV[ClesQCM]{#1}%
+ \colorlet{PfCCouleurAlterneQCM}{\useKV[ClesQCM]{CouleurAlt}}%
\setcounter{QuestionQCM}{\fpeval{\useKV[ClesQCM]{Depart}-1}}%
\setcounter{TitreQCM}{0}
\setsepchar[*]{,*&}\ignoreemptyitems%
@@ -30,8 +31,8 @@
\\
\hline%
\xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
- \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
- &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{\ListeQCM[##1,\fpeval{##2+1}]==1}{$\boxtimes$}{$\square$}}{$\square$}%
+ \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+ &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{\ListeQCM[##1,\fpeval{##2+1}]==1}{$\boxtimes$}{$\square$}}{$\square$}%
}\\
}%
\hline%
@@ -49,8 +50,8 @@
\multicolumn{1}{c|}{}&\useKV[ClesQCM]{NomV}&\useKV[ClesQCM]{NomF}\\
\hline%
\xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
- \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
- &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{##2==\ListeQCM[##1,2]}{$\boxtimes$}{$\square$}}{$\square$}%
+ \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+ &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{##2==\ListeQCM[##1,2]}{$\boxtimes$}{$\square$}}{$\square$}%
}\\
}%
\hline%
@@ -65,8 +66,8 @@
}{}
\hline%
\xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
- \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
- &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\PfCSolCellColor{##1}{##2}}{}\ListeQCM[##1,##2+1]%
+ \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+ &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Solution}{\PfCSolCellColor{##1}{##2}}{}\ListeQCM[##1,##2+1]%
}\\
}%
\hline%
@@ -74,11 +75,12 @@
}%
}%
\renewcommand{\arraystretch}{1}%
- }
+ }%
}{%
\newcommand\QCM[2][]{%
\useKVdefault[ClesQCM]%
\setKV[ClesQCM]{#1}%
+ \colorlet{PfCCouleurAlterneQCM}{\useKV[ClesQCM]{CouleurAlt}}%
\setcounter{QuestionQCM}{\fpeval{\useKV[ClesQCM]{Depart}-1}}%
\setcounter{TitreQCM}{0}
\setsepchar[*]{,*&}\ignoreemptyitems%
@@ -97,8 +99,8 @@
\\
\hline%
\xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
- \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
- &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{\ListeQCM[##1,\fpeval{##2+1}]==1}{$\boxtimes$}{$\square$}}{$\square$}%
+ \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+ &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{\ListeQCM[##1,\fpeval{##2+1}]==1}{$\boxtimes$}{$\square$}}{$\square$}%
}\\
}%
\hline%
@@ -115,8 +117,8 @@
\multicolumn{1}{c|}{}&\useKV[ClesQCM]{NomV}&\useKV[ClesQCM]{NomF}\\
\hline%
\xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
- \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
- &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{##2==\ListeQCM[##1,2]}{$\boxtimes$}{$\square$}}{$\square$}%
+ \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+ &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{##2==\ListeQCM[##1,2]}{$\boxtimes$}{$\square$}}{$\square$}%
}\\
}%
\hline%
@@ -129,11 +131,11 @@
\multicolumn{1}{c|}{}\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
&\stepcounter{TitreQCM}\useKV[ClesQCM]{Nom} \ifboolKV[ClesQCM]{AlphT}{\Alph{TitreQCM}}{##2}}%
\\
- }{}
+ }{}%
\hline%
\xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
- \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
- &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\PfCSolCellColor{##1}{##2}}{}\ListeQCM[##1,\fpeval{##2+1}]%
+ \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+ &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{PfCCouleurAlterneQCM}\fi}{}\ifboolKV[ClesQCM]{Solution}{\PfCSolCellColor{##1}{##2}}{}\ListeQCM[##1,\fpeval{##2+1}]%
}\\
}%
\hline%
diff --git a/macros/latex/contrib/profcollege/latex/PfCErathostene.tex b/macros/latex/contrib/profcollege/latex/PfCErathostene.tex
deleted file mode 100644
index 2924d856d5..0000000000
--- a/macros/latex/contrib/profcollege/latex/PfCErathostene.tex
+++ /dev/null
@@ -1,80 +0,0 @@
-\setKVdefault[ClesEra]{Premier=false,Nombre=1,CouleurP=Cornsilk!50,CouleurNP=Crimson!15,Colonnes=10,Lignes=10,Hauteur=24pt}
-
-\NewDocumentCommand\TestPremier{m}{%
- % #1 le nombre premier \`a tester
- \newcount\anp\newcount\bnp\newcount\cnp%
- \anp=#1\relax
- \bnp=2\relax
- \premier=-1\relax
- % Pour d\'eterminer le nombre d'\'etapes
- \whiledo{\anp > 1}{%
- \modulo{\the\anp}{\the\bnp}
- \ifnum\remainder=0\relax
- \global\premier=\numexpr\premier+1\relax
- \cnp=\numexpr\anp/\bnp\relax
- \anp=\cnp\relax
- \else%
- \bnp=\numexpr\bnp+1\relax%
- \fi%
- }%
- \ifnum\premier=0%
- \setKV[ClesEra]{Premier=true}%
- \else
- \setKV[ClesEra]{Premier=false}%
- \fi%
-}%
-
-\newlength{\PfCEraHauteur}
-
-\NewDocumentCommand\Erathostene{o}{%
- \useKVdefault[ClesEra]
- \setKV[ClesEra]{#1}
- \setlength{\PfCEraHauteur}{\useKV[ClesEra]{Hauteur}}%
- \xdef\PfCEraMax{\fpeval{\useKV[ClesEra]{Lignes}*\useKV[ClesEra]{Colonnes}}}%
- \colorlet{PfCCouleurPremier}{\useKV[ClesEra]{CouleurP}}
- \colorlet{PfCCouleurPasPremier}{\useKV[ClesEra]{CouleurNP}}
- \begin{NiceTabular}{*{\useKV[ClesEra]{Colonnes}}{m{\PfCEraHauteur-\tabcolsep}}}[hvlines]
- \CodeBefore
- \tikz\draw[fill,PfCCouleurPasPremier] (1-|1) rectangle (2-|2);
- \xintifboolexpr{\useKV[ClesEra]{Nombre}>1}{%
- \xintFor* ##3 in{\xintSeq{2}{\useKV[ClesEra]{Nombre}}}\do{%
- \TestPremier{##3}
- \ifboolKV[ClesEra]{Premier}{%
- % on positionne le nombre premier
- \xdef\PfCEraLigneA{\fpeval{floor(##3/\useKV[ClesEra]{Colonnes})+1}}%
- \xdef\PfCEraLigneB{\fpeval{floor(##3/\useKV[ClesEra]{Colonnes})+2}}%
- \xdef\PfCEraLigneC{\fpeval{floor(##3/\useKV[ClesEra]{Colonnes})}}%
- \xdef\PfCEraColonneA{\fpeval{##3-\useKV[ClesEra]{Colonnes}*floor(##3/\useKV[ClesEra]{Colonnes})}}
- \xdef\PfCEraColonneB{\fpeval{##3-\useKV[ClesEra]{Colonnes}*floor(##3/\useKV[ClesEra]{Colonnes})+1}}
- \xintifboolexpr{\PfCEraColonneA==0}{%
- \tikz\draw[fill,PfCCouleurPremier] (\PfCEraLigneC-|\useKV[ClesEra]{Colonnes}) rectangle (\PfCEraLigneA-|\fpeval{\useKV[ClesEra]{Colonnes}+1});
- }{%
- \tikz\draw[fill,PfCCouleurPremier] (\PfCEraLigneA-|\PfCEraColonneA) rectangle (\PfCEraLigneB-|\PfCEraColonneB);
- }%
- %On positionne ses multiples
- \xintFor* ##4 in{\xintSeq{2}{\fpeval{floor(\PfCEraMax/##3)}}}\do{%
- \xintifboolexpr{##3>\fpeval{floor(sqrt(\PfCEraMax))}}{\xintBreakFor}{%
- \xdef\PfCEraLigneA{\fpeval{floor(##3*##4/\useKV[ClesEra]{Colonnes})+1}}%
- \xdef\PfCEraLigneB{\fpeval{floor(##3*##4/\useKV[ClesEra]{Colonnes})+2}}%
- \xdef\PfCEraLigneC{\fpeval{floor(##3*##4/\useKV[ClesEra]{Colonnes})}}%
- \xdef\PfCEraColonneA{\fpeval{##3*##4-\useKV[ClesEra]{Colonnes}*floor(##3*##4/\useKV[ClesEra]{Colonnes})}}
- \xdef\PfCEraColonneB{\fpeval{##3*##4-\useKV[ClesEra]{Colonnes}*floor(##3*##4/\useKV[ClesEra]{Colonnes})+1}}
- \xintifboolexpr{\PfCEraColonneA==0}{%
- \tikz\draw[fill,PfCCouleurPasPremier] (\PfCEraLigneC-|\useKV[ClesEra]{Colonnes}) rectangle (\PfCEraLigneA-|\fpeval{\useKV[ClesEra]{Colonnes}+1});
- }{%
- \tikz\draw[fill,PfCCouleurPasPremier] (\PfCEraLigneA-|\PfCEraColonneA) rectangle (\PfCEraLigneB-|\PfCEraColonneB);
- }%
- }%
- }%
- }{%Le nombre choisi n'est pas un nombre premier, ses multiples ont déjà étaient criblés.
- }%
- }%
- }%
- \Body
- \xintFor* ##1 in{\xintSeq{0}{\fpeval{\useKV[ClesEra]{Lignes}-1}}}\do{%
- \xintFor* ##2 in{\xintSeq{1}{\useKV[ClesEra]{Colonnes}}}\do{%
- \xintifForFirst{\rule{0pt}{\PfCEraHauteur}}{&}\Block{1-1}{\fpeval{##2+##1*\useKV[ClesEra]{Colonnes}}}
- }\\
- }%
- \end{NiceTabular}
-}% \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCFractionNombre.tex b/macros/latex/contrib/profcollege/latex/PfCFractionNombre.tex
index f373aecc6c..08e9936d52 100644
--- a/macros/latex/contrib/profcollege/latex/PfCFractionNombre.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCFractionNombre.tex
@@ -4,7 +4,7 @@
\newtoks\tokFractionNombrePerso%
\def\UpdatetoksFN#1\nil{\addtotok\tokFractionNombrePerso{"#1",}}%
-\setKVdefault[ClesFN]{Unite=5cm,Aire=false,Solution=false,Quadrillage=false,PasQuad=5mm,HautQuad=3,LargQuad=8,Vide=false,Creation=false,Couleur=blue,UniteAire=1x1}%
+\setKVdefault[ClesFN]{Unite=5cm,Aire=false,Solution=false,Quadrillage=false,PasQuad=5mm,HautQuad=3,LargQuad=8,Vide=false,Creation=false,Couleur=blue,UniteAire=1x1,Pointilles=false,Tentatives=10}%
\defKV[ClesFN]{Perso=\setKV[ClesFN]{Creation}\xdef\PfCFooCheminFN{#1}}%
\NewDocumentCommand\FractionNombre{om}{%
@@ -131,6 +131,7 @@
enddef;
%
def PopChemin=
+ tentative:=tentative+1;
currentpicture:=nullpicture;
RAZZone;
for k=-1 upto HautQuad:
@@ -192,9 +193,12 @@
fi;
enddef;
%
+ boolean Vide;
+ Vide=\useKV[ClesFN]{Vide};
PasQuad=\useKV[ClesFN]{PasQuad};
HautQuad=\useKV[ClesFN]{HautQuad};
LargQuad=\useKV[ClesFN]{LargQuad};
+ Tentatives=\useKV[ClesFN]{Tentatives};
pair A,B,C,D,U[];
A=(0,0);
B-A=PasQuad*(LargQuad,0);
@@ -215,13 +219,15 @@
ChoixLigneD=ceiling(uniformdeviate(HautQuad-1));
ChoixColonneD=ceiling(uniformdeviate(LargQuad-#3-1));
%
+ tentative:=1;
+ if Vide=false:
PushChemin((ChoixLigneD,ChoixColonneD));
nbcaseschoisies=1;
fill ((unitsquare scaled 5mm) shifted (5mm*(ChoixColonneD-1,ChoixLigneD-1))) withcolor LightSteelBlue;
Impossible[ChoixLigneD][ChoixColonneD]:=true;
VoisinDispo(ChoixLigneD,ChoixColonneD);
% Le "parcours"
- forever: exitif nbcaseschoisies>NbTotalCasesAColorier-1;
+ forever: exitif (nbcaseschoisies>NbTotalCasesAColorier-1) or (tentative>Tentatives);
nb:=ceiling(uniformdeviate(nbvoisin));
if nb>0:
for k=1 upto nbvoisin:
@@ -235,7 +241,19 @@
PopChemin;
fi;
endfor;
+ fi;
% Tracage
+ if tentative>Tentatives:
+ currentpicture:=nullpicture;
+ picture MiseEnGarde;
+ MiseEnGarde=image(
+ label(TEX("\begin{minipage}{0.5\linewidth}
+ La construction automatique a échouée. Relancez en augmentant le nombre de tentatives ou en augmentant les dimensions du quadrillage (Hauteur,Largeur)
+ \end{minipage}"),(0,0));
+ );
+ draw (((llcorner MiseEnGarde)--(lrcorner MiseEnGarde)--(urcorner MiseEnGarde)--(ulcorner MiseEnGarde)--cycle) scaled 1.1) withpen pensquare scaled 2;
+ draw MiseEnGarde;
+ else:
fill polygone(U0,U1,U2,U3) withcolor 0.7white;
label.top(TEX("\textbf{1 ua}"),iso(U1,U0));
%Le quadrillage
@@ -246,6 +264,7 @@
for k=1 upto HautQuad-1:
trace (k/HautQuad)[A,D]--(k/HautQuad)[B,C];
endfor;
+ fi;
\end{mplibcode}
\fi
}%
@@ -298,10 +317,11 @@
Unite:=#2;%\useKV[ClesFN]{Unite};%en carreaux
HautQuad:=\useKV[ClesFN]{HautQuad};
Largeur:=Unite;%en carreaux
- boolean Solution,Vide,Creation;
+ boolean Solution,Vide,Creation,Pointilles;
Solution=\useKV[ClesFN]{Solution};
Vide=\useKV[ClesFN]{Vide};
Creation=\useKV[ClesFN]{Creation};
+ Pointilles=\useKV[ClesFN]{Pointilles};
color CoulFN;
CoulFN=\useKV[ClesFN]{Couleur};
Num:=#1;
@@ -407,10 +427,10 @@
endfor;
fi;
if Vide=false:
- trace ch[0] for k=1 upto #1:--ch[k] endfor withpen pencircle scaled 2 withcolor CoulFN;
+ trace ch[0] for k=1 upto #1:--ch[k] endfor withpen pencircle scaled 2 if Pointilles: dashed evenly else: withcolor CoulFN fi;
fi;
trace cotationmil(D,(D+#2*(PasQuad,0)),5mm,15,TEX("1 ul"));
trace segment(D,D+#2*(PasQuad,0)) withpen pencircle scaled 1.5;
\end{mplibcode}
\fi
-}% \ No newline at end of file
+}%
diff --git a/macros/latex/contrib/profcollege/latex/PfCGeometrie.tex b/macros/latex/contrib/profcollege/latex/PfCGeometrie.tex
index ab15f8754e..0ae20f54e7 100644
--- a/macros/latex/contrib/profcollege/latex/PfCGeometrie.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCGeometrie.tex
@@ -3,7 +3,7 @@
%%%
\setKVdefault[Geometrie]{CoinBG={(0,0)},CoinHD={(10u,10u)},TypeTrace="Instruments"}%
-\ifluatex
+\ifluatex%
\NewDocumentEnvironment{Geometrie}{o +b}{%
\useKVdefault[Geometrie]%
\setKV[Geometrie]{#1}%
@@ -30,7 +30,7 @@
_tfig:=2*_tfig;
#2%
\end{mplibcode}
-}{}
+}{}%
\else
\NewDocumentEnvironment{Geometrie}{o +b}{%
\useKVdefault[Geometrie]%
@@ -57,5 +57,5 @@
_tfig:=2*_tfig;
#2%
\end{mpost}
-}{}
+}{}%
\fi% \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCKakuro.tex b/macros/latex/contrib/profcollege/latex/PfCKakuro.tex
index 1f8d7f3f49..bbb99424f6 100644
--- a/macros/latex/contrib/profcollege/latex/PfCKakuro.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCKakuro.tex
@@ -22,7 +22,7 @@
\readlist*\ListeKakuroNombres{\ListeAvantNombres}%
\savecomparemode%
\comparestrict%
- \begin{NiceTabular}{*{\useKV[Kakuro]{TLargeur}}{m{\useKV[Kakuro]{Largeur}}}}[hvlines]%
+ \begin{NiceTabular}{*{\useKV[Kakuro]{TLargeur}}{m{\useKV[Kakuro]{Largeur}}}}[hvlines,color-inside]%
\xintFor* ##1 in {\xintSeq{0}{\fpeval{\useKV[Kakuro]{THauteur}-1}}}\do{%
\xintFor* ##2 in {\xintSeq{1}{\useKV[Kakuro]{TLargeur}}}\do{%
\rule{0pt}{\PfCKakuro}%
diff --git a/macros/latex/contrib/profcollege/latex/PfCKenKen.tex b/macros/latex/contrib/profcollege/latex/PfCKenKen.tex
index 60f072b208..8e8daa9f86 100644
--- a/macros/latex/contrib/profcollege/latex/PfCKenKen.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCKenKen.tex
@@ -14,7 +14,7 @@
\readlist*\ListeCasesKK{#2}%
\savecomparemode%
\comparestrict%
- \begin{NiceTabular}{*{\useKV[ClesKK]{Taille}}{m{\useKV[ClesKK]{Largeur}}}}%
+ \begin{NiceTabular}{*{\useKV[ClesKK]{Taille}}{m{\useKV[ClesKK]{Largeur}}}}[color-inside]%
\CodeBefore
\xintFor* ##1 in {\xintSeq{2}{\fpeval{\useKV[ClesKK]{Taille}}}}\do{%
\tikz\draw[gray] (##1-|1) -- (##1-|last);%
diff --git a/macros/latex/contrib/profcollege/latex/PfCMotsCodes.tex b/macros/latex/contrib/profcollege/latex/PfCMotsCodes.tex
index ad49524c71..6a638a7c93 100644
--- a/macros/latex/contrib/profcollege/latex/PfCMotsCodes.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCMotsCodes.tex
@@ -9,7 +9,7 @@
\setsepchar[*]{§*/}%
\readlist*\ListeMotsCodes{#2}%
\xdef\ListeMotsCodesPas{\fpeval{\ListeMotsCodeslen/\useKV[MotsCodes]{Colonnes}}}%
- \begin{NiceTabular}{*{\fpeval{\useKV[MotsCodes]{Colonnes}}}{>{\centering\arraybackslash}m{\useKV[MotsCodes]{Largeur}}}}
+ \begin{NiceTabular}{*{\fpeval{\useKV[MotsCodes]{Colonnes}}}{>{\centering\arraybackslash}m{\useKV[MotsCodes]{Largeur}}}}[color-inside]
\xintFor* ##1 in {\xintSeq {1}{\ListeMotsCodesPas}}\do{%
\xintFor* ##2 in {\xintSeq {1}{\fpeval{\useKV[MotsCodes]{Colonnes}}}}\do{%
\xintifForFirst{}{&}\Block[draw=black]{4-1}{}%
@@ -38,7 +38,7 @@
\foreachitem\compteur\in\ListeMotsCodesTableau{%
\xintifboolexpr{\ListeMotsCodesMax<\listlen\ListeMotsCodesTableau[\compteurcnt]}{\xdef\ListeMotsCodesMax{\fpeval{\listlen\ListeMotsCodesTableau[\compteurcnt]}}}{}%
}%
- \begin{NiceTabular}{*{\fpeval{\ListeMotsCodesMax}}{>{\centering\arraybackslash}m{\useKV[MotsCodes]{LargeurT}}}}
+ \begin{NiceTabular}{*{\fpeval{\ListeMotsCodesMax}}{>{\centering\arraybackslash}m{\useKV[MotsCodes]{LargeurT}}}}[color-inside]
\xintFor* ##1 in {\xintSeq {1}{\fpeval{\ListeMotsCodesTableaulen}}}\do{%
\xintFor* ##2 in {\xintSeq {1}{\listlen\ListeMotsCodesTableau[##1]}}\do{%
\xintifForFirst{}{&}\ifboolKV[MotsCodes]{Solution}{%
diff --git a/macros/latex/contrib/profcollege/latex/PfCNotionFonction.tex b/macros/latex/contrib/profcollege/latex/PfCNotionFonction.tex
index 7723e8b1af..7fdeb47dec 100644
--- a/macros/latex/contrib/profcollege/latex/PfCNotionFonction.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCNotionFonction.tex
@@ -90,8 +90,8 @@
}%
}%
-\setKVdefault[LecGra]{NbPoints=7,Image=false,Antecedent=false,Equation=false,UniteX=1,UniteY=1,Epaisseur=1,CouleurTrace=black,Points}
-\defKV[LecGra]{Graine=\PfCGraineAlea{#1}}
+\setKVdefault[LecGra]{NbPoints=7,Image=false,Antecedent=false,Equation=false,UniteX=1,UniteY=1,Epaisseur=1,CouleurTrace=black,Points,Tableau=false,SolutionTableau=false,Prolonge=false}%
+\defKV[LecGra]{Graine=\PfCGraineAlea{#1}}%
\newread\myread
@@ -132,6 +132,20 @@
\setsepchar{,}%
\readlist*\ListeAbscisses{\FooAbscisses}%
\readlist*\ListeOrdonnees{\FooOrdonnees}%
+ \ifboolKV[LecGra]{Tableau}{%
+ \ifboolKV[LecGra]{Prolonge}{\xdef\LecGraDepartTab{2}\xdef\LecGraArriveeTab{\fpeval{\ListeAbscisseslen-1}}}{\xdef\LecGraDepartTab{1}\xdef\LecGraArriveeTab{\ListeAbscisseslen}}
+ \begin{center}
+ \begin{NiceTabular}{c*{\ListeAbscisseslen}{m{12pt}}}[hvlines]
+ $x$\xintFor* ##1 in{\xintSeq{\LecGraDepartTab}{\LecGraArriveeTab}}\do{
+ &\Block{}{\num{\ListeAbscisses[##1]}}%
+ }\\
+ $f(x)$\ifboolKV[LecGra]{SolutionTableau}{\xintFor* ##1 in{\xintSeq{\LecGraDepartTab}{\LecGraArriveeTab}}\do{
+ &\num{\ListeOrdonnees[##1]}%
+ }%
+ }{}\\
+ \end{NiceTabular}
+ \end{center}
+ }{%
\xdef\FooPoints{0/\ListeAbscisses[1]/\ListeOrdonnees[1]/0}%
\xintFor*##1 in{\xintSeq{2}{\useKV[LecGra]{NbPoints}}}\do{%
\xdef\FooPoints{\FooPoints§0/\ListeAbscisses[##1]/\ListeOrdonnees[##1]/0}%
@@ -148,6 +162,7 @@
\Fonction[
Points,
Splines,
+ Prolonge=\useKV[LecGra]{Prolonge},
PointsCourbe=\useKV[LecGra]{Points},
Epaisseur=\useKV[LecGra]{Epaisseur},
CouleurTrace=\useKV[LecGra]{CouleurTrace},
@@ -246,7 +261,8 @@
\xintifForLast{ et }{\xintifForFirst{}{;}}\num{\fpeval{round(\ListeNombreAntecedents,1)}}%
}\else c'est \read\myread to \ListeNombreAntecedents\num{\fpeval{round(\ListeNombreAntecedents,1)}}\fi
\fi.%
- }{}%
+}{}%
+}
}%
\def\MPSplineCode{%
@@ -649,7 +665,7 @@
vardef courbe[](expr a,b,nb)(text texte)=
path Courbe;
for i:=0 upto nb :
- x@[i]:=(a+i*(b-a)/nb);
+ x@[i]:=(a+i*((b-a)/nb));
x:=x@[i];
y@[i]:=texte;
endfor ;
diff --git a/macros/latex/contrib/profcollege/latex/PfCNumberHive.tex b/macros/latex/contrib/profcollege/latex/PfCNumberHive.tex
index 3c7903c3a0..ee37a5b2f1 100644
--- a/macros/latex/contrib/profcollege/latex/PfCNumberHive.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCNumberHive.tex
@@ -28,10 +28,14 @@
\ifboolKV[NumberHive]{Graines}{\PfCGraineAlea{\useKV[NumberHive]{Graine}}}{}%
\ifboolKV[NumberHive]{Produit}{%
\xdef\PfCNHListe{1,2,3,4,5,6,7,8,9,10,11,12,14,16,18,20,22,24,15,21,27,30,33,36,28,32,40,44,48,25,35,45,50,55,60,42,54,66,72,56,63,70,77,84,64,72,80,88,96,81,90,99,108,100,110,120,121,132,144}%
+ \ifboolKV[NumberHive]{Negatif}{%
+ \xdef\PfCNHListe{-1,-2,-3,-4,-5,-6,-8,-10,-12,-9,-15,-18,-16,-20,-24,-25,-30,-36,1,2,3,4,5,6,8,10,12,9,15,18,16,20,24,25,30,36}%
+ \xdef\PfCNHListe{\PfCNHListe,\PfCNHListe}%
+ }{}%
\ifboolKV[NumberHive]{Double}{%
\MelangeListe{\PfCNHListe}{59}%
}{%
- \xdef\PfCNHListe{\PfCNHListe,\PfCNHListe}%
+% \xdef\PfCNHListe{\PfCNHListe,\PfCNHListe}%
\MelangeListe{\PfCNHListe}{46}%
}%
}{%
diff --git a/macros/latex/contrib/profcollege/latex/PfCProgrammeCalcul.tex b/macros/latex/contrib/profcollege/latex/PfCProgrammeCalcul.tex
index fd1a46d6e3..9395074379 100644
--- a/macros/latex/contrib/profcollege/latex/PfCProgrammeCalcul.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCProgrammeCalcul.tex
@@ -5,16 +5,22 @@
Ecart=2em,%
Direct,%
SansCalcul=false,%
- Application=false,
- Details=false,
- Enonce=false,
- Nom={},
+ Application=false,%
+ Details=false,%
+ Enonce=false,%
+ Nom={},%
CouleurCadre=black,%
CouleurFond=gray!10,%
Largeur={.95\linewidth},%
Epaisseur=.75pt,%
- Pointilles=0,
- ThemePerso=false,
+ Pointilles=0,%
+ ThemePerso=false,%
+ Vide=false,%pour vider le chemin de flèches
+ Depart=false,%pour indiquer qu'on cherche le nombre de départ (non fractionnaire pour le moment)
+ Retour=false,%on affiche les fleches de retour
+ OpReciproques=false,%on affiche les opérations réciproques
+ Reponses=0,%on affiche les opérations réciproques 1 par 1 :)
+ ReponsesCalculs=0,%on affiche les valeurs 1 par 1 :)
}
\newcounter{NBprog}%
@@ -114,28 +120,73 @@
\setsepchar[*]{,* }\ignoreemptyitems%
\readlist*\ListeProg{#2}%
\stepcounter{NBprog}%
- \xdef\NbDepart{\ListeProg[1]}%
- \ifboolKV[ClesProg]{SansCalcul}{%
- $\NbDepart$\foreachitem\compteur\in\ListeProg[2]{%
- \hspace{0.2em}\tikzmark{A-\theNBprog-\compteurcnt}\hspace{\useKV[ClesProg]{Ecart}}\tikzmark{B-\theNBprog-\compteurcnt}\hspace{0.2em}$\ListeProg[3,\compteurcnt]$%
- }%
- \begin{tikzpicture}[remember picture, overlay]
- \foreachitem\compteur\in\ListeProg[2]{%
- \edef\Test{\ListeProg[2,\compteurcnt]}
- \expandarg%
- \StrSubstitute{\Test}{^}{\empty\dots{}^}[\tempa]%
- \StrSubstitute{\tempa}{**}{^}[\tempab]%
- \StrSubstitute{\tempab}{*}{\times}[\tempac]%
- \StrSubstitute{\tempac}{/}{\div}[\tempad]%
- \draw[-stealth,transform canvas={yshift=0.25em}] (pic cs:A-\theNBprog-\compteurcnt) --
- node[above]{\scriptsize$\tempad$}(pic cs:B-\theNBprog-\compteurcnt);
- }
- \end{tikzpicture}
+ \ifboolKV[ClesProg]{Vide}{%
+ \xdef\PfCNbDepart{\ListeProg[1]}%
+ \ifnum\fpeval{\useKV[ClesProg]{ReponsesCalculs}}=\listlen\ListeProg[2]\relax%
+ \num{\PfCNbDepart}%
+ \else%
+ \phantom{\num{\PfCNbDepart}}%
+ \fi%
+ \foreachitem\compteur\in\ListeProg[2]{%
+ \xdef\PfCNbDepart{\fpeval{(\PfCNbDepart)\ListeProg[2,\compteurcnt]}}%
+ \hspace{0.2em}\tikzmark{A-\theNBprog-\compteurcnt}\hspace{\useKV[ClesProg]{Ecart}}\tikzmark{B-\theNBprog-\compteurcnt}\hspace{0.2em}%
+ \ifnum\fpeval{\listlen\ListeProg[2]-\compteurcnt}<\fpeval{\useKV[ClesProg]{ReponsesCalculs}+1}\relax%
+ \ifboolKV[ClesProg]{Depart}{\num{\PfCNbDepart}}{\phantom{\num{\PfCNbDepart}}}%\num{\PfCNbDepart}%
+ \else%
+ \ifnum\compteurcnt=\listlen\ListeProg[2]\relax%
+ \ifboolKV[ClesProg]{Depart}{\num{\PfCNbDepart}}{\phantom{\num{\PfCNbDepart}}}%
+ \else%
+ \phantom{\num{\PfCNbDepart}}%
+ \fi%
+ \fi%
+ }%
+ \begin{tikzpicture}[remember picture, overlay]
+ \foreachitem\compteur\in\ListeProg[2]{%
+ \edef\Test{\ListeProg[2,\compteurcnt]}%
+ \expandarg%
+ \StrSubstitute{\Test}{^}{\empty\dots{}^}[\tempa]%
+ \StrSubstitute{\tempa}{**}{^}[\tempab]%
+ \StrSubstitute{\tempab}{*}{\times}[\tempac]%
+ \StrSubstitute{\tempac}{/}{\div}[\tempad]%
+ \draw[-stealth,transform canvas={yshift=0.25em}] (pic cs:A-\theNBprog-\compteurcnt) --
+ node[above]{\scriptsize$\tempad$}(pic cs:B-\theNBprog-\compteurcnt);
+ }%
+ \end{tikzpicture}
+ \ifboolKV[ClesProg]{Retour}{%
+ \begin{tikzpicture}[remember picture, overlay]
+ \foreachitem\compteur\in\ListeProg[2]{%
+ \edef\Test{\ListeProg[2,\compteurcnt]}%
+ \expandarg%
+ \StrSubstitute{\Test}{^2}{\empty\sqrt{\dots{}}}[\tempa]%
+ \StrSubstitute{\tempa}{**}{^}[\tempab]%
+ \StrSubstitute{\tempab}{*}{\div}[\tempac]%
+ \StrSubstitute{\tempac}{/}{\times}[\tempad]%
+ \StrSubstitute{\tempad}{-}{+}[\tempae]%
+ \StrSubstitute{\tempae}{+}{-}[\tempaf]%
+ \ifnum\fpeval{\useKV[ClesProg]{Reponses}}>0\relax%
+ \ifnum\fpeval{\listlen\ListeProg[2]-\compteurcnt}<\fpeval{\useKV[ClesProg]{Reponses}}\relax%
+ \ifboolKV[ClesProg]{OpReciproques}{%
+ \draw[-stealth,out=-150,in=-30,transform canvas={yshift=-0.5em}] (pic cs:B-\theNBprog-\compteurcnt) to node[below]{\scriptsize$\tempaf$}(pic cs:A-\theNBprog-\compteurcnt);
+ }{%
+ \draw[-stealth,out=-150,in=-30,transform canvas={yshift=-0.5em}] (pic cs:B-\theNBprog-\compteurcnt) to (pic cs:A-\theNBprog-\compteurcnt);
+ }%
+ \fi%
+ \else%
+ \ifboolKV[ClesProg]{OpReciproques}{%
+ \draw[-stealth,out=-150,in=-30,transform canvas={yshift=-0.5em}] (pic cs:B-\theNBprog-\compteurcnt) to node[below]{\scriptsize$\tempaf$}(pic cs:A-\theNBprog-\compteurcnt);
+ }{%
+ \draw[-stealth,out=-150,in=-30,transform canvas={yshift=-0.5em}] (pic cs:B-\theNBprog-\compteurcnt) to (pic cs:A-\theNBprog-\compteurcnt);
+ }%
+ \fi%
+ }%
+ \end{tikzpicture}%
+ }{}%
}{%
- \num{\NbDepart}\foreachitem\compteur\in\ListeProg[2]{%
- \hspace{0.2em}\tikzmark{A-\theNBprog-\compteurcnt}\hspace{\useKV[ClesProg]{Ecart}}\tikzmark{B-\theNBprog-\compteurcnt}\xdef\NbDepart{\fpeval{(\NbDepart)\ListeProg[2,\compteurcnt]}}\hspace{0.2em}\num{\NbDepart}%
- }%
- \ifboolKV[ClesProg]{Direct}{%
+ \xdef\NbDepart{\ListeProg[1]}%
+ \ifboolKV[ClesProg]{SansCalcul}{%
+ $\NbDepart$\foreachitem\compteur\in\ListeProg[2]{%
+ \hspace{0.2em}\tikzmark{A-\theNBprog-\compteurcnt}\hspace{\useKV[ClesProg]{Ecart}}\tikzmark{B-\theNBprog-\compteurcnt}\hspace{0.2em}$\ListeProg[3,\compteurcnt]$%
+ }%
\begin{tikzpicture}[remember picture, overlay]
\foreachitem\compteur\in\ListeProg[2]{%
\edef\Test{\ListeProg[2,\compteurcnt]}
@@ -145,24 +196,42 @@
\StrSubstitute{\tempab}{*}{\times}[\tempac]%
\StrSubstitute{\tempac}{/}{\div}[\tempad]%
\draw[-stealth,transform canvas={yshift=0.25em}] (pic cs:A-\theNBprog-\compteurcnt) --
- node[above]{\scriptsize$\tempad$}(pic
- cs:B-\theNBprog-\compteurcnt);
- }
- \end{tikzpicture}
+ node[above]{\scriptsize$\tempad$}(pic cs:B-\theNBprog-\compteurcnt);
+ }%
+ \end{tikzpicture}%
}{%
- \begin{tikzpicture}[remember picture, overlay]
- \foreachitem\compteur\in\ListeProg[2]{%
- \edef\Test{\ListeProg[2,\compteurcnt]}
- \expandarg%
- \StrSubstitute{\Test}{^2}{\empty\sqrt{\dots{}}}[\tempa]%
- \StrSubstitute{\tempa}{**}{^}[\tempab]%
- \StrSubstitute{\tempab}{*}{\div}[\tempac]%
- \StrSubstitute{\tempac}{/}{\times}[\tempad]%
- \StrSubstitute{\tempad}{-}{+}[\tempae]%
- \StrSubstitute{\tempae}{++}{-}[\tempaf]%
- \draw[-stealth,transform canvas={yshift=0.25em}] (pic cs:B-\theNBprog-\compteurcnt) -- node[above]{\scriptsize$\tempaf$}(pic cs:A-\theNBprog-\compteurcnt);
- }
- \end{tikzpicture}
+ \num{\NbDepart}\foreachitem\compteur\in\ListeProg[2]{%
+ \hspace{0.2em}\tikzmark{A-\theNBprog-\compteurcnt}\hspace{\useKV[ClesProg]{Ecart}}\tikzmark{B-\theNBprog-\compteurcnt}\xdef\NbDepart{\fpeval{(\NbDepart)\ListeProg[2,\compteurcnt]}}\hspace{0.2em}\num{\NbDepart}%
+ }%
+ \ifboolKV[ClesProg]{Direct}{%
+ \begin{tikzpicture}[remember picture, overlay]
+ \foreachitem\compteur\in\ListeProg[2]{%
+ \edef\Test{\ListeProg[2,\compteurcnt]}
+ \expandarg%
+ \StrSubstitute{\Test}{^}{\empty\dots{}^}[\tempa]%
+ \StrSubstitute{\tempa}{**}{^}[\tempab]%
+ \StrSubstitute{\tempab}{*}{\times}[\tempac]%
+ \StrSubstitute{\tempac}{/}{\div}[\tempad]%
+ \draw[-stealth,transform canvas={yshift=0.25em}] (pic cs:A-\theNBprog-\compteurcnt) --
+ node[above]{\scriptsize$\tempad$}(pic
+ cs:B-\theNBprog-\compteurcnt);
+ }%
+ \end{tikzpicture}%
+ }{%
+ \begin{tikzpicture}[remember picture, overlay]
+ \foreachitem\compteur\in\ListeProg[2]{%
+ \edef\Test{\ListeProg[2,\compteurcnt]}
+ \expandarg%
+ \StrSubstitute{\Test}{^2}{\empty\sqrt{\dots{}}}[\tempa]%
+ \StrSubstitute{\tempa}{**}{^}[\tempab]%
+ \StrSubstitute{\tempab}{*}{\div}[\tempac]%
+ \StrSubstitute{\tempac}{/}{\times}[\tempad]%
+ \StrSubstitute{\tempad}{-}{+}[\tempae]%
+ \StrSubstitute{\tempae}{++}{-}[\tempaf]%
+ \draw[-stealth,transform canvas={yshift=0.25em}] (pic cs:B-\theNBprog-\compteurcnt) -- node[above]{\scriptsize$\tempaf$}(pic cs:A-\theNBprog-\compteurcnt);
+ }%
+ \end{tikzpicture}
+ }%
}%
}%
}%
diff --git a/macros/latex/contrib/profcollege/latex/PfCProprietesDroites.tex b/macros/latex/contrib/profcollege/latex/PfCProprietesDroites.tex
index cbb7775806..ad9f1b0edb 100644
--- a/macros/latex/contrib/profcollege/latex/PfCProprietesDroites.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCProprietesDroites.tex
@@ -1,7 +1,7 @@
%%%
% Ppt\'es des droites (6eme)
%%%
-\setKVdefault[ClesDroites]{Brouillon=false,CitePropriete=false,Num=1,Figure=false,Remediation=false}
+\setKVdefault[ClesDroites]{Brouillon=false,CitePropriete=false,Num=1,Figure=false,Remediation=false,FigureSeule=false}
\newcommand\Redaction[4][]{%
\ifboolKV[ClesDroites]{Remediation}{%
@@ -21,7 +21,7 @@
Or, si deux droites sont perpendiculaires \`a une m\^eme droite, alors elles sont parall\`eles.%
- Donc les droites $(\hbox to2em{\dotfill})$ et $(\hbox to2em{\dotfill})$ sont perpendiculaires.
+ Donc les droites $(\hbox to2em{\dotfill})$ et $(\hbox to2em{\dotfill})$ sont parall\`eles.
}{%
Comme les droites $(\hbox to2em{\dotfill})$ et $(\hbox to2em{\dotfill})$ sont toutes les deux perpendiculaires \`a la m\^eme droite $(\hbox to2em{\dotfill})$, alors les droites $(\hbox to2em{\dotfill})$ et $(\hbox to2em{\dotfill})$ sont parall\`eles.
}
@@ -29,7 +29,7 @@
\ifboolKV[ClesDroites]{CitePropriete}{%
Les droites $(\hbox to2em{\dotfill})$ et $(\hbox to2em{\dotfill})$ sont parall\`eles. Les droites $(\hbox to2em{\dotfill})$ et $(\hbox to2em{\dotfill})$ sont perpendiculaires.%
- Or, si deux droites sont parall\`eles, alors toute droite droite perpendiculaire \`a l'une est perpendiculaire \`a l'autre.%
+ Or, si deux droites sont parall\`eles, alors toute droite perpendiculaire \`a l'une est perpendiculaire \`a l'autre.%
Donc les droites $(\hbox to2em{\dotfill})$ et $(\hbox to2em{\dotfill})$ sont perpendiculaires.
}{%
@@ -54,7 +54,7 @@
Or, si deux droites sont perpendiculaires \`a une m\^eme droite, alors elles sont parall\`eles.%
- Donc les droites $(#2)$ et $(#3)$ sont perpendiculaires.
+ Donc les droites $(#2)$ et $(#3)$ sont parall\`eles.
}{%
Comme les droites $(#2)$ et $(#3)$ sont toutes les deux perpendiculaires \`a la m\^eme droite $(#4)$, alors les droites $(#2)$ et $(#3)$ sont parall\`eles.
}
@@ -62,7 +62,7 @@
\ifboolKV[ClesDroites]{CitePropriete}{%
Les droites $(#2)$ et $(#4)$ sont parall\`eles. Les droites $(#3)$ et $(#4)$ sont perpendiculaires.%
- Or, si deux droites sont parall\`eles, alors toute droite droite perpendiculaire \`a l'une est perpendiculaire \`a l'autre.%
+ Or, si deux droites sont parall\`eles, alors toute droite perpendiculaire \`a l'une est perpendiculaire \`a l'autre.%
Donc les droites $(#2)$ et $(#3)$ sont perpendiculaires.
}{%
@@ -326,18 +326,22 @@
\newcommand\ProprieteDroites[4][]{%
\useKVdefault[ClesDroites]%
\setKV[ClesDroites]{#1}%
- \ifboolKV[ClesDroites]{Figure}{%
- \begin{multicols}{2}%
- \begin{center}%
- \FaireFigure[#1]{#2}{#3}{#4}%
- \end{center}%
- \columnbreak
- \ifboolKV[ClesDroites]{Brouillon}{\Brouillon[#1]{#2}{#3}{#4}}{}%
- \Redaction[#1]{#2}{#3}{#4}%
- \par%
- \end{multicols}
+ \ifboolKV[ClesDroites]{FigureSeule}{%
+ \FaireFigure[#1]{#2}{#3}{#4}%
}{%
+ \ifboolKV[ClesDroites]{Figure}{%
+ \begin{multicols}{2}%
+ \begin{center}%
+ \FaireFigure[#1]{#2}{#3}{#4}%
+ \end{center}%
+ \columnbreak
+ \ifboolKV[ClesDroites]{Brouillon}{\Brouillon[#1]{#2}{#3}{#4}}{}%
+ \Redaction[#1]{#2}{#3}{#4}%
+ \par%
+ \end{multicols}
+ }{%
\ifboolKV[ClesDroites]{Brouillon}{\Brouillon[#1]{#2}{#3}{#4}}{}%
\Redaction[#1]{#2}{#3}{#4}%
+ }%
}%
}% \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCPythagore.tex b/macros/latex/contrib/profcollege/latex/PfCPythagore.tex
index 5df5f0b03a..d63849f613 100644
--- a/macros/latex/contrib/profcollege/latex/PfCPythagore.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCPythagore.tex
@@ -1,10 +1,15 @@
%%%
% Le th\'eor\`eme de Pythagore
%%%
-\setKVdefault[ClesPythagore]{Exact=false,AvantRacine=false,Racine=false,Entier=false,Egalite=false,Precision=2,Soustraction=false,Figure=false,FigureSeule=false,Angle=0,Echelle=1cm,Reciproque=false,ReciColonnes=false,Faible=false,Unite=cm,EnchaineA=false,EnchaineB=false,EnchaineC=false,Perso=false,AllPerso=false,SansMots=false}%
+\setKVdefault[ClesPythagore]{Exact=false,AvantRacine=false,Racine=false,Entier=false,Egalite=false,Precision=2,Soustraction=false,Figure=false,FigureSeule=false,Angle=0,Echelle=1cm,Reciproque=false,ReciColonnes=false,Faible=false,Unite=cm,EnchaineA=false,EnchaineB=false,EnchaineC=false,Perso=false,AllPerso=false,SansMots=false,Decalage=5mm}%
\defKV[ClesPythagore]{ValeurA=\setKV[ClesPythagore]{EnchaineA}}%
\defKV[ClesPythagore]{ValeurB=\setKV[ClesPythagore]{EnchaineB}}%
\defKV[ClesPythagore]{ValeurC=\setKV[ClesPythagore]{EnchaineC}}%
+
+\setsepchar[*]{,*/}%
+\readlist*\ListePythagoreCoteEntier{13/84/85,14/48/50,15/20/25,15/36/39,16/30/34,16/63/65,18/24/30,18/80/82,20/21/29,20/48/52,21/28/35,21/72/75,24/32/40,24/45/51,24/70/74,25/60/65,27/36/45,28/45/53,28/96/100,30/40/50,30/72/78,32/60/68,33/44/55,33/56/65,35/84/91,36/48/60,36/77/85,39/52/65,39/80/89,40/42/58,40/75/85,42/56/70,45/60/75,48/55/73,48/64/80,51/68/85,54/72/90,57/76/95,60/63/87,60/80/100,65/72/97}%%d'après villement.gerard.free.fr%3/4/5}/{5/12/13}/{6/8/10}/{7/24/25}/{8/15/17}/{9/12/15}/{9/40/41}/{10/24/26}/{11/60/61}/{12/16/20}/{12/35/37}/
+\setsepchar{,}%
+
% On d\'efinit les figures \`a utiliser
\def\MPFigurePytha#1#2#3#4#5#6{%
% #1 Premier sommet
@@ -121,6 +126,7 @@
\mplibforcehmode
\begin{mplibcode}
u:=\useKV[ClesPythagore]{Echelle};
+ decalage=\useKV[ClesPythagore]{Decalage};
pair A,B,C,O,D,E,F;%B est le sommet de l'angle droit
O=u*(2.5,2.5);
path cc;
@@ -136,22 +142,15 @@
draw A{dir(angle(B-A)+5)}..B{dir(angle(B-A)+5)};
draw B{dir(angle(C-B)+5)}..C{dir(angle(C-B)+5)};
draw C{dir(angle(A-C)+5)}..A{dir(angle(A-C)+5)};
- decalage=3mm;
- if ypart(B)>ypart(O) :
- label(btex \num{#4} etex,1/2[C,A]-decalage*(unitvector(C-A) rotated 90));
- label(btex \num{#5} etex,1/2[C,B]-decalage*(unitvector(C-B)));
- label(btex \num{#6} etex,1/2[A,B]-decalage*(unitvector(C-B)));
- else:
- label(btex \num{#4} etex,1/2[A,C]+decalage*(unitvector(A-C) rotated 90));
- label(btex \num{#5} etex,1/2[A,B]-decalage*(unitvector(C-B)));
- label(btex \num{#6} etex,1/2[C,B]-decalage*(unitvector(A-B)));
- fi;
- label(btex #1 etex,1.2[O,A]);
- label(btex #2 etex,1.2[O,B]);
- label(btex #3 etex,1.2[O,C]);
+ label(TEX("\num{#4}"),O+decalage*(unitvector(O-B)));
+ label(TEX("\num{#6}"),1/2[C,B]+decalage*(unitvector(1/2[C,B]-O)));
+ label(TEX("\num{#5}"),1/2[A,B]+decalage*(unitvector(1/2[A,B]-O)));
+ label(TEX("#1"),1.2[O,A]);
+ label(TEX("#2"),1.2[O,B]);
+ label(TEX("#3"),1.2[O,C]);
\end{mplibcode}
\else
- \begin{mpost}[mpsettings={u:=\useKV[ClesPythagore]{Echelle};}]
+ \begin{mpost}[mpsettings={u:=\useKV[ClesPythagore]{Echelle};decalage=\useKV[ClesPythagore]{Decalage};}]
pair A,B,C,O,D,E,F;%B est le sommet de l'angle droit
O=u*(2.5,2.5);
path cc;
@@ -168,15 +167,9 @@
draw B{dir(angle(C-B)+5)}..C{dir(angle(C-B)+5)};
draw C{dir(angle(A-C)+5)}..A{dir(angle(A-C)+5)};
decalage=3mm;
- if ypart(B)>ypart(O) :
- label(LATEX("\num{"&decimal(#4)&"}") rotated angle(C-A),1/2[C,A]-decalage*(unitvector(C-A) rotated 90));
- label(LATEX("\num{"&decimal(#5)&"}") rotated(angle(C-B)),1/2[C,B]-decalage*(unitvector(C-B)));
- label(LATEX("\num{"&decimal(#6)&"}") rotated(angle(B-A)),1/2[A,B]-decalage*(unitvector(C-B)));
- else:
- label(LATEX("\num{"&decimal(#4)&"}") rotated angle(A-C),1/2[A,C]+decalage*(unitvector(A-C) rotated 90));
- label(LATEX("\num{"&decimal(#5)&"}") rotated(angle(A-B)),1/2[A,B]-decalage*(unitvector(C-B)));
- label(LATEX("\num{"&decimal(#6)&"}") rotated angle(C-B),1/2[C,B]-decalage*(unitvector(A-B)));
- fi;
+ label(LATEX("\num{#4}"),O+decalage*(unitvector(O-B)));
+ label(LATEX("\num{#5}"),1/2[C,B]+decalage*(unitvector(1/2[C,B]-O)));
+ label(LATEX("\num{#6}"),1/2[A,B]+decalage*(unitvector(1/2[A,B]-O)));
label(btex #1 etex,1.2[O,A]);
label(btex #2 etex,1.2[O,B]);
label(btex #3 etex,1.2[O,C]);
diff --git a/macros/latex/contrib/profcollege/latex/PfCQuestionsFlash.tex b/macros/latex/contrib/profcollege/latex/PfCQuestionsFlash.tex
index dd5db3e71b..8edee39f16 100644
--- a/macros/latex/contrib/profcollege/latex/PfCQuestionsFlash.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCQuestionsFlash.tex
@@ -361,6 +361,7 @@
\colorlet{CouleurDeux}{\useKV[ClesFlash]{Couleur2}}%
\colorlet{CouleurTrois}{\useKV[ClesFlash]{Couleur3}}%
\colorlet{CouleurQuatre}{\useKV[ClesFlash]{Couleur4}}%
+ \reademptyitems%
\ifboolKV[ClesFlash]{Evaluation}{%
\ifboolKV[ClesFlash]{Seul}{%
\setsepchar[*]{/}%
diff --git a/macros/latex/contrib/profcollege/latex/PfCQuestionsRelier.tex b/macros/latex/contrib/profcollege/latex/PfCQuestionsRelier.tex
index f921498c54..fa35906ead 100644
--- a/macros/latex/contrib/profcollege/latex/PfCQuestionsRelier.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCQuestionsRelier.tex
@@ -1,13 +1,14 @@
%%%
% R\'eponses \`a relier
%%%
-\setKVdefault[ClesRelie]{Solution=false,LargeurG=5cm,LargeurD=2cm,Stretch=1.5,Ecart=2cm,Couleur=black}
+\setKVdefault[ClesRelie]{Solution=false,LargeurG=5cm,LargeurD=2cm,Stretch=1.5,Ecart=2cm,Couleur=black}%
\newcommand\Relie[2][]{%
\useKVdefault[ClesRelie]%
\setKV[ClesRelie]{#1}%
- \setsepchar[*]{,*/}%
+ \setsepchar[*]{,*/}\reademptyitems%
\readlist*\ListeRelie{#2}%
+ \ignoreemptyitems
\buildtabrelie%
\ifboolKV[ClesRelie]{Solution}{%
\colorlet{PfCRelieCouleurTrace}{\useKV[ClesRelie]{Couleur}}%
@@ -15,14 +16,14 @@
\itemtomacro\ListeRelie[##1,1]\untest
\ifx\bla\untest\bla%
\else
- \tikz[remember picture,overlay]{\draw[PfCRelieCouleurTrace] (RelieG-##1) -- (RelieD-\ListeRelie[##1,3]);}%
+ \tikz[remember picture,overlay]{\draw[PfCRelieCouleurTrace] (RelieG-##1) -- (RelieD-\ListeRelie[##1,3]);}%
\fi
}%
}{%
}%
-}
+}%
-\newcounter{NbRelie}
+\newcounter{NbRelie}%
\def\buildtabrelie{%
\setcounter{NbRelie}{0}%
diff --git a/macros/latex/contrib/profcollege/latex/PfCRangementNombres.tex b/macros/latex/contrib/profcollege/latex/PfCRangementNombres.tex
index e248c04401..1c48ab8efc 100644
--- a/macros/latex/contrib/profcollege/latex/PfCRangementNombres.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCRangementNombres.tex
@@ -11,9 +11,9 @@
\NewDocumentCommand\RangementListe{m}{%
\readlist*\ListeRgt{#1}%
- \xdef\Foo{\ListeRgt[1]}
+ \xdef\Foo{\ListeRgt[1]}%
\xintFor* ##1 in{\xintSeq{2}{\ListeRgtlen}}\do{%
- \xdef\Foo{\Foo,\ListeRgt[##1]}
+ \xdef\Foo{\Foo,\ListeRgt[##1]}%
}%
\xdef\Fooa{\Foo}%
\xdef\PfCRetiensRangement{}%
@@ -25,15 +25,21 @@
\xdef\PfCRetiensRangement{\Element}%
}%
\readlist*\RetiensListe{\Fooa}%
- % La liste des rangements vaut \RetiensRangement.\par
- % La retiensliste vaut \showitems\RetiensListe[]\par
+ %La liste des rangements vaut \RetiensRangement.\par
+ %La retiensliste vaut \showitems\RetiensListe[]\par
\xdef\Fooi{}%
+ \xdef\PfCNombreFoisElementMini{0}%
\foreachitem\rgt\in\RetiensListe{%
% \rgtcnt~\RetiensListe[\rgtcnt] et \Element%
- \xintifboolexpr{\RetiensListe[\rgtcnt]==\Element}{}{%
- \xdef\Fooi{\Fooi,\RetiensListe[\rgtcnt]}
+ %POur gére les cas où le minimum apparaît plusieurs fois
+ \xintifboolexpr{\RetiensListe[\rgtcnt]==\Element}{%
+ \xdef\PfCNombreFoisElementMini{\fpeval{\PfCNombreFoisElementMini+1}}%
+ %Element mini =\Element -- \PfCNombreFoisElementMini\\
+ \xintifboolexpr{\PfCNombreFoisElementMini>1}{\xdef\Fooi{\Fooi,\RetiensListe[\rgtcnt]}}{}%
+ }{%
+ \xdef\Fooi{\Fooi,\RetiensListe[\rgtcnt]}%
}%
- % La liste Fooi est \Fooi\par
+ % La liste Fooi est \Fooi\par
}%
\readlist*\ListeTempo{\Fooi}%
\xintifboolexpr{\ListeTempolen>1}{%
@@ -43,7 +49,7 @@
}%
}{%
% \xdef\Fooa{\ListeTempo[1]}%
- \xdef\PfCRetiensRangement{\PfCRetiensRangement,\ListeTempo[1]}
+ \xdef\PfCRetiensRangement{\PfCRetiensRangement,\ListeTempo[1]}%
}%
% La liste Fooa vaut \Fooa\par
}%
@@ -59,7 +65,7 @@
\setsepchar[*]{,*/}\ignoreemptyitems%
\readlist*\ListeRgt{#2}%
% on cherche le d\'enominateur commun
- \ppcm=1\relax
+ \ppcm=1\relax%
\foreachitem\x\in\ListeRgt{%
\PPCM{\fpeval{\ListeRgt[\xcnt,2]}}{\fpeval{\the\ppcm}}%
}%
@@ -79,7 +85,7 @@
}%
}%
}{%
- \ensuremath{
+ \ensuremath{%
\xintFor* ##1 in{\xintSeq{0}{\fpeval{\PfCListeFinaleRgtlen-1}}}\do{%
\xintifForFirst{}{\ifboolKV[ClesRgt]{Strict}{>}{\qeqslant}}\Simplification{\PfCListeFinaleRgt[\fpeval{\PfCListeFinaleRgtlen-##1}]}{\the\ppcm}}%
}%
@@ -98,16 +104,16 @@
}%
}%
}%
- }% %%%%%%%%%%%%%
+ }%
}{%
\RangementListe{#2}%
%
% \PfCRetiensRangement%
- \ifboolKV[ClesRgt]{Seul}{}{%
- \readlist*\PfCListeFinaleRgt{\PfCRetiensRangement}
- % \par \showitems\PfCListeFinaleRgt[] -- La longueur de la liste est \PfCListeFinaleRgtlen
- \ifboolKV[ClesRgt]{Decroissant}{%
- \ensuremath{%
+ \ifboolKV[ClesRgt]{Seul}{}{%
+ \readlist*\PfCListeFinaleRgt{\PfCRetiensRangement}%
+ % \par \showitems\PfCListeFinaleRgt[] -- La longueur de la liste est \PfCListeFinaleRgtlen
+ \ifboolKV[ClesRgt]{Decroissant}{%
+ \ensuremath{%
\xintFor* ##1 in{\xintSeq{0}{\fpeval{\PfCListeFinaleRgtlen-1}}}\do{%
\xintifForFirst{}{\ifboolKV[ClesRgt]{Strict}{>}{\geqslant}}\num{\PfCListeFinaleRgt[\fpeval{\PfCListeFinaleRgtlen-##1}]}%
}%
@@ -122,7 +128,8 @@
}%
}%
\reademptyitems
- }
+%
+}%
\NewDocumentCommand\Rangementold{om}{%
\useKVdefault[ClesRgt]%
diff --git a/macros/latex/contrib/profcollege/latex/PfCRapido.tex b/macros/latex/contrib/profcollege/latex/PfCRapido.tex
index 2fcc701b52..fa3a16bf7e 100644
--- a/macros/latex/contrib/profcollege/latex/PfCRapido.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCRapido.tex
@@ -36,6 +36,7 @@
}{}%
\setlength{\WidthRapido}{\useKV[ClesRapido]{Largeur}}%
%
+\reademptyitems
\setsepchar[*]{§*/}%
\readlist*\ListeRapido{#2}%
\begin{RapidoBox}
diff --git a/macros/latex/contrib/profcollege/latex/PfCReperage.tex b/macros/latex/contrib/profcollege/latex/PfCReperage.tex
index 9924f631f8..6ab6ebf847 100644
--- a/macros/latex/contrib/profcollege/latex/PfCReperage.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCReperage.tex
@@ -1,7 +1,7 @@
%%%
% Reperage
%%%
-\setKVdefault[ClesReperage]{Unitex=1,Pasx=1,Unitey=1,Pasy=1,Unitez=1,Pasz=1,DemiDroite=false,Droite=false,Plan=false,Trace=false,ListeSegment={},Espace=false,Sphere=false,AnglePhi=30,CouleurLa=white,CouleurLon=Tomato,AffichageUnites=true,MarquePrimaire=true,AffichageNom=false,AffichageGrad=false,AffichageAbs=0,AffichageCoord=false,LectureCoord=false,ValeurUnitex=1,ValeurUnitey=1,ValeurOrigine=0,NomOrigine=O,EchelleEspace=50,CouleurCoord=black,Thermometre=false,Mercure=false,CouleurMercure=black,Celsius,Kelvin=false,Farenheit=false,ValeurMin=-4000,ValeurMax=4000,Etages=4,Code=false,Globe=false,Rho=1500,Phi=22,Theta=10,CouleurE=orange,CouleurG=green,Axes=false,TypeProj="persp",Niveaux=false,Decale=false}
+\setKVdefault[ClesReperage]{Unitex=1,Pasx=1,Unitey=1,Pasy=1,Unitez=1,Pasz=1,DemiDroite=false,Droite=false,Plan=false,Trace=false,ListeSegment={},Espace=false,Sphere=false,AnglePhi=30,CouleurLa=white,CouleurLon=Tomato,AffichageUnites=true,MarquePrimaire=true,AffichageNom=false,AffichageGrad=false,AffichageAbs=0,AffichageCoord=false,LectureCoord=false,ValeurUnitex=1,ValeurUnitey=1,ValeurOrigine=0,NomOrigine=O,EchelleEspace=50,CouleurCoord=black,Thermometre=false,Mercure=false,CouleurMercure=black,Celsius,Kelvin=false,Farenheit=false,ValeurMin=-4000,ValeurMax=4000,ValeurMiny=-4000,ValeurMaxy=4000,Etages=4,Code=false,Globe=false,Rho=1500,Phi=22,Theta=10,CouleurE=orange,CouleurG=green,Axes=false,TypeProj="persp",Niveaux=false,Decale=false,Tiret=false,Cadre=false}
\defKV[ClesReperage]{Traces=\setKV[ClesReperage]{Code}}%
\defKV[ClesReperage]{Niveau=\setKV[ClesReperage]{Etages=#1}\setKV[ClesReperage]{Niveaux}}%
% ValeurOrigine permet de faire des morceaux de demi-droite gradu\'ee en passant par droite :)
@@ -21,6 +21,7 @@
% Pour construire le rep\`ere de l'espace
\def\buildespace{%
\toklistepointespace{}%
+ \toklistepointrepere{}%
\ifboolKV[ClesReperage]{Globe}{%
\foreachitem\compteur\in\ListePointEspace{\expandafter\Updatetoksrepere\compteur\nil}%
\MPGlobe{\the\toklistepointrepere}{\useKV[ClesReperage]{EchelleEspace}}%
@@ -299,7 +300,7 @@
fi;
);
CodageDeux=image(
- if k>0:
+ if l>0:
label.rt(TEX("\scriptsize\ang{"&decimal(l)&"} N"),(0,0));
else:
label.lft(TEX("\scriptsize\ang{"&decimal(abs(l))&"} S"),(0,0));
@@ -391,7 +392,7 @@
fi;
);
CodageDeux=image(
- if k>0:
+ if l>0:
label.rt(LATEX("\noexpand\scriptsize\noexpand\ang{"&decimal(l)&"} N"),(0,0));
else:
label.lft(LATEX("\noexpand\scriptsize\noexpand\ang{"&decimal(abs(l))&"} S"),(0,0));
@@ -683,38 +684,93 @@
% Pour construire le rep\`ere du plan
\def\buildreperenew{%
- \toklistepointrepere{}%
- \foreachitem\compteur\in\ListePointRepere{\expandafter\Updatetoksrepere\compteur\nil}%
- \ifboolKV[ClesReperage]{Trace}{%
- \[\MPPlanTrace{\useKV[ClesReperage]{Unitex}}{\useKV[ClesReperage]{Pasx}}{\useKV[ClesReperage]{Unitey}}{\useKV[ClesReperage]{Pasy}}{\the\toklistepointrepere}{2}{\useKV[ClesReperage]{ValeurUnitex}}{\useKV[ClesReperage]{ValeurUnitey}}{\useKV[ClesReperage]{ListeSegment}}\]%
- }{%
- \xdef\AfficheNom{0}\ifboolKV[ClesReperage]{AffichageNom}{\ifboolKV[ClesReperage]{LectureCoord}{\xdef\AfficheNom{3}}{\xdef\AfficheNom{2}}}{\ifboolKV[ClesReperage]{LectureCoord}{\xdef\AfficheNom{1}}{}}%
- \xdef\AfficheGrad{0}\ifboolKV[ClesReperage]{AffichageGrad}{\xdef\AfficheGrad{1}}{}%
- \xdef\AfficheCoord{\useKV[ClesReperage]{AffichageAbs}}%
- \MPPlannew{(\useKV[ClesReperage]{Unitex},\useKV[ClesReperage]{Pasx})}{(\useKV[ClesReperage]{Unitey},\useKV[ClesReperage]{Pasy})}{\the\toklistepointrepere}{\AfficheNom}{\AfficheCoord}{\AfficheGrad}{(\useKV[ClesReperage]{ValeurUnitex},\useKV[ClesReperage]{ValeurUnitey})}%
+ \xdef\RetiensListePoints{}%
+ \xdef\RetiensListePointsA{}%
+ \xdef\RetiensListePointsCourte{}%
+ \foreachitem\compteur\in\ListePointRepere{%
+ \xdef\RetiensListePoints{\RetiensListePoints\ListePointRepere[\compteurcnt,1],}%
+ \xdef\RetiensListePoints{\RetiensListePoints\ListePointRepere[\compteurcnt,2],}%
+ \xdef\RetiensListePointsA{\RetiensListePointsA\ListePointRepere[\compteurcnt,1],}%
+ \xdef\RetiensListePointsA{\RetiensListePointsA\ListePointRepere[\compteurcnt,2],}%
+ \IfStrEq{\ListePointRepere[\compteurcnt,3]}{ }{%
+ \xdef\RetiensListePoints{\RetiensListePoints PfC,}%
+ \xdef\RetiensListePointsA{\RetiensListePointsA"",}%
+ }{%
+ \xdef\RetiensListePoints{\RetiensListePoints\ListePointRepere[\compteurcnt,3],}%
+ \xdef\RetiensListePointsA{\RetiensListePointsA"\ListePointRepere[\compteurcnt,3]",}%
+ \ifx\bla\RetiensListePointsCourte\bla%
+ \xdef\RetiensListePointsCourte{\ListePointRepere[\compteurcnt,3]}%
+ \else
+ \xdef\RetiensListePointsCourte{\RetiensListePointsCourte,\ListePointRepere[\compteurcnt,3]}%
+ \fi
+ }%
}%
-}
+ \xdef\AfficheNom{0}\ifboolKV[ClesReperage]{AffichageNom}{\ifboolKV[ClesReperage]{LectureCoord}{\xdef\AfficheNom{3}}{\xdef\AfficheNom{2}}}{\ifboolKV[ClesReperage]{LectureCoord}{\xdef\AfficheNom{1}}{}}%
+ \xdef\AfficheGrad{0}\ifboolKV[ClesReperage]{AffichageGrad}{\xdef\AfficheGrad{1}}{}%
+ \xdef\AfficheCoord{\useKV[ClesReperage]{AffichageAbs}}%
+ \MPPlannew{\RetiensListePoints}{\AfficheNom}{\AfficheCoord}{\RetiensListePointsCourte}{\RetiensListePointsA}%
+}%
-\def\MPPlannew#1#2#3#4#5#6#7{%
- %#1 : Unitex, pasx
- %#2 : unitey, pasy
- %#3 : liste de points
- %#4 : Affichage nom + lecture graphique
- %#5 : Affichage des (abscisses/ordonn\'ees)
- %#6 : Graduation compl\`ete ?
- %#7 : (unitex,unitey)
+\def\MPPlannew#1#2#3#4#5{%
+ % #1 : liste de points
+ % #2 : Affichage nom + lecture graphique
+ % #3 : Affichage des (abscisses/ordonn\'ees)
+ % #4 : la liste courte des noms des points.
+ % #5 : liste des points pour les string
\ifluatex
- \begin{mplibcode}
+ \begin{mplibcode}
+ boolean Tiret,Code,AffichageGrad,Cadre;
+ Tiret=\useKV[ClesReperage]{Tiret};
+ Code=\useKV[ClesReperage]{Code};
+ AffichageGrad=\useKV[ClesReperage]{AffichageGrad};
+ Cadre=\useKV[ClesReperage]{Cadre};
+ %
+ Unitex=\useKV[ClesReperage]{Unitex};
+ Pasx=\useKV[ClesReperage]{Pasx};
+ Unitey=\useKV[ClesReperage]{Unitey};
+ Pasy=\useKV[ClesReperage]{Pasy};
+ ValeurUnitex=\useKV[ClesReperage]{ValeurUnitex};
+ ValeurUnitey=\useKV[ClesReperage]{ValeurUnitey};
+ %
+ vardef AvantDefinirSommets(text tu)=
+ pair tu;
+ enddef;
+ %
+ vardef DefinirLesSommets(text t)=
+ nbretiens=1;
+ k:=0;
+ l:=0;
+ for g_=t:
+ if (nbretiens mod 3)=1:
+ if numeric g_:
+ k:=g_;
+ fi;
+ fi;
+ if (nbretiens mod 3)=2:
+ if numeric g_:
+ l:=g_;
+ fi;
+ fi;
+ if (nbretiens mod 3)=0:
+ if pair g_:
+ g_=(k*unitpx,l*unitpy);
+ fi;
+ fi;
+ nbretiens:=nbretiens+1;
+ endfor;
+ enddef;
+ %
maxx:=-4000;
minx=4000;
- unitex:=(xpart(#1))*cm;
- pasx=ypart(#1);
+ unitex:=(Unitex)*cm;
+ pasx=Pasx;
unitpx:=unitex/pasx;
maxy:=-4000;
miny:=4000;
- unitey:=(xpart(#2))*cm;
- pasy:=ypart(#2);
+ unitey:=(Unitey)*cm;
+ pasy:=Pasy;
unitpy:=unitey/pasy;
+ %
n:=1;
vardef toto(text t)=
for p_=t:
@@ -738,23 +794,36 @@
endfor;
maxx:=maxx+1;
minx:=minx-1;
- if maxx<(ypart(#1)+1):
- maxx:=ypart(#1)+1;
+ if maxx<(Pasx+1):
+ maxx:=Pasx+1;
fi;
- if minx>(-ypart(#1)-1):
- minx:=-ypart(#1)-1;
+ if minx>(-Pasx-1):
+ minx:=-Pasx-1;
fi;
maxy:=maxy+1;
miny:=miny-1;
- if maxy<(ypart(#2)+1):
- maxy:=ypart(#2)+1;
+ if maxy<(Pasy+1):
+ maxy:=Pasy+1;
fi;
- if miny>(-ypart(#2)-1):
- miny:=-ypart(#2)-1;
+ if miny>(-Pasy-1):
+ miny:=-Pasy-1;
+ fi;
+ if minx<\useKV[ClesReperage]{ValeurMin}:
+ minx:=\useKV[ClesReperage]{ValeurMin};
+ fi;
+ if maxx>\useKV[ClesReperage]{ValeurMax}:
+ maxx:=\useKV[ClesReperage]{ValeurMax};
+ fi;
+ if miny<\useKV[ClesReperage]{ValeurMiny}:
+ miny:=\useKV[ClesReperage]{ValeurMiny};
+ fi;
+ if maxy>\useKV[ClesReperage]{ValeurMaxy}:
+ maxy:=\useKV[ClesReperage]{ValeurMaxy};
fi;
enddef;
- toto(#3);
+ toto(#1);
Figure((minx-1)*unitpx,(miny-1)*unitpy,(maxx+1)*unitpx,(maxy+1)*unitpy);
+ %Figure(minx*unitpx,miny*unitpy,maxx*unitpx,maxy*unitpy);
pair A,B,C,D,E;
A=(0,0);
B=(minx*unitpx,0);
@@ -771,30 +840,41 @@
drawarrow (D+(0,-0.75*unitpy))--(E+(0,0.75*unitpy));
% graduation compl\`ete ou pas ?
label.llft(TEX("\footnotesize 0"),A);
- if #6>0:
+ if AffichageGrad:
for k=minx upto maxx:
if (xpart((k*unitex,0))>xpart(B+(-0.75*unitpx,0))) and (xpart((k*unitex,0))<xpart(C+(0.75*unitpx,0))):
if k<>0:
+ if Tiret:
+ draw (k*unitex,-1mm)--(k*unitex,1mm);
+ label.lrt(TEX("\footnotesize\num{"&decimal(k)&"}"),(k*unitex,0));
+ else:
dotlabel.lrt(TEX("\footnotesize\num{"&decimal(k)&"}"),(k*unitex,0));
fi;
fi;
+ fi;
endfor;
for k=miny upto maxy:
if (ypart((0,k*unitey))>ypart(D+(0,-0.75*unitpy))) and (ypart((0,k*unitey))<ypart(E+(0,0.75*unitpy))):
if k<>0:
+ if Tiret:
+ draw (-1mm,k*unitey)--(1mm,k*unitey);
+ label.ulft(TEX("\footnotesize\num{"&decimal(k)&"}"),(0,k*unitey));
+ else:
dotlabel.ulft(TEX("\footnotesize\num{"&decimal(k)&"}"),(0,k*unitey));
fi;
fi;
+ fi;
endfor;
else:
- dotlabel.lrt(TEX("\footnotesize\num{"&decimal(xpart(#7))&"}"),(unitex,0));
- dotlabel.ulft(TEX("\footnotesize\num{"&decimal(ypart(#7))&"}"),(0,unitey));
+ dotlabel.lrt(TEX("\footnotesize\num{"&decimal(ValeurUnitex)&"}"),(unitex,0));
+ dotlabel.ulft(TEX("\footnotesize\num{"&decimal(ValeurUnitey)&"}"),(0,unitey));
fi;
% apparition du nom des points ou pas
m_c:=m_c*3;
marque_p:="croix";
vardef tata(text t)=%on place les points
- if #4>0:
+ % {
+ if #2>0:
n:=1;
k:=0;%pour retenir la coordonn\'ee en x
l:=0;%pour retenir la coordonn\'ee en y
@@ -810,7 +890,7 @@
fi;
fi;
if (n mod 3)=0:
- if #4>1:
+ if #2>1:
if p_<>"":
if (k>0) and (l>0):
label.urt(TEX(p_),(k*unitpx,l*unitpy));
@@ -839,85 +919,124 @@
pointe((k*unitpx,l*unitpy));
fi;
fi;
- if (#4=1) or (#4=3):
+ if (#2=1) or (#2=3):
draw (0,l*unitpy)--(k*unitpx,l*unitpy)--(k*unitpx,0) dashed evenly;
fi;
fi;
n:=n+1;
endfor;
fi;
- if #5=2:
+ % }
n:=1;
k:=0;%pour retenir la coordonn\'ee en x
l:=0;%pour retenir la coordonn\'ee en y
for p_=t:
- if (n mod 3)=1:
- if numeric p_:
- k:=p_;
- fi;
- fi;
- if (n mod 3)=2:
- if numeric p_:
- l:=p_;
- fi;
- fi;
- if (n mod 3)=0:
- if p_<>"":
- if (k mod pasx)<>0:
- label.lrt(TEX("\footnotesize$\frac{\num{"&decimal(k)&"}}{\num{"&decimal(pasx)&"}}$"),(k*unitpx,0));
- else:
- label.lrt(TEX("\footnotesize\num{\fpeval{"&decimal(k)&"/"&decimal(pasx)&"}}"),(k*unitpx,0));
+ if (n mod 3)=1:
+ if numeric p_:
+ k:=p_;
fi;
- if (l mod pasy)<>0:
- label.ulft(TEX("\footnotesize$\frac{\num{"&decimal(l)&"}}{\num{"&decimal(pasy)&"}}$"),(0,l*unitpy));
- else:
- label.ulft(TEX("\footnotesize\num{\fpeval{"&decimal(l)&"/"&decimal(pasy)&"}}"),(0,l*unitpy));
+ fi;
+ if (n mod 3)=2:
+ if numeric p_:
+ l:=p_;
fi;
- pointe((k*unitpx,0),(0,l*unitpy));
fi;
+ if (n mod 3)=0:
+ if #3=2:
+ if p_<>"":
+ if (k mod pasx)<>0:
+ label.lrt(TEX("\footnotesize$\frac{\num{"&decimal(k)&"}}{\num{"&decimal(pasx)&"}}$"),(k*unitpx,0));
+ else:
+ label.lrt(TEX("\footnotesize\num{\fpeval{"&decimal(k)&"/"&decimal(pasx)&"}}"),(k*unitpx,0));
+ fi;
+ if (l mod pasy)<>0:
+ label.ulft(TEX("\footnotesize$\frac{\num{"&decimal(l)&"}}{\num{"&decimal(pasy)&"}}$"),(0,l*unitpy));
+ else:
+ label.ulft(TEX("\footnotesize\num{\fpeval{"&decimal(l)&"/"&decimal(pasy)&"}}"),(0,l*unitpy));
+ fi;
+ pointe((k*unitpx,0),(0,l*unitpy));
+ fi;
+ elseif #3=1:
+ if p_<>"":
+ label.lrt(TEX("\footnotesize\num{\fpeval{"&decimal(k)&"/"&decimal(pasx)&"}}"),(k*unitpx,0));
+ label.ulft(TEX("\footnotesize\num{\fpeval{"&decimal(l)&"/"&decimal(pasy)&"}}"),(0,l*unitpy));
+ pointe((k*unitpx,0),(0,l*unitpy));
+ fi;
+ fi;
fi;
n:=n+1;
endfor;
- elseif #5=1:
- n:=1;
- k:=0;%pour retenir la coordonn\'ee en x
- l:=0;%pour retenir la coordonn\'ee en y
- for p_=t:
- if (n mod 3)=1:
- if numeric p_:
- k:=p_;
- fi;
- fi;
- if (n mod 3)=2:
- if numeric p_:
- l:=p_;
- fi;
- fi;
- if (n mod 3)=0:
- if p_<>"":
- label.lrt(TEX("\footnotesize\num{\fpeval{"&decimal(k)&"/"&decimal(pasx)&"}}"),(k*unitpx,0));
- label.ulft(TEX("\footnotesize\num{\fpeval{"&decimal(l)&"/"&decimal(pasy)&"}}"),(0,l*unitpy));
- pointe((k*unitpx,0),(0,l*unitpy));
- fi;
- fi;
- n:=n+1;
- endfor;
- fi;
enddef;
- tata(#3);
+ tata(#5);
+ AvantDefinirSommets(#4);
+ DefinirLesSommets(#1);
+ if Code:
+ \useKV[ClesReperage]{Traces};
+ fi;
+ if Cadre:
+ trace polygone(%
+ ((minx-1)*unitpx,(miny-1)*unitpy),
+ ((maxx+1)*unitpx,(miny-1)*unitpy),
+ ((maxx+1)*unitpx,(maxy+1)*unitpy),
+ ((minx-1)*unitpx,(maxy+1)*unitpy)
+ );
+ fi;
\end{mplibcode}
\else
- \begin{mpost}
+ \begin{mpost}[mpsettings={
+ vardef EffectuerTraces=
+ \useKV[ClesFonction]{Traces};
+ enddef;
+ boolean Tiret,Code,AffichageGrad;
+ Tiret=\useKV[ClesReperage]{Tiret};
+ Code=\useKV[ClesReperage]{Code};
+ AffichageGrad=\useKV[ClesReperage]{AffichageGrad};
+ %
+ Unitex=\useKV[ClesReperage]{Unitex};
+ Pasx=\useKV[ClesReperage]{Pasx};
+ Unitey=\useKV[ClesReperage]{Unitey};
+ Pasy=\useKV[ClesReperage]{Pasy};
+ ValeurUnitex=\useKV[ClesReperage]{ValeurUnitex};
+ ValeurUnitey=\useKV[ClesReperage]{ValeurUnitey};
+ };]
+ %
+ vardef AvantDefinirSommets(text tu)=
+ pair tu;
+ enddef;
+ %
+ vardef DefinirLesSommets(text t)=
+ nbretiens=1;
+ k:=0;
+ l:=0;
+ for g_=t:
+ if (nbretiens mod 3)=1:
+ if numeric g_:
+ k:=g_;
+ fi;
+ fi;
+ if (nbretiens mod 3)=2:
+ if numeric g_:
+ l:=g_;
+ fi;
+ fi;
+ if (nbretiens mod 3)=0:
+ g_=(k*unitpx,l*unitpy);
+ fi;
+ nbretiens:=nbretiens+1;
+ endfor;
+ enddef;
+ %
maxx:=-4000;
minx=4000;
- unitex:=(xpart(#1))*cm;
- pasx=ypart(#1);
+ unitex:=(Unitex)*cm;
+ pasx=Pasx;
unitpx:=unitex/pasx;
maxy:=-4000;
miny:=4000;
- unitey:=(xpart(#2))*cm;
- pasy:=ypart(#2);
+ unitey:=(Unitey)*cm;
+ pasy:=Pasy;
unitpy:=unitey/pasy;
+ %
n:=1;
vardef toto(text t)=
for p_=t:
@@ -941,22 +1060,22 @@
endfor;
maxx:=maxx+1;
minx:=minx-1;
- if maxx<(ypart(#1)+1):
- maxx:=ypart(#1)+1;
+ if maxx<(Pasx+1):
+ maxx:=Pasx+1;
fi;
- if minx>(-ypart(#1)-1):
- minx:=-ypart(#1)-1;
+ if minx>(-Pasx-1):
+ minx:=-Pasx-1;
fi;
maxy:=maxy+1;
miny:=miny-1;
- if maxy<(ypart(#2)+1):
- maxy:=ypart(#2)+1;
+ if maxy<(Pasy+1):
+ maxy:=Pasy+1;
fi;
- if miny>(-ypart(#2)-1):
- miny:=-ypart(#2)-1;
+ if miny>(-Pasy-1):
+ miny:=-Pasy-1;
fi;
enddef;
- toto(#3);
+ toto(#1);
Figure((minx-1)*unitpx,(miny-1)*unitpy,(maxx+1)*unitpx,(maxy+1)*unitpy);
pair A,B,C,D,E;
A=(0,0);
@@ -973,31 +1092,42 @@
drawarrow (B+(-0.75*unitpx,0))--(C+(0.75*unitpx,0));
drawarrow (D+(0,-0.75*unitpy))--(E+(0,0.75*unitpy));
% graduation compl\`ete ou pas ?
- label.llft(btex \noexpand\footnotesize 0 etex,A);
- if #6>0:
+ label.llft(LATEX("\noexpand\footnotesize 0"),A);
+ if AffichageGrad:
for k=minx upto maxx:
if (xpart((k*unitex,0))>xpart(B+(-0.75*unitpx,0))) and (xpart((k*unitex,0))<xpart(C+(0.75*unitpx,0))):
if k<>0:
+ if Tiret:
+ draw (k*unitex,-1mm)--(k*unitex,1mm);
+ label.lrt(LATEX("\noexpand\footnotesize\noexpand\num{"&decimal(k)&"}"),(k*unitex,0));
+ else:
dotlabel.lrt(LATEX("\noexpand\footnotesize\noexpand\num{"&decimal(k)&"}"),(k*unitex,0));
fi;
fi;
+ fi;
endfor;
for k=miny upto maxy:
if (ypart((0,k*unitey))>ypart(D+(0,-0.75*unitpy))) and (ypart((0,k*unitey))<ypart(E+(0,0.75*unitpy))):
if k<>0:
+ if Tiret:
+ draw (-1mm,k*unitey)--(1mm,k*unitey);
+ label.ulft(LATEX("\noexpand\footnotesize\noexpand\num{"&decimal(k)&"}"),(0,k*unitey));
+ else:
dotlabel.ulft(LATEX("\noexpand\footnotesize\noexpand\num{"&decimal(k)&"}"),(0,k*unitey));
fi;
fi;
+ fi;
endfor;
else:
- dotlabel.lrt(LATEX("\noexpand\footnotesize\noexpand\num{"&decimal(xpart(#7))&"}"),(unitex,0));
- dotlabel.ulft(LATEX("\noexpand\footnotesize\noexpand\num{"&decimal(ypart(#7))&"}"),(0,unitey));
+ dotlabel.lrt(LATEX("\noexpand\footnotesize\noexpand\num{"&decimal(ValeurUnitex)&"}"),(unitex,0));
+ dotlabel.ulft(LATEX("\noexpand\footnotesize\noexpand\num{"&decimal(ValeurUnitey)&"}"),(0,unitey));
fi;
% apparition du nom des points ou pas
m_c:=m_c*3;
marque_p:="croix";
vardef tata(text t)=%on place les points
- if #4>0:
+ % {
+ if #2>0:
n:=1;
k:=0;%pour retenir la coordonn\'ee en x
l:=0;%pour retenir la coordonn\'ee en y
@@ -1013,7 +1143,7 @@
fi;
fi;
if (n mod 3)=0:
- if #4>1:
+ if #2>1:
if p_<>"":
if (k>0) and (l>0):
label.urt(LATEX(p_),(k*unitpx,l*unitpy));
@@ -1042,375 +1172,63 @@
pointe((k*unitpx,l*unitpy));
fi;
fi;
- if (#4=1) or (#4=3):
+ if (#2=1) or (#2=3):
draw (0,l*unitpy)--(k*unitpx,l*unitpy)--(k*unitpx,0) dashed evenly;
fi;
fi;
n:=n+1;
endfor;
fi;
- if #5=2:
+ % }
n:=1;
k:=0;%pour retenir la coordonn\'ee en x
l:=0;%pour retenir la coordonn\'ee en y
for p_=t:
- if (n mod 3)=1:
- if numeric p_:
- k:=p_;
- fi;
- fi;
- if (n mod 3)=2:
- if numeric p_:
- l:=p_;
- fi;
- fi;
- if (n mod 3)=0:
- if p_<>"":
- if (k mod pasx)<>0:
- label.lrt(LATEX("\noexpand\footnotesize$\noexpand\frac{\noexpand\num{"&decimal(k)&"}}{\noexpand\num{"&decimal(pasx)&"}}$"),(k*unitpx,0));
- else:
- label.lrt(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(k)&"/"&decimal(pasx)&"}}"),(k*unitpx,0));
- fi;
- if (l mod pasy)<>0:
- label.ulft(LATEX("\noexpand\footnotesize$\noexpand\frac{\noexpand\num{"&decimal(l)&"}}{\noexpand\num{"&decimal(pasy)&"}}$"),(0,l*unitpy));
- else:
- label.ulft(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(l)&"/"&decimal(pasy)&"}}"),(0,l*unitpy));
+ if (n mod 3)=1:
+ if numeric p_:
+ k:=p_;
fi;
- pointe((k*unitpx,0),(0,l*unitpy));
- fi;
- fi;
- n:=n+1;
- endfor;
- elseif #5=1:
- n:=1;
- k:=0;%pour retenir la coordonn\'ee en x
- l:=0;%pour retenir la coordonn\'ee en y
- for p_=t:
- if (n mod 3)=1:
- if numeric p_:
- k:=p_;
- fi;
- fi;
- if (n mod 3)=2:
- if numeric p_:
- l:=p_;
- fi;
- fi;
- if (n mod 3)=0:
- if p_<>"":
- label.lrt(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(k)&"/"&decimal(pasx)&"}}"),(k*unitpx,0));
- label.ulft(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(l)&"/"&decimal(pasy)&"}}"),(0,l*unitpy));
- pointe((k*unitpx,0),(0,l*unitpy));
- fi;
- fi;
- n:=n+1;
- endfor;
- fi;
- enddef;
- tata(#3);
- \end{mpost}
- \fi
-}
-
-\def\MPPlanTrace#1#2#3#4#5#6#7#8#9{%
- \ifluatex
- \begin{mplibcode}
- maxx:=-4000;
- minx=4000;
- unitex:=#1*cm;
- pasx=#2;
- unitpx:=unitex/pasx;
- maxy:=-4000;
- miny:=4000;
- unitey:=#3*cm;
- pasy:=#4;
- unitpy:=unitey/pasy;
- n:=1;
- vardef toto(text t)=
- for p_=t:
- if (n mod 3)=1:
- if p_>maxx:
- maxx:=p_;
- fi;
- if p_<minx:
- minx:=p_;
- fi;
- fi;
- if (n mod 3)=2:
- if p_>maxy:
- maxy:=p_;
- fi;
- if p_<miny:
- miny:=p_;
fi;
+ if (n mod 3)=2:
+ if numeric p_:
+ l:=p_;
+ fi;
fi;
- n:=n+1;
- endfor;
- maxx:=maxx+1;
- minx:=minx-1;
- if maxx<(#2+1):
- maxx:=#2+1;
- fi;
- if minx>(-#2-1):
- minx:=-#2-1;
- fi;
- maxy:=maxy+1;
- miny:=miny-1;
- if maxy<(#4+1):
- maxy:=#2+1;
- fi;
- if miny>(-#4-1):
- miny:=-#4-1;
- fi;
- enddef;
- toto(#5);
- Figure((minx-1)*unitpx,(miny-1)*unitpy,(maxx+1)*unitpx,(maxy+1)*unitpy);
- pair A,B,C,D,E;
- A=(0,0);
- B=(minx*unitpx,0);
- C=(maxx*unitpx,0);
- D=(0,miny*unitpy);
- E=(0,maxy*unitpy);
- for k=0 upto (maxx-minx):
- draw ((xpart(B),ypart(D)-0.75*unitpy)--(xpart(B),ypart(E)+0.75*unitpy)) shifted (k*unitpx,0) withcolor gris;
- endfor;
- for k=0 upto (maxy-miny):
- draw ((xpart(B)-0.75*unitpx,ypart(D))--(xpart(C)+0.75*unitpx,ypart(D))) shifted (0,k*unitpy) withcolor gris;
- endfor;
- drawarrow (B+(-0.75*unitpx,0))--(C+(0.75*unitpx,0));
- drawarrow (D+(0,-0.75*unitpy))--(E+(0,0.75*unitpy));
- dotlabel.bot(TEX("\footnotesize\num{"&decimal(#7)&"}"),(unitex,0));
- dotlabel.lft(TEX("\footnotesize\num{"&decimal(#8)&"}"),(0,unitey));
- label.llft(btex 0 etex,A);
- % apparition du nom des points ou pas
- m_c:=m_c*3;
- marque_p:="croix";
- vardef tata(text t)=%on place les points
- if #6>0:
- n:=1;
- k:=0;%pour retenir la coordonn\'ee en x
- l:=0;%pour retenir la coordonn\'ee en y
- for p_=t:
- if (n mod 3)=1:
- if numeric p_:
- k:=p_;
- fi;
- fi;
- if (n mod 3)=2:
- if numeric p_:
- l:=p_;
- fi;
- fi;
- if (n mod 3)=0:
- if #6>1:
- if (k>0) and (l>0):
- label.urt(TEX(p_),(k*unitpx,l*unitpy));
- fi;
- if (k=0) and (l>0):
- label.urt(TEX(p_),(k*unitpx,l*unitpy));
- fi;
- if (k>0) and (l=0):
- label.urt(TEX(p_),(k*unitpx,l*unitpy));
- fi;
- if (k<0) and (l>0):
- label.ulft(TEX(p_),(k*unitpx,l*unitpy));
- fi;
- if (k=0) and (l<0):
- label.llft(TEX(p_),(k*unitpx,l*unitpy));
- fi;
- if (k<0) and (l<0):
- label.llft(TEX(p_),(k*unitpx,l*unitpy));
- fi;
- if (k<0) and (l=0):
- label.llft(TEX(p_),(k*unitpx,l*unitpy));
- fi;
- if (k>0) and (l<0):
- label.lrt(TEX(p_),(k*unitpx,l*unitpy));
- fi;
- pointe((k*unitpx,l*unitpy));
- fi;
- if (#6=1) or (#6=3):
- draw (0,l*unitpy)--(k*unitpx,l*unitpy)--(k*unitpx,0) dashed evenly;
- fi;
- fi;
- n:=n+1;
- endfor;
+ if (n mod 3)=0:
+ if #3=2:
+ if p_<>"":
+ if (k mod pasx)<>0:
+ label.lrt(LATEX("\noexpand\footnotesize$\noexpand\frac{\noexpand\num{"&decimal(k)&"}}{\noexpand\num{"&decimal(pasx)&"}}$"),(k*unitpx,0));
+ else:
+ label.lrt(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(k)&"/"&decimal(pasx)&"}}"),(k*unitpx,0));
+ fi;
+ if (l mod pasy)<>0:
+ label.ulft(LATEX("\noexpand\footnotesize$\noexpand\frac{\noexpand\num{"&decimal(l)&"}}{\noexpand\num{"&decimal(pasy)&"}}$"),(0,l*unitpy));
+ else:
+ label.ulft(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(l)&"/"&decimal(pasy)&"}}"),(0,l*unitpy));
+ fi;
+ pointe((k*unitpx,0),(0,l*unitpy));
+ fi;
+ elseif #3=1:
+ if p_<>"":
+ label.lrt(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(k)&"/"&decimal(pasx)&"}}"),(k*unitpx,0));
+ label.ulft(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(l)&"/"&decimal(pasy)&"}}"),(0,l*unitpy));
+ pointe((k*unitpx,0),(0,l*unitpy));
+ fi;
+ fi;
fi;
- enddef;
- vardef Tracage(text t)(text ls)=%on trace les segments
- pair A[];
- n:=0;%pour parcourir la liste
- m:=0;%pour lister les points par leur nombre
- for p_=t:
n:=n+1;
- if (n mod 3)=1:
- k:=p_;
- fi;
- if (n mod 3)=2:
- l:=p_;
- fi;
- if (n mod 3)=0:
- m:=m+1;
- A[m]=(k*unitpx,l*unitpy);
- fi;
- endfor;
- for p_=ls:
- draw segment(A[p_ div 10],A[p_ mod 10]);
endfor;
enddef;
tata(#5);
- Tracage(#5)(#9);
- \end{mplibcode}
- \else
- \begin{mpost}[mpsettings={input PfCGeometrie;}]
- maxx:=-4000;
- minx=4000;
- unitex:=#1*cm;
- pasx=#2;
- unitpx:=unitex/pasx;
- maxy:=-4000;
- miny:=4000;
- unitey:=#3*cm;
- pasy:=#4;
- unitpy:=unitey/pasy;
- n:=1;
- vardef toto(text t)=
- for p_=t:
- if (n mod 3)=1:
- if p_>maxx:
- maxx:=p_;
- fi;
- if p_<minx:
- minx:=p_;
- fi;
- fi;
- if (n mod 3)=2:
- if p_>maxy:
- maxy:=p_;
- fi;
- if p_<miny:
- miny:=p_;
- fi;
- fi;
- n:=n+1;
- endfor;
- maxx:=maxx+1;
- minx:=minx-1;
- if maxx<(#2+1):
- maxx:=#2+1;
- fi;
- if minx>(-#2-1):
- minx:=-#2-1;
- fi;
- maxy:=maxy+1;
- miny:=miny-1;
- if maxy<(#4+1):
- maxy:=#2+1;
- fi;
- if miny>(-#4-1):
- miny:=-#4-1;
- fi;
- enddef;
- toto(#5);
- Figure((minx-1)*unitpx,(miny-1)*unitpy,(maxx+1)*unitpx,(maxy+1)*unitpy);
- pair A,B,C,D,E;
- A=(0,0);
- B=(minx*unitpx,0);
- C=(maxx*unitpx,0);
- D=(0,miny*unitpy);
- E=(0,maxy*unitpy);
- for k=0 upto (maxx-minx):
- draw ((xpart(B),ypart(D)-0.75*unitpy)--(xpart(B),ypart(E)+0.75*unitpy)) shifted (k*unitpx,0) withcolor gris;
- endfor;
- for k=0 upto (maxy-miny):
- draw ((xpart(B)-0.75*unitpx,ypart(D))--(xpart(C)+0.75*unitpx,ypart(D))) shifted (0,k*unitpy) withcolor gris;
- endfor;
- drawarrow (B+(-0.75*unitpx,0))--(C+(0.75*unitpx,0));
- drawarrow (D+(0,-0.75*unitpy))--(E+(0,0.75*unitpy));
- dotlabel.bot(LATEX("\noexpand\footnotesize\num{"&decimal(#7)&"}"),(unitex,0));
- dotlabel.lft(LATEX("\noexpand\footnotesize\num{"&decimal(#8)&"}"),(0,unitey));
- label.llft(btex 0 etex,A);
- % apparition du nom des points ou pas
- m_c:=m_c*3;
- marque_p:="croix";
- vardef tata(text t)=%on place les points
- if #6>0:
- n:=1;
- k:=0;%pour retenir la coordonn\'ee en x
- l:=0;%pour retenir la coordonn\'ee en y
- for p_=t:
- if (n mod 3)=1:
- if numeric p_:
- k:=p_;
- fi;
- fi;
- if (n mod 3)=2:
- if numeric p_:
- l:=p_;
- fi;
- fi;
- if (n mod 3)=0:
- if #6>1:
- if (k>0) and (l>0):
- label.urt(LATEX(p_),(k*unitpx,l*unitpy));
- fi;
- if (k=0) and (l>0):
- label.urt(LATEX(p_),(k*unitpx,l*unitpy));
- fi;
- if (k>0) and (l=0):
- label.urt(LATEX(p_),(k*unitpx,l*unitpy));
+ AvantDefinirSommets(#4);
+ DefinirLesSommets(#1);
+ if Code:
+ EffectuerTraces;
fi;
- if (k<0) and (l>0):
- label.ulft(LATEX(p_),(k*unitpx,l*unitpy));
- fi;
- if (k=0) and (l<0):
- label.llft(LATEX(p_),(k*unitpx,l*unitpy));
- fi;
- if (k<0) and (l<0):
- label.llft(LATEX(p_),(k*unitpx,l*unitpy));
- fi;
- if (k<0) and (l=0):
- label.llft(LATEX(p_),(k*unitpx,l*unitpy));
- fi;
- if (k>0) and (l<0):
- label.lrt(LATEX(p_),(k*unitpx,l*unitpy));
- fi;
- pointe((k*unitpx,l*unitpy));
- fi;
- if (#6=1) or (#6=3):
- draw (0,l*unitpy)--(k*unitpx,l*unitpy)--(k*unitpx,0) dashed evenly;
- fi;
- fi;
- n:=n+1;
- endfor;
- fi;
- enddef;
- vardef Tracage(text t)(text ls)=%on trace les segments
- pair A[];
- n:=0;%pour parcourir la liste
- m:=0;%pour lister les points par leur nombre
- for p_=t:
- n:=n+1;
- if (n mod 3)=1:
- k:=p_;
- fi;
- if (n mod 3)=2:
- l:=p_;
- fi;
- if (n mod 3)=0:
- m:=m+1;
- A[m]=(k*unitpx,l*unitpy);
- fi;
- endfor;
- for p_=ls:
- draw segment(A[p_ div 10],A[p_ mod 10]);
- endfor;
- enddef;
- tata(#5);
- Tracage(#5)(#9);
\end{mpost}
\fi
-}
+}%
\def\MPTouteDROITEGraduee#1#2{%
% #1 : liste des points \`a placer en pas. pour g\'erer le cas des rep\'erages fractionnaires
@@ -1546,10 +1364,12 @@
drawarrow (unitp*valeur[n],-7mm if (n mod 2)=0:-5mm fi)--(unitp*valeur[n],-3mm);
else:
drawarrow (unitp*valeur[n],-7mm)--(unitp*valeur[n],-3mm);
+ label.bot(TEX("\pointilles[1cm]"),(unitp*valeur[n],-7mm));
fi;
numeric LongPoint;
Labeloffset:=labeloffset;
labeloffset:=0pt;
+ if Decale:
if DemiDroite:
LongPoint=abs(C-(B+unitp*(0.75,0)));
label.rt(TEX("\pointilles["&decimal(LongPoint)&"pt]"),C+(0,-1.6cm));
@@ -1557,6 +1377,7 @@
LongPoint=abs((C+unitp*(-0.75,0))-(B+unitp*(0.75,0)));
label.rt(TEX("\pointilles["&decimal(LongPoint)&"pt]"),C+unitp*(-0.75,0)+(0,-1.6cm));
fi;
+ fi;
labeloffset:=Labeloffset;
pointe(unitp*(valeur[n],0));
elseif ACoord=2:
@@ -1579,10 +1400,12 @@
drawarrow (unitp*valeur[n],-7mm if (n mod 2)=0:-5mm fi)--(unitp*valeur[n],-3mm);
else:
drawarrow (unitp*valeur[n],-7mm)--(unitp*valeur[n],-3mm);
+ label.bot(TEX("\pointilles[1cm]"),(unitp*valeur[n],-7mm));
fi;
numeric LongPoint;
Labeloffset:=labeloffset;
labeloffset:=0pt;
+ if Decale:
if DemiDroite:
LongPoint=abs(C-(B+unitp*(0.75,0)));
label.rt(TEX("\pointilles["&decimal(LongPoint)&"pt]"),C+(0,-1.6cm));
@@ -1590,6 +1413,7 @@
LongPoint=abs((C+unitp*(-0.75,0))-(B+unitp*(0.75,0)));
label.rt(TEX("\pointilles["&decimal(LongPoint)&"pt]"),C+unitp*(-0.75,0)+(0,-1.6cm));
fi;
+ fi;
labeloffset:=Labeloffset;
pointe(unitp*(valeur[n],0));
fi;
@@ -2299,8 +2123,9 @@ label.lft(LATEX("\noexpand\footnotesize\noexpand\SI{\noexpand\fpeval{"&decimal(V
\readlist*\ListePointEspace{#2}%
\buildespace%
}{\ifboolKV[ClesReperage]{Plan}{%
- \setsepchar[*]{,*/}\ignoreemptyitems%
- \readlist*\ListePointRepere{#2}%
+ \setsepchar[*]{,*/}%\ignoreemptyitems%
+ \readlist\ListePointRepere{#2}%
+ \ignoreemptyitems
\buildreperenew%
}{%
\setsepchar[*]{,*/}\ignoreemptyitems%
diff --git a/macros/latex/contrib/profcollege/latex/PfCRepresenterFraction.tex b/macros/latex/contrib/profcollege/latex/PfCRepresenterFraction.tex
index aed889bfcb..d0d39859ea 100644
--- a/macros/latex/contrib/profcollege/latex/PfCRepresenterFraction.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCRepresenterFraction.tex
@@ -382,7 +382,7 @@
trace FractionRectangle(#1,#2);
\end{mplibcode}
\else%
- \begin{mpost}[mpsettings={\MPFractionRectangleCode}]
+ \begin{mpost}[mpsettings={\MPFractionRectangleCode;color ColRectangle;ColRectangle=\useKV[ClesFraction]{Couleur};}]
trace FractionRectangle(#1,#2);
\end{mpost}
\fi%
diff --git a/macros/latex/contrib/profcollege/latex/PfCRepresenterTableur.tex b/macros/latex/contrib/profcollege/latex/PfCRepresenterTableur.tex
index 22ea023935..dbd54d1857 100644
--- a/macros/latex/contrib/profcollege/latex/PfCRepresenterTableur.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCRepresenterTableur.tex
@@ -40,7 +40,7 @@
\newcolumntype{B}{>{\centering\arraybackslash}m{\PfCTableurLargeur}}%
\setlength{\PfCLongInter}{-40pt+\fpeval{\useKV[Tableur]{LargeurUn}}pt+\fpeval{(\useKV[Tableur]{Colonnes}-2)*\useKV[Tableur]{Largeur}}pt+\fpeval{2*\useKV[Tableur]{Colonnes}-6}\tabcolsep+\fpeval{\useKV[Tableur]{Colonnes}+2}\arrayrulewidth}%
\ifboolKV[Tableur]{Bandeau}{%
- \begin{NiceTabular}{p{\PfCTableurLargeur}p{10pt}p{50pt}p{\PfCLongInter}}
+ \begin{NiceTabular}{p{\PfCTableurLargeur}p{10pt}p{50pt}p{\PfCLongInter}}%
\Block[draw,l]{}{\useKV[Tableur]{Cellule}}&\Block[draw]{}{\scriptsize$\blacktriangledown$}&\Block{}{$f_x$\hfill$\sum$~\scriptsize$\blacktriangledown$\hfill$=$}&\Block[draw]{}{\useKV[Tableur]{Formule}\hfill\scriptsize$\blacktriangledown$}\\
\end{NiceTabular}%
\nopagebreak%
@@ -56,7 +56,7 @@
\ifboolKV[Tableur]{Selection}{%
\xintifboolexpr{\cntlin>\useKV[Tableur]{Ligne} && \cntlin<\fpeval{\useKV[Tableur]{Ligne}+\useKV[Tableur]{PasL}+1}}{\textcolor{white}{\number\numexpr\cntlin-1\relax}}{\number\numexpr\cntlin-1\relax}%
}{\number\numexpr\cntlin-1\relax}\fi}%
- wc{20pt}A*{\fpeval{\useKV[Tableur]{Colonnes}-1}}{B}}[hvlines]%
+ wc{20pt}A*{\fpeval{\useKV[Tableur]{Colonnes}-1}}{B}}[hvlines,color-inside]%
\CodeBefore
% on colorie en gris toute la première ligne
\tikz\fill[gray!15](row-1-|col-1) rectangle (row-2-|last);%
@@ -101,4 +101,4 @@
\repeat%
\addtot@b{\\&}%
\collectcp@body}{\the\t@b}%
-\makeatother
+\makeatother \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex b/macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex
index 4038ecd1b0..3e2aa47db9 100644
--- a/macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex
@@ -180,7 +180,7 @@
}%
}%
-\setKVdefault[ClesSimplification]{Details=false,All=false,Longue=false,Fleches=false,Contraire=0,Couleur=black,Debut=false,Impose=false}
+\setKVdefault[ClesSimplification]{Details=false,All=false,Longue=false,Fleches=false,Contraire=0,Couleur=black,Debut=false,Impose=false,Decomposition=false}
\defKV[ClesSimplification]{Nombre=\setKV[ClesSimplification]{Impose}}
\newcounter{NbFrac}%
@@ -215,12 +215,105 @@
\frac{\num{#2}}{\num{#3}}=\frac{\num{#2}\times\num{\useKV[ClesSimplification]{Contraire}}}{\num{#3}\times\num{\useKV[ClesSimplification]{Contraire}}}=\frac{\num{\fpeval{\useKV[ClesSimplification]{Contraire}*#2}}}{\num{\fpeval{\useKV[ClesSimplification]{Contraire}*#3}}}%
}%
}{%
+ \ifboolKV[ClesSimplification]{Decomposition}{%
+ \DecompositionSimplification{#2}{#3}%
+ }{%
\ifboolKV[ClesSimplification]{Longue}{%
\colorlet{PfCSimpliCol}{\useKV[ClesSimplification]{Couleur}}%
\LongueSimplification{#2}{#3}%
}{%
\ifboolKV[ClesSimplification]{Details}{\SSimpli{#2}{#3}}{\ifboolKV[ClesSimplification]{All}{\ensuremath{\SSimpli{#2}{#3}=\SSimplifie{#2}{#3}}}{\SSimplifie{#2}{#3}}}%
- }%
+ }%
+ }%
}%
}%
+}%
+
+\NewDocumentCommand\DecompositionSimplification{mm}{%
+ \setsepchar{,}\ignoreemptyitems%
+ \RecupListeTousFacteursPremier{#1}%
+ \readlist*\DiviseurHaut{\PfCPileFacteurs}%
+ \RecupListeTousFacteursPremier{#2}%
+ \readlist*\DiviseurBas{\PfCPileFacteurs}%
+ \xdef\LongueurH{\DiviseurHautlen}%
+ \xdef\LongueurB{\DiviseurBaslen}%
+ \xdef\PfCPremierFacteur{#1}%
+ \xdef\PfCDeuxiemeFacteur{#2}%
+ \DiviseurCommun{#1}{#2}%
+ \ensuremath{%
+ \ifnum\PfCDivCom>1%
+ \frac{%
+ \xintFor* ##2 in{\xintSeq{1}{\LongueurH}}\do{%
+ \DiviseurCommun{\DiviseurHaut[##2]}{\PfCDeuxiemeFacteur}
+ \ifnum\PfCDivCom>1%
+ \mathcolor{\useKV[ClesSimplification]{Couleur}}{\DiviseurHaut[##2]}
+ \xdef\PfCDeuxiemeFacteur{\fpeval{\PfCDeuxiemeFacteur/\DiviseurHaut[##2]}}
+ \else
+ \DiviseurHaut[##2]
+ \fi
+ \xintifForLast{}{\times}
+ }
+ }{%
+ \xintFor* ##2 in{\xintSeq{1}{\LongueurB}}\do{%
+ \DiviseurCommun{\DiviseurBas[##2]}{\PfCPremierFacteur}
+ \ifnum\PfCDivCom>1%
+ \mathcolor{\useKV[ClesSimplification]{Couleur}}{\DiviseurBas[##2]}
+ \xdef\PfCPremierFacteur{\fpeval{\PfCPremierFacteur/\DiviseurBas[##2]}}
+ \else
+ \DiviseurBas[##2]
+ \fi
+ \xintifForLast{}{\times}
+ }
+ }=\frac{\PfCPremierFacteur}{\PfCDeuxiemeFacteur}
+ \else
+ \tofrac{#1/#2}
+ \fi
+ }%
+}%
+
+\NewDocumentCommand\DecompositionSimplificationSeule{mm}{%
+ \setsepchar{,}\ignoreemptyitems%
+ \RecupListeTousFacteursPremier{\fpeval{abs(#1)}}%
+ \readlist*\DiviseurHaut{\PfCPileFacteurs}%
+ \RecupListeTousFacteursPremier{\fpeval{abs(#2)}}%
+ \readlist*\DiviseurBas{\PfCPileFacteurs}%
+ \xdef\LongueurH{\DiviseurHautlen}%
+ \xdef\LongueurB{\DiviseurBaslen}%
+ \xintifboolexpr{\fpeval{#1*#2}<0}{%
+ \xdef\PfCPremierFacteur{#1}%
+ \xdef\PfCDeuxiemeFacteur{#2}%
+ }{%
+ \xdef\PfCPremierFacteur{\fpeval{abs(#1)}}%
+ \xdef\PfCDeuxiemeFacteur{\fpeval{abs(#2)}}%
+ }%
+ \DiviseurCommun{\fpeval{abs(#1)}}{\fpeval{abs(#2)}}%
+ \ensuremath{%
+ \ifnum\PfCDivCom>1%
+ \frac{%
+ \xintifboolexpr{\fpeval{#1*#2}<0}{\xintifboolexpr{#1<0}{-}{}}{}\xintFor* ##2 in{\xintSeq{1}{\LongueurH}}\do{%
+ \DiviseurCommun{\DiviseurHaut[##2]}{\PfCDeuxiemeFacteur}
+ \ifnum\PfCDivCom>1%
+ \mathcolor{\useKV[ClesSimplification]{Couleur}}{\DiviseurHaut[##2]}
+ \xdef\PfCDeuxiemeFacteur{\fpeval{\PfCDeuxiemeFacteur/\DiviseurHaut[##2]}}
+ \else
+ \DiviseurHaut[##2]
+ \fi
+ \xintifForLast{}{\times}
+ }
+ }{%
+ \xintifboolexpr{\fpeval{#1*#2}<0}{\xintifboolexpr{#1<0}{}{-}}{}\xintFor* ##2 in{\xintSeq{1}{\LongueurB}}\do{%
+ \DiviseurCommun{\DiviseurBas[##2]}{\PfCPremierFacteur}
+ \ifnum\PfCDivCom>1%
+ \mathcolor{\useKV[ClesSimplification]{Couleur}}{\DiviseurBas[##2]}
+ \xdef\PfCPremierFacteur{\fpeval{\PfCPremierFacteur/\DiviseurBas[##2]}}
+ \else
+ \DiviseurBas[##2]
+ \fi
+ \xintifForLast{}{\times}
+ }
+ }%=\frac{\PfCPremierFacteur}{\PfCDeuxiemeFacteur}
+ \else
+ \tofrac{#1/#2}
+ \fi
+ }%
}% \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCSommeAngles.tex b/macros/latex/contrib/profcollege/latex/PfCSommeAngles.tex
index ec142b6a3f..df62edfbce 100644
--- a/macros/latex/contrib/profcollege/latex/PfCSommeAngles.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCSommeAngles.tex
@@ -274,7 +274,7 @@
\ifboolKV[ClesSommeAngle]{Detail}{2\times\widehat{\NomA\NomB\NomC}&=\ang{180}-\ang{#4}\\}{2\times\widehat{\NomA\NomB\NomC}&=\ang{\totalangle}\\}%
\ifboolKV[ClesSommeAngle]{Detail}{2\times\widehat{\NomA\NomB\NomC}&=\ang{\totalangle}\\}{\widehat{\NomA\NomB\NomC}&=\frac{\ang{\totalangle}}{2}\\}%
\ifboolKV[ClesSommeAngle]{Detail}{\widehat{\NomA\NomB\NomC}&=\frac{\ang{\totalangle}}{2}\\}{\widehat{\NomA\NomB\NomC}&=\ang{\fpeval{0.5*(180-#4)}}}%\\
- \ifboolKV[ClesSommeAngle]{Detail}{\widehat{\NomA\NomB\NomC}&=\ang{\fpeval{0.5*(180-#4)}}\\}{}%
+ \ifboolKV[ClesSommeAngle]{Detail}{\widehat{\NomA\NomB\NomC}&=\ang{\fpeval{0.5*(180-#4)}}}{}%
\end{align*}%
\xdef\ResultatAngle{\fpeval{0.5*(180-#4)}}%
\fi%
diff --git a/macros/latex/contrib/profcollege/latex/PfCStatistiques.tex b/macros/latex/contrib/profcollege/latex/PfCStatistiques.tex
index 720186804f..3be43cc34d 100644
--- a/macros/latex/contrib/profcollege/latex/PfCStatistiques.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCStatistiques.tex
@@ -1883,13 +1883,12 @@ Histogramme=false,UniteAire=1,MemeAmpli,DepartHisto=1%
On range les donn\'ees par ordre croissant :%
\nbdonnees=0%
\xintifboolexpr{\ListeCompletelen<\useKV[ClesStat]{Coupure}}{%
- \[\DTLforeach{mtdb}{\numeroDonnee=Numeric}{\num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}\DTLiflastrow{.}{;}}\]%
+ \[\DTLforeach{mtdb}{\numeroDonnee=Numeric}{\num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}\DTLiflastrow{.}{\,;~}}\]%
}{%
%\medskip%
\begin{center}
\begin{minipage}{0.9\linewidth}
- \DTLforeach*{mtdb}{\numeroDonnee=Numeric}{\num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}\DTLiflastrow{.}{;
- }\nbdonnees=\fpeval{\nbdonnees+1}\modulo{\nbdonnees}{\useKV[ClesStat]{Coupure}}\xintifboolexpr{\remainder==0}{\\}{}}
+ \DTLforeach*{mtdb}{\numeroDonnee=Numeric}{\num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}\DTLiflastrow{.}{\,;~}\nbdonnees=\fpeval{\nbdonnees+1}\modulo{\nbdonnees}{\useKV[ClesStat]{Coupure}}\xintifboolexpr{\remainder==0}{\\}{}}
\end{minipage}
\end{center}%
%\medskip%
@@ -1898,11 +1897,11 @@ Histogramme=false,UniteAire=1,MemeAmpli,DepartHisto=1%
\newcount\meda%
\ifodd\number\ListeCompletelen%odd impair
\med=\fpeval{(\ListeCompletelen+1)/2}\relax%
- L'effectif total de la s\'erie est \num{\ListeCompletelen}. Or, $\num{\ListeCompletelen}=\num{\fpeval{\med-1}}+1+\num{\fpeval{\med-1}}$.\\
+ \ifboolKV[ClesStat]{SET}{On sait que }{L'effectif total de la s\'erie est \num{\ListeCompletelen}. Or, }$\num{\ListeCompletelen}=\num{\fpeval{\med-1}}+1+\num{\fpeval{\med-1}}$.\\
\else% pair
\med=\fpeval{\ListeCompletelen/2}\relax%
\meda=\numexpr\med+1\relax%
- L'effectif total de la s\'erie est \num{\ListeCompletelen}. Or, $\num{\ListeCompletelen}=\num{\the\med}+\num{\the\med}$.\\
+ \ifboolKV[ClesStat]{SET}{On sait que }{L'effectif total de la s\'erie est \num{\ListeCompletelen}. Or, }$\num{\ListeCompletelen}=\num{\the\med}+\num{\the\med}$.\\
\fi%
\newcount\k%
\k=0%
@@ -2070,11 +2069,11 @@ Histogramme=false,UniteAire=1,MemeAmpli,DepartHisto=1%
\newcount\meda%
\ifodd\number\EffectifTotal%odd impair
\med=\fpeval{(\EffectifTotal+1)/2}\relax%
- L'effectif total de la s\'erie est \num{\EffectifTotal}. Or, $\num{\EffectifTotal}=\num{\fpeval{\med-1}}+1+\num{\fpeval{\med-1}}$. %
+ \ifboolKV[ClesStat]{SET}{On sait que }{L'effectif total de la s\'erie est \num{\EffectifTotal}. Or, }$\num{\EffectifTotal}=\num{\fpeval{\med-1}}+1+\num{\fpeval{\med-1}}$. %
\else% pair
\med=\fpeval{\EffectifTotal/2}\relax%
\meda=\numexpr\med+1\relax%
- L'effectif total de la s\'erie est \num{\EffectifTotal}. Or, $\num{\EffectifTotal}=\num{\fpeval{\med}}+\num{\fpeval{\med}}$. %
+ \ifboolKV[ClesStat]{SET}{On sait que }{L'effectif total de la s\'erie est \num{\EffectifTotal}. Or, }$\num{\EffectifTotal}=\num{\fpeval{\med}}+\num{\fpeval{\med}}$. %
\fi%
\newcount\k%
\k=0%
diff --git a/macros/latex/contrib/profcollege/latex/PfCTableauxUnites.tex b/macros/latex/contrib/profcollege/latex/PfCTableauxUnites.tex
index 84d64c3f09..75270180d3 100644
--- a/macros/latex/contrib/profcollege/latex/PfCTableauxUnites.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCTableauxUnites.tex
@@ -1,7 +1,7 @@
%%%
% Tableaux d'unit\'es
%%%
-\setKVdefault[ClesTableaux]{Virgule=true,Incline=false,Entiers=false,Decimaux=false,Milliards=false,Millions=false,Micro=false,Nano=false,Partie=false,CouleurG=gray!15,CouleurM=gray!15,Couleurm=gray!15,Couleuru=gray!15,Couleurd=gray!15,Classes=false,Nombres=false,Puissances=false,NbLignes=2,Metre=false,Are=false,Capacite=false,Carre=false,CarreA=false,Cube=false,Litre=false,Gramme=false,Fleches=false,FlechesB=false,FlechesH=false,Colonnes=false,Prefixes=false,Escalier=false,CubeA=false,Taille=5,Largeur=4.75em,Nom=PfCTableau,CodeAfter={},PuissancesSeules=false,Colonne=-1,Octet=false,CouleurGN=white,CadreGN=black,Tabcolsep=0.275\tabcolsep,Exterieur=false}%
+\setKVdefault[ClesTableaux]{Virgule=true,Incline=false,Entiers=false,Decimaux=false,Milliards=false,Millions=false,Micro=false,Nano=false,Partie=false,CouleurG=gray!15,CouleurM=gray!15,Couleurm=gray!15,Couleuru=gray!15,Couleurd=gray!15,Classes=false,Nombres=false,Puissances=false,NbLignes=2,Metre=false,Are=false,Capacite=false,Carre=false,CarreA=false,Cube=false,Litre=false,Gramme=false,Fleches=false,FlechesB=false,FlechesH=false,Colonnes=false,Prefixes=false,Escalier=false,CubeA=false,Taille=5,Largeur=4.75em,Nom=PfCTableau,CodeAfter={},PuissancesSeules=false,Colonne=-1,Octet=false,CouleurGN=white,CadreGN=black,Tabcolsep=0.275\tabcolsep,Exterieur=false,Condense=false}%
\defKV[ClesTableaux]{ColonnesSup=\setKV[ClesTableaux]{Exterieur}}%
%
\newcommand\PfCTBstrut{\rule[-1.2ex]{0pt}{3.8ex}}% Top and Bottom strut
@@ -1153,13 +1153,15 @@
\ifboolKV[ClesTableaux]{Carre}{%
\[\renewcommand{\arraystretch}{1.15}%
\begin{NiceTabular}{*{7}{wc{3.5mm}wc{3.5mm}}}%
- \Block[]{1-2}{}%
- &&\Block[]{1-2}{}%
- &&\Block[]{1-2}{}%
- &&\Block[]{1-2}{}%
- &&\Block[]{1-2}{}%
- &&\Block[]{1-2}{}%
- &&\Block[]{1-2}{}\\
+ \ifboolKV[ClesTableaux]{Condense}{}{%
+ \Block[]{1-2}{}%
+ &&\Block[]{1-2}{}%
+ &&\Block[]{1-2}{}%
+ &&\Block[]{1-2}{}%
+ &&\Block[]{1-2}{}%
+ &&\Block[]{1-2}{}%
+ &&\Block[]{1-2}{}\\
+ }%
\Block[borders={left,top,right}]{1-2}{km$^2$\PfCTBstrut}&&\Block[borders={top,right}]{1-2}{hm$^2$\PfCTBstrut}&&\Block[borders={top,right}]{1-2}{dam$^2$\PfCTBstrut}&&\Block[borders={top,right}]{1-2}{m$^2$\PfCTBstrut}&&\Block[borders={top,right}]{1-2}{dm$^2$\PfCTBstrut}&&\Block[borders={top,right}]{1-2}{cm$^2$\PfCTBstrut}&&\Block[borders={top,right}]{1-2}{mm$^2$\PfCTBstrut}&\\
\ifboolKV[ClesTableaux]{Are}{%
\Block[borders={left,right,bottom}]{1-2}{}&&\Block[draw=gray!50,borders={left,top,bottom}]{}{~}&\Block[borders={top,right,bottom}]{}{\scriptsize ha}&\Block[draw=gray!50,borders={left,top,bottom}]{}{~}&\Block[borders={top,right,bottom}]{}{\scriptsize a}&\Block[borders={left,right,bottom}]{1-2}{}&&\Block[borders={left,right,bottom}]{1-2}{}&&\Block[borders={left,right,bottom}]{1-2}{}&&\Block[borders={left,right,bottom}]{1-2}{}&\\
@@ -1167,29 +1169,33 @@
\xintFor* ##1 in {\xintSeq {1}{\useKV[ClesTableaux]{NbLignes}}}\do{%
&&&&&&&&&&&&&\\
}%
- \Block[]{1-2}{}%
- &&\Block[]{1-2}{}%
- &&\Block[]{1-2}{}%
- &&\Block[]{1-2}{}%
- &&\Block[]{1-2}{}%
- &&\Block[]{1-2}{}%
- &&\Block[]{1-2}{}\\
+ \ifboolKV[ClesTableaux]{Condense}{}{%
+ \Block[]{1-2}{}%
+ &&\Block[]{1-2}{}%
+ &&\Block[]{1-2}{}%
+ &&\Block[]{1-2}{}%
+ &&\Block[]{1-2}{}%
+ &&\Block[]{1-2}{}%
+ &&\Block[]{1-2}{}\\
+ }
\CodeAfter
% on trace les lignes verticales
+ \xdef\PfCRetiensDepart{3}%
+ \ifboolKV[ClesTableaux]{Condense}{\xdef\PfCRetiensDepart{2}}{}%
\xintifboolexpr{\useKV[ClesTableaux]{Are}}{%
\xintFor* ##1 in {\xintSeq{1}{8}}\do{%
- \tikz\draw (4-|\fpeval{2*(##1-1)+1})--(\fpeval{4+\useKV[ClesTableaux]{NbLignes}}-|\fpeval{2*(##1-1)+1});
+ \tikz\draw (\fpeval{\PfCRetiensDepart+1}-|\fpeval{2*(##1-1)+1})--(\fpeval{\fpeval{\PfCRetiensDepart+1}+\useKV[ClesTableaux]{NbLignes}}-|\fpeval{2*(##1-1)+1});
}%
\xintFor* ##1 in {\xintSeq{1}{7}}\do{%
- \tikz\draw[gray!50] (4-|\fpeval{2*(##1-1)+2})--(\fpeval{4+\useKV[ClesTableaux]{NbLignes}}-|\fpeval{2*(##1-1)+2});
+ \tikz\draw[gray!50] (\fpeval{\PfCRetiensDepart+1}-|\fpeval{2*(##1-1)+2})--(\fpeval{\fpeval{\PfCRetiensDepart+1}+\useKV[ClesTableaux]{NbLignes}}-|\fpeval{2*(##1-1)+2});
}%
}{%
\xintFor* ##1 in {\xintSeq{1}{8}}\do{%
- \tikz\draw (3-|\fpeval{2*(##1-1)+1})--(\fpeval{3+\useKV[ClesTableaux]{NbLignes}}-|\fpeval{2*(##1-1)+1});
+ \tikz\draw (\PfCRetiensDepart-|\fpeval{2*(##1-1)+1})--(\fpeval{\PfCRetiensDepart+\useKV[ClesTableaux]{NbLignes}}-|\fpeval{2*(##1-1)+1});
}%
\xintifboolexpr{\useKV[ClesTableaux]{Colonnes}}{%
\xintFor* ##1 in {\xintSeq{1}{7}}\do{%
- \tikz\draw[gray!50] (3-|\fpeval{2*(##1-1)+2})--(\fpeval{3+\useKV[ClesTableaux]{NbLignes}}-|\fpeval{2*(##1-1)+2});
+ \tikz\draw[gray!50] (\PfCRetiensDepart-|\fpeval{2*(##1-1)+2})--(\fpeval{\PfCRetiensDepart+\useKV[ClesTableaux]{NbLignes}}-|\fpeval{2*(##1-1)+2});
}%
}{}%
}%
@@ -1201,11 +1207,12 @@
\xintFor* ##2 in{\xintSeq {1}{\ListeNombreAPlacerlen}}\do{
\StrLen{\ListeNombreAPlacer[##2,1]}[\TabLongueurNombre]%
\xintFor* ##1 in{\xintSeq {1}{\TabLongueurNombre}}\do{%
- \tikz\node at (\fpeval{##2+\ifboolKV[ClesTableaux]{Are}{3.5}{2.5}}-|\fpeval{\ListeNombreAPlacer[##2,2]-0.5+##1}) {\PfCTBstrut\StrMid{\ListeNombreAPlacer[##2,1]}{##1}{##1}};
+ \tikz\node at (\fpeval{##2+\ifboolKV[ClesTableaux]{Are}{\fpeval{\PfCRetiensDepart+0.5}}{\fpeval{\PfCRetiensDepart-0.5}}}-|\fpeval{\ListeNombreAPlacer[##2,2]-0.5+##1}) {\PfCTBstrut\StrMid{\ListeNombreAPlacer[##2,1]}{##1}{##1}};
}%
}
\fi%
% on trace les flèches
+ \ifboolKV[ClesTableaux]{Condense}{}{%
\ifboolKV[ClesTableaux]{Fleches}{\setKV[ClesTableaux]{FlechesH,FlechesB}}{}%
\ifboolKV[ClesTableaux]{Are}{\xdef\PfCTableauDepart{4}}{\xdef\PfCTableauDepart{3}}%
\ifboolKV[ClesTableaux]{FlechesH}{%
@@ -1218,6 +1225,7 @@
\tikz\draw[gray,->,>=latex,out=-150,in=-30] (\fpeval{\PfCTableauDepart+\useKV[ClesTableaux]{NbLignes}+0.5}-|\fpeval{2*(##1+1)}) to node[below,midway]{\small$\div\num{100}$}(\fpeval{\PfCTableauDepart+\useKV[ClesTableaux]{NbLignes}+0.5}-|\fpeval{2*##1});%
}%
}{}%
+ }%
\useKV[ClesTableaux]{CodeAfter}%
\end{NiceTabular}
\]%
diff --git a/macros/latex/contrib/profcollege/latex/ProfCollege.sty b/macros/latex/contrib/profcollege/latex/ProfCollege.sty
index 9cf41f3817..18b287fba4 100644
--- a/macros/latex/contrib/profcollege/latex/ProfCollege.sty
+++ b/macros/latex/contrib/profcollege/latex/ProfCollege.sty
@@ -2,9 +2,9 @@
% licence : Released under the LaTeX Project Public License v1.3c
% or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}%
-\def\filedate{2023/10/15}%
+\def\filedate{2023/11/14}%
\let\PfCfiledate\filedate%
-\def\fileversion{0.99-z-v}%
+\def\fileversion{0.99-z-w}%
\let\PfCfileversion\fileversion%
\ProvidesPackage{ProfCollege}[\filedate\space v\fileversion\space Aide pour utiliser LaTeX au college]%
@@ -49,8 +49,8 @@
\DeclareSIUnit{\Dollar}{\$}%
\DeclareSIUnit{\LivreSterling}{£}%
-
\RequirePackage[table,svgnames]{xcolor}%Gestion des couleurs
+%\PassOptionsToPackage{table,svgnames}{xcolor}
\RequirePackage{xstring}%Gestion de chaines de caractères
\RequirePackage{simplekv}%Gestion de paramètres sous forme de clés
\RequirePackage{ifthen}%
@@ -168,6 +168,62 @@
%%%
% Commandes "utiles"
%%%
+\NewDocumentCommand\NumMA{m}{%
+ \xintifboolexpr{#1<0}{%
+ (\num{#1})%
+ }{%
+ \num{#1}%
+ }%
+}%
+
+\newcounter{Marque}
+
+\NewDocumentCommand\AffichageTab{O{x}mmm}{%
+ \ifnum#2=0\relax%
+ \ifnum#3=0\relax%
+ \ifnum#4=0\relax%
+ \else%
+ #4%
+ \fi%
+ \else%
+ #3*#1%
+ \ifnum#4=0\relax%
+ \else%
+ \ifnum#4<0\relax%
+ #4%
+ \else%
+ +#4%
+ \fi%
+ \fi%
+ \fi%
+ \else%
+ #2*#1*#1%
+ \ifnum#3=0\relax%
+ \ifnum#4=0\relax%
+ \else%
+ \ifnum#4<0%
+ #4%
+ \else%
+ +#4%
+ \fi%
+ \fi%
+ \else%
+ \ifnum#3<0%
+ #3*#1%
+ \else%
+ +#3*#1%
+ \fi%
+ \ifnum#4=0\relax%
+ \else%
+ \ifnum#4<0%
+ #4%
+ \else%
+ +#4%
+ \fi%
+ \fi%
+ \fi%
+ \fi%
+}%
%encadrer avec des "sommets arrondis"
\newsavebox{\logobox}%
@@ -599,6 +655,12 @@
}%\emoticon
}%\raisebox
}%
+
+\setsepchar[*]{,*/}\ignoreemptyitems
+\readlist*\ListeMateriaux{aluminium/'/2.7,chêne/e~/0.69,bouleau/e~/0.65,sapin/e~/0.45,polystyrène/e~/1.04,porcelaine/la/2.5,acier/'/7.85,cuivre/e~/8.92,fer/e~/7.86,or/'/19.3,argent/'/10.5,bronze/e~/8.4,plomb/e~/11.35,marbre/e~/2.75,laiton/e~/7.3,titane/e~/4.5,PVC/e~/1.38}
+\setsepchar{,}
+
+\input{PfCCritere}
\input{PfCLego}
\input{PfCJeton}
\input{PfCDessinAlgo}
diff --git a/macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp b/macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp
index 37f4809598..bada2c141a 100644
--- a/macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp
+++ b/macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp
@@ -56,6 +56,17 @@ _tn:=0;
pair _t[];
color _T[];
+%%%%%%%%%
+%Labelisation spéciale :)
+%
+vardef Labelcp(suffix a)(expr s,z) =
+ save p; picture p;
+ if picture s: p=s
+ else: p = s infont defaultfont scaled defaultscale
+ fi;
+ draw p shifted (z + 2*labeloffset*unitvector(z-a)-center p)
+enddef;
+
%%-----------------------------------------------
%% Procedures d'affichage
%%-----------------------------------------------
diff --git a/macros/latex/contrib/profcollege/metapost/PfCScratch.mp b/macros/latex/contrib/profcollege/metapost/PfCScratch.mp
index d0dbad1a25..f60928745c 100644
--- a/macros/latex/contrib/profcollege/metapost/PfCScratch.mp
+++ b/macros/latex/contrib/profcollege/metapost/PfCScratch.mp
@@ -1910,8 +1910,12 @@ vardef Sinon=
$=image(
fill cadre withcolor if print=true : coefprint*white else : if unknown colControle : LightOrange else : colControle fi fi;
draw cadre withcolor if print=true : coefprint*white else : if unknown colControle : LightOrange else : colControle fi fi;
- drawoptions(withcolor white);
- label.rt(TEX("\longbarre\sffamily\bfseries sinon"),(xpart(llcorner texto),ypart(center texto)));
+ if print:
+ label.rt(TEX("\longbarre\sffamily\bfseries sinon"),(xpart(llcorner texto),ypart(center texto)));
+ else:
+ drawoptions(withcolor white);
+ label.rt(TEX("\longbarre\sffamily\bfseries sinon"),(xpart(llcorner texto),ypart(center texto)));
+ fi;
drawoptions();
if BlocStopAvant=false:
draw (coindebutbloc[numblocrep]+(0.0625+0.5cm,0)+(eb,0.125)){dir180}..
@@ -2456,13 +2460,13 @@ TEXT=image(
path cadre;
cadre=CADRE(texto);
fill cadre withcolor white;
- draw %(urcorner texto+(0,eb))--
- (ulcorner texto+(0.625cm,0)+(eb,eb)){dir180}..
- {dir180}(ulcorner texto+(0.625cm,0))--
- (ulcorner texto+(0.375cm,0)){dir180}..
- {dir180}(ulcorner texto+(0.375cm,0)+(-eb,eb))
- %--(ulcorner texto+(0,eb))
- withpen pencircle scaled 0.01;
+ %draw %(urcorner texto+(0,eb))--
+ % (ulcorner texto+(0.625cm,0)+(eb,eb)){dir180}..
+ % {dir180}(ulcorner texto+(0.625cm,0))--
+ % (ulcorner texto+(0.375cm,0)){dir180}..
+ % {dir180}(ulcorner texto+(0.375cm,0)+(-eb,eb))
+ % %--(ulcorner texto+(0,eb))
+ % withpen pencircle scaled 0.01;
draw texto;
);
$=TEXT shifted (if unknown _coinprec:(0,0) else :_coinprec fi - ulcorner TEXT);
diff --git a/macros/latex/contrib/sim-os-menus/README.md b/macros/latex/contrib/sim-os-menus/README.md
new file mode 100644
index 0000000000..8367c7746d
--- /dev/null
+++ b/macros/latex/contrib/sim-os-menus/README.md
@@ -0,0 +1,7 @@
+sim-os-menus is a package to present a window/context menu/terminal like in an OS
+-------------------------------------------------------------------------------------------------------
+sim-os-menus est un pakage pour afficher une fenêtre, un terminal, un menu contextuel comme dans un OS.
+-------------------------------------------------------------------------------------------------------
+Author : Cédric Pierquet
+email : cpierquet@outlook.fr
+Licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt \ No newline at end of file
diff --git a/macros/latex/contrib/sim-os-menus/doc/sim-os-menus-doc.pdf b/macros/latex/contrib/sim-os-menus/doc/sim-os-menus-doc.pdf
new file mode 100644
index 0000000000..d7e7c69c9b
--- /dev/null
+++ b/macros/latex/contrib/sim-os-menus/doc/sim-os-menus-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/sim-os-menus/doc/sim-os-menus-doc.tex b/macros/latex/contrib/sim-os-menus/doc/sim-os-menus-doc.tex
new file mode 100644
index 0000000000..677a0883c5
--- /dev/null
+++ b/macros/latex/contrib/sim-os-menus/doc/sim-os-menus-doc.tex
@@ -0,0 +1,362 @@
+% !TeX TXS-program:compile = txs:///pdflatex
+
+\documentclass[11pt,a4paper]{ltxdoc}
+\usepackage{sim-os-menus}
+\usepackage{graphicx}
+\usepackage{fancyvrb}
+\usepackage{fancyhdr}
+\usepackage{hyperref}
+\fancyhf{}
+\renewcommand{\headrulewidth}{0pt}
+%\rhead{\sffamily\small\affloetalab[Legende]}
+\lfoot{\sffamily\small [sim-os-menus]}
+\rfoot{\sffamily\small - \thepage{} -}
+%\rfoot{\hyperlink{matoc}{\small\faArrowAltCircleUp[regular]}}
+\usepackage{hologo}
+\providecommand\tikzlogo{Ti\textit{k}Z}
+\providecommand\TeXLive{\TeX{}Live\xspace}
+\providecommand\PSTricks{\textsf{PSTricks}\xspace}
+\let\pstricks\PSTricks
+\let\TikZ\tikzlogo
+
+\urlstyle{same}
+\hypersetup{pdfborder=0 0 0}
+\usepackage[margin=2cm]{geometry}
+\setlength{\parindent}{0pt}
+\def\TPversion{0.1.0}
+\def\TPdate{13/11/2023}
+\usepackage{soul}
+\sethlcolor{lightgray!25}
+\NewDocumentCommand\MontreCode{ m }{%
+ \hl{\vphantom{\texttt{pf}}\texttt{#1}}%
+}
+
+\begin{document}
+
+\pagestyle{fancy}
+
+\thispagestyle{empty}
+
+\begin{center}
+ \begin{minipage}{0.88\linewidth}
+ \begin{tcolorbox}[colframe=yellow,colback=yellow!15]
+ \begin{center}
+ \begin{tabular}{c}
+ {\Huge \texttt{sim-os-menus}}\\
+ \\
+ {\LARGE Simulate 'windows', 'terminal' or} \\
+ {\LARGE 'context menu' like in an OS.} \\
+ \\
+ {\small \texttt{Version \TPversion{} -- \TPdate}}
+ \end{tabular}
+ \end{center}
+ \end{tcolorbox}
+\end{minipage}
+\end{center}
+
+\begin{center}
+ \begin{tabular}{c}
+ \texttt{Cédric Pierquet}\\
+ {\ttfamily c pierquet -- at -- outlook . fr}\\
+ \texttt{\url{https://github.com/cpierquet/sim-os-menus}} \\
+\end{tabular}
+\end{center}
+
+\hrule
+
+\vfill
+
+\begin{tcolorbox}[colframe=lightgray,colback=lightgray!5]
+\ContextMenu[Font=\sffamily,ListSeps={1,3/1/4/1/},ListOffsets={1,2,1,0}]{%
+ Menu1(>),Menu2,Menu3(>)(*),Menu4 §
+ SubMenuA(>),SubMenuB(>)(*) §
+ SubSubMenu1,SubSubMenu2,SubSubMenu3(>)(*),SubSubMenu4,SubSubMenu5(>) §
+ SSSSMa,SSSSMa(>)(*),SSSSMc §
+ OK(*),KO
+}
+\end{tcolorbox}
+
+\begin{tcolorbox}[colframe=lightgray,colback=lightgray!5]
+\begin{TermUnix}[Width=12cm,Align=center]{}
+test@DESKTOP:~$ ping -c 2 ctan.org
+PING ctan.org (5.35.249.60) 56(84) bytes of data.
+\end{TermUnix}
+\end{tcolorbox}
+
+\begin{tcolorbox}[colframe=lightgray,colback=lightgray!5]
+\begin{IMGViewer}[Width=12cm]{}
+\includegraphics[width=5cm]{example-image-b}
+\end{IMGViewer}
+\end{tcolorbox}
+
+\begin{tcolorbox}[colframe=lightgray,colback=lightgray!5]
+\begin{TermMac}[Width=14cm,Align=flush left]{}
+[test@server]$ ping -c 2 ctan.org
+PING ctan.org (5.35.249.60) 56(84) bytes of data.
+\end{TermMac}
+\end{tcolorbox}
+
+\vfill~
+
+\pagebreak
+
+\phantomsection
+
+\hypertarget{matoc}{}
+
+\tableofcontents
+
+\vspace*{5mm}
+
+\hrule
+
+\vspace*{5mm}
+
+\section{Introduction}
+
+\subsection{Description}
+
+With this package you can create context menu, or terminal, or doc viewer, like in an OS.
+
+Global styles are mostly fixed, but some customizations are possible.
+
+\subsection{Loading}
+
+To load the package, simply use :
+
+\begin{quote}
+\begin{verbatim}
+\usepackage{sim-os-menus}
+\end{verbatim}
+\end{quote}
+
+The package loads the packages :
+
+\begin{itemize}
+ \item \MontreCode{tikz} (with \MontreCode{calc,positioning}), \MontreCode{pgf}, \MontreCode{pgffor} ;
+ \item \MontreCode{calc}, \MontreCode{fontawesome5} ;
+ \item \MontreCode{simplekv}, \MontreCode{xintexpr}, \MontreCode{listofitems}, \MontreCode{xstring} ;
+ \item \MontreCode{settobox}, \MontreCode{tabularray} ;
+ \item \MontreCode{tcolorbox} (with \MontreCode{breakable,fitting,skins,listings,listingsutf8,hooks}).
+\end{itemize}
+
+\vfill
+
+\subsection{History}
+
+\begin{quote}
+\begin{verbatim}
+0.1.0 : Initial version
+\end{verbatim}
+\end{quote}
+
+\pagebreak
+
+\section{The macros}
+
+\subsection{Context menu}
+
+I order to create a context menu, the command is :
+
+\begin{quote}
+\begin{verbatim}
+%----contextual menu
+\ContextMenu[keys]{list of items}<tikz options>
+\end{verbatim}
+\end{quote}
+
+Optional keys, between \MontreCode{[...]} are :
+
+\begin{itemize}
+ \item \MontreCode{ColBack} := background color ;
+ \item \MontreCode{ColHL} : = highlight color ;
+ \item \MontreCode{Rounded} := boolean for rounded corners (\MontreCode{true} by default) ;
+ \item \MontreCode{Font} := font for the items (\MontreCode{\textbackslash normalsize\textbackslash normalfont} by default) ;
+ \item \MontreCode{ColItems} := color(s) for the items (\MontreCode{black} by default) ;
+ \item \MontreCode{MarginV} := vertical margin of the lines (\MontreCode{6pt} by default) ;
+ \item \MontreCode{MarginH} := horizontal margin of the lines (\MontreCode{12pt} by default) ;
+ \item \MontreCode{Arrow} := character for the arrow (\MontreCode{\textbackslash faCaretRight} by default) ;
+ \item \MontreCode{ListSeps} := list for the possible sep lines (empty or for all the levels !) ;
+ \item \MontreCode{ListIcons} := list for the possible icons (empty or for all the levels/items !) ;
+ \item \MontreCode{ListOffsets} := list for the possible vertical offset of levels (from 2, \ldots !) (empty or for all the sub-levels !) ;
+ \item \MontreCode{Icons} := boolean for icons (\MontreCode{false} by default) ;
+ \item \MontreCode{Bar} := boolean for small vertical bar with icons (\MontreCode{true} by default) ;
+ \item \MontreCode{Space} := horizontal space between levels (\MontreCode{-0.125} by default).
+\end{itemize}
+
+\medskip
+
+The mandatory argument, between \MontreCode{\{...\}}, is given as :
+
+\smallskip
+
+\hfill\MontreCode{item1A,item1B,... § item2A,itemp2B,... § ...}\hfill~
+
+\begin{itemize}
+ \item if an item ends with \MontreCode{(*)}, this is the beginning of the next level (\underline{only one} by level !) ;
+ \item if an item ends with \MontreCode{(>)} (\underline{before} optional \MontreCode{(*)}), an arrow is written at the end of the line.
+\end{itemize}
+
+A correct usage of the syntax is necessary for the code !
+
+\vspace{5mm}
+
+A few tips, due to \MontreCode{ListIcons}, \MontreCode{ListOffsets} and \MontreCode{ListSeps} keys, which are \textit{sensitive} :
+
+\begin{itemize}
+ \item \MontreCode{ListIcons} must have the same number of elements than the number of levels/items (with possible empty items) ;
+ \item \MontreCode{ListSeps} must have the same number of elements than the number of levels (with possible empty items) ;
+ \item \MontreCode{ListOffsets} must have the same number of elements than the numbers of sub-levels (with 0 si no offset !).
+\end{itemize}
+
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5}
+%default style
+\ContextMenu{Item1A(>),Item1B,Item1C(>)(*),Item1D § Item2A(*),Item2B(>),Item2C}
+\end{tcblisting}
+
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5}
+%custom style
+\ContextMenu[Rounded=false,ColBack=yellow,ColHL=teal,%
+ ListSeps={1,3/2},ColItems={black/white},Icons,Space=0,%
+ ListIcons={\faCut,\faIcon[regular]{copy},\faCopy,\faPaste / \faNotEqual}]
+ {Item1A(>)(*),Item1B,Item1C(>),Item1D § Item2A(*),Item2B(>),Item2C}
+\end{tcblisting}
+
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5}
+\ContextMenu[Font=\sffamily,ListSeps={1,3/1/4/1/},ListOffsets={1,2,1,0}]{%
+ Menu1(>),Menu2,Menu3(>)(*),Menu4 §
+ SubMenuA(>),SubMenuB(>)(*) §
+ SubSubMenu1,SubSubMenu2,SubSubMenu3(>)(*),SubSubMenu4,SubSubMenu5(>) §
+ SSSSMa,SSSSMa(>)(*),SSSSMc §
+ OK(*),KO
+}
+\end{tcblisting}
+
+\pagebreak
+
+\subsection{Terminal}
+
+In order to create a terminal (Win/UNiX/Mac), environments are :
+
+\begin{quote}
+\begin{verbatim}
+%----Windows like terminal
+\begin{TermWin}[keys]{tcbox options}
+ ...
+\end{TermWin}
+
+%----UNiX like terminal
+\begin{TermUnix}[keys]{tcbox options}
+ ...
+\end{TermUnix}
+
+%----OSX like terminal
+\begin{TermMac}[keys]{tcbox options}
+ ...
+\end{TermMac}
+\end{verbatim}
+\end{quote}
+
+Optional keys, between \MontreCode{[...]} are :
+
+\begin{itemize}
+ \item \MontreCode{Title} := title of the terminal (\MontreCode{Terminal Win/UNiX/Mac} by default) ;
+ \item \MontreCode{Align} := horizontal alignment of the box (\MontreCode{center} by default) ;
+ \item \MontreCode{Width} := width of the box (\MontreCode{\textbackslash linewidth} by default).
+\end{itemize}
+
+\medskip
+
+The mandatory argument, between \MontreCode{\{...\}}, are options to give to the tcbox.
+
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5}
+\begin{TermWin}{}
+Microsoft Windows [version 10.0.22000.493]
+(c) Microsoft Corporation. Tous droits réservés.
+C:\Users\test>ping ctan.org
+Envoi d'une requête 'ping' sur ctan.org [5.35.249.60] avec 32 octets de données :
+Réponse de 5.35.249.60 : octets=32 temps=35 ms TTL=51
+Réponse de 5.35.249.60 : octets=32 temps=37 ms TTL=51
+Réponse de 5.35.249.60 : octets=32 temps=35 ms TTL=51
+Réponse de 5.35.249.60 : octets=32 temps=39 ms TTL=51
+Statistiques Ping pour 5.35.249.60:
+Paquets : envoyés = 4, reçus = 4, perdus = 0 (perte 0%),
+Durée approximative des boucles en millisecondes :
+Minimum = 35ms, Maximum = 39ms, Moyenne = 36ms
+\end{TermWin}
+\end{tcblisting}
+
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5}
+\begin{TermUnix}[Align=flush right]{hbox}
+test@DESKTOP:~$ ping -c 2 ctan.org
+PING ctan.org (5.35.249.60) 56(84) bytes of data.
+\end{TermUnix}
+\end{tcblisting}
+
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5}
+\begin{TermMac}[Width=14cm,Align=flush left]{}
+[test@server]$ ping -c 2 ctan.org
+PING ctan.org (5.35.249.60) 56(84) bytes of data.
+\end{TermMac}
+\end{tcblisting}
+
+\pagebreak
+
+\subsection{Viewers}
+
+In order to create a 'fake' viewer (for \textsf{pdf} or \textsf{img}), environments are :
+
+\begin{quote}
+\begin{verbatim}
+%----PDF Viewer like
+\begin{PDFViewer}[keys]{tcbox options}
+ ....
+\end{PDFViewer}
+
+%----Image Viewer like
+\begin{IMGViewer}[keys]{tcbox options}
+ ....
+\end{IMGViewer}
+\end{verbatim}
+\end{quote}
+
+Optional keys, between \MontreCode{[...]} are :
+
+\begin{itemize}
+ \item \MontreCode{Title} := title of the terminal (\MontreCode{Terminal Windows} by default) ;
+ \item \MontreCode{Align} := horizontal alignment of the box (\MontreCode{center} by default) ;
+ \item \MontreCode{Width} := width of the box (\MontreCode{\textbackslash linewidth} by default) ;
+ \item \MontreCode{Halign} := horizontal alignment fot the content (\MontreCode{left} by default) ;
+ \item \MontreCode{Icons} := boolean for the icons (\MontreCode{true} by default).
+\end{itemize}
+
+\medskip
+
+The mandatory argument, between \MontreCode{\{...\}}, are options to give to the tcbox.
+
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5}
+\begin{PDFViewer}{hbox}
+\fbox{\includegraphics[page=35,width=6cm]{ProfLycee-doc.pdf}}%
+\fbox{\includegraphics[page=36,width=6cm]{ProfLycee-doc.pdf}}
+\end{PDFViewer}
+\end{tcblisting}
+
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5}
+\begin{PDFViewer}[Width=14cm,Icons=false]{}
+\fbox{\includegraphics[page=65,width=4.75cm]{ProfLycee-doc.pdf}}
+\end{PDFViewer}
+\end{tcblisting}
+
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5}
+\begin{IMGViewer}[Icons=false]{hbox}
+\includegraphics[width=5cm]{example-image-b}
+\end{IMGViewer}
+\end{tcblisting}
+
+\begin{tcblisting}{colframe=lightgray,colback=lightgray!5}
+\begin{IMGViewer}[Width=12cm]{}
+\includegraphics[width=3cm]{example-image}
+\end{IMGViewer}
+\end{tcblisting}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/sim-os-menus/tex/sim-os-menus.sty b/macros/latex/contrib/sim-os-menus/tex/sim-os-menus.sty
new file mode 100644
index 0000000000..2271b338d0
--- /dev/null
+++ b/macros/latex/contrib/sim-os-menus/tex/sim-os-menus.sty
@@ -0,0 +1,469 @@
+% Author : C. Pierquet
+% licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{sim-os-menus}[2023/11/13 0.1.0 Present 'context menu'/'terminal'/'windows', with TikZ or tcolorbox]
+%0.1.0 Initial version
+
+%====PACKAGES
+\RequirePackage{tikz,pgf,pgffor}
+\usetikzlibrary{calc,positioning}
+\RequirePackage{calc}
+\RequirePackage{fontawesome5}
+\RequirePackage{simplekv}
+\RequirePackage{xintexpr}
+\RequirePackage{listofitems}
+\RequirePackage{xstring}
+\RequirePackage{settobox}
+\RequirePackage{tabularray}
+\RequirePackage{tcolorbox}
+\tcbuselibrary{breakable,fitting,skins,listings,listingsutf8,hooks}
+
+%****CONTEXTMENU****
+%====USEFULL
+\definecolor{ColBackContextMenu}{HTML}{f0f0f0}%
+\definecolor{ColHLContextMenu}{HTML}{90c8f6}%
+\newlength{\ContMenOffsetIcon}\setlength{\ContMenOffsetIcon}{0pt}
+\newlength{\ContMenOffsetArrow}\setlength{\ContMenOffsetArrow}{1em}
+\newlength{\ContMenOffsetV}\setlength{\ContMenOffsetV}{6pt}
+\newlength{\ContMenOffset}\setlength{\ContMenOffset}{12pt}
+\newlength{\ContMenWdth}\newlength{\ContMenWdthTmp}
+\newlength{\ContMenHgth}\newlength{\ContMenHgthTmp}
+\newsavebox{\maboitemenucontext}
+\newsavebox{\maboitelogomenucontext}
+
+%====KEYS
+\defKV[ContextMenu]{%
+ ColBack=\def\ContMenColBack{#1},%
+ ColHL=\def\ContMenColHL{#1},%
+ Font=\def\ContMenuFonte{#1},%
+ MarginV=\setlength{\ContMenOffsetV}{#1},%
+ MarginH=\setlength{\ContMenOffset}{#1},
+ Arrow=\def\ContMenArrow{#1},%
+ ListSeps=\xdef\ContMenSep{#1},%
+ ListIcons=\xdef\ContMenIcons{#1},%
+ Space=\def\ContMenSpace{#1},%
+ ColItems=\def\ContMenuColItems{#1},%
+ ListOffsets=\xdef\ContMenOffsets{#1}
+}
+
+\setKVdefault[ContextMenu]{%
+ ColBack=ColBackContextMenu,%
+ ColHL=ColHLContextMenu,%
+ Rounded=true,%
+ Font=\normalsize\normalfont,%
+ MarginV=6pt,%
+ MarginH=12pt,%
+ Arrow=\faCaretRight,%
+ ListSeps={},%
+ ListIcons={},%
+ Icons=false,%
+ Bar=true,%
+ Space=-0.125,%
+ ColItems=black,%
+ ListOffsets={}
+}
+
+%====MACRO
+\NewDocumentCommand\ContextMenu{ O{} m D<>{} }{%
+ %clés
+ \useKVdefault[ContextMenu]%
+ \setKV[ContextMenu]{#1}%
+ \setsepchar{§/,}%
+ \readlist*\DonnesContMenu{#2}%
+ \IfEq{\ContMenSep}{}%
+ {}%
+ {
+ \setsepchar[.]{/.,}%
+ \readlist*\LstSepContMenu{\ContMenSep}%
+ }%
+ \IfEq{\ContMenIcons}{}%
+ {}%
+ {
+ \setsepchar[.]{/.,}%
+ \readlist*\LstIconsContMenu{\ContMenIcons}%
+ }%
+ \IfEq{\ContMenOffsets}{}%
+ {}%
+ {
+ \setsepchar{,}%
+ \readlist*\LstOffsetsContMenu{\ContMenOffsets}%
+ }%
+ %colors of items
+ \IfSubStr{\ContMenuColItems}{/}%
+ {%
+ \StrCut{\ContMenuColItems}{/}{\ContMenuColItemsE}{\ContMenuColItemsH}%
+ }%
+ {%
+ \xdef\ContMenuColItemsE{\ContMenuColItems}\xdef\ContMenuColItemsH{\ContMenuColItems}
+ }%
+ %height of lines
+ \sbox{\maboitemenucontext}{\ContMenuFonte qSÉ}%
+ \settoboxtotalheight{\ContMenHgthTmp}{\maboitemenucontext}%
+ \ifboolKV[ContextMenu]{Icons}%
+ {%
+ \sbox{\maboitelogomenucontext}{\ContMenuFonte\faCreditCard}%
+ \settoboxwidth{\ContMenOffsetIcon}{\maboitelogomenucontext}%
+ }%
+ {%
+ \setlength{\ContMenOffsetIcon}{0pt}%
+ }%
+ \setlength{\ContMenHgth}{\ContMenHgthTmp+2\ContMenOffsetV}%
+ %environment
+ \begin{tikzpicture}[#3]
+ \ifboolKV[ContextMenu]{Rounded}%
+ {\tikzset{contextborder/.style={rounded corners=4pt}}}%
+ {\tikzset{contextborder/.style={}}}%
+ %--first node
+ \coordinate (I-1-1) at (0,0) ;%
+ %--levels one by one--
+ \foreach \niv in {1,...,\DonnesContMenulen}{%
+ \def\nivmun{\inteval{\niv-1}}%
+ \def\nivpun{\inteval{\niv+1}}%
+ \itemtomacro\DonnesContMenu[\niv]{\ContMenNivTmp}%
+ \setsepchar{,}\readlist*\ContMenLstItem{\ContMenNivTmp}%
+ %left nodes
+ \coordinate (I-\niv-2) at ($(I-\niv-1)+(0,{-\ContMenHgth})$) ;%
+ \xintifboolexpr{\ContMenLstItemlen >= 2}%
+ {%
+ \foreach \i in {2,...,\ContMenLstItemlen}{%
+ \xdef\j{\inteval{\i+1}}%
+ \coordinate (I-\niv-\j) at ($(I-\niv-\i)+(0,{-\ContMenHgth})$) ;%
+ }
+ }%
+ {}%
+ %width calculus
+ \itemtomacro\ContMenLstItem[1]{\itemtmp}%
+ \IfEndWith{\itemtmp}{(*)}{\StrGobbleRight{\itemtmp}{3}[\itemtmp]}{}%
+ \IfEndWith{\itemtmp}{(>)}{\StrGobbleRight{\itemtmp}{3}[\itemtmp]}{}%
+ \sbox{\maboitemenucontext}{\pgfinterruptpicture\ContMenuFonte\itemtmp\endpgfinterruptpicture}%
+ \settoboxwidth{\ContMenWdthTmp}{\maboitemenucontext}%
+ \xdef\tmplistwidth{\the\ContMenWdthTmp}%
+ \xintifboolexpr{\ContMenLstItemlen >= 2}%calul des autres si besoin
+ {%
+ \foreach \i in {2,...,\ContMenLstItemlen}{%
+ \itemtomacro\ContMenLstItem[\i]{\itemtmp}%
+ \IfEndWith{\itemtmp}{(*)}{\StrGobbleRight{\itemtmp}{3}[\itemtmp]}{}%
+ \IfEndWith{\itemtmp}{(>)}{\StrGobbleRight{\itemtmp}{3}[\itemtmp]}{}%
+ \sbox{\maboitemenucontext}{\pgfinterruptpicture\ContMenuFonte\itemtmp\endpgfinterruptpicture}%
+ \settoboxwidth{\ContMenWdthTmp}{\maboitemenucontext}%
+ \xdef\tmplistwidth{\tmplistwidth,\the\ContMenWdthTmp}%
+ }%
+ }%
+ {}%
+ \pgfmathsetlength{\ContMenWdth}{max(\tmplistwidth)}%
+ \setlength{\ContMenWdth}{\ContMenWdth+\ContMenOffsetIcon+2\ContMenOffset+\ContMenOffsetArrow}%calcul de la 1ère largeur
+ %boxes
+ \draw[contextborder,draw=none,fill=\ContMenColBack] (I-\niv-1) rectangle++ ({\ContMenWdth},{-\ContMenLstItemlen*\ContMenHgth}) ;
+ \ifboolKV[ContextMenu]{Icons}%
+ {%
+ \ifboolKV[ContextMenu]{Bar}{\draw[thick,white] ($(I-\niv-1)+({\ContMenOffset+\ContMenOffsetIcon-3pt},{-0.5\ContMenOffsetV})$) --++ (0,{-\ContMenLstItemlen*\ContMenHgth+\ContMenOffsetV}) ;}{}%
+ }%
+ {}%
+ %labels
+ \foreach \i in {1,...,\ContMenLstItemlen}{%
+ \itemtomacro\ContMenLstItem[\i]{\itemtmp}%
+ \IfEndWith{\itemtmp}{(*)}%
+ {%
+ \StrGobbleRight{\itemtmp}{3}[\itemtmp]%
+ %offset si delared ?
+
+ \IfEq{\ContMenOffsets}{}%
+ {%
+ \coordinate (I-\nivpun-1) at ($(I-\niv-\i)+({\ContMenWdth+\ContMenSpace\ContMenOffset},{0})$) ;
+ }%
+ {%
+ \xintifboolexpr{\niv < \DonnesContMenulen}%
+ {%
+ \itemtomacro\LstOffsetsContMenu[\niv]{\offsettmp}%
+ \coordinate (I-\nivpun-1) at ($(I-\niv-\i)+({\ContMenWdth+\ContMenSpace\ContMenOffset},{\offsettmp*\ContMenHgth})$) ;
+ }%
+ {}%
+ }%
+
+ \draw[contextborder,draw=none,fill=\ContMenColHL,fill opacity=0.65] ($(I-\niv-\i)+({0.25\ContMenOffset},{-0.5\ContMenOffsetV})$) rectangle++ ({\ContMenWdth-0.5\ContMenOffset},{-\ContMenHgth+\ContMenOffsetV}) ;
+ %test if char at the end
+ \IfEndWith{\itemtmp}{(>)}%
+ {%
+ \StrGobbleRight{\itemtmp}{3}[\itemtmp]%
+ \draw ($(I-\niv-\i)+(0,{-0.5*\ContMenHgth})$) node[inner sep=0pt,right={\ContMenOffset+\ContMenOffsetIcon},font=\ContMenuFonte,text=\ContMenuColItemsH] {\itemtmp} ;
+ \draw ($(I-\niv-\i)+({\ContMenWdth-0.5\ContMenOffset},{-0.5*\ContMenHgth})$) node[inner sep=0pt,left=0.25\ContMenOffset,font=\ContMenuFonte,text=\ContMenuColItemsH] {$\vcenter{\hbox{\ContMenArrow}}$} ;
+ }%
+ {%
+ \draw ($(I-\niv-\i)+(0,{-0.5*\ContMenHgth})$) node[inner sep=0pt,right={\ContMenOffset+\ContMenOffsetIcon},font=\ContMenuFonte,text=\ContMenuColItemsH] {\itemtmp} ;
+ }%
+ }%
+ {%
+ \IfEndWith{\itemtmp}{(>)}%
+ {%
+ \StrGobbleRight{\itemtmp}{3}[\itemtmp]%
+ \draw ($(I-\niv-\i)+(0,{-0.5*\ContMenHgth})$) node[inner sep=0pt,right={\ContMenOffset+\ContMenOffsetIcon},font=\ContMenuFonte] {\itemtmp} ;
+ \draw ($(I-\niv-\i)+({\ContMenWdth-0.5\ContMenOffset},{-0.5*\ContMenHgth})$) node[inner sep=0pt,left=0.25\ContMenOffset,font=\ContMenuFonte,text=\ContMenuColItemsE] {$\vcenter{\hbox{\ContMenArrow}}$} ;
+ }%
+ {%
+ \draw ($(I-\niv-\i)+(0,{-0.5*\ContMenHgth})$) node[inner sep=0pt,right={\ContMenOffset+\ContMenOffsetIcon},font=\ContMenuFonte,text=\ContMenuColItemsE] {\itemtmp} ;
+ }%
+ }%
+ }%
+ %border
+ \draw[contextborder,thick,\ContMenColBack!75!black] (I-\niv-1) rectangle++ ({\ContMenWdth},{-\ContMenLstItemlen*\ContMenHgth}) ;
+ %separators
+ \IfEq{\ContMenSep}{}%
+ {}%
+ {%
+ \itemtomacro\LstSepContMenu[\niv]{\lstsepniv}%
+ \IfEq{\lstsepniv}{}%
+ {}%
+ {%
+ \setsepchar{,}%
+ \readlist*\lstsepnivpos{\lstsepniv}
+ \foreachitem\sep\in\lstsepnivpos{\def\seppun{\inteval{\sep+1}}\draw[thick,\ContMenColBack!75!black] ($(I-\niv-\seppun)+({0.25\ContMenOffset},0)$) --++ ({\ContMenWdth-0.5\ContMenOffset},0) ;}%
+ }%
+ }%
+ %icons
+ \ifboolKV[ContextMenu]{Icons}%
+ {%
+ \IfEq{\ContMenIcons}{}%
+ {}%
+ {%
+ \itemtomacro\LstIconsContMenu[\niv]{\lsticonsniv}%
+ \IfEq{\lsticonsniv}{}%
+ {}%
+ {%
+ \setsepchar{,}%
+ \readlist*\lsticonsnivpos{\lsticonsniv}%
+ \foreach \i in {1,...,\lsticonsnivposlen}{%
+ \itemtomacro\lsticonsnivpos[\i]{\icontmp}%
+ \itemtomacro\DonnesContMenu[\niv,\i]{\itemtmp}%
+ \IfEndWith{\itemtmp}{(*)}%
+ {%
+ \draw ($(I-\niv-\i)+({0.25\ContMenOffset+0.75\ContMenOffsetIcon},{-0.5*\ContMenHgth})$) node[scale=0.9,inner sep=0pt,font=\ContMenuFonte,text=\ContMenuColItemsH] {$\vcenter{\hbox{\icontmp}}$} ;
+ }%
+ {%
+ \draw ($(I-\niv-\i)+({0.25\ContMenOffset+0.75\ContMenOffsetIcon},{-0.5*\ContMenHgth})$) node[scale=0.9,inner sep=0pt,font=\ContMenuFonte,text=\ContMenuColItemsE] {$\vcenter{\hbox{\icontmp}}$} ;
+ }%
+ }%
+ }%
+ }%
+ }%
+ {}%
+ }%
+ \end{tikzpicture}
+}
+
+%****TERMINAL****
+%====COLORS
+\definecolor{Termmpurple}{RGB}{48,10,36}
+\definecolor{Termmgray}{RGB}{70,72,67}
+\definecolor{Termogray}{RGB}{148,147,141}
+\definecolor{Termoorange}{RGB}{233,101,56}
+\definecolor{Termterminal}{RGB}{80,78,70}
+\definecolor{Termlinux}{RGB}{0,39,51}
+\definecolor{Termwinblue}{HTML}{1883D7}
+\definecolor{Termosxgray}{HTML}{D8D6D9}
+\definecolor{Termosxgreen}{HTML}{1F8B36}
+
+%====WINDOWS (OK)
+\tcbset{StyleTermWindows/.style={%
+ enhanced,boxrule=1pt,arc=1pt,before skip=\baselineskip,after skip=\baselineskip,%
+ colframe=Termwinblue,colback=black,colbacktitle=white,colupper=white,coltitle=black,%
+ titlerule=0.4pt,left=2pt,top=2pt,bottom=2pt,right=2pt,middle=2pt,%
+ fonttitle=\bfseries\small\sffamily
+ }
+}
+
+\setKVdefault[TERMwin]{Title={Terminal Win},Align={center},Width={\linewidth}}
+
+\newcommand\TermWinComm{%
+ \begin{tikzpicture}[thick,scale=0.66]
+ \draw (0,0.5em)--++(1em,0) ; \draw[rounded corners=0.05em] (2em,0) rectangle++ (0.8em,0.8em) ; \draw[rounded corners=0.05em] (2.2em,0.2em) rectangle++ (0.8em,0.8em) ; \draw (4em,1em)--(5em,0) (4em,0)--(5em,1em) ;
+ \end{tikzpicture}%
+}
+
+\newcommand\TermWinTitle{%
+ \begin{tblr}{colsep=0pt,rowsep=0pt,width=\linewidth,colspec={X[l]r}}
+ {\footnotesize\faTerminal}~~\useKV[TERMwin]{Title} & \TermWinComm \\ %
+ \end{tblr}
+}
+
+\NewDocumentEnvironment{TermWin}{ O{} m }
+{%
+ \restoreKV[TERMwin]%
+ \setKV[TERMwin]{#1}%
+ \tcblisting{StyleTermWindows,{\useKV[TERMwin]{Align}},title={\TermWinTitle},listing only,listing engine=listings,listing options={style=tcblatex,language={},basicstyle=\footnotesize\ttfamily},width={\useKV[TERMwin]{Width}},#2}
+}%
+{%
+ \endtcblisting%
+}
+
+%====LINUX (OK)
+\newcommand{\TermUbuntuWhite}{%
+ \begin{tikzpicture}[thick,anchor=base,baseline]
+ \filldraw[Termmgray] (0,0.25em) circle[radius=0.5em] ;
+ \end{tikzpicture}%
+}
+\newcommand{\TermUbuntuMin}{%
+ \begin{tikzpicture}[thick,anchor=base,baseline]
+ \filldraw[color=Termogray!50!white] (0,0.25em) circle[radius=0.5em];
+ \draw[Termterminal](-0.35em,0.25em)--(0.35em,0.25em);
+ \end{tikzpicture}%
+}
+\newcommand{\TermUbuntuClose}{%
+ \begin{tikzpicture}[thick,anchor=base,baseline]
+ \filldraw[color=Termoorange!70!white] (0,0.25em) circle[radius=0.5em];
+ \draw[Termterminal] (-0.32em,-0.07em)--(0.32em,0.57em);
+ \draw[Termterminal] (-0.32em,0.57em)--(0.32em,-0.07em);
+ \end{tikzpicture}%
+}
+\newcommand{\TermUbuntuMax}{%
+ \begin{tikzpicture}[thick,anchor=base,baseline]
+ \filldraw[color=Termogray!50!white] (0,0.25em) circle[radius=0.5em];
+ \draw[Termterminal] (-0.32em,0.5em) rectangle (0.32em,0);
+ \end{tikzpicture}%
+}
+
+\tcbset{StyleTermUniX/.style={%
+ enhanced,boxrule=1pt,arc=4pt,before skip=\baselineskip,after skip=\baselineskip,%
+ colframe=Termmgray,colback=Termmpurple,colbacktitle=Termmgray,colupper=white,coltitle=white,%
+ titlerule=0.4pt,left=2pt,top=2pt,bottom=2pt,right=2pt,middle=2pt,%
+ fonttitle=\bfseries\small\sffamily
+ }
+}
+
+\setKVdefault[TERMnux]{Title={Terminal UNiX},Align={center},Width={\linewidth}}
+
+\newcommand\TermNuxTitle{%
+ \begin{tblr}{colsep=0pt,rowsep=0pt,width=\linewidth,colspec={lX[c]r}}
+ \TermUbuntuWhite~~\TermUbuntuWhite~~\TermUbuntuWhite & \vphantom{p}\useKV[TERMnux]{Title} & \TermUbuntuMin~~\TermUbuntuMax~~\TermUbuntuClose \\
+ \end{tblr}
+}
+
+\NewDocumentEnvironment{TermUnix}{ O{} m }
+{%
+ \restoreKV[TERMnux]%
+ \setKV[TERMnux]{#1}%
+ \tcblisting{StyleTermUniX,{\useKV[TERMnux]{Align}},title={\TermNuxTitle},listing only,listing engine=listings,listing options={style=tcblatex,language={},basicstyle=\footnotesize\ttfamily},width={\useKV[TERMnux]{Width}},#2}
+}%
+{%
+ \endtcblisting%
+}
+
+%OSX (OK)
+\tcbset{StyleTermOSX/.style={%
+ enhanced,boxrule=1pt,arc=6pt,before skip=\baselineskip,after skip=\baselineskip,%
+ colframe=Termosxgray,colback=lightgray!15,colbacktitle=Termosxgray,colupper=black,coltitle=black,%
+ titlerule=0.4pt,left=2pt,top=2pt,bottom=2pt,right=2pt,middle=2pt,%
+ fonttitle=\bfseries\small\sffamily
+ }
+}
+
+\newcommand{\TermOSXRed}{%
+ \begin{tikzpicture}[thick,anchor=base,baseline]
+ \filldraw[red] (0,0.25em) circle[radius=0.45em] ;
+ \end{tikzpicture}%
+}
+
+\newcommand{\TermOSXOrange}{%
+ \begin{tikzpicture}[thick,anchor=base,baseline]
+ \filldraw[orange] (0,0.25em) circle[radius=0.45em] ;
+ \end{tikzpicture}%
+}
+
+\newcommand{\TermOSXgreen}{%
+ \begin{tikzpicture}[thick,anchor=base,baseline]
+ \filldraw[Termosxgreen] (0,0.25em) circle[radius=0.45em] ;
+ \end{tikzpicture}%
+}
+
+\newcommand{\TermOSXLG}{%
+ \begin{tikzpicture}[thick,anchor=base,baseline]
+ \filldraw[Termosxgray] (0,0.25em) circle[radius=0.45em] ;
+ \end{tikzpicture}%
+}
+
+\setKVdefault[TERMosx]{Title={Terminal Mac},Align={center},Width={\linewidth}}
+
+\newcommand\TermOSXTitle{%
+ \begin{tblr}{colsep=0pt,rowsep=0pt,width=\linewidth,colspec={lX[c]r}}
+ \TermOSXRed~\TermOSXOrange~\TermOSXgreen & \vphantom{p}\useKV[TERMosx]{Title} & \TermOSXLG~\TermOSXLG~\TermOSXLG \\
+ \end{tblr}
+}
+
+\NewDocumentEnvironment{TermMac}{ O{} m }
+{%
+ \restoreKV[TERMosx]%
+ \setKV[TERMosx]{#1}%
+ \tcblisting{StyleTermOSX,{\useKV[TERMosx]{Align}},title={\TermOSXTitle},listing only,listing engine=listings,listing options={style=tcblatex,language={},basicstyle=\footnotesize\ttfamily},width={\useKV[TERMosx]{Width}},#2}
+}%
+{%
+ \endtcblisting%
+}
+
+%****VIEWERS****
+%PDFVIEWER (OK)
+\tcbset{StylePDFViewer/.style={%
+ enhanced,boxrule=1pt,arc=6pt,before skip=\baselineskip,after skip=\baselineskip,%
+ colframe=gray,colback=lightgray!5,colbacktitle=lightgray!15,colupper=black,coltitle=black,titlerule=0.4pt,left=2pt,top=2pt,bottom=2pt,right=2pt,middle=0pt,fonttitle=\bfseries\small\sffamily
+ }
+}
+
+\setKVdefault[PDFViewer]{Title={PDF Viewer},Align={center},Width={\linewidth},Halign={center},Icons=true}
+
+\NewDocumentCommand\PDFVIewerTitle{ s }{%
+ \IfBooleanTF{#1}%
+ {%
+ \begin{tblr}{colsep=4pt,rowsep=0pt,width=\linewidth,colspec={l|[1pt]X[c]|[1pt]c},cells={font=\footnotesize}}
+ \vphantom{p}\useKV[PDFViewer]{Title} && \faIcon[regular]{file-pdf} \\
+ \end{tblr}
+ }%
+ {%
+ \begin{tblr}{colsep=4pt,rowsep=0pt,width=\linewidth,colspec={l|[1pt]l|[1pt]l|[1pt]l|[1pt]X[c]|[1pt]c},cells={font=\footnotesize}}
+ \vphantom{p}\useKV[PDFViewer]{Title} & \faIcon[regular]{folder}~~\faPrint~~\faIcon{pencil-alt} & \faArrowLeft~~\faArrowRight & \faExpand~~\faIcon{expand-alt}~~\faIcon{expand-arrows-alt}&&\faIcon[regular]{file-pdf} \\
+ \end{tblr}
+ }%
+}
+
+\NewDocumentEnvironment{PDFViewer}{ O{} m }
+{%
+ \restoreKV[PDFViewer]%
+ \setKV[PDFViewer]{#1}%
+ \tcolorbox[StylePDFViewer,{\useKV[PDFViewer]{Align}},title={\ifboolKV[PDFViewer]{Icons}{\PDFVIewerTitle}{\PDFVIewerTitle*}},width={\useKV[PDFViewer]{Width}},halign={\useKV[PDFViewer]{Halign}},#2]
+}%
+{%
+ \endtcolorbox%
+}
+
+%IMGVIEWER (OK)
+\tcbset{StyleIMGViewer/.style={%
+ enhanced,boxrule=1pt,arc=6pt,before skip=\baselineskip,after skip=\baselineskip,%
+ colframe=gray,colback=lightgray!5,colbacktitle=lightgray!15,colupper=black,coltitle=black,titlerule=0.4pt,left=2pt,top=2pt,bottom=2pt,right=2pt,middle=0pt,fonttitle=\bfseries\small\sffamily
+ }
+}
+
+\setKVdefault[IMGViewer]{Title={Image Viewer},Align={center},Width={\linewidth},Halign={center},Icons=true}
+
+\NewDocumentCommand\IMGVIewerTitle{ s }{%
+ \IfBooleanTF{#1}%
+ {%
+ \begin{tblr}{colsep=4pt,rowsep=0pt,width=\linewidth,colspec={l|[1pt]X[c]|[1pt]c},cells={font=\footnotesize}}
+ \vphantom{p}\useKV[IMGViewer]{Title} && \faIcon[regular]{file-image} \\
+ \end{tblr}
+ }%
+ {%
+ \begin{tblr}{colsep=4pt,rowsep=0pt,width=\linewidth,colspec={l|[1pt]l|[1pt]l|[1pt]l|[1pt]X[c]|[1pt]c},cells={font=\footnotesize}}
+ \vphantom{p}\useKV[IMGViewer]{Title} & \faIcon[regular]{folder}~~\faPrint~~\faPen~~\faFillDrip~~\faBorderNone& \faArrowLeft~~\faArrowRight & \faExpand~~\faIcon{expand-alt}~~\faIcon{expand-arrows-alt}&&\faIcon[regular]{file-image} \\
+ \end{tblr}
+ }%
+}
+
+\NewDocumentEnvironment{IMGViewer}{ O{} m }
+{%
+ \restoreKV[IMGViewer]%
+ \setKV[IMGViewer]{#1}%
+ \tcolorbox[StyleIMGViewer,{\useKV[IMGViewer]{Align}},title={\ifboolKV[IMGViewer]{Icons}{\IMGVIewerTitle}{\IMGVIewerTitle*}},width={\useKV[IMGViewer]{Width}},halign={\useKV[IMGViewer]{Halign}},#2]
+}%
+{%
+ \endtcolorbox%
+}
+
+\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/tagpdf/README.md b/macros/latex/contrib/tagpdf/README.md
index b9a7b50076..4d2ad1588e 100644
--- a/macros/latex/contrib/tagpdf/README.md
+++ b/macros/latex/contrib/tagpdf/README.md
@@ -1,6 +1,6 @@
#tagpdf — A package to create tagged pdf
-Packageversion: 0.98n
-Packagedate: 2023/11/10
+Packageversion: 0.98o
+Packagedate: 2023/11/13
Author: Ulrike Fischer
## License
diff --git a/macros/latex/contrib/tagpdf/ex-AF-file.pdf b/macros/latex/contrib/tagpdf/ex-AF-file.pdf
index 01005b4e94..c81c810055 100644
--- a/macros/latex/contrib/tagpdf/ex-AF-file.pdf
+++ b/macros/latex/contrib/tagpdf/ex-AF-file.pdf
@@ -1,11 +1,11 @@
%PDF-2.0
%
23 0 obj
-<< /Subtype /application#2Fx-tex/Type /EmbeddedFile /Params<</ModDate (D:20231110140937+01'00') /Size 151 /CheckSum (AFAB6D7630BC17F0715E512B375DAF2F) >> /Length 151 >>
+<< /Subtype /application#2Fx-tex/Type /EmbeddedFile /Params<</ModDate (D:20231113211438+01'00') /Size 151 /CheckSum (CA344819B60A141BF87A3D91BB444EE8) >> /Length 151 >>
stream
%% LaTeX2e file `example-input-file.tex'
%% generated by the `filecontents' environment
-%% from source `ex-AF-file' on 2023/11/10.
+%% from source `ex-AF-file' on 2023/11/13.
%%
Additional info!
@@ -15,7 +15,7 @@ endobj
<< /Type /Filespec /AFRelationship /Unspecified /F <FEFF006500780061006D0070006C0065002D0069006E007000750074002D00660069006C0065002E007400650078> /UF <FEFF006500780061006D0070006C0065002D0069006E007000750074002D00660069006C0065002E007400650078> /EF<</F 23 0 R/UF 23 0 R>> >>
endobj
26 0 obj
-<< /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20231110) >> /Length 19 >>
+<< /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20231113) >> /Length 19 >>
stream
Bär with teh shirt
endstream
@@ -24,7 +24,7 @@ endobj
<< /Type /Filespec /AFRelationship /Supplement /F <FEFF007400610067002D0041004600660069006C00650031002E007400780074> /UF <FEFF007400610067002D0041004600660069006C00650031002E007400780074> /EF<</F 26 0 R/UF 26 0 R>> >>
endobj
29 0 obj
-<< /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20231110) >> /Length 4 >>
+<< /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20231113) >> /Length 4 >>
stream
Duck
endstream
@@ -242,17 +242,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2023-11-10T14:10:00+01:00</rdf:li>
+ <rdf:li>2023-11-13T21:14:53+01:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-AF-file.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2023-11-10T14:10:00+01:00</xmp:CreateDate>
- <xmp:ModifyDate>2023-11-10T14:10:00+01:00</xmp:ModifyDate>
- <xmp:MetadataDate>2023-11-10T14:10:00+01:00</xmp:MetadataDate>
+ <xmp:CreateDate>2023-11-13T21:14:53+01:00</xmp:CreateDate>
+ <xmp:ModifyDate>2023-11-13T21:14:53+01:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2023-11-13T21:14:53+01:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:38d5a844-2217-4081-87cc-b2129dc357a6</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:40cfed2b-246c-4f9e-8dbb-81e17b7af1cd</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:a4841ebd-785e-438d-82d6-884ef2152b90</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -350,7 +350,7 @@ endobj
<< /Type /Namespace /NS (https://www.latex-project.org/ns/inline/2022) /RoleMapNS 19 0 R >>
endobj
20 0 obj
-<< /Type /Namespace /NS (data:,C16FD12F-E6F4-B639-8684-B77B77C0DEAC) >>
+<< /Type /Namespace /NS (data:,46216150-E3FE-A148-B520-267FDB369773) >>
endobj
7 0 obj
[ 8 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 20 0 R ]
@@ -452,7 +452,7 @@ endobj
<< /Type /Catalog /Pages 37 0 R /MarkInfo 38 0 R/Lang (de-DE)/Metadata 32 0 R/StructTreeRoot 5 0 R >>
endobj
47 0 obj
-<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231110141000+01'00')/ModDate (D:20231110141000+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
+<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231113211453+01'00')/ModDate (D:20231113211453+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
endobj
xref
0 48
@@ -505,7 +505,7 @@ xref
0000020422 00000 n
0000020540 00000 n
trailer
-<< /Size 48 /Root 46 0 R /Info 47 0 R /ID [ <0906DE5BA246761E32230059ADAEA835> <0906DE5BA246761E32230059ADAEA835> ] >>
+<< /Size 48 /Root 46 0 R /Info 47 0 R /ID [ <1A6175CEF659A87D8FFC100ED9D1D0C2> <1A6175CEF659A87D8FFC100ED9D1D0C2> ] >>
startxref
20763
%%EOF
diff --git a/macros/latex/contrib/tagpdf/ex-alt-actualtext.pdf b/macros/latex/contrib/tagpdf/ex-alt-actualtext.pdf
index d006c4e759..807337a054 100644
--- a/macros/latex/contrib/tagpdf/ex-alt-actualtext.pdf
+++ b/macros/latex/contrib/tagpdf/ex-alt-actualtext.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/ex-attribute.pdf b/macros/latex/contrib/tagpdf/ex-attribute.pdf
index 3e56bd0cce..eb8bad0b82 100644
--- a/macros/latex/contrib/tagpdf/ex-attribute.pdf
+++ b/macros/latex/contrib/tagpdf/ex-attribute.pdf
@@ -216,17 +216,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2023-11-10T14:11:06+01:00</rdf:li>
+ <rdf:li>2023-11-13T21:15:35+01:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-attribute.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2023-11-10T14:11:06+01:00</xmp:CreateDate>
- <xmp:ModifyDate>2023-11-10T14:11:06+01:00</xmp:ModifyDate>
- <xmp:MetadataDate>2023-11-10T14:11:06+01:00</xmp:MetadataDate>
+ <xmp:CreateDate>2023-11-13T21:15:35+01:00</xmp:CreateDate>
+ <xmp:ModifyDate>2023-11-13T21:15:35+01:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2023-11-13T21:15:35+01:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:7a9cf910-1c19-429a-8f24-339c62d8a57f</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:2bc8027a-cfe0-4961-8490-8daa82cc99e4</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:e2843c3d-8db3-41dd-89bd-38310c26c077</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -449,7 +449,7 @@ endobj
<< /Type /Catalog /Pages 26 0 R /MarkInfo 27 0 R/Lang (de_DE)/Metadata 21 0 R/StructTreeRoot 5 0 R >>
endobj
38 0 obj
-<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/Title (Title)/CreationDate (D:20231110141106+01'00')/ModDate (D:20231110141106+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
+<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/Title (Title)/CreationDate (D:20231113211535+01'00')/ModDate (D:20231113211535+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
endobj
xref
0 39
@@ -493,7 +493,7 @@ xref
0000017720 00000 n
0000017838 00000 n
trailer
-<< /Size 39 /Root 37 0 R /Info 38 0 R /ID [ <F0741ED33F8E6F5B02B6BC9CDAF134FE> <F0741ED33F8E6F5B02B6BC9CDAF134FE> ] >>
+<< /Size 39 /Root 37 0 R /Info 38 0 R /ID [ <47D1C2D69F575F9E01DE0C66F3FE9B3E> <47D1C2D69F575F9E01DE0C66F3FE9B3E> ] >>
startxref
18075
%%EOF
diff --git a/macros/latex/contrib/tagpdf/ex-formula-problem.pdf b/macros/latex/contrib/tagpdf/ex-formula-problem.pdf
index 9c1eb39685..544cbe1c25 100644
--- a/macros/latex/contrib/tagpdf/ex-formula-problem.pdf
+++ b/macros/latex/contrib/tagpdf/ex-formula-problem.pdf
@@ -239,17 +239,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2023-11-10T14:11:39+01:00</rdf:li>
+ <rdf:li>2023-11-13T21:15:56+01:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-formula-problem.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2023-11-10T14:11:39+01:00</xmp:CreateDate>
- <xmp:ModifyDate>2023-11-10T14:11:39+01:00</xmp:ModifyDate>
- <xmp:MetadataDate>2023-11-10T14:11:39+01:00</xmp:MetadataDate>
+ <xmp:CreateDate>2023-11-13T21:15:56+01:00</xmp:CreateDate>
+ <xmp:ModifyDate>2023-11-13T21:15:56+01:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2023-11-13T21:15:56+01:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:8eb2ce1d-b2ec-440a-8bc2-73733eb3eeb0</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:1cb80672-7f0e-4957-82fd-a363ca4be249</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:05891aff-080f-4795-880d-e06e8f203f92</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>2</prism:pageCount>
</rdf:Description>
@@ -425,7 +425,7 @@ endobj
<< /Type /Catalog /Pages 16 0 R /MarkInfo 23 0 R/Lang (de-DE)/Metadata 19 0 R/StructTreeRoot 5 0 R >>
endobj
33 0 obj
-<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231110141139+01'00')/ModDate (D:20231110141139+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
+<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231113211556+01'00')/ModDate (D:20231113211556+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
endobj
xref
0 34
@@ -464,7 +464,7 @@ xref
0000018886 00000 n
0000019004 00000 n
trailer
-<< /Size 34 /Root 32 0 R /Info 33 0 R /ID [ <4B9E465D4F356F14AC84B182AD479F1E> <4B9E465D4F356F14AC84B182AD479F1E> ] >>
+<< /Size 34 /Root 32 0 R /Info 33 0 R /ID [ <6E80C1639BBBE116A84E090E40FE794F> <6E80C1639BBBE116A84E090E40FE794F> ] >>
startxref
19227
%%EOF
diff --git a/macros/latex/contrib/tagpdf/ex-list.pdf b/macros/latex/contrib/tagpdf/ex-list.pdf
index 4adf5f2655..bd712d9257 100644
--- a/macros/latex/contrib/tagpdf/ex-list.pdf
+++ b/macros/latex/contrib/tagpdf/ex-list.pdf
@@ -210,17 +210,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2023-11-10T14:12:11+01:00</rdf:li>
+ <rdf:li>2023-11-13T21:16:18+01:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-list.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2023-11-10T14:12:11+01:00</xmp:CreateDate>
- <xmp:ModifyDate>2023-11-10T14:12:11+01:00</xmp:ModifyDate>
- <xmp:MetadataDate>2023-11-10T14:12:11+01:00</xmp:MetadataDate>
+ <xmp:CreateDate>2023-11-13T21:16:18+01:00</xmp:CreateDate>
+ <xmp:ModifyDate>2023-11-13T21:16:18+01:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2023-11-13T21:16:18+01:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:4c749825-1de7-414c-879f-29e4d0bef66e</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:02d87685-2095-48b8-85da-5ee1c8c493fa</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:9e11756c-7ae1-436e-82ae-417255ed674b</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -653,7 +653,7 @@ endobj
<< /Type /Catalog /Pages 54 0 R /MarkInfo 55 0 R/Lang (en-US)/Metadata 48 0 R/StructTreeRoot 5 0 R >>
endobj
72 0 obj
-<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231110141211+01'00')/ModDate (D:20231110141211+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
+<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231113211618+01'00')/ModDate (D:20231113211618+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
endobj
xref
0 73
@@ -731,7 +731,7 @@ xref
0000029592 00000 n
0000029710 00000 n
trailer
-<< /Size 73 /Root 71 0 R /Info 72 0 R /ID [ <09DEF1FD2F764480F957BC8BD613651A> <09DEF1FD2F764480F957BC8BD613651A> ] >>
+<< /Size 73 /Root 71 0 R /Info 72 0 R /ID [ <E6E3E2896909F4FA13627634E6806221> <E6E3E2896909F4FA13627634E6806221> ] >>
startxref
29933
%%EOF
diff --git a/macros/latex/contrib/tagpdf/ex-mc-manual-para-split-obsolete.pdf b/macros/latex/contrib/tagpdf/ex-mc-manual-para-split-obsolete.pdf
index a0a8da7c1b..565b86409c 100644
--- a/macros/latex/contrib/tagpdf/ex-mc-manual-para-split-obsolete.pdf
+++ b/macros/latex/contrib/tagpdf/ex-mc-manual-para-split-obsolete.pdf
@@ -243,17 +243,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2023-11-10T14:12:40+01:00</rdf:li>
+ <rdf:li>2023-11-13T21:16:37+01:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-mc-manual-para-split-obsolete.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2023-11-10T14:12:40+01:00</xmp:CreateDate>
- <xmp:ModifyDate>2023-11-10T14:12:40+01:00</xmp:ModifyDate>
- <xmp:MetadataDate>2023-11-10T14:12:40+01:00</xmp:MetadataDate>
+ <xmp:CreateDate>2023-11-13T21:16:37+01:00</xmp:CreateDate>
+ <xmp:ModifyDate>2023-11-13T21:16:37+01:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2023-11-13T21:16:37+01:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:c33d64b4-96ec-4e48-8f27-0b3edc831547</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:52227309-b4de-4e21-891a-dad1c3eff6b8</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:ba5f4763-755b-4920-8c5b-34b25788a2a8</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>2</prism:pageCount>
</rdf:Description>
@@ -413,7 +413,7 @@ endobj
<< /Type /Catalog /Pages 14 0 R /Lang (en-US)/Metadata 15 0 R >>
endobj
25 0 obj
-<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231110141240+01'00')/ModDate (D:20231110141240+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
+<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231113211637+01'00')/ModDate (D:20231113211637+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
endobj
xref
0 26
@@ -444,7 +444,7 @@ xref
0000023897 00000 n
0000023978 00000 n
trailer
-<< /Size 26 /Root 24 0 R /Info 25 0 R /ID [ <B71915C8C17E9479FA80AC71CAF7B245> <B71915C8C17E9479FA80AC71CAF7B245> ] >>
+<< /Size 26 /Root 24 0 R /Info 25 0 R /ID [ <EF90B19D1B80FA770B2411E6A56D63B2> <EF90B19D1B80FA770B2411E6A56D63B2> ] >>
startxref
24201
%%EOF
diff --git a/macros/latex/contrib/tagpdf/ex-softhyphen.pdf b/macros/latex/contrib/tagpdf/ex-softhyphen.pdf
index 647091c049..ff3164a9b5 100644
--- a/macros/latex/contrib/tagpdf/ex-softhyphen.pdf
+++ b/macros/latex/contrib/tagpdf/ex-softhyphen.pdf
@@ -210,17 +210,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2023-11-10T14:13:07+01:00</rdf:li>
+ <rdf:li>2023-11-13T21:16:56+01:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-softhyphen.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2023-11-10T14:13:07+01:00</xmp:CreateDate>
- <xmp:ModifyDate>2023-11-10T14:13:07+01:00</xmp:ModifyDate>
- <xmp:MetadataDate>2023-11-10T14:13:07+01:00</xmp:MetadataDate>
+ <xmp:CreateDate>2023-11-13T21:16:56+01:00</xmp:CreateDate>
+ <xmp:ModifyDate>2023-11-13T21:16:56+01:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2023-11-13T21:16:56+01:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:aa82e685-4098-469d-861c-3c45dfc700c7</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:4f689acd-2072-43d3-856b-a58f6b26b13c</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:3bf007f2-937b-4ad1-8034-4a218e9c8300</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -393,7 +393,7 @@ endobj
<< /Type /Catalog /Pages 19 0 R /MarkInfo 20 0 R/Lang (en-US)/Metadata 14 0 R/StructTreeRoot 5 0 R >>
endobj
30 0 obj
-<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231110141307+01'00')/ModDate (D:20231110141307+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
+<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231113211656+01'00')/ModDate (D:20231113211656+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
endobj
xref
0 31
@@ -429,7 +429,7 @@ xref
0000018116 00000 n
0000018234 00000 n
trailer
-<< /Size 31 /Root 29 0 R /Info 30 0 R /ID [ <F8EAEDE45D732AA955717061C997A6A5> <F8EAEDE45D732AA955717061C997A6A5> ] >>
+<< /Size 31 /Root 29 0 R /Info 30 0 R /ID [ <28F23554CFC238ED1A31BEE31255CA6A> <28F23554CFC238ED1A31BEE31255CA6A> ] >>
startxref
18457
%%EOF
diff --git a/macros/latex/contrib/tagpdf/ex-spaceglyph-listings.pdf b/macros/latex/contrib/tagpdf/ex-spaceglyph-listings.pdf
index 59c708eaf3..08f2ae4381 100644
--- a/macros/latex/contrib/tagpdf/ex-spaceglyph-listings.pdf
+++ b/macros/latex/contrib/tagpdf/ex-spaceglyph-listings.pdf
@@ -210,17 +210,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2023-11-10T14:13:31+01:00</rdf:li>
+ <rdf:li>2023-11-13T21:17:13+01:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-spaceglyph-listings.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2023-11-10T14:13:31+01:00</xmp:CreateDate>
- <xmp:ModifyDate>2023-11-10T14:13:31+01:00</xmp:ModifyDate>
- <xmp:MetadataDate>2023-11-10T14:13:31+01:00</xmp:MetadataDate>
+ <xmp:CreateDate>2023-11-13T21:17:13+01:00</xmp:CreateDate>
+ <xmp:ModifyDate>2023-11-13T21:17:13+01:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2023-11-13T21:17:13+01:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:acdc2435-bf29-4e54-8d09-1c9b6dc32038</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:631da56a-0ec5-456d-87d4-f70bf6acbe9f</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:4a1e6257-2851-4159-8745-a5def760da34</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -354,7 +354,7 @@ endobj
<< /Type /Catalog /Pages 15 0 R /MarkInfo 16 0 R/Lang (en-US)/Metadata 10 0 R/StructTreeRoot 5 0 R >>
endobj
26 0 obj
-<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231110141331+01'00')/ModDate (D:20231110141331+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
+<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231113211713+01'00')/ModDate (D:20231113211713+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
endobj
xref
0 27
@@ -386,7 +386,7 @@ xref
0000015484 00000 n
0000015602 00000 n
trailer
-<< /Size 27 /Root 25 0 R /Info 26 0 R /ID [ <F8208C53956D6B2968E58A038D143F4B> <F8208C53956D6B2968E58A038D143F4B> ] >>
+<< /Size 27 /Root 25 0 R /Info 26 0 R /ID [ <C0968B57172BE73DC77D2A801B7630CF> <C0968B57172BE73DC77D2A801B7630CF> ] >>
startxref
15825
%%EOF
diff --git a/macros/latex/contrib/tagpdf/ex-structure-obsolete.pdf b/macros/latex/contrib/tagpdf/ex-structure-obsolete.pdf
index 569172f2bf..85ee68d4e3 100644
--- a/macros/latex/contrib/tagpdf/ex-structure-obsolete.pdf
+++ b/macros/latex/contrib/tagpdf/ex-structure-obsolete.pdf
@@ -210,17 +210,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2023-11-10T14:13:58+01:00</rdf:li>
+ <rdf:li>2023-11-13T21:17:30+01:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-structure-obsolete.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2023-11-10T14:13:58+01:00</xmp:CreateDate>
- <xmp:ModifyDate>2023-11-10T14:13:58+01:00</xmp:ModifyDate>
- <xmp:MetadataDate>2023-11-10T14:13:58+01:00</xmp:MetadataDate>
+ <xmp:CreateDate>2023-11-13T21:17:30+01:00</xmp:CreateDate>
+ <xmp:ModifyDate>2023-11-13T21:17:30+01:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2023-11-13T21:17:30+01:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:bf5e4a2b-cfa9-4fc5-878c-8f9d2ee95445</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:d2bd8d0f-1f98-4b4c-8047-a5af0ff5747a</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:23fe8d43-bb93-4096-8e96-a5c0b0c6f72b</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -526,7 +526,7 @@ endobj
<< /Type /Catalog /Pages 26 0 R /MarkInfo 27 0 R/Lang (en-US)/Metadata 20 0 R/StructTreeRoot 5 0 R >>
endobj
43 0 obj
-<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231110141358+01'00')/ModDate (D:20231110141358+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
+<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231113211730+01'00')/ModDate (D:20231113211730+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
endobj
xref
0 44
@@ -575,7 +575,7 @@ xref
0000023426 00000 n
0000023544 00000 n
trailer
-<< /Size 44 /Root 42 0 R /Info 43 0 R /ID [ <C8B6F7D9B994556DD12263178F0AD592> <C8B6F7D9B994556DD12263178F0AD592> ] >>
+<< /Size 44 /Root 42 0 R /Info 43 0 R /ID [ <05D149B975B214B2BFEC57907F0165FC> <05D149B975B214B2BFEC57907F0165FC> ] >>
startxref
23767
%%EOF
diff --git a/macros/latex/contrib/tagpdf/ex-tagpdf-template.pdf b/macros/latex/contrib/tagpdf/ex-tagpdf-template.pdf
index 314850be08..3bd71fa6cf 100644
--- a/macros/latex/contrib/tagpdf/ex-tagpdf-template.pdf
+++ b/macros/latex/contrib/tagpdf/ex-tagpdf-template.pdf
@@ -210,17 +210,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2023-11-10T14:14:26+01:00</rdf:li>
+ <rdf:li>2023-11-13T21:17:50+01:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-tagpdf-template.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2023-11-10T14:14:26+01:00</xmp:CreateDate>
- <xmp:ModifyDate>2023-11-10T14:14:26+01:00</xmp:ModifyDate>
- <xmp:MetadataDate>2023-11-10T14:14:26+01:00</xmp:MetadataDate>
+ <xmp:CreateDate>2023-11-13T21:17:50+01:00</xmp:CreateDate>
+ <xmp:ModifyDate>2023-11-13T21:17:50+01:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2023-11-13T21:17:50+01:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:f320abfc-f6ab-4d12-8719-d176f4d947cf</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:d328b069-9e8c-4ecc-8df0-1cab14ffe29a</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:26bb7f6f-595a-4f07-86df-4dd2a45559fc</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -309,7 +309,7 @@ endobj
<< /Type /Namespace /NS (https://www.latex-project.org/ns/inline/2022) /RoleMapNS 19 0 R >>
endobj
20 0 obj
-<< /Type /Namespace /NS (data:,9178B9FC-4867-FE34-58C9-EAC87DE90333) >>
+<< /Type /Namespace /NS (data:,B7D1143C-2A0-AE5-DBD3-AED0CA9ED27D) >>
endobj
7 0 obj
[ 8 0 R 10 0 R 12 0 R 14 0 R 16 0 R 18 0 R 20 0 R ]
@@ -401,7 +401,7 @@ endobj
<< /Type /Catalog /Pages 32 0 R /MarkInfo 33 0 R/Lang (en-US)/Metadata 27 0 R/StructTreeRoot 5 0 R >>
endobj
43 0 obj
-<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231110141426+01'00')/ModDate (D:20231110141426+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
+<< /Producer (luahbtex-1.17.0)/Creator (LaTeX)/CreationDate (D:20231113211750+01'00')/ModDate (D:20231113211750+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
endobj
xref
0 44
@@ -410,9 +410,9 @@ xref
0000000003 00000 f
0000000004 00000 f
0000000009 00000 f
-0000014545 00000 n
+0000014543 00000 n
0000012015 00000 n
-0000013973 00000 n
+0000013971 00000 n
0000012288 00000 n
0000000011 00000 f
0000012356 00000 n
@@ -427,30 +427,30 @@ xref
0000013574 00000 n
0000013884 00000 n
0000000000 00000 f
-0000014041 00000 n
-0000014138 00000 n
-0000014225 00000 n
-0000014312 00000 n
-0000014411 00000 n
+0000014039 00000 n
+0000014136 00000 n
+0000014223 00000 n
+0000014310 00000 n
+0000014409 00000 n
0000000020 00000 n
0000011869 00000 n
0000011734 00000 n
0000011500 00000 n
-0000017151 00000 n
-0000017505 00000 n
+0000017149 00000 n
+0000017503 00000 n
0000011979 00000 n
0000012056 00000 n
0000012188 00000 n
0000012225 00000 n
-0000014667 00000 n
-0000016108 00000 n
-0000014754 00000 n
-0000016329 00000 n
-0000017305 00000 n
-0000017567 00000 n
-0000017685 00000 n
+0000014665 00000 n
+0000016106 00000 n
+0000014752 00000 n
+0000016327 00000 n
+0000017303 00000 n
+0000017565 00000 n
+0000017683 00000 n
trailer
-<< /Size 44 /Root 42 0 R /Info 43 0 R /ID [ <13E8734E578845AFB77A1386EB367394> <13E8734E578845AFB77A1386EB367394> ] >>
+<< /Size 44 /Root 42 0 R /Info 43 0 R /ID [ <9664024FEFABCF22793938B20D473180> <9664024FEFABCF22793938B20D473180> ] >>
startxref
-17908
+17906
%%EOF
diff --git a/macros/latex/contrib/tagpdf/tagpdf-backend.dtx b/macros/latex/contrib/tagpdf/tagpdf-backend.dtx
index bad8cbe1fe..95c3ebec19 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-backend.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-backend.dtx
@@ -47,13 +47,13 @@
% }^^A
% }
%
-% \date{Version 0.98n, released 2023-11-10}
+% \date{Version 0.98o, released 2023-11-13}
% \maketitle
% \begin{implementation}
% \begin{macrocode}
%<@@=tag>
%<*luatex>
-\ProvidesExplFile {tagpdf-luatex.def} {2023-11-10} {0.98n}
+\ProvidesExplFile {tagpdf-luatex.def} {2023-11-13} {0.98o}
{tagpdf~driver~for~luatex}
% \end{macrocode}
% \section{Loading the lua}
@@ -158,8 +158,8 @@
local ProvidesLuaModule = {
name = "tagpdf",
- version = "0.98n", --TAGVERSION
- date = "2023-11-10", --TAGDATE
+ version = "0.98o", --TAGVERSION
+ date = "2023-11-13", --TAGDATE
description = "tagpdf lua code",
license = "The LATEX Project Public License 1.3c"
}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-checks.dtx b/macros/latex/contrib/tagpdf/tagpdf-checks.dtx
index faad17d671..d4452a7853 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-checks.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-checks.dtx
@@ -48,7 +48,7 @@
% }^^A
% }
%
-% \date{Version 0.98n, released 2023-11-10}
+% \date{Version 0.98o, released 2023-11-13}
% \maketitle
% \begin{documentation}
% \section{Commands}
@@ -313,7 +313,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-checks-code} {2023-11-10} {0.98n}
+\ProvidesExplPackage {tagpdf-checks-code} {2023-11-13} {0.98o}
{part of tagpdf - code related to checks, conditionals, debugging and messages}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-code.pdf b/macros/latex/contrib/tagpdf/tagpdf-code.pdf
index 8ad5a96ec6..100f449960 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-code.pdf
+++ b/macros/latex/contrib/tagpdf/tagpdf-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/tagpdf-data.dtx b/macros/latex/contrib/tagpdf/tagpdf-data.dtx
index db8d475c29..90cde27527 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-data.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-data.dtx
@@ -47,7 +47,7 @@
% }^^A
% }
%
-% \date{Version 0.98n, released 2023-11-10}
+% \date{Version 0.98o, released 2023-11-13}
% \maketitle
% \begin{documentation}
% This files contains a various data files which are read in
@@ -60,7 +60,7 @@
% It lists the new tag, the rolemap and the namespace of the rolemap.
% \begin{macrocode}
%<*ns-latex>
-%% \ProvidesExplFile {tagpdf-ns-latex.def} {2023-11-10} {0.98n}
+%% \ProvidesExplFile {tagpdf-ns-latex.def} {2023-11-13} {0.98o}
%% {latex} {https://www.latex-project.org/ns/dflt/2022}{}
title, Title, pdf2,
part, Title, pdf2,
@@ -92,7 +92,7 @@ text, P, pdf2,
% It is bound to change
% \begin{macrocode}
%<*ns-latex-book>
-%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2023-11-10} {0.98n}
+%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2023-11-13} {0.98o}
%% {latex-book} {https://www.latex-project.org/ns/book/2022}{}
chapter, H1,pdf2,
section, H2,pdf2,
@@ -108,7 +108,7 @@ subparagraph, H6,pdf2,
% loaded.
% \begin{macrocode}
%<*ns-latex-inline>
-%% \ProvidesExplFile {tagpdf-ns-latex-inline.def} {2023-11-10} {0.98n}
+%% \ProvidesExplFile {tagpdf-ns-latex-inline.def} {2023-11-13} {0.98o}
%% {latex-inline} {https://www.latex-project.org/ns/inline/2022}{}
chapter, Span, pdf2,
section, Span, pdf2,
@@ -122,7 +122,7 @@ P, Span, pdf2,
% \section{The pdf namespace data}
% \begin{macrocode}
%<*ns-pdf>
-%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2023-11-10} {0.98n}
+%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2023-11-13} {0.98o}
%% {pdf} {http://iso.org/pdf/ssn}{}
StructTreeRoot,StructTreeRoot,pdf,D,
Document,Document,pdf,D,
@@ -190,7 +190,7 @@ Strong,Span,pdf,I,
% \section{The pdf 2.0 namespace data}
% \begin{macrocode}
%<*ns-pdf2>
-%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2023-11-10} {0.98n}
+%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2023-11-13} {0.98o}
%% {pdf2} {http://iso.org/pdf2/ssn}{}
Document,Document,pdf2,D,
Part,Part,pdf2,G,
@@ -246,7 +246,7 @@ Strong,Strong,pdf2,I,
% \section{The mathml namespace data}
% \begin{macrocode}
%<*ns-mathml>
-%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2023-11-10} {0.98n}
+%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2023-11-13} {0.98o}
% {mathml}{http://www.w3.org/1998/Math/MathML}{}
abs,abs,mathml,
and,and,mathml,
@@ -481,7 +481,7 @@ xor,xor,mathml,
% This will perhaps change in future.
% \begin{macrocode}
%<*parent-child>
-%% \ProvidesExplFile {tagpdf-parent-child.csv} {2023-11-10} {0.98n}
+%% \ProvidesExplFile {tagpdf-parent-child.csv} {2023-11-13} {0.98o}
,,,StructTreeRoot,Document,Art,Part,Div,Sect,BlockQuote,NonStruct,TOC,TOCI,Index,Private,Quote,Note,Reference,BibEntry,P,Hn,H,Lbl,Code,Span,Link,Annot,Form,Ruby,RB,RT,RP,Warichu,WT,WP,L,LI,LBody,Table,TR,TH,TD,THead,TBody,TFoot,Caption,Figure,Formula,MC
Document,both,document level,1,0..n,∅,‡,‡,∅,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅
Art,1.7,grouping,∅,0..n,∅,‡,‡,0..n,0..n,‡,∅,∅,∅,0..n,∅,0..n,∅,∅,∅,0..1,0..1,∅,∅,∅,0..n,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,0..n,∅,∅,0..n,0..n,∅,∅,∅,0..n,0..n,∅,∅
@@ -536,7 +536,7 @@ MC,both,---,∅,∅,∅,∅,∅,∅,0..n,‡,∅,∅,∅,0..n,0..n,0..n,0..n,0..
% This will perhaps change in future.
% \begin{macrocode}
%<*parent-child-2>
-%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2023-11-10} {0.98n}
+%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2023-11-13} {0.98o}
,,,StructTreeRoot,Document,DocumentFragment,Art,Part,Div,Sect,Aside,BlockQuote,NonStruct,TOC,TOCI,Index,Private,Title,Sub,Quote,Note,Reference,BibEntry,P,Hn,H,Lbl,Code,Em,Strong,Span,Link,Annot,Form,Ruby,RB,RT,RP,Warichu,WT,WP,FENote,L,LI,LBody,Table,TR,TH,TD,THead,TBody,TFoot,Caption,Figure,Formula,math,mathml,Artifact,MC
Document,both,document level,1,0..n,0..n,∅,‡,‡,∅,0..n,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,0..n,∅
DocumentFragment,2.0,document level,∅,0..n,0..n,0..n,‡,‡,0..n,0..n,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅*,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅*,∅*,∅,∅,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅,0..n,∅
diff --git a/macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx b/macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx
index 1651229013..48d2deb404 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.98n, released 2023-11-10}
+% \date{Version 0.98o, released 2023-11-13}
% \maketitle
% \begin{documentation}
% \end{documentation}
@@ -55,11 +55,11 @@
% \begin{macrocode}
%<@@=tag>
%<*generic>
-\ProvidesExplPackage {tagpdf-mc-code-generic} {2023-11-10} {0.98n}
+\ProvidesExplPackage {tagpdf-mc-code-generic} {2023-11-13} {0.98o}
{part of tagpdf - code related to marking chunks - generic mode}
%</generic>
%<*debug>
-\ProvidesExplPackage {tagpdf-debug-generic} {2023-11-10} {0.98n}
+\ProvidesExplPackage {tagpdf-debug-generic} {2023-11-13} {0.98o}
{part of tagpdf - debugging code related to marking chunks - generic mode}
%</debug>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx b/macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx
index 43d8c78283..d0dbffd45e 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.98n, released 2023-11-10}
+% \date{Version 0.98o, released 2023-11-13}
% \maketitle
% \begin{implementation}
% The code is splitted into three parts: code shared by all engines,
@@ -86,11 +86,11 @@
% \begin{macrocode}
%<@@=tag>
%<*luamode>
-\ProvidesExplPackage {tagpdf-mc-code-lua} {2023-11-10} {0.98n}
+\ProvidesExplPackage {tagpdf-mc-code-lua} {2023-11-13} {0.98o}
{tagpdf - mc code only for the luamode }
%</luamode>
%<*debug>
-\ProvidesExplPackage {tagpdf-debug-lua} {2023-11-10} {0.98n}
+\ProvidesExplPackage {tagpdf-debug-lua} {2023-11-13} {0.98o}
{part of tagpdf - debugging code related to marking chunks - lua mode}
%</debug>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx b/macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx
index 11b5f36276..0b159909cf 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.98n, released 2023-11-10}
+% \date{Version 0.98o, released 2023-11-13}
% \maketitle
% \begin{documentation}
% \section{Public Commands}
@@ -181,7 +181,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-mc-code-shared} {2023-11-10} {0.98n}
+\ProvidesExplPackage {tagpdf-mc-code-shared} {2023-11-13} {0.98o}
{part of tagpdf - code related to marking chunks -
code shared by generic and luamode }
%</header>
diff --git a/macros/latex/contrib/tagpdf/tagpdf-roles.dtx b/macros/latex/contrib/tagpdf/tagpdf-roles.dtx
index 3cec0cda91..2d8084282e 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-roles.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-roles.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.98n, released 2023-11-10}
+% \date{Version 0.98o, released 2023-11-13}
% \maketitle
% \begin{documentation}
% \begin{function}
@@ -98,7 +98,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-roles-code} {2023-11-10} {0.98n}
+\ProvidesExplPackage {tagpdf-roles-code} {2023-11-13} {0.98o}
{part of tagpdf - code related to roles and structure names}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-space.dtx b/macros/latex/contrib/tagpdf/tagpdf-space.dtx
index 0798ffa995..c77c832c07 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-space.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-space.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.98n, released 2023-11-10}
+% \date{Version 0.98o, released 2023-11-13}
% \maketitle
% \begin{documentation}
% \begin{function}{interwordspace (setup-key)}
@@ -64,7 +64,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-space-code} {2023-11-10} {0.98n}
+\ProvidesExplPackage {tagpdf-space-code} {2023-11-13} {0.98o}
{part of tagpdf - code related to real space chars}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-struct.dtx b/macros/latex/contrib/tagpdf/tagpdf-struct.dtx
index 6aeb54c3fd..3cc92b1ce3 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-struct.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-struct.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.98n, released 2023-11-10}
+% \date{Version 0.98o, released 2023-11-13}
% \maketitle
% \begin{documentation}
% \section{Public Commands}
@@ -247,7 +247,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-struct-code} {2023-11-10} {0.98n}
+\ProvidesExplPackage {tagpdf-struct-code} {2023-11-13} {0.98o}
{part of tagpdf - code related to storing structure}
%</header>
% \end{macrocode}
@@ -1848,7 +1848,7 @@
% \section{Attributes and attribute classes}
% \begin{macrocode}
%<*header>
-\ProvidesExplPackage {tagpdf-attr-code} {2023-11-10} {0.98n}
+\ProvidesExplPackage {tagpdf-attr-code} {2023-11-13} {0.98o}
{part of tagpdf - code related to attributes and attribute classes}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-tree.dtx b/macros/latex/contrib/tagpdf/tagpdf-tree.dtx
index af7b1d089b..5674e18c8d 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-tree.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-tree.dtx
@@ -47,13 +47,13 @@
% }^^A
% }
%
-% \date{Version 0.98n, released 2023-11-10}
+% \date{Version 0.98o, released 2023-11-13}
% \maketitle
% \begin{implementation}
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-tree-code} {2023-11-10} {0.98n}
+\ProvidesExplPackage {tagpdf-tree-code} {2023-11-13} {0.98o}
{part of tagpdf - code related to writing trees and dictionaries to the pdf}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf-user.dtx b/macros/latex/contrib/tagpdf/tagpdf-user.dtx
index 25625e7858..20d4ee3196 100644
--- a/macros/latex/contrib/tagpdf/tagpdf-user.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf-user.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.98n, released 2023-11-10}
+% \date{Version 0.98o, released 2023-11-13}
% \maketitle
% \begin{documentation}
% \section{Setup commands}
@@ -250,7 +250,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-user} {2023-11-10} {0.98n}
+\ProvidesExplPackage {tagpdf-user} {2023-11-13} {0.98o}
{tagpdf - user commands}
%</header>
% \end{macrocode}
diff --git a/macros/latex/contrib/tagpdf/tagpdf.dtx b/macros/latex/contrib/tagpdf/tagpdf.dtx
index ed001717f9..bc28e00bd0 100644
--- a/macros/latex/contrib/tagpdf/tagpdf.dtx
+++ b/macros/latex/contrib/tagpdf/tagpdf.dtx
@@ -93,7 +93,7 @@
% \begin{macrocode}
%<@@=tag>
%<*package>
-\ProvidesExplPackage {tagpdf} {2023-11-10} {0.98n}
+\ProvidesExplPackage {tagpdf} {2023-11-13} {0.98o}
{ A package to experiment with pdf tagging }
\bool_if:nF
@@ -119,7 +119,7 @@
% \end{macrocode}
%<*debug>
% \begin{macrocode}
-\ProvidesExplPackage {tagpdf-debug} {2023-11-10} {0.98n}
+\ProvidesExplPackage {tagpdf-debug} {2023-11-13} {0.98o}
{ debug code for tagpdf }
\@ifpackageloaded{tagpdf}{}{\PackageWarning{tagpdf-debug}{tagpdf~not~loaded,~quitting}\endinput}
% \end{macrocode}
@@ -142,7 +142,7 @@
% we define a base package with dummy functions
% \begin{macrocode}
%<*base>
-\ProvidesExplPackage {tagpdf-base} {2023-11-10} {0.98n}
+\ProvidesExplPackage {tagpdf-base} {2023-11-13} {0.98o}
{part of tagpdf - provide base, no-op versions of the user commands }
%</base>
% \end{macrocode}
@@ -527,8 +527,8 @@
\cs_set_eq:NN \@@_prop_item:cn \prop_item:cn
\cs_set_eq:NN \@@_seq_show:N \seq_show:N
\cs_set_eq:NN \@@_prop_show:N \prop_show:N
-
-\cs_generate_variant:Nn \@@_prop_gput:Nnn { Nen , Nee, Nne , cnn, cen, cne, cno}
+% cnx temporary needed for latex-lab-graphic code
+\cs_generate_variant:Nn \@@_prop_gput:Nnn { Nen , Nee, Nne , cnn, cen, cne, cno, cnx}
\cs_generate_variant:Nn \@@_seq_gput_right:Nn { Ne , No, cn, ce }
\cs_generate_variant:Nn \@@_prop_new:N { c }
\cs_generate_variant:Nn \@@_seq_new:N { c }
diff --git a/macros/latex/contrib/tagpdf/tagpdf.pdf b/macros/latex/contrib/tagpdf/tagpdf.pdf
index 76c692eb41..0de37bf366 100644
--- a/macros/latex/contrib/tagpdf/tagpdf.pdf
+++ b/macros/latex/contrib/tagpdf/tagpdf.pdf
Binary files differ
diff --git a/macros/latex/contrib/tagpdf/tagpdf.tex b/macros/latex/contrib/tagpdf/tagpdf.tex
index d8bb536361..71c45132e2 100644
--- a/macros/latex/contrib/tagpdf/tagpdf.tex
+++ b/macros/latex/contrib/tagpdf/tagpdf.tex
@@ -16,8 +16,8 @@
}
\DebugBlocksOff
\makeatletter
-\def\UlrikeFischer@package@version{0.98n}
-\def\UlrikeFischer@package@date{2023-11-10}
+\def\UlrikeFischer@package@version{0.98o}
+\def\UlrikeFischer@package@date{2023-11-13}
\makeatother
\documentclass[bibliography=totoc,a4paper]{article}
@@ -1751,12 +1751,13 @@ The key-val list understands the following keys:
\tagstructbegin{tag=P,AF=tag/AFtest}
\end{taglstlisting}
- As shown, the wanted AFRelationship can be set
- by filling the dictionary with the value. The mime type
- is here detected automatically, but for unknown types it can be set too.
- See the \texttt{l3pdffile} documentation for details. Associated files are
- a concept new in PDF 2.0, but the code currently doesn't check the pdf version, it is your responsability
- to set it (this can be done with the \texttt{pdfversion} key in \verb+\DeclareDocumentMetadata+).
+ As shown, the wanted AFRelationship can be set by filling the dictionary
+ with the value. The mime type is here detected automatically, but for
+ unknown types it can be set too. See the \texttt{l3pdffile}
+ documentation for details. Associated files are a concept new in PDF
+ 2.0, but the code currently doesn't check the pdf version, it is your
+ responsability to set it (this can be done with the \texttt{pdfversion}
+ key in \verb+\DocumentMetadata+).
\item[\PrintKeyName{root-AF}]
This key allows to reference an associated file in the root structure element. Using the root
diff --git a/macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty b/macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty
index c3a5d0bd29..bc52a77e82 100644
--- a/macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty
+++ b/macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty
@@ -1,5 +1,5 @@
%\RequirePackage[enable-debug]{expl3}[2018/06/14]
-\ProvidesExplPackage {tagpdfdocu-patches} {2023-11-10} {0.98n}
+\ProvidesExplPackage {tagpdfdocu-patches} {2023-11-13} {0.98o}
{patches/commands for the tagpdf documentation}
\RequirePackage{etoolbox,xpatch}
diff --git a/macros/latex/contrib/xcolor/ChangeLog b/macros/latex/contrib/xcolor/ChangeLog
index 48ac99bfbd..7608690902 100644
--- a/macros/latex/contrib/xcolor/ChangeLog
+++ b/macros/latex/contrib/xcolor/ChangeLog
@@ -3,6 +3,17 @@ https://github.com/latex3/xcolor/issues
History
=======
+2023/11/11 v3.00
+* If a LaTeX older than 2022-06-01 is detected a frozen version is used.
+ All new features apply only if LaTeX 2022-06-01 or newer is detected.
+ The frozen version can also be requested with \usepackage{xcolor}[=v2].
+* The new LaTeX key/val handler is used for the package options. That means there
+ will be less option clash errors, issue #29
+* The \rowcolors command has moved to the colortbl package
+* The fixpdftex option is obsolete and does nothing at all (issue #20)
+* Extended \normalcolor to set also the "dot" color, issue #19
+* Fix Gray color model, issue #23
+
2022/06/12 v2.14
* New features:
- Load if it exists the code from LaTeX to define \mathcolor.
diff --git a/macros/latex/contrib/xcolor/README.md b/macros/latex/contrib/xcolor/README.md
index dd8e528ccd..b7702951cc 100644
--- a/macros/latex/contrib/xcolor/README.md
+++ b/macros/latex/contrib/xcolor/README.md
@@ -1,6 +1,6 @@
## Package `xcolor` by Dr. Uwe Kern
-Version 2022-06-12 v2.14
+Version 2023-11-11 v3.00
Maintained by the LaTeX Project https://github.com/latex3/xcolor/issues
@@ -14,7 +14,7 @@ separation, and color wheel calculations.
## Copyright (C)
- 2003-2021 Dr. Uwe Kern
-- 2021-2022 The LaTeX Project
+- 2021-2023 The LaTeX Project
## License
LaTeX Project Public License, version 1.3c or later.
diff --git a/macros/latex/contrib/xcolor/xcolor-2022-06-12.sty b/macros/latex/contrib/xcolor/xcolor-2022-06-12.sty
new file mode 100644
index 0000000000..93ae517f22
--- /dev/null
+++ b/macros/latex/contrib/xcolor/xcolor-2022-06-12.sty
@@ -0,0 +1,1465 @@
+%%
+%% This is file `xcolor.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% xcolor.dtx (with options: `package')
+%%
+%% IMPORTANT NOTICE:
+%%
+%% For the copyright see the source file.
+%%
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from xcolor.sty.
+%%
+%% For distribution of the original source see the terms
+%% for copying and modification in the file xcolor.dtx.
+%%
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+%%
+\ProvidesPackage{xcolor-2022-06-12}
+ [2022/06/12 v2.14 LaTeX color extensions (UK)]
+%%
+%% ----------------------------------------------------------------
+%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% 2021-2022 LaTeX Project https://github.com/latex3/xcolor/issues
+%% ----------------------------------------------------------------
+%%
+%% Please send error reports and suggestions for
+%% improvements to https://github.com/latex3/xcolor/issues.
+%%
+%% This package contains code copied from
+%%
+%% color.dtx [1999/02/16 v1.0i Standard LaTeX Color (DPC)]
+%% Copyright (C) 1994--1999 David Carlisle
+%%
+%% which is part of the Standard LaTeX `Graphics Bundle'.
+%%
+\NeedsTeXFormat{LaTeX2e}
+\expandafter\edef\csname XC@catcodes\endcsname
+ {\catcode33 \the\catcode33 % !
+ \catcode34 \the\catcode34 % "
+ \catcode39 \the\catcode39 % '
+ \catcode42 \the\catcode42 % *
+ \catcode44 \the\catcode44 % ,
+ \catcode45 \the\catcode45 % -
+ \catcode46 \the\catcode46 % .
+ \catcode47 \the\catcode47 % /
+ \catcode58 \the\catcode58 % :
+ \catcode59 \the\catcode59 % ;
+ \catcode60 \the\catcode60 % <
+ \catcode61 \the\catcode61 % =
+ \catcode62 \the\catcode62 % >
+ \catcode63 \the\catcode63 % ?
+ \catcode64 \the\catcode64 % @
+ \catcode94 \the\catcode94 % ^
+ \catcode96 \the\catcode96 % `
+ \catcode`\noexpand\^^A\the\catcode`\^^A\relax}
+\catcode64 11 %
+\@makeother\! \@makeother\" \@makeother\' \@makeother\* \@makeother\,
+\@makeother\- \@makeother\. \@makeother\/ \@makeother\: \@makeother\;
+\@makeother\< \@makeother\= \@makeother\> \@makeother\? \@makeother\`
+\catcode94 7 %
+\catcode`\^^A=14 %
+\edef\XC@@{\expandafter\noexpand\csname\@backslashchar XC@@\endcsname}
+\newif\ifcolors@ \colors@true
+\newif\ifcolorerrors@
+\newif\ifglobalcolors \globalcolorsfalse
+\newif\ifdefinecolors \definecolorstrue
+\newif\ifconvertcolorsD
+\newif\ifconvertcolorsU
+\newif\ifblendcolors
+\newif\ifmaskcolors
+\newif\ifXC@@fbox \XC@@fboxtrue
+\newif\ifXC@@tst
+\def\c@lor@error#1%
+ {\ifcolorerrors@\PackageError{xcolor}{Undefined color #1}\@ehc
+ \else\PackageWarning{xcolor}{Undefined color #1}\fi}
+\def\XC@append#1#2%
+ {\ifx#1\@undefined\def#1{#2}\else\ifx#1\relax\def#1{#2}\else
+ \toks@\expandafter{#1#2}\edef#1{\the\toks@}\fi\fi}
+\def\XC@let@cc#1{\expandafter\XC@let@Nc\csname#1\endcsname}
+\providecommand*\@namelet[1]{\expandafter\XC@let@Nc\csname#1\endcsname}
+\def\XC@let@Nc#1#2{\expandafter\let\expandafter#1\csname#2\endcsname}
+\def\XC@let@cN#1{\expandafter\let\csname#1\endcsname}
+\def\@namexdef#1{\expandafter\xdef\csname #1\endcsname}
+\def\aftergroupdef#1#2%
+ {\expandafter\endgroup\expandafter\def\expandafter#1\expandafter{#2}}
+\def\aftergroupedef#1#2%
+ {\edef\@@tmp{\def\noexpand#1{#2}}\expandafter\endgroup\@@tmp}
+\begingroup
+\catcode`\!=13 \catcode`\:=13 \catcode`\-=13 \catcode`\+=13
+\catcode`\;=13 \catcode`\/=13 \catcode`\"=13 \catcode`\>=13
+\gdef\XC@edef#1#2%
+ {\begingroup
+ \ifnum\catcode`\!=13 \edef!{\string!}\fi
+ \ifnum\catcode`\:=13 \edef:{\string:}\fi
+ \ifnum\catcode`\-=13 \edef-{\string-}\fi
+ \ifnum\catcode`\+=13 \edef+{\string+}\fi
+ \ifnum\catcode`\;=13 \edef;{\string;}\fi
+ \ifnum\catcode`\"=13 \edef"{\string"}\fi
+ \ifnum\catcode`\>=13 \edef>{\string>}\fi
+ \edef#1{#2}\@onelevel@sanitize#1\aftergroupdef#1#1}
+\gdef\XC@mdef#1#2%
+ {\begingroup
+ \ifnum\catcode`\/=13 \edef/{\string/}\fi
+ \ifnum\catcode`\:=13 \edef:{\string:}\fi
+ \edef#1{#2}\@onelevel@sanitize#1\aftergroupdef#1#1}
+\endgroup
+\def\XC@sdef#1#2{\edef#1{#2}\@onelevel@sanitize#1}
+\def\@ifxempty#1{\@@ifxempty#1\@@ifxempty\XC@@}
+\def\@@ifxempty#1#2\XC@@
+ {\ifx#1\@@ifxempty
+ \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
+\long\def\XC@ifxcase#1#2#3%
+ {\long\def\XC@if@##1##2%
+ {\ifx#1##1%
+ \toks@{##2}\expandafter\remove@to@nnil\else\expandafter\XC@if@\fi}%
+ \XC@if@#2#1{#3}\@nnil\the\toks@}
+\long\def\XC@ifcase#1#2#3%
+ {\long\def\XC@if@##1##2%
+ {\@expandtwoargs\in@{,#1,}{,##1,}\ifin@
+ \toks@{##2}\expandafter\remove@to@nnil\else\expandafter\XC@if@\fi}%
+ \XC@if@#2{#1}{#3}\@nnil\the\toks@}
+\def\XC@@opt{,}
+\def\@ifXCopt#1%
+ {\@expandtwoargs\in@{,#1,}{\XC@@opt}%
+ \ifin@\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
+\let\XC@@pkg\relax
+\let\XC@declareoption\@declareoption
+\long\def\@declareoption#1#2%
+ {\XC@declareoption{#1}{\edef\XC@@opt{\XC@@opt#1,}#2}}
+\def\selectcolormodel#1%
+ {\@ifundefined{XC@mod@#1}%
+ {\c@lor@error{target model `#1'}}%
+ {\expandafter\ifx\csname XC@mod@#1\endcsname\XC@mod@natural
+ \def\XC@tgt@mod##1{##1}\convertcolorsDfalse\convertcolorsUfalse
+ \else\expandafter\ifx\csname XC@mod@#1\endcsname\XC@mod@named
+ \c@lor@error{target model `#1'}
+ \else
+ \edef\XC@tgt@mod##1{#1}\convertcolorsDtrue\convertcolorsUtrue
+ \fi\fi}}
+\@tfor\@@tmp:={Hsb}{tHsb}{ignore}{named}{ps}{wave}\do
+ {\expandafter\XC@sdef\csname XC@mod@\@@tmp\endcsname{\@@tmp}}
+\@tfor\@@tmp:={natural}{rgb}{cmy}{cmyk}{hsb}{gray}{RGB}{HTML}{HSB}{Gray}\do
+ {\expandafter\XC@sdef\csname XC@mod@\@@tmp\endcsname{\@@tmp}%
+ \edef\@@tmp
+ {\noexpand\DeclareOption{\@@tmp}{\noexpand\selectcolormodel{\@@tmp}}}%
+ \@@tmp}
+\DeclareOption{monochrome}
+ {\ExecuteOptions{hideerrors}%
+ \AtEndOfPackage
+ {\colors@false
+ \def\set@color{\c@lor@special\m@ne
+ {color push \current@color}\aftergroup\reset@color}%
+ \def\reset@color{\c@lor@special\m@ne{color pop}}%
+ \def\set@page@color{\c@lor@special\m@ne{background \current@color}}}}
+\let\XC@@names\relax
+\providecommand*\colornameprefix{XC@}
+\let\XC@@nameprefix\colornameprefix
+\def\XC@declarenames#1#2#3%
+ {\DeclareOption{#1}{\XC@append\XC@@names
+ {#3\definecolorstrue\input{#2.def}\definecolorstrue
+ \let\colornameprefix\XC@@nameprefix}}
+ \DeclareOption{#1*}{\XC@append\XC@@names
+ {#3\definecolorsfalse\input{#2.def}\definecolorstrue
+ \let\colornameprefix\XC@@nameprefix}}}
+\XC@declarenames{dvipsnames}{dvipsnam}{\let\colornameprefix\@empty}
+\XC@declarenames{svgnames}{svgnam}{}
+\XC@declarenames{x11names}{x11nam}{}
+\XC@declarenames{hksnames}%
+ {hks\ifcase\paperquality k\or n\or k\or z\else n\fi nam}{}
+\XC@declarenames{pmsnames}{pmsnam}{}
+\XC@declarenames{ralnames}{ralnam}{}
+\DeclareOption{table}{\XC@append\XC@@pkg{\RequirePackage{colortbl}}}
+\DeclareOption{fixpdftex}{\XC@append\XC@@pkg{\RequirePackage{pdfcolmk}}}
+\DeclareOption{hyperref}
+ {\@tfor\@@tmp:={cite}{file}{link}{menu}{page}{run}{url}\do
+ {\expandafter\edef\csname KV@Hyp@x\@@tmp bordercolor\endcsname #1%
+ {\noexpand\XC@bordercolor{\@@tmp}{#1}}}%
+ \AtEndOfPackage
+ {\GetGinDriver\def\KV@Hyp@xpdfborder#1{\edef\@pdfborder{#1}}%
+ \@tfor\@@tmp:={dvips}\do
+ {\ifx\GinDriver\@@tmp
+ \def\KV@Hyp@xpdfborder#1%
+ {\edef\@pdfborder{#1}\expandafter\XC@pdfborder\@pdfborder\relax}%
+ \@break@tfor\fi}}}
+\providecommand*\Gin@driver{}
+\@tfor\@@tmp:={dvipdf}{dvipdfmx}{dvips}{dvipsone}{dviwin}%
+ {emtex}{luatex}{pctex32}{pctexhp}{pctexps}{pctexwin}{pdftex}%
+ {tcidvi}{textures}{truetex}{vtex}{xetex}{dvisvgm}\do
+ {\edef\@@tmp{\noexpand\DeclareOption{\@@tmp}%
+ {\def\noexpand\Gin@driver{\@@tmp.def}}}%
+ \@@tmp}
+\DeclareOption{dviwindo}{\ExecuteOptions{dvipsone}}
+\DeclareOption{oztex}{\ExecuteOptions{dvips}}
+\DeclareOption{xdvi}{\ExecuteOptions{dvips,monochrome}}
+\DeclareOption{dvipdfm}{\ExecuteOptions{dvipdfmx}}
+\DeclareOption{xcdraw}{\def\XC@@xcd@{1}}
+\DeclareOption{noxcdraw}{\def\XC@@xcd@{-1}}
+\DeclareOption{fixinclude}{\def\XC@@xcf@{1}}
+\DeclareOption{prologue}{\def\XC@@xcp@{1}}
+\DeclareOption{kernelfbox}{\XC@@fboxfalse}
+\DeclareOption{showerrors}{\colorerrors@true}
+\DeclareOption{hideerrors}{\colorerrors@false}
+\DeclareOption{debugshow}{\catcode`\^^A=9 \let\GDebug\typeout}
+\DeclareOption*%
+ {\PackageInfo{xcolor}{Package option `\CurrentOption' ignored}}
+\def\XC@@xcd@{-1}
+\def\XC@@xcf@{-1}
+\def\XC@@xcp@{-1}
+\ExecuteOptions{natural,showerrors}
+\InputIfFileExists{color.cfg}{}{}
+\let\@declareoption\XC@declareoption
+\ProcessOptions\relax
+\edef\Gin@driver{\Gin@driver}
+\if!\Gin@driver!
+ \PackageError{xcolor}
+ {No driver specified}
+ {You should make a default driver option in a file \MessageBreak
+ color.cfg\MessageBreak
+ eg: \protect\ExecuteOptions{dvips}}
+\else
+ \PackageInfo{xcolor}{Driver file: \Gin@driver}
+ \@ifundefined{ver@\Gin@driver}{\input{\Gin@driver}}{}
+ \def\@@tmp#1.def{\def\XC@@drv{#1}}
+ \expandafter\@@tmp\Gin@driver
+\fi
+\count@\XC@@xcd@ \advance\count@\XC@@xcf@ \advance\count@\XC@@xcp@\relax
+\ifnum\count@>-3
+ \XC@ifcase\XC@@drv
+ {{dvips,pctex32}%
+ {\def\@tempa{0}
+ \def\XC@special#1{\special{ps:XC!b}\special{"#1}\special{ps:XC!e}}}%
+ {pdftex}%
+ {\def\@tempa{1}
+ \def\XC@special#1{\pdfliteral{ q #1 Q }}}%
+ {luatex}%
+ {\def\@tempa{1}
+ \ifnum\luatexversion<87%
+ \def\XC@special#1{\pdfliteral{ q #1 Q }}%
+ \else%
+ \def\XC@special#1{\pdfextension literal{ q #1 Q }}%
+ \fi}%
+ {dvipdfm}%
+ {\def\@tempa{1}
+ \def\XC@special#1{\special{pdf: content #1}}}%
+ }{\def\@tempa{-1}}
+ \ifnum\XC@@xcd@>\m@ne\let\XC@@xcd@\@tempa\fi
+ \ifnum\XC@@xcf@>\m@ne\let\XC@@xcf@\@tempa\fi
+ \ifnum\XC@@xcp@>\m@ne\let\XC@@xcp@\@tempa\fi
+ \ifnum\@tempa=0 \AtBeginDvi{\special{header=xcolor.pro}}\fi
+ \ifcase\XC@@xcf@
+ \AtBeginDvi{\special{! XCfixnormalscale}}
+ \fi
+ \ifcase\XC@@xcp@
+ \AtBeginDvi{\special{header=\jobname.xcp}}
+ \newwrite\XC@@xcp\immediate\openout\XC@@xcp=\jobname.xcp
+ \immediate\write\XC@@xcp{\@percentchar!}
+ \immediate\write\XC@@xcp{TeXDict begin}
+ \AtEndDocument
+ {\immediate\write\XC@@xcp{end}\immediate\closeout\XC@@xcp}
+ \fi
+\fi
+\@namedef{ver@color.sty}{1999/02/16}
+\XC@@pkg
+\long\def\@secondoffive#1#2#3#4#5{#2}
+\long\def\@thirdoffive#1#2#3#4#5{#3}
+\def\xglobal{\xglobal@stop\begingroup\futurelet\@@tok\xglobal@test}
+\def\xglobal@test
+ {\expandafter\@tfor\expandafter\@@tmp
+ \expandafter:\expandafter=\xglobal@list\do
+ {\expandafter\ifx\@@tmp\@@tok
+ \aftergroup\let\aftergroup\xglobal@\@break@tfor\fi}%
+ \endgroup\global}
+\def\xglobal@stop{\let\xglobal@\@empty}
+\xglobal@stop
+\def\xglobal@list
+ {\definecolor\definecolors\definecolorset\colorlet\providecolor
+ \providecolors\providecolorset\blendcolors\maskcolors
+ \substitutecolormodel}
+\def\xglobalize@#1{\ifx\xglobal@\global\global\let#1#1\fi}
+\def\GetGinDriver
+ {\@tempswafalse
+ \@tfor\@@tmp:={dvips}{luatex}{pdftex}{dvipdf}{dvipdfm}{dvipsone}{vtex}{textures}%
+ \do{\ifx\XC@@drv\@@tmp\@tempswatrue\@break@tfor\fi}%
+ \edef\GinDriver{\if@tempswa\XC@@drv\else hypertex\fi}}
+\def\@hex@Hex#1{\ifx#1\relax\else\expandafter\@hex@@Hex\expandafter#1\fi}
+\def\@hex@@Hex#1%
+ {\if a#1A\else \if b#1B\else \if c#1C\else \if d#1D\else
+ \if e#1E\else \if f#1F\else #1\fi\fi\fi\fi\fi\fi \@hex@Hex}
+\def\XC@strip@comma#1,#2%
+ {\ifx,#2%
+ #1\expandafter\remove@to@nnil\else#1 \expandafter\XC@strip@comma\fi
+ #2}
+{\catcode`Q=3
+ \gdef\XC@replace#1#2#3%
+ {\begingroup
+ \def\XC@repl@ce##1#2##2Q##3%
+ {\@ifxempty{##2}{\XC@r@pl@ce##1Q}{\XC@repl@ce##1##3##2Q{##3}}}%
+ \def\XC@r@pl@ce##1\@empty Q%
+ {\expandafter\endgroup\expandafter\def\expandafter#1\expandafter{##1}}%
+ \expandafter\XC@repl@ce\expandafter\@empty #1\@empty#2Q{#3}}
+}
+\def\XC@clean#1%
+ {\edef#1{ #1 }%
+ \XC@cle@n#1,{ }\XC@cle@n#1{. }{ }\XC@cle@n#1{ },%
+ \edef#1{\expandafter\@gobbletwo#1}}
+\def\XC@cle@n#1#2#3%
+ {\def\XC@cl@@n##1#2##2{#3##1\ifx##2\@empty\else\expandafter\XC@cl@@n\fi##2}%
+ \edef#1{\expandafter\XC@cl@@n#1#2\@empty}}%
+\def\rdivide#1#2%
+ {\begingroup\toks@{#1}\edef\@@tmp{\noexpand\@tempdima\the#1}%
+ \@defaultunits\@tempdimb=#2pt\relax\@nnil \@@tmp\relax
+ \ifdim\@tempdima<\z@ \@tempdima-\@tempdima\def\@sign{-}\else
+ \def\@sign{}\fi
+ \ifdim\@tempdimb<\z@ \@tempdimb-\@tempdimb\edef\@sign{\@sign-}\fi
+ \ifdim\@tempdima<.1\maxdimen \ifdim\@tempdimb<.01\maxdimen
+ \lshift\@tempdima \lshift\@tempdimb \fi\fi
+ \@tempcnta=\@tempdima \@tempcntb=\@tempdimb
+ \count@=\@tempcnta \divide\count@\@tempcntb
+ \edef\@@tmp{\number\count@.}%
+ \@tempswatrue \@rdivide \@rdivide \@rdivide \@rdivide \@rdivide
+ \@tempswafalse \@rdivide
+ \dimen@\@@tmp\p@ \ifnum\count@>4\advance\dimen@1sp\fi
+ \dimen@\@sign\dimen@
+ \edef\@@tmp{\the\toks@\the\dimen@}%
+ \expandafter\endgroup\@@tmp}
+\def\@rdivide
+ {\multiply\count@\@tempcntb \advance\@tempcnta-\count@
+ \multiply\@tempcnta10 \count@=\@tempcnta \divide\count@\@tempcntb
+ \if@tempswa\edef\@@tmp{\@@tmp\number\count@}\fi}
+\def\rmultiply#1#2%
+ {\begingroup
+ \edef\@@mul{#2}\@tempdima\the#1\relax
+ \afterassignment\@tempdimb\@tempcntb=\@@mul\p@
+ \ifdim\@tempdima<\z@ \@tempdima-\@tempdima\def\@sign{-}\else
+ \def\@sign{}\fi
+ \ifnum\@tempcntb<\z@ \@tempcntb-\@tempcntb\edef\@sign{\@sign-}\fi
+ \lshift\@tempdima \dimen@\z@
+ \expandafter\@rmultiply\@@mul.0.\@nil
+ \advance\dimen@\@tempcntb\@tempdima \rshift\dimen@
+ \dimen@\@sign\dimen@
+ \edef\@@tmp{#1\the\dimen@}%
+ \expandafter\endgroup\@@tmp}
+\def\@rmultiply#1.#2.#3\@nil
+ {\def\@@tmp{}%
+ \@tfor\@@mul:=#2\do
+ {\edef\@@tmp
+ {\advance\dimen@\@@mul\@tempdima \divide\dimen@10 \@@tmp}}%
+ \@@tmp}
+\def\lshift#1{#1\expandafter\lshift@\the#1}
+\def\llshift#1{\lshift#1\lshift#1}
+\def\lshiftnum#1{\expandafter\lshiftnum@#1.00.:}
+\def\lshiftnum@#1.#2#3.#4:{#1#2\ifnum0#3>\z@.#3\fi}
+\def\llshiftnum#1{\expandafter\llshiftnum@#1\@empty.00.:}
+\def\llshiftnum@#1.#2#3#4.#5:%
+ {#1#2\ifnum0#3>\z@#3\else0\fi\ifnum0#4>\z@.#4\fi}
+\def\lshiftset#1#2{\edef\@@XC{\noexpand\lshiftnum{#2}}#1\@@XC\p@}
+\def\llshiftset#1#2{\edef\@@XC{\noexpand\llshiftnum{#2}}#1\@@XC\p@}
+\def\rshift#1{#1\expandafter\rshift@\the#1}
+\def\rrshift#1{\rshift#1\rshift#1}
+\begingroup
+\catcode`P=12
+\catcode`T=12
+\lowercase
+ {\def\@@tmp{\def\lshift@##1.##2##3PT{##1##2\ifnum0##3>\z@.##3\fi\p@}
+ \def\rshift@##1.##2PT{\rshift@@##1\relax##2\p@}}}
+\expandafter\endgroup\@@tmp
+\def\rshift@@#1#2%
+ {\ifx#2\relax.#1\else#1\expandafter\rshift@@\expandafter#2\fi}
+\def\XC@inflate#1#2#3#4%
+ {\edef#4{#2,\ifx#1\XC@mod@cmyk #3\else
+ \ifx#1\XC@mod@gray ,,,#3,,,\else ,#3,\fi\fi}}
+\def\XC@vec#1,#2,#3,#4,#5,#6,#7,#8,#9%
+ {\def\@@tmp{}%
+ \XC@vec@{#1}{#5}%
+ \ifx,#2,\else
+ \XC@vec@{#2}{#6}\XC@vec@{#3}{#7}\ifx,#4,\else\XC@vec@{#4}{#8}\fi\fi
+ \aftergroupdef#9\@@tmp}
+\def\XC@vec@@{\edef\@@tmp{\ifx\@@tmp\@empty\else\@@tmp,\fi\strip@pt\dimen@}}
+\def\XC@add{\begingroup \let\XC@vec@\XC@add@ \XC@vec}
+\def\XC@add@#1#2%
+ {\llshiftset\dimen@{#1}\llshiftset\@tempdima{#2}%
+ \advance\dimen@\@tempdima \rrshift\dimen@ \XC@vec@@}
+\def\XC@sub{\begingroup \let\XC@vec@\XC@sub@ \XC@vec}
+\def\XC@sub@#1#2{\XC@add@{#1}{-#2}}
+\def\XC@mul{\begingroup \let\XC@vec@\XC@mul@ \XC@vec}
+\def\XC@mul@#1#2%
+ {\llshiftset\dimen@{#1}\rmultiply\dimen@{#2}\rrshift\dimen@ \XC@vec@@}
+\def\XC@mix%
+ {\begingroup
+ \@tempdima\dimen@ \@tempdimb100\p@ \advance\@tempdimb-\@tempdima
+ \let\XC@vec@\XC@mix@ \XC@vec}
+\def\XC@mix@#1#2%
+ {\dimen@#1\@tempdima \advance\dimen@#2\@tempdimb \rrshift\dimen@ \XC@vec@@}
+\def\XC@calc@#1,#2,#3,#4,#5:#6%
+ {\XC@let@Nc\@@cmd{XC@calc#6}\@@cmd{#1}\@@tmp
+ \ifx,#2,\else
+ \@@cmd{#2}\@tempa\@@cmd{#3}\@tempb
+ \ifx,#4,%
+ \edef\@@tmp{\@@tmp,\@tempa,\@tempb}\else
+ \@@cmd{#4}\@tempc\edef\@@tmp{\@@tmp,\@tempa,\@tempb,\@tempc}\fi\fi}
+\def\XC@calcC#1#2%
+ {\llshiftset\dimen@{-#1}\advance\dimen@100\p@
+ \rrshift\dimen@ \XC@calcN{\strip@pt\dimen@}#2}
+\def\XC@calcD{\XC@c@lcD\@@scl{}}
+\def\XC@c@lcD#1#2#3#4%
+ {\dimen@#3\p@ \rdivide\dimen@{#1}\edef#4{\strip@pt\dimen@#2}}
+\def\XC@calcF#1#2%
+ {\edef#2{#1}\expandafter\XC@c@lcF#2.0.:#2}
+\def\XC@c@lcF#1.#2.#3:#4%
+ {\edef#4{\XC@c@@cR#200000:}%
+ \dimen@#1.5\p@ \afterassignment\dimen@\count@=\the\dimen@
+ \edef#4%
+ {\ifnum#4>0 \ifnum\count@=0 \ifdim#1.5\p@<\z@ -\fi\fi\fi
+ \number\count@.#4}}
+\def\XC@calcH#1#2%
+ {\count@#1 \divide\count@\sixt@@n \edef\XC@@tmp{\hexnumber@\count@}%
+ \multiply\count@-\sixt@@n \advance\count@#1
+ \edef#2{\XC@@tmp\hexnumber@\count@}}
+\def\XC@calcM#1#2%
+ {\dimen@#1\p@ \dimen@\@@scl\dimen@ \advance\dimen@.5\p@
+ \afterassignment\dimen@\count@=\the\dimen@ \edef#2{\number\count@}}
+\def\XC@calcN#1#2%
+ {\XC@calcR{#1}#2\edef#2{\expandafter\XC@c@lcN#200000:}}
+\def\XC@c@lcN#1.#200000#3:{#1\ifnum0#2=0 \else.#2\fi}
+\def\XC@calcR#1#2{\edef#2{#1}\edef#2{\expandafter\XC@c@lcR#2.0.:}}
+\def\XC@c@lcR#1.#2.#3:%
+ {\ifnum#10>0 1.00000\else 0.\ifnum#11<0 00000\else
+ \XC@c@@cR#200000:\fi\fi}
+\def\XC@c@@cR#1#2#3#4#5#6:{#1#2#3#4#5}
+\def\XC@calcS{\XC@c@lcS\@@scl{}}
+\def\XC@c@lcS#1#2#3#4%
+ {\lshiftset\dimen@{#3}%
+ \ifdim#1\p@<100\p@
+ \dimen@\lshiftnum#1\dimen@ \rrshift\dimen@ \else
+ \dimen@#1\dimen@ \rshift\dimen@ \fi
+ \edef#4{\strip@pt\dimen@#2}}
+\def\XC@calcT#1#2%
+ {\lshiftset\dimen@{#1}\advance\dimen@\lshiftnum\@@arg\p@ \rshift\dimen@
+ \edef#2%
+ {\ifdim\dimen@>\p@1\else\ifdim\dimen@<\z@0\else\strip@pt\dimen@\fi\fi}}
+\def\XC@calcU#1#2%
+ {\dimen@#1\p@
+ \ifdim\dimen@=\p@\else
+ \afterassignment\dimen@\count@=\the\dimen@
+ \relax\ifdim\dimen@=\z@\else
+ \ifdim#1\p@<\z@ \dimen@-\dimen@ \advance\dimen@\p@ \fi
+ \fi
+ \fi
+ \edef#2{\strip@pt\dimen@}}
+\providecommand*\rangeRGB{255}
+\providecommand*\rangeHSB{240}
+\providecommand*\rangeHsb{360}
+\providecommand*\rangetHsb{60,30;120,60;180,120;210,180;240,240}
+\providecommand*\rangeGray{15}
+\providecommand*\adjustUCRBG{1,1,1,1}
+\providecommand*\paperquality{1}
+\providecommand*\colorseriescycle{16}
+\def\XC@clr@rgb@white{1,1,1}
+\def\XC@clr@cmy@white{0,0,0}
+\def\XC@clr@cmyk@white{0,0,0,0}
+\def\XC@clr@hsb@white{\@@hue,0,1}
+\def\XC@clr@hsb@gray{\@@hue,0,0.5}
+\def\XC@clr@hsb@black{\@@hue,0,0}
+\def\XC@clr@gray@white{1}
+\@tfor\@@tmp:={grad}{last}{step}\do
+ {\XC@let@cN{XC@met@\@@tmp}\@@tmp}
+\protected\def\definecolor{\@testopt{\XC@definecolor}{}}
+\def\XC@definecolor[#1]#2%
+ {\@testopt{\XC@definec@lor[#1]{#2}}\colornameprefix}
+\def\XC@definec@lor[#1]#2[#3]#4#5%
+ {\begingroup
+ \XC@sdef\@@cls{#1}\XC@edef\@@nam{#2}\edef\colornameprefix{#3}%
+ \XC@logdef\@@nam
+ \XC@getmodclr02{#4}{#5}{\let\@@tmp\relax}%
+ {\ifx\@@mod\XC@mod@named
+ \XC@c@l@rlet\@@nam\@@clr
+ \else
+ \ifx\@@cls\XC@mod@ps
+ \edef\@@drv{\@@mod\space\@@clr}\def\@@hue{0}%
+ \edef\@@clr{\@nameuse{XC@clr@\@@mod @white}}%
+ \else
+ \ifconvertcolorsD
+ \let\@@tmp\@@mod\XC@sdef\@@mod{\XC@tgt@mod\@@tmp}%
+ \convertcolorspec\@@tmp\@@clr\@@mod\@@clr
+ \fi
+ \XC@coremodel\@@mod\@@clr
+ \csname color@\@@mod\expandafter\endcsname
+ \expandafter\@@drv\expandafter{\@@clr}%
+ \ifcase\XC@@xcp@
+ \immediate\write\XC@@xcp{/\colornameprefix\@@nam{\expandafter
+ \XC@strip@comma\@@clr,,\@nnil}XC\@@mod}%
+ \let\@@cls\XC@mod@named
+ \fi
+ \ifx\@@cls\@empty\else
+ \let\@@tmp\@@cls
+ \@nameuse{define@color@\@@cls}\@@nam\@@drv
+ \csname color@\@@tmp\expandafter\endcsname
+ \expandafter\@@drv\expandafter{\@@nam}%
+ \fi
+ \fi
+ \toks@\expandafter{\@@drv}%
+ \edef\@@tmp
+ {\ifglobalcolors\global\else\xglobal@\fi
+ \noexpand\@namedef{\@backslashchar color@\@@nam}%
+ {\noexpand\xcolor@{\@@cls}{\the\toks@}{\@@mod}{\@@clr}}}%
+ \fi}%
+ \expandafter\endgroup\@@tmp\xglobal@stop}
+\def\XC@getmodclr#1#2#3#4%
+ {\ifnum\ifcase#1 \ifXC@@getmod1\else0 \fi \or1 \fi>0
+ \XC@mdef\@@mod{#3}\expandafter\XC@getmod\@@mod////////\XC@@
+ \@ifundefinedmodel\@@Mod{\let\@@Mod\XC@mod@ignore}{}\fi
+ \@ifundefined{XC@mod@\@@mod}%
+ {\c@lor@error{model `\@@mod'}\@firstoftwo}%
+ {\ifcase#2\else
+ \XC@mdef\@@clr{#4}%
+ \edef\@@clr{\expandafter\XC@getclr\@@clr////////\XC@@}%
+ \ifx\@@cls\XC@mod@ps\else\XC@clean\@@clr\fi
+ \ifx\@@Mod\XC@mod@ignore\else
+ \convertcolorspec\@@mod\@@clr\@@Mod\@@clr
+ \ifnum#2>1 \let\@@mod\@@Mod\fi
+ \fi
+ \fi \@secondoftwo}}
+\def\XC@getmod#1/#2/#3/#4/#5/#6/#7/#8/#9\XC@@
+ {\XC@g@tm@d0#1::\XC@@ \XC@getm@d1{#2}\XC@getm@d2{#3}%
+ \XC@getm@d3{#4}\XC@getm@d4{#5}\XC@getm@d5{#6}\XC@getm@d6{#7}%
+ \XC@getm@d7{#8}\def\XC@@pos{0}\def\@@mod{#1}\@gobble\@nnil}%
+\def\XC@getm@d#1#2%
+ {\edef\XC@@pos{#2}\XC@sdef\@@mod{\XC@tgt@mod\XC@@pos}%
+ \ifx\XC@@pos\@@mod\def\XC@@pos{#1}\expandafter\remove@to@nnil\fi}%
+\def\XC@g@tm@d#1#2:#3:#4\XC@@
+ {\@ifxempty{#3}{\let\@@Mod\XC@mod@ignore\XC@getm@d0{#2}}%
+ {\def\@@Mod{#2}\XC@getm@d0{#3}}}%
+\def\XC@getclr#1/#2/#3/#4/#5/#6/#7/#8/#9\XC@@
+ {\ifcase\XC@@pos\space #1\or#2\or#3\or#4\or#5\or#6\or#7\or#8\fi}
+\newif\ifXC@@getmod \XC@@getmodtrue
+\let\xdefinecolor\definecolor
+\def\providecolor{\@testopt{\XC@providecolor}{}}
+\def\XC@providecolor[#1]#2%
+ {\@testopt{\XC@providec@lor[#1]{#2}}\colornameprefix}
+\def\XC@providec@lor[#1]#2[#3]%
+ {\XC@edef\XC@@tmp{#2}%
+ \@ifundefinedcolor\XC@@tmp{\XC@definecolor[#1]{#2}[#3]}%
+ {\ifnum\XC@tracing>0
+ \PackageInfo{xcolor}{Ignoring color definition `\XC@@tmp'}\fi
+ \@gobbletwo}}
+\def\xcolor@#1#2#3#4{#2}
+\def\colorlet{\@testopt{\XC@colorlet}{}}
+\def\XC@colorlet[#1]#2{\@testopt{\XC@col@rlet[#1]{#2}}{}}
+\def\XC@col@rlet[#1]#2[#3]#4%
+ {\begingroup
+ \edef\@@cls{#1}\XC@edef\@@nam{#2}\XC@sdef\@@mod{#3}\XC@edef\@@clr{#4}%
+ \XC@info\@@clr\@@tmp\XC@@tstfalse
+ \ifnum\@@tmp=\@ne\ifx\@@mod\@empty
+ \ifx\@@cls\@empty
+ \XC@@tsttrue
+ \else
+ \edef\@@tmp
+ {\expandafter\expandafter\expandafter\@secondoffive
+ \csname\@backslashchar color@\@@clr\endcsname}%
+ \ifx\@@cls\@@tmp\XC@@tsttrue\fi
+ \fi
+ \fi\fi
+ \ifXC@@tst
+ \XC@logdef\@@nam\XC@c@l@rlet\@@nam\@@clr
+ \else
+ \extractcolorspec\@@clr\@@clr
+ \ifx\@@mod\@empty\else
+ \expandafter\convertcolorspec\@@clr\@@mod\@@clr
+ \edef\@@clr{{\@@mod}{\@@clr}}\fi
+ \edef\@@tmp{\noexpand\XC@definecolor[\@@cls]{\@@nam}\@@clr}%
+ \fi
+ \expandafter\endgroup\@@tmp\xglobal@stop}
+\def\XC@c@l@rlet#1#2%
+ {\@ifundefinedcolor{#2}%
+ {\c@lor@error{`#2'}\let\@@tmp\@empty}%
+ {\edef\@@tmp
+ {\ifglobalcolors\global\else\xglobal@\fi
+ \noexpand\XC@let@cc{\@backslashchar color@#1}{\@backslashchar color@#2}}}}
+\protected\def\DefineNamedColor#1%
+ {\@nameuse{XC@\ifdefinecolors defin\else prepar\fi ecolor}[#1]}
+\def\preparecolor{\@testopt{\XC@preparecolor}{}}
+\def\XC@preparecolor[#1]#2%
+ {\@testopt{\XC@preparec@lor[#1]{#2}}\colornameprefix}
+\def\XC@preparec@lor[#1]#2[#3]#4#5%
+ {\XC@sdef\@@cls{#1}\XC@edef\@@nam{#2}%
+ \XC@getmodclr01{#4}{#5}{}%
+ {\xdef\XC@@stack
+ {\ifx\XC@@stack\@empty\else\XC@@stack,\fi{#1}{\@@nam}{#3}%
+ {\ifx\@@Mod\XC@mod@ignore\@@mod\else\@@Mod\fi}{\@@clr}}}}
+\let\XC@@stack\@empty
+\def\definecolors#1%
+ {\let\XC@@cmd\definecolor\let\XC@@glb\xglobal@
+ \expandafter\XC@definecolors#1,,}
+\def\XC@definecolors#1,%
+ {\@ifxempty{#1}{}{\expandafter\XC@definec@lors#1=#1=:\XC@definecolors}}
+\def\XC@definec@lors#1=#2=#3:%
+ {\XC@edef\@@nam{#1}\XC@edef\@@arg{#2}%
+ \let\next\XC@definec@l@rs\expandafter\next\XC@@stack,,\@nnil}
+\def\XC@definec@l@rs#1,%
+ {\ifx,#1,\let\next\remove@to@nnil\else\XC@defin@c@l@rs#1\fi\next}
+\def\XC@defin@c@l@rs#1#2#3#4#5%
+ {\def\@@tmp{#2}%
+ \ifx\@@tmp\@@arg
+ \let\xglobal@\XC@@glb\XC@@cmd[#1]{\@@nam}[#3]{#4}{#5}%
+ \let\next\remove@to@nnil
+ \fi}
+\def\providecolors#1%
+ {\let\XC@@cmd\providecolor\let\XC@@glb\xglobal@
+ \expandafter\XC@definecolors#1,,}
+\def\definecolorset
+ {\let\XC@@cmd\definecolor\@testopt{\XC@definecolorset}{}}
+\def\XC@definecolorset[#1]#2#3#4#5%
+ {\XC@getmodclr10{#2}{}{}%
+ {\XC@@getmodfalse\XC@edef\XC@@tmp{#5}\let\XC@@glb\xglobal@
+ \def\XC@definec@lorset##1,##2;%
+ {\@ifxempty{##1}{}%
+ {\let\xglobal@\XC@@glb
+ \XC@@cmd[#1]{#3##1#4}{\@@mod}{##2}\XC@definec@lorset}}%
+ \expandafter\XC@definec@lorset\XC@@tmp;,;\XC@@getmodtrue}}
+\def\providecolorset
+ {\let\XC@@cmd\providecolor\@testopt{\XC@definecolorset}{}}
+\def\preparecolorset
+ {\ifdefinecolors\let\XC@@cmd\definecolor\else\let\XC@@cmd\preparecolor\fi
+ \@testopt{\XC@definecolorset}{}}
+\def\definecolorseries#1#2#3%
+ {\@testopt{\XC@definecolorseries{#1}{#2}{#3}}{}}
+\def\XC@definecolorseries#1#2#3[#4]#5%
+ {\@testopt{\XC@definec@lorseries{#1}{#2}{#3}[#4]{#5}}{}}
+\def\XC@definec@lorseries#1#2#3[#4]#5[#6]#7%
+ {\begingroup
+ \XC@sdef\@@mod{#2}%
+ \@ifxempty{#4}{\extractcolorspec{#5}\@@clr}{\edef\@@clr{{#4}{#5}}}%
+ \expandafter\convertcolorspec\@@clr\@@mod\@@clr
+ \@namexdef{\@backslashchar colorB@#1}{{\@@mod}{\@@clr}}%
+ \edef\@@met{#3}%
+ \ifx\@@met\XC@met@last
+ \@ifxempty{#6}{\extractcolorspec{#7}\@@tmp}{\edef\@@tmp{{#6}{#7}}}%
+ \expandafter\convertcolorspec\@@tmp\@@mod\@@tmp
+ \XC@inflate\@@mod\@@tmp\@@clr\@@tmp
+ \expandafter\XC@sub\@@tmp,\@@tmp
+ \else
+ \edef\@@tmp{#7}%
+ \fi
+ \@namexdef{\@backslashchar colorD@#1}{{\@@met}{\@@tmp}}%
+ \endgroup}
+\def\resetcolorseries{\@testopt{\XC@resetcolorseries}{}}
+\def\XC@resetcolorseries[#1]#2%
+ {\begingroup
+ \@namexdef
+ {\@backslashchar color@#2}{\noexpand\xcolor@{}{}\@nameuse{\@backslashchar colorB@#2}}%
+ \XC@let@Nc\@@tmp{\@backslashchar colorD@#2}%
+ \edef\@@met{\expandafter\@firstoftwo\@@tmp}%
+ \edef\@@tmp{\expandafter\@secondoftwo\@@tmp}%
+ \ifx\@@met\XC@met@step\else
+ \edef\@@scl{\@ifxempty{#1}\colorseriescycle{#1}}%
+ \expandafter\XC@calc@\@@tmp,,,,:D%
+ \fi
+ \@namexdef{\@backslashchar colorS@#2}{\@@tmp}%
+ \endgroup}
+\def\XC@step#1%
+ {\let\xcolor@\@gobbletwo\edef\@@tmp{\@nameuse{\@backslashchar color@#1}}%
+ \expandafter\XC@st@p\@@tmp{#1}%
+ \@namexdef{\@backslashchar color@#1}{\noexpand\xcolor@{}{}{\@@mod}{\@@tmp}}}
+\def\XC@st@p#1#2#3%
+ {\def\@@mod{#1}\def\@@tmp{#2}\edef\@@vec{\@nameuse{\@backslashchar colorS@#3}}%
+ \@whilenum\@tempcnta>\z@\do
+ {\XC@inflate\@@mod\@@tmp\@@vec\@@tmp
+ \expandafter\XC@add\@@tmp,\@@tmp \expandafter\XC@calc@\@@tmp,,,,:U%
+ \advance\@tempcnta\m@ne}}
+\def\XC@stepabs#1%
+ {\edef\@@tmp{\@nameuse{\@backslashchar colorB@#1}}%
+ \expandafter\XC@st@p\@@tmp{#1}%
+ \edef\@@tmp
+ {\def\noexpand\@@mod{\@@mod}\def\noexpand\@@clr{\@@tmp}}}
+\def\blendcolors{\@ifstar{\XC@blendcolors\colorblend}{\XC@blendcolors{}}}
+\def\XC@blendcolors#1#2%
+ {\edef\colorblend{#1}\XC@edef\XC@@tmp{#2}%
+ \ifx\XC@@tmp\@empty
+ \xglobal@\blendcolorsfalse
+ \else
+ \xglobal@\blendcolorstrue
+ \expandafter\XC@blendc@lors\XC@@tmp!!\@nil
+ \fi
+ \xglobalize@\colorblend \xglobal@stop}
+\def\XC@blendc@lors!#1!#2!#3\@nil
+ {\@ifxempty{#1}{}%
+ {\@ifxempty{#2}%
+ {\edef\colorblend{\colorblend!#1!white}}%
+ {\edef\colorblend{\colorblend!#1!#2}\XC@blendc@lors!#3!\@nil}}}
+\blendcolors{}
+\def\maskcolors{\@testopt{\XC@maskcolors}{}}
+\def\XC@maskcolors[#1]#2%
+ {\XC@edef\colormask{#2}%
+ \ifx\colormask\@empty
+ \xglobal@\maskcolorsfalse \def\XC@mmod{}\def\XC@mclr{}%
+ \else
+ \xglobal@\maskcolorstrue \extractcolorspecs\colormask\XC@mmod\XC@mclr
+ \@ifxempty{#1}{}%
+ {\convertcolorspec\XC@mmod\XC@mclr{#1}\XC@mclr \XC@sdef\XC@mmod{#1}}%
+ \XC@coremodel\XC@mmod\XC@mclr
+ \fi
+ \xglobalize@\colormask \xglobalize@\XC@mmod \xglobalize@\XC@mclr
+ \xglobal@stop}
+\maskcolors{}
+\DeclareRobustCommand\color
+ {\@ifnextchar[\@undeclaredcolor\@declaredcolor}
+\def\@undeclaredcolor[#1]#2%
+ {\begingroup
+ \let\@@cls\@empty
+ \XC@getmodclr12{#1}{#2}{}%
+ {\ifblendcolors
+ \ifx\colorblend\@empty\else
+ \edef\@@mix{\expandafter\@gobble\colorblend}\@tempswafalse
+ \XC@coremodel\@@mod\@@clr\@xcolor@{}{}\@@mod\@@clr
+ \fi
+ \fi
+ \ifconvertcolorsU
+ \edef\@@tmp{\XC@tgt@mod{\@@mod}}%
+ \convertcolorspec\@@mod\@@clr\@@tmp\@@clr \let\@@mod\@@tmp
+ \fi
+ \ifmaskcolors
+ \convertcolorspec\@@mod\@@clr\XC@mmod\@@clr
+ \let\@@mod\XC@mmod
+ \XC@inflate\@@mod\XC@mclr\@@clr\@@tmp
+ \expandafter\XC@mul\@@tmp,\@@clr
+ \fi
+ \edef\@@tmp{\noexpand\XC@undeclaredcolor{\@@mod}{\@@clr}}%
+ \expandafter\endgroup\@@tmp}}
+\def\XC@undeclaredcolor#1#2%
+ {\@ifundefinedmodel{#1}%
+ {\c@lor@error{model `#1'}}%
+ {\@nameuse{color@#1}\current@color{#2}%
+ \edef\XC@current@color{\noexpand\xcolor@{}{\current@color}{#1}{#2}}%
+ \XC@display}}
+\def\@declaredcolor#1%
+ {\XC@edef\XC@@tmp{#1}\XC@@tstfalse
+ \ifcase\XC@type\XC@@tmp\relax \XC@@tsttrue\or \relax\else
+ \ifblendcolors\XC@@tsttrue\fi \ifmaskcolors\XC@@tsttrue\fi
+ \ifconvertcolorsU\XC@@tsttrue\fi
+ \fi
+ \ifXC@@tst
+ \expandafter\XC@declaredcolor\else
+ \expandafter\XC@declaredc@lor\fi}
+\def\XC@declaredcolor
+ {\XC@split\XC@@tmp
+ \edef\@@tmp{\noexpand\@undeclaredcolor[\@@mod]{\@@clr}}%
+ \expandafter\endgroup\@@tmp}
+\def\XC@declaredc@lor
+ {\XC@let@Nc\XC@current@color{\@backslashchar color@\XC@@tmp}%
+ \edef\current@color{\XC@current@color}%
+ \XC@display}
+\protected\def\textcolor#1#{\@textcolor{#1}}
+\def\@textcolor#1#2#3{\protect\leavevmode{\color#1{#2}#3}}
+\protected\def\pagecolor
+ {\begingroup
+ \let\ignorespaces\endgroup \let\set@color\set@page@color
+ \color}
+\protected\def\nopagecolor
+ {\@ifundefined{no@page@color}%
+ {\PackageInfo{xcolor}{\@backslashchar nopagecolor\space is not supported}}%
+ {\no@page@color}}
+\InputIfFileExists{mathcolor.ltx}{}{}
+\protected\def\colorbox#1#{\color@box{#1}}
+\def\color@box#1#2{\color@b@x\relax{\color#1{#2}}}
+\protected\def\fcolorbox#1#{\color@fbox{#1}}
+\def\color@fbox#1#2#3#{\protect\color@fb@x{#1}{#2}{#3}}
+\def\color@fb@x#1#2#3#4%
+ {\color@b@x{\fboxsep\z@\color#1{#2}\XC@fbox}%
+ {\@ifxempty{#3}{\color#1}{\color#3}{#4}}}
+\long\def\color@b@x#1#2#3%
+ {\leavevmode
+ \setbox\z@\hbox{\kern\fboxsep{\set@color#3}\kern\fboxsep}%
+ \dimen@\ht\z@\advance\dimen@\fboxsep\ht\z@\dimen@
+ \dimen@\dp\z@\advance\dimen@\fboxsep\dp\z@\dimen@
+ {#1{#2\color@block{\wd\z@}{\ht\z@}{\dp\z@}\box\z@}}}
+\def\XC@frameb@x#1%
+ {\hbox
+ {\@tempdima\fboxrule \advance\@tempdima\fboxsep
+ \advance\@tempdima\dp\@tempboxa
+ \setbox\@tempboxa\hbox
+ {\lower\@tempdima\hbox
+ {\vbox
+ {\kern\fboxrule
+ \hbox{\kern\fboxrule#1%
+ \vbox{\kern\fboxsep\box\@tempboxa\kern\fboxsep}%
+ #1\kern\fboxrule}%
+ \kern\fboxrule}}}%
+ \@tempdima\wd\@tempboxa
+ \edef\@tempa{{\the\@tempdima}{\the\ht\@tempboxa}{\the\dp\@tempboxa}}%
+ \box\@tempboxa\kern-\@tempdima\expandafter\boxframe\@tempa}}
+\ifXC@@fbox
+ \let\@frameb@x\XC@frameb@x \let\XC@fbox\fbox
+\else
+ \def\XC@fbox{\let\@frameb@x\XC@frameb@x\fbox}
+\fi
+
+\ifnum\XC@@xcd@>\m@ne
+\def\XC@boxframe#1#2#3#4%
+ {\hbox{\sbox\z@{\ifdim\fboxrule>\z@ #4\fi}%
+ \wd\z@#1\relax\ht\z@#2\relax\dp\z@#3\relax\box\z@}}
+\fi
+\ifcase\XC@@xcd@
+\providecommand*\color@block[3]%
+ {{\set@color\hbox
+ {\dimen@#3\edef\@tempa{ \number\dimen@\space}%
+ \dimen@#2\edef\@tempa{ \number\dimen@\@tempa}%
+ \dimen@#1\relax
+ \XC@special{\number\dimen@\@tempa XCcolorblock}}}}
+\providecommand*\boxframe[3]%
+ {\XC@boxframe{#1}{#2}{#3}%
+ {\dimen@#3\edef\@tempa{ \number\dimen@\space}%
+ \dimen@#2\edef\@tempa{ \number\dimen@\@tempa}%
+ \dimen@#1\relax
+ \XC@special{\number\fboxrule\space\number\dimen@\@tempa XCboxframe}}}
+\or
+\providecommand*\boxframe[3]%
+ {\XC@boxframe{#1}{#2}{#3}%
+ {\dimen@#3\edef\@tempa{ 0 -\strip@pt\dimen@\space}%
+ \edef\@tempb{\advance\dimen@\the\dimen@}%
+ \dimen@#2\advance\dimen@-\fboxrule\@tempb
+ \edef\@tempb{ \strip@pt\dimen@\space re s}%
+ \dimen@#1\advance\dimen@-\fboxrule
+ \edef\@tempb{ cm\@tempa\strip@pt\dimen@\@tempb}%
+ \dimen@.5\fboxrule\edef\@tempa{ \strip@pt\dimen@}%
+ \XC@special
+ {0.996264 0 0 0.996264 0 0 cm
+ \strip@pt\fboxrule\space w [] 0 d 2 J 0 j 4 M
+ 1 0 0 1\@tempa\@tempa\@tempb}}}
+\fi
+\providecommand*\color@block[3]%
+ {{\set@color\rlap{\ifcolors@\vrule\@width#1\@height#2\@depth#3\fi}}}
+\providecommand*\boxframe[3]%
+ {\hbox
+ {\dimen@#2\advance\dimen@#3\relax
+ \lower#3\vbox
+ {\hrule\@height\fboxrule
+ \@tempdima-0.5\fboxrule \ifodd\fboxrule\advance\@tempdima\m@ne sp\fi
+ \kern\@tempdima
+ \hbox
+ {\advance\dimen@-\fboxrule
+ \vrule\@width\fboxrule\@height\dimen@\@depth\z@
+ \@tempdima#1\advance\@tempdima-\tw@\fboxrule \kern\@tempdima
+ \vrule\@width\fboxrule\@height\dimen@\@depth\z@}%
+ \kern-0.5\fboxrule
+ \hrule\@height\fboxrule}}}
+\def\@xcolor@#1#2#3#4%
+ {\XC@sdef\@@mod{#3}\edef\@@clr{#4}%
+ \ifx\@@mix\@empty\else\expandafter\@xcolor@@\@@mix!!!!\@nil\fi
+ \if@tempswa
+ \XC@let@Nc\@@tmp{XC@cnv@\@@mod @compl}%
+ \ifx\@@tmp\relax \expandafter\XC@calc@\@@clr,,,,:C\else
+ \expandafter\@@tmp\@@clr,\fi
+ \let\@@clr\@@tmp
+ \fi}
+\def\@xcolor@@#1!#2!#3!#4!#5\@nil
+ {\dimen@\@ifxempty{#1}{100}{#1}\p@
+ \edef\@@mix{\@ifxempty{#2}{white}{#2}}%
+ \ifdim\dimen@=100\p@
+ \expandafter\XC@postfix\@@mix]\relax
+ \else\ifdim\dimen@=\z@
+ \extractcolorspecs\@@mix\@@mod\@@clr
+ \else
+ \XC@let@Nc\@@tmp{XC@clr@\@@mod @\@@mix}%
+ \ifx\@@tmp\relax
+ \extractcolorspec\@@mix\@@tmp
+ \ifx\@@mod\XC@mod@gray
+ \edef\@@mod{\expandafter\@firstoftwo\@@tmp}%
+ \edef\@@tmp{\expandafter\@secondoftwo\@@tmp}%
+ \convertcolorspec\XC@mod@gray\@@clr\@@mod\@@clr
+ \else
+ \expandafter\convertcolorspec\@@tmp\@@mod\@@tmp
+ \fi
+ \else
+ \ifx\@@mod\XC@mod@hsb\expandafter\XC@extract@hue\@@clr:\@@hue\fi
+ \fi
+ \XC@inflate\@@mod\@@clr\@@tmp\@@tmp
+ \expandafter\XC@mix\@@tmp,\@@clr
+ \fi\fi
+ \@ifxempty{#3}%
+ {\@ifxempty{#4}{}{\@xcolor@@!#4!#5\@nil}}%
+ {\@xcolor@@#3!#4!#5\@nil}}
+\def\XC@split#1%
+ {\begingroup\XC@edef\@@tmp{#1}\expandafter\XC@split@i\@@tmp>>\@nnil}
+\def\XC@split@i#1>%
+ {\def\@@tmp{#1}\XC@split@ii#1:\@nil \XC@func}
+\def\XC@split@ii#1:#2\@nil
+ {\@ifxempty{#2}{\XC@split@vi}{\XC@split@iii#1,,:#2}}
+\def\XC@split@iii#1,#2,#3:#4:%
+ {\edef\XC@@mod{#1}\let\@tempa\@empty
+ \ifx,#2,\XC@@tsttrue\@tempdima\z@\else\XC@@tstfalse\@tempdima#2\p@\fi
+ \XC@split@iv#4;,;}
+\def\XC@split@iv#1,#2;%
+ {\@ifxempty{#1}%
+ {\let\XC@@clr\@empty \@tempa \expandafter\XC@calc@\XC@@clr,,,,:U%
+ \let\@@mod\XC@@mod \let\@@clr\@@tmp}
+ {\XC@append\@tempa{\XC@split@v{#1}{#2}}%
+ \ifXC@@tst\advance\@tempdima#2\p@\fi
+ \XC@split@iv}}
+\def\XC@split@v#1#2%
+ {\def\@@tmp{#1}\XC@split@vi
+ \ifx\@@mod\XC@@mod\else
+ \convertcolorspec\@@mod\@@clr\XC@@mod\@@clr
+ \fi
+ \dimen@#2\p@ \rdivide\dimen@\@tempdima
+ \edef\@@scl{\strip@pt\dimen@}%
+ \expandafter\XC@calc@\@@clr,,,,:S%
+ \ifx\XC@@clr\@empty\let\XC@@clr\@@tmp\else
+ \XC@inflate\XC@@mod\XC@@clr\@@tmp\@@tmp
+ \expandafter\XC@add\@@tmp,\XC@@clr
+ \fi}
+\def\XC@split@vi{\count@\z@ \expandafter\XC@split@vii\@@tmp!\@nil}
+\def\XC@split@vii#1%
+ {\ifx#1-\advance\count@\@ne\expandafter\XC@split@vii
+ \else\expandafter\XC@split@viii\expandafter#1\fi}
+\def\XC@split@viii#1!#2\@nil
+ {\edef\@@nam{#1}\edef\@@mix{#2}%
+ \ifodd\count@\@tempswatrue\else\@tempswafalse\fi
+ \@ifundefinedcolor\@@nam
+ {\c@lor@error{`\@@nam'}\def\@@nam{black}}{}%
+ \let\xcolor@\@xcolor@\@nameuse{\@backslashchar color@\@@nam}}
+\def\XC@postfix#1#2]#3\relax
+ {\begingroup
+ \if[#1\@tempcnta#2\relax\XC@stepabs\@@nam
+ \else\@tempcnta\z@
+ \@tfor\@@tok:=#1#2\do
+ {\if+\@@tok\advance\@tempcnta\@ne
+ \else\if-\@@tok\advance\@tempcnta\m@ne
+ \else\@tempcnta\z@\expandafter\@break@tfor\fi\fi}%
+ \ifnum\@tempcnta=\z@\relax\else\XC@step\@@nam\fi
+ \let\@@tmp\@empty
+ \fi\expandafter\endgroup\@@tmp}
+\def\XC@func#1>{\@ifxempty{#1}{\remove@to@nnil}{\XC@fun@#1,>\XC@func}}
+\def\XC@fun@#1,#2>{\@nameuse{XC@func@#1}#2,,>}
+\def\XC@func@wheel#1,#2,#3>{\XC@func@wh@el{#1}{#2}0}
+\def\XC@func@twheel#1,#2,#3>{\XC@func@wh@el{#1}{#2}1}
+\def\XC@func@wh@el#1#2#3%
+ {\convertcolorspec\@@mod\@@clr
+ {\ifcase#3 \XC@mod@Hsb\or\XC@mod@tHsb\fi}\@@clr
+ \expandafter\XC@extract@hue\@@clr:\@@hue \dimen@#1\p@
+ \@ifxempty{#2}{}%
+ {\rdivide\dimen@{#2}\lshift\dimen@
+ \dimen@\rangeHsb\dimen@\rshift\dimen@}%
+ \advance\dimen@\@@hue\p@ \rdivide\dimen@\rangeHsb
+ \edef\@@hue{\strip@pt\dimen@}\XC@calcU\@@hue\@@hue
+ \ifcase#3
+ \expandafter\XC@replace@hue\@@clr:\@@hue,\@@clr
+ \or
+ \XC@c@lcS\rangeHsb{}\@@hue\@@hue
+ \expandafter\XC@replace@hue\@@clr:\@@hue,\@@clr
+ \convertcolorspec\XC@mod@tHsb\@@clr\XC@mod@hsb\@@clr
+ \fi
+ \let\@@mod\XC@mod@hsb}
+\def\XC@display
+ {\XC@bcolor\XC@let@cN{\@backslashchar color@.}\XC@current@color
+ \ifnum\XC@type{.}=1
+ \PackageWarning{xcolor}{Incompatible color definition}\else
+ \ifnum\XC@tracing>2
+ \begingroup \let\xcolor@\@empty \def\@nil{\@backslashchar @nil}%
+ \PackageInfo{xcolor}{Setting color `\XC@current@color'}%
+ \endgroup
+ \fi\fi
+ \XC@mcolor\set@color\XC@ecolor\ignorespaces}
+\let\XC@bcolor\relax
+\let\XC@mcolor\relax
+\let\XC@ecolor\relax
+\def\XC@bordercolor#1#2%
+ {\extractcolorspec{#2}\XC@@tmp
+ \expandafter\convertcolorspec\XC@@tmp\XC@mod@rgb\XC@@tmp
+ \expandafter\edef\csname @#1bordercolor\endcsname
+ {\expandafter\XC@strip@comma\XC@@tmp,,\@nnil}}
+\def\XC@pdfborder#1 #2 #3\relax
+ {\def\@@scl{80}\XC@calc@#1,#2,#3,,:S%
+ \edef\@pdfborder{\expandafter\XC@strip@comma\@@tmp,,\@nnil}}
+\@ifXCopt{table}{%
+ \def\rowcolors
+ {\@ifstar{\@rowcmdfalse\rowc@lors}{\@rowcmdtrue\rowc@lors}}
+ \def\rowc@lors{\@testopt{\rowc@l@rs}{}}
+ \def\rowc@l@rs[#1]#2#3#4%
+ {\global\rownum=\z@
+ \global\@rowcolorstrue
+ \@ifxempty{#3}%
+ {\def\@oddrowcolor{\@norowcolor}}%
+ {\def\@oddrowcolor{\gdef\CT@row@color{\CT@color{#3}}}}%
+ \@ifxempty{#4}%
+ {\def\@evenrowcolor{\@norowcolor}}%
+ {\def\@evenrowcolor{\gdef\CT@row@color{\CT@color{#4}}}}%
+ \if@rowcmd
+ \def\@rowcolors
+ {#1\if@rowcolors
+ \noalign{\relax\ifnum\rownum<#2\@norowcolor\else
+ \ifodd\rownum\@oddrowcolor\else\@evenrowcolor\fi\fi}%
+ \fi}%
+ \else
+ \def\@rowcolors
+ {\if@rowcolors
+ \ifnum\rownum<#2\noalign{\@norowcolor}\else
+ #1\noalign{\ifodd\rownum\@oddrowcolor\else\@evenrowcolor\fi}\fi
+ \fi}%
+ \fi
+ \CT@everycr{\@rowc@lors\the\everycr}%
+ \ignorespaces}
+ \def\@rowc@lors{\noalign{\global\advance\rownum\@ne}\@rowcolors}
+ \let\@rowcolors\@empty
+ \def\showrowcolors{\noalign{\global\@rowcolorstrue}\@rowcolors}
+ \def\hiderowcolors{\noalign{\global\@rowcolorsfalse\@norowcolor}}
+ \def\@norowcolor{\global\let\CT@row@color\relax}
+ \@norowcolor
+ \newif\if@rowcolors
+ \newif\if@rowcmd
+ \@ifundefined{rownum}{\newcount\rownum}{}
+ \def\CT@extract#1\columncolor#2#3\@nil
+ {\if!#2%
+ \let\CT@column@color\@empty
+ \else
+ \if[#2%
+ \expandafter\CT@extractb
+ \else
+ \XC@edef\XC@@tmp{#2}%
+ \edef\CT@column@color{\noexpand\CT@color{\XC@@tmp}}%
+ \expandafter\CT@extractd
+ \fi
+ {#1}#3\@nil
+ \fi}
+}{}
+\def\extractcolorspec#1#2%
+ {\XC@split{#1}\edef\@@tmp{{\@@mod}{\@@clr}}\aftergroupdef#2\@@tmp}
+\def\extractcolorspecs#1#2#3%
+ {\extractcolorspec{#1}#3%
+ \edef#2{\expandafter\@firstoftwo#3}%
+ \edef#3{\expandafter\@secondoftwo#3}}
+\def\XC@extract@hue#1,#2:#3{\edef#3{#1}}
+\def\XC@replace@hue#1,#2:#3,#4{\edef#4{#3,#2}}
+\def\@ifundefinedcolor#1{\@ifundefined{\@backslashchar color@#1}}
+\def\@ifundefinedmodel#1{\@ifundefined{color@#1}}
+\def\XC@type#1%
+ {\expandafter\expandafter\expandafter\XC@typ@
+ \csname\@backslashchar color@#1\endcsname\@empty\@empty\@empty\XC@@}
+\def\XC@typ@#1#2#3#4\XC@@
+ {\ifx#1\relax 0\else
+ \ifx#1\xcolor@
+ \ifx$#2$%
+ \ifx$#3$4\else3\fi\@gobbletwo
+ \else2\fi\@gobbletwo
+ \else1\fi
+ \fi}
+\def\XC@info#1#2%
+ {\XC@edef#2{#1}%
+ \expandafter\in@\expandafter>\expandafter{#2}%
+ \ifin@\def#2{4}\else\expandafter\in@\expandafter:\expandafter{#2}%
+ \ifin@\def#2{3}\else\expandafter\in@\expandafter!\expandafter{#2}%
+ \ifin@\def#2{2}\else % now there's no >,:,!
+ \if-\expandafter\@car#2\relax\@nil\def#2{2}\else % catches -red
+ \edef#2{\noexpand\in@{/./}{/#2/}}#2%
+ \edef#2{\ifin@0\else1\fi}\fi\fi\fi\fi}
+\def\tracingcolors{\begingroup\afterassignment\XC@tracingcolors\count@}
+\def\XC@tracingcolors{\aftergroupdef\XC@tracing{\the\count@}}
+\tracingcolors=0
+\def\XC@logdef#1%
+ {\ifnum\XC@tracing>1
+ \@ifundefinedcolor{#1}%
+ {\ifnum\XC@tracing>2
+ \PackageInfo{xcolor}{Defining color `#1'}%
+ \fi}%
+ {\PackageInfo{xcolor}{Redefining color `#1'}}%
+ \fi}
+\newenvironment*{testcolors}[1][rgb,cmyk,hsb,HTML]%
+ {\let\@@nam\@empty\count@\z@
+ \@for\@@tmp:=#1\do
+ {\advance\count@\@ne
+ \XC@sdef\@@tmp{\@@tmp}\edef\@@nam{\@@nam{\@@tmp}}}%
+ \edef\@@num{\the\count@}%
+ \def\XC@@gt{\textgreater}\def\@@tmp{OT1}%
+ \ifx\f@encoding\@@tmp
+ \@expandtwoargs\in@{,\f@family,}{,cmtt,pcr,}%
+ \ifin@\def\XC@@gt{>}\fi
+ \fi
+ \def\XC@@xcp@{-1}\ifnum\XC@tracing>1 \def\XC@tracing{1}\fi
+ \def\testcolor{\@testopt{\@testcolor}{}}%
+ \def\@testcolor[##1]##2%
+ {\XC@mdef\@@mod{##1}\XC@edef\@@clr{##2}%
+ \ifx\@@mod\@empty
+ \let\@@arg\@@clr\XC@replace\@@arg>\XC@@gt\else
+ \edef\@@arg{[\@@mod]{\@@clr}}\XC@definecolor[]{*}\@@mod\@@clr
+ \def\@@clr{*}\fi
+ \XC@append\@@arg{&}\extractcolorspecs\@@clr\@@mod\@@clr
+ \@testc@lor}%
+ \def\@testc@lor
+ {\count@\z@
+ \expandafter\@tfor\expandafter\@@tmp\expandafter:\expandafter=\@@nam\do
+ {\ifx\@@clr\@empty
+ \edef\@@cmd{\noexpand\textbf{\@@tmp}}%
+ \else
+ \convertcolorspec\@@mod\@@clr\@@tmp\@@cmd
+ \edef\@@cmd
+ {\noexpand\@testc@l@r{\@@tmp}{\@@cmd}%
+ \ifx\@@mod\@@tmp\noexpand\underline\fi
+ {\expandafter\XC@strip@comma\@@cmd,,\@nnil}}%
+ \fi
+ \expandafter\XC@append\expandafter\@@arg\expandafter{\@@cmd}%
+ \advance\count@\@ne
+ \ifnum\count@=\@@num\XC@append\@@arg{\\}\else\XC@append\@@arg{&}\fi}%
+ \@@arg}%
+ \def\@testc@l@r##1##2%
+ {\fboxsep\z@\fbox{\colorbox[##1]{##2}{\phantom{XX}}} }%
+ \tabular{@{}l*{\@@num}{l}@{}}%
+ \def\@@arg{\textbf{color}& }\let\@@clr\@empty\@testc@lor}%
+ {\endtabular\ignorespacesafterend}
+\def\color@setgroup{\begingroup\set@color}
+\let\color@begingroup\begingroup
+\def\color@endgroup{\endgraf\endgroup}
+\def\color@hbox{\hbox\bgroup\color@begingroup}
+\def\color@vbox{\vbox\bgroup\color@begingroup}
+\def\color@endbox{\color@endgroup\egroup}
+\def\convertcolorspec#1#2#3#4%
+ {\begingroup
+ \XC@sdef\sm{#1}\XC@sdef\tm{#3}\edef\@@tmp{#2}%
+ \ifx\sm\XC@mod@named\extractcolorspecs\@@tmp\sm\@@tmp\fi
+ \ifx\sm\tm\else\csname XC@cnv@\sm\expandafter\endcsname\@@tmp,\fi
+ \aftergroupdef#4\@@tmp}
+\def\XC@coremodel#1#2%
+ {\XC@ifxcase#1%
+ {\XC@mod@RGB {\convertcolorspec#1#2\XC@mod@rgb#2\let#1\XC@mod@rgb}%
+ \XC@mod@HTML{\convertcolorspec#1#2\XC@mod@rgb#2\let#1\XC@mod@rgb}%
+ \XC@mod@Hsb {\convertcolorspec#1#2\XC@mod@hsb#2\let#1\XC@mod@hsb}%
+ \XC@mod@tHsb{\convertcolorspec#1#2\XC@mod@hsb#2\let#1\XC@mod@hsb}%
+ \XC@mod@HSB {\convertcolorspec#1#2\XC@mod@hsb#2\let#1\XC@mod@hsb}%
+ \XC@mod@Gray{\convertcolorspec#1#2\XC@mod@gray#2\let#1\XC@mod@gray}%
+ \XC@mod@wave{\convertcolorspec#1#2\XC@mod@hsb#2\let#1\XC@mod@hsb}%
+ \XC@mod@named{}%
+ \XC@mod@ps{}}%
+ {\expandafter\XC@calc@#2,,,,:N\let#2\@@tmp}}
+\def\XC@cnv@rgb#1,#2,#3,%
+ {\XC@ifxcase\tm
+ {\XC@mod@cmy {\XC@calc@#1,#2,#3,,:C}%
+ \XC@mod@cmyk
+ {\XC@calc@#1,#2,#3,,:C\expandafter\XC@cnv@cmy@cmyk\@@tmp,}%
+ \XC@mod@RGB {\edef\@@scl{\rangeRGB}\XC@calc@#1,#2,#3,,:M}%
+ \XC@mod@HTML{\edef\@@scl{\@cclv}\XC@calc@#1,#2,#3,,:M%
+ \expandafter\XC@calc@\@@tmp,,:H%
+ \expandafter\XC@cnv@rgb@HTML\@@tmp,}%
+ \XC@mod@gray{\XC@cnv@rgb@gray#1,#2,#3,}%
+ \XC@mod@Gray{\XC@cnv@rgb@gray#1,#2,#3,\XC@cnv@gray\@@tmp,}}%
+ {\XC@cnv@rgb@hsb#1,#2,#3,\XC@cnv@hsb@}}
+\def\XC@cnv@rgb@
+ {\ifx\tm\XC@mod@rgb\else\expandafter\XC@cnv@rgb\@@tmp,\fi}
+\def\XC@cnv@rgb@hsb#1,#2,#3,%
+ {\count@\z@
+ \ifdim#2\p@>#1\p@ \else\advance\count@4 \fi
+ \ifdim#3\p@>#2\p@ \else\advance\count@2 \fi
+ \ifdim#1\p@>#3\p@ \else\advance\count@1 \fi
+ \ifcase\count@\or
+ \XC@c@v@rgb@hsb{#3}{#2}{#1}3{}\or
+ \XC@c@v@rgb@hsb{#2}{#1}{#3}1{}\or
+ \XC@c@v@rgb@hsb{#2}{#3}{#1}3-\or
+ \XC@c@v@rgb@hsb{#1}{#3}{#2}5{}\or
+ \XC@c@v@rgb@hsb{#3}{#1}{#2}5-\or
+ \XC@c@v@rgb@hsb{#1}{#2}{#3}1-\or
+ \def\@tempa{0}\def\@tempb{0}\XC@calcN{#3}\@tempc
+ \fi
+ \edef\@@tmp{\@tempa,\@tempb,\@tempc}}
+\def\XC@c@v@rgb@hsb#1#2#3#4#5%
+ {\XC@calcN{#1}\@tempc \llshiftset\dimen@{#1}%
+ \llshiftset\@tempdimb{-#3}\advance\@tempdimb\dimen@
+ \llshiftset\@tempdima{-#5#2}\advance\@tempdima#5\dimen@
+ \advance\@tempdima#4\@tempdimb \rdivide\@tempdima{6\@tempdimb}%
+ \edef\@tempa{\ifdim\@tempdima>\p@1\else\strip@pt\@tempdima\fi}%
+ \rdivide\@tempdimb\dimen@
+ \edef\@tempb{\strip@pt\@tempdimb}}
+\def\XC@cnv@rgb@gray#1,#2,#3,%
+ {\llshiftset\dimen@{#1}\@tempdima30\dimen@
+ \llshiftset\dimen@{#2}\advance\@tempdima59\dimen@
+ \llshiftset\dimen@{#3}\advance\@tempdima11\dimen@
+ \rrshift\@tempdima \rdivide\@tempdima{100}%
+ \edef\@@tmp{\strip@pt\@tempdima}}
+\def\XC@cnv@rgb@HTML#1,#2,#3,%
+ {\edef\@@tmp{#1#2#3}}
+\def\XC@cnv@cmy#1,#2,#3,%
+ {\XC@ifxcase\tm
+ {\XC@mod@cmyk{\XC@cnv@cmy@cmyk#1,#2,#3,}%
+ \XC@mod@gray{\XC@cnv@rgb@gray#1,#2,#3,\XC@calcC\@@tmp\@@tmp}%
+ \XC@mod@Gray{\XC@cnv@rgb@gray#1,#2,#3,\XC@calcC\@@tmp\@@tmp
+ \XC@cnv@gray\@@tmp,}}%
+ {\XC@calc@#1,#2,#3,,:C\XC@cnv@rgb@}}
+\def\XC@cnv@cmy@cmyk#1,#2,#3,%
+ {\edef\@@scl
+ {\ifdim#1\p@<#2\p@
+ \ifdim#1\p@<#3\p@ #1\else #3\fi \else
+ \ifdim#2\p@<#3\p@ #2\else #3\fi \fi}%
+ \expandafter\XC@calc@\adjustUCRBG,:S%
+ \expandafter\XC@c@v@cmy@cmyk\@@tmp,#1,#2,#3,}
+\def\XC@c@v@cmy@cmyk#1,#2,#3,#4,#5,#6,#7,%
+ {\XC@add#5,#6,#7,,-#1,-#2,-#3,,\@@tmp \edef\@@tmp{\@@tmp,#4}%
+ \expandafter\XC@calc@\@@tmp,:N}
+\def\XC@cnv@cmyk#1,#2,#3,#4,%
+ {\XC@ifxcase\tm
+ {\XC@mod@gray{\XC@cnv@rgb@gray#1,#2,#3,\edef\@@arg{#4}%
+ \XC@calcT\@@tmp\@@tmp \XC@calcC\@@tmp\@@tmp}%
+ \XC@mod@Gray{\XC@cnv@rgb@gray#1,#2,#3,\edef\@@arg{#4}%
+ \XC@calcT\@@tmp\@@tmp \XC@calcC\@@tmp\@@tmp \XC@cnv@gray\@@tmp,}}%
+ {\XC@cnv@cmyk@cmy#1,#2,#3,#4,%
+ \ifx\tm\XC@mod@cmy\else\expandafter\XC@cnv@cmy\@@tmp,\fi}}
+\def\XC@cnv@cmyk@cmy#1,#2,#3,#4,%
+ {\edef\@@arg{#4}\XC@calc@#1,#2,#3,,:T}
+\def\XC@cnv@hsb#1,#2,#3,%
+ {\XC@ifxcase\tm
+ {\XC@mod@Hsb {\XC@cnv@hsb@Hsb#1,#2,#3,}%
+ \XC@mod@tHsb{\XC@cnv@hsb@Hsb#1,#2,#3,\expandafter\XC@cnv@Hsb\@@tmp,}%
+ \XC@mod@HSB {\edef\@@scl{\rangeHSB}\XC@calc@#1,#2,#3,,:M}}%
+ {\XC@cnv@hsb@rgb#1,#2,#3,\XC@cnv@rgb@}}
+\def\XC@cnv@hsb@
+ {\ifx\tm\XC@mod@hsb\else\expandafter\XC@cnv@hsb\@@tmp,\fi}
+\def\XC@cnv@hsb@rgb#1,#2,#3,%
+ {\llshiftset\dimen@{#1}\dimen@6\dimen@ \rrshift\dimen@
+ \afterassignment\dimen@\count@=\the\dimen@
+ \edef\@@tmp{\strip@pt\dimen@}%
+ \ifodd\count@\else\XC@calcC\@@tmp\@@tmp\fi
+ \edef\@@tmp
+ {\ifcase\count@ 0,\@@tmp,1\or \@@tmp,0,1\or 1,0,\@@tmp\or
+ 1,\@@tmp,0\or \@@tmp,1,0\or 0,1,\@@tmp\or 0,\@@tmp,1\fi}%
+ \edef\@@scl{#2}\expandafter\XC@calc@\@@tmp,,:S%
+ \expandafter\XC@calc@\@@tmp,,:C%
+ \edef\@@scl{#3}\expandafter\XC@calc@\@@tmp,,:S%
+ \expandafter\XC@calc@\@@tmp,,:N}
+\def\XC@cnv@hsb@Hsb#1,#2,#3,%
+ {\XC@c@lcS\rangeHsb{,#2,#3}{#1}\@@tmp}
+\def\XC@cnv@gray#1,%
+ {\XC@ifxcase\tm
+ {\XC@mod@rgb {\XC@calcN{#1}\@@tmp \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}}%
+ \XC@mod@cmy {\XC@calcC{#1}\@@tmp \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}}%
+ \XC@mod@cmyk{\XC@calcC{#1}\@@tmp \edef\@@tmp{0,0,0,\@@tmp}}%
+ \XC@mod@RGB {\edef\@@scl{\rangeRGB}\XC@calcM{#1}\@@tmp
+ \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}}%
+ \XC@mod@HTML{\edef\@@scl{\@cclv}\XC@calcM{#1}\@@tmp
+ \XC@calcH\@@tmp\@@tmp \edef\@@tmp{\@@tmp\@@tmp\@@tmp}}%
+ \XC@mod@HSB {\edef\@@scl{\rangeHSB}\XC@calcM{#1}\@@tmp
+ \edef\@@tmp{0,0,\@@tmp}}%
+ \XC@mod@Gray{\edef\@@scl{\rangeGray}\XC@calcM{#1}\@@tmp}}%
+ {\XC@calcN{#1}\@@tmp \edef\@@tmp{0,0,\@@tmp}}}
+\def\XC@cnv@RGB#1,#2,#3,%
+ {\edef\@@scl{\rangeRGB}\XC@calc@#1,#2,#3,,:D\XC@cnv@rgb@}
+\def\XC@cnv@HTML#1,%
+ {\edef\@@tmp{\expandafter\@hex@Hex#1\relax}\expandafter\XC@cnv@HTML@\@@tmp
+ \edef\@@scl{\@cclv}\expandafter\XC@calc@\@@tmp,,:D\XC@cnv@rgb@}
+\def\XC@cnv@HTML@#1#2#3#4#5#6%
+ {\edef\@@tmp{\number"#1#2,\number"#3#4,\number"#5#6}}
+\def\XC@cnv@Hsb#1,#2,#3,%
+ {\ifx\tm\XC@mod@tHsb\XC@cnv@@Hsb#1,#2,#3,\XC@cnv@Hsb@
+ \else\XC@cnv@Hsb@hsb#1,#2,#3,\XC@cnv@hsb@\fi}
+\def\XC@cnv@Hsb@hsb#1,#2,#3,%
+ {\XC@c@lcD\rangeHsb{,#2,#3}{#1}\@@tmp}
+\def\XC@cnv@@Hsb#1,#2,#3,#4%
+ {\dimen@\rangeHsb\p@ \advance\dimen@\p@ \edef\@@tmp{\strip@pt\dimen@}%
+ \edef\@@tmp{0,0;\rangetHsb;\rangeHsb,\rangeHsb;\@@tmp,\@@tmp;}%
+ \dimen@#1\p@ \expandafter#4\@@tmp\@nnil
+ \edef\@@tmp{\strip@pt\dimen@,#2,#3}}
+\def\XC@cnv@Hsb@#1,#2;#3,#4;%
+ {\ifdim\dimen@<#4\p@
+ \@tempdima#3\p@ \advance\@tempdima-#1\p@
+ \@tempdimb#4\p@ \advance\@tempdimb-#2\p@
+ \rdivide\@tempdima\@tempdimb
+ \advance\dimen@-#2\p@ \rmultiply\dimen@{\strip@pt\@tempdima}%
+ \advance\dimen@#1\p@ \expandafter\remove@to@nnil
+ \else
+ \def\@@tmp{\XC@cnv@Hsb@#3,#4;}\expandafter\@@tmp
+ \fi}
+\def\XC@cnv@tHsb#1,#2,#3,%
+ {\XC@cnv@@Hsb#1,#2,#3,\XC@cnv@tHsb@
+ \ifx\tm\XC@mod@Hsb\else\expandafter\XC@cnv@Hsb\@@tmp,\fi}
+\def\XC@cnv@tHsb@#1,#2;#3,#4;%
+ {\ifdim\dimen@<#3\p@
+ \@tempdima#4\p@ \advance\@tempdima-#2\p@
+ \@tempdimb#3\p@ \advance\@tempdimb-#1\p@
+ \rdivide\@tempdima\@tempdimb
+ \advance\dimen@-#1\p@ \rmultiply\dimen@{\strip@pt\@tempdima}%
+ \advance\dimen@#2\p@ \expandafter\remove@to@nnil
+ \else
+ \def\@@tmp{\XC@cnv@tHsb@#3,#4;}\expandafter\@@tmp
+ \fi}
+\def\XC@cnv@HSB#1,#2,#3,%
+ {\edef\@@scl{\rangeHSB}\XC@calc@#1,#2,#3,,:D\XC@cnv@hsb@}
+\def\XC@cnv@Gray#1,%
+ {\XC@c@lcD\rangeGray{}{#1}\@@tmp \XC@cnv@gray\@@tmp,}
+\def\XC@cnv@wave#1,%
+ {\XC@cnv@wave@hsb#1,\XC@cnv@hsb@}
+\def\XC@cnv@wave@hsb#1,%
+ {\@tempdima#1\p@
+ \ifdim\@tempdima<440\p@
+ \XC@c@v@wave@hsb{-.0166667}{7.33333}4{}\else
+ \ifdim\@tempdima<490\p@
+ \XC@c@v@wave@hsb{.02}{-8.8}4-\else
+ \ifdim\@tempdima<510\p@
+ \XC@c@v@wave@hsb{-.05}{25.5}2{}\else
+ \ifdim\@tempdima<580\p@
+ \XC@c@v@wave@hsb{.0142857}{-7.28571}2-\else
+ \ifdim\@tempdima<645\p@
+ \XC@c@v@wave@hsb{-.0153846}{9.92308}0{}\else
+ \dimen@\z@ \fi\fi\fi\fi\fi
+ \divide\dimen@6\relax
+ \edef\@@tmp{\strip@pt\dimen@,1,}%
+ \ifdim\@tempdima<420\p@
+ \XC@c@v@wave@hsb{.0175}{-6.35}0{}\else
+ \ifdim\@tempdima>700\p@
+ \XC@c@v@wave@hsb{-.00875}{7.125}0{}\else
+ \dimen@\p@ \fi\fi
+ \edef\@@tmp{\@@tmp\strip@pt\dimen@}}
+\def\XC@c@v@wave@hsb#1#2#3#4%
+ {\dimen@#1\@tempdima \advance\dimen@#2\p@
+ \XC@calcR{\strip@pt\dimen@}\@tempa
+ \dimen@#4\@tempa\p@ \advance\dimen@#3\p@}
+\def\XC@cnv@cmyk@compl#1,#2,#3,#4,%
+ {\XC@cnv@cmyk@cmy#1,#2,#3,#4,%
+ \expandafter\XC@calc@\@@tmp,,:C\expandafter\XC@cnv@cmy@cmyk\@@tmp,}
+\def\XC@cnv@hsb@compl#1,#2,#3,%
+ {\lshiftset\dimen@{#1}\advance\dimen@\ifdim\dimen@<5\p@-\fi-5\p@
+ \rshift\dimen@ \edef\@@tmp{\strip@pt\dimen@}%
+ \lshiftset\dimen@{#3}\@tempdima#2\dimen@
+ \@tempdimb\@tempdima \advance\@tempdimb10\p@ \advance\@tempdimb-\dimen@
+ \ifdim\@tempdimb=\z@
+ \edef\@@tmp{\@@tmp,0,0}%
+ \else
+ \rdivide\@tempdima\@tempdimb \rshift\@tempdimb
+ \edef\@@tmp{\@@tmp,\strip@pt\@tempdima,\strip@pt\@tempdimb}%
+ \fi}
+\def\substitutecolormodel#1#2%
+ {\XC@sdef\XC@@tmp{\expandafter\XC@substitutecolormodel#2/ignore/\@nnil}%
+ \ifx\XC@@tmp\XC@mod@ignore
+ \XC@let@cN{color@#1}\color@ignore
+ \else
+ \expandafter\edef\csname color@#1\endcsname##1##2%
+ {\noexpand\convertcolorspec
+ \expandafter\noexpand\csname XC@mod@#1\endcsname{##2}%
+ \expandafter\noexpand\csname XC@mod@\XC@@tmp\endcsname
+ \noexpand\XC@@tmp\noexpand\expandafter
+ \expandafter\noexpand\csname color@\XC@@tmp\endcsname
+ \noexpand\expandafter##1\noexpand\expandafter{\noexpand\XC@@tmp}}%
+ \fi
+ \expandafter\xglobalize@\csname color@#1\endcsname \xglobal@stop
+ \PackageInfo{xcolor}{Model `#1' substituted by `\XC@@tmp'}}
+\def\XC@substitutecolormodel#1/%
+ {\@ifundefinedmodel{#1}{\XC@substitutecolormodel}{#1\remove@to@nnil}}
+\def\color@ignore#1#2{\def#1{}}
+\@ifundefinedmodel{rgb}%
+ {\substitutecolormodel{rgb}{RGB/HTML/hsb/Hsb/HSB/cmy/cmyk/gray/Gray}}{}
+\@ifundefinedmodel{cmyk}{\substitutecolormodel{cmyk}{cmy/rgb}}{}
+\@ifundefinedmodel{cmy}%
+ {\PackageInfo{xcolor}{Model `cmy' substituted by `cmy0'}
+ \def\color@cmy#1#2{\color@cmyk#1{#2,0}}}{}
+\@ifundefinedmodel{hsb}{\@tempswatrue}%
+ {\XC@ifcase\XC@@drv{{dvipdfm,textures}\@tempswatrue}\@tempswafalse}
+\if@tempswa
+ \substitutecolormodel{hsb}{Hsb/HSB/rgb}
+\fi
+\@ifundefinedmodel{RGB}%
+ {\substitutecolormodel{RGB}{HTML/rgb}}
+ {\PackageInfo{xcolor}{Model `RGB' extended}
+ \let\XC@color@RGB\color@RGB
+ \def\color@RGB#1#2%
+ {\relax\ifnum\rangeRGB=255
+ \XC@color@RGB#1{#2}%
+ \else
+ \convertcolorspec\XC@mod@RGB{#2}\XC@mod@rgb\XC@@tmp
+ \expandafter\color@rgb\expandafter#1\expandafter{\XC@@tmp}%
+ \fi}}
+\@ifundefinedmodel{gray}{\substitutecolormodel{gray}{Gray/rgb}}{}
+\@ifundefinedmodel{HTML}{\substitutecolormodel{HTML}{rgb}}{}
+\@ifundefinedmodel{Hsb}{\substitutecolormodel{Hsb}{hsb}}{}
+\@ifundefinedmodel{tHsb}{\substitutecolormodel{tHsb}{hsb}}{}
+\@ifundefinedmodel{HSB}{\substitutecolormodel{HSB}{hsb}}{}
+\@ifundefinedmodel{Gray}{\substitutecolormodel{Gray}{gray}}{}
+\@ifundefinedmodel{wave}{\substitutecolormodel{wave}{hsb}}{}
+\def\XC@getcolor#1#2%
+ {\begingroup\toks@{#1}\XC@getc@lor#1\XC@@\aftergroupdef#2{\@@tmp}}
+\def\XC@getc@lor#1#2\XC@@
+ {\@ifxempty{#2}%
+ {\expandafter\XC@getc@l@r#1\XC@@}%
+ {\let\set@color\relax
+ \ifx#1[%
+ \expandafter\@undeclaredcolor\the\toks@\else
+ \expandafter\@declaredcolor\expandafter{\the\toks@}\fi
+ \let\@@tmp\XC@current@color}}
+\def\XC@getc@l@r#1#2\XC@@
+ {\ifx#1\xcolor@
+ \def\@@tmp{\xcolor@#2}%
+ \else
+ \let\set@color\relax
+ \expandafter\@declaredcolor\expandafter{\the\toks@}%
+ \let\@@tmp\XC@current@color
+ \fi}
+\def\XC@usecolor#1{\expandafter\XC@usec@lor#1\XC@@}
+\def\XC@usec@lor#1#2\XC@@
+ {\ifx#1\xcolor@
+ \expandafter\expandafter\expandafter\c@lor@to@ps#1#2\@@
+ \else
+ \expandafter\expandafter\expandafter\expandafter\expandafter\expandafter
+ \expandafter\c@lor@to@ps\csname\@backslashchar color@#1#2\endcsname\@@
+ \fi
+ \space}
+\let\XC@c@lor@to@ps\XC@usecolor
+\let\pst@getcolor\XC@getcolor
+\let\pst@usecolor\XC@usecolor
+\def\c@lor@special#1#2{\edef\@tempa{\write#1{#2}}\@tempa}
+\protected\def\normalcolor{\let\current@color\default@color\set@color}
+\AtBeginDocument{\let\default@color\current@color}
+\XC@ifcase\XC@@drv
+ {{dvipdf,dvipdfm,dvipdfmx,dvips,pctex32}%
+ {\def\c@lor@@named#1,#2,#3\@@#4%
+ {\edef#4{\expandafter\expandafter\expandafter\@thirdoffive
+ \csname\@backslashchar color@#1\endcsname}}
+ \def\define@color@named#1#2%
+ {\@namedef{\@backslashchar color@#1}{{}{}{ \colornameprefix#1}{}{}}}}%
+ {dvipsone,luatex,pctexps,pdftex,tcidvi,truetex,vtex,xetex}%
+ {\def\c@lor@@named#1,#2,#3\@@#4%
+ {\edef#4{\expandafter\expandafter\expandafter\@thirdoffive
+ \csname\@backslashchar color@#1\endcsname}}
+ \def\define@color@named#1#2%
+ {\let\@@cls\@empty\@namedef{\@backslashchar color@#1}{{}{}{#2}{}{}}}}%
+ {textures}%
+ {\def\c@lor@@named#1,#2,#3\@@#4%
+ {\edef\@tempa{\color@P@custom{#1}{\if!#2!1\else#2\fi}}%
+ \expandafter\def\expandafter#4\@tempa}
+ \def\define@color@named#1#2%
+ {\edef\@tempa{{#1}{#2}}\expandafter\AddCustomColor\@tempa}
+ \def\c@lor@ps@#1 #2\@@
+ {\expandafter\expandafter\expandafter\expandafter\expandafter
+ \expandafter\expandafter\c@lor@to@ps@
+ \csname\@backslashchar color@#1\expandafter\endcsname\space
+ #2. \@@{#1}}}%
+ }{}
+\definecolorset{rgb/hsb/cmyk/gray}{}{}%
+ {red,1,0,0/0,1,1/0,1,1,0/.3;%
+ green,0,1,0/.33333,1,1/1,0,1,0/.59;%
+ blue,0,0,1/.66667,1,1/1,1,0,0/.11;%
+ brown,.75,.5,.25/.083333,.66667,.75/0,.25,.5,.25/.5475;%
+ lime,.75,1,0/.20833,1,1/.25,0,1,0/.815;%
+ orange,1,.5,0/.083333,1,1/0,.5,1,0/.595;%
+ pink,1,.75,.75/0,.25,1/0,.25,.25,0/.825;%
+ purple,.75,0,.25/.94444,1,.75/0,.75,.5,.25/.2525;%
+ teal,0,.5,.5/.5,1,.5/.5,0,0,.5/.35;%
+ violet,.5,0,.5/.83333,1,.5/0,.5,0,.5/.205}%
+\definecolorset{cmyk/rgb/hsb/gray}{}{}%
+ {cyan,1,0,0,0/0,1,1/.5,1,1/.7;%
+ magenta,0,1,0,0/1,0,1/.83333,1,1/.41;%
+ yellow,0,0,1,0/1,1,0/.16667,1,1/.89;%
+ olive,0,0,1,.5/.5,.5,0/.16667,1,.5/.39}
+\definecolorset{gray/rgb/hsb/cmyk}{}{}%
+ {black,0/0,0,0/0,0,0/0,0,0,1;%
+ darkgray,.25/.25,.25,.25/0,0,.25/0,0,0,.75;%
+ gray,.5/.5,.5,.5/0,0,.5/0,0,0,.5;%
+ lightgray,.75/.75,.75,.75/0,0,.75/0,0,0,.25;%
+ white,1/1,1,1/0,0,1/0,0,0,0}
+\XC@@names
+\AtBeginDocument{\let\XC@@stack\@empty}
+\let\colornameprefix\XC@@nameprefix
+\XC@catcodes
+\csname xcolorcmd\endcsname
+\color{black}
+\endinput
+%%
+%% End of file `xcolor.sty'.
diff --git a/macros/latex/contrib/xcolor/xcolor.dtx b/macros/latex/contrib/xcolor/xcolor.dtx
index e6b5129012..8e914bc889 100644
--- a/macros/latex/contrib/xcolor/xcolor.dtx
+++ b/macros/latex/contrib/xcolor/xcolor.dtx
@@ -2,7 +2,7 @@
%%
%% ----------------------------------------------------------------
%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
-%% 2021-2022 LaTeX Project https://github.com/latex3/xcolor/issues
+%% 2021-2023 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
%<*package>
@@ -18,8 +18,8 @@
%%
%</package>
%<*extract|driver|test1|test2|test3|test4>
-\def\XCfileversion{v2.14}%
-\def\XCfiledate{2022/06/12}%
+\def\XCfileversion{v3.00}%
+\def\XCfiledate{2023/11/11}%
%</extract|driver|test1|test2|test3|test4>
%
% This file may be distributed and/or modified under the
@@ -382,12 +382,11 @@
% \item options that determine the color driver as explained in \cite{dpc} and \cite{color}, currently: \Option{dvips}, \Option{xdvi}, \Option{dvipdf}, \Option{dvipdfm}, \Option{dvipdfmx}, \Option{luatex}, \Option{pdftex}, \Option{dvipsone}, \Option{dviwindo}, \Option{emtex}, \Option{dviwin}, \Option{oztex}, \Option{textures}, \Option{pctexps}, \Option{pctexwin}, \Option{pctexhp}, \Option{pctex32}, \Option{truetex}, \Option{tcidvi}, \Option{vtex}, \Option{xetex}, \Option{dvisvgm},
% \item options that determine the target color model\footnote{Section \vref{sec.tgt} explains how this setting can be overridden at any point in a document.} (\Option{natural}, \Option{rgb}, \Option{cmy}, \Option{cmyk}, \Option{hsb}, \Option{gray}, \Option{RGB}, \Option{HTML}, \Option{HSB}, \Option{Gray}) or disable colored output (\Option{monochrome}),
% \item options that control whether and how certain sets of predefined colors are being loaded: \Option{dvipsnames}, \Option{dvipsnames*}, \Option{svgnames}, \Option{svgnames*}, \Option{x11names}, \Option{x11names*},
-% \item options that determine which other packages are to be loaded or supported: \Option{table}, \Option{fixpdftex},
-% \Option{hyperref},
+% \item option that determine which other packages are to be loaded or supported: \Option{table},
% \item options that influence the behaviour of other commands: \Option{prologue}, \Option{kernelfbox}, \Option{xcdraw}, \Option{noxcdraw}, \Option{fixinclude}, \Option{showerrors}, \Option{hideerrors},
% \item obsolete options:
% \oOption{pst},
-% \oOption{override}, \oOption{usenames}, \oOption{nodvipsnames}.
+% \oOption{override}, \oOption{usenames}, \oOption{nodvipsnames}, \oOption{fixpdftex}, \oOption{hyperref}.
% \end{itemize}
% All available package options (except driver selection and obsolete options) are listed in table \vref{tab.opt}.
% \DescribeMacro\GetGinDriver
@@ -427,7 +426,7 @@
% \Option{x11names}, \Option{x11names*}& Load a set of predefined colors according to \Index{Unix}/\Index{X11}.\footnotemark[1]\\
% \hline
% \Option{table}& Load the \Package{colortbl} package, in order to use the tools for coloring rows, columns, and cells within tables.\\
-% \Option{fixpdftex}& Load the \Package{pdfcolmk} package, in order to improve |pdftex|'s color behaviour (see section \vref{sec.fixpdftex}).\\
+% \Option{fixpdftex}& This option is obsolete and does nothing at all.\\
% \Option{hyperref}& Support the \Package{hyperref} package in terms of color expressions by defining additional keys (see section \vref{sec.hyperref}).\\
% \hline
% \Option{prologue}& Write prologue information to \File{.xcp} file for every color definition (as described in section \vref{sec.prologue}).\\
@@ -452,15 +451,15 @@
% \raggedleft
% \extrarowheight2pt
% \rowcolors{3}{tablerowcolor}{}
-% \begin{tabular}{l*{6}{c}}
+% \begin{tabular}{l*{5}{c}}
% \hline
% \rowcolor{tableheadcolor}
-% \em Action/Package & \Package{colortbl}& \Package{pdfcolmk}& \Package{hyperref}& \Package{pstricks}& \LC& \Package{pstcol}\\
-% load before \XC & no & no & allowed & allowed\rlap{\footnotemark[1]} & no & no \\
-% load with \XC{} option& \Option{table} & \Option{fixpdftex} & --- & --- & --- & --- \\
-% load after \XC & no & allowed & allowed & allowed & no & no \\
+% \em Action/Package & \Package{colortbl}& \Package{hyperref}& \Package{pstricks}& \LC& \Package{pstcol}\\
+% load before \XC & allowed & allowed & allowed\rlap{\footnotemark[1]} & no & no \\
+% load with \XC{} option& \Option{table} & --- & --- & --- & --- \\
+% load after \XC & allowed & allowed & allowed & no & no \\
% \hline\hline
-% \multicolumn6{c}{\footnotemark[1]\,recent \Package{pstricks} versions do load \XC\ by default}\\
+% \multicolumn5{c}{\footnotemark[1]\,\Package{pstricks} loads \XC\ by default}\\
% \hline
% \end{tabular}
% \end{adjustwidth}
@@ -1350,6 +1349,14 @@
%
% \subsection{Border colors for hyperlinks}\label{sec.hyperref}
%
+% \textbf{Change 2022}: The options described in this subsection have been removed from the code
+% as no longer relevant. \Package{hyperref} can handle color names in the border color keys.
+%
+% This affects the package options \Option{hyperref}, and the Keys
+% \Key{xcitebordercolor}, \Key{xfilebordercolor}, \Key{xlinkbordercolor}, \Key{xmenubordercolor},
+% \Key{xpagebordercolor}, \Key{xrunbordercolor}, \Key{xurlbordercolor} and \Key{xpdfborder}.
+%
+%
% The \Package{hyperref} package offers all kinds of support for hyperlinks, pdfmarks etc.
% There are two standard ways to make hyperlinks visible (see the package documentation \cite{hyperref} for additional information on how to set up these features):
% \begin{itemize}
@@ -1391,6 +1398,13 @@
%
%
% \subsection{Color in tables}
+% The commands in this subsection
+% were in previous versions provided by the \Package{xcolor} package as
+% an extension of the \Package{colortbl} commands. They have now
+% been merged into the \Package{colortbl} package properly. The package can be loaded
+% either with the \Option{table} option or independently with |\usepackage|.
+% The description of the commands is kept only for historical reasons. If in doubt
+% consult the documentation of \Package{colortbl}.
%
% \DescribeMacro\rowcolors
% \oarg{commands}\marg{row}\marg{odd-row color}\marg{even-row color}\\
@@ -1408,7 +1422,6 @@
% \DescribeMacro\rownum
% The counter |\rownum| may be used within such a table to access the current row number.
% An example is given in figure \vref{fig.row}.
-% These commands require the \Option{table} option (which loads the \Package{colortbl} package).
%
% Note that table coloring may be combined with color series.
% This method was used to construct the examples in figure \vref{fig.csx}.
@@ -1469,28 +1482,6 @@
% \end{verbatim}
% Now all colors from the \Index{SVG} set are available (except \Color{Fuchsia}) plus \Color{Fuchsia} from the other set.
%
-% \subsubsection{Page breaks and pdf\TeX}\label{sec.fixpdftex}
-%
-% Since pdf\TeX{} does not maintain a \emph{\Index{color stack}} --- in contrast to \Program{dvips} --- a typical problem is the behaviour of colors in the case of page breaks, as illustrated by the following example:
-% \begin{verbatim}
-% \documentclass{minimal}
-% \usepackage{xcolor}
-% \begin{document}
-% black\color{red}red1\newpage red2\color{black}black
-% \end{document}
-% \end{verbatim}
-% This works as expected with |dvips|, i.e., `red1' and `red2' being \Color{red}, however, with |pdftex|, `red2' is displayed in \Color{black}.
-% The problem may be solved by using the \Option{fixpdftex} option which simply loads Heiko Oberdiek's \Package{pdfcolmk} package \cite{pdfcolmk}.
-% However, its author also lists some limitations:
-% \begin{itemize}
-% \item Mark limitations: page breaks in math.
-% \item LaTeX's output routine is redefinded.
-% \begin{itemize}
-% \item Changes in the output routine of newer versions of LaTeX are not detected.
-% \item Packages that change the output routine are not supported.
-% \end{itemize}
-% \item It does not support several independent text streams like footnotes.
-% \end{itemize}
%
% \subsubsection{Change color of included \File{.eps} file}\label{sec.fixinclude}
%
@@ -3152,7 +3143,32 @@
%
% \subsection*{History}
% \addcontentsline{toc}{subsection}{History}
-%
+% \subsubsection*{2023/11/11 v3.00}
+% \begin{itemize}
+% \item if a \LaTeX{} older than 2022-06-01 is detected a frozen version is used.
+% All new features apply only if LaTeX 2022-06-01 or newer is detected.
+% The frozen version can also be requested with \verb+\usepackage{xcolor}[=v2]+
+% \item The new LaTeX key/val handler is used for the package options.
+% That means there will be fewer option clash errors (issue \#29).
+% item The |\rowcolors| command has moved to the |colortbl| package and is no longer
+% defined by |xcolor|.
+% \item The fixpdftex option is obsolete and does nothing at all (issue \#20)
+% \item Extended |\normalcolor| to set also the dot color, issue \#19
+% \item Fix Gray color model, issue \#23
+% \end{itemize}
+%
+% \subsubsection*{2022/06/12 v2.14}
+% \begin{itemize}
+% \item Load code from \LaTeX\ to define |\mathcolor| if it is available.
+% \item Bug fixes:
+% \begin{itemize}
+% \item Modify |\XC@info| to avoid spurious error from |\colorlet{foo}{}|, issue \#12
+% \item make |\normalcolor|, |\colorbox|, |\fcolorbox|, |\textcolor|, |\pagecolor|,
+% |\nopagecolor|, |\definecolor|, |\DefineNamedColor|
+% protected as in |color.sty|, issue \#17
+% \end{itemize}
+% \end{itemize}
+
% \subsubsection*{2021/10/31 v2.13}
% \begin{itemize}
% \item Bug Fixes:
@@ -3556,20 +3572,33 @@
%
%
% \subsection{Preparation}
+% \begin{macrocode}
+%<*package>
+% \end{macrocode}
+%
+% \subsubsection{Release handling}
+%
+% \begin{macrocode}
+\providecommand\DeclareRelease[3]{}
+\providecommand\DeclareCurrentRelease[2]{}
+\DeclareRelease{v2}{0000-00-00}{xcolor-2022-06-12.sty}
+\DeclareCurrentRelease{}{2023-11-11}
+% \end{macrocode}
%
% \subsubsection{File identification}
%
% \renewcommand*\MacroFont{\footnotesize\ttfamily}
% \renewcommand*\AltMacroFont{\footnotesize\ttfamily\slshape}
%
-% \begin{macrocode}
-%<*package>
-% \end{macrocode}
%
% \fbox{\MacroFont\string\ProvidesPackage\string{xcolor\string}[\XCfiledate\space\XCfileversion\space LaTeX color extensions (UK)]}
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
+\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
+\IfFormatAtLeastTF{2022/06/01}{}
+ {\RequirePackageWithOptions{xcolor-2022-06-12}}
+\IfFormatAtLeastTF{2022/06/01}{}{\endinput}
% \end{macrocode}
%
%
@@ -3837,6 +3866,7 @@
% Performs the test |\if|\Meta{str}\Meta[kl]{str} for $k=1,\dots,n$ and $l=1,\ldots,m_n$.
% If for some $k,l$ the test is `true', then the attached code \Meta[k]{code} is executed.
% If all tests are `false', then \Meta{default code} is executed.
+% \changes{3.0}{2022-08-10}{moved the patch from hycolor to correct Gray model, issue \#23}
% \begin{macrocode}
\long\def\XC@ifcase#1#2#3%
{\long\def\XC@if@##1##2%
@@ -3848,43 +3878,6 @@
%
%
%
-% \subsection{Package options}
-%
-% \begin{macro}{\XC@@opt}
-% Initialise the macro to hold the names of \emph{executed} \XCP{} options.
-% \begin{macrocode}
-\def\XC@@opt{,}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@ifXCopt}
-% \marg{option}\marg{executed}\marg{not executed}\\
-% Performs action dependent on whether a specific \XCP{} option has been executed or not.
-% \begin{macrocode}
-\def\@ifXCopt#1%
- {\@expandtwoargs\in@{,#1,}{\XC@@opt}%
- \ifin@\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\XC@@pkg}
-% Initialise the macro to hold the names of packages that are to be loaded by \XC.
-% \begin{macrocode}
-\let\XC@@pkg\relax
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\DeclareOption}
-% |\DeclareOption| has to be redefined in order to collect every executed package option in |\XC@@opt|.
-% This is being restored immediately before |\ProcessOptions|; thus, other packages use the original definition.
-% \begin{macrocode}
-\let\XC@declareoption\@declareoption
-\long\def\@declareoption#1#2%
- {\XC@declareoption{#1}{\edef\XC@@opt{\XC@@opt#1,}#2}}
-% \end{macrocode}
-% \end{macro}
-%
-%
% \subsubsection{Color model selection}
%
% \begin{macro}{\selectcolormodel}
@@ -3931,7 +3924,7 @@
\@tfor\@@tmp:={natural}{rgb}{cmy}{cmyk}{hsb}{gray}{RGB}{HTML}{HSB}{Gray}\do
{\expandafter\XC@sdef\csname XC@mod@\@@tmp\endcsname{\@@tmp}%
\edef\@@tmp
- {\noexpand\DeclareOption{\@@tmp}{\noexpand\selectcolormodel{\@@tmp}}}%
+ {\noexpand\DeclareKeys{\@@tmp .code= {\noexpand\selectcolormodel{\@@tmp}}}}%
\@@tmp}
% \end{macrocode}
% \end{macro}
@@ -3953,14 +3946,20 @@
%
% The \Option{monochrome} option should be used \emph{in addition} to one of the standard driver options.
% \begin{macrocode}
-\DeclareOption{monochrome}
- {\ExecuteOptions{hideerrors}%
- \AtEndOfPackage
- {\colors@false
- \def\set@color{\c@lor@special\m@ne
- {color push \current@color}\aftergroup\reset@color}%
- \def\reset@color{\c@lor@special\m@ne{color pop}}%
- \def\set@page@color{\c@lor@special\m@ne{background \current@color}}}}
+\DeclareKeys
+ {
+ monochrome .code =
+ {
+ \colorerrors@false
+ \AtEndOfPackage
+ {\colors@false
+ \def\set@color{\c@lor@special\m@ne
+ {color push \current@color}\aftergroup\reset@color}%
+ \def\reset@color{\c@lor@special\m@ne{color pop}}%
+ \def\set@page@color{\c@lor@special\m@ne{background \current@color}}}
+ }
+ ,monochrome .usage = load
+ }
% \end{macrocode}
%
%
@@ -3989,12 +3988,27 @@
% Construct package options for color names.
% \begin{macrocode}
\def\XC@declarenames#1#2#3%
- {\DeclareOption{#1}{\XC@append\XC@@names
- {#3\definecolorstrue\input{#2.def}\definecolorstrue
- \let\colornameprefix\XC@@nameprefix}}
- \DeclareOption{#1*}{\XC@append\XC@@names
- {#3\definecolorsfalse\input{#2.def}\definecolorstrue
- \let\colornameprefix\XC@@nameprefix}}}
+ {%
+ \DeclareKeys
+ {
+ #1 .code =
+ {
+ \AddToHook{package/xcolor/after}
+ {#3\definecolorstrue\input{#2.def}\definecolorstrue
+ \let\colornameprefix\XC@@nameprefix}%
+ \DeclareKeys[xcolor]{#1 .code = {},#1* .code={}}
+ }
+ ,#1 .usage = preamble
+ ,#1* .code =
+ {
+ \AddToHook{package/xcolor/after}
+ {#3\definecolorsfalse\input{#2.def}\definecolorstrue
+ \let\colornameprefix\XC@@nameprefix}
+ \DeclareKeys[xcolor]{#1 .code = {},#1* .code={}}
+ }
+ ,#1* .usage = preamble
+ }%
+ }
% \end{macrocode}
% \end{macro}
%
@@ -4013,44 +4027,19 @@
%
% Use this option to load \People{David P.}{Carlisle}'s \Package{colortbl} package:
% \begin{macrocode}
-\DeclareOption{table}{\XC@append\XC@@pkg{\RequirePackage{colortbl}}}
+\DeclareKeys
+ {
+ table .code ={\AddToHook{package/xcolor/after}{\RequirePackage{colortbl}}}
+ ,table .usage = preamble
% \end{macrocode}
%
-% Use this option to load \People{Heiko}{Oberdiek}'s \Package{pdfcolmk} package:
+% These options are obsolete and only added for compatibility.
% \begin{macrocode}
-\DeclareOption{fixpdftex}{\XC@append\XC@@pkg{\RequirePackage{pdfcolmk}}}
+ ,hyperref .code = {}
+ ,fixpdftex .code = {}
+ }
% \end{macrocode}
%
-% \begin{macro}{\KV@Hyp@xcitebordercolor}
-% \begin{macro}{\KV@Hyp@xfilebordercolor}
-% \begin{macro}{\KV@Hyp@xlinkbordercolor}
-% \begin{macro}{\KV@Hyp@xmenubordercolor}
-% \begin{macro}{\KV@Hyp@xpagebordercolor}
-% \begin{macro}{\KV@Hyp@xrunbordercolor}
-% \begin{macro}{\KV@Hyp@xurlbordercolor}
-% \begin{macro}{\KV@Hyp@xpdfborder}
-% Use this option to define the extended keys for the \Package{hyperref} package.
-% \begin{macrocode}
-\DeclareOption{hyperref}
- {\@tfor\@@tmp:={cite}{file}{link}{menu}{page}{run}{url}\do
- {\expandafter\edef\csname KV@Hyp@x\@@tmp bordercolor\endcsname #1%
- {\noexpand\XC@bordercolor{\@@tmp}{#1}}}%
- \AtEndOfPackage
- {\GetGinDriver\def\KV@Hyp@xpdfborder#1{\edef\@pdfborder{#1}}%
- \@tfor\@@tmp:={dvips}\do
- {\ifx\GinDriver\@@tmp
- \def\KV@Hyp@xpdfborder#1%
- {\edef\@pdfborder{#1}\expandafter\XC@pdfborder\@pdfborder\relax}%
- \@break@tfor\fi}}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
%
%
% \subsubsection{Driver options}
@@ -4066,25 +4055,42 @@
\@tfor\@@tmp:={dvipdf}{dvipdfmx}{dvips}{dvipsone}{dviwin}%
{emtex}{luatex}{pctex32}{pctexhp}{pctexps}{pctexwin}{pdftex}%
{tcidvi}{textures}{truetex}{vtex}{xetex}{dvisvgm}\do
- {\edef\@@tmp{\noexpand\DeclareOption{\@@tmp}%
- {\def\noexpand\Gin@driver{\@@tmp.def}}}%
+ {\edef\@@tmp{%
+ \noexpand\DeclareKeys
+ {
+ \@@tmp .code = {\def\noexpand\Gin@driver{\@@tmp.def}},
+ \@@tmp .usage=load
+ }}%
\@@tmp}
% \end{macrocode}
%
% Drivers that are derivatives of others:
% \begin{macrocode}
-\DeclareOption{dviwindo}{\ExecuteOptions{dvipsone}}
-\DeclareOption{oztex}{\ExecuteOptions{dvips}}
-\DeclareOption{xdvi}{\ExecuteOptions{dvips,monochrome}}
-\DeclareOption{dvipdfm}{\ExecuteOptions{dvipdfmx}}
+\DeclareKeys
+ {
+ ,dviwindo .code = {\SetKeys{dvipsone}}
+ ,dviwindo .usage = load
+ ,oztex .code = {\SetKeys{dvips}}
+ ,oztex .usage = load
+ ,xdvi .code = {\SetKeys{dvips,monochrome}}
+ ,xdvi .usage = load
+ ,dvipdfm .code = {\SetKeys{dvipdfmx}}
+ ,dvipdfm .usage = load
+ }
% \end{macrocode}
%
% Options used by (some) drivers.
% \begin{macrocode}
-\DeclareOption{xcdraw}{\def\XC@@xcd@{1}}
-\DeclareOption{noxcdraw}{\def\XC@@xcd@{-1}}
-\DeclareOption{fixinclude}{\def\XC@@xcf@{1}}
-\DeclareOption{prologue}{\def\XC@@xcp@{1}}
+\DeclareKeys
+ {
+ ,xcdraw .code = {\def\XC@@xcd@{1}}
+ ,xcdraw .usage = load %TODO check
+ ,noxcdraw .code = {\def\XC@@xcd@{-1}}
+ ,noxcdraw .usage = load %TODO check
+ ,fixinclude .code = {\def\XC@@xcf@{1}}
+ ,fixinclude .usage = load %TODO check
+ ,prologue .code = {\def\XC@@xcp@{1}}
+ ,prologue .usage = load %TODO check
% \end{macrocode}
% \end{macro}
%
@@ -4093,32 +4099,30 @@
%
% Switch to original kernel |\fbox| command instead of new \XC{} version.
% \begin{macrocode}
-\DeclareOption{kernelfbox}{\XC@@fboxfalse}
+ ,kernelfbox .code = {\XC@@fboxfalse}
+ ,kernelfbox .usage = load %TODO check
% \end{macrocode}
%
% These options control how non-existing colors are treated:
% \begin{macrocode}
-\DeclareOption{showerrors}{\colorerrors@true}
-\DeclareOption{hideerrors}{\colorerrors@false}
+ ,showerrors .code = {\colorerrors@true}
+ ,hideerrors .code = {\colorerrors@false}
% \end{macrocode}
%
% The \Option{debugshow} option turns on debugging info (perhaps).
% \begin{macrocode}
-\DeclareOption{debugshow}{\catcode`\^^A=9 \let\GDebug\typeout}
+ ,debugshow .code = {\catcode`\^^A=9 \let\GDebug\typeout}
+ }
% \end{macrocode}
%
-% All other options (including \LC's \oOption{usenames}, \oOption{nodvipsnames}) are being ignored.
-% \begin{macrocode}
-\DeclareOption*%
- {\PackageInfo{xcolor}{Package option `\CurrentOption' ignored}}
-% \end{macrocode}
+% All other options (including \LC's \oOption{usenames}, \oOption{nodvipsnames}) error.
%
% Choose default options:
% \begin{macrocode}
\def\XC@@xcd@{-1}
\def\XC@@xcf@{-1}
\def\XC@@xcp@{-1}
-\ExecuteOptions{natural,showerrors}
+\SetKeys{natural,showerrors}
% \end{macrocode}
%
%
@@ -4127,14 +4131,18 @@
% A local configuration file may declare more options.
% It should also make one driver option the default, by calling |\ExecuteOptions| with the appropriate option.
% \begin{macrocode}
+\let\XC@ExecuteOptions\ExecuteOptions
+\ExplSyntaxOn
+\def\ExecuteOptions{\keys_set_known:nn {xcolor}}
+\ExplSyntaxOff
\InputIfFileExists{color.cfg}{}{}
+\let\ExecuteOptions\XC@ExecuteOptions
% \end{macrocode}
%
% After the options are processed, load the appropriate driver file.
% If a site wants a default driver (e.g., \Option{dvips}) it just needs to put |\ExecuteOptions{dvips}| in a \File{color.cfg} file.
% \begin{macrocode}
-\let\@declareoption\XC@declareoption
-\ProcessOptions\relax
+\ProcessKeyOptions
% \end{macrocode}
%
% \begin{macro}{\XC@@drv}
@@ -4225,11 +4233,10 @@
%
% \subsubsection{Required packages}
%
-% All packages within the list |\XC@pkg|
-% receive a pretended \LC.
+% We pretent that color.sty has already been loaded.
+%
% \begin{macrocode}
\@namedef{ver@color.sty}{1999/02/16}
-\XC@@pkg
% \end{macrocode}
%
%
@@ -4862,10 +4869,10 @@
\def\XC@definecolor[#1]#2%
{\@testopt{\XC@definec@lor[#1]{#2}}\colornameprefix}
% \end{macrocode}
-%
% \begin{macrocode}
\def\XC@definec@lor[#1]#2[#3]#4#5%
- {\begingroup
+ {%
+ \begingroup
\XC@sdef\@@cls{#1}\XC@edef\@@nam{#2}\edef\colornameprefix{#3}%
\XC@logdef\@@nam
\XC@getmodclr02{#4}{#5}{\let\@@tmp\relax}%
@@ -5932,114 +5939,6 @@
% \end{macro}
%
%
-% \subsubsection{Colored rows in tables}
-%
-% The following definitions make only sense if the \Package{colortbl} package has been loaded by the \Option{table} option.
-% \begin{macrocode}
-\@ifXCopt{table}{%
-% \end{macrocode}
-%
-% \begin{macro}{\rowcolors}
-% \begin{macro}{\rowcolors*}
-% \oarg{commands}\marg{row}\marg{odd-row color}\marg{even-row color}\\
-% Defines alternating colors for the next tabular environment.
-% Starting with row \Meta{row}, odd and even rows get their respective colors.
-% The color arguments may also be left empty (= no color).
-% Optional commands may be |\hline| or |\noalign|\marg{stuff}.
-% \begin{macrocode}
- \def\rowcolors
- {\@ifstar{\@rowcmdfalse\rowc@lors}{\@rowcmdtrue\rowc@lors}}
-% \end{macrocode}
-%
-% \begin{macrocode}
- \def\rowc@lors{\@testopt{\rowc@l@rs}{}}
-% \end{macrocode}
-%
-% \begin{macrocode}
- \def\rowc@l@rs[#1]#2#3#4%
- {\global\rownum=\z@
- \global\@rowcolorstrue
- \@ifxempty{#3}%
- {\def\@oddrowcolor{\@norowcolor}}%
- {\def\@oddrowcolor{\gdef\CT@row@color{\CT@color{#3}}}}%
- \@ifxempty{#4}%
- {\def\@evenrowcolor{\@norowcolor}}%
- {\def\@evenrowcolor{\gdef\CT@row@color{\CT@color{#4}}}}%
- \if@rowcmd
- \def\@rowcolors
- {#1\if@rowcolors
- \noalign{\relax\ifnum\rownum<#2\@norowcolor\else
- \ifodd\rownum\@oddrowcolor\else\@evenrowcolor\fi\fi}%
- \fi}%
- \else
- \def\@rowcolors
- {\if@rowcolors
- \ifnum\rownum<#2\noalign{\@norowcolor}\else
- #1\noalign{\ifodd\rownum\@oddrowcolor\else\@evenrowcolor\fi}\fi
- \fi}%
- \fi
- \CT@everycr{\@rowc@lors\the\everycr}%
- \ignorespaces}
-% \end{macrocode}
-%
-% \begin{macrocode}
- \def\@rowc@lors{\noalign{\global\advance\rownum\@ne}\@rowcolors}
- \let\@rowcolors\@empty
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\showrowcolors}
-% \begin{macro}{\hiderowcolors}
-% Switch coloring mode on/off.
-% \begin{macrocode}
- \def\showrowcolors{\noalign{\global\@rowcolorstrue}\@rowcolors}
- \def\hiderowcolors{\noalign{\global\@rowcolorsfalse\@norowcolor}}
- \def\@norowcolor{\global\let\CT@row@color\relax}
- \@norowcolor
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\if@rowcolors}
-% \begin{macro}{\if@rowcmd}
-% \begin{macrocode}
- \newif\if@rowcolors
- \newif\if@rowcmd
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\rownum}
-% Reserve a counter register.
-% \begin{macrocode}
- \@ifundefined{rownum}{\newcount\rownum}{}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\CT@extract}
-% This is a fix for active `!' character to enable color expressions; it is apparently only necessary for |\columncolor| commands within |\multicolumn|.
-% \begin{macrocode}
- \def\CT@extract#1\columncolor#2#3\@nil
- {\if!#2%
- \let\CT@column@color\@empty
- \else
- \if[#2%
- \expandafter\CT@extractb
- \else
- \XC@edef\XC@@tmp{#2}%
- \edef\CT@column@color{\noexpand\CT@color{\XC@@tmp}}%
- \expandafter\CT@extractd
- \fi
- {#1}#3\@nil
- \fi}
-% \end{macrocode}
-% \end{macro}
-%
-% End of conditional code for colored tables.
-% \begin{macrocode}
-}{}
-% \end{macrocode}
%
%
% \subsubsection{Color information}
@@ -6546,10 +6445,12 @@
%
% \begin{macro}{\XC@cnv@gray}
% \Meta{gray}|,|
+% \changes{3.0}{2022-08-10}{moved the patch from hycolor to correct Gray model, issue \#23}
% \begin{macrocode}
\def\XC@cnv@gray#1,%
{\XC@ifxcase\tm
{\XC@mod@rgb {\XC@calcN{#1}\@@tmp \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}}%
+ \XC@mod@gray{}%
\XC@mod@cmy {\XC@calcC{#1}\@@tmp \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}}%
\XC@mod@cmyk{\XC@calcC{#1}\@@tmp \edef\@@tmp{0,0,0,\@@tmp}}%
\XC@mod@RGB {\edef\@@scl{\rangeRGB}\XC@calcM{#1}\@@tmp
@@ -6988,7 +6889,10 @@
% |\normalcolor| is defined (to |\relax|) in the \LaTeX\ kernel, so it is safe to use this in macros that may possibly be used in conjunction with color.
% It will have no effect until the \XCP{} is also loaded.
% \begin{macrocode}
-\protected\def\normalcolor{\let\current@color\default@color\set@color}
+\protected\def\normalcolor{%
+ \let\current@color\default@color
+ \let\XC@current@color\XC@default@color\XC@display}
+\AtBeginDocument{\let\XC@default@color\XC@current@color}
% \end{macrocode}
% \end{macro}
%
@@ -8274,7 +8178,7 @@ Type test:
{\immediate\write\@tempa{\@@tmp}}}
\immediate\closeout\@tempa
\@@end}% end of driver list construction code
-\edef\Options{\expandafter\@gobble\XC@@opt}
+\edef\Options{}
\@tfor\@@tmp:={dvipdf}{dvipdfm}{dvipdfmx}{dvips}{dvipsone}{dviwin}{dviwindo}%
{emtex}{oztex}{pctex32}{pctexhp}{pctexps}{pctexwin}{pdftex}%
{tcidvi}{textures}{truetex}{vtex}{xdvi}{xetex}%
diff --git a/macros/latex/contrib/xcolor/xcolor.pdf b/macros/latex/contrib/xcolor/xcolor.pdf
index be04b36451..2df8ee2081 100644
--- a/macros/latex/contrib/xcolor/xcolor.pdf
+++ b/macros/latex/contrib/xcolor/xcolor.pdf
Binary files differ
diff --git a/macros/latex/contrib/xcolor/xcolor2.pdf b/macros/latex/contrib/xcolor/xcolor2.pdf
index 35c2946529..88a91d6a35 100644
--- a/macros/latex/contrib/xcolor/xcolor2.pdf
+++ b/macros/latex/contrib/xcolor/xcolor2.pdf
Binary files differ