diff options
author | Norbert Preining <norbert@preining.info> | 2020-10-15 03:00:58 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-10-15 03:00:58 +0000 |
commit | ff1e02dbf9c33ee832d7f0cb39a42648b376c9c5 (patch) | |
tree | a42fe5db4e9016144fdea322aff808927deeccd6 | |
parent | 3a5a864b265cf29d47d0821fb7f03745f99b97d9 (diff) |
CTAN sync 202010150300
161 files changed, 3580 insertions, 3435 deletions
diff --git a/FILES.byname b/FILES.byname index d92860f6ad..7612452ce6 100644 --- a/FILES.byname +++ b/FILES.byname @@ -5019,7 +5019,7 @@ 1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp 1990/10/02 | 812 | dviware/vutex/vaxvms.ins 1990/10/02 | 127576 | dviware/vutex/vutex.web -2020/10/14 | 127040 | FILES.last07days +2020/10/14 | 125795 | FILES.last07days 2020/08/14 | 104065 | fonts/academicons/academicons.pdf 2020/08/14 | 17247 | fonts/academicons/academicons.sty 2020/08/14 | 6546 | fonts/academicons/academicons.tex @@ -62212,45 +62212,31 @@ 2020/05/06 | 82 | fonts/libertinus/Changes 2020/05/06 | 15920 | fonts/libertinus/doc/libertinus-doc.pdf 2019/11/25 | 851 | fonts/libertinus/doc/libertinus-doc.tex -2020/10/08 | 732 | fonts/libertinus-fonts/AUTHORS.txt -2020/10/08 | 1402 | fonts/libertinus-fonts/CONTRIBUTING.md -2020/10/08 | 878 | fonts/libertinus-fonts/CONTRIBUTORS.txt -2020/10/08 | 160836 | fonts/libertinus-fonts/documentation/Math-Sample.pdf -2020/10/08 | 91660 | fonts/libertinus-fonts/documentation/Opentype-Features.pdf -2020/10/08 | 202681 | fonts/libertinus-fonts/documentation/Sample.pdf -2020/10/08 | 14702 | fonts/libertinus-fonts/FONTLOG.txt -2020/10/08 | 4426 | fonts/libertinus-fonts/OFL.txt -2020/10/08 | 53928 | fonts/libertinus-fonts/otf/LibertinusKeyboard-Regular.otf -2020/10/08 | 512748 | fonts/libertinus-fonts/otf/LibertinusMath-Regular.otf -2020/10/08 | 59028 | fonts/libertinus-fonts/otf/LibertinusMono-Regular.otf -2020/10/08 | 274900 | fonts/libertinus-fonts/otf/LibertinusSans-Bold.otf -2020/10/08 | 288564 | fonts/libertinus-fonts/otf/LibertinusSans-Italic.otf -2020/10/08 | 256760 | fonts/libertinus-fonts/otf/LibertinusSans-Regular.otf -2020/10/08 | 237604 | fonts/libertinus-fonts/otf/LibertinusSerif-BoldItalic.otf -2020/10/08 | 279280 | fonts/libertinus-fonts/otf/LibertinusSerif-Bold.otf -2020/10/08 | 255360 | fonts/libertinus-fonts/otf/LibertinusSerifDisplay-Regular.otf -2020/10/08 | 84284 | fonts/libertinus-fonts/otf/LibertinusSerifInitials-Regular.otf -2020/10/08 | 317688 | fonts/libertinus-fonts/otf/LibertinusSerif-Italic.otf -2020/10/08 | 297912 | fonts/libertinus-fonts/otf/LibertinusSerif-Regular.otf -2020/10/08 | 328808 | fonts/libertinus-fonts/otf/LibertinusSerif-SemiboldItalic.otf -2020/10/08 | 276492 | fonts/libertinus-fonts/otf/LibertinusSerif-Semibold.otf -2020/10/08 | 510180 | fonts/libertinus-fonts/preview.svg -2020/10/08 | 5595 | fonts/libertinus-fonts/README.md -2020/10/08 | 35264 | fonts/libertinus-fonts/woff2/LibertinusKeyboard-Regular.woff2 -2020/10/08 | 327192 | fonts/libertinus-fonts/woff2/LibertinusMath-Regular.woff2 -2020/10/08 | 40440 | fonts/libertinus-fonts/woff2/LibertinusMono-Regular.woff2 -2020/10/08 | 171048 | fonts/libertinus-fonts/woff2/LibertinusSans-Bold.woff2 -2020/10/08 | 181144 | fonts/libertinus-fonts/woff2/LibertinusSans-Italic.woff2 -2020/10/08 | 160172 | fonts/libertinus-fonts/woff2/LibertinusSans-Regular.woff2 -2020/10/08 | 150540 | fonts/libertinus-fonts/woff2/LibertinusSerif-BoldItalic.woff2 -2020/10/08 | 174620 | fonts/libertinus-fonts/woff2/LibertinusSerif-Bold.woff2 -2020/10/08 | 160012 | fonts/libertinus-fonts/woff2/LibertinusSerifDisplay-Regular.woff2 -2020/10/08 | 59428 | fonts/libertinus-fonts/woff2/LibertinusSerifInitials-Regular.woff2 -2020/10/08 | 201400 | fonts/libertinus-fonts/woff2/LibertinusSerif-Italic.woff2 -2020/10/08 | 187700 | fonts/libertinus-fonts/woff2/LibertinusSerif-Regular.woff2 -2020/10/08 | 209512 | fonts/libertinus-fonts/woff2/LibertinusSerif-SemiboldItalic.woff2 -2020/10/08 | 176604 | fonts/libertinus-fonts/woff2/LibertinusSerif-Semibold.woff2 -2020/10/09 | 5446574 | fonts/libertinus-fonts.zip +2020/10/14 | 732 | fonts/libertinus-fonts/AUTHORS.txt +2020/10/14 | 1402 | fonts/libertinus-fonts/CONTRIBUTING.md +2020/10/14 | 878 | fonts/libertinus-fonts/CONTRIBUTORS.txt +2020/10/14 | 160836 | fonts/libertinus-fonts/documentation/Math-Sample.pdf +2020/10/14 | 91660 | fonts/libertinus-fonts/documentation/Opentype-Features.pdf +2020/10/14 | 202681 | fonts/libertinus-fonts/documentation/Sample.pdf +2020/10/14 | 15110 | fonts/libertinus-fonts/FONTLOG.txt +2020/10/14 | 4426 | fonts/libertinus-fonts/OFL.txt +2020/10/14 | 53912 | fonts/libertinus-fonts/otf/LibertinusKeyboard-Regular.otf +2020/10/14 | 512748 | fonts/libertinus-fonts/otf/LibertinusMath-Regular.otf +2020/10/14 | 58960 | fonts/libertinus-fonts/otf/LibertinusMono-Regular.otf +2020/10/14 | 274900 | fonts/libertinus-fonts/otf/LibertinusSans-Bold.otf +2020/10/14 | 288564 | fonts/libertinus-fonts/otf/LibertinusSans-Italic.otf +2020/10/14 | 256760 | fonts/libertinus-fonts/otf/LibertinusSans-Regular.otf +2020/10/14 | 237572 | fonts/libertinus-fonts/otf/LibertinusSerif-BoldItalic.otf +2020/10/14 | 279280 | fonts/libertinus-fonts/otf/LibertinusSerif-Bold.otf +2020/10/14 | 254800 | fonts/libertinus-fonts/otf/LibertinusSerifDisplay-Regular.otf +2020/10/14 | 84284 | fonts/libertinus-fonts/otf/LibertinusSerifInitials-Regular.otf +2020/10/14 | 317688 | fonts/libertinus-fonts/otf/LibertinusSerif-Italic.otf +2020/10/14 | 297912 | fonts/libertinus-fonts/otf/LibertinusSerif-Regular.otf +2020/10/14 | 328768 | fonts/libertinus-fonts/otf/LibertinusSerif-SemiboldItalic.otf +2020/10/14 | 276472 | fonts/libertinus-fonts/otf/LibertinusSerif-Semibold.otf +2020/10/14 | 510180 | fonts/libertinus-fonts/preview.svg +2020/10/14 | 6624 | fonts/libertinus-fonts/README.md +2020/10/14 | 3211985 | fonts/libertinus-fonts.zip 2020/05/06 | 847 | fonts/libertinus/latex/libertinus.sty 2020/10/13 | 1809 | fonts/libertinus-otf/Changes 2020/10/13 | 626620 | fonts/libertinus-otf/doc/libertinus-otf-doc.pdf @@ -138231,46 +138217,46 @@ 2019/04/14 | 24014 | graphics/pgf/contrib/chordbox/chordbox.tex 2019/04/14 | 1125 | graphics/pgf/contrib/chordbox/README.md 2019/04/15 | 567774 | graphics/pgf/contrib/chordbox.zip -2020/10/04 | 28039 | graphics/pgf/contrib/circuitikz/doc/changelog.tex -2020/10/04 | 17743 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf -2020/10/04 | 938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex -2020/10/04 | 1083975 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf -2020/10/04 | 374265 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex -2020/10/04 | 418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex -2020/10/04 | 6106 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty -2020/10/04 | 3277 | graphics/pgf/contrib/circuitikz/README.md -2020/10/04 | 364086 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty -2020/10/04 | 393856 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty -2020/10/04 | 403539 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty -2020/10/04 | 422268 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty -2020/10/04 | 690730 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty -2020/10/04 | 758990 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty -2020/10/04 | 841461 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty -2020/10/04 | 937253 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty -2020/10/04 | 11132 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty -2020/10/04 | 280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex -2020/10/04 | 3098 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex -2020/10/04 | 1875 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex -2020/10/04 | 228583 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex -2020/10/04 | 8754 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex -2020/10/04 | 104844 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex -2020/10/04 | 9107 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex -2020/10/04 | 14029 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex -2020/10/04 | 46195 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex -2020/10/04 | 151918 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex -2020/10/04 | 62614 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex -2020/10/04 | 51357 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex -2020/10/04 | 30990 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex -2020/10/04 | 251110 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex -2020/10/04 | 2678 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex -2020/10/04 | 31819 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex -2020/10/04 | 416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex -2020/10/04 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex -2020/10/04 | 751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex -2020/10/04 | 834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex -2020/10/04 | 929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex -2020/10/04 | 3590 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex -2020/10/04 | 2155708 | graphics/pgf/contrib/circuitikz.zip +2020/10/14 | 28369 | graphics/pgf/contrib/circuitikz/doc/changelog.tex +2020/10/14 | 17743 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf +2020/10/14 | 938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex +2020/10/14 | 1093750 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf +2020/10/14 | 376120 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex +2020/10/14 | 418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex +2020/10/14 | 6106 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty +2020/10/14 | 3277 | graphics/pgf/contrib/circuitikz/README.md +2020/10/14 | 364086 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty +2020/10/14 | 393856 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty +2020/10/14 | 403539 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty +2020/10/14 | 422268 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty +2020/10/14 | 690730 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty +2020/10/14 | 758990 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty +2020/10/14 | 841461 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty +2020/10/14 | 937253 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty +2020/10/14 | 11132 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty +2020/10/14 | 280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex +2020/10/14 | 3098 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex +2020/10/14 | 1875 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex +2020/10/14 | 228583 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex +2020/10/14 | 8754 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex +2020/10/14 | 104844 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex +2020/10/14 | 9107 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex +2020/10/14 | 14413 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex +2020/10/14 | 46195 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex +2020/10/14 | 151918 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex +2020/10/14 | 62614 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex +2020/10/14 | 51357 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex +2020/10/14 | 30990 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex +2020/10/14 | 251110 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex +2020/10/14 | 2678 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex +2020/10/14 | 31836 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex +2020/10/14 | 416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex +2020/10/14 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex +2020/10/14 | 751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex +2020/10/14 | 834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex +2020/10/14 | 929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex +2020/10/14 | 3590 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex +2020/10/14 | 2166099 | graphics/pgf/contrib/circuitikz.zip 2019/07/12 | 14811 | graphics/pgf/contrib/codeanatomy/codeanatomy.dtx 2019/07/12 | 1475 | graphics/pgf/contrib/codeanatomy/codeanatomy.ins 2019/07/12 | 123921 | graphics/pgf/contrib/codeanatomy/codeanatomy.lstlisting.pdf @@ -166196,7 +166182,7 @@ 2020/10/01 | 13189701 | install/graphics/pgf/base/pgf.tds.zip 2013/02/23 | 92056 | install/graphics/pgf/contrib/battleship.tds.zip 2016/02/19 | 701759 | install/graphics/pgf/contrib/celtic.tds.zip -2020/10/04 | 2169789 | install/graphics/pgf/contrib/circuitikz.tds.zip +2020/10/14 | 2180258 | install/graphics/pgf/contrib/circuitikz.tds.zip 2020/06/12 | 573255 | install/graphics/pgf/contrib/commutative-diagrams.tds.zip 2017/06/01 | 1005947 | install/graphics/pgf/contrib/hobby.tds.zip 2014/06/15 | 843875 | install/graphics/pgf/contrib/logicpuzzle.tds.zip @@ -166526,7 +166512,7 @@ 2019/07/31 | 453685 | install/macros/latex/contrib/thalie.tds.zip 2013/01/06 | 389729 | install/macros/latex/contrib/threadcol.tds.zip 2014/03/09 | 752162 | install/macros/latex/contrib/thumbs.tds.zip -2020/09/10 | 2661338 | install/macros/latex/contrib/thuthesis.tds.zip +2020/10/14 | 1625917 | install/macros/latex/contrib/thuthesis.tds.zip 2009/09/04 | 196291 | install/macros/latex/contrib/titling.tds.zip 2010/10/13 | 327240 | install/macros/latex/contrib/tocbibind.tds.zip 2014/03/10 | 311835 | install/macros/latex/contrib/tocvsec2.tds.zip @@ -166555,7 +166541,7 @@ 2020/03/04 | 377976 | install/macros/latex/contrib/xsavebox.tds.zip 2011/07/31 | 387124 | install/macros/latex/contrib/xtab.tds.zip 2009/02/27 | 2323785 | install/macros/latex/contrib/yagusylo.tds.zip -2020/06/16 | 12799245 | install/macros/latex/contrib/yathesis.tds.zip +2020/10/14 | 12489060 | install/macros/latex/contrib/yathesis.tds.zip 2012/05/03 | 352839 | install/macros/latex/contrib/ydoc.tds.zip 2020/04/09 | 806385 | install/macros/latex/contrib/zhlipsum.tds.zip 2020/05/01 | 293478 | install/macros/latex/contrib/zhnumber.tds.zip @@ -166570,7 +166556,7 @@ 2020/10/01 | 2643064 | install/macros/latex/required/latex-amsmath.tds.zip 2020/09/25 | 200192 | install/macros/latex/required/latexbug.tds.zip 2018/04/06 | 1324669 | install/macros/latex/required/latex-cyrillic.tds.zip -2020/10/09 | 216218 | install/macros/latex/required/latex-firstaid.tds.zip +2020/10/14 | 231717 | install/macros/latex/required/latex-firstaid.tds.zip 2020/10/01 | 2533230 | install/macros/latex/required/latex-graphics.tds.zip 2020/10/01 | 6964612 | install/macros/latex/required/latex-tools.tds.zip 2016/09/02 | 108688 | install/macros/luatex/generic/cstypo.tds.zip @@ -175225,56 +175211,57 @@ 2020/10/07 | 3194 | language/japanese/platex/plnews.cls 2020/10/07 | 22997 | language/japanese/platex/plvers.dtx 2020/10/07 | 2034 | language/japanese/platex/README.md -2020/09/27 | 1500 | language/japanese/platex-tools/LICENSE -2020/09/27 | 66352 | language/japanese/platex-tools/plarray.pdf -2020/09/27 | 1836 | language/japanese/platex-tools/plarray.sty -2020/09/27 | 2942 | language/japanese/platex-tools/plarray.tex -2020/09/27 | 92346 | language/japanese/platex-tools/plextarray.pdf -2020/09/27 | 3689 | language/japanese/platex-tools/plextarray.sty -2020/09/27 | 5902 | language/japanese/platex-tools/plextarray.tex -2020/09/27 | 71413 | language/japanese/platex-tools/plextdelarray.pdf -2020/09/27 | 1771 | language/japanese/platex-tools/plextdelarray.sty -2020/09/27 | 5059 | language/japanese/platex-tools/plextdelarray.tex -2020/09/27 | 83094 | language/japanese/platex-tools/pxatbegshi.pdf -2020/09/27 | 3792 | language/japanese/platex-tools/pxatbegshi.sty -2020/09/27 | 3878 | language/japanese/platex-tools/pxatbegshi.tex -2020/09/27 | 58790 | language/japanese/platex-tools/pxeverysel.pdf -2020/09/27 | 5365 | language/japanese/platex-tools/pxeverysel.sty -2020/09/27 | 2612 | language/japanese/platex-tools/pxeverysel.tex -2020/09/27 | 57534 | language/japanese/platex-tools/pxeveryshi.pdf -2020/09/27 | 1391 | language/japanese/platex-tools/pxeveryshi.sty -2020/09/27 | 2660 | language/japanese/platex-tools/pxeveryshi.tex -2020/09/27 | 56616 | language/japanese/platex-tools/pxftnright.pdf -2020/09/27 | 3775 | language/japanese/platex-tools/pxftnright.sty -2020/09/27 | 2362 | language/japanese/platex-tools/pxftnright.tex -2020/09/27 | 49650 | language/japanese/platex-tools/pxmulticol.pdf -2020/09/27 | 607 | language/japanese/platex-tools/pxmulticol.sty -2020/09/27 | 1937 | language/japanese/platex-tools/pxmulticol.tex -2020/09/27 | 39968 | language/japanese/platex-tools/pxxspace.pdf -2020/09/27 | 3515 | language/japanese/platex-tools/pxxspace.sty -2020/09/27 | 2589 | language/japanese/platex-tools/pxxspace.tex -2020/09/27 | 2941 | language/japanese/platex-tools/README.md -2020/09/27 | 589384 | language/japanese/platex-tools.zip +2020/10/14 | 1500 | language/japanese/platex-tools/LICENSE +2020/10/14 | 58689 | language/japanese/platex-tools/plarray.pdf +2020/10/14 | 1836 | language/japanese/platex-tools/plarray.sty +2020/10/14 | 2915 | language/japanese/platex-tools/plarray.tex +2020/10/14 | 35463 | language/japanese/platex-tools/pldocverb.pdf +2020/10/14 | 1349 | language/japanese/platex-tools/pldocverb.sty +2020/10/14 | 1647 | language/japanese/platex-tools/pldocverb.tex +2020/10/14 | 78889 | language/japanese/platex-tools/plextarray.pdf +2020/10/14 | 3689 | language/japanese/platex-tools/plextarray.sty +2020/10/14 | 5902 | language/japanese/platex-tools/plextarray.tex +2020/10/14 | 35074 | language/japanese/platex-tools/plextcolortbl.pdf +2020/10/14 | 1066 | language/japanese/platex-tools/plextcolortbl.sty +2020/10/14 | 1636 | language/japanese/platex-tools/plextcolortbl.tex +2020/10/14 | 64927 | language/japanese/platex-tools/plextdelarray.pdf +2020/10/14 | 1771 | language/japanese/platex-tools/plextdelarray.sty +2020/10/14 | 5059 | language/japanese/platex-tools/plextdelarray.tex +2020/10/14 | 72780 | language/japanese/platex-tools/pxatbegshi.pdf +2020/10/14 | 3792 | language/japanese/platex-tools/pxatbegshi.sty +2020/10/14 | 3878 | language/japanese/platex-tools/pxatbegshi.tex +2020/10/14 | 53283 | language/japanese/platex-tools/pxeverysel.pdf +2020/10/14 | 5365 | language/japanese/platex-tools/pxeverysel.sty +2020/10/14 | 2612 | language/japanese/platex-tools/pxeverysel.tex +2020/10/14 | 51299 | language/japanese/platex-tools/pxeveryshi.pdf +2020/10/14 | 1391 | language/japanese/platex-tools/pxeveryshi.sty +2020/10/14 | 2660 | language/japanese/platex-tools/pxeveryshi.tex +2020/10/14 | 52774 | language/japanese/platex-tools/pxftnright.pdf +2020/10/14 | 3775 | language/japanese/platex-tools/pxftnright.sty +2020/10/14 | 2362 | language/japanese/platex-tools/pxftnright.tex +2020/10/14 | 44150 | language/japanese/platex-tools/pxmulticol.pdf +2020/10/14 | 607 | language/japanese/platex-tools/pxmulticol.sty +2020/10/14 | 1937 | language/japanese/platex-tools/pxmulticol.tex +2020/10/14 | 36240 | language/japanese/platex-tools/pxxspace.pdf +2020/10/14 | 3515 | language/japanese/platex-tools/pxxspace.sty +2020/10/14 | 2589 | language/japanese/platex-tools/pxxspace.tex +2020/10/14 | 2918 | language/japanese/platex-tools/README.md +2020/10/14 | 596017 | language/japanese/platex-tools.zip 2020/10/07 | 1676659 | language/japanese/platex.zip -2020/09/27 | 1500 | language/japanese/plautopatch/LICENSE -2020/09/27 | 931 | language/japanese/plautopatch/plarydshln.sty -2020/09/27 | 103312 | language/japanese/plautopatch/plautopatch-ja.pdf -2020/09/27 | 7593 | language/japanese/plautopatch/plautopatch-ja.tex -2020/09/27 | 36706 | language/japanese/plautopatch/plautopatch.pdf -2020/09/27 | 9097 | language/japanese/plautopatch/plautopatch.sty -2020/09/27 | 6722 | language/japanese/plautopatch/plautopatch.tex -2020/09/27 | 5479 | language/japanese/plautopatch/plcollcell.sty -2020/09/27 | 1347 | language/japanese/plautopatch/pldocverb.sty -2020/09/27 | 1965 | language/japanese/plautopatch/plextarydshln.sty -2020/09/27 | 1066 | language/japanese/plautopatch/plextcolortbl.sty -2020/09/27 | 2086 | language/japanese/plautopatch/plsiunitx.sty -2020/09/27 | 5654 | language/japanese/plautopatch/pxesopic.sty -2020/09/27 | 1471 | language/japanese/plautopatch/pxpdfpages.sty -2020/09/27 | 885 | language/japanese/plautopatch/pxpgfrcs.sty -2020/09/27 | 3009 | language/japanese/plautopatch/pxstfloats.sty -2020/09/27 | 2456 | language/japanese/plautopatch/pxtextpos.sty -2020/09/27 | 3885 | language/japanese/plautopatch/README.md -2020/09/27 | 158225 | language/japanese/plautopatch.zip +2020/10/14 | 1500 | language/japanese/plautopatch/LICENSE +2020/10/14 | 931 | language/japanese/plautopatch/plarydshln.sty +2020/10/14 | 88308 | language/japanese/plautopatch/plautopatch-ja.pdf +2020/10/14 | 8001 | language/japanese/plautopatch/plautopatch-ja.tex +2020/10/14 | 36828 | language/japanese/plautopatch/plautopatch.pdf +2020/10/14 | 9075 | language/japanese/plautopatch/plautopatch.sty +2020/10/14 | 7135 | language/japanese/plautopatch/plautopatch.tex +2020/10/14 | 5479 | language/japanese/plautopatch/plcollcell.sty +2020/10/14 | 1965 | language/japanese/plautopatch/plextarydshln.sty +2020/10/14 | 2086 | language/japanese/plautopatch/plsiunitx.sty +2020/10/14 | 1123 | language/japanese/plautopatch/pxpgfrcs.sty +2020/10/14 | 3009 | language/japanese/plautopatch/pxstfloats.sty +2020/10/14 | 3214 | language/japanese/plautopatch/README.md +2020/10/14 | 138480 | language/japanese/plautopatch.zip 2020/05/20 | 18092 | language/japanese/ptex2pdf/COPYING 2020/05/20 | 14066 | language/japanese/ptex2pdf/ptex2pdf.lua 2020/05/20 | 6622 | language/japanese/ptex2pdf/README.md @@ -175404,14 +175391,14 @@ 2019/03/31 | 492 | language/japanese/pxchfon/vf/cfjas-x-ts1.vf 2020/10/04 | 375343 | language/japanese/pxchfon.zip 2020/04/25 | 1091 | language/japanese/pxjahyper/LICENSE -2020/10/05 | 23995 | language/japanese/pxjahyper/pxjahyper-ajm.def -2020/10/06 | 3343 | language/japanese/pxjahyper/pxjahyper-enc.sty +2020/10/07 | 23994 | language/japanese/pxjahyper/pxjahyper-ajm.def +2020/10/07 | 3307 | language/japanese/pxjahyper/pxjahyper-enc.sty 2020/10/06 | 116641 | language/japanese/pxjahyper/pxjahyper.pdf -2020/10/06 | 39649 | language/japanese/pxjahyper/pxjahyper.sty -2020/10/06 | 9897 | language/japanese/pxjahyper/pxjahyper.tex -2020/10/06 | 4366 | language/japanese/pxjahyper/README-ja.md -2020/10/06 | 1838 | language/japanese/pxjahyper/README.md -2020/10/06 | 140247 | language/japanese/pxjahyper.zip +2020/10/07 | 38758 | language/japanese/pxjahyper/pxjahyper.sty +2020/10/07 | 9898 | language/japanese/pxjahyper/pxjahyper.tex +2020/10/07 | 4380 | language/japanese/pxjahyper/README-ja.md +2020/10/07 | 1872 | language/japanese/pxjahyper/README.md +2020/10/14 | 140036 | language/japanese/pxjahyper.zip 2020/05/04 | 1091 | language/japanese/pxjodel/LICENSE 2020/05/04 | 105827 | language/japanese/pxjodel/pxjodel.pdf 2020/05/04 | 4901 | language/japanese/pxjodel/pxjodel.sty @@ -183943,11 +183930,11 @@ 2013/05/20 | 1546 | macros/latex/contrib/babel-contrib/romansh/romansh.ldf 2013/05/20 | 111436 | macros/latex/contrib/babel-contrib/romansh/romansh.pdf 2013/05/20 | 114479 | macros/latex/contrib/babel-contrib/romansh.zip -2020/10/06 | 7488 | macros/latex/contrib/babel-contrib/russian/README -2020/10/06 | 91145 | macros/latex/contrib/babel-contrib/russian/russianb.dtx -2020/10/06 | 4612 | macros/latex/contrib/babel-contrib/russian/russianb.ins -2020/10/06 | 550621 | macros/latex/contrib/babel-contrib/russian/russianb.pdf -2020/10/08 | 528375 | macros/latex/contrib/babel-contrib/russian.zip +2020/10/14 | 7629 | macros/latex/contrib/babel-contrib/russian/README +2020/10/13 | 91489 | macros/latex/contrib/babel-contrib/russian/russianb.dtx +2020/10/14 | 4612 | macros/latex/contrib/babel-contrib/russian/russianb.ins +2020/10/14 | 127486 | macros/latex/contrib/babel-contrib/russian/russianb.pdf +2020/10/14 | 156289 | macros/latex/contrib/babel-contrib/russian.zip 2013/05/20 | 8153 | macros/latex/contrib/babel-contrib/samin/samin.dtx 2013/05/20 | 4933 | macros/latex/contrib/babel-contrib/samin/samin.ins 2013/05/20 | 124782 | macros/latex/contrib/babel-contrib/samin/samin.pdf @@ -184000,11 +183987,11 @@ 2019/07/05 | 4954 | macros/latex/contrib/babel-contrib/turkish/turkish.ins 2019/07/05 | 297619 | macros/latex/contrib/babel-contrib/turkish/turkish.pdf 2019/07/05 | 303843 | macros/latex/contrib/babel-contrib/turkish.zip -2020/10/13 | 5966 | macros/latex/contrib/babel-contrib/ukrainian/README.md -2020/10/13 | 65927 | macros/latex/contrib/babel-contrib/ukrainian/ukraineb.dtx -2020/10/13 | 4808 | macros/latex/contrib/babel-contrib/ukrainian/ukraineb.ins -2020/10/13 | 134371 | macros/latex/contrib/babel-contrib/ukrainian/ukraineb.pdf -2020/10/13 | 157018 | macros/latex/contrib/babel-contrib/ukrainian.zip +2020/10/14 | 6064 | macros/latex/contrib/babel-contrib/ukrainian/README.md +2020/10/14 | 66157 | macros/latex/contrib/babel-contrib/ukrainian/ukraineb.dtx +2020/10/14 | 4808 | macros/latex/contrib/babel-contrib/ukrainian/ukraineb.ins +2020/10/14 | 134237 | macros/latex/contrib/babel-contrib/ukrainian/ukraineb.pdf +2020/10/14 | 156995 | macros/latex/contrib/babel-contrib/ukrainian.zip 2015/12/31 | 400 | macros/latex/contrib/babel-contrib/vietnamese/README 2015/12/31 | 30242 | macros/latex/contrib/babel-contrib/vietnamese/vietnamese.dtx 2015/12/31 | 4262 | macros/latex/contrib/babel-contrib/vietnamese/vietnamese.ins @@ -189295,9 +189282,9 @@ 2018/12/30 | 1110 | macros/latex/contrib/delimset/README.txt 2018/12/30 | 328783 | macros/latex/contrib/delimset.zip 2011/09/15 | 301243 | macros/latex/contrib/delim.zip -2020/05/31 | 81273 | macros/latex/contrib/denisbdoc/denisbdoc.dtx -2020/05/31 | 477 | macros/latex/contrib/denisbdoc/README.md -2020/05/31 | 23266 | macros/latex/contrib/denisbdoc.zip +2020/10/14 | 82745 | macros/latex/contrib/denisbdoc/denisbdoc.dtx +2020/10/14 | 483 | macros/latex/contrib/denisbdoc/README.md +2020/10/14 | 23510 | macros/latex/contrib/denisbdoc.zip 2020/07/20 | 185397 | macros/latex/contrib/derivative/derivative.pdf 2020/07/20 | 42252 | macros/latex/contrib/derivative/derivative.sty 2020/07/20 | 99308 | macros/latex/contrib/derivative/derivative.tex @@ -191130,18 +191117,17 @@ 2010/05/04 | 1431 | macros/latex/contrib/esk/README 2010/05/05 | 434664 | macros/latex/contrib/esk.zip 2015/04/20 | 631 | macros/latex/contrib/eso-pic/eso-article-test.tex -2020/09/27 | 886 | macros/latex/contrib/eso-pic/eso-ex1.tex -2018/05/12 | 866 | macros/latex/contrib/eso-pic/eso-ex2.tex -2018/05/12 | 1223 | macros/latex/contrib/eso-pic/eso-ex3.tex -2018/05/12 | 922 | macros/latex/contrib/eso-pic/eso-ex4.tex -2018/05/12 | 1537 | macros/latex/contrib/eso-pic/eso-ex5.tex -2018/05/12 | 994 | macros/latex/contrib/eso-pic/eso-memoir-test.tex -2020/09/27 | 25231 | macros/latex/contrib/eso-pic/eso-pic.dtx -2018/05/12 | 1574 | macros/latex/contrib/eso-pic/eso-pic.ins -2020/09/27 | 250230 | macros/latex/contrib/eso-pic/eso-pic.pdf -2020/09/27 | 318 | macros/latex/contrib/eso-pic/README -2015/04/20 | 2263 | macros/latex/contrib/eso-pic/showframe.sty -2020/09/27 | 260711 | macros/latex/contrib/eso-pic.zip +2020/10/14 | 770 | macros/latex/contrib/eso-pic/eso-ex1.tex +2020/10/14 | 686 | macros/latex/contrib/eso-pic/eso-ex2.tex +2020/10/14 | 1646 | macros/latex/contrib/eso-pic/eso-ex4.tex +2020/10/14 | 1483 | macros/latex/contrib/eso-pic/eso-ex5.tex +2020/10/14 | 970 | macros/latex/contrib/eso-pic/eso-memoir-test.tex +2020/10/14 | 24601 | macros/latex/contrib/eso-pic/eso-pic.dtx +2020/10/14 | 1574 | macros/latex/contrib/eso-pic/eso-pic.ins +2020/10/14 | 250019 | macros/latex/contrib/eso-pic/eso-pic.pdf +2018/05/12 | 318 | macros/latex/contrib/eso-pic/README.md +2020/10/14 | 2151 | macros/latex/contrib/eso-pic/showframe.sty +2020/10/14 | 259545 | macros/latex/contrib/eso-pic.zip 2010/03/04 | 1673 | macros/latex/contrib/estcpmm/estcpmm.bib 2010/03/04 | 25632 | macros/latex/contrib/estcpmm/estcpmm.dtx 2008/12/08 | 1020 | macros/latex/contrib/estcpmm/estcpmm.ins @@ -193068,22 +193054,25 @@ 2006/09/16 | 86371 | macros/latex/contrib/genmpage/genmpage.pdf 2006/09/16 | 269 | macros/latex/contrib/genmpage/README 2006/09/16 | 79510 | macros/latex/contrib/genmpage.zip -2020/09/25 | 49513 | macros/latex/contrib/gentombow/bounddvi-en.pdf -2020/09/25 | 5322 | macros/latex/contrib/gentombow/bounddvi-en.tex -2020/09/25 | 123721 | macros/latex/contrib/gentombow/bounddvi.pdf -2020/09/25 | 3996 | macros/latex/contrib/gentombow/bounddvi.sty -2020/09/25 | 7664 | macros/latex/contrib/gentombow/bounddvi.tex -2020/09/25 | 213739 | macros/latex/contrib/gentombow/gentombow-ja.pdf -2020/09/25 | 21407 | macros/latex/contrib/gentombow/gentombow-ja.tex -2020/09/25 | 150461 | macros/latex/contrib/gentombow/gentombow.pdf -2020/09/25 | 27146 | macros/latex/contrib/gentombow/gentombow.sty -2020/09/25 | 10280 | macros/latex/contrib/gentombow/gentombow.tex -2020/09/25 | 1500 | macros/latex/contrib/gentombow/LICENSE -2020/09/25 | 23384 | macros/latex/contrib/gentombow/pxgentombow.pdf -2020/09/25 | 457 | macros/latex/contrib/gentombow/pxgentombow.sty -2020/09/25 | 728 | macros/latex/contrib/gentombow/pxgentombow.tex -2020/09/25 | 1329 | macros/latex/contrib/gentombow/README.md -2020/09/25 | 579429 | macros/latex/contrib/gentombow.zip +2020/10/14 | 49397 | macros/latex/contrib/gentombow/bounddvi-en.pdf +2020/10/14 | 5322 | macros/latex/contrib/gentombow/bounddvi-en.tex +2020/10/14 | 102475 | macros/latex/contrib/gentombow/bounddvi.pdf +2020/10/14 | 3986 | macros/latex/contrib/gentombow/bounddvi.sty +2020/10/14 | 7664 | macros/latex/contrib/gentombow/bounddvi.tex +2020/10/14 | 174085 | macros/latex/contrib/gentombow/gentombow-ja.pdf +2020/10/14 | 21595 | macros/latex/contrib/gentombow/gentombow-ja.tex +2020/10/14 | 150209 | macros/latex/contrib/gentombow/gentombow.pdf +2020/10/14 | 26436 | macros/latex/contrib/gentombow/gentombow.sty +2020/10/14 | 10362 | macros/latex/contrib/gentombow/gentombow.tex +2020/10/14 | 1500 | macros/latex/contrib/gentombow/LICENSE +2020/10/14 | 7762 | macros/latex/contrib/gentombow/pxesopic.sty +2020/10/14 | 23109 | macros/latex/contrib/gentombow/pxgentombow.pdf +2020/10/14 | 457 | macros/latex/contrib/gentombow/pxgentombow.sty +2020/10/14 | 728 | macros/latex/contrib/gentombow/pxgentombow.tex +2020/10/14 | 2144 | macros/latex/contrib/gentombow/pxpdfpages.sty +2020/10/14 | 3412 | macros/latex/contrib/gentombow/pxtextpos.sty +2020/10/14 | 1965 | macros/latex/contrib/gentombow/README.md +2020/10/14 | 523053 | macros/latex/contrib/gentombow.zip 2020/01/02 | 15887 | macros/latex/contrib/geometry/changes.txt 2020/01/02 | 159890 | macros/latex/contrib/geometry/geometry-de.dtx 2020/01/02 | 465858 | macros/latex/contrib/geometry/geometry-de.pdf @@ -196768,12 +196757,12 @@ 2019/10/02 | 8686 | macros/latex/contrib/leadsheets/leadsheets.sty 2019/10/02 | 1637 | macros/latex/contrib/leadsheets/README 2019/10/03 | 986982 | macros/latex/contrib/leadsheets.zip -2017/03/17 | 48089 | macros/latex/contrib/leaflet/leaflet.dtx -2016/02/12 | 766 | macros/latex/contrib/leaflet/leaflet.ins -2017/03/17 | 93938 | macros/latex/contrib/leaflet/leaflet-manual.pdf -2017/03/17 | 240797 | macros/latex/contrib/leaflet/leaflet.pdf -2017/03/17 | 775 | macros/latex/contrib/leaflet/README.md -2017/03/17 | 347175 | macros/latex/contrib/leaflet.zip +2020/10/14 | 47764 | macros/latex/contrib/leaflet/leaflet.dtx +2020/10/12 | 766 | macros/latex/contrib/leaflet/leaflet.ins +2020/10/14 | 92279 | macros/latex/contrib/leaflet/leaflet-manual.pdf +2020/10/14 | 246694 | macros/latex/contrib/leaflet/leaflet.pdf +2020/10/14 | 675 | macros/latex/contrib/leaflet/README.md +2020/10/14 | 351123 | macros/latex/contrib/leaflet.zip 2020/02/02 | 21505 | macros/latex/contrib/lectures/lectures.cls 2020/02/02 | 1073 | macros/latex/contrib/lectures/LICENSE 2020/02/02 | 2453 | macros/latex/contrib/lectures/README.md @@ -208211,53 +208200,47 @@ 2010/01/15 | 10230 | macros/latex/contrib/thumby/thumby.sty 2010/01/15 | 162336 | macros/latex/contrib/thumby.zip 2005/06/21 | 207846 | macros/latex/contrib/thumb.zip -2020/09/10 | 31399 | macros/latex/contrib/thuthesis/CHANGELOG.md -2020/09/10 | 2634 | macros/latex/contrib/thuthesis/data/abstract.tex -2020/09/10 | 612 | macros/latex/contrib/thuthesis/data/acknowledgements.tex -2020/09/10 | 7584 | macros/latex/contrib/thuthesis/data/appendix-survey.tex -2020/09/10 | 4240 | macros/latex/contrib/thuthesis/data/appendix.tex -2020/09/10 | 5105 | macros/latex/contrib/thuthesis/data/appendix-translation.tex -2020/09/10 | 30104 | macros/latex/contrib/thuthesis/data/chap01.tex -2020/09/10 | 6135 | macros/latex/contrib/thuthesis/data/chap02.tex -2020/09/10 | 98 | macros/latex/contrib/thuthesis/data/comments.tex -2020/09/10 | 1664 | macros/latex/contrib/thuthesis/data/committee.tex -2020/09/10 | 2802 | macros/latex/contrib/thuthesis/data/denotation.tex -2020/09/10 | 482 | macros/latex/contrib/thuthesis/data/resolution.tex -2020/09/10 | 2652 | macros/latex/contrib/thuthesis/data/resume.tex -2020/09/10 | 35129 | macros/latex/contrib/thuthesis/figures/committee.pdf -2020/09/10 | 35716 | macros/latex/contrib/thuthesis/figures/scan-copyright.pdf -2020/09/10 | 108783 | macros/latex/contrib/thuthesis/figures/scan-record.pdf -2020/09/10 | 31558 | macros/latex/contrib/thuthesis/figures/scan-statement.pdf -2020/09/10 | 111420 | macros/latex/contrib/thuthesis/figures/thu-fig-logo.pdf -2020/09/10 | 7726 | macros/latex/contrib/thuthesis/figures/thu-lib-logo.pdf -2020/09/10 | 22013 | macros/latex/contrib/thuthesis/figures/thu-text-logo.pdf -2020/09/10 | 121086 | macros/latex/contrib/thuthesis/figures/thu-whole-logo.pdf -2020/09/10 | 490 | macros/latex/contrib/thuthesis/latexmkrc -2020/09/10 | 19106 | macros/latex/contrib/thuthesis/LICENSE -2020/09/10 | 2015 | macros/latex/contrib/thuthesis/Makefile -2020/09/10 | 6630 | macros/latex/contrib/thuthesis/README.md -2020/09/10 | 428 | macros/latex/contrib/thuthesis/ref/appendix.bib -2020/09/10 | 7290 | macros/latex/contrib/thuthesis/ref/refs.bib -2020/09/10 | 17118 | macros/latex/contrib/thuthesis/spine.pdf -2020/09/10 | 307 | macros/latex/contrib/thuthesis/spine.tex -2020/09/10 | 5611 | macros/latex/contrib/thuthesis/thusetup.tex -2020/09/10 | 479 | macros/latex/contrib/thuthesis/thuthesis-author-year.bbx -2020/09/10 | 47246 | macros/latex/contrib/thuthesis/thuthesis-author-year.bst -2020/09/10 | 132 | macros/latex/contrib/thuthesis/thuthesis-author-year.cbx -2020/09/10 | 778 | macros/latex/contrib/thuthesis/thuthesis-bachelor.bbx -2020/09/10 | 44412 | macros/latex/contrib/thuthesis/thuthesis-bachelor.bst -2020/09/10 | 127 | macros/latex/contrib/thuthesis/thuthesis-bachelor.cbx -2020/09/10 | 176215 | macros/latex/contrib/thuthesis/thuthesis.dtx -2020/09/10 | 891653 | macros/latex/contrib/thuthesis/thuthesis-example.pdf -2020/09/10 | 2051 | macros/latex/contrib/thuthesis/thuthesis-example.tex -2020/09/10 | 421 | macros/latex/contrib/thuthesis/thuthesis-inline.cbx -2020/09/10 | 1392 | macros/latex/contrib/thuthesis/thuthesis.ins -2020/09/10 | 802 | macros/latex/contrib/thuthesis/thuthesis-numeric.bbx -2020/09/10 | 44397 | macros/latex/contrib/thuthesis/thuthesis-numeric.bst -2020/09/10 | 126 | macros/latex/contrib/thuthesis/thuthesis-numeric.cbx -2020/09/10 | 1156739 | macros/latex/contrib/thuthesis/thuthesis.pdf -2020/09/10 | 14186 | macros/latex/contrib/thuthesis/tsinghua-name-bachelor.pdf -2020/09/09 | 2639241 | macros/latex/contrib/thuthesis.zip +2020/10/14 | 32078 | macros/latex/contrib/thuthesis/CHANGELOG.md +2020/10/14 | 2286 | macros/latex/contrib/thuthesis/data/abstract.tex +2020/10/14 | 548 | macros/latex/contrib/thuthesis/data/acknowledgements.tex +2020/10/14 | 1725 | macros/latex/contrib/thuthesis/data/appendix-survey.tex +2020/10/14 | 1445 | macros/latex/contrib/thuthesis/data/appendix.tex +2020/10/14 | 1793 | macros/latex/contrib/thuthesis/data/appendix-translation.tex +2020/10/14 | 4652 | macros/latex/contrib/thuthesis/data/chap01.tex +2020/10/14 | 3406 | macros/latex/contrib/thuthesis/data/chap02.tex +2020/10/14 | 3239 | macros/latex/contrib/thuthesis/data/chap03.tex +2020/10/14 | 2954 | macros/latex/contrib/thuthesis/data/chap04.tex +2020/10/14 | 98 | macros/latex/contrib/thuthesis/data/comments.tex +2020/10/14 | 1664 | macros/latex/contrib/thuthesis/data/committee.tex +2020/10/14 | 5334 | macros/latex/contrib/thuthesis/data/denotation.tex +2020/10/14 | 446 | macros/latex/contrib/thuthesis/data/resolution.tex +2020/10/14 | 1452 | macros/latex/contrib/thuthesis/data/resume.tex +2020/10/14 | 490 | macros/latex/contrib/thuthesis/latexmkrc +2020/10/14 | 19106 | macros/latex/contrib/thuthesis/LICENSE +2020/10/14 | 2024 | macros/latex/contrib/thuthesis/Makefile +2020/10/14 | 6907 | macros/latex/contrib/thuthesis/README.md +2020/10/14 | 428 | macros/latex/contrib/thuthesis/ref/appendix.bib +2020/10/14 | 9970 | macros/latex/contrib/thuthesis/ref/refs.bib +2020/10/14 | 17199 | macros/latex/contrib/thuthesis/spine.pdf +2020/10/14 | 307 | macros/latex/contrib/thuthesis/spine.tex +2020/10/14 | 4669 | macros/latex/contrib/thuthesis/thusetup.tex +2020/10/14 | 479 | macros/latex/contrib/thuthesis/thuthesis-author-year.bbx +2020/10/14 | 47246 | macros/latex/contrib/thuthesis/thuthesis-author-year.bst +2020/10/14 | 132 | macros/latex/contrib/thuthesis/thuthesis-author-year.cbx +2020/10/14 | 778 | macros/latex/contrib/thuthesis/thuthesis-bachelor.bbx +2020/10/14 | 44412 | macros/latex/contrib/thuthesis/thuthesis-bachelor.bst +2020/10/14 | 127 | macros/latex/contrib/thuthesis/thuthesis-bachelor.cbx +2020/10/14 | 175868 | macros/latex/contrib/thuthesis/thuthesis.dtx +2020/10/14 | 449650 | macros/latex/contrib/thuthesis/thuthesis-example.pdf +2020/10/14 | 2091 | macros/latex/contrib/thuthesis/thuthesis-example.tex +2020/10/14 | 421 | macros/latex/contrib/thuthesis/thuthesis-inline.cbx +2020/10/14 | 1392 | macros/latex/contrib/thuthesis/thuthesis.ins +2020/10/14 | 802 | macros/latex/contrib/thuthesis/thuthesis-numeric.bbx +2020/10/14 | 44397 | macros/latex/contrib/thuthesis/thuthesis-numeric.bst +2020/10/14 | 126 | macros/latex/contrib/thuthesis/thuthesis-numeric.cbx +2020/10/14 | 1027021 | macros/latex/contrib/thuthesis/thuthesis.pdf +2020/10/14 | 14186 | macros/latex/contrib/thuthesis/tsinghua-name-bachelor.pdf +2020/10/14 | 1603400 | macros/latex/contrib/thuthesis.zip 2016/10/11 | 347 | macros/latex/contrib/ticket/comment 2016/09/07 | 42607 | macros/latex/contrib/ticket/doc/ex_file.pdf 2016/09/07 | 1294 | macros/latex/contrib/ticket/doc/ex_file.tex @@ -211770,23 +211753,23 @@ 2017/01/01 | 2250 | macros/latex/contrib/yaletter/yaletter.ins 2017/01/01 | 552053 | macros/latex/contrib/yaletter/yaletter.pdf 2017/01/01 | 514703 | macros/latex/contrib/yaletter.zip -2020/06/16 | 4676 | macros/latex/contrib/yathesis/CHANGELOG.md -2020/06/16 | 187 | macros/latex/contrib/yathesis/doc/README-TRANSLATION.md -2020/06/16 | 6522425 | macros/latex/contrib/yathesis/doc/yathesis-fr.pdf -2020/06/16 | 4222083 | macros/latex/contrib/yathesis/exemples/canevas-specimen.zip -2020/06/16 | 1773 | macros/latex/contrib/yathesis/exemples/specimen/bibliographie.bib -2020/06/16 | 702363 | macros/latex/contrib/yathesis/exemples/specimen/comue.pdf -2020/06/16 | 135127 | macros/latex/contrib/yathesis/exemples/specimen/labo.pdf -2020/06/16 | 677 | macros/latex/contrib/yathesis/exemples/specimen/latexmkrc -2020/06/16 | 4856 | macros/latex/contrib/yathesis/exemples/specimen/paris13.pdf -2020/06/16 | 1245596 | macros/latex/contrib/yathesis/exemples/specimen/these.pdf -2020/06/16 | 30622 | macros/latex/contrib/yathesis/exemples/specimen/these.tex -2020/06/16 | 33436 | macros/latex/contrib/yathesis/exemples/specimen/tiger.pdf -2020/06/16 | 47613 | macros/latex/contrib/yathesis/exemples/specimen/ulco.pdf -2020/06/16 | 1582 | macros/latex/contrib/yathesis/README.md -2020/06/16 | 217014 | macros/latex/contrib/yathesis/source/yathesis.dtx -2020/06/16 | 52530 | macros/latex/contrib/yathesis/source/yathesis-samples-templates.dtx -2020/06/17 | 12674101 | macros/latex/contrib/yathesis.zip +2020/10/14 | 4874 | macros/latex/contrib/yathesis/CHANGELOG.md +2020/10/14 | 187 | macros/latex/contrib/yathesis/doc/README-TRANSLATION.md +2020/10/14 | 6337461 | macros/latex/contrib/yathesis/doc/yathesis-fr.pdf +2020/10/14 | 4093741 | macros/latex/contrib/yathesis/exemples/canevas-specimen.zip +2020/10/14 | 1768 | macros/latex/contrib/yathesis/exemples/specimen/bibliographie.bib +2020/10/14 | 702363 | macros/latex/contrib/yathesis/exemples/specimen/comue.pdf +2020/10/14 | 135127 | macros/latex/contrib/yathesis/exemples/specimen/labo.pdf +2020/10/14 | 677 | macros/latex/contrib/yathesis/exemples/specimen/latexmkrc +2020/10/14 | 4856 | macros/latex/contrib/yathesis/exemples/specimen/paris13.pdf +2020/10/14 | 1246385 | macros/latex/contrib/yathesis/exemples/specimen/these.pdf +2020/10/14 | 30695 | macros/latex/contrib/yathesis/exemples/specimen/these.tex +2020/10/14 | 33436 | macros/latex/contrib/yathesis/exemples/specimen/tiger.pdf +2020/10/14 | 47613 | macros/latex/contrib/yathesis/exemples/specimen/ulco.pdf +2020/10/14 | 1582 | macros/latex/contrib/yathesis/README.md +2020/10/14 | 218662 | macros/latex/contrib/yathesis/source/yathesis.dtx +2020/10/14 | 52598 | macros/latex/contrib/yathesis/source/yathesis-samples-templates.dtx +2020/10/14 | 12362915 | macros/latex/contrib/yathesis.zip 2018/01/02 | 586 | macros/latex/contrib/ycbook/README.md 2018/01/02 | 20474 | macros/latex/contrib/ycbook/ycbook.cls 2018/01/02 | 126255 | macros/latex/contrib/ycbook/ycbook-doc.pdf @@ -212531,12 +212514,12 @@ 2018/04/06 | 27640 | macros/latex/required/cyrillic/t2lhfnt.fdd 2018/04/06 | 135567 | macros/latex/required/cyrillic/t2lhfnt.pdf 2018/04/06 | 1179110 | macros/latex/required/cyrillic.zip -2020/10/09 | 741 | macros/latex/required/firstaid/changes.txt -2020/10/09 | 2619 | macros/latex/required/firstaid/firstaid.ins -2020/10/09 | 11239 | macros/latex/required/firstaid/latex2e-first-aid-for-external-files.dtx -2020/10/09 | 208937 | macros/latex/required/firstaid/latex2e-first-aid-for-external-files.pdf -2020/10/09 | 474 | macros/latex/required/firstaid/README.md -2020/10/09 | 212780 | macros/latex/required/firstaid.zip +2020/10/14 | 921 | macros/latex/required/firstaid/changes.txt +2020/10/14 | 2613 | macros/latex/required/firstaid/firstaid.ins +2020/10/14 | 14915 | macros/latex/required/firstaid/latex2e-first-aid-for-external-files.dtx +2020/10/14 | 223600 | macros/latex/required/firstaid/latex2e-first-aid-for-external-files.pdf +2020/10/14 | 474 | macros/latex/required/firstaid/README.md +2020/10/14 | 227639 | macros/latex/required/firstaid.zip 2020/10/01 | 15737 | macros/latex/required/graphics/cat.eps 2020/10/01 | 32793 | macros/latex/required/graphics/changes.txt 2020/10/01 | 31608 | macros/latex/required/graphics/color.dtx @@ -252852,10 +252835,10 @@ 2018/01/26 | 4655 | support/wp2latex/html2latex.htm 2007/07/22 | 600 | support/wp2latex/readme.1st 2018/06/13 | 7401 | support/wp2latex/readme.txt -2016/12/04 | 5662481 | support/wp2latex/wp2latex-3.74.zip +2017/05/06 | 5656974 | support/wp2latex/wp2latex-3.75.zip 2018/01/26 | 45297 | support/wp2latex/wp2latex.doc.htm 2018/01/26 | 7259 | support/wp2latex/wp2latex.faq -2017/01/01 | 888938 | support/wp2latex/WP2LaTeX_Installer-3.74.exe +2017/05/06 | 888742 | support/wp2latex/WP2LaTeX_Installer-3.75.exe 2018/01/26 | 1241 | support/wp2latex/wp2latex.lsm 2018/01/26 | 35145 | support/wp2latex/wp2latex_pas-2.3.zip 2000/02/22 | 481 | support/wsuipa2tipa/README @@ -255851,9 +255834,9 @@ 2019/07/06 | 298588 | systems/texlive/tlnet/archive/babel-turkish.doc.r51560.tar.xz 2019/07/06 | 2932 | systems/texlive/tlnet/archive/babel-turkish.r51560.tar.xz 2019/07/06 | 6272 | systems/texlive/tlnet/archive/babel-turkish.source.r51560.tar.xz -2019/02/28 | 450616 | systems/texlive/tlnet/archive/babel-ukrainian.doc.r47585.tar.xz -2019/02/28 | 5068 | systems/texlive/tlnet/archive/babel-ukrainian.r47585.tar.xz -2019/02/28 | 19232 | systems/texlive/tlnet/archive/babel-ukrainian.source.r47585.tar.xz +2020/10/14 | 135532 | systems/texlive/tlnet/archive/babel-ukrainian.doc.r56650.tar.xz +2020/10/14 | 5072 | systems/texlive/tlnet/archive/babel-ukrainian.r56650.tar.xz +2020/10/14 | 19324 | systems/texlive/tlnet/archive/babel-ukrainian.source.r56650.tar.xz 2019/02/28 | 49604 | systems/texlive/tlnet/archive/babel-vietnamese.doc.r39246.tar.xz 2019/02/28 | 2480 | systems/texlive/tlnet/archive/babel-vietnamese.r39246.tar.xz 2019/02/28 | 6908 | systems/texlive/tlnet/archive/babel-vietnamese.source.r39246.tar.xz @@ -258381,7 +258364,7 @@ 2020/03/17 | 351296 | systems/texlive/tlnet/archive/dvipdfmx.i386-netbsd.r54348.tar.xz 2020/03/16 | 404588 | systems/texlive/tlnet/archive/dvipdfmx.i386-solaris.r54341.tar.xz 2020/10/06 | 26752 | systems/texlive/tlnet/archive/dvipdfmx.r56557.tar.xz -2020/10/08 | 329260 | systems/texlive/tlnet/archive/dvipdfmx.win32.r56588.tar.xz +2020/10/14 | 329304 | systems/texlive/tlnet/archive/dvipdfmx.win32.r56654.tar.xz 2020/06/02 | 385140 | systems/texlive/tlnet/archive/dvipdfmx.x86_64-cygwin.r55384.tar.xz 2020/03/16 | 397480 | systems/texlive/tlnet/archive/dvipdfmx.x86_64-darwinlegacy.r54341.tar.xz 2020/03/17 | 456020 | systems/texlive/tlnet/archive/dvipdfmx.x86_64-darwin.r54359.tar.xz @@ -259285,9 +259268,9 @@ 2019/02/28 | 19612 | systems/texlive/tlnet/archive/flashmovie.r25768.tar.xz 2019/02/28 | 348720 | systems/texlive/tlnet/archive/flipbook.doc.r25584.tar.xz 2019/02/28 | 1792 | systems/texlive/tlnet/archive/flipbook.r25584.tar.xz -2019/02/28 | 10988 | systems/texlive/tlnet/archive/flippdf.doc.r15878.tar.xz -2019/02/28 | 1216 | systems/texlive/tlnet/archive/flippdf.r15878.tar.xz -2019/02/28 | 3364 | systems/texlive/tlnet/archive/flippdf.source.r15878.tar.xz +2020/10/14 | 135612 | systems/texlive/tlnet/archive/flippdf.doc.r56652.tar.xz +2020/10/14 | 1260 | systems/texlive/tlnet/archive/flippdf.r56652.tar.xz +2020/10/14 | 3764 | systems/texlive/tlnet/archive/flippdf.source.r56652.tar.xz 2019/02/28 | 112620 | systems/texlive/tlnet/archive/float.doc.r15878.tar.xz 2019/02/28 | 304824 | systems/texlive/tlnet/archive/floatflt.doc.r25540.tar.xz 2019/02/28 | 2828 | systems/texlive/tlnet/archive/floatflt.r25540.tar.xz @@ -261260,8 +261243,8 @@ 2020/05/08 | 16240 | systems/texlive/tlnet/archive/libertinus.doc.r55064.tar.xz 2020/10/10 | 472196 | systems/texlive/tlnet/archive/libertinus-fonts.doc.r56604.tar.xz 2020/10/10 | 3919660 | systems/texlive/tlnet/archive/libertinus-fonts.r56604.tar.xz -2020/08/02 | 599756 | systems/texlive/tlnet/archive/libertinus-otf.doc.r56017.tar.xz -2020/08/02 | 3684 | systems/texlive/tlnet/archive/libertinus-otf.r56017.tar.xz +2020/10/14 | 600480 | systems/texlive/tlnet/archive/libertinus-otf.doc.r56649.tar.xz +2020/10/14 | 3688 | systems/texlive/tlnet/archive/libertinus-otf.r56649.tar.xz 2020/05/08 | 972 | systems/texlive/tlnet/archive/libertinus.r55064.tar.xz 2020/06/12 | 1329740 | systems/texlive/tlnet/archive/libertinust1math.doc.r55517.tar.xz 2020/06/12 | 1011352 | systems/texlive/tlnet/archive/libertinust1math.r55517.tar.xz @@ -265429,9 +265412,9 @@ 2019/02/28 | 3936 | systems/texlive/tlnet/archive/svrsymbols.source.r50019.tar.xz 2019/02/28 | 492 | systems/texlive/tlnet/archive/swebib.doc.r15878.tar.xz 2019/02/28 | 6892 | systems/texlive/tlnet/archive/swebib.r15878.tar.xz -2020/10/12 | 892708 | systems/texlive/tlnet/archive/swfigure.doc.r56637.tar.xz -2020/10/12 | 2752 | systems/texlive/tlnet/archive/swfigure.r56637.tar.xz -2020/10/12 | 11824 | systems/texlive/tlnet/archive/swfigure.source.r56637.tar.xz +2020/10/14 | 911764 | systems/texlive/tlnet/archive/swfigure.doc.r56651.tar.xz +2020/10/14 | 2904 | systems/texlive/tlnet/archive/swfigure.r56651.tar.xz +2020/10/14 | 12668 | systems/texlive/tlnet/archive/swfigure.source.r56651.tar.xz 2019/02/28 | 51084 | systems/texlive/tlnet/archive/swimgraf.doc.r25446.tar.xz 2019/02/28 | 11364 | systems/texlive/tlnet/archive/swimgraf.r25446.tar.xz 2020/03/13 | 1512 | systems/texlive/tlnet/archive/swrule.r54267.tar.xz @@ -265830,8 +265813,8 @@ 2020/03/24 | 280 | systems/texlive/tlnet/archive/texlive-cz.r54496.tar.xz 2020/03/29 | 1338300 | systems/texlive/tlnet/archive/texlive-de.doc.r54604.tar.xz 2020/03/29 | 272 | systems/texlive/tlnet/archive/texlive-de.r54604.tar.xz -2020/10/13 | 169524 | systems/texlive/tlnet/archive/texlive-docindex.doc.r56642.tar.xz -2020/10/13 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r56642.tar.xz +2020/10/14 | 169680 | systems/texlive/tlnet/archive/texlive-docindex.doc.r56647.tar.xz +2020/10/14 | 392 | systems/texlive/tlnet/archive/texlive-docindex.r56647.tar.xz 2020/04/16 | 1891392 | systems/texlive/tlnet/archive/texlive-en.doc.r54755.tar.xz 2020/04/16 | 272 | systems/texlive/tlnet/archive/texlive-en.r54755.tar.xz 2020/03/22 | 3090144 | systems/texlive/tlnet/archive/texlive-es.doc.r54465.tar.xz @@ -265887,7 +265870,7 @@ 2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r55172.tar.xz 2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r55172.tar.xz 2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r55172.tar.xz -2020/10/12 | 218656 | systems/texlive/tlnet/archive/texlive-scripts.doc.r56627.tar.xz +2020/10/14 | 218656 | systems/texlive/tlnet/archive/texlive-scripts.doc.r56647.tar.xz 2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.aarch64-linux.r53577.tar.xz 2020/01/27 | 924 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-freebsd.r53577.tar.xz 2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-netbsd.r53577.tar.xz @@ -265911,7 +265894,7 @@ 2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r55172.tar.xz 2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz 2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r55172.tar.xz -2020/10/12 | 132008 | systems/texlive/tlnet/archive/texlive-scripts.r56627.tar.xz +2020/10/14 | 132020 | systems/texlive/tlnet/archive/texlive-scripts.r56647.tar.xz 2020/08/24 | 36336 | systems/texlive/tlnet/archive/texlive-scripts.win32.r56157.tar.xz 2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz 2020/05/12 | 592 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-darwinlegacy.r55117.tar.xz @@ -266543,8 +266526,8 @@ 2019/02/28 | 254104 | systems/texlive/tlnet/archive/tucv.doc.r20680.tar.xz 2019/02/28 | 1860 | systems/texlive/tlnet/archive/tucv.r20680.tar.xz 2019/02/28 | 4996 | systems/texlive/tlnet/archive/tucv.source.r20680.tar.xz -2020/10/12 | 1077788 | systems/texlive/tlnet/archive/tuda-ci.doc.r56638.tar.xz -2020/10/12 | 40072 | systems/texlive/tlnet/archive/tuda-ci.r56638.tar.xz +2020/10/14 | 1077824 | systems/texlive/tlnet/archive/tuda-ci.doc.r56653.tar.xz +2020/10/14 | 40100 | systems/texlive/tlnet/archive/tuda-ci.r56653.tar.xz 2020/09/30 | 3743324 | systems/texlive/tlnet/archive/tudscr.doc.r56481.tar.xz 2020/09/30 | 160268 | systems/texlive/tlnet/archive/tudscr.r56481.tar.xz 2020/09/30 | 316968 | systems/texlive/tlnet/archive/tudscr.source.r56481.tar.xz @@ -267566,16 +267549,16 @@ 2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz 2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz 2020/06/13 | 105829 | systems/texlive/tlnet/install-tl -2020/10/13 | 5500110 | systems/texlive/tlnet/install-tl-unx.tar.gz -2020/10/13 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2020/10/13 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2020/10/14 | 5500085 | systems/texlive/tlnet/install-tl-unx.tar.gz +2020/10/14 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2020/10/14 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2020/08/23 | 4889 | systems/texlive/tlnet/install-tl-windows.bat -2020/10/13 | 19381775 | systems/texlive/tlnet/install-tl-windows.exe -2020/10/13 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2020/10/13 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2020/10/13 | 24270001 | systems/texlive/tlnet/install-tl.zip -2020/10/13 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2020/10/13 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2020/10/14 | 19384608 | systems/texlive/tlnet/install-tl-windows.exe +2020/10/14 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2020/10/14 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2020/10/14 | 24270003 | systems/texlive/tlnet/install-tl.zip +2020/10/14 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2020/10/14 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc 2020/03/05 | 1215 | systems/texlive/tlnet/README.md 2020/04/06 | 5961 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg 2016/04/12 | 600 | systems/texlive/tlnet/tlpkg/gpg/random_seed @@ -267584,7 +267567,7 @@ 2020/04/06 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg 2020/09/22 | 48875 | systems/texlive/tlnet/tlpkg/installer/config.guess 2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt -2020/10/11 | 6348 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +2020/10/13 | 6395 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2020/04/15 | 223687 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt 2020/04/15 | 2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe 2018/04/29 | 13647 | systems/texlive/tlnet/tlpkg/installer/DirSelect.pm @@ -267631,12 +267614,12 @@ 2020/05/17 | 20322 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm 2020/05/03 | 4786 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm 2020/09/22 | 27563 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm -2020/10/13 | 16632276 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2020/10/13 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2020/10/14 | 16632513 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2020/10/14 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 2020/05/13 | 86417 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm -2020/10/13 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2020/10/13 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2020/10/13 | 2238172 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2020/10/14 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2020/10/14 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2020/10/14 | 2236476 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2020/04/15 | 58761 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm 2020/03/20 | 41736 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm 2020/05/11 | 15010 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm @@ -275126,7 +275109,7 @@ 2020/10/07 | 5178984 | systems/win32/w32tex/aleph-w32.tar.xz 2020/10/02 | 66084440 | systems/win32/w32tex/biblatex-biber.tar.xz 2016/12/13 | 65971452 | systems/win32/w32tex/cbfonts.tar.xz -2020/10/12 | 723563 | systems/win32/w32tex/ChangeLog +2020/10/12 | 723620 | systems/win32/w32tex/ChangeLog 2009/08/03 | 141221 | systems/win32/w32tex/ChangeLog.0 2009/08/03 | 221890 | systems/win32/w32tex/ChangeLog.1 2009/08/03 | 116462 | systems/win32/w32tex/ChangeLog.2 @@ -275150,7 +275133,7 @@ 2020/10/10 | 34544596 | systems/win32/w32tex/latex.tar.xz 2020/06/13 | 996116 | systems/win32/w32tex/lcdf-typetools-w32.tar.xz 2020/10/12 | 400512776 | systems/win32/w32tex/ltxpkgdocs.tar.xz -2020/10/12 | 33933604 | systems/win32/w32tex/ltxpkgs.tar.xz +2020/10/12 | 33932468 | systems/win32/w32tex/ltxpkgs.tar.xz 2020/10/05 | 3837980 | systems/win32/w32tex/luajittex-dev-w32.tar.xz 2020/10/05 | 3835924 | systems/win32/w32tex/luajittex-exp-w32.tar.xz 2020/10/05 | 3827288 | systems/win32/w32tex/luajittex-w32.tar.xz @@ -275344,7 +275327,7 @@ 2004/06/04 | 404 | tds/tds.sed 2004/06/23 | 65418 | tds/tds.tex 2019/05/29 | 304264 | tds.zip -2020/10/14 | 186 | timestamp +2020/10/15 | 186 | timestamp 2002/08/26 | 61898 | usergrps/dante/antrag.pdf 2002/08/26 | 118217 | usergrps/dante/antrag.ps 2017/06/30 | 917 | usergrps/dante/dtk/doc/beispiel.bib diff --git a/FILES.byname.gz b/FILES.byname.gz Binary files differindex 963e94c17e..11b1d1126f 100644 --- a/FILES.byname.gz +++ b/FILES.byname.gz diff --git a/FILES.last07days b/FILES.last07days index 7c2146dc1e..3ef25dd7dd 100644 --- a/FILES.last07days +++ b/FILES.last07days @@ -1,3 +1,265 @@ +2020/10/14 | 9970 | macros/latex/contrib/thuthesis/ref/refs.bib +2020/10/14 | 98 | macros/latex/contrib/thuthesis/data/comments.tex +2020/10/14 | 970 | macros/latex/contrib/eso-pic/eso-memoir-test.tex +2020/10/14 | 938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex +2020/10/14 | 937253 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty +2020/10/14 | 931 | language/japanese/plautopatch/plarydshln.sty +2020/10/14 | 929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex +2020/10/14 | 92279 | macros/latex/contrib/leaflet/leaflet-manual.pdf +2020/10/14 | 921 | macros/latex/required/firstaid/changes.txt +2020/10/14 | 91660 | fonts/libertinus-fonts/documentation/Opentype-Features.pdf +2020/10/14 | 911764 | systems/texlive/tlnet/archive/swfigure.doc.r56651.tar.xz +2020/10/14 | 9107 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex +2020/10/14 | 9075 | language/japanese/plautopatch/plautopatch.sty +2020/10/14 | 88308 | language/japanese/plautopatch/plautopatch-ja.pdf +2020/10/14 | 878 | fonts/libertinus-fonts/CONTRIBUTORS.txt +2020/10/14 | 8754 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex +2020/10/14 | 84284 | fonts/libertinus-fonts/otf/LibertinusSerifInitials-Regular.otf +2020/10/14 | 841461 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty +2020/10/14 | 834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex +2020/10/14 | 82745 | macros/latex/contrib/denisbdoc/denisbdoc.dtx +2020/10/14 | 802 | macros/latex/contrib/thuthesis/thuthesis-numeric.bbx +2020/10/14 | 8001 | language/japanese/plautopatch/plautopatch-ja.tex +2020/10/14 | 78889 | language/japanese/platex-tools/plextarray.pdf +2020/10/14 | 778 | macros/latex/contrib/thuthesis/thuthesis-bachelor.bbx +2020/10/14 | 7762 | macros/latex/contrib/gentombow/pxesopic.sty +2020/10/14 | 770 | macros/latex/contrib/eso-pic/eso-ex1.tex +2020/10/14 | 7664 | macros/latex/contrib/gentombow/bounddvi.tex +2020/10/14 | 7629 | macros/latex/contrib/babel-contrib/russian/README +2020/10/14 | 758990 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty +2020/10/14 | 751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex +2020/10/14 | 732 | fonts/libertinus-fonts/AUTHORS.txt +2020/10/14 | 728 | macros/latex/contrib/gentombow/pxgentombow.tex +2020/10/14 | 72780 | language/japanese/platex-tools/pxatbegshi.pdf +2020/10/14 | 7135 | language/japanese/plautopatch/plautopatch.tex +2020/10/14 | 702363 | macros/latex/contrib/yathesis/exemples/specimen/comue.pdf +2020/10/14 | 6907 | macros/latex/contrib/thuthesis/README.md +2020/10/14 | 690730 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty +2020/10/14 | 686 | macros/latex/contrib/eso-pic/eso-ex2.tex +2020/10/14 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex +2020/10/14 | 677 | macros/latex/contrib/yathesis/exemples/specimen/latexmkrc +2020/10/14 | 675 | macros/latex/contrib/leaflet/README.md +2020/10/14 | 6624 | fonts/libertinus-fonts/README.md +2020/10/14 | 66157 | macros/latex/contrib/babel-contrib/ukrainian/ukraineb.dtx +2020/10/14 | 64927 | language/japanese/platex-tools/plextdelarray.pdf +2020/10/14 | 6337461 | macros/latex/contrib/yathesis/doc/yathesis-fr.pdf +2020/10/14 | 62614 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex +2020/10/14 | 6106 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty +2020/10/14 | 607 | language/japanese/platex-tools/pxmulticol.sty +2020/10/14 | 6064 | macros/latex/contrib/babel-contrib/ukrainian/README.md +2020/10/14 | 600480 | systems/texlive/tlnet/archive/libertinus-otf.doc.r56649.tar.xz +2020/10/14 | 596017 | language/japanese/platex-tools.zip +2020/10/14 | 5902 | language/japanese/platex-tools/plextarray.tex +2020/10/14 | 58960 | fonts/libertinus-fonts/otf/LibertinusMono-Regular.otf +2020/10/14 | 58689 | language/japanese/platex-tools/plarray.pdf +2020/10/14 | 5500085 | systems/texlive/tlnet/install-tl-unx.tar.gz +2020/10/14 | 548 | macros/latex/contrib/thuthesis/data/acknowledgements.tex +2020/10/14 | 5479 | language/japanese/plautopatch/plcollcell.sty +2020/10/14 | 53912 | fonts/libertinus-fonts/otf/LibertinusKeyboard-Regular.otf +2020/10/14 | 5365 | language/japanese/platex-tools/pxeverysel.sty +2020/10/14 | 5334 | macros/latex/contrib/thuthesis/data/denotation.tex +2020/10/14 | 53283 | language/japanese/platex-tools/pxeverysel.pdf +2020/10/14 | 5322 | macros/latex/contrib/gentombow/bounddvi-en.tex +2020/10/14 | 52774 | language/japanese/platex-tools/pxftnright.pdf +2020/10/14 | 52598 | macros/latex/contrib/yathesis/source/yathesis-samples-templates.dtx +2020/10/14 | 523053 | macros/latex/contrib/gentombow.zip +2020/10/14 | 51357 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex +2020/10/14 | 51299 | language/japanese/platex-tools/pxeveryshi.pdf +2020/10/14 | 512748 | fonts/libertinus-fonts/otf/LibertinusMath-Regular.otf +2020/10/14 | 510180 | fonts/libertinus-fonts/preview.svg +2020/10/14 | 5072 | systems/texlive/tlnet/archive/babel-ukrainian.r56650.tar.xz +2020/10/14 | 5059 | language/japanese/platex-tools/plextdelarray.tex +2020/10/14 | 49397 | macros/latex/contrib/gentombow/bounddvi-en.pdf +2020/10/14 | 490 | macros/latex/contrib/thuthesis/latexmkrc +2020/10/14 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2020/10/14 | 4874 | macros/latex/contrib/yathesis/CHANGELOG.md +2020/10/14 | 4856 | macros/latex/contrib/yathesis/exemples/specimen/paris13.pdf +2020/10/14 | 483 | macros/latex/contrib/denisbdoc/README.md +2020/10/14 | 4808 | macros/latex/contrib/babel-contrib/ukrainian/ukraineb.ins +2020/10/14 | 479 | macros/latex/contrib/thuthesis/thuthesis-author-year.bbx +2020/10/14 | 47764 | macros/latex/contrib/leaflet/leaflet.dtx +2020/10/14 | 47613 | macros/latex/contrib/yathesis/exemples/specimen/ulco.pdf +2020/10/14 | 474 | macros/latex/required/firstaid/README.md +2020/10/14 | 47246 | macros/latex/contrib/thuthesis/thuthesis-author-year.bst +2020/10/14 | 4669 | macros/latex/contrib/thuthesis/thusetup.tex +2020/10/14 | 4652 | macros/latex/contrib/thuthesis/data/chap01.tex +2020/10/14 | 46195 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex +2020/10/14 | 4612 | macros/latex/contrib/babel-contrib/russian/russianb.ins +2020/10/14 | 457 | macros/latex/contrib/gentombow/pxgentombow.sty +2020/10/14 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2020/10/14 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2020/10/14 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2020/10/14 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2020/10/14 | 449650 | macros/latex/contrib/thuthesis/thuthesis-example.pdf +2020/10/14 | 446 | macros/latex/contrib/thuthesis/data/resolution.tex +2020/10/14 | 44412 | macros/latex/contrib/thuthesis/thuthesis-bachelor.bst +2020/10/14 | 44397 | macros/latex/contrib/thuthesis/thuthesis-numeric.bst +2020/10/14 | 4426 | fonts/libertinus-fonts/OFL.txt +2020/10/14 | 44150 | language/japanese/platex-tools/pxmulticol.pdf +2020/10/14 | 428 | macros/latex/contrib/thuthesis/ref/appendix.bib +2020/10/14 | 422268 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty +2020/10/14 | 421 | macros/latex/contrib/thuthesis/thuthesis-inline.cbx +2020/10/14 | 418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex +2020/10/14 | 416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex +2020/10/14 | 4093741 | macros/latex/contrib/yathesis/exemples/canevas-specimen.zip +2020/10/14 | 403539 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty +2020/10/14 | 40100 | systems/texlive/tlnet/archive/tuda-ci.r56653.tar.xz +2020/10/14 | 3986 | macros/latex/contrib/gentombow/bounddvi.sty +2020/10/14 | 393856 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty +2020/10/14 | 392 | systems/texlive/tlnet/archive/texlive-docindex.r56647.tar.xz +2020/10/14 | 3878 | language/japanese/platex-tools/pxatbegshi.tex +2020/10/14 | 3792 | language/japanese/platex-tools/pxatbegshi.sty +2020/10/14 | 3775 | language/japanese/platex-tools/pxftnright.sty +2020/10/14 | 3764 | systems/texlive/tlnet/archive/flippdf.source.r56652.tar.xz +2020/10/14 | 376120 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex +2020/10/14 | 3689 | language/japanese/platex-tools/plextarray.sty +2020/10/14 | 3688 | systems/texlive/tlnet/archive/libertinus-otf.r56649.tar.xz +2020/10/14 | 36828 | language/japanese/plautopatch/plautopatch.pdf +2020/10/14 | 364086 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty +2020/10/14 | 36240 | language/japanese/platex-tools/pxxspace.pdf +2020/10/14 | 3590 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex +2020/10/14 | 35463 | language/japanese/platex-tools/pldocverb.pdf +2020/10/14 | 3515 | language/japanese/platex-tools/pxxspace.sty +2020/10/14 | 351123 | macros/latex/contrib/leaflet.zip +2020/10/14 | 35074 | language/japanese/platex-tools/plextcolortbl.pdf +2020/10/14 | 3412 | macros/latex/contrib/gentombow/pxtextpos.sty +2020/10/14 | 3406 | macros/latex/contrib/thuthesis/data/chap02.tex +2020/10/14 | 33436 | macros/latex/contrib/yathesis/exemples/specimen/tiger.pdf +2020/10/14 | 329304 | systems/texlive/tlnet/archive/dvipdfmx.win32.r56654.tar.xz +2020/10/14 | 328768 | fonts/libertinus-fonts/otf/LibertinusSerif-SemiboldItalic.otf +2020/10/14 | 3277 | graphics/pgf/contrib/circuitikz/README.md +2020/10/14 | 3239 | macros/latex/contrib/thuthesis/data/chap03.tex +2020/10/14 | 3214 | language/japanese/plautopatch/README.md +2020/10/14 | 3211985 | fonts/libertinus-fonts.zip +2020/10/14 | 32078 | macros/latex/contrib/thuthesis/CHANGELOG.md +2020/10/14 | 31836 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex +2020/10/14 | 317688 | fonts/libertinus-fonts/otf/LibertinusSerif-Italic.otf +2020/10/14 | 30990 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex +2020/10/14 | 3098 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex +2020/10/14 | 307 | macros/latex/contrib/thuthesis/spine.tex +2020/10/14 | 30695 | macros/latex/contrib/yathesis/exemples/specimen/these.tex +2020/10/14 | 3009 | language/japanese/plautopatch/pxstfloats.sty +2020/10/14 | 297912 | fonts/libertinus-fonts/otf/LibertinusSerif-Regular.otf +2020/10/14 | 2954 | macros/latex/contrib/thuthesis/data/chap04.tex +2020/10/14 | 2918 | language/japanese/platex-tools/README.md +2020/10/14 | 2915 | language/japanese/platex-tools/plarray.tex +2020/10/14 | 2904 | systems/texlive/tlnet/archive/swfigure.r56651.tar.xz +2020/10/14 | 288564 | fonts/libertinus-fonts/otf/LibertinusSans-Italic.otf +2020/10/14 | 28369 | graphics/pgf/contrib/circuitikz/doc/changelog.tex +2020/10/14 | 280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex +2020/10/14 | 279280 | fonts/libertinus-fonts/otf/LibertinusSerif-Bold.otf +2020/10/14 | 276472 | fonts/libertinus-fonts/otf/LibertinusSerif-Semibold.otf +2020/10/14 | 274900 | fonts/libertinus-fonts/otf/LibertinusSans-Bold.otf +2020/10/14 | 2678 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex +2020/10/14 | 2660 | language/japanese/platex-tools/pxeveryshi.tex +2020/10/14 | 26436 | macros/latex/contrib/gentombow/gentombow.sty +2020/10/14 | 2613 | macros/latex/required/firstaid/firstaid.ins +2020/10/14 | 2612 | language/japanese/platex-tools/pxeverysel.tex +2020/10/14 | 259545 | macros/latex/contrib/eso-pic.zip +2020/10/14 | 2589 | language/japanese/platex-tools/pxxspace.tex +2020/10/14 | 256760 | fonts/libertinus-fonts/otf/LibertinusSans-Regular.otf +2020/10/14 | 254800 | fonts/libertinus-fonts/otf/LibertinusSerifDisplay-Regular.otf +2020/10/14 | 251110 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex +2020/10/14 | 250019 | macros/latex/contrib/eso-pic/eso-pic.pdf +2020/10/14 | 246694 | macros/latex/contrib/leaflet/leaflet.pdf +2020/10/14 | 24601 | macros/latex/contrib/eso-pic/eso-pic.dtx +2020/10/14 | 24270003 | systems/texlive/tlnet/install-tl.zip +2020/10/14 | 237572 | fonts/libertinus-fonts/otf/LibertinusSerif-BoldItalic.otf +2020/10/14 | 2362 | language/japanese/platex-tools/pxftnright.tex +2020/10/14 | 23510 | macros/latex/contrib/denisbdoc.zip +2020/10/14 | 231717 | install/macros/latex/required/latex-firstaid.tds.zip +2020/10/14 | 23109 | macros/latex/contrib/gentombow/pxgentombow.pdf +2020/10/14 | 2286 | macros/latex/contrib/thuthesis/data/abstract.tex +2020/10/14 | 228583 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex +2020/10/14 | 227639 | macros/latex/required/firstaid.zip +2020/10/14 | 2236476 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2020/10/14 | 223600 | macros/latex/required/firstaid/latex2e-first-aid-for-external-files.pdf +2020/10/14 | 218662 | macros/latex/contrib/yathesis/source/yathesis.dtx +2020/10/14 | 218656 | systems/texlive/tlnet/archive/texlive-scripts.doc.r56647.tar.xz +2020/10/14 | 2180258 | install/graphics/pgf/contrib/circuitikz.tds.zip +2020/10/14 | 2166099 | graphics/pgf/contrib/circuitikz.zip +2020/10/14 | 21595 | macros/latex/contrib/gentombow/gentombow-ja.tex +2020/10/14 | 2151 | macros/latex/contrib/eso-pic/showframe.sty +2020/10/14 | 2144 | macros/latex/contrib/gentombow/pxpdfpages.sty +2020/10/14 | 2091 | macros/latex/contrib/thuthesis/thuthesis-example.tex +2020/10/14 | 2086 | language/japanese/plautopatch/plsiunitx.sty +2020/10/14 | 202681 | fonts/libertinus-fonts/documentation/Sample.pdf +2020/10/14 | 2024 | macros/latex/contrib/thuthesis/Makefile +2020/10/14 | 1965 | macros/latex/contrib/gentombow/README.md +2020/10/14 | 1965 | language/japanese/plautopatch/plextarydshln.sty +2020/10/14 | 19384608 | systems/texlive/tlnet/install-tl-windows.exe +2020/10/14 | 1937 | language/japanese/platex-tools/pxmulticol.tex +2020/10/14 | 19324 | systems/texlive/tlnet/archive/babel-ukrainian.source.r56650.tar.xz +2020/10/14 | 19106 | macros/latex/contrib/thuthesis/LICENSE +2020/10/14 | 187 | macros/latex/contrib/yathesis/doc/README-TRANSLATION.md +2020/10/14 | 1875 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex +2020/10/14 | 1836 | language/japanese/platex-tools/plarray.sty +2020/10/14 | 1793 | macros/latex/contrib/thuthesis/data/appendix-translation.tex +2020/10/14 | 17743 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf +2020/10/14 | 1771 | language/japanese/platex-tools/plextdelarray.sty +2020/10/14 | 1768 | macros/latex/contrib/yathesis/exemples/specimen/bibliographie.bib +2020/10/14 | 175868 | macros/latex/contrib/thuthesis/thuthesis.dtx +2020/10/14 | 174085 | macros/latex/contrib/gentombow/gentombow-ja.pdf +2020/10/14 | 1725 | macros/latex/contrib/thuthesis/data/appendix-survey.tex +2020/10/14 | 17199 | macros/latex/contrib/thuthesis/spine.pdf +2020/10/14 | 169680 | systems/texlive/tlnet/archive/texlive-docindex.doc.r56647.tar.xz +2020/10/14 | 1664 | macros/latex/contrib/thuthesis/data/committee.tex +2020/10/14 | 16632513 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2020/10/14 | 1647 | language/japanese/platex-tools/pldocverb.tex +2020/10/14 | 1646 | macros/latex/contrib/eso-pic/eso-ex4.tex +2020/10/14 | 1636 | language/japanese/platex-tools/plextcolortbl.tex +2020/10/14 | 1625917 | install/macros/latex/contrib/thuthesis.tds.zip +2020/10/14 | 160836 | fonts/libertinus-fonts/documentation/Math-Sample.pdf +2020/10/14 | 1603400 | macros/latex/contrib/thuthesis.zip +2020/10/14 | 1582 | macros/latex/contrib/yathesis/README.md +2020/10/14 | 1574 | macros/latex/contrib/eso-pic/eso-pic.ins +2020/10/14 | 156995 | macros/latex/contrib/babel-contrib/ukrainian.zip +2020/10/14 | 156289 | macros/latex/contrib/babel-contrib/russian.zip +2020/10/14 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2020/10/14 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2020/10/14 | 151918 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex +2020/10/14 | 15110 | fonts/libertinus-fonts/FONTLOG.txt +2020/10/14 | 150209 | macros/latex/contrib/gentombow/gentombow.pdf +2020/10/14 | 1500 | macros/latex/contrib/gentombow/LICENSE +2020/10/14 | 1500 | language/japanese/plautopatch/LICENSE +2020/10/14 | 1500 | language/japanese/platex-tools/LICENSE +2020/10/14 | 14915 | macros/latex/required/firstaid/latex2e-first-aid-for-external-files.dtx +2020/10/14 | 1483 | macros/latex/contrib/eso-pic/eso-ex5.tex +2020/10/14 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2020/10/14 | 1452 | macros/latex/contrib/thuthesis/data/resume.tex +2020/10/14 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2020/10/14 | 1445 | macros/latex/contrib/thuthesis/data/appendix.tex +2020/10/14 | 14413 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex +2020/10/14 | 14186 | macros/latex/contrib/thuthesis/tsinghua-name-bachelor.pdf +2020/10/14 | 1402 | fonts/libertinus-fonts/CONTRIBUTING.md +2020/10/14 | 140036 | language/japanese/pxjahyper.zip +2020/10/14 | 1392 | macros/latex/contrib/thuthesis/thuthesis.ins +2020/10/14 | 1391 | language/japanese/platex-tools/pxeveryshi.sty +2020/10/14 | 138480 | language/japanese/plautopatch.zip +2020/10/14 | 135612 | systems/texlive/tlnet/archive/flippdf.doc.r56652.tar.xz +2020/10/14 | 135532 | systems/texlive/tlnet/archive/babel-ukrainian.doc.r56650.tar.xz +2020/10/14 | 135127 | macros/latex/contrib/yathesis/exemples/specimen/labo.pdf +2020/10/14 | 1349 | language/japanese/platex-tools/pldocverb.sty +2020/10/14 | 134237 | macros/latex/contrib/babel-contrib/ukrainian/ukraineb.pdf +2020/10/14 | 132 | macros/latex/contrib/thuthesis/thuthesis-author-year.cbx +2020/10/14 | 132020 | systems/texlive/tlnet/archive/texlive-scripts.r56647.tar.xz +2020/10/14 | 127 | macros/latex/contrib/thuthesis/thuthesis-bachelor.cbx +2020/10/14 | 127486 | macros/latex/contrib/babel-contrib/russian/russianb.pdf +2020/10/14 | 126 | macros/latex/contrib/thuthesis/thuthesis-numeric.cbx +2020/10/14 | 12668 | systems/texlive/tlnet/archive/swfigure.source.r56651.tar.xz +2020/10/14 | 1260 | systems/texlive/tlnet/archive/flippdf.r56652.tar.xz +2020/10/14 | 12489060 | install/macros/latex/contrib/yathesis.tds.zip +2020/10/14 | 1246385 | macros/latex/contrib/yathesis/exemples/specimen/these.pdf +2020/10/14 | 12362915 | macros/latex/contrib/yathesis.zip +2020/10/14 | 1123 | language/japanese/plautopatch/pxpgfrcs.sty +2020/10/14 | 11132 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty +2020/10/14 | 1093750 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf +2020/10/14 | 1077824 | systems/texlive/tlnet/archive/tuda-ci.doc.r56653.tar.xz +2020/10/14 | 1066 | language/japanese/platex-tools/plextcolortbl.sty +2020/10/14 | 104844 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex +2020/10/14 | 10362 | macros/latex/contrib/gentombow/gentombow.tex +2020/10/14 | 1027021 | macros/latex/contrib/thuthesis/thuthesis.pdf +2020/10/14 | 102475 | macros/latex/contrib/gentombow/bounddvi.pdf 2020/10/13 | 97411 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma 2020/10/13 | 97053 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma 2020/10/13 | 96402 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma @@ -10,6 +272,7 @@ 2020/10/13 | 93612 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma 2020/10/13 | 922944 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma 2020/10/13 | 9205 | macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg +2020/10/13 | 91489 | macros/latex/contrib/babel-contrib/russian/russianb.dtx 2020/10/13 | 88950 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma 2020/10/13 | 88264 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma 2020/10/13 | 87374 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma @@ -46,12 +309,12 @@ 2020/10/13 | 67441 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma 2020/10/13 | 6647 | macros/latex/contrib/tuda-ci/tex/tudabeamer.cls 2020/10/13 | 65943 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma -2020/10/13 | 65927 | macros/latex/contrib/babel-contrib/ukrainian/ukraineb.dtx 2020/10/13 | 65821 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma 2020/10/13 | 65788 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma 2020/10/13 | 64602 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma 2020/10/13 | 643235 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf 2020/10/13 | 6412954 | macros/latex/contrib/tuda-ci.zip +2020/10/13 | 6395 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2020/10/13 | 638781 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma 2020/10/13 | 63563 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma 2020/10/13 | 635442 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf @@ -67,7 +330,6 @@ 2020/10/13 | 6188 | systems/texlive/tlnet/archive/collection-latexextra.r56644.tar.xz 2020/10/13 | 604731 | fonts/libertinus-otf.zip 2020/10/13 | 598025 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma -2020/10/13 | 5966 | macros/latex/contrib/babel-contrib/ukrainian/README.md 2020/10/13 | 59404 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma 2020/10/13 | 59050 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma 2020/10/13 | 589227 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf @@ -89,7 +351,6 @@ 2020/10/13 | 552181 | systems/win32/miktex/tm/packages/files.csv.lzma 2020/10/13 | 550823 | macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf 2020/10/13 | 550263 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma -2020/10/13 | 5500110 | systems/texlive/tlnet/install-tl-unx.tar.gz 2020/10/13 | 54982 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma 2020/10/13 | 547330 | macros/latex/contrib/swfigure/swfigure-examples.pdf 2020/10/13 | 543565 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma @@ -103,8 +364,6 @@ 2020/10/13 | 50927 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma 2020/10/13 | 500190 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma 2020/10/13 | 49708 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma -2020/10/13 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 -2020/10/13 | 4808 | macros/latex/contrib/babel-contrib/ukrainian/ukraineb.ins 2020/10/13 | 48087 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma 2020/10/13 | 4792 | systems/texlive/tlnet/archive/expkv-def.r56643.tar.xz 2020/10/13 | 46357 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma @@ -112,10 +371,6 @@ 2020/10/13 | 460772 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma 2020/10/13 | 45805 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma 2020/10/13 | 456448 | macros/latex/contrib/swfigure/swfigure.pdf -2020/10/13 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2020/10/13 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc -2020/10/13 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2020/10/13 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2020/10/13 | 45296 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma 2020/10/13 | 44897 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma 2020/10/13 | 4441 | macros/latex/contrib/tuda-ci/tex/tudacolors.def @@ -130,7 +385,6 @@ 2020/10/13 | 39353 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma 2020/10/13 | 39305 | macros/latex/contrib/swfigure/swfigure.dtx 2020/10/13 | 392240 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma -2020/10/13 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r56642.tar.xz 2020/10/13 | 3883 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco 2020/10/13 | 3809 | macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty 2020/10/13 | 370212 | systems/win32/miktex/tm/packages/expkv-def.tar.lzma @@ -183,7 +437,6 @@ 2020/10/13 | 24789 | macros/latex/contrib/tuda-ci/tex/tudathesis.cfg 2020/10/13 | 246839 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma 2020/10/13 | 243079 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma -2020/10/13 | 24270001 | systems/texlive/tlnet/install-tl.zip 2020/10/13 | 2362 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex 2020/10/13 | 23575 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma 2020/10/13 | 231545 | systems/win32/miktex/tm/packages/centerlastline.tar.lzma @@ -191,7 +444,6 @@ 2020/10/13 | 227760 | systems/texlive/tlnet/archive/centerlastline.doc.r56644.tar.xz 2020/10/13 | 2252 | systems/texlive/tlnet/archive/centerlastline.source.r56644.tar.xz 2020/10/13 | 224177 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma -2020/10/13 | 2238172 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2020/10/13 | 2180 | macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty 2020/10/13 | 2172 | macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty 2020/10/13 | 211883 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma @@ -206,7 +458,6 @@ 2020/10/13 | 2029210 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma 2020/10/13 | 19987 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma 2020/10/13 | 196620 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma -2020/10/13 | 19381775 | systems/texlive/tlnet/install-tl-windows.exe 2020/10/13 | 193814 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma 2020/10/13 | 192828 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma 2020/10/13 | 192521 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma @@ -223,7 +474,6 @@ 2020/10/13 | 17395 | macros/latex/contrib/tuda-ci/tex/tudaposter.cls 2020/10/13 | 171293 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma 2020/10/13 | 169703 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma -2020/10/13 | 169524 | systems/texlive/tlnet/archive/texlive-docindex.doc.r56642.tar.xz 2020/10/13 | 1686 | macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo 2020/10/13 | 1684 | macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo 2020/10/13 | 1682 | macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo @@ -231,27 +481,20 @@ 2020/10/13 | 1680 | macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo 2020/10/13 | 1676 | macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo 2020/10/13 | 16688 | macros/latex/contrib/tuda-ci/tex/tudaletter.cls -2020/10/13 | 16632276 | systems/texlive/tlnet/tlpkg/texlive.tlpdb 2020/10/13 | 165448 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma 2020/10/13 | 16069 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma 2020/10/13 | 1603 | macros/latex/contrib/swfigure/README.txt 2020/10/13 | 16005 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma 2020/10/13 | 159941 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma -2020/10/13 | 157018 | macros/latex/contrib/babel-contrib/ukrainian.zip 2020/10/13 | 15440 | systems/texlive/tlnet/archive/expkv-def.source.r56643.tar.xz 2020/10/13 | 154192 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma -2020/10/13 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2020/10/13 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 2020/10/13 | 152023 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma 2020/10/13 | 151819 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma -2020/10/13 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2020/10/13 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 2020/10/13 | 141531 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma 2020/10/13 | 14125 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma 2020/10/13 | 1397691 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma 2020/10/13 | 138143 | macros/latex/contrib/flippdf.zip 2020/10/13 | 13710 | macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls -2020/10/13 | 134371 | macros/latex/contrib/babel-contrib/ukrainian/ukraineb.pdf 2020/10/13 | 134345 | macros/latex/contrib/flippdf/flippdf.pdf 2020/10/13 | 133511 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma 2020/10/13 | 1330154 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma @@ -283,22 +526,21 @@ 2020/10/13 | 100968 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma 2020/10/13 | 10072 | macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty 2020/10/12 | 909201 | systems/win32/miktex/tm/packages/swfigure.tar.lzma -2020/10/12 | 892708 | systems/texlive/tlnet/archive/swfigure.doc.r56637.tar.xz 2020/10/12 | 8680 | systems/texlive/tlnet/archive/mltex.doc.r56640.tar.xz 2020/10/12 | 83300 | systems/texlive/tlnet/archive/luatexja.source.r56639.tar.xz 2020/10/12 | 832925 | systems/win32/miktex/tm/packages/ccool.tar.lzma 2020/10/12 | 810856 | systems/texlive/tlnet/archive/ccool.doc.r56636.tar.xz 2020/10/12 | 7924 | systems/texlive/tlnet/archive/everypage.source.r56631.tar.xz 2020/10/12 | 778233 | systems/win32/miktex/tm/packages/apa7.tar.lzma +2020/10/12 | 766 | macros/latex/contrib/leaflet/leaflet.ins 2020/10/12 | 7508 | systems/texlive/tlnet/archive/expkv-opt.source.r56633.tar.xz 2020/10/12 | 728508 | systems/texlive/tlnet/archive/apa7.doc.r56635.tar.xz -2020/10/12 | 723563 | systems/win32/w32tex/ChangeLog +2020/10/12 | 723620 | systems/win32/w32tex/ChangeLog 2020/10/12 | 6980 | systems/texlive/tlnet/archive/xetex.r56640.tar.xz 2020/10/12 | 68629 | macros/generic/expkv-def/expkv-def.dtx 2020/10/12 | 6444 | systems/texlive/tlnet/archive/mltex.r56640.tar.xz 2020/10/12 | 617016 | systems/texlive/tlnet/archive/xetex.doc.r56640.tar.xz 2020/10/12 | 403496 | systems/texlive/tlnet/archive/expkv.doc.r56634.tar.xz -2020/10/12 | 40072 | systems/texlive/tlnet/archive/tuda-ci.r56638.tar.xz 2020/10/12 | 400512776 | systems/win32/w32tex/ltxpkgdocs.tar.xz 2020/10/12 | 3904 | systems/texlive/tlnet/archive/expkv-cs.r56632.tar.xz 2020/10/12 | 3848 | systems/texlive/tlnet/archive/expkv.r56634.tar.xz @@ -307,18 +549,16 @@ 2020/10/12 | 369961 | install/macros/generic/expkv-def.tds.zip 2020/10/12 | 363683 | macros/generic/expkv-def.zip 2020/10/12 | 356349 | macros/generic/expkv-def/expkv-def.pdf -2020/10/12 | 33933604 | systems/win32/w32tex/ltxpkgs.tar.xz +2020/10/12 | 33932468 | systems/win32/w32tex/ltxpkgs.tar.xz 2020/10/12 | 335281 | systems/win32/miktex/tm/packages/expkv-cs.tar.lzma 2020/10/12 | 32456 | systems/texlive/tlnet/archive/apa7.source.r56635.tar.xz 2020/10/12 | 3184352 | systems/texlive/tlnet/archive/luatexja.doc.r56639.tar.xz 2020/10/12 | 316092 | systems/texlive/tlnet/archive/expkv-cs.doc.r56632.tar.xz -2020/10/12 | 2752 | systems/texlive/tlnet/archive/swfigure.r56637.tar.xz 2020/10/12 | 257016 | systems/texlive/tlnet/archive/expkv-opt.doc.r56633.tar.xz 2020/10/12 | 24036 | systems/texlive/tlnet/archive/cslatex.source.r56640.tar.xz 2020/10/12 | 2376 | systems/texlive/tlnet/archive/expkv-opt.r56633.tar.xz 2020/10/12 | 228557 | macros/latex/contrib/centerlastline.zip 2020/10/12 | 226307 | macros/latex/contrib/centerlastline/centerlastline.pdf -2020/10/12 | 218656 | systems/texlive/tlnet/archive/texlive-scripts.doc.r56627.tar.xz 2020/10/12 | 20480 | systems/texlive/tlnet/archive/expkv.source.r56634.tar.xz 2020/10/12 | 18996 | systems/texlive/tlnet/archive/cslatex.doc.r56640.tar.xz 2020/10/12 | 187984 | systems/texlive/tlnet/archive/luatexja.r56639.tar.xz @@ -328,12 +568,9 @@ 2020/10/12 | 15024 | systems/texlive/tlnet/archive/expkv-cs.source.r56632.tar.xz 2020/10/12 | 1425 | macros/latex/contrib/centerlastline/README 2020/10/12 | 14124 | systems/texlive/tlnet/archive/apa7.r56635.tar.xz -2020/10/12 | 132008 | systems/texlive/tlnet/archive/texlive-scripts.r56627.tar.xz 2020/10/12 | 12740 | systems/texlive/tlnet/archive/cslatex.r56640.tar.xz 2020/10/12 | 1263 | macros/generic/expkv-def/README.md -2020/10/12 | 11824 | systems/texlive/tlnet/archive/swfigure.source.r56637.tar.xz 2020/10/12 | 11093 | systems/win32/miktex/tm/packages/everypage.tar.lzma -2020/10/12 | 1077788 | systems/texlive/tlnet/archive/tuda-ci.doc.r56638.tar.xz 2020/10/11 | 98316 | support/splint/cweb/splint.w 2020/10/11 | 964004 | systems/texlive/tlnet/archive/pst-pdf.doc.r56622.tar.xz 2020/10/11 | 9545 | support/splint/examples/ld/ldnump.w @@ -377,7 +614,6 @@ 2020/10/11 | 6535 | macros/latex/contrib/apa7/apa7.ins 2020/10/11 | 65283 | macros/latex/contrib/apa7/samples/shortsample.pdf 2020/10/11 | 63608 | macros/generic/expkv-cs/expkv-cs.dtx -2020/10/11 | 6348 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2020/10/11 | 6328416 | systems/win32/w32tex/win64/pdftex-w64.tar.xz 2020/10/11 | 6220 | systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages 2020/10/11 | 614 | systems/win32/miktex/setup/rpm/fedora/28/repodata/be0e1ed17a8bf854857ac51de38a54432f3e1a36eb7ceb36d6dabe6d314889f8-other.xml.gz @@ -1002,7 +1238,6 @@ 2020/10/09 | 75649 | macros/latex/contrib/jsclasses/jsverb.pdf 2020/10/09 | 7526 | macros/latex/base/ltxguide.cls 2020/10/09 | 749397 | macros/latex/base/ltshipout-code.pdf -2020/10/09 | 741 | macros/latex/required/firstaid/changes.txt 2020/10/09 | 74092 | macros/latex/base/ltfssini.dtx 2020/10/09 | 735762 | macros/latex/base/ltfilehook-code.pdf 2020/10/09 | 7326 | macros/latex/base/ltnews20.tex @@ -1069,7 +1304,6 @@ 2020/10/09 | 5507 | macros/latex/base/ltnews04.tex 2020/10/09 | 5474 | macros/latex/base/ltnews25.tex 2020/10/09 | 54543 | macros/latex/base/ltfilehook.dtx -2020/10/09 | 5446574 | fonts/libertinus-fonts.zip 2020/10/09 | 5426 | macros/latex/base/ltnews07.tex 2020/10/09 | 5418 | macros/latex/base/ltnews12.tex 2020/10/09 | 5404 | macros/latex/contrib/tcolorbox/tcolorbox.doc.abstract.tex @@ -1104,7 +1338,6 @@ 2020/10/09 | 477944 | macros/unicodetex/latex/polyglossia.zip 2020/10/09 | 47704 | macros/latex/base/lttab.dtx 2020/10/09 | 4762 | macros/latex/base/ltlength.dtx -2020/10/09 | 474 | macros/latex/required/firstaid/README.md 2020/10/09 | 457359 | macros/latex/contrib/tcolorbox/tcolorbox-example.pdf 2020/10/09 | 45246 | macros/latex/base/ltspace.dtx 2020/10/09 | 442139 | macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf @@ -1204,7 +1437,6 @@ 2020/10/09 | 264505 | macros/latex/base/cmfonts.pdf 2020/10/09 | 2636 | systems/texlive/tlnet/archive/auto-pst-pdf.r56596.tar.xz 2020/10/09 | 262059 | macros/latex/base/fix-cm.pdf -2020/10/09 | 2619 | macros/latex/required/firstaid/firstaid.ins 2020/10/09 | 2587952 | systems/win32/w32tex/tex4htk-w32.tar.xz 2020/10/09 | 25816 | macros/latex/contrib/tcolorbox/tcolorbox.doc.external.tex 2020/10/09 | 25727 | systems/win32/miktex/source/CHANGELOG.md @@ -1238,12 +1470,9 @@ 2020/10/09 | 216997 | macros/latex/base/cyrguide.pdf 2020/10/09 | 216877 | macros/latex/base/proc.pdf 2020/10/09 | 21663 | macros/latex/contrib/tcolorbox/crinklepaper.png -2020/10/09 | 216218 | install/macros/latex/required/latex-firstaid.tds.zip 2020/10/09 | 215102 | macros/latex/base/ltxdoc.pdf 2020/10/09 | 214710 | macros/latex/base/slifonts.pdf -2020/10/09 | 212780 | macros/latex/required/firstaid.zip 2020/10/09 | 211044 | systems/texlive/tlnet/archive/auto-pst-pdf.doc.r56596.tar.xz -2020/10/09 | 208937 | macros/latex/required/firstaid/latex2e-first-aid-for-external-files.pdf 2020/10/09 | 206491 | fonts/plimsoll/plimsoll.pdf 2020/10/09 | 205213 | macros/latex/base/ifthen.pdf 2020/10/09 | 20471 | macros/latex/base/ltnews.cls @@ -1354,7 +1583,6 @@ 2020/10/09 | 1131080 | systems/texlive/tlnet/archive/hyperxmp.doc.r56599.tar.xz 2020/10/09 | 11305 | macros/latex/contrib/jsclasses/jslogo.dtx 2020/10/09 | 112 | macros/latex/contrib/tcolorbox/tcolorbox.doc.index.tex -2020/10/09 | 11239 | macros/latex/required/firstaid/latex2e-first-aid-for-external-files.dtx 2020/10/09 | 1106 | macros/latex/contrib/tcolorbox/tcolorbox.doc.picturecredits.tex 2020/10/09 | 10698 | macros/latex/base/ltnews26.tex 2020/10/09 | 106914 | macros/latex/base/inputenc.dtx @@ -1373,129 +1601,61 @@ 2020/10/09 | 101343 | macros/latex/base/lgc2.pdf 2020/10/09 | 10053 | macros/latex/base/webcomp.err 2020/10/09 | 10045 | macros/latex/base/ltexpl.dtx -2020/10/08 | 91660 | fonts/libertinus-fonts/documentation/Opentype-Features.pdf -2020/10/08 | 878 | fonts/libertinus-fonts/CONTRIBUTORS.txt -2020/10/08 | 84284 | fonts/libertinus-fonts/otf/LibertinusSerifInitials-Regular.otf 2020/10/08 | 83048 | systems/texlive/tlnet/archive/fontspec.source.r56594.tar.xz 2020/10/08 | 8064 | systems/texlive/tlnet/archive/docutils.doc.r56594.tar.xz -2020/10/08 | 801052 | systems/texlive/tlnet/archive/babel.doc.r56581.tar.xz -2020/10/08 | 79740 | systems/texlive/tlnet/archive/revtex4-1.source.r56590.tar.xz 2020/10/08 | 7959538 | systems/texlive/tlnet/update-tlmgr-r56587.sh 2020/10/08 | 77679 | macros/latex/contrib/hyperxmp/einstein2.pdf 2020/10/08 | 758 | macros/latex/contrib/auto-pst-pdf/auto-pst-pdf.ins -2020/10/08 | 732 | fonts/libertinus-fonts/AUTHORS.txt 2020/10/08 | 70830 | macros/latex/contrib/hyperxmp/einstein1.pdf -2020/10/08 | 69356 | systems/texlive/tlnet/archive/revtex.r56591.tar.xz -2020/10/08 | 671700 | systems/texlive/tlnet/archive/babel.source.r56581.tar.xz 2020/10/08 | 627557 | macros/latex/contrib/showexpl.zip -2020/10/08 | 61308 | systems/texlive/tlnet/archive/revtex4-1.r56590.tar.xz 2020/10/08 | 6096 | systems/texlive/tlnet/archive/xltxtra.source.r56594.tar.xz -2020/10/08 | 59428 | fonts/libertinus-fonts/woff2/LibertinusSerifInitials-Regular.woff2 -2020/10/08 | 59028 | fonts/libertinus-fonts/otf/LibertinusMono-Regular.otf 2020/10/08 | 578 | macros/latex/contrib/auto-pst-pdf/example.tex -2020/10/08 | 5595 | fonts/libertinus-fonts/README.md 2020/10/08 | 547 | macros/latex/contrib/auto-pst-pdf/README.txt -2020/10/08 | 5428696 | systems/texlive/tlnet/archive/revtex4-1.doc.r56590.tar.xz -2020/10/08 | 53928 | fonts/libertinus-fonts/otf/LibertinusKeyboard-Regular.otf -2020/10/08 | 528375 | macros/latex/contrib/babel-contrib/russian.zip 2020/10/08 | 513440 | systems/texlive/tlnet/archive/biblatex-swiss-legal.doc.r56594.tar.xz -2020/10/08 | 512748 | fonts/libertinus-fonts/otf/LibertinusMath-Regular.otf 2020/10/08 | 511088 | systems/texlive/tlnet/archive/oup-authoring-template.doc.r56594.tar.xz -2020/10/08 | 510180 | fonts/libertinus-fonts/preview.svg -2020/10/08 | 47488 | systems/texlive/tlnet/archive/revtex4.r56589.tar.xz -2020/10/08 | 46889056 | systems/win32/w32tex/latex-dev.tar.xz 2020/10/08 | 455 | systems/texlive/tlnet/update-tlmgr-r56587.sh.sha512.asc 2020/10/08 | 455 | systems/texlive/tlnet/update-tlmgr-r56587.exe.sha512.asc -2020/10/08 | 4487388 | systems/texlive/tlnet/archive/revtex.doc.r56591.tar.xz 2020/10/08 | 4468 | systems/texlive/tlnet/archive/realscripts.source.r56594.tar.xz 2020/10/08 | 44636 | macros/latex/contrib/auto-pst-pdf/example.eps -2020/10/08 | 4426 | fonts/libertinus-fonts/OFL.txt 2020/10/08 | 42816 | systems/texlive/tlnet/archive/unicode-math.r56594.tar.xz -2020/10/08 | 417668 | systems/texlive/tlnet/archive/lwarp.source.r56584.tar.xz 2020/10/08 | 411066 | systems/win32/miktex/tm/packages/semantex.tar.lzma -2020/10/08 | 40816 | systems/texlive/tlnet/archive/platex.r56582.tar.xz -2020/10/08 | 40440 | fonts/libertinus-fonts/woff2/LibertinusMono-Regular.woff2 2020/10/08 | 3996699 | systems/texlive/tlnet/update-tlmgr-r56587.exe -2020/10/08 | 387784 | systems/texlive/tlnet/archive/semantex.doc.r56585.tar.xz 2020/10/08 | 37860 | systems/texlive/tlnet/archive/unicode-math.source.r56594.tar.xz 2020/10/08 | 3748 | systems/texlive/tlnet/archive/fltpoint.r56594.tar.xz -2020/10/08 | 35264 | fonts/libertinus-fonts/woff2/LibertinusKeyboard-Regular.woff2 2020/10/08 | 35149 | fonts/plimsoll/LICENSE 2020/10/08 | 350869 | macros/latex/contrib/showexpl/doc/showexpl-test.pdf 2020/10/08 | 3472010 | systems/win32/miktex/tm/packages/lwarp.tar.lzma 2020/10/08 | 3466 | macros/latex/contrib/hyperxmp/gglo-hyxmp.ist 2020/10/08 | 3442 | macros/latex/contrib/hyperxmp/gind-hyxmp.ist -2020/10/08 | 329260 | systems/texlive/tlnet/archive/dvipdfmx.win32.r56588.tar.xz 2020/10/08 | 3288 | fonts/plimsoll/plimsoll-sans.sfd -2020/10/08 | 328808 | fonts/libertinus-fonts/otf/LibertinusSerif-SemiboldItalic.otf -2020/10/08 | 327192 | fonts/libertinus-fonts/woff2/LibertinusMath-Regular.woff2 2020/10/08 | 3256 | systems/texlive/tlnet/archive/runcode.r56594.tar.xz 2020/10/08 | 3200561 | systems/win32/miktex/tm/packages/animate.tar.lzma -2020/10/08 | 317688 | fonts/libertinus-fonts/otf/LibertinusSerif-Italic.otf -2020/10/08 | 3145132 | systems/texlive/tlnet/archive/animate.doc.r56583.tar.xz -2020/10/08 | 30296 | systems/texlive/tlnet/archive/animate.source.r56583.tar.xz 2020/10/08 | 3008 | systems/texlive/tlnet/archive/iftex.r56594.tar.xz -2020/10/08 | 297912 | fonts/libertinus-fonts/otf/LibertinusSerif-Regular.otf 2020/10/08 | 29479 | macros/latex/contrib/showexpl/showexpl.dtx -2020/10/08 | 288564 | fonts/libertinus-fonts/otf/LibertinusSans-Italic.otf -2020/10/08 | 2883136 | systems/win32/w32tex/platex.tar.xz 2020/10/08 | 2875 | fonts/plimsoll/plimsoll.sfd -2020/10/08 | 2857624 | systems/texlive/tlnet/archive/lwarp.doc.r56584.tar.xz -2020/10/08 | 279280 | fonts/libertinus-fonts/otf/LibertinusSerif-Bold.otf -2020/10/08 | 276492 | fonts/libertinus-fonts/otf/LibertinusSerif-Semibold.otf -2020/10/08 | 274900 | fonts/libertinus-fonts/otf/LibertinusSans-Bold.otf 2020/10/08 | 26788 | systems/texlive/tlnet/archive/fontspec.r56594.tar.xz 2020/10/08 | 260895 | macros/latex/contrib/hyperxmp/hyperxmp.dtx -2020/10/08 | 256760 | fonts/libertinus-fonts/otf/LibertinusSans-Regular.otf 2020/10/08 | 2556 | systems/texlive/tlnet/archive/docutils.r56594.tar.xz -2020/10/08 | 255360 | fonts/libertinus-fonts/otf/LibertinusSerifDisplay-Regular.otf 2020/10/08 | 2516 | systems/texlive/tlnet/archive/xltxtra.r56594.tar.xz 2020/10/08 | 250715 | macros/latex/contrib/showexpl/doc/showexpl.pdf -2020/10/08 | 237604 | fonts/libertinus-fonts/otf/LibertinusSerif-BoldItalic.otf -2020/10/08 | 23388 | systems/texlive/tlnet/archive/animate.r56583.tar.xz -2020/10/08 | 22980 | systems/texlive/tlnet/archive/semantex.r56585.tar.xz -2020/10/08 | 227600 | systems/texlive/tlnet/archive/texlive.infra.r56587.tar.xz 2020/10/08 | 2252 | macros/latex/contrib/hyperxmp/README 2020/10/08 | 222 | macros/latex/contrib/auto-pst-pdf/example-psfrag.tex 2020/10/08 | 220023 | macros/latex/contrib/auto-pst-pdf.zip 2020/10/08 | 218576 | systems/texlive/tlnet/archive/iftex.doc.r56594.tar.xz -2020/10/08 | 209512 | fonts/libertinus-fonts/woff2/LibertinusSerif-SemiboldItalic.woff2 -2020/10/08 | 204656 | systems/texlive/tlnet/archive/texlive.infra.doc.r56587.tar.xz 2020/10/08 | 2034 | macros/latex/contrib/hyperxmp/hyperxmp.ins -2020/10/08 | 202681 | fonts/libertinus-fonts/documentation/Sample.pdf 2020/10/08 | 20208 | macros/latex/contrib/auto-pst-pdf/auto-pst-pdf.dtx -2020/10/08 | 201400 | fonts/libertinus-fonts/woff2/LibertinusSerif-Italic.woff2 2020/10/08 | 197032 | macros/latex/contrib/auto-pst-pdf/auto-pst-pdf.pdf -2020/10/08 | 195788 | systems/texlive/tlnet/archive/revtex.source.r56591.tar.xz -2020/10/08 | 190800 | systems/texlive/tlnet/archive/lwarp.r56584.tar.xz 2020/10/08 | 1880 | systems/texlive/tlnet/archive/realscripts.r56594.tar.xz -2020/10/08 | 187700 | fonts/libertinus-fonts/woff2/LibertinusSerif-Regular.woff2 2020/10/08 | 18148 | systems/texlive/tlnet/archive/biblatex-swiss-legal.r56594.tar.xz -2020/10/08 | 181144 | fonts/libertinus-fonts/woff2/LibertinusSans-Italic.woff2 2020/10/08 | 177668 | systems/texlive/tlnet/archive/fltpoint.doc.r56594.tar.xz -2020/10/08 | 176604 | fonts/libertinus-fonts/woff2/LibertinusSerif-Semibold.woff2 -2020/10/08 | 174620 | fonts/libertinus-fonts/woff2/LibertinusSerif-Bold.woff2 2020/10/08 | 1725064 | systems/texlive/tlnet/archive/unicode-math.doc.r56594.tar.xz 2020/10/08 | 172436 | systems/texlive/tlnet/archive/runcode.doc.r56594.tar.xz -2020/10/08 | 171088 | systems/texlive/tlnet/archive/babel.r56581.tar.xz -2020/10/08 | 171048 | fonts/libertinus-fonts/woff2/LibertinusSans-Bold.woff2 2020/10/08 | 1639464 | systems/win32/miktex/tm/packages/platex.tar.lzma -2020/10/08 | 160836 | fonts/libertinus-fonts/documentation/Math-Sample.pdf -2020/10/08 | 160172 | fonts/libertinus-fonts/woff2/LibertinusSans-Regular.woff2 -2020/10/08 | 160012 | fonts/libertinus-fonts/woff2/LibertinusSerifDisplay-Regular.woff2 2020/10/08 | 154 | systems/texlive/tlnet/update-tlmgr-r56587.exe.sha512 2020/10/08 | 153 | systems/texlive/tlnet/update-tlmgr-r56587.sh.sha512 2020/10/08 | 1525551 | macros/latex/contrib/hyperxmp/hyperxmp.pdf -2020/10/08 | 1520 | systems/texlive/tlnet/archive/collection-publishers.r56590.tar.xz 2020/10/08 | 15152 | systems/texlive/tlnet/archive/fltpoint.source.r56594.tar.xz 2020/10/08 | 15128 | systems/texlive/tlnet/archive/oup-authoring-template.r56594.tar.xz -2020/10/08 | 150540 | fonts/libertinus-fonts/woff2/LibertinusSerif-BoldItalic.woff2 -2020/10/08 | 1485440 | systems/texlive/tlnet/archive/revtex4.doc.r56589.tar.xz -2020/10/08 | 1478256 | systems/texlive/tlnet/archive/platex.doc.r56582.tar.xz -2020/10/08 | 14702 | fonts/libertinus-fonts/FONTLOG.txt -2020/10/08 | 1402 | fonts/libertinus-fonts/CONTRIBUTING.md -2020/10/08 | 136108 | systems/texlive/tlnet/archive/revtex4.source.r56589.tar.xz -2020/10/08 | 135880 | systems/texlive/tlnet/archive/platex.source.r56582.tar.xz 2020/10/08 | 1356328 | install/macros/latex/contrib/hyperxmp.tds.zip 2020/10/08 | 134752 | systems/texlive/tlnet/archive/circuitikz.r56594.tar.xz 2020/10/08 | 1343403 | macros/latex/contrib/hyperxmp.zip @@ -1504,103 +1664,3 @@ 2020/10/08 | 11394 | macros/latex/contrib/hyperxmp/einstein-xmp.tex 2020/10/08 | 104544 | systems/texlive/tlnet/archive/realscripts.doc.r56594.tar.xz 2020/10/08 | 100928 | systems/texlive/tlnet/archive/xltxtra.doc.r56594.tar.xz -2020/10/07 | 9888 | language/japanese/platex/kinsoku.dtx -2020/10/07 | 93960883 | systems/win32/w32tex/TLW64/tl-win64.zip -2020/10/07 | 89 | macros/latex/contrib/lwarp/lwarp_baseline_marker.png -2020/10/07 | 88 | fonts/plimsoll/plimsoll.map -2020/10/07 | 883 | fonts/utilities/t1subset/README -2020/10/07 | 861 | language/japanese/platex/pl209.ins -2020/10/07 | 856411 | language/japanese/platex/pldoc.pdf -2020/10/07 | 855 | language/japanese/BX/bxjscls/bxjscls.ins -2020/10/07 | 8363 | language/japanese/platex/plnewsc14.tex -2020/10/07 | 8150 | fonts/utilities/t1subset/src/t1-encoding.h -2020/10/07 | 804748 | systems/win32/w32tex/win64/dvipdfm-w64.tar.xz -2020/10/07 | 7818 | language/japanese/platex/plnewsc01.tex -2020/10/07 | 7614 | language/japanese/platex/pl209.dtx -2020/10/07 | 724 | fonts/utilities/t1subset/src/test.cpp -2020/10/07 | 719 | macros/latex/contrib/lwarp/lwarp_baseline_marker.eps -2020/10/07 | 70238 | language/japanese/platex/platex.dtx -2020/10/07 | 6995 | language/japanese/platex/jltxdoc.dtx -2020/10/07 | 697 | language/japanese/platex/platexrelease.ins -2020/10/07 | 6717 | language/japanese/platex/plnewsc06.tex -2020/10/07 | 6069 | language/japanese/platex/plnews06.tex -2020/10/07 | 565 | language/japanese/platex/pldocs.ins -2020/10/07 | 549899 | systems/win32/miktex/tm/packages/regexpatch.tar.lzma -2020/10/07 | 5492 | language/japanese/platex/Makefile -2020/10/07 | 54376 | language/japanese/platex/plext.dtx -2020/10/07 | 5163 | language/japanese/platex/plnewsc04.tex -2020/10/07 | 492 | fonts/plimsoll/plimsoll-sans.afm -2020/10/07 | 482 | fonts/plimsoll/plimsoll.afm -2020/10/07 | 4730 | macros/latex/contrib/semantex/stripsemantex.sty -2020/10/07 | 4685 | language/japanese/platex/plnews02.tex -2020/10/07 | 4606 | language/japanese/platex/plnewsc15.tex -2020/10/07 | 417011 | macros/latex/contrib/semantex.zip -2020/10/07 | 4153 | language/japanese/platex/plnewsc08.tex -2020/10/07 | 4047 | language/japanese/platex/plexpl3.dtx -2020/10/07 | 3952310 | install/macros/latex/contrib/lwarp.tds.zip -2020/10/07 | 3899235 | macros/latex/contrib/animate/animate.pdf -2020/10/07 | 3877 | language/japanese/platex/plnews08.tex -2020/10/07 | 3796 | language/japanese/platex/plnewsc05.tex -2020/10/07 | 3778 | language/japanese/platex/plnews07.tex -2020/10/07 | 3713 | language/japanese/platex/plnewsc02.tex -2020/10/07 | 362033 | macros/latex/contrib/semantex/semantex.pdf -2020/10/07 | 35148 | fonts/utilities/t1subset/COPYING -2020/10/07 | 3484 | language/japanese/platex/plnewsc11.tex -2020/10/07 | 3456327 | systems/win32/miktex/tm/packages/luatexja.tar.lzma -2020/10/07 | 3413085 | macros/latex/contrib/lwarp.zip -2020/10/07 | 3321 | language/japanese/platex/plnewsc03.tex -2020/10/07 | 3235161 | install/macros/latex/contrib/animate.tds.zip -2020/10/07 | 3232888 | macros/latex/contrib/animate.zip -2020/10/07 | 3197 | language/japanese/platex/plnewsc13.tex -2020/10/07 | 3194 | language/japanese/platex/plnews.cls -2020/10/07 | 30929 | macros/latex/contrib/lwarp/lwarp.ins -2020/10/07 | 2999 | language/japanese/platex/plnewsc09.tex -2020/10/07 | 2976111 | macros/latex/contrib/lwarp/lwarp.pdf -2020/10/07 | 2948 | language/japanese/platex/plnewsc10.tex -2020/10/07 | 2947 | macros/latex/contrib/lwarp/lwarp_tutorial.txt -2020/10/07 | 2931 | language/japanese/platex/plnews04.tex -2020/10/07 | 29001 | macros/latex/contrib/lwarp/lwarpmk.lua -2020/10/07 | 2763 | language/japanese/platex/plnews03.tex -2020/10/07 | 2735 | fonts/plimsoll/plimsoll-sans.pfb -2020/10/07 | 2729 | fonts/plimsoll/plimsoll.enc -2020/10/07 | 2670 | fonts/plimsoll/plimsoll.pfb -2020/10/07 | 2566374 | macros/latex/contrib/lwarp/lwarp.dtx -2020/10/07 | 253 | language/japanese/platex/platex.ini -2020/10/07 | 251862 | language/japanese/platex/platex.pdf -2020/10/07 | 246274 | systems/win32/miktex/tm/packages/etoolbox.tar.lzma -2020/10/07 | 2421 | language/japanese/platex/plnewsc12.tex -2020/10/07 | 2313 | language/japanese/platex/plnews05.tex -2020/10/07 | 22997 | language/japanese/platex/plvers.dtx -2020/10/07 | 218789 | macros/latex/contrib/semantex/semantex.sty -2020/10/07 | 20383 | fonts/utilities/t1subset.zip -2020/10/07 | 2034 | language/japanese/platex/README.md -2020/10/07 | 192162 | language/japanese/platex/plfonts.dtx -2020/10/07 | 1842320 | systems/win32/miktex/tm/packages/l3packages.tar.lzma -2020/10/07 | 1798798 | install/language/japanese/platex.tds.zip -2020/10/07 | 172046 | macros/latex/contrib/semantex/semantex.tex -2020/10/07 | 17083 | language/japanese/platex/platexrelease.dtx -2020/10/07 | 1676659 | language/japanese/platex.zip -2020/10/07 | 1653322 | systems/win32/miktex/tm/packages/babel.tar.lzma -2020/10/07 | 1624 | macros/latex/contrib/lwarp/README.txt -2020/10/07 | 158330 | language/japanese/platex/jclasses.dtx -2020/10/07 | 15802 | fonts/utilities/t1subset/src/t1subset.h -2020/10/07 | 1553 | language/japanese/platex/LICENSE -2020/10/07 | 1552709 | systems/win32/miktex/tm/packages/nicematrix.tar.lzma -2020/10/07 | 152 | fonts/plimsoll/plimsoll.tfm -2020/10/07 | 152 | fonts/plimsoll/plimsoll-sans.tfm -2020/10/07 | 149765 | systems/win32/miktex/tm/packages/nnext.tar.lzma -2020/10/07 | 1488 | language/japanese/platex/plcls.ins -2020/10/07 | 147796 | language/japanese/platex/platex-en.pdf -2020/10/07 | 137664 | language/japanese/platex/exppl2e.pdf -2020/10/07 | 137203 | macros/latex/contrib/animate/animate.sty -2020/10/07 | 137125 | systems/win32/miktex/tm/packages/pxjahyper.tar.lzma -2020/10/07 | 13656 | language/japanese/platex/exppl2e.sty -2020/10/07 | 12233 | macros/latex/contrib/animate/ChangeLog -2020/10/07 | 1191 | language/japanese/platex/plfmt.ins -2020/10/07 | 114028 | language/japanese/platex/plcore.dtx -2020/10/07 | 1117421 | systems/win32/miktex/tm/packages/tuda-ci.tar.lzma -2020/10/07 | 10810 | systems/win32/miktex/tm/packages/graphics-def.tar.lzma -2020/10/07 | 107343 | language/japanese/platex/platexrelease.pdf -2020/10/07 | 10671578 | systems/win32/miktex/tm/packages/l3kernel.tar.lzma -2020/10/07 | 10430 | language/japanese/platex/plnewsc07.tex -2020/10/07 | 10426 | language/japanese/platex/plnews01.tex diff --git a/fonts/libertinus-fonts/FONTLOG.txt b/fonts/libertinus-fonts/FONTLOG.txt index 240d757981..628712bd17 100644 --- a/fonts/libertinus-fonts/FONTLOG.txt +++ b/fonts/libertinus-fonts/FONTLOG.txt @@ -45,6 +45,13 @@ https://github.com/alerque/libertinus ChangeLog --------- +14 October 2020 (Caleb Maclennan) <Libertinus> Version 7.020 +- Fix name tables broken in 7.010 that associate styles in the Serif family +- Correct position of middle dot on Å€ U+0140 in Mono and Keyboard families +- Adjust height of middle dot in Ä¿ U+013F in the Display family +- Un-slant ‖ U+2016 and ‗ U+2017 in Mono family +- Un-slant, center, and fix widths of dash related characters in Mono family + 8 October 2020 (Caleb Maclennan) <Libertinus> Version 7.010 - Build WOFF2 static font files suitable for use as self-hosted webfonts - Add ‘ð„†â€™ [U+1D106] and ‘ð„‡â€™ [U+1D107] MUSICAL SYMBOL REPEAT SIGN glyphs diff --git a/fonts/libertinus-fonts/README.md b/fonts/libertinus-fonts/README.md index 91b8572256..ab5eef2e25 100644 --- a/fonts/libertinus-fonts/README.md +++ b/fonts/libertinus-fonts/README.md @@ -1,23 +1,43 @@ -# Libertinus Font Family +# Libertinus Fonts [![Latest Release](https://img.shields.io/github/v/release/alerque/libertinus?label=Download%20Release&logo=Github)](https://github.com/alerque/libertinus/releases/latest) -[![All Releases](https://img.shields.io/github/downloads/alerque/libertinus/total)](https://github.com/alerque/libertinus/releases) +[![All Releases](https://img.shields.io/github/downloads/alerque/libertinus/total?label=Downloads)](https://github.com/alerque/libertinus/releases) [![Fontship Build Status](https://img.shields.io/github/workflow/status/alerque/libertinus/Fontship?label=Fontship&logo=data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTQyLjgiIGhlaWdodD0iMTA2LjgiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTEwLjEzIDBhMy4wOTQgMy4wOTQgMCAwMC0zLjA4MyAyLjgyNEwuMDE0IDgzLjIzNGEzLjA5MyAzLjA5MyAwIDAwMy4wODIgMy4zNjNoOS43MjZjLS4xMzYuNjc1LS4yNSAxLjM1Ni0uMzEgMi4wNTMtLjg2NCA5Ljg3MyA2LjcxMyAxOC4xOCAxNi42IDE4LjE4IDkuODg4IDAgMTguNDQtNy44NzUgMTkuMzEtMTcuNzUuMDc0LS44NDIuMDcxLTEuNjcuMDMtMi40ODhoNDUuNDNhMTguMDM5IDE4LjAzOSAwIDAwLS4zMTUgMi4wNTNjLS44NjUgOS44OCA2LjcxMyAxOC4xOSAxNi42MSAxOC4xOSA5Ljg5NSAwIDE4LjQ1LTcuODczIDE5LjMxLTE3Ljc1YTE3LjI4IDE3LjI4IDAgMDAtLjAyNC0zLjA3OGg2Ljk1N3YuMDAyYy41NTQuMDEyLjc5NC4wMSAxLjQ4NC4wMjcgMi4wMjcuMTA3IDMuMzMzLjE2IDMuOTIuMTYuMzIgMCAuNTM0LS4wNTMuNjQxLS4xNi4xNi0uMTA2LjI0LS4yNC4yNC0uNC4wNTMtLjIxMy4wOC0uNTU5LjA4LTEuMDM5IDAtLjUzMy0uMDUzLS44ODEtLjE2LTEuMDQxLS4xMDctLjE2LS4zNzQtLjI0LS44LS4yNGgtLjExbC44Ni05LjgxNGMxLjIxNy0xMy45Mi0zLjE1NS0yNy4zNS0xMi4xOS0zNy4yNmwtMy41NzUtMy45MTZhMi41MDYgMi41MDYgMCAwMC0xLjg1LS44MTdoLTIxLjQybDIuNDYzLTI4LjE1YTMuMDkzIDMuMDkzIDAgMDAtMy4wOC0zLjM2M3oiIGNsaXAtcnVsZT0ibm9uemVybyIgY29sb3I9IiMwMDAiIGZpbGw9IiNGRkYiIGZpbGwtcnVsZT0ibm9uemVybyIgc3Ryb2tlPSIjRkZGIiBzdHlsZT0iZm9udC1mZWF0dXJlLXNldHRpbmdzOm5vcm1hbDtmb250LXZhcmlhbnQtYWx0ZXJuYXRlczpub3JtYWw7Zm9udC12YXJpYW50LWNhcHM6bm9ybWFsO2ZvbnQtdmFyaWFudC1lYXN0LWFzaWFuOm5vcm1hbDtmb250LXZhcmlhbnQtbGlnYXR1cmVzOm5vcm1hbDtmb250LXZhcmlhbnQtbnVtZXJpYzpub3JtYWw7Zm9udC12YXJpYW50LXBvc2l0aW9uOm5vcm1hbDtmb250LXZhcmlhdGlvbi1zZXR0aW5nczpub3JtYWw7aW5saW5lLXNpemU6MDtpc29sYXRpb246YXV0bzttaXgtYmxlbmQtbW9kZTpub3JtYWw7c2hhcGUtbWFyZ2luOjA7c2hhcGUtcGFkZGluZzowO3RleHQtZGVjb3JhdGlvbi1jb2xvcjojMDAwO3RleHQtZGVjb3JhdGlvbi1saW5lOm5vbmU7dGV4dC1kZWNvcmF0aW9uLXN0eWxlOnNvbGlkO3RleHQtaW5kZW50OjA7dGV4dC1vcmllbnRhdGlvbjptaXhlZDt0ZXh0LXRyYW5zZm9ybTpub25lO3doaXRlLXNwYWNlOm5vcm1hbCIvPjxwYXRoIGQ9Ik0xMi45NiA2LjE4NmwtNi40OTQgNzQuMjNoODYuNThsNi40OTQtNzQuMjN6IiBmaWxsPSIjRkZGIiBzdHJva2U9IiNGRkYiLz48L3N2Zz4=)](https://github.com/alerque/libertinus/actions?workflow=Fontship) -![Sample of Libertinus Font Family](preview.svg) +![Sample of Libertinus Font Faces](preview.svg) -The Libertinus family consists of: +The Libertinus Fonts project includes four main type families: + +* The **Libertinus Serif** family: + + 6 serif typefaces cover three weights (Regular, Semibold, Bold) in each of two styles (Regular, Italic); originally forked from *Linux Libertine*. + +* The **Libertinus Sans** family: + + 3 sans-serif typefaces cover Regular, a Bold weight, and an Italic style; originally forked from *Linux Biolinum*. + +* The **Libertinus Mono** family: + + 1 monospace typeface derived from the serif family; originally forked from *Linux Libertine Mono*. + +* The **Libertinus Math** family: + + 1 OpenType math typeface derived from the serif family with many extra glyphs and features for use in OpenType math-capable applications (such as LuaTeX, XeTeX, or MS Word 2007+). + +Additionally included are 3 special-use families with a single typeface each: + +* **Libertinus Serif Display**: A derivative of *Libertinus Serif Regular* optimized for display at large sizes. + +* **Libertinus Serif Initials**: A derivative of *Libertinus Serif* with outlined variants of capital letter glyphs suitable for drop-caps or other decorations. + +* **Libertinus Keyboard**: A derivative of *Libertinus Sans* with keyboard key outlines around each character suitable for use in technical documentation. -* **Libertinus Serif**: forked from *Linux Libertine*. -* **Libertinus Sans**: forked from *Linux Biolinum*. -* **Libertinus Mono**: forked from *Linux Libertine Mono*. -* **Libertinus Math**: an OpenType math font for use in OpenType math-capable applications (such as LuaTeX, XeTeX, or MS Word 2007+). ## Download Downloads containing all the ready to use font files and documentation can be found on the [Releases][3] page of the project on GitHub. -To preview changes in between tagged releases, the fonts resulting from each change can be downloaded as artifacts attached to each commit under the [Fontship workflow in the Actions tab](https://github.com/alerque/libertinus/actions?query=workflow%3AFontship). +To test drive changes on development font builds between tagged releases, the fonts resulting from each change can be downloaded and from the artifacts attached to each commit under the [Fontship workflow in the GitHub Actions tab](https://github.com/alerque/libertinus/actions?query=workflow%3AFontship+branch%3Amaster). ## Building @@ -41,7 +61,7 @@ See the file [CONTRIBUTING.md](CONTRIBUTING.md) for instructions on how to build The Libertinus font project began as a fork of the [Linux Libertine][1] and Linux Biolinum fonts. Libertinus was forked from the [5.3.0 (2012-07-02) release][2] of Linux Libertine fonts. -The original impetus was to add an OpenType math companion to the Libertine font family. +The original impetus was to add an OpenType math companion to the Libertine font families. Over time it grew into to a full-fledged fork addressing many of the bugs in the Libertine fonts. Hat-tip to [Frédéric Wang][fred-wang] for coming up with the name “Libertinusâ€. @@ -53,8 +73,8 @@ In 2020, Khaled passed the role of maintainer on to [Caleb Maclennan][alerque]. ## License -All fonts in the Libertinus family are available under the terms of the Open Font License, version 1.1. -See the file [OFL.txt](OFL.txt) for details. +All typefaces in the Libertinus Fonts project are released under the terms of the Open Font License, version 1.1. +See the license file [OFL.txt](OFL.txt) for details. [1]: https://en.wikipedia.org/wiki/Linux_Libertine [2]: https://sourceforge.net/projects/linuxlibertine/files/linuxlibertine/ diff --git a/fonts/libertinus-fonts/otf/LibertinusKeyboard-Regular.otf b/fonts/libertinus-fonts/otf/LibertinusKeyboard-Regular.otf Binary files differindex 1af2c2e10b..661f1301b0 100644 --- a/fonts/libertinus-fonts/otf/LibertinusKeyboard-Regular.otf +++ b/fonts/libertinus-fonts/otf/LibertinusKeyboard-Regular.otf diff --git a/fonts/libertinus-fonts/otf/LibertinusMath-Regular.otf b/fonts/libertinus-fonts/otf/LibertinusMath-Regular.otf Binary files differindex 697f3d4901..6a8015adc5 100644 --- a/fonts/libertinus-fonts/otf/LibertinusMath-Regular.otf +++ b/fonts/libertinus-fonts/otf/LibertinusMath-Regular.otf diff --git a/fonts/libertinus-fonts/otf/LibertinusMono-Regular.otf b/fonts/libertinus-fonts/otf/LibertinusMono-Regular.otf Binary files differindex d2462fde0b..92a6255bdd 100644 --- a/fonts/libertinus-fonts/otf/LibertinusMono-Regular.otf +++ b/fonts/libertinus-fonts/otf/LibertinusMono-Regular.otf diff --git a/fonts/libertinus-fonts/otf/LibertinusSans-Bold.otf b/fonts/libertinus-fonts/otf/LibertinusSans-Bold.otf Binary files differindex f62d35c984..bf945a3dfa 100644 --- a/fonts/libertinus-fonts/otf/LibertinusSans-Bold.otf +++ b/fonts/libertinus-fonts/otf/LibertinusSans-Bold.otf diff --git a/fonts/libertinus-fonts/otf/LibertinusSans-Italic.otf b/fonts/libertinus-fonts/otf/LibertinusSans-Italic.otf Binary files differindex 9d9f75954d..4a33a90eba 100644 --- a/fonts/libertinus-fonts/otf/LibertinusSans-Italic.otf +++ b/fonts/libertinus-fonts/otf/LibertinusSans-Italic.otf diff --git a/fonts/libertinus-fonts/otf/LibertinusSans-Regular.otf b/fonts/libertinus-fonts/otf/LibertinusSans-Regular.otf Binary files differindex da8073abc3..e621a10b97 100644 --- a/fonts/libertinus-fonts/otf/LibertinusSans-Regular.otf +++ b/fonts/libertinus-fonts/otf/LibertinusSans-Regular.otf diff --git a/fonts/libertinus-fonts/otf/LibertinusSerif-Bold.otf b/fonts/libertinus-fonts/otf/LibertinusSerif-Bold.otf Binary files differindex 1d7a8ac22d..e662a6b552 100644 --- a/fonts/libertinus-fonts/otf/LibertinusSerif-Bold.otf +++ b/fonts/libertinus-fonts/otf/LibertinusSerif-Bold.otf diff --git a/fonts/libertinus-fonts/otf/LibertinusSerif-BoldItalic.otf b/fonts/libertinus-fonts/otf/LibertinusSerif-BoldItalic.otf Binary files differindex 66980cc10e..55694393df 100644 --- a/fonts/libertinus-fonts/otf/LibertinusSerif-BoldItalic.otf +++ b/fonts/libertinus-fonts/otf/LibertinusSerif-BoldItalic.otf diff --git a/fonts/libertinus-fonts/otf/LibertinusSerif-Italic.otf b/fonts/libertinus-fonts/otf/LibertinusSerif-Italic.otf Binary files differindex 7d0a9b9409..05b1f6bbef 100644 --- a/fonts/libertinus-fonts/otf/LibertinusSerif-Italic.otf +++ b/fonts/libertinus-fonts/otf/LibertinusSerif-Italic.otf diff --git a/fonts/libertinus-fonts/otf/LibertinusSerif-Regular.otf b/fonts/libertinus-fonts/otf/LibertinusSerif-Regular.otf Binary files differindex 80d23253f3..a9c281c203 100644 --- a/fonts/libertinus-fonts/otf/LibertinusSerif-Regular.otf +++ b/fonts/libertinus-fonts/otf/LibertinusSerif-Regular.otf diff --git a/fonts/libertinus-fonts/otf/LibertinusSerif-Semibold.otf b/fonts/libertinus-fonts/otf/LibertinusSerif-Semibold.otf Binary files differindex d5f639a7b1..b3e6b4d176 100644 --- a/fonts/libertinus-fonts/otf/LibertinusSerif-Semibold.otf +++ b/fonts/libertinus-fonts/otf/LibertinusSerif-Semibold.otf diff --git a/fonts/libertinus-fonts/otf/LibertinusSerif-SemiboldItalic.otf b/fonts/libertinus-fonts/otf/LibertinusSerif-SemiboldItalic.otf Binary files differindex 3f0bde7af6..2f44a43ec7 100644 --- a/fonts/libertinus-fonts/otf/LibertinusSerif-SemiboldItalic.otf +++ b/fonts/libertinus-fonts/otf/LibertinusSerif-SemiboldItalic.otf diff --git a/fonts/libertinus-fonts/otf/LibertinusSerifDisplay-Regular.otf b/fonts/libertinus-fonts/otf/LibertinusSerifDisplay-Regular.otf Binary files differindex f480af4305..a85b2165e1 100644 --- a/fonts/libertinus-fonts/otf/LibertinusSerifDisplay-Regular.otf +++ b/fonts/libertinus-fonts/otf/LibertinusSerifDisplay-Regular.otf diff --git a/fonts/libertinus-fonts/otf/LibertinusSerifInitials-Regular.otf b/fonts/libertinus-fonts/otf/LibertinusSerifInitials-Regular.otf Binary files differindex 175f0dbbbe..92b8040462 100644 --- a/fonts/libertinus-fonts/otf/LibertinusSerifInitials-Regular.otf +++ b/fonts/libertinus-fonts/otf/LibertinusSerifInitials-Regular.otf diff --git a/fonts/libertinus-fonts/woff2/LibertinusKeyboard-Regular.woff2 b/fonts/libertinus-fonts/woff2/LibertinusKeyboard-Regular.woff2 Binary files differdeleted file mode 100644 index 3ca6308249..0000000000 --- a/fonts/libertinus-fonts/woff2/LibertinusKeyboard-Regular.woff2 +++ /dev/null diff --git a/fonts/libertinus-fonts/woff2/LibertinusMath-Regular.woff2 b/fonts/libertinus-fonts/woff2/LibertinusMath-Regular.woff2 Binary files differdeleted file mode 100644 index 5fa5ed1a89..0000000000 --- a/fonts/libertinus-fonts/woff2/LibertinusMath-Regular.woff2 +++ /dev/null diff --git a/fonts/libertinus-fonts/woff2/LibertinusMono-Regular.woff2 b/fonts/libertinus-fonts/woff2/LibertinusMono-Regular.woff2 Binary files differdeleted file mode 100644 index 591dc33c02..0000000000 --- a/fonts/libertinus-fonts/woff2/LibertinusMono-Regular.woff2 +++ /dev/null diff --git a/fonts/libertinus-fonts/woff2/LibertinusSans-Bold.woff2 b/fonts/libertinus-fonts/woff2/LibertinusSans-Bold.woff2 Binary files differdeleted file mode 100644 index b48846bcd0..0000000000 --- a/fonts/libertinus-fonts/woff2/LibertinusSans-Bold.woff2 +++ /dev/null diff --git a/fonts/libertinus-fonts/woff2/LibertinusSans-Italic.woff2 b/fonts/libertinus-fonts/woff2/LibertinusSans-Italic.woff2 Binary files differdeleted file mode 100644 index f5c1f26eeb..0000000000 --- a/fonts/libertinus-fonts/woff2/LibertinusSans-Italic.woff2 +++ /dev/null diff --git a/fonts/libertinus-fonts/woff2/LibertinusSans-Regular.woff2 b/fonts/libertinus-fonts/woff2/LibertinusSans-Regular.woff2 Binary files differdeleted file mode 100644 index 3984b0842e..0000000000 --- a/fonts/libertinus-fonts/woff2/LibertinusSans-Regular.woff2 +++ /dev/null diff --git a/fonts/libertinus-fonts/woff2/LibertinusSerif-Bold.woff2 b/fonts/libertinus-fonts/woff2/LibertinusSerif-Bold.woff2 Binary files differdeleted file mode 100644 index f1b7a29820..0000000000 --- a/fonts/libertinus-fonts/woff2/LibertinusSerif-Bold.woff2 +++ /dev/null diff --git a/fonts/libertinus-fonts/woff2/LibertinusSerif-BoldItalic.woff2 b/fonts/libertinus-fonts/woff2/LibertinusSerif-BoldItalic.woff2 Binary files differdeleted file mode 100644 index 909e391751..0000000000 --- a/fonts/libertinus-fonts/woff2/LibertinusSerif-BoldItalic.woff2 +++ /dev/null diff --git a/fonts/libertinus-fonts/woff2/LibertinusSerif-Italic.woff2 b/fonts/libertinus-fonts/woff2/LibertinusSerif-Italic.woff2 Binary files differdeleted file mode 100644 index c607e65ca6..0000000000 --- a/fonts/libertinus-fonts/woff2/LibertinusSerif-Italic.woff2 +++ /dev/null diff --git a/fonts/libertinus-fonts/woff2/LibertinusSerif-Regular.woff2 b/fonts/libertinus-fonts/woff2/LibertinusSerif-Regular.woff2 Binary files differdeleted file mode 100644 index a1f209c8ff..0000000000 --- a/fonts/libertinus-fonts/woff2/LibertinusSerif-Regular.woff2 +++ /dev/null diff --git a/fonts/libertinus-fonts/woff2/LibertinusSerif-Semibold.woff2 b/fonts/libertinus-fonts/woff2/LibertinusSerif-Semibold.woff2 Binary files differdeleted file mode 100644 index f1645090e5..0000000000 --- a/fonts/libertinus-fonts/woff2/LibertinusSerif-Semibold.woff2 +++ /dev/null diff --git a/fonts/libertinus-fonts/woff2/LibertinusSerif-SemiboldItalic.woff2 b/fonts/libertinus-fonts/woff2/LibertinusSerif-SemiboldItalic.woff2 Binary files differdeleted file mode 100644 index 096615c609..0000000000 --- a/fonts/libertinus-fonts/woff2/LibertinusSerif-SemiboldItalic.woff2 +++ /dev/null diff --git a/fonts/libertinus-fonts/woff2/LibertinusSerifDisplay-Regular.woff2 b/fonts/libertinus-fonts/woff2/LibertinusSerifDisplay-Regular.woff2 Binary files differdeleted file mode 100644 index ab537d98be..0000000000 --- a/fonts/libertinus-fonts/woff2/LibertinusSerifDisplay-Regular.woff2 +++ /dev/null diff --git a/fonts/libertinus-fonts/woff2/LibertinusSerifInitials-Regular.woff2 b/fonts/libertinus-fonts/woff2/LibertinusSerifInitials-Regular.woff2 Binary files differdeleted file mode 100644 index c111b2670e..0000000000 --- a/fonts/libertinus-fonts/woff2/LibertinusSerifInitials-Regular.woff2 +++ /dev/null diff --git a/graphics/pgf/contrib/circuitikz/doc/changelog.tex b/graphics/pgf/contrib/circuitikz/doc/changelog.tex index 0a7467452b..a414bf258b 100644 --- a/graphics/pgf/contrib/circuitikz/doc/changelog.tex +++ b/graphics/pgf/contrib/circuitikz/doc/changelog.tex @@ -5,6 +5,19 @@ full list of changes. \begin{itemize} \item + Version 1.2.5 (2020-10-14) + + Mainly a bugfix release fir \texttt{raised} voltage style. + + \begin{itemize} + \tightlist + \item + added macro to access labels and annotations anchors and direction + \item + fixed a bug in ``raised'' voltages' positions with \texttt{invert} + and/or \texttt{mirror} + \end{itemize} +\item Version 1.2.4 (2020-10-04) \begin{itemize} diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf Binary files differindex 5fe1659424..411929d411 100644 --- a/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf +++ b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf Binary files differindex e1ccb1f821..bf155cae30 100644 --- a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf +++ b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex index b952bdc291..bdb000b19a 100644 --- a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex +++ b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex @@ -6412,6 +6412,33 @@ Since 0.9.5, you can access all the labels nodes\footnote{The access to \texttt{ \end{circuitikz} \end{LTXexample} + +If you want to have more access to the label positioning algorithm, since \texttt{1.2.5} you can access the label rotation using with the command \texttt{\textbackslash ctikzgetrotation\{\emph{nodename}\}} (where node name is for example \texttt{L1label} or \texttt{L2annotation}), and the anchor used for positioning the node as \texttt{\textbackslash ctikzgetanchor\{\emph{component label}\}\{\emph{type}\}}, where \emph{component label} is, for example, \texttt{L1} and type is either \texttt{label} or \texttt{annotation} (notice that the syntax is slightly different, for implementation reasons). +Those values are available only if the dipole declares a \texttt{l} or \texttt{a} keys; if you want them without any label you need to declare a blank one (like for example \texttt{l=\textasciitilde}). +The following example gives an idea of the values of those macro for the three types of label positioning strategies. + +\begin{LTXexample}[varwidth=true, pos=t, basicstyle=\small\ttfamily] +\newcommand{\marklabann}[3][45]{% [angle] {node label} {type: label or annotation} +\node[circle, draw, blue, inner sep=1pt, +pin={[draw, blue, font=\tiny, align=left]#1:{#2 \\ dir: \ctikzgetdirection{#2#3} \\ + anchor: \ctikzgetanchor{#2}{#3}}}] at (#2#3.\ctikzgetanchor{#2}{#3}) {};} +\begin{tikzpicture}[scale=0.95, transform shape] +\foreach \style/\xdelta in {straight/0, smart/5, rotate/10} { +\begin{scope}[xshift=\xdelta cm] + \ctikzset{label/align = \style} + \draw (0,0) node[above right, rotate=45]{\style} + to[L, o-, l=$L_{ab}$, v, name=L1, a=a] ++(3,3) + to[ceV, -*, v, name=V1, l2_=L1 and L2, a^=A] ++(0,-3); + \marklabann[135]{L1}{label} + \marklabann[-90]{L1}{annotation} + \marklabann[90]{V1}{label} + \marklabann[-90]{V1}{annotation} +\end{scope}} +\end{tikzpicture} +\end{LTXexample} + + + \subsection{Advanced voltages, currents and flows}\label{sec:vif-anchors} Since version \texttt{1.2.1}, it is possible to access the anchors of the ``ornaments'' --- voltage, current and flows, together with some additional information that makes it possible to personalize them. diff --git a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty index 3fdb137c4b..24fde4cd3d 100644 --- a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty +++ b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty @@ -12,8 +12,8 @@ \NeedsTeXFormat{LaTeX2e} -\def\pgfcircversion{1.2.4} -\def\pgfcircversiondate{2020/10/04} +\def\pgfcircversion{1.2.5} +\def\pgfcircversiondate{2020/10/14} \ProvidesPackage{circuitikz}% [\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion] diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex index a83279ee8c..5f65d77079 100644 --- a/graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex +++ b/graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex @@ -195,7 +195,8 @@ \pgf@circ@res@temp=1.5\pgf@circ@res@temp \fi %Calculate rotation of the label from direction and strip decimals - \edef\pgfcirclabrot{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil} + \pgfmathsetmacro{\pgfcirclabrot}{round(\pgf@circ@direction)} + \edef\pgfcirclabrot{\expandafter\pgf@circ@stripdecimals\pgfcirclabrot\pgf@nil} % rotate the label at second or third quadrant: \ifnum \pgfcirclabrot > 90 \ifnum \pgfcirclabrot < 270 \pgfmathsubtract{\pgf@circ@direction}{180} @@ -205,8 +206,10 @@ \pgf@circ@res@temp=1.5\pgf@circ@res@temp \fi \fi\fi - \pgfmathparse{\ctikzvalof{bipole/#1/position}>0?\pgf@circ@direction+90:\pgf@circ@direction-90} - \edef\pgf@circ@labposangle{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil} + \pgfmathparse{\ctikzvalof{bipole/#1/position}>0?\pgf@circ@direction+90:\pgf@circ@direction-90}% + \edef\pgf@circ@labposangle{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}% + \expandafter\xdef\csname pgfcirc@\pgfcirc@a@prefix#1-direction\endcsname{\pgfcirclabrot}% + \expandafter\xdef\csname pgfcirc@\pgfcirc@a@prefix-#1-anchor\endcsname{mid}% } % reset cm is not working correctly here (pgfcirc@labelcoor)++(\pgf@circ@labposangle:\the\pgf@circ@res@temp) coordinate(pgfcirc@labelcoor) @@ -250,7 +253,6 @@ \fi \fi\fi %Values between -5 and 5 are at pos /neg x-axis - \pgfextra{\def\uffa{}\newdimen\realshift\realshift=\dimexpr1pt\relax} \ifnum \pgfcircmathresult <6 \ifnum \pgfcircmathresult > -6 \ifnum \ctikzvalof{bipole/#1/position} < 0 \ifnum \pgf@circ@labanc > 90 @@ -281,6 +283,10 @@ \fi \fi \fi\fi + \pgfextra{% + \expandafter\xdef\csname pgfcirc@\pgfcirc@a@prefix#1-direction\endcsname{0}% + \expandafter\xdef\csname pgfcirc@\pgfcirc@a@prefix-#1-anchor\endcsname{\pgf@circ@labanctext}% + } (pgfcirc@labelcoor) node[anchor=\pgf@circ@labanctext, inner sep=0.5\pgf@circ@res@temp, outer sep=0pt, \circuitikzbasekey/bipole #1 style, ](\ctikzvalof{bipole/name}#1){\strut\pgf@circ@finallabels{#1}% diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex index 0b9c9dd779..d6c11db040 100644 --- a/graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex +++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex @@ -177,7 +177,7 @@ \fi \ifpgf@circuit@bipole@voltage@raised \def\pgf@circ@bipole@voltage@label@anchor{center} - \pgfmathsetlength{\absvshift}{\absvshift+height{"Q"}} % with the current font. + \pgfmathsetlength{\absvshift}{\absvshift+sign(\absvshift)*height{"Q"}} % with the current font. \fi } % %\pgf@circ@Rlen/\ctikzvalof{current arrow scale} is equal to the length of the currarrow diff --git a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex index 1b45f630bd..c571704c24 100644 --- a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex +++ b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex @@ -10,8 +10,8 @@ % % See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details. -\def\pgfcircversion{1.2.4} -\def\pgfcircversiondate{2020/10/04} +\def\pgfcircversion{1.2.5} +\def\pgfcircversiondate{2020/10/14} \writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion} \usemodule[tikz] diff --git a/language/japanese/platex-tools/README.md b/language/japanese/platex-tools/README.md index 903bb76ee3..99a92286e7 100644 --- a/language/japanese/platex-tools/README.md +++ b/language/japanese/platex-tools/README.md @@ -7,56 +7,56 @@ and some additional packages are included. ## Bundle contents +All these packages can be used on pLaTeX and upLaTeX. + +- pldocverb.sty: + Patch for doc.sty (latex) to improve + compatibility with `\verb` redefinition in pLaTeX. - plarray.sty: Patch for array.sty (latex-tools) to improve - compatibility with pLaTeX/upLaTeX kernels. - Can be used on pLaTeX/upLaTeX. + compatibility with pLaTeX kernel. - plextarray.sty: Patch for array.sty (latex-tools) to improve compatibility with plext.sty in pLaTeX. - Can be used on pLaTeX/upLaTeX. - plextdelarray.sty: Patch for delarray.sty (latex-tools) to improve compatibility with plext.sty in pLaTeX. - Can be used on pLaTeX/upLaTeX. +- plextcolortbl.sty: + Patch for colortbl.sty (by David Carlisle) to improve + compatibility with plext.sty in pLaTeX. - pxftnright.sty: Patch for ftnright.sty (latex-tools) to support Japanese classes for vertical writing. - Can be used on pLaTeX/upLaTeX. - pxmulticol.sty: Patch for multicol.sty (latex-tools) to support `\footnote` in vertical writing. - Can be used on pLaTeX/upLaTeX. - pxxspace.sty: Patch for xspace.sty (latex-tools) to fix interword spacing with Japanese characters. - Can be used on pLaTeX/upLaTeX. Version 0.2 was written by Takayuki YATO in 2019 (https://gist.github.com/zr-tex8r/7de76036846e149bc28ec6399a683e3a), and incorporated into this bundle by his courtesy. - pxeverysel.sty: Patch for everysel.sty (ms) to improve compatibility with Japanese font selection in pLaTeX. - Can be used on pLaTeX/upLaTeX. Version 0.1 was written by Takayuki YATO in 2015 (https://gist.github.com/zr-tex8r/48c6910bbbe2f41d72de), and incorporated into this bundle by his courtesy. - pxeveryshi.sty: Patch for everyshi.sty (ms) to support Japanese classes for vertical writing. - Can be used on pLaTeX/upLaTeX. Version 0.1 was written by Takayuki YATO in 2012 (https://gist.github.com/zr-tex8r/2702969), and incorporated into this bundle by his courtesy. - pxatbegshi.sty: Patch for atbegshi.sty (oberdiek) to support Japanese classes for vertical writing. - Can be used on pLaTeX/upLaTeX. The essential part of this package was proposed by Hironori Kitagawa in 2017. -The packages "pxgentombow", "gentombow" and "bounddvi" are now distributed -as part of [gentombow](https://github.com/aminophen/gentombow) bundle. +The packages "gentombow" (formerly "pxgentombow") and "bounddvi" +are now distributed as part of +[gentombow](https://github.com/aminophen/gentombow) bundle. ## Character encoding @@ -83,6 +83,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2020-09-27 +2020-10-14 Hironobu Yamashita diff --git a/language/japanese/platex-tools/plarray.pdf b/language/japanese/platex-tools/plarray.pdf Binary files differindex dfa0afcbf7..27ef3b0f86 100644 --- a/language/japanese/platex-tools/plarray.pdf +++ b/language/japanese/platex-tools/plarray.pdf diff --git a/language/japanese/platex-tools/plarray.sty b/language/japanese/platex-tools/plarray.sty index 52ff536d54..2629e52bca 100644 --- a/language/japanese/platex-tools/plarray.sty +++ b/language/japanese/platex-tools/plarray.sty @@ -7,9 +7,9 @@ % % This package is expected to be compatible with % * array.sty in latex-tools -% (2016/10/06 v2.4d -- 2019/08/31 v2.4l) +% (2016/10/06 v2.4d -- 2020/10/01 v2.5c) % * plcore.ltx in platex -% (2001/09/26 v1.2a -- 2020/03/05 v1.3e) +% (2001/09/26 v1.2a -- 2020/09/28 v1.3g) % \NeedsTeXFormat{pLaTeX2e} diff --git a/language/japanese/platex-tools/plarray.tex b/language/japanese/platex-tools/plarray.tex index fdb95faf3e..66ea8f2fb5 100644 --- a/language/japanese/platex-tools/plarray.tex +++ b/language/japanese/platex-tools/plarray.tex @@ -7,8 +7,6 @@ \usepackage{doc} \usepackage{plarray} \GetFileInfo{plarray.sty} -\makeatletter -\makeatother \title{Package \textsf{plarray} \fileversion} \author{Hironobu Yamashita} \date{\filedate} diff --git a/language/japanese/platex-tools/pldocverb.pdf b/language/japanese/platex-tools/pldocverb.pdf Binary files differnew file mode 100644 index 0000000000..480cf59298 --- /dev/null +++ b/language/japanese/platex-tools/pldocverb.pdf diff --git a/language/japanese/plautopatch/pldocverb.sty b/language/japanese/platex-tools/pldocverb.sty index bd1dcb9c84..c3b7ec7050 100644 --- a/language/japanese/plautopatch/pldocverb.sty +++ b/language/japanese/platex-tools/pldocverb.sty @@ -13,9 +13,9 @@ % %% package declaration -\NeedsTeXFormat{LaTeX2e} +\NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{pldocverb} - [2018/11/25 v0.2 doc package for pLaTeX/upLaTeX] + [2020/10/08 v0.2a doc package for pLaTeX/upLaTeX] \RequirePackage{doc} % doc.sty conditionally requires multicol.sty without passing options \IfFileExists{pxmulticol.sty}{\RequirePackage{pxmulticol}}{} diff --git a/language/japanese/platex-tools/pldocverb.tex b/language/japanese/platex-tools/pldocverb.tex new file mode 100644 index 0000000000..e590f4a67d --- /dev/null +++ b/language/japanese/platex-tools/pldocverb.tex @@ -0,0 +1,54 @@ +%# -*- coding: utf-8 -*- +\ifx\epTeXinputencoding\undefined\else % defined in e-pTeX (> TL2016) + \epTeXinputencoding utf8 % ensure utf-8 encoding for platex +\fi + +\documentclass[a4paper]{jsarticle}% supports \verb in \footnote +\usepackage{doc} +\usepackage{pldocverb} +\GetFileInfo{pldocverb.sty} +\title{Package \textsf{pldocverb} \fileversion} +\author{Hironobu Yamashita} +\date{\filedate} +\begin{document} + +\maketitle + +This package \textsf{pldocverb} provides small patches to +\textsf{doc} package of \textsf{latex(-base)} for use with +Japanese p\LaTeX/up\LaTeX. +Current package supports re-definition of \verb+\verb+ command. + +This package is part of \textsf{platex-tools} bundle: +\begin{verbatim} + https://github.com/aminophen/platex-tools +\end{verbatim} + +\bigskip + +ã“ã®\textsf{pldocverb}パッケージã¯ã€ +\textsf{latex(-base)}ãƒãƒ³ãƒ‰ãƒ«ã®\textsf{doc}パッケージã«ã‚ˆã£ã¦ +上書ãã•ã‚Œã¦ç„¡åŠ¹åŒ–ã•ã‚Œã¦ã—ã¾ã†p\LaTeX/up\LaTeX カーãƒãƒ«ã®ä¿®æ£ç‚¹ã‚’ +å†æœ‰åŠ¹åŒ–ã—ã¾ã™ã€‚具体的ã«ã¯ã€\verb+\verb+コマンドã®ç›´å‰ã« +\verb+\xkanjiskip+挿入を許å¯ã™ã‚‹ãŸã‚ã®ä¿®æ£ã«å¯¾å¿œã—ã¾ã™ã€‚ + +\bigskip +\begin{minipage}{0.6\linewidth} +\noautoxspacing %% on purpose +\begin{verbatim} + \documentclass{jarticle} % if you are using pLaTeX, + \usepackage{pldocverb} % load this! + \usepackage{minijs} + \begin{document} + \setlength{\xkanjiskip}{10pt} + ã“ã‚ŒãŒ\verb+test+ã§\verb+テスト+ã§ã™ã€‚ + \end{document} +\end{verbatim} +\end{minipage} +\begin{minipage}{0.35\linewidth} + \setlength{\xkanjiskip}{10pt} + ã“ã‚ŒãŒ\verb+test+ã§\verb+テスト+ã§ã™ã€‚ +\end{minipage} +\bigskip + +\end{document} diff --git a/language/japanese/platex-tools/plextarray.pdf b/language/japanese/platex-tools/plextarray.pdf Binary files differindex 6ebd30fcee..ebf6a7aa51 100644 --- a/language/japanese/platex-tools/plextarray.pdf +++ b/language/japanese/platex-tools/plextarray.pdf diff --git a/language/japanese/platex-tools/plextarray.sty b/language/japanese/platex-tools/plextarray.sty index a1f3805678..24c8d2ca99 100644 --- a/language/japanese/platex-tools/plextarray.sty +++ b/language/japanese/platex-tools/plextarray.sty @@ -7,9 +7,9 @@ % % This package is expected to be compatible with % * array.sty in latex-tools -% (2016/10/06 v2.4d -- 2019/08/31 v2.4l) +% (2016/10/06 v2.4d -- 2020/10/01 v2.5c) % * plext.sty in platex -% (2001/09/26 v1.2 -- 2019/09/29 v1.2l) +% (2001/09/26 v1.2 -- 2020/10/07 v1.2m) % Largely based on lltjext.sty from LuaTeX-ja project. % diff --git a/language/japanese/platex-tools/plextcolortbl.pdf b/language/japanese/platex-tools/plextcolortbl.pdf Binary files differnew file mode 100644 index 0000000000..10e8857f5e --- /dev/null +++ b/language/japanese/platex-tools/plextcolortbl.pdf diff --git a/language/japanese/plautopatch/plextcolortbl.sty b/language/japanese/platex-tools/plextcolortbl.sty index 4519b99e24..a56a3067cf 100644 --- a/language/japanese/plautopatch/plextcolortbl.sty +++ b/language/japanese/platex-tools/plextcolortbl.sty @@ -9,7 +9,7 @@ % * colortbl.sty % (2012/06/21 v1.0b -- 2020/01/04 v1.0e) % * plext.sty in platex -% (2001/09/26 v1.2 -- 2019/09/29 v1.2l) +% (2001/09/26 v1.2 -- 2020/10/07 v1.2m) % %% package declaration diff --git a/language/japanese/platex-tools/plextcolortbl.tex b/language/japanese/platex-tools/plextcolortbl.tex new file mode 100644 index 0000000000..0cea5c1093 --- /dev/null +++ b/language/japanese/platex-tools/plextcolortbl.tex @@ -0,0 +1,64 @@ +%# -*- coding: utf-8 -*- +\ifx\epTeXinputencoding\undefined\else % defined in e-pTeX (> TL2016) + \epTeXinputencoding utf8 % ensure utf-8 encoding for platex +\fi + +\documentclass[a4paper]{jsarticle} +\usepackage{doc} +\usepackage{colortbl} +\usepackage{plextcolortbl} +\GetFileInfo{plextcolortbl.sty} +\title{Package \textsf{plextcolortbl} \fileversion} +\author{Hironobu Yamashita} +\date{\filedate} +\begin{document} + +\maketitle + +The package \textsf{plextcolortbl} provides a tiny patch to +make \textsf{colortbl} compatible with \textsf{plext}. + +\bigskip + +\textsf{plextcolortbl}パッケージã¯ã€David Carlisleæ°ã«ã‚ˆã‚‹ +\textsf{colortbl}パッケージã¨ã€p\LaTeX ã®æ‹¡å¼µãƒ‘ッケージã§ã‚ã‚‹ +\textsf{plext}パッケージをåŒæ™‚ã«ä½¿ãˆã‚‹ã‚ˆã†ã«ã™ã‚‹ã‚‚ã®ã§ã™ã€‚ + +\section{使ã„ã‹ãŸ} + +\textsf{plext}ã¨\textsf{colortbl}ã‚’å…±å˜ã•ã›ãŸã„ã¨ãã«ã€ãƒ—リアンブル㫠+\verb+\usepackage{plextcolortbl}+ã¨æ›¸ãã¾ã™ã€‚ + +以下ã«ä¾‹ã‚’示ã—ã¾ã™ã€‚ + +\bigskip +\begin{minipage}{0.5\linewidth} +\begin{verbatim} + \documentclass{jsarticle} + %\usepackage{plext} + %\usepackage{colortbl} + \usepackage{plextcolortbl} + \begin{document} + \begin{tabular*}<t>{3cm}{% + @{\extracolsep{\fill}} + >{\columncolor{green}[0pt][20mm]}l + >{\columncolor{yellow}[5mm][0pt]}l + @{}} + one & ã„ã¡ \\ + two & ã« + \end{tabular*} + \end{document} +\end{verbatim} +\end{minipage} +\begin{minipage}{0.4\linewidth} + \begin{tabular*}<t>{3cm}{% + @{\extracolsep{\fill}} + >{\columncolor{green}[0pt][20mm]}l + >{\columncolor{yellow}[5mm][0pt]}l + @{}} + one & ã„ã¡ \\ + two & ã« + \end{tabular*} +\end{minipage} + +\end{document} diff --git a/language/japanese/platex-tools/plextdelarray.pdf b/language/japanese/platex-tools/plextdelarray.pdf Binary files differindex 81ae06afe0..d45927b87d 100644 --- a/language/japanese/platex-tools/plextdelarray.pdf +++ b/language/japanese/platex-tools/plextdelarray.pdf diff --git a/language/japanese/platex-tools/plextdelarray.sty b/language/japanese/platex-tools/plextdelarray.sty index 03008c193e..fff8dbb64c 100644 --- a/language/japanese/platex-tools/plextdelarray.sty +++ b/language/japanese/platex-tools/plextdelarray.sty @@ -9,7 +9,7 @@ % * delarray.sty in latex-tools % (2014/10/28 v1.01) % * plext.sty in platex -% (2001/09/26 v1.2 -- 2019/09/29 v1.2l) +% (2001/09/26 v1.2 -- 2020/10/07 v1.2m) % \NeedsTeXFormat{pLaTeX2e} diff --git a/language/japanese/platex-tools/pxatbegshi.pdf b/language/japanese/platex-tools/pxatbegshi.pdf Binary files differindex 6401ed5cf8..f43e6c22f1 100644 --- a/language/japanese/platex-tools/pxatbegshi.pdf +++ b/language/japanese/platex-tools/pxatbegshi.pdf diff --git a/language/japanese/platex-tools/pxeverysel.pdf b/language/japanese/platex-tools/pxeverysel.pdf Binary files differindex 83ab40a82e..01e9e6e09a 100644 --- a/language/japanese/platex-tools/pxeverysel.pdf +++ b/language/japanese/platex-tools/pxeverysel.pdf diff --git a/language/japanese/platex-tools/pxeveryshi.pdf b/language/japanese/platex-tools/pxeveryshi.pdf Binary files differindex d4538ba42c..35418cd977 100644 --- a/language/japanese/platex-tools/pxeveryshi.pdf +++ b/language/japanese/platex-tools/pxeveryshi.pdf diff --git a/language/japanese/platex-tools/pxftnright.pdf b/language/japanese/platex-tools/pxftnright.pdf Binary files differindex 918d40a324..29ee0a1246 100644 --- a/language/japanese/platex-tools/pxftnright.pdf +++ b/language/japanese/platex-tools/pxftnright.pdf diff --git a/language/japanese/platex-tools/pxmulticol.pdf b/language/japanese/platex-tools/pxmulticol.pdf Binary files differindex a82970574c..50a904177e 100644 --- a/language/japanese/platex-tools/pxmulticol.pdf +++ b/language/japanese/platex-tools/pxmulticol.pdf diff --git a/language/japanese/platex-tools/pxxspace.pdf b/language/japanese/platex-tools/pxxspace.pdf Binary files differindex 8dc7a2a4a8..fb9645aa46 100644 --- a/language/japanese/platex-tools/pxxspace.pdf +++ b/language/japanese/platex-tools/pxxspace.pdf diff --git a/language/japanese/plautopatch/README.md b/language/japanese/plautopatch/README.md index 1063a4b9b4..571e2d364d 100644 --- a/language/japanese/plautopatch/README.md +++ b/language/japanese/plautopatch/README.md @@ -15,13 +15,13 @@ similar to those of ordinary LaTeX ones. The following patches are currently registered: -- doc (latex) -> pldocverb (maintained here!) +- doc (latex) -> pldocverb (platex-tools) - tracefnt (latex) -> ptrace/uptrace (platex/uplatex) - fltrace (latex) -> pfltrace (platex) - array (latex-tools) -> plarray (platex-tools) - array (latex-tools) + plext (platex) -> plextarray (platex-tools) - delarray (latex-tools) + plext (platex) -> plextdelarray (platex-tools) -- colortbl + plext (platex) -> plextcolortbl (maintained here!) +- colortbl + plext (platex) -> plextcolortbl (platex-tools) - arydshln -> plarydshln (maintained here!) - arydshln + plext (platex) -> plextarydshln (maintained here!) - siunitx -> plsiunitx (maintained here!) @@ -32,9 +32,9 @@ The following patches are currently registered: - ftnright (latex-tools) -> pxftnright (platex-tools) - multicol (latex-tools) -> pxmulticol (platex-tools) - xspace (latex-tools) -> pxxspace (platex-tools) -- textpos -> pxtextpos (maintained here!) -- eso-pic -> pxesopic (maintained here!) -- pdfpages -> pxpdfpages (maintained here!) +- textpos -> pxtextpos (gentombow) +- eso-pic -> pxesopic (gentombow) +- pdfpages -> pxpdfpages (gentombow) - stfloats (sttools) -> pxstfloats (pxsttools) - hyperref -> pxjahyper (by Takayuki YATO) - pgfrcs (pgf) -> pxpgfrcs (maintained here!) @@ -52,12 +52,6 @@ together with the main package. All packages are meant for use with pLaTeX/upLaTeX. Short information: -- pldocverb.sty: - Patch for doc.sty (latex) to improve - compatibility with `\verb` redefinition in pLaTeX. -- plextcolortbl.sty: - Patch for colortbl.sty (by David Carlisle) to improve - compatibility with plext.sty in pLaTeX. - plarydshln.sty: Patch for arydshln.sty (by Hiroshi Nakashima) to improve compatibility with pLaTeX kernel. @@ -70,15 +64,6 @@ Short information: - plcollcell.sty: Patch for collcell.sty (by Martin Scharrer) to fix conflict with plarray.sty (platex-tools). -- pxtextpos.sty: - Patch for textpos.sty (by Norman Gray) to support - Japanese-style crop marks (called 'tombow' in Japanese). -- pxesopic.sty: - Patch for eso-pic.sty (by Rolf Niepraschk) to support - Japanese-style crop marks (called 'tombow' in Japanese). -- pxpdfpages.sty: - Patch for pdfpages.sty (by Andreas Matthias) to support - Japanese-style crop marks (called 'tombow' in Japanese). - pxpgfrcs.sty: Patch for pgfrcs.sty (part of PGF) to support Japanese classes for vertical writing. @@ -105,6 +90,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2020-09-27 +2020-10-14 Hironobu Yamashita diff --git a/language/japanese/plautopatch/plautopatch-ja.pdf b/language/japanese/plautopatch/plautopatch-ja.pdf Binary files differindex 418ebd8b87..366bcf438f 100644 --- a/language/japanese/plautopatch/plautopatch-ja.pdf +++ b/language/japanese/plautopatch/plautopatch-ja.pdf diff --git a/language/japanese/plautopatch/plautopatch-ja.tex b/language/japanese/plautopatch/plautopatch-ja.tex index acdb3f5e39..5913374333 100644 --- a/language/japanese/plautopatch/plautopatch-ja.tex +++ b/language/japanese/plautopatch/plautopatch-ja.tex @@ -5,6 +5,9 @@ \documentclass[a4paper]{jsarticle} \usepackage{doc} +\xspcode"5C=3 % \ +\xspcode"3C=3 % < +\xspcode"3E=3 % > \usepackage{plautopatch}% load this here to make \GetFileInfo work \GetFileInfo{plautopatch.sty} \title{Package \textsf{plautopatch} \fileversion} @@ -35,7 +38,11 @@ p\LaTeX/up\LaTeX{}ã§å‹•ä½œã™ã‚‹ã‚½ãƒ¼ã‚¹ã¨é€šå¸¸ã®\LaTeX{}ソース㮠\section*{動作æ¡ä»¶} -ã“ã®ãƒ‘ッケージ㯠+\LaTeXe~2020-10-01以é™ã®å ´åˆã¯ã€ +カーãƒãƒ«ãŒæä¾›ã™ã‚‹ãƒ•ãƒƒã‚¯ã‚·ã‚¹ãƒ†ãƒ ã® +\verb+\AddToHook{package/before/...}+åŠã³ +\verb+\AddToHook{package/after/...}+を利用ã—ã¾ã™ã€‚ +\LaTeXe{}ãŒå¤ã„å ´åˆã¯ã€ \textsf{filehook}パッケージ(Martin Scharreræ°ã®ä½œï¼‰ã«ä¾å˜ã—ã¾ã™ã€‚ \section*{使ã„æ–¹} @@ -79,6 +86,9 @@ p\LaTeX/up\LaTeX{}ã§å‹•ä½œã™ã‚‹ã‚½ãƒ¼ã‚¹ã¨é€šå¸¸ã®\LaTeX{}ソース㮠\def\ITEMoTx#1 (#2) -> #3 {% \item \textsf{#1} (\textsf{#2})\\ $\rightarrow$ \textsf{#3} } +\def\ITEMxTo#1 -> #2 (#3){% + \item \textsf{#1}\\ + $\rightarrow$ \textsf{#2} (\textsf{#3})} \def\ITEMxTx#1 -> #2 {% \item \textsf{#1}\\ $\rightarrow$ \textsf{#2} } @@ -101,13 +111,13 @@ p\LaTeX/up\LaTeX{}ã§å‹•ä½œã™ã‚‹ã‚½ãƒ¼ã‚¹ã¨é€šå¸¸ã®\LaTeX{}ソース㮠ç¾åœ¨ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ (\filedate\space\fileversion) ãŒã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã‚‹ã®ã¯ 下記ã®ãƒ‘ッケージã§ã™ã€‚ \begin{itemize} -\ITEMoTo doc (latex) -> pldocverb (maintained here!) +\ITEMoTo doc (latex) -> pldocverb (platex-tools) \ITEMoTo tracefnt (latex) -> ptrace/uptrace (platex/uplatex) \ITEMoTo fltrace (latex) -> pfltrace (platex) \ITEMoTo array (latex-tools) -> plarray (platex-tools) \ITEMooTo array (latex-tools) + plext (platex) -> plextarray (platex-tools) \ITEMooTo delarray (latex-tools) + plext (platex) -> plextdelarray (platex-tools) -\ITEMxoTx colortbl + plext (platex) -> plextcolortbl (maintained here!) +\ITEMxoTo colortbl + plext (platex) -> plextcolortbl (platex-tools) \ITEMxTx arydshln -> plarydshln (maintained here!) \ITEMxoTx arydshln + plext (platex) -> plextarydshln (maintained here!) \ITEMxTx siunitx -> plsiunitx (maintained here!) @@ -118,9 +128,9 @@ p\LaTeX/up\LaTeX{}ã§å‹•ä½œã™ã‚‹ã‚½ãƒ¼ã‚¹ã¨é€šå¸¸ã®\LaTeX{}ソース㮠\ITEMoTo ftnright (latex-tools) -> pxftnright (platex-tools) \ITEMoTo multicol (latex-tools) -> pxmulticol (platex-tools) \ITEMoTo xspace (latex-tools) -> pxxspace (platex-tools) -\ITEMxTx textpos -> pxtextpos (maintained here!) -\ITEMxTx eso-pic -> pxesopic (maintained here!) -\ITEMxTx pdfpages -> pxpdfpages (maintained here!) +\ITEMxTo textpos -> pxtextpos (gentombow) +\ITEMxTo eso-pic -> pxesopic (gentombow) +\ITEMxTo pdfpages -> pxpdfpages (gentombow) \ITEMoTo stfloats (sttools) -> pxstfloats (pxsttools) \ITEMxTx hyperref -> pxjahyper (by Takayuki YATO) \ITEMoTx pgfrcs (pgf) -> pxpgfrcs (maintained here!) @@ -162,6 +172,7 @@ p\LaTeX/up\LaTeX{}ã§å‹•ä½œã™ã‚‹ã‚½ãƒ¼ã‚¹ã¨é€šå¸¸ã®\LaTeX{}ソース㮠\item 2020/09/13 v0.9h \LaTeXe~2020-10-01ã§ã¯\textsf{filehook}éžä¾å˜ã« \item 2020/09/25 v0.9i \textsf{pxeveryshi}ã¨\textsf{pxatbegshi}ã‚’ä¸è¦ã« \item 2020/09/27 v0.9j \textsf{eso-pic}ã®ã‚µãƒãƒ¼ãƒˆï¼ˆè¦\LaTeXe~2020-10-01) + \item 2020/10/14 v0.9k トンボ関連パッãƒã‚’\textsf{gentombow}ã¸ç§»å‹• \end{itemize} \end{document} diff --git a/language/japanese/plautopatch/plautopatch.pdf b/language/japanese/plautopatch/plautopatch.pdf Binary files differindex 44aefb55a5..95ac396841 100644 --- a/language/japanese/plautopatch/plautopatch.pdf +++ b/language/japanese/plautopatch/plautopatch.pdf diff --git a/language/japanese/plautopatch/plautopatch.sty b/language/japanese/plautopatch/plautopatch.sty index f77c4e0b8a..5fd92ce617 100644 --- a/language/japanese/plautopatch/plautopatch.sty +++ b/language/japanese/plautopatch/plautopatch.sty @@ -8,10 +8,10 @@ \NeedsTeXFormat{LaTeX2e}% not pLaTeX2e on purpose! \ProvidesPackage{plautopatch} - [2020/09/27 v0.9j Automated patches for pLaTeX/upLaTeX] + [2020/10/14 v0.9k Automated patches for pLaTeX/upLaTeX] \ifx\pfmtname\@undefined - \PackageWarningNoLine{plautopatch}{% + \PackageInfo{plautopatch}{% This package is meant for pLaTeX/upLaTeX,\MessageBreak you will not need it.} \expandafter\endinput @@ -195,7 +195,7 @@ % register patches -\platpc@patch@after{doc}{pldocverb}% (maintained here!) +\platpc@patch@after{doc}{pldocverb}% platex-tools \ifx\enablecjktoken\@undefined \platpc@patch@after{tracefnt}{ptrace}% platex \else @@ -205,7 +205,7 @@ \platpc@patch@after{array}{plarray}% platex-tools \platpc@patch@after@both{array}{plext}{plextarray}% platex-tools \platpc@patch@after@both{delarray}{plext}{plextdelarray}% platex-tools -\platpc@patch@after@both{colortbl}{plext}{plextcolortbl}% (maintained here!) +\platpc@patch@after@both{colortbl}{plext}{plextcolortbl}% platex-tools \platpc@patch@after{arydshln}{plarydshln}% (maintained here!) \platpc@patch@after@both{arydshln}{plext}{plextarydshln}% (maintained here!) \platpc@patch@after{siunitx}{plsiunitx}% (maintained here!) @@ -226,19 +226,20 @@ \platpc@patch@before{ftnright}{pxftnright}% platex-tools \platpc@patch@after{multicol}{pxmulticol}% platex-tools \platpc@patch@after{xspace}{pxxspace}% platex-tools -\platpc@patch@after{textpos}{pxtextpos}% (maintained here!) +\platpc@patch@after{textpos}{pxtextpos}% gentombow % --- until LaTeX2e 2020-10-01, patching eso-pic automatically % --- is not supported by pxesopic \@ifl@t@r{\fmtversion}{2020/10/01}% - {\platpc@patch@before{eso-pic}{pxesopic}}{}% (maintained here!) -\platpc@patch@after{pdfpages}{pxpdfpages}% (maintained here!) + {\platpc@patch@before{eso-pic}{pxesopic}}{}% gentombow +\platpc@patch@after{pdfpages}{pxpdfpages}% gentombow \platpc@patch@before{stfloats}{pxstfloats}% pxsttools -- (!!) % --- in most cases, pxjahyper works without explicit options % --- however, in case a user specifies some, delay it % --- [TODO] if \AtBeginDocument{\usepackage{hyperref}} appears, % ---- writing to \jobname.out (= 'jacommentline' feature) % ---- does not work because it's too late. -\AtBeginDocument{\platpc@patch@after{hyperref}{pxjahyper}} +\AtBeginDocument + {\platpc@patch@after{hyperref}{pxjahyper}}% by Takayuki YATO (ZR) % for TikZ/PGF \platpc@patch@after{pgfrcs}{pxpgfrcs}% (maintained here!) diff --git a/language/japanese/plautopatch/plautopatch.tex b/language/japanese/plautopatch/plautopatch.tex index b0e3cda4a5..7e7497f81a 100644 --- a/language/japanese/plautopatch/plautopatch.tex +++ b/language/japanese/plautopatch/plautopatch.tex @@ -3,8 +3,11 @@ \epTeXinputencoding utf8 % ensure utf-8 encoding for platex \fi -\documentclass[a4paper]{jsarticle} +\documentclass[a4paper,english]{jsarticle} \usepackage{doc} +\xspcode"5C=3 % \ +\xspcode"3C=3 % < +\xspcode"3E=3 % > \usepackage{plautopatch}% load this here to make \GetFileInfo work \GetFileInfo{plautopatch.sty} \title{Package \textsf{plautopatch} \fileversion} @@ -34,8 +37,12 @@ The package is maintained on GitHub: \section*{Requirements} -This package depends on \textsf{filehook} package, -written by Martin Scharrer. +If \LaTeXe~2020-10-01 or newer is running, +this package uses the new hook system such as +\verb+\AddToHook{package/before/...}+ and +\verb+\AddToHook{package/after/...}+. +If \LaTeXe\ is older than that, this package depends on +\textsf{filehook} package (written by Martin Scharrer). \section*{Usage} @@ -79,6 +86,9 @@ as a list separated by commas and spaces. \def\ITEMoTx#1 (#2) -> #3 {% \item \textsf{#1} (\textsf{#2})\\ $\rightarrow$ \textsf{#3} } +\def\ITEMxTo#1 -> #2 (#3){% + \item \textsf{#1}\\ + $\rightarrow$ \textsf{#2} (\textsf{#3})} \def\ITEMxTx#1 -> #2 {% \item \textsf{#1}\\ $\rightarrow$ \textsf{#2} } @@ -100,13 +110,13 @@ The legend: Current version (\filedate\space\fileversion) supports the followings: \begin{itemize} -\ITEMoTo doc (latex) -> pldocverb (maintained here!) +\ITEMoTo doc (latex) -> pldocverb (platex-tools) \ITEMoTo tracefnt (latex) -> ptrace/uptrace (platex/uplatex) \ITEMoTo fltrace (latex) -> pfltrace (platex) \ITEMoTo array (latex-tools) -> plarray (platex-tools) \ITEMooTo array (latex-tools) + plext (platex) -> plextarray (platex-tools) \ITEMooTo delarray (latex-tools) + plext (platex) -> plextdelarray (platex-tools) -\ITEMxoTx colortbl + plext (platex) -> plextcolortbl (maintained here!) +\ITEMxoTo colortbl + plext (platex) -> plextcolortbl (platex-tools) \ITEMxTx arydshln -> plarydshln (maintained here!) \ITEMxoTx arydshln + plext (platex) -> plextarydshln (maintained here!) \ITEMxTx siunitx -> plsiunitx (maintained here!) @@ -117,9 +127,9 @@ Current version (\filedate\space\fileversion) supports the followings: \ITEMoTo ftnright (latex-tools) -> pxftnright (platex-tools) \ITEMoTo multicol (latex-tools) -> pxmulticol (platex-tools) \ITEMoTo xspace (latex-tools) -> pxxspace (platex-tools) -\ITEMxTx textpos -> pxtextpos (maintained here!) -\ITEMxTx eso-pic -> pxesopic (maintained here!) -\ITEMxTx pdfpages -> pxpdfpages (maintained here!) +\ITEMxTo textpos -> pxtextpos (gentombow) +\ITEMxTo eso-pic -> pxesopic (gentombow) +\ITEMxTo pdfpages -> pxpdfpages (gentombow) \ITEMoTo stfloats (sttools) -> pxstfloats (pxsttools) \ITEMxTx hyperref -> pxjahyper (by Takayuki YATO) \ITEMoTx pgfrcs (pgf) -> pxpgfrcs (maintained here!) @@ -164,6 +174,7 @@ a comma-separated list of them: \item 2020/09/13 v0.9h No dependency for \textsf{filehook} on \LaTeXe~2020-10-01 \item 2020/09/25 v0.9i Do not require \textsf{pxeveryshi} and \textsf{pxatbegshi} \item 2020/09/27 v0.9j Add support for \textsf{eso-pic} (\LaTeXe~2020-10-01 required) + \item 2020/10/14 v0.9k Move tombow-related patches to \textsf{gentombow} \end{itemize} \end{document} diff --git a/language/japanese/plautopatch/plextarydshln.sty b/language/japanese/plautopatch/plextarydshln.sty index 2ccdc865ed..89a019e639 100644 --- a/language/japanese/plautopatch/plextarydshln.sty +++ b/language/japanese/plautopatch/plextarydshln.sty @@ -9,7 +9,7 @@ % * arydshln.sty % (2004/08/31 v1.71 -- 2019/02/21 v1.76) % * plext.sty in platex -% (2001/09/26 v1.2 -- 2019/09/29 v1.2l) +% (2001/09/26 v1.2 -- 2020/10/07 v1.2m) % %% package declaration diff --git a/language/japanese/plautopatch/pxpdfpages.sty b/language/japanese/plautopatch/pxpdfpages.sty deleted file mode 100644 index 36b796cf28..0000000000 --- a/language/japanese/plautopatch/pxpdfpages.sty +++ /dev/null @@ -1,51 +0,0 @@ -% -% pxpdfpages.sty -% written by Hironobu Yamashita (@aminophen) -% -% This package is part of the plautopatch bundle. -% https://github.com/aminophen/plautopatch -% -% This package is expected to be compatible with -% * pdfpages.sty -% (2015/07/19 v0.5a -- 2020/01/28 v0.5q) -% * plcore.ltx in platex -% (2001/09/26 v1.2a -- 2020/03/05 v1.3e) -% - -%% package declaration -\NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{pxpdfpages} - [2018/08/20 v0.1 Patch to pdfpages for (u)pLaTeX] - -%% preparations -\def\pxpdpg@pkgname{pxpdfpages} -\def\pxpdpg@warn{\PackageWarningNoLine\pxpdpg@pkgname} -\def\pxpdpg@info{\PackageInfo\pxpdpg@pkgname} - -%% load it -\RequirePackageWithOptions{pdfpages} -\RequirePackage{pxatbegshi}% pdfpages requires atbegshi - -%% patch internal for pdfpages to work with tombow -%% Note: this code should be copied to gentombow.sty! -\def\pxpdpg@patch@pdfpages{% - \RequirePackage{etoolbox} - \patchcmd{\AM@output}{% - \setlength{\@tempdima}{\AM@xmargin}% - \edef\AM@xmargin{\the\@tempdima}% - \setlength{\@tempdima}{\AM@ymargin}% - \edef\AM@ymargin{\the\@tempdima}% - }{% - \setlength{\@tempdima}{\AM@xmargin\iftombow+1in\fi}% - \edef\AM@xmargin{\the\@tempdima}% - \setlength{\@tempdima}{\AM@ymargin\iftombow-1in\fi}% - \edef\AM@ymargin{\the\@tempdima}% - } - {\pxpdpg@info{Patch for pdfpages applied}} - {\pxpdpg@warn{Patch for pdfpages failed}}% - } -\AtBeginDocument{\@ifpackageloaded{pdfpages}{\pxpdpg@patch@pdfpages}{}} - -%% all done - -\endinput diff --git a/language/japanese/plautopatch/pxpgfrcs.sty b/language/japanese/plautopatch/pxpgfrcs.sty index b5508dcf47..a151a19437 100644 --- a/language/japanese/plautopatch/pxpgfrcs.sty +++ b/language/japanese/plautopatch/pxpgfrcs.sty @@ -9,8 +9,15 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{pxpgfrcs} - [2018/09/21 v0.1 shadings etc in tate class] -\RequirePackage{pgfrcs} + [2020/10/10 v0.2 shadings etc in tate class] +\RequirePackage{pgfrcs}% pgfutil-latex.def requires everyshi +\ifx\@EveryShipout@Output\@undefined + % LaTeX2e 2020-10-01: an emulation by ``everyshi-ltx.sty'' + % => pLaTeX2e 2020-10-01 natively supports it +\else + % older: the real ``everyshi.sty'' is loaded + \IfFileExists{pxeveryshi.sty}{\RequirePackage{pxeveryshi}}{} +\fi % Note: I chose the name "pxpgfrcs.sty" % (instead of "pgfutil-platex.def") because @@ -20,7 +27,6 @@ % such an interface like \input pgfutil-platex.def. % patch pgfutil-latex.def -\RequirePackage{pxeveryshi}% pgfutil-latex.def requires everyshi \def\pgfutil@insertatbegincurrentpagefrombox#1{% \edef\pgf@temp{\the\wd\pgfutil@abb}% \global\setbox\pgfutil@abb\hbox{% diff --git a/language/japanese/pxjahyper/README-ja.md b/language/japanese/pxjahyper/README-ja.md index bacc24b43f..f9126c84ed 100644 --- a/language/japanese/pxjahyper/README-ja.md +++ b/language/japanese/pxjahyper/README-ja.md @@ -49,12 +49,11 @@ pxjahyper-enc パッケージ ー æ–‡å—コードè¨å®š ### パッケージオプション -※オプション無ã—ã§ã®èªè¾¼ãŒæœ›ã¾ã—ã„。一応グãƒãƒ¼ãƒãƒ«ã®ãƒ‰ãƒ©ã‚¤ãƒã‚ªãƒ—ション -ã«åå¿œã™ã‚‹ãŒã€ã“ã‚Œã«ã¤ã„ã¦ã‚‚「ドライãƒæŒ‡å®šãŒ dvipdfmx ã§ã‚ã‚‹å ´åˆã«ã®ã¿ -èªã¿è¾¼ã‚€ã€ã®ãŒæœ›ã¾ã—ã„。 +※オプション無ã—ã§ã®èªè¾¼ãŒæœ›ã¾ã—ã„ãŒã€ä¸€å¿œã‚°ãƒãƒ¼ãƒãƒ«ã®ãƒ‰ãƒ©ã‚¤ãƒã‚ªãƒ—ション +ã«åå¿œã™ã‚‹ã‚ˆã†ã«ã—ã¦ã„る。 - * ドライãƒã‚ªãƒ—ション:`dvipdfmx`/`dvips`/`nodvidriver` ãŒã‚ã‚Šã€`dvips` - ã¯ã‚¨ãƒ©ãƒ¼ã«ãªã‚Šã€`nodvidriver` ã¯ãƒ‘ッケージã®æ©Ÿèƒ½ã‚’無効化ã™ã‚‹ã€‚ + * ドライãƒã‚ªãƒ—ション:`dvipdfmx`/`dvips`/`nodvidriver` ãŒã‚り〠+ `dvipdfmx` 以外を指定ã—ãŸå ´åˆã¯ãƒ‘ッケージã®æ©Ÿèƒ½ã‚’無効化ã™ã‚‹ã€‚ ### 機能 @@ -71,6 +70,9 @@ pxjahyper-enc パッケージ ー æ–‡å—コードè¨å®š æ›´æ–°å±¥æ´ -------- + * Version 0.6a 〈2020/10/10〉 + - pxjahyper-enc:`dvips` 指定時ã¯ã‚¨ãƒ©ãƒ¼ã§ãªãè¦å‘Šã‚’出ã™ã€‚ + * Version 0.6 〈2020/10/05〉 - pxjahyper-enc ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’è¿½åŠ ã—ãŸã€‚ - `otfmacros` オプションを既定ã§æœ‰åŠ¹ã«ã™ã‚‹ã€‚ diff --git a/language/japanese/pxjahyper/README.md b/language/japanese/pxjahyper/README.md index c7201e43d6..476d97749e 100644 --- a/language/japanese/pxjahyper/README.md +++ b/language/japanese/pxjahyper/README.md @@ -52,6 +52,7 @@ the PDF strings in the output DVI file. Revision History ---------------- + * Version 0.6a 〈2020/10/10〉 * Version 0.6 〈2020/10/05〉 * Version 0.5b 〈2020/10/04〉 * Version 0.5a 〈2020/09/27〉 diff --git a/language/japanese/pxjahyper/pxjahyper-ajm.def b/language/japanese/pxjahyper/pxjahyper-ajm.def index a8897d9c5c..b4b00f5d79 100644 --- a/language/japanese/pxjahyper/pxjahyper-ajm.def +++ b/language/japanese/pxjahyper/pxjahyper-ajm.def @@ -11,7 +11,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesFile{pxjahyper-ajm.def}[2020/10/04 v0.5b] +\ProvidesFile{pxjahyper-ajm.def}[2020/10/10 v0.6] %% avoid multiple loading \csname pxjahyperajmLoaded\endcsname diff --git a/language/japanese/pxjahyper/pxjahyper-enc.sty b/language/japanese/pxjahyper/pxjahyper-enc.sty index 51468dc23c..3b9583a766 100644 --- a/language/japanese/pxjahyper/pxjahyper-enc.sty +++ b/language/japanese/pxjahyper/pxjahyper-enc.sty @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{pxjahyper-enc}[2020/10/05 v0.6-pre] +\ProvidesPackage{pxjahyper-enc}[2020/10/10 v0.6a] \def\pxhe@pkgname{pxjahyper-enc} \providecommand{\bxDebug}[1]{} @@ -61,10 +61,9 @@ %% check \ifx d\pxhe@driver\else - \ifx 0\pxhe@driver\else - \PackageError\pxhe@pkgname - {Bad driver option} - {Package loading is aborted right now.} + \ifx s\pxhe@driver + \PackageWarningNoLine\pxhe@pkgname + {Unsupported driver (dvips)} \fi \let\pxhe@begin@dvi@hook\@gobble \expandafter\endinput\fi\relax diff --git a/language/japanese/pxjahyper/pxjahyper.sty b/language/japanese/pxjahyper/pxjahyper.sty index 0a79f7fe03..9a89a338ef 100644 --- a/language/japanese/pxjahyper/pxjahyper.sty +++ b/language/japanese/pxjahyper/pxjahyper.sty @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{pxjahyper}[2020/10/05 v0.6-pre] +\ProvidesPackage{pxjahyper}[2020/10/10 v0.6a] %% error messages \def\pxhy@pkgname{pxjahyper} @@ -250,13 +250,6 @@ pxhy@driver = \the\pxhy@driver^^J% \def\pxhy@end{\pxhy@end@} \let\pxhy@mk\indent % unexpandable -%% \pxhy@out@special{<text>} -\def\pxhy@out@special#1{% - \edef\pxhy@tmpa{% - \noexpand\pxhy@begin@dvi@enc@hook{\special{#1}}% - }\pxhy@tmpa -} - %% \pxhy@begin@dvi@hook{<text>} %% \pxhy@begin@dvi@enc@hook{<text>} \ifpxhy@new@hook@system @@ -264,19 +257,8 @@ pxhy@driver = \the\pxhy@driver^^J% \AddToHook{shipout/firstpage}{#1}% } \DeclareHookRule{shipout/firstpage}{.}{>}{hyperref} - \def\pxhy@begin@dvi@enc@hook#1{% only once - \AddToHook{shipout/firstpage}[./enc]{#1}% - \DeclareHookRule{shipout/firstpage}{./enc}{<}{hyperref}% - } \else \RequirePackage{atbegshi}[2011/10/05]% v1.16 -\def\pxhy@begin@dvi@enc@hook#1{% - \begingroup - \toks\z@{#1}% - \toks\tw@\expandafter{\AtBegShi@HookFirst}% - \xdef\AtBegShi@HookFirst{\the\toks@\the\toks\tw@}% - \endgroup -} \def\pxhy@begin@dvi@hook#1{% \AtBeginShipoutFirst{#1}% } @@ -331,20 +313,8 @@ pxhy@driver = \the\pxhy@driver^^J% \ifnum\pxhy@driver=\pxhy@driver@dvipdfmx %<*dvipdfmx> %% dvipdfmx - \IfFileExists{pxjahyper-enc.sty}{% FIXME: TRANSIENT CODE \RequirePackage{pxjahyper-enc}[]% \ifpxhy@bigcode\else \suppressbigcode \fi - }{%else - \if e\pxhy@jcode % euc - \pxhy@out@special{pdf:tounicode EUC-UCS2} - \else\if s\pxhy@jcode % sjis - \pxhy@out@special{pdf:tounicode 90ms-RKSJ-UCS2} - \else\ifpxhy@bigcode % ucs, bigcode - \pxhy@out@special{pdf:tounicode UTF8-UTF16} - \else - \pxhy@out@special{pdf:tounicode UTF8-UCS2} - \fi\fi\fi - }% \fi %</dvipdfmx> \fi diff --git a/language/japanese/pxjahyper/pxjahyper.tex b/language/japanese/pxjahyper/pxjahyper.tex index c903300952..87b782970b 100644 --- a/language/japanese/pxjahyper/pxjahyper.tex +++ b/language/japanese/pxjahyper/pxjahyper.tex @@ -6,8 +6,8 @@ \MakeShortVerb{\|} \usepackage{bxtexlogo} \bxtexlogoimport{*} -\newcommand{\PkgVersion}{0.6} -\newcommand{\PkgDate}{2020/10/05} +\newcommand{\PkgVersion}{0.6a} +\newcommand{\PkgDate}{2020/10/10} \newcommand{\Pkg}[1]{\textsf{#1}} \newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$} \newcommand{\Note}{\par\noindent ※} diff --git a/macros/latex/contrib/babel-contrib/russian/README b/macros/latex/contrib/babel-contrib/russian/README index 46fe0449e7..fb47e71ebd 100644 --- a/macros/latex/contrib/babel-contrib/russian/README +++ b/macros/latex/contrib/babel-contrib/russian/README @@ -1,6 +1,6 @@ ---------------------------------------------------------------- -Russian language module for Babel, v1.3k +Russian language module for Babel, v1.3l Released under the LaTeX Project Public License v1.3c or later. See http://www.latex-project.org/lppl.txt @@ -108,6 +108,11 @@ might be absent. 5. CHANGES +2020-10-16 version 1.3l + + * Patches for Russian language from hyperref package to babel-russian module + (thanks to Ulrike Fischer). + 2020-09-06 version 1.3k * Bug fixed in definition of \Russian command (thanks to Javier Bezos). diff --git a/macros/latex/contrib/babel-contrib/russian/russianb.dtx b/macros/latex/contrib/babel-contrib/russian/russianb.dtx index cf89bcd118..33c24a06f5 100644 --- a/macros/latex/contrib/babel-contrib/russian/russianb.dtx +++ b/macros/latex/contrib/babel-contrib/russian/russianb.dtx @@ -7,7 +7,7 @@ %<*readme> ---------------------------------------------------------------- -Russian language module for Babel, v1.3k +Russian language module for Babel, v1.3l Released under the LaTeX Project Public License v1.3c or later. See http://www.latex-project.org/lppl.txt @@ -119,6 +119,11 @@ might be absent. 5. CHANGES +2020-10-16 version 1.3l + + * Patches for Russian language from hyperref package to babel-russian module + (thanks to Ulrike Fischer). + 2020-09-06 version 1.3k * Bug fixed in definition of \Russian command (thanks to Javier Bezos). @@ -267,7 +272,7 @@ and the derived files russianb.ins, %</internal> %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{russianb.ldf}[2020/09/09 1.3k Russian support for the Babel system] +\ProvidesFile{russianb.ldf}[2020/10/16 1.3l Russian support for the Babel system] %</code> %<*driver> \documentclass[a4paper]{ltxdoc} @@ -281,16 +286,10 @@ and the derived files russianb.ins, \ifnum 0\ifxetex 1\fi\ifluatex 1\fi>0 \usepackage{fontspec} \defaultfontfeatures{Ligatures={TeX}} - \setmainfont{CMU Serif} - %\setmainfont{STIX Two}[ - % UprightFont={* Math}, - % %UprightFont={* Text}, - % ItalicFont={* Text Italic}, - % BoldFont={* Text Bold}, - % BoldItalicFont={* Text Bold Italic}, - %] - %\setsansfont{CMU Sans Serif} - %\setmonofont{CMU Typewriter Text} + \setmainfont{cmunrm.otf}%{CMU Serif} + %\setmainfont{STIX Two Text} + \setsansfont{cmunss.otf}%{CMU Sans Serif} + \setmonofont{cmuntt.otf}%{CMU Typewriter Text} %%\setmonofont[Scale=MatchLowercase]{Courier New} %%\setmonofont[Scale=MatchUppercase]{Courier New} %%\setmonofont{Courier New} @@ -909,7 +908,8 @@ and the derived files russianb.ins, % % \section{Implementation} % -% \changes{1.3k}{2020/09/06}{bug in definition of \cs{Russian} fixed} +% \changes{1.3l}{2020/10/16}{Added support to hyperref package} +% \changes{1.3k}{2020/09/06}{Bug in definition of \cs{Russian} fixed} % \changes{1.3h}{2016/02/18}{\cs{cyrdash} is redefined} % \changes{1.3h}{2016/02/18}{Bugs fixed in captions for revtex4 and revtex4-1} % \changes{1.3g}{2015/05/01}{Added support for revtex4 and revtex4-1 classes} @@ -1363,12 +1363,16 @@ and the derived files russianb.ins, % which indicates explicitly breakpoint for hyphenation in a word. Meaning % of these shorthands is explained in table~\ref{tab:russian-quote}. % +% Some of this definitions need a alternative definitions for the booksmarks. +% \changes{1.3l}{2020/10/16}{Modified shorthands} % \begin{macrocode} +\providecommand\texorpdfstring[2]{#1} \declare@shorthand{russian}{""}{\hskip\z@skip} -\declare@shorthand{russian}{"~}{\textormath{\leavevmode\hbox{-}}{-}} +\declare@shorthand{russian}{"~}{\texorpdfstring{\textormath{\leavevmode\hbox{-}}{-}}{-}} \declare@shorthand{russian}{"=}{\nobreak-\hskip\z@skip} \declare@shorthand{russian}{"|}{% - \textormath{\nobreak\discretionary{-}{}{\kern.03em}\allowhyphens}{}} + \texorpdfstring{% + \textormath{\nobreak\discretionary{-}{}{\kern.03em}\allowhyphens}{}}{}} % \end{macrocode} % % \subsubsection{Emdash, endash and hyphenation sign} @@ -1378,12 +1382,13 @@ and the derived files russianb.ins, % If it is, we output an emdash, otherwise a hyphen sign. Therefor % \TeX\ looks for the next token after the first `|-|', writes % its meaning to |\russian@sh@next| and finally call for |\russian@sh@tmp|. +% \changes{1.3l}{2020/10/16}{Modified shorthands} % \begin{macrocode} \declare@shorthand{russian}{"-}{% - \def\russian@sh@tmp{% + \texorpdfstring{\def\russian@sh@tmp{% \if\russian@sh@next-\expandafter\russian@sh@emdash \else\expandafter\russian@sh@hyphen\fi}% - \futurelet\russian@sh@next\russian@sh@tmp} + \futurelet\russian@sh@next\russian@sh@tmp}{-}} % \end{macrocode} % Two macros |\russian@sh@hyphen| and |\russian@sh@emdash| called by % |\russian@sh@tmp| are defined below. The second of @@ -1406,7 +1411,7 @@ and the derived files russianb.ins, \errmessage{Wrong usage of cdash}\fi\fi\fi} % \end{macrocode} % -% All these 3 internal macros call for |\cyrdash|, which type Cyrillic +% All these 3 internal macros call for |\cyrdash|, which types Cyrillic % emdash, but put different spaces around the dash. % % |\@Acdash| is invoked by |"---|. It types Cyrillic emdash to be used @@ -2179,7 +2184,7 @@ and the derived files russianb.ins, %\iffalse %</code> %\fi -%\CheckSum{2353} +%\CheckSum{2358} %\Finale % %% diff --git a/macros/latex/contrib/babel-contrib/russian/russianb.pdf b/macros/latex/contrib/babel-contrib/russian/russianb.pdf Binary files differindex ac043c91cf..791989648b 100644 --- a/macros/latex/contrib/babel-contrib/russian/russianb.pdf +++ b/macros/latex/contrib/babel-contrib/russian/russianb.pdf diff --git a/macros/latex/contrib/babel-contrib/ukrainian/README.md b/macros/latex/contrib/babel-contrib/ukrainian/README.md index bdeb5018d7..ed2832dc1d 100644 --- a/macros/latex/contrib/babel-contrib/ukrainian/README.md +++ b/macros/latex/contrib/babel-contrib/ukrainian/README.md @@ -1,6 +1,6 @@ ---------------------------------------------------------------- -Ukrainian language module for Babel, v1.4c +Ukrainian language module for Babel, v1.4e Released under the LaTeX Project Public License v1.3c or later. See http://www.latex-project.org/lppl.txt @@ -15,7 +15,7 @@ The current maintainer is Sergiy Ponomarenko <sergiy.ponomarenko@gmail.com>. 1. INSTALLATION - unpack babel-ukrainian.zip -- run "xelatex.exe ukraineb.dtx" (recommended) +- run "lualatex.exe ukraineb.dtx" (recommended) or "pdflatex.exe ukraineb.dtx"; run "tex.exe ukraineb.dtx" or "tex.exe ukraineb.ins", if you don't need documentation @@ -81,6 +81,9 @@ files as they might have stored incompatible internal encodings. 5. CHANGES +2020-10-13 version 1.4e + * Preventing a problem with duplicate math operators in russian.ldf. + 2020-10-13 version 1.4d * Added support for pdfstings. diff --git a/macros/latex/contrib/babel-contrib/ukrainian/ukraineb.dtx b/macros/latex/contrib/babel-contrib/ukrainian/ukraineb.dtx index f99ce29dbb..8d1ef19714 100644 --- a/macros/latex/contrib/babel-contrib/ukrainian/ukraineb.dtx +++ b/macros/latex/contrib/babel-contrib/ukrainian/ukraineb.dtx @@ -6,7 +6,7 @@ %<*readme> ---------------------------------------------------------------- -Ukrainian language module for Babel, v1.4c +Ukrainian language module for Babel, v1.4e Released under the LaTeX Project Public License v1.3c or later. See http://www.latex-project.org/lppl.txt @@ -22,7 +22,7 @@ The current maintainer is Sergiy Ponomarenko <sergiy.ponomarenko@gmail.com>. 1. INSTALLATION - unpack babel-ukrainian.zip -- run "xelatex.exe ukraineb.dtx" (recommended) +- run "lualatex.exe ukraineb.dtx" (recommended) or "pdflatex.exe ukraineb.dtx"; run "tex.exe ukraineb.dtx" or "tex.exe ukraineb.ins", if you don't need documentation @@ -90,6 +90,9 @@ files as they might have stored incompatible internal encodings. 5. CHANGES +2020-10-13 version 1.4e + * Preventing a problem with duplicate math operators in russian.ldf. + 2020-10-13 version 1.4d * Added support for pdfstings. @@ -200,8 +203,8 @@ and the derived files ukraineb.ins, %</internal> %<*code> \NeedsTeXFormat{LaTeX2e} -%\ProvidesLanguage{\jobname}[2020/10/13 1.4d Ukrainian support for the Babel system] -\ProvidesFile{ukraineb.ldf}[2020/10/13 1.4d Ukrainian support for the Babel system] +%\ProvidesLanguage{\jobname}[2020/10/14 1.4e Ukrainian support for the Babel system] +\ProvidesFile{ukraineb.ldf}[2020/10/14 1.4e Ukrainian support for the Babel system] %</code> %<*driver> \documentclass[a4paper]{ltxdoc} @@ -1009,29 +1012,7 @@ and the derived files ukraineb.ins, % well enough to Ukrainian version of Windows ANSI encoding which is almost % equivalent to \texttt{cp1251}. % -% \begin{macrocode} -\@ifpackageloaded{inputenc}{% - \if@ukr@uni@ode - \PackageWarning{babel}{inputenc should not be used with LuaTeX or XeTeX} - \fi -}{% - %\def\reserved@a{LWN}% - %\ifx\reserved@a\cyrillicencoding\else - \def\reserved@a{OT2}% - \ifx\reserved@a\cyrillicencoding - \else - \def\reserved@a{EU1}% - \ifx\reserved@a\cyrillicencoding\else - \def\reserved@a{EU2}% - \ifx\reserved@a\cyrillicencoding\else - \PackageWarning{babel}% - {No input encoding specified for Ukrainian language} - \fi - \fi - \fi - %\fi -} -% \end{macrocode} +% \changes{1.4e}{2020/10/14}{Removed check if inputenc is loaded} % % % \subsection{Shorthands} @@ -1534,7 +1515,7 @@ and the derived files ukraineb.ins, % % \subsection{Ukrainian mathetematical typography traditions} % -% \Describe\sh{} +% \Describe\sh{}% % \DescribeOther\ch{}% % \DescribeOther\tg{}% % \DescribeOther\ctg{}% @@ -1551,20 +1532,34 @@ and the derived files ukraineb.ins, % defined in Latin~1 encoding: % % \begin{macrocode} -\def\sh{\mathop{\operator@font sh}\nolimits} -\def\ch{\mathop{\operator@font ch}\nolimits} -\def\tg{\mathop{\operator@font tg}\nolimits} -\def\ctg{\mathop{\operator@font ctg}\nolimits} -\def\arctg{\mathop{\operator@font arctg}\nolimits} -\def\arcctg{\mathop{\operator@font arcctg}\nolimits} -\addto\extrasukrainian{% - \babel@save{\th}% - \let\ltx@th\th - \def\th{\textormath{\ltx@th}% - {\mathop{\operator@font th}\nolimits}}% +\AtBeginDocument{% + \@ifpackagewith{babel}{russian}{\relax}{% + \@ifpackageloaded{amsopn} + {% + \DeclareMathOperator{\sh}{sh}% + \DeclareMathOperator{\ch}{ch}% + \DeclareMathOperator{\tg}{tg}% + \DeclareMathOperator{\ctg}{ctg}% + \DeclareMathOperator{\arctg}{arctg}% + \DeclareMathOperator{\arcctg}{arcctg}% + \DeclareMathOperator{\cth}{cth}%\ + \DeclareMathOperator{\cosec}{cosec}% + \DeclareMathOperator{\math@th}{th}% + }{% + \DeclareRobustCommand\sh{\mathop{\operator@font sh}\nolimits}% + \DeclareRobustCommand\ch{\mathop{\operator@font ch}\nolimits}% + \DeclareRobustCommand\tg{\mathop{\operator@font tg}\nolimits}% + \DeclareRobustCommand\ctg{\mathop{\operator@font ctg}\nolimits}% + \DeclareRobustCommand{\arctg}{\mathop{\operator@font arctg}\nolimits}% + \DeclareRobustCommand\arcctg{\mathop{\operator@font arcctg}\nolimits}% + \DeclareRobustCommand\cth{\mathop{\operator@font cth}\nolimits}%\MakeRobust\cth% + \DeclareRobustCommand\cosec{\mathop{\operator@font cosec}\nolimits}% + \DeclareRobustCommand{\math@th}{\mathop{\operator@font arctg}\nolimits}% + }% + \let\text@th\th% + \DeclareRobustCommand{\th}{\TextOrMath{\text@th}{\math@th}}% + }% } -\def\cth{\mathop{\operator@font cth}\nolimits} -\def\cosec{\mathop{\operator@font cosec}\nolimits} % \end{macrocode} % % For compatibility with older Ukrainian packages we leave definition of the |\No| @@ -1591,7 +1586,7 @@ and the derived files ukraineb.ins, %\iffalse %</code> %\fi -% \CheckSum{1092} +% \CheckSum{1083} %\Finale % %% diff --git a/macros/latex/contrib/babel-contrib/ukrainian/ukraineb.pdf b/macros/latex/contrib/babel-contrib/ukrainian/ukraineb.pdf Binary files differindex a9714b7d06..8278fe7607 100644 --- a/macros/latex/contrib/babel-contrib/ukrainian/ukraineb.pdf +++ b/macros/latex/contrib/babel-contrib/ukrainian/ukraineb.pdf diff --git a/macros/latex/contrib/denisbdoc/README.md b/macros/latex/contrib/denisbdoc/README.md index 7eb3cbb01a..4c41602027 100644 --- a/macros/latex/contrib/denisbdoc/README.md +++ b/macros/latex/contrib/denisbdoc/README.md @@ -1,8 +1,8 @@ -denisbdoc - A personal package for documenting classes and packages, v. 0.9 -=========================================================================== +denisbdoc - A personal package for documenting classes and packages, v. 0.9.1 +============================================================================= **The sole purpose of this (quick 'n dirty) `denisbdoc` package is for -documenting the classes written by its author (Denis Bitouzé).** +documenting the classes written by their author (Denis Bitouzé).** The class is supplied in `.dtx` format. If you want to unpack the `.dtx` yourself, running: diff --git a/macros/latex/contrib/denisbdoc/denisbdoc.dtx b/macros/latex/contrib/denisbdoc/denisbdoc.dtx index a1f0bf4b18..af502881fe 100644 --- a/macros/latex/contrib/denisbdoc/denisbdoc.dtx +++ b/macros/latex/contrib/denisbdoc/denisbdoc.dtx @@ -3,11 +3,11 @@ \iffalse %</internal> %<*readme> -denisbdoc - A personal package for documenting classes and packages, v. 0.9 -=========================================================================== +denisbdoc - A personal package for documenting classes and packages, v. 0.9.1 +============================================================================= **The sole purpose of this (quick 'n dirty) `denisbdoc` package is for -documenting the classes written by its author (Denis Bitouzé).** +documenting the classes written by their author (Denis Bitouzé).** The class is supplied in `.dtx` format. If you want to unpack the `.dtx` yourself, running: @@ -31,7 +31,7 @@ This package is currently not documented. \preamble ----------------------------------------------------------------------------- denisbdoc --- A personal dirty package for documenting personal classes, - version 0.9 + version 0.9.1 Maintained by Denis Bitouzé E-mail: denis.bitouze@univ-littoral.fr @@ -125,6 +125,7 @@ This work consists of the file denisbdoc.dtx %\changes{v0.7}{2017/01/01}{Seventh CTAN version} %\changes{v0.8}{2020/03/27}{Eighth CTAN version} %\changes{v0.9}{2020/05/31}{Nineth CTAN version} +%\changes{v0.9.1}{2020/10/14}{Further CTAN version} % %\begin{abstract} % ... @@ -195,7 +196,7 @@ This work consists of the file denisbdoc.dtx % % The usual preliminaries. % \begin{macrocode} -\ProvidesExplPackage {denisbdoc} {2020/05/31} {0.9} +\ProvidesExplPackage {denisbdoc} {2020/10/14} {0.9.1} {A personal package for documenting packages} % \end{macrocode} % @@ -242,9 +243,16 @@ This work consists of the file denisbdoc.dtx % \begin{macrocode} \sys_if_engine_pdftex:TF { - \RequirePackage{cmap} + % \RequirePackage{cmap} \RequirePackage[T1]{fontenc} \RequirePackage[utf8]{inputenc} +% \end{macrocode} +% +% In order to get rid of the warning "PDF inclusion: multiple pdfs with page +% group included in a single page" (see +% \url{http://tex.stackexchange.com/q/183149/18401}). +% \begin{macrocode} + \pdfsuppresswarningpagegroup=1 }{ \RequirePackage{fontspec} } @@ -409,7 +417,6 @@ This work consists of the file denisbdoc.dtx }% \@ifpackageloaded{glossaries}{% }{% - % \RequirePackage{glossaries}% \RequirePackage[xindy,hyperfirst=false,toc=false]{glossaries-extra}% \makeglossaries% \newglossaryentry{zip}{% @@ -422,7 +429,7 @@ This work consists of the file denisbdoc.dtx text={zip}% }% \setglossarystyle{indexhypergroup}% - \setabbreviationstyle[acronym]{long-short-sc}% + \setabbreviationstyle{long-short-sc}% \newcommand*{\formatfont}[1]{\textsc{#1}}% \glssetcategoryattribute{format}{glossnamefont}{formatfont}% \glssetcategoryattribute{format}{font}{formatfont}% @@ -460,7 +467,10 @@ This work consists of the file denisbdoc.dtx % \end{macrocode} % % \begin{macrocode} -\renewcommand{\acrpluralsuffix}{} +\@ifpackageloaded{glossaries-extra}{% + \renewcommand*{\glsxtrabbrvpluralsuffix}{} +}{% +} % \end{macrocode} % % % Some hacks to avoid issues of \pkg{hypdoc} reported by me at @@ -718,30 +728,30 @@ This work consists of the file denisbdoc.dtx }{}{\aaa}% % \end{macrocode} % -% We create a boolean which tests if the letter in the navigation bar is the 1st -% one or not (in the latter case, a newline is added). -% \begin{macrocode} - \newif\if@DBD@no@first@letter@ - \@DBD@no@first@letter@false -% \end{macrocode} -% % \begin{macrocode} \newcommand*{\indexheading}[2]{% \hypertarget{#2:#1}{\textbf{#1}}% \protected@write\@auxout{}{\string\DBD@indexgroup{#1}{#2}}% } +% \end{macrocode} +% +% We create a boolean which tests whether the letter in the navigation bar is +% the 1st one or not (in the latter case, a newline is added). +% \begin{macrocode} +\newtoggle{@DBD@no@first@letter} \newcommand*{\DBD@indexgroup}[2]{% \csgappto{DBD@indexnavigation@#2}{% - \if@DBD@no@first@letter@ - \,\textbar\,% - % \\ - \else - \noindent - \@DBD@no@first@letter@true - \fi + \iftoggle{@DBD@no@first@letter}{% + \,\textbar\,% + % \\ + }{% + \toggletrue{@DBD@no@first@letter}% + \noindent% + }% \hyperlink{#2:#1}{\textbf{#1}}% }% }% +\fi % \end{macrocode} % % \begin{macrocode} @@ -1072,7 +1082,7 @@ This work consists of the file denisbdoc.dtx {% % Séquences de contrôles (communément appelées commandes ou macros) moretexcs={% - tcbset,tcbuselibrary% + tcbset,tcbuselibrary,tcbsetforeverylayer% },% % Mots-clés de niveau 1 : arguments optionnels morekeywords={% @@ -1083,8 +1093,9 @@ This work consists of the file denisbdoc.dtx },% % Mots-clés de niveau 3 : arguments optionnels clés dans clé=valeur morekeywords=[3]{% - lightgray,red!50!white% + lightgray,red!50!white,autoparskip,beforeafter,skip,balanced% },% + alsoletter={ \ },% sensitive,% }[keywords,tex,comments]% % @@ -1311,7 +1322,7 @@ This work consists of the file denisbdoc.dtx % \begin{macrocode} \lstdefinelanguage[studentreport]{TeX}[LaTeX]{TeX}{% moretexcs={% Control sequences' names - reportsetup,daterange,professionaladvisor,academicadvisor,companylogo% + reportsetup,daterange,companytutor,academictutor,companylogo% },% % Mandatory arguments (other than environments' names) morekeywords={% @@ -1320,11 +1331,11 @@ This work consists of the file denisbdoc.dtx },% morekeywords=[2]{% Keys of key-value lists institute,subinstitute,subsubinstitute,year,10pt,11pt,12pt,internship,project,layout,% - strings,pretitle,company,advisor,advisors,before~start~date,before~end~date,date,% - logos,logosheights,,% + strings,pretitle,company,tutor,tutors,before~start~date,before~end~date,date,% + logos,logosheights,keywords,subject,% },% morekeywords=[3]{% Values of key-value lists - ulco,iutlco,gte,gim,% + ulco,iutlco,gtelco,gimlco,% },% alsoletter={!-*1234560}% }% @@ -1410,154 +1421,6 @@ This work consists of the file denisbdoc.dtx % % prebreak={\c_space_tl\Righttorque}, % % postbreak={\c_space_tl\Lefttorque} % }% -\lstdefinestyle{pre-dbtex}{% - escapechar=", - language=[LaTeX]TeX, - alsolanguage=[extLaTeX]TeX, - % alsolanguage=[glossaries]TeX, - % alsolanguage=[biblatex]TeX, - alsolanguage=[csquotes]TeX, - % alsolanguage=[tcolorbox]TeX, - % alsolanguage=[listings]TeX, - % alsolanguage=[xcolor]TeX, - % alsolanguage=[hyperref]TeX, - texcsstyle=*\color{texcs}, - breaklines=true, - basicstyle=\normalfont\ttfamily, - commentstyle=\color{comment}\itshape, - directivestyle={\color{directive}}, - keywordstyle={\color{red}}, - keywordstyle={[1]\color{environment}}, - keywordstyle={[2]\color{key}}, - keywordstyle={[3]\color{value}}, - keywordstyle={[4]\color{keyword4}}, - keywordstyle={[5]\color{keyword5}}, - moredelim=*[s][\color{math}\ttfamily]{\\[}{\\]}, - moredelim=*[s][\color{math}\ttfamily]{$}{$}, - stringstyle=\color{string}, - columns=flexible, - keepspaces, - numberstyle=\small, - inputencoding=utf8/latin1, - aboveskip=\c_@@_listings_aboveskip_skip, - belowskip=\c_@@_listings_belowskip_skip -}% -\bool_if:nT {\g_@@_yad_bool} {% - \lstdefinestyle{dbtex}{% - style=pre-dbtex,% - alsolanguage=[yad]TeX,% - alsolanguage=[colophon]TeX,% - moretexcs={printbibliography,autocite},% - morekeywords=[2]{% - colback,refsegment% - },% - morekeywords=[2]{% - red,white% - },% - }% -} -\bool_if:nT {\g_@@_gzt_bool} {% - \lstdefinestyle{dbtex}{% - style=pre-dbtex,% - alsolanguage=[gzt]TeX,% - }% -} -\bool_if:nT {\g_@@_nwejm_bool} {% - \lstdefinestyle{dbtex}{% - style=pre-dbtex,% - alsolanguage=[nwejm]TeX,% - }% -} -\bool_if:nT {\g_@@_studentreport_bool} {% - \lstdefinestyle{dbtex}{% - style=pre-dbtex,% - alsolanguage=[studentreport]TeX,% - }% -} -\lstset{style=dbtex} -\sys_if_engine_pdftex:TF -{ - \ExplSyntaxOff - \lstMakeShortInline[style=dbtex]| - \ExplSyntaxOn -}{ - \lstMakeShortInline[style=dbtex]× -} -% \end{macrocode} -% -% \begin{macrocode} -\tcbset{dbtcb/.style={% - breakable, - fonttitle=\bfseries, - enlarge~top~by=1mm, - separator~sign~dash, - label~separator=-, - before~title={% - \hypersetup{hidelinks}% - \tcbset{% - color~definition=white, - color~hyperlink=white, - }% - }% - }% -}% -% -\tcbset{% - doc~head={% - % boxsep=4pt,arc=4pt,boxrule=0.6pt,% - % frame~style=fill,% - % colframe=red!50!black,% - interior~style={% - fill,% - color=yellow!10!white,% - }% - }% -} -\tcbset{% - /tcb/doclang/environment~content=contenu~de~l'environnement, - /tcb/doclang/color=~(couleur), - /tcb/doclang/colors=Couleurs, - /tcb/doclang/environments=Environnements, - /tcb/doclang/keys=Clés, - /tcb/doclang/values=Valeurs, - /tcb/doclang/pageshort=p., - /tcb/documentation~listing~style=dbtex, - /tcb/color~command=texcs, - /tcb/color~environment=environment, - /tcb/color~key=key, - /tcb/color~value=value, - % index~format=pgfchapter, - index~format=off, - index~colorize, - index~annotate=false, - enhanced, - listing~style=dbtex, - every~box/.style={documentation~listing~style=dbtex}, -% index~actual={}, -% doc~left~indent=-15mm, -% doc~right~indent=-15mm+2em - codes/.style={% - listing~only, - enlarge~top~by=\medskipamount, - colframe=ExampleFrame, - colback=ExampleBack, - fonttitle=\bfseries, - fontupper=\small, - split=0.5, - enhanced, - breakable, - listing~style=dbtex, - }% -}% -\tcbset{samples/.style={% - codes, - % listing~options={rangebeginprefix=\\,rangeendsuffix=\}} - }% -}% -\renewcommand*{\tcbdocnew}[1]{\scriptsize\sffamily\textcolor{green!50!black}{\bfseries -Nouv.~:}~#1} -\renewcommand*{\tcbdocupdated}[1]{\scriptsize\sffamily\textcolor{blue!75!black}{\bfseries -\textsc{m.-à -j.}~:}~#1} % \end{macrocode} % % Suppression du gras dans la commande ×\docAuxCommand× : @@ -1743,7 +1606,7 @@ Nouv.~:}~#1} % % This saves the url with all characters catcode other: % \begin{macrocode} -\tl_const:Nx \c_@@_standard_url_tl { \tl_to_str:n { http://ctan.org/pkg/ } } +\tl_const:Nx \c_@@_standard_url_tl { \tl_to_str:n { https://ctan.org/pkg/ } } % \end{macrocode} % Separate formatting: % #1: package or class name @@ -2189,13 +2052,6 @@ Nouv.~:}~#1} } % \end{macrocode} % -% In order to get rid of the warning "PDF inclusion: multiple pdfs with page -% group included in a single page" (see -% \url{http://tex.stackexchange.com/q/183149/18401}). -% \begin{macrocode} -\pdfsuppresswarningpagegroup=1 -% \end{macrocode} -% % We want to make the angle brackets generated by ×\meta× to be copied and % pasted as they are, and not replaced by "h" and "i" % (cf. \url{https://tex.stackexchange.com/q/18146/18401}). @@ -2229,6 +2085,12 @@ Nouv.~:}~#1} drop~lifted~shadow, #1% } +\NewTCBListing{preamblecode*}{ !O{} }{% + codes,% + enlarge~top~by=\c_zero_dim, + drop~lifted~shadow, + #1% +} \NewTCBListing{bodycode}{ !O{} }{% codes,% #1% @@ -2294,13 +2156,11 @@ Nouv.~:}~#1} colframe=red!75!black, dbtcb }{wa} -% \newtcbtheorem[list~inside=dbexamplelist,number~within=\g_@@_number_within_tl,crefname={exemple}{exemples}]{dbexample}{Exemple}{% colback=lime!5!white, colframe=lime!75!black, - dbtcb + dbtcb, }{ex} -% \newtcbtheorem[list~inside=dbremarklist,number~within=\g_@@_number_within_tl,crefname={remarque}{remarques}]{dbremark}{Remarque}{% colback=cyan!5!white, colframe=cyan!75!black, @@ -2309,7 +2169,7 @@ Nouv.~:}~#1} \newtcbtheorem[list~inside=dbfaqlist,number~within=\g_@@_number_within_tl,crefname={question}{questions}]{dbfaq}{Question}{% colback=lightgray!5!white, colframe=lightgray!75!black, - fontupper=\itshape, + % fontupper=\itshape, dbtcb }{faq} \newtcbtheorem[list~inside=dbtabularlist,number~within=\g_@@_number_within_tl,crefname={tableau}{tableaux}]{dbtab}{Tableau}{% @@ -2488,7 +2348,6 @@ Nouv.~:}~#1} % \end{macrocode} % \end{macro} % \end{macro} -% \end{macro} % % \subsection{\Class{nwejm}} % @@ -2524,8 +2383,194 @@ Nouv.~:}~#1} % \end{macrocode} % \end{macro} % \end{macro} +% +% \subsection{\Class{studentreport}} +% +% \begin{macrocode} +\tl_const:Nn \c_@@_studentreport_class_name_tl {studentreport} +% \end{macrocode} +% +% \begin{macro}{\studentreportcl} +% \begin{macrocode} +\ProvideDocumentCommand \studentreportcl { } +{% + \Class{\c_@@_studentreport_class_name_tl} +} +\NewDocumentCommand \studentreportauthor { } +{% + \class[\c_@@_standard_url_tl\c_@@_studentreport_class_name_tl]{\c_@@_studentreportauthor_class_name_tl} +} +\NewDocumentCommand \studentreportauthorcl { } +{% + \Class[\c_@@_standard_url_tl\c_@@_studentreport_class_name_tl]{\c_@@_studentreportauthor_class_name_tl} +} +% \end{macrocode} % \end{macro} % +% \begin{macrocode} +\lstdefinestyle{pre-dbtex}{% + escapechar=",%" + language=[LaTeX]TeX, + alsolanguage=[extLaTeX]TeX, + % alsolanguage=[glossaries]TeX, + % alsolanguage=[biblatex]TeX, + alsolanguage=[csquotes]TeX, + % alsolanguage=[tcolorbox]TeX, + % alsolanguage=[listings]TeX, + % alsolanguage=[xcolor]TeX, + % alsolanguage=[hyperref]TeX, + texcsstyle=*\color{texcs}, + breaklines=true, + basicstyle=\normalfont\ttfamily, + commentstyle=\color{comment}\itshape, + directivestyle={\color{directive}}, + keywordstyle={\color{red}}, + keywordstyle={[1]\color{environment}}, + keywordstyle={[2]\color{key}}, + keywordstyle={[3]\color{value}}, + keywordstyle={[4]\color{keyword4}}, + keywordstyle={[5]\color{keyword5}}, + moredelim=*[s][\color{math}\ttfamily]{\\[}{\\]}, + moredelim=*[s][\color{math}\ttfamily]{$}{$}, + stringstyle=\color{string}, + columns=flexible, + keepspaces, + numberstyle=\small, + inputencoding=utf8/latin1, + aboveskip=\c_@@_listings_aboveskip_skip, + belowskip=\c_@@_listings_belowskip_skip +}% +% \end{macrocode} +% +% \begin{macrocode} +\tl_gclear:N \g_tmpa_tl +\bool_if:nT {\g_@@_yad_bool} {% + \lstdefinestyle{dbtex}{% + style=pre-dbtex,% + alsolanguage=[yad]TeX,% + alsolanguage=[colophon]TeX,% + moretexcs={printbibliography,autocite},% + morekeywords=[2]{% + colback,refsegment% + },% + morekeywords=[2]{% + red,white% + },% + }% + \tl_gset:Nx \g_tmpa_tl {\c_@@_yat_class_name_tl} +} +\bool_if:nT {\g_@@_gzt_bool} {% + \lstdefinestyle{dbtex}{% + style=pre-dbtex,% + alsolanguage=[gzt]TeX,% + }% + \tl_gset:Nx \g_tmpa_tl {\c_@@_gzt_class_name_tl} +} +\bool_if:nT {\g_@@_nwejm_bool} {% + \lstdefinestyle{dbtex}{% + style=pre-dbtex,% + alsolanguage=[nwejm]TeX,% + }% + \tl_gset:Nx \g_tmpa_tl {\c_@@_nwejm_class_name_tl} +} +\bool_if:nT {\g_@@_studentreport_bool} {% + \lstdefinestyle{dbtex}{% + style=pre-dbtex,% + alsolanguage=[studentreport]TeX,% + }% + \tl_gset:Nx \g_tmpa_tl {\c_@@_studentreport_class_name_tl} +} +\NewDocumentCommand{\currentclass}{}{\g_tmpa_tl} +\NewExpandableDocumentCommand{\currenturl}{}{\c_@@_standard_url_tl\g_tmpa_tl} +\NewDocumentCommand{\thisclass}{}{\class{\g_tmpa_tl}} +\NewDocumentCommand{\Thisclass}{}{\Class{\g_tmpa_tl}} +% \end{macrocode} +% +% \begin{macrocode} +\tcbset{dbtcb/.style={% + breakable, + fonttitle=\bfseries, + enlarge~top~by=1mm, + separator~sign~dash, + label~separator=-, + before~title={% + \hypersetup{hidelinks}% + \tcbset{% + color~definition=white, + color~hyperlink=white, + }% + }% + }% +}% +% +\tcbset{% + doc~head={% + % boxsep=4pt,arc=4pt,boxrule=0.6pt,% + % frame~style=fill,% + % colframe=red!50!black,% + interior~style={% + fill,% + color=yellow!10!white,% + }% + }% +} +\tcbset{% + /tcb/doclang/environment~content=contenu~de~l'environnement, + /tcb/doclang/color=~(couleur), + /tcb/doclang/colors=Couleurs, + /tcb/doclang/environments=Environnements, + /tcb/doclang/keys=Clés, + /tcb/doclang/values=Valeurs, + /tcb/doclang/pageshort=p., + /tcb/documentation~listing~style=dbtex, + /tcb/color~command=texcs, + /tcb/color~environment=environment, + /tcb/color~key=key, + /tcb/color~value=value, + % index~format=pgfchapter, + index~format=off, + index~colorize, + index~annotate=false, + enhanced, + listing~style=dbtex, + every~box/.style={documentation~listing~style=dbtex}, +% index~actual={}, +% doc~left~indent=-15mm, +% doc~right~indent=-15mm+2em + codes/.style={% + listing~only, + enlarge~top~by=\medskipamount, + colframe=ExampleFrame, + colback=ExampleBack, + fonttitle=\bfseries, + fontupper=\small, + split=0.5, + enhanced, + breakable, + listing~style=dbtex, + }% +}% +\tcbset{samples/.style={% + codes, + % listing~options={rangebeginprefix=\\,rangeendsuffix=\}} + }% +}% +\renewcommand*{\tcbdocnew}[1]{\scriptsize\sffamily\textcolor{green!50!black}{\bfseries +Nouv.~:}~#1} +\renewcommand*{\tcbdocupdated}[1]{\scriptsize\sffamily\textcolor{blue!75!black}{\bfseries +\textsc{m.-à -j.}~:}~#1} +% +\lstset{style=dbtex} +\sys_if_engine_pdftex:TF +{ + \ExplSyntaxOff + \lstMakeShortInline[style=dbtex]| + \ExplSyntaxOn +}{ + \lstMakeShortInline[style=dbtex]× +} +% \end{macrocode} +% % We PDFdisable some commands in order to avoid troubles in bookmarks. % \begin{macrocode} \pdfstringdefDisableCommands{% diff --git a/macros/latex/contrib/eso-pic/README b/macros/latex/contrib/eso-pic/README.md index 2633b5dc54..2633b5dc54 100644 --- a/macros/latex/contrib/eso-pic/README +++ b/macros/latex/contrib/eso-pic/README.md diff --git a/macros/latex/contrib/eso-pic/eso-ex1.tex b/macros/latex/contrib/eso-pic/eso-ex1.tex index c9a43c24f9..c780356975 100644 --- a/macros/latex/contrib/eso-pic/eso-ex1.tex +++ b/macros/latex/contrib/eso-pic/eso-ex1.tex @@ -1,22 +1,22 @@ % file `eso-ex1.tex'; a framed background example -% Rolf Niepraschk, 2020-09-27, Rolf.Niepraschk@gmx.de \documentclass[a4paper]{article} \usepackage{eso-pic} \listfiles -\newdimen\myTempdima -\newdimen\myTempdimb -\newdimen\myTempdimc - -\AddToShipoutPicture{% - \setlength{\myTempdima}{15mm}% - \setlength{\myTempdimb}{\dimexpr\paperwidth-2\myTempdima}% - \setlength{\myTempdimc}{\dimexpr\paperheight-2\myTempdima}% - \thicklines% - \put(\LenToUnit{\myTempdima},\LenToUnit{\myTempdima}){% - \framebox(\LenToUnit{\myTempdimb},\LenToUnit{\myTempdimc}){}}% +\newdimen\myLenA +\newdimen\myLenB +\newdimen\myLenC + +\AddToShipoutPictureBG{% + \begingroup + \setlength\myLenA{15mm}% + \setlength\myLenB{\dimexpr\paperwidth-2\myLenA}% + \setlength\myLenC{\dimexpr\paperheight-2\myLenA}% + \thicklines% + \put(\myLenA,\myLenA){\framebox(\myLenB,\myLenC){}}% + \endgroup } \begin{document} @@ -24,11 +24,13 @@ \section*{First page} This page and all the following have a frame with 15~mm - distance from the paper edges.\newpage + distance from the paper edges. + + \newpage \section*{Second page} - \AddToShipoutPicture*{\put(100,100){\circle{40}}} + \AddToShipoutPictureBG*{\put(100,100){\circle{40}}} Only this page has a circle on the lower left side. diff --git a/macros/latex/contrib/eso-pic/eso-ex2.tex b/macros/latex/contrib/eso-pic/eso-ex2.tex index 37012a958e..affe690bd7 100644 --- a/macros/latex/contrib/eso-pic/eso-ex2.tex +++ b/macros/latex/contrib/eso-pic/eso-ex2.tex @@ -1,24 +1,23 @@ % file `eso-ex2.tex'; an example for background pictures -% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de -\listfiles\setcounter{errorcontextlines}{100} + \documentclass{article} \usepackage{eso-pic} \usepackage{graphicx} -\usepackage[dvips]{geometry} -% Tells `dvips' and `pdfTeX' the papersize. % `rose.eps' from CTAN: macros/generic/boxedeps/ \newcommand\BackgroundPicture{% - \put(0,0){% - \parbox[b][\paperheight]{\paperwidth}{% - \vfill - \centering - \includegraphics[width=\paperwidth,height=\paperheight,% - keepaspectratio]{rose}% - \vfill - }}} + \put(0,0){% + \parbox[b][\paperheight]{\paperwidth}{% + \vfill + \centering + \includegraphics[width=\paperwidth,height=\paperheight,% + keepaspectratio]{rose}% + \vfill + } + } +} % The picture is centered on the page background \AddToShipoutPicture{\BackgroundPicture} @@ -34,7 +33,7 @@ \newpage -\AddToShipoutPicture{\BackgroundPicture} +\AddToShipoutPictureBG{\BackgroundPicture} \section{\LaTeX} \end{document} diff --git a/macros/latex/contrib/eso-pic/eso-ex3.tex b/macros/latex/contrib/eso-pic/eso-ex3.tex deleted file mode 100644 index 4465d3e3f8..0000000000 --- a/macros/latex/contrib/eso-pic/eso-ex3.tex +++ /dev/null @@ -1,42 +0,0 @@ - -% file `eso-ex3.tex'; an example for import pages of another (pdf) document. -% This works only with `pdfTeX' (maybe `VTeX'?). -% Based on an article from Andreas Matthias <amat@kabsi.at> in d.c.t.t -% -% A much better solution is Andreas' package `pdfpages'. -% -% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de - -\documentclass[a4paper]{article} -\usepackage[pdftex]{graphicx}% -% `pdftex.def' >= 2000/05/12 v0.02u and `pdftex' >= v0.14 are needed. -\usepackage{ifthen,calc,eso-pic} - -\newcounter{thispdfpage}\newcounter{afterlastpdfpage} -\newcommand{\includepdfpages}[3] -{% - \setcounter{thispdfpage}{#2}\setcounter{afterlastpdfpage}{#3+1}% - \newpage - \whiledo{\value{thispdfpage} < \value{afterlastpdfpage}}% - {% - \AddToShipoutPicture* - {% - \put(0,0){% - \includegraphics[width=\paperwidth,height=\paperheight,% - keepaspectratio,page=\arabic{thispdfpage}]{#1}}% - } - \thispagestyle{empty}\mbox{}\newpage - \stepcounter{thispdfpage}% - } -} - -\begin{document} - -\section{First page of the main document} - -% import pages 1 to 3 of an external document. -\includepdfpages{ltx3info.pdf}{1}{3} - -\section{First page after the imported pages of the external document} - -\end{document} diff --git a/macros/latex/contrib/eso-pic/eso-ex4.tex b/macros/latex/contrib/eso-pic/eso-ex4.tex index eb617a7bbd..46a66c5774 100644 --- a/macros/latex/contrib/eso-pic/eso-ex4.tex +++ b/macros/latex/contrib/eso-pic/eso-ex4.tex @@ -1,32 +1,54 @@ % file `eso-ex4.tex'; a framed text area example -% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de \listfiles\setcounter{errorcontextlines}{100} \documentclass[a4paper,twoside]{article} -\usepackage{graphicx,color} +\usepackage{graphicx,pict2e} \usepackage{eso-pic} -\definecolor{lightgray}{gray}{.75} -\AddToShipoutPicture{% - \AtTextLowerLeft{% - \framebox(\LenToUnit{\textwidth},\LenToUnit{\textheight}){}}} +\AddToShipoutPictureBG{% + \AtTextLowerLeft{\framebox(\textwidth,\textheight){}}} \setlength\parindent{0pt} \begin{document} \section*{First page} + + \AddToShipoutPictureBG*{% on the background, only this page + \AtTextUpperLeft{% + \put(30mm,-25mm){\color{lightgray}\circle*{50}} + } + } + \AddToShipoutPictureFG*{% on the foreground, only this page + \AtTextUpperLeft{% + \put(60mm,-25mm){\color{lightgray}\circle*{50}} + } + } This page and all the following have a frame around the - text area. + text area. \par + This page and all the following have a frame around the + text area. \par + This page and all the following have a frame around the + text area. \par + This page and all the following have a frame around the + text area. \par + This page and all the following have a frame around the + text area. \par + This page and all the following have a frame around the + text area. \par + This page and all the following have a frame around the + text area. \par + This page and all the following have a frame around the + text area. \par \vfill X \hfill X\newpage \section*{Second page} - \AddToShipoutPicture*{% + \AddToShipoutPictureBG*{% \AtTextCenter{% \makebox(0,0)[c]{\resizebox{\textwidth}{!}{% \rotatebox{45}{\textsf{\textbf{\color{lightgray}DRAFT}}}}} diff --git a/macros/latex/contrib/eso-pic/eso-ex5.tex b/macros/latex/contrib/eso-pic/eso-ex5.tex index 6c6e1e9ea5..78d0ee5ef7 100644 --- a/macros/latex/contrib/eso-pic/eso-ex5.tex +++ b/macros/latex/contrib/eso-pic/eso-ex5.tex @@ -1,6 +1,5 @@ % file `eso-ex5.tex'; background grid example -% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de \listfiles\setcounter{errorcontextlines}{100} \documentclass[a4paper,twoside]{article} diff --git a/macros/latex/contrib/eso-pic/eso-memoir-test.tex b/macros/latex/contrib/eso-pic/eso-memoir-test.tex index 5df69f737e..ad88f57fcd 100644 --- a/macros/latex/contrib/eso-pic/eso-memoir-test.tex +++ b/macros/latex/contrib/eso-pic/eso-memoir-test.tex @@ -1,5 +1,3 @@ -% Rolf Niepraschk, 2015-07-14, Rolf.Niepraschk@gmx.de - \setcounter{errorcontextlines}{100} \listfiles \documentclass[twoside,a4paper,showtrims]{memoir} @@ -19,6 +17,7 @@ \AddToShipoutPicture{% \AtPageLowerLeft{\circle*{40}}% \AtPageUpperLeft{\circle*{40}}% + \AtPageCenter{\circle*{40}}% \AtTextLowerLeft{\circle*{15}}% \AtTextUpperLeft{\circle*{15}}% \AtStockLowerLeft{\circle*{40}}% diff --git a/macros/latex/contrib/eso-pic/eso-pic.dtx b/macros/latex/contrib/eso-pic/eso-pic.dtx index 74060e560e..5cdf9141cd 100644 --- a/macros/latex/contrib/eso-pic/eso-pic.dtx +++ b/macros/latex/contrib/eso-pic/eso-pic.dtx @@ -23,9 +23,9 @@ % \fi % % \iffalse -%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] +%<package>\NeedsTeXFormat{LaTeX2e}[2020-10-01] %<package>\ProvidesPackage{eso-pic} -%<package> [2020/09/27 v2.0i eso-pic (RN)] +%<package> [2020/10/14 v3.0a eso-pic (RN)] % %<*driver> \documentclass[a4paper]{ltxdoc} @@ -37,7 +37,7 @@ %</driver> % \fi % -% \CheckSum{782} +% \CheckSum{750} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -151,9 +151,10 @@ % \cs{ClearShipoutPictureFG} % clears the contents of \cs{ESO@HookIFG}. % -% \DescribeMacro{\LenToUnit} Allows a length as parameter to a picture -% command. Note that this macro is no more necessary when using -% |\usepackage{picture}|. +% \DescribeMacro{\LenToUnit} [Allows a length as parameter to a picture +% command.] Note that this macro exist only for compatibility to older +% versions of this package. A recent \LaTeX\ version allows dimensions +% in picture commands. % % \DescribeMacro{\gridSetup} % \cmd{\gridSetup}\oarg{gridunitname}\marg{gridunit}\marg{labelfactor}^^A @@ -208,28 +209,21 @@ % % \subsection{The main functionality} % -% \begin{macrocode} -\RequirePackage{atbegshi} -% \end{macrocode} % \begin{macro}{\LenToUnit} % \changes{v1.0d}{2006/07/14}{Using \cmd{\providecommand} instead of % \cmd{\newcommand} for \cmd{\LenToUnit}} % \changes{v2.0f}{2015/07/14}{Changed definition for better compatibility % with package \pkgname{curve2e} suggested by Claudio Beccari.} +% Only for compatibility +% \changes{v3.0a}{2020/10/14}{No more used. (RN).} % \begin{macrocode} -\providecommand*\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength} +\providecommand*\LenToUnit[1]{#1} % \end{macrocode} % \end{macro} -% \changes{v2.0i}{2020/09/27}{no more system dimension registers} -% \begin{macro}{\ESO@tempdima} -% \begin{macro}{\ESO@tempdimb} -% Some auxiliary dimension registers % \begin{macrocode} \newdimen\ESO@tempdima \newdimen\ESO@tempdimb % \end{macrocode} -% \end{macro} -% \end{macro} % \begin{macro}{\ESO@isMEMOIR} % Support for the \clsname{memoir} class. % \begin{macrocode} @@ -240,20 +234,20 @@ % \begin{macro}{\AtPageUpperLeft} % \begin{macrocode} \newcommand\AtPageUpperLeft[1]{% - \put(0,\LenToUnit{-\ESO@yoffsetI}){#1}% + \put(0,-\ESO@yoffsetI){#1}% } % \end{macrocode} % \end{macro} % \begin{macro}{\AtPageLowerLeft} % \begin{macrocode} \newcommand\AtPageLowerLeft[1]{\AtPageUpperLeft{% - \put(0,\LenToUnit{-\paperheight}){#1}}} + \put(0,-\paperheight){#1}}} % \end{macrocode} % \end{macro} % \begin{macro}{\AtPageCenter} % \begin{macrocode} \newcommand\AtPageCenter[1]{\AtPageUpperLeft{% - \put(\LenToUnit{.5\paperwidth},\LenToUnit{-.5\paperheight}){#1}}% + \put(.5\paperwidth,-.5\paperheight){#1}}% } % \end{macrocode} % \end{macro} @@ -274,7 +268,7 @@ \advance\ESO@tempdimb\paperheight \advance\ESO@tempdimb\trimtop \AtPageLowerLeft{% - \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){#1}% + \put(\ESO@tempdima,\ESO@tempdimb){#1}% }% \endgroup } @@ -290,7 +284,7 @@ \ESO@isMEMOIR{% \renewcommand\AtStockUpperLeft[1]{% \AtStockLowerLeft{% - \put(0,\LenToUnit{\stockheight}){#1}% + \put(0,\stockheight){#1}% }% }% }{% @@ -305,7 +299,7 @@ \ESO@isMEMOIR{% \renewcommand\AtStockCenter[1]{% \AtStockLowerLeft{% - \put(\LenToUnit{.5\stockwidth},\LenToUnit{.5\stockheight}){#1}% + \put(.5\stockwidth,.5\stockheight){#1}% }% }% }{% @@ -329,7 +323,7 @@ \fi \ESO@tempdimb=-\uppermargin \AtPageUpperLeft{% - \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){#1}% + \put(\ESO@tempdima,\ESO@tempdimb){#1}% }% \endgroup } @@ -351,7 +345,7 @@ \advance\ESO@tempdimb-\headheight \advance\ESO@tempdimb-\headsep \AtPageUpperLeft{% - \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){#1}% + \put(\ESO@tempdima,\ESO@tempdimb){#1}% }% \endgroup } @@ -361,13 +355,13 @@ % \begin{macro}{\AtTextLowerLeft} % \begin{macrocode} \newcommand\AtTextLowerLeft[1]{\AtTextUpperLeft{% - \put(0,\LenToUnit{-\textheight}){#1}}} + \put(0,-\textheight){#1}}} % \end{macrocode} % \end{macro} % \begin{macro}{\AtTextCenter} % \begin{macrocode} \newcommand\AtTextCenter[1]{\AtTextUpperLeft{% - \put(\LenToUnit{.5\textwidth},\LenToUnit{-.5\textheight}){#1}}} + \put(.5\textwidth,-.5\textheight){#1}}} % \end{macrocode} % \end{macro} % \DescribeMacro{\ESO@HookIBG}\DescribeMacro{\ESO@HookIIBG} @@ -405,6 +399,7 @@ \@ifstar{\g@addto@macro\ESO@HookIIFG}{\g@addto@macro\ESO@HookIFG}} % \end{macrocode} % \end{macro} +% \changes{v3.0a}{2020/10/14}{LaTeX's shipout hooks instead of `atbegshi' (RN).} % \begin{macro}{\ClearShipoutPictureBG} % \begin{macro}{\ClearShipoutPicture} % \begin{macro}{\ClearShipoutPictureFG} @@ -419,15 +414,11 @@ % \end{macro} % \end{macro} % \end{macro} -% \begin{macro}{\AtBeginShipout} -% \begin{macro}{\AtBeginShipoutUpperLeft} -% \begin{macro}{\AtBeginShipoutUpperLeftForeground} -% (see package \pkgname{atbegshi}) % \changes{v2.0c}{2010/10/06}{bugfix for memoir class % (reported by YI Hoze)} % \begin{macrocode} \ESO@isMEMOIR{% - \AtBeginShipout{% + \newcommand*\ESO@MEMOIR@corr{% \ESO@tempdima=-\trimedge \advance\ESO@tempdima-\paperwidth \advance\ESO@tempdima\stockwidth @@ -438,41 +429,38 @@ \fi\fi \ESO@tempdimb=\ESO@yoffsetI \advance\ESO@tempdimb-\trimtop - \nointerlineskip - \AtBeginShipoutUpperLeft{% - \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){% - \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG - \global\let\ESO@HookIIBG\@empty - }% + } + \nointerlineskip + \AddToHook{shipout/background}{% + \ESO@MEMOIR@corr + \put(\ESO@tempdima,\ESO@tempdimb){% + \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG + \global\let\ESO@HookIIBG\@empty }% - \AtBeginShipoutUpperLeftForeground{% - \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){% - \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG - \global\let\ESO@HookIIFG\@empty - }% + }% + \AddToHook{shipout/foreground}{% + \ESO@MEMOIR@corr + \put(\ESO@tempdima,\ESO@tempdimb){% + \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG + \global\let\ESO@HookIIFG\@empty }% - } + }% }{% - \AtBeginShipout{% - \nointerlineskip - \AtBeginShipoutUpperLeft{% - \put(0,\LenToUnit{\ESO@yoffsetI}){% - \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG - \global\let\ESO@HookIIBG\@empty - }% + \nointerlineskip + \AddToHook{shipout/background}{% + \put(0,\ESO@yoffsetI){% + \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG + \global\let\ESO@HookIIBG\@empty }% - \AtBeginShipoutUpperLeftForeground{% - \put(0,\LenToUnit{\ESO@yoffsetI}){% - \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG - \global\let\ESO@HookIIFG\@empty - }% + }% + \AddToHook{shipout/foreground}{% + \put(0,\ESO@yoffsetI){% + \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG + \global\let\ESO@HookIIFG\@empty }% - } + }% } % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} % \subsection{The background grid} % \begin{macrocode} \RequirePackage{keyval} @@ -613,7 +601,7 @@ \fi }% \ifESO@dvips\def\@tempb{eepic}\else\def\@tempb{epic}\fi - \def\@tempa{dotted}%\def\ESO@gap{\LenToUnit{6\@wholewidth}}% + \def\@tempa{dotted}%\def\ESO@gap{6\@wholewidth}% \ifx\@tempa\ESO@subgridstyle \IfFileExists{\@tempb.sty}% {% @@ -648,26 +636,26 @@ % \begin{macrocode} \ESO@div{\paperheight}{\ESO@griddelta}% \multiput(0,0)(0,\ESO@griddeltaY){\@tempcnta}% - {\ESO@hline{\LenToUnit{\paperwidth}}}% + {\ESO@hline{\paperwidth}}% % \end{macrocode} % --- vertical subgrid lines --- % \begin{macrocode} \ESO@div{\paperwidth}{\ESO@griddelta}% - \multiput(0,\LenToUnit{\ESO@yoffsetII})(\ESO@griddelta,0){\@tempcnta}% - {\ESO@vline{\LenToUnit{\paperheight}}}% + \multiput(0,\ESO@yoffsetII)(\ESO@griddelta,0){\@tempcnta}% + {\ESO@vline{\paperheight}}% \ESO@color{\ESO@gridcolor}% % \end{macrocode} % --- horizontal grid lines --- % \begin{macrocode} \ESO@div{\paperheight}{\ESO@gridDelta}% \multiput(0,0)(0,\ESO@gridDeltaY){\@tempcnta}% - {\ESO@Hline{\LenToUnit{\paperwidth}}}% + {\ESO@Hline{\paperwidth}}% % \end{macrocode} % --- vertical grid lines --- % \begin{macrocode} \ESO@div{\paperwidth}{\ESO@gridDelta}% - \multiput(0,\LenToUnit{\ESO@yoffsetII})(\ESO@gridDelta,0){\@tempcnta}% - {\ESO@Vline{\LenToUnit{\paperheight}}}% + \multiput(0,\ESO@yoffsetII)(\ESO@gridDelta,0){\@tempcnta}% + {\ESO@Vline{\paperheight}}% % \end{macrocode} % --- horizontal numbers --- % \changes{v1.1a}{2002/11/09}{Font setting added.} diff --git a/macros/latex/contrib/eso-pic/eso-pic.pdf b/macros/latex/contrib/eso-pic/eso-pic.pdf Binary files differindex c1b4fe471b..961f29e150 100644 --- a/macros/latex/contrib/eso-pic/eso-pic.pdf +++ b/macros/latex/contrib/eso-pic/eso-pic.pdf diff --git a/macros/latex/contrib/eso-pic/showframe.sty b/macros/latex/contrib/eso-pic/showframe.sty index 5bc0366f10..9d746d87ac 100644 --- a/macros/latex/contrib/eso-pic/showframe.sty +++ b/macros/latex/contrib/eso-pic/showframe.sty @@ -22,7 +22,7 @@ % \ShowFrameColor and \ShowFrameLinethickness can be used to change % the frames. -\ProvidesPackage{showframe}[2011/02/24 v0.1i showframe (new impl., RN)] +\ProvidesPackage{showframe}[2020/10/14 v0.1j showframe (new impl., RN)] \newif\ifSF@frame\SF@frametrue @@ -34,31 +34,32 @@ \newcommand*\ShowFrameColor{\normalcolor} \newcommand*\ShowFrameLinethickness{.8pt} +\newdimen\SF@tempdima \newcommand\ShowFramePicture{% \begingroup \ShowFrameColor\linethickness{\ShowFrameLinethickness}% \AtPageLowerLeft{% - \framebox(\LenToUnit{\paperwidth},\LenToUnit{\paperheight}){}}% + \framebox(\paperwidth,\paperheight){}}% \AtTextLowerLeft{% - \framebox(\LenToUnit{\textwidth},\LenToUnit{\textheight}){}}% + \framebox(\textwidth,\textheight){}}% \AtTextUpperLeft{% - \put(0,\LenToUnit{\headsep}){% - \framebox(\LenToUnit{\textwidth},\LenToUnit{\headheight}){}}}% + \put(0,\headsep){% + \framebox(\textwidth,\headheight){}}}% \AtTextLowerLeft{% - \put(0,\LenToUnit{-\footskip}){% - \line(1,0){\LenToUnit{\textwidth}}}}% + \put(0,-\footskip){% + \line(1,0){\textwidth}}}% \AtTextLowerLeft{% - \@tempdima=\textwidth\advance\@tempdima\marginparsep% + \SF@tempdima=\textwidth\advance\SF@tempdima\marginparsep% \if@twoside \ifodd\c@page\else \if@mparswitch - \@tempdima=-\marginparsep\advance\@tempdima-\marginparwidth + \SF@tempdima=-\marginparsep\advance\SF@tempdima-\marginparwidth \fi \fi \fi - \put(\LenToUnit{\@tempdima},0)% - {\framebox(\LenToUnit{\marginparwidth},\LenToUnit{\textheight}){}}% + \put(\SF@tempdima,0)% + {\framebox(\marginparwidth,\textheight){}}% }% \endgroup } diff --git a/macros/latex/contrib/gentombow/README.md b/macros/latex/contrib/gentombow/README.md index 6ea7f2aea5..94cbdbdac0 100644 --- a/macros/latex/contrib/gentombow/README.md +++ b/macros/latex/contrib/gentombow/README.md @@ -3,6 +3,16 @@ This bundle provides a LaTeX package for generating Japanese-style crop marks (called 'tombow' in Japanese) for practical use in self-publishing. +The core feature of "gentombow.sty" is based on pLaTeX kernel. + +## Supported engines + +All packages except bounddvi.sty works with the followings: +- LaTeX + dvips/dvipdfmx +- pLaTeX/upLaTeX + dvips/dvipdfmx +- pdfLaTeX +- LuaLaTeX +- XeLaTeX ## Bundle contents @@ -16,11 +26,23 @@ self-publishing. Set papersize special to DVI file. Can be used on LaTeX/pLaTeX/upLaTeX (with DVI output mode) with dvips or dvipdfmx drivers. - Old version (v6.0) of this package, written by Koichi INOUE - in 2004, is available at - https://www.ma.ns.tcu.ac.jp/Pages/TeX/bounddvi.sty.html - (dead link). - Now it is maintained by Hironobu Yamashita by his courtesy. + Old version (v6.0) was written by Koichi INOU in 2004 + (https://www.ma.ns.tcu.ac.jp/Pages/TeX/bounddvi.sty.html), + and incorporated into this bundle by his courtesy. + +## Miscellaneous patches + +Some packages are unaware of crop marks defined in "gentombow"; +to cope with those packages, patches are provided here. +- pxtextpos.sty: + Patch for textpos.sty (by Norman Gray). +- pxesopic.sty: + Patch for eso-pic.sty (by Rolf Niepraschk). +- pxpdfpages.sty: + Patch for pdfpages.sty (by Andreas Matthias). + +These patches can also be used independent of "gentombow", +to avoid problems with crop marks on pLaTeX and upLaTeX. ## Character encoding @@ -44,6 +66,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2020-09-25 +2020-10-14 Hironobu Yamashita diff --git a/macros/latex/contrib/gentombow/bounddvi-en.pdf b/macros/latex/contrib/gentombow/bounddvi-en.pdf Binary files differindex fb9647d1ec..2cf419316e 100644 --- a/macros/latex/contrib/gentombow/bounddvi-en.pdf +++ b/macros/latex/contrib/gentombow/bounddvi-en.pdf diff --git a/macros/latex/contrib/gentombow/bounddvi.pdf b/macros/latex/contrib/gentombow/bounddvi.pdf Binary files differindex c0a2b20af6..57fed9c6c7 100644 --- a/macros/latex/contrib/gentombow/bounddvi.pdf +++ b/macros/latex/contrib/gentombow/bounddvi.pdf diff --git a/macros/latex/contrib/gentombow/bounddvi.sty b/macros/latex/contrib/gentombow/bounddvi.sty index 3e355d63c1..a70da52c6e 100644 --- a/macros/latex/contrib/gentombow/bounddvi.sty +++ b/macros/latex/contrib/gentombow/bounddvi.sty @@ -1,6 +1,6 @@ % % bounddvi.sty -% 2020/09/25 v8.0-v7.0 h.y.acetaminophen [at] gmail.com +% 2020/10/08 v8.2-v7.0 h.y.acetaminophen [at] gmail.com % 2004/12/15 v6.0-v1.0 inoue [at] ma.ns.tcu.ac.jp % % This package, originally written by Koichi Inoue @@ -10,15 +10,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bounddvi}[2020/09/25 v8.0 bounddvi] - -% catcode trick to hide \iftombow ... \else ... \fi -% since \iftombow is defined only in pLaTeX. -\ifx\pfmtname\@undefined - \catcode`\Q=14\relax -\else - \catcode`\Q=9\relax -\fi +\ProvidesPackage{bounddvi}[2020/10/08 v8.2 bounddvi] % Note: graphics/color drivers % - dvips.def 2016/07/10 v3.1a or later @@ -28,74 +20,84 @@ % setpagesize option (= default since 2016) and \mag equals % to 1000, we can exploit its routine. % (they are using \AtBeginDocument{\AtBeginDvi{...}}) -% However, these .def files do _not_ care about tombow by pLaTeX; -% so, we set \stock{width,height} to invoke stock test in those +% However, these .def files do _not_ care about tombow; so, +% we set \stock{width,height} to invoke stock test in those % files (probably meant for memoir.cls). -Q \iftombow -Q % if \stockwidth/\stockheight are not available, -Q % define them now -Q \ifx\stockwidth\@undefined \newdimen\stockwidth \fi -Q \ifx\stockheight\@undefined \newdimen\stockheight \fi -Q % if \stockwidth already has effective value, do nothing; -Q % otherwise assume pLaTeX-style tombow and set it to -Q % \paperwidth + 2in (similar for \stockheight) -Q \ifdim\stockwidth>\z@\else -Q \stockwidth\paperwidth \advance\stockwidth2in -Q \fi -Q \ifdim\stockheight>\z@\else -Q \stockheight\paperheight \advance\stockheight2in -Q \fi -Q \fi -% reset catcode trick -\catcode`\Q=11\relax +% detection of \iftombow status is delayed until \AtBeginDocument, +% to support both (u)pLaTeX kernel and ``gentombow.sty'' +\def\bddv@maybe@ensure@stock{% + \ifx\tombowtrue\@undefined + \let\bddv@ensure@stock\relax % skip if-tokens + \fi + \bddv@ensure@stock} + +% when \iftombow == \iftrue, we also need \stock{width,height} +\def\bddv@ensure@stock{% + \iftombow + % if \stockwidth/\stockheight are not available, + % define them now + \ifx\stockwidth\@undefined \newdimen\stockwidth \fi + \ifx\stockheight\@undefined \newdimen\stockheight \fi + % if \stockwidth already has effective value, do nothing; + % otherwise assume pLaTeX-style tombow and set it to + % \paperwidth + 2in (similar for \stockheight) + \ifdim\stockwidth>\z@\else + \stockwidth\paperwidth \advance\stockwidth2in + \fi + \ifdim\stockheight>\z@\else + \stockheight\paperheight \advance\stockheight2in + \fi + \fi +} + +% prepare actual papersize special +\def\bddv@emit@papersize{% + \begingroup + % if \stockwidth/\stockheight are defined & have effective + % values, copy them to \paperwidth/\paperheight + % for current group + \ifx\stockwidth\@undefined\else \ifdim\stockwidth>\z@ + \paperwidth\stockwidth + \fi\fi + \ifx\stockheight\@undefined\else \ifdim\stockheight>\z@ + \paperheight\stockheight + \fi\fi + % adjust for \mag and emit papersize special + \divide\paperwidth\@m\multiply\paperwidth\mag + \divide\paperheight\@m\multiply\paperheight\mag + \special{papersize=\the\paperwidth,\the\paperheight}% + \endgroup +} %% Since LaTeX2e 2020-10-01, \@begindocumenthook is deprecated %% and \UseHook{begindocument} etc. are used. %% This code appends papersize special to the _end_ of the hook. %% (Note: support for old dvips is removed.) -\ifx\AddToHook\@undefined\else - \AtBeginDocument{\AtBeginDvi{% - \begingroup - % if \stockwidth/\stockheight are defined & have effective - % values, copy them to \paperwidth/\paperheight - % for current group - \ifx\stockwidth\@undefined\else \ifdim\stockwidth>\z@ - \paperwidth\stockwidth - \fi\fi - \ifx\stockheight\@undefined\else \ifdim\stockheight>\z@ - \paperheight\stockheight - \fi\fi - % adjust for \mag and emit papersize special - \divide\paperwidth\@m\multiply\paperwidth\mag - \divide\paperheight\@m\multiply\paperheight\mag - \special{papersize=\the\paperwidth,\the\paperheight}% - \endgroup}} - \expandafter\endinput -\fi +\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} +\IfFormatAtLeastTF{2020-10-01}{% + \AtBeginDocument{% + \bddv@maybe@ensure@stock + \AtBeginDvi{\bddv@emit@papersize}}% + \endinput +}{} %% The rest of this package is meant for %% LaTeX2e 2020-02-02 PL5 or older. % following code is almost equivalent to % \AtBeginDocument{\AtBeginDvi{...}} -% however, we append the specification to the _beginning_ of -% \@begindocumenthook; this ensures proper papersize when -% dvips (TeX Live 2016 or earlier) is used. +% however, we put into the _beginning_ of \@begindocumenthook; +% this ensures proper papersize when old dvips +% (TeX Live 2016 or earlier) is used. +% also, note that old pLaTeX (before 2016/07/01) needs \yoko +% at the beginning of \AtBeginDvi. \begingroup -\def\@prependto@begindocumenthook{\global\setbox\@begindvibox - \vbox{\csname yoko\endcsname\unvbox\@begindvibox - \begingroup - \ifx\stockwidth\@undefined\else \ifdim\stockwidth>\z@ - \paperwidth\stockwidth - \fi\fi - \ifx\stockheight\@undefined\else \ifdim\stockheight>\z@ - \paperheight\stockheight - \fi\fi - \divide\paperwidth\@m\multiply\paperwidth\mag - \divide\paperheight\@m\multiply\paperheight\mag - \special{papersize=\the\paperwidth,\the\paperheight}% - \endgroup}} +\def\@prependto@begindocumenthook{% + \bddv@maybe@ensure@stock + \global\setbox\@begindvibox\vbox{% + \csname yoko\endcsname\unvbox\@begindvibox + \bddv@emit@papersize}} \toks@\expandafter\expandafter\expandafter {\expandafter\@prependto@begindocumenthook\@begindocumenthook} \xdef\@begindocumenthook{\the\toks@} diff --git a/macros/latex/contrib/gentombow/gentombow-ja.pdf b/macros/latex/contrib/gentombow/gentombow-ja.pdf Binary files differindex ada6318d41..ee94b6c132 100644 --- a/macros/latex/contrib/gentombow/gentombow-ja.pdf +++ b/macros/latex/contrib/gentombow/gentombow-ja.pdf diff --git a/macros/latex/contrib/gentombow/gentombow-ja.tex b/macros/latex/contrib/gentombow/gentombow-ja.tex index 763f790020..411aad1db2 100644 --- a/macros/latex/contrib/gentombow/gentombow-ja.tex +++ b/macros/latex/contrib/gentombow/gentombow-ja.tex @@ -3,14 +3,10 @@ \epTeXinputencoding utf8 % ensure utf-8 encoding for platex \fi +\RequirePackage{plautopatch}% pldocverb \documentclass[a4paper,dvipdfmx]{jsarticle} \usepackage{doc} \makeatletter -%%% import from jltxdoc.cls -\def\verb{\relax\ifmmode\hbox\else\leavevmode\vadjust{}\fi - \bgroup \let\do\do@noligs \verbatim@nolig@list - \ttfamily \verb@eol@error \let\do\@makeother \dospecials - \@ifstar{\@sverb}{\@vobeyspaces \frenchspacing \@sverb}} \xspcode"5C=3 %% \ \xspcode"22=3 %% " %%% dangerous bend @@ -207,7 +203,11 @@ C系列(\texttt{c0}--\texttt{c10})㨠ãªãŠã€ã“ã“ã§ã‚‚用紙サイズãŒæ¨ªé•·ã®å ´åˆã¯è‡ªå‹•çš„ã«å‡ºåŠ›ã‚‚横長ã«ãªã‚Šã€ 縦長ã®å ´åˆã¯è‡ªå‹•çš„ã«ç¸¦é•·ã«ãªã‚Šã¾ã™ã€‚ -オプションã¯\jMeta{トンボ形å¼}\texttt{-}\jMeta{出力サイズ}ã®æ›¸å¼ã§ä¸Žãˆã¾ã™ã€‚ +オプションã¯\jMeta{トンボ形å¼}\texttt{-}\jMeta{出力サイズ}ã®æ›¸å¼ +\footnote{ä»–ã®ãƒ‘ッケージã§è¦‹ã‚‰ã‚Œã‚‹ã‚ˆã†ãªkey=valueå½¢å¼ã§ã¯ãªã„ã®ã§ +注æ„ã—ã¦ãã ã•ã„。ã“ã®ã‚ˆã†ãªç‰¹æ®Šãªã‚ªãƒ—ション書å¼ã‚’用ã„ã¦ã„ã‚‹ã®ã¯ã€ +オプションåãŒä»–ã®ã‚¯ãƒ©ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã‚„パッケージã¨è¡çªã™ã‚‹å¯èƒ½æ€§ã‚’ +å°ã•ãã™ã‚‹ãŸã‚ã§ã™ã€‚}ã§ä¸Žãˆã¾ã™ã€‚ トンボ形å¼ã¯ã€p\LaTeX ã®æ¨™æº–クラスã¨åŒã˜ã§ \verb+tombow+, \verb+tombo+, \verb+mentuke+ã®ã„ãšã‚Œã‹ã‚’é¸ã³ã¾ã™ (\verb+tombow+ã¯ã‚¸ãƒ§ãƒ–æƒ…å ±ã‚’è¡¨ç¤ºã—ã€\verb+tombo+ã¯è¡¨ç¤ºã—ã¾ã›ã‚“。 @@ -453,6 +453,7 @@ $30\,\mathrm{mm}$ã«ã—ãŸã„ã¨ã\footnote{ã“ã“ã§ã¯ã€Œæœ¬æ–‡ã®é ˜åŸŸä»¥å¤ \verb+\settombowbleed+ãŒ\verb+/TrimBox+ã«åæ˜ ã•ã‚Œãª ã‹ã£ãŸãƒã‚°ã®ä¿®æ£ \item 2019/07/21 v0.9k \textsf{pdfx}パッケージã¨ã®æ•´åˆæ€§ã‚’ã¨ã‚‹æ”¹è‰¯ + \item 2020/10/14 v0.9l \textsf{plautopatch}ã‹ã‚‰ãƒˆãƒ³ãƒœå¯¾ç–パッãƒã‚’å–り込㿠\end{itemize} \end{document} diff --git a/macros/latex/contrib/gentombow/gentombow.pdf b/macros/latex/contrib/gentombow/gentombow.pdf Binary files differindex c47dab8edb..178bab4c52 100644 --- a/macros/latex/contrib/gentombow/gentombow.pdf +++ b/macros/latex/contrib/gentombow/gentombow.pdf diff --git a/macros/latex/contrib/gentombow/gentombow.sty b/macros/latex/contrib/gentombow/gentombow.sty index 396a8f3405..bcd8093f50 100644 --- a/macros/latex/contrib/gentombow/gentombow.sty +++ b/macros/latex/contrib/gentombow/gentombow.sty @@ -8,7 +8,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{gentombow} - [2019/07/21 v0.9k Generate crop mark 'tombow'] + [2020/10/14 v0.9l Generate crop mark 'tombow'] \def\pxgtmb@pkgname{gentombow} \@namedef{ver@pxgentombow.sty}{}% fake @@ -19,7 +19,8 @@ % case 2: pdfLaTeX etc. % case 1: pLaTeX2e <2018-04-01>+2 or older % case 0: pLaTeX2e <2018-05-20> or newer -\ifx\pfmtversion\@undefined +% --- checked plcore.ltx in platex 2020/09/28 v1.3g +\ifx\pfmtname\@undefined \@ifpackageloaded{luatexja}{}{\chardef\pxgtmb@errlevel=\tw@} \fi \ifnum\pxgtmb@errlevel<\tw@ @@ -615,12 +616,15 @@ \def\pxgtmb@driver{x} \fi % required for putting \special to every page - \ifx\pfmtname\@undefined - \RequirePackage{atbegshi} - \else - \IfFileExists{pxatbegshi.sty} - {\RequirePackage{pxatbegshi}} - {\RequirePackage{atbegshi}} + \RequirePackage{atbegshi} + \ifx\pfmtname\@undefined\else + \ifx\AtBegShi@Output\@undefined + % LaTeX2e 2020-10-01: an emulation by ``atbegshi-ltx.sty'' + % => pLaTeX2e 2020-10-01 natively supports it + \else + % older: the real ``atbegshi.sty'' is loaded + \IfFileExists{pxatbegshi.sty}{\RequirePackage{pxatbegshi}}{} + \fi \fi % do it \if x\pxgtmb@driver @@ -732,34 +736,8 @@ \@onlypreamble\settombowbleed %% patch internal of pdfpages.sty to work with tombow -%% (tested on pdfpages 2017/10/31 v0.5l) -%% Note the code is the same as that of pxpdfpages.sty, -%% but reserved here since gentombow.sty can be used on -%% any LaTeX format -%% (cf. pxpdfpages.sty is restricted to (u)pLaTeX) \def\pxgtmb@patch@pdfpages{% - \RequirePackage{etoolbox} - \patchcmd{\AM@output}{% - \setlength{\@tempdima}{\AM@xmargin}% - \edef\AM@xmargin{\the\@tempdima}% - \setlength{\@tempdima}{\AM@ymargin}% - \edef\AM@ymargin{\the\@tempdima}% - }{% - \setlength{\@tempdima}{\AM@xmargin\iftombow+1in\fi}% - \edef\AM@xmargin{\the\@tempdima}% - \setlength{\@tempdima}{\AM@ymargin\iftombow-1in\fi}% - \edef\AM@ymargin{\the\@tempdima}% - } - {\PackageInfo{\pxgtmb@pkgname}{Patch for pdfpages applied}} - {\PackageWarningNoLine{\pxgtmb@pkgname}{Patch for pdfpages failed}}% -} -%% however, if running (u)pLaTeX, use pxpdfpages.sty if available -\ifx\pfmtname\@undefined\else - \IfFileExists{pxpdfpages.sty}{% - \def\pxgtmb@patch@pdfpages{\RequirePackage{pxpdfpages}}% - }{} -\fi -%% do it + \IfFileExists{pxpdfpages.sty}{\RequirePackage{pxpdfpages}}{}} \AtBeginDocument{\@ifpackageloaded{pdfpages}{\pxgtmb@patch@pdfpages}{}} %% patch pdfx.sty diff --git a/macros/latex/contrib/gentombow/gentombow.tex b/macros/latex/contrib/gentombow/gentombow.tex index 81be1fe6c5..d0bc4523ab 100644 --- a/macros/latex/contrib/gentombow/gentombow.tex +++ b/macros/latex/contrib/gentombow/gentombow.tex @@ -301,6 +301,7 @@ please load \textsf{gentombow} after \textsf{geometry}. Fix a bug that \verb+\settombowbleed+ is not considered by \verb+/TrimBox+. \item 2019/07/21 v0.9k Support \textsf{pdfx} package. + \item 2020/10/14 v0.9l Import tombow-related patches from \textsf{plautopatch}. \end{itemize} \end{document} diff --git a/language/japanese/plautopatch/pxesopic.sty b/macros/latex/contrib/gentombow/pxesopic.sty index f020501e94..567b9d0a2d 100644 --- a/language/japanese/plautopatch/pxesopic.sty +++ b/macros/latex/contrib/gentombow/pxesopic.sty @@ -2,31 +2,41 @@ % pxesopic.sty % written by Hironobu Yamashita (@aminophen) % -% This package is part of the plautopatch bundle. -% https://github.com/aminophen/plautopatch +% This package is part of the gentombow bundle. +% https://github.com/aminophen/gentombow % % This package is expected to be compatible with % * eso-pic.sty -% ????/??/?? v?.? -- 2018/04/12 v2.0h +% 2015/07/21 v2.0g -- 2020/09/27 v2.0i % % -------------------------------------------------------------- % [Note] % The package ``pxesopic.sty'' relies heavily on internals -% of ``plautopatch.sty'' +% of ``plautopatch.sty''. +% Also, ``pxesopic.sty'' is incompatible with ``memoir.cls''. % -------------------------------------------------------------- % %% package declaration \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pxesopic} - [2020/09/27 v0.2a Patch to eso-pic for tombow] + [2020/10/11 v0.4c Patch to eso-pic for tombow] %% preparations \def\pxesop@pkgname{pxesopic} \def\pxesop@error{\PackageError\pxesop@pkgname} \def\pxesop@warn{\PackageWarningNoLine\pxesop@pkgname} \let\pxesop@debug\@gobble -\def\pxesop@debug#1{\typeout{\pxesop@pkgname: [DEBUG] #1}}% for debug +%\def\pxesop@debug#1{\typeout{\pxesop@pkgname: [DEBUG] #1}}% for debug + +\@ifclassloaded{memoir}{% + \pxesop@warn{This package should not be loaded with memoir.cls}}{} + +\@ifpackageloaded{eso-pic}{% + \pxesop@error{% + Package eso-pic is already loaded!\MessageBreak + Load pxesopic earlier}\@ehc +}{} %% hooks \ifx\declare@file@substitution\@undefined @@ -45,6 +55,16 @@ %% until \AtBeginDocument, to support both (u)pLaTeX kernel %% and ``gentombow.sty'' \RequirePackage{atbegshi}% eso-pic requires atbegshi +\ifx\pfmtname\@undefined\else + \ifx\AtBegShi@Output\@undefined + % LaTeX2e 2020-10-01: an emulation by ``atbegshi-ltx.sty'' + % => pLaTeX2e 2020-10-01 natively supports it + \else + % older: the real ``atbegshi.sty'' is loaded + \IfFileExists{pxatbegshi.sty}{\RequirePackage{pxatbegshi}}{} + \fi +\fi +% \pxesop@ExecuteBeforePackage{eso-pic}{\pxesop@before} \pxesop@ExecuteAfterPackage{eso-pic}{\pxesop@after} % @@ -75,7 +95,9 @@ \expandafter\ifx\csname platpc@begin@eso-pic\endcsname\relax % ``plautopatch.sty'' is loaded but the macro is \relax % => means that ``pxesopic.sty'' is automatically loaded - \chardef\pxesop@status\@ne + \@ifl@t@r{\fmtversion}{2020/10/01}{% + \chardef\pxesop@status\@ne + }{}% \fi }{} % @@ -84,6 +106,10 @@ \ProcessOptions\relax \RequirePackage{eso-pic} % +%% ensure internal dimensions added in ``eso-pic.sty'' v2.0i +\ifx\ESO@tempdima\@undefined \newdimen\ESO@tempdima \fi +\ifx\ESO@tempdimb\@undefined \newdimen\ESO@tempdimb \fi +% %% recover the error \ifnum\pxesop@status>\z@ % auto \def\pxesop@pkgtohook{eso-pic}% @@ -105,12 +131,42 @@ } %% -%% delayed to detect \iftombow status -\AtBeginDocument{% +%% do it +%-- similar to bounddvi.sty (checked 2020/10/08 v8.2) +% detection of \iftombow availability is delayed until \AtBeginDocument, +% to support both (u)pLaTeX kernel and ``gentombow.sty'' +% Note: this package does not consider changing \iftombow status +% in the middle of a single document. +\AtBeginDocument{\pxesop@do} +\def\pxesop@do{% \ifx\tombowtrue\@undefined - \pxesop@warn{Tombow feature unavailable, aborting}% + \pxesop@debug{Tombow feature unavailable, no patch applied}% + \let\pxesop@switch\pxesop@orig % skip if-tokens and restore \fi - \iftombow \pxesop@new \else \pxesop@orig \fi}% + \pxesop@switch} +% +\def\pxesop@switch{% + \iftombow \pxesop@ensure@stock \pxesop@new + \else \pxesop@orig \fi} +% +\def\pxesop@ensure@stock{% + %\iftombow + % if \stockwidth/\stockheight are not available, + % define them now + \ifx\stockwidth\@undefined \newdimen\stockwidth \fi + \ifx\stockheight\@undefined \newdimen\stockheight \fi + % if \stockwidth already has effective value, do nothing; + % otherwise assume pLaTeX-style tombow and set it to + % \paperwidth + 2in (similar for \stockheight) + \ifdim\stockwidth>\z@\else + \stockwidth\paperwidth \advance\stockwidth2in + \fi + \ifdim\stockheight>\z@\else + \stockheight\paperheight \advance\stockheight2in + \fi + %\fi +} +%-- % %% for \iftombow is FALSE => restore from ``eso-pic.sty'' \expandafter\def\expandafter\pxesop@orig\expandafter{% @@ -121,16 +177,18 @@ %% \AtStockLowerLeft: based on TRUE of \ESO@isMEMOIR \renewcommand\AtStockLowerLeft[1]{% \begingroup - \@tempdima=-\stockwidth - \advance\@tempdima\paperwidth - \@tempdimb=-\stockheight - \advance\@tempdimb\paperheight + \ESO@tempdima=-\stockwidth + \advance\ESO@tempdima\paperwidth + \ESO@tempdimb=-\stockheight + \advance\ESO@tempdimb\paperheight %% specific BEGIN - \advance\@tempdima 1in\relax - \advance\@tempdimb 1in\relax + \advance\ESO@tempdima 1in\relax + \advance\ESO@tempdimb 1in\relax + \advance\ESO@tempdima \hoffset\relax + \advance\ESO@tempdimb \voffset\relax %% specific END \AtPageLowerLeft{% - \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){##1}% + \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){##1}% }% \endgroup }% === @@ -151,20 +209,24 @@ % %% \AtBeginShipout: based on TRUE of \ESO@isMEMOIR \AtBeginShipout{% - \@tempdima=\dimexpr(\stockwidth-\paperwidth)/2\relax - \@tempdimb=-\dimexpr(\stockheight+\paperheight)/2\relax + \ESO@tempdima=\dimexpr(\stockwidth-\paperwidth)/2\relax + \ESO@tempdimb=-\dimexpr(\stockheight+\paperheight)/2\relax \ifESO@texcoord - \advance\@tempdimb\paperheight % [FIXME] not sure! + \advance\ESO@tempdimb\paperheight % [FIXME] not sure! \fi + %% specific BEGIN + \advance\ESO@tempdima -\hoffset\relax + \advance\ESO@tempdimb \voffset\relax + %% specific END \nointerlineskip \AtBeginShipoutUpperLeft{% - \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){% + \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){% \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG \global\let\ESO@HookIIBG\@empty }% }% \AtBeginShipoutUpperLeftForeground{% - \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){% + \put(\LenToUnit{\ESO@tempdima},\LenToUnit{\ESO@tempdimb}){% \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG \global\let\ESO@HookIIFG\@empty }% diff --git a/macros/latex/contrib/gentombow/pxgentombow.pdf b/macros/latex/contrib/gentombow/pxgentombow.pdf Binary files differindex a0da4121e0..d30a4509e4 100644 --- a/macros/latex/contrib/gentombow/pxgentombow.pdf +++ b/macros/latex/contrib/gentombow/pxgentombow.pdf diff --git a/macros/latex/contrib/gentombow/pxgentombow.sty b/macros/latex/contrib/gentombow/pxgentombow.sty index ab28b38bb1..bd94b4bcee 100644 --- a/macros/latex/contrib/gentombow/pxgentombow.sty +++ b/macros/latex/contrib/gentombow/pxgentombow.sty @@ -8,7 +8,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pxgentombow} - [2018/05/17 v0.9g Generate crop mark 'tombow'] + [2020/10/14 v0.9l Generate crop mark 'tombow'] \PackageWarningNoLine{pxgentombow}{% Package `pxgentombow' is now superseded by\MessageBreak `gentombow', use `gentombow' instead} diff --git a/macros/latex/contrib/gentombow/pxpdfpages.sty b/macros/latex/contrib/gentombow/pxpdfpages.sty new file mode 100644 index 0000000000..ad86ea819b --- /dev/null +++ b/macros/latex/contrib/gentombow/pxpdfpages.sty @@ -0,0 +1,72 @@ +% +% pxpdfpages.sty +% written by Hironobu Yamashita (@aminophen) +% +% This package is part of the gentombow bundle. +% https://github.com/aminophen/gentombow +% +% This package is expected to be compatible with +% * pdfpages.sty +% (2015/07/19 v0.5a -- 2020/01/28 v0.5q) +% + +%% package declaration +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{pxpdfpages} + [2020/10/11 v0.4c Patch to pdfpages for tombow] + +%% preparations +\def\pxpdpg@pkgname{pxpdfpages} +\def\pxpdpg@warn{\PackageWarningNoLine\pxpdpg@pkgname} +\def\pxpdpg@info{\PackageInfo\pxpdpg@pkgname} +\let\pxpdpg@debug\@gobble +%\def\pxpdpg@debug#1{\typeout{\pxpdpg@pkgname: [DEBUG] #1}}% for debug + +%% load it +\RequirePackageWithOptions{pdfpages}% pdfpages requires atbegshi +\ifx\pfmtname\@undefined\else + \ifx\AtBegShi@Output\@undefined + % LaTeX2e 2020-10-01: an emulation by ``atbegshi-ltx.sty'' + % => pLaTeX2e 2020-10-01 natively supports it + \else + % older: the real ``atbegshi.sty'' is loaded + \IfFileExists{pxatbegshi.sty}{\RequirePackage{pxatbegshi}}{} + \fi +\fi + +%% do it +%-- similar to bounddvi.sty (checked 2020/10/08 v8.2) +% detection of \iftombow availability is delayed until \AtBeginDocument, +% to support both (u)pLaTeX kernel and ``gentombow.sty'' +\AtBeginDocument{\pxpdpg@do} +\def\pxpdpg@do{% + \ifx\tombowtrue\@undefined + \pxpdpg@debug{Tombow feature unavailable, no patch applied}% + \let\pxpdpg@switch\relax % do nothing + \fi + \pxpdpg@switch} +% +\def\pxpdpg@switch{\pxpdpg@patch@pdfpages} + +%% patch internal for pdfpages to work with tombow +%-- Note: this code should be copied to gentombow.sty! +\def\pxpdpg@patch@pdfpages{% + \RequirePackage{etoolbox} + \patchcmd{\AM@output}{% + \setlength{\@tempdima}{\AM@xmargin}% + \edef\AM@xmargin{\the\@tempdima}% + \setlength{\@tempdima}{\AM@ymargin}% + \edef\AM@ymargin{\the\@tempdima}% + }{% + \setlength{\@tempdima}{\AM@xmargin\iftombow+1in\fi}% + \edef\AM@xmargin{\the\@tempdima}% + \setlength{\@tempdima}{\AM@ymargin\iftombow-1in\fi}% + \edef\AM@ymargin{\the\@tempdima}% + }% + {\pxpdpg@info{Patch for pdfpages applied}}% + {\pxpdpg@warn{Patch for pdfpages failed}}% +} + +%% all done + +\endinput diff --git a/language/japanese/plautopatch/pxtextpos.sty b/macros/latex/contrib/gentombow/pxtextpos.sty index c6e7cf5fe0..02cd5202e2 100644 --- a/language/japanese/plautopatch/pxtextpos.sty +++ b/macros/latex/contrib/gentombow/pxtextpos.sty @@ -2,8 +2,8 @@ % pxtextpos.sty % written by Hironobu Yamashita (@aminophen) % -% This package is part of the plautopatch bundle. -% https://github.com/aminophen/plautopatch +% This package is part of the gentombow bundle. +% https://github.com/aminophen/gentombow % % This package is expected to be compatible with % * textpos.sty @@ -13,21 +13,47 @@ %% package declaration \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pxtextpos} - [2019/11/17 v0.2a Patch to textpos for tombow] + [2020/10/11 v0.4b Patch to textpos for tombow] %% preparations \def\pxtxtpos@pkgname{pxtextpos} \def\pxtxtpos@warn{\PackageWarningNoLine\pxtxtpos@pkgname} +\let\pxtxtpos@debug\@gobble +%\def\pxtxtpos@debug#1{\typeout{\pxtxtpos@pkgname: [DEBUG] #1}}% for debug %% load it \RequirePackageWithOptions{textpos} - -%% check if \iftombow ... \fi is available -\ifx\tombowtrue\@undefined - \pxtxtpos@warn{Tombow feature unavailable, aborting} - \expandafter\endinput +% textpos requires everyshi, only if both conditions are met: +% (1) \fmtversion is **older** than 2020/10/01 +% (2) \ifTP@abspos == \iftrue +% [TODO] tate-mode support is incomplete! +\ifx\pfmtname\@undefined\else + \ifx\@EveryShipout@Output\@undefined + % LaTeX2e 2020-10-01: an emulation by ``everyshi-ltx.sty'' + % => pLaTeX2e 2020-10-01 natively supports it + \else + % older: the real ``everyshi.sty'' is loaded + \IfFileExists{pxeveryshi.sty}{\RequirePackage{pxeveryshi}}{} + \fi \fi +%% do it +%-- similar to bounddvi.sty (checked 2020/10/08 v8.2) +% detection of \iftombow availability is delayed until \AtBeginDocument, +% to support both (u)pLaTeX kernel and ``gentombow.sty'' +\AtBeginDocument{\pxtxtpos@do} +\def\pxtxtpos@do{% + \ifx\tombowtrue\@undefined + \pxtxtpos@debug{Tombow feature unavailable, no patch applied}% + \let\pxtxtpos@switch\relax % do nothing + \fi + \pxtxtpos@switch} +% +\def\pxtxtpos@switch{% + \let\textblockorigin\pxtxtpos@textblockorigin + \ifTP@abspos\textblockorigin{0pt}{0pt}\fi %% reset +} + %% known definition \def\pxtxtpos@textblockorigin#1#2{% \ifTP@abspos @@ -47,14 +73,16 @@ } \@onlypreamble\pxtxtpos@textblockorigin -%% redefine it +%% check definition \ifx\textblockorigin\pxtxtpos@textblockorigin\else \pxtxtpos@warn{% Command \noexpand\textblockorigin is beyond my knowledge.\MessageBreak I will apply the patch anyway, but it may break:\MessageBreak Please report to the author of `\pxtxtpos@pkgname.sty'} \fi -\def\textblockorigin#1#2{% + +%% new definition +\def\pxtxtpos@textblockorigin#1#2{% \ifTP@abspos \TP@ox=-1in \addtolength\TP@ox{#1} \TP@oy=-1in \addtolength\TP@oy{#2} @@ -76,10 +104,5 @@ \fi } -%% reset -\ifTP@abspos - \textblockorigin{0pt}{0pt}% -\fi - \endinput %% EOF diff --git a/macros/latex/contrib/leaflet/README.md b/macros/latex/contrib/leaflet/README.md index bc86a82757..f69c75208c 100644 --- a/macros/latex/contrib/leaflet/README.md +++ b/macros/latex/contrib/leaflet/README.md @@ -11,13 +11,8 @@ Recommended TDS locations: leaflet.cls: tex/latex/leaflet leaflet.pdf,leaflet-manual.pdf: doc/latex/leaflet ``` -For general installation advice, see -http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages For bug reports use [this address](https://github.com/rolfn/leaflet/issues). The leaflet document class is also on CTAN:[macros/latex/contrib/leaflet](http://mirrors.ctan.org/macros/latex/contrib/leaflet) - - - diff --git a/macros/latex/contrib/leaflet/leaflet-manual.pdf b/macros/latex/contrib/leaflet/leaflet-manual.pdf Binary files differindex 01c189db39..07cf61a3f2 100644 --- a/macros/latex/contrib/leaflet/leaflet-manual.pdf +++ b/macros/latex/contrib/leaflet/leaflet-manual.pdf diff --git a/macros/latex/contrib/leaflet/leaflet.dtx b/macros/latex/contrib/leaflet/leaflet.dtx index da7360318c..1acc4424c7 100644 --- a/macros/latex/contrib/leaflet/leaflet.dtx +++ b/macros/latex/contrib/leaflet/leaflet.dtx @@ -20,16 +20,16 @@ % \fi % % \iffalse -%<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01] +%<class>\NeedsTeXFormat{LaTeX2e}[2020-10-01] %<class>\ProvidesClass{leaflet} -%<class> [2015/12/27 v1.1a LaTeX document class (JS,WaS,RN,HjG)] +%<class> [2020/10/14 v2.0b LaTeX document class (JS,WaS,RN,HjG)] % %<*driver|manual> %<driver>\def\filename{leaflet.dtx} %<manual>\def\filename{leaflet-manual.tex} -\def\fileversion{v1.1b} % change this when leaflet-manual changed, too. -\def\filedate{2017/03/17} -\def\docdate {2015/12/27} % change this when leaflet-manual changed, too. +\def\fileversion{v2.0b} % change this when leaflet-manual changed, too. +\def\filedate{2020/10/14} +\def\docdate {2020/10/14} % change this when leaflet-manual changed, too. %</driver|manual> %<*driver> \listfiles @@ -52,7 +52,7 @@ %</driver> % \fi % -% \CheckSum{1303} +% \CheckSum{1272} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -144,16 +144,29 @@ %<*class> % \end{macrocode} % +% \subsection{Test whether the LaTeX format is new enough} +% We use the 'shipout/before' hook. +% \begin{macrocode} +\@ifundefined{DiscardShipoutBox}{% + \ClassError{leaflet}{% + LaTeX version equal to or newer \MessageBreak + than '2020-10-01' is required% + }{% + Renew your TeX installation.% + }% +}{} +% \end{macrocode} % \subsection{Saving some internal macros\dots} % % \begin{macrocode} -\let\LL@shipout\shipout \let\LL@outputpage\@outputpage -\let\LL@begindvi\@begindvi \let\LL@@end\@@end +\let\LL@begindvi\@begindvi % \end{macrocode} % \subsection{Option processing} % % \changes{v1.0b}{2004/08/12}{New option -% \texttt{nospecialtricks} for testing purposes. (RN)} +% \texttt{nospecialtricks} for testing purposes. (RN)} +% \changes{v2.0a}{2020/10/13}{The macro \cmd{\LenToUnit} is no longer +% required. (RN)} % \begin{macrocode} \@ifundefined{iflandscape}{\newif\iflandscape}{}% \@ifundefined{iftumble}{\newif\iftumble}{}% @@ -213,10 +226,10 @@ \DeclareOption{foldmark}{% \def\LL@foldmark{% \begingroup - \linethickness{\LenToUnit{\foldmarkrule}}% + \linethickness{\foldmarkrule}% \@tempdima=\dimexpr\paperheight-\LL@tmargin - \put(0,\LenToUnit{\@tempdima}){% - \line(0,-1){\LenToUnit{\foldmarklength}}}% + \put(0,\@tempdima){% + \line(0,-1){\foldmarklength}}% \endgroup}% } % \end{macrocode} @@ -284,13 +297,12 @@ % \begin{macro}{\write} % \begin{macro}{\openout} % \begin{macro}{\closeout} -% Im Folgenden definieren wir die \TeX{} primitives \cmd{\immediate}, -% \cmd{\write}, \cmd{\openout} und \cmd{\closeout} um. Alle nicht -% ``immediate'' ausgef\"uhrten Anweisungen werden dem Makro -% \cmd{\@@@pending@outs} (Kommaliste) hinzugef\"ugt. So k\"onnen speziell die -% \cmd{\write}-Anweisungen unabh\"angig von \TeX's \cmd{\shipout} -% zu einem g\"unstigen Zeitpunkt ausgef\"uhrt werden. For V\TeX\ we -% must keep in mind that \cmd{\immediate}\cmd{\special} exist. +% In the following we redefine the \TeX{} primitives \cmd{\immediate}, +% \cmd{\write}, \cmd{\openout}, and \cmd{\closeout}. All of them not +% ``immediate'' executed statements are added to the macro +% \cmd{\@@@pending@outs} (comma list). So especially the \cmd{\write} +% statements independent of \TeX's \cmd{\shipout} run at a convenient time. For +% V\TeX\ we must keep in mind that \cmd{\immediate}\cmd{\special} exist. % \changes{v1.0b}{2004/08/12}{\cmd{\special} must be processed similar % to e.\,g. \cmd{\write} (V\TeX). (RN)} % \begin{macrocode} @@ -426,20 +438,20 @@ % ready. It works only for output commands in the main text which moved to % the next page but not for floating output commands. % \begin{macrocode} - \newcommand*\@@@exec@outs{% - \begingroup +\newcommand*\@@@exec@outs{% + \begingroup % \end{macrocode} % Pending io's $=\cmd{\@tempcntb} = \mbox{TOTAL-OUTS}\,-\,\mbox{LAST-EXEC}$ % \begin{macrocode} - \@tempcntb\c@@@total@outs\advance\@tempcntb-\c@@@last@exec% - \edef\reserved@a{\botmarks\@@@out@mark}% - \ifx\reserved@a\@empty\@tempcnta\z@\else\@tempcnta\reserved@a\fi% - \LL@debug@info{PENDING-OUTS:\the\@tempcntb\space\space - TOTAL-OUTS:\the\c@@@total@outs\space\space - LAST-EXEC:\the\c@@@last@exec\space\space - TOPMARK:\topmarks\@@@out@mark\space\space - FIRSTMARK:\firstmarks\@@@out@mark\space\space - BOTMARK:\botmarks\@@@out@mark}% + \@tempcntb\c@@@total@outs\advance\@tempcntb-\c@@@last@exec% + \edef\reserved@a{\botmarks\@@@out@mark}% + \ifx\reserved@a\@empty\@tempcnta\z@\else\@tempcnta\reserved@a\fi% + \LL@debug@info{PENDING-OUTS:\the\@tempcntb\space\space + TOTAL-OUTS:\the\c@@@total@outs\space\space + LAST-EXEC:\the\c@@@last@exec\space\space + TOPMARK:\topmarks\@@@out@mark\space\space + FIRSTMARK:\firstmarks\@@@out@mark\space\space + BOTMARK:\botmarks\@@@out@mark}% % \end{macrocode} % Last valid pending entry $ = \cmd{\@tempcntb} = % \mbox{PENDING-OUTS}\,-\,\mbox{TOTAL-OUTS}\,+\,\mbox{BOTMARK} $ @@ -447,33 +459,33 @@ % Number of invalid (moved) out's $ = \cmd{\@tempcnta} = % \mbox{TOTAL-OUTS}\,-\,\mbox{BOTMARK} $ % \begin{macrocode} - \advance\@tempcnta-\c@@@total@outs \advance\@tempcntb\@tempcnta - \@tempcnta-\@tempcnta% - \ifnum\@tempcnta>\z@ - \LL@debug@info{% - >>> resave \the\@tempcnta\space output command(s). - Too early to execute! <<<}% - \fi - \@tempcnta\z@ \def\reserved@b{}% - \@for\reserved@a :=\@@@pending@outs\do{% - \ifx\reserved@a\@empty\else - \ifnum\@tempcnta<\@tempcntb% - \reserved@a% execute output's related to the current page box. - \global\advance\c@@@last@exec\@ne - \LL@debug@info{>>> execute output command number - \the\c@@@last@exec\space<<<}% - \else + \advance\@tempcnta-\c@@@total@outs \advance\@tempcntb\@tempcnta + \@tempcnta-\@tempcnta% + \ifnum\@tempcnta>\z@ + \LL@debug@info{% + >>> resave \the\@tempcnta\space output command(s). + Too early to execute! <<<}% + \fi + \@tempcnta\z@ \def\reserved@b{}% + \@for\reserved@a :=\@@@pending@outs\do{% + \ifx\reserved@a\@empty\else + \ifnum\@tempcnta<\@tempcntb% + \reserved@a% execute output's related to the current page box. + \global\advance\c@@@last@exec\@ne + \LL@debug@info{>>> execute output command number + \the\c@@@last@exec\space<<<}% + \else % \end{macrocode} % Other output's must be resaved and still pending. % \begin{macrocode} - \expandafter\g@addto@macro\expandafter\reserved@b\expandafter{% - \reserved@a,}% - \fi - \advance\@tempcnta\@ne% - \fi}% - \expandafter\@temptokena\expandafter{\reserved@b}% - \xdef\@@@pending@outs{\the\@temptokena}% - \endgroup}% + \expandafter\g@addto@macro\expandafter\reserved@b\expandafter{% + \reserved@a,}% + \fi + \advance\@tempcnta\@ne% + \fi}% + \expandafter\@temptokena\expandafter{\reserved@b}% + \xdef\@@@pending@outs{\the\@temptokena}% + \endgroup}% % \end{macrocode} % \end{macro} % \begin{macrocode} @@ -498,13 +510,6 @@ \if@nobreak\ifvmode\nobreak\fi\fi}% % \end{macrocode} % \end{macro} -% \begin{macro}{\shipout} -% We make \LaTeX's \cmd{\shipout} inefficacious (no more shipout at -% all). -% \begin{macrocode} - \def\shipout{\deadcycles\z@\setbox\@tempboxa=} -% \end{macrocode} -% \end{macro} % \begin{macro}{\@begindvi} % Delay \cmd{\@begindvi} to be executed until the real page output. % \begin{macrocode} @@ -519,7 +524,7 @@ % package `calc'.(RN)} % \begin{macrocode} \LoadClass{article} -\RequirePackage{everyshi,graphicx} +\RequirePackage{graphicx} % \end{macrocode} % \begin{macro}{\LL@pagesize@specials} % Now the graphics driver is known. @@ -540,27 +545,27 @@ \if@tempswa \ClassInfo{leaflet}{Generating code for dvips}% \def\LL@pagesize@specials#1#2{% - \@tempdima=#1\@tempdimb=#2% + \@tempdima=#1\@tempdimb=#2 % \AtBeginDvi{\special{papersize=\the\@tempdima,\the\@tempdimb}}}% \fi \def\reserved@a{pdftex}% \ifx\filename@base\reserved@a \ClassInfo{leaflet}{Generating code for pdfTeX}% \def\LL@pagesize@specials#1#2{% - \@tempdima=#1\@tempdimb=#2% + \@tempdima=#1\@tempdimb=#2 % \pdfpagewidth\@tempdima\pdfpageheight\@tempdimb}% \fi \def\reserved@a{luatex}% \ifx\filename@base\reserved@a \ClassInfo{leaflet}{Generating code for LuaTeX}% - \ifx\pdfvariable\@undefined + \ifx\pdfpagewidth\@undefined \def\LL@pagesize@specials#1#2{% - \@tempdima=#1\@tempdimb=#2% - \pdfpagewidth\@tempdima\pdfpageheight\@tempdimb}% + \@tempdima=#1\@tempdimb=#2 % + \pagewidth\@tempdima\pageheight\@tempdimb}% \else \def\LL@pagesize@specials#1#2{% - \@tempdima=#1\@tempdimb=#2% - \pagewidth\@tempdima\pageheight\@tempdimb}% + \@tempdima=#1\@tempdimb=#2 % + \pdfpagewidth\@tempdima\pdfpageheight\@tempdimb}% \fi \fi \def\reserved@a{xetex}% @@ -814,16 +819,6 @@ % \end{macrocode} % \end{macro} % \end{macro} -% \begin{macro}{\LenToUnit} -% \changes{v1.0a}{2004/08/08}{New macro \cmd{\LenToUnit}. (RN)} -% \changes{v1.1a}{2015/12/27}{\cmd{\providecommand} instead of -% \cmd{\newcommand}. (RN)} -% \cmd{\LenToUnit}\marg{dimension} can be used in a -% |picture| environment instead of multiples of \cmd{\unitlength}. -% \begin{macrocode} -\providecommand\LenToUnit[1]{#1\@gobble} -% \end{macrocode} -% \end{macro} % \begin{macro}{\CutLine} % \begin{macro}{\CutLine*} % \begin{macro}{\Scissors} @@ -840,13 +835,13 @@ \if@tempswa \AddToBackground{#1}{% \put(0,0){% - \rotatebox{90}{\makebox(\LenToUnit{\paperheight},0){% + \rotatebox{90}{\makebox(\paperheight,0){% \normalsize \dotfill}}}}% \else \AddToBackground{#1}{% \put(0,0){% - \rotatebox{90}{\makebox(\LenToUnit{\paperheight},0){% + \rotatebox{90}{\makebox(\paperheight,0){% \normalsize \dotfill\Scissors\dotfill\dotfill\Scissors\dotfill}}}}% \fi @@ -876,7 +871,7 @@ % \end{macro} % We use our own page saving macro instead of real \LaTeX\ output. % \begin{macrocode} -\AtBeginDocument{\EveryShipout{\LL@savePage}} +\AtBeginDocument{\AddToHook{shipout/before}{\LL@processPage}} % \end{macrocode} % \begin{macro}{LL@page} % A counter for the small pages (absolute counting). @@ -885,14 +880,19 @@ \newcommand\LL@tempa{} % \end{macrocode} % \end{macro} -% \begin{macro}{\LL@savePage} +% \begin{macro}{\LL@processPage} % With ``combine'' option the six small pages will be saved in box registers % (\cmd{\LL@boxI}\dots \cmd{\LL@boxVI}). -% The box255 with the page content must be a bit moved to get a -% ``normal-sized'' box. +% The \cmd{\ShipoutBox} with the page content must be a bit moved to get a +% ``normal-sized'' box. In ``nocombine'' mode only put the background picture. % \changes{v1.1a}{2015/12/27}{Additions for new option `foldcorr'. (RN)} +% \changes{v2.0a}{2020/10/13}{Do not call \cmd{\@@@exec@outs} temporarily. (RN)} +% \changes{v2.0a}{2020/10/13}{Using \LaTeX's new 'shipout/before' hook. (RN)} +% \changes{v2.0b}{2020/10/14}{Renamed \cmd{\LL@savePage} to +% \cmd{\LL@processPage}. (RN)} % \begin{macrocode} -\newcommand*\LL@savePage{% +\newcommand*\LL@processPage{% + \ifLL@combine\DiscardShipoutBox\fi \ifnum\c@LL@page<7\relax \LL@tempdima=\paperwidth \ifLL@combine @@ -908,18 +908,19 @@ \if@tempswa\LL@tempdima=0.9797979798\paperwidth \else\LL@tempdima=1.0101010101\paperwidth \fi \fi - \@@@exec@outs + %%%\@@@exec@outs \expandafter\newsavebox\csname LL@box\Roman{LL@page}\endcsname% - \setbox\@cclv=\vbox{\vskip1in\unvbox\@cclv}% - \setbox\@cclv=\vbox{\moveright1in\box\@cclv}% - \setbox\@cclv=\hb@xt@\paperwidth{\box\@cclv\hss}% - \iffoldcorr\setbox\@cclv=\hb@xt@\LL@tempdima{\hss\box\@cclv\hss}\fi + \setbox\ShipoutBox=\vbox{\vskip1in\unvbox\ShipoutBox}% + \setbox\ShipoutBox=\vbox{\moveright1in\box\ShipoutBox}% + \setbox\ShipoutBox=\hb@xt@\paperwidth{\box\ShipoutBox\hss}% + \iffoldcorr + \setbox\ShipoutBox=\hb@xt@\LL@tempdima{\hss\box\ShipoutBox\hss}\fi % \end{macrocode} % Add a background picture to a single small page (`combine'). % \begin{macrocode} - \setbox\@cclv=\vb@xt@\paperheight{% + \setbox\ShipoutBox=\vb@xt@\paperheight{% \vbox{% - \pictur@(0,0)(0,\LenToUnit{\paperheight})% + \pictur@(0,0)(0,\paperheight)% \begingroup \set@typeset@protect \paperwidth=\LL@tempdima @@ -927,26 +928,26 @@ \endgroup \endpicture }% - \nointerlineskip\box\@cclv\vss + \nointerlineskip\box\ShipoutBox\vss }% \global\expandafter\setbox - \csname LL@box\Roman{LL@page}\endcsname=\box\@cclv + \csname LL@box\Roman{LL@page}\endcsname=\box\ShipoutBox \typeout{\@spaces[\the\c@LL@page] ==> [\Roman{LL@page}]}% \else % \end{macrocode} % Add a background picture to a single small page (`nocombine'). % \begin{macrocode} - \setbox\@cclv\vbox{% + \setbox\ShipoutBox\vbox{% \vbox{\@tempdima=1in\relax \@tempdimb=\paperheight\advance\@tempdimb-\@tempdima - \pictur@(0,0)(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb})% + \pictur@(0,0)(\@tempdima,\@tempdimb)% \begingroup \set@typeset@protect \@nameuse{LL@smallPic\Roman{LL@page}}% \endgroup \endpicture }% - \nointerlineskip\box\@cclv + \nointerlineskip\box\ShipoutBox }% \fi \fi @@ -967,53 +968,58 @@ % \end{macrocode} % \end{macro} % -% \subsubsection{Generating missing small pages} -% -% NOTE TO OURSELVES: +% \noindent NOTE TO OURSELVES: % All the following must be done if the document code is already -% processed. -% \begin{macrocode} -\ifLL@combine -% \end{macrocode} -% \begin{macro}{\@@end} -% \begin{macrocode} - \def\@@end{% - \clearpage\pagestyle{empty}% +% processed. +% +% \changes{v2.0b}{2020/10/14}{Using hooks instead of redefinition +% of \cmd{\@@end}. (RN)} +% \begin{macro}{\LL@add@empty@pages} +% Generating missing small pages +% \begin{macrocode} +\newcommand*\LL@add@empty@pages{% + \clearpage\pagestyle{empty}% + \loop\ifnum\c@LL@page<7\relax + \ClassInfo{leaflet}{Generating empty page \the\c@page}% + \null\newpage + \repeat +} % \end{macrocode} -% Restore the original \cmd{\@outputpage} command (removing any related -% background pictures). +% \end{macro} +% \begin{macro}{\LL@shipout@combined@pages} % \begin{macrocode} - \let\@outputpage\LL@outputpage +\newcommand*\LL@shipout@combined@pages{% % \end{macrocode} -% Suppresses all everyshi's clients (removing other kinds of -% background pictures) but our page saving macro is still needed for +% +% \subsubsection{Reassembling the small pages} +% +% Suppresses all shipout hook's clients (removing other kinds of +% background pictures). Our page saving macro is still needed for % the next step and must be set again. +% \changes{v2.0b}{2020/10/14}{Suppress other background images. (RN)} % \begin{macrocode} - \def\@EveryShipout@Hook{}% - \def\@EveryShipout@AtNextHook{}% - \EveryShipout{\LL@savePage}% + \RemoveFromHook{shipout/foreground}[*] + \RemoveFromHook{shipout/background}[*] + \RemoveFromHook{shipout/firstpage}[*] + \RemoveFromHook{shipout/lastpage}[*] + \RemoveFromHook{shipout/before}[*] + \AddToHook{shipout/before}{\LL@processPage} % \end{macrocode} % Create empty pages if necessary. % \begin{macrocode} - \loop\ifnum\c@LL@page<7\relax - \ClassInfo{leaflet}{Generating empty page \the\c@page}% - \null\newpage - \repeat + \LL@add@empty@pages % \end{macrocode} -% -% \subsubsection{Reassembling the small pages} -% -% Here begins the real output using \LaTeX's original \cmd{\shipout}. -% The \textsf{everyshi} package isn't active any more. -% The begin dvi hook is reactivated. -% \begin{macrocode} - \let\shipout\LL@shipout \let\@begindvi\LL@begindvi - \paperwidth=3\paperwidth - \iflandscape - \LL@pagesize@specials{\paperwidth}{\paperheight}% - \else - \LL@pagesize@specials{\paperheight}{\paperwidth}% - \fi +% Here begins the real output. LaTeX's \cmd{\shipout} will no more suppressed. +% The begin dvi hook is reactivated. Final removing content from the hook. +% \begin{macrocode} + \RemoveFromHook{shipout/before}[*] + \let\@begindvi\LL@begindvi + \paperwidth=3\paperwidth + \iflandscape + \LL@pagesize@specials{\paperwidth}{\paperheight}% + \else + \LL@pagesize@specials{\paperheight}{\paperwidth}% + \fi % \end{macrocode} % \begin{macro}{\LL@shipoutPage} % \changes{v1.0c}{2004/08/13}{Fix \cmd{\protect}-ion problems. (RN/HjG)} @@ -1024,22 +1030,22 @@ % Helper macros for page output: reassemble the small pages. % % \begin{macrocode} - \newcommand*\LL@shipoutPage[1]{% + \newcommand*\LL@shipoutPage[1]{% % \set@display@protect - \let \protect \noexpand - \shipout\vb@xt@\paperheight{% - \set@typeset@protect - \vskip-1in% - \@begindvi\hb@xt@\paperwidth{\hskip-1in##1\hss}\vss}}% - \newcommand*\LL@preparePages[3]{% - \typeout{[\@Roman{##1}\space\@Roman{##2}\space\@Roman{##3}] ==>}% + \let \protect \noexpand + \shipout\vb@xt@\paperheight{% + \set@typeset@protect + \vskip-1in% + \@begindvi\hb@xt@\paperwidth{\hskip-1in##1\hss}\vss}}% + \newcommand*\LL@preparePages[3]{% + \typeout{[\@Roman{##1}\space\@Roman{##2}\space\@Roman{##3}] ==>}% % \end{macrocode} % Add a background picture to a large page. % \begin{macrocode} - \pictur@(0,0)\@nameuse{LL@largePic\Roman{page}}\endpicture% - \LL@preparePage{##1}\LL@preparePage{##2}\LL@preparePage{##3}}% - \newcommand*\LL@preparePage[1]{% - \expandafter\box\csname LL@box\@Roman{##1}\endcsname}% + \pictur@(0,0)\@nameuse{LL@largePic\Roman{page}}\endpicture% + \LL@preparePage{##1}\LL@preparePage{##2}\LL@preparePage{##3}}% + \newcommand*\LL@preparePage[1]{% + \expandafter\box\csname LL@box\@Roman{##1}\endcsname}% % \end{macrocode} % \end{macro} % \end{macro} @@ -1049,35 +1055,31 @@ % order, to allow the typesetting of a 4 page leaflet and a detachable 2 page % form, for summaries, fill-in forms, applications, questionnaires, etc. % \begin{macrocode} - \LL@selectOutput - \iftwopart - {\setcounter{page}{1}% - \LL@shipoutPage{\LL@rotate@I{\LL@preparePages{6}{4}{1}}}}% - {\setcounter{page}{2}% - \LL@shipoutPage{\LL@rotate@II{\LL@preparePages{2}{3}{5}}}}% - \else - {\setcounter{page}{1}% - \LL@shipoutPage{\LL@rotate@I{\LL@preparePages{5}{6}{1}}}}% - {\setcounter{page}{2}% - \LL@shipoutPage{\LL@rotate@II{\LL@preparePages{2}{3}{4}}}}% - \fi - \LL@@end - }% + \LL@selectOutput + \iftwopart + {\setcounter{page}{1}% + \LL@shipoutPage{\LL@rotate@I{\LL@preparePages{6}{4}{1}}}}% + {\setcounter{page}{2}% + \LL@shipoutPage{\LL@rotate@II{\LL@preparePages{2}{3}{5}}}}% + \else + {\setcounter{page}{1}% + \LL@shipoutPage{\LL@rotate@I{\LL@preparePages{5}{6}{1}}}}% + {\setcounter{page}{2}% + \LL@shipoutPage{\LL@rotate@II{\LL@preparePages{2}{3}{4}}}}% + \fi +}% % \end{macrocode} -% End of the redefinition of \cmd{\@@end}. % \end{macro} -% \begin{macrocode} +% \begin{macrocode} +\ifLL@combine + \AddToHook{enddocument/end}{\LL@shipout@combined@pages} \else % \end{macrocode} % Create empty pages if necessary and then call the normal \LaTeX\ end. % \begin{macrocode} \LL@pagesize@specials{\paperwidth}{\paperheight}% \AtEndDocument{% - \clearpage\pagestyle{empty}% - \loop\ifnum\c@LL@page<7\relax - \ClassInfo{leaflet}{Generating empty page \the\c@page}% - \null\newpage - \repeat + \LL@add@empty@pages } \fi %</class> @@ -1138,8 +1140,7 @@ \MakeShortVerb{\|} \usepackage{url} \usepackage{graphicx} -\usepackage[dvipsnames,usenames]{color} -\definecolor{LIGHTGRAY}{gray}{.9} +\usepackage[svgnames]{xcolor} %%%%\renewcommand{\descfont}{\normalfont} \newcommand\Lpack[1]{\textsf{#1}} @@ -1160,13 +1161,13 @@ \CutLine{6}% Dotted line with scissors \AddToBackground{5}{% Background of a small page - \put(0,0){\textcolor{Cerulean}{\rule{\paperwidth}{\paperheight}}}} + \put(0,0){\textcolor{LightSkyBlue}{\rule{\paperwidth}{\paperheight}}}} \AddToBackground*{2}{% Background of a large page - \put(\LenToUnit{.5\paperwidth},\LenToUnit{.5\paperheight}){% + \put(.5\paperwidth,.5\paperheight){% \makebox(0,0)[c]{% \resizebox{.9\paperwidth}{!}{\rotatebox{35.26}{% - \textsf{\textbf{\textcolor{LIGHTGRAY}{BACKGROUND}}}}}}}} + \textsf{\textbf{\textcolor{LightGray}{BACKGROUND}}}}}}}} \begin{document} @@ -1208,10 +1209,6 @@ document is created in PostScript or PDF format, using \end{itemize} (Some other drivers supported by standard \LaTeX{} work as well.) -The non-standard macro package \Lpack{everyshi} \cite{cit:everyshi} is -used by the \Lclass{leaflet} class. - - \section{Features} Basically the \Lclass{leaflet} class provides the same features as the @@ -1401,9 +1398,6 @@ this document class. \bibitem{cit:latex-man} \textsc{L.\,Lamport}: \LaTeX. A Document Preparation System. \textit{User's Guide And Reference Manual.} Second Edition. 1994. -\bibitem{cit:everyshi} - \textsc{M.\,Schr\"oder}: The \Lpack{everyshi} package. 2001. - CTAN: \url{macros/latex/contrib/ms/everyshi.dtx} \end{thebibliography} \loggingall diff --git a/macros/latex/contrib/leaflet/leaflet.pdf b/macros/latex/contrib/leaflet/leaflet.pdf Binary files differindex ee6687ad8c..7f2ae79914 100644 --- a/macros/latex/contrib/leaflet/leaflet.pdf +++ b/macros/latex/contrib/leaflet/leaflet.pdf diff --git a/macros/latex/contrib/thuthesis/CHANGELOG.md b/macros/latex/contrib/thuthesis/CHANGELOG.md index 015689074a..05e7be0d81 100644 --- a/macros/latex/contrib/thuthesis/CHANGELOG.md +++ b/macros/latex/contrib/thuthesis/CHANGELOG.md @@ -6,6 +6,24 @@ ## [Unreleased] +## [v7.1.0] - 2020-10-14 +### Changed +- 更新摘è¦çš„æ ‡é¢˜æ ¼å¼ï¼ˆç ”究生 2020-09-18 版)。 +- æ›´æ–°ç›®å½•çš„æ ¼å¼ï¼ˆç ”究生 2020-09-18 版)。 +- 图表浮动体的ä½ç½®å‚数默认为 `h`。 +- 更新示例文档。 + +### Fixed +- ä¿®æ£ â€œkeywords†的拼写。 +- ä¿®æ£æŽˆæƒä½¿ç”¨è¯´æ˜Žçš„内容。 +- ä¿®æ£æŽˆä¼ªç²—å—体的粗度。 +- ä¿®æ£ `\small` ç‰å—å·å‘½ä»¤çš„è¡Œè·ã€‚ +- ä¿®æ£æ•°å¦å…¬å¼å‰åŽçš„è·ç¦»ã€‚ +- ä¿®æ£ä¸ªäººç®€åŽ†å’Œå¦æœ¯æˆæžœçš„æ ¼å¼ã€‚ +- ä¿®æ£å›¾è¡¨æ ‡é¢˜çš„è¡Œè·ã€‚ +- ç¦æ¢åŒä¸€æ¡å‚考文献ä¸é—´åˆ†é¡µã€‚ +- ä¿®æ£è„šæ³¨çš„è¡Œè·å’Œç¼©è¿›è·ç¦»ã€‚ + ## [v7.0.0] - 2020-09-09 ### Changed - æ›´æ–° 2020 年版目录ã€æ’图和附表清å•çš„æ ¼å¼ã€‚ @@ -624,7 +642,8 @@ -[Unreleased]: https://github.com/tuna/thuthesis/compare/v7.0.0...HEAD +[Unreleased]: https://github.com/tuna/thuthesis/compare/v7.1.0...HEAD +[v7.1.0]: https://github.com/tuna/thuthesis/compare/v7.0.0...v7.1.0 [v7.0.0]: https://github.com/tuna/thuthesis/compare/v6.1.3...v7.0.0 [v6.1.3]: https://github.com/tuna/thuthesis/compare/v6.1.2...v6.1.3 [v6.1.2]: https://github.com/tuna/thuthesis/compare/v6.1.1...v6.1.2 diff --git a/macros/latex/contrib/thuthesis/Makefile b/macros/latex/contrib/thuthesis/Makefile index 3ab76d06e3..1a7fd81641 100644 --- a/macros/latex/contrib/thuthesis/Makefile +++ b/macros/latex/contrib/thuthesis/Makefile @@ -82,8 +82,8 @@ check: FORCE_MAKE ifeq ($(version),) @echo "Error: version missing: \"make [check|dist] version=X.Y.Z\""; exit 1 else - @[[ $(shell grep -E -c '$(version) Tsinghua University Thesis Template|\\def\\version\{$(version)\}' thuthesis.dtx) -eq 3 ]] || (echo "update version in thuthesis.dtx before release"; exit 1) - @[[ $(shell grep -E -c '"version": "$(version)"' package.json) -eq 1 ]] || (echo "update version in package.json before release"; exit 1) + @[[ $(shell grep -E -c '$(version) Tsinghua University Thesis Template|\\def\\version\{$(version)\}' thuthesis.dtx) -eq 3 ]] || (echo "update version with \'l3build tag\" before release"; exit 1) + @[[ $(shell grep -E -c '"version": "$(version)"' package.json) -eq 1 ]] || (echo "update version with \'l3build tag\" before release"; exit 1) endif dist: check all-dev diff --git a/macros/latex/contrib/thuthesis/README.md b/macros/latex/contrib/thuthesis/README.md index 6e6eb06a31..ed0788a5ad 100644 --- a/macros/latex/contrib/thuthesis/README.md +++ b/macros/latex/contrib/thuthesis/README.md @@ -34,6 +34,7 @@ Scroll down for the English version of README. * [CTAN](https://www.ctan.org/pkg/thuthesis):å¯èƒ½æ»žåŽæ£å¼å‘布少许时间。 * [GitHub Releases](https://github.com/tuna/thuthesis/releases):最新版的åŠæ—¶å‘布途径。 * [TUNA é•œåƒç«™](https://mirrors.tuna.tsinghua.edu.cn/github-release/tuna/thuthesis/):GitHub Releases çš„é•œåƒã€‚ + * [Overleaf](https://www.overleaf.com/latex/templates/thuthesis-tsinghua-university-thesis-latex-template/wddqnwbyhtnk):Overleaf 的模æ¿ã€‚ * å¼€å‘版:[GitHub](https://github.com/tuna/thuthesis) ## 更新日志 @@ -102,6 +103,7 @@ Developer versions contain only source code but no pre-compiled `cls` file and d * [CTAN](https://www.ctan.org/pkg/thuthesis) * [GitHub Releases](https://github.com/tuna/thuthesis/releases) * [TUNA Mirrors](https://mirrors.tuna.tsinghua.edu.cn/github-release/tuna/thuthesis/): mirror of GitHub Releases + * [Overleaf Template](https://www.overleaf.com/latex/templates/thuthesis-tsinghua-university-thesis-latex-template/wddqnwbyhtnk) * Developer versions: [GitHub](https://github.com/tuna/thuthesis) ## Changelog diff --git a/macros/latex/contrib/thuthesis/data/abstract.tex b/macros/latex/contrib/thuthesis/data/abstract.tex index 5567a1ed95..babbca3f46 100644 --- a/macros/latex/contrib/thuthesis/data/abstract.tex +++ b/macros/latex/contrib/thuthesis/data/abstract.tex @@ -3,54 +3,37 @@ % ä¸è‹±æ–‡æ‘˜è¦å’Œå…³é”®å— \begin{abstract} - 论文的摘è¦æ˜¯å¯¹è®ºæ–‡ç ”究内容和æˆæžœçš„高度概括。摘è¦åº”å¯¹è®ºæ–‡æ‰€ç ”ç©¶çš„é—®é¢˜åŠå…¶ç ”究目 - 的进行æè¿°ï¼Œå¯¹ç ”ç©¶æ–¹æ³•å’Œè¿‡ç¨‹è¿›è¡Œç®€å•ä»‹ç»ï¼Œå¯¹ç ”究æˆæžœå’Œæ‰€å¾—结论进行概括。摘è¦åº” - 具有独立性和自明性,其内容应包å«ä¸Žè®ºæ–‡å…¨æ–‡åŒç‰é‡çš„主è¦ä¿¡æ¯ã€‚使读者å³ä½¿ä¸é˜…读全 - 文,通过摘è¦å°±èƒ½äº†è§£è®ºæ–‡çš„总体内容和主è¦æˆæžœã€‚ + 论文的摘è¦æ˜¯å¯¹è®ºæ–‡ç ”究内容和æˆæžœçš„高度概括。 + 摘è¦åº”å¯¹è®ºæ–‡æ‰€ç ”ç©¶çš„é—®é¢˜åŠå…¶ç ”究目的进行æè¿°ï¼Œå¯¹ç ”ç©¶æ–¹æ³•å’Œè¿‡ç¨‹è¿›è¡Œç®€å•ä»‹ç»ï¼Œå¯¹ç ”究æˆæžœå’Œæ‰€å¾—结论进行概括。 + 摘è¦åº”具有独立性和自明性,其内容应包å«ä¸Žè®ºæ–‡å…¨æ–‡åŒç‰é‡çš„主è¦ä¿¡æ¯ã€‚ + 使读者å³ä½¿ä¸é˜…读全文,通过摘è¦å°±èƒ½äº†è§£è®ºæ–‡çš„总体内容和主è¦æˆæžœã€‚ - 论文摘è¦çš„书写应力求精确ã€ç®€æ˜Žã€‚切忌写æˆå¯¹è®ºæ–‡ä¹¦å†™å†…容进行æè¦çš„å½¢å¼ï¼Œå°¤å…¶è¦é¿ - å…“第 1 ç« â€¦â€¦ï¼›ç¬¬ 2 ç« â€¦â€¦ï¼›â€¦â€¦â€è¿™ç§æˆ–类似的陈述方å¼ã€‚ + 论文摘è¦çš„书写应力求精确ã€ç®€æ˜Žã€‚ + 切忌写æˆå¯¹è®ºæ–‡ä¹¦å†™å†…容进行æè¦çš„å½¢å¼ï¼Œå°¤å…¶è¦é¿å…“第 1 ç« â€¦â€¦ï¼›ç¬¬ 2 ç« â€¦â€¦ï¼›â€¦â€¦â€è¿™ç§æˆ–类似的陈述方å¼ã€‚ - 本文介ç»æ¸…åŽå¤§å¦è®ºæ–‡æ¨¡æ¿ \thuthesis{} 的使用方法。本模æ¿ç¬¦åˆå¦æ ¡çš„本科ã€ç¡•å£«ã€ - åšå£«è®ºæ–‡æ ¼å¼è¦æ±‚。 + 关键è¯æ˜¯ä¸ºäº†æ–‡çŒ®æ ‡å¼•å·¥ä½œã€ç”¨ä»¥è¡¨ç¤ºå…¨æ–‡ä¸»è¦å†…容信æ¯çš„å•è¯æˆ–术è¯ã€‚ + 关键è¯ä¸è¶…过 5 个,æ¯ä¸ªå…³é”®è¯ä¸é—´ç”¨åˆ†å·åˆ†éš”。 - 本文的创新点主è¦æœ‰ï¼š - \begin{itemize} - \item 用例åæ¥è§£é‡Šæ¨¡æ¿çš„使用方法; - \item 用废è¯æ¥å¡«å……æ— å…³ç´§è¦çš„部分; - \item 一边å¦ä¹ 摸索一边编写新代ç 。 - \end{itemize} - - 关键è¯æ˜¯ä¸ºäº†æ–‡çŒ®æ ‡å¼•å·¥ä½œã€ç”¨ä»¥è¡¨ç¤ºå…¨æ–‡ä¸»è¦å†…容信æ¯çš„å•è¯æˆ–术è¯ã€‚关键è¯ä¸è¶…过 5 - 个,æ¯ä¸ªå…³é”®è¯ä¸é—´ç”¨åˆ†å·åˆ†éš”。(模æ¿ä½œè€…注:关键è¯åˆ†éš”符ä¸ç”¨è€ƒè™‘,模æ¿ä¼šè‡ªåŠ¨å¤„ - ç†ã€‚英文关键è¯åŒç†ã€‚) - - % 关键è¯ç”¨â€œè‹±æ–‡é€—å·â€åˆ†éš” + % 关键è¯ç”¨â€œè‹±æ–‡é€—å·â€åˆ†éš”,输出时会自动处ç†ä¸ºæ£ç¡®çš„分隔符 \thusetup{ - keywords = {TeX, LaTeX, CJK, 模æ¿, 论文}, + keywords = {å…³é”®è¯ 1, å…³é”®è¯ 2, å…³é”®è¯ 3, å…³é”®è¯ 4, å…³é”®è¯ 5}, } \end{abstract} \begin{abstract*} - An abstract of a dissertation is a summary and extraction of research work - and contributions. Included in an abstract should be description of research - topic and research objective, brief introduction to methodology and research - process, and summarization of conclusion and contributions of the - research. An abstract should be characterized by independence and clarity and - carry identical information with the dissertation. It should be such that the - general idea and major contributions of the dissertation are conveyed without - reading the dissertation. - - An abstract should be concise and to the point. It is a misunderstanding to - make an abstract an outline of the dissertation and words ``the first - chapter'', ``the second chapter'' and the like should be avoided in the - abstract. - - Key words are terms used in a dissertation for indexing, reflecting core - information of the dissertation. An abstract may contain a maximum of 5 key - words, with semi-colons used in between to separate one another. + An abstract of a dissertation is a summary and extraction of research work and contributions. + Included in an abstract should be description of research topic and research objective, brief introduction to methodology and research process, and summarization of conclusion and contributions of the research. + An abstract should be characterized by independence and clarity and carry identical information with the dissertation. + It should be such that the general idea and major contributions of the dissertation are conveyed without reading the dissertation. + + An abstract should be concise and to the point. + It is a misunderstanding to make an abstract an outline of the dissertation and words “the first chapterâ€, “the second chapter†and the like should be avoided in the abstract. + + Keywords are terms used in a dissertation for indexing, reflecting core information of the dissertation. + An abstract may contain a maximum of 5 keywords, with semi-colons used in between to separate one another. + % Use comma as seperator when inputting \thusetup{ - keywords* = {TeX, LaTeX, CJK, template, thesis}, + keywords* = {keyword 1, keyword 2, keyword 3, keyword 4, keyword 5}, } \end{abstract*} diff --git a/macros/latex/contrib/thuthesis/data/acknowledgements.tex b/macros/latex/contrib/thuthesis/data/acknowledgements.tex index 04026682bb..43437169d2 100644 --- a/macros/latex/contrib/thuthesis/data/acknowledgements.tex +++ b/macros/latex/contrib/thuthesis/data/acknowledgements.tex @@ -1,12 +1,11 @@ % !TeX root = ../thuthesis-example.tex \begin{acknowledgements} - 衷心感谢导师 xxx 教授和物ç†ç³» xxx å‰¯æ•™æŽˆå¯¹æœ¬äººçš„ç²¾å¿ƒæŒ‡å¯¼ã€‚ä»–ä»¬çš„è¨€ä¼ èº«æ•™å°†ä½¿ - 我终生å—益。 + 衷心感谢导师×××教授和物ç†ç³»Ã—Ã—å‰¯æ•™æŽˆå¯¹æœ¬äººçš„ç²¾å¿ƒæŒ‡å¯¼ã€‚ä»–ä»¬çš„è¨€ä¼ èº«æ•™å°†ä½¿æˆ‘ç»ˆç”Ÿå—益。 - 在美国麻çœç†å·¥å¦é™¢åŒ–å¦ç³»è¿›è¡Œä¹ä¸ªæœˆçš„åˆä½œç ”究期间,承蒙 xxx 教授çƒå¿ƒæŒ‡å¯¼ä¸Žå¸®åŠ©ï¼Œä¸ - 胜感激。感谢 xx 实验室主任 xx 教授,以åŠå®žéªŒå®¤å…¨ä½“è€å¸ˆå’ŒåŒå¦ä»¬çš„çƒæƒ…帮助和支 - æŒï¼æœ¬è¯¾é¢˜æ‰¿è’™å›½å®¶è‡ªç„¶ç§‘å¦åŸºé‡‘资助,特æ¤è‡´è°¢ã€‚ + 在美国麻çœç†å·¥å¦é™¢åŒ–å¦ç³»è¿›è¡Œä¹ä¸ªæœˆçš„åˆä½œç ”究期间,承蒙 Robert Field 教授çƒå¿ƒæŒ‡å¯¼ä¸Žå¸®åŠ©ï¼Œä¸èƒœæ„Ÿæ¿€ã€‚ - æ„Ÿè°¢ \LaTeX{} å’Œ \thuthesis\cite{thuthesis},帮我节çœäº†ä¸å°‘时间。 + 感谢×××××实验室主任×××教授,以åŠå®žéªŒå®¤å…¨ä½“è€å¸ˆå’ŒåŒçª—们å¦çš„çƒæƒ…帮助和支æŒï¼ + + 本课题承蒙国家自然科å¦åŸºé‡‘资助,特æ¤è‡´è°¢ã€‚ \end{acknowledgements} diff --git a/macros/latex/contrib/thuthesis/data/appendix-survey.tex b/macros/latex/contrib/thuthesis/data/appendix-survey.tex index 5c09088a38..5dd97a7a08 100644 --- a/macros/latex/contrib/thuthesis/data/appendix-survey.tex +++ b/macros/latex/contrib/thuthesis/data/appendix-survey.tex @@ -6,168 +6,67 @@ \title{Title of the Survey} \maketitle -写出至少 5000 外文å°åˆ·å—ç¬¦çš„è°ƒç ”é˜…è¯»æŠ¥å‘Šæˆ–è€…ä¹¦é¢ç¿»è¯‘ 1-2 篇(ä¸å°‘于 2 万外文å°åˆ·ç¬¦)。 - \tableofcontents -\section{Single-Objective Programming} - -It is impossible to cover in a single chapter every concept of mathematical -programming\cite{tex}. This chapter introduces only the basic concepts and techniques of -mathematical programming such that readers gain an understanding of them -throughout the book.~\cite{abrahams99tex,salomon1995advanced}. - -The general form of single-objective programming (SOP) is written -as follows, -\begin{equation*} % 如果附录ä¸çš„å…¬å¼ä¸æƒ³è®©å®ƒå‡ºçŽ°åœ¨å…¬å¼ç´¢å¼•ä¸ï¼Œé‚£å°±è¯· - % 用 equation* -\left\{\begin{array}{l} -\max \,\,f(x)\\%[0.1 cm] -\mbox{subject to:} \\%[0.1 cm] -\qquad g_j(x)\le 0,\quad j=1,2,\cdots,p -\end{array}\right. -\end{equation*} -which maximizes a real-valued function $f$ of -$x=(x_1,x_2,\cdots,x_n)$ subject to a set of constraints. - -\newtheorem{mpdef}{Definition}[chapter] -\begin{mpdef} -In SOP, we call $x$ a decision vector, and -$x_1,x_2,\cdots,x_n$ decision variables. The function -$f$ is called the objective function. The set -\begin{equation*} -S=\left\{x\in\real^n\bigm|g_j(x)\le 0,\,j=1,2,\cdots,p\right\} -\end{equation*} -is called the feasible set. An element $x$ in $S$ is called a -feasible solution. -\end{mpdef} - -\newtheorem{mpdefop}[mpdef]{Definition} -\begin{mpdefop} -A feasible solution $x^*$ is called the optimal -solution of SOP if and only if -\begin{equation} -f(x^*)\ge f(x) -\end{equation} -for any feasible solution $x$. -\end{mpdefop} - -One of the outstanding contributions to mathematical programming was known as -the Kuhn-Tucker conditions~\eqref{eq:ktc}. In order to introduce them, let us give -some definitions. An inequality constraint $g_j(x)\le 0$ is said to be active at -a point $x^*$ if $g_j(x^*)=0$. A point $x^*$ satisfying $g_j(x^*)\le 0$ is said -to be regular if the gradient vectors $\nabla g_j(x)$ of all active constraints -are linearly independent. - -Let $x^*$ be a regular point of the constraints of SOP and assume that all the -functions $f(x)$ and $g_j(x),j=1,2,\cdots,p$ are differentiable. If $x^*$ is a -local optimal solution, then there exist Lagrange multipliers -$\lambda_j,j=1,2,\cdots,p$ such that the following Kuhn-Tucker conditions hold, -\begin{equation} -\label{eq:ktc} -\left\{\begin{array}{l} - \nabla f(x^*)-\sum\limits_{j=1}^p\lambda_j\nabla g_j(x^*)=0\\%[0.3cm] - \lambda_jg_j(x^*)=0,\quad j=1,2,\cdots,p\\%[0.2cm] - \lambda_j\ge 0,\quad j=1,2,\cdots,p. -\end{array}\right. -\end{equation} -If all the functions $f(x)$ and $g_j(x),j=1,2,\cdots,p$ are convex and -differentiable, and the point $x^*$ satisfies the Kuhn-Tucker conditions -\eqref{eq:ktc}, then it has been proved that the point $x^*$ is a global optimal -solution of SOP. - -\subsection{Linear Programming} -\label{sec:lp} - -If the functions $f(x),g_j(x),j=1,2,\cdots,p$ are all linear, then SOP is called -a \emph{linear programming}. - -The feasible set of linear is always convex. A point $x$ is called an extreme -point of convex set $S$ if $x\in S$ and $x$ cannot be expressed as a convex -combination of two points in $S$. It has been shown that the optimal solution to -linear programming corresponds to an extreme point of its feasible set provided -that the feasible set $S$ is bounded. This fact is the basis of the \emph{simplex - algorithm} which was developed by Dantzig as a very efficient method for -solving linear programming. -\begin{table}[ht] -\centering - \centering - \caption{This is an example for table} - \label{tab:badtabular2} - \begin{tabular}[c]{|m{1.5cm}|c|c|c|c|c|c|}\hline - \multicolumn{2}{|c|}{Network Topology} & \# of nodes & - \multicolumn{3}{c|}{\# of clients} & Server \\\hline - GT-ITM & Waxman Transit-Stub & 600 & - \multirow{2}{2em}{2\%}& - \multirow{2}{2em}{10\%}& - \multirow{2}{2em}{50\%}& - \multirow{2}{1.2in}{Max. Connectivity}\\\cline{1-3} - \multicolumn{2}{|c|}{Inet-2.1} & 6000 & & & &\\\hline - \multirow{2}{1.5cm}{Xue} & Rui & Ni &\multicolumn{4}{c|}{\multirow{2}*{\thuthesis}}\\\cline{2-3} - & \multicolumn{2}{c|}{ABCDEF} &\multicolumn{4}{c|}{} \\\hline -\end{tabular} -\end{table} +æœ¬ç§‘ç”Ÿçš„å¤–æ–‡èµ„æ–™è°ƒç ”é˜…è¯»æŠ¥å‘Šã€‚ + -Roughly speaking, the simplex algorithm examines only the extreme points of the -feasible set, rather than all feasible points. At first, the simplex algorithm -selects an extreme point as the initial point. The successive extreme point is -selected so as to improve the objective function value. The procedure is -repeated until no improvement in objective function value can be made. The last -extreme point is the optimal solution. +\section{Figures and Tables} -\subsection{Nonlinear Programming} +\subsection{Figures} -If at least one of the functions $f(x),g_j(x),j=1,2,\dots,p$ is nonlinear, then -SOP is called a \emph{nonlinear programming}. +An example figure in appendix (Figure~\ref{fig:appendix-survey-figure}). -A large number of classical optimization methods have been developed to treat -special-structural nonlinear programming based on the mathematical theory -concerned with analyzing the structure of problems. -\begin{figure}[h] +\begin{figure} \centering - \includegraphics{thu-lib-logo.pdf} - \caption{This is an example for figure.} - \label{tab:badfigure2} + \includegraphics[width=0.6\linewidth]{example-image-a.pdf} + \caption{Example figure in appendix} + \label{fig:appendix-survey-figure} \end{figure} -Now we consider a nonlinear programming which is confronted solely with -maximizing a real-valued function with domain $\real^n$. Whether derivatives are -available or not, the usual strategy is first to select a point in $\real^n$ which -is thought to be the most likely place where the maximum exists. If there is no -information available on which to base such a selection, a point is chosen at -random. From this first point an attempt is made to construct a sequence of -points, each of which yields an improved objective function value over its -predecessor. The next point to be added to the sequence is chosen by analyzing -the behavior of the function at the previous points. This construction continues -until some termination criterion is met. Methods based upon this strategy are -called \emph{ascent methods}, which can be classified as \emph{direct methods}, -\emph{gradient methods}, and \emph{Hessian methods} according to the information -about the behavior of objective function $f$. Direct methods require only that -the function can be evaluated at each point. Gradient methods require the -evaluation of first derivatives of $f$. Hessian methods require the evaluation -of second derivatives. In fact, there is no superior method for all -problems. The efficiency of a method is very much dependent upon the objective -function. - -\subsection{Integer Programming} - -\emph{Integer programming} is a special mathematical programming in which all of -the variables are assumed to be only integer values. When there are not only -integer variables but also conventional continuous variables, we call it \emph{ - mixed integer programming}. If all the variables are assumed either 0 or 1, -then the problem is termed a \emph{zero-one programming}. Although integer -programming can be solved by an \emph{exhaustive enumeration} theoretically, it -is impractical to solve realistically sized integer programming problems. The -most successful algorithm so far found to solve integer programming is called -the \emph{branch-and-bound enumeration} developed by Balas (1965) and Dakin -(1965). The other technique to integer programming is the \emph{cutting plane - method} developed by Gomory (1959). - -\hfill\textit{Uncertain Programming\/}\quad(\textsl{BaoDing Liu, 2006.2}) + +\subsection{Tables} + +An example table in appendix (Table~\ref{tab:appendix-survey-table}). + +\begin{table} + \centering + \caption{Example table in appendix} + \begin{tabular}{ll} + \toprule + File name & Description \\ + \midrule + thuthesis.dtx & The source file including documentaion and comments \\ + thuthesis.cls & The template file \\ + thuthesis-*.bst & BibTeX styles \\ + thuthesis-*.bbx & BibLaTeX styles for bibliographies \\ + thuthesis-*.cbx & BibLaTeX styles for citations \\ + \bottomrule + \end{tabular} + \label{tab:appendix-survey-table} +\end{table} + + +\section{Equations} + +An example equation in appendix (Equation~\eqref{eq:appendix-survey-equation}). +\begin{equation} + \frac{1}{2 \symup{\pi} \symup{i}} \int_\gamma f = \sum_{k=1}^m n(\gamma; a_k) \mathscr{R}(f; a_k) + \label{eq:appendix-survey-equation} +\end{equation} + + +\section{Citations} + +Example citations in appendix. +\cite{abrahams99tex} +\cite{salomon1995advanced} +\cite{abrahams99tex,salomon1995advanced} + \bibliographystyle{unsrtnat} -\bibliography{ref/refs,ref/appendix} +\bibliography{ref/appendix} \end{survey} diff --git a/macros/latex/contrib/thuthesis/data/appendix-translation.tex b/macros/latex/contrib/thuthesis/data/appendix-translation.tex index 84719cc824..891e416b06 100644 --- a/macros/latex/contrib/thuthesis/data/appendix-translation.tex +++ b/macros/latex/contrib/thuthesis/data/appendix-translation.tex @@ -9,92 +9,63 @@ \tableofcontents -\section{å•ç›®æ ‡è§„划} -北冥有鱼,其å为鲲。鲲之大,ä¸çŸ¥å…¶å‡ åƒé‡Œä¹Ÿã€‚化而为鸟,其å为é¹ã€‚é¹ä¹‹èƒŒï¼Œä¸çŸ¥å…¶å‡ -åƒé‡Œä¹Ÿã€‚怒而飞,其翼若垂天之云。是鸟也,海è¿åˆ™å°†å¾™äºŽå—冥。å—å†¥è€…ï¼Œå¤©æ± ä¹Ÿã€‚\cite{abrahams99tex} -\begin{equation}\tag*{(123)} - p(y|\mathbf{x}) = \frac{p(\mathbf{x},y)}{p(\mathbf{x})}= -\frac{p(\mathbf{x}|y)p(y)}{p(\mathbf{x})} -\end{equation} +本科生的外文资料书é¢ç¿»è¯‘。 + + +\section{图表示例} + +\subsection{图} -å¾ç”Ÿä¹Ÿæœ‰æ¶¯ï¼Œè€ŒçŸ¥ä¹Ÿæ— 涯。以有涯éšæ— 涯,殆已ï¼å·²è€Œä¸ºçŸ¥è€…,殆而已矣ï¼ä¸ºå–„æ— è¿‘å,为 -æ¶æ— 近刑,缘ç£ä»¥ä¸ºç»ï¼Œå¯ä»¥ä¿èº«ï¼Œå¯ä»¥å…¨ç”Ÿï¼Œå¯ä»¥å…»äº²ï¼Œå¯ä»¥å°½å¹´ã€‚ +附录ä¸çš„图片示例(图~\ref{fig:appendix-translation-figure})。 -\subsection{线性规划} -庖ä¸ä¸ºæ–‡æƒ å›è§£ç‰›ï¼Œæ‰‹ä¹‹æ‰€è§¦ï¼Œè‚©ä¹‹æ‰€å€šï¼Œè¶³ä¹‹æ‰€å±¥ï¼Œè†ä¹‹æ‰€å€šï¼Œç ‰ç„¶å“然,å¥åˆ€é¨žç„¶ï¼ŒèŽ« -ä¸ä¸éŸ³ï¼ŒåˆäºŽæ¡‘林之舞,乃ä¸ç»é¦–之会。 -\begin{table}[ht] -\centering +\begin{figure} \centering - \caption{è¿™æ˜¯ä¸€ä¸ªè¡¨æ ¼ä¾‹å} - \label{tab:badtabular3} - \begin{tabular}[c]{|m{1.5cm}|c|c|c|c|c|c|}\hline - \multicolumn{2}{|c|}{Network Topology} & \# of nodes & - \multicolumn{3}{c|}{\# of clients} & Server \\\hline - GT-ITM & Waxman Transit-Stub & 600 & - \multirow{2}{2em}{2\%}& - \multirow{2}{2em}{10\%}& - \multirow{2}{2em}{50\%}& - \multirow{2}{1.2in}{Max. Connectivity}\\\cline{1-3} - \multicolumn{2}{|c|}{Inet-2.1} & 6000 & & & &\\\hline - \multirow{2}{1.5cm}{Xue} & Rui & Ni &\multicolumn{4}{c|}{\multirow{2}*{\thuthesis}}\\\cline{2-3} - & \multicolumn{2}{c|}{ABCDEF} &\multicolumn{4}{c|}{} \\\hline -\end{tabular} -\end{table} + \includegraphics[width=0.6\linewidth]{example-image-a.pdf} + \caption{附录ä¸çš„图片示例} + \label{fig:appendix-translation-figure} +\end{figure} -æ–‡æƒ å›æ›°ï¼šâ€œå˜»ï¼Œå–„哉ï¼æŠ€ç›–至æ¤ä¹Žï¼Ÿâ€åº–ä¸é‡Šåˆ€å¯¹æ›°ï¼šâ€œè‡£ä¹‹æ‰€å¥½è€…é“也,进乎技矣。始臣之 -解牛之时,所è§æ— éžå…¨ç‰›è€…;三年之åŽï¼Œæœªå°è§å…¨ç‰›ä¹Ÿï¼›æ–¹ä»Šä¹‹æ—¶ï¼Œè‡£ä»¥ç¥žé‡è€Œä¸ä»¥ç›®è§†ï¼Œ -官知æ¢è€Œç¥žæ¬²è¡Œã€‚ä¾ä¹Žå¤©ç†ï¼Œæ‰¹å¤§éƒ¤ï¼Œå¯¼å¤§çª¾ï¼Œå› 其固然。技ç»è‚¯ç¶®ä¹‹æœªå°ï¼Œè€Œå†µå¤§å¬ä¹Žï¼ -良庖å²æ›´åˆ€ï¼Œå‰²ä¹Ÿï¼›æ—庖月更刀,折也;今臣之刀åä¹å¹´çŸ£ï¼Œæ‰€è§£æ•°åƒç‰›çŸ£ï¼Œè€Œåˆ€åˆƒè‹¥æ–°å‘ -äºŽç¡Žã€‚å½¼èŠ‚è€…æœ‰é—´è€Œåˆ€åˆƒè€…æ— åŽšï¼Œä»¥æ— åŽšå…¥æœ‰é—´ï¼Œæ¢æ¢ä¹Žå…¶äºŽæ¸¸åˆƒå¿…有余地矣。是以åä¹å¹´ -而刀刃若新å‘于硎。虽然,æ¯è‡³äºŽæ—,å¾è§å…¶éš¾ä¸ºï¼Œæ€µç„¶ä¸ºæˆ’,视为æ¢ï¼Œè¡Œä¸ºè¿Ÿï¼ŒåŠ¨åˆ€ç”šå¾®ï¼Œ -謋然已解,如土委地。æ刀而立,为之而四顾,为之踌躇满志,善刀而è—之。†-æ–‡æƒ å›æ›°ï¼šâ€œå–„哉ï¼å¾é—»åº–ä¸ä¹‹è¨€ï¼Œå¾—养生焉。†+\subsection{è¡¨æ ¼} +附录ä¸çš„è¡¨æ ¼ç¤ºä¾‹ï¼ˆè¡¨~\ref{tab:appendix-translation-table})。 -\subsection{éžçº¿æ€§è§„划} -å”å与柳下å£ä¸ºå‹ï¼ŒæŸ³ä¸‹å£ä¹‹å¼Ÿå曰盗跖。盗跖从å’ä¹åƒäººï¼Œæ¨ªè¡Œå¤©ä¸‹ï¼Œä¾µæš´è¯¸ä¾¯ã€‚穴室枢 -户,驱人牛马,å–人妇女。贪得忘亲,ä¸é¡¾çˆ¶æ¯å…„弟,ä¸ç¥å…ˆç¥–ã€‚æ‰€è¿‡ä¹‹é‚‘ï¼Œå¤§å›½å®ˆåŸŽï¼Œå° -国入ä¿ï¼Œä¸‡æ°‘苦之。å”å谓柳下å£æ›°ï¼šâ€œå¤«ä¸ºäººçˆ¶è€…,必能è¯å…¶å;为人兄者,必能教其弟。 -若父ä¸èƒ½è¯å…¶å,兄ä¸èƒ½æ•™å…¶å¼Ÿï¼Œåˆ™æ— 贵父å兄弟之亲矣。今先生,世之æ‰å£«ä¹Ÿï¼Œå¼Ÿä¸ºç›— -跖,为天下害,而弗能教也,丘窃为先生羞之。丘请为先生往说之。†-\begin{figure}[h] +\begin{table} \centering - \includegraphics{thu-whole-logo.pdf} - \caption{这是图片的例å} - \label{tab:badfigure3} -\end{figure} + \caption{附录ä¸çš„è¡¨æ ¼ç¤ºä¾‹} + \begin{tabular}{ll} + \toprule + 文件å & æè¿° \\ + \midrule + thuthesis.dtx & 模æ¿çš„æºæ–‡ä»¶ï¼ŒåŒ…括文档和注释 \\ + thuthesis.cls & 模æ¿æ–‡ä»¶ \\ + thuthesis-*.bst & BibTeX å‚è€ƒæ–‡çŒ®è¡¨æ ·å¼æ–‡ä»¶ \\ + thuthesis-*.bbx & BibLaTeX å‚è€ƒæ–‡çŒ®è¡¨æ ·å¼æ–‡ä»¶ \\ + thuthesis-*.cbx & BibLaTeX å¼•ç”¨æ ·å¼æ–‡ä»¶ \\ + \bottomrule + \end{tabular} + \label{tab:appendix-translation-table} +\end{table} + -柳下å£æ›°ï¼šâ€œå…ˆç”Ÿè¨€ä¸ºäººçˆ¶è€…必能è¯å…¶å,为人兄者必能教其弟,若åä¸å¬çˆ¶ä¹‹è¯ï¼Œå¼Ÿä¸å— -兄之教,虽今先生之辩,将奈之何哉?且跖之为人也,心如涌泉,æ„如飘风,强足以è·æ•Œï¼Œ -辩足以饰éžã€‚é¡ºå…¶å¿ƒåˆ™å–œï¼Œé€†å…¶å¿ƒåˆ™æ€’ï¼Œæ˜“è¾±äººä»¥è¨€ã€‚å…ˆç”Ÿå¿…æ— å¾€ã€‚â€ +\section{æ•°å¦å…¬å¼} + +附录ä¸çš„æ•°å¦å…¬å¼ç¤ºä¾‹ï¼ˆå…¬å¼~\eqref{eq:appendix-translation-equation})。 +\begin{equation} + \frac{1}{2 \symup{\pi} \symup{i}} \int_\gamma f = \sum_{k=1}^m n(\gamma; a_k) \mathscr{R}(f; a_k) + \label{eq:appendix-translation-equation} +\end{equation} -å”åä¸å¬ï¼Œé¢œå›žä¸ºé©ï¼Œå贡为å³ï¼Œå¾€è§ç›—跖。 -\subsection{整数规划} -盗跖乃方休å’徒大山之阳,è„人è‚而餔之。å”å下车而å‰ï¼Œè§è°’者曰:“é²äººå”丘,闻将军 -高义,敬å†æ‹œè°’者。â€è°’者入通。盗跖闻之大怒,目如明星,å‘ä¸ŠæŒ‡å† ï¼Œæ›°ï¼šâ€œæ¤å¤«é²å›½ä¹‹ -巧伪人å”丘éžé‚ªï¼Ÿä¸ºæˆ‘å‘Šä¹‹ï¼šå°”ä½œè¨€é€ è¯ï¼Œå¦„称文ã€æ¦ï¼Œå† æžæœ¨ä¹‹å† ,带æ»ç‰›ä¹‹èƒï¼Œå¤šè¾žç¼ª -说,ä¸è€•è€Œé£Ÿï¼Œä¸ç»‡è€Œè¡£ï¼Œæ‘‡å”‡é¼“舌,擅生是éžï¼Œä»¥è¿·å¤©ä¸‹ä¹‹ä¸»ï¼Œä½¿å¤©ä¸‹å¦å£«ä¸å其本,妄 -作å弟,而侥幸于å°ä¾¯å¯Œè´µè€…也。å之罪大æžé‡ï¼Œç–¾èµ°å½’ï¼ä¸ç„¶ï¼Œæˆ‘将以åè‚益昼餔之膳。†+\section{文献引用} + +文献引用示例\cite{abrahams99tex}。 % 书é¢ç¿»è¯‘çš„å‚考文献 \bibliographystyle{unsrtnat} \bibliography{ref/appendix} -% 也å¯ä»¥ä½¿ç”¨ thebiliography 环境手写 -% \begin{thebibliography}{2} -% \bibitem{abrahams99tex} -% P.~W. Abrahams, K.~Berry, and K.~A. Hargreaves, \emph{{\TeX} for the -% Impatient}.\hskip 1em plus 0.5em minus 0.4em\relax Addison-Wesley, 1990. - -% \bibitem{salomon1995advanced} -% D.~Salomon, ``The advanced {\TeX}book.''\hskip 1em plus 0.5em minus 0.4em\relax -% New York: Springer, 1995. -% \end{thebibliography} - % 书é¢ç¿»è¯‘对应的原文索引 \begin{translation-index} \nocite{salomon1995advanced} diff --git a/macros/latex/contrib/thuthesis/data/appendix.tex b/macros/latex/contrib/thuthesis/data/appendix.tex index 179bc376a9..94b1743931 100644 --- a/macros/latex/contrib/thuthesis/data/appendix.tex +++ b/macros/latex/contrib/thuthesis/data/appendix.tex @@ -1,70 +1,48 @@ -\chapter{å•ç›®æ ‡è§„划} +\chapter{补充内容} -\section{å•ç›®æ ‡è§„划} -北冥有鱼,其å为鲲。鲲之大,ä¸çŸ¥å…¶å‡ åƒé‡Œä¹Ÿã€‚化而为鸟,其å为é¹ã€‚é¹ä¹‹èƒŒï¼Œä¸çŸ¥å…¶å‡ -åƒé‡Œä¹Ÿã€‚怒而飞,其翼若垂天之云。是鸟也,海è¿åˆ™å°†å¾™äºŽå—冥。å—å†¥è€…ï¼Œå¤©æ± ä¹Ÿã€‚ -\begin{equation}\tag*{(123)} - p(y|\mathbf{x}) = \frac{p(\mathbf{x},y)}{p(\mathbf{x})}= -\frac{p(\mathbf{x}|y)p(y)}{p(\mathbf{x})} -\end{equation} +附录是与论文内容密切相关ã€ä½†ç¼–å…¥æ£æ–‡åˆå½±å“整篇论文编排的æ¡ç†å’Œé€»è¾‘性的资料,例如æŸäº›é‡è¦çš„æ•°æ®è¡¨æ ¼ã€è®¡ç®—程åºã€ç»Ÿè®¡è¡¨ç‰ï¼Œæ˜¯è®ºæ–‡ä¸»ä½“的补充内容,å¯æ ¹æ®éœ€è¦è®¾ç½®ã€‚ + + +\section{图表示例} -å¾ç”Ÿä¹Ÿæœ‰æ¶¯ï¼Œè€ŒçŸ¥ä¹Ÿæ— 涯。以有涯éšæ— 涯,殆已ï¼å·²è€Œä¸ºçŸ¥è€…,殆而已矣ï¼ä¸ºå–„æ— è¿‘å,为 -æ¶æ— 近刑,缘ç£ä»¥ä¸ºç»ï¼Œå¯ä»¥ä¿èº«ï¼Œå¯ä»¥å…¨ç”Ÿï¼Œå¯ä»¥å…»äº²ï¼Œå¯ä»¥å°½å¹´ã€‚ +\subsection{图} -\subsection{线性规划} -庖ä¸ä¸ºæ–‡æƒ å›è§£ç‰›ï¼Œæ‰‹ä¹‹æ‰€è§¦ï¼Œè‚©ä¹‹æ‰€å€šï¼Œè¶³ä¹‹æ‰€å±¥ï¼Œè†ä¹‹æ‰€å€šï¼Œç ‰ç„¶å“然,å¥åˆ€é¨žç„¶ï¼ŒèŽ« -ä¸ä¸éŸ³ï¼ŒåˆäºŽæ¡‘林之舞,乃ä¸ç»é¦–之会。 -\begin{table}[ht] +附录ä¸çš„图片示例(图~\ref{fig:appendix-figure})。 + +\begin{figure} \centering - \caption{è¿™æ˜¯ä¸€ä¸ªè¡¨æ ¼ä¾‹å} - \label{tab:badtabular3} - \begin{tabular}[c]{|m{1.5cm}|c|c|c|c|c|c|}\hline - \multicolumn{2}{|c|}{Network Topology} & \# of nodes & - \multicolumn{3}{c|}{\# of clients} & Server \\\hline - GT-ITM & Waxman Transit-Stub & 600 & - \multirow{2}{2em}{2\%}& - \multirow{2}{2em}{10\%}& - \multirow{2}{2em}{50\%}& - \multirow{2}{1.2in}{Max. Connectivity}\\\cline{1-3} - \multicolumn{2}{|c|}{Inet-2.1} & 6000 & & & &\\\hline - \multirow{2}{1.5cm}{Xue} & Rui & Ni &\multicolumn{4}{c|}{\multirow{2}*{\thuthesis}}\\\cline{2-3} - & \multicolumn{2}{c|}{ABCDEF} &\multicolumn{4}{c|}{} \\\hline -\end{tabular} -\end{table} + \includegraphics[width=0.6\linewidth]{example-image-a.pdf} + \caption{附录ä¸çš„图片示例} + \label{fig:appendix-figure} +\end{figure} -æ–‡æƒ å›æ›°ï¼šâ€œå˜»ï¼Œå–„哉ï¼æŠ€ç›–至æ¤ä¹Žï¼Ÿâ€åº–ä¸é‡Šåˆ€å¯¹æ›°ï¼šâ€œè‡£ä¹‹æ‰€å¥½è€…é“也,进乎技矣。始臣之 -解牛之时,所è§æ— éžå…¨ç‰›è€…;三年之åŽï¼Œæœªå°è§å…¨ç‰›ä¹Ÿï¼›æ–¹ä»Šä¹‹æ—¶ï¼Œè‡£ä»¥ç¥žé‡è€Œä¸ä»¥ç›®è§†ï¼Œ -官知æ¢è€Œç¥žæ¬²è¡Œã€‚ä¾ä¹Žå¤©ç†ï¼Œæ‰¹å¤§éƒ¤ï¼Œå¯¼å¤§çª¾ï¼Œå› 其固然。技ç»è‚¯ç¶®ä¹‹æœªå°ï¼Œè€Œå†µå¤§å¬ä¹Žï¼ -良庖å²æ›´åˆ€ï¼Œå‰²ä¹Ÿï¼›æ—庖月更刀,折也;今臣之刀åä¹å¹´çŸ£ï¼Œæ‰€è§£æ•°åƒç‰›çŸ£ï¼Œè€Œåˆ€åˆƒè‹¥æ–°å‘ -äºŽç¡Žã€‚å½¼èŠ‚è€…æœ‰é—´è€Œåˆ€åˆƒè€…æ— åŽšï¼Œä»¥æ— åŽšå…¥æœ‰é—´ï¼Œæ¢æ¢ä¹Žå…¶äºŽæ¸¸åˆƒå¿…有余地矣。是以åä¹å¹´ -而刀刃若新å‘于硎。虽然,æ¯è‡³äºŽæ—,å¾è§å…¶éš¾ä¸ºï¼Œæ€µç„¶ä¸ºæˆ’,视为æ¢ï¼Œè¡Œä¸ºè¿Ÿï¼ŒåŠ¨åˆ€ç”šå¾®ï¼Œ -謋然已解,如土委地。æ刀而立,为之而四顾,为之踌躇满志,善刀而è—之。†-æ–‡æƒ å›æ›°ï¼šâ€œå–„哉ï¼å¾é—»åº–ä¸ä¹‹è¨€ï¼Œå¾—养生焉。†+\subsection{è¡¨æ ¼} +附录ä¸çš„è¡¨æ ¼ç¤ºä¾‹ï¼ˆè¡¨~\ref{tab:appendix-table})。 -\subsection{éžçº¿æ€§è§„划} -å”å与柳下å£ä¸ºå‹ï¼ŒæŸ³ä¸‹å£ä¹‹å¼Ÿå曰盗跖。盗跖从å’ä¹åƒäººï¼Œæ¨ªè¡Œå¤©ä¸‹ï¼Œä¾µæš´è¯¸ä¾¯ã€‚穴室枢 -户,驱人牛马,å–人妇女。贪得忘亲,ä¸é¡¾çˆ¶æ¯å…„弟,ä¸ç¥å…ˆç¥–ã€‚æ‰€è¿‡ä¹‹é‚‘ï¼Œå¤§å›½å®ˆåŸŽï¼Œå° -国入ä¿ï¼Œä¸‡æ°‘苦之。å”å谓柳下å£æ›°ï¼šâ€œå¤«ä¸ºäººçˆ¶è€…,必能è¯å…¶å;为人兄者,必能教其弟。 -若父ä¸èƒ½è¯å…¶å,兄ä¸èƒ½æ•™å…¶å¼Ÿï¼Œåˆ™æ— 贵父å兄弟之亲矣。今先生,世之æ‰å£«ä¹Ÿï¼Œå¼Ÿä¸ºç›— -跖,为天下害,而弗能教也,丘窃为先生羞之。丘请为先生往说之。†-\begin{figure}[h] +\begin{table} \centering - \includegraphics{thu-whole-logo.pdf} - \caption{这是图片的例å} - \label{tab:badfigure3} -\end{figure} + \caption{附录ä¸çš„è¡¨æ ¼ç¤ºä¾‹} + \begin{tabular}{ll} + \toprule + 文件å & æè¿° \\ + \midrule + thuthesis.dtx & 模æ¿çš„æºæ–‡ä»¶ï¼ŒåŒ…括文档和注释 \\ + thuthesis.cls & 模æ¿æ–‡ä»¶ \\ + thuthesis-*.bst & BibTeX å‚è€ƒæ–‡çŒ®è¡¨æ ·å¼æ–‡ä»¶ \\ + thuthesis-*.bbx & BibLaTeX å‚è€ƒæ–‡çŒ®è¡¨æ ·å¼æ–‡ä»¶ \\ + thuthesis-*.cbx & BibLaTeX å¼•ç”¨æ ·å¼æ–‡ä»¶ \\ + \bottomrule + \end{tabular} + \label{tab:appendix-table} +\end{table} -柳下å£æ›°ï¼šâ€œå…ˆç”Ÿè¨€ä¸ºäººçˆ¶è€…必能è¯å…¶å,为人兄者必能教其弟,若åä¸å¬çˆ¶ä¹‹è¯ï¼Œå¼Ÿä¸å— -兄之教,虽今先生之辩,将奈之何哉?且跖之为人也,心如涌泉,æ„如飘风,强足以è·æ•Œï¼Œ -辩足以饰éžã€‚é¡ºå…¶å¿ƒåˆ™å–œï¼Œé€†å…¶å¿ƒåˆ™æ€’ï¼Œæ˜“è¾±äººä»¥è¨€ã€‚å…ˆç”Ÿå¿…æ— å¾€ã€‚â€ -å”åä¸å¬ï¼Œé¢œå›žä¸ºé©ï¼Œå贡为å³ï¼Œå¾€è§ç›—跖。 +\section{æ•°å¦å…¬å¼} -\subsection{整数规划} -盗跖乃方休å’徒大山之阳,è„人è‚而餔之。å”å下车而å‰ï¼Œè§è°’者曰:“é²äººå”丘,闻将军 -高义,敬å†æ‹œè°’者。â€è°’者入通。盗跖闻之大怒,目如明星,å‘ä¸ŠæŒ‡å† ï¼Œæ›°ï¼šâ€œæ¤å¤«é²å›½ä¹‹ -巧伪人å”丘éžé‚ªï¼Ÿä¸ºæˆ‘å‘Šä¹‹ï¼šå°”ä½œè¨€é€ è¯ï¼Œå¦„称文ã€æ¦ï¼Œå† æžæœ¨ä¹‹å† ,带æ»ç‰›ä¹‹èƒï¼Œå¤šè¾žç¼ª -说,ä¸è€•è€Œé£Ÿï¼Œä¸ç»‡è€Œè¡£ï¼Œæ‘‡å”‡é¼“舌,擅生是éžï¼Œä»¥è¿·å¤©ä¸‹ä¹‹ä¸»ï¼Œä½¿å¤©ä¸‹å¦å£«ä¸å其本,妄 -作å弟,而侥幸于å°ä¾¯å¯Œè´µè€…也。å之罪大æžé‡ï¼Œç–¾èµ°å½’ï¼ä¸ç„¶ï¼Œæˆ‘将以åè‚益昼餔之膳。†+附录ä¸çš„æ•°å¦å…¬å¼ç¤ºä¾‹ï¼ˆå…¬å¼~\eqref{eq:appendix-equation})。 +\begin{equation} + \frac{1}{2 \symup{\pi} \symup{i}} \int_\gamma f = \sum_{k=1}^m n(\gamma; a_k) \mathscr{R}(f; a_k) + \label{eq:appendix-equation} +\end{equation} diff --git a/macros/latex/contrib/thuthesis/data/chap01.tex b/macros/latex/contrib/thuthesis/data/chap01.tex index 2433747296..a1ce9626fc 100644 --- a/macros/latex/contrib/thuthesis/data/chap01.tex +++ b/macros/latex/contrib/thuthesis/data/chap01.tex @@ -1,594 +1,78 @@ % !TeX root = ../thuthesis-example.tex -\chapter{带 English çš„æ ‡é¢˜} -\label{cha:intro} - -这是 \thuthesis\cite{thuthesis} 的示例文档,基本上覆盖了模æ¿ä¸æ‰€æœ‰æ ¼å¼çš„设置。建 -议大家在使用模æ¿ä¹‹å‰ï¼Œé™¤äº†é˜…读《\thuthesis{} 用户手册》,这个示例文档也最好能看一 -看。 - -å°è€é¼ å·åƒçƒå‡‰ç²‰ï¼›çŸé•¿è™«çŽ¯ç»•çŸ®é«˜ç²±\footnote{韩愈(768-824),å—退之,河å—河阳( - 今河å—åŸåŽ¿ï¼‰äººï¼Œè‡ªç§°éƒ¡æœ›æ˜Œé»Žï¼Œä¸–称韩昌黎。幼å¤è´«åˆ»è‹¦å¥½å¦ï¼Œå¾·å®—贞元八年进士。曾 - 任监察御å²ï¼Œå› 上ç–请å…å…³ä¸èµ‹å½¹ï¼Œè´¬ä¸ºé˜³å±±åŽ¿ä»¤ã€‚åŽéšå®°ç›¸è£´åº¦å¹³å®šæ·®è¥¿è¿åˆ‘部ä¾éƒŽï¼Œ - åˆå› 上表è°è¿Žä½›éª¨ï¼Œè´¬æ½®å·žåˆºå²ã€‚åšè¿‡å部ä¾éƒŽï¼Œæ»è°¥æ–‡å…¬ï¼Œæ•…世称韩å部ã€éŸ©æ–‡å…¬ã€‚是 - å”代å¤æ–‡è¿åŠ¨é¢†è¢–,与柳宗元åˆç§°éŸ©æŸ³ã€‚诗力求险怪新奇,雄浑é‡æ°”势。}。 - - -\section{å°é¢ç›¸å…³} -å°é¢çš„例å请å‚看 \texttt{cover.tex}。主è¦ç¬¦å·è¡¨å‚看 \texttt{denotation.tex},附录和 -个人简历分别å‚看 \texttt{appendix01.tex} å’Œ \texttt{resume.tex}。里é¢çš„命令都很直 -观,一看å³ä¼š\footnote{ä½ è¯´è¿˜æ˜¯çœ‹ä¸æ‡‚?怎么会呢?}。 - -\section{å—体命令} -\label{sec:first} - -è‹è½¼ï¼ˆ1037-1101),北宋文å¦å®¶ã€ä¹¦ç”»å®¶ã€‚å—å瞻,å·ä¸œå¡å±…士,眉州眉山(今属四å·ï¼‰äºº -。è‹æ´µåã€‚å˜‰ä½‘è¿›å£«ã€‚ç¥žå®—æ—¶æ›¾ä»»ç¥ éƒ¨å‘˜å¤–éƒŽï¼Œå› å对王安石新法而求外èŒï¼Œä»»æ州通判, -知密州ã€å¾å·žã€æ¹–州。åŽä»¥ä½œè¯—“谤讪æœå»·â€ç½ªè´¬é»„州。哲宗时任翰林å¦å£«ï¼Œæ›¾å‡ºçŸ¥æ州〠-颖州ç‰ï¼Œå®˜è‡³ç¤¼éƒ¨å°šä¹¦ã€‚åŽåˆè´¬è°ªæƒ å·žã€å„‹å·žã€‚北还åŽç¬¬äºŒå¹´ç—…æ»å¸¸å·žã€‚å—å®‹æ—¶è¿½è°¥æ–‡å¿ ã€‚ -与父洵弟辙,åˆç§°â€œä¸‰è‹â€ã€‚在政治上属于旧党,但也有改é©å¼Šæ”¿çš„è¦æ±‚。其文汪洋æ£è‚†ï¼Œ -明白畅达,为“å”宋八大家â€ä¹‹ä¸€ã€‚ 其诗清新豪å¥ï¼Œå–„ç”¨å¤¸å¼ æ¯”å–»ï¼Œåœ¨è‰ºæœ¯è¡¨çŽ°æ–¹é¢ç‹¬å…· -é£Žæ ¼ã€‚å°‘æ•°è¯—ç¯‡ä¹Ÿèƒ½åæ˜ æ°‘é—´ç–¾è‹¦ï¼ŒæŒ‡è´£ç»Ÿæ²»è€…çš„å¥¢ä¾ˆéª„çºµã€‚è¯å¼€è±ªæ”¾ä¸€æ´¾ï¼Œå¯¹åŽä»£å¾ˆæœ‰å½± -å“。《念奴娇·赤å£æ€€å¤ã€‹ã€ã€Šæ°´è°ƒæŒå¤´Â·ä¸™è¾°ä¸ç§‹ã€‹ä¼ 诵甚广。 - -{\kaishu å¡ä»™æ“…长行书ã€æ¥·ä¹¦ï¼Œå–法æŽé‚•ã€å¾æµ©ã€é¢œçœŸå¿ã€æ¨å‡å¼ï¼Œè€Œèƒ½è‡ªåˆ›æ–°æ„。用笔丰腴 - 跌宕,有天真烂漫之趣。与蔡襄ã€é»„åºåšã€ç±³èŠ¾å¹¶ç§°â€œå®‹å››å®¶â€ã€‚能画竹,å¦æ–‡åŒï¼Œä¹Ÿå–œ - ä½œæž¯æœ¨æ€ªçŸ³ã€‚è®ºç”»ä¸»å¼ â€œç¥žä¼¼â€ï¼Œè®¤ä¸ºâ€œè®ºç”»ä»¥å½¢ä¼¼ï¼Œè§ä¸Žå„¿ç«¥é‚»â€ï¼›é«˜åº¦è¯„价“诗ä¸æœ‰ - 画,画ä¸æœ‰è¯—â€çš„è‰ºæœ¯é€ è¯£ã€‚è¯—æ–‡æœ‰ã€Šä¸œå¡ä¸ƒé›†ã€‹ç‰ã€‚å˜ä¸–书迹有《ç”谢民师论文帖》〠- 《ç¥é»„å‡ é“文》ã€ã€Šå‰èµ¤å£èµ‹ã€‹ã€ã€Šé»„州寒食诗帖》ç‰ã€‚ 画迹有《枯木怪石图》ã€ã€Š - 竹石图》ç‰ã€‚} - -{\fangsong 易与天地准,故能弥纶天地之é“。仰以观於天文,俯以察於地ç†ï¼Œæ˜¯æ•…知幽明之故。原 - 始å终,故知æ»ç”Ÿä¹‹è¯´ã€‚精气为物,游é‚为å˜ï¼Œæ˜¯æ•…知鬼神之情状。与天地相似,故ä¸è¿ã€‚ - 知周乎万物,而é“济天下,故ä¸è¿‡ã€‚æ—行而ä¸æµï¼Œä¹å¤©çŸ¥å‘½ï¼Œæ•…ä¸å¿§ã€‚安土敦乎ä»ï¼Œæ•… - 能爱。范围天地之化而ä¸è¿‡ï¼Œæ›²æˆä¸‡ç‰©è€Œä¸é—,通乎昼夜之é“è€ŒçŸ¥ï¼Œæ•…ç¥žæ— æ–¹è€Œæ˜“æ— ä½“ã€‚} - -{\heiti 履而泰,然åŽå®‰ï¼Œæ•…å—之以泰;泰者通也。物ä¸å¯ä»¥ç»ˆé€šï¼Œæ•…å—之以å¦ã€‚物ä¸å¯ä»¥ç»ˆ - å¦ï¼Œæ•…å—之以åŒäººã€‚与人åŒè€…,物必归焉,故å—之以大有。有大者ä¸å¯ä»¥ç›ˆï¼Œæ•…å—之以谦。 - 有大而能谦,必豫,故å—之以豫。豫必有éšï¼Œæ•…å—之以éšã€‚以喜éšäººè€…ï¼Œå¿…æœ‰äº‹ï¼Œæ•…å— - 之以蛊;蛊者事也。} - -{\songti æœ‰æ— å¦„ç„¶åŽå¯ç•œï¼Œæ•…å—之以大畜。物畜然åŽå¯å…»ï¼Œæ•…å—之以é¢ï¼›é¢è€…养也。ä¸å…»åˆ™ä¸ - å¯åŠ¨ï¼Œæ•…å—之以大过。物ä¸å¯ä»¥ç»ˆè¿‡ï¼Œæ•…å—之以åŽï¼›åŽè€…陷也。陷必有所丽,故å—之以 - 离;离者丽也。} - -\section{è¡¨æ ¼æ ·æœ¬} -\label{chap1:sample:table} - -\subsection{åŸºæœ¬è¡¨æ ¼} -\label{sec:basictable} - -模æ¿ä¸å…³äºŽè¡¨æ ¼çš„å®åŒ…有三个:\pkg{booktabs}ã€\pkg{array} å’Œ \pkg{longtable}。 -三线表å¯ä»¥ç”¨ \pkg{booktabs} æä¾› çš„ \cs{toprule}ã€\cs{midrule} å’Œ \cs{bottomrule}。 -它们与 \pkg{longtable} 能很好的é…åˆä½¿ç”¨ã€‚ -\begin{table}[htb] - \centering - \begin{threeparttable}[b] - \caption[模æ¿æ–‡ä»¶]{模æ¿æ–‡ä»¶ã€‚å¦‚æžœè¡¨æ ¼çš„æ ‡é¢˜å¾ˆé•¿ï¼Œé‚£ä¹ˆåœ¨è¡¨æ ¼ç´¢å¼•ä¸å°±ä¼šå¾ˆä¸ç¾Ž - 观,所以è¦åƒ chapter é‚£æ ·åœ¨å‰é¢ç”¨ä¸æ‹¬å·å†™ä¸€ä¸ªç®€çŸçš„æ ‡é¢˜ã€‚è¿™ä¸ªæ ‡é¢˜ä¼šå‡ºçŽ°åœ¨ç´¢ - 引ä¸ã€‚} - \label{tab:template-files} - \begin{tabular}{ll} - \toprule - {\heiti 文件å} & {\heiti æè¿°} \\\midrule - thuthesis.ins & \LaTeX{} 安装文件,DocStrip。\tnote{1} \\ - thuthesis.dtx & 所有的一切都在这里é¢ã€‚\tnote{b}\\ - thuthesis.cls & 模æ¿ç±»æ–‡ä»¶ã€‚\\ - thuthesis-numeric.bst & å‚考文献 BibTeX æ ·å¼æ–‡ä»¶ã€‚\\ - thuthesis-author-year.bst & å‚考文献 BibTeX æ ·å¼æ–‡ä»¶ã€‚\\ - thusetup.tex & 基本é…置和常用的包ã€å‘½ä»¤ï¼Œå‡è½»ä¸»æ–‡ä»¶çš„负担。\\ - \bottomrule - \end{tabular} - \begin{tablenotes} - \item [1] è¡¨æ ¼ä¸çš„脚注。如果脚注比较长,那么æ¢è¡ŒåŽçš„æ•ˆæžœæ˜¯è¿™æ ·çš„ï¼Œéœ€è¦æ›´å¤šçš„æ–‡å—。 - 现在能看到么? - \item [b] å†æ¥ä¸€ä¸ªã€‚å¯ä»¥ä½¿ç”¨ä¸åŒçš„ symbol。 - \end{tablenotes} - \end{threeparttable} -\end{table} - -首先æ¥çœ‹ä¸€ä¸ªæœ€ç®€å•çš„è¡¨æ ¼ã€‚è¡¨ \ref{tab:template-files} 列举了本模æ¿ä¸»è¦æ–‡ä»¶åŠå…¶åŠŸ -能。请大家注æ„三线表ä¸å„æ¡çº¿å¯¹åº”的命令。这个例åè¿˜å±•ç¤ºäº†å¦‚ä½•åœ¨è¡¨æ ¼ä¸æ£ç¡®ä½¿ç”¨è„šæ³¨ã€‚ -由于 \LaTeX{} 本身ä¸æ”¯æŒåœ¨è¡¨æ ¼ä¸ä½¿ç”¨ \cs{footnote},所以我们ä¸å¾—ä¸å°†è¡¨æ ¼æ”¾åœ¨ -å°é¡µä¸ï¼Œè€Œä¸”æœ€å¥½å°†è¡¨æ ¼çš„å®½åº¦è®¾ç½®ä¸ºå°é¡µçš„å®½åº¦ï¼Œè¿™æ ·è„šæ³¨çœ‹èµ·æ¥æ‰æ›´ç¾Žè§‚。 - -\subsection{å¤æ‚è¡¨æ ¼} -\label{sec:complicatedtable} - -我们ç»å¸¸ä¼šåœ¨è¡¨æ ¼ä¸‹æ–¹æ ‡æ³¨æ•°æ®æ¥æºï¼Œæˆ–è€…å¯¹è¡¨æ ¼é‡Œé¢çš„æ¡ç›®è¿›è¡Œè§£é‡Šã€‚å‰é¢çš„è„šæ³¨æ˜¯ä¸€ç§ -ä¸é”™çš„方法,如果ä¸å–œæ¬¢è„šæ³¨ï¼Œå¯ä»¥åœ¨è¡¨æ ¼åŽé¢å†™æ³¨é‡Šï¼Œæ¯”如表~\ref{tab:tabexamp1}。 -\begin{table}[htbp] - \centering - \caption{å¤æ‚è¡¨æ ¼ç¤ºä¾‹ 1。这个引用 \cite{tex} ä¸ä¼šå¯¼è‡´ç¼–å·æ··ä¹±ã€‚} - \label{tab:tabexamp1} - \begin{minipage}[t]{0.8\textwidth} - \begin{tabularx}{\linewidth}{|l|X|X|X|X|} - \hline - \multirow{2}*{} & \multicolumn{2}{c|}{First Half} & \multicolumn{2}{c|}{Second Half}\\\cline{2-5} - & 1st Qtr &2nd Qtr&3rd Qtr&4th Qtr \\ \hline - East$^{*}$ & 20.4& 27.4& 90& 20.4 \\ - West$^{**}$ & 30.6 & 38.6 & 34.6 & 31.6 \\ \hline - \end{tabularx}\\[2pt] - \footnotesize 注:数æ®æ¥æºã€Š\thuthesis{} 使用手册》。\\ - *:东部\\ - **:西部 - \end{minipage} -\end{table} - -æ¤å¤–,表~\ref{tab:tabexamp1} åŒæ—¶è¿˜æ¼”示了通过 \pkg{tabularx} çš„ - \texttt{|X|} æ‰©å±•å®žçŽ°è¡¨æ ¼è‡ªåŠ¨æ”¾å¤§åŠŸèƒ½ã€‚ - -为了使我们的例å更接近实际情况,我会在必è¦çš„时候æ’å…¥ä¸€äº›â€œæ— å…³â€æ–‡å—,以å…太多图 -表åŒæ—¶å‡ºçŽ°ï¼Œå¯¼è‡´æŽ’版效果ä¸å¤ªç†æƒ³ã€‚第一个出场的当然是我的最爱:风æµæ½‡æ´’ã€éªé©¬ç»å°˜ã€ -å¥ç¬”凌云的{\heiti æŽå¤ªç™½}了。 - -æŽç™½ï¼Œå—太白,陇西æˆçºªäººã€‚凉æ¦æ˜çŽ‹æš ä¹ä¸–å™ã€‚或曰山东人,或曰蜀人。白少有逸æ‰ï¼Œå¿— -æ°”å®æ”¾ï¼Œé£˜ç„¶æœ‰è¶…世之心。åˆéšå²·å±±ï¼Œç›Šå·žé•¿å²è‹é¢‹è§è€Œå¼‚之,曰:“是å天æ‰è‹±ç‰¹ï¼Œå¯æ¯” -相如。â€å¤©å®åˆï¼Œè‡³é•¿å®‰ï¼Œå¾€è§è´ºçŸ¥ç« ã€‚çŸ¥ç« è§å…¶æ–‡ï¼Œå¹æ›°ï¼šâ€œå谪仙人也。â€è¨€äºŽæ˜Žçš‡ï¼Œ -å¬è§é‡‘銮殿,å¥é¢‚一篇。å¸èµé£Ÿï¼Œäº²ä¸ºè°ƒç¾¹ï¼Œæœ‰è¯ä¾›å¥‰ç¿°æž—。白犹与酒徒饮于市,å¸å沉香 -äºå,æ„有所感,欲得白为ä¹ç« ,å¬å…¥ï¼Œè€Œç™½å·²é†‰ã€‚å·¦å³ä»¥æ°´é¢’é¢ï¼Œç¨è§£ï¼Œæ´ç¬”æˆæ–‡ï¼Œå©‰ä¸½ -精切。å¸çˆ±å…¶æ‰ï¼Œæ•°å®´è§ã€‚白常ä¾å¸ï¼Œé†‰ï¼Œä½¿é«˜åŠ›å£«è„±é´ã€‚åŠ›å£«ç´ è´µï¼Œè€»ä¹‹ï¼Œæ‘˜å…¶è¯—ä»¥æ¿€æ¨ -贵妃。å¸æ¬²å®˜ç™½ï¼Œå¦ƒè¾„æ²®æ¢ã€‚白自知ä¸ä¸ºäº²è¿‘所容,æ³æ±‚还山。å¸èµé‡‘放还。乃浪迹江湖, -终日沉饮。永王璘都ç£æ±Ÿé™µï¼Œè¾Ÿä¸ºåƒšä½ã€‚璘谋乱,兵败,白åé•¿æµå¤œéƒŽï¼Œä¼šèµ¦å¾—还。æ—人阳 -冰为当涂令,白往ä¾ä¹‹ã€‚代宗立,以左拾é—å¬ï¼Œè€Œç™½å·²å’。文宗时,è¯ä»¥ç™½æŒè¯—ã€è£´æ—»å‰‘舞〠-å¼ æ—è‰ä¹¦ä¸ºä¸‰ç»äº‘。集三åå·ã€‚今编诗二å五å·ã€‚\hfill —— 《全å”诗》诗人å°ä¼ - -浮动体的并排放置一般有两ç§æƒ…况:1)二者没有关系,为两个独立的浮动体;2)二者隶属 -于åŒä¸€ä¸ªæµ®åŠ¨ä½“ã€‚å¯¹è¡¨æ ¼æ¥è¯´å¹¶æŽ’è¡¨æ ¼æ—¢å¯ä»¥åƒå›¾~\ref{tab:parallel1}〠-图~\ref{tab:parallel2} 使用å°é¡µçŽ¯å¢ƒï¼Œä¹Ÿå¯ä»¥å¦‚图~\ref{tab:subtable} 使用åè¡¨æ ¼æ¥åšã€‚ -图的例åå‚è§ç¬¬~\ref{sec:multifig} 节。 - -\begin{table}[htbp] -\noindent\begin{minipage}{0.5\textwidth} -\centering -\caption{第一个并排åè¡¨æ ¼} -\label{tab:parallel1} -\begin{tabular}{p{2cm}p{2cm}} -\toprule -111 & 222 \\\midrule -222 & 333 \\\bottomrule -\end{tabular} -\end{minipage}% -\begin{minipage}{0.5\textwidth} -\centering -\caption{第二个并排åè¡¨æ ¼} -\label{tab:parallel2} -\begin{tabular}{p{2cm}p{2cm}} -\toprule -111 & 222 \\\midrule -222 & 333 \\\bottomrule -\end{tabular} -\end{minipage} -\end{table} - -然åŽå°±æ˜¯å¿§å›½å¿§æ°‘,诗家楷模æœå·¥éƒ¨äº†ã€‚æœç”«ï¼Œå—å美,其先襄阳人,曾祖ä¾è‰ºä¸ºå·©ä»¤ï¼Œå› -居巩。甫天å®åˆåº”进士,ä¸ç¬¬ã€‚åŽçŒ®ã€Šä¸‰å¤§ç¤¼èµ‹ã€‹ï¼Œæ˜Žçš‡å¥‡ä¹‹ï¼Œå¬è¯•æ–‡ç« ï¼ŒæŽˆäº¬å…†åºœå…µæ›¹å‚ -军。安禄山陷京师,肃宗å³ä½çµæ¦ï¼Œç”«è‡ªè´¼ä¸é赴行在,拜左拾é—。以论救房ç¯ï¼Œå‡ºä¸ºåŽå·ž -å¸åŠŸå‚军。关辅饥乱,寓居åŒå·žåŒè°·åŽ¿ï¼Œèº«è‡ªè´Ÿè–ªé‡‡æ¢ ,餔糒ä¸ç»™ã€‚久之,å¬è¡¥äº¬å…†åºœåŠŸæ›¹ï¼Œ -é“阻ä¸èµ´ã€‚严æ¦é•‡æˆéƒ½ï¼Œå¥ä¸ºå‚è°‹ã€æ£€æ ¡å·¥éƒ¨å‘˜å¤–郎,èµç»¯ã€‚æ¦ä¸Žç”«ä¸–旧,待é‡ç”šåŽšã€‚乃于 -æˆéƒ½æµ£èŠ±é‡Œç§ç«¹æ¤æ ‘,枕江结åºï¼Œçºµé…’啸æŒå…¶ä¸ã€‚æ¦å’ï¼Œç”«æ— æ‰€ä¾ï¼Œä¹ƒä¹‹ä¸œèœ€å°±é«˜é©ã€‚既至 -而é©å’。是å²ï¼Œèœ€å¸…相攻æ€ï¼Œèœ€å¤§æ‰°ã€‚甫æºå®¶é¿ä¹±è†æ¥šï¼Œæ‰èˆŸä¸‹å³¡ï¼Œæœªç»´èˆŸè€Œæ±Ÿé™µäº¦ä¹±ã€‚乃 -溯沿湘æµï¼Œæ¸¸è¡¡å±±ï¼Œå¯“居耒阳。å’年五åä¹ã€‚元和ä¸ï¼Œå½’葬åƒå¸ˆé¦–é˜³å±±ï¼Œå…ƒç¨¹å¿—å…¶å¢“ã€‚å¤©å® -间,甫与æŽç™½é½å,时称æŽæœã€‚然元稹之言曰:“æŽç™½å£®æµªçºµæ£ï¼Œæ‘†åŽ»æ‹˜æŸï¼Œè¯šäº¦å·®è‚©å美 -矣。至若铺陈终始,排比声韵,大或åƒè¨€ï¼Œæ¬¡çŠ¹æ•°ç™¾ï¼Œè¯æ°”豪迈,而风调清深,属对律切, -而脱弃凡近,则æŽå°šä¸èƒ½åŽ†å…¶è—©ç¿°ï¼Œå†µå ‚奥乎。â€ç™½å±…易亦云:“æœè¯—贯穿å¤ä»Šï¼Œ 尽工尽 -善,殆过于æŽã€‚â€å…ƒã€ç™½ä¹‹è®ºå¦‚æ¤ã€‚盖其出处劳佚,喜ä¹æ‚²æ„¤ï¼Œå¥½è´¤æ¶æ¶ï¼Œä¸€è§ä¹‹äºŽè¯—。而 -åˆä»¥å¿ å›å¿§å›½ã€ä¼¤æ—¶å¿µä¹±ä¸ºæœ¬æ—¨ã€‚读其诗å¯ä»¥çŸ¥å…¶ä¸–,故当时谓之“诗å²â€ã€‚æ—§é›†è¯—æ–‡å…±å… -åå·ï¼Œä»Šç¼–诗åä¹å·ã€‚ - -\begin{table}[htbp] -\centering -\caption{并排åè¡¨æ ¼} -\label{tab:subtable} -\subcaptionbox{第一个åè¡¨æ ¼} -{ -\begin{tabular}{p{2cm}p{2cm}} -\toprule -111 & 222 \\\midrule -222 & 333 \\\bottomrule -\end{tabular} -} -\hskip2cm -\subcaptionbox{第二个åè¡¨æ ¼} -{ -\begin{tabular}{p{2cm}p{2cm}} -\toprule -111 & 222 \\\midrule -222 & 333 \\\bottomrule -\end{tabular} -} -\end{table} - -ä¸å¯å¦è®¤ \LaTeX{} çš„è¡¨æ ¼åŠŸèƒ½æ²¡æœ‰æƒ³è±¡ä¸çš„那么强大,ä¸è¿‡åªè¦è¶³å¤Ÿè®¤çœŸï¼Œè¶³å¤Ÿç»†è‡´ï¼Œ -åŒæ ·å¯ä»¥æŽ’出æ¥éžå¸¸å¤æ‚éžå¸¸æ¼‚äº®çš„è¡¨æ ¼ã€‚è¯·å‚看表~\ref{tab:tabexamp2}。 -\begin{table}[htbp] - \centering\dawu[1.3] - \caption{å¤æ‚è¡¨æ ¼ç¤ºä¾‹ 2} - \label{tab:tabexamp2} - \begin{tabular}[c]{|m{1.5cm}|c|c|c|c|c|c|}\hline - \multicolumn{2}{|c|}{Network Topology} & \# of nodes & - \multicolumn{3}{c|}{\# of clients} & Server \\\hline - GT-ITM & Waxman Transit-Stub & 600 & - \multirow{2}{1.5em}{2\%}& - \multirow{2}{2em}{10\%}& - \multirow{2}{2em}{50\%}& - \multirow{2}{1.2in}{Max. Connectivity}\\\cline{1-3} - \multicolumn{2}{|c|}{Inet-2.1} & 6000 & & & &\\\hline - \multirow{2}{1.5cm}{Xue} & Rui & Ni &\multicolumn{4}{c|}{\multirow{2}*{\thuthesis}}\\\cline{2-3} - & \multicolumn{2}{c|}{ABCDEF} &\multicolumn{4}{c|}{} \\\hline -\end{tabular} -\end{table} - -最åŽå°±æ˜¯æ¸…新飘逸ã€æ–‡çº¦æ„èµ…ã€ç©ºè°·ç»å“çš„çŽ‹å¤§ä¾ äº†ã€‚çŽ‹ç»´ï¼Œå—摩诘,河东人。工书画,与 -弟缙俱有俊æ‰ã€‚开元ä¹å¹´ï¼Œè¿›å£«æ“¢ç¬¬ï¼Œè°ƒå¤ªä¹ä¸žã€‚å累为济州å¸ä»“å‚军,历å³æ‹¾é—ã€ç›‘察御 -å²ã€å·¦è¡¥é˜™ã€åº“部郎ä¸ï¼Œæ‹œå部郎ä¸ã€‚天å®æœ«ï¼Œä¸ºç»™äº‹ä¸ã€‚å®‰ç¦„å±±é™·ä¸¤éƒ½ï¼Œç»´ä¸ºè´¼æ‰€å¾—ï¼Œæœ -è¯é˜³å–‘,拘于è©æ寺。禄山宴å‡ç¢§æ± ,维潜赋诗悲悼,闻于行在。贼平,陷贼官三ç‰å®šç½ªï¼Œ -特原之,责授太åä¸å…,è¿ä¸åº¶åã€ä¸ä¹¦èˆäººã€‚å¤æ‹œç»™äº‹ä¸ï¼Œè½¬å°šä¹¦å³ä¸žã€‚维以诗å盛于开 -å…ƒã€å¤©å®é—´ï¼Œå®è–›è¯¸çŽ‹é©¸é©¬è±ªè´µä¹‹é—¨ï¼Œæ— ä¸æ‹‚å¸è¿Žä¹‹ã€‚得宋之问辋å·åˆ«å¢…,山水ç»èƒœï¼Œä¸Žé“ -å‹è£´è¿ªï¼Œæµ®èˆŸå¾€æ¥ï¼Œå¼¹ç´èµ‹è¯—,啸å’终日。笃于奉佛,晚年长斋禅诵。一日,忽索笔作书 -数纸,别弟缙åŠå¹³ç”Ÿäº²æ•…,èˆç¬”而å’ã€‚èµ ç§˜ä¹¦ç›‘ã€‚å®åº”ä¸ï¼Œä»£å®—问缙:“朕常于诸王å闻维 -ä¹ç« ,今å˜å‡ 何?â€ç¼™é›†è¯—å…å·ï¼Œæ–‡å››å·ï¼Œè¡¨ä¸Šä¹‹ã€‚æ••ç”云,å¿ä¼¯æ°ä½åˆ—å…ˆæœï¼Œå高希代。 -抗行周雅,长æ–楚辞。诗家者æµï¼Œæ—¶è®ºå½’美。克æˆç¼–录,å¹æ¯è‰¯æ·±ã€‚æ®·ç’ è°“ç»´è¯—è¯ç§€è°ƒé›…, -æ„æ–°ç†æƒ¬ã€‚在泉æˆç ,著å£æˆç»˜ã€‚è‹è½¼äº¦äº‘:“维诗ä¸æœ‰ç”»ï¼Œç”»ä¸æœ‰è¯—也。â€ä»Šç¼–诗四å·ã€‚ - -\begin{longtable}[c]{c*{6}{r}} -\caption{实验数æ®}\label{tab:performance}\\ -\toprule - æµ‹è¯•ç¨‹åº & \multicolumn{1}{c}{æ£å¸¸è¿è¡Œ} & \multicolumn{1}{c}{åŒæ¥} & \multicolumn{1}{c}{检查点} & \multicolumn{1}{c}{å·å›žæ¢å¤} -& \multicolumn{1}{c}{进程è¿ç§»} & \multicolumn{1}{c}{检查点} \\ -& \multicolumn{1}{c}{时间 (s)}& \multicolumn{1}{c}{时间 (s)}& -\multicolumn{1}{c}{时间 (s)}& \multicolumn{1}{c}{时间 (s)}& \multicolumn{1}{c}{ - 时间 (s)}& 文件(KB)\\\midrule -\endfirsthead -\multicolumn{7}{c}{ç»è¡¨~\thetable\hskip1em 实验数æ®}\\ -\toprule - æµ‹è¯•ç¨‹åº & \multicolumn{1}{c}{æ£å¸¸è¿è¡Œ} & \multicolumn{1}{c}{åŒæ¥} & \multicolumn{1}{c}{检查点} & \multicolumn{1}{c}{å·å›žæ¢å¤} -& \multicolumn{1}{c}{进程è¿ç§»} & \multicolumn{1}{c}{检查点} \\ -& \multicolumn{1}{c}{时间 (s)}& \multicolumn{1}{c}{时间 (s)}& -\multicolumn{1}{c}{时间 (s)}& \multicolumn{1}{c}{时间 (s)}& \multicolumn{1}{c}{ - 时间 (s)}& 文件(KB)\\\midrule -\endhead -\hline -\multicolumn{7}{r}{ç»ä¸‹é¡µ} -\endfoot -\endlastfoot -CG.A.2 & 23.05 & 0.002 & 0.116 & 0.035 & 0.589 & 32491 \\ -CG.A.4 & 15.06 & 0.003 & 0.067 & 0.021 & 0.351 & 18211 \\ -CG.A.8 & 13.38 & 0.004 & 0.072 & 0.023 & 0.210 & 9890 \\ -CG.B.2 & 867.45 & 0.002 & 0.864 & 0.232 & 3.256 & 228562 \\ -CG.B.4 & 501.61 & 0.003 & 0.438 & 0.136 & 2.075 & 123862 \\ -CG.B.8 & 384.65 & 0.004 & 0.457 & 0.108 & 1.235 & 63777 \\ -MG.A.2 & 112.27 & 0.002 & 0.846 & 0.237 & 3.930 & 236473 \\ -MG.A.4 & 59.84 & 0.003 & 0.442 & 0.128 & 2.070 & 123875 \\ -MG.A.8 & 31.38 & 0.003 & 0.476 & 0.114 & 1.041 & 60627 \\ -MG.B.2 & 526.28 & 0.002 & 0.821 & 0.238 & 4.176 & 236635 \\ -MG.B.4 & 280.11 & 0.003 & 0.432 & 0.130 & 1.706 & 123793 \\ -MG.B.8 & 148.29 & 0.003 & 0.442 & 0.116 & 0.893 & 60600 \\ -LU.A.2 & 2116.54 & 0.002 & 0.110 & 0.030 & 0.532 & 28754 \\ -LU.A.4 & 1102.50 & 0.002 & 0.069 & 0.017 & 0.255 & 14915 \\ -LU.A.8 & 574.47 & 0.003 & 0.067 & 0.016 & 0.192 & 8655 \\ -LU.B.2 & 9712.87 & 0.002 & 0.357 & 0.104 & 1.734 & 101975 \\ -LU.B.4 & 4757.80 & 0.003 & 0.190 & 0.056 & 0.808 & 53522 \\ -LU.B.8 & 2444.05 & 0.004 & 0.222 & 0.057 & 0.548 & 30134 \\ -EP.A.2 & 123.81 & 0.002 & 0.010 & 0.003 & 0.074 & 1834 \\ -EP.A.4 & 61.92 & 0.003 & 0.011 & 0.004 & 0.073 & 1743 \\ -EP.A.8 & 31.06 & 0.004 & 0.017 & 0.005 & 0.073 & 1661 \\ -EP.B.2 & 495.49 & 0.001 & 0.009 & 0.003 & 0.196 & 2011 \\ -EP.B.4 & 247.69 & 0.002 & 0.012 & 0.004 & 0.122 & 1663 \\ -EP.B.8 & 126.74 & 0.003 & 0.017 & 0.005 & 0.083 & 1656 \\ -\bottomrule -\end{longtable} - -è¦æƒ³ç”¨å¥½è®ºæ–‡æ¨¡æ¿è¿˜æ˜¯å¾—æå‰å¦ä¹ 一些 \TeX/\LaTeX{} 的相关知识,具备一些基本能力,掌 -æ¡ä¸€äº›å¸¸è§æŠ€å·§ï¼Œå¦åˆ™ä¸€æ—¦é‡åˆ°é—®é¢˜è¿˜çœŸæ˜¯æ¯”较麻烦。我们è§è¿‡å¾ˆå¤šè¿™æ ·çš„åŒå¦ï¼Œä¸€ç›´ä»¥æ¥ -都是使用 Word ç‰å—处ç†å·¥å…·ï¼Œä»¥ä¸º \LaTeX{} 模æ¿çš„用法也应该类似,所以就沿è¢åŒæ ·çš„æ€ -è·¯æ¥å¯¹å¾…è¿™ç§æ‰€è§éžæ‰€å¾—的排版工具,结果被折腾的焦头烂é¢ï¼Œç–²æƒ«ä¸å ªã€‚ - -如果您è¦æŽ’ç‰ˆçš„è¡¨æ ¼é•¿åº¦è¶…è¿‡ä¸€é¡µï¼Œé‚£ä¹ˆæŽ¨è使用 \pkg{longtable} 或者 \pkg{supertabular} -å®åŒ…,模æ¿å¯¹ \pkg{longtable} 进行了相应的设置,所以用起æ¥å¯èƒ½ç®€å•ä¸€äº›ã€‚ -表~\ref{tab:performance} 就是 \pkg{longtable} 的示例。 - -\subsection{其它} -\label{sec:tableother} -如果ä¸æƒ³è®©æŸä¸ªè¡¨æ ¼æˆ–者图片出现在索引里é¢ï¼Œè¯·ä½¿ç”¨å‘½ä»¤ \cs{caption*}。 -这个命令ä¸ä¼šç»™è¡¨æ ¼ç¼–å·ï¼Œä¹Ÿå°±æ˜¯å‡ºæ¥çš„åªæœ‰æ ‡é¢˜æ–‡å—而没有“表~XXâ€ï¼Œâ€œå›¾~XXâ€ï¼Œå¦åˆ™ -索引里é¢åºå·ä¸è¿žç»å°±æ˜¾å¾—ä¸ä¼¦ä¸ç±»ï¼Œè¿™ä¹Ÿæ˜¯ \LaTeX{} 里星å·å‘½ä»¤é»˜è®¤çš„规则。 - -有这ç§éœ€æ±‚的多是本科åŒå¦çš„英文资料翻译部分,如果觉得附录ä¸è‹±æ–‡åŽŸæ–‡ä¸çš„è¡¨æ ¼å’Œå›¾ -片显示æˆâ€œè¡¨â€å’Œâ€œå›¾â€ä¸å调的è¯ï¼Œä¸€ä¸ªå¾ˆå¥½çš„办法就是用 \cs{caption*},å‚æ•° -éšä¾¿è‡ªå·±å†™ï¼Œæ¯”如ä¸å®ˆè§„矩的表~1.111 和图~1.111 能满足这ç§ç‰¹æ®Šéœ€è¦ï¼ˆå¯ä»¥å‚看附录部 -分)。 -\begin{table}[ht] - \begin{minipage}{0.4\linewidth} - \centering - \caption*{表~1.111\quad 这是一个手动编å·ï¼Œä¸å‡ºçŽ°åœ¨ç´¢å¼•ä¸çš„è¡¨æ ¼ã€‚} - \label{tab:badtabular} - \framebox(150,50)[c]{\thuthesis} - \end{minipage}% - \hfill% - \begin{minipage}{0.4\linewidth} - \centering - \caption*{Figure~1.111\quad 这是一个手动编å·ï¼Œä¸å‡ºçŽ°åœ¨ç´¢å¼•ä¸çš„图。} - \label{tab:badfigure} - \framebox(150,50)[c]{薛瑞尼} - \end{minipage} -\end{table} - -如果的确想让它编å·ï¼Œä½†åˆä¸æƒ³è®©å®ƒå‡ºçŽ°åœ¨ç´¢å¼•ä¸çš„è¯ï¼Œç›®å‰æ¨¡æ¿ä¸Šä¸æ”¯æŒã€‚ - -最åŽï¼Œè™½ç„¶å¤§å®¶ä¸ä¸€å®šä¼šç‹¬ç«‹ä½¿ç”¨å°é¡µï¼Œä½†æ˜¯å…³äºŽå°é¡µä¸çš„脚注还是有必è¦æ一下。请看下 -é¢çš„例å。 - -\begin{minipage}[t]{\linewidth-2\parindent} - 柳宗元,å—å厚(773-819),河东(今永济县)人\footnote{山西永济水饺。},是å”代 - æ°å‡ºçš„æ–‡å¦å®¶ï¼Œå“²å¦å®¶ï¼ŒåŒæ—¶ä¹Ÿæ˜¯ä¸€ä½æ”¿æ²»æ”¹é©å®¶ã€‚与韩愈共åŒå€¡å¯¼å”代å¤æ–‡è¿åŠ¨ï¼Œå¹¶ç§° - 韩柳\footnote{å”宋八大家之首二ä½ã€‚}。 -\end{minipage} -\\ - -å”æœå®‰å²ä¹‹ä¹±åŽï¼Œå®¦å®˜ä¸“æƒï¼Œè—©é•‡å‰²æ®ï¼ŒåœŸåœ°å…¼å¹¶æ—¥æ¸ä¸¥é‡ï¼Œç¤¾ä¼šç”Ÿäº§ç ´å严é‡ï¼Œæ°‘ä¸èŠç”Ÿã€‚柳宗 -元对这ç§ç¤¾ä¼šçŽ°å®žæžä¸ºä¸æ»¡ï¼Œä»–积æžå‚åŠ äº†çŽ‹å”文领导的“永济é©æ–°â€ï¼Œå¹¶æˆä¸ºè¿™ä¸€ -è¿åŠ¨çš„ä¸åšäººç‰©ã€‚他们é©é™¤å¼Šæ”¿ï¼Œæ‰“击æƒå¥¸ï¼Œè§¦çŠ¯äº†å®¦å®˜å’Œå®˜åƒšè´µæ—利益,在他们的è”åˆå -扑下,改é©å¤±è´¥äº†ï¼ŒæŸ³å®—元被贬为永州å¸é©¬ã€‚ - -\section{æ•°å¦ç¬¦å·å’Œå…¬å¼} - -\subsection{æ•°å¦ç¬¦å·} -æ•°å¦ç¬¦å·åº”éµå¾ª GB/T 3102.11-1993《物ç†ç§‘å¦å’ŒæŠ€æœ¯ä¸ä½¿ç”¨çš„æ•°å¦ç¬¦å·ã€‹ -(原 GB 3102.11-1993), -模æ¿ä¸ä½¿ç”¨ \pkg{unicode-math} å®åŒ…æ¥é…置数å¦ç¬¦å·ï¼Œ -与 \LaTeX{} 默认的英美国家的符å·ä¹ 惯有所差异: -\begin{enumerate} - \item 大写希腊å—æ¯é»˜è®¤ä¸ºæ–œä½“,如 \cs{Delta}:$\Delta$。 - \item 有é™å¢žé‡ç¬¦å· $\increment$(U+2206)应使用 \pkg{unicode-math} å®åŒ…æ供的 - \cs{increment} 命令。 - \item å‘é‡ã€çŸ©é˜µå’Œå¼ é‡è¦æ±‚粗斜体,应使用 \cs{symbf} 命令, - 如 \verb|\symbf{A}|ã€\verb|\symbf{\alpha}|。 - \item æ•°å¦å¸¸æ•°å’Œç‰¹æ®Šå‡½æ•°è¦æ±‚用æ£ä½“,应使用 \cs{symup} 命令, - 如 $\symup{\pi} = 3.14\dots$; $\symup{e} = 2.718\dots$, - \item 微分å·å’Œç§¯åˆ†å·ä½¿ç”¨ä½¿ç”¨æ£ä½“,比如 $\int f(x) \dif x$。 -\end{enumerate} - -关于数å¦ç¬¦å·æ›´å¤šçš„用法,å‚考 -\href{http://mirrors.ctan.org/macros/latex/contrib/unicode-math/unicode-math.pdf}{\pkg{unicode-math}} -å®åŒ…的使用说明, -全部数å¦ç¬¦å·å‘½çš„令å‚考 -\href{http://mirrors.ctan.org/macros/latex/contrib/unicode-math/unimath-symbols.pdf}{\pkg{unimath-symbols}}。 - -关于é‡å’Œå•ä½æŽ¨è使用 -\href{http://mirrors.ctan.org/macros/latex/contrib/siunitx/siunitx.pdf}{\pkg{siunitx}} -å®åŒ…,比如: -\SI{6.4e6}{m}, -\SI{9}{\micro\meter}, -\si{kg.m.s^{-1}}, -\SIrange{10}{20}{\degreeCelsius}。 - -\subsection{æ•°å¦å…¬å¼} -\label{sec:equation} - -è´å¶æ–¯å…¬å¼å¦‚å¼~(\ref{equ:chap1:bayes})ï¼Œå…¶ä¸ $p(y|\vx)$ 为åŽéªŒï¼› -$p(\vx)$ ä¸ºå…ˆéªŒï¼›åˆ†æ¯ $p(\vx)$ ä¸ºå½’ä¸€åŒ–å› å。 -\begin{equation} -\label{equ:chap1:bayes} -p(y|\vx) = \frac{p(\vx,y)}{p(\vx)}= -\frac{p(\vx|y)p(y)}{p(\vx)} -\end{equation} - -论文里é¢å…¬å¼è¶Šå¤šï¼Œ\TeX{} 就越 happy。å†çœ‹ä¸€ä¸ª \pkg{amsmath} 的例å: -\newcommand{\envert}[1]{\left\lvert#1\right\rvert} -\begin{equation}\label{detK2} -\det\mK(t=1,t_1,\dots,t_n)=\sum_{I\in\vn}(-1)^{\envert{I}} -\prod_{i\in I}t_i\prod_{j\in I}(D_j+\lambda_jt_j)\det\mA -^{(\lambda)}(\overline{I}|\overline{I})=0. -\end{equation} - -å‰é¢å®šç†ç¤ºä¾‹éƒ¨åˆ†åˆ—举了很多公å¼çŽ¯å¢ƒï¼Œå¯ä»¥è¯´æŠŠå¸¸è§çš„情况都覆盖了,大家在写公å¼çš„æ—¶ -候一定è¦å¥½å¥½çœ‹ \pkg{amsmath} 的文档,并å‚考模æ¿ä¸çš„用法: -\begin{multline*}%\tag{[b]} % 这个出现在索引ä¸çš„ -\int_a^b\biggl\{\int_a^b[f(x)^2g(y)^2+f(y)^2g(x)^2] - -2f(x)g(x)f(y)g(y)\dif x\biggr\}\dif y \\ - =\int_a^b\biggl\{g(y)^2\int_a^bf^2+f(y)^2 - \int_a^b g^2-2f(y)g(y)\int_a^b fg\biggr\}\dif y -\end{multline*} - -其实还å¯ä»¥çœ‹çœ‹è¿™ä¸ªå¤šçº§è§„划: -\begin{equation} - \label{bilevel} - \begin{cases} - \max_{\bm{x}} F(\bm{x}, y_1^*, y_2^*, \dots, y_m^*) \\ - \text{subject to:} \\ - \qquad G(\bm{x}) \le 0 \\ - \qquad (y_1^*, y_2^*, \dots, y_m^*) \text{ solves problems } - (i = 1, 2, \dots, m) \\ - \qquad - \begin{cases} - \max_{\bm{x}} f_i(\bm{x}, y_1, y_2, \dots, y_m) \\ - \text{subject to:} \\ - \qquad g_i(\bm{x}, y_1, y_2, \dots, y_m) \le 0. - \end{cases} - \end{cases} -\end{equation} -这些跟规划相关的公å¼éƒ½æ¥è‡ªäºŽåˆ˜å®ç¢‡è€å¸ˆã€Šä¸ç¡®å®šè§„划》的课件。 - -\section{定ç†çŽ¯å¢ƒ} -\label{sec:theorem} - -给大家演示一下å„ç§å’Œè¯æ˜Žæœ‰å…³çš„环境,比如公å¼~\eqref{eq:eqnxmp}: - -\begin{assumption} -待月西厢下,迎风户åŠå¼€ï¼›éš”墙花影动,疑是玉人æ¥ã€‚ -\begin{align} - \label{eq:eqnxmp} - c & = a^2 - b^2 \\ - & = (a+b)(a-b) -\end{align} -\end{assumption} - -åƒè¾›ä¸‡è‹¦ï¼ŒåŽ†å°½è‰°éš¾ï¼Œå¾—有今日。然相从数åƒé‡Œï¼Œæœªæ›¾å“€æˆšã€‚今将渡江,方图百年欢笑,如 -何å起悲伤?(引自《æœå娘怒沉百å®ç®±ã€‹ï¼‰ - -\begin{definition} -\label{def:ziyue} -å曰:「é“åƒä¹˜ä¹‹å›½ï¼Œæ•¬äº‹è€Œä¿¡ï¼ŒèŠ‚用而爱人,使民以时。〠-\end{definition} - -åƒå¤ç¬¬ä¸€å®šä¹‰ï¼é—®ä¸–é—´ã€æƒ…为何物,åªæ•™ç”Ÿæ»ç›¸è®¸ï¼Ÿå¤©å—地北åŒé£žå®¢ï¼Œè€ç¿…å‡ å›žå¯’æš‘ã€‚æ¬¢ä¹è¶£ï¼Œç¦»åˆ«è‹¦ï¼Œå°±ä¸æ›´æœ‰ç—´å„¿å¥³ã€‚ -å›åº”有è¯ï¼Œæ¸ºä¸‡é‡Œå±‚云,åƒå±±æš®é›ªï¼Œåªå½±å‘è°åŽ»ï¼Ÿ - -横汾路,寂寞当年箫鼓,è’烟ä¾æ—§å¹³æ¥šã€‚æ‹›é‚楚些何嗟åŠï¼Œå±±é¬¼æš—谛风雨。天也妒,未信与,莺儿燕å俱黄土。 -åƒç§‹ä¸‡å¤ï¼Œä¸ºç•™å¾…骚人,狂æŒç—›é¥®ï¼Œæ¥è®¿é›ä¸˜å¤„。(å‚è§å®šä¹‰~\ref{def:ziyue}) - -\begin{proposition} - 曾å曰:「å¾æ—¥ä¸‰çœå¾èº« —— 为人谋而ä¸å¿ 乎?与朋å‹äº¤è€Œä¸ä¿¡ä¹Žï¼Ÿä¼ ä¸ä¹ 乎?〠-\end{proposition} - -其日牛马嘶,新妇入é’åºï¼Œå¥„奄黄æ˜åŽï¼Œå¯‚寂人定åˆï¼Œæˆ‘命ç»ä»Šæ—¥ï¼Œé‚去尸长留,æ½è£™è„±ä¸å±¥ï¼Œä¸¾èº«èµ´æ¸…æ± ï¼Œ -府åé—»æ¤äº‹ï¼Œå¿ƒçŸ¥é•¿åˆ«ç¦»ï¼Œå¾˜å¾Šåºæ ‘下,自挂东å—æžã€‚ - -\begin{remark} -天ä¸è¨€è‡ªé«˜ï¼Œæ°´ä¸è¨€è‡ªæµã€‚ -\begin{gather*} -\begin{split} -\varphi(x,z) -&=z-\gamma_{10}x-\gamma_{mn}x^mz^n\\ -&=z-Mr^{-1}x-Mr^{-(m+n)}x^mz^n -\end{split}\\[6pt] -\begin{align} \zeta^0&=(\xi^0)^2,\\ -\zeta^1 &=\xi^0\xi^1,\\ -\zeta^2 &=(\xi^1)^2, -\end{align} -\end{gather*} -\end{remark} - -天尊地å‘,乾å¤å®šçŸ£ã€‚å‘高以陈,贵贱ä½çŸ£ã€‚ 动é™æœ‰å¸¸ï¼ŒåˆšæŸ”æ–矣。方以类èšï¼Œç‰©ä»¥ç¾¤åˆ†ï¼Œ -å‰å‡¶ç”ŸçŸ£ã€‚在天æˆè±¡ï¼Œåœ¨åœ°æˆå½¢ï¼Œå˜åŒ–è§çŸ£ã€‚鼓之以雷霆,润之以风雨,日月è¿è¡Œï¼Œä¸€å¯’一 -暑,乾é“æˆç”·ï¼Œå¤é“æˆå¥³ã€‚乾知大始,å¤ä½œæˆç‰©ã€‚乾以易知,å¤ä»¥ç®€èƒ½ã€‚易则易知,简则易 -从。易知则有亲,易从则有功。有亲则å¯ä¹…,有功则å¯å¤§ã€‚å¯ä¹…则贤人之德,å¯å¤§åˆ™è´¤äººä¹‹ -业。易简,而天下矣之ç†çŸ£ï¼›å¤©ä¸‹ä¹‹ç†å¾—,而æˆä½ä¹Žå…¶ä¸çŸ£ã€‚ - -\begin{axiom} -两点间直线段è·ç¦»æœ€çŸã€‚ -\begin{align} -x&\equiv y+1\pmod{m^2}\\ -x&\equiv y+1\mod{m^2}\\ -x&\equiv y+1\pod{m^2} -\end{align} -\end{axiom} - -《彖曰》:大哉乾元,万物资始,乃统天。云行雨施,å“物æµå½¢ã€‚大明始终,å…ä½æ—¶æˆï¼Œæ—¶ -乘å…龙以御天。乾é“å˜åŒ–,å„æ£æ€§å‘½ï¼Œä¿åˆå¤§å’Œï¼Œä¹ƒåˆ©è´žã€‚首出庶物,万国咸å®ã€‚ - -《象曰》:天行å¥ï¼Œå›å以自强ä¸æ¯ã€‚潜龙勿用,阳在下也。è§é¾™å†ç”°ï¼Œå¾·æ–½æ™®ä¹Ÿã€‚终日乾 -乾,åå¤é“ä¹Ÿã€‚æˆ–è·ƒåœ¨æ¸Šï¼Œè¿›æ— å’Žä¹Ÿã€‚é£žé¾™åœ¨å¤©ï¼Œå¤§äººé€ ä¹Ÿã€‚äº¢é¾™æœ‰æ‚”ï¼Œç›ˆä¸å¯ä¹…也。用ä¹ï¼Œ -天德ä¸å¯ä¸ºé¦–也。    - -\begin{lemma} -《猫和è€é¼ 》是我最爱看的动画片。 -\begin{multline*}%\tag*{[a]} % 这个ä¸å‡ºçŽ°åœ¨ç´¢å¼•ä¸ -\int_a^b\biggl\{\int_a^b[f(x)^2g(y)^2+f(y)^2g(x)^2] - -2f(x)g(x)f(y)g(y)\dif x\biggr\}\dif y \\ - =\int_a^b\biggl\{g(y)^2\int_a^bf^2+f(y)^2 - \int_a^b g^2-2f(y)g(y)\int_a^b fg\biggr\}\dif y -\end{multline*} -\end{lemma} - -行行é‡è¡Œè¡Œï¼Œä¸Žå›ç”Ÿåˆ«ç¦»ã€‚相去万余里,å„在天一涯。é“路阻且长,会é¢å®‰å¯çŸ¥ã€‚胡马ä¾åŒ— -风,越鸟巢å—æžã€‚相去日已远,衣带日已缓。浮云蔽白日,游åä¸é¡¾è¿”。æ€å›ä»¤äººè€ï¼Œå²æœˆ -忽已晚。 弃æå‹¿å¤é“ï¼ŒåŠªåŠ›åŠ é¤é¥ã€‚ - -\begin{theorem}\label{the:theorem1} -犯我强汉者,虽远必诛\hfill —— 陈汤(汉) -\end{theorem} - -下é¢æ¼”示了åå…¬å¼ç¼–å·ï¼š -\begin{subequations} -\begin{align} -y & = 1 \\ -y & = 0 -\end{align} -\end{subequations} - -é“å¯é“,éžå¸¸é“。åå¯å,éžå¸¸åã€‚æ— å天地之始;有å万物之æ¯ã€‚æ•…å¸¸æ— ï¼Œæ¬²ä»¥è§‚å…¶å¦™ï¼› -常有,欲以观其徼。æ¤ä¸¤è€…,åŒå‡ºè€Œå¼‚å,åŒè°“之玄。玄之åˆçŽ„,众妙之门。上善若水。水 -善利万物而ä¸äº‰ï¼Œå¤„众人之所æ¶ï¼Œæ•…å‡ äºŽé“。曲则全,枉则直,洼则盈,æ•åˆ™æ–°ï¼Œå°‘则多, -多则惑。人法地,地法天,天法é“,é“法自然。知人者智,自知者明。胜人者有力,自胜 -者强。知足者富。强行者有志。ä¸å¤±å…¶æ‰€è€…久。æ»è€Œä¸äº¡è€…寿。 - -\begin{proof} -燕赵å¤ç§°å¤šæ„Ÿæ…¨æ‚²æŒä¹‹å£«ã€‚董生举进士,连ä¸å¾—志于有å¸ï¼Œæ€€æŠ±åˆ©å™¨ï¼Œéƒéƒé€‚å…¹åœŸï¼Œå¾ -知其必有åˆä¹Ÿã€‚董生勉乎哉? - -夫以å之ä¸é‡æ—¶ï¼Œè‹Ÿæ…•ä¹‰å¼ºä»è€…,皆爱惜焉,矧燕ã€èµµä¹‹å£«å‡ºä¹Žå…¶æ€§è€…哉ï¼ç„¶å¾å°é—» -风俗与化移易,å¾æ¶çŸ¥å…¶ä»Šä¸å¼‚于å¤æ‰€äº‘邪?èŠä»¥å¾å之行åœä¹‹ä¹Ÿã€‚董生勉乎哉? - -å¾å› å有所感矣。为我åŠæœ›è¯¸å›ä¹‹å¢“,而观于其市,å¤æœ‰æ˜”æ—¶å± ç‹—è€…ä¹Žï¼Ÿä¸ºæˆ‘è°¢ -曰:“明天å在上,å¯ä»¥å‡ºè€Œä»•çŸ£ï¼â€ \hfill —— 韩愈《é€è‘£é‚µå—åºã€‹ -\end{proof} - -\begin{corollary} - å››å·è¯é…音的《猫和è€é¼ 》是世界上最好看最好å¬æœ€æœ‰è¶£çš„动画片。 -\begin{alignat}{3} -V_i & =v_i - q_i v_j, & \qquad X_i & = x_i - q_i x_j, - & \qquad U_i & = u_i, - \qquad \text{for $i\ne j$;}\label{eq:B}\\ -V_j & = v_j, & \qquad X_j & = x_j, - & \qquad U_j & u_j + \sum_{i\ne j} q_i u_i. -\end{alignat} -\end{corollary} - -迢迢牵牛星,皎皎河汉女。 -çº¤çº¤æ“¢ç´ æ‰‹ï¼Œæœæœå¼„机æ¼ã€‚ -终日ä¸æˆç« ,泣涕零如雨。 -河汉清且浅,相去å¤å‡ 许。 -盈盈一水间,脉脉ä¸å¾—è¯ã€‚ - -\begin{example} - 大家æ¥çœ‹è¿™ä¸ªä¾‹å。 -\begin{equation} - \label{ktc} - \begin{cases} - \nabla f(\bm{x}^*) - \sum_{j=1}^p \lambda_j \nabla g_j(\bm{x}^*) - = 0 \\[0.3cm] - \lambda_j g_j(\bm{x}^*) = 0, \quad j = 1, 2, \dots, p \\[0.2cm] - \lambda_j \ge 0, \quad j = 1, 2, \dots, p. - \end{cases} -\end{equation} -\end{example} - -\begin{exercise} - 请列出 Andrew S. Tanenbaum å’Œ W. Richard Stevens 的所有著作。 -\end{exercise} - -\begin{conjecture} \textit{Poincare Conjecture} If in a closed three-dimensional - space, any closed curves can shrink to a point continuously, this space can be - deformed to a sphere. -\end{conjecture} - -\begin{problem} - 回ç”还是ä¸å›žç”,是个问题。 -\end{problem} - -如何引用定ç†~\ref{the:theorem1} å‘¢ï¼ŸåŠ ä¸Š \cs{label} 使用 \cs{ref} å³å¯ã€‚å¦¾å‘ -åˆè¦†é¢ï¼ŒæŠ˜èŠ±é—¨å‰å‰§ã€‚郎骑竹马æ¥ï¼Œç»•åºŠå¼„é’梅。åŒå±…长干里,两å°æ— 嫌猜。 å四为å›å¦‡ï¼Œ -羞颜未å°å¼€ã€‚低头å‘æš—å£ï¼Œåƒå”¤ä¸ä¸€å›žã€‚å五始展眉,愿åŒå°˜ä¸Žç°ã€‚常å˜æŠ±æŸ±ä¿¡ï¼Œå²‚上望夫 -å°ã€‚ åå…å›è¿œè¡Œï¼Œçž¿å¡˜æ»Ÿæ»ªå †ã€‚五月ä¸å¯è§¦ï¼ŒçŒ¿å£°å¤©ä¸Šå“€ã€‚é—¨å‰è¿Ÿè¡Œè¿¹ï¼Œä¸€ä¸€ç”Ÿç»¿è‹”。苔深 -ä¸èƒ½æ‰«ï¼Œè½å¶ç§‹é£Žæ—©ã€‚八月è´è¶æ¥ï¼ŒåŒé£žè¥¿å›è‰ã€‚æ„Ÿæ¤ä¼¤å¦¾å¿ƒï¼Œåæ„红颜è€ã€‚ - -\section{å‚考文献} -\label{sec:bib} - -本模æ¿æŽ¨è使用 BibTeX,分别æ供数å—引用(\texttt{thuthesis-numeric.bst})和作 -者年份引用(\texttt{thuthesis-author-year.bst}ï¼‰æ ·å¼ã€‚ -看看这个例å,关于书的~\cite{tex, companion, - ColdSources},还有这些~\cite{Krasnogor2004e, clzs, zjsw},关于期刊 -çš„~\cite{ELIDRISSI94, MELLINGER96, SHELL02},硕士论文~\cite{zhubajie, - metamori2004},åšå£«è®ºæ–‡~\cite{shaheshang, FistSystem01}ï¼Œæ ‡å‡†æ–‡ -件~\cite{IEEE-1363},会议论文~\cite{DPMG,kocher99},技术报告~\cite{NPB2},电åæ–‡ -献~\cite{chuban2001,oclc2000}。 -若使用著者-出版年制,ä¸æ–‡å‚考文献~\cite{cnarticle}åº”å¢žåŠ -\texttt{key=\{pinyin\}} å—段,以便æ£ç¡®è¿›è¡ŒæŽ’åº~\cite{cnproceed}。 -å¦å¤–,如果对å‚考文献有ä¸å¦‚æ„的地方,请手动修改 \texttt{bbl} 文件。 - -如果需è¦æ ‡å‡ºå¼•æ–‡é¡µç \cite[42]{tex},引文页ç 放在方括å·å¤–\cite[73]{tex}。 - -有时候ä¸æƒ³è¦ä¸Šæ ‡ï¼Œé‚£ä¹ˆå¯ä»¥è¿™æ ·~\inlinecite{shaheshang}。 +\chapter{论文主è¦éƒ¨åˆ†çš„写法} + +ç ”ç©¶ç”Ÿå¦ä½è®ºæ–‡æ’°å†™ï¼Œé™¤è¡¨è¾¾å½¢å¼ä¸Šéœ€è¦ç¬¦åˆä¸€å®šçš„æ ¼å¼è¦æ±‚外,内容方é¢ä¸Šä¹Ÿè¦éµå¾ªä¸€äº›å…±æ€§åŽŸåˆ™ã€‚ + +é€šå¸¸ç ”ç©¶ç”Ÿå¦ä½è®ºæ–‡åªèƒ½æœ‰ä¸€ä¸ªä¸»é¢˜(ä¸èƒ½æ˜¯å‡ å—工作拼凑在一起),该主题应针对æŸå¦ç§‘领域ä¸çš„一个具体问题展开深入ã€ç³»ç»Ÿçš„ç ”ç©¶ï¼Œå¹¶å¾—å‡ºæœ‰ä»·å€¼çš„ç ”ç©¶ç»“è®ºã€‚ +å¦ä½è®ºæ–‡çš„ç ”ç©¶ä¸»é¢˜åˆ‡å¿Œè¿‡å¤§ï¼Œä¾‹å¦‚ï¼Œâ€œä¸å›½å›½æœ‰ä¼ä¸šæ”¹åˆ¶é—®é¢˜ç ”究â€è¿™æ ·çš„ç ”ç©¶ä¸»é¢˜è¿‡å¤§ï¼Œå› ä¸ºâ€œå›½ä¼æ”¹åˆ¶â€æ¶‰åŠçš„é—®é¢˜èŒƒå›´å¤ªå¹¿ï¼Œå¾ˆéš¾åœ¨ä¸€æœ¬ç ”ç©¶ç”Ÿå¦ä½è®ºæ–‡ä¸å®Œå…¨ç ”究é€å½»ã€‚ + + + +\section{论文的è¯è¨€åŠè¡¨è¿°} + +é™¤å›½é™…ç ”ç©¶ç”Ÿå¤–ï¼Œå¦ä½è®ºæ–‡ä¸€å¾‹é¡»ç”¨æ±‰è¯ä¹¦å†™ã€‚ +å¦ä½è®ºæ–‡åº”当用规范汉å—进行撰写,除å¤æ±‰è¯ç ”究ä¸æ¶‰åŠçš„å¤æ–‡å—å’Œå‚考文献ä¸å¼•ç”¨çš„外文文献之外,å‡é‡‡ç”¨ç®€ä½“汉å—撰写。 + +å›½é™…ç ”ç©¶ç”Ÿä¸€èˆ¬åº”ä»¥ä¸æ–‡æˆ–英文书写å¦ä½è®ºæ–‡ï¼Œæ ¼å¼è¦æ±‚åŒä¸Šã€‚ +论文须用ä¸æ–‡å°é¢ã€‚ + +ç ”ç©¶ç”Ÿå¦ä½è®ºæ–‡æ˜¯å¦æœ¯ä½œå“ï¼Œå› æ¤å…¶è¡¨è¿°è¦ä¸¥è°¨ç®€æ˜Žï¼Œé‡ç‚¹çªå‡ºï¼Œä¸“业常识应简写或ä¸å†™ï¼Œåšåˆ°ç«‹è®ºæ£ç¡®ã€æ•°æ®å¯é ã€è¯´æ˜Žé€å½»ã€æŽ¨ç†ä¸¥è°¨ã€æ–‡å—å‡ç»ƒã€å±‚次分明,é¿å…使用文å¦æ€§è´¨çš„或带感情色彩的éžå¦æœ¯æ€§è¯è¨€ã€‚ + +论文ä¸å¦‚出现一个éžé€šç”¨æ€§çš„æ–°åè¯ã€æ–°æœ¯è¯æˆ–新概念,需éšå³è§£é‡Šæ¸…楚。 + + + +\section{论文题目的写法} + +论文题目应简明扼è¦åœ°åæ˜ è®ºæ–‡å·¥ä½œçš„ä¸»è¦å†…容,力求精炼ã€å‡†ç¡®ï¼Œåˆ‡å¿Œç¬¼ç»Ÿã€‚ +è®ºæ–‡é¢˜ç›®æ˜¯å¯¹ç ”ç©¶å¯¹è±¡çš„å‡†ç¡®ã€å…·ä½“æ述,一般è¦åœ¨ä¸€å®šç¨‹åº¦ä¸Šä½“çŽ°ç ”ç©¶ç»“è®ºï¼Œå› æ¤ï¼Œè®ºæ–‡é¢˜ç›®ä¸ä»…åº”å‘Šè¯‰è¯»è€…è¿™æœ¬è®ºæ–‡ç ”ç©¶äº†ä»€ä¹ˆé—®é¢˜ï¼Œæ›´è¦å‘Šè¯‰è¯»è€…è¿™ä¸ªç ”ç©¶å¾—å‡ºçš„ç»“è®ºã€‚ +例如:“在事实与虚构之间:梅ä¹ã€å¡å½ç‰¹ã€æ²ƒå°”夫的新闻观â€å°±æ¯”â€œä¸‰ä¸ªç¾Žå›½ä½œå®¶çš„æ–°é—»è§‚ç ”ç©¶â€æ›´ä¸“业ã€æ›´å‡†ç¡®ã€‚ + + + +\section{摘è¦çš„写法} + +论文摘è¦æ˜¯å¯¹è®ºæ–‡ç ”究内容的高度概括,应具有独立性和自å«æ€§ï¼Œå³åº”是 一篇简çŸä½†æ„ä¹‰å®Œæ•´çš„æ–‡ç« ã€‚ +通过阅读论文摘è¦ï¼Œè¯»è€…åº”è¯¥èƒ½å¤Ÿå¯¹è®ºæ–‡çš„ç ”ç©¶ 方法åŠç»“è®ºæœ‰ä¸€ä¸ªæ•´ä½“æ€§çš„äº†è§£ï¼Œå› æ¤æ‘˜è¦çš„写法应力求精确简明。 +è®ºæ–‡æ‘˜è¦ åº”åŒ…æ‹¬å¯¹é—®é¢˜åŠç ”究目的的æè¿°ã€å¯¹ä½¿ç”¨çš„æ–¹æ³•å’Œç ”ç©¶è¿‡ç¨‹è¿›è¡Œçš„ç®€è¦ä»‹ç»ã€ å¯¹ç ”ç©¶ç»“è®ºçš„é«˜åº¦å‡ç»ƒç‰ï¼Œé‡ç‚¹æ˜¯ç»“果和结论。 + +论文摘è¦åˆ‡å¿Œå†™æˆå…¨æ–‡çš„æ纲,尤其è¦é¿å…“第 1 ç« â€¦â€¦ï¼›ç¬¬ 2 ç« â€¦â€¦ï¼›â€¦â€¦â€è¿™æ ·çš„陈述方å¼ã€‚ + + + +\section{引言的写法} + +一篇å¦ä½è®ºæ–‡çš„引言大致包å«å¦‚ä¸‹å‡ ä¸ªéƒ¨åˆ†ï¼š +1ã€é—®é¢˜çš„æ出; +2ã€é€‰é¢˜èƒŒ 景åŠæ„义; +3ã€æ–‡çŒ®ç»¼è¿°ï¼› +4ã€ç ”究方法; +5ã€è®ºæ–‡ç»“构安排。 +\begin{itemize} + \item 问题的æ出:è¦æ¸…晰地é˜è¿°æ‰€è¦ç ”究的问题“是什么â€ã€‚ + \footnote{选题时切记è¦æœ‰â€œé—®é¢˜æ„识â€ï¼Œä¸è¦é€‰ä¸æ˜¯é—®é¢˜çš„问题æ¥ç ”究。} + \item 选题背景åŠæ„义:论述清楚为什么选择这个题目æ¥ç ”究,å³é˜è¿°è¯¥ç ”究对å¦ç§‘å‘展的贡献ã€å¯¹å›½è®¡æ°‘生的ç†è®ºä¸ŽçŽ°å®žæ„义ç‰ã€‚ + \item æ–‡çŒ®ç»¼è¿°ï¼šå¯¹æœ¬ç ”ç©¶ä¸»é¢˜èŒƒå›´å†…çš„æ–‡çŒ®è¿›è¡Œè¯¦å°½çš„ç»¼åˆè¿°è¯„,“述â€çš„åŒæ—¶ä¸€å®šè¦æœ‰â€œè¯„â€ï¼ŒæŒ‡å‡ºçŽ°æœ‰ç ”究状æ€ï¼Œä»å˜åœ¨å“ªäº›å°šå¾…è§£å†³çš„é—®é¢˜ï¼Œè®²å‡ºè‡ªå·±çš„ç ”ç©¶æœ‰å“ªäº›æŽ¢ç´¢æ€§å†…å®¹ã€‚ + \item ç ”ç©¶æ–¹æ³•ï¼šè®²æ¸…è®ºæ–‡æ‰€ä½¿ç”¨çš„å¦æœ¯ç ”究方法。 + \item 论文结构安排:介ç»æœ¬è®ºæ–‡çš„写作结构安排。 +\end{itemize} + + + +\section{æ£æ–‡çš„写法} + +æœ¬éƒ¨åˆ†æ˜¯è®ºæ–‡ä½œè€…çš„ç ”ç©¶å†…å®¹ï¼Œä¸èƒ½å°†ä»–äººç ”ç©¶æˆæžœä¸åŠ 区分地掺和进æ¥ã€‚ +å·²ç»åœ¨å¼•è¨€çš„文献综述部分讲过的内容,这里ä¸éœ€è¦å†é‡å¤ã€‚ +å„ç« ä¹‹é—´è¦å˜åœ¨æœ‰æœºè”系,符åˆé€»è¾‘顺åºã€‚ + + + +\section{结论的写法} + +结论是对论文主è¦ç ”究结果ã€è®ºç‚¹çš„æ炼与概括,应精炼ã€å‡†ç¡®ã€å®Œæ•´ï¼Œä½¿è¯»è€…看åŽèƒ½å…¨é¢äº†è§£è®ºæ–‡çš„æ„义ã€ç›®çš„和工作内容。 +结论是最终的ã€æ€»ä½“的结论,ä¸æ˜¯æ£æ–‡å„ç« å°ç»“的简å•é‡å¤ã€‚ +ç»“è®ºåº”åŒ…æ‹¬è®ºæ–‡çš„æ ¸å¿ƒè§‚ç‚¹ï¼Œä¸»è¦é˜è¿°ä½œè€…çš„åˆ›é€ æ€§å·¥ä½œåŠæ‰€å–å¾—çš„ç ”ç©¶æˆæžœåœ¨æœ¬é¢†åŸŸä¸çš„地ä½ã€ä½œç”¨å’Œæ„ä¹‰ï¼Œäº¤ä»£ç ”ç©¶å·¥ä½œçš„å±€é™ï¼Œæ出未æ¥å·¥ä½œçš„æ„è§æˆ–建议。 +åŒæ—¶ï¼Œè¦ä¸¥æ ¼åŒºåˆ†è‡ªå·±å–å¾—çš„æˆæžœä¸ŽæŒ‡å¯¼æ•™å¸ˆåŠä»–人的å¦æœ¯æˆæžœã€‚ + +åœ¨è¯„ä»·è‡ªå·±çš„ç ”ç©¶å·¥ä½œæˆæžœæ—¶ï¼Œè¦å®žäº‹æ±‚是,除éžæœ‰è¶³å¤Ÿçš„è¯æ®è¡¨æ˜Žè‡ªå·±çš„ç ”ç©¶æ˜¯â€œé¦–æ¬¡â€ã€â€œé¢†å…ˆâ€ã€â€œå¡«è¡¥ç©ºç™½â€çš„,å¦åˆ™åº”é¿å…使用这些或类似è¯è¯ã€‚ diff --git a/macros/latex/contrib/thuthesis/data/chap02.tex b/macros/latex/contrib/thuthesis/data/chap02.tex index 3721ede72b..31f7032e1a 100644 --- a/macros/latex/contrib/thuthesis/data/chap02.tex +++ b/macros/latex/contrib/thuthesis/data/chap02.tex @@ -1,126 +1,85 @@ % !TeX root = ../thuthesis-example.tex -\chapter{图表公å¼ä¾‹å} -\label{cha:chapter02} +\chapter{图表示例} -\section{其它例å} -\label{sec:other} +\section{æ’图} -在第~\ref{cha:intro} ç« ä¸æˆ‘们å¦ä¹ 了è´å¶æ–¯å…¬å¼~(\ref{equ:chap1:bayes})ï¼Œè¿™é‡Œæˆ‘ä»¬å¤ -ä¹ ä¸€ä¸‹ï¼š -\begin{equation} -\label{equ:chap2:bayes} -p(y|\vx) = \frac{p(\vx,y)}{p(\vx)}= -\frac{p(\vx|y)p(y)}{p(\vx)} -\end{equation} +图片通常在 \env{figure} 环境ä¸ä½¿ç”¨ \cs{includegraphics} æ’入,如图~\ref{fig:example} çš„æºä»£ç 。 +建议矢é‡å›¾ç‰‡ä½¿ç”¨ PDF æ ¼å¼ï¼Œæ¯”如数æ®å¯è§†åŒ–的绘图; +照片应使用 JPG æ ¼å¼ï¼› +å…¶ä»–çš„æ …æ ¼å›¾åº”ä½¿ç”¨æ— æŸçš„ PNG æ ¼å¼ã€‚ +注æ„,LaTeX ä¸æ”¯æŒ TIFF æ ¼å¼ï¼›EPS æ ¼å¼å·²ç»è¿‡æ—¶ã€‚ -\subsection{绘图} -\label{sec:draw} - -本模æ¿ä¸å†é¢„先装载任何绘图包(如 \pkg{pstricks,pgf} ç‰ï¼‰ï¼Œå®Œå…¨ç”±ç”¨æˆ·æ¥å†³å®šã€‚ -个人觉得 \pkg{pgf} ä¸é”™ï¼Œä¸ä¾èµ–于 Postscript。æ¤å¤–还有很多针对 \LaTeX{} çš„ - GUI 作图工具,如 XFig(jFig), WinFig, Tpx, Ipe, Dia, Inkscape, LaTeXPiX, -jPicEdt, jaxdraw ç‰ç‰ã€‚ - -\subsection{æ’图} -\label{sec:graphs} - -强烈推è《\LaTeXe{} æ’图指å—》ï¼å…³äºŽå图形的使用细节请å‚看 \pkg{subcaption} å®åŒ…的说明文档。 - -\subsubsection{一个图形} -\label{sec:onefig} -一般图形都是处在浮动环境ä¸ã€‚之所以称为浮动是指最终排版效果图形的ä½ç½®ä¸ä¸€å®šä¸Žæºæ–‡ -件ä¸çš„ä½ç½®å¯¹åº”\footnote{This is not a bug, but a feature of \LaTeX!},这也是刚使 -用 \LaTeX{} åŒå¦å¯èƒ½é‡åˆ°çš„问题。如果è¦å¼ºåˆ¶å›ºå®šæµ®åŠ¨å›¾å½¢çš„ä½ç½®ï¼Œè¯·ä½¿ç”¨ \pkg{float} å®åŒ…, -它æ供了 \texttt{[H]} å‚数,比如图~\ref{fig:xfig1}。 -\begin{figure}[H] % use float package if you want it here +\begin{figure} \centering - \includegraphics{thu-whole-logo.pdf} - \caption{利用 Xfig 制图} - \label{fig:xfig1} + \includegraphics[width=0.6\linewidth]{example-image-a.pdf} + \caption{示例图片} + \label{fig:example} \end{figure} -大å¦ä¹‹é“,在明明德,在亲民,在æ¢äºŽè‡³å–„。知æ¢è€ŒåŽæœ‰å®šï¼›å®šè€ŒåŽèƒ½é™ï¼›é™è€ŒåŽèƒ½å®‰ï¼›å®‰ -而åŽèƒ½è™‘;虑而åŽèƒ½å¾—。物有本末,事有终始。知所先åŽï¼Œåˆ™è¿‘é“矣。å¤ä¹‹æ¬²æ˜Žæ˜Žå¾·äºŽå¤© -下者,先治其国;欲治其国者,先é½å…¶å®¶ï¼›æ¬²é½å…¶å®¶è€…,先修其身;欲修其身者,先æ£å…¶å¿ƒï¼› -欲æ£å…¶å¿ƒè€…,先诚其æ„;欲诚其æ„è€…ï¼Œå…ˆè‡´å…¶çŸ¥ï¼›è‡´çŸ¥åœ¨æ ¼ç‰©ã€‚ç‰©æ ¼è€ŒåŽçŸ¥è‡³ï¼›çŸ¥è‡³è€ŒåŽ -æ„诚;æ„诚而åŽå¿ƒæ£ï¼›å¿ƒæ£è€ŒåŽèº« 修;身修而åŽå®¶é½ï¼›å®¶é½è€ŒåŽå›½æ²»ï¼›å›½æ²»è€ŒåŽå¤©ä¸‹ -平。自天å以至于庶人,壹是皆以修身为本。其本乱而未治者 å¦çŸ£ã€‚其所厚者薄,而其所 -è–„è€…åŽšï¼Œæœªä¹‹æœ‰ä¹Ÿï¼ - -\hfill —— 《大å¦ã€‹ +若图或表ä¸æœ‰é™„注,采用英文å°å†™å—æ¯é¡ºåºç¼–å·ï¼Œé™„注写在图或表的下方。 +% LaTeX ä¼ ç»Ÿä¸Šä¸€èˆ¬å°†é™„æ³¨çš„å†…å®¹åŒå›¾è¡¨çš„æ ‡é¢˜å†™åœ¨ä¸€èµ·ï¼Œå½¢æˆå¾ˆé•¿çš„一段文å—。 +如果一个图由两个或两个以上分图组æˆæ—¶ï¼Œå„分图分别以(a)ã€(b)ã€(c)...... 作为图åºï¼Œå¹¶é¡»æœ‰åˆ†å›¾é¢˜ã€‚ +推è使用 \pkg{subcaption} å®åŒ…æ¥å¤„ç†ï¼Œ 比如图~\ref{fig:subfig-a} 和图~\ref{fig:subfig-b}。 -\subsubsection{多个图形} -\label{sec:multifig} +\begin{figure} + \centering + \subcaptionbox{分图 A\label{fig:subfig-a}} + {\includegraphics[width=0.45\linewidth]{example-image-a.pdf}} + \subcaptionbox{分图 B\label{fig:subfig-b}} + {\includegraphics[width=0.45\linewidth]{example-image-b.pdf}} + \caption{多个分图的示例} + \label{fig:multi-image} +\end{figure} -如果多个图形相互独立,并ä¸å…±ç”¨ä¸€ä¸ªå›¾å½¢è®¡æ•°å™¨ï¼Œé‚£ä¹ˆ -用 \texttt{minipage} 或者\texttt{parbox} å°±å¯ä»¥ã€‚å¦åˆ™ï¼Œè¯·å‚看 -图~\ref{fig:big1-subcaptionbox},它包å«ä¸¤ä¸ªå°å›¾ï¼Œåˆ†åˆ«æ˜¯å›¾~\ref{fig:subfig1}å’Œ -图~\ref{fig:subfig2}。推è使用 \cs{subcaptionbox}ï¼Œå› ä¸ºå¯ä»¥åƒ -图~\ref{fig:big1-subcaptionbox} é‚£æ ·å¯¹é½åå›¾çš„æ ‡é¢˜ï¼Œä¹Ÿå¯ä»¥ä½¿ç”¨ \pkg{subcaption} -å®åŒ…çš„ \cs{subcaption}(放在 minipageä¸ï¼Œç”¨æ³•åŒ\cs{caption})或 -是 \pkg{subfigure} ã€\pkg{subtable}环境,åƒå›¾~\ref{fig:big1-subfigure},ä¸è¦å† -用 \cs{subfloat}ã€\cs{subfigure} å’Œ \cs{subtable}。 -\begin{figure}[h] - \centering% - \subcaptionbox{第一个å°å›¾å½¢\label{fig:subfig1}}[3cm] %æ ‡é¢˜çš„é•¿åº¦ï¼Œè¶…è¿‡åˆ™ä¼šæ¢è¡Œï¼Œå¦‚下一个å°å›¾ã€‚ - {\includegraphics[height=3cm]{thu-fig-logo.pdf}}% - \hspace{4em}% - \subcaptionbox{第二个å°å›¾å½¢ï¼Œæ³¨æ„è¿™ä¸ªå›¾ç•¥çŸ®äº›ã€‚å¦‚æžœæ ‡é¢˜å¾ˆé•¿çš„è¯ï¼Œå®ƒä¼šè‡ªåŠ¨æ¢è¡Œ\label{fig:subfig2}} - {\includegraphics[height=2cm]{thu-text-logo.pdf}} - \caption{包å«å图形的大图形(subcaptionbox示例)} - \label{fig:big1-subcaptionbox} -\end{figure} -\begin{figure}[h] - \centering% - \begin{subfigure}{3cm} - \includegraphics[height=3cm]{thu-fig-logo.pdf} - \caption{第一个å°å›¾å½¢} - \end{subfigure}% - \hspace{4em}% - \begin{subfigure}{0.5\textwidth} - \includegraphics[height=2cm]{thu-text-logo.pdf} - \caption{第二个å°å›¾å½¢ï¼Œæ³¨æ„这个图略矮些。subfigureä¸åŒä¸€è¡Œçš„å图在顶端对é½ã€‚} - \end{subfigure} - \caption{包å«å图形的大图形(subfigure示例)} - \label{fig:big1-subfigure} -\end{figure} -å¤ä¹‹å¦è€…å¿…æœ‰å¸ˆã€‚å¸ˆè€…ï¼Œæ‰€ä»¥ä¼ é“å—业解惑也。人éžç”Ÿè€ŒçŸ¥ä¹‹è€…,å°èƒ½æ— 惑?惑而ä¸ä»Žå¸ˆï¼Œ -其为惑也,终ä¸è§£çŸ£ã€‚生乎å¾å‰ï¼Œå…¶é—»é“也固先乎å¾ï¼Œå¾ä»Žè€Œå¸ˆä¹‹ï¼›ç”Ÿä¹Žå¾å¾Œï¼Œå…¶é—»é“也亦 -先乎å¾ï¼Œå¾ä»Žè€Œå¸ˆä¹‹ã€‚å¾å¸ˆé“也,夫庸知其年之先後生於å¾ä¹Žï¼æ˜¯æ•…æ— è´µæ— è´±æ— é•¿æ— å°‘ï¼Œé“ -之所å˜ï¼Œå¸ˆä¹‹æ‰€å˜ä¹Ÿã€‚ +\section{è¡¨æ ¼} -嗟乎ï¼å¸ˆé“之ä¸ä¼ ä¹Ÿä¹…çŸ£ï¼Œæ¬²äººä¹‹æ— æƒ‘ä¹Ÿéš¾çŸ£ã€‚å¤ä¹‹åœ£äººï¼Œå…¶å‡ºäººä¹Ÿè¿œçŸ£ï¼ŒçŠ¹ä¸”从师而问焉; -今之众人,其下圣人也亦远矣,而耻å¦æ–¼å¸ˆã€‚是故圣益圣,愚益愚。圣人之所以为圣,愚 -人之所以为愚,其皆出於æ¤ä¹Žï¼Ÿçˆ±å…¶å,择师而教之,於其身也,则耻师焉,惑焉。彼童å -ä¹‹å¸ˆï¼ŒæŽˆä¹‹ä¹¦è€Œä¹ å…¶å¥è¯»è€…,éžå¾æ‰€è°“ä¼ å…¶é“ã€è§£å…¶æƒ‘者也。å¥è¯»ä¹‹ä¸çŸ¥ï¼Œæƒ‘之ä¸è§£ï¼Œæˆ–师 -焉,或ä¸ç„‰ï¼Œå°å¦è€Œå¤§é—,å¾æœªè§å…¶æ˜Žä¹Ÿã€‚巫医ã€ä¹å¸ˆã€ç™¾å·¥ä¹‹äººä¸è€»ç›¸å¸ˆï¼Œ å£«å¤§å¤«ä¹‹æ— -曰“师â€æ›°â€œå¼Ÿåâ€ä¹‹äº‘者,则群èšè€Œç¬‘之。问之,则曰:彼与彼年相若也,é“ç›¸ä¼¼ä¹Ÿï¼Œä½ -å‘则足羞,官盛则近谀。呜呼ï¼å¸ˆé“之ä¸å¤ï¼Œå¯çŸ¥çŸ£ã€‚巫医ã€ä¹å¸ˆã€ç™¾å·¥ä¹‹äººã€‚å¾åä¸é½¿ï¼Œ -今其智乃åä¸èƒ½åŠï¼Œå…¶å¯æ€ªä¹Ÿæ¬¤ï¼åœ£äººæ— 常师。å”å师郯åã€è‹Œåã€å¸ˆè¥„ã€è€èƒã€‚郯å之徒, -其贤ä¸åŠå”å。å”å曰:“三人行,必有我师。â€æ˜¯æ•…弟åä¸å¿…ä¸å¦‚师,师ä¸å¿…贤於弟å。 -é—»é“有先後,术业有专攻,如是而已。 +è¡¨åº”å…·æœ‰è‡ªæ˜Žæ€§ã€‚ä¸ºä½¿è¡¨æ ¼ç®€æ´æ˜“读,尽å¯èƒ½é‡‡ç”¨ä¸‰çº¿è¡¨ï¼Œå¦‚表~\ref{tab:three-line}。 +三æ¡çº¿å¯ä»¥ä½¿ç”¨ \pkg{booktabs} å®åŒ…æ供的命令生æˆã€‚ -如果è¦æŠŠç¼–å·çš„两个图形并排,那么å°é¡µå°±éžå¸¸æœ‰ç”¨äº†ï¼š -\begin{figure} -\begin{minipage}{0.48\textwidth} +\begin{table} \centering - \includegraphics[height=2cm]{thu-whole-logo.pdf} - \caption{并排第一个图} - \label{fig:parallel1} -\end{minipage}\hfill -\begin{minipage}{0.48\textwidth} + \caption{三线表示例} + \begin{tabular}{ll} + \toprule + 文件å & æè¿° \\ + \midrule + thuthesis.dtx & 模æ¿çš„æºæ–‡ä»¶ï¼ŒåŒ…括文档和注释 \\ + thuthesis.cls & 模æ¿æ–‡ä»¶ \\ + thuthesis-*.bst & BibTeX å‚è€ƒæ–‡çŒ®è¡¨æ ·å¼æ–‡ä»¶ \\ + thuthesis-*.bbx & BibLaTeX å‚è€ƒæ–‡çŒ®è¡¨æ ·å¼æ–‡ä»¶ \\ + thuthesis-*.cbx & BibLaTeX å¼•ç”¨æ ·å¼æ–‡ä»¶ \\ + \bottomrule + \end{tabular} + \label{tab:three-line} +\end{table} + +è¡¨æ ¼å¦‚æžœæœ‰é™„æ³¨ï¼Œå°¤å…¶æ˜¯éœ€è¦åœ¨è¡¨æ ¼ä¸è¿›è¡Œæ ‡æ³¨æ—¶ï¼Œå¯ä»¥ä½¿ç”¨ \pkg{threeparttable} å®åŒ…。 +ç ”ç©¶ç”Ÿè¦æ±‚使用英文å°å†™å—æ¯ aã€bã€c……顺åºç¼–å·ï¼Œæœ¬ç§‘生使用圈ç â‘ ã€â‘¡ã€â‘¢â€¦â€¦ç¼–å·ã€‚ + +\begin{table} \centering - \includegraphics[height=2cm]{thu-whole-logo.pdf} - \caption{并排第二个图} - \label{fig:parallel2} -\end{minipage} -\end{figure} - -æŽæ°åèŸ ï¼Œå¹´å七,好å¤æ–‡ã€å…艺,ç»ä¼ çš†é€šä¹ ä¹‹ï¼Œä¸æ‹˜æ–¼æ—¶ï¼Œå¦æ–¼ä½™ã€‚ä½™å˜‰å…¶èƒ½è¡Œå¤ -é“,作师说以贻之。 - -\hfill —— 韩愈(å”) + \begin{threeparttable}[c] + \caption{å¸¦é™„æ³¨çš„è¡¨æ ¼ç¤ºä¾‹} + \label{tab:three-part-table} + \begin{tabular}{ll} + \toprule + 文件å & æè¿° \\ + \midrule + thuthesis.dtx\tnote{a} & 模æ¿çš„æºæ–‡ä»¶ï¼ŒåŒ…括文档和注释 \\ + thuthesis.cls\tnote{b} & 模æ¿æ–‡ä»¶ \\ + thuthesis-*.bst & BibTeX å‚è€ƒæ–‡çŒ®è¡¨æ ·å¼æ–‡ä»¶ \\ + thuthesis-*.bbx & BibLaTeX å‚è€ƒæ–‡çŒ®è¡¨æ ·å¼æ–‡ä»¶ \\ + thuthesis-*.cbx & BibLaTeX å¼•ç”¨æ ·å¼æ–‡ä»¶ \\ + \bottomrule + \end{tabular} + \begin{tablenotes} + \item [a] å¯ä»¥é€šè¿‡ xelatex 编译生æˆæ¨¡æ¿çš„使用说明文档; + 使用 xetex 编译 \file{thuthesis.ins} 时则会从 \file{.dtx} ä¸åŽ»é™¤æŽ‰æ–‡æ¡£å’Œæ³¨é‡Šï¼Œå¾—到精简的 \file{.cls} 文件。 + \item [b] 更新模æ¿æ—¶ï¼Œä¸€å®šè¦è®°å¾—ç¼–è¯‘ç”Ÿæˆ \file{.cls} 文件,å¦åˆ™ç¼–译论文时载入的ä¾ç„¶æ˜¯æ—§ç‰ˆçš„模æ¿ã€‚ + \end{tablenotes} + \end{threeparttable} +\end{table} diff --git a/macros/latex/contrib/thuthesis/data/chap03.tex b/macros/latex/contrib/thuthesis/data/chap03.tex new file mode 100644 index 0000000000..2cb452b0be --- /dev/null +++ b/macros/latex/contrib/thuthesis/data/chap03.tex @@ -0,0 +1,76 @@ +% !TeX root = ../thuthesis-example.tex + +\chapter{æ•°å¦ç¬¦å·å’Œå…¬å¼} + +\section{æ•°å¦ç¬¦å·} + +ç ”ç©¶ç”Ÿã€Šå†™ä½œæŒ‡å—》è¦æ±‚é‡åŠå…¶å•ä½æ‰€ä½¿ç”¨çš„符å·åº”符åˆå›½å®¶æ ‡å‡†ã€Šå›½é™…å•ä½åˆ¶åŠå…¶åº”用》(GB 3100—1993)ã€ã€Šæœ‰å…³é‡ã€å•ä½å’Œç¬¦å·çš„一般原则》(GB/T 3101—1993) 的规定。 +模æ¿ä¸ä½¿ç”¨ \pkg{unicode-math} å®åŒ…æ¥é…置数å¦ç¬¦å·ï¼Œ +与 \LaTeX{} 默认的英美国家的符å·ä¹ 惯有所差异: +\begin{enumerate} + \item 大写希腊å—æ¯é»˜è®¤ä¸ºæ–œä½“,如 \cs{Delta}:$\Delta$。 + \item 有é™å¢žé‡ç¬¦å· $\increment$(U+2206)应使用 \pkg{unicode-math} å®åŒ…æ供的 + \cs{increment} 命令。 + \item å‘é‡ã€çŸ©é˜µå’Œå¼ é‡è¦æ±‚粗斜体,应该使用 \pkg{unicode-math} çš„ \cs{symbf} 命令, + 如 \verb|\symbf{A}|ã€\verb|\symbf{\alpha}|。 + \item æ•°å¦å¸¸æ•°å’Œç‰¹æ®Šå‡½æ•°è¦æ±‚用æ£ä½“,应使用 \cs{symup} 命令, + 如 $\symup{\pi} = 3.14\dots$; $\symup{e} = 2.718\dots$, + \item 微分å·å’Œç§¯åˆ†å·ä½¿ç”¨ä½¿ç”¨æ£ä½“,比如 $\int f(x) \dif x$。 +\end{enumerate} + +关于数å¦ç¬¦å·æ›´å¤šçš„用法,å‚考 +\href{http://mirrors.ctan.org/macros/latex/contrib/unicode-math/unicode-math.pdf}{\pkg{unicode-math}} +å®åŒ…的使用说明, +全部数å¦ç¬¦å·å‘½çš„令å‚考 +\href{http://mirrors.ctan.org/macros/latex/contrib/unicode-math/unimath-symbols.pdf}{\pkg{unimath-symbols}}。 + +关于é‡å’Œå•ä½æŽ¨è使用 +\href{http://mirrors.ctan.org/macros/latex/contrib/siunitx/siunitx.pdf}{\pkg{siunitx}} +å®åŒ…, +å¯ä»¥æ–¹ä¾¿åœ°å¤„ç†å¸Œè…Šå—æ¯ä»¥åŠæ•°å—与å•ä½ä¹‹é—´çš„空白, +比如: +\SI{6.4e6}{m}, +\SI{9}{\micro\meter}, +\si{kg.m.s^{-1}}, +\SIrange{10}{20}{\degreeCelsius}。 + + + +\section{æ•°å¦å…¬å¼} + +æ•°å¦å…¬å¼å¯ä»¥ä½¿ç”¨ \env{equation} å’Œ \env{equation*} 环境。 +注æ„æ•°å¦å…¬å¼çš„引用应å‰åŽå¸¦æ‹¬å·ï¼Œå»ºè®®ä½¿ç”¨ \cs{eqref} å‘½ä»¤ï¼Œæ¯”å¦‚å¼ \eqref{eq:example}。 +\begin{equation} + \frac{1}{2 \symup{\pi} \symup{i}} \int_\gamma f = \sum_{k=1}^m n(\gamma; a_k) \mathscr{R}(f; a_k) + \label{eq:example} +\end{equation} +注æ„å…¬å¼ç¼–å·çš„引用应å«æœ‰åœ†æ‹¬å·ï¼Œå¯ä»¥ä½¿ç”¨ \cs{eqref} 命令。 + +多行公å¼å°½å¯èƒ½åœ¨â€œ=â€å¤„对é½ï¼ŒæŽ¨è使用 \env{align} 环境。 +\begin{align} + a & = b + c + d + e \\ + & = f + g +\end{align} + + + +\section{æ•°å¦å®šç†} + +定ç†çŽ¯å¢ƒçš„æ ¼å¼å¯ä»¥ä½¿ç”¨ \pkg{amsthm} 或者 \pkg{ntheorem} å®åŒ…é…置。 +用户在导言区载入这两者之一åŽï¼Œæ¨¡æ¿ä¼šè‡ªåŠ¨é…ç½® \env{thoerem}ã€\env{proof} ç‰çŽ¯å¢ƒã€‚ + +\begin{theorem}[Lindeberg--Lévy ä¸å¿ƒæžé™å®šç†] + 设éšæœºå˜é‡ $X_1, X_2, \dots, X_n$ 独立åŒåˆ†å¸ƒï¼Œ 且具有期望 $\mu$ 和有é™çš„方差 $\sigma^2 \ne 0$, + è®° $\bar{X}_n = \frac{1}{n} \sum_{i+1}^n X_i$,则 + \begin{equation} + \lim_{n \to \infty} P \left(\frac{\sqrt{n} \left( \bar{X}_n - \mu \right)}{\sigma} \le z \right) = \Phi(z), + \end{equation} + å…¶ä¸ $\Phi(z)$ æ˜¯æ ‡å‡†æ£æ€åˆ†å¸ƒçš„分布函数。 +\end{theorem} +\begin{proof} + Trivial. +\end{proof} + +åŒæ—¶æ¨¡æ¿è¿˜æ供了 \env{assumption}ã€\env{definition}ã€\env{proposition}〠+\env{lemma}ã€\env{theorem}ã€\env{axiom}ã€\env{corollary}ã€\env{exercise}〠+\env{example}ã€\env{remar}ã€\env{problem}ã€\env{conjecture} 这些相关的环境。 diff --git a/macros/latex/contrib/thuthesis/data/chap04.tex b/macros/latex/contrib/thuthesis/data/chap04.tex new file mode 100644 index 0000000000..a7fcc1439f --- /dev/null +++ b/macros/latex/contrib/thuthesis/data/chap04.tex @@ -0,0 +1,73 @@ +% !TeX root = ../thuthesis-example.tex + +\chapter{å¼•ç”¨æ–‡çŒ®çš„æ ‡æ³¨} + +模æ¿æ”¯æŒ BibTeX å’Œ BibLaTeX 两ç§æ–¹å¼å¤„ç†å‚考文献。 +下文主è¦ä»‹ç» BibTeX é…åˆ \pkg{natbib} å®åŒ…的主è¦ä½¿ç”¨æ–¹æ³•ã€‚ + + +\section{顺åºç¼–ç 制} + +在顺åºç¼–ç 制下,默认的 \cs{cite} å‘½ä»¤åŒ \cs{citep} ä¸€æ ·ï¼Œåºå·ç½®äºŽæ–¹æ‹¬å·ä¸ï¼Œ +引文页ç 会放在括å·å¤–。 +统一处引用的连ç»åºå·ä¼šè‡ªåŠ¨ç”¨çŸæ¨ªçº¿è¿žæŽ¥ã€‚ + +\thusetup{ + cite-style = super, +} +\begin{tabular}{l@{\quad$\Rightarrow$\quad}l} + \verb|\cite{zhangkun1994}| & \cite{zhangkun1994} \\ + \verb|\citet{zhangkun1994}| & \citet{zhangkun1994} \\ + \verb|\citep{zhangkun1994}| & \citep{zhangkun1994} \\ + \verb|\cite[42]{zhangkun1994}| & \cite[42]{zhangkun1994} \\ + \verb|\cite{zhangkun1994,zhukezhen1973}| & \cite{zhangkun1994,zhukezhen1973} \\ +\end{tabular} + + +也å¯ä»¥å–æ¶ˆä¸Šæ ‡æ ¼å¼ï¼Œå°†æ•°å—åºå·ä½œä¸ºæ–‡å—的一部分。 +建议全文统一使用相åŒçš„æ ¼å¼ã€‚ + +\thusetup{ + cite-style = inline, +} +\begin{tabular}{l@{\quad$\Rightarrow$\quad}l} + \verb|\cite{zhangkun1994}| & \cite{zhangkun1994} \\ + \verb|\citet{zhangkun1994}| & \citet{zhangkun1994} \\ + \verb|\citep{zhangkun1994}| & \citep{zhangkun1994} \\ + \verb|\cite[42]{zhangkun1994}| & \cite[42]{zhangkun1994} \\ + \verb|\cite{zhangkun1994,zhukezhen1973}| & \cite{zhangkun1994,zhukezhen1973} \\ +\end{tabular} + + + +\section{著者-出版年制} + +著者-出版年制下的 \cs{cite} è·Ÿ \cs{citet} ä¸€æ ·ã€‚ + +\thusetup{ + cite-style = author-year, +} +\begin{tabular}{l@{\quad$\Rightarrow$\quad}l} + \verb|\cite{zhangkun1994}| & \cite{zhangkun1994} \\ + \verb|\citet{zhangkun1994}| & \citet{zhangkun1994} \\ + \verb|\citep{zhangkun1994}| & \citep{zhangkun1994} \\ + \verb|\cite[42]{zhangkun1994}| & \cite[42]{zhangkun1994} \\ + \verb|\citep{zhangkun1994,zhukezhen1973}| & \citep{zhangkun1994,zhukezhen1973} \\ +\end{tabular} + +\vskip 2ex +\thusetup{ + cite-style = super, +} +注æ„,引文å‚考文献的æ¯æ¡éƒ½è¦åœ¨æ£æ–‡ä¸æ ‡æ³¨ +\cite{zhangkun1994,zhukezhen1973,dupont1974bone,zhengkaiqing1987,% + jiangxizhou1980,jianduju1994,merkt1995rotational,mellinger1996laser,% + bixon1996dynamics,mahui1995,carlson1981two,taylor1983scanning,% + taylor1981study,shimizu1983laser,atkinson1982experimental,% + kusch1975perturbations,guangxi1993,huosini1989guwu,wangfuzhi1865songlun,% + zhaoyaodong1998xinshidai,biaozhunhua2002tushu,chubanzhuanye2004,% + who1970factors,peebles2001probability,baishunong1998zhiwu,% + weinstein1974pathogenic,hanjiren1985lun,dizhi1936dizhi,% + tushuguan1957tushuguanxue,aaas1883science,fugang2000fengsha,% + xiaoyu2001chubanye,oclc2000about,scitor2000project% +}。 diff --git a/macros/latex/contrib/thuthesis/data/denotation.tex b/macros/latex/contrib/thuthesis/data/denotation.tex index d3aa4f13bb..914288e3eb 100644 --- a/macros/latex/contrib/thuthesis/data/denotation.tex +++ b/macros/latex/contrib/thuthesis/data/denotation.tex @@ -1,59 +1,93 @@ % !TeX root = ../thuthesis-example.tex \begin{denotation}[3cm] -\item[HPC] 高性能计算 (High Performance Computing) -\item[cluster] 集群 -\item[Itanium] 安腾 -\item[SMP] å¯¹ç§°å¤šå¤„ç† -\item[API] 应用程åºç¼–ç¨‹æŽ¥å£ -\item[PI] èšé…°äºšèƒº -\item[MPI] èšé…°äºšèƒºæ¨¡åž‹åŒ–åˆç‰©ï¼ŒN-苯基邻苯酰亚胺 -\item[PBI] èšè‹¯å¹¶å’ªå”‘ -\item[MPBI] èšè‹¯å¹¶å’ªå”‘模型化åˆç‰©ï¼ŒN-苯基苯并咪唑 -\item[PY] èšå¡å’™ -\item[PMDA-BDA] å‡è‹¯å››é…¸äºŒé…与è”苯四胺åˆæˆçš„èšå¡å’™è–„膜 -\item[$\increment G$] 活化自由能 (Activation Free Energy) -\item[$\chi$] ä¼ è¾“ç³»æ•° (Transmission Coefficient) -\item[$E$] èƒ½é‡ -\item[$m$] è´¨é‡ -\item[$c$] 光速 -\item[$P$] 概率 -\item[$T$] 时间 -\item[$v$] 速度 -\item[åŠå¦] å›å曰:å¦ä¸å¯ä»¥å·²ã€‚é’,å–之于è“,而é’于è“;冰,水为之,而寒于水。木 - ç›´ä¸ç»³ã€‚輮以为轮,其曲ä¸è§„。虽有æ§æš´ï¼Œä¸å¤æŒºè€…,輮使之然也。故木å—绳则直,金就 - ç ºåˆ™åˆ©ï¼Œå›ååšå¦è€Œæ—¥å‚çœä¹Žå·±ï¼Œåˆ™çŸ¥æ˜Žè€Œè¡Œæ— 过矣。å¾å°ç»ˆæ—¥è€Œæ€çŸ£ï¼Œä¸å¦‚é¡»è‡¾ä¹‹æ‰€å¦ - 也;å¾å°è·‚而望矣,ä¸å¦‚登高之åšè§ä¹Ÿã€‚登高而招,臂éžåŠ 长也,而è§è€…远;顺风而呼, - 声éžåŠ 疾也,而闻者彰。å‡èˆ†é©¬è€…,éžåˆ©è¶³ä¹Ÿï¼Œè€Œè‡´åƒé‡Œï¼›å‡èˆŸæ¥«è€…,éžèƒ½æ°´ä¹Ÿï¼Œè€Œç»æ±Ÿ - 河,å›å生éžå¼‚也,善å‡äºŽç‰©ä¹Ÿã€‚积土æˆå±±ï¼Œé£Žé›¨å…´ç„‰ï¼›ç§¯æ°´æˆæ¸Šï¼Œè›Ÿé¾™ç”Ÿç„‰ï¼›ç§¯å–„æˆå¾·ï¼Œ - 而神明自得,圣心备焉。故ä¸ç§¯è·¬æ¥ï¼Œæ— 以至åƒé‡Œï¼›ä¸ç§¯å°æµï¼Œæ— 以æˆæ±Ÿæµ·ã€‚éªéª¥ä¸€è·ƒï¼Œ - ä¸èƒ½åæ¥ï¼›é©½é©¬å驾,功在ä¸èˆã€‚锲而èˆä¹‹ï¼Œæœ½æœ¨ä¸æŠ˜ï¼›é”²è€Œä¸èˆï¼Œé‡‘石å¯é•‚ã€‚èš“æ— çˆªç‰™ - 之利,ç‹éª¨ä¹‹å¼ºï¼Œä¸Šé£ŸåŸƒåœŸï¼Œä¸‹é¥®é»„泉,用心一也。蟹å…跪而二螯,éžè›‡é³ä¹‹ç©´æ— å¯å¯„托 - 者,用心èºä¹Ÿã€‚—— è€å†µ + \item[PI] èšé…°äºšèƒº + \item[MPI] èšé…°äºšèƒºæ¨¡åž‹åŒ–åˆç‰©ï¼ŒN-苯基邻苯酰亚胺 + \item[PBI] èšè‹¯å¹¶å’ªå”‘ + \item[MPBI] èšè‹¯å¹¶å’ªå”‘模型化åˆç‰©ï¼ŒN-苯基苯并咪唑 + \item[PY] èšå¡å’™ + \item[PMDA-BDA] å‡è‹¯å››é…¸äºŒé…与è”苯四胺åˆæˆçš„èšå¡å’™è–„膜 + \item[MPY] èšå¡å’™æ¨¡åž‹åŒ–åˆç‰© + \item[As-PPT] èšè‹¯åŸºä¸å¯¹ç§°ä¸‰å—ª + \item[MAsPPT] èšè‹¯åŸºä¸å¯¹ç§°ä¸‰å—ªå•æ¨¡åž‹åŒ–åˆç‰©ï¼Œ3,5,6-三苯基-1,2,4-三嗪 + \item[DMAsPPT] èšè‹¯åŸºä¸å¯¹ç§°ä¸‰å—ªåŒæ¨¡åž‹åŒ–åˆç‰©ï¼ˆæ°´è§£å®žéªŒæ¨¡åž‹åŒ–åˆç‰©ï¼‰ + \item[S-PPT] èšè‹¯åŸºå¯¹ç§°ä¸‰å—ª + \item[MSPPT] èšè‹¯åŸºå¯¹ç§°ä¸‰å—ªæ¨¡åž‹åŒ–åˆç‰©ï¼Œ2,4,6-三苯基-1,3,5-三嗪 + \item[PPQ] èšè‹¯åŸºå–¹å™å•‰ + \item[MPPQ] èšè‹¯åŸºå–¹å™å•‰æ¨¡åž‹åŒ–åˆç‰©ï¼Œ3,4-二苯基苯并二嗪 + \item[HMPI] èšé…°äºšèƒºæ¨¡åž‹åŒ–åˆç‰©çš„è´¨å化产物 + \item[HMPY] èšå¡å’™æ¨¡åž‹åŒ–åˆç‰©çš„è´¨å化产物 + \item[HMPBI] èšè‹¯å¹¶å’ªå”‘模型化åˆç‰©çš„è´¨å化产物 + \item[HMAsPPT] èšè‹¯åŸºä¸å¯¹ç§°ä¸‰å—ªæ¨¡åž‹åŒ–åˆç‰©çš„è´¨å化产物 + \item[HMSPPT] èšè‹¯åŸºå¯¹ç§°ä¸‰å—ªæ¨¡åž‹åŒ–åˆç‰©çš„è´¨å化产物 + \item[HMPPQ] èšè‹¯åŸºå–¹å™å•‰æ¨¡åž‹åŒ–åˆç‰©çš„è´¨å化产物 + \item[PDT] çƒåˆ†è§£æ¸©åº¦ + \item[HPLC] 高效液相色谱 (High Performance Liquid Chromatography) + \item[HPCE] 高效毛细管电泳色谱 (High Performance Capillary lectrophoresis) + \item[LC-MS] 液相色谱-质谱è”用 (Liquid chromatography-Mass Spectrum) + \item[TIC] 总离å浓度 (Total Ion Content) + \item[\textit{ab initio}] 基于第一原ç†çš„é‡å化å¦è®¡ç®—方法,常称从头算法 + \item[DFT] 密度泛函ç†è®º (Density Functional Theory) + \item[$E_a$] 化å¦å应的活化能 (Activation Energy) + \item[ZPE] 零点振动能 (Zero Vibration Energy) + \item[PES] åŠ¿èƒ½é¢ (Potential Energy Surface) + \item[TS] è¿‡æ¸¡æ€ (Transition State) + \item[TST] 过渡æ€ç†è®º (Transition State Theory) + \item[$\increment G^\neq$] 活化自由能(Activation Free Energy) + \item[$\kappa$] ä¼ è¾“ç³»æ•° (Transmission Coefficient) + \item[IRC] 内禀å应åæ ‡ (Intrinsic Reaction Coordinates) + \item[$\nu_i$] 虚频 (Imaginary Frequency) + \item[ONIOM] 分层算法 (Our own N-layered Integrated molecular Orbital and molecular Mechanics) + \item[SCF] 自洽场 (Self-Consistent Field) + \item[SCRF] 自洽å应场 (Self-Consistent Reaction Field) \end{denotation} -% % 也å¯ä»¥ä½¿ç”¨ nomencl å®åŒ…: +% 也å¯ä»¥ä½¿ç”¨ nomencl å®åŒ…,需è¦åœ¨å¯¼è¨€åŒº +% \usepackage{nomencl} +% \makenomenclature +% 在这里输出符å·è¯´æ˜Ž % \printnomenclature[3cm] -% \nomenclature{HPC}{高性能计算 (High Performance Computing)} -% \nomenclature{cluster}{集群} -% \nomenclature{Itanium}{安腾} -% \nomenclature{SMP}{对称多处ç†} -% \nomenclature{API}{应用程åºç¼–程接å£} +% 在æ£æ–‡ä¸çš„ä»»æ„为都å¯ä»¥æ ‡é¢˜ % \nomenclature{PI}{èšé…°äºšèƒº} % \nomenclature{MPI}{èšé…°äºšèƒºæ¨¡åž‹åŒ–åˆç‰©ï¼ŒN-苯基邻苯酰亚胺} % \nomenclature{PBI}{èšè‹¯å¹¶å’ªå”‘} % \nomenclature{MPBI}{èšè‹¯å¹¶å’ªå”‘模型化åˆç‰©ï¼ŒN-苯基苯并咪唑} % \nomenclature{PY}{èšå¡å’™} % \nomenclature{PMDA-BDA}{å‡è‹¯å››é…¸äºŒé…与è”苯四胺åˆæˆçš„èšå¡å’™è–„膜} -% \nomenclature{$\increment G$}{活化自由能 (Activation Free Energy)} -% \nomenclature{$\chi$}{ä¼ è¾“ç³»æ•° (Transmission Coefficient)} -% \nomenclature{$E$}{能é‡} -% \nomenclature{$m$}{è´¨é‡} -% \nomenclature{$c$}{光速} -% \nomenclature{$P$}{概率} -% \nomenclature{$T$}{时间} -% \nomenclature{$v$}{速度} +% \nomenclature{MPY}{èšå¡å’™æ¨¡åž‹åŒ–åˆç‰©} +% \nomenclature{As-PPT}{èšè‹¯åŸºä¸å¯¹ç§°ä¸‰å—ª} +% \nomenclature{MAsPPT}{èšè‹¯åŸºä¸å¯¹ç§°ä¸‰å—ªå•æ¨¡åž‹åŒ–åˆç‰©ï¼Œ3,5,6-三苯基-1,2,4-三嗪} +% \nomenclature{DMAsPPT}{èšè‹¯åŸºä¸å¯¹ç§°ä¸‰å—ªåŒæ¨¡åž‹åŒ–åˆç‰©ï¼ˆæ°´è§£å®žéªŒæ¨¡åž‹åŒ–åˆç‰©ï¼‰} +% \nomenclature{S-PPT}{èšè‹¯åŸºå¯¹ç§°ä¸‰å—ª} +% \nomenclature{MSPPT}{èšè‹¯åŸºå¯¹ç§°ä¸‰å—ªæ¨¡åž‹åŒ–åˆç‰©ï¼Œ2,4,6-三苯基-1,3,5-三嗪} +% \nomenclature{PPQ}{èšè‹¯åŸºå–¹å™å•‰} +% \nomenclature{MPPQ}{èšè‹¯åŸºå–¹å™å•‰æ¨¡åž‹åŒ–åˆç‰©ï¼Œ3,4-二苯基苯并二嗪} +% \nomenclature{HMPI}{èšé…°äºšèƒºæ¨¡åž‹åŒ–åˆç‰©çš„è´¨å化产物} +% \nomenclature{HMPY}{èšå¡å’™æ¨¡åž‹åŒ–åˆç‰©çš„è´¨å化产物} +% \nomenclature{HMPBI}{èšè‹¯å¹¶å’ªå”‘模型化åˆç‰©çš„è´¨å化产物} +% \nomenclature{HMAsPPT}{èšè‹¯åŸºä¸å¯¹ç§°ä¸‰å—ªæ¨¡åž‹åŒ–åˆç‰©çš„è´¨å化产物} +% \nomenclature{HMSPPT}{èšè‹¯åŸºå¯¹ç§°ä¸‰å—ªæ¨¡åž‹åŒ–åˆç‰©çš„è´¨å化产物} +% \nomenclature{HMPPQ}{èšè‹¯åŸºå–¹å™å•‰æ¨¡åž‹åŒ–åˆç‰©çš„è´¨å化产物} +% \nomenclature{PDT}{çƒåˆ†è§£æ¸©åº¦} +% \nomenclature{HPLC}{高效液相色谱 (High Performance Liquid Chromatography)} +% \nomenclature{HPCE}{高效毛细管电泳色谱 (High Performance Capillary lectrophoresis)} +% \nomenclature{LC-MS}{液相色谱-质谱è”用 (Liquid chromatography-Mass Spectrum)} +% \nomenclature{TIC}{总离å浓度 (Total Ion Content)} +% \nomenclature{\textit{ab initio}}{基于第一原ç†çš„é‡å化å¦è®¡ç®—方法,常称从头算法} +% \nomenclature{DFT}{密度泛函ç†è®º (Density Functional Theory)} +% \nomenclature{$E_a$}{化å¦å应的活化能 (Activation Energy)} +% \nomenclature{ZPE}{零点振动能 (Zero Vibration Energy)} +% \nomenclature{PES}{åŠ¿èƒ½é¢ (Potential Energy Surface)} +% \nomenclature{TS}{è¿‡æ¸¡æ€ (Transition State)} +% \nomenclature{TST}{过渡æ€ç†è®º (Transition State Theory)} +% \nomenclature{$\increment G^\neq$}{活化自由能(Activation Free Energy)} +% \nomenclature{$\kappa$}{ä¼ è¾“ç³»æ•° (Transmission Coefficient)} +% \nomenclature{IRC}{内禀å应åæ ‡ (Intrinsic Reaction Coordinates)} +% \nomenclature{$\nu_i$}{虚频 (Imaginary Frequency)} +% \nomenclature{ONIOM}{分层算法 (Our own N-layered Integrated molecular Orbital and molecular Mechanics)} +% \nomenclature{SCF}{自洽场 (Self-Consistent Field)} +% \nomenclature{SCRF}{自洽å应场 (Self-Consistent Reaction Field)} diff --git a/macros/latex/contrib/thuthesis/data/resolution.tex b/macros/latex/contrib/thuthesis/data/resolution.tex index e3d7c3dab6..81091ea9a3 100644 --- a/macros/latex/contrib/thuthesis/data/resolution.tex +++ b/macros/latex/contrib/thuthesis/data/resolution.tex @@ -12,6 +12,6 @@ 3. …… -论文工作表明作者在×××××具有×××××知识,具有×××××能力,论文××××××××××,ç”辩×××××××××××××××。 +论文工作表明作者在×××××具有×××××知识,具有××××能力,论文××××,ç”辩××××。 ç”辩委员会表决,(×票/一致)åŒæ„通过论文ç”辩,并建议授予×××(姓å)×××(门类)å¦åšå£«/硕士å¦ä½ã€‚ diff --git a/macros/latex/contrib/thuthesis/data/resume.tex b/macros/latex/contrib/thuthesis/data/resume.tex index 02d777bbf1..025bf58e76 100644 --- a/macros/latex/contrib/thuthesis/data/resume.tex +++ b/macros/latex/contrib/thuthesis/data/resume.tex @@ -2,52 +2,32 @@ \begin{resume} - \resumeitem{个人简历} - - xxxx å¹´ xx 月 xx 日出生于 xx çœ xx 县。 - - xxxx å¹´ 9 月考入 xx å¤§å¦ xx ç³» xx 专业,xxxx å¹´ 7 月本科毕业并获得 xx å¦å£«å¦ä½ã€‚ - - xxxx å¹´ 9 月å…试进入 xx å¤§å¦ xx 系攻读 xx å¦ä½è‡³ä»Šã€‚ - - \researchitem{å‘表的å¦æœ¯è®ºæ–‡} % å‘表的和录用的åˆåœ¨ä¸€èµ· - - % 1. å·²ç»åˆŠè½½çš„å¦æœ¯è®ºæ–‡ï¼ˆæœ¬äººæ˜¯ç¬¬ä¸€ä½œè€…,或者导师为第一作者本人是第二作者) - \begin{publications} - \item Yang Y, Ren T L, Zhang L T, et al. Miniature microphone with silicon- - based ferroelectric thin films. Integrated Ferroelectrics, 2003, - 52:229-235. (SCI 收录, 检索å·:758FZ.) - \item æ¨è½¶, å¼ å®æ¬£, 任天令, ç‰. 硅基é“电微声å¦å™¨ä»¶ä¸è–„è†œæ®‹ä½™åº”åŠ›çš„ç ”ç©¶. ä¸å›½æœº - 械工程, 2005, 16(14):1289-1291. (EI 收录, 检索å·:0534931 2907.) - \item æ¨è½¶, å¼ å®æ¬£, 任天令, ç‰. 集æˆé“电器件ä¸çš„å…³é”®å·¥è‰ºç ”ç©¶. 仪器仪表å¦æŠ¥, - 2003, 24(S4):192-193. (EI æºåˆŠ.) - \end{publications} - - % 2. 尚未刊载,但已ç»æŽ¥åˆ°æ£å¼å½•ç”¨å‡½çš„å¦æœ¯è®ºæ–‡ï¼ˆæœ¬äººä¸ºç¬¬ä¸€ä½œè€…,或者 - % 导师为第一作者本人是第二作者)。 - \begin{publications}[before*=\publicationskip,after*=\publicationskip] - \item Yang Y, Ren T L, Zhu Y P, et al. PMUTs for handwriting recognition. In - press. (已被 Integrated Ferroelectrics 录用. SCI æºåˆŠ.) - \end{publications} - - % 3. 其他å¦æœ¯è®ºæ–‡ã€‚å¯åˆ—出除上述两ç§æƒ…况以外的其他å¦æœ¯è®ºæ–‡ï¼Œä½†å¿…须是 - % å·²ç»åˆŠè½½æˆ–者收到æ£å¼å½•ç”¨å‡½çš„论文。 - \begin{publications} - \item Wu X M, Yang Y, Cai J, et al. Measurements of ferroelectric MEMS - microphones. Integrated Ferroelectrics, 2005, 69:417-429. (SCI 收录, æ£€ç´¢å· - :896KM) - \item 贾泽, æ¨è½¶, 陈兢, ç‰. 用于压电和电容微麦克风的体硅è…èš€ç›¸å…³ç ”ç©¶. 压电与声 - å…‰, 2006, 28(1):117-119. (EI 收录, 检索å·:06129773469) - \item ä¼æ™“明, æ¨è½¶, å¼ å®æ¬£, ç‰. 基于MEMS技术的集æˆé“电硅微麦克风. ä¸å›½é›†æˆç”µè·¯, - 2003, 53:59-61. - \end{publications} - - \researchitem{ç ”ç©¶æˆæžœ} % æœ‰å°±å†™ï¼Œæ²¡æœ‰å°±åˆ é™¤ + \section*{个人简历} + + 197× å¹´ ×× 月 ×× 日出生于四å·Ã—×县。 + + 1992 å¹´ 9 月考入××大å¦åŒ–å¦ç³»Ã—×化å¦ä¸“业,1996 å¹´ 7 月本科毕业并获得ç†å¦å¦å£«å¦ä½ã€‚ + + 1996 å¹´ 9 月å…试进入清åŽå¤§å¦åŒ–å¦ç³»æ”»è¯»Ã—×化å¦åšå£«è‡³ä»Šã€‚ + + + \section*{在å¦æœŸé—´å®Œæˆçš„相关å¦æœ¯æˆæžœ} + + \subsection*{å¦æœ¯è®ºæ–‡} + + \begin{achievements} + \item Yang Y, Ren T L, Zhang L T, et al. Miniature microphone with silicon-based ferroelectric thin films[J]. Integrated Ferroelectrics, 2003, 52:229-235. + \item æ¨è½¶, å¼ å®æ¬£, 任天令, ç‰. 硅基é“电微声å¦å™¨ä»¶ä¸è–„è†œæ®‹ä½™åº”åŠ›çš„ç ”ç©¶[J]. ä¸å›½æœºæ¢°å·¥ç¨‹, 2005, 16(14):1289-1291. + \item æ¨è½¶, å¼ å®æ¬£, 任天令, ç‰. 集æˆé“电器件ä¸çš„å…³é”®å·¥è‰ºç ”ç©¶[J]. 仪器仪表å¦æŠ¥, 2003, 24(S4):192-193. + \item Yang Y, Ren T L, Zhu Y P, et al. PMUTs for handwriting recognition. In press[J]. (已被Integrated Ferroelectrics录用) + \end{achievements} + + + \subsection*{专利} + \begin{achievements} - \item 任天令, æ¨è½¶, 朱一平, ç‰. 硅基é“电微声å¦ä¼ 感器畴æžåŒ–区域控制和电æžè¿žæŽ¥çš„ - 方法: ä¸å›½, CN1602118A. (ä¸å›½ä¸“利公开å·) - \item Ren T L, Yang Y, Zhu Y P, et al. Piezoelectric micro acoustic sensor - based on ferroelectric materials: USA, No.11/215, 102. (美国å‘明专利申请å·) + \item 任天令, æ¨è½¶, 朱一平, ç‰. 硅基é“电微声å¦ä¼ 感器畴æžåŒ–区域控制和电æžè¿žæŽ¥çš„方法: ä¸å›½, CN1602118A[P]. 2005-03-30. + \item Ren T L, Yang Y, Zhu Y P, et al. Piezoelectric micro acoustic sensor based on ferroelectric materials: USA, No.11/215, 102[P]. (美国å‘明专利申请å·.) \end{achievements} \end{resume} diff --git a/macros/latex/contrib/thuthesis/figures/committee.pdf b/macros/latex/contrib/thuthesis/figures/committee.pdf Binary files differdeleted file mode 100644 index 37f210a115..0000000000 --- a/macros/latex/contrib/thuthesis/figures/committee.pdf +++ /dev/null diff --git a/macros/latex/contrib/thuthesis/figures/scan-copyright.pdf b/macros/latex/contrib/thuthesis/figures/scan-copyright.pdf Binary files differdeleted file mode 100644 index 9d5c5a5665..0000000000 --- a/macros/latex/contrib/thuthesis/figures/scan-copyright.pdf +++ /dev/null diff --git a/macros/latex/contrib/thuthesis/figures/scan-record.pdf b/macros/latex/contrib/thuthesis/figures/scan-record.pdf Binary files differdeleted file mode 100644 index db0dcef7b2..0000000000 --- a/macros/latex/contrib/thuthesis/figures/scan-record.pdf +++ /dev/null diff --git a/macros/latex/contrib/thuthesis/figures/scan-statement.pdf b/macros/latex/contrib/thuthesis/figures/scan-statement.pdf Binary files differdeleted file mode 100644 index 25e1494d7a..0000000000 --- a/macros/latex/contrib/thuthesis/figures/scan-statement.pdf +++ /dev/null diff --git a/macros/latex/contrib/thuthesis/figures/thu-fig-logo.pdf b/macros/latex/contrib/thuthesis/figures/thu-fig-logo.pdf Binary files differdeleted file mode 100644 index 594a342957..0000000000 --- a/macros/latex/contrib/thuthesis/figures/thu-fig-logo.pdf +++ /dev/null diff --git a/macros/latex/contrib/thuthesis/figures/thu-lib-logo.pdf b/macros/latex/contrib/thuthesis/figures/thu-lib-logo.pdf Binary files differdeleted file mode 100644 index 996961e825..0000000000 --- a/macros/latex/contrib/thuthesis/figures/thu-lib-logo.pdf +++ /dev/null diff --git a/macros/latex/contrib/thuthesis/figures/thu-text-logo.pdf b/macros/latex/contrib/thuthesis/figures/thu-text-logo.pdf Binary files differdeleted file mode 100644 index 7f20baf74b..0000000000 --- a/macros/latex/contrib/thuthesis/figures/thu-text-logo.pdf +++ /dev/null diff --git a/macros/latex/contrib/thuthesis/figures/thu-whole-logo.pdf b/macros/latex/contrib/thuthesis/figures/thu-whole-logo.pdf Binary files differdeleted file mode 100644 index 1107b0d3ae..0000000000 --- a/macros/latex/contrib/thuthesis/figures/thu-whole-logo.pdf +++ /dev/null diff --git a/macros/latex/contrib/thuthesis/ref/refs.bib b/macros/latex/contrib/thuthesis/ref/refs.bib index 120569caab..ff2b667a71 100644 --- a/macros/latex/contrib/thuthesis/ref/refs.bib +++ b/macros/latex/contrib/thuthesis/ref/refs.bib @@ -1,222 +1,330 @@ -@book{IEEE-1363, - author = {{IEEE Std 1363-2000}}, - title = {{IEEE} Standard Specifications for Public-Key Cryptography}, - address = {New York}, - publisher = {IEEE}, - year = 2000 -} - -@inproceedings{kocher99, - author = {C. Kocher and J. Jaffe and B. Jun}, - title = {Differential Power Analysis}, - editor = {M. Wiener}, - booktitle = {Advances in Cryptology ({CRYPTO}~'99)}, - series = {Lecture Notes in Computer Science}, - volume = 1666, - pages = {388-397}, - publisher = {Springer-Verlag}, - address = {Germany}, - month = {August}, - year = 1999 -} - -@incollection{Krasnogor2004e, - author = {N. Krasnogor}, - title = {Towards robust memetic algorithms}, - booktitle = {Recent Advances in Memetic Algorithms}, - publisher = {Springer Berlin Heidelberg}, - year = 2004, - pages = {185-207}, - editor = {W.E. Hart and N. Krasnogor and J.E. Smith}, - volume = 166, - series = {Studies in Fuzziness and Soft Computing}, - address = {New York}, -} - -@incollection{zjsw, - author = {ç固}, - title = {è‹æ¦ä¼ }, - booktitle = {ä¼ è®°æ•£æ–‡è‹±åŽ}, - publisher = {湖北人民出版社}, - year = 1998, - pages = {65-69}, - editor = {郑在瀛 and æ±ªè¶…å® and 周文å¤}, - volume = 2, - series = {æ–°å¤æ–‡è§‚æ¢ä¸›ä¹¦}, - address = {æ¦æ±‰}, -} - -@inbook{clzs, - author = {阎真}, - title = {沧浪之水}, - chapter = {大人物还是讲人情的}, - pages = {185-207}, - publisher = {人民文å¦å‡ºç‰ˆç¤¾}, - address = {北京}, - year = 2001, -} - -@book{tex, - author = "Donald E. Knuth", - title = "The {\TeX}book", - publisher = "Addison-Wesley Publishing Company", - address = "Reading, MA", - year = 1989, - edition = "15th", -} - -@book{companion, - author = "Michel Goosens and Frank Mittelbach and Alexander Samarin", - title = "The {\LaTeX} Companion", - publisher = "Addison-Wesley Publishing Company", - address = "Reading, MA", - PAGES = "112--125", - year = 1994, -} - -@article{ELIDRISSI94, - author = "{Chafik El Idrissi}, M. and {Roney}, A. and {Frigon}, C. - and {Larzilli{\`e}re}, M.", - title = "Measurements of total kinetic-energy released to the - {$N=2$} dissociation limit of {H}$_2$ --- evidence of the - dissociation of very high vibrational {R}ydberg states of - {H}$_2$ by doubly-excited states", - journal = "Chemical Physics Letters", - pages = "260-266", - volume = 224, - number = 10, - year = 1994, -} - -@article{MELLINGER96, - author = "Mellinger, A. and Vidal, C. R. and Jungen, Ch.", - title = "Laser reduced fluorescence study of the carbon-monoxide nd - triplet {R}ydberg series-experimental results and multichannel - quantum-defect analysis", - journal = "J. Chem. Phys.", - pages = "8913-8921", - volume = 104, - number = 5, - year = 1996, -} - -@article{SHELL02, - author = "Michael Shell", - title = "How to Use the {IEEEtran \LaTeX} Class", - journal = "Journal of {\LaTeX} Class Files", - year = 2002, - volume = 12, - number = 4, - pages = "100--120" -} - -@TechReport{NPB2, - title = {The {NAS} Parallel Benchmarks 2.0}, - author = {Alex Woo and David Bailey and Maurice Yarrow and Wijngaart - Wijngaart and Tim Harris and William Saphir}, - year = 1995, - month = dec # "~05", - institution = "The Pennsylvania State University CiteSeer Archives", - url = "http://www.nasa.org/" -} - -@inproceedings{DPMG, - author = {Kim, Sangbum and Woo, Namyoon and Yeom, Heon Y. and Park, - Taesoon and Park, Hyoungwoo}, - title = {Design and {I}mplementation of {D}ynamic {P}rocess - {M}anagement for {G}rid-enabled {MPICH}}, - booktitle = {the 10th European PVM/MPI Users' Group Conference}, - editor = {Jack Dongarra and Domenico Laforenza and Salvatore Orlando}, - publisher = {Springer-Verlag}, - year = 2003, - address = {Venice, Italy}, - month = sep, -} - -@inproceedings{cnproceed, - author = {王é‡é˜³ and 黄è¯å¸ˆ and 欧阳峰 and 洪七公 and 段皇å¸}, - publisher = {金大庸}, - title = {æ¦æž—高手从入门到精通}, - booktitle = {第~$N$~次åŽå±±è®ºå‰‘}, - year = 2006, - address = {西安, ä¸å›½}, - month = sep, -} - -@article{cnarticle, - author = "è´¾å®çŽ‰ and 林黛玉 and è–›å®é’— and 贾探春", - title = "论刘姥姥食é‡å¤§å¦‚牛之现实æ„义", - journal = "红楼梦æ‚è°ˆ", - pages = "260--266", - volume = 224, - year = 1800, -} - -@mastersthesis{zhubajie, - author = {猪八戒}, - title = {论æµä½“食物的æŒä¹…ä¿å˜}, - school = {广寒宫大å¦}, - year = 2005, - address = {北京}, -} - -@phdthesis{shaheshang, - author = {沙和尚}, - title = {论æµæ²™æ²³çš„综åˆæ²»ç†}, - school = {清åŽå¤§å¦}, - year = 2005, - address = {北京}, -} - -@mastersthesis{metamori2004, - author = {Ashwin Raju Jeyakumar}, - title = {Metamori: A library for Incremental File Checkpointing}, - school = {Virgina Tech}, - year = 2004, - month = jun # "~21", - address = {Blacksburg}, -} - -@phdthesis{FistSystem01, - author = "Erez Zadok", - title = "{FiST: A System for Stackable File System Code Generation}", - year = 2001, - month = "May", - school = "Computer Science Department, Columbia University", - address = "USA" -} - -@inbook{ColdSources, - author = {P. Gr{\"o}ning and L. Nilsson and P. Ruffieux and R. - Clergereaux and O. Gr{\"o}ning}, - title = {Encyclopedia of Nanoscience and Nanotechnology}, - pages = {547--579}, - publisher = {American Scientific Publishers}, - year = 2004, - volume = 1, - address = {USA}, -} - -@online{chuban2001, - author = {è§é’°}, - title = {出版业信æ¯åŒ–迈入快车é“}, - date = {2001-12-19}, - urldate = {2002-04-15}, - url = {http://www.creader.com/news/200112190019.htm}, -} - -@online{oclc2000, - author = {{Online Computer Library Center, Inc.}}, - title = {History of {OCLC}}, - year = 2000, - urldate = {2000-01-08}, - url = {http://www.oclc.org/about/history/default.htm}, -} - -@online{thuthesis, - author = {薛瑞尼}, - title = {ThuThesis: 清åŽå¤§å¦å¦ä½è®ºæ–‡æ¨¡æ¿}, - urldate = {2019-04-27}, - url = {https://github.com/xueruini/thuthesis}, - year = 2017, +@article{zhangkun1994, + author = {å¼ æ˜† and 冯立群 and 余昌钰 and others}, + title = {机器人柔性手腕的çƒé¢é½¿è½®è®¾è®¡ç ”究}, + journal = {清åŽå¤§å¦å¦æŠ¥: 自然科å¦ç‰ˆ}, + volume = {34}, + number = {2}, + pages = {1--7}, + year = {1994}, + key = {zhang1 kun1}, +} + +@book{zhukezhen1973, + author = {竺å¯æ¡¢}, + title = {物ç†å¦è®º}, + address = {北京}, + publisher = {科å¦å‡ºç‰ˆç¤¾}, + year = {1973}, + pages = {56--60}, + key = {zhu2 ke3 zhen1}, +} + +@inproceedings{dupont1974bone, + author = {Dupont, B}, + title = {Bone marrow transplantation in severe combined immunodeficiency with an unrelated MLC compatible donor}, + editor = {White, H J and Smith, R}, + booktitle = {Proceedings of the third annual meeting of the International Society for Experimental Hematology}, + address = {Houston}, + publisher = {International Society for Experimental Hematology}, + year = {1974}, + pages = {44--46}, +} + +@mastersthesis{zhengkaiqing1987, + author = {郑开é’}, + title = {通讯系统模拟åŠè½¯ä»¶}, + address = {北京}, + school = {清åŽå¤§å¦æ— 线电系}, + year = {1987}, + key = {zheng4 kai1 qing1}, +} + +@patent{jiangxizhou1980, + author = {姜锡洲}, + title = {一ç§æ¸©çƒå¤–æ•·è¯åˆ¶å¤‡æ–¹æ¡ˆ: ä¸å›½, 88105607.3}, + date = {1980-07-26}, + key = {jiang1 xi1 zhou1}, +} + +@standard{jianduju1994, + author = {ä¸åŽäººæ°‘共和国国家技术监ç£å±€}, + title = {GB3100-3102. ä¸åŽäººæ°‘å…±å’Œå›½å›½å®¶æ ‡å‡†-é‡ä¸Žå•ä½}, + address = {北京}, + publisher = {ä¸å›½æ ‡å‡†å‡ºç‰ˆç¤¾}, + year = {1994}, + key = {zhong1 hua2 ren2 min2 gong4 he2 guo2}, +} + +@article{merkt1995rotational, + author = {Merkt, Fr{\'e}d{\'e}ric and Mackenzie, S R and Softley, Timothy P}, + title = {Rotational Autoionization Dynamics in High Rydberg States of Nitrogen}, + journal = {J Chem Phys}, + year = {1995}, + volume = {103}, + pages = {4509--4518}, +} + +@article{mellinger1996laser, + author = {Mellinger, A and Vidal, C R and Jungen, {Ch}}, + title = {Laser reduced fluorescence study of the carbon monoxide nd triplet Rydberg series - Experimental results and multichannel quantum defect analysis}, + journal = {J Chem Phys}, + year = {1996}, + volume = {104}, + pages = {8913--8921}, +} + +@article{bixon1996dynamics, + author = {Bixon, M and Jortner, Joshua}, + title = {The dynamics of predissociating high {Rydberg} states of {NO}}, + journal = {J Chem Phys}, + year = {1996}, + volume = {105}, + pages = {1363--1382}, +} + +@article{mahui1995, + author = {马辉 and æŽä¿ and 刘耀明 and others}, + title = {利用 {REMPI} æ–¹æ³•æµ‹é‡ {BaF} é«˜é‡Œå¾·å ¡ç³»åˆ—å…‰è°±}, + journal = {化å¦ç‰©ç†å¦æŠ¥}, + year = {1995}, + volume = {8}, + pages = {308--311}, + key = {ma3 hui1}, +} + +@article{carlson1981two, + author = {Carlson, N W and Taylor, A J and Jones, K M and Schawlow, A L}, + title = {Two-step polarization-labeling spectroscopy of excited states of {Na2}}, + journal = {Phys Rev A}, + year = {1981}, + volume = {24}, + pages = {822--834}, +} + +@article{taylor1983scanning, + author = {Taylor, A J and Jones, K M and Schawlow, A L}, + title = {Scanning pulsed-polarization spectrometer applied to {Na2}}, + journal = {J Opt Soc Am}, + year = {1983}, + volume = {73}, + pages = {994--998}, +} + +@article{taylor1981study, + author = {Taylor, A J and Jones, K M and Schawlow, A L}, + title = {A study of the excited {1$\Sigma$g+} states in {Na2}}, + journal = {Opt Commun}, + year = {1981}, + volume = {39}, + pages = {47--50}, +} + +@article{shimizu1983laser, + author = {Shimizu, Kazuko and Shimizu, Fujio}, + title = {Laser induced fluorescence spectra of the a {3$\Pi$u--X 1$\Sigma$g+} band of {Na2} by molecular beam}, + journal = {J Chem Phys}, + year = {1983}, + volume = {78}, + pages = {1126--1131}, +} + +@article{atkinson1982experimental, + author = {Atkinson, J B and Becker, J and Demtr{\"o}der, W}, + title = {Experimental observation of the a {3$\Pi$u} state of {Na2}}, + journal = {Chem Phys Lett}, + year = {1982}, + volume = {87}, + pages = {92--97}, +} + +@article{kusch1975perturbations, + author = {Kusch, P and Hessel, M M}, + title = {Perturbations in the A {1$\Sigma$u+} state of {Na2}}, + journal = {J Chem Phys}, + year = {1975}, + volume = {63}, + pages = {4087--4088}, +} + +@book{guangxi1993, + author = {广西壮æ—自治区林业厅}, + title = {广西自然ä¿æŠ¤åŒº}, + address = {北京}, + publisher = {ä¸å›½æž—业出版社}, + year = {1993}, + key = {guang3 xi1 zhuang4 zu2 zi4 zhi4 qu1}, +} + +@book{huosini1989guwu, + author = {éœæ–¯å°¼}, + title = {谷物科å¦ä¸Žå·¥è‰ºå¦åŽŸç†}, + translator = {æŽåº†é¾™}, + edition = {2}, + address = {北京}, + publisher = {ä¸å›½é£Ÿå“出版社}, + year = {1989}, + pages = {15--20}, + key = {huo4 si1 ni2}, +} + +@book{wangfuzhi1865songlun, + author = {王夫之}, + title = {宋论}, + edition = {刻本}, + address = {金陵}, + publisher = {曾æ°}, + year = {1865(清åŒæ²»å››å¹´ï¼‰}, + key = {wang2 fu1 zhi1}, +} + +@book{zhaoyaodong1998xinshidai, + author = {赵耀东}, + title = {新时代的工业工程师}, + address = {å°åŒ—}, + publisher = {天下文化出版社}, + year = {1998}, + urldate = {1998-09-26}, + url = {http://www.ie.nthu.edu.tw/info/ie.newie.htm}, + key = {zhao4 yao4 dong1}, +} + +@standard{biaozhunhua2002tushu, + author = {全国信æ¯ä¸Žæ–‡çŒ®å·¥ä½œæ ‡å‡†åŒ–æŠ€æœ¯å§”å‘˜ä¼šå‡ºç‰ˆç‰©æ ¼å¼åˆ†å§”员会}, + title = {GB/T 12450-2001 图书书å页}, + address = {北京}, + publisher = {ä¸å›½æ ‡å‡†å‡ºç‰ˆç¤¾}, + year = {2002}, + key = {quan2 guo2 xin4 xi1}, +} + +@book{chubanzhuanye2004, + author = {全国出版专业èŒä¸šèµ„æ ¼è€ƒè¯•åŠžå…¬å®¤}, + title = {全国出版专业èŒä¸šèµ„æ ¼è€ƒè¯•è¾…å¯¼æ•™æ: 出版专业ç†è®ºä¸Žå®žåŠ¡â€¢ä¸çº§}, + edition = {2014}, + address = {上海}, + publisher = {上海辞书出版社}, + year = {2004}, + pages = {299--307}, + key = {quan2 guo2 chu1 ban3 ye4}, +} + +@techreport{who1970factors, + author = {{World Health Organization}}, + title = {Factors Regulating the Immune Response: Report of {WHO Scientific Group}}, + address = {Geneva}, + publisher = {WHO}, + year = {1970}, +} + +@book{peebles2001probability, + author = {Peebles, Jr, Peyton Z.}, + title = {Probability, Random Variables, and Random Signal Principles}, + edition = {4}, + address = {New York}, + publisher = {McGraw Hill}, + year = {2001}, +} + +@incollection{baishunong1998zhiwu, + author = {白书农}, + title = {æ¤ç‰©å¼€èŠ±ç ”究}, + editor = {æŽæ‰¿æ£®}, + booktitle = {æ¤ç‰©ç§‘å¦è¿›å±•}, + address = {北京}, + publisher = {高ç‰æ•™è‚²å‡ºç‰ˆç¤¾}, + year = {1998}, + pages = {146--163}, + key = {bai2 shu1 nong2}, +} + +@incollection{weinstein1974pathogenic, + author = {Weinstein, L and Swertz, M N}, + title = {Pathogenic Properties of Invading Microorganism}, + editor = {Sodeman, Jr, William A and Sodeman, William A}, + booktitle = {Pathologic physiology: mechanisms of disease}, + address = {Philadelphia}, + publisher = {Saunders}, + year = {1974}, + pages = {745--772}, +} + +@inproceedings{hanjiren1985lun, + author = {韩å‰äºº}, + title = {论èŒå·¥æ•™è‚²çš„特点}, + editor = {ä¸å›½èŒå·¥æ•™è‚²ç ”究会}, + booktitle = {èŒå·¥æ•™è‚²ç ”究论文集}, + address = {北京}, + publisher = {人民教育出版社}, + year = {1985}, + pages = {90--99}, + key = {han2 ji2 ren2}, +} + +@periodical{dizhi1936dizhi, + author = {ä¸å›½åœ°è´¨å¦ä¼š}, + title = {地质评论}, + year = {1936}, + volume = {1}, + number = {1}, + address = {北京}, + publisher = {地质出版社}, + key = {zhong1 guo2 di4 zhi3 xue2 hui4}, +} + +@periodical{tushuguan1957tushuguanxue, + author = {ä¸å›½å›¾ä¹¦é¦†å¦ä¼š}, + title = {图书馆å¦é€šè®¯}, + year = {1957/1990}, + number = {1--4}, + address = {北京}, + publisher = {北京图书馆}, + key = {zhong1 guo2 tu2 shu1 guan3 xue2 hui4}, +} + +@periodical{aaas1883science, + author = {{American Association for the Advancement of Science}}, + title = {Science}, + year = {1883}, + volume = {1}, + number = {1}, + address = {Washington, D.C.}, + publisher = {American Association for the Advancement of Science}, +} + +@newspaper{fugang2000fengsha, + author = {傅刚 and 赵承 and æŽä½³è·¯}, + title = {大风沙过åŽçš„æ€è€ƒ}, + journal = {北京é’年报}, + date = {2000-04-12}, + number = {14}, + urldate = {2002-03-06}, + url = {http://www.bjyouth.com.cn/Bqb/20000412/B/4216%5ED0412B1401.htm}, + key = {fu4 gang1}, +} + +@online{xiaoyu2001chubanye, + author = {è§é’°}, + title = {出版业信æ¯åŒ–迈入快车é“}, + year = {2001}, + date = {2001-12-19}, + urldate = {2002-04-15}, + url = {http://www.creader.com/news/20011219/200112190019.htm}, + key = {xiao1 yu4}, +} + +@online{oclc2000about, + author = {{Online Computer Library Center, Inc}}, + title = {About {OCLC}: History of Cooperation}, + year = {2000}, + urldate = {2000-01-08}, + url = {http://www.oclc.org/about/cooperation.en.htm}, +} + +@software{scitor2000project, + author = {{Scitor Corporation}}, + title = {Project scheduler}, + address = {Sunnyvale, Calif.}, + publisher = {Scitor Corporation}, + year = {1983}, + medium = {DK}, } diff --git a/macros/latex/contrib/thuthesis/spine.pdf b/macros/latex/contrib/thuthesis/spine.pdf Binary files differindex 2e1e47a680..8f0f80226e 100644 --- a/macros/latex/contrib/thuthesis/spine.pdf +++ b/macros/latex/contrib/thuthesis/spine.pdf diff --git a/macros/latex/contrib/thuthesis/thusetup.tex b/macros/latex/contrib/thuthesis/thusetup.tex index 997340120b..26254e2325 100644 --- a/macros/latex/contrib/thuthesis/thusetup.tex +++ b/macros/latex/contrib/thuthesis/thusetup.tex @@ -105,31 +105,23 @@ % start-date = {2011-07-01}, % ç ”ç©¶å·¥ä½œèµ·å§‹æ—¶é—´ } -%% Put any packages you would like to use here +% 载入所需的å®åŒ… -% è¡¨æ ¼ä¸æ”¯æŒè·¨è¡Œ -\usepackage{multirow} - -% è·¨é¡µè¡¨æ ¼ -\usepackage{longtable} - -% å›ºå®šå®½åº¦çš„è¡¨æ ¼ã€‚æ”¾åœ¨ hyperref 之å‰çš„è¯ï¼Œtabularx 里的 footnote 显示ä¸å‡ºæ¥ã€‚ -\usepackage{tabularx} +% å¯ä»¥ä½¿ç”¨ nomencl 生æˆç¬¦å·å’Œç¼©ç•¥è¯è¯´æ˜Ž +% \usepackage{nomencl} +% \makenomenclature % è¡¨æ ¼åŠ è„šæ³¨ \usepackage{threeparttable} -\pretocmd{\TPTnoteSettings}{\footnotesize}{}{} -% 确定浮动对象的ä½ç½®ï¼Œå¯ä»¥ä½¿ç”¨ H,强制将浮动对象放到这里(å¯èƒ½æ•ˆæžœå¾ˆå·®ï¼‰ -\usepackage{float} +% è¡¨æ ¼ä¸æ”¯æŒè·¨è¡Œ +\usepackage{multirow} + +% å›ºå®šå®½åº¦çš„è¡¨æ ¼ã€‚æ”¾åœ¨ hyperref 之å‰çš„è¯ï¼Œtabularx 里的 footnote 显示ä¸å‡ºæ¥ã€‚ +% \usepackage{tabularx} -% 浮动图形控制å®åŒ…。 -% å…许上一个 section 的浮动图形出现在下一个 section 的开始部分 -% 该å®åŒ…æ供处ç†æµ®åŠ¨å¯¹è±¡çš„ \FloatBarrier 命令,使所有未处 -% ç†çš„浮动图形立å³è¢«å¤„ç†ã€‚这三个å®åŒ…ä»…ä¾›å‚考,未必使用: -% \usepackage[below]{placeins} -% \usepackage{floatflt} % 图文混排用å®åŒ… -% \usepackage{rotating} % å›¾å½¢å’Œè¡¨æ ¼çš„æŽ§åˆ¶æ—‹è½¬ +% è·¨é¡µè¡¨æ ¼ +% \usepackage{longtable} % é‡å’Œå•ä½ \usepackage{siunitx} @@ -155,32 +147,16 @@ % å‚考文献使用 BibLaTeX å®åŒ… % \usepackage[backend=biber,style=thuthesis-numeric]{biblatex} % \usepackage[backend=biber,style=thuthesis-author-year]{biblatex} - -% \addbibresource{ref/refs.bib} % 声明 BibLaTeX çš„æ•°æ®åº“ - -% 给自定义的å®åŽé¢è‡ªåŠ¨åŠ 空白 -% \usepackage{xspace} +% \usepackage[backend=biber,style=apa]{biblatex} +% \usepackage[backend=biber,style=mla-new]{biblatex} +% 声明 BibLaTeX çš„æ•°æ®åº“ +% \addbibresource{ref/refs.bib} % 定义所有的图片文件在 figures å目录下 \graphicspath{{figures/}} -% 定义自己常用的东西 -% \def\myname{薛瑞尼} - % æ•°å¦å‘½ä»¤ \newcommand\dif{\mathop{}\!\mathrm{d}} % å¾®åˆ†ç¬¦å· -\newcommand\real{{\mathbf{R}}} % 实数集 -\newcommand\abs[1]{\lvert#1\rvert} -\newcommand\VECTOR{\symbf} % å‘é‡ -\newcommand\MATRIX{\symbf} % 矩阵 -\newcommand\vn{{\VECTOR{n}}} -\newcommand\vx{{\VECTOR{x}}} -\newcommand\mA{{\MATRIX{A}}} -\newcommand\mK{{\MATRIX{K}}} - -% 借用 ltxdoc 里é¢çš„å‡ ä¸ªå‘½ä»¤æ–¹ä¾¿å†™æ–‡æ¡£ã€‚ -\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} -\providecommand\pkg[1]{{\sffamily#1}} % hyperref å®åŒ…在最åŽè°ƒç”¨ \usepackage{hyperref} diff --git a/macros/latex/contrib/thuthesis/thuthesis-example.pdf b/macros/latex/contrib/thuthesis/thuthesis-example.pdf Binary files differindex ceea3fa53c..92704a73fc 100644 --- a/macros/latex/contrib/thuthesis/thuthesis-example.pdf +++ b/macros/latex/contrib/thuthesis/thuthesis-example.pdf diff --git a/macros/latex/contrib/thuthesis/thuthesis-example.tex b/macros/latex/contrib/thuthesis/thuthesis-example.tex index e3b3fd4fd4..4f71d6db49 100644 --- a/macros/latex/contrib/thuthesis/thuthesis-example.tex +++ b/macros/latex/contrib/thuthesis/thuthesis-example.tex @@ -33,9 +33,9 @@ \tableofcontents % æ’å›¾å’Œé™„è¡¨æ¸…å• -\listoffigures % æ’å›¾æ¸…å• +\listoffiguresandtables % æ’å›¾å’Œé™„è¡¨æ¸…å• +% \listoffigures % æ’å›¾æ¸…å• % \listoftables % é™„è¡¨æ¸…å• -% \listoffiguresandtables % æ’å›¾å’Œé™„è¡¨æ¸…å• % 符å·å¯¹ç…§è¡¨ \input{data/denotation} @@ -45,6 +45,8 @@ \mainmatter \input{data/chap01} \input{data/chap02} +\input{data/chap03} +\input{data/chap04} % 其他部分 diff --git a/macros/latex/contrib/thuthesis/thuthesis.dtx b/macros/latex/contrib/thuthesis/thuthesis.dtx index b52c7ea851..84c320323c 100644 --- a/macros/latex/contrib/thuthesis/thuthesis.dtx +++ b/macros/latex/contrib/thuthesis/thuthesis.dtx @@ -17,7 +17,7 @@ % % \iffalse %<*driver> -\ProvidesFile{thuthesis.dtx}[2020/09/09 7.0.0 Tsinghua University Thesis Template] +\ProvidesFile{thuthesis.dtx}[2020/10/14 7.1.0 Tsinghua University Thesis Template] \documentclass{ltxdoc} \usepackage{dtx-style} @@ -75,17 +75,14 @@ % \item 本模æ¿çš„å‘布éµå®ˆ \href{https://www.latex-project.org/lppl/lppl-1-3c.txt}{\LaTeX{} Project Public License (1.3.c)},使用å‰è¯·è®¤çœŸé˜…读å议内 % 容。 % \item 本模æ¿ä¸ºä½œè€…æ ¹æ® -% 清åŽå¤§å¦æ•™åŠ¡å¤„é¢å‘çš„ -% \href{http://www.law.tsinghua.edu.cn/publish/law/7024/2012/20120216153516317135347/20120216153516317135347_.html}{《综åˆè®ºæ–‡è®ç»ƒå†™ä½œæŒ‡å—》}, % 清åŽå¤§å¦ç ”究生院é¢å‘çš„ -% \href{http://yjsy.cic.tsinghua.edu.cn/docinfo/board/boarddetail.jsp?columnId=001050603&parentColumnId=0010506&itemSeq=5365}{ã€Šç ”ç©¶ç”Ÿå¦ä½è®ºæ–‡å†™ä½œæŒ‡å—》}, +% \href{http://yjsy.cic.tsinghua.edu.cn/docinfo/board/boarddetail.jsp?columnId=001050603&parentColumnId=0010506&itemSeq=5365}{% +% ã€Šç ”ç©¶ç”Ÿå¦ä½è®ºæ–‡å†™ä½œæŒ‡å—》}(仅é™æ ¡å†…网络访问)〠+% 清åŽå¤§å¦æ•™åŠ¡å¤„é¢å‘的《综åˆè®ºæ–‡è®ç»ƒå†™ä½œæŒ‡å—》和 % 清åŽå¤§å¦ % \href{http://postdoctor.tsinghua.edu.cn/info/czxz/1283}{% % 《编写“清åŽå¤§å¦åšå£«åŽç ”究报告â€å‚考æ„è§ã€‹} % 编写而æˆï¼Œæ—¨åœ¨ä¾›æ¸…åŽå¤§å¦æ¯•ä¸šç”Ÿæ’°å†™å¦ä½è®ºæ–‡ä½¿ç”¨ã€‚ -% \item 清åŽå¤§å¦æ•™åŠ¡å¤„å’Œç ”ç©¶ç”Ÿé™¢åªæ供毕业论文写作指å—,ä¸æ供官方模æ¿ï¼Œä¹Ÿä¸ä¼šæŽˆ -% æƒç¬¬ä¸‰æ–¹æ¨¡æ¿ä¸ºå®˜æ–¹æ¨¡æ¿ï¼Œæ‰€ä»¥æ¤æ¨¡æ¿ä»…为写作指å—çš„å‚考实现,ä¸ä¿è¯æ ¼å¼å®¡æŸ¥è€å¸ˆ -% ä¸ææ„è§ã€‚任何由于使用本模æ¿è€Œå¼•èµ·çš„è®ºæ–‡æ ¼å¼å®¡æŸ¥é—®é¢˜å‡ä¸Žæœ¬æ¨¡æ¿ä½œè€…æ— å…³ã€‚ % \item 任何个人或组织以本模æ¿ä¸ºåŸºç¡€è¿›è¡Œä¿®æ”¹ã€æ‰©å±•è€Œç”Ÿæˆçš„新的专用模æ¿ï¼Œè¯·ä¸¥æ ¼éµ % 守 \LaTeX{} Project Public License å议。由于è¿çŠ¯åè®®è€Œå¼•èµ·çš„ä»»ä½•çº çº·äº‰ç«¯å‡ä¸Ž % 本模æ¿ä½œè€…æ— å…³ã€‚ @@ -167,9 +164,9 @@ % thuthesis.ins & \textsc{DocStrip} 驱动文件(开å‘用) \\ % thuthesis.dtx & \textsc{DocStrip} æºæ–‡ä»¶ï¼ˆå¼€å‘用)\\\midrule % thuthesis.cls & 模æ¿ç±»æ–‡ä»¶\\ -% thuthesis-numeric.bst & å‚è€ƒæ–‡çŒ®æ ·å¼æ–‡ä»¶\\ -% thuthesis-author-year.bst & å‚è€ƒæ–‡çŒ®æ ·å¼æ–‡ä»¶\\ -% thuthesis-bachelor.bst & å‚è€ƒæ–‡çŒ®æ ·å¼æ–‡ä»¶\\ +% thuthesis-*.bst & \hologo{BibTeX} å‚è€ƒæ–‡çŒ®è¡¨æ ·å¼æ–‡ä»¶\\ +% thuthesis-*.bbx & BibLaTeX å‚è€ƒæ–‡çŒ®è¡¨æ ·å¼æ–‡ä»¶\\ +% thuthesis-*.cbx & BibLaTeX å‚è€ƒæ–‡çŒ®å¼•ç”¨æ ·å¼æ–‡ä»¶\\ % tsinghua-name-bachelor.pdf & æ ¡å logo,本科生å°é¢ä½¿ç”¨ \\\midrule % thuthesis-example.tex & 示例文档主文件\\ % spine.tex & 书脊示例文档\\ @@ -245,20 +242,20 @@ % % 首先,更新模æ¿ï¼š % \begin{shell} -% $ xetex thuthesis.ins # ç”Ÿæˆ thuthesis.cls +% $ xetex thuthesis.ins # ç”Ÿæˆ thuthesis.cls % \end{shell} % % 然åŽï¼Œç”Ÿæˆè®ºæ–‡ä»¥åŠä¹¦è„Šï¼š % \begin{shell} % $ xelatex thuthesis-example.tex -% $ bibtex thuthesis-example.aux # ç”Ÿæˆ bbl 文件 -% $ bibtex thuthesis-example-survey.aux # æœ¬ç§‘ç”Ÿçš„è°ƒç ”æŠ¥å‘Šçš„å‚考文献 -% $ bibtex thuthesis-example-translation.aux # 本科生的外文资料翻译的å‚考文献 -% $ bibtex thuthesis-example-index.aux # 本科生的书é¢ç¿»è¯‘对应的原文索引 -% $ xelatex thuthesis-example.tex # 解决引用 -% $ xelatex thuthesis-example.tex # 生æˆè®ºæ–‡ PDF -% -% $ xelatex spine.tex # 生æˆä¹¦è„Š PDF +% $ bibtex thuthesis-example.aux # ç”Ÿæˆ bbl 文件 +% $ bibtex thuthesis-example-survey.aux # æœ¬ç§‘ç”Ÿçš„è°ƒç ”æŠ¥å‘Šçš„å‚考文献 +% $ bibtex thuthesis-example-translation.aux # 本科生的外文资料翻译的å‚考文献 +% $ bibtex thuthesis-example-index.aux # 本科生的书é¢ç¿»è¯‘对应的原文索引 +% $ xelatex thuthesis-example.tex # 解决引用 +% $ xelatex thuthesis-example.tex # 生æˆè®ºæ–‡ PDF +% +% $ xelatex spine.tex # 生æˆä¹¦è„Š PDF % \end{shell} % % 在调用 \XeLaTeX 时,如果设置了 \option{include-spine} 选项, @@ -290,20 +287,14 @@ % \subsection{示例文件} % \label{sec:userguide} % -% 模æ¿æ ¸å¿ƒæ–‡ä»¶ -% 有:\file{thuthesis.cls},\file{thuthesis-numeric.bst}, -% \file{thuthesis-author-year.bst} å’Œ \file{tsinghua-name-bachelor.pdf}, +% 模æ¿æ ¸å¿ƒæ–‡ä»¶æœ‰ï¼š\file{thuthesis.cls},\file{tsinghua-name-bachelor.pdf}, +% \file{thuthesis-*.bst}(\hologo{BibTeX}), +% \file{thuthesis-*.bbx} å’Œ \file{thuthesis-*.cbx}(BibLaTeX), % 但如果没有示例文档会较难下手,所以推è从模æ¿è‡ªå¸¦çš„示例文档入手。其ä¸åŒ…括了论文 % 写作用到的所有命令åŠå…¶ä½¿ç”¨æ–¹æ³•ï¼Œåªéœ€ç”¨è‡ªå·±çš„内容进行相应替æ¢å°±å¯ä»¥ã€‚对于ä¸æ¸… % 楚的命令å¯ä»¥æŸ¥é˜…本手册。下é¢çš„例åæ述了模æ¿ä¸ç« 节的组织形å¼ï¼Œæ¥è‡ªäºŽç¤ºä¾‹æ–‡æ¡£ï¼Œ % 具体内容å¯ä»¥å‚考模æ¿é™„带的 \file{thuthesis-example.tex} å’Œ \file{data/}。 % -% \lstinputlisting[style=lstStyleLaTeX]{thuthesis-example.tex} -% -% å…¶ä¸ \file{thusetup.tex} 包括了论文基本信æ¯çš„é…ç½®æ ·ä¾‹ï¼š -% -% \lstinputlisting[style=lstStyleLaTeX]{thusetup.tex} -% % \subsection{论文选项} % \label{sec:option} % @@ -739,9 +730,7 @@ % % \subsubsection{æ•°å¦ç¬¦å·} % \label{sec:math} -% æ•°å¦ç¬¦å·åº”éµå¾ª GB/T 3102.11-1993《物ç†ç§‘å¦å’ŒæŠ€æœ¯ä¸ä½¿ç”¨çš„æ•°å¦ç¬¦å·ã€‹ -% \footnote{原 GB 3102.11-1993ï¼Œæ ¹æ®2017年第7å·å…¬å‘Šå’Œå¼ºåˆ¶æ€§æ ‡å‡†æ•´åˆç²¾ç®€ç»“论, -% 自2017å¹´3月23日起,è¯¥æ ‡å‡†è½¬åŒ–ä¸ºæŽ¨èæ€§æ ‡å‡†ã€‚}, +% æ•°å¦ç¬¦å·åº”éµå¾ª GB/T 3102.11—1993《物ç†ç§‘å¦å’ŒæŠ€æœ¯ä¸ä½¿ç”¨çš„æ•°å¦ç¬¦å·ã€‹ % 模æ¿ä¸ä½¿ç”¨ \pkg{unicode-math} å®åŒ…æ¥é…置数å¦ç¬¦å·ï¼Œ % 与 \LaTeX{} 默认的英美国家的符å·ä¹ 惯有所差异: % \newcommand\dif{\mathop{}\!\mathrm{d}} @@ -876,7 +865,7 @@ % Biblatex è¿è¡Œè¾ƒç¼“æ…¢ï¼Œæ— æ³•å¯¹å¤šä¸ªå‚考文献表使用ä¸åŒæ ·å¼ã€‚ % 用户需è¦æ ¹æ®å®žé™…选择åˆé€‚çš„æ–¹å¼ã€‚ % -% ç ”ç©¶ç”Ÿè¦æ±‚çš„å‚è€ƒæ–‡çŒ®æ ¼å¼åŸºäºŽã€Šä¿¡æ¯ä¸Žæ–‡çŒ® å‚考文献著录规则》(GB/T 7714-2015) +% ç ”ç©¶ç”Ÿè¦æ±‚çš„å‚è€ƒæ–‡çŒ®æ ¼å¼åŸºäºŽã€Šä¿¡æ¯ä¸Žæ–‡çŒ® å‚考文献著录规则》(GB/T 7714—2015) % 进行了少é‡æ”¹ç¼–(如英文姓åä¸ä½¿ç”¨å…¨å¤§å†™ï¼‰ï¼Œ % å¯ä»¥é€‰æ‹©â€œé¡ºåºç¼–ç 制â€å’Œâ€œè‘—者-出版年制â€ã€‚ % 如果使用 BibTeX çš„æ–¹å¼ï¼Œéœ€è¦åœ¨å¯¼è¨€åŒºè½½å…¥ \pkg{natbib} å®åŒ…å¹¶é€‰æ‹©æ ·å¼ï¼Œå¦‚: @@ -918,7 +907,7 @@ % 而且 \cs{addbibresource} 必须在导言区设置。 % 输出å‚考文献表应使用 \cs{printbibliography} 命令。 % -% 本科生è¦æ±‚çš„ä¸æ–‡å‚è€ƒæ–‡çŒ®æ ¼å¼ä¸¥æ ¼éµä»Ž GB/T 7714-2015, +% 本科生è¦æ±‚çš„ä¸æ–‡å‚è€ƒæ–‡çŒ®æ ¼å¼ä¸¥æ ¼éµä»Ž GB/T 7714—2015, % 附录ä¸è°ƒç ”报告的英文å‚考文献å¯ä»¥è‡ªè¡Œé€‰æ‹©åˆé€‚çš„é£Žæ ¼ã€‚ % 但是 biblatex ä¸æ”¯æŒåŒä¸€æ–‡æ¡£ä¸ä½¿ç”¨ä¸åŒçš„æ ¼å¼ï¼Œ % 所以åªèƒ½ä½¿ç”¨ \hologo{BibTeX}: @@ -1045,71 +1034,36 @@ % \end{translation} % \end{latex} % -% \subsubsection{简历} +% \subsubsection{个人简历ã€åœ¨å¦æœŸé—´å®Œæˆçš„相关å¦æœ¯æˆæžœ} % \DescribeEnv{resume} -% å¼€å¯ä¸ªäººç®€åŽ†ç« 节,包括个人简历,å‘è¡¨æ–‡ç« ï¼Œç ”ç©¶æˆæžœåˆ—表ç‰ã€‚æ¯ä¸ªå项目请 -% 用以下对应命令开å¯ï¼š\cs{xxxitem}\marg{subtitle}。 -% -% \DescribeMacro{\resumeitem} -% 个人简历,用法:\cs{resumeitem}\{个人简历\}ã€‚ç®€åŽ†å†…å®¹éƒ¨åˆ†æ²¡æœ‰æ ¼å¼è¦æ±‚,æ£å¸¸æ®µ -% è½æŽ’版。 +% ç ”ç©¶ç”Ÿçš„æ ‡é¢˜ä¸ºä¸ºâ€œä¸ªäººç®€åŽ†ã€åœ¨å¦æœŸé—´å®Œæˆçš„相关å¦æœ¯æˆæžœâ€ï¼Œ +% æœ¬ç§‘ç”Ÿçš„æ ‡é¢˜ä¸ºâ€œåœ¨å¦æœŸé—´å‚åŠ è¯¾é¢˜çš„ç ”ç©¶æˆæžœâ€æˆ–“PUBLICATIONSâ€ã€‚ % -% \DescribeMacro{\researchitem} -% å‘表å¦æœ¯è®ºæ–‡ï¼Œç”¨æ³•ï¼š\cs{researchitem}\marg{类别},包括“å¦æœ¯è®ºæ–‡â€å’Œâ€œç ”究æˆæžœâ€ä¸¤ -% 个类别。分别用 \env{publications} å’Œ \env{achievements} 罗列。 -% -% \DescribeEnv{publications} -% \DescribeMacro{\publicationskip} -% 用 \env{publications} 环境进行罗列å‘表的论文。按照å¦æ ¡è¦æ±‚,在å¦æœŸé—´å‘表的å¦æœ¯ -% 论文分以下三部分按顺åºåˆ†åˆ«åˆ—出,æ¯éƒ¨åˆ†ä¹‹é—´ç©º 1 行,åºå·å¯è¿žç»æŽ’列: -% \begin{enumerate} -% \item å·²ç»åˆŠè½½çš„å¦æœ¯è®ºæ–‡ï¼ˆæœ¬äººæ˜¯ç¬¬ä¸€ä½œè€…,或者导师为第一作者本人是第二作者) -% \item 尚未刊载,但已ç»æŽ¥åˆ°æ£å¼å½•ç”¨å‡½çš„å¦æœ¯è®ºæ–‡ï¼ˆæœ¬äººä¸ºç¬¬ä¸€ä½œè€…,或者导师为第一 -% 作者本人是第二作者)。 -% \item 其他å¦æœ¯è®ºæ–‡ã€‚å¯åˆ—出除上述两ç§æƒ…况以外的其他å¦æœ¯è®ºæ–‡ï¼Œä½†å¿…须是已ç»åˆŠè½½æˆ– -% 者收到æ£å¼å½•ç”¨å‡½çš„论文。 -% \end{enumerate} +% \DescribeEnv{achievements} +% æœ¬ç« çš„å…¶ä»–æ ‡é¢˜åŒæ ·ä½¿ç”¨ \cs{section*},\cs{subsection*} ç‰å‘½ä»¤ç”Ÿæˆï¼Œ +% ç ”ç©¶æˆæžœç”¨ \env{achievements} 环境罗列。 % -% \env{publications} 环境支æŒæ¯ä¸€éƒ¨åˆ†åˆ†åˆ«ç¼–å†™ï¼Œé€»è¾‘ä¸Šæ›´æ¸…æ¥šï¼Œä¸ºäº†åœ¨çŽ¯å¢ƒä¹‹é—´æ”¯æŒ -% 空行,需è¦åˆ©ç”¨ \cs{publicationskip} 控制。示例: % \begin{latex} -% \researchitem{å‘表的å¦æœ¯è®ºæ–‡} -% -% % 1. å·²ç»åˆŠè½½çš„å¦æœ¯è®ºæ–‡ -% \begin{publications} -% \item Yang Y, Ren T L, Zhang L T, et al. Miniature microphone with -% silicon-based ferroelectric thin films. Integrated Ferroelectrics, -% 2003, 52:229-235. (SCI 收录, 检索å·:758FZ.) -% \item æ¨è½¶, å¼ å®æ¬£, 任天令, ç‰. 硅基é“电微声å¦å™¨ä»¶ä¸è–„è†œæ®‹ä½™åº”åŠ›çš„ç ”ç©¶. ä¸å›½æœº -% 械工程, 2005, 16(14):1289-1291. (EI 收录, 检索å·:0534931 2907.) -% \item æ¨è½¶, å¼ å®æ¬£, 任天令, ç‰. 集æˆé“电器件ä¸çš„å…³é”®å·¥è‰ºç ”ç©¶. 仪器仪表å¦æŠ¥, -% 2003, 24(S4):192-193. (EI æºåˆŠ.) -% \end{publications} -% -% % 2. 尚未刊载,但已ç»æŽ¥åˆ°æ£å¼å½•ç”¨å‡½çš„å¦æœ¯è®ºæ–‡ -% \begin{publications}[before*=\publicationskip,after*=\publicationskip] -% \item Yang Y, Ren T L, Zhu Y P, et al. PMUTs for handwriting -% recognition. In press. (已被 Integrated Ferroelectrics 录用. SCI æºåˆŠ.) -% \end{publications} -% -% % 3. 其他å¦æœ¯è®ºæ–‡ã€‚ -% \begin{publications} -% \item Wu X M, Yang Y, Cai J, et al. Measurements of ferroelectric -% MEMS microphones. Integrated Ferroelectrics, 2005, 69:417-429. -% (SCI 收录, 检索å·:896KM) -% \item 贾泽, æ¨è½¶, 陈兢, ç‰. 用于压电和电容微麦克风的体硅è…èš€ç›¸å…³ç ”ç©¶. 压电与声 -% å…‰, 2006, 28(1):117-119. (EI 收录, 检索å·:06129773469) -% \item ä¼æ™“明, æ¨è½¶, å¼ å®æ¬£, ç‰. 基于MEMS技术的集æˆé“电硅微麦克风. ä¸å›½é›†æˆç”µè·¯, -% 2003, 53:59-61. -% \end{publications} +% \begin{resume} +% \section*{个人简历} +% …… +% +% \section*{在å¦æœŸé—´å®Œæˆçš„相关å¦æœ¯æˆæžœ} +% +% \subsection*{å¦æœ¯è®ºæ–‡} +% \begin{achievements} +% \item …… +% \item …… +% \end{achievements} +% +% \subsection*{专利} +% \begin{achievements} +% \item …… +% \item …… +% \end{achievements} +% \end{resume} % \end{latex} % -% \DescribeEnv{achievements} -% ç ”ç©¶æˆæžœç”¨ \cs{researchitem}\{ç ”ç©¶æˆæžœ\} å¼€å¯ï¼ŒéšåŽç”¨ \env{achievements} 环 -% 境罗列。 -% -% 具体用法请å‚看示例文档 \file{data/resume.tex}。 -% % \subsubsection{综åˆè®ºæ–‡è®ç»ƒè®°å½•è¡¨} % \DescribeMacro{\record} % 本科生需è¦åœ¨æœ€åŽé™„上综åˆè®ºæ–‡è®ç»ƒè®°å½•è¡¨ï¼Œå¯ä»¥ç”¨å¦‚下命令: @@ -1179,7 +1133,7 @@ % \begin{macrocode} %<cls>\NeedsTeXFormat{LaTeX2e}[2017/04/15] %<cls>\ProvidesClass{thuthesis} -%<cls>[2020/09/09 7.0.0 Tsinghua University Thesis Template] +%<cls>[2020/10/14 7.1.0 Tsinghua University Thesis Template] % \end{macrocode} % % 报错 @@ -1193,6 +1147,15 @@ \newcommand\thu@patch@error[1]{% \thu@error{Failed to patch command \protect#1}% } +\newcommand\thu@deprecate[2]{% + \def\thu@@tmp{#2}% + \thu@warning{% + The #1 is deprecated% + \ifx\thu@@tmp\@empty\else + . Use #2 instead% + \fi + }% +} % \end{macrocode} % % 检查 \LaTeXe{} kernel 版本 @@ -1226,7 +1189,7 @@ %<*cls> \hyphenation{Thu-Thesis} \def\thuthesis{ThuThesis} -\def\version{7.0.0} +\def\version{7.1.0} \RequirePackage{kvdefinekeys} \RequirePackage{kvsetkeys} \RequirePackage{kvoptions} @@ -1757,6 +1720,7 @@ \clearpage \fi \@mainmatterfalse + \thusetup{toc-depth = 0}% } % \end{macrocode} % \end{macro} @@ -2042,7 +2006,7 @@ \fi \fi \newcommand\thu@load@cjk@font@windows{% - \xeCJKsetup{EmboldenFactor=2} + \xeCJKsetup{EmboldenFactor=3}% \setCJKmainfont{SimSun}[ AutoFakeBold = true, ItalicFont = KaiTi, @@ -2078,7 +2042,6 @@ UprightFont = * Light, BoldFont = * Bold, ]% - \xeCJKsetwidth{‘’“â€}{1em}% } % \end{macrocode} % @@ -2161,13 +2124,50 @@ % % \begin{macro}{\normalsize} % æ£æ–‡å°å››å· (12bp) å—,行è·ä¸ºå›ºå®šå€¼ 20 bp。 +% 其他å—å·çš„è¡Œè·æŒ‰ç…§ç›¸åŒçš„比例设置。 +% +% 表达å¼è¡Œçš„è¡Œè·ä¸ºå•å€è¡Œè·ï¼Œæ®µå‰ç©º 6 磅,段åŽç©º 6 磅。 % \begin{macrocode} \renewcommand\normalsize{% \@setfontsize\normalsize{12bp}{20bp}% - \abovedisplayskip=12bp \@plus 2bp \@minus 2bp - \abovedisplayshortskip=12bp \@plus 2bp \@minus 2bp - \belowdisplayskip=\abovedisplayskip - \belowdisplayshortskip=\abovedisplayshortskip} + \abovedisplayskip 6bp% + \abovedisplayshortskip 6bp% + \belowdisplayshortskip 6bp% + \belowdisplayskip \abovedisplayskip +} +\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi +\DeclareRobustCommand\small{% + \@setfontsize\small{10.5bp}{17.5bp}% + \abovedisplayskip 6bp% + \abovedisplayshortskip 6bp% + \belowdisplayshortskip 6bp% + \def\@listi{\leftmargin\leftmargini + \topsep \z@skip + \parsep \z@skip + \itemsep \z@skip}% + \belowdisplayskip \abovedisplayskip +} +\DeclareRobustCommand\footnotesize{% + \@setfontsize\footnotesize{9bp}{15bp}% + \abovedisplayskip 6bp% + \abovedisplayshortskip 6bp% + \belowdisplayshortskip 6bp% + \def\@listi{\leftmargin\leftmargini + \topsep \z@skip + \parsep \z@skip + \itemsep \z@skip}% + \belowdisplayskip \abovedisplayskip +} +\DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize{7.5bp}{12.5bp}} +\DeclareRobustCommand\tiny{\@setfontsize\tiny{6.5bp}{10.83bp}} +\DeclareRobustCommand\large{\@setfontsize\large{15bp}{25bp}} +\DeclareRobustCommand\Large{\@setfontsize\Large{18bp}{30bp}} +\DeclareRobustCommand\LARGE{\@setfontsize\LARGE{22bp}{36.67bp}} +\DeclareRobustCommand\huge{\@setfontsize\huge{24bp}{40bp}} +\DeclareRobustCommand\Huge{\@setfontsize\Huge{26bp}{43.33bp}} % \end{macrocode} % \end{macro} % @@ -2207,25 +2207,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\chuhao} -% \begin{macro}{\xiaochu} -% \begin{macro}{\yihao} -% \begin{macro}{\xiaoyi} -% \begin{macro}{\erhao} -% \begin{macro}{\xiaoer} -% \begin{macro}{\sanhao} -% \begin{macro}{\xiaosan} -% \begin{macro}{\sihao} -% \begin{macro}{\banxiaosi} -% \begin{macro}{\xiaosi} -% \begin{macro}{\dawu} -% \begin{macro}{\wuhao} -% \begin{macro}{\xiaowu} -% \begin{macro}{\liuhao} -% \begin{macro}{\xiaoliu} -% \begin{macro}{\qihao} -% \begin{macro}{\bahao} -% 一组å—å·å®šä¹‰ã€‚TODO:用 \cs{zihao} 替代。 +% 一组å—å·å®šä¹‰ã€‚ % \begin{macrocode} \thu@def@fontsize{chuhao}{42bp} \thu@def@fontsize{xiaochu}{36bp} @@ -2236,9 +2218,7 @@ \thu@def@fontsize{sanhao}{16bp} \thu@def@fontsize{xiaosan}{15bp} \thu@def@fontsize{sihao}{14bp} -\thu@def@fontsize{banxiaosi}{13bp} \thu@def@fontsize{xiaosi}{12bp} -\thu@def@fontsize{dawu}{11bp} \thu@def@fontsize{wuhao}{10.5bp} \thu@def@fontsize{xiaowu}{9bp} \thu@def@fontsize{liuhao}{7.5bp} @@ -2246,24 +2226,6 @@ \thu@def@fontsize{qihao}{5.5bp} \thu@def@fontsize{bahao}{5bp} % \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} % % % \subsubsection{è¯è¨€è®¾ç½®} @@ -2297,9 +2259,9 @@ \def\bibname{å‚考文献}% \def\appendixname{附录}% \def\indexname{索引}% - \def\thu@acknowledgements@name{致\hspace{\ccwd}è°¢}% + \def\thu@acknowledgements@name{致\quad è°¢}% \ifthu@degree@bachelor - \def\contentsname{ç›®\hspace{\ccwd}录}% + \def\contentsname{ç›®\quad 录}% \def\listfigurename{æ’图索引}% \def\listtablename{è¡¨æ ¼ç´¢å¼•}% \def\thu@list@figure@table@name{æ’图和附表索引}% @@ -2314,12 +2276,11 @@ \def\thu@list@algorithm@name{算法清å•}% \def\listequationname{å…¬å¼æ¸…å•}% \ifthu@degree@graduate - \def\contentsname{ç›®\hspace{\ccwd}录}% - \def\thu@toc@contents@name{目录}% + \def\contentsname{ç›®\quad 录}% \def\thu@denotation@name{符å·å’Œç¼©ç•¥è¯è¯´æ˜Ž}% \def\thu@resume@name{个人简历ã€åœ¨å¦æœŸé—´å®Œæˆçš„相关å¦æœ¯æˆæžœ}% \else % degree = postdoc - \def\contentsname{ç›®\hspace{2\ccwd}次}% + \def\contentsname{ç›®\qquad 次}% \def\thu@denotation@name{符å·è¡¨}% \def\thu@resume@name{个人简历ã€å‘表的å¦æœ¯è®ºæ–‡ä¸Žç§‘ç ”æˆæžœ}% \fi @@ -2344,7 +2305,6 @@ \def\thu@resume@name{PUBLICATIONS}% \else \def\contentsname{Contents}% - \def\thu@toc@contents@name{Contents}% \def\listfigurename{List of Figures}% \def\listtablename{List of Tables}% \def\thu@list@figure@table@name{List of Figures and Tables}% @@ -2418,6 +2378,12 @@ \thu@option@hook{language}{\thu@set@names} % \end{macrocode} % +% 带圈数å—和星å·ä½¿ç”¨ä¸æ–‡å—体。 +% \begin{macrocode} +\xeCJKDeclareCharClass{CJK}{"2460 -> "2473} +\xeCJKDeclareCharClass{CJK}{"2605} +% \end{macrocode} +% % \newcommand\unicodechar[1]{U+#1(\symbol{"#1})} % 由于 Unicode çš„ä¸€äº›æ ‡ç‚¹ç¬¦å·æ˜¯ä¸è¥¿æ–‡æ··ç”¨çš„: % \unicodechar{00B7}〠@@ -2497,7 +2463,7 @@ \fancyfoot[C]{\wuhao\thepage}% \let\@mkboth\markboth \def\chaptermark##1{% - \markboth{\CTEXifname{\CTEXthechapter\hskip\ccwd}{}##1}{}% + \markboth{\CTEXifname{\CTEXthechapter\quad}{}##1}{}% }% \fi \let\sectionmark\@gobble @@ -2536,7 +2502,48 @@ \thu@option@hook{main-language}{\thu@set@indent} % \end{macrocode} % -% 利用 \pkg{enumitem} 命令调整默认列表环境间的è·ç¦»ï¼Œä»¥ç¬¦åˆä¸æ–‡ä¹ 惯。 +% 设置 url æ ·å¼ï¼Œä¸Žä¸Šä¸‹æ–‡ä¸€è‡´ +% \begin{macrocode} +\urlstyle{same} +% \end{macrocode} +% +% 使用 \pkg{xurl} çš„æ–¹æ³•ï¼Œå¢žåŠ URL å¯æ–行的ä½ç½®ã€‚ +% \begin{macrocode} +\g@addto@macro\UrlBreaks{% + \do0\do1\do2\do3\do4\do5\do6\do7\do8\do9% + \do\A\do\B\do\C\do\D\do\E\do\F\do\G\do\H\do\I\do\J\do\K\do\L\do\M + \do\N\do\O\do\P\do\Q\do\R\do\S\do\T\do\U\do\V\do\W\do\X\do\Y\do\Z + \do\a\do\b\do\c\do\d\do\e\do\f\do\g\do\h\do\i\do\j\do\k\do\l\do\m + \do\n\do\o\do\p\do\q\do\r\do\s\do\t\do\u\do\v\do\w\do\x\do\y\do\z +} +\Urlmuskip=0mu plus 0.1mu +% \end{macrocode} +% +% å–消列表的间è·ï¼Œä»¥ç¬¦åˆä¸æ–‡ä¹ 惯。 +% \begin{macrocode} +\partopsep=\z@skip +\def\@listi{\leftmargin\leftmargini + \parsep \z@skip + \topsep \z@skip + \itemsep\z@skip} +\let\@listI\@listi +\@listi +\def\@listii {\leftmargin\leftmarginii + \labelwidth\leftmarginii + \advance\labelwidth-\labelsep + \topsep \z@skip + \parsep \z@skip + \itemsep \z@skip} +\def\@listiii{\leftmargin\leftmarginiii + \labelwidth\leftmarginiii + \advance\labelwidth-\labelsep + \topsep \z@skip + \parsep \z@skip + \partopsep \z@skip + \itemsep \z@skip} +% \end{macrocode} +% +% 使用 \pkg{enumitem} 命令调整默认列表环境间的è·ç¦»ï¼Œ % \begin{macrocode} \setlist{nosep} % \end{macrocode} @@ -2544,56 +2551,85 @@ % % \subsubsection{脚注} % \label{sec:footnote} -% 脚注符åˆä¸æ–‡ä¹ 惯,数å—带圈。 -% \begin{macro}{\thu@textcircled} +% 脚注内容采用å°äº”å·å—,ä¸æ–‡ç”¨å®‹ä½“,英文和数å—用 Times New Roman 体按两端对é½æ ¼å¼ä¹¦å†™ï¼Œ +% å•å€è¡Œè·ï¼Œæ®µå‰æ®µåŽå‡ç©º 0 磅。 +% 脚注的åºå·æŒ‰é¡µç¼–排,ä¸åŒé¡µçš„脚注åºå·ä¸éœ€è¦è¿žç»ã€‚ +% +% 脚注处åºå·â€œ1,……,10â€çš„å—体是“æ£æ–‡â€ï¼Œä¸æ˜¯â€œä¸Šæ ‡â€ï¼Œåºå·ä¸Žè„šæ³¨å†…容文å—之间空åŠä¸ªæ±‰å—符, +% 脚注的段è½æ ¼å¼ä¸ºï¼šå•å€è¡Œè·ï¼Œæ®µå‰ç©º 0 磅,段åŽç©º 0 磅,悬挂缩进 1.5 å—符; +% å—å·ä¸ºå°äº”å·å—,汉å—用宋体,外文用 Times New Roman 体。 +% +% 脚注åºå·ä½¿ç”¨å¸¦åœˆæ•°å—。 +% \begin{macro}{\thu@circled} % 生æˆå¸¦åœˆçš„脚注数å—,最多处ç†åˆ° 10。 % \begin{macrocode} -\def\thu@textcircled#1{% - \ifnum\value{#1} >10\relax +\newcommand\thu@circled[1]{% + \ifnum#1 >10\relax \thu@error{% Too many footnotes in this page. Keep footnote less than 10% }% \fi - {\CJKfamily+{}\symbol{\the\numexpr\value{#1}+"245F\relax}}% + {\symbol{\the\numexpr#1+"245F\relax}}% } -\renewcommand{\thefootnote}{\thu@textcircled{footnote}} -\renewcommand{\thempfootnote}{\thu@textcircled{mpfootnote}} +\renewcommand{\thefootnote}{\thu@circled{\c@footnote}} +\renewcommand{\thempfootnote}{\thu@circled{\c@mpfootnote}} % \end{macrocode} % \end{macro} % % 定义脚注分割线,å—å·ï¼ˆå®‹ä½“å°äº”),以åŠæ‚¬æŒ‚缩进(1.5å—符)。 % \begin{macrocode} \def\footnoterule{\vskip-3\p@\hrule\@width0.3\textwidth\@height0.4\p@\vskip2.6\p@} -\let\thu@footnotesize\footnotesize -\renewcommand\footnotesize{\thu@footnotesize\xiaowu[1.5]} -\footnotemargin1.5em\relax +\footnotemargin=13.5bp % \end{macrocode} % -% \cs{@makefnmark} é»˜è®¤æ˜¯ä¸Šæ ‡æ ·å¼ï¼Œè€Œåœ¨è„šæ³¨éƒ¨åˆ†è¦æ±‚为æ£æ–‡å¤§å°ã€‚利用\cs{patchcmd} -% 动æ€è°ƒæ•´ \cs{@makefnmark} 的定义。 +% 修改 \pkg{footmisc} å®šä¹‰çš„è„šæ³¨æ ¼å¼ã€‚ % \begin{macrocode} -\let\thu@makefnmark\@makefnmark -\def\thu@@makefnmark{\hbox{{\normalfont\@thefnmark}}} -\pretocmd{\@makefntext}{\let\@makefnmark\thu@@makefnmark}{}{} -\apptocmd{\@makefntext}{\let\@makefnmark\thu@makefnmark}{}{} -% \end{macrocode} -% -% 设置 url æ ·å¼ï¼Œä¸Žä¸Šä¸‹æ–‡ä¸€è‡´ -% \begin{macrocode} -\urlstyle{same} -% \end{macrocode} -% -% 使用 \pkg{xurl} çš„æ–¹æ³•ï¼Œå¢žåŠ URL å¯æ–行的ä½ç½®ã€‚ -% \begin{macrocode} -\g@addto@macro\UrlBreaks{% - \do0\do1\do2\do3\do4\do5\do6\do7\do8\do9% - \do\A\do\B\do\C\do\D\do\E\do\F\do\G\do\H\do\I\do\J\do\K\do\L\do\M - \do\N\do\O\do\P\do\Q\do\R\do\S\do\T\do\U\do\V\do\W\do\X\do\Y\do\Z - \do\a\do\b\do\c\do\d\do\e\do\f\do\g\do\h\do\i\do\j\do\k\do\l\do\m - \do\n\do\o\do\p\do\q\do\r\do\s\do\t\do\u\do\v\do\w\do\x\do\y\do\z +\long\def\@makefntext#1{% + \begingroup + % åºå·å–æ¶ˆä¸Šæ ‡ + \def\@makefnmark{\hbox{\normalfont\@thefnmark}}% + \xiaowu + \ifFN@hangfoot + \bgroup + \setbox\@tempboxa\hbox{% + \ifdim\footnotemargin>\z@ + \hb@xt@\footnotemargin{\@makefnmark\hss}% + \else + \@makefnmark + \fi + }% + \leftmargin\wd\@tempboxa + \rightmargin\z@ + \linewidth \columnwidth + \advance \linewidth -\leftmargin + \parshape \@ne \leftmargin \linewidth + % \footnotesize + \xiaowu + \@setpar{{\@@par}}% + \leavevmode + \llap{\box\@tempboxa}% + \parskip\hangfootparskip\relax + \parindent\hangfootparindent\relax + \else + \parindent1em% + \noindent + \ifdim\footnotemargin>\z@ + \hb@xt@ \footnotemargin{\hss\@makefnmark}% + \else + \ifdim\footnotemargin=\z@ + \llap{\@makefnmark}% + \else + \llap{\hb@xt@ -\footnotemargin{\@makefnmark\hss}}% + \fi + \fi + \fi + \footnotelayout#1% + \ifFN@hangfoot + \par\egroup + \fi + \endgroup } -\Urlmuskip=0mu plus 0.1mu % \end{macrocode} % % @@ -2703,36 +2739,15 @@ % % å…¬å¼è·å‰åŽæ–‡çš„è·ç¦»ç”± 4 个å‚数控制,å‚è§ \cs{normalsize} 的定义。 % -% 本科的公å¼ç¼–å·è¦æ±‚很诡异,ä¸å¾—ä¸ä¿®æ”¹ \pkg{amsmath} ä¸å¾ˆæ·±çš„一个命令 \cs{tagform@}。 -% åŒæ—¶ä¸ºäº†è®© \pkg{amsmath} çš„ \cs{tag*} 命令得到æ£ç¡®çš„æ ¼å¼ï¼Œæˆ‘们必须修改这些代 -% ç 。\cs{make@df@tag} 是定义 \cs{tag*} å’Œ \cs{tag} 内部命令的。 -% \cs{make@df@tag@@} å¤„ç† \cs{tag*}ï¼Œæˆ‘ä»¬å°±æ”¹å®ƒï¼ -% \begin{latex} -% \def\make@df@tag{\@ifstar\make@df@tag@@\make@df@tag@@@} -% \def\make@df@tag@@#1{% -% \gdef\df@tag{\maketag@@@{#1}\def\@currentlabel{#1}}} -% \end{latex} -% \begin{macrocode} -\def\make@df@tag{\@ifstar\thu@make@df@tag@@\make@df@tag@@@} -\def\thu@make@df@tag@@#1{\gdef\df@tag{\thu@maketag{#1}\def\@currentlabel{#1}}} -\iffalse -\ifthu@degree@bachelor - \def\thu@maketag#1{\maketag@@@{% - (\ignorespaces\text{\thu@equation@name\hskip0.5em}#1\unskip\@@italiccorr)}} - \def\tagform@#1{\maketag@@@{% - (\ignorespaces\text{\thu@equation@name\hskip0.5em}#1\unskip\@@italiccorr)\equcaption{#1}}} -\fi -\fi -\def\thu@maketag#1{\maketag@@@{(\ignorespaces #1\unskip\@@italiccorr)}} -\def\tagform@#1{\maketag@@@{(\ignorespaces #1\unskip\@@italiccorr)\equcaption{#1}}} -% \end{macrocode} -% 修改 \cs{tagform} ä¼šå½±å“ \cs{eqref}。 +% \subsubsection{浮动对象:æ’å›¾å’Œè¡¨æ ¼} +% \label{sec:float} +% +% 图表浮动体的默认ä½ç½®è®¾ä¸º |h|。 % \begin{macrocode} -\renewcommand{\eqref}[1]{\textup{(\ref{#1})}} +\def\fps@figure{h} +\def\fps@table{h} % \end{macrocode} % -% \subsubsection{浮动对象:æ’å›¾å’Œè¡¨æ ¼} -% \label{sec:float} % 设置浮动对象和文å—之间的è·ç¦» % \begin{macrocode} \setlength{\floatsep}{6bp} @@ -2753,12 +2768,13 @@ % \end{macrocode} % % ç ”ç©¶ç”Ÿè¦æ±‚表å•å…ƒæ ¼ä¸çš„æ–‡å—采用 11pt 宋体å—,å•å€è¡Œè·ï¼Œæ®µå‰ç©º 3 磅,段åŽç©º 3 磅。 +% $(3 + 3) / (11 \times 1.3) \approx 0.4$ % \begin{macrocode} \patchcmd\@floatboxreset{% \normalsize }{% \fontsize{11bp}{14.3bp}\selectfont - \renewcommand\arraystretch{1.2}% + \renewcommand\arraystretch{1.4}% }{}{\thu@patch@error{\@floatboxreset}} % \end{macrocode} % @@ -2780,12 +2796,21 @@ % \end{macrocode} % % \begin{macrocode} -\DeclareCaptionFont{thu}{\dawu} -\DeclareCaptionLabelSeparator{thu}{\hspace{\ccwd}} +\newcommand\thu@caption@font{} +\newcommand\thu@set@caption@font{% + \ifthu@degree@bachelor + \renewcommand\thu@caption@font{\fontsize{11bp}{15bp}\selectfont}% + \else + \renewcommand\thu@caption@font{\fontsize{11bp}{14.3bp}\selectfont}% + \fi +} +\thu@set@caption@font +\thu@option@hook{degree}{\thu@set@caption@font} +\DeclareCaptionFont{thu}{\thu@caption@font} \captionsetup{ format = hang, font = thu, - labelsep = thu, + labelsep = quad, aboveskip = 6bp, belowskip = 6bp, figureposition = bottom, @@ -2805,16 +2830,11 @@ \lightrulewidth=1bp % \end{macrocode} % -% \begin{macro}{\hlinewd} -% 简å•çš„è¡¨æ ¼ä½¿ç”¨ä¸‰çº¿è¡¨æŽ¨è用 \cs{hlinewd}ã€‚å¦‚æžœè¡¨æ ¼æ¯”è¾ƒå¤æ‚还是用 \pkg{booktabs} 的命 -% 令好一些。 % \begin{macrocode} -\def\hlinewd#1{% - \noalign{\ifnum0=`}\fi\hrule \@height #1 \futurelet - \reserved@a\@xhline} +\AtEndOfPackageFile*{threeparttable}{ + \g@addto@macro\TPT@defaults{\wuhao} +} % \end{macrocode} -% \end{macro} -% % % \subsubsection{ç« èŠ‚æ ‡é¢˜} % \label{sec:theor} @@ -2823,7 +2843,7 @@ \newcommand{\thu@abstract@name}{ä¸æ–‡æ‘˜è¦} \newcommand{\thu@abstract@name@en}{ABSTRACT} \else - \newcommand{\thu@abstract@name}{摘\hspace{\ccwd}è¦} + \newcommand{\thu@abstract@name}{摘\quad è¦} \newcommand{\thu@abstract@name@en}{Abstract} \fi % \end{macrocode} @@ -2930,14 +2950,14 @@ % 段å‰ç©º 12 磅,段åŽç©º 6 磅。 % \end{itemize} % -% 由于 Word 模æ¿ä¸å¼€å¯äº†â€œå¯¹é½åˆ°ç½‘æ ¼â€ï¼Œå®žé™…的段å‰æ®µåŽè·ç¦»æœ‰æ‰€è°ƒæ•´ã€‚ +% 由于 Word çš„è¡Œè·ç®—法ä¸åŒï¼Œè¿™é‡Œè¿›è¡Œäº†ä¸€äº›è°ƒæ•´ä½¿å¾—视觉上更接近。 % \begin{macrocode} \else \ctexset{% chapter = { format = \centering\sffamily\sanhao, - beforeskip = 32bp, - afterskip = 32bp, + beforeskip = 27bp, + afterskip = 27bp, }, section = { format = \sffamily\fontsize{14bp}{20bp}\selectfont, @@ -3051,7 +3071,7 @@ % \begin{macrocode} \renewcommand\tableofcontents{% \ifthu@degree@graduate - \thu@chapter*[\thu@toc@contents@name]{\contentsname}% + \thu@chapter*{\contentsname}% \else \thu@chapter*[]{\contentsname}% \fi @@ -3136,13 +3156,7 @@ % \begin{macrocode} \else \titlecontents{chapter} - [\z@]{\addvspace{6bp} - \ifthu@main@language@chinese - \heiti - \else - \sffamily - \fi - } + [\z@]{\addvspace{6bp}\sffamily} {\contentspush{\thecontentslabel\quad}}{} {\rmfamily\thu@leaders\thecontentspage}% \titlecontents{section} @@ -3499,7 +3513,7 @@ % % \begin{macrocode} \newcommand\thu@titlepage@secret{% - \sffamily\CJKfamily+{}\sanhao + \sffamily\sanhao \ifx\thu@secret@level\@empty \phantom{秘密}% \else @@ -3764,7 +3778,7 @@ \centering \parbox[t][0cm][t]{\textwidth}{% \hfill - \CJKfamily+{}\xiaosi + \xiaosi \ifx\thu@secret@level\@empty\else \thu@secret@level\space\thu@secret@year å¹´\par \fi @@ -3953,52 +3967,19 @@ % \begin{macro}{\copyrightpage} % 授æƒè¯´æ˜Ž % \begin{macrocode} -\newcommand{\thu@authorization@title}{关于å¦ä½è®ºæ–‡ä½¿ç”¨æŽˆæƒçš„说明} -\newcommand{\thu@authorization@content}{% -\ifthu@degree@bachelor - 本人完全了解清åŽå¤§å¦æœ‰å…³ä¿ç•™ã€ä½¿ç”¨å¦ä½è®ºæ–‡çš„规定,% - å³ï¼šå¦æ ¡æœ‰æƒä¿ç•™å¦ä½è®ºæ–‡çš„å¤å°ä»¶ï¼Œå…许该论文被查阅和借阅;% - å¦æ ¡å¯ä»¥å…¬å¸ƒè¯¥è®ºæ–‡çš„全部或部分内容,å¯ä»¥é‡‡ç”¨å½±å°ã€ç¼©å°æˆ–其他å¤åˆ¶æ‰‹æ®µä¿å˜è¯¥è®ºæ–‡ã€‚% -\else - 本人完全了解清åŽå¤§å¦æœ‰å…³ä¿ç•™ã€ä½¿ç”¨å¦ä½è®ºæ–‡çš„规定,å³ï¼š\par - 清åŽå¤§å¦æ‹¥æœ‰åœ¨è‘—作æƒæ³•è§„定范围内å¦ä½è®ºæ–‡çš„使用æƒï¼Œå…¶ä¸åŒ…括:% - (1)已获å¦ä½çš„ç ”ç©¶ç”Ÿå¿…é¡»æŒ‰å¦æ ¡è§„定æ交å¦ä½è®ºæ–‡ï¼Œ% - å¦æ ¡å¯ä»¥é‡‡ç”¨å½±å°ã€ç¼©å°æˆ–其他å¤åˆ¶æ‰‹æ®µä¿å˜ç ”究生上交的å¦ä½è®ºæ–‡ï¼›% - (2)为教å¦å’Œç§‘ç ”ç›®çš„ï¼Œå¦æ ¡å¯ä»¥å°†å…¬å¼€çš„å¦ä½è®ºæ–‡ä½œä¸ºèµ„料在图书馆ã€èµ„料室ç‰åœºæ‰€ä¾›æ ¡å†…师生阅读,% - æˆ–åœ¨æ ¡å›ç½‘ä¸Šä¾›æ ¡å†…å¸ˆç”Ÿæµè§ˆéƒ¨åˆ†å†…容;% - \ifthu@degree@doctor - (3ï¼‰æ ¹æ®ã€Šä¸åŽäººæ°‘共和国å¦ä½æ¡ä¾‹æš‚行实施办法》åŠç›¸å…³éƒ¨é—¨å…·ä½“è¦æ±‚,å‘国家图书馆报é€ç›¸åº”çš„å¦ä½è®ºæ–‡ã€‚% - \else - (3)按照相关部门ç£å¯¼ã€æŠ½æŸ¥ç‰è¦æ±‚,报é€ç›¸åº”çš„å¦ä½è®ºæ–‡ã€‚% - \fi - \par - 本人ä¿è¯éµå®ˆä¸Šè¿°è§„定。% - \fi -} -\newcommand{\thu@authorization@addon}{% - \ifthu@degree@bachelor(涉密的å¦ä½è®ºæ–‡åœ¨è§£å¯†åŽåº”éµå®ˆæ¤è§„定)\else (ä¿å¯†çš„论文在解密åŽéµå®ˆæ¤è§„定)\fi} -\newcommand{\thu@authorization@authorsig}{\ifthu@degree@bachelor ç¾\hskip1emå:\else 作者ç¾å:\fi} -\newcommand{\thu@authorization@teachersig}{导师ç¾å:} -\newcommand{\thu@authorization@frontdate}{% - æ—¥\ifthu@degree@bachelor\hspace{1em}\else\hspace{2em}\fi 期:} \newcommand\copyrightpage[1][]{% \ifthu@degree@postdoc\relax\else - \cleardoublepage - \thispagestyle{empty}% - \thu@pdfbookmark{0}{\thu@authorization@title}% \def\thu@@tmp{#1} \ifx\thu@@tmp\@empty - \ifthu@degree@bachelor\thu@authorization@mk\else% - \begin{list}{}{% - \topsep\z@% - \listparindent\parindent% - \parsep\parskip% - \setlength{\leftmargin}{0.9mm}% - \setlength{\rightmargin}{0.9mm}}% - \item[]\thu@authorization@mk% - \end{list}% - \fi% + \ifthu@degree@bachelor + \thu@copyright@page@bachelor + \else + \thu@copyright@page@graduate + \fi \else + \cleardoublepage + \thispagestyle{empty}% + \thu@pdfbookmark{0}{\thu@authorization@title}% \thu@phantomsection \kv@define@key{thu@copyright}{file}{\includepdf{\kv@value}}% \kv@set@family@handler{thu@copyright}{% @@ -4016,25 +3997,84 @@ % % 支æŒæ‰«æ文件替æ¢ã€‚ % \begin{macrocode} -\newcommand{\thu@authorization@mk}{% - \ifthu@degree@bachelor\vspace*{0.2cm}\else\vspace*{0.42cm}\fi % shit code! - \begin{center}\erhao\heiti \thu@authorization@title\end{center} - \ifthu@degree@bachelor\vskip5pt\else\vskip40pt\sihao[2.03]\fi\par - \thu@authorization@content\par - \textbf{\thu@authorization@addon}\par - \ifthu@degree@bachelor\vskip0.7cm\else\vskip1.0cm\fi - \ifthu@degree@bachelor - \indent\mbox{\thu@authorization@authorsig\thu@underline\relax% - \thu@authorization@teachersig\thu@underline\relax\thu@authorization@frontdate\thu@underline\relax} - \else - \begingroup - \parindent0pt\xiaosi - \hspace*{1.5cm}\thu@authorization@authorsig\thu@underline[7em]\relax\hfill% - \thu@authorization@teachersig\thu@underline[7em]\relax\hspace*{1cm}\\[3pt] - \hspace*{1.5cm}\thu@authorization@frontdate\thu@underline[7em]\relax\hfill% - \thu@authorization@frontdate\thu@underline[7em]\relax\hspace*{1cm} - \endgroup - \fi} +\newcommand{\thu@authorization@frontdate}{% + æ—¥\ifthu@degree@bachelor\hspace{1em}\else\hspace{2em}\fi 期:} +\newcommand\thu@copyright@page@graduate{% + \cleardoublepage + \newgeometry{ + vmargin = 3.8cm, + hmargin = 3.2cm, + }% + \begingroup + \ctexset{ + chapter = { + format = {\centering\sffamily\erhao}, + beforeskip = 18bp, + afterskip = 6bp, + }, + }% + \thu@chapter*[]{关于å¦ä½è®ºæ–‡ä½¿ç”¨æŽˆæƒçš„说明}% + \thispagestyle{empty}% + \endgroup + \vskip 50bp% + \begingroup + \fontsize{14bp}{26bp}\selectfont + 本人完全了解清åŽå¤§å¦æœ‰å…³ä¿ç•™ã€ä½¿ç”¨å¦ä½è®ºæ–‡çš„规定,å³ï¼š\par + 清åŽå¤§å¦æ‹¥æœ‰åœ¨è‘—作æƒæ³•è§„定范围内å¦ä½è®ºæ–‡çš„使用æƒï¼Œå…¶ä¸åŒ…括:% + (1)已获å¦ä½çš„ç ”ç©¶ç”Ÿå¿…é¡»æŒ‰å¦æ ¡è§„定æ交å¦ä½è®ºæ–‡ï¼Œ% + å¦æ ¡å¯ä»¥é‡‡ç”¨å½±å°ã€ç¼©å°æˆ–其他å¤åˆ¶æ‰‹æ®µä¿å˜ç ”究生上交的å¦ä½è®ºæ–‡ï¼›% + (2)\nobreak 为教å¦å’Œç§‘ç ”ç›®çš„ï¼Œå¦æ ¡å¯ä»¥å°†å…¬å¼€çš„å¦ä½è®ºæ–‡ä½œä¸ºèµ„料在图书馆ã€èµ„料室ç‰åœºæ‰€ä¾›æ ¡å†…师生阅读,% + æˆ–åœ¨æ ¡å›ç½‘ä¸Šä¾›æ ¡å†…å¸ˆç”Ÿæµè§ˆéƒ¨åˆ†å†…容;% + \ifthu@degree@doctor + (3ï¼‰æ ¹æ®ã€Šä¸åŽäººæ°‘共和国å¦ä½æ¡ä¾‹æš‚行实施办法》åŠä¸Šçº§æ•™è‚²ä¸»ç®¡éƒ¨é—¨å…·ä½“è¦æ±‚,å‘国家图书馆报é€ç›¸åº”çš„å¦ä½è®ºæ–‡ã€‚% + \else + (3)按照上级教育主管部门ç£å¯¼ã€æŠ½æŸ¥ç‰è¦æ±‚,报é€ç›¸åº”çš„å¦ä½è®ºæ–‡ã€‚% + \fi + \par + 本人ä¿è¯éµå®ˆä¸Šè¿°è§„定。\par + \vskip 6bp% + \textbf{(ä¿å¯†çš„论文在解密åŽéµå®ˆæ¤è§„定)}\par + \endgroup + \vskip1.2cm% + \begingroup + \noindent\xiaosi + \hspace*{1.5cm}% + 作者ç¾å:\thu@underline[7em]\relax\hfill + 导师ç¾å:\thu@underline[7em]\relax\hspace*{1cm}\\[3pt]% + \hspace*{1.5cm}% + æ—¥\hspace{2em}期:\thu@underline[7em]\relax\hfill + æ—¥\hspace{2em}期:\thu@underline[7em]\relax\hspace*{1cm}% + \endgroup + \clearpage + \restoregeometry +} +\newcommand\thu@copyright@page@bachelor{% + \cleardoublepage + \begingroup + \ctexset{ + chapter = { + format = {\centering\sffamily\erhao[1]}, + beforeskip = 1bp, + afterskip = 24bp, + }, + }% + \thu@chapter*[]{关于å¦ä½è®ºæ–‡ä½¿ç”¨æŽˆæƒçš„说明}% + \thispagestyle{empty}% + \endgroup + \vskip 4bp% + 本人完全了解清åŽå¤§å¦æœ‰å…³ä¿ç•™ã€ä½¿ç”¨å¦ä½è®ºæ–‡çš„规定,å³ï¼š% + å¦æ ¡æœ‰æƒä¿ç•™å¦ä½è®ºæ–‡çš„å¤å°ä»¶ï¼Œå…许该论文被查阅和借阅;% + å¦æ ¡å¯ä»¥å…¬å¸ƒè¯¥è®ºæ–‡çš„全部或部分内容,å¯ä»¥é‡‡ç”¨å½±å°ã€ç¼©å°æˆ–其他å¤åˆ¶æ‰‹æ®µä¿å˜è¯¥è®ºæ–‡ã€‚\par + \textbf{(涉密的å¦ä½è®ºæ–‡åœ¨è§£å¯†åŽåº”éµå®ˆæ¤è§„定)}\par + \null\par + \begingroup + \centering + ç¾\quad å:\thu@underline[6em]{}% + 导师ç¾å:\thu@underline[6em]{}% + æ—¥\quad 期\thu@underline[6em]{}% + \par + \endgroup +} % \end{macrocode} % \end{macro} % @@ -4088,18 +4128,14 @@ % æ¯ä¸ªå…³é”®è¯ä¹‹é—´ç©ºä¸¤ä¸ªæ±‰å—符宽度, 且为悬挂缩进。 % \begin{macrocode} \par + \null\par \ifthu@degree@graduate - \vspace*{\stretch{4}}% \noindent \textsf{关键è¯ï¼š}% \else - \null\par \textbf{关键è¯ï¼š}% \fi \thu@clist@use{\thu@keywords}{ï¼›}% - \ifthu@degree@graduate - \vspace*{\stretch{1}}% - \fi \ifthu@degree@bachelor \cleardoublepage \fi @@ -4118,23 +4154,17 @@ \fi \thusetup{language = english}% \ifthu@degree@graduate - \begingroup - \ctexset{chapter/format+=\bfseries}% - \thu@chapter*[\sffamily\bfseries\thu@abstract@name@en]{\thu@abstract@name@en}% - \endgroup + \thu@chapter*{\thu@abstract@name@en}% \else \thu@chapter*[]{\thu@abstract@name@en}% \fi }{% \par + \null\par \ifthu@degree@graduate - \vspace*{\stretch{4}}% \noindent - \textbf{Key Words:}\space - \else - \null\par - \textbf{Keywords:}\space \fi + \textbf{Keywords:}\space \thu@clist@use{\thu@keywords@en}{; }% \ifthu@degree@graduate \vspace*{\stretch{1}}% @@ -4313,7 +4343,7 @@ } \titlecontents{figure} [\z@]{} - {\contentspush{\figurename~\thecontentslabel\hspace{\ccwd}}}{} + {\contentspush{\figurename~\thecontentslabel\quad}}{} {\nobreak\thu@leaders\nobreak\hfil\thecontentspage} % \end{macrocode} % \end{macro} @@ -4328,7 +4358,7 @@ } \titlecontents{table} [\z@]{} - {\contentspush{\tablename~\thecontentslabel\hspace{\ccwd}}}{} + {\contentspush{\tablename~\thecontentslabel\quad}}{} {\thu@leaders\thecontentspage} % \end{macrocode} % \end{macro} @@ -4393,6 +4423,11 @@ \thu@define@key{ cite-style = { name = cite@style, + choices = { + super, + inline, + author-year, + } } } % \end{macrocode} @@ -4416,14 +4451,25 @@ % å‡ ç§ç§å¼•ç”¨æ ·å¼ï¼Œä¸Ž \file{bst} 文件åä¿æŒä¸€è‡´ï¼Œ % è¿™æ ·åœ¨ä½¿ç”¨ \cs{bibliographystyle} 选择å‚è€ƒæ–‡çŒ®è¡¨çš„æ ·å¼æ—¶ä¹Ÿä¼šè®¾ç½®å¯¹åº”çš„å¼•ç”¨æ ·å¼ã€‚ % \begin{macrocode} - \expandafter\newcommand\csname bibstyle@thuthesis-numeric\endcsname{% + \newcommand\bibstyle@super{% \bibpunct{[}{]}{,}{s}{,}{\textsuperscript{,}}} - \expandafter\newcommand\csname bibstyle@thuthesis-author-year\endcsname{% + \newcommand\bibstyle@inline{% + \bibpunct{[}{]}{,}{n}{,}{,}} + \@namedef{bibstyle@author-year}{% \bibpunct{(}{)}{;}{a}{,}{,}} - \expandafter\newcommand\csname bibstyle@thuthesis-bachelor\endcsname{% - \bibpunct{[}{]}{,}{s}{,}{\textsuperscript{,}}} - \@namedef{bibstyle@thuthesis-inline}{\bibpunct{[}{]}{,}{n}{,}{,}} - \thu@option@hook{cite-style}{\@nameuse{bibstyle@thuthesis-\thu@cite@style}} +% \end{macrocode} +% +% \begin{macrocode} + \thu@option@hook{cite-style}{\@nameuse{bibstyle@\thu@cite@style}} +% \end{macrocode} +% +% å‡ ç§ç§å¼•ç”¨æ ·å¼ï¼Œä¸Ž \file{bst} 文件åä¿æŒä¸€è‡´ï¼Œ +% è¿™æ ·åœ¨ä½¿ç”¨ \cs{bibliographystyle} 选择å‚è€ƒæ–‡çŒ®è¡¨çš„æ ·å¼æ—¶ä¹Ÿä¼šè®¾ç½®å¯¹åº”çš„å¼•ç”¨æ ·å¼ã€‚ +% \begin{macrocode} + \@namedef{bibstyle@thuthesis-numeric}{\citestyle{super}} + \@namedef{bibstyle@thuthesis-author-year}{\citestyle{author-year}} + \@namedef{bibstyle@thuthesis-bachelor}{\citestyle{super}} + \@namedef{bibstyle@thuthesis-inline}{\citestyle{inline}} % \end{macrocode} % % ä¿®æ”¹å¼•ç”¨çš„æ ·å¼ã€‚ @@ -4665,7 +4711,7 @@ \newcommand\thu@set@bibliography@format{% \ifthu@degree@bachelor \renewcommand\bibfont{\fontsize{10.5bp}{17bp}\selectfont}% - \setlength{\bibsep}{6bp}% + \setlength{\bibsep}{6bp \@plus 3bp \@minus 3bp}% \ifthu@main@language@chinese \setlength{\bibhang}{21bp}% \else @@ -4673,7 +4719,7 @@ \fi \else \renewcommand\bibfont{\fontsize{10.5bp}{16bp}\selectfont}% - \setlength{\bibsep}{3bp}% + \setlength{\bibsep}{3bp \@plus 3bp \@minus 3bp}% \setlength{\bibhang}{21bp}% \fi } @@ -4682,6 +4728,25 @@ \thu@option@hook{main-language}{\thu@set@bibliography@format} % \end{macrocode} % +% ç ”ç©¶ç”Ÿè¦æ±‚æ¯ä¸€æ¡æ–‡çŒ®çš„内容è¦å°½é‡å†™åœ¨åŒä¸€é¡µå†…。 +% é‡æœ‰è¢«è¿«åˆ†é¡µçš„情况,å¯é€šè¿‡â€œç•™ç™½â€æˆ–微调本页行è·çš„æ–¹å¼å°½é‡å°†åŒä¸€æ¡æ–‡çŒ®å†…容放在一页。 +% 所以上述 \cs{bibsep} 的设置å…许 1pt 的伸缩, +% åŒæ—¶å¢žåŠ åŒä¸€æ¡æ–‡çŒ®å†…分页的惩罚, +% 这里å‚考 \href{https://github.com/plk/biblatex/blob/e5d6e69e61613cc33ab1fcc2083a8277eb9cfce5/tex/latex/biblatex/biblatex.def}{BibLaTeX 的设置}。 +% \begin{macrocode} + \patchcmd\thebibliography{% + \clubpenalty4000% + }{% + \interlinepenalty=5000\relax + \clubpenalty=10000\relax + }{}{\thu@patch@error{\thebibliography}} + \patchcmd\thebibliography{% + \widowpenalty4000% + }{% + \widowpenalty=10000\relax + }{}{\thu@patch@error{\thebibliography}} +% \end{macrocode} +% % å‚考文献表的编å·å±…左,宽度 1 cm。 % \begin{macrocode} \def\@biblabel#1{[#1]\hfill} @@ -4720,7 +4785,7 @@ \newcommand\thu@set@bibliography@format{% \ifthu@degree@bachelor \renewcommand\bibfont{\fontsize{10.5bp}{17bp}\selectfont}% - \setlength{\bibitemsep}{6bp}% + \setlength{\bibitemsep}{6bp \@plus 3bp \@minus 3bp}% \ifthu@main@language@chinese \setlength{\bibhang}{21bp}% \else @@ -4728,7 +4793,7 @@ \fi \else \renewcommand\bibfont{\fontsize{10.5bp}{16bp}\selectfont}% - \setlength{\bibitemsep}{3bp}% + \setlength{\bibitemsep}{3bp \@plus 3bp \@minus 3bp}% \setlength{\biblabelsep}{0.1cm}% \setlength{\bibhang}{21bp}% \fi @@ -4828,6 +4893,7 @@ \section*{Contents}% \thu@pdfbookmark{1}{Contents}% \printcontents[survey]{l}{1}[2]{}% + \vskip 20bp% }% \renewcommand\bibname{å‚考文献}% \let\bibsection\thu@appendix@bibsection @@ -4857,6 +4923,7 @@ \section*{目录}% \thu@pdfbookmark{1}{目录}% \printcontents[translation]{l}{1}[2]{}% + \vskip 20bp% }% \def\bibsection{% \begingroup @@ -4907,15 +4974,15 @@ \newcommand\thu@set@partial@toc@format{% \titlecontents{section} [\z@]{} - {\contentspush{\thecontentslabel\hspace{\ccwd}}}{} + {\contentspush{\thecontentslabel\quad}}{} {\thu@leaders\thecontentspage}% \titlecontents{subsection} - [1\ccwd]{} - {\contentspush{\thecontentslabel\hspace{\ccwd}}}{} + [1em]{} + {\contentspush{\thecontentslabel\quad}}{} {\thu@leaders\thecontentspage}% \titlecontents{subsubsection} - [2\ccwd]{} - {\contentspush{\thecontentslabel\hspace{\ccwd}}}{} + [2em]{} + {\contentspush{\thecontentslabel\quad}}{} {\thu@leaders\thecontentspage}% } % \end{macrocode} @@ -4941,52 +5008,73 @@ % \begin{environment}{resume} % 个人简历å‘è¡¨æ–‡ç« ç‰ã€‚ % \begin{macrocode} -\newenvironment{resume}[1][\thu@resume@name]{% +\newenvironment{resume}{% \@mainmatterfalse - \thu@chapter*{#1}}{} + \thu@chapter*{\thu@resume@name}% + \ctexset{ + section = { + format += \centering, + numbering = false, + }, + subsection = { + format = \sffamily\fontsize{14bp}{20bp}\selectfont, + numbering = false, + aftertitle = \ifthu@language@chinese :\else :\fi, + }, + }% + \ifthu@degree@bachelor + \ifthu@language@english + \sffamily\fontsize{15bp}{20bp}\selectfont, + \fi + \fi +}{} % \end{macrocode} % \end{environment} % -% \begin{macro}{\resumeitem} -% 个人简历部分。æ¯æ¡ä¿¡æ¯ä¸€ä¸ªæ®µè½ï¼Œæ•…ä¸éœ€è¦ç‰¹åˆ«å¤„ç†ã€‚ +% 旧的 \cs{resumeitem} å’Œ \cs{researchitem} å·²ç»è¿‡æ—¶ã€‚ % \begin{macrocode} -\newcommand{\resumeitem}[1]{% - \vspace{24bp}{\sihao\heiti\centerline{#1}}\par\vspace{6bp}} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\researchitem} -% ç ”ç©¶æˆæžœç”¨ \cs{researchitem}\marg{类别} å¼€å¯ï¼ŒåŒ…括“å¦æœ¯è®ºæ–‡â€å’Œâ€œç ”究æˆæžœâ€ä¸¤ä¸ª -% 列表。 -% \begin{macrocode} -\newcommand{\researchitem}[1]{% - \vspace{32bp}{\sihao\heiti\centerline{#1}}\par\vspace{14bp}} +\newcommand\resumeitem[1]{% + \thu@error{The "\protect\resumeitem" is obsolete. Please update to the new format}% +} +\newcommand\researchitem[1]{% + \thu@error{The "\protect\researchitem" is obsolete. Please update to the new format}% +} % \end{macrocode} -% \end{macro} % -% \begin{environment}{publications} % \begin{environment}{achievements} -% 二者分别通过两个环境 \env{publications} å’Œ \env{achievements} ç½— -% 列。 -% +% å¦æœ¯æˆæžœç”± \env{achievements} 环境罗列。 % \begin{macrocode} -\newlist{publications}{enumerate}{1} -\setlist[publications]{label=[\arabic*],align=left,nosep,itemsep=8bp, - leftmargin=10mm,labelsep=!,before=\xiaosi[1.26],resume} \newlist{achievements}{enumerate}{1} -\setlist[achievements]{label=[\arabic*],align=left,nosep,itemsep=8bp, - leftmargin=10mm,labelsep=!,before=\xiaosi[1.26]} +\setlist[achievements]{ + label = [\arabic*], + align = left, + leftmargin = 10mm, + topsep = 6bp, + parsep = 0bp, + partopsep = 0bp, + itemsep = 6bp, + labelsep = !, + before = { + \ifthu@degree@graduate + \fontsize{12bp}{16bp}\selectfont + \fi + }, + resume = achievements, +} % \end{macrocode} % \end{environment} -% \end{environment} % -% \begin{macro}{\publicationskip} -% \env{publications} 环境å¯ä»¥è¿žç»å‡ºçŽ°å¤šæ¬¡ï¼Œç¬¬äºŒç±»è®ºæ–‡åˆ—表å‰åŽè¦ç©ºä¸€è¡Œï¼Œä½¿ -% 用 \cs{publicationskip}。 % \begin{macrocode} -\def\publicationskip{\bigskip\bigskip} +\newenvironment{publications}{% + \thu@deprecate{"publications" environment}{"achievements"}% + \begin{achievements}% +}{% + \end{achievements}% +} +\newcommand\publicationskip{% + \thu@error{The "\protect\publicationskip" is obsolete. Do not use it}% +} % \end{macrocode} -% \end{macro} % % \subsection{综åˆè®ºæ–‡è®ç»ƒè®°å½•è¡¨} % @@ -5048,7 +5136,8 @@ \phantomsection } \pdfstringdefDisableCommands{ - \let\\\@empty + \let\\\relax + \let\quad\relax \let\hspace\@gobble }% % \end{macrocode} @@ -5108,9 +5197,11 @@ % % 我们采用 \pkg{longtable} æ¥å¤„ç†è·¨é¡µçš„è¡¨æ ¼ã€‚åŒæ ·æˆ‘们需è¦è®¾ç½®å…¶é»˜è®¤å—体为五å·ã€‚ % \begin{macrocode} -\AtBeginDocument{% - \let\thu@LT@array\LT@array - \def\LT@array{\dawu[1.5]\thu@LT@array} % set default font size +\AtEndOfPackageFile*{longtable}{ + \pretocmd\LT@array{% + \fontsize{11bp}{14.3bp}\selectfont + \renewcommand\arraystretch{1.4}% + }{}{\thu@patch@error{\LT@array}} } % \end{macrocode} % @@ -5232,7 +5323,7 @@ \contentsuse{algorithm}{loa} \titlecontents{algorithm} [\z@]{} - {\contentspush{\fname@algorithm~\thecontentslabel\hspace{\ccwd}}}{} + {\contentspush{\fname@algorithm~\thecontentslabel\quad}}{} {\thu@leaders\thecontentspage} } % \end{macrocode} @@ -5245,10 +5336,10 @@ \PassOptionsToPackage{algochapter}{algorithm2e} \AtEndOfPackageFile*{algorithm2e}{ \renewcommand\algorithmcfname{\thu@algorithm@name} - \SetAlgoCaptionLayout{dawu} + \SetAlgoCaptionLayout{thu@caption@font} \SetAlCapSty{relax} \SetAlgoCaptionSeparator{\hspace*{1em}} - \SetAlFnt{\dawu} + \SetAlFnt{\fontsize{11bp}{14.3bp}\selectfont} \renewcommand\listofalgorithms{% \thu@listof{algorithmcf}% } @@ -5257,7 +5348,7 @@ \contentsuse{algocf}{loa} \titlecontents{algocf} [\z@]{} - {\contentspush{\algorithmcfname~\thecontentslabel\hspace{\ccwd}}}{} + {\contentspush{\algorithmcfname~\thecontentslabel\quad}}{} {\thu@leaders\thecontentspage} } % \end{macrocode} @@ -5392,9 +5483,17 @@ % \subsection{其它} % \label{sec:other} % -% 在模æ¿æ–‡æ¡£ç»“æŸæ—¶å³è£…å…¥é…ç½®æ–‡ä»¶ï¼Œè¿™æ ·ç”¨æˆ·å°±èƒ½åœ¨å¯¼è¨€åŒºè¿›è¡Œç›¸åº”çš„ä¿®æ”¹ã€‚ +% 借用 \cls{ltxdoc} å’Œ \cls{l3doc} 里é¢çš„å‡ ä¸ªå‘½ä»¤æ–¹ä¾¿å†™æ–‡æ¡£ã€‚ +% \begin{macrocode} +\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}} +\DeclareRobustCommand\file{\nolinkurl} +\DeclareRobustCommand\env{\textsf} +\DeclareRobustCommand\pkg{\textsf} +\DeclareRobustCommand\cls{\textsf} +% \end{macrocode} +% % \begin{macrocode} -\AtEndOfClass{\sloppy} +\sloppy %</cls> % \end{macrocode} % @@ -5570,9 +5669,11 @@ \DeclareDocumentCommand{\option}{m}{\textsf{#1}} \DeclareDocumentCommand{\env}{m}{\texttt{#1}} \DeclareDocumentCommand{\pkg}{s m}{% - \texttt{#2}\IfBooleanF#1{\thu@special@index{package}{#2}}} + \textsf{#2}\IfBooleanF#1{\thu@special@index{package}{#2}}} +\DeclareDocumentCommand{\cls}{s m}{% + \textsf{#2}\IfBooleanF#1{\thu@special@index{package}{#2}}} \DeclareDocumentCommand{\file}{s m}{% - \texttt{#2}\IfBooleanF#1{\thu@special@index{file}{#2}}} + \nolinkurl{#2}\IfBooleanF#1{\thu@special@index{file}{#2}}} \newcommand{\myentry}[1]{% \marginpar{\raggedleft\color{purple}\bfseries\strut #1}} \newcommand{\note}[2][Note]{{% diff --git a/macros/latex/contrib/thuthesis/thuthesis.pdf b/macros/latex/contrib/thuthesis/thuthesis.pdf Binary files differindex a6fef1ff93..40ebbc9fe0 100644 --- a/macros/latex/contrib/thuthesis/thuthesis.pdf +++ b/macros/latex/contrib/thuthesis/thuthesis.pdf diff --git a/macros/latex/contrib/yathesis/CHANGELOG.md b/macros/latex/contrib/yathesis/CHANGELOG.md index 6893e749ab..cf7266c192 100644 --- a/macros/latex/contrib/yathesis/CHANGELOG.md +++ b/macros/latex/contrib/yathesis/CHANGELOG.md @@ -1,16 +1,26 @@ # [Unreleased] -# [1.0.3] - 2020-06-16 +# [1.0.4] - 2020-10-14 ## Changed +- Documentation revised. +- The class now relies on `datetime2` and not on `datetime`. + +## Fixed +- Bug gh #76 (https://git.io/JTTpX). +- Bug gh #77 (https://git.io/JTTpu). +- Bug gh #78 (https://git.io/JTTpQ). + +# [1.0.3] - 2020-06-16 +## Changed - Documentation revised. - Specimens improved. -- Package `titlesec` used intead of `titleps`: possible (hopefully slight) layout discrepancies. +- Package `titlesec` used instead of `titleps`: possible (hopefully slight) layout discrepancies. ## Fixed - Bug gh #74 (https://git.io/Jf64U). -- Bug gh #65 (https://git.io/Jf64k), continuation and (?) ending. +- Bug gh #65 (https://git.io/Jf64k), continuation and (hopefully) ending. # [1.0.2] - 2020-04-13 @@ -78,9 +88,6 @@ - On the title page (s) in French, automatic gender agreement in expressions keys introducing the groups member of the committee. -## Removed -- Useless warning from `iflang` package. - ## Fixed - Several bug fixes (among others gh #43). diff --git a/macros/latex/contrib/yathesis/README.md b/macros/latex/contrib/yathesis/README.md index 33f9a33c6b..e6cea4ed6b 100644 --- a/macros/latex/contrib/yathesis/README.md +++ b/macros/latex/contrib/yathesis/README.md @@ -1,6 +1,6 @@ ----------------------------------------------------------------------- -- `yathesis` --- Yet Another Thesis Class, version 1.0.3 +- `yathesis` --- Yet Another Thesis Class, version 1.0.4 - E-mail: `denis.bitouze@univ-littoral.fr` - Released under the LaTeX Project Public License v1.3c or later. See http://www.latex-project.org/lppl.txt diff --git a/macros/latex/contrib/yathesis/doc/yathesis-fr.pdf b/macros/latex/contrib/yathesis/doc/yathesis-fr.pdf Binary files differindex 520a5a9276..c78d47117a 100644 --- a/macros/latex/contrib/yathesis/doc/yathesis-fr.pdf +++ b/macros/latex/contrib/yathesis/doc/yathesis-fr.pdf diff --git a/macros/latex/contrib/yathesis/exemples/specimen/bibliographie.bib b/macros/latex/contrib/yathesis/exemples/specimen/bibliographie.bib index 7a545f1207..9f7bcc7dab 100644 --- a/macros/latex/contrib/yathesis/exemples/specimen/bibliographie.bib +++ b/macros/latex/contrib/yathesis/exemples/specimen/bibliographie.bib @@ -22,7 +22,7 @@ editor = {O'Connor, Arhur and Arago, François}, title = {Discours prononcé à l'Assemblée Nationale au nom de l'Académie des Sciences à la séance du - \formatdate{12}{06}{1790}}, + \DTMdate{1790-06-12}}, booktitle = {Å’uvres de Condorcet}, publisher = {Firmin Didot Frères}, address = {Paris}, diff --git a/macros/latex/contrib/yathesis/exemples/specimen/these.pdf b/macros/latex/contrib/yathesis/exemples/specimen/these.pdf Binary files differindex 1104cc6f7d..d7beb0e193 100644 --- a/macros/latex/contrib/yathesis/exemples/specimen/these.pdf +++ b/macros/latex/contrib/yathesis/exemples/specimen/these.pdf diff --git a/macros/latex/contrib/yathesis/exemples/specimen/these.tex b/macros/latex/contrib/yathesis/exemples/specimen/these.tex index 8b3305f2ca..89e0331e30 100644 --- a/macros/latex/contrib/yathesis/exemples/specimen/these.tex +++ b/macros/latex/contrib/yathesis/exemples/specimen/these.tex @@ -128,7 +128,7 @@ \floatsetup[figure]{style=BOXED}% % % Numéro de version du package pgfplots -\pgfplotsset{compat=1.16} +\pgfplotsset{compat=1.17} % % Ajustement pour éviter, dans la table des matières, des débordements de % numéros de pages dans la marge de droite @@ -498,11 +498,11 @@ suis certain qu'il sera \enquote{hors-texte} : \end{displaycquote} % % Deuxième chapitre -\chapter{Développement} +\chapter{Développement du chaos du rire} \label{chap-developpement} \epigraphhead[30]{\selectlanguage{english}\epigraph{I have not failed. I've - just found 10.000 ways that won't work.}{Thomas A. Edison}} + just found \num{10000} ways that won't work.}{Thomas A. Edison}} Dans ce chapitre, nous développons notre travail. Nous citons une référence\index{référence!bibliographique|see{bibliographie}} @@ -648,7 +648,7 @@ optionnel de la commande de sectionnement qui a permis cela. \lipsum[43-52] % % Troisième chapitre -\chapter{Conclusion} +\chapter{Conclusion du chaos du rire} Dans ce chapitre, nous concluons l'étude du chaos du rire. \lipsum[26-27] @@ -685,7 +685,7 @@ Dans ce chapitre, nous concluons l'étude du chaos du rire. \lipsum[26-32] % % Cinquième chapitre -\chapter{Développement} +\chapter{Développement du rire du chaos} Nous pouvons faire référence à des graphiques (très jolis au demeurant), comme celui de la figure~\vref{sin-x*sin-y}. @@ -705,7 +705,7 @@ celui de la figure~\vref{sin-x*sin-y}. \end{figure} % % Sixième chapitre -\chapter{Conclusion} +\chapter{Conclusion du rire du chaos} Dans ce chapitre, nous concluons l'étude du rire du chaos. \lipsum[6-9] diff --git a/macros/latex/contrib/yathesis/source/yathesis-samples-templates.dtx b/macros/latex/contrib/yathesis/source/yathesis-samples-templates.dtx index 58c8f72bf1..8c8ec7cc9f 100644 --- a/macros/latex/contrib/yathesis/source/yathesis-samples-templates.dtx +++ b/macros/latex/contrib/yathesis/source/yathesis-samples-templates.dtx @@ -219,7 +219,7 @@ % % Numéro de version du package pgfplots %COMMENT -\pgfplotsset{compat=1.16} +\pgfplotsset{compat=1.17} %<<COMMENT % % Ajustement pour éviter, dans la table des matières, des débordements de @@ -828,11 +828,11 @@ suis certain qu'il sera \enquote{hors-texte} : %<these-master>% \include{corps/} %<these-sample>\include{corps/developpementI} %<*developpementI-sample|flat-sample> -\chapter{Développement} +\chapter{Développement du chaos du rire} \label{chap-developpement} \epigraphhead[30]{\selectlanguage{english}\epigraph{I have not failed. I've - just found 10.000 ways that won't work.}{Thomas A. Edison}} + just found \num{10000} ways that won't work.}{Thomas A. Edison}} Dans ce chapitre, nous développons notre travail. Nous citons une référence\index{référence!bibliographique|see{bibliographie}} @@ -1005,7 +1005,7 @@ optionnel de la commande de sectionnement qui a permis cela. %<these-master>% \include{corps/} %<these-sample>\include{corps/conclusionI} %<*conclusionI-sample|flat-sample> -\chapter{Conclusion} +\chapter{Conclusion du chaos du rire} Dans ce chapitre, nous concluons l'étude du chaos du rire. \lipsum[26-27] @@ -1069,7 +1069,7 @@ Dans ce chapitre, nous concluons l'étude du chaos du rire. %<these-master>% \include{corps/} %<these-sample>\include{corps/developpementII} %<*developpementII-sample|flat-sample> -\chapter{Développement} +\chapter{Développement du rire du chaos} Nous pouvons faire référence à des graphiques (très jolis au demeurant), comme celui de la figure~\vref{sin-x*sin-y}. @@ -1102,7 +1102,7 @@ celui de la figure~\vref{sin-x*sin-y}. %<these-master>% \include{corps/} %<these-sample>\include{corps/conclusionII} %<*conclusionII-sample|flat-sample> -\chapter{Conclusion} +\chapter{Conclusion du rire du chaos} Dans ce chapitre, nous concluons l'étude du rire du chaos. \lipsum[6-9] @@ -1328,7 +1328,7 @@ int factorielle(int n) editor = {O'Connor, Arhur and Arago, François}, title = {Discours prononcé à l'Assemblée Nationale au nom de l'Académie des Sciences à la séance du - \formatdate{12}{06}{1790}}, + \DTMdate{1790-06-12}}, booktitle = {Å’uvres de Condorcet}, publisher = {Firmin Didot Frères}, address = {Paris}, diff --git a/macros/latex/contrib/yathesis/source/yathesis.dtx b/macros/latex/contrib/yathesis/source/yathesis.dtx index 9b7a90f18b..581528318b 100644 --- a/macros/latex/contrib/yathesis/source/yathesis.dtx +++ b/macros/latex/contrib/yathesis/source/yathesis.dtx @@ -23,7 +23,7 @@ %<*readme> ----------------------------------------------------------------------- -- `yathesis` --- Yet Another Thesis Class, version 1.0.3 +- `yathesis` --- Yet Another Thesis Class, version 1.0.4 - E-mail: `denis.bitouze@univ-littoral.fr` - Released under the LaTeX Project Public License v1.3c or later. See http://www.latex-project.org/lppl.txt @@ -70,14 +70,14 @@ Typesetting the documentation of the class requires: \fi %</internal> %<*class|install> -\def\yathesisfileversion{1.0.3} -\def\yathesisfiledate{2020-06-16} +\def\yathesisversion{1.0.4} +\def\yathesisdate{2020-10-14} %</class|install> %<*install> \input docstrip.tex \Msg{********************************************************} \Msg{* Installation} -\Msg{* Class: yathesis \yathesisfiledate\space v\yathesisfileversion} +\Msg{* Class: yathesis \yathesisdate\space v\yathesisversion} \Msg{* that helps to write thesis following French rules (DB)} \Msg{********************************************************} \keepsilent @@ -361,7 +361,7 @@ This work consists of the file yathesis.dtx % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{yathesis}[\yathesisfiledate\space v\yathesisfileversion\space Yet another class for writing thesis (DB)] +\ProvidesClass{yathesis}[\yathesisdate\space v\yathesisversion\space Yet another class for writing thesis (DB)] % \end{macrocode} % % Pour pouvoir définir des macros dont les arguments puissent être @@ -610,7 +610,6 @@ This work consists of the file yathesis.dtx #1/false/.code={% \boolfalse{YAD@#1}% }, - #1/.initial=false, #1/.default=true, }% % }{% @@ -755,7 +754,6 @@ This work consists of the file yathesis.dtx \boolfalse{YAD@submitted@work@star}% \booltrue{YAD@final@work}% },% - version/.initial=final% }% \yadsetup{version=inprogress}% % \end{macrocode} @@ -775,8 +773,8 @@ This work consists of the file yathesis.dtx \booltrue{YAD@output@paper@star}% },% output/screen/.code={},% - output/.initial=screen% }% +\yadsetup{output=screen}% % \end{macrocode} % % On définit la clé de classe "localtocs" qui fait que les titres des chapitres @@ -863,6 +861,7 @@ This work consists of the file yathesis.dtx },% localbibs/.code={% \YAD@localbibs@common@code{false}% + \AtEndPreamble{\BiblatexSplitbibDefernumbersWarningOff}% }% } % \end{macrocode} @@ -874,8 +873,8 @@ This work consists of the file yathesis.dtx space/single/.code={\def\YAD@interligne{single}},% space/onehalf/.code={\def\YAD@interligne{onehalf}},% space/double/.code={\def\YAD@interligne{double}},% - space/.initial=single% }% +\yadsetup{space=single} % \end{macrocode} % % \begin{macrocode} @@ -892,8 +891,8 @@ This work consists of the file yathesis.dtx colophon-location/nowhere/.code={\def\YAD@colophon@location{nowhere}},% colophon-location/verso-frontcover/.code={\def\YAD@colophon@location{verso-frontcover}},% colophon-location/recto-backcover/.code={\def\YAD@colophon@location{recto-backcover}},% - colophon-location/.initial=verso-frontcover% }% +\yadsetup{colophon-location=verso-frontcover} % \end{macrocode} % % \begin{macrocode} @@ -930,7 +929,7 @@ This work consists of the file yathesis.dtx % % \begin{macrocode} \PassOptionsToPackage{a4paper}{geometry}% -\PassOptionsToPackage{nodayofweek}{datetime}% +% \PassOptionsToPackage{nodayofweek}{datetime}% \PassOptionsToPackage{export}{adjustbox}% \PassOptionsToPackage{numbered}{bookmark}% % \PassOptionsToPackage{pagestyles}{titlesec}% @@ -958,7 +957,7 @@ This work consists of the file yathesis.dtx titlesec/.code={\PassOptionsToPackage{#1}{titlesec}},% draftwatermark/.code={\PassOptionsToPackage{#1}{draftwatermark}},% babel/.code={\PassOptionsToPackage{#1}{babel}},% - datetime/.code={\PassOptionsToPackage{#1}{datetime}}% + datetime2/.code={\PassOptionsToPackage{useregional,#1}{datetime2}}% }% % \end{macrocode} % @@ -1138,7 +1137,7 @@ This work consists of the file yathesis.dtx % \end{macrocode} % Pour générer les dates (sans affichage du jour de la semaine). % \begin{macrocode} -\RequirePackage{datetime}[2013/09/10]% +\RequirePackage[useregional]{datetime2}[2020-03-02]% % \end{macrocode} % Pour faire pointer les hyperliens au début des flottants plutôt qu'au % début des légendes @@ -1332,6 +1331,13 @@ This work consists of the file yathesis.dtx \tcbuselibrary{skins}% % \end{macrocode} % +% Afin de préserver la compatibilité ascendante, on demande le comportement +% original du \Package{tcolorbox} en ce qui concerne les espaces verticaux avant +% et après les boîtes de couleur de ce package. +% \begin{macrocode} + \tcbsetforeverylayer{autoparskip} +% \end{macrocode} +% % Par défaut, les listings sont composés en fonte à châsse fixe % \begin{macrocode} % \lstset{basicstyle=\ttfamily} @@ -2184,7 +2190,7 @@ This work consists of the file yathesis.dtx \YAD@translation{\YAD@the@staff-pl-hdr-female}% }{% \YAD@translation{\YAD@the@staff-pl-hdr}% - } + }% }{% \ifboolexpr{% bool {YAD@only@female@\YAD@the@staff}% @@ -2192,7 +2198,7 @@ This work consists of the file yathesis.dtx \YAD@translation{\YAD@the@staff-pl-female}% }{% \YAD@translation{\YAD@the@staff-pl}% - } + }% }% }{% \ifboolexpr{% @@ -2204,7 +2210,7 @@ This work consists of the file yathesis.dtx \YAD@translation{\YAD@the@staff-hdr-female}% }{% \YAD@translation{\YAD@the@staff-hdr}% - } + }% }{% \ifboolexpr{% bool {YAD@only@female@\YAD@the@staff}% @@ -2212,7 +2218,7 @@ This work consists of the file yathesis.dtx \YAD@translation{\YAD@the@staff-female}% }{% \YAD@translation{\YAD@the@staff}% - } + }% }% }% }{% @@ -2700,16 +2706,16 @@ This work consists of the file yathesis.dtx }{% }% \ifthenelse{\equal{#2}{title}}{% - \YAD@hypersetup{pdftitle=\YAD@metatitle}% + \AtEndPreamble{\YAD@hypersetup{pdftitle=\YAD@metatitle}}% }{% }% \ifundef{\YAD@metasubject}{% \ifundef{\YAD@metaacademicfield}{% }{% - \YAD@hypersetup{pdfsubject=\YAD@metaacademicfield}% + \AtEndPreamble{\YAD@hypersetup{pdfsubject=\YAD@metaacademicfield}}% }% }{% - \YAD@hypersetup{pdfsubject=\YAD@metasubject}% + \AtEndPreamble{\YAD@hypersetup{pdfsubject=\YAD@metasubject}}% }% % \end{macrocode} % Création de la commande affichant le résultat de la commande bilingue @@ -2838,7 +2844,7 @@ This work consists of the file yathesis.dtx }% }% \YAD@error@firstlastnames@empty{de l'auteur de la thèse}{#2}{#3}{\author}% - \YAD@hypersetup{pdfauthor=\YAD@firstname@author{} \YAD@lastname@author}% + \AtEndPreamble{\YAD@hypersetup{pdfauthor=\YAD@firstname@author{} \YAD@lastname@author}}% \newcommand*\YAD@email@author{% #1% }% @@ -2992,7 +2998,7 @@ This work consists of the file yathesis.dtx and bool {YAD@valid@year}% }{% \csdef{printdate}{% - \formatdate{#1}{#2}{#3}% + \DTMdisplaydate{#3}{#2}{#1}{}% }% }{% \csdef{printdate}{% @@ -3013,7 +3019,7 @@ This work consists of the file yathesis.dtx and bool {YAD@valid@year}% }{% \csdef{printsubmissiondate}{% - \formatdate{#1}{#2}{#3}% + \DTMdisplaydate{#3}{#2}{#1}{}% }% }{% \csdef{printsubmissiondate}{% @@ -3202,9 +3208,9 @@ This work consists of the file yathesis.dtx % \end{macrocode} % \end{macro} % -% On crée la macro "\YAD@setsecnumdepth", analogue à "\@setseccntt@c" du \Package{tocvsec2}, qui fixe -% la valeur du compteur "secnumdepth" selon l'argument donné sous la forme du -% nom d'une commande de sectionnement +% On crée la macro "\YAD@setsecnumdepth", analogue à "\@setseccntt@c" du +% \Package{tocvsec2}, qui fixe la valeur du compteur "secnumdepth" selon +% l'argument donné sous la forme du nom d'une commande de sectionnement % \begin{macrocode} \newcommand{\YAD@setsecnumdepth}[1]{% \newif\if@YAD@knownsect% @@ -3825,7 +3831,10 @@ This work consists of the file yathesis.dtx \par% \YAD@translation{company} \textbf{\textsc{\Large\printcompany}}% }% - \ifbool{YAD@nodoctoralschool}{% + \ifboolexpr{% + bool {YAD@nodoctoralschool}% + or bool {YAD@hdr}% + }{% }{% \ifdraft{}{\vspace*{\stretch{1.5}}}% % \vspace*{\stretch{1.5}}% @@ -3846,6 +3855,26 @@ This work consists of the file yathesis.dtx \textbf{\printdoctoralschool}% }% }% +% \end{macrocode} +% +% Si une école doctorale est spécifiée alors que la thèse est une HDR, un +% warning est émis. +% \begin{macrocode} + \ifbool{YAD@hdr}{% + \YAD@ifemptyorundef{\printdoctoralschool}{% + }{% + \YAD@ClassWarningNoLine{% + Une école doctorale a été spécifiée mais elle ne\MessageBreak% + figurera nulle part : les HDR ne sont pas préparées\MessageBreak% + sous l'égide d'écoles doctorales (cf. \MessageBreak% + https://www.legifrance.gouv.fr/loda/id/JORFTEXT000000298904)% + }% + }% + }{% + }% +% \end{macrocode} +% +% \begin{macrocode} \ifbool{YAD@nolaboratory}{% }{% \ifdraft{}{\vspace*{\stretch{.5}}}% @@ -3961,7 +3990,7 @@ This work consists of the file yathesis.dtx \large% \YAD@translation{speciality} \textbf{\printspeciality}% }% - } + }% \end{center} % \end{minipage}% \vspace*{\stretch{1}}% @@ -4123,9 +4152,9 @@ This work consists of the file yathesis.dtx \ifthenelse{\isempty{#1}}{% }{% \ifthenelse{\isempty{#2}}{% - \YAD@hypersetup{pdfkeywords={#1}}% + \AtEndPreamble{\YAD@hypersetup{pdfkeywords={#1}}}% }{% - \YAD@hypersetup{pdfkeywords={#1} ({#2})}% + \AtEndPreamble{\YAD@hypersetup{pdfkeywords={#1} ({#2})}}% }% }% }% @@ -5761,21 +5790,37 @@ This work consists of the file yathesis.dtx % On définit la valeur, en anglais et en français, de la macro "\colophon" du colophon. % % \begin{macrocode} -\colophontext{% - \IfLanguageName{french}{% - Mémoire de thèse intitulé \frquote{\printtitle}, écrit par \printauthor{}, - achevé le \today{}, composé au moyen du système de préparation de document - \href{https://fr.wikipedia.org/wiki/LaTeX}{\LaTeX{}} et de la classe - \href{https://www.ctan.org/pkg/yathesis}{\textsf{yathesis}} dédiée aux - thèses préparées en France.% - }{% - Doctoral dissertation entitled “\printtitleâ€, written by \printauthor{}, - completed on \today{}, typeset with the document preparation system - \href{https://en.wikipedia.org/wiki/LaTeX}{\LaTeX{}} and the - \href{https://www.ctan.org/pkg/yathesis}{\textsf{yathesis}} class dedicated - to theses prepared in France.% +\AtEndPreamble{% + \colophontext{% + \IfLanguageName{french}{% + Mémoire de thèse intitulé \YAD@ifemptyorundef{\printtitle}{% + \YAD@generic@argument@translate{title}% + }{% + \frquote{\printtitle}% + }, écrit par \YAD@ifemptyorundef{\printauthor}{% + \YAD@generic@argument@translate{author}% + }{% + \printauthor% + }, achevé le \today{}, composé au moyen du système de préparation de + document \YAD@href{https://fr.wikipedia.org/wiki/LaTeX}{\LaTeX{}} et de la + classe \YAD@href{https://www.ctan.org/pkg/yathesis}{\textsf{yathesis}} + dédiée aux thèses préparées en France.% + }{% + Doctoral dissertation entitled \YAD@ifemptyorundef{\printtitle}{% + \YAD@generic@argument@translate{title}% + }{% + “\printtitleâ€% + }, written by \YAD@ifemptyorundef{\printauthor}{% + \YAD@generic@argument@translate{author}% + }{% + \printauthor% + }, completed on \today{}, typeset with the document preparation system + \YAD@href{https://en.wikipedia.org/wiki/LaTeX}{\LaTeX{}} and the + \YAD@href{https://www.ctan.org/pkg/yathesis}{\textsf{yathesis}} class + dedicated to theses prepared in France.% + }% }% -}% +} % \end{macrocode} % % % Le contenu de l'environnement "introduction" est collecté dans la macro @@ -6521,7 +6566,7 @@ This work consists of the file yathesis.dtx #include:colophon #include:csquotes #include:datatool -#include:datetime +#include:datetime2 #include:draftwatermark #include:environ #include:epigraph @@ -6600,7 +6645,7 @@ datatool titlesec draftwatermark babel -datetime +datetime2 #endkeyvals # \yadsetup{%<options%>}#n @@ -6936,10 +6981,10 @@ name= \ifthenelse{\equal{#3}{Introduction générale}}{\cleardoublepage\zlabel{introduction}% }{% }% - \ifthenelse{\equal{#3}{Développement}}{\zlabel{localbib}% + \ifthenelse{\equal{#3}{Contexte du chaos du rire}}{\cleardoublepage\zlabel{chapter}% }{% }% - \ifthenelse{\equal{#3}{Contexte du chaos du rire}}{\cleardoublepage\zlabel{chapter}% + \ifthenelse{\equal{#3}{Développement du chaos du rire}}{\zlabel{localbib}% }{% }% \ifthenelse{\equal{#3}{Documents juridiques}}{\cleardoublepage\zlabel{appendix}% diff --git a/macros/latex/required/firstaid/changes.txt b/macros/latex/required/firstaid/changes.txt index ef734a335a..75067562e7 100644 --- a/macros/latex/required/firstaid/changes.txt +++ b/macros/latex/required/firstaid/changes.txt @@ -1,3 +1,8 @@ +2020-10-13 Frank Mittelbach <Frank.Mittelbach@latex-project.org> + + * latex2e-first-aid-for-external-files.dtx: + Fix for gh408 to be taken out later when it moves to the kernel. + 2020-10-04 Frank Mittelbach <Frank.Mittelbach@latex-project.org> * latex2e-first-aid-for-external-files.dtx: diff --git a/macros/latex/required/firstaid/firstaid.ins b/macros/latex/required/firstaid/firstaid.ins index 5d888cf65b..9965480f20 100644 --- a/macros/latex/required/firstaid/firstaid.ins +++ b/macros/latex/required/firstaid/firstaid.ins @@ -3,7 +3,7 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright (C) 1993-2020 +%% Copyright (C) 2020 %% The LaTeX3 Project and any individual authors listed elsewhere %% in this file. %% @@ -44,12 +44,12 @@ reports for it can be opened at https://latex-project.org/bugs/ (but please observe conditions on bug reports sent to that address!) -Copyright (C) 1993-2020 +Copyright (C) 2020 The LaTeX3 Project and any individual authors listed elsewhere in this file. This file was generated from file(s) of the Standard LaTeX `First Aid Bundle'. --------------------------------------------------------------------------- +------------------------------------------------------------------------------ It may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c diff --git a/macros/latex/required/firstaid/latex2e-first-aid-for-external-files.dtx b/macros/latex/required/firstaid/latex2e-first-aid-for-external-files.dtx index 78f52ca78a..55e0d01e26 100644 --- a/macros/latex/required/firstaid/latex2e-first-aid-for-external-files.dtx +++ b/macros/latex/required/firstaid/latex2e-first-aid-for-external-files.dtx @@ -87,6 +87,17 @@ % doesn't get out of bounds. % \end{quote} % +% \subsection{Minor kernel fixes} +% +% If we encounter issues with the kernel code that should get fixed +% before the next main release we normally generate a patch release +% for \LaTeX{}. However, depending on the complexity of the fix we +% might first add the fix here and generate a full patch release +% only when a number of such issues have accumulated. This way we +% lessen the impact on CTAN maintainers because for each tach +% release we have to make and distribute also a matching +% development release. +% % \StopEventually{\setlength\IndexMin{200pt} \PrintIndex } % % @@ -99,8 +110,8 @@ % \end{macrocode} % % \begin{macrocode} -\def\LaTeXFirstAidDate{2020/10/04} -\def\LaTeXFirstAidVersion{v1.0e} +\def\LaTeXFirstAidDate{2020/10/13} +\def\LaTeXFirstAidVersion{v1.0f} % \end{macrocode} % % \begin{macrocode} @@ -147,37 +158,28 @@ % implementation. % % The package has now got an update so we aren't activating the -% first aid. However, it basically bypasses the new hook mechanism -% and puts the old hooks in thereby disabling, for example, the -% possibility to reorder code through rules. +% first aid. However, at the moment it basically bypasses the new +% hook mechanism and puts the old hooks in thereby disabling, for +% example, the possibility to re-order code through rules. % % We therefore keep \texttt{filehook-ltx.sty} around as a guideline % for further updates. % +% Replacing \pkg{filehook} with a leaner version would then work +% like this: % \begin{macrocode} %<*kernel> %\declare@file@substitution{filehook.sty}{filehook-ltx.sty} %</kernel> -% \End{macrocode} -% -% If a new filehook package becomes available it can be tested -% simply by undoing the above substitution via -% \begin{verbatim} -% \undeclare@file@substitution{filehook.sty} -% \end{verbatim} -% Once ready this will then taken out of the first aid file. +% \end{macrocode} % -% What follows is a partial implementation of the \pkg{filehook} +% What follows is a simplified (partial) implementation of the \pkg{filehook} % interfaces. -% % Not implemented are: %\begin{verbatim} -% \AtBeginOfFiles -% \AtEndOfFiles -% \AtBeginOfInputs -% \AtEndOfInputs -% \AtBeginOfInputFile -% \AtEndOfInputFile +% \AtBeginOfFiles \AtEndOfFiles +% \AtBeginOfInputs \AtEndOfInputs +% \AtBeginOfInputFile \AtEndOfInputFile %\end{verbatim} % % \begin{macrocode} @@ -214,14 +216,14 @@ {\AddToHook{class/after}{#1}} % \end{macrocode} % -% For normal files we drop the \texttt{.tex} extension for now: % \begin{macrocode} \newcommand\AtBeginOfFile [2] {\AddToHook{file/before/#1}{#2}} \newcommand\AtEndOfFile [2] {\AddToHook{file/after/#1}{#2}} % \end{macrocode} -% +% +% Some commands offered a starred form % \begin{macrocode} \DeclareDocumentCommand \AtBeginOfPackageFile {smm} {\IfBooleanTF{#1}% @@ -230,6 +232,9 @@ {\AddToHook{package/before/#2}{#3}}}% {\AddToHook{package/before/#2}{#3}}% } +% \end{macrocode} +% +% \begin{macrocode} \DeclareDocumentCommand \AtEndOfPackageFile {smm} {\IfBooleanTF{#1}% {\@ifpackageloaded{#2}% @@ -294,6 +299,10 @@ % is still in the kernel. % % \begin{macrocode} +%<*kernel> +% \end{macrocode} +% +% \begin{macrocode} \AddToHook{file/after/biditools.sty}[firstaid]{% \FirstAidNeededT{biditools}{sty}% {2020/05/13 v2 Programming tools for bidi package}% @@ -322,10 +331,6 @@ } % \end{macrocode} % -% \begin{macrocode} -%<*kernel> -% \end{macrocode} -% % % % \subsection{The \pkg{dinbrief} class first aid} @@ -341,6 +346,93 @@ % % % +% \subsection[Temporary fixes for the kernel (until the next +% patch-level release)] +% {Temporary fixes for the kernel \\ +% (until the next patch-level release)} +% +% This is fixing GitHub issue 408. Looks rather long but changes +% only 3 or 4 lines in the macros. +% \begin{macrocode} +\def\@pr@videpackage[#1]{% + \expandafter\protected@xdef % <-- protected... + \csname ver@\@currname.\@currext\endcsname{#1}% Loaded package + \expandafter\let + \csname ver@\@currpkg@reqd\expandafter\endcsname % Requested package + \csname ver@\@currname.\@currext\endcsname + \ifx\@currext\@clsextension + \typeout{Document Class: \@gtempa\space#1}% + \else + \protected@wlog{Package: \@gtempa\space#1}% <--- protected + \fi} +% \end{macrocode} +% +% \begin{macrocode} +\def\load@onefilewithoptions#1[#2][#3]#4{% % <--- \@onefilewithoptions + % earlier in the kernel + \@pushfilename + \xdef\@currname{#1}% + \global\let\@currext#4% + \@ifl@aded\@currext\@currname + {\@if@ptions\@currext{\@currname}{#2}{}% + {\@latex@error + {Option clash for \@cls@pkg\space \@currname}% + {The package \@currname\space has already been loaded + with options:\MessageBreak + \space\space[\@ptionlist{\@currname.\@currext}]\MessageBreak + There has now been an attempt to load it + with options\MessageBreak + \space\space[#2]\MessageBreak + Adding the global options:\MessageBreak + \space\space + \@ptionlist{\@currname.\@currext},#2\MessageBreak + to your \noexpand\documentclass declaration may fix this.% + \MessageBreak + Try typing \space <return> \space to proceed.}}% + \@firstofone}% + {\makeatletter + \@reset@ptions + \IfFileExists{\@currname.\@currext}{}% + {\@missing@onefilewithoptions{#2}}% + \ifx\@currname\@empty + \expandafter\@gobble + \else + \@disable@packageload@do{\@currname.\@currext}% + {\@expl@@@filehook@file@push@@ + \set@curr@file{\@currname.\@currext}% + \@filehook@set@CurrentFile + \expandafter\@swaptwoargs\expandafter + {\expandafter{\@currpkg@reqd}}% + {% < + \edef\@currpkg@reqd{\@currname.\@currext}% + \ifx\CurrentFile\CurrentFileUsed + \else + \filename@parse\@curr@file + \edef\@currname{\string@makeletter\filename@base}% + \edef\@currext{\string@makeletter\filename@ext}% + \fi + \load@onefile@withoptions{#2}% + \def\@currpkg@reqd%{\@currpkg@reqd} + }% > + \@expl@@@filehook@file@pop@@}% + \expandafter\@firstofone + \fi}% + {\@ifl@ter\@currext{\@currname}{#3}{}% + {\@latex@warning@no@line + {You have requested,\on@line, + version\MessageBreak + `#3' of \@cls@pkg\space \@currname,\MessageBreak + but only version\MessageBreak + `\csname ver@\@currname.\@currext\endcsname'\MessageBreak + is available}}% + \ifx\@currext\@clsextension\let\LoadClass\@twoloadclasserror\fi}% + \@popfilename + \@reset@ptions} +% \end{macrocode} +% +% \begin{macrocode} +\let\@currpkg@reqd\@empty +% \end{macrocode} % % % \begin{macrocode} diff --git a/macros/latex/required/firstaid/latex2e-first-aid-for-external-files.pdf b/macros/latex/required/firstaid/latex2e-first-aid-for-external-files.pdf Binary files differindex 7e9157f792..70301b7646 100644 --- a/macros/latex/required/firstaid/latex2e-first-aid-for-external-files.pdf +++ b/macros/latex/required/firstaid/latex2e-first-aid-for-external-files.pdf diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb index 6f7c347de9..9d38247dd3 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb @@ -26,11 +26,11 @@ depend container_split_src_files/1 depend frozen/0 depend minrelease/2016 depend release/2020 -depend revision/56654 +depend revision/56669 name 00texlive.image category TLCore -revision 56644 +revision 56669 shortdesc TeX Live files only in the source repository longdesc The files here are not copied by the installer and containers longdesc are not built for them; they exist only in the source @@ -28175,22 +28175,22 @@ catalogue-topics multilingual-addon name babel-russian category Package -revision 56597 +revision 56663 shortdesc Russian language module for Babel relocated 1 longdesc The package provides support for use of Babel in documents longdesc written in Russian (in both "traditional" and modern forms). longdesc The support is adapted for use both under 'traditional' TeX longdesc engines, and under XeTeX and LuaTeX. -containersize 6296 -containerchecksum fde01c945239b63ac99840dafc08569e78d0a2abd143664693324004e0f815003b1a6043cbf281d5b7fdaba8753b3730e059f6f599c96466e1c2d0488f72e7ac -doccontainersize 496192 -doccontainerchecksum 3acd55a7e161cae33fbcfa68e762d61b476d12ea91560822f1de0eb35bc8b04127cc7ef30aca2e6fcee3f4665357e23d570d1b76dd2bbe0539773867c08d8b0b -docfiles size=137 +containersize 6324 +containerchecksum a13697984db65dbd36387761012062b6e55195137b8b1903114ced022e2def90ded6a8a9e3987b76f81d5d1d73202c371d835c1cbd00e824cd13c78aa04a2136 +doccontainersize 128828 +doccontainerchecksum 7be47356ab7350ac5d67ba2ab2f14ea728c5dde7072dcc527785f96de5286aae94e22e48692d544ba7faf6b13ff7af103f5a0585a189fe83b0cd9c03632c030b +docfiles size=34 RELOC/doc/generic/babel-russian/README details="Readme" RELOC/doc/generic/babel-russian/russianb.pdf details="Package documentation" -srccontainersize 24240 -srccontainerchecksum b5eb81e9bd501846b3bab3aecea6e6789edd189673cc713e60fa37391b6a09892144bd247c38c197abe79124a814be5275c01788984b5616572d106f821430a8 +srccontainersize 24340 +srccontainerchecksum 5d2f16e58c7cbd868a5c51f47fc703a43618f52cea4cc35bc518944b8d6fbdb821e8a0e8cd6382f7e81dffc4443ab7f3bb161e07caa7f90750a1f0766db36b19 srcfiles size=25 RELOC/source/generic/babel-russian/russianb.dtx RELOC/source/generic/babel-russian/russianb.ins @@ -28199,9 +28199,9 @@ runfiles size=7 catalogue-contact-bugs https://github.com/kia999/babel-russian/issues catalogue-contact-home https://github.com/kia999/babel-russian catalogue-ctan /macros/latex/contrib/babel-contrib/russian -catalogue-license lppl1.3 +catalogue-license lppl1.3c catalogue-topics multilingual-addon russian -catalogue-version 1.3k +catalogue-version 1.3l name babel-samin category Package @@ -54184,7 +54184,7 @@ catalogue-version 9.3 name circuitikz category Package -revision 56594 +revision 56660 shortdesc Draw electrical networks with TikZ relocated 1 longdesc The package provides a set of macros for naturally typesetting @@ -54193,11 +54193,11 @@ longdesc networks. It is designed as a tool that is easy to use, with a longdesc lean syntax, native to LaTeX, and directly supporting PDF longdesc output format. It has therefore been based on the very longdesc impressive PGF/TikZ package. -containersize 134752 -containerchecksum 3f18c02e92afe11c79d7770abc45e1fbdd1bcc145b098687842a242fd37d3426fcd7a10d81441a27d549b839c0bc8fa1ca780203c263a20a52304d1bb0c0c8ae -doccontainersize 1176960 -doccontainerchecksum ab86ebbcd68a87a650b7985345e8e1b7e0c81ed6deef6fea51bd3ccf218c2f93865df5bd131bf83962ee1ee6b123febb1f680af07669147deb02954d2ebe8266 -docfiles size=380 +containersize 134860 +containerchecksum 92f40a01d563adcf572e6c82f42cfc27f13a51b82671f1fec4bf4c1029db2d3f22a01003406e8aaed567a08dc3af59a901fa95cc41cb0501d39e9f8530577c07 +doccontainersize 1187036 +doccontainerchecksum 912af2d3006abaca34fe785f5b1bd635b0ee2598ab04240e0d392e48a58898741494a5188a9a62ec8b1dbec9c3d24dc30800974c561dcf11c452b9c9da5cf093 +docfiles size=383 RELOC/doc/context/third/circuitikz/circuitikz-context.pdf RELOC/doc/context/third/circuitikz/circuitikz-context.tex RELOC/doc/generic/circuitikz/CHANGELOG.md @@ -54243,8 +54243,8 @@ catalogue-contact-bugs https://github.com/circuitikz/circuitikz/issues catalogue-contact-repository https://github.com/circuitikz/circuitikz catalogue-ctan /graphics/pgf/contrib/circuitikz catalogue-license lppl gpl -catalogue-topics graphics diagram-circ pgf-tikz -catalogue-version 1.2.4 +catalogue-topics graphics diagram-circ pgf-tikz electronic +catalogue-version 1.2.5 name cite category Package @@ -67046,7 +67046,7 @@ containerchecksum 653143f95761352dc349c66f618b01a77650b20bf8b2cf45137e72b2f05ba3 name collection-publishers category Collection -revision 56590 +revision 56669 shortdesc Publisher styles, theses, etc. relocated 1 depend IEEEconf @@ -67282,11 +67282,12 @@ depend uwthesis depend vancouver depend wsemclassic depend xduthesis +depend xmuthesis depend yathesis depend yazd-thesis depend york-thesis containersize 1520 -containerchecksum 5a1e89da355bc14c2faab559707a87876c822368796a57b661e7567d0ddf9f2826369de1392406ad957ea836e5660d46e7479a2b5a1f63b5a7f257ac7f4ac61c +containerchecksum 5e82a97fa1032540dda77989b4effceb3771202d51b6a006027a17e458cf6807b80e69aa38f6dd88cae45a554557d68c64484626dc3276bbabe28b56a5269e9a name collection-texworks category Collection @@ -85593,28 +85594,28 @@ catalogue-topics foreign-import name denisbdoc category Package -revision 55474 +revision 56664 shortdesc A personal dirty package for documenting packages relocated 1 longdesc A personal dirty package for documenting packages. -containersize 14872 -containerchecksum 60377f33d9a8b17e010ce58ec56c3727bf9ac8f168d0124a3fd2743d4e7eab67c64a4277f9c3639e7c73098f5ac465e13ddcf13f40fa5cb1176c8e21e86aa0bb -doccontainersize 1180 -doccontainerchecksum 23b359e65d42d951f1767049413956fae16f89748358bb0bdf1e15c7a32e2612cee6987574ee36ac9fad637b63d507471f1a4854d0bf749b8fb33bd8b90cb45b +containersize 15044 +containerchecksum 636537275629ba01fe78b5a189e94845898555715ddc879a3558539016e9cbc814ea74d6eed0cc31e42d8062e6ba6c6bb5c00064a14644c236a3c4f48f688e3f +doccontainersize 1184 +doccontainerchecksum 6e1715fe7ed2c3d0091688ffa4e0e2245a838063a896334727ea87bad566771fa93c66cd0580c3ce1980b217cdf5e6bfba36b77d10d19ea55afe4e8fd92db8be docfiles size=3 RELOC/doc/latex/denisbdoc/README.md details="Readme" RELOC/doc/latex/denisbdoc/denisbdoc-chng.xdy RELOC/doc/latex/denisbdoc/denisbdoc.xdy -srccontainersize 21208 -srccontainerchecksum 86d3beb7cc5c67e0482f18bcefeb75644047330af1500d723b58efb82a7cbfb911d389e186401a290c1ef4d209f2904644e4c5f07569e2527285a7fbfca0cc2d -srcfiles size=20 +srccontainersize 21392 +srccontainerchecksum 89abdd37bda49536437063229346ea70655211716ebcc0798a4df87d49df9a2fb38f201e0b80e8d3748a2d847ccc2ce320c29d71f9922d5f2932eb07de3c5645 +srcfiles size=21 RELOC/source/latex/denisbdoc/denisbdoc.dtx -runfiles size=14 +runfiles size=15 RELOC/tex/latex/denisbdoc/denisbdoc.sty catalogue-ctan /macros/latex/contrib/denisbdoc catalogue-license lppl1.3c catalogue-topics doc-supp -catalogue-version 0.9 +catalogue-version 0.9.1 name derivative category Package @@ -104909,39 +104910,40 @@ catalogue-version 0.98 name eso-pic category Package -revision 56463 +revision 56658 shortdesc Add picture commands (or backgrounds) to every page relocated 1 longdesc The package adds one or more user commands to LaTeX's shipout longdesc routine, which may be used to place the output at fixed longdesc positions. The grid option may be used to find the correct longdesc places. -containersize 3824 -containerchecksum 7646578d67dcaa61bf995762b190d07bc829dcfa322211ce84fe0e107f643649b302ee2feb2b3bc83d3369157242e33fc9bcc6b3637af274638b23e84d5c3aa9 -doccontainersize 252240 -doccontainerchecksum 3b8f7ff80a6cd3a1870172884759cd5147dae4935f05e06d6fa880b7d03de9c227390353f46bc03a7f6437efa4e05f1fa845aa4571bcc4f0ea3612a9728a1e94 -docfiles size=70 - RELOC/doc/latex/eso-pic/README +containersize 3816 +containerchecksum d4020b6d7f1ed44ecfc11938d604595e48dc32a24e2e67742016fbc2022f19ab63c759ec03030d7d3a996cc00f7a08ce8cb1354d0e9234f116080d732e4dc5e8 +doccontainersize 251608 +doccontainerchecksum 96fcdb612c8473fffe672a6c443c120b2cc8dafec5b43de132cd8f758d85bb504ea14285af121921afbaafea7c6df99e32f6c50101d1d76900b1aeba38c3010a +docfiles size=69 + RELOC/doc/latex/eso-pic/README.md details="Package documentation" RELOC/doc/latex/eso-pic/eso-article-test.tex RELOC/doc/latex/eso-pic/eso-ex1.tex RELOC/doc/latex/eso-pic/eso-ex2.tex - RELOC/doc/latex/eso-pic/eso-ex3.tex RELOC/doc/latex/eso-pic/eso-ex4.tex RELOC/doc/latex/eso-pic/eso-ex5.tex RELOC/doc/latex/eso-pic/eso-memoir-test.tex RELOC/doc/latex/eso-pic/eso-pic.pdf details="Package documentation" -srccontainersize 6664 -srccontainerchecksum 08b254a5b0f129ce70259f889082f490c38fb0519c80cece7f555d0a0e6f84b9d34695612ee8bc3af24003033fb1996890c3497206ee3f9a4728d37165e55bb8 +srccontainersize 6636 +srccontainerchecksum 86655acc2d9d11084dea3791a171b01e18715cce77b2300220764eba88d4a049a2a6bef6ff7bc1b90fdf337379be065a2d998aa32e42a0dd04b21f0293d1c14b srcfiles size=8 RELOC/source/latex/eso-pic/eso-pic.dtx RELOC/source/latex/eso-pic/eso-pic.ins runfiles size=4 RELOC/tex/latex/eso-pic/eso-pic.sty RELOC/tex/latex/eso-pic/showframe.sty +catalogue-contact-bugs https://github.com/rolfn/eso-pic/issues +catalogue-contact-repository https://github.com/rolfn/eso-pic catalogue-ctan /macros/latex/contrib/eso-pic catalogue-license lppl1.2 catalogue-topics defer-stuff -catalogue-version 2.0i +catalogue-version 3.0a name esrelation category Package @@ -115829,7 +115831,7 @@ catalogue-topics tut-latex name firstaid category Package -revision 56612 +revision 56668 catalogue latex-firstaid shortdesc First aid for external LaTeX files and packages that need updating relocated 1 @@ -115839,27 +115841,27 @@ longdesc LaTeX kernel that are not yet reflected in the package's or longdesc class's code. The file latex2e-first-aid-for-external-files.ltx longdesc provided by this package is meant to be loaded during format longdesc generation and not by the user. -containersize 1944 -containerchecksum c82a47a918f075eb2fcbe4f842665980e2832b44d7bdc6e4af4914e591d5c70b73795447ffe56bced9411152f1d9d5759efc255fe2ece45c1812c0a77186cbe9 -doccontainersize 209220 -doccontainerchecksum 3457555bb895795759e9251e58bc2c5fe4fbaa3ec85be31a8d34fb0fc15ffd6341591938f1edc2c4287d9e7cfa17834d9b754701271d102386e9eed7898f012b -docfiles size=54 +containersize 2760 +containerchecksum 38db02b820ffa9340425bacb6c8b004a86c8297c562005353b730e2316dece3f488b49f0be773125c098226dc1c4db2ec2044232498d2eeaa9c750f0ca3cefa8 +doccontainersize 223232 +doccontainerchecksum deaa5642cb43fb6b673a3775089a5a7ea753aef1424e482b3f2db0814b71d1e056cd3ecdefbee62ba3b8298e3a0ad10f294b03161f33595a5b9f6fff71bda110 +docfiles size=57 RELOC/doc/latex/firstaid/README.md details="Readme" RELOC/doc/latex/firstaid/changes.txt RELOC/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf details="Package documentation" -srccontainersize 4636 -srccontainerchecksum e65760b094e6751268356843427675338248eecaa278289a06f7817280b3700f46e902f8a8db6c8fba28515647782d2643cec813c4dafcc56e233ed612775a29 -srcfiles size=4 +srccontainersize 5708 +srccontainerchecksum 4f97211175a3c473bfaa6bf8f6f09a060e87966fb809cc43d8504177dee1b14c67400d0b2a12b7bf886d2e2276f99214330b91b44d1963b9de3fb13e0d8132af +srcfiles size=5 RELOC/source/latex/firstaid/firstaid.ins RELOC/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx -runfiles size=2 +runfiles size=3 RELOC/tex/latex/firstaid/filehook-ltx.sty RELOC/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx catalogue-contact-home https://www.latex-project.org catalogue-ctan /macros/latex/required/firstaid catalogue-license lppl1.3c catalogue-topics format bugfix -catalogue-version 1.0e +catalogue-version 1.0f name fitbox category Package @@ -123143,7 +123145,7 @@ catalogue-topics tut-plaintex name gentombow category Package -revision 56429 +revision 56665 shortdesc Generate Japanese-style crop marks relocated 1 longdesc This bundle provides a LaTeX package for generating @@ -123156,11 +123158,11 @@ longdesc pxgentombow.sty: Superseded by gentombow.sty; kept for longdesc compatibility only. bounddvi.sty: Set papersize special to DVI longdesc file. Can be used on LaTeX/pLaTeX/upLaTeX (with DVI output longdesc mode) with dvips or dvipdfmx drivers. -containersize 8392 -containerchecksum f01a53df6b891306b832bd09462d3ecca748bd072ea1aff03414a38b6996842799ea32648b5494992a168633de0dd6679f76a36badf1592776c1098ca0a1abab -doccontainersize 565804 -doccontainerchecksum 6d5c8917de96ffef7b393b5e9ba286faa968828920132f77086ab4f3ecf919ae75181ac5ab40674d400d530055de075a99900132b613fe317c691fc4d5ce637a -docfiles size=156 +containersize 10892 +containerchecksum e97b138d5359c3fa0635bf56001ecc7c6a5afb2ab2a01fd8817cbd956adce97bee67632f4e3ae40d56e5d2ce06bc07ab33b52bbe3978f14bf4957d2647781813 +doccontainersize 504052 +doccontainerchecksum 89912adef5b6572945a81835b1dfd0648699c03e81c6f4e06309dbb8230f536f5c93bcd46a3acb508ca92398df07cdf71e8f5fa7a2f889220a03b27ad78ac110 +docfiles size=141 RELOC/doc/latex/gentombow/LICENSE RELOC/doc/latex/gentombow/README.md details="Readme" RELOC/doc/latex/gentombow/bounddvi-en.pdf details="Documentation of the bounddvi package (English)" @@ -123173,10 +123175,13 @@ docfiles size=156 RELOC/doc/latex/gentombow/gentombow.tex RELOC/doc/latex/gentombow/pxgentombow.pdf RELOC/doc/latex/gentombow/pxgentombow.tex -runfiles size=9 +runfiles size=13 RELOC/tex/latex/gentombow/bounddvi.sty RELOC/tex/latex/gentombow/gentombow.sty + RELOC/tex/latex/gentombow/pxesopic.sty RELOC/tex/latex/gentombow/pxgentombow.sty + RELOC/tex/latex/gentombow/pxpdfpages.sty + RELOC/tex/latex/gentombow/pxtextpos.sty catalogue-contact-repository https://github.com/aminophen/gentombow catalogue-ctan /macros/latex/contrib/gentombow catalogue-license bsd3 @@ -164379,7 +164384,7 @@ catalogue-version 0.6 name leaflet category Package -revision 43523 +revision 56666 shortdesc Create small handouts (flyers) relocated 1 longdesc A document class to create small hand-outs (flyers) that fit on @@ -164388,26 +164393,26 @@ longdesc rearranged by LaTeX so that they print correctly on a single longdesc sheet -- no external script is necessary. (Works with longdesc PostScript and PDF.) This is a complete reimplementation with longdesc permission of the original author Jurgen Schlegelmilch. -containersize 5480 -containerchecksum b819cae65ac9f38d7170f4aec4f94adfc547afdeadc345091fad170def744247ed46d653975e493aa64a28117e89a5414463f693a4b2f7e28b9bf998b8859915 -doccontainersize 339136 -doccontainerchecksum d2355c9b93ae490f4087bca09ed3acc815abb714fa7508b64155d8b5994c967b7296b79f8b3d68cd59d082d7d3d7c618c0d4d0fa50df23724ed50718f0433f8d -docfiles size=86 +containersize 5488 +containerchecksum e7a0c70dc8e407be057766fc41221230fc12bdc80869a2e6f5c4f4ca1f60342b72d8d11e4f7c604b66371cc101ee241a6a1b2b3404e4e36b8f611a1bff3a5517 +doccontainersize 343228 +doccontainerchecksum daa0404502a26116739103bfc86c0f5226eee55b1b4ffd896eb069022e7c61ecfe019759590a9e24f8d980c634ef063a728106bf1afecb0e25b619917e40026b +docfiles size=88 RELOC/doc/latex/leaflet/README.md details="Readme" RELOC/doc/latex/leaflet/leaflet-manual.pdf details="Package manual (as a leaflet)" RELOC/doc/latex/leaflet/leaflet-manual.tex RELOC/doc/latex/leaflet/leaflet.pdf details="Documented source" -srccontainersize 13800 -srccontainerchecksum 38cdcd9b452afc6ff98e946d162119615e44f372322664894a479130035a2a05520b7b1e7f616f17b04914c5caac6910ff18fd71c06a31dae9d4e044c6106627 +srccontainersize 13716 +srccontainerchecksum ad9d8c7c1a418529c3a24e91d51d9bbee589de26f12a9a467c952e2fbad4ca71783a1cecd6db685417051e51c36192b4a365497f8c8ca786ba6e1eaa3aa85af7 srcfiles size=13 RELOC/source/latex/leaflet/leaflet.dtx RELOC/source/latex/leaflet/leaflet.ins runfiles size=5 RELOC/tex/latex/leaflet/leaflet.cls catalogue-ctan /macros/latex/contrib/leaflet -catalogue-license lppl +catalogue-license lppl1.3 catalogue-topics layout class -catalogue-version 1.1b +catalogue-version 2.0b name lecturer category Package @@ -168570,7 +168575,7 @@ catalogue-version 0.02 name libertinus-fonts category Package -revision 56604 +revision 56656 shortdesc The Libertinus font family relocated 1 longdesc This is a fork of the Linux Libertine and Linux Biolinum fonts @@ -168581,10 +168586,10 @@ longdesc forked from Linux Libertine. Libertinus Sans: forked from Linux longdesc Biolinum. Libertinus Mono: forked from Linux Libertine Mono. longdesc Libertinus Math: an OpenType math font for use in OpenType longdesc math-capable applications like LuaTeX, XeTeX or MS Word 2007+. -containersize 3919660 -containerchecksum 194bd016afb12d4398f9ddf97e0f735f8817322c837cd15d2ec2c121b560dfbffc360bd355172f68387a7fc0abac4d9c5c7989fb24b05c49055d7ab262dfd869 -doccontainersize 472196 -doccontainerchecksum a518c59ff99b2a8286c06e9a826e6f74c3028aa37c6b4064cd656a97c34897d4050a9720511f059b210d38c74742b22a4fc30a6198d1745a188da46a29fe90ab +containersize 1670592 +containerchecksum 2470e6c0ca297b9e8ca6658594e8ed4134320148c71d40a95eaa67969ddd94643bf5375e5a799d3e4a3aa6aa2304170c53e2faa63a0ec571943aa6aee86f68af +doccontainersize 472592 +doccontainerchecksum 1d869f2e19e7305aed20d4ee530ea10465c12fde92eeaa0c284b1f21a0142e6cb352678c99f49ab1912da7babb34697c9cd51e9b0952fe876fac5d1499499430 docfiles size=249 RELOC/doc/fonts/libertinus-fonts/AUTHORS.txt RELOC/doc/fonts/libertinus-fonts/CONTRIBUTING.md @@ -168596,35 +168601,21 @@ docfiles size=249 RELOC/doc/fonts/libertinus-fonts/README.md details="Readme" RELOC/doc/fonts/libertinus-fonts/Sample.pdf details="Font samples" RELOC/doc/fonts/libertinus-fonts/preview.svg -runfiles size=1422 +runfiles size=869 RELOC/fonts/opentype/public/libertinus-fonts/LibertinusKeyboard-Regular.otf - RELOC/fonts/opentype/public/libertinus-fonts/LibertinusKeyboard-Regular.woff2 RELOC/fonts/opentype/public/libertinus-fonts/LibertinusMath-Regular.otf - RELOC/fonts/opentype/public/libertinus-fonts/LibertinusMath-Regular.woff2 RELOC/fonts/opentype/public/libertinus-fonts/LibertinusMono-Regular.otf - RELOC/fonts/opentype/public/libertinus-fonts/LibertinusMono-Regular.woff2 RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSans-Bold.otf - RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSans-Bold.woff2 RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSans-Italic.otf - RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSans-Italic.woff2 RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSans-Regular.otf - RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSans-Regular.woff2 RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerif-Bold.otf - RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerif-Bold.woff2 RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerif-BoldItalic.otf - RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerif-BoldItalic.woff2 RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerif-Italic.otf - RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerif-Italic.woff2 RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerif-Regular.otf - RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerif-Regular.woff2 RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerif-Semibold.otf - RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerif-Semibold.woff2 RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerif-SemiboldItalic.otf - RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerif-SemiboldItalic.woff2 RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerifDisplay-Regular.otf - RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerifDisplay-Regular.woff2 RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerifInitials-Regular.otf - RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerifInitials-Regular.woff2 catalogue-also libertinus-otf libertinus-type1 catalogue-contact-announce https://github.com/alerque/libertinus/releases catalogue-contact-bugs https://github.com/alerque/libertinus/issues @@ -168632,7 +168623,7 @@ catalogue-contact-repository https://github.com/alerque/libertinus catalogue-ctan /fonts/libertinus-fonts catalogue-license ofl catalogue-topics font font-body font-proportional font-mono font-serif font-sans font-multilingual font-maths font-otf -catalogue-version 7.010 +catalogue-version 7.020 name libertinus-otf category Package @@ -235982,24 +235973,28 @@ catalogue-topics format class japanese name platex-tools category Package -revision 56451 +revision 56661 shortdesc pLaTeX standard tools bundle relocated 1 longdesc This bundle is an extended version of the latex-tools bundle longdesc developed by the LaTeX team, mainly intended to support longdesc pLaTeX2e and upLaTeX2e. Currently patches for the latex-tools longdesc bundle and Martin Schroder's ms bundle are included. -containersize 7496 -containerchecksum 826f3b18d6624afb6097d15b29b2fa48a8177c0bf81b5608b90cb6b0ee092181facc6814afa3b2659d9f4c30cf64a837fe54ba12f0e8b9b33a343bd5b94aa414 -doccontainersize 567504 -doccontainerchecksum be1e37396366b32141bc5751906c707b1c40f83d6e4b8c27e1cae99cf738ab7f0ba57ef0c2e3b31b6367fe466e3d106dde9051e0c523408296edc76f15f53f30 -docfiles size=159 +containersize 7992 +containerchecksum 1821edb26aea01156fa0d3619837d27a72d61613dac0fff39d86cc48c04fbdbae5bb25cf22ac74875e7fd5de6cb5d900b655045fdb15970d66af25bea8372ccd +doccontainersize 566640 +doccontainerchecksum 6fbf99e5b83b0f04c382a87d543ab187b14865a1ae3523bca86d28e586b932fbc35a823bd2d12d8bc3a268ed35b7005b939ae93ec0566d8f9bcec88420154de9 +docfiles size=162 RELOC/doc/latex/platex-tools/LICENSE RELOC/doc/latex/platex-tools/README.md details="Readme" RELOC/doc/latex/platex-tools/plarray.pdf details="Documentation of the plarray package" language="ja" RELOC/doc/latex/platex-tools/plarray.tex + RELOC/doc/latex/platex-tools/pldocverb.pdf + RELOC/doc/latex/platex-tools/pldocverb.tex RELOC/doc/latex/platex-tools/plextarray.pdf details="Documentation of the plextarray package" language="ja" RELOC/doc/latex/platex-tools/plextarray.tex + RELOC/doc/latex/platex-tools/plextcolortbl.pdf + RELOC/doc/latex/platex-tools/plextcolortbl.tex RELOC/doc/latex/platex-tools/plextdelarray.pdf details="Documentation of the plextdelarray package" language="ja" RELOC/doc/latex/platex-tools/plextdelarray.tex RELOC/doc/latex/platex-tools/pxatbegshi.pdf details="Documentation of the pxatbegshi package" language="ja" @@ -236014,9 +236009,11 @@ docfiles size=159 RELOC/doc/latex/platex-tools/pxmulticol.tex RELOC/doc/latex/platex-tools/pxxspace.pdf details="Documentation of the pxmulticol package" language="ja" RELOC/doc/latex/platex-tools/pxxspace.tex -runfiles size=10 +runfiles size=12 RELOC/tex/latex/platex-tools/plarray.sty + RELOC/tex/latex/platex-tools/pldocverb.sty RELOC/tex/latex/platex-tools/plextarray.sty + RELOC/tex/latex/platex-tools/plextcolortbl.sty RELOC/tex/latex/platex-tools/plextdelarray.sty RELOC/tex/latex/platex-tools/pxatbegshi.sty RELOC/tex/latex/platex-tools/pxeverysel.sty @@ -236222,7 +236219,7 @@ catalogue-version 3.1 name plautopatch category Package -revision 56452 +revision 56657 shortdesc Automated patches for pLaTeX/upLaTeX relocated 1 longdesc Japanese pLaTeX/upLaTeX formats and packages often conflict @@ -236235,35 +236232,30 @@ longdesc necessary. This helps not only to simplify source files, but longdesc also to make the appearance of working pLaTeX/upLaTeX sources longdesc similar to those of ordinary LaTeX ones. This package depends longdesc on the filehook package written by Martin Scharrer. -containersize 9084 -containerchecksum 4720b0f0434438bffa80422973825d1d2677aadf158a9a6ddbbf92377bdad4005e37ad58202bc49f15739a4c8d8e3de5c60dc0318b236ceccd12fb0a8c10b2e9 -doccontainersize 140944 -doccontainerchecksum 652220d9bf383c58da2a94bfe9a8b202c2e0474a19ae882af4adc29bf2d827a1de228e765218dfa9c32485597e102d8bbe931954107cd1dbe81cd14553a5c2ff -docfiles size=41 +containersize 6620 +containerchecksum ed16f20adf0802c2d79eca84b9e4aa7b5e78f8deff93634489e26311cbd842aa95a3dcb3fcb9e5d70d20bd74c7b9c6b3d767cdf91ee7f4b155a177595f0c81cb +doccontainersize 125620 +doccontainerchecksum 0570d30458e465f461d5ec02abc273b0747a1f63cc17ffc459680de939c406d1a468f09f12a4f43b1adea628331de08a36e47fe4b603d3f47dd66f5e2f7468a3 +docfiles size=37 RELOC/doc/latex/plautopatch/LICENSE RELOC/doc/latex/plautopatch/README.md details="Readme" RELOC/doc/latex/plautopatch/plautopatch-ja.pdf details="Package documentation (Japanese)" language="ja" RELOC/doc/latex/plautopatch/plautopatch-ja.tex RELOC/doc/latex/plautopatch/plautopatch.pdf details="Package documentation (English)" RELOC/doc/latex/plautopatch/plautopatch.tex -runfiles size=16 +runfiles size=10 RELOC/tex/latex/plautopatch/plarydshln.sty RELOC/tex/latex/plautopatch/plautopatch.sty RELOC/tex/latex/plautopatch/plcollcell.sty - RELOC/tex/latex/plautopatch/pldocverb.sty RELOC/tex/latex/plautopatch/plextarydshln.sty - RELOC/tex/latex/plautopatch/plextcolortbl.sty RELOC/tex/latex/plautopatch/plsiunitx.sty - RELOC/tex/latex/plautopatch/pxesopic.sty - RELOC/tex/latex/plautopatch/pxpdfpages.sty RELOC/tex/latex/plautopatch/pxpgfrcs.sty RELOC/tex/latex/plautopatch/pxstfloats.sty - RELOC/tex/latex/plautopatch/pxtextpos.sty catalogue-contact-repository https://github.com/aminophen/plautopatch catalogue-ctan /language/japanese/plautopatch catalogue-license bsd3 catalogue-topics japanese debug-supp bugfix -catalogue-version 0.9j +catalogue-version 0.9k name play category Package @@ -249188,16 +249180,16 @@ catalogue-version 1.0 name pxjahyper category Package -revision 56573 +revision 56662 shortdesc Hyperref support for pLaTeX relocated 1 longdesc This package adjusts the behavior of hyperref on (u)pLaTeX so longdesc that authors can properly create PDF documents that contain longdesc document information in Japanese. -containersize 15076 -containerchecksum 8e0d6170b7a581100aea33f1780a0449a5894b43ff12bb9bb1d3b6213b8a2a33c5dd7e74e2894ae6a58f7ca56008f4b9a7192775cc3518c0326a6b953b31260d -doccontainersize 121696 -doccontainerchecksum b251f5de00df4ec6f7b69023e6bb33ba35453e5c2b92acc969d59ee0d44e82b8e1845c2d1efce71b75d610d3463154fde2bd4b7a299bfa01c3af30b78e27682e +containersize 14904 +containerchecksum 21fe7aa128154a4e6086ca8e8a14f3130278517277c47a46beaaa0e2c6a53e691060ad00868fe4e38105c63688fb4e10a5fd1f920bd8fd4fb102a2215ec97d45 +doccontainersize 121700 +doccontainerchecksum e39ffa2b648e3005dffb32d06db950ed72dd5a6b2cd75f63e57a58ede9bdaaf4adc5349027ca6e077a39b1e35f7679b199aaad7d22f19c8858876382764c8eac docfiles size=36 RELOC/doc/platex/pxjahyper/LICENSE RELOC/doc/platex/pxjahyper/README-ja.md details="Readme (Japanese)" language="ja" @@ -296053,18 +296045,18 @@ catalogue-version 0.1 name thuthesis category Package -revision 56305 +revision 56659 shortdesc Thesis template for Tsinghua University relocated 1 longdesc This package establishes a simple and easy-to-use LaTeX longdesc template for Tsinghua dissertations, including general longdesc undergraduate research papers, masters theses, doctoral longdesc dissertations, and postdoctoral reports. -containersize 38740 -containerchecksum fb7efc08f75995cf1598ddf6c7c9c18fb23110fab75cd3d2c2412f2b1b0788a03673db76339b01ef97a539eddefc69d371a50b947bbdba94e011aba9c9c39edd -doccontainersize 2426596 -doccontainerchecksum 839ba4e7ef67c769e89f4f26882487a999d77da4de4c37f90e0814b57db0a43f4f527fe12b7077fac85d9ffc7e5ca77bc9026ebc1e89f3cb480e9be4cbcaa4bd -docfiles size=672 +containersize 39164 +containerchecksum 0d95c02814b57c503d1cdab1094caa8d44288f400f333547a2cbb0d75f9158d7c262ce6ca7d103ef46db5eb116dab9198b227c138dfe98e13cfe4a99f831a054 +doccontainersize 1503876 +doccontainerchecksum 85b211be8449a5d280db6a427e36ff8dd6daf66d2f8c07e1e99d9faf656a00b8fba1315ee8b919ee7c37527c2291004aa267cd385269e518fba507a3f1b7a793 +docfiles size=407 RELOC/doc/latex/thuthesis/CHANGELOG.md RELOC/doc/latex/thuthesis/LICENSE RELOC/doc/latex/thuthesis/Makefile @@ -296076,19 +296068,13 @@ docfiles size=672 RELOC/doc/latex/thuthesis/data/appendix.tex RELOC/doc/latex/thuthesis/data/chap01.tex RELOC/doc/latex/thuthesis/data/chap02.tex + RELOC/doc/latex/thuthesis/data/chap03.tex + RELOC/doc/latex/thuthesis/data/chap04.tex RELOC/doc/latex/thuthesis/data/comments.tex RELOC/doc/latex/thuthesis/data/committee.tex RELOC/doc/latex/thuthesis/data/denotation.tex RELOC/doc/latex/thuthesis/data/resolution.tex RELOC/doc/latex/thuthesis/data/resume.tex - RELOC/doc/latex/thuthesis/figures/committee.pdf - RELOC/doc/latex/thuthesis/figures/scan-copyright.pdf - RELOC/doc/latex/thuthesis/figures/scan-record.pdf - RELOC/doc/latex/thuthesis/figures/scan-statement.pdf - RELOC/doc/latex/thuthesis/figures/thu-fig-logo.pdf - RELOC/doc/latex/thuthesis/figures/thu-lib-logo.pdf - RELOC/doc/latex/thuthesis/figures/thu-text-logo.pdf - RELOC/doc/latex/thuthesis/figures/thu-whole-logo.pdf RELOC/doc/latex/thuthesis/latexmkrc RELOC/doc/latex/thuthesis/ref/appendix.bib RELOC/doc/latex/thuthesis/ref/refs.bib @@ -296098,12 +296084,12 @@ docfiles size=672 RELOC/doc/latex/thuthesis/thuthesis-example.pdf details="Example of use (Chinese)" language="zh" RELOC/doc/latex/thuthesis/thuthesis-example.tex RELOC/doc/latex/thuthesis/thuthesis.pdf details="Package documentation (Chinese)" language="zh" -srccontainersize 42716 -srccontainerchecksum 608175b2b46369d59b108e1d0c1bdc0e4677c56bae5ca9b0fd7a98c078fe25952f3265ca2d85cc785a4cd548b3dcf2ad8764908f485268e471c8c210ea9ee89a -srcfiles size=45 +srccontainersize 42108 +srccontainerchecksum c360eec95b59cbb77b9ef51b454b48bcee07763ea733c187c0f8c5a39f4052d744f5b3c17ad7fc786539b0190bd03e906f487462ece32661f45a7ecd42ccedda +srcfiles size=44 RELOC/source/latex/thuthesis/thuthesis.dtx RELOC/source/latex/thuthesis/thuthesis.ins -runfiles size=66 +runfiles size=67 RELOC/bibtex/bst/thuthesis/thuthesis-author-year.bst RELOC/bibtex/bst/thuthesis/thuthesis-bachelor.bst RELOC/bibtex/bst/thuthesis/thuthesis-numeric.bst @@ -296122,7 +296108,7 @@ catalogue-contact-repository https://github.com/tuna/thuthesis catalogue-ctan /macros/latex/contrib/thuthesis catalogue-license lppl1.3 catalogue-topics dissertation class chinese -catalogue-version 7.0.0 +catalogue-version 7.1.0 name ticket category Package @@ -328252,7 +328238,7 @@ catalogue-topics font font-mf font-greek greek name yathesis category Package -revision 55578 +revision 56667 shortdesc A LaTeX class for writing a thesis following French rules relocated 1 longdesc The purpose of yathesis is to facilitate the typesetting of @@ -328270,11 +328256,11 @@ longdesc doc/latex/yathesis/french/exemples/ directory in the longdesc distribution. They can also be tested on ShareLaTeX (template longdesc and specimen) and on Overleaf (template and specimen). Note: longdesc The "ya" in the package name stands for "yet another". -containersize 22948 -containerchecksum 6568c02322bed6aa694089977c81d3f86d9cc184fd75afbb23a1b41021dd304f36ba9e5809c233ef9b0b04709f7e98d77b526569d8dc134de527985093b8b50a -doccontainersize 4983008 -doccontainerchecksum 9212f8068e78c12e315f2fad35ace56881d7c4ba8436bed2312fd37083ffbba6fea408df29f7b88578ddadbc3697416726f21395c56ca1dc71d60e80c8cc6456 -docfiles size=3284 +containersize 23156 +containerchecksum e0caca0434238bcc76c8da3f9c59ecd412618d9bd64d0085782a54dfd63ef1f4f37089a362d97182a645624f92a616814bbb908fb11f3c859793546a9240b629 +doccontainersize 5750536 +doccontainerchecksum be719c2eaecaa6773b68a1497b6819d0d3e3d4f08887351ffab7a9089167d5ef268d55386c644c8fb9fdf5141baf7203755cbc4e5892fc47b269ccb654796e77 +docfiles size=3208 RELOC/doc/latex/yathesis/CHANGELOG.md RELOC/doc/latex/yathesis/README.md details="Readme" RELOC/doc/latex/yathesis/addons/completion/yathesis.cwl @@ -328345,9 +328331,9 @@ docfiles size=3284 RELOC/doc/latex/yathesis/french/exemples/specimen/a-plat/these.tex RELOC/doc/latex/yathesis/french/exemples/specimen/a-plat/tiger.pdf RELOC/doc/latex/yathesis/french/exemples/specimen/a-plat/ulco.pdf -srccontainersize 50316 -srccontainerchecksum e8960ed6c320f403d84eec1be5fa4b2c459715f315623c7384538dd91369e65ba848e6e41e796f3bde7c29618f8ce80b785b05ac841e87c66bd7e359fba25a3c -srcfiles size=66 +srccontainersize 50640 +srccontainerchecksum ff6674724d8c12dd8e78244330cd42fe934038cf6f026e0463209a99f65cd7b23c33e4aa053592350509afa7daa1058674db862975609abc33f1f4f5db74a593 +srcfiles size=67 RELOC/source/latex/yathesis/yathesis-samples-templates.dtx RELOC/source/latex/yathesis/yathesis.dtx runfiles size=36 @@ -328359,7 +328345,7 @@ catalogue-contact-repository https://github.com/dbitouze/yathesis catalogue-ctan /macros/latex/contrib/yathesis catalogue-license lppl1.3c catalogue-topics class dissertation french -catalogue-version 1.0.3 +catalogue-version 1.0.4 name yax category Package diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 index b6cd2bfb85..863f6e6a93 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 @@ -1 +1 @@ -76fe3faf071fe5ae5760aa393fc1d7b0 texlive.tlpdb +52c6363583252a8d9e83bbda5b220acf texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 index f1fe98d3a5..0fd3386c6d 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 @@ -1 +1 @@ -4eac116866a30d7a54e2de24e7e6c6f2c36e16226dc33fb33024bda728e2434b0bece8e38dbf00c972a8d6cb8cb9212e52b20453d4807a99530be257f83fd68b texlive.tlpdb +fdb3929271b8166eb01e072596bfff08ca1990b867c1204de990510f1cd6b1527422eff4ca4b4df64cc7bc2dc6a5fbf7c601e4eb40fd53256e1e8543550b922a texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc index 99628d4124..5bf0f8ce43 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc @@ -1,10 +1,10 @@ -----BEGIN PGP SIGNATURE----- -iQEcBAEBCgAGBQJfhj7XAAoJEEzhh34ZQ4xwEWoH/jI7LitGXD8rClMXl5P906ml -kpnGtM5C2ADV9OD0LvPD9h3774gkG1Ya+Mz0SqNuFwy7U9cbPRc70M/Ng8vGVEFN -x9xgctUp5PUzDaPGj+ie+eeCzypMiST2kNRgHKVOSbDiFh+xHY1q0xDV1b+AD6C2 -6jSWK6mgDUavnJyHiMeGY53ooUtA8oLYDZ2j/bUH8/Ywl+yr/QY/NCc9BlEh43lv -dOvnw1bmD9mklqeLt+EEwUQ3BciENF3aGDB0YsPMIOP5/9HGuL8IVysh7zbXORGg -7HvXgu0jTgAVFtE2Ei71RWJcegSEidcS8PJ8lbSU2lSfoBu+I2y4EgZkwRl1GLY= -=KV81 +iQEcBAEBCgAGBQJfh5BiAAoJEEzhh34ZQ4xw9qcH/0lo9H7Fpyp+WfXpoZXY9iRB +GZbKbsbu0VDxGnjDDo55FEPc/afSTHC8/ioJQW9cG6AiPr061BIYEqUZG8IPwc3n +Wmsusx6AE6HdkHA4J/PmuthVwYBX/WynZdk3J5j0X9sjZzG5c/R+V3XtB34y4p/L +FTGzFJT9kaeBR3n0YfTtBbvCe5JU8+0ge2OdZXfd+z52g2p8QBkcOK1AHCol3Pyt +Yx7iawfjAtgPXQBkFS+JXpH9lw6GhrA2fJlVBw58ET8QAKG0wsZY+De4FNIcnqry +9gPASjboW+hktRIl1VIQrqsQ/QsfvhR8T8pz84JnGXeUmdNTGeGCJ/uES7yZEsw= +=x0cQ -----END PGP SIGNATURE----- diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz Binary files differindex 7ae6b1a523..8bca7f60b2 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz diff --git a/systems/win32/w32tex/ChangeLog b/systems/win32/w32tex/ChangeLog index 1ce6273f16..81d7d36ce6 100644 --- a/systems/win32/w32tex/ChangeLog +++ b/systems/win32/w32tex/ChangeLog @@ -1,5 +1,33 @@ W32TeX (x86 & x64) ChangeLog +[2020/10/14] +(01) dvipdfm-w32.tar.xz + Update dvipdfmx.dll (20201014), and a map file. +(02) dvipsk-w32.tar.xz + Update a map file. +(03) ltxpkgs.tar.xz + Add makecmds. +(04) mftools.tar.xz + Update a map file. +(05) pdftex-w32.tar.xz + Update a map file. +(06) ptex-ng-w32.tar.xz + Update libdpx. +(07) t1fonts.tar.xz + Add cm-super fonts. +(08) web2c-lib.tar.xz + Add lh fonts (cyrillic). Update babel/ukrainian. +(09) web2c-w32.tar.xz + Update updmap.cfg. +(10) xetex-w32.tar.xz + Update dvipdfmx.dll (20201014). +(11) win64/dvipdfm-w64.tar.xz + Update dvipdfmx.dll (20201014). +(12) win64/ptex-ng-w64.tar.xz + Update libdpx. +(13) win64/xetex-w64.tar.xz + Update dvipdfmx.dll (20201014). + [2020/10/13] (01) ltxpkgs.tar.xz Update expkv-def. @@ -2,4 +2,4 @@ # The source CTAN of this site's material: dante.ctan.org # The year-month-day-hour-minute of this site's material: -2020-10-14-02-02 +2020-10-15-02-02 |