texlive[46564] Master/texmf-dist: hithesis (7feb18)
commits+karl at tug.org
commits+karl at tug.org
Wed Feb 7 23:16:31 CET 2018
Revision: 46564
http://tug.org/svn/texlive?view=revision&revision=46564
Author: karl
Date: 2018-02-07 23:16:30 +0100 (Wed, 07 Feb 2018)
Log Message:
-----------
hithesis (7feb18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/hithesis/Makefile
trunk/Master/texmf-dist/doc/latex/hithesis/README.md
trunk/Master/texmf-dist/doc/latex/hithesis/back/appA.tex
trunk/Master/texmf-dist/doc/latex/hithesis/body/introduction.tex
trunk/Master/texmf-dist/doc/latex/hithesis/dtx-style.sty
trunk/Master/texmf-dist/doc/latex/hithesis/hithesis.pdf
trunk/Master/texmf-dist/doc/latex/hithesis/main.pdf
trunk/Master/texmf-dist/doc/latex/hithesis/main.tex
trunk/Master/texmf-dist/makeindex/hithesis/hithesis.ist
trunk/Master/texmf-dist/source/latex/hithesis/hithesis.dtx
trunk/Master/texmf-dist/tex/latex/hithesis/hithesis.cfg
trunk/Master/texmf-dist/tex/latex/hithesis/hithesis.cls
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/hithesis/latexmkrc
Modified: trunk/Master/texmf-dist/doc/latex/hithesis/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hithesis/Makefile 2018-02-07 22:16:14 UTC (rev 46563)
+++ trunk/Master/texmf-dist/doc/latex/hithesis/Makefile 2018-02-07 22:16:30 UTC (rev 46564)
@@ -85,7 +85,7 @@
clean:
latexmk -c $(PACKAGE).dtx $(THESISMAIN)
- -@$(RM) *~ *.idx *.ind *.ilg *.thm *.toe *.bbl
+ -@$(RM) *~ *.idx *.ind *.ilg *.thm *.toe *.bbl latexmkrc
cleanall: clean
-@$(RM) $(PACKAGE).pdf $(THESISMAIN).pdf
Modified: trunk/Master/texmf-dist/doc/latex/hithesis/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hithesis/README.md 2018-02-07 22:16:14 UTC (rev 46563)
+++ trunk/Master/texmf-dist/doc/latex/hithesis/README.md 2018-02-07 22:16:30 UTC (rev 46564)
@@ -1,44 +1,180 @@
-# What's hithesis?
+# hithesis
+# 哈尔滨工业大学LaTeX论文模板
+<a rel="license" href="http://creativecommons.org/licenses/by-nc/4.0/"><img alt="知识共享许可协议" style="border-width:0" src="https://i.creativecommons.org/l/by-nc/4.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/Text" property="dct:title" rel="dct:type">hithesis</span> 由 <a xmlns:cc="http://creativecommons.org/ns#" href="https://github.com/dustincys/hithesis" property="cc:attributionName" rel="cc:attributionURL">https://github.com/dustincys/hithesis</a> 采用 <a rel="license" href="http://creativecommons.org/licenses/by-nc/4.0/">知识共享 署名-非商业性使用 4.0 国际 许可协议</a>进行许可。<br />基于<a xmlns:dct="http://purl.org/dc/terms/" href="https://github.com/dustincys/hithesis" rel="dct:source">https://github.com/dustincys/hithesis</a>上的作品创作。
+
+## What's hithesis?
+
hithesis is a LaTeX thesis template package for Harbin Institute of Technolog
supporting bachelor, master, doctor dissertations. Since the users of this
package are supposed to be Chinese or those understand Chinese, the following of
this file and all other documents are written in Chinese only.
-# hithesis是什么？
+This file may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3a
+of this license or (at your option) any later version.
+The latest version of this license is in:
-hithesis, 既含我工hit，也是说用的“嗨！”，读作“嗨thesis”。hithesis 旨在建立一个
-简单易用的哈尔滨工业大学学位论文LaTeX模板，包括本科论文、硕士论文、博士论文 。现
-在支持本科、硕士、博士论文，对其它格式的支持会陆续加入。
+http://www.latex-project.org/lppl.txt
+and version 1.3a or later is part of all distributions of LaTeX
+version 2004/10/01 or later.
-# 文档
-请[下载](https://github.com/dustincys/hithesis "下载")模板，生成具体使用说明以
-及示例文档：
+## hithesis是什么？
- 模板使用说明 (hithesis.pdf)
- 示例文档 (main.pdf)
+hithesis
+旨在建立一个简单易用的哈尔滨工业大学学位论文LaTeX模板，包括本科论文、硕士论文、博士论文
+。现 在支持本科、硕士、博士论文，对其它格式的支持会陆续加入。
+hithesis 已收录在[CTAN](https://ctan.org/pkg/hithesis
+"CTAN")中，用户安装TeXLive将自带我工模板（版本日期>2017.08.28）。
-# 下载
+## 我工规范有歧义之处
-开发版有两个下载地址：
+各位刀客一定要先看清楚我工规范两大歧义之处：[版芯歧义](http://yanshuo.name/cn/2017/06/hithesisregulation/)和[本科生行距歧义](http://yanshuo.name/cn/2017/06/hithesissiyuan/)。
-- [oschina 码云](https://git.oschina.net/dustincys/hithesis)
-- [github](https://github.com/dustincys/hithesis)
+## 模板特点
+### 呆萌的操作，傲娇的效果
+- 极限程度实现了[《哈尔滨工业大学研究生学位论文撰写规范》](http://hitgs.hit.edu.cn/aa/fd/c3425a109309/page.htm)、[《哈尔滨工业大学本科生毕业论文撰写规范》](http://jwc.hit.edu.cn/2566/list.htm)
+- 这是[PlutoThesis](https://github.com/dustincys/PlutoThesis "PlutoThesis")的终极进化，PlutoThesis废弃不再维护。
+ - 更傻更简单的选项，例如论文主文件，只需要在文档类的括号中填写本硕博选项，字体选项（设置弹性间距或者刚性间距），文科生选项（目录可以设成四级目录），非全日制类型等，轻松设定目标格式。
+ - 自适应格式，例如图题和标题，标题字号在字数超过两行时自动由五号变小五号，实现自适应（硕博规范规定，字数多时用五号）
+ - 自动化中英文索引（博士规范要求，有需要时候添加）
+ - 图书馆提交论文级的书签设置
+ - ……
-# Makefile的用法
- make [{all|thesis|doc|clean|cleanall|distclean}]
+### 矫正PlutoThesis的不足
-## 目标
+ - 纠正PlutoThesis页面向下溢出
+ - 纠正PlutoThesis不符合规范要求的各层次题序及标题不得置于页面的最后两行，改为不得置于最后一行（孤行），从此解决了饱受诟病的空白大的问题。
+ - 纠正PlutoThesis行间距与标题段前段后距离统统设置为1.6倍行距的问题
+ - 更强大的版芯设置，满足所有需求
+ - 补充了PlutoThesis没有的符号表、索引两项
+ - 字体设置符合CTeX的自动识别系统功能
+ - 纠正PlutoThesis中图片中一些距离设置
+ - 添加了符合规范要求的“图注在图题之上的设置”
+ - 纠正PlutoThesis的双语图、表题中英语的非两端对齐问题
+ - 添加了PlutoThesis中没有的图题最后一行居中且两端对齐格式
+ - 添加了所有的图形排版格式
+ - 纠正了附录中标题错误
+ - 纠正了博士论文右翻页问题
+ - 添加扫描替换功能，替换之后、页码目录书签自动设置
+ - 添加思源宋体设置，再也不用害怕奇怪字打不出来了
+ - 添加文科生、非全日制同等学力封面格式
+ - 添加PlutoThesis没有的说明文档
+ - ……
-- make all 等于 make thesis && make doc；
-- make cls 生成模板文件；
-- make thesis 生成论文 main.pdf；
-- make doc 生成使用说明书 thuthesis.pdf；
-- make clean 删除示例文件的中间文件（不含 main.pdf）；
-- make cleanall 删除示例文件的中间文件和 main.pdf；
-- make distclean 删除示例文件和模板的所有中间文件和 PDF。
+### 为了我工的规格严格、功夫到家
+
+ - 行间距、段前后距离设置精确到小数后四位， 例如 1bp = 1.00374pt，1mm = 2.84526pt， 按照我工之要求, 行距在3mm～4mm之间，换算之后为20.50398～23.33863bp，严格符合规范要求，哪怕是显微镜级别
+ - 重写了一堆重要函数，例如章节标题由原来的`BiChapter{}{}`方式进化为`chapter{}[]`，极大简化，后面方括号中为可选括号，硕本可以不用，用了自动忽略
+ - 严格符合（满足）两个规范要求，由于规范中有矛盾之处，例如本科生的标题段前距离有两处不一样的规定，刚性行距尽量满足行数（要求约33行）要求。
+ - 规范中给出了行距区间，为了规格严格，设置了弹性行距
+ - ……
+
+## 关于模板的命名和其他说明
+
+### 模板的命名
+
+本模板对PlutoThesis中的核心代码进行了彻底深入的修改。
+PlutoThesis中没有采用cls，这种文档类的模式，代码与正文内容耦合程度大难以维护，本科模板和硕博模板难以融合。
+由于冥王星已经不是太阳系C9之一，所以不继续使用PlutoThesis命名。
+
+hithesis, 既含我工hit，也是说用的“嗨！”，读作“嗨thesis”。
+
+### 关于模板的下载地址
+
+模板有三个下载地址：
+
+1. github: https://github.com/dustincys/hithesis
+2. gitee: https://gitee.com/dustincys/hithesis
+3. CTAN: https://ctan.org/pkg/hithesis
+
+github和gitee的版本是同步且是最新的模板。
+CTAN的版本一般会比较落后，但在每年年底会同步为最新版本。
+
+### 关于hithesis的线上讨论区
+
+由于维护者（就是本书呆）已经是高龄不毕业刀客，课题繁忙，常常无法及时回答疑问。
+为了解决使用中遇到的问题，请各位刀客和大侠加入QQ群：259959600。
+群里有很多热心的LaTeX隐士高人如@poofee等，很乐于解答。
+
+### 关于查重
+
+注意：我工的论文查重可以使用pdf查重！！！！！！！
+
+另外一点注意：查重的pdf一定要确保能够正常复制汉字。有些系统自动识别的汉字字体，
+会出现无法正常复制的情况（可能是系统的字体映射出现了误差）。一般需要在主文件的
+选项中明确声明使用哪一种fontset。
+
+### 模板的编译方法、打印版、电子版及其他说明
+
+- 生成论文格式文件(第一步要生成 *.cls，*.cfg，*.ist，然后再生成论文)
+
+ latex hithesis.ins
+
+- 生成论文
+
+ xelatex main.tex
+ bibtex main
+ xelatex main.tex
+ xelatex main.tex
+ splitindex main -- -s hithesis.ist # 自动生成索引
+ xelatex main.tex
+
+- 生成文档
+
+ xelatex hithesis.dtx
+ makeindex -s gind.ist -o hithesis.ind hithesis.idx
+ makeindex -s gglo.ist -o hithesis.gls hithesis.glo
+ xelatex hithesis.dtx
+ xelatex hithesis.dtx
+
+如果喜欢Makefile的是另一画风：
+
+- 生成文档类
+
+ make cls
+
+- 生成论文
+
+ make thesis
+
+- 生成文档
+
+ make doc
+
+LaTeX 中的ctex package版本要求：
+
+ ctex >= v2.4.3 (2016年9月份发布)
+
+注意，一般情况下，博士论文的打印版要求右翻页，最后向图书管提交的电子版不是右翻
+页，注意选项中的选项。
+
+由于维护者（就是本书呆）已经是高龄不毕业博士，课题繁忙，实在无空余时间再写详细文档以及 无偿解决一些用户要求（例如前面文档中[已经解决的算法格式各实验室要求不一致](https://github.com/dustincys/PlutoThesis#%E6%B2%A1%E6%9C%89%E6%98%8E%E7%A1%AE%E8%A6%81%E6%B1%82%E7%9A%84%E6%A0%BC%E5%BC%8F)问题）。
+
+各位刀客和大侠如用的嗨，要解囊相助，请微信扫码～～
+
+
+
+如果用的非常嗨，
+
+
+
+那个，看在苦X高龄不毕业博士，还熬夜写代码的份上…… 唉……
+
+
+
+或者支付宝，不限额度，
+
+
+
+其实没关系，为了我工的“规格严格，功夫到家”！
+
+- 本模板以PlutoThesis为核心基础，参考了CTAN中清华大学薛瑞尼所开发的thuthesis以及其分支重庆大学等毕业论文模板的代码开发而来
+- 学校教务处和研究生院只提供了规范，并没有提供官方的任何模板（包括word），所以此模板仅为规范的参考实现，不保证格式审查老师不提意见。任何由于使用本模板而引起的论文格式审查问题均与本模板作者无关
+
+<a rel="license" href="http://creativecommons.org/licenses/by-nc/4.0/"><img alt="知识共享许可协议" style="border-width:0" src="https://i.creativecommons.org/l/by-nc/4.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/Text" property="dct:title" rel="dct:type">hithesis</span> 由 <a xmlns:cc="http://creativecommons.org/ns#" href="https://github.com/dustincys/hithesis" property="cc:attributionName" rel="cc:attributionURL">https://github.com/dustincys/hithesis</a> 采用 <a rel="license" href="http://creativecommons.org/licenses/by-nc/4.0/">知识共享 署名-非商业性使用 4.0 国际 许可协议</a>进行许可。<br />基于<a xmlns:dct="http://purl.org/dc/terms/" href="https://github.com/dustincys/hithesis" rel="dct:source">https://github.com/dustincys/hithesis</a>上的作品创作。
Modified: trunk/Master/texmf-dist/doc/latex/hithesis/back/appA.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hithesis/back/appA.tex 2018-02-07 22:16:14 UTC (rev 46563)
+++ trunk/Master/texmf-dist/doc/latex/hithesis/back/appA.tex 2018-02-07 22:16:30 UTC (rev 46564)
@@ -23,12 +23,47 @@
\end{align}
\chapter{这个星球上最好的免费Linux软件列表}[List of the Best Linux Software in our Planet]
-\section*{系统}
+\section{系统}
-\href{http://fvwm.org/}{FVWM 星球最强大的窗口管理器}——推荐
+\href{http://fvwm.org/}{FVWM 自从上世纪诞生以来，此星球最强大的窗口管理器。}
+推荐基于FVWM的桌面设计hifvwm：\href{https://github.com/dustincys/hifvwm}{https://github.com/dustincys/hifvwm}。
-\section*{其他}
+\subsection{hifvwm的优点}
-\href{https://github.com/goldendict/goldendict}{goldendict 星球最强大的桌面字典}——推荐
+\begin{enumerate}
+ \item 即使打开上百个窗口也不会“蒙圈”。计算机性能越来越强大，窗口任务的管理必须要升级到打怪兽级别。
+ \item 自动同步Bing搜索主页的壁纸。每次电脑开机，午夜零点自动更新，用户
+ 也可以手动更新，从此审美再也不疲劳。
+ \item 切换窗口自动聚焦到最上面的窗口。使用键盘快捷键切换窗口时候，减少
+ 操作过程，自动聚焦到目标窗口。这一特性是虚拟窗口必须的人性化设
+ 计。
+ \item 类似window右下角的功能的最小化窗口来显示桌面的功能此处类似
+ win7/win10，实现在一个桌面之内操作多个任务。
+ \item 任务栏结合标题栏。采用任务栏和标题栏结合，节省空间。
+ \item 同类窗口切换。可以在同类窗口之内类似alt-tab的方式切换。
+ \item ……
+\end{enumerate}
-\href{http://www.mutt.org/}{mutt 星球最强大的邮件客户端}——推荐
+\section{其他}
+
+\href{https://github.com/goldendict/goldendict}{goldendict 星球最强大的桌面字典。}
+
+\href{https://github.com/yarrick/iodine}{iodine，“HIT-WLAN + 锐捷”时代的福音。}
+
+\href{http://www.aircrack-ng.org/}{aircrack，Wifi“安全性评估”工具。}
+
+\href{https://www.ledger-cli.org/}{ledger，前“金融区块链”时代最好的复式记账系统。}
+
+\href{https://orgmode.org/}{orgmode，最强大的笔记系统，从来没有之一。}
+
+\href{https://www.jianguoyun.com/}{坚果云，国内一款支持WebDav的云盘系统，国内真正的云盘没有之一。}
+
+\href{http://www.mutt.org/}{mutt, ``All mail clients suck. This one just sucks less.''}
+
+\section{vim}
+实现中英文每一句一行，以及实现每一句折叠断行的简单正则式，tex源码更加乖乖。
+\begin{lstlisting}
+vnoremap <leader>fae J:s/[.!?]\zs\s\+/\="\r".matchstr(getline('.'), '^\s*')/g<CR>
+vnoremap <leader>fac J:s/[。！？]/\=submatch(0)."\n".matchstr(getline('.'), '^\s*')/g<CR>
+vnoremap <leader>fle :!fmt -80 -s<CR>
+\end{lstlisting}
Modified: trunk/Master/texmf-dist/doc/latex/hithesis/body/introduction.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hithesis/body/introduction.tex 2018-02-07 22:16:14 UTC (rev 46563)
+++ trunk/Master/texmf-dist/doc/latex/hithesis/body/introduction.tex 2018-02-07 22:16:30 UTC (rev 46564)
@@ -2,11 +2,11 @@
\chapter{示例文档}[Example]
-这是 \hithesis\ 的示例文档，基本上覆盖了模板中所有格式的设置。建议大家在使用模板
-之前，除了阅读《\hithesis\ 用户手册》，这个示例文档也最好能看一看。
-这个示例文档尽量使用到所有的排版格式，然而对于一些不在我工规范中规定的文档，理论
-上是由用户自由发挥，这里不给出样例。需要另行载入的宏包和自定义命令在文件
-`hithesis.sty'中有示例，这里不列举。
+这是 \hithesis\ 的示例文档，基本上覆盖了模板中所有格式的设置。建议大家在使用模
+板之前，除了阅读《\hithesis\:哈尔滨工业大学学位论文模板》\footnote{即
+hithesis.pdf文件}，本示例文档也最好能看一看。此示例文档尽量使用到所有的排版格式
+，然而对于一些不在我工规范中规定的文档，理论上是由用户自由发挥，这里不给出样例
+。需要另行载入的宏包和自定义命令在文件`hithesis.sty'中有示例，这里不列举。
\section{索引示例}[Index]
@@ -45,7 +45,7 @@
\begin{figure}[htpb]
\centering
\includegraphics[width = 0.4\textwidth]{golfer}
-\bicaption[golfer1]{}{图打打高尔夫球的人打高尔夫球的人打高尔夫球的人打高尔夫球球的人高尔夫球的人球的人高尔夫球的人的人高尔夫球的人}{Fig.$\!$}{The person playing golf playing golf playing golf playing golf playing golf playing golf playing golf playing golf}
+\bicaption[golfer1]{}{打高尔夫球球的人（博士论文双语题注）}{Fig.$\!$}{The person playing golf (Doctoral thesis)}
\end{figure}
每个图均应有图题（由图序和图名组成），图题不宜有标点符号，图名在图序之后空1个半
@@ -62,11 +62,16 @@
\begin{figure}[h]
\centering
\includegraphics[width = 0.4\textwidth]{golfer}
-\caption{打高尔夫球的人}
+\caption{打高尔夫球的人，硕士论文要求只用汉语}
\end{figure}
\subsection{并排图和子图}[Abreast-picture and Sub-picture example]
\subsubsection{并排图}[Abreast-picture example]
+
+使用并排图时，需要注意对齐方式。默认情况是中部对齐。这里给出中部对齐、顶部对齐
+、图片底部对齐三种常见方式。其中，底部对齐方式有一个很巧妙的方式，将长度比较小
+的图放在左面即可。
+
\begin{figure}[htbp]
\centering
\begin{minipage}{0.4\textwidth}
@@ -74,29 +79,125 @@
\includegraphics[width=\textwidth]{golfer}
\bicaption[golfer2]{}{打高尔夫球的人}{Fig.$\!$}{The person playing golf}
\end{minipage}
+\centering
\begin{minipage}{0.4\textwidth}
\centering
\includegraphics[width=\textwidth]{golfer}
-\bicaption[golfer3]{}{打高尔夫球的人}{Fig.$\!$}{The person playing golf}
+\bicaption[golfer3]{}{打高尔夫球的人。注意，这里默认居中}{Fig.$\!$}{The person playing golf. Please note that, it is vertically center aligned by default.}
\end{minipage}
\end{figure}
+
+\begin{figure}[htbp]
+\centering
+\begin{minipage}[t]{0.4\textwidth}
+\centering
+\includegraphics[width=\textwidth]{golfer}
+\bicaption[golfer2]{}{打高尔夫球的人}{Fig.$\!$}{The person playing golf}
+\end{minipage}
+\centering
+\begin{minipage}[t]{0.4\textwidth}
+\centering
+\includegraphics[width=\textwidth]{golfer}
+\bicaption[golfer3]{}{打高尔夫球的人。注意，此图是顶部对齐}{Fig.$\!$}{The person playing golf. Please note that, it is vertically top aligned.}
+\end{minipage}
+\end{figure}
+
+\begin{figure}[htbp]
+\centering
+\begin{minipage}[t]{0.4\textwidth}
+\centering
+\includegraphics[width=\textwidth,height=\textwidth]{golfer}
+\bicaption[golfer3]{}{打高尔夫球的人。注意，此图对齐方式是图片底部对齐}{Fig.$\!$}{The person playing golf. Please note that, it is vertically bottom aligned for figure.}
+\end{minipage}
+\centering
+\begin{minipage}[t]{0.4\textwidth}
+\centering
+\includegraphics[width=\textwidth]{golfer}
+\bicaption[golfer2]{}{打高尔夫球的人}{Fig.$\!$}{The person playing golf}
+\end{minipage}
+\end{figure}
+
\subsubsection{子图}[Sub-picture example]
-注意：子图题注也可以只用中文。
+注意：子图题注也可以只用中文。规范规定“分图题置于分图之下或图题之下”，但没有给出具体的格式要求。
+没有要求的另外一个说法就是“无论什么格式都不对”。
+所以只有在一个图中有标注“a)，b)”，无法使用\cs{subfigure}的情况下，使用最后一个图例中的格式设置方法，否则不要使用。
+为了应对“无论什么格式都不对”，这个子图图题使用“minipage”和“description”环境，宽度，对齐方式可以按照个人喜好自由设置，是否使用双语子图图题也可以自由设置。
+
\begin{figure}[!h]
\setlength{\subfigcapskip}{-1bp}
\centering
+\begin{minipage}{\textwidth}
+\centering
\subfigure{\label{golfer41}}\addtocounter{subfigure}{-2}
\subfigure[The person playing golf]{\subfigure[打高尔夫球的人~1]{\includegraphics[width=0.4\textwidth]{golfer}}}
+\hspace{2em}
\subfigure{\label{golfer42}}\addtocounter{subfigure}{-2}
\subfigure[The person playing golf]{\subfigure[打高尔夫球的人~2]{\includegraphics[width=0.4\textwidth]{golfer}}}
+\end{minipage}
+\centering
+\begin{minipage}{\textwidth}
+\centering
\subfigure{\label{golfer43}}\addtocounter{subfigure}{-2}
\subfigure[The person playing golf]{\subfigure[打高尔夫球的人~3]{\includegraphics[width=0.4\textwidth]{golfer}}}
+\hspace{2em}
\subfigure{\label{golfer44}}\addtocounter{subfigure}{-2}
-\subfigure[The person playing golf]{\subfigure[打高尔夫球的人~4]{\includegraphics[width=0.4\textwidth]{golfer}}}
+\subfigure[The person playing golf. Here, 'hang indent' and 'center last line' are not stipulated in the regulation.]{\subfigure[打高尔夫球的人~4。注意，规范中没有明确规定要悬挂缩进、最后一行居中。]{\includegraphics[width=0.4\textwidth]{golfer}}}
+\end{minipage}
\vspace{0.2em}
-\bicaption[golfer4]{}{打高尔夫球的人}{Fig.$\!$}{The person playing golf}
+\bicaption[golfer4]{}{打高尔夫球的人}{Fig.$\!$}{The person playing gol}
\end{figure}
+\begin{figure}[t]
+ \centering
+ \begin{minipage}{.7\linewidth}
+ \setlength{\subfigcapskip}{-1bp}
+ \centering
+ \begin{minipage}{\textwidth}
+ \centering
+ \subfigure{\label{golfer41}}\addtocounter{subfigure}{-2}
+ \subfigure[The person playing golf]{\subfigure[打高尔夫球的人~1]{\includegraphics[width=0.4\textwidth]{golfer}}}
+ \hspace{4em}
+ \subfigure{\label{golfer42}}\addtocounter{subfigure}{-2}
+ \subfigure[The person playing golf]{\subfigure[打高尔夫球的人~2]{\includegraphics[width=0.4\textwidth]{golfer}}}
+ \end{minipage}
+ \vskip 0.2em
+ \wuhao 注意：这里是中文图注添加位置（我工要求，图注在图题之上）。
+ \vspace{0.2em}
+\bicaption[golfer4]{}{打高尔夫球的人。注意，此处我工有另外一处要求，子图图题可以位于主图题之下。但由于没有明确说明位于下方具体是什么格式，所以这里不给出举例。}{Fig.$\!$}{The person playing golf. Please note that, although it is appropriate to put subfigures' captions under this caption as stipulated in regulation, but its format is not clearly stated.}
+ \end{minipage}
+\end{figure}
+
+\begin{figure}[t]
+\centering
+\begin{tikzpicture}
+ \node[anchor=south west,inner sep=0] (image) at (0,0) {\includegraphics[width=0.3\textwidth]{golfer}};
+ \begin{scope}[x={(image.south east)},y={(image.north west)}]
+ \node at (0.3,0.5) {a)};
+ \node at (0.8,0.2) {b)};
+ \end{scope}
+\end{tikzpicture}
+\bicaption[golfer1]{}{打高尔夫球球的人（博士论文双语题注）}{Fig.$\!$}{The person playing golf (Doctoral thesis)}
+\vskip -0.4em
+ \hspace{2em}
+\begin{minipage}[t]{0.3\textwidth}
+\wuhao \setlist[description]{font=\normalfont}
+ \begin{description}
+ \item[a)]子图图题
+ \end{description}
+ \end{minipage}
+ \hspace{2em}
+ \begin{minipage}[t]{0.3\textwidth}
+\wuhao \setlist[description]{font=\normalfont}
+ \begin{description}
+ \item[b)]子图图题
+ \item[b)]Subfigure caption
+ \end{description}
+\end{minipage}
+\end{figure}
+
+\clearpage
+
+如果不想让图片浮动到下一章节，那么在此处使用\cs{clearpage}命令。
\section{表格}
表应有自明性。表格不加左、右边线。表的编排建议采用国际通行的三线表。表中文字用宋
@@ -294,10 +395,17 @@
\section{其他杂项}[Miscellaneous]
+\subsection{右翻页}[Open right]
+
+对于双面打印的论文，强制使每章的标题页出现右手边为右翻页。
+规范中没有明确规定是否是右翻页打印。
+模板给出了右翻页选项。
+为了应对用户的个人喜好，在希望设置成右翻页的位置之前添加\cs{cleardoublepage}命令即可。
+
\subsection{算法}[Algorithms]
我工算法有以下几大特点。
-（1）算法不再规范中要求。
+（1）算法不在规范中要求。
（2）算法常常被使用（至少计算机学院）。
@@ -308,10 +416,10 @@
的readme文件中有不同实验室算法要求说明。
\subsection{脚注}[Footnotes]
-不再规范\footnote{规范是指\PGR\ 和\UGR}中要求，模板默认使用清华大学的格式。
+不在再规范\footnote{规范是指\PGR\ 和\UGR}中要求，模板默认使用清华大学的格式。
\subsection{源码}[Source code]
-也不再规范中要求。如果有需要最好使用minted包，但在编译的时候需要添加“
+也不在再规范中要求。如果有需要最好使用minted包，但在编译的时候需要添加“
-shell-escape”选项且安装pygmentize软件，这些不在模板中默认载入，如果需要自行载入
。
\subsection{思源宋体}[Siyuan font]
@@ -328,7 +436,7 @@
专业、复杂的数据图。R语言中有tikz包，能自动生成tikz码，这样tikz几乎无所不能。
对于排版有极致追求的小伙伴，可以参考
\href{http://www.texample.net/tikz/resources/}{http://www.texample.net/tikz/resources/}
-中所列工具，几乎所有作图软件所作的图形都可一转成tikz，然后可以自由的在tikz中修改
+中所列工具，几乎所有作图软件所作的图形都可转成tikz，然后可以自由的在tikz中修改
图中内容，定义字体等等。实现前文窝工规范中要求的图中字体的一致性的终极目标。
@@ -354,15 +462,15 @@
\setlength{\subfigcapskip}{-1bp}
\centering
\subfigure{\label{wct5}}\addtocounter{subfigure}{-1}
-\subfigure[如果用的嗨，微信扫码捐助5元～～]{\includegraphics[width=0.4\textwidth]{wct5}}
+\subfigure[如果用的嗨，微信扫码捐助5元]{\includegraphics[width=0.4\textwidth]{wct5}}
\hspace{2em}
\subfigure{\label{wct10}}\addtocounter{subfigure}{-1}
-\subfigure[如果用的非常嗨，微信扫码捐助10元～～]{\includegraphics[width=0.4\textwidth]{wct10}}
+\subfigure[如果用的非常嗨，微信扫码捐助10元]{\includegraphics[width=0.4\textwidth]{wct10}}
\subfigure{\label{wct1}}\addtocounter{subfigure}{-1}
-\subfigure[那个，看在熬夜写代码的份上，微信扫码捐助1元吧～～]{\includegraphics[width=0.4\textwidth]{wct1}}
+\subfigure[那个，看在熬夜写代码的份上，微信扫码捐助1元吧]{\includegraphics[width=0.4\textwidth]{wct1}}
\hspace{2em}
\subfigure{\label{zfb}}\addtocounter{subfigure}{-1}
-\subfigure[或者支付宝不限额度～]{\includegraphics[width=0.4\textwidth]{zfb}}
+\subfigure[或者支付宝不限额度]{\includegraphics[width=0.4\textwidth]{zfb}}
\vspace{0.2em}
\bicaption[Donation]{}{捐助，注意此处是子图只用汉语图题的形式，我工规定可以不用
英语图题}{Fig.$\!$}{Donation, please note that it is OK to use Chinese caption
Modified: trunk/Master/texmf-dist/doc/latex/hithesis/dtx-style.sty
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hithesis/dtx-style.sty 2018-02-07 22:16:14 UTC (rev 46563)
+++ trunk/Master/texmf-dist/doc/latex/hithesis/dtx-style.sty 2018-02-07 22:16:30 UTC (rev 46564)
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2017-2017 by Chu Yanshuo <yanshuoc at gmail.com>
+%% Copyright (C) 2017-2018 by Chu Yanshuo <yanshuoc at gmail.com>
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3a
Modified: trunk/Master/texmf-dist/doc/latex/hithesis/hithesis.pdf
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/doc/latex/hithesis/latexmkrc
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hithesis/latexmkrc (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/hithesis/latexmkrc 2018-02-07 22:16:30 UTC (rev 46564)
@@ -0,0 +1,3 @@
+# vim: set ft=perl:
+$clean_ext = 'thm glo gls bbl hd loe';
+$makeindex = 'splitindex main -- -s hithesis.ist';
Modified: trunk/Master/texmf-dist/doc/latex/hithesis/main.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hithesis/main.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hithesis/main.tex 2018-02-07 22:16:14 UTC (rev 46563)
+++ trunk/Master/texmf-dist/doc/latex/hithesis/main.tex 2018-02-07 22:16:30 UTC (rev 46564)
@@ -1,5 +1,5 @@
% !Mode:: "TeX:UTF-8"
-\documentclass[openright=true,fontset=siyuan,type=doctor]{hithesis}
+\documentclass[capcenterlast=true,subcapcenterlast=true,openright=false,fontset=windowsnew,type=doctor]{hithesis}
% 此处选项中不要有空格
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% 必填选项
@@ -16,28 +16,26 @@
% false
% fontset=siyuan|windowsnew|windowsold
% 含义：注意这个选项视为了解决特殊问题而设置，比如用有些发行版本的linux排
-% 版时可能（大多数发行版不会）会遇到的字体无法载入的问题，以及想要解决排
-% 版如biang biang面的biang 这类中易宋体无法识别的汉字的问题。没有特殊的需
-% 要不推荐使用这个选项。
+% 版时可能（大多数发行版不会）会遇到的字体无法载入的问题，或者字体载入之
+% 后出现无法复制的问题以及想要解决排版如 biang biang 面的 biang 这类中易
+% 宋体无法识别的汉字的问题。没有特殊的需要不推荐使用这个选项。
%
-% 如果是安装了windowns字体的linux系统，可以填写windowsnew（win vista以后
-% 的字体）或windowsold（vista以前）或者想用思源宋体并且是已经安装了思源宋
-% 体的任何系统，填写siyuan选项缺省值为空，自动识别系统并匹配字体。模板版
-% 中给出的思源字体定义文件定义的思源字体的版本是Adobe版，其他字体是
-% windowsnew字体。
+% 如果是安装了 windowns 字体的 linux 系统，可以填写windowsnew（win vista
+% 以后 的字体）或 windowsold（vista 以前）或者想用思源宋体并且是已经安装
+% 了思源宋体的任何系统，填写siyuan选项。缺省值为空，自动识别系统并匹配字体
+% 。模板版中给出的思源字体定义文件定义的思源字体的版本是Adobe版，其他字体
+% 是windowsnew字体。
% tocblank=true|false
% 含义：目录中第一章之前，是否加一行空白。缺省值为true。
% chapterhang=true|false
% 含义：目录的章标题是否悬挂居中，规范中要求章标题少于15字，所以这个选项
-% 有无没什么用，
-% 除了特殊需求。缺省值为true。
+% 有无没什么用，除了特殊需求。缺省值为true。
% fulltime=true|false
% 含义：是否全日制，缺省值为true。非全日制如同等学力等，要在cover中设置类
% 型，封面中不同格式
% subtitle=true|false
% 含义：论文题目是否含有副标题，缺省值为false，如果有要在cover中设置副标
-% 题内容
-% ，封面中显示。
+% 题内容，封面中显示。
% newgeometry=true|false
% 含义：规范中的自相矛盾之处，版芯是否包含页眉页脚，旧方法是按照包含页眉
% 页脚来设置，缺省值为false，即旧方法。
@@ -44,11 +42,17 @@
% debug=true|false
% 含义：是否显示版芯框和行号，用来调试。默认否。
% openright=true|false
-% 含义：博士论文是否要求章节首页在偶数页，此选项不在规范要求中，按个人喜
-% 好自行决定。 默认否。
-% caplastcenter=true|false
-% 含义：图题、表题是否居中对齐（我工规范要求居中，但不要求居中对齐），此
-% 选项不在规范要求中，按个人喜好自行决定。默认是。
+% 含义：博士论文是否要求章节首页必须在奇数页，此选项不在规范要求中，按个
+% 人喜好自行决定。 默认否。注意，窝工的默认情况是打印版博士论文要求右翻页
+% ，电子版要求非右翻页且无空白页。如果想DIY（或身不由己DIY）在什么地方右
+% 翻页，将这个选项设置为false，然后在目标位置添加`\cleardoublepage`命令即
+% 可。
+% capcenterlast=true|false
+% 含义：图题、表题最后一行是否居中对齐（我工规范要求居中，但不要求居中对
+% 齐），此选项不在规范要求中，按个人喜好自行决定。默认否。
+% subcapcenterlast=true|false
+% 含义：子图图题最后一行是否居中对齐（我工规范要求居中，但不要求居中对齐
+% ），此选项不在规范要求中，按个人喜好自行决定。默认否。
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage{hithesis}
@@ -60,12 +64,24 @@
\input{front/cover} % 封面
\makecover
\input{front/denotation}%物理量名称表,符合规范为主，有要求添加
+%\cleardoublepage 自定义在什么位置进行右翻页
\tableofcontents % 中文目录
+%\cleardoublepage 自定义在什么位置进行右翻页
\tableofengcontents % 英文目录,硕本不要求
\mainmatter
-%\linenumbers debug 选项
-%\layout debug 选项
+%\linenumbers %debug 选项
+%\layout %debug 选项
+%\floatdiagram %debug 选项
+%\begin{figure} %debug 选项
+%\currentfloat %debug 选项
+%\tryintextsep{\intextsep} %debug 选项
+%\trytopfigrule{0.5pt} %debug 选项
+%\trybotfigrule{1pt} %debug 选项
+%\setlayoutscale{0.9} %debug 选项
+%\floatdesign %debug 选项
+%\caption{Float layout with rules}\label{fig:fludf} %debug 选项
+%\end{figure} %debug 选项
\include{body/introduction}
\backmatter
@@ -94,11 +110,4 @@
%\input{body/appendix01}%本科生翻译论文
%\end{appendix}
-%% 以下有需要留下,没有需要不加
-% 插图索引
-%\listoffigures
-% 表格索引
-%\listoftables
-% 公式索引
-%\listofequations
\end{document}
Modified: trunk/Master/texmf-dist/makeindex/hithesis/hithesis.ist
===================================================================
--- trunk/Master/texmf-dist/makeindex/hithesis/hithesis.ist 2018-02-07 22:16:14 UTC (rev 46563)
+++ trunk/Master/texmf-dist/makeindex/hithesis/hithesis.ist 2018-02-07 22:16:30 UTC (rev 46564)
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2017-2017 by Chu Yanshuo <yanshuoc at gmail.com>
+%% Copyright (C) 2017-2018 by Chu Yanshuo <yanshuoc at gmail.com>
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3a
Modified: trunk/Master/texmf-dist/source/latex/hithesis/hithesis.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/hithesis/hithesis.dtx 2018-02-07 22:16:14 UTC (rev 46563)
+++ trunk/Master/texmf-dist/source/latex/hithesis/hithesis.dtx 2018-02-07 22:16:30 UTC (rev 46564)
@@ -16,7 +16,7 @@
%
% \iffalse
%<*driver>
-\ProvidesFile{hithesis.dtx}[2017/08/27 1.0.2 Harbin Institute of Technology Thesis Template]
+\ProvidesFile{hithesis.dtx}[2017/11/5 1.0.9 Harbin Institute of Technology Thesis Template]
\documentclass{ltxdoc}
\usepackage{dtx-style}
@@ -140,10 +140,11 @@
%
% 如果要使用开发版，需自己下载，\hithesis\ 相关链接：
% \begin{itemize}
-% \item github：\href{https://gihitb.com/dustincys/hithesis}
-% {https://gihitb.com/dustincys/hithesis}
+% \item github：\href{https://github.com/dustincys/hithesis}
+% {https://github.com/dustincys/hithesis}
% \item oschina：\href{https://git.oschina.net/dustincys/hithesis}
-% {https://git.oschina.net/dustincys/hithesis}
+% {https://git.oschina.net/dustincys/hithesis}\\ 或码云另外一个域名
+% \href{https://gitee.com/dustincys/hithesis}{https://gitee.com/dustincys/hithesis}
% \end{itemize}
%
% \note[注意：]{如果登录不了github的同学可以登录oschina下载。}
@@ -182,9 +183,9 @@
% 几点说明：
% \begin{itemize}
% \item \file{hithesis.cls} 和 \file{hithesis.cfg} 可由 \file{hithesis.ins}
-% 和 \file{hithesis.dtx} 生成，但为了降低新手用户的使用难度，故
-% 将 \file{hithesis.cls} 和 \file{hithesis.cfg} 文件一起发布。
+% 和 \file{hithesis.dtx} 生成。
% \item 使用前阅读文档：\file{hithesis.pdf}。
+% \item 默认的生成的论文中含有丰富的格式示例，使用前请仔细阅读\file{main.pdf}。
% \end{itemize}
%
% \subsection{生成模板}
@@ -567,7 +568,7 @@
% 两个题之间的距离具体多少不在\PGR\ 中要求。目前的方法是用户手动调节该距离。
% 关于图题\PGR\ 和\UGR\ 只规定了居中，并没有规定居中对其。然而评审老师很多喜欢居
% 中且居中对齐。模板默认选项是居中且居中对齐，如果不喜欢居中对齐，那么需要在
-% \file{main.tex}的文档类选项中设置选项caplastcenter=false。详细方法见前文的介绍
+% \file{main.tex}的文档类选项中设置选项capcenterlast=false。详细方法见前文的介绍
% 。
% \begin{hitrgu}
% 每个图均应有图题（由图序和图名组成），图题不宜有标点符号，图名在图序之后空1个
@@ -939,7 +940,7 @@
%<cls>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<cls>\ProvidesClass{hithesis}
%<cfg>\ProvidesFile{hithesis.cfg}
-%<cls|cfg>[2017/08/21 0.0.1 Harbin Institute of Technology]
+%<cls|cfg>[2017/11/5 1.0.9 Harbin Institute of Technology]
% \end{macrocode}
%
% \subsection{定义选项}
@@ -969,9 +970,11 @@
% \begin{macrocode}
\DeclareBoolOption[false]{arialtitle}
% \end{macrocode}
-% \option{raggedbottom} 选项（默认关闭）。
+% \changes{v1.0.3}{2017/08/29}{默认开启raggedbottom}
+% \option{raggedbottom} 选项（默认开启）。如果不开启这个选项，会出现一页中尽量上
+% 下对齐，段的间距大。如果开启，尽量使段间距保持一致，页面底部出现空白。
% \begin{macrocode}
-\DeclareBoolOption[false]{raggedbottom}
+\DeclareBoolOption[true]{raggedbottom}
% \end{macrocode}
% 在脚注标记中使用 \pkg{pifont} 的带圈数字（默认关闭）。
% \begin{macrocode}
@@ -1013,10 +1016,16 @@
% \begin{macrocode}
\DeclareBoolOption[false]{openright}
% \end{macrocode}
-% 图题和标题是否居中对其（默认是，非规范要求）。
+% 图题和标题最后一行是否居中对其（默认是，非规范要求）。
+% \changes{v1.0.6}{2017/10/25}{此处更改了选项的名称}
% \begin{macrocode}
-\DeclareBoolOption[true]{caplastcenter}
+\DeclareBoolOption[false]{capcenterlast}
% \end{macrocode}
+% 子图图题和标题最后一行是否居中对其（默认是，非规范要求）。
+% \changes{v1.0.6}{2017/10/25}{此处添加子图最后一行图题是否居中选项}
+% \begin{macrocode}
+\DeclareBoolOption[false]{subcapcenterlast}
+% \end{macrocode}
% 声明字体选项。
% \begin{macrocode}
\DeclareStringOption{fontset}
@@ -1221,9 +1230,11 @@
\fi
% \end{macrocode}
% 载入显示行号的包。
+% \changes{v1.0.9}{2018/01/07}{添加debug包}
% \begin{macrocode}
\ifhit at debug%
\RequirePackage{layout}
+\RequirePackage{layouts}
\RequirePackage{lineno}
\fi
% \end{macrocode}
@@ -1232,6 +1243,7 @@
\RequirePackage{fancyhdr}
% \end{macrocode}
% 其他包，表格、数学符号包
+% \changes{v1.0.6}{2017/10/25}{此处添加子图最后一行图题是否居中选项}
% \begin{macrocode}
\RequirePackage{tabularx}
\RequirePackage{varwidth}
@@ -1240,7 +1252,10 @@
\RequirePackage[below]{placeins}%允许上一个section的浮动图形出现在下一个section的开始部分,还提供\FloatBarrier命令,使所有未处理的浮动图形立即被处理
\RequirePackage{flafter} % 使得所有浮动体不能被放置在其浮动环境之前，以免浮动体在引述它的文本之前出现.
\RequirePackage{multirow} %使用Multirow宏包，使得表格可以合并多个row格
-\RequirePackage[hang]{subfigure}%支持子图 %centerlast 设置最后一行是否居中
+\ifhit at subcapcenterlast
+\PassOptionsToPackage{centerlast}{subfigure}
+\fi
+\RequirePackage{subfigure}%支持子图 %centerlast 设置最后一行是否居中
\RequirePackage[subfigure]{ccaption} %支持双语标题
% \end{macrocode}
% 中英文索引包。
@@ -1601,6 +1616,7 @@
% \subsubsection{浮动对象以及表格}
% \label{sec:float}
% 设置浮动对象和文字之间的距离
+% \changes{v1.0.9}{2018/01/07}{修正float垂直间距bug}
% \begin{macrocode}
%<*cls>
\setlength{\floatsep}{\ifhit at glue 20.50398bp \@plus 2.83465bp \@minus 0bp\else 21bp\fi}
@@ -1607,12 +1623,16 @@
\setlength{\intextsep}{\ifhit at glue 20.50398bp \@plus 2.83465bp \@minus 0bp\else 21bp\fi}
\setlength{\textfloatsep}{\ifhit at glue 20.50398bp \@plus 2.83465bp \@minus 0bp\else 21bp\fi}
\setlength{\@fptop}{0bp}
-\setlength{\@fpsep}{12bp}
+\setlength{\@fpsep}{\ifhit at glue 20.50398bp \@plus 2.83465bp \@minus 0bp\else 21bp\fi}
\setlength{\@fpbot}{0bp}
% \end{macrocode}
% 下面这组命令使浮动对象的缺省值稍微宽松一点，从而防止幅度对象占据过多的文本页面，
% 也可以防止在很大空白的浮动页上放置很小的图形。
+% \changes{v1.0.8}{2017/11/5}{修改附录中图、表、公式数字编码}
% \begin{macrocode}
+\g at addto@macro\appendix{\renewcommand*{\thefigure}{\thechapter-\arabic{figure}}}
+\g at addto@macro\appendix{\renewcommand*{\thetable}{\thechapter-\arabic{table}}}
+\g at addto@macro\appendix{\renewcommand*{\theequation}{\thechapter-\arabic{equation}}}
\renewcommand{\textfraction}{0.15}
\renewcommand{\topfraction}{0.85}
\renewcommand{\bottomfraction}{0.65}
@@ -1640,12 +1660,27 @@
% 字符排写。
% \end{hitrgu}
% 我工规范中没有明确规定是否标题是否居中对齐，这里给出一个居中选项自行调整。
+% 注意，我工只规定：“居中书写”。此处不额外添加悬挂处理。
+% \changes{v1.0.6}{2017/10/25}{此处更改了选项的名称}
+% \changes{v1.0.7}{2017/11/4}{优化了最后一行居中算法，使其两边对齐、单词内部断行}
% \begin{macrocode}
\long\def\@makecaption#1#2{%
\vskip\abovecaptionskip
- \wuhao\ifhit at caplastcenter\centering\fi\sbox\@tempboxa{#1\ifhit at bachelor\hskip\ccwd\else\enskip\fi#2}%
+ \wuhao\sbox\@tempboxa{#1\ifhit at bachelor\hskip\ccwd\else\enskip\fi#2}%
\ifdim \wd\@tempboxa >\hsize
- #1\ifhit at bachelor\hskip\ccwd\else\enskip\fi#2\par
+ \ifhit at capcenterlast%
+ \vskip 6.3bp%
+ {\setbox0=\vbox{#1\ifhit at bachelor\hskip\ccwd\else\enskip\fi#2}
+ \setbox1=\vbox{%
+ \unvbox0
+ \setbox2=\lastbox
+ \hbox to \textwidth{\hfill\unhcopy2 \unskip\unskip\hfill}
+ }
+ \unvbox1}
+ \else%
+ #1\ifhit at bachelor\hskip\ccwd\else\enskip\fi#2%
+ \fi%
+ \par
\else
\global \@minipagefalse
\hb at xt@\hsize{\hfil\box\@tempboxa\hfil}%
@@ -1682,6 +1717,7 @@
% \end{macrocode}
% \end{macro}
% 图表名称及格式。
+% \changes{v1.0.8}{2017/11/5}{删除冗余公式符号定义}
% \begin{macrocode}
\renewcommand{\thesubtable}{(\alph{subtable})}
\renewcommand{\thefigure}{\arabic{chapter}-\arabic{figure}}%使图编号为 7-1 的格式 %\protect{~}
@@ -1688,19 +1724,18 @@
\renewcommand{\thesubfigure}{\alph{subfigure})}%使子图编号为 a)的格式
\renewcommand{\p at subfigure}{\thefigure~} %使子图引用为 7-1 a) 的格式，母图编号和子图编号之间用~加一个空格
\renewcommand{\thetable}{\arabic{chapter}-\arabic{table}}%使表编号为 7-1 的格式
-\renewcommand{\theequation}{\arabic{chapter}-\arabic{equation}}%使公式编号为 7-1 的格式
% \end{macrocode}
% 调整罗列环境、浮动格式、间距。
% \begin{macrocode}
-% 调整罗列环境的布局
\setitemize{leftmargin=0em,itemsep=0em,partopsep=0em,parsep=0em,topsep=0em,itemindent=3em}
\setenumerate{leftmargin=0em,itemsep=0em,partopsep=0em,parsep=0em,topsep=0em,itemindent=3.5em}
\newcommand{\citeup}[1]{\textsuperscript{\cite{#1}}}
-% 定制默认浮动图形和表格标题样式
+% \end{macrocode}
+% 此处删除hang caption的设置
+% \changes{v1.0.6}{2017/10/25}{删除caption hang 的默认设置，因为不在规范要求中}
+% \begin{macrocode}
\captionnamefont{\wuhao}
\captiontitlefont{\wuhao}
-\captiondelim{~~}
-\hangcaption
\renewcommand{\subcapsize}{\wuhao}
\setlength{\abovecaptionskip}{0pt}%为了双标题之间的间距，不能设置
\setlength{\belowcaptionskip}{0pt}
@@ -1896,7 +1931,11 @@
{\hit at chapter{#3}}%
{\hit at chapter[#2]{#3}}%
\IfValueT{#4}{%
- \addcontentsline{toe}{chapter}{\bfseries\relax Chapter \thechapter\hspace{0.5em} #4}
+% \end{macrocode}
+% 此处需删除章节的空白
+% \changes{v1.0.5}{2017/09/20}{添加\cs{ignorespaces}选项，矫正英文目录多出一个空白而无法对其的bug}
+% \begin{macrocode}
+ \addcontentsline{toe}{chapter}{\bfseries\relax Chapter \thechapter\hspace{0.5em}\ignorespaces #4}
}
}
}
@@ -1915,7 +1954,11 @@
{\hit at section{#3}}%
{\hit at section[#2]{#3}}%
\IfValueT{#4}{%
- \addcontentsline{toe}{section}{\protect\numberline{\csname thesection\endcsname} #4}
+% \end{macrocode}
+% 此处需删除章节的空白
+% \changes{v1.0.5}{2017/09/18}{添加\cs{ignorespaces}选项，矫正英文目录多出一个空白而无法对其的bug}
+% \begin{macrocode}
+ \addcontentsline{toe}{section}{\protect\numberline{\csname thesection\endcsname}\ignorespaces #4}
}
}
}
@@ -1934,7 +1977,11 @@
{\hit at subsection{#3}}%
{\hit at subsection[#2]{#3}}%
\IfValueT{#4}{%
- \addcontentsline{toe}{subsection}{\protect\numberline{\csname thesubsection\endcsname} #4}
+% \end{macrocode}
+% 此处需删除章节的空白
+% \changes{v1.0.5}{2017/09/18}{添加\cs{ignorespaces}选项，矫正英文目录多出一个空白而无法对其的bug}
+% \begin{macrocode}
+ \addcontentsline{toe}{subsection}{\protect\numberline{\csname thesubsection\endcsname}\ignorespaces #4}
}
}
}
@@ -1953,7 +2000,11 @@
{\hit at subsubsection{#3}}%
{\hit at subsubsection[#2]{#3}}%
\IfValueT{#4}{%
- \addcontentsline{toe}{subsubsection}{\protect\numberline{\csname thesubsubsection\endcsname} #4}
+% \end{macrocode}
+% 此处需删除章节的空白
+% \changes{v1.0.5}{2017/09/18}{添加\cs{ignorespaces}选项，矫正英文目录多出一个空白而无法对其的bug}
+% \begin{macrocode}
+ \addcontentsline{toe}{subsubsection}{\protect\numberline{\csname thesubsubsection\endcsname}\ignorespaces #4}
}
}
}
@@ -2409,6 +2460,12 @@
\def\@pnumwidth{4em}%规定中的提前悬挂
\def\@tocrmarg{\@pnumwidth}
\def\@dotsep{1}
+% \end{macrocode}
+% 此处临时更改一下对齐方式。\CTeX\ 似乎无法应对双语目录。
+% todo:
+% \changes{v1.0.4}{2017/09/17}{将leftskip设置参数至于外侧，以便后续添加可以适应标题长度的\cs{contentsline}方法}
+% \begin{macrocode}
+\setlength\@tempdima{4em}%
\patchcmd{\@dottedtocline}{#4}{\csname hit at toc@font\endcsname #4}{}{}
\patchcmd{\@dottedtocline}{\hb at xt@\@pnumwidth}{\hbox}{}{}
\renewcommand*\l at chapter[2]{%
@@ -2415,7 +2472,6 @@
\ifnum \c at tocdepth >\m at ne
\addpenalty{-\@highpenalty}%
%\vskip 4bp \@plus\p@
- \setlength\@tempdima{4em}%
\begingroup
\parindent \z@ \rightskip \@pnumwidth
\parfillskip -\@pnumwidth
@@ -2448,11 +2504,22 @@
\def\engcontentsname{\bfseries Contents}
\newcommand\tableofengcontents{
+% \end{macrocode}
+% 此处添加英文目录的章标题格式，默认细点
+% \changes{v1.0.5}{2017/09/18}{矫正英文目录缩进与中文目录一致的bug}
+% \begin{macrocode}
+ \def\l at chapter{\@dottedtocline{0}{0em}{5em}}%控制英文目录： 细点\@dottedtocline 粗点\@dottedtoclinebold
\@restonecolfalse
\chapter*{\engcontentsname %chapter*上移一行，避免在toc中出现。
\pdfbookmark[0]{Contents}{econtent}
\@mkboth{%
\engcontentsname}{\engcontentsname}}
+% \end{macrocode}
+% 此处临时更改一下对齐方式。\CTeX\ 似乎无法应对双语目录。
+% \changes{v1.0.4}{2017/09/17}{修正英文目录中换行时无法对齐的bug}
+% 删除增加\cs{hangindent}的方法，其原因是\cs{numberline}多出一个空格
+% \changes{v1.0.5}{2017/09/18}{彻底修正英文目录中换行时无法对齐的bug}
+% \begin{macrocode}
\@starttoc{toe}%
\if at restonecol\twocolumn\fi}
\def\@dotsep{0.75} % 定义英文目录的点间距
@@ -2820,7 +2887,7 @@
%%EndPageSetup
q 98 590 467 87 rectclip q
0 g
-532.574 596.495 m 527.34 601.503 l 532.105 601.257 l 536.867 601.015 l
+532.574 596.495 m 527.34 601.503 l 532.105 601.257 l 536.867 601.015 l
537.176 605.284 l 537.57 610.765 535.727 611.605 529.727 608.679 c 525.621
606.675 525.082 606.632 522.34 608.054 c 519.105 609.734 518.207 613.554
521.047 613.554 c 526.309 613.554 535.574 615.941 536.098 617.433 c 536.414
@@ -2838,11 +2905,11 @@
533.902 641.253 c 529.945 638.651 527.355 641.421 531.121 644.23 c 532.781
645.468 532.785 645.62 531.133 647.3 c 529.477 648.987 529.316 648.98 527.637
647.112 c 526.668 646.034 524.629 643.234 523.109 640.89 c 520.074 636.202
- 519.285 635.859 516.941 638.214 c 515.5 639.659 515.535 640.05 517.367
+ 519.285 635.859 516.941 638.214 c 515.5 639.659 515.535 640.05 517.367
642.632 c 519.605 645.784 519.863 648.249 518.371 652.194 c 517.082 655.597
517.922 657.003 520.438 655.651 c 522.004 654.812 522.375 653.526 522.375
648.929 c 522.375 644.753 522.672 643.542 523.488 644.362 c 525.016 645.898
- 524.98 659.335 523.438 664.03 c 522.742 666.136 522.426 668.109 522.73
+ 524.98 659.335 523.438 664.03 c 522.742 666.136 522.426 668.109 522.73
668.413 c 523.68 669.37 528.34 667.757 530.293 665.796 c 532.059 664.023
532.078 663.616 530.602 658.296 c 529.742 655.202 529.355 652.359 529.738
651.976 c 530.117 651.593 531.637 652.491 533.113 653.972 c 535.215 656.081
@@ -2891,7 +2958,7 @@
250.781 646.843 c 249.219 651.198 249.508 654.683 251.426 654.683 c 253.09
654.683 258.27 649.773 258.812 647.679 c 259.164 646.339 258.359 644.612
256.426 642.53 c 252.633 638.456 251.941 635.39 253.887 631.269 c 255.355
- 628.167 255.328 627.573 253.5 622.737 c 252.418 619.882 251.531 616.87
+ 628.167 255.328 627.573 253.5 622.737 c 252.418 619.882 251.531 616.87
251.531 616.05 c 251.531 613.741 253.32 614.284 254.043 616.812 c 255.953
623.487 259.816 632.554 260.559 632.093 c 261.027 631.804 260.547 629.655
259.492 627.323 c 257.395 622.687 256.992 619.573 258.484 619.573 c 259.879
@@ -2910,7 +2977,7 @@
634.179 276.52 631.585 276.52 630.882 c 276.52 629.14 277.234 629.265 281.129
631.679 c 282.973 632.823 284.887 633.503 285.391 633.191 c 285.91 632.87
286.07 627.23 285.766 620.124 c 285.227 607.624 l 287.703 606.491 l 289.066
- 605.866 290.965 604.019 291.93 602.386 c 293.543 599.64 293.555 599.23
+ 605.866 290.965 604.019 291.93 602.386 c 293.543 599.64 293.555 599.23
292.07 596.952 c 291.188 595.601 289.984 594.491 289.402 594.491 c 288.816
594.491 285.883 597.089 282.875 600.261 c h
273.02 608.37 m 273.02 610.183 271.062 609.855 270.676 607.972 c 270.461
@@ -2923,7 +2990,7 @@
622.089 c 276.879 623.952 277.211 623.409 277.312 617.042 c 277.441 609.073
280.066 604.405 282.852 607.202 c h
273.762 615.073 m 273.055 618.792 271.52 619.167 271.52 615.62 c 271.52
- 613.698 272.031 612.55 272.883 612.55 c 273.797 612.55 274.086 613.378
+ 613.698 272.031 612.55 272.883 612.55 c 273.797 612.55 274.086 613.378
273.762 615.073 c h
394.883 598.015 m 393.098 602.304 391.578 602.413 388.113 598.507 c 386.641
596.851 384.613 595.495 383.605 595.495 c 381.195 595.495 378.461 598.601
@@ -2990,19 +3057,19 @@
192.047 620.64 c 191.539 622.241 191.781 622.64 193.125 622.394 c 195.914
621.886 195.902 624.284 193.109 624.987 c 189.305 625.948 190.039 628.273
194.816 630.398 c 200.5 632.925 201.59 634.495 201.848 640.484 c 202.078
- 645.937 200.887 648.109 198.23 647.085 c 196.191 646.3 196.109 644.968
+ 645.937 200.887 648.109 198.23 647.085 c 196.191 646.3 196.109 644.968
197.973 643.093 c 200.273 640.784 198.648 637.792 193.09 634.089 c 187.453
630.335 186.836 630.151 184.598 631.573 c 183.406 632.331 183.977 633.308
187.598 636.706 c 191.922 640.769 191.949 642.991 187.645 640.679 c 184.664
639.077 180.711 640.468 179.043 643.71 c 177.273 647.14 178.188 647.987
184.07 648.378 c 187.996 648.64 202.82 655.359 209.664 659.976 c 223.113
- 669.05 230.449 670.456 230.531 663.98 c 230.551 662.155 220.797 657.48
+ 669.05 230.449 670.456 230.531 663.98 c 230.551 662.155 220.797 657.48
218.496 658.21 c 216.395 658.882 205.637 652.972 205.586 651.12 c 205.555
649.89 207.598 647.659 208.758 647.659 c 209.195 647.659 209.559 648.737
209.559 650.05 c 209.559 651.683 210.27 652.636 211.805 653.046 c 218.297
654.792 222.848 652.425 221.922 647.776 c 221.543 645.874 221.988 644.562
223.469 643.218 c 225.973 640.944 226.035 639.921 223.934 635.691 c 222.16
- 632.12 221.879 627.03 222.48 609.202 c 222.801 599.722 222.598 597.144
+ 632.12 221.879 627.03 222.48 609.202 c 222.801 599.722 222.598 597.144
221.469 596.425 c 218.898 594.792 217.609 595.448 214.914 599.761 c h
193.641 610.819 m 193.516 612.019 192.148 611.788 191.719 610.495 c 191.496
609.831 191.855 609.472 192.516 609.691 c 193.176 609.913 193.684 610.421
@@ -3070,7 +3137,7 @@
459.414 621.038 c 459.414 621.886 458.898 622.581 458.266 622.581 c 456.938
622.581 446.797 615.98 445.906 614.53 c 444.969 613.007 440.812 613.382
439.375 615.116 c 438.465 616.218 438.355 617.452 439.004 619.276 c 440.008
- 622.105 440.91 622.71 446.922 624.589 c 452.84 626.441 458.934 629.319
+ 622.105 440.91 622.71 446.922 624.589 c 452.84 626.441 458.934 629.319
460.223 630.878 c 461.512 632.437 463.242 651.933 462.715 658.964 c 462.426
662.823 462.715 663.804 464.395 664.706 c 466.066 665.605 466.859 665.355
468.914 663.296 c 471.898 660.3 472.152 655.714 469.926 645.151 c 467.488
@@ -3085,7 +3152,7 @@
620.573 465.102 618.378 464.152 615.691 c 462.457 610.905 455.445 602.851
451.664 601.347 c 447.969 599.878 441.773 600.464 439.98 602.456 c h
312.055 609.765 m 310.184 612.444 310.016 616.487 311.75 616.987 c 312.434
- 617.187 315.617 617.929 318.82 618.64 c 324.414 619.878 324.938 620.28
+ 617.187 315.617 617.929 318.82 618.64 c 324.414 619.878 324.938 620.28
332.062 628.757 c 340.41 638.687 342.074 643.023 335.305 637.206 c 330.438
633.023 327.645 632.718 323.895 635.952 c 321.719 637.831 321.324 638.819
321.867 640.999 c 322.516 643.589 322.758 643.683 327.266 643.081 c 331.402
@@ -3205,36 +3272,36 @@
%%EndPageSetup
q 134 161 314 315 rectclip q
0 g
-134.121 191.71 m 134.121 221.335 l 193.371 221.335 l 193.371 162.085 l
+134.121 191.71 m 134.121 221.335 l 193.371 221.335 l 193.371 162.085 l
134.121 162.085 l h
-185.121 191.71 m 185.121 213.085 l 142.371 213.085 l 142.371 170.335 l
+185.121 191.71 m 185.121 213.085 l 142.371 213.085 l 142.371 170.335 l
185.121 170.335 l h
-151.371 191.71 m 151.371 204.085 l 176.121 204.085 l 176.121 179.335 l
+151.371 191.71 m 151.371 204.085 l 176.121 204.085 l 176.121 179.335 l
151.371 179.335 l h
-210.621 166.21 m 210.621 170.335 l 227.121 170.335 l 227.121 162.085 l
+210.621 166.21 m 210.621 170.335 l 227.121 170.335 l 227.121 162.085 l
210.621 162.085 l h
-236.121 166.21 m 236.121 170.335 l 244.371 170.335 l 244.371 179.335 l
-235.371 179.335 l 235.371 171.085 l 227.871 171.085 l 227.871 195.835 l
-244.371 195.835 l 244.371 221.335 l 227.871 221.335 l 227.871 229.585 l
+236.121 166.21 m 236.121 170.335 l 244.371 170.335 l 244.371 179.335 l
+235.371 179.335 l 235.371 171.085 l 227.871 171.085 l 227.871 195.835 l
+244.371 195.835 l 244.371 221.335 l 227.871 221.335 l 227.871 229.585 l
252.621 229.585 l 252.621 221.335 l 269.047 221.335 l 269.27 217.023 l 269.496
- 212.71 l 273.809 212.484 l 278.121 212.261 l 278.121 221.335 l 269.871
-221.335 l 269.871 229.585 l 287.121 229.585 l 287.121 246.835 l 295.371
-246.835 l 295.371 255.085 l 303.621 255.085 l 303.621 246.835 l 311.871
-246.835 l 311.871 238.585 l 294.621 238.585 l 294.621 229.585 l 329.121
-229.585 l 329.121 237.835 l 337.371 237.835 l 337.371 221.335 l 320.121
-221.335 l 320.121 204.835 l 312.621 204.835 l 312.621 221.335 l 303.621
-221.335 l 303.621 213.085 l 294.621 213.085 l 294.621 195.835 l 287.121
-195.835 l 287.121 204.835 l 261.621 204.835 l 261.621 213.085 l 252.621
-213.085 l 252.621 204.085 l 260.871 204.085 l 260.871 195.835 l 269.121
-195.835 l 269.121 187.585 l 253.371 187.585 l 253.371 195.835 l 244.371
-195.835 l 244.371 186.835 l 252.621 186.835 l 252.621 170.335 l 269.871
-170.335 l 269.871 178.585 l 278.121 178.585 l 278.121 162.085 l 236.121
+ 212.71 l 273.809 212.484 l 278.121 212.261 l 278.121 221.335 l 269.871
+221.335 l 269.871 229.585 l 287.121 229.585 l 287.121 246.835 l 295.371
+246.835 l 295.371 255.085 l 303.621 255.085 l 303.621 246.835 l 311.871
+246.835 l 311.871 238.585 l 294.621 238.585 l 294.621 229.585 l 329.121
+229.585 l 329.121 237.835 l 337.371 237.835 l 337.371 221.335 l 320.121
+221.335 l 320.121 204.835 l 312.621 204.835 l 312.621 221.335 l 303.621
+221.335 l 303.621 213.085 l 294.621 213.085 l 294.621 195.835 l 287.121
+195.835 l 287.121 204.835 l 261.621 204.835 l 261.621 213.085 l 252.621
+213.085 l 252.621 204.085 l 260.871 204.085 l 260.871 195.835 l 269.121
+195.835 l 269.121 187.585 l 253.371 187.585 l 253.371 195.835 l 244.371
+195.835 l 244.371 186.835 l 252.621 186.835 l 252.621 170.335 l 269.871
+170.335 l 269.871 178.585 l 278.121 178.585 l 278.121 162.085 l 236.121
162.085 l h
287.121 170.335 m 287.121 178.585 l 295.371 178.585 l 295.371 186.835 l
320.121 186.835 l 320.121 179.335 l 303.621 179.335 l 303.621 171.159 l
299.309 170.937 l 294.996 170.71 l 294.77 166.398 l 294.547 162.085 l 287.121
162.085 l h
-303.621 166.21 m 303.621 170.335 l 311.871 170.335 l 311.871 162.085 l
+303.621 166.21 m 303.621 170.335 l 311.871 170.335 l 311.871 162.085 l
303.621 162.085 l h
329.121 166.585 m 329.121 171.085 l 320.871 171.085 l 320.871 178.585 l
329.121 178.585 l 329.121 187.585 l 320.871 187.585 l 320.871 204.085 l
@@ -3241,13 +3308,13 @@
329.121 204.085 l 329.121 195.835 l 337.371 195.835 l 337.371 186.835 l
345.621 186.835 l 345.621 179.335 l 337.371 179.335 l 337.371 170.335 l
353.871 170.335 l 353.871 162.085 l 329.121 162.085 l h
-362.871 166.21 m 362.871 170.335 l 371.121 170.335 l 371.121 162.085 l
+362.871 166.21 m 362.871 170.335 l 371.121 170.335 l 371.121 162.085 l
362.871 162.085 l h
388.371 170.335 m 388.371 178.585 l 405.621 178.585 l 405.621 186.835 l
413.871 186.835 l 413.871 162.085 l 388.371 162.085 l h
-422.871 166.21 m 422.871 170.335 l 430.371 170.335 l 430.371 162.085 l
+422.871 166.21 m 422.871 170.335 l 430.371 170.335 l 430.371 162.085 l
422.871 162.085 l h
-439.371 166.21 m 439.371 170.335 l 447.621 170.335 l 447.621 162.085 l
+439.371 166.21 m 439.371 170.335 l 447.621 170.335 l 447.621 162.085 l
439.371 162.085 l h
371.871 174.835 m 371.871 178.585 l 379.371 178.585 l 379.371 171.085 l
371.871 171.085 l h
@@ -3271,9 +3338,9 @@
195.835 l 371.121 187.585 l 362.871 187.585 l h
405.621 217.23 m 405.621 230.37 l 392.684 230.167 l 379.746 229.96 l 379.539
217.023 l 379.336 204.085 l 405.621 204.085 l h
-388.371 217.21 m 388.371 221.335 l 396.621 221.335 l 396.621 213.085 l
+388.371 217.21 m 388.371 221.335 l 396.621 221.335 l 396.621 213.085 l
388.371 213.085 l h
-303.621 199.96 m 303.621 204.085 l 311.871 204.085 l 311.871 195.835 l
+303.621 199.96 m 303.621 204.085 l 311.871 204.085 l 311.871 195.835 l
303.621 195.835 l h
218.871 208.585 m 218.871 212.335 l 227.121 212.335 l 227.121 204.835 l
218.871 204.835 l h
@@ -3284,17 +3351,17 @@
271.585 l 167.871 271.585 l 167.871 280.585 l 176.871 280.585 l 176.871
288.835 l 201.621 288.835 l 201.621 272.335 l 193.371 272.335 l 193.371
280.585 l 184.297 280.585 l 184.52 276.273 l 184.746 271.96 l 189.059 271.737
- l 193.371 271.511 l 193.371 264.159 l 189.059 263.937 l 184.746 263.71
-l 184.293 255.835 l 176.121 255.835 l 176.121 246.835 l 184.297 246.835
-l 184.52 242.523 l 184.746 238.21 l 189.059 237.987 l 193.371 237.761 l
-193.371 246.835 l 185.121 246.835 l 185.121 255.085 l 193.371 255.085 l
-193.371 263.335 l 218.871 263.335 l 218.871 255.909 l 214.559 255.687 l
+ l 193.371 271.511 l 193.371 264.159 l 189.059 263.937 l 184.746 263.71
+l 184.293 255.835 l 176.121 255.835 l 176.121 246.835 l 184.297 246.835
+l 184.52 242.523 l 184.746 238.21 l 189.059 237.987 l 193.371 237.761 l
+193.371 246.835 l 185.121 246.835 l 185.121 255.085 l 193.371 255.085 l
+193.371 263.335 l 218.871 263.335 l 218.871 255.909 l 214.559 255.687 l
210.246 255.46 l 210.02 251.148 l 209.797 246.835 l 201.621 246.835 l 201.621
237.835 l 209.871 237.835 l 209.871 221.335 l 218.871 221.335 l 218.871
213.085 l 202.418 213.085 l h
-338.121 217.21 m 338.121 221.335 l 353.871 221.335 l 353.871 213.085 l
+338.121 217.21 m 338.121 221.335 l 353.871 221.335 l 353.871 213.085 l
338.121 213.085 l h
-439.371 217.21 m 439.371 221.335 l 447.621 221.335 l 447.621 213.085 l
+439.371 217.21 m 439.371 221.335 l 447.621 221.335 l 447.621 213.085 l
439.371 213.085 l h
134.121 259.585 m 134.121 288.835 l 158.871 288.835 l 158.871 280.585 l
150.621 280.585 l 150.621 272.335 l 142.371 272.335 l 142.371 263.335 l
@@ -3307,13 +3374,13 @@
218.871 230.335 l h
439.371 234.085 m 439.371 237.835 l 447.621 237.835 l 447.621 230.335 l
439.371 230.335 l h
-236.121 242.71 m 236.121 246.835 l 244.371 246.835 l 244.371 255.085 l
+236.121 242.71 m 236.121 246.835 l 244.371 246.835 l 244.371 255.085 l
252.621 255.085 l 252.621 238.585 l 236.121 238.585 l h
338.121 255.085 m 338.121 271.585 l 345.621 271.585 l 345.621 263.335 l
- 353.871 263.335 l 353.871 255.913 l 345.996 255.46 l 345.781 247.023 l
+ 353.871 263.335 l 353.871 255.913 l 345.996 255.46 l 345.781 247.023 l
345.57 238.585 l 338.121 238.585 l h
227.871 255.085 m 227.871 263.335 l 244.371 263.335 l 244.371 255.909 l
- 240.059 255.687 l 235.746 255.46 l 235.293 246.835 l 227.871 246.835 l
+ 240.059 255.687 l 235.746 255.46 l 235.293 246.835 l 227.871 246.835 l
h
261.469 251.148 m 261.246 255.46 l 253.418 255.913 l 252.996 271.96 l 244.559
272.171 l 236.121 272.386 l 236.121 280.585 l 227.871 280.585 l 227.871
@@ -3320,11 +3387,11 @@
288.835 l 236.121 288.835 l 236.121 306.085 l 227.871 306.085 l 227.871
314.335 l 244.371 314.335 l 244.371 306.085 l 256.371 306.085 l 256.371
297.835 l 244.371 297.835 l 244.371 288.835 l 252.621 288.835 l 252.621
- 280.585 l 260.793 280.585 l 261.246 271.96 l 269.121 271.507 l 269.121
+ 280.585 l 260.793 280.585 l 261.246 271.96 l 269.121 271.507 l 269.121
255.085 l 278.121 255.085 l 278.121 246.835 l 261.695 246.835 l h
-320.871 250.96 m 320.871 255.085 l 329.121 255.085 l 329.121 246.835 l
+320.871 250.96 m 320.871 255.085 l 329.121 255.085 l 329.121 246.835 l
320.871 246.835 l h
-371.871 250.96 m 371.871 255.085 l 379.371 255.085 l 379.371 246.835 l
+371.871 250.96 m 371.871 255.085 l 379.371 255.085 l 379.371 246.835 l
371.871 246.835 l h
431.121 255.085 m 431.121 263.335 l 438.621 263.335 l 438.621 246.835 l
431.121 246.835 l h
@@ -3339,24 +3406,24 @@
362.871 255.835 l h
380.121 259.585 m 380.121 263.335 l 388.371 263.335 l 388.371 255.835 l
380.121 255.835 l h
-312.621 268.21 m 312.621 272.335 l 278.121 272.335 l 278.121 280.585 l
+312.621 268.21 m 312.621 272.335 l 278.121 272.335 l 278.121 280.585 l
273.996 280.585 l 270.094 280.585 269.871 280.687 269.871 282.46 c 269.871
284.234 270.094 284.335 273.996 284.335 c 277.895 284.335 278.121 284.234
- 278.121 282.46 c 278.121 280.585 l 320.871 280.585 l 320.871 282.296 l
+ 278.121 282.46 c 278.121 280.585 l 320.871 280.585 l 320.871 282.296 l
320.871 283.507 321.527 284.253 323.121 284.855 c 324.609 285.417 325.371
286.222 325.371 287.241 c 325.371 288.644 325.895 288.792 331.559 288.991
- c 337.746 289.21 l 338.199 297.085 l 345.621 297.085 l 345.621 288.835
-l 353.871 288.835 l 353.871 280.585 l 329.121 280.585 l 329.121 264.085
+ c 337.746 289.21 l 338.199 297.085 l 345.621 297.085 l 345.621 288.835
+l 353.871 288.835 l 353.871 280.585 l 329.121 280.585 l 329.121 264.085
l 312.621 264.085 l h
-413.871 280.585 m 413.871 297.085 l 438.543 297.085 l 438.996 289.21 l
-443.309 288.987 l 447.621 288.761 l 447.621 264.085 l 439.371 264.085 l
-439.371 272.335 l 431.121 272.335 l 431.121 289.585 l 422.074 289.585 l
+413.871 280.585 m 413.871 297.085 l 438.543 297.085 l 438.996 289.21 l
+443.309 288.987 l 447.621 288.761 l 447.621 264.085 l 439.371 264.085 l
+439.371 272.335 l 431.121 272.335 l 431.121 289.585 l 422.074 289.585 l
422.496 271.96 l 430.371 271.507 l 430.371 264.085 l 413.871 264.085 l h
-210.621 276.46 m 210.621 280.585 l 218.871 280.585 l 218.871 272.335 l
+210.621 276.46 m 210.621 280.585 l 218.871 280.585 l 218.871 272.335 l
210.621 272.335 l h
159.621 293.335 m 159.621 297.085 l 176.121 297.085 l 176.121 289.585 l
159.621 289.585 l h
-218.871 293.71 m 218.871 297.835 l 210.621 297.835 l 210.621 306.085 l
+218.871 293.71 m 218.871 297.835 l 210.621 297.835 l 210.621 306.085 l
227.121 306.085 l 227.121 289.585 l 218.871 289.585 l h
354.621 293.335 m 354.621 297.085 l 362.871 297.085 l 362.871 322.585 l
371.121 322.585 l 371.121 314.335 l 388.371 314.335 l 388.371 306.085 l
@@ -3363,13 +3430,13 @@
404.871 306.085 l 404.871 297.835 l 388.371 297.835 l 388.371 289.585 l
380.121 289.585 l 380.121 306.085 l 371.121 306.085 l 371.121 289.585 l
354.621 289.585 l h
-134.121 301.96 m 134.121 306.085 l 158.871 306.085 l 158.871 297.835 l
+134.121 301.96 m 134.121 306.085 l 158.871 306.085 l 158.871 297.835 l
134.121 297.835 l h
-176.871 301.96 m 176.871 306.085 l 193.371 306.085 l 193.371 297.835 l
+176.871 301.96 m 176.871 306.085 l 193.371 306.085 l 193.371 297.835 l
176.871 297.835 l h
-329.121 301.96 m 329.121 306.085 l 337.371 306.085 l 337.371 297.835 l
+329.121 301.96 m 329.121 306.085 l 337.371 306.085 l 337.371 297.835 l
329.121 297.835 l h
-346.371 301.96 m 346.371 306.085 l 353.871 306.085 l 353.871 297.835 l
+346.371 301.96 m 346.371 306.085 l 353.871 306.085 l 353.871 297.835 l
346.371 297.835 l h
202.371 314.335 m 202.371 322.585 l 209.871 322.585 l 209.871 306.085 l
202.371 306.085 l h
@@ -3376,7 +3443,7 @@
338.121 318.835 m 338.121 331.585 l 345.621 331.585 l 345.621 322.585 l
353.871 322.585 l 353.871 315.085 l 345.621 315.085 l 345.621 306.085 l
338.121 306.085 l h
-405.621 310.21 m 405.621 314.335 l 413.871 314.335 l 413.871 339.835 l
+405.621 310.21 m 405.621 314.335 l 413.871 314.335 l 413.871 339.835 l
431.121 339.835 l 431.121 348.085 l 438.543 348.085 l 438.996 340.21 l 443.309
339.987 l 447.621 339.761 l 447.621 315.085 l 439.371 315.085 l 439.371
323.335 l 422.121 323.335 l 422.121 306.085 l 405.621 306.085 l h
@@ -3388,7 +3455,7 @@
167.871 315.085 l h
185.121 318.835 m 185.121 322.585 l 193.371 322.585 l 193.371 315.085 l
185.121 315.085 l h
-244.371 319.21 m 244.371 323.335 l 236.121 323.335 l 236.121 331.585 l
+244.371 319.21 m 244.371 323.335 l 236.121 323.335 l 236.121 331.585 l
244.371 331.585 l 244.371 339.835 l 252.621 339.835 l 252.621 335.71 l 252.621
331.812 252.723 331.585 254.496 331.585 c 256.27 331.585 256.371 331.359
256.371 327.46 c 256.371 323.562 256.266 323.335 254.496 323.335 c 252.723
@@ -3399,35 +3466,35 @@
327.246 315.085 c 325.496 315.085 325.371 315.335 325.371 318.835 c h
388.371 318.835 m 388.371 322.585 l 397.371 322.585 l 397.371 331.585 l
404.871 331.585 l 404.871 315.085 l 388.371 315.085 l h
-193.371 327.46 m 193.371 331.585 l 185.121 331.585 l 185.121 339.835 l
-193.371 339.835 l 193.371 331.585 l 201.621 331.585 l 201.621 323.335 l
+193.371 327.46 m 193.371 331.585 l 185.121 331.585 l 185.121 339.835 l
+193.371 339.835 l 193.371 331.585 l 201.621 331.585 l 201.621 323.335 l
193.371 323.335 l h
210.621 331.585 m 210.621 339.835 l 218.871 339.835 l 218.871 331.585 l
227.121 331.585 l 227.121 323.335 l 210.621 323.335 l h
-329.121 335.71 m 329.121 339.835 l 337.371 339.835 l 337.371 331.585 l
+329.121 335.71 m 329.121 339.835 l 337.371 339.835 l 337.371 331.585 l
329.121 331.585 l h
-362.871 335.71 m 362.871 339.835 l 379.371 339.835 l 379.371 331.585 l
+362.871 335.71 m 362.871 339.835 l 379.371 339.835 l 379.371 331.585 l
362.871 331.585 l h
-388.371 340.21 m 388.371 348.835 l 371.871 348.835 l 371.871 356.335 l
-388.371 356.335 l 388.371 365.335 l 380.121 365.335 l 380.121 373.585 l
-397.371 373.585 l 397.371 381.835 l 404.871 381.835 l 404.871 365.335 l
-413.871 365.335 l 413.871 357.085 l 396.621 357.085 l 396.621 348.085 l
-413.871 348.085 l 413.871 340.585 l 396.621 340.585 l 396.621 331.585 l
+388.371 340.21 m 388.371 348.835 l 371.871 348.835 l 371.871 356.335 l
+388.371 356.335 l 388.371 365.335 l 380.121 365.335 l 380.121 373.585 l
+397.371 373.585 l 397.371 381.835 l 404.871 381.835 l 404.871 365.335 l
+413.871 365.335 l 413.871 357.085 l 396.621 357.085 l 396.621 348.085 l
+413.871 348.085 l 413.871 340.585 l 396.621 340.585 l 396.621 331.585 l
388.371 331.585 l h
134.121 344.335 m 134.121 348.085 l 142.371 348.085 l 142.371 340.585 l
134.121 340.585 l h
159.621 344.335 m 159.621 348.085 l 167.871 348.085 l 167.871 340.585 l
159.621 340.585 l h
-176.871 348.46 m 176.871 356.335 l 209.871 356.335 l 209.871 348.835 l
-201.621 348.835 l 201.621 340.585 l 193.371 340.585 l 193.371 348.909 l
+176.871 348.46 m 176.871 356.335 l 209.871 356.335 l 209.871 348.835 l
+201.621 348.835 l 201.621 340.585 l 193.371 340.585 l 193.371 348.909 l
189.059 348.687 l 184.746 348.46 l 184.293 340.585 l 176.871 340.585 l h
-218.871 352.96 m 218.871 365.335 l 202.371 365.335 l 202.371 382.585 l
-185.121 382.585 l 185.121 390.835 l 202.371 390.835 l 202.371 399.085 l
-210.621 399.085 l 210.621 407.335 l 218.871 407.335 l 218.871 381.835 l
-235.371 381.835 l 235.371 374.335 l 227.121 374.335 l 227.121 365.335 l
-244.371 365.335 l 244.371 373.585 l 252.621 373.585 l 252.621 365.335 l
+218.871 352.96 m 218.871 365.335 l 202.371 365.335 l 202.371 382.585 l
+185.121 382.585 l 185.121 390.835 l 202.371 390.835 l 202.371 399.085 l
+210.621 399.085 l 210.621 407.335 l 218.871 407.335 l 218.871 381.835 l
+235.371 381.835 l 235.371 374.335 l 227.121 374.335 l 227.121 365.335 l
+244.371 365.335 l 244.371 373.585 l 252.621 373.585 l 252.621 365.335 l
244.371 365.335 l 244.371 356.261 l 248.684 356.487 l 252.996 356.71 l 253.219
- 361.023 l 253.445 365.335 l 260.797 365.335 l 261.02 361.023 l 261.246
+ 361.023 l 253.445 365.335 l 260.797 365.335 l 261.02 361.023 l 261.246
356.71 l 278.121 356.288 l 278.121 373.585 l 286.371 373.585 l 286.371 365.335
l 294.621 365.335 l 294.621 357.085 l 290.496 357.085 l 286.594 357.085
286.371 356.984 286.371 355.21 c 286.371 353.335 l 272.547 353.335 l 260.984
@@ -3443,8 +3510,8 @@
354.621 340.585 l h
413.871 352.585 m 413.871 356.335 l 422.121 356.335 l 422.121 348.835 l
413.871 348.835 l h
-439.371 352.96 m 439.371 357.085 l 431.121 357.085 l 431.121 365.335 l
-439.371 365.335 l 439.371 374.335 l 430.371 374.335 l 430.371 365.335 l
+439.371 352.96 m 439.371 357.085 l 431.121 357.085 l 431.121 365.335 l
+439.371 365.335 l 439.371 374.335 l 430.371 374.335 l 430.371 365.335 l
422.945 365.335 l 422.719 369.648 l 422.496 373.96 l 418.184 374.187 l 413.871
374.409 l 413.871 381.835 l 431.121 381.835 l 431.121 390.835 l 413.871
390.835 l 413.871 382.585 l 405.621 382.585 l 405.621 390.835 l 396.621
@@ -3453,15 +3520,15 @@
399.835 l 362.871 416.335 l 354.621 416.335 l 354.621 424.585 l 362.871
424.585 l 362.871 416.335 l 371.121 416.335 l 371.121 407.335 l 379.371
407.335 l 379.371 399.085 l 413.871 399.085 l 413.871 407.335 l 430.371
- 407.335 l 430.371 399.085 l 438.57 399.085 l 438.781 390.648 l 438.996
+ 407.335 l 430.371 399.085 l 438.57 399.085 l 438.781 390.648 l 438.996
382.21 l 443.309 381.987 l 447.621 381.761 l 447.621 348.835 l 439.371 348.835
l h
295.371 354.835 m 295.371 356.276 295.871 356.335 307.746 356.335 c 319.621
356.335 320.121 356.276 320.121 354.835 c 320.121 353.398 319.621 353.335
307.746 353.335 c 295.871 353.335 295.371 353.398 295.371 354.835 c h
-143.121 361.21 m 143.121 365.335 l 150.621 365.335 l 150.621 357.085 l
+143.121 361.21 m 143.121 365.335 l 150.621 365.335 l 150.621 357.085 l
143.121 357.085 l h
-134.121 369.46 m 134.121 373.585 l 142.371 373.585 l 142.371 365.335 l
+134.121 369.46 m 134.121 373.585 l 142.371 373.585 l 142.371 365.335 l
134.121 365.335 l h
168.371 365.835 m 168.094 366.109 167.871 368.136 167.871 370.335 c 167.871
374.335 l 159.621 374.335 l 159.621 381.835 l 167.871 381.835 l 167.871
@@ -3468,10 +3535,10 @@
399.835 l 159.621 399.835 l 159.621 407.335 l 176.121 407.335 l 176.121
373.585 l 193.371 373.585 l 193.371 365.335 l 181.121 365.335 l 174.383
365.335 168.645 365.562 168.371 365.835 c h
-295.371 386.71 m 295.371 408.085 l 286.371 408.085 l 286.371 390.835 l
-278.121 390.835 l 278.121 382.585 l 269.871 382.585 l 269.871 390.835 l
-278.121 390.835 l 278.121 416.335 l 269.871 416.335 l 269.871 424.585 l
-278.121 424.585 l 278.121 416.335 l 287.195 416.335 l 286.969 420.648 l
+295.371 386.71 m 295.371 408.085 l 286.371 408.085 l 286.371 390.835 l
+278.121 390.835 l 278.121 382.585 l 269.871 382.585 l 269.871 390.835 l
+278.121 390.835 l 278.121 416.335 l 269.871 416.335 l 269.871 424.585 l
+278.121 424.585 l 278.121 416.335 l 287.195 416.335 l 286.969 420.648 l
286.746 424.96 l 282.434 425.187 l 278.121 425.409 l 278.121 432.835 l 287.121
432.835 l 287.121 441.835 l 278.121 441.835 l 278.121 433.585 l 269.871
433.585 l 269.871 441.835 l 261.621 441.835 l 261.621 458.335 l 269.871
@@ -3481,31 +3548,31 @@
450.085 l 303.621 458.335 l 320.871 458.335 l 320.871 475.585 l 329.121
475.585 l 329.121 450.909 l 324.809 450.687 l 320.496 450.46 l 320.27 446.148
l 320.047 441.835 l 338.121 441.835 l 338.121 450.085 l 345.621 450.085
- l 345.621 432.835 l 353.871 432.835 l 353.871 425.413 l 345.996 424.96
+ l 345.621 432.835 l 353.871 432.835 l 353.871 425.413 l 345.996 424.96
l 345.77 420.648 l 345.547 416.335 l 338.195 416.335 l 337.969 420.648 l
- 337.746 424.96 l 333.434 425.187 l 329.121 425.409 l 329.121 433.585 l
-320.121 433.585 l 320.121 425.335 l 312.621 425.335 l 312.621 433.585 l
-294.621 433.585 l 294.621 416.335 l 303.621 416.335 l 303.621 424.585 l
-311.871 424.585 l 311.871 416.335 l 320.121 416.335 l 320.121 408.085 l
-311.871 408.085 l 311.871 382.585 l 303.621 382.585 l 303.621 365.335 l
+ 337.746 424.96 l 333.434 425.187 l 329.121 425.409 l 329.121 433.585 l
+320.121 433.585 l 320.121 425.335 l 312.621 425.335 l 312.621 433.585 l
+294.621 433.585 l 294.621 416.335 l 303.621 416.335 l 303.621 424.585 l
+311.871 424.585 l 311.871 416.335 l 320.121 416.335 l 320.121 408.085 l
+311.871 408.085 l 311.871 382.585 l 303.621 382.585 l 303.621 365.335 l
295.371 365.335 l h
143.121 378.085 m 143.121 381.835 l 150.621 381.835 l 150.621 374.335 l
143.121 374.335 l h
-253.371 386.71 m 253.371 399.085 l 269.121 399.085 l 269.121 390.835 l
+253.371 386.71 m 253.371 399.085 l 269.121 399.085 l 269.121 390.835 l
260.871 390.835 l 260.871 374.335 l 253.371 374.335 l h
312.621 378.085 m 312.621 381.835 l 320.121 381.835 l 320.121 374.335 l
312.621 374.335 l h
-151.371 386.71 m 151.371 390.835 l 158.871 390.835 l 158.871 382.585 l
+151.371 386.71 m 151.371 390.835 l 158.871 390.835 l 158.871 382.585 l
151.371 382.585 l h
-320.871 386.71 m 320.871 390.835 l 337.371 390.835 l 337.371 382.585 l
+320.871 386.71 m 320.871 390.835 l 337.371 390.835 l 337.371 382.585 l
320.871 382.585 l h
-346.371 386.71 m 346.371 390.835 l 353.871 390.835 l 353.871 382.585 l
+346.371 386.71 m 346.371 390.835 l 353.871 390.835 l 353.871 382.585 l
346.371 382.585 l h
-134.121 394.96 m 134.121 399.085 l 150.621 399.085 l 150.621 390.835 l
+134.121 394.96 m 134.121 399.085 l 150.621 399.085 l 150.621 390.835 l
134.121 390.835 l h
-227.871 394.96 m 227.871 399.085 l 244.371 399.085 l 244.371 390.835 l
+227.871 394.96 m 227.871 399.085 l 244.371 399.085 l 244.371 390.835 l
227.871 390.835 l h
-354.621 394.96 m 354.621 399.085 l 362.871 399.085 l 362.871 390.835 l
+354.621 394.96 m 354.621 399.085 l 362.871 399.085 l 362.871 390.835 l
354.621 390.835 l h
185.121 403.585 m 185.121 407.335 l 201.621 407.335 l 201.621 399.835 l
185.121 399.835 l h
@@ -3513,35 +3580,35 @@
329.121 424.585 l 329.121 416.335 l 337.371 416.335 l 337.371 407.335 l
346.371 407.335 l 346.371 416.335 l 353.871 416.335 l 353.871 399.835 l
329.121 399.835 l h
-227.871 412.21 m 227.871 416.335 l 236.121 416.335 l 236.121 432.835 l
-244.371 432.835 l 244.371 416.335 l 253.371 416.335 l 253.371 432.835 l
+227.871 412.21 m 227.871 416.335 l 236.121 416.335 l 236.121 432.835 l
+244.371 432.835 l 244.371 416.335 l 253.371 416.335 l 253.371 432.835 l
260.871 432.835 l 260.871 408.085 l 227.871 408.085 l h
-134.121 445.96 m 134.121 475.585 l 193.371 475.585 l 193.371 416.335 l
+134.121 445.96 m 134.121 475.585 l 193.371 475.585 l 193.371 416.335 l
134.121 416.335 l h
-185.121 445.96 m 185.121 467.335 l 142.371 467.335 l 142.371 424.585 l
+185.121 445.96 m 185.121 467.335 l 142.371 467.335 l 142.371 424.585 l
185.121 424.585 l h
-151.371 445.96 m 151.371 458.335 l 176.121 458.335 l 176.121 433.585 l
+151.371 445.96 m 151.371 458.335 l 176.121 458.335 l 176.121 433.585 l
151.371 433.585 l h
-202.371 420.46 m 202.371 424.585 l 209.871 424.585 l 209.871 416.335 l
+202.371 420.46 m 202.371 424.585 l 209.871 424.585 l 209.871 416.335 l
202.371 416.335 l h
218.871 424.585 m 218.871 432.835 l 227.121 432.835 l 227.121 416.335 l
218.871 416.335 l h
-371.719 420.648 m 371.496 424.96 l 367.184 425.187 l 362.871 425.409 l
-362.871 432.835 l 371.871 432.835 l 371.871 441.835 l 379.371 441.835 l
+371.719 420.648 m 371.496 424.96 l 367.184 425.187 l 362.871 425.409 l
+362.871 432.835 l 371.871 432.835 l 371.871 441.835 l 379.371 441.835 l
379.371 416.335 l 371.945 416.335 l h
-388.371 445.96 m 388.371 475.585 l 447.621 475.585 l 447.621 416.335 l
+388.371 445.96 m 388.371 475.585 l 447.621 475.585 l 447.621 416.335 l
388.371 416.335 l h
-439.371 445.96 m 439.371 467.335 l 396.621 467.335 l 396.621 424.585 l
+439.371 445.96 m 439.371 467.335 l 396.621 467.335 l 396.621 424.585 l
439.371 424.585 l h
-405.621 445.96 m 405.621 458.335 l 430.371 458.335 l 430.371 433.585 l
+405.621 445.96 m 405.621 458.335 l 430.371 458.335 l 430.371 433.585 l
405.621 433.585 l h
-210.621 437.71 m 210.621 441.835 l 218.871 441.835 l 218.871 450.085 l
-227.871 450.085 l 227.871 467.335 l 218.871 467.335 l 218.871 475.585 l
-235.371 475.585 l 235.371 458.335 l 244.371 458.335 l 244.371 441.835 l
+210.621 437.71 m 210.621 441.835 l 218.871 441.835 l 218.871 450.085 l
+227.871 450.085 l 227.871 467.335 l 218.871 467.335 l 218.871 475.585 l
+235.371 475.585 l 235.371 458.335 l 244.371 458.335 l 244.371 441.835 l
218.871 441.835 l 218.871 433.585 l 210.621 433.585 l h
202.371 450.085 m 202.371 458.335 l 209.871 458.335 l 209.871 441.835 l
202.371 441.835 l h
-346.371 454.96 m 346.371 459.085 l 338.121 459.085 l 338.121 466.507 l
+346.371 454.96 m 346.371 459.085 l 338.121 459.085 l 338.121 466.507 l
345.996 466.96 l 346.219 471.273 l 346.445 475.585 l 353.871 475.585 l 353.871
450.835 l 346.371 450.835 l h
362.871 454.585 m 362.871 458.335 l 371.121 458.335 l 371.121 450.835 l
@@ -3550,9 +3617,9 @@
210.621 459.085 l h
295.371 462.835 m 295.371 466.585 l 303.621 466.585 l 303.621 459.085 l
295.371 459.085 l h
-244.371 471.46 m 244.371 475.585 l 252.621 475.585 l 252.621 467.335 l
+244.371 471.46 m 244.371 475.585 l 252.621 475.585 l 252.621 467.335 l
244.371 467.335 l h
-303.621 471.46 m 303.621 475.585 l 311.871 475.585 l 311.871 467.335 l
+303.621 471.46 m 303.621 475.585 l 311.871 475.585 l 311.871 467.335 l
303.621 467.335 l h
303.621 471.46 m f
Q Q
@@ -3635,36 +3702,36 @@
%%EndPageSetup
q 134 161 314 315 rectclip q
0 g
-134.121 191.71 m 134.121 221.335 l 193.371 221.335 l 193.371 162.085 l
+134.121 191.71 m 134.121 221.335 l 193.371 221.335 l 193.371 162.085 l
134.121 162.085 l h
-185.121 191.71 m 185.121 213.085 l 142.371 213.085 l 142.371 170.335 l
+185.121 191.71 m 185.121 213.085 l 142.371 213.085 l 142.371 170.335 l
185.121 170.335 l h
-151.371 191.71 m 151.371 204.085 l 176.121 204.085 l 176.121 179.335 l
+151.371 191.71 m 151.371 204.085 l 176.121 204.085 l 176.121 179.335 l
151.371 179.335 l h
-210.621 166.21 m 210.621 170.335 l 227.121 170.335 l 227.121 162.085 l
+210.621 166.21 m 210.621 170.335 l 227.121 170.335 l 227.121 162.085 l
210.621 162.085 l h
-236.121 166.21 m 236.121 170.335 l 244.371 170.335 l 244.371 179.335 l
-235.371 179.335 l 235.371 171.085 l 227.871 171.085 l 227.871 195.835 l
-244.371 195.835 l 244.371 221.335 l 227.871 221.335 l 227.871 229.585 l
+236.121 166.21 m 236.121 170.335 l 244.371 170.335 l 244.371 179.335 l
+235.371 179.335 l 235.371 171.085 l 227.871 171.085 l 227.871 195.835 l
+244.371 195.835 l 244.371 221.335 l 227.871 221.335 l 227.871 229.585 l
252.621 229.585 l 252.621 221.335 l 269.047 221.335 l 269.27 217.023 l 269.496
- 212.71 l 273.809 212.484 l 278.121 212.261 l 278.121 221.335 l 269.871
-221.335 l 269.871 229.585 l 287.121 229.585 l 287.121 246.835 l 295.371
-246.835 l 295.371 255.085 l 303.621 255.085 l 303.621 246.835 l 311.871
-246.835 l 311.871 238.585 l 294.621 238.585 l 294.621 229.585 l 329.121
-229.585 l 329.121 237.835 l 337.371 237.835 l 337.371 221.335 l 320.121
-221.335 l 320.121 204.835 l 312.621 204.835 l 312.621 221.335 l 303.621
-221.335 l 303.621 213.085 l 294.621 213.085 l 294.621 195.835 l 287.121
-195.835 l 287.121 204.835 l 261.621 204.835 l 261.621 213.085 l 252.621
-213.085 l 252.621 204.085 l 260.871 204.085 l 260.871 195.835 l 269.121
-195.835 l 269.121 187.585 l 253.371 187.585 l 253.371 195.835 l 244.371
-195.835 l 244.371 186.835 l 252.621 186.835 l 252.621 170.335 l 269.871
-170.335 l 269.871 178.585 l 278.121 178.585 l 278.121 162.085 l 236.121
+ 212.71 l 273.809 212.484 l 278.121 212.261 l 278.121 221.335 l 269.871
+221.335 l 269.871 229.585 l 287.121 229.585 l 287.121 246.835 l 295.371
+246.835 l 295.371 255.085 l 303.621 255.085 l 303.621 246.835 l 311.871
+246.835 l 311.871 238.585 l 294.621 238.585 l 294.621 229.585 l 329.121
+229.585 l 329.121 237.835 l 337.371 237.835 l 337.371 221.335 l 320.121
+221.335 l 320.121 204.835 l 312.621 204.835 l 312.621 221.335 l 303.621
+221.335 l 303.621 213.085 l 294.621 213.085 l 294.621 195.835 l 287.121
+195.835 l 287.121 204.835 l 261.621 204.835 l 261.621 213.085 l 252.621
+213.085 l 252.621 204.085 l 260.871 204.085 l 260.871 195.835 l 269.121
+195.835 l 269.121 187.585 l 253.371 187.585 l 253.371 195.835 l 244.371
+195.835 l 244.371 186.835 l 252.621 186.835 l 252.621 170.335 l 269.871
+170.335 l 269.871 178.585 l 278.121 178.585 l 278.121 162.085 l 236.121
162.085 l h
287.121 170.335 m 287.121 178.585 l 295.371 178.585 l 295.371 186.835 l
320.121 186.835 l 320.121 179.335 l 303.621 179.335 l 303.621 171.159 l
299.309 170.937 l 294.996 170.71 l 294.77 166.398 l 294.547 162.085 l 287.121
162.085 l h
-303.621 166.21 m 303.621 170.335 l 311.871 170.335 l 311.871 162.085 l
+303.621 166.21 m 303.621 170.335 l 311.871 170.335 l 311.871 162.085 l
303.621 162.085 l h
329.121 166.585 m 329.121 171.085 l 320.871 171.085 l 320.871 178.585 l
329.121 178.585 l 329.121 187.585 l 320.871 187.585 l 320.871 204.085 l
@@ -3671,13 +3738,13 @@
329.121 204.085 l 329.121 195.835 l 337.371 195.835 l 337.371 186.835 l
345.621 186.835 l 345.621 179.335 l 337.371 179.335 l 337.371 170.335 l
353.871 170.335 l 353.871 162.085 l 329.121 162.085 l h
-362.871 166.21 m 362.871 170.335 l 371.121 170.335 l 371.121 162.085 l
+362.871 166.21 m 362.871 170.335 l 371.121 170.335 l 371.121 162.085 l
362.871 162.085 l h
388.371 170.335 m 388.371 178.585 l 405.621 178.585 l 405.621 186.835 l
413.871 186.835 l 413.871 162.085 l 388.371 162.085 l h
-422.871 166.21 m 422.871 170.335 l 430.371 170.335 l 430.371 162.085 l
+422.871 166.21 m 422.871 170.335 l 430.371 170.335 l 430.371 162.085 l
422.871 162.085 l h
-439.371 166.21 m 439.371 170.335 l 447.621 170.335 l 447.621 162.085 l
+439.371 166.21 m 439.371 170.335 l 447.621 170.335 l 447.621 162.085 l
439.371 162.085 l h
371.871 174.835 m 371.871 178.585 l 379.371 178.585 l 379.371 171.085 l
371.871 171.085 l h
@@ -3701,9 +3768,9 @@
195.835 l 371.121 187.585 l 362.871 187.585 l h
405.621 217.23 m 405.621 230.37 l 392.684 230.167 l 379.746 229.96 l 379.539
217.023 l 379.336 204.085 l 405.621 204.085 l h
-388.371 217.21 m 388.371 221.335 l 396.621 221.335 l 396.621 213.085 l
+388.371 217.21 m 388.371 221.335 l 396.621 221.335 l 396.621 213.085 l
388.371 213.085 l h
-303.621 199.96 m 303.621 204.085 l 311.871 204.085 l 311.871 195.835 l
+303.621 199.96 m 303.621 204.085 l 311.871 204.085 l 311.871 195.835 l
303.621 195.835 l h
218.871 208.585 m 218.871 212.335 l 227.121 212.335 l 227.121 204.835 l
218.871 204.835 l h
@@ -3714,17 +3781,17 @@
271.585 l 167.871 271.585 l 167.871 280.585 l 176.871 280.585 l 176.871
288.835 l 201.621 288.835 l 201.621 272.335 l 193.371 272.335 l 193.371
280.585 l 184.297 280.585 l 184.52 276.273 l 184.746 271.96 l 189.059 271.737
- l 193.371 271.511 l 193.371 264.159 l 189.059 263.937 l 184.746 263.71
-l 184.293 255.835 l 176.121 255.835 l 176.121 246.835 l 184.297 246.835
-l 184.52 242.523 l 184.746 238.21 l 189.059 237.987 l 193.371 237.761 l
-193.371 246.835 l 185.121 246.835 l 185.121 255.085 l 193.371 255.085 l
-193.371 263.335 l 218.871 263.335 l 218.871 255.909 l 214.559 255.687 l
+ l 193.371 271.511 l 193.371 264.159 l 189.059 263.937 l 184.746 263.71
+l 184.293 255.835 l 176.121 255.835 l 176.121 246.835 l 184.297 246.835
+l 184.52 242.523 l 184.746 238.21 l 189.059 237.987 l 193.371 237.761 l
+193.371 246.835 l 185.121 246.835 l 185.121 255.085 l 193.371 255.085 l
+193.371 263.335 l 218.871 263.335 l 218.871 255.909 l 214.559 255.687 l
210.246 255.46 l 210.02 251.148 l 209.797 246.835 l 201.621 246.835 l 201.621
237.835 l 209.871 237.835 l 209.871 221.335 l 218.871 221.335 l 218.871
213.085 l 202.418 213.085 l h
-338.121 217.21 m 338.121 221.335 l 353.871 221.335 l 353.871 213.085 l
+338.121 217.21 m 338.121 221.335 l 353.871 221.335 l 353.871 213.085 l
338.121 213.085 l h
-439.371 217.21 m 439.371 221.335 l 447.621 221.335 l 447.621 213.085 l
+439.371 217.21 m 439.371 221.335 l 447.621 221.335 l 447.621 213.085 l
439.371 213.085 l h
134.121 259.585 m 134.121 288.835 l 158.871 288.835 l 158.871 280.585 l
150.621 280.585 l 150.621 272.335 l 142.371 272.335 l 142.371 263.335 l
@@ -3737,13 +3804,13 @@
218.871 230.335 l h
439.371 234.085 m 439.371 237.835 l 447.621 237.835 l 447.621 230.335 l
439.371 230.335 l h
-236.121 242.71 m 236.121 246.835 l 244.371 246.835 l 244.371 255.085 l
+236.121 242.71 m 236.121 246.835 l 244.371 246.835 l 244.371 255.085 l
252.621 255.085 l 252.621 238.585 l 236.121 238.585 l h
338.121 255.085 m 338.121 271.585 l 345.621 271.585 l 345.621 263.335 l
- 353.871 263.335 l 353.871 255.913 l 345.996 255.46 l 345.781 247.023 l
+ 353.871 263.335 l 353.871 255.913 l 345.996 255.46 l 345.781 247.023 l
345.57 238.585 l 338.121 238.585 l h
227.871 255.085 m 227.871 263.335 l 244.371 263.335 l 244.371 255.909 l
- 240.059 255.687 l 235.746 255.46 l 235.293 246.835 l 227.871 246.835 l
+ 240.059 255.687 l 235.746 255.46 l 235.293 246.835 l 227.871 246.835 l
h
261.469 251.148 m 261.246 255.46 l 253.418 255.913 l 252.996 271.96 l 244.559
272.171 l 236.121 272.386 l 236.121 280.585 l 227.871 280.585 l 227.871
@@ -3750,11 +3817,11 @@
288.835 l 236.121 288.835 l 236.121 306.085 l 227.871 306.085 l 227.871
314.335 l 244.371 314.335 l 244.371 306.085 l 256.371 306.085 l 256.371
297.835 l 244.371 297.835 l 244.371 288.835 l 252.621 288.835 l 252.621
- 280.585 l 260.793 280.585 l 261.246 271.96 l 269.121 271.507 l 269.121
+ 280.585 l 260.793 280.585 l 261.246 271.96 l 269.121 271.507 l 269.121
255.085 l 278.121 255.085 l 278.121 246.835 l 261.695 246.835 l h
-320.871 250.96 m 320.871 255.085 l 329.121 255.085 l 329.121 246.835 l
+320.871 250.96 m 320.871 255.085 l 329.121 255.085 l 329.121 246.835 l
320.871 246.835 l h
-371.871 250.96 m 371.871 255.085 l 379.371 255.085 l 379.371 246.835 l
+371.871 250.96 m 371.871 255.085 l 379.371 255.085 l 379.371 246.835 l
371.871 246.835 l h
431.121 255.085 m 431.121 263.335 l 438.621 263.335 l 438.621 246.835 l
431.121 246.835 l h
@@ -3769,24 +3836,24 @@
362.871 255.835 l h
380.121 259.585 m 380.121 263.335 l 388.371 263.335 l 388.371 255.835 l
380.121 255.835 l h
-312.621 268.21 m 312.621 272.335 l 278.121 272.335 l 278.121 280.585 l
+312.621 268.21 m 312.621 272.335 l 278.121 272.335 l 278.121 280.585 l
273.996 280.585 l 270.094 280.585 269.871 280.687 269.871 282.46 c 269.871
284.234 270.094 284.335 273.996 284.335 c 277.895 284.335 278.121 284.234
- 278.121 282.46 c 278.121 280.585 l 320.871 280.585 l 320.871 282.296 l
+ 278.121 282.46 c 278.121 280.585 l 320.871 280.585 l 320.871 282.296 l
320.871 283.507 321.527 284.253 323.121 284.855 c 324.609 285.417 325.371
286.222 325.371 287.241 c 325.371 288.644 325.895 288.792 331.559 288.991
- c 337.746 289.21 l 338.199 297.085 l 345.621 297.085 l 345.621 288.835
-l 353.871 288.835 l 353.871 280.585 l 329.121 280.585 l 329.121 264.085
+ c 337.746 289.21 l 338.199 297.085 l 345.621 297.085 l 345.621 288.835
+l 353.871 288.835 l 353.871 280.585 l 329.121 280.585 l 329.121 264.085
l 312.621 264.085 l h
-413.871 280.585 m 413.871 297.085 l 438.543 297.085 l 438.996 289.21 l
-443.309 288.987 l 447.621 288.761 l 447.621 264.085 l 439.371 264.085 l
-439.371 272.335 l 431.121 272.335 l 431.121 289.585 l 422.074 289.585 l
+413.871 280.585 m 413.871 297.085 l 438.543 297.085 l 438.996 289.21 l
+443.309 288.987 l 447.621 288.761 l 447.621 264.085 l 439.371 264.085 l
+439.371 272.335 l 431.121 272.335 l 431.121 289.585 l 422.074 289.585 l
422.496 271.96 l 430.371 271.507 l 430.371 264.085 l 413.871 264.085 l h
-210.621 276.46 m 210.621 280.585 l 218.871 280.585 l 218.871 272.335 l
+210.621 276.46 m 210.621 280.585 l 218.871 280.585 l 218.871 272.335 l
210.621 272.335 l h
159.621 293.335 m 159.621 297.085 l 176.121 297.085 l 176.121 289.585 l
159.621 289.585 l h
-218.871 293.71 m 218.871 297.835 l 210.621 297.835 l 210.621 306.085 l
+218.871 293.71 m 218.871 297.835 l 210.621 297.835 l 210.621 306.085 l
227.121 306.085 l 227.121 289.585 l 218.871 289.585 l h
354.621 293.335 m 354.621 297.085 l 362.871 297.085 l 362.871 322.585 l
371.121 322.585 l 371.121 314.335 l 388.371 314.335 l 388.371 306.085 l
@@ -3793,13 +3860,13 @@
404.871 306.085 l 404.871 297.835 l 388.371 297.835 l 388.371 289.585 l
380.121 289.585 l 380.121 306.085 l 371.121 306.085 l 371.121 289.585 l
354.621 289.585 l h
-134.121 301.96 m 134.121 306.085 l 158.871 306.085 l 158.871 297.835 l
+134.121 301.96 m 134.121 306.085 l 158.871 306.085 l 158.871 297.835 l
134.121 297.835 l h
-176.871 301.96 m 176.871 306.085 l 193.371 306.085 l 193.371 297.835 l
+176.871 301.96 m 176.871 306.085 l 193.371 306.085 l 193.371 297.835 l
176.871 297.835 l h
-329.121 301.96 m 329.121 306.085 l 337.371 306.085 l 337.371 297.835 l
+329.121 301.96 m 329.121 306.085 l 337.371 306.085 l 337.371 297.835 l
329.121 297.835 l h
-346.371 301.96 m 346.371 306.085 l 353.871 306.085 l 353.871 297.835 l
+346.371 301.96 m 346.371 306.085 l 353.871 306.085 l 353.871 297.835 l
346.371 297.835 l h
202.371 314.335 m 202.371 322.585 l 209.871 322.585 l 209.871 306.085 l
202.371 306.085 l h
@@ -3806,7 +3873,7 @@
338.121 318.835 m 338.121 331.585 l 345.621 331.585 l 345.621 322.585 l
353.871 322.585 l 353.871 315.085 l 345.621 315.085 l 345.621 306.085 l
338.121 306.085 l h
-405.621 310.21 m 405.621 314.335 l 413.871 314.335 l 413.871 339.835 l
+405.621 310.21 m 405.621 314.335 l 413.871 314.335 l 413.871 339.835 l
431.121 339.835 l 431.121 348.085 l 438.543 348.085 l 438.996 340.21 l 443.309
339.987 l 447.621 339.761 l 447.621 315.085 l 439.371 315.085 l 439.371
323.335 l 422.121 323.335 l 422.121 306.085 l 405.621 306.085 l h
@@ -3818,7 +3885,7 @@
167.871 315.085 l h
185.121 318.835 m 185.121 322.585 l 193.371 322.585 l 193.371 315.085 l
185.121 315.085 l h
-244.371 319.21 m 244.371 323.335 l 236.121 323.335 l 236.121 331.585 l
+244.371 319.21 m 244.371 323.335 l 236.121 323.335 l 236.121 331.585 l
244.371 331.585 l 244.371 339.835 l 252.621 339.835 l 252.621 335.71 l 252.621
331.812 252.723 331.585 254.496 331.585 c 256.27 331.585 256.371 331.359
256.371 327.46 c 256.371 323.562 256.266 323.335 254.496 323.335 c 252.723
@@ -3829,35 +3896,35 @@
327.246 315.085 c 325.496 315.085 325.371 315.335 325.371 318.835 c h
388.371 318.835 m 388.371 322.585 l 397.371 322.585 l 397.371 331.585 l
404.871 331.585 l 404.871 315.085 l 388.371 315.085 l h
-193.371 327.46 m 193.371 331.585 l 185.121 331.585 l 185.121 339.835 l
-193.371 339.835 l 193.371 331.585 l 201.621 331.585 l 201.621 323.335 l
+193.371 327.46 m 193.371 331.585 l 185.121 331.585 l 185.121 339.835 l
+193.371 339.835 l 193.371 331.585 l 201.621 331.585 l 201.621 323.335 l
193.371 323.335 l h
210.621 331.585 m 210.621 339.835 l 218.871 339.835 l 218.871 331.585 l
227.121 331.585 l 227.121 323.335 l 210.621 323.335 l h
-329.121 335.71 m 329.121 339.835 l 337.371 339.835 l 337.371 331.585 l
+329.121 335.71 m 329.121 339.835 l 337.371 339.835 l 337.371 331.585 l
329.121 331.585 l h
-362.871 335.71 m 362.871 339.835 l 379.371 339.835 l 379.371 331.585 l
+362.871 335.71 m 362.871 339.835 l 379.371 339.835 l 379.371 331.585 l
362.871 331.585 l h
-388.371 340.21 m 388.371 348.835 l 371.871 348.835 l 371.871 356.335 l
-388.371 356.335 l 388.371 365.335 l 380.121 365.335 l 380.121 373.585 l
-397.371 373.585 l 397.371 381.835 l 404.871 381.835 l 404.871 365.335 l
-413.871 365.335 l 413.871 357.085 l 396.621 357.085 l 396.621 348.085 l
-413.871 348.085 l 413.871 340.585 l 396.621 340.585 l 396.621 331.585 l
+388.371 340.21 m 388.371 348.835 l 371.871 348.835 l 371.871 356.335 l
+388.371 356.335 l 388.371 365.335 l 380.121 365.335 l 380.121 373.585 l
+397.371 373.585 l 397.371 381.835 l 404.871 381.835 l 404.871 365.335 l
+413.871 365.335 l 413.871 357.085 l 396.621 357.085 l 396.621 348.085 l
+413.871 348.085 l 413.871 340.585 l 396.621 340.585 l 396.621 331.585 l
388.371 331.585 l h
134.121 344.335 m 134.121 348.085 l 142.371 348.085 l 142.371 340.585 l
134.121 340.585 l h
159.621 344.335 m 159.621 348.085 l 167.871 348.085 l 167.871 340.585 l
159.621 340.585 l h
-176.871 348.46 m 176.871 356.335 l 209.871 356.335 l 209.871 348.835 l
-201.621 348.835 l 201.621 340.585 l 193.371 340.585 l 193.371 348.909 l
+176.871 348.46 m 176.871 356.335 l 209.871 356.335 l 209.871 348.835 l
+201.621 348.835 l 201.621 340.585 l 193.371 340.585 l 193.371 348.909 l
189.059 348.687 l 184.746 348.46 l 184.293 340.585 l 176.871 340.585 l h
-218.871 352.96 m 218.871 365.335 l 202.371 365.335 l 202.371 382.585 l
-185.121 382.585 l 185.121 390.835 l 202.371 390.835 l 202.371 399.085 l
-210.621 399.085 l 210.621 407.335 l 218.871 407.335 l 218.871 381.835 l
-235.371 381.835 l 235.371 374.335 l 227.121 374.335 l 227.121 365.335 l
-244.371 365.335 l 244.371 373.585 l 252.621 373.585 l 252.621 365.335 l
+218.871 352.96 m 218.871 365.335 l 202.371 365.335 l 202.371 382.585 l
+185.121 382.585 l 185.121 390.835 l 202.371 390.835 l 202.371 399.085 l
+210.621 399.085 l 210.621 407.335 l 218.871 407.335 l 218.871 381.835 l
+235.371 381.835 l 235.371 374.335 l 227.121 374.335 l 227.121 365.335 l
+244.371 365.335 l 244.371 373.585 l 252.621 373.585 l 252.621 365.335 l
244.371 365.335 l 244.371 356.261 l 248.684 356.487 l 252.996 356.71 l 253.219
- 361.023 l 253.445 365.335 l 260.797 365.335 l 261.02 361.023 l 261.246
+ 361.023 l 253.445 365.335 l 260.797 365.335 l 261.02 361.023 l 261.246
356.71 l 278.121 356.288 l 278.121 373.585 l 286.371 373.585 l 286.371 365.335
l 294.621 365.335 l 294.621 357.085 l 290.496 357.085 l 286.594 357.085
286.371 356.984 286.371 355.21 c 286.371 353.335 l 272.547 353.335 l 260.984
@@ -3873,8 +3940,8 @@
354.621 340.585 l h
413.871 352.585 m 413.871 356.335 l 422.121 356.335 l 422.121 348.835 l
413.871 348.835 l h
-439.371 352.96 m 439.371 357.085 l 431.121 357.085 l 431.121 365.335 l
-439.371 365.335 l 439.371 374.335 l 430.371 374.335 l 430.371 365.335 l
+439.371 352.96 m 439.371 357.085 l 431.121 357.085 l 431.121 365.335 l
+439.371 365.335 l 439.371 374.335 l 430.371 374.335 l 430.371 365.335 l
422.945 365.335 l 422.719 369.648 l 422.496 373.96 l 418.184 374.187 l 413.871
374.409 l 413.871 381.835 l 431.121 381.835 l 431.121 390.835 l 413.871
390.835 l 413.871 382.585 l 405.621 382.585 l 405.621 390.835 l 396.621
@@ -3883,15 +3950,15 @@
399.835 l 362.871 416.335 l 354.621 416.335 l 354.621 424.585 l 362.871
424.585 l 362.871 416.335 l 371.121 416.335 l 371.121 407.335 l 379.371
407.335 l 379.371 399.085 l 413.871 399.085 l 413.871 407.335 l 430.371
- 407.335 l 430.371 399.085 l 438.57 399.085 l 438.781 390.648 l 438.996
+ 407.335 l 430.371 399.085 l 438.57 399.085 l 438.781 390.648 l 438.996
382.21 l 443.309 381.987 l 447.621 381.761 l 447.621 348.835 l 439.371 348.835
l h
295.371 354.835 m 295.371 356.276 295.871 356.335 307.746 356.335 c 319.621
356.335 320.121 356.276 320.121 354.835 c 320.121 353.398 319.621 353.335
307.746 353.335 c 295.871 353.335 295.371 353.398 295.371 354.835 c h
-143.121 361.21 m 143.121 365.335 l 150.621 365.335 l 150.621 357.085 l
+143.121 361.21 m 143.121 365.335 l 150.621 365.335 l 150.621 357.085 l
143.121 357.085 l h
-134.121 369.46 m 134.121 373.585 l 142.371 373.585 l 142.371 365.335 l
+134.121 369.46 m 134.121 373.585 l 142.371 373.585 l 142.371 365.335 l
134.121 365.335 l h
168.371 365.835 m 168.094 366.109 167.871 368.136 167.871 370.335 c 167.871
374.335 l 159.621 374.335 l 159.621 381.835 l 167.871 381.835 l 167.871
@@ -3898,10 +3965,10 @@
399.835 l 159.621 399.835 l 159.621 407.335 l 176.121 407.335 l 176.121
373.585 l 193.371 373.585 l 193.371 365.335 l 181.121 365.335 l 174.383
365.335 168.645 365.562 168.371 365.835 c h
-295.371 386.71 m 295.371 408.085 l 286.371 408.085 l 286.371 390.835 l
-278.121 390.835 l 278.121 382.585 l 269.871 382.585 l 269.871 390.835 l
-278.121 390.835 l 278.121 416.335 l 269.871 416.335 l 269.871 424.585 l
-278.121 424.585 l 278.121 416.335 l 287.195 416.335 l 286.969 420.648 l
+295.371 386.71 m 295.371 408.085 l 286.371 408.085 l 286.371 390.835 l
+278.121 390.835 l 278.121 382.585 l 269.871 382.585 l 269.871 390.835 l
+278.121 390.835 l 278.121 416.335 l 269.871 416.335 l 269.871 424.585 l
+278.121 424.585 l 278.121 416.335 l 287.195 416.335 l 286.969 420.648 l
286.746 424.96 l 282.434 425.187 l 278.121 425.409 l 278.121 432.835 l 287.121
432.835 l 287.121 441.835 l 278.121 441.835 l 278.121 433.585 l 269.871
433.585 l 269.871 441.835 l 261.621 441.835 l 261.621 458.335 l 269.871
@@ -3911,31 +3978,31 @@
450.085 l 303.621 458.335 l 320.871 458.335 l 320.871 475.585 l 329.121
475.585 l 329.121 450.909 l 324.809 450.687 l 320.496 450.46 l 320.27 446.148
l 320.047 441.835 l 338.121 441.835 l 338.121 450.085 l 345.621 450.085
- l 345.621 432.835 l 353.871 432.835 l 353.871 425.413 l 345.996 424.96
+ l 345.621 432.835 l 353.871 432.835 l 353.871 425.413 l 345.996 424.96
l 345.77 420.648 l 345.547 416.335 l 338.195 416.335 l 337.969 420.648 l
- 337.746 424.96 l 333.434 425.187 l 329.121 425.409 l 329.121 433.585 l
-320.121 433.585 l 320.121 425.335 l 312.621 425.335 l 312.621 433.585 l
-294.621 433.585 l 294.621 416.335 l 303.621 416.335 l 303.621 424.585 l
-311.871 424.585 l 311.871 416.335 l 320.121 416.335 l 320.121 408.085 l
-311.871 408.085 l 311.871 382.585 l 303.621 382.585 l 303.621 365.335 l
+ 337.746 424.96 l 333.434 425.187 l 329.121 425.409 l 329.121 433.585 l
+320.121 433.585 l 320.121 425.335 l 312.621 425.335 l 312.621 433.585 l
+294.621 433.585 l 294.621 416.335 l 303.621 416.335 l 303.621 424.585 l
+311.871 424.585 l 311.871 416.335 l 320.121 416.335 l 320.121 408.085 l
+311.871 408.085 l 311.871 382.585 l 303.621 382.585 l 303.621 365.335 l
295.371 365.335 l h
143.121 378.085 m 143.121 381.835 l 150.621 381.835 l 150.621 374.335 l
143.121 374.335 l h
-253.371 386.71 m 253.371 399.085 l 269.121 399.085 l 269.121 390.835 l
+253.371 386.71 m 253.371 399.085 l 269.121 399.085 l 269.121 390.835 l
260.871 390.835 l 260.871 374.335 l 253.371 374.335 l h
312.621 378.085 m 312.621 381.835 l 320.121 381.835 l 320.121 374.335 l
312.621 374.335 l h
-151.371 386.71 m 151.371 390.835 l 158.871 390.835 l 158.871 382.585 l
+151.371 386.71 m 151.371 390.835 l 158.871 390.835 l 158.871 382.585 l
151.371 382.585 l h
-320.871 386.71 m 320.871 390.835 l 337.371 390.835 l 337.371 382.585 l
+320.871 386.71 m 320.871 390.835 l 337.371 390.835 l 337.371 382.585 l
320.871 382.585 l h
-346.371 386.71 m 346.371 390.835 l 353.871 390.835 l 353.871 382.585 l
+346.371 386.71 m 346.371 390.835 l 353.871 390.835 l 353.871 382.585 l
346.371 382.585 l h
-134.121 394.96 m 134.121 399.085 l 150.621 399.085 l 150.621 390.835 l
+134.121 394.96 m 134.121 399.085 l 150.621 399.085 l 150.621 390.835 l
134.121 390.835 l h
-227.871 394.96 m 227.871 399.085 l 244.371 399.085 l 244.371 390.835 l
+227.871 394.96 m 227.871 399.085 l 244.371 399.085 l 244.371 390.835 l
227.871 390.835 l h
-354.621 394.96 m 354.621 399.085 l 362.871 399.085 l 362.871 390.835 l
+354.621 394.96 m 354.621 399.085 l 362.871 399.085 l 362.871 390.835 l
354.621 390.835 l h
185.121 403.585 m 185.121 407.335 l 201.621 407.335 l 201.621 399.835 l
185.121 399.835 l h
@@ -3943,35 +4010,35 @@
329.121 424.585 l 329.121 416.335 l 337.371 416.335 l 337.371 407.335 l
346.371 407.335 l 346.371 416.335 l 353.871 416.335 l 353.871 399.835 l
329.121 399.835 l h
-227.871 412.21 m 227.871 416.335 l 236.121 416.335 l 236.121 432.835 l
-244.371 432.835 l 244.371 416.335 l 253.371 416.335 l 253.371 432.835 l
+227.871 412.21 m 227.871 416.335 l 236.121 416.335 l 236.121 432.835 l
+244.371 432.835 l 244.371 416.335 l 253.371 416.335 l 253.371 432.835 l
260.871 432.835 l 260.871 408.085 l 227.871 408.085 l h
-134.121 445.96 m 134.121 475.585 l 193.371 475.585 l 193.371 416.335 l
+134.121 445.96 m 134.121 475.585 l 193.371 475.585 l 193.371 416.335 l
134.121 416.335 l h
-185.121 445.96 m 185.121 467.335 l 142.371 467.335 l 142.371 424.585 l
+185.121 445.96 m 185.121 467.335 l 142.371 467.335 l 142.371 424.585 l
185.121 424.585 l h
-151.371 445.96 m 151.371 458.335 l 176.121 458.335 l 176.121 433.585 l
+151.371 445.96 m 151.371 458.335 l 176.121 458.335 l 176.121 433.585 l
151.371 433.585 l h
-202.371 420.46 m 202.371 424.585 l 209.871 424.585 l 209.871 416.335 l
+202.371 420.46 m 202.371 424.585 l 209.871 424.585 l 209.871 416.335 l
202.371 416.335 l h
218.871 424.585 m 218.871 432.835 l 227.121 432.835 l 227.121 416.335 l
218.871 416.335 l h
-371.719 420.648 m 371.496 424.96 l 367.184 425.187 l 362.871 425.409 l
-362.871 432.835 l 371.871 432.835 l 371.871 441.835 l 379.371 441.835 l
+371.719 420.648 m 371.496 424.96 l 367.184 425.187 l 362.871 425.409 l
+362.871 432.835 l 371.871 432.835 l 371.871 441.835 l 379.371 441.835 l
379.371 416.335 l 371.945 416.335 l h
-388.371 445.96 m 388.371 475.585 l 447.621 475.585 l 447.621 416.335 l
+388.371 445.96 m 388.371 475.585 l 447.621 475.585 l 447.621 416.335 l
388.371 416.335 l h
-439.371 445.96 m 439.371 467.335 l 396.621 467.335 l 396.621 424.585 l
+439.371 445.96 m 439.371 467.335 l 396.621 467.335 l 396.621 424.585 l
439.371 424.585 l h
-405.621 445.96 m 405.621 458.335 l 430.371 458.335 l 430.371 433.585 l
+405.621 445.96 m 405.621 458.335 l 430.371 458.335 l 430.371 433.585 l
405.621 433.585 l h
-210.621 437.71 m 210.621 441.835 l 218.871 441.835 l 218.871 450.085 l
-227.871 450.085 l 227.871 467.335 l 218.871 467.335 l 218.871 475.585 l
-235.371 475.585 l 235.371 458.335 l 244.371 458.335 l 244.371 441.835 l
+210.621 437.71 m 210.621 441.835 l 218.871 441.835 l 218.871 450.085 l
+227.871 450.085 l 227.871 467.335 l 218.871 467.335 l 218.871 475.585 l
+235.371 475.585 l 235.371 458.335 l 244.371 458.335 l 244.371 441.835 l
218.871 441.835 l 218.871 433.585 l 210.621 433.585 l h
202.371 450.085 m 202.371 458.335 l 209.871 458.335 l 209.871 441.835 l
202.371 441.835 l h
-346.371 454.96 m 346.371 459.085 l 338.121 459.085 l 338.121 466.507 l
+346.371 454.96 m 346.371 459.085 l 338.121 459.085 l 338.121 466.507 l
345.996 466.96 l 346.219 471.273 l 346.445 475.585 l 353.871 475.585 l 353.871
450.835 l 346.371 450.835 l h
362.871 454.585 m 362.871 458.335 l 371.121 458.335 l 371.121 450.835 l
@@ -3980,9 +4047,9 @@
210.621 459.085 l h
295.371 462.835 m 295.371 466.585 l 303.621 466.585 l 303.621 459.085 l
295.371 459.085 l h
-244.371 471.46 m 244.371 475.585 l 252.621 475.585 l 252.621 467.335 l
+244.371 471.46 m 244.371 475.585 l 252.621 475.585 l 252.621 467.335 l
244.371 467.335 l h
-303.621 471.46 m 303.621 475.585 l 311.871 475.585 l 311.871 467.335 l
+303.621 471.46 m 303.621 475.585 l 311.871 475.585 l 311.871 467.335 l
303.621 467.335 l h
303.621 471.46 m f
Q Q
@@ -4085,11 +4152,11 @@
322.613 259.484 l 322.613 268.484 l 306.113 268.484 l 306.113 276.734 l
322.613 276.734 l 322.613 285.734 l 297.113 285.734 l 297.113 310.484 l
305.363 310.484 l 305.363 293.984 l 314.363 293.984 l 314.363 310.484 l
- 339.113 310.484 l 339.113 302.984 l 330.863 302.984 l 330.863 294.03 l
-347.738 293.609 l 348.191 285.734 l 330.863 285.734 l 330.863 276.734 l
-339.113 276.734 l 339.113 251.234 l 348.113 251.234 l 348.113 242.984 l
-356.363 242.984 l 356.363 233.984 l 364.613 233.984 l 364.613 226.484 l
-356.363 226.484 l 356.363 222.171 l 356.367 217.859 l 352.238 218.116 l
+ 339.113 310.484 l 339.113 302.984 l 330.863 302.984 l 330.863 294.03 l
+347.738 293.609 l 348.191 285.734 l 330.863 285.734 l 330.863 276.734 l
+339.113 276.734 l 339.113 251.234 l 348.113 251.234 l 348.113 242.984 l
+356.363 242.984 l 356.363 233.984 l 364.613 233.984 l 364.613 226.484 l
+356.363 226.484 l 356.363 222.171 l 356.367 217.859 l 352.238 218.116 l
348.113 218.37 l 348.113 226.484 l 339.113 226.484 l 339.113 217.484 l 348.113
217.484 l 348.113 209.234 l 297.113 209.234 l h
331.465 247.296 m 331.238 251.609 l 326.926 251.831 l 322.613 252.058 l
@@ -4096,8 +4163,8 @@
322.613 242.984 l 331.688 242.984 l h
365.363 217.484 m 365.363 225.734 l 372.863 225.734 l 372.863 217.484 l
381.863 217.484 l 381.863 209.234 l 365.363 209.234 l h
-390.863 217.484 m 390.863 225.734 l 415.613 225.734 l 415.613 218.28 l
-398.738 217.859 l 398.516 213.546 l 398.289 209.234 l 390.863 209.234 l
+390.863 217.484 m 390.863 225.734 l 415.613 225.734 l 415.613 218.28 l
+398.738 217.859 l 398.516 213.546 l 398.289 209.234 l 390.863 209.234 l
h
416.363 213.359 m 416.363 217.484 l 423.863 217.484 l 423.863 209.234 l
416.363 209.234 l h
@@ -4164,12 +4231,12 @@
182.551 285.585 l 178.238 285.359 l 177.785 277.484 l 170.363 277.484 l
170.363 302.984 l 161.363 302.984 l 161.363 277.484 l 153.113 277.484 l
h
-186.863 281.234 m 186.863 284.984 l 195.91 284.984 l 195.488 302.609 l
-191.176 302.835 l 186.863 303.058 l 186.863 310.484 l 203.363 310.484 l
-203.363 302.234 l 212.363 302.234 l 212.363 310.484 l 220.613 310.484 l
-220.613 293.984 l 228.863 293.984 l 228.863 285.734 l 212.363 285.734 l
-212.363 293.984 l 203.289 293.984 l 203.516 289.671 l 203.738 285.359 l
-208.051 285.132 l 212.363 284.909 l 212.363 277.484 l 186.863 277.484 l
+186.863 281.234 m 186.863 284.984 l 195.91 284.984 l 195.488 302.609 l
+191.176 302.835 l 186.863 303.058 l 186.863 310.484 l 203.363 310.484 l
+203.363 302.234 l 212.363 302.234 l 212.363 310.484 l 220.613 310.484 l
+220.613 293.984 l 228.863 293.984 l 228.863 285.734 l 212.363 285.734 l
+212.363 293.984 l 203.289 293.984 l 203.516 289.671 l 203.738 285.359 l
+208.051 285.132 l 212.363 284.909 l 212.363 277.484 l 186.863 277.484 l
h
356.941 294.171 m 356.738 310.859 l 352.426 311.085 l 348.113 311.308 l
348.113 327.734 l 356.289 327.734 l 356.516 323.421 l 356.738 319.109 l
@@ -4386,11 +4453,11 @@
343.801 497.831 l 339.488 497.609 l 339.266 493.296 l 339.039 488.984 l
322.613 488.984 l 322.613 497.234 l 331.613 497.234 l 331.613 505.484 l
365.363 505.484 l 365.363 513.734 l 373.613 513.734 l 373.613 522.734 l
- 381.863 522.734 l 381.863 513.734 l 390.113 513.734 l 390.113 506.28 l
-373.238 505.859 l 373.016 501.546 l 372.789 497.234 l 390.863 497.234 l
-390.863 505.484 l 398.363 505.484 l 398.363 480.734 l 390.863 480.734 l
-390.863 488.984 l 381.863 488.984 l 381.863 463.484 l 373.613 463.484 l
-373.613 488.984 l 364.613 488.984 l 364.613 463.484 l 357.113 463.484 l
+ 381.863 522.734 l 381.863 513.734 l 390.113 513.734 l 390.113 506.28 l
+373.238 505.859 l 373.016 501.546 l 372.789 497.234 l 390.863 497.234 l
+390.863 505.484 l 398.363 505.484 l 398.363 480.734 l 390.863 480.734 l
+390.863 488.984 l 381.863 488.984 l 381.863 463.484 l 373.613 463.484 l
+373.613 488.984 l 364.613 488.984 l 364.613 463.484 l 357.113 463.484 l
h
390.863 467.609 m 390.863 471.734 l 398.363 471.734 l 398.363 463.484 l
390.863 463.484 l h
@@ -4493,15 +4560,15 @@
%%EndPageSetup
q 124 234 325 326 rectclip q
0 g
-124.363 269.89 m 124.363 304.015 l 192.613 304.015 l 192.613 235.765 l
+124.363 269.89 m 124.363 304.015 l 192.613 304.015 l 192.613 235.765 l
124.363 235.765 l h
183.613 270.265 m 183.613 295.015 l 134.113 295.015 l 134.113 245.515 l
183.613 245.515 l h
144.613 270.265 m 144.613 284.515 l 173.113 284.515 l 173.113 256.015 l
144.613 256.015 l h
-212.863 240.64 m 212.863 245.515 l 222.613 245.515 l 222.613 235.765 l
+212.863 240.64 m 212.863 245.515 l 222.613 245.515 l 222.613 235.765 l
212.863 235.765 l h
-232.363 245.956 m 232.363 256.144 l 227.488 255.894 l 222.609 255.64 l
+232.363 245.956 m 232.363 256.144 l 227.488 255.894 l 222.609 255.64 l
222.609 260.308 l 222.613 264.972 l 232.551 265.183 l 242.488 265.39 l 242.934
274.765 l 261.613 274.765 l 261.613 265.765 l 251.863 265.765 l 251.863
255.265 l 262.363 255.265 l 262.363 265.015 l 272.113 265.015 l 272.113
@@ -4510,14 +4577,14 @@
294.265 l 251.863 294.265 l 251.863 285.265 l 242.113 285.265 l 242.113
275.515 l 222.613 275.515 l 222.613 285.265 l 212.863 285.265 l 212.863
304.015 l 222.613 304.015 l 222.613 313.765 l 232.363 313.765 l 232.363
- 323.448 l 237.426 323.667 l 242.488 323.89 l 242.934 333.194 l 252.238
+ 323.448 l 237.426 323.667 l 242.488 323.89 l 242.934 333.194 l 252.238
333.64 l 252.461 338.702 l 252.68 343.765 l 242.113 343.765 l 242.113 334.015
l 232.363 334.015 l 232.363 343.765 l 222.613 343.765 l 222.613 353.515
l 212.863 353.515 l 212.863 364.015 l 203.113 364.015 l 203.113 373.015
l 222.613 373.015 l 222.613 402.265 l 257.863 402.265 l 257.863 383.515
- l 251.863 383.515 l 251.863 364.015 l 242.895 364.015 l 242.488 392.89
-l 232.363 393.335 l 232.363 363.265 l 242.113 363.265 l 242.113 353.515
-l 252.613 353.515 l 252.613 363.265 l 262.363 363.265 l 262.363 369.265
+ l 251.863 383.515 l 251.863 364.015 l 242.895 364.015 l 242.488 392.89
+l 232.363 393.335 l 232.363 363.265 l 242.113 363.265 l 242.113 353.515
+l 252.613 353.515 l 252.613 363.265 l 262.363 363.265 l 262.363 369.265
l 281.113 369.265 l 281.113 364.085 l 271.738 363.64 l 271.293 353.515 l
281.863 353.515 l 281.863 363.265 l 300.613 363.265 l 300.613 353.515 l
290.863 353.515 l 290.863 334.015 l 281.863 334.015 l 281.863 343.765 l
@@ -4524,16 +4591,16 @@
261.613 343.765 l 261.613 323.515 l 271.363 323.515 l 271.363 314.515 l
261.613 314.515 l 261.613 304.015 l 271.363 304.015 l 271.363 284.515 l
281.113 284.515 l 281.113 274.765 l 291.613 274.765 l 291.613 284.515 l
- 320.113 284.515 l 320.113 275.562 l 300.988 275.14 l 300.777 265.577 l
+ 320.113 284.515 l 320.113 275.562 l 300.988 275.14 l 300.777 265.577 l
300.57 256.015 l 291.613 256.015 l 291.613 265.765 l 281.113 265.765 l 281.113
- 256.085 l 271.738 255.64 l 271.293 245.515 l 242.113 245.515 l 242.113
+ 256.085 l 271.738 255.64 l 271.293 245.515 l 242.113 245.515 l 242.113
235.765 l 232.363 235.765 l h
311.113 245.515 m 311.113 255.265 l 320.863 255.265 l 320.863 265.015 l
330.613 265.015 l 330.613 255.265 l 340.363 255.265 l 340.363 265.015 l
- 389.113 265.015 l 389.113 256.085 l 379.738 255.64 l 379.293 245.515 l
+ 389.113 265.015 l 389.113 256.085 l 379.738 255.64 l 379.293 245.515 l
370.434 245.515 l 369.988 255.64 l 360.051 255.859 l 350.113 256.081 l 350.113
245.515 l 369.613 245.515 l 369.613 235.765 l 330.613 235.765 l 330.613
- 245.515 l 319.984 245.515 l 320.238 240.64 l 320.488 235.761 l 315.801
+ 245.515 l 319.984 245.515 l 320.238 240.64 l 320.488 235.761 l 315.801
235.765 l 311.113 235.765 l h
389.863 245.515 m 389.863 255.265 l 409.363 255.265 l 409.363 265.765 l
389.863 265.765 l 389.863 275.515 l 340.363 275.515 l 340.363 265.765 l
@@ -4558,22 +4625,22 @@
380.113 295.015 l h
389.863 368.515 m 389.863 373.765 l 379.363 373.765 l 379.363 363.265 l
389.863 363.265 l h
-281.863 250.39 m 281.863 255.265 l 290.863 255.265 l 290.863 245.515 l
+281.863 250.39 m 281.863 255.265 l 290.863 255.265 l 290.863 245.515 l
281.863 245.515 l h
-438.613 250.39 m 438.613 255.265 l 448.363 255.265 l 448.363 245.515 l
+438.613 250.39 m 438.613 255.265 l 448.363 255.265 l 448.363 245.515 l
438.613 245.515 l h
203.859 255.89 m 203.398 256.046 203.113 261.593 203.113 270.327 c 203.113
284.515 l 212.113 284.515 l 212.113 256.159 l 208.359 255.901 l 206.293
255.757 204.27 255.753 203.859 255.894 c h
428.863 275.515 m 428.863 285.265 l 419.113 285.265 l 419.113 304.015 l
- 428.043 304.015 l 428.488 294.64 l 433.551 294.417 l 438.613 294.198 l
-438.613 284.515 l 448.363 284.515 l 448.363 275.515 l 438.613 275.515 l
+ 428.043 304.015 l 428.488 294.64 l 433.551 294.417 l 438.613 294.198 l
+438.613 284.515 l 448.363 284.515 l 448.363 275.515 l 438.613 275.515 l
438.613 265.765 l 428.863 265.765 l h
281.863 299.515 m 281.863 313.765 l 290.863 313.765 l 290.863 285.265 l
281.863 285.265 l h
301.363 299.515 m 301.363 304.015 l 310.363 304.015 l 310.363 295.015 l
301.363 295.015 l h
-320.863 304.39 m 320.863 313.765 l 330.613 313.765 l 330.613 295.015 l
+320.863 304.39 m 320.863 313.765 l 330.613 313.765 l 330.613 295.015 l
320.863 295.015 l h
340.363 299.515 m 340.363 304.015 l 350.113 304.015 l 350.113 295.015 l
340.363 295.015 l h
@@ -4581,12 +4648,12 @@
438.613 295.015 l h
203.113 309.265 m 203.113 313.765 l 212.113 313.765 l 212.113 304.765 l
203.113 304.765 l h
-124.363 348.605 m 124.363 382.698 l 129.426 382.917 l 134.488 383.14 l
+124.363 348.605 m 124.363 382.698 l 129.426 382.917 l 134.488 383.14 l
134.934 392.444 l 144.238 392.89 l 144.684 402.265 l 154.363 402.265 l 154.363
- 412.765 l 144.613 412.765 l 144.613 421.694 l 153.988 422.14 l 154.199
-431.702 l 154.406 441.265 l 173.113 441.265 l 173.113 422.515 l 163.363
-422.515 l 163.363 402.265 l 203.113 402.265 l 203.113 412.765 l 173.863
-412.765 l 173.863 421.765 l 203.113 421.765 l 203.113 432.265 l 183.613
+ 412.765 l 144.613 412.765 l 144.613 421.694 l 153.988 422.14 l 154.199
+431.702 l 154.406 441.265 l 173.113 441.265 l 173.113 422.515 l 163.363
+422.515 l 163.363 402.265 l 203.113 402.265 l 203.113 412.765 l 173.863
+412.765 l 173.863 421.765 l 203.113 421.765 l 203.113 432.265 l 183.613
432.265 l 183.613 441.194 l 192.988 441.64 l 193.211 446.702 l 193.43 451.765
l 183.613 451.765 l 183.613 461.515 l 193.363 461.515 l 193.363 471.265
l 202.363 471.265 l 202.363 461.515 l 212.863 461.515 l 212.863 471.265
@@ -4594,9 +4661,9 @@
l 251.863 481.015 l 251.863 472.015 l 242.113 472.015 l 242.113 461.515
l 252.613 461.515 l 252.613 471.265 l 261.613 471.265 l 261.613 461.515
l 271.363 461.515 l 271.363 451.765 l 261.613 451.765 l 261.613 442.015
- l 252.613 442.015 l 252.613 451.765 l 202.293 451.765 l 202.738 441.64
+ l 252.613 442.015 l 252.613 451.765 l 202.293 451.765 l 202.738 441.64
l 212.676 441.433 l 222.613 441.222 l 222.613 432.265 l 212.07 432.265 l
- 212.277 422.327 l 212.488 412.39 l 217.551 412.171 l 222.613 411.948 l
+ 212.277 422.327 l 212.488 412.39 l 217.551 412.171 l 222.613 411.948 l
222.613 403.085 l 212.488 402.64 l 212.043 393.335 l 202.738 392.89 l 202.516
388.202 l 202.289 383.515 l 193.363 383.515 l 193.363 393.265 l 173.113
393.265 l 173.113 383.515 l 164.113 383.515 l 164.113 393.265 l 153.613
@@ -4610,7 +4677,7 @@
212.863 319.015 m 212.863 323.515 l 222.613 323.515 l 222.613 314.515 l
212.863 314.515 l h
301.363 319.015 m 301.363 323.515 l 311.113 323.515 l 311.113 333.702 l
- 320.863 333.109 l 320.863 353.515 l 311.18 353.515 l 310.961 358.577 l
+ 320.863 333.109 l 320.863 353.515 l 311.18 353.515 l 310.961 358.577 l
310.738 363.64 l 306.051 363.862 l 301.363 364.089 l 301.363 369.265 l 305.805
369.265 l 309.449 369.265 310.648 369.601 312.477 371.14 c 314.547 372.882
315.27 373.015 322.66 373.015 c 330.613 373.015 l 330.613 353.515 l 350.113
@@ -4619,11 +4686,11 @@
314.515 l h
330.613 319.015 m 330.613 323.515 l 340.363 323.515 l 340.363 314.515 l
330.613 314.515 l h
-428.863 319.39 m 428.863 324.265 l 419.113 324.265 l 419.113 333.702 l
-428.863 333.109 l 428.863 343.765 l 448.363 343.765 l 448.363 334.015 l
-438.613 334.015 l 438.613 323.515 l 448.363 323.515 l 448.363 314.515 l
+428.863 319.39 m 428.863 324.265 l 419.113 324.265 l 419.113 333.702 l
+428.863 333.109 l 428.863 343.765 l 448.363 343.765 l 448.363 334.015 l
+438.613 334.015 l 438.613 323.515 l 448.363 323.515 l 448.363 314.515 l
428.863 314.515 l h
-144.613 328.952 m 144.609 333.64 l 153.988 333.409 l 163.363 333.179 l
+144.613 328.952 m 144.609 333.64 l 153.988 333.409 l 163.363 333.179 l
163.363 324.265 l 144.613 324.265 l 144.609 328.952 l h
173.863 328.765 m 173.863 333.265 l 182.863 333.265 l 182.863 324.265 l
173.863 324.265 l h
@@ -4637,20 +4704,20 @@
192.613 382.765 l 192.613 373.765 l 182.863 373.765 l 182.863 363.265 l
202.363 363.265 l 202.363 353.515 l 182.863 353.515 l 182.863 343.765 l
173.113 343.765 l 173.113 334.015 l 164.113 334.015 l h
-183.613 338.89 m 183.613 343.765 l 192.613 343.765 l 192.613 334.015 l
+183.613 338.89 m 183.613 343.765 l 192.613 343.765 l 192.613 334.015 l
183.613 334.015 l h
-212.863 338.925 m 212.863 343.839 l 217.551 343.612 l 222.238 343.39 l
+212.863 338.925 m 212.863 343.839 l 217.551 343.612 l 222.238 343.39 l
222.684 334.015 l 212.863 334.015 l h
-203.113 348.64 m 203.113 353.515 l 212.113 353.515 l 212.113 343.765 l
+203.113 348.64 m 203.113 353.515 l 212.113 353.515 l 212.113 343.765 l
203.113 343.765 l h
-301.363 348.64 m 301.363 353.515 l 310.363 353.515 l 310.363 343.765 l
+301.363 348.64 m 301.363 353.515 l 310.363 353.515 l 310.363 343.765 l
301.363 343.765 l h
-438.613 358.39 m 438.613 363.265 l 448.363 363.265 l 448.363 353.515 l
+438.613 358.39 m 438.613 363.265 l 448.363 363.265 l 448.363 353.515 l
438.613 353.515 l h
-340.363 368.89 m 340.363 373.765 l 330.613 373.765 l 330.613 392.515 l
-340.363 392.515 l 340.363 382.765 l 359.863 382.765 l 359.863 373.765 l
+340.363 368.89 m 340.363 373.765 l 330.613 373.765 l 330.613 392.515 l
+340.363 392.515 l 340.363 382.765 l 359.863 382.765 l 359.863 373.765 l
350.113 373.765 l 350.113 364.015 l 340.363 364.015 l h
-314.863 392.89 m 314.863 402.265 l 320.113 402.265 l 320.113 383.515 l
+314.863 392.89 m 314.863 402.265 l 320.113 402.265 l 320.113 383.515 l
314.863 383.515 l h
438.613 388.015 m 438.613 392.515 l 448.363 392.515 l 448.363 383.515 l
438.613 383.515 l h
@@ -4679,33 +4746,33 @@
l 281.113 432.265 l 281.113 426.265 l 271.797 426.265 l 262.949 426.265
262.363 426.171 260.25 424.39 c 258.773 423.148 257.105 422.515 255.316
422.515 c 252.613 422.515 l h
-320.863 431.89 m 320.863 441.265 l 330.613 441.265 l 330.613 461.515 l
-320.863 461.515 l 320.863 471.265 l 340.363 471.265 l 340.363 451.765 l
-350.113 451.765 l 350.113 442.015 l 340.363 442.015 l 340.363 432.265 l
+320.863 431.89 m 320.863 441.265 l 330.613 441.265 l 330.613 461.515 l
+320.863 461.515 l 320.863 471.265 l 340.363 471.265 l 340.363 451.765 l
+350.113 451.765 l 350.113 442.015 l 340.363 442.015 l 340.363 432.265 l
330.613 432.265 l 330.613 422.515 l 320.863 422.515 l h
-360.613 432.077 m 360.609 441.64 l 369.988 441.409 l 379.363 441.179 l
-379.363 432.265 l 369.613 432.265 l 369.613 422.515 l 360.613 422.515 l
+360.613 432.077 m 360.609 441.64 l 369.988 441.409 l 379.363 441.179 l
+379.363 432.265 l 369.613 432.265 l 369.613 422.515 l 360.613 422.515 l
360.609 432.077 l h
428.863 432.265 m 428.863 442.015 l 419.113 442.015 l 419.113 451.765 l
409.363 451.765 l 409.363 471.265 l 418.363 471.265 l 418.363 461.515 l
428.113 461.515 l 428.113 451.765 l 448.363 451.765 l 448.363 422.515 l
428.863 422.515 l h
-134.863 437.14 m 134.863 442.015 l 124.363 442.015 l 124.363 451.765 l
-134.945 451.765 l 134.719 461.519 l 134.488 471.269 l 139.176 471.265 l
+134.863 437.14 m 134.863 442.015 l 124.363 442.015 l 124.363 451.765 l
+134.945 451.765 l 134.719 461.519 l 134.488 471.269 l 139.176 471.265 l
143.863 471.265 l 143.863 461.515 l 154.43 461.515 l 154.211 466.577 l 153.988
471.64 l 150.238 471.753 l 148.176 471.816 146.066 471.901 145.551 471.941
c 144.914 471.991 144.613 473.456 144.613 476.515 c 144.613 481.015 l 173.113
481.015 l 173.113 451.765 l 143.863 451.765 l 143.863 432.265 l 134.863
432.265 l h
-380.113 446.89 m 380.113 451.765 l 389.113 451.765 l 389.113 442.015 l
+380.113 446.89 m 380.113 451.765 l 389.113 451.765 l 389.113 442.015 l
380.113 442.015 l h
-350.695 461.702 m 350.488 471.64 l 340.363 472.085 l 340.363 480.948 l
+350.695 461.702 m 350.488 471.64 l 340.363 472.085 l 340.363 480.948 l
345.426 481.167 l 350.488 481.39 l 350.934 490.765 l 359.863 490.765 l 359.863
- 481.015 l 398.863 481.015 l 398.863 472.046 l 369.988 471.64 l 369.777
+ 481.015 l 398.863 481.015 l 398.863 472.046 l 369.988 471.64 l 369.777
461.702 l 369.57 451.765 l 350.906 451.765 l h
183.613 476.515 m 183.613 481.015 l 192.613 481.015 l 192.613 472.015 l
183.613 472.015 l h
-203.113 491.14 m 203.113 510.265 l 212.863 510.265 l 212.863 520.015 l
+203.113 491.14 m 203.113 510.265 l 212.863 510.265 l 212.863 520.015 l
222.613 520.015 l 222.613 501.335 l 212.488 500.89 l 212.082 472.015 l 203.113
472.015 l h
262.363 476.515 m 262.363 481.015 l 271.363 481.015 l 271.363 472.015 l
@@ -4715,11 +4782,11 @@
472.015 l 301.363 472.015 l h
419.113 476.515 m 419.113 481.015 l 448.363 481.015 l 448.363 472.015 l
419.113 472.015 l h
-281.863 491.14 m 281.863 500.515 l 290.863 500.515 l 290.863 481.765 l
+281.863 491.14 m 281.863 500.515 l 290.863 500.515 l 290.863 481.765 l
281.863 481.765 l h
330.613 486.265 m 330.613 490.765 l 340.363 490.765 l 340.363 481.765 l
330.613 481.765 l h
-124.363 525.64 m 124.363 559.765 l 192.613 559.765 l 192.613 491.515 l
+124.363 525.64 m 124.363 559.765 l 192.613 559.765 l 192.613 491.515 l
124.363 491.515 l h
183.613 525.265 m 183.613 550.015 l 134.113 550.015 l 134.113 500.515 l
183.613 500.515 l h
@@ -4735,16 +4802,16 @@
320.863 491.515 l h
340.363 496.015 m 340.363 500.515 l 350.113 500.515 l 350.113 491.515 l
340.363 491.515 l h
-360.461 496.202 m 360.238 500.89 l 350.863 501.335 l 350.863 510.265 l
+360.461 496.202 m 360.238 500.89 l 350.863 501.335 l 350.863 510.265 l
369.613 510.265 l 369.613 491.515 l 360.684 491.515 l h
-380.113 525.64 m 380.113 559.765 l 448.363 559.765 l 448.363 491.515 l
+380.113 525.64 m 380.113 559.765 l 448.363 559.765 l 448.363 491.515 l
380.113 491.515 l h
438.613 525.265 m 438.613 550.015 l 389.113 550.015 l 389.113 500.515 l
438.613 500.515 l h
399.613 525.265 m 399.613 539.515 l 428.051 539.515 l 428.488 511.015 l
399.613 511.015 l h
-272.113 506.14 m 272.113 511.015 l 232.363 511.015 l 232.363 530.515 l
-203.113 530.515 l 203.113 559.765 l 207.801 559.765 l 212.488 559.769 l
+272.113 506.14 m 272.113 511.015 l 232.363 511.015 l 232.363 530.515 l
+203.113 530.515 l 203.113 559.765 l 207.801 559.765 l 212.488 559.769 l
212.488 539.89 l 242.113 539.484 l 242.113 529.765 l 251.863 529.765 l 251.863
520.015 l 272.113 520.015 l 272.113 529.765 l 281.863 529.765 l 281.863
540.265 l 271.363 540.265 l 271.363 530.515 l 262.363 530.515 l 262.363
@@ -4751,13 +4818,13 @@
540.265 l 252.613 540.265 l 252.613 549.265 l 255.051 549.335 l 262.617
549.55 261.961 549.058 262.211 554.702 c 262.43 559.765 l 281.043 559.765
l 281.488 549.64 l 290.793 549.194 l 291.238 539.89 l 296.301 539.667 l
- 301.363 539.448 l 301.363 549.265 l 310.293 549.265 l 310.738 539.89 l
-315.801 539.667 l 320.863 539.448 l 320.863 559.765 l 340.363 559.765 l
-340.363 550.015 l 330.613 550.015 l 330.613 539.515 l 340.363 539.515 l
-340.363 529.765 l 350.113 529.765 l 350.113 511.015 l 340.363 511.015 l
-340.363 520.765 l 330.613 520.765 l 330.613 511.015 l 320.863 511.015 l
-320.863 520.765 l 311.113 520.765 l 311.113 530.515 l 290.863 530.515 l
-290.863 520.765 l 281.113 520.765 l 281.113 501.265 l 272.113 501.265 l
+ 301.363 539.448 l 301.363 549.265 l 310.293 549.265 l 310.738 539.89 l
+315.801 539.667 l 320.863 539.448 l 320.863 559.765 l 340.363 559.765 l
+340.363 550.015 l 330.613 550.015 l 330.613 539.515 l 340.363 539.515 l
+340.363 529.765 l 350.113 529.765 l 350.113 511.015 l 340.363 511.015 l
+340.363 520.765 l 330.613 520.765 l 330.613 511.015 l 320.863 511.015 l
+320.863 520.765 l 311.113 520.765 l 311.113 530.515 l 290.863 530.515 l
+290.863 520.765 l 281.113 520.765 l 281.113 501.265 l 272.113 501.265 l
h
291.613 515.515 m 291.613 520.015 l 310.363 520.015 l 310.363 511.015 l
291.613 511.015 l h
@@ -4765,7 +4832,7 @@
360.613 520.765 l h
350.863 550.015 m 350.863 559.765 l 369.613 559.765 l 369.613 540.265 l
350.863 540.265 l h
-232.363 554.89 m 232.363 559.765 l 251.863 559.765 l 251.863 550.015 l
+232.363 554.89 m 232.363 559.765 l 251.863 559.765 l 251.863 550.015 l
232.363 550.015 l h
232.363 554.89 m f
Q Q
@@ -4859,7 +4926,7 @@
l 23.953 30.423 25.258 29.72 25.754 29.243 c 26.66 28.376 l 32.27 28.821
l 35.352 29.067 38.203 29.302 38.602 29.349 c 40.082 29.509 40.516 29.274
41.535 27.774 c 42.109 26.927 42.68 26.153 42.801 26.056 c 43.188 25.739
- 43.527 22.552 43.281 21.571 c 43.098 20.833 42.824 20.626 42.02 20.626
+ 43.527 22.552 43.281 21.571 c 43.098 20.833 42.824 20.626 42.02 20.626
c 41.457 20.626 40.902 20.778 40.789 20.962 c 40.676 21.145 39.551 21.638
38.293 22.056 c 36.312 22.716 35.297 22.806 30.789 22.72 c 25.574 22.618
l 25.324 20.626 l 25.188 19.532 25.043 14.727 25 9.95 c 24.961 5.177 24.859
@@ -4872,9 +4939,9 @@
31.493 191.039 31.681 c 191.785 31.806 192.965 32.059 193.66 32.239 c 194.359
32.419 195.309 32.563 195.777 32.567 c 196.242 32.567 197.746 32.907 199.117
33.325 c 201.609 34.083 l 201.707 41.919 l 201.805 49.759 l 203.684 49.864
- l 204.992 49.942 206.055 49.751 207.18 49.239 c 209.047 48.388 209.301
+ l 204.992 49.942 206.055 49.751 207.18 49.239 c 209.047 48.388 209.301
47.942 208.66 46.665 c 208.371 46.095 208.152 43.868 208.074 40.786 c 207.957
- 35.825 l 209.273 35.825 l 209.996 35.825 211.422 36.095 212.445 36.427
+ 35.825 l 209.273 35.825 l 209.996 35.825 211.422 36.095 212.445 36.427
c 214.23 37.001 214.328 36.997 214.855 36.337 c 215.16 35.954 215.578 35.196
215.789 34.649 c 215.996 34.102 216.293 33.653 216.449 33.653 c 216.832
33.653 217.645 30.641 217.484 29.806 c 217.367 29.192 216.957 29.13 213.016
@@ -4884,7 +4951,7 @@
407.906 2.102 m 406.441 2.333 402.094 5.352 402.332 5.974 c 402.445 6.27
402.707 6.513 402.914 6.513 c 403.426 6.513 410.059 13.184 410.059 13.7
c 410.059 13.927 410.184 14.114 410.332 14.114 c 410.895 14.122 413.797
- 19.571 414.762 22.434 c 417.156 29.536 417.203 38.747 414.895 47.946 c
+ 19.571 414.762 22.434 c 417.156 29.536 417.203 38.747 414.895 47.946 c
414.594 49.141 414.215 50.649 414.047 51.294 c 413.758 52.427 413.781 52.462
414.707 52.259 c 417.59 51.634 417.832 51.333 419.203 46.681 c 422.32 36.099
422.586 26.45 420.016 17.052 c 419.426 14.895 416.766 9.188 415.988 8.407
@@ -4893,12 +4960,12 @@
262.418 2.829 m 260.957 3.532 260.273 4.263 260.258 5.145 c 260.25 5.485
260.02 6.302 259.746 6.954 c 257.246 12.884 256.172 26.763 257.664 33.872
c 258.633 38.485 259.824 41.72 261.766 45.02 c 263.887 48.626 268.145 52.833
- 269.668 52.833 c 270.238 52.833 274.098 50.97 274.633 50.438 c 274.883
+ 269.668 52.833 c 270.238 52.833 274.098 50.97 274.633 50.438 c 274.883
50.188 275.41 49.884 275.809 49.755 c 276.207 49.63 276.531 49.407 276.531
49.255 c 276.531 49.001 274.07 46.681 273.797 46.681 c 273.5 46.681 270.016
42.997 270.016 42.684 c 270.016 42.493 269.887 42.341 269.73 42.341 c 269.445
42.341 266.758 38.907 266.758 38.54 c 266.758 38.434 266.391 37.735 265.934
- 36.993 c 264.969 35.411 263.863 32.599 262.914 29.313 c 262.355 27.368
+ 36.993 c 264.969 35.411 263.863 32.599 262.914 29.313 c 262.355 27.368
262.238 25.77 262.254 20.083 c 262.273 13.337 262.504 11.423 263.945 5.97
c 264.887 2.403 264.906 2.169 264.277 2.196 c 263.953 2.204 263.113 2.493
262.418 2.829 c h
@@ -4911,16 +4978,16 @@
362.293 12.7 c 362.293 12.88 362.457 13.028 362.66 13.028 c 363.078 13.028
366.273 16.266 366.273 16.684 c 366.273 17.184 364.309 18.345 362.422 18.966
c 360.445 19.61 360.137 20.067 360.129 22.356 c 360.121 23.665 360.91 25.829
- 361.527 26.212 c 361.746 26.345 362.91 25.876 364.117 25.169 c 365.324
+ 361.527 26.212 c 361.746 26.345 362.91 25.876 364.117 25.169 c 365.324
24.462 366.445 23.884 366.609 23.884 c 366.773 23.884 367.113 23.638 367.359
- 23.341 c 367.605 23.044 368.086 22.798 368.426 22.798 c 369.125 22.798
+ 23.341 c 367.605 23.044 368.086 22.798 368.426 22.798 c 369.125 22.798
369.891 25.466 369.891 27.891 c 369.891 29.438 369.422 29.681 367.969 28.872
c 367.48 28.602 365.57 28.431 362.988 28.419 c 359.531 28.411 358.57 28.282
357.477 27.696 c 356.164 26.985 356.152 26.985 355.625 27.696 c 355.055
28.458 354.332 31.302 354.332 32.774 c 354.332 33.849 355.266 34.282 358.246
- 34.587 c 362.355 35.009 368.797 36.509 370.098 37.349 c 370.312 37.485
+ 34.587 c 362.355 35.009 368.797 36.509 370.098 37.349 c 370.312 37.485
372.266 38.192 374.441 38.919 c 376.617 39.645 378.758 40.47 379.199 40.747
- c 380.543 41.595 381.707 41.372 382.68 40.079 c 384.594 37.528 385.734
+ c 380.543 41.595 381.707 41.372 382.68 40.079 c 384.594 37.528 385.734
33.751 384.637 33.587 c 384.391 33.548 383.02 33.509 381.59 33.493 c 378.305
33.466 377.375 32.841 375.738 29.532 c 374.648 27.325 373.168 21.665 373.152
19.653 c 373.148 18.552 378.91 12.809 380.75 12.087 c 381.047 11.97 381.781
@@ -4932,7 +4999,7 @@
c 147.344 9.528 147.098 9.77 146.801 9.77 c 146.5 9.77 146.258 9.931 146.258
10.126 c 146.258 10.52 143.5 11.942 142.73 11.942 c 142.457 11.942 141.797
11.481 141.262 10.923 c 138.781 8.333 136.094 6.876 133.781 6.876 c 132.195
- 6.876 129.453 7.86 128.688 8.708 c 128.082 9.376 128.082 9.442 128.707
+ 6.876 129.453 7.86 128.688 8.708 c 128.082 9.376 128.082 9.442 128.707
10.134 c 129.066 10.532 129.656 10.856 130.016 10.856 c 131.078 10.856 135.316
12.778 137.27 14.145 c 138.605 15.083 l 136.484 17.313 l 135.305 18.552
134.051 19.54 133.66 19.54 c 132.48 19.54 131.969 20.563 132 22.849 c 132.035
@@ -4941,20 +5008,20 @@
28.759 144.836 29.485 c 143.207 31.274 143 32.27 143 38.341 c 143 44.794
142.957 44.888 140.816 43.102 c 139.562 42.056 l 139.582 38.852 l 139.59
37.087 139.672 34.782 139.762 33.724 c 139.922 31.813 139.918 31.798 138.098
- 30.087 c 135.477 27.626 131.059 26.356 131.059 28.067 c 131.059 28.333
+ 30.087 c 135.477 27.626 131.059 26.356 131.059 28.067 c 131.059 28.333
131.547 29.274 132.145 30.161 c 132.742 31.044 133.23 31.907 133.23 32.079
c 133.234 32.247 133.496 32.876 133.816 33.474 c 134.238 34.263 134.445
- 35.942 134.574 39.626 c 134.691 42.876 134.926 44.962 135.227 45.442 c
+ 35.942 134.574 39.626 c 134.691 42.876 134.926 44.962 135.227 45.442 c
135.656 46.13 139.707 47.766 140.977 47.766 c 141.246 47.766 141.938 48.009
142.508 48.309 c 143.953 49.059 146.387 48.985 148.055 48.134 c 149.832
47.227 150.133 46.317 149.238 44.587 c 148.355 42.888 147.648 39.95 147.613
- 37.852 c 147.582 35.696 148.406 34.516 150.328 33.966 c 152.465 33.356
+ 37.852 c 147.582 35.696 148.406 34.516 150.328 33.966 c 152.465 33.356
152.77 33.04 152.77 31.454 c 152.77 30.411 152.527 29.841 151.801 29.165
c 150.82 28.255 148.48 27.618 147.629 28.028 c 147.371 28.153 147.473 28.044
147.855 27.786 c 149.988 26.349 150.328 25.423 149.152 24.247 c 148.754
23.849 148.43 23.282 148.43 22.993 c 148.43 22.477 148.07 21.552 146.543
18.102 c 145.828 16.485 l 146.91 15.571 l 147.504 15.067 148.383 14.329
- 148.863 13.931 c 150.176 12.845 153.766 11.083 156.207 10.329 c 162.23
+ 148.863 13.931 c 150.176 12.845 153.766 11.083 156.207 10.329 c 162.23
8.47 164.34 7.106 163.805 5.415 c 163.562 4.653 163.234 4.54 159.645 3.985
c 156.93 3.567 155.723 3.587 152.227 4.099 c h
142.797 24.309 m 142.523 25.177 141.594 25.141 139.391 24.181 c 137.582
@@ -4963,12 +5030,12 @@
315.25 4.927 m 312.305 6.091 309.629 8.333 309.27 9.942 c 308.648 12.696
308.348 16.372 308.375 20.774 c 308.395 23.579 308.402 26.149 308.395 26.485
c 308.383 26.927 307.93 26.657 306.797 25.544 c 304.602 23.38 302.277 21.86
- 300.727 21.575 c 299.773 21.399 299.355 21.11 299.219 20.528 c 299.113
+ 300.727 21.575 c 299.773 21.399 299.355 21.11 299.219 20.528 c 299.113
20.083 298.762 19.005 298.438 18.13 c 297.465 15.505 297.832 15.165 299.734
- 16.923 c 301.922 18.938 302.586 18.934 302.586 16.919 c 302.586 14.095
+ 16.923 c 301.922 18.938 302.586 18.934 302.586 16.919 c 302.586 14.095
300.703 10.075 298.281 7.72 c 297.199 6.669 296.75 6.661 295.832 7.692 c
294.453 9.227 293.852 12.157 294.121 15.993 c 294.41 20.114 294.184 21.352
- 293.145 21.352 c 292.25 21.352 291.098 20.782 290.043 19.825 c 288.664
+ 293.145 21.352 c 292.25 21.352 291.098 20.782 290.043 19.825 c 288.664
18.571 287.23 19.645 286.145 22.735 c 285.496 24.583 286.012 25.618 287.711
25.884 c 290.102 26.255 293.352 27.255 293.762 27.743 c 293.98 28.009 294.273
28.227 294.41 28.227 c 294.547 28.227 295.02 28.606 295.457 29.067 c 295.895
@@ -4982,29 +5049,29 @@
c 312.52 53.153 312.582 53.192 314.184 53.196 c 315.09 53.196 316.027 53.001
316.266 52.763 c 316.848 52.177 316.793 50.329 316.156 49.216 c 315.512
48.091 315.449 44.372 316.066 43.724 c 316.312 43.458 316.762 42.774 317.059
- 42.196 c 317.359 41.618 318.426 40.282 319.438 39.224 c 320.445 38.165
+ 42.196 c 317.359 41.618 318.426 40.282 319.438 39.224 c 320.445 38.165
321.992 36.438 322.871 35.388 c 325.047 32.786 327.559 30.399 328.117 30.399
c 328.371 30.399 328.633 30.27 328.699 30.11 c 328.766 29.954 329.719 29.364
330.812 28.798 c 333.949 27.177 336.176 25.614 336.363 24.899 c 336.914
22.786 335.586 22.224 330.949 22.61 c 325.246 23.087 323.25 23.989 323.223
- 26.099 c 323.211 27.255 321.867 30.399 321.387 30.399 c 321.195 30.399
+ 26.099 c 323.211 27.255 321.867 30.399 321.387 30.399 c 321.195 30.399
321.043 30.641 321.043 30.942 c 321.043 31.239 320.879 31.485 320.68 31.485
c 320.48 31.485 320.02 31.77 319.656 32.118 c 319.293 32.466 318.602 33.083
318.117 33.493 c 317.637 33.903 316.508 35.059 315.613 36.067 c 314.719
37.075 313.648 38.075 313.234 38.29 c 312.551 38.645 312.383 38.477 311.355
- 36.438 c 309.703 33.149 309.098 31.524 309.098 30.349 c 309.098 29.337
+ 36.438 c 309.703 33.149 309.098 31.524 309.098 30.349 c 309.098 29.337
309.145 29.309 310.508 29.528 c 311.625 29.708 312.062 29.606 312.633 29.036
- c 313.273 28.395 313.312 28.106 312.992 26.263 c 312.797 25.13 312.723
+ c 313.273 28.395 313.312 28.106 312.992 26.263 c 312.797 25.13 312.723
24.118 312.828 24.016 c 312.93 23.911 313.723 24.247 314.586 24.755 c 315.449
25.266 316.488 25.833 316.895 26.013 c 317.301 26.192 317.852 26.602 318.113
- 26.923 c 318.875 27.841 319.586 27.606 320.156 26.247 c 321.023 24.165
+ 26.923 c 318.875 27.841 319.586 27.606 320.156 26.247 c 321.023 24.165
320.57 21.712 319.312 21.712 c 319.102 21.712 318.875 21.591 318.809 21.442
c 318.648 21.079 315.371 18.458 315.082 18.458 c 314.953 18.458 314.355
17.997 313.754 17.431 c 312.664 16.415 312.66 16.395 313.051 14.278 c 313.27
13.102 313.68 11.915 313.961 11.63 c 314.789 10.802 317.961 10.665 319.562
- 11.388 c 321.227 12.138 321.766 13.536 321.766 17.122 c 321.766 18.431
+ 11.388 c 321.227 12.138 321.766 13.536 321.766 17.122 c 321.766 18.431
321.93 19.602 322.129 19.724 c 322.82 20.153 323.934 19.493 324.164 18.524
- c 324.293 17.989 324.52 17.388 324.672 17.188 c 325.281 16.384 326.793
+ c 324.293 17.989 324.52 17.388 324.672 17.188 c 325.281 16.384 326.793
9.849 326.809 7.962 c 326.824 6.044 326.402 5.669 323.867 5.376 c 319.918
4.919 315.816 4.704 315.25 4.927 c h
121.473 6.602 m 120.414 9.708 120.145 12.118 120.258 17.368 c 120.383 22.977
@@ -5011,22 +5078,22 @@
l 118.77 22.856 l 117.723 22.774 116.785 22.423 116.117 21.86 c 115.547
21.38 114.852 20.989 114.574 20.989 c 113.812 20.989 112.613 23.634 112.512
25.524 c 112.426 27.153 112.453 27.2 113.789 27.669 c 114.539 27.931 115.84
- 28.251 116.684 28.376 c 119.211 28.759 122.801 30.251 124.078 31.454 c
+ 28.251 116.684 28.376 c 119.211 28.759 122.801 30.251 124.078 31.454 c
125.223 32.532 126.121 32.388 127.402 30.927 c 128.809 29.325 128.879 27.759
127.621 26.056 c 127.125 25.38 126.715 24.556 126.715 24.22 c 126.715 23.888
126.496 22.981 126.227 22.212 c 125.562 20.298 125.199 17.368 125.625 17.368
- c 125.812 17.368 126.469 17.86 127.078 18.454 c 128.398 19.743 129.973
+ c 125.812 17.368 126.469 17.86 127.078 18.454 c 128.398 19.743 129.973
19.934 129.973 18.806 c 129.973 18.403 129.73 17.485 129.43 16.77 c 129.133
16.056 128.887 15.208 128.887 14.884 c 128.883 14.559 128.641 13.829 128.344
- 13.259 c 128.043 12.688 127.801 12.063 127.801 11.872 c 127.801 11.454
+ 13.259 c 128.043 12.688 127.801 12.063 127.801 11.872 c 127.801 11.454
124.668 7.247 123.875 6.602 c 123.57 6.356 122.941 6.153 122.473 6.153 c
122.008 6.153 121.559 6.356 121.473 6.602 c h
181.875 7.872 m 180.062 12.13 179.805 13.708 180.109 18.638 c 180.562 25.884
180.512 26.438 179.473 25.903 c 178.559 25.434 177.449 24.755 176.965 24.364
- c 175.574 23.251 174.926 23.434 173.891 25.224 c 173.34 26.177 172.785
+ c 175.574 23.251 174.926 23.434 173.891 25.224 c 173.34 26.177 172.785
27.04 172.66 27.141 c 172.535 27.239 172.246 27.856 172.023 28.513 c 171.676
29.528 171.715 29.798 172.289 30.372 c 172.656 30.743 173.668 31.153 174.535
- 31.282 c 176.316 31.552 179.082 32.575 183.066 34.442 c 183.906 34.833
+ 31.282 c 176.316 31.552 179.082 32.575 183.066 34.442 c 183.906 34.833
184.887 35.063 185.242 34.95 c 185.996 34.712 188.086 31.653 188.43 30.282
c 188.625 29.513 188.434 29.122 187.406 28.149 c 186.711 27.497 185.949
26.583 185.719 26.126 c 185.199 25.11 184.73 16.278 185.195 16.298 c 185.91
@@ -5035,11 +5102,11 @@
12.298 188.234 11.942 c 187.844 11.552 186.426 9.427 186.426 9.231 c 186.426
9.118 185.91 8.462 185.281 7.77 c 183.727 6.063 182.633 6.095 181.875 7.872
c h
-57.926 8.548 m 57.348 9.239 56.527 11.497 56.52 12.403 c 56.512 13.173
-57.469 13.575 60.133 13.915 c 62.109 14.169 63.715 14.563 68.691 16.024
+57.926 8.548 m 57.348 9.239 56.527 11.497 56.52 12.403 c 56.512 13.173
+57.469 13.575 60.133 13.915 c 62.109 14.169 63.715 14.563 68.691 16.024
c 72.648 17.184 72.555 17.036 72.473 22.192 c 72.441 24.384 72.375 24.599
71.895 24.118 c 71.594 23.817 71.352 23.489 71.352 23.384 c 71.352 23.024
- 67.984 19.54 67.637 19.54 c 66.953 19.54 63.852 22.997 63.441 24.216 c
+ 67.984 19.54 67.637 19.54 c 66.953 19.54 63.852 22.997 63.441 24.216 c
63.102 25.216 63.125 25.606 63.551 26.259 c 64.004 26.95 64.391 27.063 66.266
27.044 c 67.816 27.028 68.645 27.196 69.113 27.626 c 69.48 27.954 69.945
28.227 70.145 28.227 c 70.348 28.227 70.789 28.528 71.125 28.899 c 71.664
@@ -5047,11 +5114,11 @@
c 75.59 41.255 78.469 40.032 78.758 39.114 c 78.875 38.739 78.723 37.802
78.41 37.028 c 77.949 35.876 77.867 34.169 77.945 27.493 c 78.043 19.36
l 78.926 19.458 l 79.414 19.513 79.855 19.602 79.91 19.657 c 80.43 20.177
- 81.168 25.462 81.637 32.024 c 82.121 38.794 82.473 41.677 83.508 47.29
+ 81.168 25.462 81.637 32.024 c 82.121 38.794 82.473 41.677 83.508 47.29
c 83.766 48.669 84.703 49.302 86.113 49.036 c 88.926 48.509 89.969 47.001
88.707 45.29 c 88.18 44.583 87.824 43.364 87.617 41.571 c 87.449 40.102
- 87.145 37.763 86.938 36.368 c 86.73 34.974 86.566 32.778 86.566 31.481
-c 86.57 29.13 l 87.5 30.216 l 89.414 32.446 89.805 32.942 89.805 33.114
+ 87.145 37.763 86.938 36.368 c 86.73 34.974 86.566 32.778 86.566 31.481
+c 86.57 29.13 l 87.5 30.216 l 89.414 32.446 89.805 32.942 89.805 33.114
c 89.805 33.212 90.051 33.579 90.352 33.927 c 90.652 34.274 91.355 35.114
91.918 35.79 c 93.238 37.384 94.32 37.161 96.156 34.923 c 97.621 33.134
97.68 31.735 96.301 31.298 c 95.895 31.165 93.906 29.446 91.887 27.47 c
@@ -5076,8 +5143,8 @@
27.141 11.562 27.833 11.016 28.677 c h
25.684 31.841 m 24.75 32.653 23.625 34.032 23.191 34.907 c 22.434 36.415
22.41 36.766 22.676 41.681 c 22.832 44.532 22.977 48.329 23 50.118 c 23.023
- 51.911 23.172 53.579 23.332 53.829 c 23.781 54.52 25.348 54.368 26.758
-53.497 c 28.023 52.712 l 27.809 49.903 l 27.59 47.091 l 28.754 47.481 l
+ 51.911 23.172 53.579 23.332 53.829 c 23.781 54.52 25.348 54.368 26.758
+53.497 c 28.023 52.712 l 27.809 49.903 l 27.59 47.091 l 28.754 47.481 l
29.395 47.692 30.172 48.091 30.488 48.36 c 31.309 49.067 32.543 48.966 32.98
48.153 c 33.574 47.04 33.41 44.423 32.695 43.606 c 31.887 42.681 29.879
41.255 29.387 41.255 c 29.18 41.255 29.012 41.11 29.012 40.934 c 29.012
@@ -5085,16 +5152,16 @@
c 26.852 36.138 27.227 35.72 29.117 35.681 c 31.188 35.634 31.945 36.306
32.762 38.895 c 33.109 39.993 33.586 40.888 33.824 40.88 c 35.031 40.849
36.609 38.337 36.609 36.45 c 36.609 35.759 36.859 34.489 37.164 33.63 c
- 37.688 32.141 37.676 32.028 36.973 31.321 c 36.32 30.665 35.703 30.567
+ 37.688 32.141 37.676 32.028 36.973 31.321 c 36.32 30.665 35.703 30.567
31.809 30.474 c 27.383 30.368 l h
296.914 34.356 m 294.777 35.325 294.484 36.071 294.785 39.774 c 295.031
42.79 295.594 44.161 296.578 44.141 c 296.945 44.134 298.684 41.708 300.68
- 38.423 c 301.555 36.985 301.719 35.466 301.125 34.352 c 300.637 33.446
+ 38.423 c 301.555 36.985 301.719 35.466 301.125 34.352 c 300.637 33.446
298.918 33.446 296.914 34.356 c h
124.816 38.591 m 122.375 39.829 l 122.375 42.13 l 122.375 45.54 123.875
48.489 125.613 48.489 c 126.07 48.489 126.535 48.13 126.781 47.587 c 127.008
47.087 127.332 46.681 127.496 46.681 c 127.664 46.681 127.801 46.438 127.801
- 46.138 c 127.801 45.841 127.934 45.595 128.098 45.595 c 128.418 45.595
+ 46.138 c 127.801 45.841 127.934 45.595 128.098 45.595 c 128.418 45.595
129.484 43.595 130.191 41.673 c 130.938 39.638 129.73 37.259 127.984 37.321
c 127.586 37.337 126.16 37.907 124.816 38.591 c h
185.168 39.817 m 183 40.587 182.699 41.337 183.145 44.864 c 183.723 49.47
Modified: trunk/Master/texmf-dist/tex/latex/hithesis/hithesis.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hithesis/hithesis.cfg 2018-02-07 22:16:14 UTC (rev 46563)
+++ trunk/Master/texmf-dist/tex/latex/hithesis/hithesis.cfg 2018-02-07 22:16:30 UTC (rev 46564)
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2017-2017 by Chu Yanshuo <yanshuoc at gmail.com>
+%% Copyright (C) 2017-2018 by Chu Yanshuo <yanshuoc at gmail.com>
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3a
@@ -23,7 +23,7 @@
%% This is the configuration file of the hithesis package with LaTeX2e.
%%
\ProvidesFile{hithesis.cfg}
-[2017/08/21 0.0.1 Harbin Institute of Technology]
+[2017/11/5 1.0.9 Harbin Institute of Technology]
\theorembodyfont{\normalfont}
\theoremheaderfont{\normalfont\heiti}
\theoremsymbol{\ensuremath{\square}}
Modified: trunk/Master/texmf-dist/tex/latex/hithesis/hithesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hithesis/hithesis.cls 2018-02-07 22:16:14 UTC (rev 46563)
+++ trunk/Master/texmf-dist/tex/latex/hithesis/hithesis.cls 2018-02-07 22:16:30 UTC (rev 46564)
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2017-2017 by Chu Yanshuo <yanshuoc at gmail.com>
+%% Copyright (C) 2017-2018 by Chu Yanshuo <yanshuoc at gmail.com>
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3a
@@ -25,7 +25,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{hithesis}
-[2017/08/21 0.0.1 Harbin Institute of Technology]
+[2017/11/5 1.0.9 Harbin Institute of Technology]
\RequirePackage{ifthen}
\RequirePackage{kvoptions}
\SetupKeyvalOptions{
@@ -42,7 +42,7 @@
\expandafter\csname hit@#1true\endcsname}
\DeclareBoolOption[false]{arialtoc}
\DeclareBoolOption[false]{arialtitle}
-\DeclareBoolOption[false]{raggedbottom}
+\DeclareBoolOption[true]{raggedbottom}
\DeclareBoolOption[false]{pifootnote}
\DeclareBoolOption[false]{glue}
\DeclareBoolOption[false]{tocfour}
@@ -53,7 +53,8 @@
\DeclareBoolOption[false]{debug}
\DeclareBoolOption[false]{newgeometry}
\DeclareBoolOption[false]{openright}
-\DeclareBoolOption[true]{caplastcenter}
+\DeclareBoolOption[false]{capcenterlast}
+\DeclareBoolOption[false]{subcapcenterlast}
\DeclareStringOption{fontset}
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{ctexbook}}
\ProcessKeyvalOptions*
@@ -164,6 +165,7 @@
\fi
\ifhit at debug%
\RequirePackage{layout}
+\RequirePackage{layouts}
\RequirePackage{lineno}
\fi
\RequirePackage{fancyhdr}
@@ -174,7 +176,10 @@
\RequirePackage[below]{placeins}%允许上一个section的浮动图形出现在下一个section的开始部分,还提供\FloatBarrier命令,使所有未处理的浮动图形立即被处理
\RequirePackage{flafter} % 使得所有浮动体不能被放置在其浮动环境之前，以免浮动体在引述它的文本之前出现.
\RequirePackage{multirow} %使用Multirow宏包，使得表格可以合并多个row格
-\RequirePackage[hang]{subfigure}%支持子图 %centerlast 设置最后一行是否居中
+\ifhit at subcapcenterlast
+\PassOptionsToPackage{centerlast}{subfigure}
+\fi
+\RequirePackage{subfigure}%支持子图 %centerlast 设置最后一行是否居中
\RequirePackage[subfigure]{ccaption} %支持双语标题
\RequirePackage[makeindex]{splitidx}
\newindex[]{china}
@@ -325,8 +330,11 @@
\setlength{\intextsep}{\ifhit at glue 20.50398bp \@plus 2.83465bp \@minus 0bp\else 21bp\fi}
\setlength{\textfloatsep}{\ifhit at glue 20.50398bp \@plus 2.83465bp \@minus 0bp\else 21bp\fi}
\setlength{\@fptop}{0bp}
-\setlength{\@fpsep}{12bp}
+\setlength{\@fpsep}{\ifhit at glue 20.50398bp \@plus 2.83465bp \@minus 0bp\else 21bp\fi}
\setlength{\@fpbot}{0bp}
+\g at addto@macro\appendix{\renewcommand*{\thefigure}{\thechapter-\arabic{figure}}}
+\g at addto@macro\appendix{\renewcommand*{\thetable}{\thechapter-\arabic{table}}}
+\g at addto@macro\appendix{\renewcommand*{\theequation}{\thechapter-\arabic{equation}}}
\renewcommand{\textfraction}{0.15}
\renewcommand{\topfraction}{0.85}
\renewcommand{\bottomfraction}{0.65}
@@ -341,9 +349,21 @@
\def\endtable{\vskip-1em\hit at oldendtable\endgroup}
\long\def\@makecaption#1#2{%
\vskip\abovecaptionskip
- \wuhao\ifhit at caplastcenter\centering\fi\sbox\@tempboxa{#1\ifhit at bachelor\hskip\ccwd\else\enskip\fi#2}%
+ \wuhao\sbox\@tempboxa{#1\ifhit at bachelor\hskip\ccwd\else\enskip\fi#2}%
\ifdim \wd\@tempboxa >\hsize
- #1\ifhit at bachelor\hskip\ccwd\else\enskip\fi#2\par
+ \ifhit at capcenterlast%
+ \vskip 6.3bp%
+ {\setbox0=\vbox{#1\ifhit at bachelor\hskip\ccwd\else\enskip\fi#2}
+ \setbox1=\vbox{%
+ \unvbox0
+ \setbox2=\lastbox
+ \hbox to \textwidth{\hfill\unhcopy2 \unskip\unskip\hfill}
+ }
+ \unvbox1}
+ \else%
+ #1\ifhit at bachelor\hskip\ccwd\else\enskip\fi#2%
+ \fi%
+ \par
\else
\global \@minipagefalse
\hb at xt@\hsize{\hfil\box\@tempboxa\hfil}%
@@ -367,14 +387,11 @@
\renewcommand{\thesubfigure}{\alph{subfigure})}%使子图编号为 a)的格式
\renewcommand{\p at subfigure}{\thefigure~} %使子图引用为 7-1 a) 的格式，母图编号和子图编号之间用~加一个空格
\renewcommand{\thetable}{\arabic{chapter}-\arabic{table}}%使表编号为 7-1 的格式
-\renewcommand{\theequation}{\arabic{chapter}-\arabic{equation}}%使公式编号为 7-1 的格式
\setitemize{leftmargin=0em,itemsep=0em,partopsep=0em,parsep=0em,topsep=0em,itemindent=3em}
\setenumerate{leftmargin=0em,itemsep=0em,partopsep=0em,parsep=0em,topsep=0em,itemindent=3.5em}
\newcommand{\citeup}[1]{\textsuperscript{\cite{#1}}}
\captionnamefont{\wuhao}
\captiontitlefont{\wuhao}
-\captiondelim{~~}
-\hangcaption
\renewcommand{\subcapsize}{\wuhao}
\setlength{\abovecaptionskip}{0pt}%为了双标题之间的间距，不能设置
\setlength{\belowcaptionskip}{0pt}
@@ -500,7 +517,7 @@
{\hit at chapter{#3}}%
{\hit at chapter[#2]{#3}}%
\IfValueT{#4}{%
- \addcontentsline{toe}{chapter}{\bfseries\relax Chapter \thechapter\hspace{0.5em} #4}
+ \addcontentsline{toe}{chapter}{\bfseries\relax Chapter \thechapter\hspace{0.5em}\ignorespaces #4}
}
}
}
@@ -519,7 +536,7 @@
{\hit at section{#3}}%
{\hit at section[#2]{#3}}%
\IfValueT{#4}{%
- \addcontentsline{toe}{section}{\protect\numberline{\csname thesection\endcsname} #4}
+ \addcontentsline{toe}{section}{\protect\numberline{\csname thesection\endcsname}\ignorespaces #4}
}
}
}
@@ -538,7 +555,7 @@
{\hit at subsection{#3}}%
{\hit at subsection[#2]{#3}}%
\IfValueT{#4}{%
- \addcontentsline{toe}{subsection}{\protect\numberline{\csname thesubsection\endcsname} #4}
+ \addcontentsline{toe}{subsection}{\protect\numberline{\csname thesubsection\endcsname}\ignorespaces #4}
}
}
}
@@ -557,7 +574,7 @@
{\hit at subsubsection{#3}}%
{\hit at subsubsection[#2]{#3}}%
\IfValueT{#4}{%
- \addcontentsline{toe}{subsubsection}{\protect\numberline{\csname thesubsubsection\endcsname} #4}
+ \addcontentsline{toe}{subsubsection}{\protect\numberline{\csname thesubsubsection\endcsname}\ignorespaces #4}
}
}
}
@@ -870,6 +887,7 @@
\def\@pnumwidth{4em}%规定中的提前悬挂
\def\@tocrmarg{\@pnumwidth}
\def\@dotsep{1}
+\setlength\@tempdima{4em}%
\patchcmd{\@dottedtocline}{#4}{\csname hit at toc@font\endcsname #4}{}{}
\patchcmd{\@dottedtocline}{\hb at xt@\@pnumwidth}{\hbox}{}{}
\renewcommand*\l at chapter[2]{%
@@ -876,7 +894,6 @@
\ifnum \c at tocdepth >\m at ne
\addpenalty{-\@highpenalty}%
%\vskip 4bp \@plus\p@
- \setlength\@tempdima{4em}%
\begingroup
\parindent \z@ \rightskip \@pnumwidth
\parfillskip -\@pnumwidth
@@ -903,6 +920,7 @@
\def\engcontentsname{\bfseries Contents}
\newcommand\tableofengcontents{
+ \def\l at chapter{\@dottedtocline{0}{0em}{5em}}%控制英文目录： 细点\@dottedtocline 粗点\@dottedtoclinebold
\@restonecolfalse
\chapter*{\engcontentsname %chapter*上移一行，避免在toc中出现。
\pdfbookmark[0]{Contents}{econtent}
More information about the tex-live-commits
mailing list