summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-10-11 03:01:16 +0000
committerNorbert Preining <norbert@preining.info>2022-10-11 03:01:16 +0000
commit2713ec666b0e53418a839b97c48e0a9234fe5c98 (patch)
tree44f44c40d7cf3d6c2c0be9da7bfcf4dad97eb483
parent9c7942efff8183c8695ec824008847dd068dbfe7 (diff)
CTAN sync 202210110301
-rw-r--r--FILES.byname536
-rw-r--r--FILES.byname.gzbin2458258 -> 2458394 bytes
-rw-r--r--FILES.last07days596
-rw-r--r--biblio/ctan-bibdata/ctan.bib1130
-rw-r--r--biblio/ctan-bibdata/ctan.pdfbin2139368 -> 3585290 bytes
-rw-r--r--graphics/mcf2graph/CHANGELOG7
-rw-r--r--graphics/mcf2graph/README4
-rw-r--r--graphics/mcf2graph/mcf2graph.mp97
-rw-r--r--graphics/mcf2graph/mcf_exa_code.pdfbin79537 -> 78850 bytes
-rw-r--r--graphics/mcf2graph/mcf_exa_code.tex5
-rw-r--r--graphics/mcf2graph/mcf_exa_soc.mp18
-rw-r--r--graphics/mcf2graph/mcf_example.pdfbin450444 -> 449243 bytes
-rw-r--r--graphics/mcf2graph/mcf_example.tex4
-rw-r--r--graphics/mcf2graph/mcf_library.mcf2125
-rw-r--r--graphics/mcf2graph/mcf_man_soc.mp8
-rw-r--r--graphics/mcf2graph/mcf_manual.pdfbin289199 -> 289188 bytes
-rw-r--r--graphics/mcf2graph/mcf_manual.tex85
-rw-r--r--graphics/mcf2graph/mcf_mplib_exa.pdfbin195580 -> 195490 bytes
-rw-r--r--graphics/mcf2graph/mcf_mplib_exa.tex19
-rw-r--r--graphics/pgf/contrib/tikz-ext/README.md2
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-calendar.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-calendar.tex)22
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-intro.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-intro.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-calendar-plus.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-calendar-plus.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-misc.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-misc.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-node-families.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-node-families.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-paths.arcto.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-paths.arcto.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-paths.ortho.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-paths.ortho.tex)60
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-paths.timer.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-paths.timer.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-patterns.images.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-patterns.images.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-positioning-plus.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-positioning-plus.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-topaths.arcthrough.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-topaths.arcthrough.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-trans.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-trans.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-main-body.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-main-body.tex)26
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-main-preamble.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-main-preamble.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-circlearrow.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-circlearrow.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-circlecrosssplit.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-circlecrosssplit.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-heatmark.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-heatmark.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-rectround.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-rectround.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-superellipse.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-superellipse.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-trans.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-trans.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual.bib (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.bib)23
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual.pdf (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.pdf)bin525958 -> 534933 bytes
-rw-r--r--graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual.tex (renamed from graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.tex)12
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgfcalendar-ext.code.tex (renamed from graphics/pgf/contrib/tikz-ext/pgfcalendar-ext.code.tex)85
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.circlearrow.code.tex (renamed from graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.circlearrow.code.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.circlecrosssplit.code.tex (renamed from graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.circlecrosssplit.code.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.heatmark.code.tex (renamed from graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.heatmark.code.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.rectangleroundedcorners.code.tex (renamed from graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.rectangleroundedcorners.code.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.superellipse.code.tex (renamed from graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.superellipse.code.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.transformations.mirror.code.tex (renamed from graphics/pgf/contrib/tikz-ext/pgflibraryext.transformations.mirror.code.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.calendar-plus.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tikzlibraryext.calendar-plus.code.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.misc.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tikzlibraryext.misc.code.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.node-families.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tikzlibraryext.node-families.code.tex)2
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.node-families.shapes.geometric.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tikzlibraryext.node-families.shapes.geometric.code.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.arcto.code.tex326
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.ortho.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tikzlibraryext.paths.ortho.code.tex)77
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.timer.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tikzlibraryext.paths.timer.code.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.patterns.images.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tikzlibraryext.patterns.images.code.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.positioning-plus.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tikzlibraryext.positioning-plus.code.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.topaths.arcthrough.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tikzlibraryext.topaths.arcthrough.code.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.transformations.mirror.code.tex (renamed from graphics/pgf/contrib/tikz-ext/tikzlibraryext.transformations.mirror.code.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/latex/tikz-ext/pgfcalendar-ext.sty (renamed from graphics/pgf/contrib/tikz-ext/pgfcalendar-ext.sty)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/tex/plain/tikz-ext/pgfcalendar-ext.tex (renamed from graphics/pgf/contrib/tikz-ext/pgfcalendar-ext.tex)0
-rw-r--r--graphics/pgf/contrib/tikz-ext/tikzlibraryext.paths.arcto.code.tex104
-rw-r--r--macros/latex/contrib/centeredline/README.md46
-rw-r--r--macros/latex/contrib/centeredline/centeredline.sty24
-rw-r--r--macros/latex/contrib/currfile/README6
-rw-r--r--macros/latex/contrib/currfile/currfile.dtx29
-rw-r--r--macros/latex/contrib/currfile/currfile.pdfbin172948 -> 182606 bytes
-rw-r--r--macros/latex/contrib/exam-n/A1.clo82
-rw-r--r--macros/latex/contrib/exam-n/README69
-rw-r--r--macros/latex/contrib/exam-n/README.md (renamed from macros/latex/contrib/exam-n/README.ctan)0
-rw-r--r--macros/latex/contrib/exam-n/exam-n.dtx1518
-rw-r--r--macros/latex/contrib/exam-n/exam-n.html473
-rw-r--r--macros/latex/contrib/exam-n/exam-n.pdfbin271514 -> 230344 bytes
-rw-r--r--macros/latex/contrib/exam-n/examndefs.sty121
-rw-r--r--macros/latex/contrib/exam-n/myclass.clo42
-rw-r--r--macros/latex/contrib/exam-n/notes-for-authors.pdfbin228150 -> 241142 bytes
-rw-r--r--macros/latex/contrib/exam-n/notes-for-authors.tex225
-rw-r--r--macros/latex/contrib/exam-n/release-notes-dist.html656
-rw-r--r--macros/latex/contrib/exam-n/release-notes.dtx43
-rw-r--r--macros/latex/contrib/exam-n/release-notes.html340
-rw-r--r--macros/latex/contrib/exam-n/sample/Makefile25
-rw-r--r--macros/latex/contrib/exam-n/sample/cosmo1.tex37
-rw-r--r--macros/latex/contrib/exam-n/sample/cosmo2.tex8
-rw-r--r--macros/latex/contrib/exam-n/sample/cosmo3.tex4
-rw-r--r--macros/latex/contrib/exam-n/sample/dynamical1.tex8
-rw-r--r--macros/latex/contrib/exam-n/sample/sample_exam.tex46
-rw-r--r--macros/latex/contrib/exam-n/sample/sample_exam_mcq.tex (renamed from macros/latex/contrib/exam-n/sample/sample_mcq.tex)0
-rw-r--r--macros/latex/contrib/exam-n/sample/sample_exam_solution.tex65
-rw-r--r--macros/latex/contrib/exam-n/sample_exam.pdfbin192111 -> 0 bytes
-rw-r--r--macros/latex/contrib/exam-n/sample_exam_solution.pdfbin246164 -> 0 bytes
-rw-r--r--macros/latex/contrib/exam-n/style.css230
-rw-r--r--macros/latex/contrib/exam-n/template-master.pdfbin0 -> 60878 bytes
-rw-r--r--macros/latex/contrib/exam-n/template-master.tex20
-rw-r--r--macros/latex/contrib/exam-n/template-question.pdfbin0 -> 59142 bytes
-rw-r--r--macros/latex/contrib/exam-n/template-question.tex22
-rw-r--r--macros/latex/contrib/iexec/iexec.dtx36
-rw-r--r--macros/latex/contrib/iexec/iexec.pdfbin294434 -> 293850 bytes
-rw-r--r--macros/latex/contrib/pdfpages/pdfpages.dtx50
-rw-r--r--macros/latex/contrib/pdfpages/pdfpages.pdfbin300782 -> 301211 bytes
-rw-r--r--macros/latex/contrib/standalone/DEPENDS.txt10
-rw-r--r--macros/latex/contrib/standalone/README9
-rw-r--r--macros/latex/contrib/standalone/standalone.dtx43
-rw-r--r--macros/latex/contrib/standalone/standalone.pdfbin270986 -> 280807 bytes
-rw-r--r--macros/luatex/latex/japanese-mathformulas/README.txt4
-rw-r--r--macros/luatex/latex/japanese-mathformulas/japanese-mathformulas-sample.tex2
-rw-r--r--macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.pdfbin550271 -> 565692 bytes
-rw-r--r--macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.sty1825
-rw-r--r--macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.tex150
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl4
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb209
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.md52
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha5122
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc14
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2416832 -> 2415064 bytes
-rw-r--r--systems/win32/miktex/tm/packages/next/pr.ini8
-rw-r--r--systems/win32/miktex/tm/packages/pr.ini8
-rw-r--r--timestamp2
119 files changed, 6976 insertions, 4914 deletions
diff --git a/FILES.byname b/FILES.byname
index 560f8bb2d5..a2ad828d09 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -2037,10 +2037,10 @@
2022/09/23 | 591448 | biblio/citation-style-language.zip
2022/10/08 | 1476 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx
-2022/10/09 | 2598283 | biblio/ctan-bibdata/ctan.bib
-2022/10/09 | 2139676 | biblio/ctan-bibdata/ctan.pdf
+2022/10/10 | 2598283 | biblio/ctan-bibdata/ctan.bib
+2022/10/10 | 2139368 | biblio/ctan-bibdata/ctan.pdf
2022/10/08 | 1415 | biblio/ctan-bibdata/README
-2022/10/09 | 2606778 | biblio/ctan-bibdata.zip
+2022/10/10 | 2606398 | biblio/ctan-bibdata.zip
2022/02/06 | 3110 | biblio/pbibtex/pbibtex-base/cpp.awk
2022/02/06 | 1009 | biblio/pbibtex/pbibtex-base/generate.sh
2022/02/06 | 22422 | biblio/pbibtex/pbibtex-base/jabbrv.bst
@@ -5414,7 +5414,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
-2022/10/09 | 115585 | FILES.last07days
+2022/10/10 | 112311 | FILES.last07days
2021/07/24 | 1139410 | fonts/aboensis/Aboensis.glyphs
2021/07/24 | 18907382 | fonts/aboensis/aboensis.pdf
2021/07/24 | 137860 | fonts/aboensis/Aboensis-Regular.otf
@@ -155253,21 +155253,21 @@
2011/05/31 | 231925 | graphics/mathspic/perl/sourcecode113.html
2011/05/31 | 183530 | graphics/mathspic/perl/sourcecode113.nw
2011/05/31 | 2864043 | graphics/mathspic/perl/sourcecode113.pdf
-2022/08/22 | 18356 | graphics/mcf2graph/CHANGELOG
-2022/08/22 | 101605 | graphics/mcf2graph/mcf2graph.mp
-2022/08/22 | 79537 | graphics/mcf2graph/mcf_exa_code.pdf
-2022/08/22 | 3812 | graphics/mcf2graph/mcf_exa_code.tex
-2022/08/22 | 450444 | graphics/mcf2graph/mcf_example.pdf
-2022/08/22 | 2984 | graphics/mcf2graph/mcf_example.tex
-2022/08/22 | 2349 | graphics/mcf2graph/mcf_exa_soc.mp
-2022/08/22 | 104856 | graphics/mcf2graph/mcf_library.mcf
-2022/08/22 | 43352 | graphics/mcf2graph/mcf_man_soc.mp
-2022/08/22 | 289199 | graphics/mcf2graph/mcf_manual.pdf
-2022/08/22 | 57611 | graphics/mcf2graph/mcf_manual.tex
-2022/08/22 | 195580 | graphics/mcf2graph/mcf_mplib_exa.pdf
-2022/08/22 | 14575 | graphics/mcf2graph/mcf_mplib_exa.tex
-2022/08/22 | 3649 | graphics/mcf2graph/README
-2022/08/22 | 1065030 | graphics/mcf2graph.zip
+2022/10/09 | 18474 | graphics/mcf2graph/CHANGELOG
+2022/10/10 | 102727 | graphics/mcf2graph/mcf2graph.mp
+2022/10/10 | 78850 | graphics/mcf2graph/mcf_exa_code.pdf
+2022/10/10 | 3846 | graphics/mcf2graph/mcf_exa_code.tex
+2022/10/10 | 449243 | graphics/mcf2graph/mcf_example.pdf
+2022/10/10 | 2984 | graphics/mcf2graph/mcf_example.tex
+2022/10/10 | 2677 | graphics/mcf2graph/mcf_exa_soc.mp
+2022/10/10 | 105669 | graphics/mcf2graph/mcf_library.mcf
+2022/10/10 | 43351 | graphics/mcf2graph/mcf_man_soc.mp
+2022/10/10 | 289188 | graphics/mcf2graph/mcf_manual.pdf
+2022/10/10 | 57524 | graphics/mcf2graph/mcf_manual.tex
+2022/10/10 | 195490 | graphics/mcf2graph/mcf_mplib_exa.pdf
+2022/10/10 | 14649 | graphics/mcf2graph/mcf_mplib_exa.tex
+2022/10/09 | 3649 | graphics/mcf2graph/README
+2022/10/10 | 1064132 | graphics/mcf2graph.zip
2004/07/13 | 8567 | graphics/metaplot/axes.mp
2004/06/28 | 1122 | graphics/metaplot/examples/cap1.cc
2004/06/28 | 2178 | graphics/metaplot/examples/cap1.mp
@@ -159399,51 +159399,51 @@
2020/06/30 | 590 | graphics/pgf/contrib/tikzducks/tikzlibraryducks.code.tex
2020/06/30 | 1603 | graphics/pgf/contrib/tikzducks/t-tikzducks.mkiv
2020/06/30 | 469453 | graphics/pgf/contrib/tikzducks.zip
-2022/09/24 | 11644 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.bib
-2022/09/24 | 3179 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-calendar.tex
-2022/09/24 | 1053 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-intro.tex
-2022/09/24 | 2962 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-calendar-plus.tex
-2022/09/24 | 8719 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-misc.tex
-2022/09/24 | 5784 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-node-families.tex
-2022/08/21 | 3948 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-paths.arcto.tex
-2022/09/24 | 8419 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-paths.ortho.tex
-2022/09/24 | 3526 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-paths.timer.tex
-2022/09/24 | 1689 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-patterns.images.tex
-2022/09/24 | 8730 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-positioning-plus.tex
-2022/08/21 | 2265 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-topaths.arcthrough.tex
-2022/09/18 | 5464 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-trans.tex
-2022/09/24 | 7169 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-main-body.tex
-2022/09/24 | 12400 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-main-preamble.tex
-2022/09/24 | 3661 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-circlearrow.tex
-2022/09/24 | 2593 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-circlecrosssplit.tex
-2022/09/24 | 3389 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-heatmark.tex
-2022/09/11 | 2673 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-rectround.tex
-2022/09/24 | 4047 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-superellipse.tex
-2022/09/24 | 5465 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-trans.tex
-2022/09/24 | 525958 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.pdf
-2022/09/24 | 852 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.tex
-2022/08/19 | 12932 | graphics/pgf/contrib/tikz-ext/pgfcalendar-ext.code.tex
-2022/08/21 | 257 | graphics/pgf/contrib/tikz-ext/pgfcalendar-ext.sty
-2022/08/21 | 297 | graphics/pgf/contrib/tikz-ext/pgfcalendar-ext.tex
-2022/09/11 | 3395 | graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.circlearrow.code.tex
-2022/09/10 | 8698 | graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.circlecrosssplit.code.tex
-2022/09/18 | 6480 | graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.heatmark.code.tex
-2022/08/27 | 11354 | graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.rectangleroundedcorners.code.tex
-2022/08/27 | 7901 | graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.superellipse.code.tex
-2022/08/14 | 3357 | graphics/pgf/contrib/tikz-ext/pgflibraryext.transformations.mirror.code.tex
-2022/09/24 | 933 | graphics/pgf/contrib/tikz-ext/README.md
-2022/09/24 | 2672 | graphics/pgf/contrib/tikz-ext/tikzlibraryext.calendar-plus.code.tex
-2022/09/18 | 9536 | graphics/pgf/contrib/tikz-ext/tikzlibraryext.misc.code.tex
-2022/09/24 | 13003 | graphics/pgf/contrib/tikz-ext/tikzlibraryext.node-families.code.tex
-2022/09/24 | 1535 | graphics/pgf/contrib/tikz-ext/tikzlibraryext.node-families.shapes.geometric.code.tex
-2022/08/16 | 4668 | graphics/pgf/contrib/tikz-ext/tikzlibraryext.paths.arcto.code.tex
-2022/09/18 | 28639 | graphics/pgf/contrib/tikz-ext/tikzlibraryext.paths.ortho.code.tex
-2022/08/14 | 8121 | graphics/pgf/contrib/tikz-ext/tikzlibraryext.paths.timer.code.tex
-2022/09/18 | 2442 | graphics/pgf/contrib/tikz-ext/tikzlibraryext.patterns.images.code.tex
-2022/09/18 | 10180 | graphics/pgf/contrib/tikz-ext/tikzlibraryext.positioning-plus.code.tex
-2022/08/16 | 2497 | graphics/pgf/contrib/tikz-ext/tikzlibraryext.topaths.arcthrough.code.tex
-2022/09/18 | 4722 | graphics/pgf/contrib/tikz-ext/tikzlibraryext.transformations.mirror.code.tex
-2022/09/24 | 557856 | graphics/pgf/contrib/tikz-ext.zip
+2022/10/09 | 12485 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual.bib
+2022/10/09 | 4172 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-calendar.tex
+2022/10/01 | 1053 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-intro.tex
+2022/10/01 | 2962 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-calendar-plus.tex
+2022/10/01 | 8719 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-misc.tex
+2022/10/01 | 5784 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-node-families.tex
+2022/08/21 | 3948 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-paths.arcto.tex
+2022/10/01 | 9088 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-paths.ortho.tex
+2022/10/01 | 3526 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-paths.timer.tex
+2022/10/01 | 1689 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-patterns.images.tex
+2022/10/01 | 8730 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-positioning-plus.tex
+2022/08/21 | 2265 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-topaths.arcthrough.tex
+2022/09/18 | 5464 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-trans.tex
+2022/10/09 | 7837 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-main-body.tex
+2022/10/01 | 12400 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-main-preamble.tex
+2022/10/01 | 3661 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-circlearrow.tex
+2022/10/01 | 2593 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-circlecrosssplit.tex
+2022/10/01 | 3389 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-heatmark.tex
+2022/09/11 | 2673 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-rectround.tex
+2022/10/01 | 4047 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-superellipse.tex
+2022/10/01 | 5465 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-trans.tex
+2022/10/09 | 534933 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual.pdf
+2022/10/09 | 772 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual.tex
+2022/10/09 | 933 | graphics/pgf/contrib/tikz-ext/README.md
+2022/10/09 | 15023 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgfcalendar-ext.code.tex
+2022/09/11 | 3395 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.circlearrow.code.tex
+2022/09/10 | 8698 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.circlecrosssplit.code.tex
+2022/09/18 | 6480 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.heatmark.code.tex
+2022/08/27 | 11354 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.rectangleroundedcorners.code.tex
+2022/08/27 | 7901 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.superellipse.code.tex
+2022/08/14 | 3357 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.transformations.mirror.code.tex
+2022/10/01 | 2672 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.calendar-plus.code.tex
+2022/09/18 | 9536 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.misc.code.tex
+2022/10/09 | 13006 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.node-families.code.tex
+2022/10/01 | 1535 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.node-families.shapes.geometric.code.tex
+2022/10/09 | 13557 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.arcto.code.tex
+2022/10/01 | 29169 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.ortho.code.tex
+2022/08/14 | 8121 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.timer.code.tex
+2022/09/18 | 2442 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.patterns.images.code.tex
+2022/09/18 | 10180 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.positioning-plus.code.tex
+2022/08/16 | 2497 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.topaths.arcthrough.code.tex
+2022/09/18 | 4722 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.transformations.mirror.code.tex
+2022/08/21 | 257 | graphics/pgf/contrib/tikz-ext/tex/latex/tikz-ext/pgfcalendar-ext.sty
+2022/08/21 | 297 | graphics/pgf/contrib/tikz-ext/tex/plain/tikz-ext/pgfcalendar-ext.tex
+2022/10/10 | 571141 | graphics/pgf/contrib/tikz-ext.zip
2019/08/19 | 2649 | graphics/pgf/contrib/tikz-feynhand/changes.txt
2019/08/19 | 1924 | graphics/pgf/contrib/tikz-feynhand/README.md
2016/08/12 | 48826 | graphics/pgf/contrib/tikz-feynhand/shell_escape.jpg
@@ -189380,7 +189380,7 @@
2018/11/01 | 1331970 | install/macros/latex/contrib/pdfcomment.tds.zip
2019/12/09 | 354248 | install/macros/latex/contrib/pdfescape.tds.zip
2019/12/05 | 304681 | install/macros/latex/contrib/pdflscape.tds.zip
-2022/05/22 | 391462 | install/macros/latex/contrib/pdfpages.tds.zip
+2022/10/09 | 391967 | install/macros/latex/contrib/pdfpages.tds.zip
2019/09/23 | 318990 | install/macros/latex/contrib/perltex.tds.zip
2013/10/16 | 519904 | install/macros/latex/contrib/pfarrei.tds.zip
2014/07/10 | 183200 | install/macros/latex/contrib/pgfopts.tds.zip
@@ -189417,7 +189417,6 @@
2019/12/15 | 357584 | install/macros/latex/contrib/soulutf8.tds.zip
2016/02/18 | 469004 | install/macros/latex/contrib/splitindex.tds.zip
2009/08/10 | 109289 | install/macros/latex/contrib/spverbatim.tds.zip
-2018/03/26 | 330819 | install/macros/latex/contrib/standalone.tds.zip
2009/09/04 | 137721 | install/macros/latex/contrib/stdclsdv.tds.zip
2009/06/15 | 111764 | install/macros/latex/contrib/steinmetz.tds.zip
2015/04/01 | 4736442 | install/macros/latex/contrib/stellenbosch.tds.zip
@@ -211260,9 +211259,9 @@
2022/04/21 | 29232 | macros/latex/contrib/censor/censor.tex
2021/12/23 | 1258 | macros/latex/contrib/censor/README
2022/04/21 | 238816 | macros/latex/contrib/censor.zip
-2019/05/03 | 1164 | macros/latex/contrib/centeredline/centeredline.sty
-2019/05/03 | 1822 | macros/latex/contrib/centeredline/README.md
-2019/05/03 | 1992 | macros/latex/contrib/centeredline.zip
+2022/10/10 | 826 | macros/latex/contrib/centeredline/centeredline.sty
+2022/10/10 | 2836 | macros/latex/contrib/centeredline/README.md
+2022/10/10 | 2231 | macros/latex/contrib/centeredline.zip
2020/10/12 | 3766 | macros/latex/contrib/centerlastline/centerlastline.dtx
2020/10/11 | 671 | macros/latex/contrib/centerlastline/centerlastline.ins
2020/10/12 | 226307 | macros/latex/contrib/centerlastline/centerlastline.pdf
@@ -212804,11 +212803,11 @@
2018/10/24 | 175744 | macros/latex/contrib/currency/currency.pdf
2017/07/05 | 1531 | macros/latex/contrib/currency/README.md
2018/10/24 | 711039 | macros/latex/contrib/currency.zip
-2020/09/29 | 46914 | macros/latex/contrib/currfile/currfile.dtx
-2020/09/29 | 294 | macros/latex/contrib/currfile/currfile.ins
-2020/09/29 | 172948 | macros/latex/contrib/currfile/currfile.pdf
-2020/09/29 | 386 | macros/latex/contrib/currfile/README
-2020/09/29 | 184528 | macros/latex/contrib/currfile.zip
+2022/10/10 | 47189 | macros/latex/contrib/currfile/currfile.dtx
+2022/10/10 | 294 | macros/latex/contrib/currfile/currfile.ins
+2022/10/10 | 182606 | macros/latex/contrib/currfile/currfile.pdf
+2022/10/10 | 390 | macros/latex/contrib/currfile/README
+2022/10/10 | 192072 | macros/latex/contrib/currfile.zip
1999/09/14 | 54299 | macros/latex/contrib/currvita/currvita.dtx
1999/09/14 | 1188 | macros/latex/contrib/currvita/currvita.ins
2006/12/09 | 109834 | macros/latex/contrib/currvita/currvita.pdf
@@ -215719,38 +215718,39 @@
2022/08/14 | 493628 | macros/latex/contrib/exam/examdoc.pdf
2022/08/14 | 303876 | macros/latex/contrib/exam/examdoc.tex
2022/08/16 | 135 | macros/latex/contrib/exam/exam.md5
-2016/12/20 | 3432 | macros/latex/contrib/exam-n/A1.clo
-2016/12/20 | 122331 | macros/latex/contrib/exam-n/exam-n.dtx
-2016/12/20 | 6202 | macros/latex/contrib/exam-n/exam-n.html
-2016/12/20 | 295 | macros/latex/contrib/exam-n/exam-n.ins
-2016/12/20 | 271514 | macros/latex/contrib/exam-n/exam-n.pdf
-2016/12/20 | 19106 | macros/latex/contrib/exam-n/lppl.txt
-2016/12/20 | 228150 | macros/latex/contrib/exam-n/notes-for-authors.pdf
-2016/12/20 | 12427 | macros/latex/contrib/exam-n/notes-for-authors.tex
-2016/12/20 | 2757 | macros/latex/contrib/exam-n/README
-2016/12/20 | 120 | macros/latex/contrib/exam-n/README.ctan
-2016/12/20 | 12484 | macros/latex/contrib/exam-n/release-notes.html
-2016/12/20 | 2816 | macros/latex/contrib/exam-n/sample/cosmo1.tex
-2016/12/20 | 1790 | macros/latex/contrib/exam-n/sample/cosmo2.tex
-2016/12/20 | 1688 | macros/latex/contrib/exam-n/sample/cosmo3.tex
-2016/12/20 | 4131 | macros/latex/contrib/exam-n/sample/dynamical1.tex
-2016/12/20 | 792 | macros/latex/contrib/exam-n/sample/dynamical2.tex
-2016/12/20 | 1759 | macros/latex/contrib/exam-n/sample/dynamical3.tex
-2016/12/20 | 192111 | macros/latex/contrib/exam-n/sample_exam.pdf
-2016/12/20 | 246164 | macros/latex/contrib/exam-n/sample_exam_solution.pdf
-2016/12/20 | 1244 | macros/latex/contrib/exam-n/sample/excos1.tex
-2016/12/20 | 444 | macros/latex/contrib/exam-n/sample/fig/spiral.eps
-2016/12/20 | 1799 | macros/latex/contrib/exam-n/sample/fig/spiral.pdf
-2016/12/20 | 752 | macros/latex/contrib/exam-n/sample/Makefile
-2016/12/20 | 560 | macros/latex/contrib/exam-n/sample/numerical1-solution.tex
-2016/12/20 | 2121 | macros/latex/contrib/exam-n/sample/numerical1.tex
-2016/12/20 | 1659 | macros/latex/contrib/exam-n/sample/numerical2.tex
-2016/12/20 | 1696 | macros/latex/contrib/exam-n/sample/numerical3.tex
-2016/12/20 | 1963 | macros/latex/contrib/exam-n/sample/sample_exam_solution.tex
-2016/12/20 | 1948 | macros/latex/contrib/exam-n/sample/sample_exam.tex
-2016/12/20 | 1856 | macros/latex/contrib/exam-n/sample/sample_mcq.tex
-2016/12/20 | 5185 | macros/latex/contrib/exam-n/style.css
-2016/12/20 | 1006758 | macros/latex/contrib/exam-n.zip
+2022/10/10 | 4108 | macros/latex/contrib/exam-n/examndefs.sty
+2022/10/10 | 153339 | macros/latex/contrib/exam-n/exam-n.dtx
+2022/10/10 | 16380 | macros/latex/contrib/exam-n/exam-n.html
+2022/10/10 | 295 | macros/latex/contrib/exam-n/exam-n.ins
+2022/10/10 | 230344 | macros/latex/contrib/exam-n/exam-n.pdf
+2022/10/10 | 19106 | macros/latex/contrib/exam-n/lppl.txt
+2022/10/10 | 1482 | macros/latex/contrib/exam-n/myclass.clo
+2022/10/10 | 241142 | macros/latex/contrib/exam-n/notes-for-authors.pdf
+2022/10/10 | 13575 | macros/latex/contrib/exam-n/notes-for-authors.tex
+2022/10/10 | 120 | macros/latex/contrib/exam-n/README.md
+2022/10/10 | 23270 | macros/latex/contrib/exam-n/release-notes-dist.html
+2022/10/10 | 4509 | macros/latex/contrib/exam-n/release-notes.dtx
+2022/10/10 | 3817 | macros/latex/contrib/exam-n/sample/cosmo1.tex
+2022/10/10 | 1783 | macros/latex/contrib/exam-n/sample/cosmo2.tex
+2022/10/10 | 1680 | macros/latex/contrib/exam-n/sample/cosmo3.tex
+2022/10/10 | 4127 | macros/latex/contrib/exam-n/sample/dynamical1.tex
+2022/10/10 | 792 | macros/latex/contrib/exam-n/sample/dynamical2.tex
+2022/10/10 | 1759 | macros/latex/contrib/exam-n/sample/dynamical3.tex
+2022/10/10 | 1244 | macros/latex/contrib/exam-n/sample/excos1.tex
+2022/10/10 | 444 | macros/latex/contrib/exam-n/sample/fig/spiral.eps
+2022/10/10 | 1799 | macros/latex/contrib/exam-n/sample/fig/spiral.pdf
+2022/10/10 | 1039 | macros/latex/contrib/exam-n/sample/Makefile
+2022/10/10 | 560 | macros/latex/contrib/exam-n/sample/numerical1-solution.tex
+2022/10/10 | 2121 | macros/latex/contrib/exam-n/sample/numerical1.tex
+2022/10/10 | 1659 | macros/latex/contrib/exam-n/sample/numerical2.tex
+2022/10/10 | 1696 | macros/latex/contrib/exam-n/sample/numerical3.tex
+2022/10/10 | 1856 | macros/latex/contrib/exam-n/sample/sample_exam_mcq.tex
+2022/10/10 | 2635 | macros/latex/contrib/exam-n/sample/sample_exam.tex
+2022/10/10 | 60878 | macros/latex/contrib/exam-n/template-master.pdf
+2022/10/10 | 429 | macros/latex/contrib/exam-n/template-master.tex
+2022/10/10 | 59142 | macros/latex/contrib/exam-n/template-question.pdf
+2022/10/10 | 550 | macros/latex/contrib/exam-n/template-question.tex
+2022/10/10 | 671218 | macros/latex/contrib/exam-n.zip
2005/01/10 | 18044 | macros/latex/contrib/examplep/codep.sty
2005/03/04 | 364081 | macros/latex/contrib/examplep/eurotex_2005_examplep.pdf
2005/03/04 | 94048 | macros/latex/contrib/examplep/eurotex_2005_examplep.tex
@@ -219656,13 +219656,13 @@
2015/08/26 | 130521 | macros/latex/contrib/IEEEtran/tools/IEEEtrantools.sty
2015/08/27 | 4190 | macros/latex/contrib/IEEEtran/tools/README
2015/08/28 | 1727001 | macros/latex/contrib/IEEEtran.zip
-2022/10/09 | 51 | macros/latex/contrib/iexec/DEPENDS.txt
-2022/10/09 | 10317 | macros/latex/contrib/iexec/iexec.dtx
-2022/10/09 | 2625 | macros/latex/contrib/iexec/iexec.ins
-2022/10/09 | 294434 | macros/latex/contrib/iexec/iexec.pdf
-2022/10/09 | 1083 | macros/latex/contrib/iexec/LICENSE.txt
-2022/10/09 | 1369 | macros/latex/contrib/iexec/README.md
-2022/10/09 | 298605 | macros/latex/contrib/iexec.zip
+2022/10/10 | 51 | macros/latex/contrib/iexec/DEPENDS.txt
+2022/10/10 | 10943 | macros/latex/contrib/iexec/iexec.dtx
+2022/10/10 | 2625 | macros/latex/contrib/iexec/iexec.ins
+2022/10/10 | 293850 | macros/latex/contrib/iexec/iexec.pdf
+2022/10/10 | 1083 | macros/latex/contrib/iexec/LICENSE.txt
+2022/10/10 | 1369 | macros/latex/contrib/iexec/README.md
+2022/10/10 | 298285 | macros/latex/contrib/iexec.zip
2004/10/19 | 24919 | macros/latex/contrib/ifacmtg/ifac.bst
2003/06/12 | 62063 | macros/latex/contrib/ifacmtg/ifacmtg.cls
1999/04/22 | 1681 | macros/latex/contrib/ifacmtg/ifacsam.bib
@@ -226022,13 +226022,13 @@
2015/07/24 | 7214 | macros/latex/contrib/pdfpagediff/pdfpagediff.sty
2015/07/24 | 757 | macros/latex/contrib/pdfpagediff/README
2015/07/24 | 1133077 | macros/latex/contrib/pdfpagediff.zip
-2022/05/22 | 12470 | macros/latex/contrib/pdfpages/dummy-l.pdf
-2022/05/22 | 30894 | macros/latex/contrib/pdfpages/dummy.pdf
-2022/05/22 | 178021 | macros/latex/contrib/pdfpages/pdfpages.dtx
-2022/05/22 | 2983 | macros/latex/contrib/pdfpages/pdfpages.ins
-2022/05/22 | 300782 | macros/latex/contrib/pdfpages/pdfpages.pdf
-2022/05/22 | 1382 | macros/latex/contrib/pdfpages/README
-2022/05/22 | 361007 | macros/latex/contrib/pdfpages.zip
+2022/10/09 | 12470 | macros/latex/contrib/pdfpages/dummy-l.pdf
+2022/10/09 | 30894 | macros/latex/contrib/pdfpages/dummy.pdf
+2022/10/09 | 178269 | macros/latex/contrib/pdfpages/pdfpages.dtx
+2022/10/09 | 2983 | macros/latex/contrib/pdfpages/pdfpages.ins
+2022/10/09 | 301211 | macros/latex/contrib/pdfpages/pdfpages.pdf
+2022/10/09 | 1382 | macros/latex/contrib/pdfpages/README
+2022/10/10 | 361493 | macros/latex/contrib/pdfpages.zip
2018/07/21 | 10095 | macros/latex/contrib/pdfpc-movie/pdfpc-movie-doc.dtx
2018/07/21 | 75745 | macros/latex/contrib/pdfpc-movie/pdfpc-movie-doc.pdf
2018/07/21 | 8102 | macros/latex/contrib/pdfpc-movie/pdfpc-movie.dtx
@@ -230533,11 +230533,12 @@
2022/03/28 | 154204 | macros/latex/contrib/stage/stage-documentation.pdf
2020/02/24 | 10807 | macros/latex/contrib/stage/stage-documentation.tex
2022/03/29 | 160279 | macros/latex/contrib/stage.zip
-2018/03/26 | 990 | macros/latex/contrib/standalone/README
-2018/03/26 | 186364 | macros/latex/contrib/standalone/standalone.dtx
-2018/03/26 | 442 | macros/latex/contrib/standalone/standalone.ins
-2018/03/26 | 270986 | macros/latex/contrib/standalone/standalone.pdf
-2018/03/26 | 314145 | macros/latex/contrib/standalone.zip
+2022/10/10 | 134 | macros/latex/contrib/standalone/DEPENDS.txt
+2022/10/10 | 1044 | macros/latex/contrib/standalone/README
+2022/10/10 | 186493 | macros/latex/contrib/standalone/standalone.dtx
+2022/10/10 | 442 | macros/latex/contrib/standalone/standalone.ins
+2022/10/10 | 280807 | macros/latex/contrib/standalone/standalone.pdf
+2022/10/10 | 322333 | macros/latex/contrib/standalone.zip
2011/09/14 | 175639 | macros/latex/contrib/statex2/statex2-example.pdf
2011/09/14 | 5592 | macros/latex/contrib/statex2/statex2-example.tex
2011/09/14 | 17386 | macros/latex/contrib/statex2/statex2.sty
@@ -237852,13 +237853,13 @@
2021/02/07 | 123627 | macros/luatex/latex/innerscript/innerscript.pdf
2021/02/07 | 1796 | macros/luatex/latex/innerscript/README.txt
2021/02/07 | 128136 | macros/luatex/latex/innerscript.zip
-2022/10/04 | 550271 | macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.pdf
+2022/10/10 | 565692 | macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.pdf
2022/10/04 | 132365 | macros/luatex/latex/japanese-mathformulas/japanese-mathformulas-sample.pdf
-2022/10/04 | 10635 | macros/luatex/latex/japanese-mathformulas/japanese-mathformulas-sample.tex
-2022/10/04 | 189014 | macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.sty
-2022/10/04 | 75927 | macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.tex
-2022/10/04 | 1731 | macros/luatex/latex/japanese-mathformulas/README.txt
-2022/10/04 | 709896 | macros/luatex/latex/japanese-mathformulas.zip
+2022/10/03 | 10625 | macros/luatex/latex/japanese-mathformulas/japanese-mathformulas-sample.tex
+2022/10/10 | 193552 | macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.sty
+2022/10/10 | 77362 | macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.tex
+2022/10/06 | 1739 | macros/luatex/latex/japanese-mathformulas/README.txt
+2022/10/10 | 725993 | macros/luatex/latex/japanese-mathformulas.zip
2022/10/03 | 19444 | macros/luatex/latex/letgut/doc/exemple-nouveautes.pdf
2022/10/03 | 1221 | macros/luatex/latex/letgut/doc/latexmkrc
2022/10/03 | 154201 | macros/luatex/latex/letgut/doc/letgut-banner-code.pdf
@@ -240793,7 +240794,7 @@
2004/12/19 | 17114 | macros/texinfo/contrib/texinfo-hu/texinfo/util/texinfo.dtd
2004/04/10 | 4702 | macros/texinfo/contrib/texinfo-hu/texinfo/util/texinfo.xsl
2004/04/10 | 2052 | macros/texinfo/contrib/texinfo-hu/texinfo/util/txitextest
-2022/01/10 | 22769 | macros/texinfo/latest/htmlxref.cnf
+2022/10/08 | 22555 | macros/texinfo/latest/htmlxref.cnf
2022/04/08 | 58497 | macros/texinfo/latest/texi2dvi
2021/07/03 | 1163 | macros/texinfo/latest/texi2pdf
2022/09/21 | 375196 | macros/texinfo/latest/texinfo.tex
@@ -283082,9 +283083,9 @@
2022/03/13 | 42852 | systems/texlive/tlnet/archive/chemmacros.r62655.tar.xz
2021/01/22 | 794728 | systems/texlive/tlnet/archive/chemnum.doc.r57490.tar.xz
2021/01/22 | 11532 | systems/texlive/tlnet/archive/chemnum.r57490.tar.xz
-2022/09/20 | 893812 | systems/texlive/tlnet/archive/chemobabel.doc.r64444.tar.xz
-2022/09/20 | 3288 | systems/texlive/tlnet/archive/chemobabel.r64444.tar.xz
-2022/09/20 | 15152 | systems/texlive/tlnet/archive/chemobabel.source.r64444.tar.xz
+2022/10/10 | 914092 | systems/texlive/tlnet/archive/chemobabel.doc.r64665.tar.xz
+2022/10/10 | 4304 | systems/texlive/tlnet/archive/chemobabel.r64665.tar.xz
+2022/10/10 | 15364 | systems/texlive/tlnet/archive/chemobabel.source.r64665.tar.xz
2021/09/26 | 970944 | systems/texlive/tlnet/archive/chemplants.doc.r60606.tar.xz
2021/09/26 | 7704 | systems/texlive/tlnet/archive/chemplants.r60606.tar.xz
2019/02/28 | 291444 | systems/texlive/tlnet/archive/chemschemex.doc.r46723.tar.xz
@@ -283469,7 +283470,7 @@
2020/03/04 | 408 | systems/texlive/tlnet/archive/collection-langpolish.r54074.tar.xz
2020/03/04 | 392 | systems/texlive/tlnet/archive/collection-langportuguese.r54074.tar.xz
2020/03/07 | 380 | systems/texlive/tlnet/archive/collection-langspanish.r54141.tar.xz
-2022/10/07 | 6776 | systems/texlive/tlnet/archive/collection-latexextra.r64639.tar.xz
+2022/10/10 | 6780 | systems/texlive/tlnet/archive/collection-latexextra.r64662.tar.xz
2022/06/10 | 700 | systems/texlive/tlnet/archive/collection-latex.r63515.tar.xz
2022/06/12 | 736 | systems/texlive/tlnet/archive/collection-latexrecommended.r63547.tar.xz
2022/09/15 | 920 | systems/texlive/tlnet/archive/collection-luatex.r64393.tar.xz
@@ -286167,6 +286168,9 @@
2020/04/15 | 340 | systems/texlive/tlnet/archive/git-latexdiff.x86_64-solaris.r54732.tar.xz
2019/02/28 | 99728 | systems/texlive/tlnet/archive/gitlog.doc.r38932.tar.xz
2019/02/28 | 2372 | systems/texlive/tlnet/archive/gitlog.r38932.tar.xz
+2022/10/10 | 290508 | systems/texlive/tlnet/archive/gitstatus.doc.r64662.tar.xz
+2022/10/10 | 1544 | systems/texlive/tlnet/archive/gitstatus.r64662.tar.xz
+2022/10/10 | 2624 | systems/texlive/tlnet/archive/gitstatus.source.r64662.tar.xz
2022/07/18 | 140860 | systems/texlive/tlnet/archive/gitver.doc.r63920.tar.xz
2022/07/18 | 2772 | systems/texlive/tlnet/archive/gitver.r63920.tar.xz
2019/02/28 | 156772 | systems/texlive/tlnet/archive/globalvals.doc.r49962.tar.xz
@@ -286852,9 +286856,9 @@
2022/04/06 | 17644 | systems/texlive/tlnet/archive/ieejtran.r62957.tar.xz
2019/02/28 | 3464 | systems/texlive/tlnet/archive/ietfbibs.doc.r41332.tar.xz
2019/02/28 | 456 | systems/texlive/tlnet/archive/ietfbibs.r41332.tar.xz
-2022/10/02 | 284432 | systems/texlive/tlnet/archive/iexec.doc.r64575.tar.xz
-2022/10/02 | 1864 | systems/texlive/tlnet/archive/iexec.r64575.tar.xz
-2022/10/02 | 3964 | systems/texlive/tlnet/archive/iexec.source.r64575.tar.xz
+2022/10/10 | 294484 | systems/texlive/tlnet/archive/iexec.doc.r64663.tar.xz
+2022/10/10 | 2116 | systems/texlive/tlnet/archive/iexec.r64663.tar.xz
+2022/10/10 | 4388 | systems/texlive/tlnet/archive/iexec.source.r64663.tar.xz
2021/07/24 | 175068 | systems/texlive/tlnet/archive/ifallfalse.doc.r60027.tar.xz
2021/07/24 | 1248 | systems/texlive/tlnet/archive/ifallfalse.r60027.tar.xz
2021/07/24 | 3084 | systems/texlive/tlnet/archive/ifallfalse.source.r60027.tar.xz
@@ -291619,8 +291623,8 @@
2020/02/02 | 158040 | systems/texlive/tlnet/archive/sansmathaccent.doc.r53628.tar.xz
2020/02/02 | 10604 | systems/texlive/tlnet/archive/sansmathaccent.r53628.tar.xz
2019/02/28 | 182264 | systems/texlive/tlnet/archive/sansmath.doc.r17997.tar.xz
-2021/06/23 | 297124 | systems/texlive/tlnet/archive/sansmathfonts.doc.r59673.tar.xz
-2021/06/23 | 4275628 | systems/texlive/tlnet/archive/sansmathfonts.r59673.tar.xz
+2022/10/10 | 365128 | systems/texlive/tlnet/archive/sansmathfonts.doc.r64661.tar.xz
+2022/10/10 | 4275704 | systems/texlive/tlnet/archive/sansmathfonts.r64661.tar.xz
2019/02/28 | 3356 | systems/texlive/tlnet/archive/sansmath.r17997.tar.xz
2022/07/05 | 276796 | systems/texlive/tlnet/archive/sapthesis.doc.r63810.tar.xz
2022/07/05 | 30276 | systems/texlive/tlnet/archive/sapthesis.r63810.tar.xz
@@ -292868,7 +292872,7 @@
2022/09/13 | 600 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r64356.tar.xz
-2022/10/09 | 421700 | systems/texlive/tlnet/archive/texlive-scripts.doc.r64645.tar.xz
+2022/10/10 | 421840 | systems/texlive/tlnet/archive/texlive-scripts.doc.r64659.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
@@ -292892,7 +292896,7 @@
2022/09/13 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r64356.tar.xz
-2022/10/09 | 113672 | systems/texlive/tlnet/archive/texlive-scripts.r64645.tar.xz
+2022/10/10 | 113660 | systems/texlive/tlnet/archive/texlive-scripts.r64659.tar.xz
2022/09/13 | 580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz
2022/04/19 | 36296 | systems/texlive/tlnet/archive/texlive-scripts.win32.r63068.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz
@@ -293119,9 +293123,9 @@
2021/03/02 | 86548 | systems/texlive/tlnet/archive/thaispec.doc.r58019.tar.xz
2021/03/02 | 3240 | systems/texlive/tlnet/archive/thaispec.r58019.tar.xz
2021/03/02 | 7068 | systems/texlive/tlnet/archive/thaispec.source.r58019.tar.xz
-2022/06/17 | 470844 | systems/texlive/tlnet/archive/thalie.doc.r63617.tar.xz
-2022/06/17 | 5156 | systems/texlive/tlnet/archive/thalie.r63617.tar.xz
-2022/06/17 | 20032 | systems/texlive/tlnet/archive/thalie.source.r63617.tar.xz
+2022/10/10 | 479556 | systems/texlive/tlnet/archive/thalie.doc.r64664.tar.xz
+2022/10/10 | 5160 | systems/texlive/tlnet/archive/thalie.r64664.tar.xz
+2022/10/10 | 20224 | systems/texlive/tlnet/archive/thalie.source.r64664.tar.xz
2022/09/27 | 44216 | systems/texlive/tlnet/archive/theanodidot.doc.r64518.tar.xz
2022/09/27 | 377196 | systems/texlive/tlnet/archive/theanodidot.r64518.tar.xz
2022/09/27 | 33272 | systems/texlive/tlnet/archive/theanomodern.doc.r64520.tar.xz
@@ -294158,9 +294162,9 @@
2019/02/28 | 85512 | systems/texlive/tlnet/archive/warpcol.doc.r15878.tar.xz
2019/02/28 | 1336 | systems/texlive/tlnet/archive/warpcol.r15878.tar.xz
2019/02/28 | 3416 | systems/texlive/tlnet/archive/warpcol.source.r15878.tar.xz
-2019/02/28 | 578872 | systems/texlive/tlnet/archive/was.doc.r21439.tar.xz
-2019/02/28 | 3092 | systems/texlive/tlnet/archive/was.r21439.tar.xz
-2019/02/28 | 9388 | systems/texlive/tlnet/archive/was.source.r21439.tar.xz
+2022/10/10 | 467912 | systems/texlive/tlnet/archive/was.doc.r64667.tar.xz
+2022/10/10 | 2756 | systems/texlive/tlnet/archive/was.r64667.tar.xz
+2022/10/10 | 8480 | systems/texlive/tlnet/archive/was.source.r64667.tar.xz
2020/01/25 | 305032 | systems/texlive/tlnet/archive/wasy.doc.r53533.tar.xz
2020/01/25 | 24132 | systems/texlive/tlnet/archive/wasy.r53533.tar.xz
2020/03/04 | 163244 | systems/texlive/tlnet/archive/wasysym.doc.r54080.tar.xz
@@ -294736,16 +294740,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
2022/07/17 | 124404 | systems/texlive/tlnet/install-tl
-2022/10/09 | 5832291 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/10/09 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/10/09 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/10/10 | 5832291 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/10/10 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/10/10 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2022/10/09 | 20433558 | systems/texlive/tlnet/install-tl-windows.exe
-2022/10/09 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/10/09 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/10/09 | 25516720 | systems/texlive/tlnet/install-tl.zip
-2022/10/09 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/10/09 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/10/10 | 20437291 | systems/texlive/tlnet/install-tl-windows.exe
+2022/10/10 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/10/10 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/10/10 | 25516749 | systems/texlive/tlnet/install-tl.zip
+2022/10/10 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/10/10 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2022/04/03 | 1229 | systems/texlive/tlnet/README.md
2022/04/03 | 0 | systems/texlive/tlnet/TEXLIVE_2022
2022/02/28 | 7791 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -294753,9 +294757,9 @@
2016/04/12 | 0 | systems/texlive/tlnet/tlpkg/gpg/secring.gpg
2022/09/11 | 2395 | systems/texlive/tlnet/tlpkg/gpg/tl-key-extension.txt
2022/02/28 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
-2022/09/12 | 49769 | systems/texlive/tlnet/tlpkg/installer/config.guess
+2022/10/09 | 49938 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2022/10/07 | 7195 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2022/10/09 | 7149 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/07/21 | 222477 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt
2020/04/15 | 2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe
2017/04/16 | 2629 | systems/texlive/tlnet/tlpkg/installer/installer-options.txt
@@ -294798,12 +294802,12 @@
2021/05/16 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2021/12/21 | 27582 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2022/10/09 | 17675849 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/10/09 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/10/10 | 17677349 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/10/10 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2022/04/18 | 86658 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2022/10/09 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/10/09 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/10/09 | 2415668 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/10/10 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/10/10 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/10/10 | 2416832 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2022/09/14 | 58922 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2022/10/04 | 42404 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2021/12/21 | 16130 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -300183,7 +300187,7 @@
2020/10/03 | 318630 | systems/win32/miktex/tm/packages/filehook.tar.lzma
2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2022/10/09 | 668612 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/10/10 | 668612 | systems/win32/miktex/tm/packages/files.csv.lzma
2001/05/14 | 5617 | systems/win32/miktex/tm/packages/finbib.tar.lzma
2015/10/20 | 44379 | systems/win32/miktex/tm/packages/findhyph.tar.lzma
2011/10/21 | 89323 | systems/win32/miktex/tm/packages/fink.tar.lzma
@@ -301906,9 +301910,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2022/07/26 | 39695 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2022/08/27 | 43640 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/10/09 | 297861 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/10/09 | 1503141 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/10/09 | 1381855 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/10/10 | 297835 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/10/10 | 1503295 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/10/10 | 1380381 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2022/07/26 | 13519 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2022/08/27 | 14450 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma
2016/07/15 | 35914 | systems/win32/miktex/tm/packages/mil3.tar.lzma
@@ -302157,102 +302161,102 @@
2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
2021/03/17 | 232249 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2022/10/09 | 667663 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/10/09 | 57317 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/10/09 | 1161748 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/10/09 | 31586 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/10/09 | 35264 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/10/09 | 65129 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/10/09 | 95469 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/10/09 | 77211 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/10/09 | 31563 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/10/09 | 394142 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/10/09 | 37050 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/10/09 | 57505 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/10/09 | 270466 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/10/09 | 196213 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2022/10/09 | 103245 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/10/09 | 24212 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/10/09 | 481895 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/10/09 | 52037 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/10/09 | 325980 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/10/09 | 45796 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/10/09 | 135464 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/10/09 | 1458152 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/10/09 | 112980 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/10/09 | 48851 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/10/09 | 28509 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/10/09 | 63241 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/10/09 | 155432 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/10/09 | 79064 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/10/09 | 81448 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/10/09 | 295945 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/10/09 | 25120 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/10/09 | 112879 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/10/09 | 73262 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/10/09 | 115579 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/10/09 | 43889 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/10/09 | 565081 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/10/09 | 247207 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/10/09 | 169677 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/10/09 | 109650 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/10/09 | 18382 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/10/09 | 30570 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/10/09 | 682214 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/10/09 | 599105 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/10/09 | 527568 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/10/09 | 103599 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/10/09 | 2023133 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/10/09 | 74098 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/10/09 | 32074 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/10/09 | 8826 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/10/09 | 209138 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/10/09 | 286684 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/10/09 | 104922 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/10/09 | 140014 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/10/09 | 325482 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/10/09 | 181724 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/10/09 | 55319 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/10/09 | 35231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2022/10/09 | 43617 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/10/09 | 48038 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/10/09 | 52369 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/10/09 | 213850 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/10/09 | 41180 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/10/09 | 824995 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/10/09 | 203421 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/10/09 | 245152 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/10/09 | 88483 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/10/09 | 1323743 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/10/09 | 23951 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/10/09 | 37506 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/10/09 | 72978 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/10/09 | 58631 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/10/09 | 769654 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/10/09 | 1503055 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2022/10/09 | 52627 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/10/09 | 63802 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/10/09 | 27465 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/10/09 | 18511 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/10/09 | 70939 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/10/09 | 173177 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/10/09 | 68146 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2022/10/09 | 107436 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/10/09 | 2821671 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/10/09 | 62359 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2022/10/09 | 41191 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/10/09 | 33862 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/10/09 | 73685 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/10/09 | 352464 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/10/09 | 57502 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/10/09 | 630433 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/10/09 | 43528 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/10/09 | 297813 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/10/09 | 1500884 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/10/09 | 1381864 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/10/09 | 14434 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/10/10 | 667663 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/10/10 | 57317 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/10/10 | 1161749 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/10/10 | 31587 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/10/10 | 35265 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/10/10 | 65130 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/10/10 | 95469 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/10/10 | 77211 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/10/10 | 31562 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/10/10 | 394142 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/10/10 | 37049 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/10/10 | 57503 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/10/10 | 270466 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/10/10 | 196211 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/10/10 | 103248 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/10/10 | 24212 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/10/10 | 481893 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/10/10 | 52037 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/10/10 | 325980 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/10/10 | 45795 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/10/10 | 135465 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/10/10 | 1458151 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/10/10 | 112979 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/10/10 | 48852 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/10/10 | 28508 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/10/10 | 63241 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/10/10 | 155430 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/10/10 | 79065 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/10/10 | 81448 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/10/10 | 295944 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/10/10 | 25118 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/10/10 | 112879 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/10/10 | 73264 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/10/10 | 115579 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/10/10 | 43889 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/10/10 | 565083 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/10/10 | 247207 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/10/10 | 169677 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/10/10 | 109650 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/10/10 | 18382 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/10/10 | 30571 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/10/10 | 682215 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/10/10 | 599104 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/10/10 | 527569 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/10/10 | 103598 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/10/10 | 2023134 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/10/10 | 74100 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/10/10 | 32074 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/10/10 | 8826 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/10/10 | 209138 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/10/10 | 286685 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/10/10 | 104921 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/10/10 | 140012 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/10/10 | 325484 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/10/10 | 181724 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/10/10 | 55320 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/10/10 | 35231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/10/10 | 43617 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/10/10 | 48038 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/10/10 | 52369 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/10/10 | 213847 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/10/10 | 41179 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/10/10 | 824997 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/10/10 | 203420 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/10/10 | 245151 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/10/10 | 88484 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/10/10 | 1323744 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/10/10 | 23950 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/10/10 | 37507 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/10/10 | 72979 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/10/10 | 58632 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/10/10 | 769652 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/10/10 | 1503055 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/10/10 | 52627 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/10/10 | 63802 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/10/10 | 27463 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/10/10 | 18511 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/10/10 | 70938 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/10/10 | 173177 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/10/10 | 68147 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/10/10 | 107437 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/10/10 | 2821671 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/10/10 | 62359 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/10/10 | 41190 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/10/10 | 33863 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/10/10 | 73685 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/10/10 | 352464 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/10/10 | 57501 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/10/10 | 630433 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/10/10 | 43527 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/10/10 | 297836 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/10/10 | 1501959 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/10/10 | 1381472 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/10/10 | 14433 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2022/10/09 | 1172 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/10/10 | 1172 | systems/win32/miktex/tm/packages/next/pr.ini
2018/07/06 | 145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma
2017/03/30 | 191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma
2012/12/20 | 612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma
@@ -302762,7 +302766,7 @@
2022/02/22 | 6917 | systems/win32/miktex/tm/packages/preview.tar.lzma
2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
2021/04/23 | 274028 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2022/10/09 | 927 | systems/win32/miktex/tm/packages/pr.ini
+2022/10/10 | 927 | systems/win32/miktex/tm/packages/pr.ini
2010/09/27 | 248469 | systems/win32/miktex/tm/packages/printlen.tar.lzma
2008/06/17 | 77313 | systems/win32/miktex/tm/packages/proba.tar.lzma
2017/07/12 | 988486 | systems/win32/miktex/tm/packages/probsoln.tar.lzma
@@ -304738,7 +304742,7 @@
2014/07/05 | 611 | systems/win32/yandy/README
2014/07/05 | 1004628 | systems/win32/yandy/yandy-src.tar.xz
2014/07/05 | 1012416 | systems/win32/yandy.zip
-2022/10/10 | 186 | timestamp
+2022/10/11 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2022/02/28 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 0d3365bc56..09d91ccdaa 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index 9725095305..b0ff8e46cd 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,178 +1,282 @@
-2022/10/09 | 95469 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/10/10 | 95469 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/10/10 | 927 | systems/win32/miktex/tm/packages/pr.ini
+2022/10/10 | 914092 | systems/texlive/tlnet/archive/chemobabel.doc.r64665.tar.xz
+2022/10/10 | 88484 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/10/10 | 8826 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/10/10 | 8480 | systems/texlive/tlnet/archive/was.source.r64667.tar.xz
+2022/10/10 | 826 | macros/latex/contrib/centeredline/centeredline.sty
+2022/10/10 | 824997 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/10/10 | 81448 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/10/10 | 792 | macros/latex/contrib/exam-n/sample/dynamical2.tex
+2022/10/10 | 79065 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/10/10 | 78850 | graphics/mcf2graph/mcf_exa_code.pdf
+2022/10/10 | 77362 | macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.tex
+2022/10/10 | 77211 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/10/10 | 769652 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/10/10 | 74100 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/10/10 | 73685 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/10/10 | 73264 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/10/10 | 72979 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/10/10 | 725993 | macros/luatex/latex/japanese-mathformulas.zip
+2022/10/10 | 70938 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/10/10 | 682215 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/10/10 | 68147 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/10/10 | 6780 | systems/texlive/tlnet/archive/collection-latexextra.r64662.tar.xz
+2022/10/10 | 671218 | macros/latex/contrib/exam-n.zip
+2022/10/10 | 668612 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/10/10 | 667663 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/10/10 | 65130 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/10/10 | 63802 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/10/10 | 63241 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/10/10 | 630433 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/10/10 | 62359 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/10/10 | 60878 | macros/latex/contrib/exam-n/template-master.pdf
+2022/10/10 | 599104 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/10/10 | 59142 | macros/latex/contrib/exam-n/template-question.pdf
+2022/10/10 | 58632 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/10/10 | 5832291 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/10/10 | 57524 | graphics/mcf2graph/mcf_manual.tex
+2022/10/10 | 57503 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/10/10 | 57501 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/10/10 | 57317 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/10/10 | 571141 | graphics/pgf/contrib/tikz-ext.zip
+2022/10/10 | 565692 | macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.pdf
+2022/10/10 | 565083 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/10/10 | 560 | macros/latex/contrib/exam-n/sample/numerical1-solution.tex
+2022/10/10 | 55320 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/10/10 | 550 | macros/latex/contrib/exam-n/template-question.tex
+2022/10/10 | 527569 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/10/10 | 52627 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/10/10 | 52369 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/10/10 | 52037 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/10/10 | 51 | macros/latex/contrib/iexec/DEPENDS.txt
+2022/10/10 | 5160 | systems/texlive/tlnet/archive/thalie.r64664.tar.xz
+2022/10/10 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/10/10 | 48852 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/10/10 | 481893 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/10/10 | 48038 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/10/10 | 479556 | systems/texlive/tlnet/archive/thalie.doc.r64664.tar.xz
+2022/10/10 | 47189 | macros/latex/contrib/currfile/currfile.dtx
+2022/10/10 | 467912 | systems/texlive/tlnet/archive/was.doc.r64667.tar.xz
+2022/10/10 | 45795 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/10/10 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/10/10 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/10/10 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/10/10 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/10/10 | 4509 | macros/latex/contrib/exam-n/release-notes.dtx
+2022/10/10 | 449243 | graphics/mcf2graph/mcf_example.pdf
+2022/10/10 | 444 | macros/latex/contrib/exam-n/sample/fig/spiral.eps
+2022/10/10 | 442 | macros/latex/contrib/standalone/standalone.ins
+2022/10/10 | 4388 | systems/texlive/tlnet/archive/iexec.source.r64663.tar.xz
+2022/10/10 | 43889 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/10/10 | 43617 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/10/10 | 43527 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/10/10 | 43351 | graphics/mcf2graph/mcf_man_soc.mp
+2022/10/10 | 4304 | systems/texlive/tlnet/archive/chemobabel.r64665.tar.xz
+2022/10/10 | 429 | macros/latex/contrib/exam-n/template-master.tex
+2022/10/10 | 4275704 | systems/texlive/tlnet/archive/sansmathfonts.r64661.tar.xz
+2022/10/10 | 421840 | systems/texlive/tlnet/archive/texlive-scripts.doc.r64659.tar.xz
+2022/10/10 | 4127 | macros/latex/contrib/exam-n/sample/dynamical1.tex
+2022/10/10 | 41190 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/10/10 | 41179 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/10/10 | 4108 | macros/latex/contrib/exam-n/examndefs.sty
+2022/10/10 | 394142 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/10/10 | 390 | macros/latex/contrib/currfile/README
+2022/10/10 | 3846 | graphics/mcf2graph/mcf_exa_code.tex
+2022/10/10 | 3817 | macros/latex/contrib/exam-n/sample/cosmo1.tex
+2022/10/10 | 37507 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/10/10 | 37049 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/10/10 | 365128 | systems/texlive/tlnet/archive/sansmathfonts.doc.r64661.tar.xz
+2022/10/10 | 361493 | macros/latex/contrib/pdfpages.zip
+2022/10/10 | 35265 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/10/10 | 352464 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/10/10 | 35231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/10/10 | 33863 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/10/10 | 325980 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/10/10 | 325484 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/10/10 | 322333 | macros/latex/contrib/standalone.zip
+2022/10/10 | 32074 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/10/10 | 31587 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/10/10 | 31562 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/10/10 | 30571 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/10/10 | 2984 | graphics/mcf2graph/mcf_example.tex
+2022/10/10 | 298285 | macros/latex/contrib/iexec.zip
+2022/10/10 | 297836 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/10/10 | 297835 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/10/10 | 295 | macros/latex/contrib/exam-n/exam-n.ins
+2022/10/10 | 295944 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/10/10 | 294 | macros/latex/contrib/currfile/currfile.ins
+2022/10/10 | 294484 | systems/texlive/tlnet/archive/iexec.doc.r64663.tar.xz
+2022/10/10 | 293850 | macros/latex/contrib/iexec/iexec.pdf
+2022/10/10 | 290508 | systems/texlive/tlnet/archive/gitstatus.doc.r64662.tar.xz
+2022/10/10 | 289188 | graphics/mcf2graph/mcf_manual.pdf
+2022/10/10 | 286685 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/10/10 | 28508 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/10/10 | 2836 | macros/latex/contrib/centeredline/README.md
+2022/10/10 | 2821671 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/10/10 | 280807 | macros/latex/contrib/standalone/standalone.pdf
+2022/10/10 | 2756 | systems/texlive/tlnet/archive/was.r64667.tar.xz
+2022/10/10 | 27463 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/10/10 | 270466 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/10/10 | 2677 | graphics/mcf2graph/mcf_exa_soc.mp
+2022/10/10 | 2635 | macros/latex/contrib/exam-n/sample/sample_exam.tex
+2022/10/10 | 2625 | macros/latex/contrib/iexec/iexec.ins
+2022/10/10 | 2624 | systems/texlive/tlnet/archive/gitstatus.source.r64662.tar.xz
+2022/10/10 | 2606398 | biblio/ctan-bibdata.zip
+2022/10/10 | 2598283 | biblio/ctan-bibdata/ctan.bib
+2022/10/10 | 25516749 | systems/texlive/tlnet/install-tl.zip
+2022/10/10 | 25118 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/10/10 | 247207 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/10/10 | 245151 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/10/10 | 24212 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/10/10 | 2416832 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/10/10 | 241142 | macros/latex/contrib/exam-n/notes-for-authors.pdf
+2022/10/10 | 23950 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/10/10 | 23270 | macros/latex/contrib/exam-n/release-notes-dist.html
+2022/10/10 | 230344 | macros/latex/contrib/exam-n/exam-n.pdf
+2022/10/10 | 2231 | macros/latex/contrib/centeredline.zip
+2022/10/10 | 2139368 | biblio/ctan-bibdata/ctan.pdf
+2022/10/10 | 213847 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/10/10 | 2121 | macros/latex/contrib/exam-n/sample/numerical1.tex
+2022/10/10 | 2116 | systems/texlive/tlnet/archive/iexec.r64663.tar.xz
+2022/10/10 | 209138 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/10/10 | 20437291 | systems/texlive/tlnet/install-tl-windows.exe
+2022/10/10 | 203420 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/10/10 | 2023134 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/10/10 | 20224 | systems/texlive/tlnet/archive/thalie.source.r64664.tar.xz
+2022/10/10 | 196211 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/10/10 | 195490 | graphics/mcf2graph/mcf_mplib_exa.pdf
+2022/10/10 | 193552 | macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.sty
+2022/10/10 | 192072 | macros/latex/contrib/currfile.zip
+2022/10/10 | 19106 | macros/latex/contrib/exam-n/lppl.txt
+2022/10/10 | 186493 | macros/latex/contrib/standalone/standalone.dtx
+2022/10/10 | 1856 | macros/latex/contrib/exam-n/sample/sample_exam_mcq.tex
+2022/10/10 | 18511 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/10/10 | 18382 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/10/10 | 182606 | macros/latex/contrib/currfile/currfile.pdf
+2022/10/10 | 181724 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/10/10 | 1799 | macros/latex/contrib/exam-n/sample/fig/spiral.pdf
+2022/10/10 | 1783 | macros/latex/contrib/exam-n/sample/cosmo2.tex
+2022/10/10 | 17677349 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/10/10 | 1759 | macros/latex/contrib/exam-n/sample/dynamical3.tex
+2022/10/10 | 173177 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/10/10 | 1696 | macros/latex/contrib/exam-n/sample/numerical3.tex
+2022/10/10 | 169677 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/10/10 | 1680 | macros/latex/contrib/exam-n/sample/cosmo3.tex
+2022/10/10 | 1659 | macros/latex/contrib/exam-n/sample/numerical2.tex
+2022/10/10 | 16380 | macros/latex/contrib/exam-n/exam-n.html
+2022/10/10 | 155430 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/10/10 | 1544 | systems/texlive/tlnet/archive/gitstatus.r64662.tar.xz
+2022/10/10 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/10/10 | 15364 | systems/texlive/tlnet/archive/chemobabel.source.r64665.tar.xz
+2022/10/10 | 153339 | macros/latex/contrib/exam-n/exam-n.dtx
+2022/10/10 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/10/10 | 1503295 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/10/10 | 1503055 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/10/10 | 1501959 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/10/10 | 1482 | macros/latex/contrib/exam-n/myclass.clo
+2022/10/10 | 14649 | graphics/mcf2graph/mcf_mplib_exa.tex
+2022/10/10 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/10/10 | 1458151 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/10/10 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/10/10 | 14433 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/10/10 | 140012 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/10/10 | 1381472 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/10/10 | 1380381 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/10/10 | 1369 | macros/latex/contrib/iexec/README.md
+2022/10/10 | 13575 | macros/latex/contrib/exam-n/notes-for-authors.tex
+2022/10/10 | 135465 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/10/10 | 134 | macros/latex/contrib/standalone/DEPENDS.txt
+2022/10/10 | 1323744 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/10/10 | 1244 | macros/latex/contrib/exam-n/sample/excos1.tex
+2022/10/10 | 120 | macros/latex/contrib/exam-n/README.md
+2022/10/10 | 1172 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/10/10 | 1161749 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/10/10 | 115579 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/10/10 | 113660 | systems/texlive/tlnet/archive/texlive-scripts.r64659.tar.xz
+2022/10/10 | 112979 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/10/10 | 112879 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/10/10 | 109650 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/10/10 | 10943 | macros/latex/contrib/iexec/iexec.dtx
+2022/10/10 | 1083 | macros/latex/contrib/iexec/LICENSE.txt
+2022/10/10 | 107437 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/10/10 | 1064132 | graphics/mcf2graph.zip
+2022/10/10 | 105669 | graphics/mcf2graph/mcf_library.mcf
+2022/10/10 | 104921 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/10/10 | 1044 | macros/latex/contrib/standalone/README
+2022/10/10 | 1039 | macros/latex/contrib/exam-n/sample/Makefile
+2022/10/10 | 103598 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/10/10 | 103248 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/10/10 | 102727 | graphics/mcf2graph/mcf2graph.mp
2022/10/09 | 941476 | systems/texlive/tlnet/archive/proflycee.doc.r64649.tar.xz
2022/10/09 | 9388 | systems/texlive/tlnet/archive/ducksay.r64655.tar.xz
+2022/10/09 | 933 | graphics/pgf/contrib/tikz-ext/README.md
2022/10/09 | 93393 | graphics/chemobabel/example-ja.pdf
-2022/10/09 | 927 | systems/win32/miktex/tm/packages/pr.ini
-2022/10/09 | 88483 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/10/09 | 8826 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/10/09 | 824995 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/10/09 | 81448 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
2022/10/09 | 81095 | graphics/chemobabel/images-for-doc.tar.gz
-2022/10/09 | 79064 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
2022/10/09 | 78784 | macros/latex/contrib/thalie/thalie.dtx
-2022/10/09 | 77211 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/10/09 | 769654 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/10/09 | 74098 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/10/09 | 73685 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/10/09 | 73262 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/10/09 | 72978 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/10/09 | 7837 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-main-body.tex
+2022/10/09 | 772 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual.tex
+2022/10/09 | 7149 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/10/09 | 7136 | systems/texlive/tlnet/archive/piton.r64656.tar.xz
-2022/10/09 | 70939 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
2022/10/09 | 6984 | systems/texlive/tlnet/archive/algpseudocodex.r64654.tar.xz
-2022/10/09 | 682214 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/10/09 | 68146 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
2022/10/09 | 672338 | graphics/chemobabel/chemobabel-ja.pdf
-2022/10/09 | 668612 | systems/win32/miktex/tm/packages/files.csv.lzma
-2022/10/09 | 667663 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/10/09 | 65129 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/10/09 | 63802 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/10/09 | 63241 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/10/09 | 630433 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/10/09 | 62359 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
2022/10/09 | 605 | fonts/sansmathfonts/README.txt
2022/10/09 | 6003316 | fonts/sansmathfonts.zip
-2022/10/09 | 599105 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/10/09 | 58631 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/10/09 | 5832291 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/10/09 | 57505 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/10/09 | 57502 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/10/09 | 57317 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
2022/10/09 | 568562 | graphics/chemobabel/chemobabel-en.pdf
-2022/10/09 | 565081 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/10/09 | 55319 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/10/09 | 534933 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual.pdf
2022/10/09 | 528272 | systems/texlive/tlnet/archive/ducksay.doc.r64655.tar.xz
-2022/10/09 | 527568 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/10/09 | 52627 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/10/09 | 52369 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/10/09 | 52037 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/10/09 | 51 | macros/latex/contrib/iexec/DEPENDS.txt
2022/10/09 | 507609 | install/macros/latex/contrib/thalie.tds.zip
2022/10/09 | 5051 | fonts/sansmathfonts/tex/sansmathfonts.sty
2022/10/09 | 501727 | macros/latex/contrib/thalie.zip
+2022/10/09 | 49938 | systems/texlive/tlnet/tlpkg/installer/config.guess
2022/10/09 | 49805 | graphics/chemobabel/chemobabel.dtx
-2022/10/09 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2022/10/09 | 48851 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
2022/10/09 | 484998 | macros/latex/contrib/thalie/thalie.pdf
-2022/10/09 | 481895 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/10/09 | 48038 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/10/09 | 45796 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
2022/10/09 | 456 | systems/texlive/tlnet/archive/latex-for-undergraduates.r64647.tar.xz
-2022/10/09 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/10/09 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2022/10/09 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/10/09 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
-2022/10/09 | 43889 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/10/09 | 43617 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/10/09 | 43528 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/10/09 | 421700 | systems/texlive/tlnet/archive/texlive-scripts.doc.r64645.tar.xz
-2022/10/09 | 41191 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/10/09 | 41180 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/10/09 | 394142 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/10/09 | 37506 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/10/09 | 37050 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/10/09 | 35264 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/10/09 | 352464 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/10/09 | 35231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/10/09 | 4172 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-calendar.tex
+2022/10/09 | 391967 | install/macros/latex/contrib/pdfpages.tds.zip
+2022/10/09 | 3649 | graphics/mcf2graph/README
2022/10/09 | 350996 | systems/texlive/tlnet/archive/algpseudocodex.doc.r64654.tar.xz
-2022/10/09 | 33862 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/10/09 | 325980 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/10/09 | 325482 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/10/09 | 32074 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/10/09 | 31586 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/10/09 | 31563 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
2022/10/09 | 3108 | macros/latex/contrib/thalie/CHANGELOG.md
-2022/10/09 | 30570 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/10/09 | 298605 | macros/latex/contrib/iexec.zip
-2022/10/09 | 297861 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/10/09 | 297813 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/10/09 | 30894 | macros/latex/contrib/pdfpages/dummy.pdf
+2022/10/09 | 301211 | macros/latex/contrib/pdfpages/pdfpages.pdf
+2022/10/09 | 2983 | macros/latex/contrib/pdfpages/pdfpages.ins
2022/10/09 | 296024 | systems/texlive/tlnet/archive/piton.doc.r64656.tar.xz
-2022/10/09 | 295945 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/10/09 | 294434 | macros/latex/contrib/iexec/iexec.pdf
-2022/10/09 | 286684 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/10/09 | 28509 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/10/09 | 2821671 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/10/09 | 27465 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/10/09 | 270466 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
2022/10/09 | 2686828 | systems/texlive/tlnet/archive/simpleicons.r64646.tar.xz
-2022/10/09 | 2625 | macros/latex/contrib/iexec/iexec.ins
-2022/10/09 | 2606778 | biblio/ctan-bibdata.zip
2022/10/09 | 2604 | systems/texlive/tlnet/archive/fixmath.source.r64648.tar.xz
-2022/10/09 | 2598283 | biblio/ctan-bibdata/ctan.bib
-2022/10/09 | 25516720 | systems/texlive/tlnet/install-tl.zip
-2022/10/09 | 25120 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/10/09 | 247207 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/10/09 | 245152 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/10/09 | 24212 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/10/09 | 2415668 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
-2022/10/09 | 23951 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
2022/10/09 | 225664 | systems/texlive/tlnet/archive/neo-euler.r64652.tar.xz
2022/10/09 | 2167 | macros/latex/contrib/thalie/thalie.ins
-2022/10/09 | 2139676 | biblio/ctan-bibdata/ctan.pdf
-2022/10/09 | 213850 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/10/09 | 209138 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
2022/10/09 | 20792 | systems/texlive/tlnet/archive/ducksay.source.r64655.tar.xz
-2022/10/09 | 20433558 | systems/texlive/tlnet/install-tl-windows.exe
-2022/10/09 | 203421 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/10/09 | 2023133 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
2022/10/09 | 201872 | systems/texlive/tlnet/archive/xcharter-math.r64653.tar.xz
2022/10/09 | 2009952 | systems/texlive/tlnet/archive/latex-for-undergraduates.doc.r64647.tar.xz
2022/10/09 | 1971700 | systems/texlive/tlnet/archive/simpleicons.doc.r64646.tar.xz
-2022/10/09 | 196213 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
2022/10/09 | 1947500 | systems/texlive/tlnet/archive/xcharter-math.doc.r64653.tar.xz
2022/10/09 | 19106 | macros/latex/contrib/thalie/LICENSE.txt
2022/10/09 | 188924 | systems/texlive/tlnet/archive/fixmath.doc.r64648.tar.xz
-2022/10/09 | 18511 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/10/09 | 18382 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/10/09 | 18474 | graphics/mcf2graph/CHANGELOG
2022/10/09 | 1820 | graphics/chemobabel/example-ja.tex
2022/10/09 | 181 | graphics/chemobabel/chemobabel.ins
-2022/10/09 | 181724 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
2022/10/09 | 18028 | systems/texlive/tlnet/archive/proflycee.r64649.tar.xz
-2022/10/09 | 17675849 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/10/09 | 173177 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/10/09 | 178269 | macros/latex/contrib/pdfpages/pdfpages.dtx
2022/10/09 | 17020 | fonts/sansmathfonts/sansmathfonts.tex
-2022/10/09 | 169677 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
2022/10/09 | 1643 | macros/latex/contrib/thalie/dicts/thalie-fallback.trsl
2022/10/09 | 1624 | systems/texlive/tlnet/archive/collection-mathscience.r64648.tar.xz
2022/10/09 | 1582 | macros/latex/contrib/thalie/README.md
-2022/10/09 | 155432 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
2022/10/09 | 1544604 | systems/texlive/tlnet/archive/neo-euler.doc.r64652.tar.xz
-2022/10/09 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/10/09 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/10/09 | 1503141 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/10/09 | 1503055 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2022/10/09 | 1500884 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/10/09 | 15023 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgfcalendar-ext.code.tex
2022/10/09 | 1496 | systems/texlive/tlnet/archive/fixmath.r64648.tar.xz
2022/10/09 | 14943 | graphics/chemobabel/chemobabel.sty
2022/10/09 | 1473 | graphics/chemobabel/example-en.tex
-2022/10/09 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/10/09 | 1458152 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/10/09 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/10/09 | 14434 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2022/10/09 | 140014 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
2022/10/09 | 1387 | graphics/chemobabel/README.md
-2022/10/09 | 1381864 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/10/09 | 1381855 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2022/10/09 | 1369 | macros/latex/contrib/iexec/README.md
-2022/10/09 | 135464 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/10/09 | 1382 | macros/latex/contrib/pdfpages/README
+2022/10/09 | 13557 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.arcto.code.tex
2022/10/09 | 1338 | graphics/chemobabel/LICENSE
-2022/10/09 | 1323743 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
2022/10/09 | 132001 | graphics/chemobabel/example-en.pdf
+2022/10/09 | 13006 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.node-families.code.tex
2022/10/09 | 1300376 | graphics/chemobabel.zip
2022/10/09 | 12784 | systems/texlive/tlnet/archive/piton.source.r64656.tar.xz
-2022/10/09 | 1172 | systems/win32/miktex/tm/packages/next/pr.ini
-2022/10/09 | 1161748 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/10/09 | 115579 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/10/09 | 113672 | systems/texlive/tlnet/archive/texlive-scripts.r64645.tar.xz
-2022/10/09 | 112980 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/10/09 | 112879 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/10/09 | 109650 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/10/09 | 1083 | macros/latex/contrib/iexec/LICENSE.txt
-2022/10/09 | 107436 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/10/09 | 12485 | graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual.bib
+2022/10/09 | 12470 | macros/latex/contrib/pdfpages/dummy-l.pdf
2022/10/09 | 1067 | macros/latex/contrib/thalie/dicts/thalie-german.trsl
-2022/10/09 | 104922 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/10/09 | 103599 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/10/09 | 103245 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/10/09 | 10317 | macros/latex/contrib/iexec/iexec.dtx
2022/10/09 | 1027 | macros/latex/contrib/thalie/dicts/thalie-french.trsl
2022/10/09 | 1022 | macros/latex/contrib/thalie/dicts/thalie-italian.trsl
2022/10/09 | 1001 | macros/latex/contrib/thalie/dicts/thalie-english.trsl
@@ -193,6 +297,7 @@
2022/10/08 | 283311 | macros/latex/contrib/gitstatus/gitstatus.pdf
2022/10/08 | 24947 | fonts/xcharter-math/XCharter-Math.ltx
2022/10/08 | 2477 | fonts/xcharter-math/README.md
+2022/10/08 | 22555 | macros/texinfo/latest/htmlxref.cnf
2022/10/08 | 2190523 | fonts/xcharter-math.zip
2022/10/08 | 2153 | fonts/neo-euler/README.md
2022/10/08 | 1882203 | fonts/neo-euler.zip
@@ -218,9 +323,7 @@
2022/10/07 | 8183 | support/TeX4ht/source/mktex4ht-cnf.tex
2022/10/07 | 80783 | macros/latex/contrib/proflycee/tex/ProfLycee.sty
2022/10/07 | 736 | macros/latex/contrib/proflycee/doc/perroquet.csv
-2022/10/07 | 7195 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/10/07 | 69064 | systems/texlive/tlnet/archive/coolfn.doc.r64639.tar.xz
-2022/10/07 | 6776 | systems/texlive/tlnet/archive/collection-latexextra.r64639.tar.xz
2022/10/07 | 665 | fonts/simpleicons/README.md
2022/10/07 | 6432 | systems/texlive/tlnet/archive/huawei.r64625.tar.xz
2022/10/07 | 624608 | systems/texlive/tlnet/archive/carlito.doc.r64624.tar.xz
@@ -664,6 +767,7 @@
2022/10/06 | 174924 | systems/win32/miktex/tm/packages/l3kernel.tar.lzma
2022/10/06 | 1742177 | info/latex-for-undergraduates/LaTeX_for_Undergraduates.pdf
2022/10/06 | 1740 | macros/luatex/generic/luatexja/tool/test_exist_nodelib.tex
+2022/10/06 | 1739 | macros/luatex/latex/japanese-mathformulas/README.txt
2022/10/06 | 173902 | systems/win32/miktex/tm/packages/poiretone.tar.lzma
2022/10/06 | 173502 | systems/win32/miktex/tm/packages/josefin__doc.tar.lzma
2022/10/06 | 171050 | systems/win32/miktex/tm/packages/media4svg__doc.tar.lzma
@@ -1152,10 +1256,8 @@
2022/10/04 | 81128 | macros/luatex/generic/lualibs/lualibs.pdf
2022/10/04 | 7869 | macros/latex/required/babel/base/babel.ins
2022/10/04 | 7722 | macros/luatex/generic/lualibs/lualibs-util-tpl.lua
-2022/10/04 | 75927 | macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.tex
2022/10/04 | 748623 | macros/latex/required/babel/base/babel.dtx
2022/10/04 | 7149 | macros/luatex/generic/lualibs/lualibs-util-lua.lua
-2022/10/04 | 709896 | macros/luatex/latex/japanese-mathformulas.zip
2022/10/04 | 69260 | macros/latex/contrib/siunitx/CHANGELOG.md
2022/10/04 | 6661 | macros/luatex/generic/lualibs/lualibs-util-sto.lua
2022/10/04 | 665420 | macros/latex/contrib/siunitx/siunitx.pdf
@@ -1165,7 +1267,6 @@
2022/10/04 | 617674 | macros/latex/contrib/siunitx/siunitx-code.pdf
2022/10/04 | 603 | macros/luatex/generic/lualibs/lualibs-compat.lua
2022/10/04 | 56365 | macros/latex/contrib/upmethodology/src/upmethodology-fmt.sty
-2022/10/04 | 550271 | macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.pdf
2022/10/04 | 5481 | macros/latex/contrib/siunitx/siunitx-locale.dtx
2022/10/04 | 50961 | macros/latex/contrib/siunitx/siunitx-table.dtx
2022/10/04 | 4823 | macros/luatex/generic/lualibs/README.md
@@ -1215,12 +1316,10 @@
2022/10/04 | 1993 | macros/unicodetex/latex/bithesis/README.md
2022/10/04 | 1923 | macros/luatex/generic/lualibs/lualibs-set.lua
2022/10/04 | 1922500 | macros/latex/required/babel/base.zip
-2022/10/04 | 189014 | macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.sty
2022/10/04 | 1850 | macros/luatex/generic/lualibs/lualibs-boolean.lua
2022/10/04 | 183447 | macros/unicodetex/latex/bithesis/bithesis.dtx
2022/10/04 | 18217 | macros/luatex/generic/lualibs/lualibs-dir.lua
2022/10/04 | 18092 | macros/luatex/generic/lualibs/LICENSE
-2022/10/04 | 1731 | macros/luatex/latex/japanese-mathformulas/README.txt
2022/10/04 | 1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
2022/10/04 | 16721 | macros/luatex/generic/lualibs/lualibs-util-jsn.lua
2022/10/04 | 16709 | macros/latex/contrib/siunitx/siunitx-angle.dtx
@@ -1239,239 +1338,8 @@
2022/10/04 | 11988 | macros/luatex/generic/lualibs/lualibs-io.lua
2022/10/04 | 1133410 | support/TeX4ht/source/tex4ht-4ht.tex
2022/10/04 | 10812 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
-2022/10/04 | 10635 | macros/luatex/latex/japanese-mathformulas/japanese-mathformulas-sample.tex
2022/10/04 | 10593 | macros/luatex/generic/lualibs/lualibs-util-deb.lua
2022/10/04 | 10479 | macros/latex/contrib/upmethodology/src/upmethodology-document.cls
2022/10/04 | 103909 | macros/latex/contrib/siunitx/siunitx-unit.dtx
2022/10/04 | 10187 | support/bundledoc/arlatex.1
2022/10/04 | 100166 | support/bundledoc.zip
-2022/10/03 | 9946 | macros/latex/contrib/teubner/teubner.txt
-2022/10/03 | 9881 | macros/luatex/generic/luaotfload/fontloader-fonts-gbn.lua
-2022/10/03 | 9872 | systems/texlive/tlnet/archive/babel-serbianc.source.r64588.tar.xz
-2022/10/03 | 985672 | macros/luatex/generic/luaotfload/fontloader-reference.lua
-2022/10/03 | 9582 | macros/latex/contrib/ffcode/ffcode.dtx
-2022/10/03 | 94462 | macros/luatex/generic/luaotfload/fontloader-font-otr.lua
-2022/10/03 | 94342 | macros/luatex/generic/luaotfload/fontloader-font-cff.lua
-2022/10/03 | 92998 | macros/latex/contrib/teubner/teubner-doc.tex
-2022/10/03 | 912 | macros/luatex/generic/luaotfload/fontloader-fonts-mis.lua
-2022/10/03 | 895604 | macros/generic/markdown/markdown.pdf
-2022/10/03 | 883645 | macros/luatex/generic/luaotfload/fontloader-2022-10-03.lua
-2022/10/03 | 8597 | macros/luatex/generic/luaotfload/filegraph.tex
-2022/10/03 | 8562 | macros/luatex/generic/luaotfload/shaper-demo-graphite.pdf
-2022/10/03 | 8478 | macros/luatex/generic/luaotfload/shaper-demo.pdf
-2022/10/03 | 83 | macros/latex/contrib/debate/DEPENDS.txt
-2022/10/03 | 804453 | macros/generic/markdown/markdown.html
-2022/10/03 | 7917 | macros/luatex/generic/luaotfload/luaotfload-unicode.lua
-2022/10/03 | 7904 | macros/luatex/generic/luaotfload/fontloader-font-oti.lua
-2022/10/03 | 77520 | macros/luatex/generic/luaotfload/luaotfload-conf.pdf
-2022/10/03 | 7703 | macros/latex/contrib/biblatex-contrib/biblatex-publist/README
-2022/10/03 | 76791 | macros/luatex/generic/luaotfload/luaotfload-tool.pdf
-2022/10/03 | 75 | macros/generic/markdown/examples/scientists.csv
-2022/10/03 | 7528 | macros/luatex/generic/luaotfload/luaotfload-tounicode.lua
-2022/10/03 | 735 | macros/luatex/generic/luaotfload/luaotfload.conf.example
-2022/10/03 | 7260 | macros/luatex/generic/luaotfload/fontloader-fonts-ext.lua
-2022/10/03 | 71341 | macros/luatex/latex/letgut/doc/letgut.tex
-2022/10/03 | 702257 | macros/luatex/latex/letgut/doc/letgut-code.pdf
-2022/10/03 | 699 | macros/luatex/generic/luaotfload/scripts-demo.tex
-2022/10/03 | 697091 | macros/generic/markdown/markdown.dtx
-2022/10/03 | 6957 | macros/luatex/generic/luaotfload/luaotfload-dvi.lua
-2022/10/03 | 6866 | macros/luatex/generic/luaotfload/fontloader-font-afk.lua
-2022/10/03 | 671724 | macros/latex/contrib/teubner/teubner.pdf
-2022/10/03 | 67011 | macros/luatex/generic/luaotfload/fontloader-font-ttf.lua
-2022/10/03 | 6644 | macros/luatex/generic/luaotfload/fontloader-l-string.lua
-2022/10/03 | 65279 | macros/luatex/generic/luaotfload/fontloader-font-otj.lua
-2022/10/03 | 6405 | macros/luatex/generic/luaotfload/fontloader-l-lua.lua
-2022/10/03 | 6391 | macros/latex/contrib/clicks/clicks.dtx
-2022/10/03 | 6328 | systems/texlive/tlnet/archive/yb-book.source.r64586.tar.xz
-2022/10/03 | 63211 | macros/luatex/generic/luaotfload/fontloader-font-con.lua
-2022/10/03 | 6317 | macros/luatex/generic/luaotfload/luaotfload-status.lua
-2022/10/03 | 6309 | macros/luatex/generic/luaotfload/luaotfload-szss.lua
-2022/10/03 | 62 | macros/latex/contrib/ffcode/DEPENDS.txt
-2022/10/03 | 5885 | macros/luatex/generic/luaotfload/fontloader-reference-load-order.tex
-2022/10/03 | 57342 | macros/luatex/generic/luaotfload/fontloader-fonts-lig.lua
-2022/10/03 | 5502 | macros/luatex/generic/luaotfload/fontloader-font-cid.lua
-2022/10/03 | 5388 | macros/luatex/generic/luaotfload/fontloader-data-con.lua
-2022/10/03 | 53825 | macros/luatex/generic/luaotfload/luaotfload-tool.lua
-2022/10/03 | 52 | macros/luatex/generic/luaotfload/luaotfload-blacklist.cnf
-2022/10/03 | 5116 | systems/texlive/tlnet/archive/dijkstra.r64580.tar.xz
-2022/10/03 | 5086 | macros/latex/contrib/debate/debate.dtx
-2022/10/03 | 500170 | macros/luatex/generic/luaotfload/luaotfload-latex.pdf
-2022/10/03 | 49268 | systems/texlive/tlnet/archive/bibarts.source.r64579.tar.xz
-2022/10/03 | 4908 | systems/texlive/tlnet/archive/kdpcover.source.r64582.tar.xz
-2022/10/03 | 48728 | macros/luatex/generic/luaotfload/fontloader-basics-chr.lua
-2022/10/03 | 4708 | macros/latex/contrib/to-be-determined/to-be-determined.dtx
-2022/10/03 | 46322 | macros/luatex/generic/luaotfload/fontloader-util-str.lua
-2022/10/03 | 461 | macros/luatex/latex/letgut/README.md
-2022/10/03 | 45834 | macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.bbx
-2022/10/03 | 4530 | macros/generic/markdown/markdown.css
-2022/10/03 | 44587 | macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.tex
-2022/10/03 | 4377 | macros/generic/markdown/docstrip.cfg
-2022/10/03 | 4336 | systems/texlive/tlnet/archive/babel-serbianc.r64588.tar.xz
-2022/10/03 | 432909 | macros/latex/contrib/teubner/teubner-doc.pdf
-2022/10/03 | 4269 | macros/latex/contrib/href-ul/href-ul.dtx
-2022/10/03 | 42312 | macros/luatex/generic/luaotfload/luaotfload-harf-plug.lua
-2022/10/03 | 41 | macros/latex/contrib/crumbs/DEPENDS.txt
-2022/10/03 | 41758 | macros/luatex/generic/luaotfload/fontloader-l-table.lua
-2022/10/03 | 41303 | macros/luatex/generic/luaotfload/fontloader-l-unicode.lua
-2022/10/03 | 4050 | macros/luatex/generic/luaotfload/luaotfload-harf-var-t2-writer.lua
-2022/10/03 | 4047 | macros/luatex/generic/luaotfload/luaotfload-fallback.lua
-2022/10/03 | 400818 | macros/latex/contrib/biblatex-contrib/biblatex-publist.zip
-2022/10/03 | 40007 | macros/luatex/generic/luaotfload/filegraph.pdf
-2022/10/03 | 398411 | macros/latex/contrib/ffcode.zip
-2022/10/03 | 3956 | macros/luatex/latex/letgut/doc/localconf.tex
-2022/10/03 | 395644 | macros/latex/contrib/ffcode/ffcode.pdf
-2022/10/03 | 38742 | macros/luatex/generic/luaotfload/fontloader-l-lpeg.lua
-2022/10/03 | 3821 | macros/luatex/generic/luaotfload/fontloader-fonts-def.lua
-2022/10/03 | 379438 | macros/luatex/latex/letgut/doc/letgut.pdf
-2022/10/03 | 3788 | systems/texlive/tlnet/archive/yb-book.r64586.tar.xz
-2022/10/03 | 3784 | macros/luatex/generic/luaotfload/README.md
-2022/10/03 | 375557 | macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.pdf
-2022/10/03 | 3693 | macros/luatex/generic/luaotfload/fontloader-font-imp-italics.lua
-2022/10/03 | 3674 | macros/luatex/generic/luaotfload/luaotfload-bcp47.lua
-2022/10/03 | 3674 | macros/luatex/generic/luaotfload/fontloader-fonts-syn.lua
-2022/10/03 | 361 | macros/luatex/generic/luaotfload/fontloader-l-function.lua
-2022/10/03 | 3594 | macros/luatex/generic/luaotfload/fontloader-font-imp-ligatures.lua
-2022/10/03 | 35836 | macros/luatex/generic/luaotfload/fontloader-font-otc.lua
-2022/10/03 | 3561 | macros/generic/markdown/examples/example.md
-2022/10/03 | 34922 | macros/luatex/generic/luaotfload/fontloader-font-ott.lua
-2022/10/03 | 34239 | macros/luatex/generic/luaotfload/luaotfload-auxiliary.lua
-2022/10/03 | 3406 | macros/luatex/generic/luaotfload/fontloader-font-imp-tex.lua
-2022/10/03 | 33960 | macros/luatex/generic/luaotfload/fontloader-font-otl.lua
-2022/10/03 | 33529 | macros/luatex/generic/luaotfload/luaotfload-features.lua
-2022/10/03 | 329599 | macros/latex/contrib/debate.zip
-2022/10/03 | 328802 | macros/latex/contrib/debate/debate.pdf
-2022/10/03 | 3287334 | macros/luatex/generic/luaotfload/luaotfload-characters.lua
-2022/10/03 | 3258272 | systems/texlive/tlnet/archive/univie-ling.doc.r64584.tar.xz
-2022/10/03 | 31 | macros/generic/markdown/VERSION
-2022/10/03 | 31349 | macros/luatex/generic/luaotfload/fontloader-font-one.lua
-2022/10/03 | 31223 | macros/luatex/generic/luaotfload/luaotfload-configuration.lua
-2022/10/03 | 30436 | macros/luatex/generic/luaotfload/luaotfload-parsers.lua
-2022/10/03 | 30400 | systems/texlive/tlnet/archive/srdp-mathematik.r64583.tar.xz
-2022/10/03 | 303076 | systems/texlive/tlnet/archive/kdpcover.doc.r64582.tar.xz
-2022/10/03 | 293708 | systems/texlive/tlnet/archive/babel-serbianc.doc.r64588.tar.xz
-2022/10/03 | 2912 | systems/texlive/tlnet/archive/simplekv.r64578.tar.xz
-2022/10/03 | 286599 | macros/luatex/latex/letgut/source/letgut.org
-2022/10/03 | 28592 | systems/texlive/tlnet/archive/bibarts.r64579.tar.xz
-2022/10/03 | 282532 | systems/texlive/tlnet/archive/yb-book.doc.r64586.tar.xz
-2022/10/03 | 27 | macros/latex/contrib/clicks/DEPENDS.txt
-2022/10/03 | 275 | macros/luatex/generic/luaotfload/luaotfload-main.lua
-2022/10/03 | 274 | macros/luatex/latex/letgut/doc/letgut.bib
-2022/10/03 | 2702 | macros/luatex/latex/letgut/doc/xindex-letgut.lua
-2022/10/03 | 269492 | macros/latex-dev/required/firstaid.zip
-2022/10/03 | 26896 | macros/generic/markdown/CHANGES.md
-2022/10/03 | 2679 | macros/luatex/generic/luaotfload/fontloader-l-math.lua
-2022/10/03 | 2674 | macros/latex/contrib/to-be-determined/to-be-determined.ins
-2022/10/03 | 2667 | macros/luatex/generic/luaotfload/fontloader-font-vfc.lua
-2022/10/03 | 2647 | macros/latex/contrib/href-ul/href-ul.ins
-2022/10/03 | 2644 | macros/latex/contrib/ffcode/ffcode.ins
-2022/10/03 | 2644 | macros/latex/contrib/debate/debate.ins
-2022/10/03 | 2644 | macros/latex/contrib/crumbs/crumbs.ins
-2022/10/03 | 2644 | macros/latex/contrib/clicks/clicks.ins
-2022/10/03 | 2625 | macros/luatex/generic/luaotfload/fontloader-fonts-enc.lua
-2022/10/03 | 260964 | macros/latex/contrib/crumbs.zip
-2022/10/03 | 2582 | macros/luatex/generic/luaotfload/luaotfload-suppress.lua
-2022/10/03 | 256895 | macros/latex/contrib/crumbs/crumbs.pdf
-2022/10/03 | 255 | macros/luatex/latex/letgut/doc/listings-conf.tex
-2022/10/03 | 25336 | macros/luatex/generic/luaotfload/luaotfload-filelist.lua
-2022/10/03 | 25264 | macros/luatex/generic/luaotfload/fontloader-font-ocl.lua
-2022/10/03 | 25212 | macros/luatex/latex/letgut/source/letgut-banner.org
-2022/10/03 | 2506 | macros/luatex/generic/luaotfload/luaotfload-scripts.lua
-2022/10/03 | 24 | macros/latex/contrib/href-ul/DEPENDS.txt
-2022/10/03 | 2476 | macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.cbx
-2022/10/03 | 247188 | macros/latex/contrib/clicks.zip
-2022/10/03 | 243984 | macros/latex/contrib/clicks/clicks.pdf
-2022/10/03 | 235832 | macros/latex/contrib/to-be-determined.zip
-2022/10/03 | 23399 | macros/luatex/generic/luaotfload/fontloader-fonts-tfm.lua
-2022/10/03 | 232654 | macros/latex/contrib/to-be-determined/to-be-determined.pdf
-2022/10/03 | 232639 | macros/latex/contrib/href-ul.zip
-2022/10/03 | 23238 | macros/luatex/generic/luaotfload/fontloader-font-oto.lua
-2022/10/03 | 23128 | systems/texlive/tlnet/archive/kdpcover.r64582.tar.xz
-2022/10/03 | 229763 | macros/latex/contrib/href-ul/href-ul.pdf
-2022/10/03 | 22371 | macros/generic/markdown/libraries/markdown-tinyyaml.lua
-2022/10/03 | 22186 | macros/luatex/generic/luaotfload/fontloader-l-file.lua
-2022/10/03 | 21 | macros/latex/contrib/to-be-determined/DEPENDS.txt
-2022/10/03 | 21858 | macros/luatex/generic/luaotfload/luaotfload-diagnostics.lua
-2022/10/03 | 21856 | macros/luatex/generic/luaotfload/NEWS
-2022/10/03 | 21682 | macros/luatex/generic/luaotfload/scripts-demo.pdf
-2022/10/03 | 20526 | macros/luatex/generic/luaotfload/luaotfload-harf-var-ttf.lua
-2022/10/03 | 20268 | macros/luatex/generic/luaotfload/luaotfload-letterspace.lua
-2022/10/03 | 19944 | macros/luatex/generic/luaotfload/fontloader-font-def.lua
-2022/10/03 | 19746 | macros/luatex/generic/luaotfload/luaotfload-init.lua
-2022/10/03 | 1974313 | install/macros/luatex/generic/luaotfload.tds.zip
-2022/10/03 | 1973881 | macros/luatex/generic/luaotfload.zip
-2022/10/03 | 19564 | macros/luatex/generic/luaotfload/fontloader-font-map.lua
-2022/10/03 | 19444 | macros/luatex/latex/letgut/doc/exemple-nouveautes.pdf
-2022/10/03 | 191 | macros/luatex/generic/luaotfload/shaper-demo-graphite.tex
-2022/10/03 | 19011 | macros/luatex/generic/luaotfload/luaotfload-harf-define.lua
-2022/10/03 | 18717 | macros/luatex/generic/luaotfload/fontloader-font-onr.lua
-2022/10/03 | 18714 | macros/luatex/generic/luaotfload/COPYING
-2022/10/03 | 186209 | macros/luatex/generic/luaotfload/fontloader-font-ots.lua
-2022/10/03 | 1850 | macros/luatex/generic/luaotfload/fontloader-l-boolean.lua
-2022/10/03 | 18411 | macros/luatex/generic/luaotfload/fontloader-font-ota.lua
-2022/10/03 | 18378 | macros/luatex/generic/luaotfload/luaotfload.conf.rst
-2022/10/03 | 18372 | macros/luatex/generic/luaotfload/luaotfload-colors.lua
-2022/10/03 | 182 | macros/luatex/generic/luaotfload/shaper-demo.tex
-2022/10/03 | 1812 | macros/luatex/generic/luaotfload/luaotfload.sty
-2022/10/03 | 1794 | macros/luatex/generic/luaotfload/fontloader-font-ini.lua
-2022/10/03 | 17604 | macros/generic/markdown/README.md
-2022/10/03 | 1756 | macros/generic/markdown/examples/latex.tex
-2022/10/03 | 1726 | macros/generic/markdown/examples/context-mkiv.tex
-2022/10/03 | 16794 | macros/luatex/generic/luaotfload/luaotfload.conf.5
-2022/10/03 | 165212 | macros/latex/contrib/teubner/teubner.dtx
-2022/10/03 | 16214 | macros/luatex/generic/luaotfload/luaotfload-latex.tex
-2022/10/03 | 16116 | macros/luatex/generic/luaotfload/luaotfload-tool.rst
-2022/10/03 | 16116 | macros/luatex/generic/luaotfload/luaotfload-case.lua
-2022/10/03 | 160160 | systems/texlive/tlnet/archive/univie-ling.r64584.tar.xz
-2022/10/03 | 160036 | systems/texlive/tlnet/archive/dijkstra.doc.r64580.tar.xz
-2022/10/03 | 154497 | macros/luatex/generic/luaotfload/fontloader-font-dsp.lua
-2022/10/03 | 154201 | macros/luatex/latex/letgut/doc/letgut-banner-code.pdf
-2022/10/03 | 1535 | macros/generic/markdown/examples/context-mkii.tex
-2022/10/03 | 1520 | macros/luatex/latex/letgut/source/HOWTO.md
-2022/10/03 | 15196 | macros/luatex/generic/luaotfload/fontloader-reference-load-order.lua
-2022/10/03 | 150792 | systems/texlive/tlnet/archive/srdp-mathematik.doc.r64583.tar.xz
-2022/10/03 | 15068 | macros/luatex/generic/luaotfload/luaotfload-multiscript.lua
-2022/10/03 | 1449 | macros/luatex/generic/luaotfload/fontloader-font-lua.lua
-2022/10/03 | 1430525 | install/macros/luatex/latex/letgut.tds.zip
-2022/10/03 | 14285 | macros/luatex/generic/luaotfload/luaotfload-harf-var-cff2.lua
-2022/10/03 | 140951 | macros/generic/markdown/markdown.png
-2022/10/03 | 1395 | macros/latex/contrib/to-be-determined/README.md
-2022/10/03 | 13565 | macros/luatex/generic/luaotfload/luaotfload.lua
-2022/10/03 | 13525 | macros/luatex/generic/luaotfload/fontloader-font-shp.lua
-2022/10/03 | 1351 | macros/latex/contrib/ffcode/README.md
-2022/10/03 | 134172 | macros/luatex/generic/luaotfload/luaotfload-database.lua
-2022/10/03 | 1333 | macros/generic/markdown/markdown.ins
-2022/10/03 | 130940 | systems/texlive/tlnet/archive/simplekv.doc.r64578.tar.xz
-2022/10/03 | 1301733 | macros/luatex/latex/letgut.zip
-2022/10/03 | 1295994 | install/macros/generic/markdown.tds.zip
-2022/10/03 | 1284 | macros/latex/contrib/crumbs/README.md
-2022/10/03 | 12829 | macros/luatex/generic/luaotfload/luaotfload-tool.1
-2022/10/03 | 128092 | macros/luatex/generic/luaotfload/fontloader-font-oup.lua
-2022/10/03 | 12745 | macros/luatex/generic/luaotfload/fontloader-basics-gen.lua
-2022/10/03 | 12704 | macros/luatex/generic/luaotfload/fontloader-font-imp-effects.lua
-2022/10/03 | 1262 | macros/latex/contrib/debate/README.md
-2022/10/03 | 1248 | macros/latex/contrib/href-ul/README.md
-2022/10/03 | 1236128 | systems/texlive/tlnet/archive/bibarts.doc.r64579.tar.xz
-2022/10/03 | 1228403 | macros/generic/markdown.zip
-2022/10/03 | 12224 | macros/luatex/generic/luaotfload/luaotfload-notdef.lua
-2022/10/03 | 1221 | macros/luatex/latex/letgut/doc/latexmkrc
-2022/10/03 | 119973 | macros/luatex/generic/luaotfload/fontloader-font-osd.lua
-2022/10/03 | 11988 | macros/luatex/generic/luaotfload/fontloader-l-io.lua
-2022/10/03 | 11928 | systems/texlive/tlnet/archive/hvfloat.r64581.tar.xz
-2022/10/03 | 1157851 | macros/latex/contrib/teubner.zip
-2022/10/03 | 11474 | macros/luatex/generic/luaotfload/fontloader-util-fil.lua
-2022/10/03 | 11323 | macros/luatex/generic/luaotfload/luaotfload-log.lua
-2022/10/03 | 1121 | macros/latex/contrib/clicks/README.md
-2022/10/03 | 11209 | macros/luatex/generic/luaotfload/luaotfload-resolvers.lua
-2022/10/03 | 10888 | macros/latex/contrib/crumbs/crumbs.dtx
-2022/10/03 | 1083 | macros/latex/contrib/to-be-determined/LICENSE.txt
-2022/10/03 | 1083 | macros/latex/contrib/href-ul/LICENSE.txt
-2022/10/03 | 1083 | macros/latex/contrib/ffcode/LICENSE.txt
-2022/10/03 | 1083 | macros/latex/contrib/debate/LICENSE.txt
-2022/10/03 | 1083 | macros/latex/contrib/crumbs/LICENSE.txt
-2022/10/03 | 1083 | macros/latex/contrib/clicks/LICENSE.txt
-2022/10/03 | 10733 | macros/luatex/generic/luaotfload/luaotfload-loaders.lua
-2022/10/03 | 106278 | macros/luatex/generic/luaotfload/luaotfload-main.tex
-2022/10/03 | 10328200 | systems/texlive/tlnet/archive/hvfloat.doc.r64581.tar.xz
-2022/10/03 | 102502 | macros/luatex/generic/luaotfload/luaotfload-glyphlist.lua
-2022/10/03 | 10207 | macros/luatex/generic/luaotfload/fontloader-basics-nod.lua
-2022/10/03 | 1004 | macros/luatex/generic/luaotfload/luaotfload-embolden.lua
diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib
index 950aa4786a..c2711c3c25 100644
--- a/biblio/ctan-bibdata/ctan.bib
+++ b/biblio/ctan-bibdata/ctan.bib
@@ -1,7 +1,7 @@
%% bib file of all CTAN packages
%% (C) Herbert Voß
%%
-%% created at 10-10-2022, 02:00:14
+%% created at 11-10-2022, 02:00:14
%%
%% This file is provided under the terms of the LPPL v1.3 or
@@ -147,7 +147,7 @@
url = {https://mirror.ctan.org/macros/generic/abbr},
pkgurl = {https://ctan.org/pkg/abbr},
note = {The package provides some simple macros to support abbreviations in
- Plain TeX or \LaTeX{}. It allows writing (e.g.)
+ Plain \TeX{} or \LaTeX{}. It allows writing (e.g.)
instead of , hence frees users from having to escape
space after parameterless macros.},
}
@@ -407,7 +407,7 @@
note = {The accfonts package contains three utilities to permit easy
manipulation of fonts, in particular the creation of unusual
accented characters. Mkt1font works on Adobe Type 1 fonts,
- vpl2vpl works on TeX virtual fonts and vpl2ovp transforms a TeX
+ vpl2vpl works on \TeX{} virtual fonts and vpl2ovp transforms a \TeX{}
font to an Omega one. All three programs read in a font (either
the font itself or a property list), together with a simple
definition file containing lines such as
@@ -833,7 +833,7 @@
@manual{adforn,
title = {The \texttt{adforn} package},
- subtitle = {OrnementsADF font with TeX/LaTeX support},
+ subtitle = {OrnementsADF font with \TeX{}/LaTeX support},
author = {Clea F. Rees},
date = {2020-08-29},
version = {1.1b},
@@ -844,7 +844,7 @@
@manual{adfsymbols,
title = {The \texttt{adfsymbols} package},
- subtitle = {SymbolsADF with TeX/LaTeX support},
+ subtitle = {SymbolsADF with \TeX{}/LaTeX support},
author = {Clea F. Rees},
date = {2020-08-29},
version = {1.2b},
@@ -1367,13 +1367,13 @@
@manual{aleph,
title = {The \texttt{aleph} package},
- subtitle = {Extended TeX},
+ subtitle = {Extended \TeX{}},
author = {Giuseppe Bilotta and {The TeX Live Team}},
date = {2020-08-30},
license = {gpl},
pkgurl = {https://ctan.org/pkg/aleph},
note = {An development of , using most of
- the extensions of TeX itself developed for
+ the extensions of \TeX{} itself developed for
.},
}
@@ -1590,7 +1590,7 @@
@manual{almfixed,
title = {The \texttt{almfixed} package},
- subtitle = {Arabic-Latin Modern Fixed extends TeX-Gyre Latin Modern Mono 10 Regular to full Arabic Unicode support},
+ subtitle = {Arabic-Latin Modern Fixed extends \TeX{}-Gyre Latin Modern Mono 10 Regular to full Arabic Unicode support},
author = {Idris Samawi Hamid},
date = {2016-06-24},
version = {0.92},
@@ -1635,7 +1635,7 @@
@manual{alpha,
title = {The \texttt{alpha} package},
- subtitle = {Editor for the Macintosh with good TeX support},
+ subtitle = {Editor for the Macintosh with good \TeX{} support},
author = {Pete Keleher},
date = {2019-05-04},
version = {8.0.2},
@@ -1717,7 +1717,7 @@
note = {The package is a \LaTeX{}2e package, for making
multiple choices questionnaires in a table with two columns. The aim is
to provide some useful macros to build QCM in tables. These macros may be
- used by only \LaTeX{} TeX users. The package  works with utf8, pdfLaTeX,
+ used by only \LaTeX{} \TeX{} users. The package  works with utf8, pdfLaTeX,
LuaLaTeX and \XeLaTeX{} (with some languages). The documentation is in English.},
}
@@ -2117,7 +2117,7 @@
@manual{amstex,
title = {The \texttt{amstex} package},
- subtitle = {American Mathematical Society plain TeX macros},
+ subtitle = {American Mathematical Society plain \TeX{} macros},
author = {{The American Mathematical Society}},
date = {2022-06-08},
version = {2.01},
@@ -2345,7 +2345,7 @@
@manual{ant-worker-tasks,
title = {The \texttt{ant-worker-tasks} package},
- subtitle = {Apache ANT Tasks for TeX and PDF},
+ subtitle = {Apache ANT Tasks for \TeX{} and PDF},
author = {Michael Niedermair},
date = {2016-06-24},
version = {268},
@@ -2356,7 +2356,7 @@
@manual{ant,
title = {The \texttt{ant} package},
- subtitle = {A typesetting system inspired by TeX},
+ subtitle = {A typesetting system inspired by \TeX{}},
author = {Achim Blumensath},
date = {2016-06-24},
version = {0.8},
@@ -2685,7 +2685,7 @@
@manual{apnum,
title = {The \texttt{apnum} package},
- subtitle = {Arbitrary precision numbers implemented by TeX macros},
+ subtitle = {Arbitrary precision numbers implemented by \TeX{} macros},
author = {Petr Olšák},
date = {2018-04-22},
version = {1.7},
@@ -2743,7 +2743,7 @@
@manual{apprendre-a-programmer-en-tex,
title = {The \texttt{apprendre-a-programmer-en-tex} package},
- subtitle = {The book “Apprendre à programmer en TeX”},
+ subtitle = {The book “Apprendre à programmer en \TeX{}”},
author = {Christian Tellechea},
date = {2020-12-20},
version = {},
@@ -2774,7 +2774,7 @@
pkgurl = {https://ctan.org/pkg/apptools},
note = {The package provides an command to add code to a hook
that is executed when is called by the user.
- Additionally, a TeX conditional and a \LaTeX{}-style
+ Additionally, a \TeX{} conditional and a \LaTeX{}-style
conditional are provided to check if
has already been called.},
}
@@ -3061,7 +3061,7 @@
@manual{armtex,
title = {The \texttt{armtex} package},
- subtitle = {A system for writing in Armenian with TeX and \LaTeX{}},
+ subtitle = {A system for writing in Armenian with \TeX{} and \LaTeX{}},
author = {Serguei Dachian and Arnak Dalalyan and Vardan Akopian},
date = {2022-08-15},
version = {3.0-beta4},
@@ -3083,7 +3083,7 @@
@manual{aro-bend,
title = {The \texttt{aro-bend} package},
- subtitle = {Exercises in TeX, with answers},
+ subtitle = {Exercises in \TeX{}, with answers},
author = {Michael J. Downes},
date = {2016-06-24},
version = {},
@@ -3105,7 +3105,7 @@
@manual{around-the-bend,
title = {The \texttt{around-the-bend} package},
- subtitle = {Typeset exercises in TeX, with answers},
+ subtitle = {Typeset exercises in \TeX{}, with answers},
author = {Michael J. Downes and Peter R. Wilson},
date = {2016-06-24},
version = {},
@@ -3347,7 +3347,7 @@
@manual{asapsym,
title = {The \texttt{asapsym} package},
- subtitle = {Using the free ASAP Symbol font with \LaTeX{} and Plain TeX},
+ subtitle = {Using the free ASAP Symbol font with \LaTeX{} and Plain \TeX{}},
author = {Paul D. Gessler},
date = {2022-02-09},
version = {1.0},
@@ -3635,7 +3635,7 @@
@manual{asymptote,
title = {The \texttt{asymptote} package},
- subtitle = {2D and 3D TeX-Aware Vector Graphics Language},
+ subtitle = {2D and 3D \TeX{}-Aware Vector Graphics Language},
author = {John Bowman and Andy Hammerlindl},
date = {2022-09-17},
version = {2.83},
@@ -3690,7 +3690,7 @@
, providing various commands
to be executed before a command. It makes use of
e-TeX’s facilities if they are available. The package may
- be used either with \LaTeX{} or with plain TeX.},
+ be used either with \LaTeX{} or with plain \TeX{}.},
}
@manual{atenddvi,
@@ -3796,7 +3796,7 @@
@manual{auctex,
title = {The \texttt{auctex} package},
- subtitle = {Emacs support files for TeX},
+ subtitle = {Emacs support files for \TeX{}},
author = {{The AUCTeX Team} and Kresten Krab Thorup and Per Abrahamsen},
date = {2022-02-20},
version = {13.1},
@@ -4028,7 +4028,7 @@
@manual{automagic,
title = {The \texttt{automagic} package},
- subtitle = {Automagic numbering in Plain TeX},
+ subtitle = {Automagic numbering in Plain \TeX{}},
author = {{Unknown}},
date = {2016-06-24},
version = {},
@@ -4094,7 +4094,7 @@
@manual{autopict,
title = {The \texttt{autopict} package},
- subtitle = {The \LaTeX{} picture mode, for use with Plain TeX},
+ subtitle = {The \LaTeX{} picture mode, for use with Plain \TeX{}},
author = {{The LaTeX Project Team} and David Carlisle},
date = {2021-11-15},
version = {1.1k},
@@ -4153,7 +4153,7 @@
@manual{autotoc,
title = {The \texttt{autotoc} package},
- subtitle = {Table of contents in Plain TeX},
+ subtitle = {Table of contents in Plain \TeX{}},
author = {{Unknown}},
date = {2016-06-24},
version = {},
@@ -5011,7 +5011,7 @@
in documents written in Ukrainian.
The support is adapted for use under legacy
- TeX engines as well as XeTeX and LuaTeX.},
+ \TeX{} engines as well as XeTeX and LuaTeX.},
}
@manual{babel-vietnamese,
@@ -5040,7 +5040,7 @@
@manual{babel,
title = {The \texttt{babel} package},
- subtitle = {Multilingual support for \LaTeX{}, LuaLaTeX, \XeLaTeX{}, and Plain TeX},
+ subtitle = {Multilingual support for \LaTeX{}, LuaLaTeX, \XeLaTeX{}, and Plain \TeX{}},
author = {Javier Bezos López and Johannes L. Braams},
date = {2022-10-04},
version = {3.81},
@@ -5094,9 +5094,9 @@
license = {noinfo},
url = {https://mirror.ctan.org/macros/generic/misc/backgrnd.tex},
pkgurl = {https://ctan.org/pkg/backgrnd},
- note = {Marks text, using TeX's resources only (without resorting to
+ note = {Marks text, using \TeX{}'s resources only (without resorting to
commands). Grey background uses a shade font
- provided as Metafont source. Works under plain TeX and in simple \LaTeX{}
+ provided as Metafont source. Works under plain \TeX{} and in simple \LaTeX{}
2.09 documents, but probably not in \LaTeX{} 2e.},
}
@@ -5221,7 +5221,7 @@
@manual{bakoma,
title = {The \texttt{bakoma} package},
- subtitle = {A TeX distribution for MS-Windows VISTA/XP/2000},
+ subtitle = {A \TeX{} distribution for MS-Windows VISTA/XP/2000},
author = {Basil Malyshev},
date = {2016-06-24},
version = {9.51},
@@ -5450,7 +5450,7 @@
@manual{base,
title = {The \texttt{base} package},
- subtitle = {Definitive source of Plain TeX on CTAN},
+ subtitle = {Definitive source of Plain \TeX{} on CTAN},
author = {Donald E. Knuth},
date = {2020-06-21},
license = {knuth},
@@ -5504,7 +5504,7 @@
@manual{basix,
title = {The \texttt{basix} package},
- subtitle = {A BASIC interpreter written in TeX},
+ subtitle = {A BASIC interpreter written in \TeX{}},
author = {Andrew Greene},
date = {2021-08-26},
version = {},
@@ -5515,7 +5515,7 @@
@manual{baskervaldadf,
title = {The \texttt{baskervaldadf} package},
- subtitle = {Baskervald ADF fonts collection with TeX/LaTeX support},
+ subtitle = {Baskervald ADF fonts collection with \TeX{}/LaTeX support},
author = {Clea F. Rees},
date = {2017-04-18},
version = {1.016},
@@ -5555,7 +5555,7 @@
(Roman, Italic, Bold only) released under the OFL by
Paolo Impallari and Rodrigo Fuenzalida.
Their fonts are optimized for web usage,
- while BaskervilleF is optimized for traditional TeX usage,
+ while BaskervilleF is optimized for traditional \TeX{} usage,
normally destined for production of pdf files. A bold italic
style was added and mathematical support is offered as an option
to .},
@@ -6359,7 +6359,7 @@
@manual{berenisadf,
title = {The \texttt{berenisadf} package},
- subtitle = {Berenis ADF fonts and TeX/LaTeX support},
+ subtitle = {Berenis ADF fonts and \TeX{}/LaTeX support},
author = {Clea F. Rees and Hirwen Harendal},
date = {2016-06-24},
version = {1.004},
@@ -6475,7 +6475,7 @@
@manual{bfsymb,
title = {The \texttt{bfsymb} package},
- subtitle = {Generate bold symbols in Plain TeX mathematics},
+ subtitle = {Generate bold symbols in Plain \TeX{} mathematics},
author = {Uwe Münch},
date = {2016-06-24},
version = {},
@@ -7894,7 +7894,7 @@
note = {The package allows Bible references to be formatted in a
consistent way. It is similar to the bibleref package, except
that the formatting macros are all purely expandable — that is,
- they are all implemented in TeX’s mouth. This means that they can
+ they are all implemented in \TeX{}’s mouth. This means that they can
be used in any expandable context, such as an argument to
a command.},
}
@@ -8008,7 +8008,7 @@
@manual{bibplain,
title = {The \texttt{bibplain} package},
- subtitle = {Simple macros for using BibTeX with Plain TeX},
+ subtitle = {Simple macros for using BibTeX with Plain \TeX{}},
author = {Anthony Ferro},
date = {2016-06-18},
version = {},
@@ -8266,7 +8266,7 @@
@manual{bidi,
title = {The \texttt{bidi} package},
- subtitle = {Bidirectional typesetting in plain TeX and \LaTeX{}, using XeTeX},
+ subtitle = {Bidirectional typesetting in plain \TeX{} and \LaTeX{}, using XeTeX},
author = {Vafa Khalighi and {bidi-tex GitHub Organisation}},
date = {2022-09-22},
version = {39.5},
@@ -8432,7 +8432,7 @@
@manual{bigtable,
title = {The \texttt{bigtable} package},
- subtitle = {Multi-page tables in Plain TeX},
+ subtitle = {Multi-page tables in Plain \TeX{}},
author = {Andrew Mathas and Bob Howlett},
date = {2016-06-24},
version = {},
@@ -8599,7 +8599,7 @@
@manual{bitelist,
title = {The \texttt{bitelist} package},
- subtitle = {Split list, in TeX’s mouth},
+ subtitle = {Split list, in \TeX{}’s mouth},
author = {Uwe Lück},
date = {2017-05-05},
version = {0.1},
@@ -8718,7 +8718,7 @@
url = {https://mirror.ctan.org/info/symbols/blackboard},
pkgurl = {https://ctan.org/pkg/blackboard},
note = {A demonstration of various blackboard bold typefaces
- available for TeX (,
+ available for \TeX{} (,
,
, and
),
@@ -8868,7 +8868,7 @@
pkgurl = {https://ctan.org/pkg/blowup},
note = {The package blowup only defines the user-level macro
, which can be used to upscale or downscale all
- pages of a document. It is similar to the TeX primitive
+ pages of a document. It is similar to the \TeX{} primitive
but more accurate and user-friendly.},
}
@@ -8897,7 +8897,7 @@
“”,
which serves as a user manual for the format. (The acronym is
based on Knuth’s “Ben Lee User”, who
- tends to get surprised by things in examples in the TeXbook.)},
+ tends to get surprised by things in examples in the \TeX{}book.)},
}
@manual{bm,
@@ -8988,7 +8988,7 @@
@manual{bnf-plain,
title = {The \texttt{bnf-plain} package},
- subtitle = {Plain TeX macros for BNF grammars},
+ subtitle = {Plain \TeX{} macros for BNF grammars},
author = {Erik Quanstrom},
date = {2016-06-24},
version = {},
@@ -9138,7 +9138,7 @@
@manual{book-examples,
title = {The \texttt{book-examples} package},
- subtitle = {A collection of examples from published TeX-related books},
+ subtitle = {A collection of examples from published \TeX{}-related books},
author = {{Unknown}},
date = {2016-06-24},
license = {collection},
@@ -9351,7 +9351,7 @@
@manual{border,
title = {The \texttt{border} package},
- subtitle = {Draw a black border around a Plain TeX page},
+ subtitle = {Draw a black border around a Plain \TeX{} page},
author = {James Brister},
date = {2016-06-24},
version = {},
@@ -9382,7 +9382,7 @@
@manual{boxedart4mac,
title = {The \texttt{boxedart4mac} package},
- subtitle = {Import graphics into Macintosh TeX},
+ subtitle = {Import graphics into Macintosh \TeX{}},
author = {Laurent Siebenmann},
date = {2016-06-24},
version = {},
@@ -9396,7 +9396,7 @@
@manual{boxedeps,
title = {The \texttt{boxedeps} package},
- subtitle = {Incorporate EPS files into TeX documents},
+ subtitle = {Incorporate EPS files into \TeX{} documents},
author = {Laurent Siebenmann},
date = {2016-06-24},
version = {},
@@ -9439,7 +9439,7 @@
note = {The package defines a boxit environment that draws lines around
its contents. The environment can box things like verbatim text,
unlike the that originally
- appeared in the TeXbook.},
+ appeared in the \TeX{}book.},
}
@manual{boxit,
@@ -9649,7 +9649,7 @@
@manual{bridge-pln,
title = {The \texttt{bridge-pln} package},
- subtitle = {Plain TeX macros for writing about bridge},
+ subtitle = {Plain \TeX{} macros for writing about bridge},
author = {Kees van der Laan},
date = {2021-08-26},
version = {},
@@ -9745,7 +9745,7 @@
@manual{bsr2dvi,
title = {The \texttt{BSR2dvi} package},
- subtitle = {Convert a TeXtures working file to DVI},
+ subtitle = {Convert a \TeX{}tures working file to DVI},
author = {Laurent Siebenmann},
date = {2016-06-24},
license = {other-free},
@@ -9784,7 +9784,7 @@
license = {lppl1.3c},
url = {https://mirror.ctan.org/macros/latex/contrib/bubblesort},
pkgurl = {https://ctan.org/pkg/bubblesort},
- note = {This package sorts a list of TeX items
+ note = {This package sorts a list of \TeX{} items
in "increasing" order where "increasing" is determined
by a comparator macro. By default it sorts real numbers with the usual
meaning of "increasing" but some other examples are discussed
@@ -10107,7 +10107,7 @@
@manual{bxtexlogo,
title = {The \texttt{bxtexlogo} package},
- subtitle = {Additional TeX-family logos},
+ subtitle = {Additional \TeX{}-family logos},
author = {Takayuki Yato},
date = {2022-05-05},
version = {0.6},
@@ -10540,7 +10540,7 @@
@manual{capparmode,
title = {The \texttt{capparmode} package},
- subtitle = {Dropped capitals for Plain TeX},
+ subtitle = {Dropped capitals for Plain \TeX{}},
author = {David Braunegg},
date = {2016-06-24},
license = {other-free},
@@ -10895,7 +10895,7 @@
@manual{catcodes,
title = {The \texttt{catcodes} package},
- subtitle = {Generic handling of TeX category codes},
+ subtitle = {Generic handling of \TeX{} category codes},
author = {Uwe Lück},
date = {2017-05-05},
version = {r0.2},
@@ -10961,7 +10961,7 @@
(, and
, which will be used by
if the package has already been loaded).
- The package also provides a range of other TeX programming tools.},
+ The package also provides a range of other \TeX{} programming tools.},
}
@manual{causets,
@@ -11290,8 +11290,8 @@
title = {The \texttt{centeredline} package},
subtitle = {A macro for centering lines},
author = {Jean-François Burnol},
- date = {2019-05-03},
- version = {1.1},
+ date = {2022-10-10},
+ version = {1.2},
license = {lppl1.3c},
url = {https://mirror.ctan.org/macros/latex/contrib/centeredline},
pkgurl = {https://ctan.org/pkg/centeredline},
@@ -11395,7 +11395,7 @@
and commands; the bars may be
coloured. The package uses ‘drivers’ to place the bars; the
available drivers can work with dvitoln03, dvitops, dvips, the
- emTeX and TeXtures DVI drivers, and VTeX and pdfTeX.},
+ emTeX and \TeX{}tures DVI drivers, and VTeX and pdfTeX.},
}
@manual{changelayout,
@@ -11519,7 +11519,7 @@
@manual{chbar,
title = {The \texttt{chbar} package},
- subtitle = {Change bar marks in Plain TeX},
+ subtitle = {Change bar marks in Plain \TeX{}},
author = {Joachim Schrod},
date = {2016-06-24},
license = {gpl},
@@ -11833,7 +11833,7 @@
license = {noinfo},
url = {https://mirror.ctan.org/macros/latex209/contrib/chemstruct},
pkgurl = {https://ctan.org/pkg/chemstruct},
- note = {An ingenious package that will also work with Plain TeX. There
+ note = {An ingenious package that will also work with Plain \TeX{}. There
are signs that it may have been (in part) inspiration for
.},
}
@@ -11882,7 +11882,7 @@
‘printer’ and ‘screen’ formats),
and (for some reason) as a file, which from the
documentation sounds as if it ought to be a file.
- Metrics (both AFM and TeX files), and a simple package
+ Metrics (both AFM and \TeX{} files), and a simple package
for generating images of pieces, are provided.},
}
@@ -12136,7 +12136,7 @@
@manual{chitex,
title = {The \texttt{chitex} package},
- subtitle = {A Chinese TeX system},
+ subtitle = {A Chinese \TeX{} system},
author = {Hung-Yih Chen},
date = {2016-06-24},
version = {},
@@ -12643,7 +12643,7 @@
of units,
– a letter and envelope class,
– an outlining package, and
- – a package that enables all of Plain TeX usage under \LaTeX{}.},
+ – a package that enables all of Plain \TeX{} usage under \LaTeX{}.},
}
@manual{clara,
@@ -12841,7 +12841,7 @@
@manual{clock,
title = {The \texttt{clock} package},
- subtitle = {Graphical and textual clocks for TeX and \LaTeX{}},
+ subtitle = {Graphical and textual clocks for \TeX{} and \LaTeX{}},
author = {Oliver Corff},
date = {2016-06-24},
license = {other-free},
@@ -13238,7 +13238,7 @@
document, all (and similar command
definitions) between that point and the beginning of the document
will be marked for logging. At the end of the document a report
- of command usage will be printed in the TeX log, for example:},
+ of command usage will be printed in the \TeX{} log, for example:},
}
@manual{cmextra-latex,
@@ -13450,15 +13450,15 @@
@manual{cmyk-hax,
title = {The \texttt{cmyk-hax} package},
- subtitle = {A TeX macro package for colour manipulation (using PostScript)},
+ subtitle = {A \TeX{} macro package for colour manipulation (using PostScript)},
author = {{BOP}},
date = {2016-06-24},
version = {0.75},
license = {pd},
url = {https://mirror.ctan.org/macros/generic/TeX-PS/cmyk-hax},
pkgurl = {https://ctan.org/pkg/cmyk-hax},
- note = {A set of TeX macros supporting colour separation and substitution
- using the TeX/PostScript environment. Requires
+ note = {A set of \TeX{} macros supporting colour separation and substitution
+ using the \TeX{}/PostScript environment. Requires
and
colordvi.tex/sty from the standard dvips distribution. The
current version enables processing of CMYK bitmaps.},
@@ -13795,7 +13795,7 @@
@manual{colordvi,
title = {The \texttt{colordvi} package},
- subtitle = {Simple colour use in Plain TeX},
+ subtitle = {Simple colour use in Plain \TeX{}},
author = {Thomas Hafner and Tom Rokicki},
date = {2016-11-04},
version = {},
@@ -13943,7 +13943,7 @@
@manual{colortex,
title = {The \texttt{colortex} package},
- subtitle = {Colour facilities for use with TeX},
+ subtitle = {Colour facilities for use with \TeX{}},
author = {Christophe Cérin},
date = {2016-06-24},
version = {3.3},
@@ -14061,7 +14061,7 @@
@manual{comicneue,
title = {The \texttt{comicneue} package},
- subtitle = {Use Comic Neue with TeX(-alike) systems},
+ subtitle = {Use Comic Neue with \TeX{}(-alike) systems},
author = {Silke Hofstra},
date = {2020-04-26},
version = {1.2},
@@ -14131,7 +14131,7 @@
@manual{comment-pln,
title = {The \texttt{comment-pln} package},
- subtitle = {Comment macros for use in Plain TeX},
+ subtitle = {Comment macros for use in Plain \TeX{}},
author = {Jason Alexander},
date = {2016-06-24},
version = {},
@@ -14188,7 +14188,7 @@
@manual{commutative-diagrams,
title = {The \texttt{commutative-diagrams} package},
- subtitle = {CoDi: Commutative Diagrams for TeX},
+ subtitle = {CoDi: Commutative Diagrams for \TeX{}},
author = {Paolo Brasolin},
date = {2020-06-12},
version = {1.0.1},
@@ -14270,7 +14270,7 @@
@manual{components,
title = {The \texttt{components} package},
- subtitle = {Components of TeX},
+ subtitle = {Components of \TeX{}},
author = {Joachim Schrod},
date = {2022-05-01},
license = {gpl},
@@ -15463,7 +15463,7 @@
@manual{covfonts,
title = {The \texttt{covfonts} package},
- subtitle = {Make Apostrophic Laboratories's Covington fonts available to TeX and \LaTeX{}},
+ subtitle = {Make Apostrophic Laboratories's Covington fonts available to \TeX{} and \LaTeX{}},
author = {Scott Pakin},
date = {2022-04-24},
version = {1.0a},
@@ -15474,7 +15474,7 @@
fonts, font-description files, and font-mapping files needed to
use Apostrophic Laboratories's freely downloadable
- with TeX and \LaTeX{}.},
+ with \TeX{} and \LaTeX{}.},
}
@manual{covington,
@@ -15537,7 +15537,7 @@
@manual{cptex,
title = {The \texttt{cptex} package},
- subtitle = {Use different code pages for TeX input},
+ subtitle = {Use different code pages for \TeX{} input},
author = {Martin Krämer},
date = {2016-06-24},
version = {1.1},
@@ -15673,7 +15673,7 @@
@manual{cropmark-pu,
title = {The \texttt{cropmark-pu} package},
- subtitle = {Cropmark macros for Plain TeX},
+ subtitle = {Cropmark macros for Plain \TeX{}},
author = {Peter Ungar},
date = {2016-06-24},
version = {},
@@ -15693,7 +15693,7 @@
pkgurl = {https://ctan.org/pkg/cropmark},
note = {The package subverts and has it recognise the
circumstances in which it is being called. A short test program,
- which detects whether it is being run under Plain TeX or \LaTeX{}, is
+ which detects whether it is being run under Plain \TeX{} or \LaTeX{}, is
provided.},
}
@@ -15713,7 +15713,7 @@
@manual{cropmrks,
title = {The \texttt{cropmrks} package},
- subtitle = {Add crop marks to a Plain TeX document},
+ subtitle = {Add crop marks to a Plain \TeX{} document},
author = {Philip Taylor},
date = {2016-06-24},
version = {1.5},
@@ -15816,7 +15816,7 @@
@manual{crw,
title = {The \texttt{crw} package},
- subtitle = {Crossword macros for Plain TeX},
+ subtitle = {Crossword macros for Plain \TeX{}},
author = {Kees van der Laan},
date = {2016-06-24},
version = {},
@@ -15927,7 +15927,7 @@
@manual{csplain,
title = {The \texttt{csplain} package},
- subtitle = {Plain TeX multilanguage support},
+ subtitle = {Plain \TeX{} multilanguage support},
author = {Petr Olšák},
date = {2022-03-17},
version = {Mar. 2022},
@@ -16019,7 +16019,7 @@
@manual{csvmerge,
title = {The \texttt{csvmerge} package},
- subtitle = {Merge TeX code with csv data},
+ subtitle = {Merge \TeX{} code with csv data},
author = {Laurence R Taylor},
date = {2019-08-14},
version = {1.0},
@@ -16173,7 +16173,7 @@
@manual{ctex-faq,
title = {The \texttt{ctex-faq} package},
- subtitle = {LaTeX FAQ by the Chinese TeX Society (ctex.org)},
+ subtitle = {LaTeX FAQ by the Chinese \TeX{} Society (ctex.org)},
author = {LingYun Wu},
date = {2022-02-09},
version = {},
@@ -16200,7 +16200,7 @@
@manual{ctib4tex,
title = {The \texttt{ctib4tex} package},
- subtitle = {Tibetan for TeX and \LaTeX{}2e},
+ subtitle = {Tibetan for \TeX{} and \LaTeX{}2e},
author = {Oliver Corff},
date = {2016-06-24},
license = {gpl},
@@ -16209,7 +16209,7 @@
note = {A package using a modified version of
. An
advantage of this Tibetan implementation is that all consonant
- clusters are formed by TeX and Metafont. No external
+ clusters are formed by \TeX{} and Metafont. No external
preprocessor is needed.},
}
@@ -16279,9 +16279,9 @@
title = {The \texttt{currfile} package},
subtitle = {Provide file name and path of input files},
author = {Martin Scharrer},
- date = {2020-09-30},
- version = {0.7d},
- license = {lppl1.3},
+ date = {2022-10-10},
+ version = {0.8},
+ license = {lppl1.3c},
url = {https://mirror.ctan.org/macros/latex/contrib/currfile},
pkgurl = {https://ctan.org/pkg/currfile},
}
@@ -16587,8 +16587,8 @@
license = {noinfo},
url = {https://mirror.ctan.org/macros/latex209/contrib/cyrmemo},
pkgurl = {https://ctan.org/pkg/cyrmemo},
- note = {A Plain TeX document, and support macros, describing the use of
- the AMS Cyrillic fonts (the family) in Plain TeX and
+ note = {A Plain \TeX{} document, and support macros, describing the use of
+ the AMS Cyrillic fonts (the family) in Plain \TeX{} and
\LaTeX{} 2.09. (The fonts embody the OT2 encoding, in \LaTeX{} 2e.)},
}
@@ -16603,7 +16603,7 @@
pkgurl = {https://ctan.org/pkg/cyrtug},
note = {The CyrTUG distribution of files for use with
. (CyrTUG is the
- Cyrillic-alphabet TeX users' group; apart from the
+ Cyrillic-alphabet \TeX{} users' group; apart from the
fonts, there are several other files to
support Cyrillic users.)},
}
@@ -17540,7 +17540,7 @@
@manual{dcpic,
title = {The \texttt{DCpic} package},
- subtitle = {Commutative diagrams in a \LaTeX{} and TeX documents},
+ subtitle = {Commutative diagrams in a \LaTeX{} and \TeX{} documents},
author = {Pedro Quaresma},
date = {2016-06-24},
version = {5.0.0},
@@ -17653,7 +17653,7 @@
@manual{default,
title = {The \texttt{default} package},
- subtitle = {Provide default parameters for TeX macros},
+ subtitle = {Provide default parameters for \TeX{} macros},
author = {Zhuhan Jiang},
date = {2020-04-11},
version = {1.3},
@@ -17898,7 +17898,7 @@
@manual{detex,
title = {The \texttt{detex} package},
- subtitle = {Strip TeX from a source file},
+ subtitle = {Strip \TeX{} from a source file},
author = {Daniel Trinkle},
date = {2020-03-15},
version = {},
@@ -17908,7 +17908,7 @@
@manual{detexfaq,
title = {The \texttt{detexfaq} package},
- subtitle = {German TeX FAQ},
+ subtitle = {German \TeX{} FAQ},
author = {Patrick Gundlach},
date = {2017-04-18},
version = {},
@@ -18035,7 +18035,7 @@
@manual{diagnose,
title = {The \texttt{diagnose} package},
- subtitle = {A diagnostic tool for a TeX installation},
+ subtitle = {A diagnostic tool for a \TeX{} installation},
author = {Oliver Corff},
date = {2016-06-24},
version = {0.2},
@@ -18367,7 +18367,7 @@
@manual{djgpp,
title = {The \texttt{djgpp} package},
- subtitle = {DJGPP-based version of TeX for MS-DOS},
+ subtitle = {DJGPP-based version of \TeX{} for MS-DOS},
author = {Eli Zaretskii},
date = {2019-09-12},
license = {noinfo},
@@ -18803,7 +18803,7 @@
@manual{doublecol,
title = {The \texttt{doublecol} package},
- subtitle = {Double-column page macros for Plain TeX},
+ subtitle = {Double-column page macros for Plain \TeX{}},
author = {{Unknown}},
date = {2016-06-24},
version = {},
@@ -19259,7 +19259,7 @@
@manual{dtk-bibliography,
title = {The \texttt{dtk-bibliography} package},
- subtitle = {Bibliography of “Die TeXnische Komödie”},
+ subtitle = {Bibliography of “Die \TeX{}nische Komödie”},
author = {Uwe Ziegenhagen},
date = {2022-09-05},
version = {2022-03},
@@ -19484,7 +19484,7 @@
@manual{dvi2bitmap,
title = {The \texttt{dvi2bitmap} package},
- subtitle = {Utility to convert TeX DVI files directly to bitmaps},
+ subtitle = {Utility to convert \TeX{} DVI files directly to bitmaps},
author = {Norman Gray},
date = {2017-04-18},
version = {1.0},
@@ -19681,9 +19681,9 @@
pkgurl = {https://ctan.org/pkg/dviout},
note = {The program supports a variety of printing mechanisms (including
PDF output via ), and can use
- most extant font formats (including the long-outdated TeX PXL
+ most extant font formats (including the long-outdated \TeX{} PXL
format). The program will use output from Omega as well as from
- TeX, and understands a wide variety of commands.},
+ \TeX{}, and understands a wide variety of commands.},
}
@manual{dvipaste,
@@ -20329,7 +20329,7 @@
@manual{ec-plain,
title = {The \texttt{ec-plain} package},
- subtitle = {Use EC fonts in Plain TeX},
+ subtitle = {Use EC fonts in Plain \TeX{}},
author = {Daniel Taupin},
date = {2016-06-24},
version = {},
@@ -20851,7 +20851,7 @@
@manual{eitl,
title = {The \texttt{eitl} package},
- subtitle = {Easy install of TeX Live},
+ subtitle = {Easy install of \TeX{} Live},
author = {Rolf Niepraschk and Herbert Voß},
date = {2020-06-24},
version = {0.04},
@@ -21181,7 +21181,7 @@
note = {The package provides a means of storing a project, without losing
anything. It uses the
package to attach to the generated PDF all files used in creating
- your project. In particular, it can embed images, external TeX
+ your project. In particular, it can embed images, external \TeX{}
files, external codes and},
}
@@ -21264,8 +21264,8 @@
pkgurl = {https://ctan.org/pkg/emoji},
note = {This package allows users to typeset emojis in \LaTeX{} documents.
It requires the LuaHBTeX engine, which can be called by
- since TeX Live 2020, or
- in TeX Live 2019.},
+ since \TeX{} Live 2020, or
+ in \TeX{} Live 2019.},
}
@manual{emojicite,
@@ -21326,7 +21326,7 @@
@manual{emtex,
title = {The \texttt{emtex} package},
- subtitle = {A TeX system for MS-DOS and OS/2},
+ subtitle = {A \TeX{} system for MS-DOS and OS/2},
author = {Eberhard Mattes},
date = {2016-06-24},
license = {nosell},
@@ -21386,7 +21386,7 @@
@manual{enctex,
title = {The \texttt{encTeX} package},
- subtitle = {A TeX extension that translates input on its way into TeX},
+ subtitle = {A \TeX{} extension that translates input on its way into \TeX{}},
author = {Petr Olšák},
date = {2018-01-06},
version = {},
@@ -21844,7 +21844,7 @@
@manual{eplain,
title = {The \texttt{eplain} package},
- subtitle = {Extended plain TeX macros},
+ subtitle = {Extended plain \TeX{} macros},
author = {Karl Berry and Oleg Katsitadze and Dorai Sitaram},
date = {2022-10-06},
version = {3.12},
@@ -21862,11 +21862,11 @@
license = {other-free},
url = {https://mirror.ctan.org/systems/os2/epmtfe},
pkgurl = {https://ctan.org/pkg/epmtfe},
- note = {The EPM TeX Front End is an additional module for the OS/2
+ note = {The EPM \TeX{} Front End is an additional module for the OS/2
‘Enhanced Editor’ (EPM), v6.03, turning the editor into
- a powerful integrated TeX environment that can be used in
+ a powerful integrated \TeX{} environment that can be used in
conjunction with ,
- or another OS/2 TeX system.},
+ or another OS/2 \TeX{} system.},
}
@manual{eppstein-trees,
@@ -21891,7 +21891,7 @@
note = {Another front end
for this task. Note that
is the application of choice for conversion, where scripted use,
- or use in a TeX callout via , is needed.},
+ or use in a \TeX{} callout via , is needed.},
}
@manual{epsdice,
@@ -21912,7 +21912,7 @@
@manual{epsf-dvipdfmx,
title = {The \texttt{epsf-dvipdfmx} package},
- subtitle = {Plain TeX file for using epsf.tex with (x)dvipdfmx},
+ subtitle = {Plain \TeX{} file for using epsf.tex with (x)dvipdfmx},
author = {Akira Kakuto and Karl Berry},
date = {2021-06-26},
version = {2014},
@@ -21969,7 +21969,7 @@
@manual{epsfx,
title = {The \texttt{epsfx} package},
- subtitle = {A TeX macro package for including EPS graphics},
+ subtitle = {A \TeX{} macro package for including EPS graphics},
author = {{BOP}},
date = {2016-06-24},
version = {0.62},
@@ -21981,7 +21981,7 @@
The package enables, e.g., draft printing of bounding boxes,
safe inputting of EPS files generated by
; moreover, the limit on
- an EPS size is no longer ten times smaller than the TeX one.},
+ an EPS size is no longer ten times smaller than the \TeX{} one.},
}
@manual{epsincl,
@@ -22031,7 +22031,7 @@
note = {epspdf-setup is a Windows installer for and
. It replaces the epspdftk from the plain
package with a version
- which runs out of the box on Windows, as long as there is a TeX
+ which runs out of the box on Windows, as long as there is a \TeX{}
installation. On other platforms, the plain epspdf package should
suffice.},
}
@@ -22465,7 +22465,7 @@
generated from the original Metafont using
. This distribution does not
contain the TFM files that are necessary to use the fonts with
- TeX; the TFM files can be generated from the Metafont sources
+ \TeX{}; the TFM files can be generated from the Metafont sources
obtained by following the instructions in the normal way.},
}
@@ -22663,7 +22663,7 @@
@manual{etex,
title = {The \texttt{e-TeX} package},
- subtitle = {An extended version of TeX, from the NTS project},
+ subtitle = {An extended version of \TeX{}, from the NTS project},
author = {Peter Breitenlohner and {The TeX Live Team}},
date = {2020-08-30},
license = {knuth},
@@ -22906,7 +22906,7 @@
not provide mathematical character sets of their own. Euler-VM
is a set of mathematics fonts based on Euler
and CM. This approach has several advantages over immediately
- using the Euler fonts: Most noticeably, less TeX
+ using the Euler fonts: Most noticeably, less \TeX{}
resources are consumed, the quality of various math symbols is
improved and a usable symbol can be provided.
The virtual fonts are accompanied by a \LaTeX{} package which makes
@@ -23048,7 +23048,7 @@
@manual{eurotex,
title = {The \texttt{eurotex} package},
- subtitle = {Multilingual macros for Plain TeX},
+ subtitle = {Multilingual macros for Plain \TeX{}},
author = {Ivar Aavatsmark},
date = {2016-06-24},
version = {1.1},
@@ -23056,7 +23056,7 @@
url = {https://mirror.ctan.org/language/multilingual/eurotex},
pkgurl = {https://ctan.org/pkg/eurotex},
note = {A package for using the (now obsolete) DC fonts to provide a
- version of Plain TeX that accepts ISO Latin 1 input, and provides
+ version of Plain \TeX{} that accepts ISO Latin 1 input, and provides
hyphenation in Danish, English, Finnish, French, German,
Icelandic, Italian, Norwegian, Polish and Swedish (it could be
extended, but it would also need adapting for the
@@ -23097,14 +23097,14 @@
@manual{everyhook,
title = {The \texttt{everyhook} package},
- subtitle = {Hooks for standard TeX token lists},
+ subtitle = {Hooks for standard \TeX{} token lists},
author = {Stephen Checkoway},
date = {2018-01-06},
version = {1.2},
license = {lppl1.3},
url = {https://mirror.ctan.org/macros/latex/contrib/everyhook},
pkgurl = {https://ctan.org/pkg/everyhook},
- note = {The package takes control of the six TeX token registers
+ note = {The package takes control of the six \TeX{} token registers
, , ,
, and .
Real hooks for each of the registers may be installed using a
@@ -23165,9 +23165,9 @@
title = {The \texttt{exam-n} package},
subtitle = {Exam class, focused on collaborative authoring},
author = {Norman Gray},
- date = {2017-04-18},
- version = {1.1.4},
- license = {lppl1.3},
+ date = {2022-10-10},
+ version = {1.4.0},
+ license = {lppl1.3c},
url = {https://mirror.ctan.org/macros/latex/contrib/exam-n},
pkgurl = {https://ctan.org/pkg/exam-n},
}
@@ -23229,14 +23229,14 @@
@manual{example,
title = {The \texttt{example} package},
- subtitle = {Typeset examples for TeX courses},
+ subtitle = {Typeset examples for \TeX{} courses},
author = {Joachim Schrod},
date = {2019-06-21},
version = {},
license = {gpl},
url = {https://mirror.ctan.org/macros/latex209/contrib/misc/example.sty},
pkgurl = {https://ctan.org/pkg/example},
- note = {The package makes it easier to produce examples for TeX course.
+ note = {The package makes it easier to produce examples for \TeX{} course.
It provides an environment, which typesets its
contents on the left of the page, and prints it verbatim on the
right.},
@@ -23996,7 +23996,7 @@
note = {The package was inspired by the
package. In
contrast to cooltooltips, fancytooltips allows inclusion of
- tooltips which contain arbitrary TeX material or a series of TeX
+ tooltips which contain arbitrary \TeX{} material or a series of \TeX{}
materials (animated graphics) from an external PDF file. To see
the tooltips, you have to open the files in Adobe Reader. The
links and JavaScripts are inserted using eforms package from the
@@ -24027,7 +24027,7 @@
@manual{faq-de,
title = {The \texttt{faq-de} package},
- subtitle = {The DANTE TeX Users Group Frequently Asked Questions},
+ subtitle = {The DANTE \TeX{} Users Group Frequently Asked Questions},
author = {Bernd Raichle and Rolf Niepraschk and Thomas Hafner},
date = {2016-06-24},
version = {},
@@ -24040,7 +24040,7 @@
@manual{faq-es,
title = {The \texttt{faq-es} package},
- subtitle = {CervanTeX (Spanish TeX Group) FAQ},
+ subtitle = {CervanTeX (Spanish \TeX{} Group) FAQ},
author = {Agustín Martín},
date = {2016-06-24},
version = {1.97},
@@ -24051,7 +24051,7 @@
@manual{faq-fr,
title = {The \texttt{faq-fr} package},
- subtitle = {French FAQ of the GUTenberg TeX user group},
+ subtitle = {French FAQ of the GUTenberg \TeX{} user group},
author = {Marie-Paule Kluth and Jérémy Just and Yannick Tanguy},
date = {2022-05-11},
version = {},
@@ -24518,7 +24518,7 @@
@manual{fifinddo,
title = {The \texttt{fifinddo} package},
- subtitle = {Filtering files using TeX},
+ subtitle = {Filtering files using \TeX{}},
author = {Uwe Lück},
date = {2017-05-06},
version = {0.61},
@@ -24688,7 +24688,7 @@
@manual{figplace,
title = {The \texttt{figplace} package},
- subtitle = {Floating figures in Plain TeX},
+ subtitle = {Floating figures in Plain \TeX{}},
author = {Joost Zalmstra},
date = {2016-06-24},
version = {},
@@ -25203,7 +25203,7 @@
title = {The \texttt{fixmath} package},
subtitle = {Make maths comply with ISO 31-0:1992 to ISO 31-13:1992},
author = {Walter A. Schmidt and Keiran Harcombe},
- date = {2022-10-07},
+ date = {2022-10-10},
version = {0.9.1},
license = {lppl1.3c},
url = {https://mirror.ctan.org/macros/latex/contrib/fixmath},
@@ -25698,7 +25698,7 @@
@manual{fnote,
title = {The \texttt{fnote} package},
- subtitle = {Auto-numbered footnotes in Plain TeX},
+ subtitle = {Auto-numbered footnotes in Plain \TeX{}},
author = {{Unknown}},
date = {2016-06-18},
version = {},
@@ -25718,7 +25718,7 @@
pkgurl = {https://ctan.org/pkg/fnpara-pln},
note = {Typeset footnotes in run-on paragraphs, instead of one above
another, as in the ‘Dirty Tricks’ on pp
- 398–400 of the TeXbook. This code formed the basis of a
+ 398–400 of the \TeX{}book. This code formed the basis of a
, and has been
further adapted and made more robust for
use in , appears in the
@@ -25737,7 +25737,7 @@
pkgurl = {https://ctan.org/pkg/fnpara},
note = {Typeset footnotes in run-on paragraphs, instead of one above
another; this is a re-seating, for the \LaTeX{} environment, of an
- example in the TeXbook. The same basic code, improved for
+ example in the \TeX{}book. The same basic code, improved for
use in -based \LaTeX{}, appears in the
comprehensive footnote package
, and superior versions are
@@ -25891,7 +25891,7 @@
@manual{font-change,
title = {The \texttt{font-change} package},
- subtitle = {Macros to change text and mathematics fonts in plain TeX},
+ subtitle = {Macros to change text and mathematics fonts in plain \TeX{}},
author = {Amit Raj Dhawan},
date = {2016-06-24},
version = {2015.2},
@@ -25902,7 +25902,7 @@
@manual{font-selection,
title = {The \texttt{font\_selection} package},
- subtitle = {Font selection for plain TeX},
+ subtitle = {Font selection for plain \TeX{}},
author = {Harold de Wijn},
date = {2016-06-24},
license = {gpl},
@@ -25977,7 +25977,7 @@
@manual{fontch,
title = {The \texttt{fontch} package},
- subtitle = {Changing fonts, sizes and encodings in Plain TeX},
+ subtitle = {Changing fonts, sizes and encodings in Plain \TeX{}},
author = {Rodrigo Medina},
date = {2016-06-24},
version = {2.2},
@@ -26026,7 +26026,7 @@
@manual{fontinst,
title = {The \texttt{fontinst} package},
- subtitle = {Help with installing fonts for TeX and \LaTeX{}},
+ subtitle = {Help with installing fonts for \TeX{} and \LaTeX{}},
author = {Lars Hellström and Alan Jeffrey and Sebastian Rahtz and Ulrik Vieth},
date = {2021-03-31},
version = {1.933},
@@ -26081,7 +26081,7 @@
@manual{fontname,
title = {The \texttt{fontname} package},
- subtitle = {Scheme for naming fonts in TeX},
+ subtitle = {Scheme for naming fonts in \TeX{}},
author = {Karl Berry},
date = {2016-11-04},
version = {},
@@ -26138,7 +26138,7 @@
@manual{fontsampler,
title = {The \texttt{fontsampler} package},
- subtitle = {Samples of fonts that come with TeX Live},
+ subtitle = {Samples of fonts that come with \TeX{} Live},
author = {Peter Flynn},
date = {2016-06-24},
license = {gpl},
@@ -26340,7 +26340,7 @@
pkgurl = {https://ctan.org/pkg/forarray},
note = {The package provides functionality for processing lists and
array structures in .
- Arrays can contain characters as well as TeX
+ Arrays can contain characters as well as \TeX{}
and \LaTeX{} commands, nesting of arrays is possible, and arrays are
processed within the same brace level as their surrounding environment.
Array levels can be delimited by characters or control sequences
@@ -26562,7 +26562,7 @@
@manual{fourproject,
title = {The \texttt{fourproject} package},
- subtitle = {Analyse and display the structure of a TeX document},
+ subtitle = {Analyse and display the structure of a \TeX{} document},
author = {Erik Frambach},
date = {2016-06-24},
license = {gpl},
@@ -26572,7 +26572,7 @@
@manual{fourspell,
title = {The \texttt{fourspell} package},
- subtitle = {Windows32 spell checker for TeX, RTF, HTML, and BibTeX},
+ subtitle = {Windows32 spell checker for \TeX{}, RTF, HTML, and BibTeX},
author = {Erik Frambach},
date = {2016-06-24},
license = {gpl},
@@ -26610,7 +26610,7 @@
@manual{fptex,
title = {The \texttt{fpTeX} package},
- subtitle = {A web2C-based TeX system for MS-Windows32},
+ subtitle = {A web2C-based \TeX{} system for MS-Windows32},
author = {Fabrice Popineau},
date = {2016-06-24},
version = {0.7},
@@ -26646,7 +26646,7 @@
@manual{frame,
title = {The \texttt{frame} package},
- subtitle = {Framed boxes for Plain TeX},
+ subtitle = {Framed boxes for Plain \TeX{}},
author = {Timothy Van Zandt and Herbert Voß},
date = {2016-06-24},
version = {1.0},
@@ -26998,9 +26998,9 @@
license = {artistic},
url = {https://mirror.ctan.org/systems/os2/ftetx/ftetx004.zip},
pkgurl = {https://ctan.org/pkg/ftetx},
- note = {A TeX package for FTE (FTE = Folding Text Editor by Marko
- Macek) Adds a TeX menu system for FTE. Changes syntax
- highlighting for FTE's TeX-Mode. Runs TeX, dvi-drivers, ispell,
+ note = {A \TeX{} package for FTE (FTE = Folding Text Editor by Marko
+ Macek) Adds a \TeX{} menu system for FTE. Changes syntax
+ highlighting for FTE's \TeX{}-Mode. Runs \TeX{}, dvi-drivers, ispell,
etc., from FTE. Calls \LaTeX{} help files from FTE. It is
preconfigured for
.},
@@ -27311,7 +27311,7 @@
. The ‘F’ stands
for Fortran (which motivated the initial development), but FWEB
now supports multiple-language programming in C, C++, Fortran,
- Ratfor, and TeX.},
+ Ratfor, and \TeX{}.},
}
@manual{fwlw,
@@ -27486,7 +27486,7 @@
@manual{gastex,
title = {The \texttt{GasTeX} package},
- subtitle = {Graphs and Automata Simplified in TeX},
+ subtitle = {Graphs and Automata Simplified in \TeX{}},
author = {Paul Gastin},
date = {2021-03-18},
version = {3.0},
@@ -27782,7 +27782,7 @@
@manual{gentl-gr,
title = {The \texttt{gentl-gr} package},
- subtitle = {Modern Greek translation of the Gentle Introduction to TeX},
+ subtitle = {Modern Greek translation of the Gentle Introduction to \TeX{}},
author = {Dimitrios Filippou},
date = {2018-01-06},
license = {nosell},
@@ -27792,7 +27792,7 @@
@manual{gentle,
title = {The \texttt{gentle} package},
- subtitle = {A Gentle Introduction to TeX},
+ subtitle = {A Gentle Introduction to \TeX{}},
author = {Michael Doob},
date = {2016-06-24},
version = {},
@@ -28042,7 +28042,7 @@
@manual{gfnotation,
title = {The \texttt{gfnotation} package},
- subtitle = {Typeset Gottlob Frege's notation in plain TeX},
+ subtitle = {Typeset Gottlob Frege's notation in plain \TeX{}},
author = {Udo Wermuth},
date = {2016-06-24},
version = {2.9},
@@ -28234,7 +28234,7 @@
@manual{gincltex,
title = {The \texttt{gincltex} package},
- subtitle = {Include TeX files as graphics (.tex support for \textbackslash{}includegraphics)},
+ subtitle = {Include \TeX{} files as graphics (.tex support for \textbackslash{}includegraphics)},
author = {Martin Scharrer},
date = {2020-08-27},
version = {0.3},
@@ -28334,7 +28334,7 @@
title = {The \texttt{gitstatus} package},
subtitle = {Include Git information in the document as watermark or via variables},
author = {Maximilian Gruber},
- date = {2022-10-08},
+ date = {2022-10-10},
version = {1.1},
license = {lppl1.3},
url = {https://mirror.ctan.org/macros/latex/contrib/gitstatus},
@@ -29199,7 +29199,7 @@
@manual{graphics-pln,
title = {The \texttt{graphics-pln} package},
- subtitle = {LaTeX-style graphics for Plain TeX users},
+ subtitle = {LaTeX-style graphics for Plain \TeX{} users},
author = {David Carlisle},
date = {2022-09-29},
version = {},
@@ -29320,7 +29320,7 @@
@manual{graphtex,
title = {The \texttt{GraphTeX} package},
- subtitle = {Graphs theory and related diagrams in a TeX document},
+ subtitle = {Graphs theory and related diagrams in a \TeX{} document},
author = {John Pliam},
date = {2016-06-24},
version = {1.0.1beta},
@@ -29329,7 +29329,7 @@
pkgurl = {https://ctan.org/pkg/graphtex},
note = {GraphTeX is a Perl library (graphtex.pl) along with a preprocessor
(gt) which can be used to generate
- commands producing graphs and related diagrams inside a TeX
+ commands producing graphs and related diagrams inside a \TeX{}
document. A graph can be "typeset" by writing a .gt source file
which resembles a matrix environment.},
}
@@ -29377,7 +29377,7 @@
pkgurl = {https://ctan.org/pkg/grchyph},
note = {These patterns are written “in Unicode” to work
with ; they will
- not work with a standard TeX installation.},
+ not work with a standard \TeX{} installation.},
}
@manual{greek-fontenc,
@@ -29479,7 +29479,7 @@
@manual{greekinfo3,
title = {The \texttt{greekinfo3} package},
- subtitle = {Overview of systems, packages, and fonts for Greek TeX},
+ subtitle = {Overview of systems, packages, and fonts for Greek \TeX{}},
author = {Ioannis Dimakos and Dimitrios Filippou},
date = {2016-06-24},
version = {},
@@ -29752,7 +29752,7 @@
@manual{gs1,
title = {The \texttt{GS1} package},
- subtitle = {Typeset EAN barcodes using TeX rules, only},
+ subtitle = {Typeset EAN barcodes using \TeX{} rules, only},
author = {Markus Kohm},
date = {2021-06-18},
version = {23},
@@ -29929,7 +29929,7 @@
pkgurl = {https://ctan.org/pkg/guitar},
note = {(La)TeX macros for typesetting guitar chords over song texts. The
package is required. Note
- that this package only places arbitrary TeX code over the
+ that this package only places arbitrary \TeX{} code over the
lyrics. To typeset the chords graphically (and not only by name),
the author recommends use of an additional package such as
by K. Peeters.},
@@ -29984,7 +29984,7 @@
@manual{gurmukhi-singh,
title = {The \texttt{gurmukhi-singh} package},
- subtitle = {Support for Gurmukhi in TeX},
+ subtitle = {Support for Gurmukhi in \TeX{}},
author = {Amarjit Singh},
date = {2016-06-24},
license = {gpl},
@@ -30016,7 +30016,7 @@
@manual{gutenberg,
title = {The \texttt{GUTenberg} package},
- subtitle = {French TeX Users Group information},
+ subtitle = {French \TeX{} Users Group information},
author = {Jérémy Just},
date = {2022-05-23},
version = {},
@@ -30249,7 +30249,7 @@
@manual{hanoi,
title = {The \texttt{hanoi} package},
- subtitle = {Tower of Hanoi in TeX},
+ subtitle = {Tower of Hanoi in \TeX{}},
author = {Brian Blackmore},
date = {2016-06-24},
version = {20120101},
@@ -30271,7 +30271,7 @@
@manual{happy4th,
title = {The \texttt{happy4th} package},
- subtitle = {A firework display in obfuscated TeX},
+ subtitle = {A firework display in obfuscated \TeX{}},
author = {Brian Blackmore},
date = {2016-06-24},
version = {20120102},
@@ -30957,7 +30957,7 @@
@manual{highlight,
title = {The \texttt{highlight} package},
- subtitle = {Converts source code to syntax highlighted TeX or \LaTeX{}},
+ subtitle = {Converts source code to syntax highlighted \TeX{} or \LaTeX{}},
author = {André Simon},
date = {2016-06-24},
version = {2.16},
@@ -31043,7 +31043,7 @@
@manual{histyle,
title = {The \texttt{histyle} package},
- subtitle = {A "HighStyle" environment for TeX},
+ subtitle = {A "HighStyle" environment for \TeX{}},
author = {{Unknown}},
date = {2016-06-24},
version = {1.2},
@@ -31065,7 +31065,7 @@
@manual{hitex,
title = {The \texttt{hitex} package},
- subtitle = {A TeX extension writing HINT output for on-screen reading},
+ subtitle = {A \TeX{} extension writing HINT output for on-screen reading},
author = {Martin Ruckert},
date = {2022-06-19},
license = {x11},
@@ -31118,7 +31118,7 @@
@manual{hktex,
title = {The \texttt{hktex} package},
- subtitle = {A TeX/LaTeX equivalent for Android},
+ subtitle = {A \TeX{}/LaTeX equivalent for Android},
author = {Kwanleung Tse},
date = {2016-06-24},
version = {2.04},
@@ -31305,14 +31305,14 @@
note = {The horoscop package provides a unified interface for astrological
font packages; typesetting with
of standard wheel charts and some variations, in PostScript- and
- PDF-generating TeX engines; and access to external calculation
+ PDF-generating \TeX{} engines; and access to external calculation
software (Astrolog and Swiss Ephemeris) for computing object
positions.},
}
@manual{hp2pl,
title = {The \texttt{HPtfm2pl} package},
- subtitle = {Create TeX PL files from HP AutoFont Support},
+ subtitle = {Create \TeX{} PL files from HP AutoFont Support},
author = {Norman Walsh},
date = {2018-01-06},
version = {1.0b beta},
@@ -31633,7 +31633,7 @@
@manual{hvlogos,
title = {The \texttt{hvlogos} package},
- subtitle = {Print TeX-related names as logo},
+ subtitle = {Print \TeX{}-related names as logo},
author = {Herbert Voß},
date = {2022-05-08},
version = {0.09},
@@ -32010,7 +32010,7 @@
@manual{hyplain,
title = {The \texttt{HyPlain} package},
- subtitle = {Basic support for multiple languages in Plain TeX},
+ subtitle = {Basic support for multiple languages in Plain \TeX{}},
author = {Enrico Gregorio},
date = {2016-06-24},
version = {1.0},
@@ -32027,7 +32027,7 @@
license = {gpl},
url = {https://mirror.ctan.org/fonts/psfonts/i-ching},
pkgurl = {https://ctan.org/pkg/i-ching},
- note = {A complete Plain TeX-based i-ching divination system, including an
+ note = {A complete Plain \TeX{}-based i-ching divination system, including an
Adobe Type 1 font for the characters. Translations are derived
from Alan Stanier's work in his
package.},
@@ -32390,8 +32390,8 @@
title = {The \texttt{iexec} package},
subtitle = {Execute shell commands and input their output},
author = {Yegor Bugayenko},
- date = {2022-10-09},
- version = {0.7.0},
+ date = {2022-10-10},
+ version = {0.8.1},
license = {mit},
url = {https://mirror.ctan.org/macros/latex/contrib/iexec},
pkgurl = {https://ctan.org/pkg/iexec},
@@ -32790,7 +32790,7 @@
work in \LaTeX{} documents processed with pdfLaTeX, \XeLaTeX{} and
LuaLaTeX. If is used for
processing the index entries, no particular setting up is needed
- when TeX Live is used. Using or
+ when \TeX{} Live is used. Using or
other programs it is necessary to enable shell escape; shell
escape is also needed if
is used.},
@@ -32798,7 +32798,7 @@
@manual{imaketex,
title = {The \texttt{Imake-TeX} package},
- subtitle = {An Imake system for TeX},
+ subtitle = {An Imake system for \TeX{}},
author = {Rainer Klute},
date = {2016-06-24},
version = {1.0},
@@ -32941,7 +32941,7 @@
@manual{inconsolata,
title = {The \texttt{inconsolata} package},
- subtitle = {A monospaced font, with support files for use with TeX},
+ subtitle = {A monospaced font, with support files for use with \TeX{}},
author = {Raph Levien and Karl Berry and Michael Sharpe},
date = {2019-06-23},
version = {1.121},
@@ -33167,7 +33167,7 @@
license = {lppl1.3c},
url = {https://mirror.ctan.org/macros/luatex/latex/innerscript},
pkgurl = {https://ctan.org/pkg/innerscript},
- note = {This package modifies two aspects of TeX's automatic interatom
+ note = {This package modifies two aspects of \TeX{}'s automatic interatom
mathematics spacing. It uses LuaTeX's primitives
to make superscripts and subscripts more closely resemble
and math and to treat
@@ -33226,7 +33226,7 @@
url = {https://mirror.ctan.org/macros/unicodetex/generic/inputnormalization},
pkgurl = {https://ctan.org/pkg/inputnormalization},
note = {This package provides a cross engine interface to normalizing
- input before it's read by TeX. It is based on XeTeX's
+ input before it's read by \TeX{}. It is based on XeTeX's
primitive and for LuaTeX.},
}
@@ -33254,7 +33254,7 @@
@manual{inrstex,
title = {The \texttt{inrstex} package},
- subtitle = {Extended Plain TeX for use with MLTeX},
+ subtitle = {Extended Plain \TeX{} for use with MLTeX},
author = {Michael J. Ferguson},
date = {2016-06-24},
version = {},
@@ -33262,7 +33262,7 @@
url = {https://mirror.ctan.org/macros/inrstex},
pkgurl = {https://ctan.org/pkg/inrstex},
note = {INRSTeX supports the preparation of documents in several
- languages, using ordinary fonts. It is usable with any TeX
+ languages, using ordinary fonts. It is usable with any \TeX{}
system, but is most useful when using ordinary CM fonts with an
system. The macros include
support for PostScript graphics.},
@@ -33598,7 +33598,7 @@
pkgurl = {https://ctan.org/pkg/ipa},
note = {The package comprises alternative \LaTeX{} support of the
fonts.
- On CTAN (and in the TeX Live distribution),
+ On CTAN (and in the \TeX{} Live distribution),
these macros are to be found with the fonts themselves.},
}
@@ -33765,7 +33765,7 @@
@manual{isolatin1,
title = {The \texttt{isolatin1} package},
- subtitle = {An obsolete means to use ISO 8859-1 with TeX},
+ subtitle = {An obsolete means to use ISO 8859-1 with \TeX{}},
author = {{Unknown}},
date = {2016-06-24},
version = {0.9},
@@ -33804,14 +33804,14 @@
@manual{isopt,
title = {The \texttt{isopt} package},
- subtitle = {Writing a TeX length with a space between number and unit},
+ subtitle = {Writing a \TeX{} length with a space between number and unit},
author = {Herbert Voß},
date = {2018-01-07},
version = {0.01},
license = {lppl},
url = {https://mirror.ctan.org/macros/latex/contrib/isopt},
pkgurl = {https://ctan.org/pkg/isopt},
- note = {Writing a TeX length with \textbackslash{}the writes the value and the unit
+ note = {Writing a \TeX{} length with \textbackslash{}the writes the value and the unit
without a space. Package isopt provides a macro
which inserts a user defined space between number and unit.},
}
@@ -33918,7 +33918,7 @@
@manual{ite,
title = {The \texttt{iTe} package},
- subtitle = {Interactive TeX editor},
+ subtitle = {Interactive \TeX{} editor},
author = {Wolfgang Kühn},
date = {2016-06-24},
license = {gpl2},
@@ -33967,7 +33967,7 @@
license = {other-free},
url = {https://mirror.ctan.org/dviware/ivd2dvi},
pkgurl = {https://ctan.org/pkg/ivd2dvi},
- note = {The TeX extension TeX-XeT (single hyphen: not to be confused with
+ note = {The \TeX{} extension \TeX{}-XeT (single hyphen: not to be confused with
) produces
‘IVD-DVI’ files which extend DVI files with
‘reflection’ commands for horizontal reversal of
@@ -34074,8 +34074,8 @@
title = {The \texttt{japanese-mathformulas} package},
subtitle = {Compiling basic math formulas in Japanese using LuaLaTeX},
author = {{Unknown}},
- date = {2022-10-07},
- version = {1.0.1},
+ date = {2022-10-10},
+ version = {1.0.2},
license = {lppl1.3c},
url = {https://mirror.ctan.org/macros/luatex/latex/japanese-mathformulas},
pkgurl = {https://ctan.org/pkg/japanese-mathformulas},
@@ -34190,7 +34190,7 @@
@manual{javatex,
title = {The \texttt{javatex} package},
- subtitle = {A Java implementation of TeX},
+ subtitle = {A Java implementation of \TeX{}},
author = {Timothy Murphy},
date = {2016-06-24},
version = {},
@@ -34786,7 +34786,7 @@
@manual{justfontitte,
title = {The \texttt{JustFontItTE} package},
- subtitle = {JustFontIt TeX Edition},
+ subtitle = {JustFontIt \TeX{} Edition},
author = {Alexei Kostin},
date = {2016-06-24},
version = {1.1},
@@ -34952,7 +34952,7 @@
url = {https://mirror.ctan.org/macros/generic/misc/kbordermatrix.sty},
pkgurl = {https://ctan.org/pkg/kbordermatrix},
note = {The package defines along the lines of
- Plain TeX's .},
+ Plain \TeX{}'s .},
}
@manual{kdgdocs,
@@ -35034,7 +35034,7 @@
@manual{ketcindy,
title = {The \texttt{ketcindy} package},
- subtitle = {Creating graphics for TeX using Cinderella},
+ subtitle = {Creating graphics for \TeX{} using Cinderella},
author = {Setsuo Takato},
date = {2021-03-10},
version = {20191225.0},
@@ -35187,7 +35187,7 @@
@manual{kile,
title = {The \texttt{kile} package},
- subtitle = {A user friendly TeX/LaTeX editor for KDE},
+ subtitle = {A user friendly \TeX{}/LaTeX editor for KDE},
author = {Jeroen Wijnhout and Pascal Brachet},
date = {2017-04-18},
version = {2.0},
@@ -35266,7 +35266,7 @@
@manual{knitting,
title = {The \texttt{knitting} package},
- subtitle = {Produce knitting charts, in Plain TeX or \LaTeX{}},
+ subtitle = {Produce knitting charts, in Plain \TeX{} or \LaTeX{}},
author = {Ariel Barton},
date = {2019-04-06},
version = {3.0},
@@ -35357,7 +35357,7 @@
@manual{knuth-hint,
title = {The \texttt{knuth-hint} package},
- subtitle = {HINT collection of typeset C/WEB sources in TeX Live},
+ subtitle = {HINT collection of typeset C/WEB sources in \TeX{} Live},
author = {Andreas Scherer},
date = {2022-04-07},
version = {1.0},
@@ -35376,13 +35376,13 @@
pkgurl = {https://ctan.org/pkg/knuth-letter},
note = {These are Knuth’s own letter macros. Documentation is entirely
missing from the archive, but the macros are discussed in some
- detail in the TeXbook (which says it is describing
+ detail in the \TeX{}book (which says it is describing
).},
}
@manual{knuth-lib,
title = {The \texttt{knuth-lib} package},
- subtitle = {Core TeX and Metafont sources from Knuth},
+ subtitle = {Core \TeX{} and Metafont sources from Knuth},
author = {Donald E. Knuth},
date = {2021-02-27},
version = {},
@@ -35407,7 +35407,7 @@
@manual{knuth-pdf,
title = {The \texttt{knuth-pdf} package},
- subtitle = {PDF collection of typeset C/WEB sources in TeX Live},
+ subtitle = {PDF collection of typeset C/WEB sources in \TeX{} Live},
author = {Andreas Scherer},
date = {2022-04-06},
version = {2.0},
@@ -35588,7 +35588,7 @@
@manual{kotex-plain,
title = {The \texttt{kotex-plain} package},
- subtitle = {Macros for typesetting Korean under Plain TeX},
+ subtitle = {Macros for typesetting Korean under Plain \TeX{}},
author = {Kihwang Lee},
date = {2022-06-22},
version = {3.0.0},
@@ -35621,13 +35621,13 @@
@manual{kpathsea,
title = {The \texttt{kpathsea} package},
- subtitle = {Path searching library for TeX-related files},
+ subtitle = {Path searching library for \TeX{}-related files},
author = {{The TeX Live Team} and Olaf Weber},
date = {2022-01-28},
license = {lgpl2.1},
pkgurl = {https://ctan.org/pkg/kpathsea},
note = {Kpathsea is a library and utility programs which provide path
- searching facilities for TeX file types, including the
+ searching facilities for \TeX{} file types, including the
self-locating feature required for movable installations, layered
on top of a general search mechanism. It is not distributed
separately, but rather is released and maintained as part of the
@@ -35680,7 +35680,7 @@
@manual{ktexshell,
title = {The \texttt{KTeXShell} package},
- subtitle = {Graphical frontend to TeX},
+ subtitle = {Graphical frontend to \TeX{}},
author = {Arnd Fischer},
date = {2018-11-15},
version = {0.4.0},
@@ -36003,7 +36003,7 @@
@manual{laansort,
title = {The \texttt{laansort} package},
- subtitle = {Sorting within TeX},
+ subtitle = {Sorting within \TeX{}},
author = {Kees van der Laan},
date = {2021-08-26},
version = {1.0},
@@ -36191,7 +36191,7 @@
@manual{lambda-lists,
title = {The \texttt{lambda-lists} package},
- subtitle = {Lists in TeX's mouth},
+ subtitle = {Lists in \TeX{}'s mouth},
author = {Alan Jeffrey},
date = {2016-06-24},
version = {},
@@ -36321,7 +36321,7 @@
@manual{lapdf,
title = {The \texttt{lapdf} package},
- subtitle = {PDF drawing directly in TeX documents},
+ subtitle = {PDF drawing directly in \TeX{} documents},
author = {Detlef Reimers},
date = {2016-06-24},
version = {1.1},
@@ -36340,7 +36340,7 @@
url = {https://mirror.ctan.org/macros/generic/misc/laps.tex},
pkgurl = {https://ctan.org/pkg/laps},
note = {Provides macros extends the / set in
- Plain TeX:},
+ Plain \TeX{}:},
}
@manual{lastbib,
@@ -36445,7 +36445,7 @@
kernel changes. Testing by the \LaTeX{} team itself suggests that
the code is stable and usable, but wider use by knowledgeable
users is required by adding these changes to the release \LaTeX{} kernel.
- Typically, the code here will be used by a TeX system to
+ Typically, the code here will be used by a \TeX{} system to
create dedicated formats, for example ,
which can then be used explicitly for testing.},
}
@@ -36764,7 +36764,7 @@
@manual{latex-notes-zh-cn,
title = {The \texttt{latex-notes-zh-cn} package},
- subtitle = {Chinese Introduction to TeX and \LaTeX{}},
+ subtitle = {Chinese Introduction to \TeX{} and \LaTeX{}},
author = {Alpha Huang},
date = {2021-12-29},
version = {1.20},
@@ -36955,7 +36955,7 @@
@manual{latex,
title = {The \texttt{latex} package},
- subtitle = {A TeX macro package that defines \LaTeX{}},
+ subtitle = {A \TeX{} macro package that defines \LaTeX{}},
author = {{The LaTeX Project Team} and Leslie Lamport},
date = {2022-07-06},
version = {2022-06-01-PL5},
@@ -37066,7 +37066,7 @@
pkgurl = {https://ctan.org/pkg/latex4jed},
note = {This S-Lang file for the
editor provides a
- much enhanced \LaTeX{} mode in the fashion of AUC TeX: menus,
+ much enhanced \LaTeX{} mode in the fashion of AUC \TeX{}: menus,
shortcuts, templates, syntax highlighting, document outline,
integrated debugging,symbol completion, full integration with
external programs, and more. It was designed with both the
@@ -37597,7 +37597,7 @@
@manual{lazylist,
title = {The \texttt{lazylist} package},
- subtitle = {Lists in TeX’s “mouth”},
+ subtitle = {Lists in \TeX{}’s “mouth”},
author = {Alan Jeffrey},
date = {2016-06-24},
version = {1.0a},
@@ -37898,7 +37898,7 @@
@manual{letgut,
title = {The \texttt{letgut} package},
- subtitle = {Class for the newsletter “La Lettre GUTenberg” of the French TeX User Group GUTenberg},
+ subtitle = {Class for the newsletter “La Lettre GUTenberg” of the French \TeX{} User Group GUTenberg},
author = {{Association GUTenberg}},
date = {2022-10-03},
version = {0.9.4},
@@ -37925,7 +37925,7 @@
@manual{letter-plain,
title = {The \texttt{letter-plain} package},
- subtitle = {Letter macros for Plain TeX},
+ subtitle = {Letter macros for Plain \TeX{}},
author = {{Unknown}},
date = {2021-03-09},
license = {noinfo},
@@ -37974,7 +37974,7 @@
@manual{lettermac,
title = {The \texttt{lettermac} package},
- subtitle = {Simple macros for writing letters (Plain TeX)},
+ subtitle = {Simple macros for writing letters (Plain \TeX{})},
author = {J. Daniel Smith},
date = {2016-06-24},
version = {},
@@ -38039,7 +38039,7 @@
url = {https://mirror.ctan.org/fonts/greek/levy},
pkgurl = {https://ctan.org/pkg/levy-font},
note = {These fonts are derivatives of Kunth's CM fonts. Macros for use
- with Plain TeX are included in the package; for use with \LaTeX{}, see
+ with Plain \TeX{} are included in the package; for use with \LaTeX{}, see
(with English documentation) or
(with German documentation).},
}
@@ -38113,7 +38113,7 @@
@manual{lextex,
title = {The \texttt{lextex} package},
- subtitle = {Typesetting legal documents using plain TeX},
+ subtitle = {Typesetting legal documents using plain \TeX{}},
author = {Roger Horne},
date = {2016-06-24},
version = {1.005},
@@ -38122,7 +38122,7 @@
pkgurl = {https://ctan.org/pkg/lextex},
note = {LeXTeX is a collection of macros intended to enable English
lawyers, and in particular Barristers, to format their work using
- Plain TeX. The bundle incorporates the ruled table macros from
+ Plain \TeX{}. The bundle incorporates the ruled table macros from
.},
}
@@ -38339,7 +38339,7 @@
@manual{libertinus,
title = {The \texttt{libertinus} package},
- subtitle = {Wrapper to use the correct libertinus package according to the used TeX engine},
+ subtitle = {Wrapper to use the correct libertinus package according to the used \TeX{} engine},
author = {Herbert Voß},
date = {2021-06-16},
version = {0.02},
@@ -38378,7 +38378,7 @@
@manual{librarian,
title = {The \texttt{librarian} package},
- subtitle = {Tools to create bibliographies in TeX},
+ subtitle = {Tools to create bibliographies in \TeX{}},
author = {Paul Isambert},
date = {2016-06-24},
version = {1.0},
@@ -38487,7 +38487,7 @@
url = {https://mirror.ctan.org/support/ligatex},
pkgurl = {https://ctan.org/pkg/ligatex},
note = {LigaTeX removes unnecessary ligatures (accented characters written
- out as more than one letter) from TeX files (for example,
+ out as more than one letter) from \TeX{} files (for example,
it translates “” to “”). The program
currently only works with texts written in German. However, the author
welcomes additions to LigaTeX in order to make it usable with any
@@ -38698,7 +38698,7 @@
@manual{lintex,
title = {The \texttt{lintex} package},
- subtitle = {Tidy up after a TeX run},
+ subtitle = {Tidy up after a \TeX{} run},
author = {Maurizio Loreti and Ryan Kavanagh},
date = {2016-06-24},
version = {1.13},
@@ -39159,7 +39159,7 @@
@manual{localloc,
title = {The \texttt{localloc} package},
- subtitle = {Macros for localizing TeX register allocations},
+ subtitle = {Macros for localizing \TeX{} register allocations},
author = {Bernd Raichle},
date = {2020-09-30},
license = {other-free},
@@ -39990,7 +39990,7 @@
@manual{lt3luabridge,
title = {The \texttt{lt3luabridge} package},
- subtitle = {Execute Lua code in any TeX engine that exposes the shell},
+ subtitle = {Execute Lua code in any \TeX{} engine that exposes the shell},
author = {Vít Novotný},
date = {2022-08-16},
version = {2.0.1},
@@ -39998,8 +39998,8 @@
url = {https://mirror.ctan.org/macros/generic/lt3luabridge},
pkgurl = {https://ctan.org/pkg/lt3luabridge},
note = {This is an (-generic) package
- for plain TeX, \LaTeX{}, and ConTeXt that allows you to
- execute Lua code in LuaTeX or any other TeX engine
+ for plain \TeX{}, \LaTeX{}, and ConTeXt that allows you to
+ execute Lua code in LuaTeX or any other \TeX{} engine
that exposes the shell.},
}
@@ -40501,14 +40501,14 @@
@manual{luacode,
title = {The \texttt{luacode} package},
- subtitle = {Helper for executing lua code from within TeX},
+ subtitle = {Helper for executing lua code from within \TeX{}},
author = {Manuel Pégourié-Gonnard},
date = {2016-06-24},
version = {1.2a},
license = {lppl1.3},
url = {https://mirror.ctan.org/macros/luatex/latex/luacode},
pkgurl = {https://ctan.org/pkg/luacode},
- note = {Executing Lua code from within TeX with can
+ note = {Executing Lua code from within \TeX{} with can
sometimes be tricky: there is no easy way to use the percent
character, counting backslashes may be hard, and Lua comments
don’t work the way you expect. The package provides
@@ -40603,15 +40603,15 @@
url = {https://mirror.ctan.org/macros/luatex/generic/luakeys},
pkgurl = {https://ctan.org/pkg/luakeys},
note = {This package provides a Lua module that can parse
- key-value options like the TeX packages
+ key-value options like the \TeX{} packages
,
,
,
,
etc.
, however, accomplishes this task entirely
- by using the Lua language and does not rely on TeX.
- Therefore this package can only be used with the TeX engine
+ by using the Lua language and does not rely on \TeX{}.
+ Therefore this package can only be used with the \TeX{} engine
.
Since luakeys uses ,
the parsing mechanism should be pretty robust.},
@@ -40739,7 +40739,7 @@
@manual{luaotfload,
title = {The \texttt{luaotfload} package},
- subtitle = {OpenType ‘loader’ for Plain TeX and \LaTeX{}},
+ subtitle = {OpenType ‘loader’ for Plain \TeX{} and \LaTeX{}},
author = {Élie Roux and Khaled Hosny and Manuel Pégourié-Gonnard and Will Robertson and Philipp Gesang and {The LaTeX Project Team} and Ulrike Fischer and Marcel Krüger},
date = {2022-10-03},
version = {3.23},
@@ -40899,7 +40899,7 @@
@manual{luatextra,
title = {The \texttt{luatextra} package},
- subtitle = {Additional macros for Plain TeX and \LaTeX{} in LuaTeX},
+ subtitle = {Additional macros for Plain \TeX{} and \LaTeX{} in LuaTeX},
author = {Élie Roux and Manuel Pégourié-Gonnard},
date = {2017-04-18},
version = {1.0.1},
@@ -41013,7 +41013,7 @@
@manual{lug,
title = {The \texttt{lug} package},
- subtitle = {Create and edit TeX Local User Group web pages},
+ subtitle = {Create and edit \TeX{} Local User Group web pages},
author = {Wybo H. Dekker},
date = {2022-03-28},
version = {3.00},
@@ -41248,7 +41248,7 @@
@manual{mactex-basic,
title = {The \texttt{mactex-basic} package},
- subtitle = {A basic TeX distribution for the Macintosh},
+ subtitle = {A basic \TeX{} distribution for the Macintosh},
author = {{TUG TWG-MacTeX}},
date = {2021-08-26},
version = {},
@@ -41259,7 +41259,7 @@
@manual{mactex,
title = {The \texttt{mactex} package},
- subtitle = {The TeX Live Mac distribution},
+ subtitle = {The \TeX{} Live Mac distribution},
author = {{TUG TWG-MacTeX}},
date = {2022-04-04},
version = {},
@@ -41285,7 +41285,7 @@
@manual{mactotex,
title = {The \texttt{mactotex} package},
- subtitle = {Convert "Macintosh PostScript" for use with TeX},
+ subtitle = {Convert "Macintosh PostScript" for use with \TeX{}},
author = {Adam Fedor},
date = {2016-06-24},
version = {},
@@ -41294,7 +41294,7 @@
pkgurl = {https://ctan.org/pkg/mactotex},
note = {The program cleans out all the irrelevant things that the
MACOS applications used to add, and restructures so that the files
- can be “used with TeX”. The documentation talks
+ can be “used with \TeX{}”. The documentation talks
about using , but it doesn't seem
likely that this is actually necessary, 15 years after the program
was written.},
@@ -41339,7 +41339,7 @@
@manual{magicnum,
title = {The \texttt{magicnum} package},
- subtitle = {Access TeX systems’ “magic numbers”},
+ subtitle = {Access \TeX{} systems’ “magic numbers”},
author = {Heiko Oberdiek},
date = {2019-12-01},
version = {1.7},
@@ -41448,7 +41448,7 @@
license = {lppl1.3},
url = {https://mirror.ctan.org/support/make4ht},
pkgurl = {https://ctan.org/pkg/make4ht},
- note = {is a simple build system for , a TeX to XML converter. It
+ note = {is a simple build system for , a \TeX{} to XML converter. It
provides a command line tool that drives the conversion process.
It also provides a library which can be used to create
customized conversion tools.},
@@ -41538,7 +41538,7 @@
@manual{makedoc,
title = {The \texttt{makedoc} package},
- subtitle = {Preprocessing documentation with TeX},
+ subtitle = {Preprocessing documentation with \TeX{}},
author = {Uwe Lück},
date = {2017-05-06},
version = {0.52},
@@ -41623,7 +41623,7 @@
url = {https://mirror.ctan.org/indexing/makeindex},
pkgurl = {https://ctan.org/pkg/makeindex},
note = {A general purpose hierarchical index generator; it accepts one or
- more input files (often produced by a text formatter such as TeX
+ more input files (often produced by a text formatter such as \TeX{}
or troff), sorts the entries, and produces an output file which
can be formatted. The formats of the input and output files are
specified in a style file; by default, input is assumed to be an
@@ -41667,7 +41667,7 @@
@manual{makeprog,
title = {The \texttt{makeprog} package},
- subtitle = {A literate system for TeX programming},
+ subtitle = {A literate system for \TeX{} programming},
author = {Joachim Schrod},
date = {2016-06-24},
version = {1.0.1},
@@ -41724,7 +41724,7 @@
@manual{maketable,
title = {The \texttt{maketable} package},
- subtitle = {Convert Word or Excel tables to TeX tabular structures},
+ subtitle = {Convert Word or Excel tables to \TeX{} tabular structures},
author = {Gunter Maier},
date = {2019-02-03},
license = {other-free},
@@ -41820,7 +41820,7 @@
@manual{manfnt,
title = {The \texttt{manfnt} package},
- subtitle = {LaTeX support for the TeX book symbols},
+ subtitle = {LaTeX support for the \TeX{} book symbols},
author = {Axel Kielhorn},
date = {2020-04-03},
license = {lppl},
@@ -42053,7 +42053,7 @@
@manual{markdown,
title = {The \texttt{markdown} package},
- subtitle = {A package for converting and rendering markdown documents inside TeX},
+ subtitle = {A package for converting and rendering markdown documents inside \TeX{}},
author = {Vít Novotný},
date = {2022-10-03},
version = {2.17.1-0-g8ca83f5},
@@ -42281,7 +42281,7 @@
the opposite direction to . All the commands are
designed to change size appropriately in scripts, as well as in
response to \LaTeX{} size changing commands. The commands may also be
- used in plain TeX.},
+ used in plain \TeX{}.},
}
@manual{mathematica,
@@ -42292,7 +42292,7 @@
license = {lppl},
url = {https://mirror.ctan.org/fonts/psfonts/Mathematica3.0},
pkgurl = {https://ctan.org/pkg/mathematica},
- note = {Virtual TeX fonts that can be used with the PostScript fonts
+ note = {Virtual \TeX{} fonts that can be used with the PostScript fonts
distributed with Mathematica 3.0. The archives use a
conforming directory structure. A
style file for \LaTeX{}2e is included, that enables use of the
@@ -42619,7 +42619,7 @@
@manual{mathtime-pln,
title = {The \texttt{mathtime-pln} package},
- subtitle = {Plain TeX macros for using MathTime and MathTime Plus},
+ subtitle = {Plain \TeX{} macros for using MathTime and MathTime Plus},
author = {Adam Lewenberg},
date = {2018-01-06},
version = {1.30},
@@ -42688,7 +42688,7 @@
note = {Matlabweb is a literate programming system for the Matlab
language. Similar to CWEB, it is created with a slightly modified
version of the system.
- Matlabweb can be used with plain TeX or \LaTeX{}, the latter with
+ Matlabweb can be used with plain \TeX{} or \LaTeX{}, the latter with
help from the package.},
}
@@ -42827,8 +42827,8 @@
title = {The \texttt{mcf2graph} package},
subtitle = {Draw chemical structure diagrams with MetaPost},
author = {Akira Yamaji},
- date = {2022-08-22},
- version = {4.87},
+ date = {2022-10-10},
+ version = {4.88},
license = {mit},
url = {https://mirror.ctan.org/graphics/mcf2graph},
pkgurl = {https://ctan.org/pkg/mcf2graph},
@@ -43120,7 +43120,7 @@
@manual{memo-pln,
title = {The \texttt{memo-pln} package},
- subtitle = {Plain TeX macros for memoranda},
+ subtitle = {Plain \TeX{} macros for memoranda},
author = {{Unknown}},
date = {2016-06-24},
version = {},
@@ -43422,7 +43422,7 @@
license = {lppl},
url = {https://mirror.ctan.org/macros/latex/contrib/sauerj},
pkgurl = {https://ctan.org/pkg/metainfo},
- note = {The package picks up TeX comments in document that are
+ note = {The package picks up \TeX{} comments in document that are
structured according to its rules, and typesets them. Operation
is (typically in a
separate document).},
@@ -43430,7 +43430,7 @@
@manual{metalogo,
title = {The \texttt{metalogo} package},
- subtitle = {Extended TeX logo macros},
+ subtitle = {Extended \TeX{} logo macros},
author = {Andrew Gilbert Moschou},
date = {2019-01-20},
version = {0.12},
@@ -43441,7 +43441,7 @@
@manual{metalogox,
title = {The \texttt{metalogox} package},
- subtitle = {Adjust TeX logos, with font detection},
+ subtitle = {Adjust \TeX{} logos, with font detection},
author = {Brian Dunn},
date = {2019-01-28},
version = {1.00},
@@ -43541,7 +43541,7 @@
@manual{metatex,
title = {The \texttt{METATeX} package},
- subtitle = {Incorporate Metafont pictures in TeX source},
+ subtitle = {Incorporate Metafont pictures in \TeX{} source},
author = {Ramón Casares},
date = {2018-01-06},
version = {1.1},
@@ -43618,7 +43618,7 @@
@manual{mex,
title = {The \texttt{mex} package},
- subtitle = {Polish formats for TeX},
+ subtitle = {Polish formats for \TeX{}},
author = {Bogusław Jackowski and Marek Ryćko},
date = {2021-03-22},
version = {1.05a},
@@ -43664,7 +43664,7 @@
mf2pt1 imposes a number of restrictions on the Metafont input.
If these restrictions are met, mf2pt1 will produce valid
Type 1 output with more accurate control points than can
- be reverse-engineered by TeXtrace,
+ be reverse-engineered by \TeX{}trace,
, and other programs
which convert bitmaps to outline fonts.},
}
@@ -43724,7 +43724,7 @@
pkgurl = {https://ctan.org/pkg/mff},
note = {A package to provide something similar to Adobe Type 1
‘multiple master’ fonts, but using Metafont; you
- specify a font by a set of Metafont parameters, and TeX makes up
+ specify a font by a set of Metafont parameters, and \TeX{} makes up
an mf file to generate the required font. This package is not
integrated with NFSS (or MakeTeXTFM) but it is …},
}
@@ -43893,7 +43893,7 @@
@manual{mhack,
title = {The \texttt{mhack} package},
- subtitle = {Macros for marginal notes, in Plain TeX},
+ subtitle = {Macros for marginal notes, in Plain \TeX{}},
author = {Norman Walsh},
date = {2016-06-24},
version = {},
@@ -43970,7 +43970,7 @@
@manual{microimp,
title = {The \texttt{MicroIMP} package},
- subtitle = {A TeX-based word processor},
+ subtitle = {A \TeX{}-based word processor},
author = {{MicroPress}},
date = {2016-06-24},
version = {0.18},
@@ -44082,7 +44082,7 @@
@manual{miktex,
title = {The \texttt{miktex} package},
- subtitle = {A free TeX distribution for MS-Windows},
+ subtitle = {A free \TeX{} distribution for MS-Windows},
author = {Christian Schenk},
date = {2022-08-04},
version = {22.7},
@@ -44189,7 +44189,7 @@
url = {https://mirror.ctan.org/support/mimetex},
pkgurl = {https://ctan.org/pkg/mimetex},
note = {MimeTeX parses \LaTeX{} mathematics expressions, emitting either gif
- images or mime xbitmaps of them, rather than the usual TeX
+ images or mime xbitmaps of them, rather than the usual \TeX{}
DVI files. MimeTeX images are therefore easily inserted directly
into html documents using a standard html img tag without
intermediate dvi-to-gif conversion, and without storing lots
@@ -44246,7 +44246,7 @@
@manual{miniltx,
title = {The \texttt{miniltx} package},
- subtitle = {An abstract of \LaTeX{} facilities for use with Plain TeX},
+ subtitle = {An abstract of \LaTeX{} facilities for use with Plain \TeX{}},
author = {David Carlisle and Karl Berry},
date = {2022-09-29},
version = {},
@@ -44255,7 +44255,7 @@
pkgurl = {https://ctan.org/pkg/miniltx},
note = {Part of the
collection which allows the use of \LaTeX{}’s graphics, colour,
- and picture mode commands in plain TeX based formats.},
+ and picture mode commands in plain \TeX{} based formats.},
}
@manual{minim-hatching,
@@ -44506,7 +44506,7 @@
@manual{mk,
title = {The \texttt{mk} package},
- subtitle = {A TeX and \LaTeX{} maker},
+ subtitle = {A \TeX{} and \LaTeX{} maker},
author = {Wybo H. Dekker},
date = {2018-04-12},
version = {3.07},
@@ -44517,7 +44517,7 @@
(short for View and Print
PDF/PostScript), is helpful in the cyclic process of editing,
compiling, viewing, and printing a \LaTeX{}, \XeLaTeX{}, or plain
- TeX document. Essentially, mk uses
+ \TeX{} document. Essentially, mk uses
for compilation,
for viewing and printing.},
}
@@ -44717,7 +44717,7 @@
license = {lppl},
url = {https://mirror.ctan.org/macros/latex/contrib/mltex},
pkgurl = {https://ctan.org/pkg/mltex-ltx},
- note = {Support for , the multilingual TeX
+ note = {Support for , the multilingual \TeX{}
extension from Michael J. Ferguson.},
}
@@ -44842,7 +44842,7 @@
@manual{mnras-plain,
title = {The \texttt{mnras-plain} package},
- subtitle = {Plain TeX macros for MNRAS},
+ subtitle = {Plain \TeX{} macros for MNRAS},
author = {Alison Woollatt},
date = {2016-06-24},
version = {1.6},
@@ -44999,7 +44999,7 @@
‘i’ as the final letter of numbers greater than 1
and which writes the value of a
counter in the same way. You use the first in the same way as
- the TeX primitive and the second as \LaTeX{}
+ the \TeX{} primitive and the second as \LaTeX{}
command . The default option is
‘vpourv’ with which 5 is
‘translated’ as ‘v’ and option
@@ -45020,7 +45020,7 @@
@manual{modulus,
title = {The \texttt{modulus} package},
- subtitle = {A non-destructive modulus and integer quotient operator for TeX},
+ subtitle = {A non-destructive modulus and integer quotient operator for \TeX{}},
author = {Donald P. Goodman},
date = {2018-05-05},
version = {1.0},
@@ -45518,7 +45518,7 @@
@manual{mtbe,
title = {The \texttt{mtbe} package},
- subtitle = {Macros for "Mathematical TeX by Example"},
+ subtitle = {Macros for "Mathematical \TeX{} by Example"},
author = {Arvind Borde},
date = {2016-06-24},
license = {other-free},
@@ -45555,7 +45555,7 @@
pkgurl = {https://ctan.org/pkg/mtgreek},
note = {This package is an add-on to the
- a style to provide TeX support for the use of the MathTime(tm)
+ a style to provide \TeX{} support for the use of the MathTime(tm)
fonts (formerly distributed by YandY, Inc.). The MathTime
package has uppercase Greek letters hardwired to be upright and
only upright; this package provides a switch to choose between
@@ -45739,7 +45739,7 @@
@manual{multido,
title = {The \texttt{multido} package},
- subtitle = {A loop facility for Generic TeX},
+ subtitle = {A loop facility for Generic \TeX{}},
author = {Timothy Van Zandt and Rolf Niepraschk and Herbert Voß},
date = {2018-09-15},
version = {1.42},
@@ -45899,7 +45899,7 @@
@manual{musictex,
title = {The \texttt{musictex} package},
- subtitle = {Typesetting music with TeX},
+ subtitle = {Typesetting music with \TeX{}},
author = {Daniel Taupin},
date = {2019-06-21},
version = {5.20},
@@ -46986,7 +46986,7 @@
url = {https://mirror.ctan.org/macros/latex/contrib/newfile},
pkgurl = {https://ctan.org/pkg/newfile},
note = {Commands are defined to manage the limited pool of input and
- output handles provided by TeX. The so
+ output handles provided by \TeX{}. The so
provided are mapped to various of the \LaTeX{} input and output
mechanisms. Some facilities of the
package are also mapped.},
@@ -47010,7 +47010,7 @@
@manual{newinsert,
title = {The \texttt{newinsert} package},
- subtitle = {Reworking Plain TeX's insert macros},
+ subtitle = {Reworking Plain \TeX{}'s insert macros},
author = {Walter D. Neumann},
date = {2016-06-24},
version = {1.2},
@@ -47066,7 +47066,7 @@
@manual{newsletr,
title = {The \texttt{newsletr} package},
- subtitle = {Macros for making newsletters with Plain TeX},
+ subtitle = {Macros for making newsletters with Plain \TeX{}},
author = {Hunter Goatley},
date = {2016-06-18},
license = {other-free},
@@ -48016,7 +48016,7 @@
@manual{ntg,
title = {The \texttt{ntg} package},
- subtitle = {Dutch TeX Users Group information},
+ subtitle = {Dutch \TeX{} Users Group information},
author = {{Unknown}},
date = {2016-06-18},
license = {other-free},
@@ -48046,7 +48046,7 @@
note = {The command generates English ordinal
numbers of the form 1st, 2nd, 3rd, 4th, etc. \LaTeX{} package
options may specify that the ordinal mark be superscripted, and that
- negative numbers may be treated; Plain TeX users have no access to
+ negative numbers may be treated; Plain \TeX{} users have no access to
package options, so need to redefine macros for these changes.},
}
@@ -48100,7 +48100,7 @@
@manual{ntsfaq,
title = {The \texttt{ntsfaq} package},
- subtitle = {Frequently answered questions about TeX extension},
+ subtitle = {Frequently answered questions about \TeX{} extension},
author = {Jörg Knappen},
date = {2016-06-24},
version = {5},
@@ -48133,7 +48133,7 @@
and atomic mass and energy data in \LaTeX{} documents.
It uses the package
and requires to be called with the
- TeX file as the argument.},
+ \TeX{} file as the argument.},
}
@manual{numalg,
@@ -48588,7 +48588,7 @@
license = {knuth},
url = {https://mirror.ctan.org/macros/generic/ofs},
pkgurl = {https://ctan.org/pkg/ofs},
- note = {OFS (Olsak's Font System) is a set of Plain TeX and \LaTeX{} macros for
+ note = {OFS (Olsak's Font System) is a set of Plain \TeX{} and \LaTeX{} macros for
managing large font collections; it has been used by Czech/Slovak
users for many years. Main features include:},
}
@@ -48670,7 +48670,7 @@
@manual{old-fontch,
title = {The \texttt{old-fontch} package},
- subtitle = {Changing fonts, sizes and encodings in Plain TeX (obsolete version)},
+ subtitle = {Changing fonts, sizes and encodings in Plain \TeX{} (obsolete version)},
author = {Rodrigo Medina},
date = {2016-06-24},
version = {2.},
@@ -48748,7 +48748,7 @@
@manual{olsak-misc,
title = {The \texttt{olsak-misc} package},
- subtitle = {Collection of plain TeX macros written by Petr Olšák},
+ subtitle = {Collection of plain \TeX{} macros written by Petr Olšák},
author = {Petr Olšák},
date = {2022-08-04},
version = {Aug. 2022},
@@ -48759,7 +48759,7 @@
@manual{omega,
title = {The \texttt{omega} package},
- subtitle = {A wide-character-set extension of TeX},
+ subtitle = {A wide-character-set extension of \TeX{}},
author = {Yannis Haralambous and John Plaice},
date = {2017-04-24},
license = {gpl},
@@ -48816,7 +48816,7 @@
license = {lppl},
url = {https://mirror.ctan.org/macros/latex/contrib/onlyamsmath},
pkgurl = {https://ctan.org/pkg/onlyamsmath},
- note = {This package inhibits the usage of plain TeX and (on demand) of
+ note = {This package inhibits the usage of plain \TeX{} and (on demand) of
standard \LaTeX{} mathematics environments.
This is useful for class writers who want to encourage their
users to use the environments provided by the
@@ -48930,7 +48930,7 @@
@manual{optex,
title = {The \texttt{OpTeX} package},
- subtitle = {LuaTeX format based on Plain TeX and OPmac},
+ subtitle = {LuaTeX format based on Plain \TeX{} and OPmac},
author = {Petr Olšák},
date = {2022-08-04},
version = {1.08},
@@ -49011,13 +49011,13 @@
@manual{orderer,
title = {The \texttt{Orderer} package},
- subtitle = {Order references in a TeX file},
+ subtitle = {Order references in a \TeX{} file},
author = {M. Siddikov},
date = {2016-06-24},
license = {lppl},
url = {https://mirror.ctan.org/support/orderer},
pkgurl = {https://ctan.org/pkg/orderer},
- note = {Orderer is a small Perl script that will take a TeX document and
+ note = {Orderer is a small Perl script that will take a \TeX{} document and
re-order the references in it. This saves the user from building
a database.},
}
@@ -49052,7 +49052,7 @@
@manual{oriental,
title = {The \texttt{oriental} package},
- subtitle = {A version of TeX for which Oriental languages are native},
+ subtitle = {A version of \TeX{} for which Oriental languages are native},
author = {{Prosoft International}},
date = {2016-06-24},
version = {2.1},
@@ -49074,7 +49074,7 @@
@manual{oriya,
title = {The \texttt{oriya} package},
- subtitle = {Typesetting the Oriya script using TeX},
+ subtitle = {Typesetting the Oriya script using \TeX{}},
author = {Jeroen Hellingman and Anshuman Pandey},
date = {2016-06-24},
version = {0.99},
@@ -49095,7 +49095,7 @@
@manual{os2tex,
title = {The \texttt{os2tex} package},
- subtitle = {A distribution of TeX for OS/2 Warp},
+ subtitle = {A distribution of \TeX{} for OS/2 Warp},
author = {Jürgen Kleinböhl},
date = {2016-06-18},
license = {shareware},
@@ -49181,7 +49181,7 @@
@manual{otfinst,
title = {The \texttt{otfinst} package},
- subtitle = {Install OpenType fonts for use in TeX/LaTeX systems},
+ subtitle = {Install OpenType fonts for use in \TeX{}/LaTeX systems},
author = {John Owens},
date = {2018-01-06},
version = {1.0.3},
@@ -49190,7 +49190,7 @@
pkgurl = {https://ctan.org/pkg/otfinst},
note = {Otfinst takes a list of OpenType font files as input, uses Eddie
Kohler's to install
- them into a TeX/LaTeX system, and builds and installs the
+ them into a \TeX{}/LaTeX system, and builds and installs the
necessary font description and style files. Otfinst was formerly
known as otftex\_install and is written in Python. It has similar
capabilities to Marc Penninga's
@@ -49273,7 +49273,7 @@
pkgurl = {https://ctan.org/pkg/outerhbox},
note = {The package provides the command, which is
similar to , except that material is set in outer horizontal
- mode. This prevents TeX from optimising away maths penalties and
+ mode. This prevents \TeX{} from optimising away maths penalties and
the like, that are needed when the material is 'ed.},
}
@@ -49638,7 +49638,7 @@
@manual{pagereference,
title = {The \texttt{pagereference} package},
- subtitle = {Labels and references in Plain TeX},
+ subtitle = {Labels and references in Plain \TeX{}},
author = {Peter Ungar},
date = {2020-04-11},
version = {},
@@ -49951,7 +49951,7 @@
@manual{parsitex,
title = {The \texttt{parsitex} package},
- subtitle = {A localized Persian and bidirectional extension of TeX},
+ subtitle = {A localized Persian and bidirectional extension of \TeX{}},
author = {Vafa Khalighi and {bidi-tex GitHub Organisation}},
date = {2019-09-08},
version = {3.10},
@@ -50338,7 +50338,7 @@
@manual{pdf-trans,
title = {The \texttt{pdf-trans} package},
- subtitle = {A set of macros for various transformations of TeX boxes},
+ subtitle = {A set of macros for various transformations of \TeX{} boxes},
author = {Paweł Jackowski},
date = {2016-06-24},
version = {2.4},
@@ -50349,14 +50349,14 @@
@manual{pdf14,
title = {The \texttt{pdf14} package},
- subtitle = {Restore PDF 1.4 to a TeX live 2010 format},
+ subtitle = {Restore PDF 1.4 to a \TeX{} live 2010 format},
author = {Manuel Pégourié-Gonnard},
date = {2016-06-24},
version = {0.1},
license = {lppl1.3},
url = {https://mirror.ctan.org/macros/latex/contrib/pdf14},
pkgurl = {https://ctan.org/pkg/pdf14},
- note = {Starting with TeX Live 2010, the various formats, that directly
+ note = {Starting with \TeX{} Live 2010, the various formats, that directly
generate PDF, default to generating PDF 1.5. This is
generally a , but it can lead to compatibility
issues with some older PDF viewers. This package changes the
@@ -50499,7 +50499,7 @@
@manual{pdfescape,
title = {The \texttt{pdfescape} package},
- subtitle = {Implements pdfTeX's escape features using TeX or e-TeX},
+ subtitle = {Implements pdfTeX's escape features using \TeX{} or e-TeX},
author = {Heiko Oberdiek},
date = {2019-12-14},
version = {1.15},
@@ -50508,7 +50508,7 @@
pkgurl = {https://ctan.org/pkg/pdfescape},
note = {This package implements 's
escape features (, ,
- , ) using TeX or
+ , ) using \TeX{} or
e-TeX.},
}
@@ -50616,8 +50616,8 @@
title = {The \texttt{pdfpages} package},
subtitle = {Include PDF documents in \LaTeX{}},
author = {Andreas Matthias},
- date = {2022-05-22},
- version = {0.5v},
+ date = {2022-10-10},
+ version = {0.5w},
license = {lppl1.3c},
url = {https://mirror.ctan.org/macros/latex/contrib/pdfpages},
pkgurl = {https://ctan.org/pkg/pdfpages},
@@ -50787,16 +50787,16 @@
@manual{pdftex,
title = {The \texttt{pdftex} package},
- subtitle = {A TeX extension for direct creation of PDF},
+ subtitle = {A \TeX{} extension for direct creation of PDF},
author = {Hàn Thế Thành and {The pdfTeX Team} and {The TeX Live Team}},
date = {2022-01-31},
license = {gpl},
pkgurl = {https://ctan.org/pkg/pdftex},
- note = {An extension of TeX which can directly generate
- PDF documents as well as DVI output. All current free TeX distributions
+ note = {An extension of \TeX{} which can directly generate
+ PDF documents as well as DVI output. All current free \TeX{} distributions
including ,
and
- include pdfTeX (Plain TeX) and
+ include pdfTeX (Plain \TeX{}) and
pdfLaTeX (LaTeX), among many other formats based on the pdfTeX engine.},
}
@@ -50881,15 +50881,15 @@
@manual{pedigree-perl,
title = {The \texttt{pedigree-perl} package},
- subtitle = {Generate TeX pedigree files from CSV files},
+ subtitle = {Generate \TeX{} pedigree files from CSV files},
author = {Boris Veytsman and Leila Akhmadeeva},
date = {2022-08-29},
version = {2.1},
license = {gpl2},
url = {https://mirror.ctan.org/graphics/pstricks/contrib/pedigree/pedigree-perl},
pkgurl = {https://ctan.org/pkg/pedigree-perl},
- note = {This program generates TeX commands to typeset pedigrees —
- either TeX fragments or full \LaTeX{} files, to be processed by the
+ note = {This program generates \TeX{} commands to typeset pedigrees —
+ either \TeX{} fragments or full \LaTeX{} files, to be processed by the
authors’ package.
The program has support for multilanguage pedigrees (at the
present moment the English and Russian languages are supported).},
@@ -51005,7 +51005,7 @@
@manual{petri-nets,
title = {The \texttt{Petri-nets} package},
- subtitle = {A set TeX/LaTeX packages for drawing Petri nets},
+ subtitle = {A set \TeX{}/LaTeX packages for drawing Petri nets},
author = {Franck Pommereau},
date = {2016-06-24},
license = {gpl},
@@ -51033,7 +51033,7 @@
license = {lppl1.3},
url = {https://mirror.ctan.org/macros/latex/contrib/pfarrei},
pkgurl = {https://ctan.org/pkg/pfarrei},
- note = {In “Die TeXnische Komödie” (issue 1/2013) Christian Justen described
+ note = {In “Die \TeX{}nische Komödie” (issue 1/2013) Christian Justen described
his use of \LaTeX{} in his work as priest (similar requirements may
be encountered in the work of pastors and other ministers of
religion). One point was to arrange
@@ -51174,7 +51174,7 @@
@manual{pgf,
title = {The \texttt{pgf} package},
- subtitle = {Create PostScript and PDF graphics in TeX},
+ subtitle = {Create PostScript and PDF graphics in \TeX{}},
author = {{The PGF/TikZ Team} and Till Tantau and Christian Feuersänger and Henri Menke},
date = {2021-05-15},
version = {3.1.9a},
@@ -51653,7 +51653,7 @@
@manual{phyzzx,
title = {The \texttt{phyzzx} package},
- subtitle = {A TeX format for physicists},
+ subtitle = {A \TeX{} format for physicists},
author = {Vadim Kaplunovsky},
date = {2016-06-24},
version = {},
@@ -51707,7 +51707,7 @@
@manual{picmac,
title = {The \texttt{picmac} package},
- subtitle = {A picture mode in Plain TeX},
+ subtitle = {A picture mode in Plain \TeX{}},
author = {Donald E. Knuth},
date = {2016-11-06},
license = {knuth},
@@ -51739,7 +51739,7 @@
@manual{pictex,
title = {The \texttt{PicTeX} package},
- subtitle = {Picture drawing macros for TeX and \LaTeX{}},
+ subtitle = {Picture drawing macros for \TeX{} and \LaTeX{}},
author = {Michael Wichura},
date = {2021-06-11},
version = {1.1b},
@@ -51890,7 +51890,7 @@
@manual{pinlabel,
title = {The \texttt{pinlabel} package},
- subtitle = {A TeX labelling package},
+ subtitle = {A \TeX{} labelling package},
author = {Colin Rourke},
date = {2016-06-24},
version = {1.2},
@@ -52083,7 +52083,7 @@
url = {https://mirror.ctan.org/language/polish/pl-mf.zip},
pkgurl = {https://ctan.org/pkg/pl-mf},
note = {The Polish extension of the Computer Modern fonts (compatible
- with CM itself) for use with Polish TeX formats. The fonts were
+ with CM itself) for use with Polish \TeX{} formats. The fonts were
originally a part of the distribution
(and they are still available that way).},
}
@@ -52124,7 +52124,7 @@
license = {pd},
url = {https://mirror.ctan.org/macros/plain/contrib/misc/placeins.tex},
pkgurl = {https://ctan.org/pkg/placeins-plain},
- note = {This TeX file provides various mechanisms (for plain TeX and close
+ note = {This \TeX{} file provides various mechanisms (for plain \TeX{} and close
relatives) to let insertions (footnotes, topins, pageins, etc.)
float within their appropriate section, but to prevent them from
intruding into the following section, even when sections do not
@@ -52148,14 +52148,14 @@
@manual{plain-cm,
title = {The \texttt{plain-cm} package},
- subtitle = {Variable sized fonts in Plain TeX},
+ subtitle = {Variable sized fonts in Plain \TeX{}},
author = {Daniel C. Brotsky and Berthold K. P. Horn},
date = {2016-06-24},
version = {},
license = {noinfo},
url = {https://mirror.ctan.org/macros/plain/contrib/misc/plain-cm.tex},
pkgurl = {https://ctan.org/pkg/plain-cm},
- note = {A font-selection system for Plain TeX, that allows users to choose
+ note = {A font-selection system for Plain \TeX{}, that allows users to choose
sizes other than 10pt as the base size of their document, and to
use ‘relative’ sizes like ,
(and so on) as commands taking an argument to be set
@@ -52164,7 +52164,7 @@
@manual{plain-ltx,
title = {The \texttt{plain-ltx} package},
- subtitle = {Make plain TeX files \LaTeX{}able},
+ subtitle = {Make plain \TeX{} files \LaTeX{}able},
author = {David Carlisle},
date = {2022-03-14},
license = {lppl},
@@ -52174,7 +52174,7 @@
@manual{plain,
title = {The \texttt{plain} package},
- subtitle = {The Plain TeX format},
+ subtitle = {The Plain \TeX{} format},
author = {Donald E. Knuth},
date = {2016-11-06},
version = {3.141592653},
@@ -52185,7 +52185,7 @@
@manual{plainmisc,
title = {The \texttt{plainmisc} package},
- subtitle = {Miscellaneous contributed macros for plain TeX},
+ subtitle = {Miscellaneous contributed macros for plain \TeX{}},
author = {{Unknown}},
date = {2016-06-18},
license = {collection},
@@ -52203,7 +52203,7 @@
url = {https://mirror.ctan.org/macros/generic/plainpkg},
pkgurl = {https://ctan.org/pkg/plainpkg},
note = {The package provides a minimal method for making generic (i.e.,
- TeX-format-independent) packaged, combining
+ \TeX{}-format-independent) packaged, combining
functionality, fallback
definitions for \LaTeX{} and
functionality, and handling of arbitrary
@@ -52426,7 +52426,7 @@
@manual{plipsum,
title = {The \texttt{plipsum} package},
- subtitle = {'Lorem ipsum' for Plain TeX developers},
+ subtitle = {'Lorem ipsum' for Plain \TeX{} developers},
author = {Sergio Spina},
date = {2016-06-24},
version = {4.3},
@@ -52434,14 +52434,14 @@
url = {https://mirror.ctan.org/macros/plain/contrib/plipsum},
pkgurl = {https://ctan.org/pkg/plipsum},
note = {The package provides a paragraph generator designed for use in
- Plain TeX documents. The paragraphs generated contain many
+ Plain \TeX{} documents. The paragraphs generated contain many
‘f-groups’ (, etc.) so the
text can act as a test of the ligatures of the font in use.},
}
@manual{plnfss,
title = {The \texttt{plnfss} package},
- subtitle = {Font selection for Plain TeX},
+ subtitle = {Font selection for Plain \TeX{}},
author = {Hàn Thế Thành and Michal Konecny and Reinhard Kotucha},
date = {2016-06-24},
version = {1.1},
@@ -52464,14 +52464,14 @@
use the same .tfm files as for the
. This
release of fonts was adapted to the (mostly guessed) demands of
- the Windows environment, while keeping the fonts usable with TeX;
- however, encoding files are now added, as Windows and TeX use
+ the Windows environment, while keeping the fonts usable with \TeX{};
+ however, encoding files are now added, as Windows and \TeX{} use
different encoding schemes.},
}
@manual{plstmary,
title = {The \texttt{plstmary} package},
- subtitle = {St. Mary’s Road font support for plain TeX},
+ subtitle = {St. Mary’s Road font support for plain \TeX{}},
author = {Daniel H. Luecking},
date = {2016-06-24},
version = {0.5c},
@@ -52479,7 +52479,7 @@
url = {https://mirror.ctan.org/macros/plain/contrib/plstmary},
pkgurl = {https://ctan.org/pkg/plstmary},
note = {The package provides commands to produce all the symbols of the
- fonts, in a Plain TeX
+ fonts, in a Plain \TeX{}
environment.},
}
@@ -52736,7 +52736,7 @@
@manual{poligraf,
title = {The \texttt{poligraf} package},
- subtitle = {A TeX macro package for prepress},
+ subtitle = {A \TeX{} macro package for prepress},
author = {Janusz Marian Nowacki},
date = {2016-06-24},
version = {2.0},
@@ -52920,7 +52920,7 @@
@manual{poster-mac,
title = {The \texttt{poster-mac} package},
- subtitle = {Make posters and banners with TeX},
+ subtitle = {Make posters and banners with \TeX{}},
author = {Timothy Van Zandt},
date = {2016-06-24},
version = {1.1},
@@ -53007,7 +53007,7 @@
license = {noinfo},
pkgurl = {https://ctan.org/pkg/ppchtex},
note = {ppchTeX is a separate module of the
- macro package for TeX. It
+ macro package for \TeX{}. It
seems to be in its final state (having not changed for more than
10 years).},
}
@@ -53174,7 +53174,7 @@
@manual{present,
title = {The \texttt{present} package},
- subtitle = {Presentations with Plain TeX},
+ subtitle = {Presentations with Plain \TeX{}},
author = {Matthias Meister},
date = {2019-02-17},
version = {2.2.1},
@@ -53320,7 +53320,7 @@
pkgurl = {https://ctan.org/pkg/printlen},
note = {prints the value of a \LaTeX{} length
in the units specified by
- (‘unit’ may be any TeX length unit except for
+ (‘unit’ may be any \TeX{} length unit except for
scaled point, viz., any of: , , ,
, , , or
). When the unit is , the printed length
@@ -53474,7 +53474,7 @@
license = {lppl},
url = {https://mirror.ctan.org/macros/latex/contrib/progress},
pkgurl = {https://ctan.org/pkg/progress},
- note = {Progress is a package which. when compiling TeX and \LaTeX{}
+ note = {Progress is a package which. when compiling \TeX{} and \LaTeX{}
documents, generates a HTML file showing an overview of a
document's state (of how finished it is). The report is sent
to file , which is by default the
@@ -53521,7 +53521,7 @@
@manual{proof,
title = {The \texttt{proof} package},
- subtitle = {Shell based proofing for TeX-related files},
+ subtitle = {Shell based proofing for \TeX{}-related files},
author = {Klaus Bosau},
date = {2008-04-20},
version = {1.2},
@@ -53630,7 +53630,7 @@
@manual{protext,
title = {The \texttt{protext} package},
- subtitle = {A MikTeX-based TeX installation for MS-Windows},
+ subtitle = {A MikTeX-based \TeX{} installation for MS-Windows},
author = {Thomas Feuerstack},
date = {2022-06-03},
version = {3.2-031721},
@@ -53813,7 +53813,7 @@
@manual{psboxit,
title = {The \texttt{psboxit} package},
- subtitle = {Enables one to put a PostScript drawing behind a TeX box},
+ subtitle = {Enables one to put a PostScript drawing behind a \TeX{} box},
author = {Jérôme Maillot},
date = {2019-06-21},
version = {},
@@ -53892,7 +53892,7 @@
@manual{psfonts,
title = {The \texttt{psfonts} package},
- subtitle = {PostScript fonts for use with TeX and \LaTeX{}},
+ subtitle = {PostScript fonts for use with \TeX{} and \LaTeX{}},
author = {{Unknown}},
date = {2016-06-24},
license = {collection},
@@ -53974,7 +53974,7 @@
@manual{psizzl,
title = {The \texttt{psizzl} package},
- subtitle = {A TeX format for physics papers},
+ subtitle = {A \TeX{} format for physics papers},
author = {Arthur Ogawa},
date = {2016-06-24},
version = {0.35},
@@ -54163,7 +54163,7 @@
note = {A package using to draw a
large variety of graphs and plots, including 3D maths functions.
Data can be read from external data files, making this
- package a generic tool for graphing within TeX/LaTeX, without
+ package a generic tool for graphing within \TeX{}/LaTeX, without
the need for external tools.},
}
@@ -54494,7 +54494,7 @@
url = {https://mirror.ctan.org/graphics/pstricks/contrib/pst-eucl},
pkgurl = {https://ctan.org/pkg/pst-eucl},
note = {The package allows the drawing of Euclidean geometric
- figures using TeX macros
+ figures using \TeX{} macros
for specifying mathematical constraints. It is thus possible to
build point using common transformations or intersections. The
use of coordinates is limited to points which controlled the
@@ -54671,7 +54671,7 @@
@manual{pst-graphicx,
title = {The \texttt{pst-graphicx} package},
- subtitle = {A PSTricks-compatible graphicx for use with Plain TeX},
+ subtitle = {A PSTricks-compatible graphicx for use with Plain \TeX{}},
author = {Herbert Voß},
date = {2016-06-24},
version = {0.02},
@@ -55510,7 +55510,7 @@
@manual{pstricks-base,
title = {The \texttt{pstricks-base} package},
- subtitle = {PostScript macros for TeX},
+ subtitle = {PostScript macros for \TeX{}},
author = {Herbert Voß and Denis Girou and Timothy Van Zandt},
date = {2022-09-11},
version = {3.16},
@@ -55606,14 +55606,14 @@
@manual{ptex-base,
title = {The \texttt{ptex-base} package},
- subtitle = {Plain TeX format for pTeX and e-pTeX},
+ subtitle = {Plain \TeX{} format for pTeX and e-pTeX},
author = {{Japanese TeX Development Community} and Kazuki Maeda},
date = {2022-07-31},
version = {},
license = {bsd3},
url = {https://mirror.ctan.org/macros/jptex/generic/ptex-base},
pkgurl = {https://ctan.org/pkg/ptex-base},
- note = {The bundle contains the plain TeX format
+ note = {The bundle contains the plain \TeX{} format
for and e-pTeX.},
}
@@ -55666,7 +55666,7 @@
@manual{ptex,
title = {The \texttt{ptex} package},
- subtitle = {A TeX system for publishing in Japanese},
+ subtitle = {A \TeX{} system for publishing in Japanese},
author = {{Japanese TeX Development Community}},
date = {2022-02-05},
license = {bsd3},
@@ -55675,7 +55675,7 @@
@manual{ptex2pdf,
title = {The \texttt{ptex2pdf} package},
- subtitle = {Convert Japanese TeX documents to PDF},
+ subtitle = {Convert Japanese \TeX{} documents to PDF},
author = {{Japanese TeX Development Community}},
date = {2022-07-31},
version = {20200520.0},
@@ -55683,7 +55683,7 @@
url = {https://mirror.ctan.org/macros/jptex/generic/ptex2pdf},
pkgurl = {https://ctan.org/pkg/ptex2pdf},
note = {The Lua script provides system-independent support of Japanese typesetting
- engines in TeXworks. As TeXworks typesetting setup does not allow for
+ engines in \TeX{}works. As \TeX{}works typesetting setup does not allow for
multistep processing, this script runs one of the
-based programs
(,
@@ -55842,7 +55842,7 @@
@manual{pwt,
title = {The \texttt{PWT} package},
- subtitle = {An outline of publishing with TeX},
+ subtitle = {An outline of publishing with \TeX{}},
author = {Kees van der Laan},
date = {2016-06-24},
license = {nosell},
@@ -56624,7 +56624,7 @@
@manual{raleway,
title = {The \texttt{raleway} package},
- subtitle = {Use Raleway with TeX(-alike) systems},
+ subtitle = {Use Raleway with \TeX{}(-alike) systems},
author = {Silke Hofstra},
date = {2016-12-03},
version = {1.4},
@@ -56661,7 +56661,7 @@
@manual{random,
title = {The \texttt{random} package},
- subtitle = {Generating “random” numbers in TeX},
+ subtitle = {Generating “random” numbers in \TeX{}},
author = {Donald Arseneau},
date = {2020-04-15},
version = {0.2},
@@ -56828,7 +56828,7 @@
@manual{rcs-pln,
title = {The \texttt{rcs-pln} package},
- subtitle = {RCS data in Plain TeX documents},
+ subtitle = {RCS data in Plain \TeX{} documents},
author = {Kristoffer H. Rose},
date = {2016-06-24},
version = {},
@@ -57193,7 +57193,7 @@
@manual{regcount,
title = {The \texttt{regcount} package},
- subtitle = {Display the allocation status of the TeX registers},
+ subtitle = {Display the allocation status of the \TeX{} registers},
author = {Jean-Pierre Drucbert},
date = {2016-06-24},
version = {1.0},
@@ -57201,7 +57201,7 @@
url = {https://mirror.ctan.org/macros/latex/contrib/regcount},
pkgurl = {https://ctan.org/pkg/regcount},
note = {Adds a macro which displays the allocation
- status of the TeX registers. The display is written into the .log
+ status of the \TeX{} registers. The display is written into the .log
file as it is a bit verbose. An automatic call to
is done at and
.},
@@ -57491,7 +57491,7 @@
@manual{resumemac,
title = {The \texttt{resumemac} package},
- subtitle = {Plain TeX macros for resumés},
+ subtitle = {Plain \TeX{} macros for resumés},
author = {Don Hosek},
date = {2016-06-24},
version = {},
@@ -57520,7 +57520,7 @@
@manual{reverxii,
title = {The \texttt{reverxii} package},
- subtitle = {Playing Reversi in TeX},
+ subtitle = {Playing Reversi in \TeX{}},
author = {Bruno Le Floch},
date = {2022-06-28},
version = {},
@@ -57896,7 +57896,7 @@
license = {lppl},
url = {https://mirror.ctan.org/language/romanian/RomanianTeX},
pkgurl = {https://ctan.org/pkg/romaniantex},
- note = {A \LaTeX{}2e package for typesetting Romanian in a plain TeX environment.
+ note = {A \LaTeX{}2e package for typesetting Romanian in a plain \TeX{} environment.
For \LaTeX{} use, the package has been superseded by the Romanian
option of .},
}
@@ -57954,7 +57954,7 @@
@manual{rotate,
title = {The \texttt{rotate} package},
- subtitle = {Rotate TeX boxes},
+ subtitle = {Rotate \TeX{} boxes},
author = {{Unknown}},
date = {2016-06-24},
version = {},
@@ -58186,7 +58186,7 @@
@manual{rtf2tex,
title = {The \texttt{rtf2tex} package},
- subtitle = {Convert RTF to TeX},
+ subtitle = {Convert RTF to \TeX{}},
author = {Robert Lupton},
date = {2016-06-24},
version = {1.02},
@@ -58304,7 +58304,7 @@
@manual{ruled-tables,
title = {The \texttt{ruled-tables} package},
- subtitle = {Plain TeX table macros, with ruled capability},
+ subtitle = {Plain \TeX{} table macros, with ruled capability},
author = {Eric Myers},
date = {2016-06-24},
version = {},
@@ -58315,7 +58315,7 @@
@manual{ruler,
title = {The \texttt{ruler} package},
- subtitle = {A typographic ruler for TeX},
+ subtitle = {A typographic ruler for \TeX{}},
author = {Victor Eijkhout},
date = {2020-04-11},
version = {1.1},
@@ -58384,7 +58384,7 @@
@manual{runtex,
title = {The \texttt{runtex} package},
- subtitle = {Windows program to run TeX variant and various utils as needed},
+ subtitle = {Windows program to run \TeX{} variant and various utils as needed},
author = {Bernd Becker},
date = {2016-06-24},
version = {0.1.0},
@@ -58562,7 +58562,7 @@
@manual{samples,
title = {The \texttt{samples} package},
- subtitle = {Samples of Plain TeX coding},
+ subtitle = {Samples of Plain \TeX{} coding},
author = {{Unknown}},
date = {2016-06-24},
license = {collection},
@@ -58797,7 +58797,7 @@
@manual{sbtex,
title = {The \texttt{sbtex} package},
- subtitle = {A compact TeX distribution for MS-DOS},
+ subtitle = {A compact \TeX{} distribution for MS-DOS},
author = {Wayne Sullivan},
date = {2016-06-24},
version = {},
@@ -58972,7 +58972,7 @@
@manual{scholax,
title = {The \texttt{ScholaX} package},
- subtitle = {Extension of TeXGyreSchola (New Century Schoolbook) with math support},
+ subtitle = {Extension of \TeX{}GyreSchola (New Century Schoolbook) with math support},
author = {Michael Sharpe},
date = {2022-02-01},
version = {1.033},
@@ -59121,7 +59121,7 @@
@manual{sciwordconv,
title = {The \texttt{SciWordConv} package},
- subtitle = {Use Scientific Word/WorkPlace files with another TeX},
+ subtitle = {Use Scientific Word/WorkPlace files with another \TeX{}},
author = {Berik I. Tuleuov},
date = {2016-06-24},
license = {lppl},
@@ -59146,7 +59146,7 @@
@manual{scmac,
title = {The \texttt{scmac} package},
- subtitle = {Typeset scripts with Plain TeX},
+ subtitle = {Typeset scripts with Plain \TeX{}},
author = {Na Choon Piaw},
date = {2016-06-18},
version = {2.02},
@@ -60129,7 +60129,7 @@
license = {lppl1.3},
url = {https://mirror.ctan.org/macros/latex/contrib/oberdiek/setouterhbox.dtx},
pkgurl = {https://ctan.org/pkg/setouterhbox},
- note = {If math stuff is set in an , then TeX
+ note = {If math stuff is set in an , then \TeX{}
performs some optimization and omits the implicit
penalties and .
This packages tries to put stuff into an
@@ -60681,7 +60681,7 @@
url = {https://mirror.ctan.org/macros/latex/contrib/showdim/showdim.sty},
pkgurl = {https://ctan.org/pkg/showdim},
note = {A package for \LaTeX{} providing a number of commands for
- printing the value of a TeX dimension. For example,
+ printing the value of a \TeX{} dimension. For example,
yields the current value of
rounded to the nearest tenth of a point.},
}
@@ -61049,7 +61049,7 @@
@manual{simplekv,
title = {The \texttt{simplekv} package},
- subtitle = {A simple key/value system for TeX and \LaTeX{}},
+ subtitle = {A simple key/value system for \TeX{} and \LaTeX{}},
author = {Christian Tellechea},
date = {2022-10-01},
version = {0.2a},
@@ -61423,7 +61423,7 @@
@manual{slatex-scheme,
title = {The \texttt{slatex-scheme} package},
- subtitle = {A pretty-printer for Scheme code in TeX documents},
+ subtitle = {A pretty-printer for Scheme code in \TeX{} documents},
author = {Dorai Sitaram},
date = {2020-09-03},
version = {2.4z2a},
@@ -62234,7 +62234,7 @@
@manual{sourcecodepro,
title = {The \texttt{sourcecodepro} package},
- subtitle = {Use SourceCodePro with TeX(-alike) systems},
+ subtitle = {Use SourceCodePro with \TeX{}(-alike) systems},
author = {Silke Hofstra},
date = {2019-05-19},
version = {2.7},
@@ -62245,7 +62245,7 @@
@manual{sourcesanspro,
title = {The \texttt{SourceSansPro} package},
- subtitle = {Use SourceSansPro with TeX(-alike) systems},
+ subtitle = {Use SourceSansPro with \TeX{}(-alike) systems},
author = {Silke Hofstra},
date = {2020-04-26},
version = {2.8},
@@ -62256,7 +62256,7 @@
@manual{sourceserifpro,
title = {The \texttt{sourceserifpro} package},
- subtitle = {Use SourceSerifPro with TeX(-alike) systems},
+ subtitle = {Use SourceSerifPro with \TeX{}(-alike) systems},
author = {Silke Hofstra},
date = {2018-11-10},
version = {1.4},
@@ -62480,7 +62480,7 @@
@manual{spix,
title = {The \texttt{SpiX} package},
- subtitle = {Yet another TeX compilation tool: simple, human readable, no option, no magic},
+ subtitle = {Yet another \TeX{} compilation tool: simple, human readable, no option, no magic},
author = {Louis Paternault},
date = {2020-07-28},
version = {1.1.0},
@@ -62502,7 +62502,7 @@
@manual{splint,
title = {The \texttt{splint} package},
- subtitle = {Write LALR(1) parsers in TeX using bison and flex},
+ subtitle = {Write LALR(1) parsers in \TeX{} using bison and flex},
author = {Alexander Shibakov},
date = {2020-10-11},
version = {1.1.0},
@@ -62510,8 +62510,8 @@
url = {https://mirror.ctan.org/support/splint},
pkgurl = {https://ctan.org/pkg/splint},
note = {The bundle provides the means of building parsers and scanners in
- TeX. and are used to create the
- tables that drive the automata programmed as TeX macros.},
+ \TeX{}. and are used to create the
+ tables that drive the automata programmed as \TeX{} macros.},
}
@manual{split,
@@ -62549,7 +62549,7 @@
small program, . The package may be used to
produce one index or several indexes. Without splitindex (for
example, using the package), the
- number of indexes is limited by the number of TeX’s output
+ number of indexes is limited by the number of \TeX{}’s output
streams. But using the program you may use even more than 16
indexes: splitidx outputs only a single file
and the program splits that file into several raw index files and
@@ -62700,7 +62700,7 @@
@manual{srcltx,
title = {The \texttt{srcltx} package},
- subtitle = {Jump between DVI and TeX files},
+ subtitle = {Jump between DVI and \TeX{} files},
author = {Stefan Ulrich},
date = {2016-06-24},
version = {1.6},
@@ -62778,7 +62778,7 @@
providing facilities for clipping and arranging multiple symbols
so that they do not overlap. The package is built using
, and shares that systems large
- demands for TeX system memory. Its geometric commands are based
+ demands for \TeX{} system memory. Its geometric commands are based
on a turtle graphics model, and control structures such as loops
and conditionals are available.},
}
@@ -62821,7 +62821,7 @@
@manual{stables,
title = {The \texttt{stables} package},
- subtitle = {Simplified Plain TeX tables},
+ subtitle = {Simplified Plain \TeX{} tables},
author = {Robert Nilsson},
date = {2016-06-24},
version = {1.0},
@@ -62851,7 +62851,7 @@
url = {https://mirror.ctan.org/macros/latex/contrib/stack},
pkgurl = {https://ctan.org/pkg/stack},
note = {The package provides a small set of commands to implement stacks
- independently of TeX's own stack. As an example of how the stacks
+ independently of \TeX{}'s own stack. As an example of how the stacks
might be used, the documentation offers a small "relinput" package
that implements the backbone of the
package.},
@@ -62903,10 +62903,10 @@
@manual{standalone,
title = {The \texttt{standalone} package},
- subtitle = {Compile TeX pictures stand-alone or as part of a document},
+ subtitle = {Compile \TeX{} pictures stand-alone or as part of a document},
author = {Martin Scharrer},
- date = {2020-08-27},
- version = {1.3a},
+ date = {2022-10-10},
+ version = {1.3b},
license = {lppl1.3},
url = {https://mirror.ctan.org/macros/latex/contrib/standalone},
pkgurl = {https://ctan.org/pkg/standalone},
@@ -63107,7 +63107,7 @@
note = {This is a beta version of the STEP Greek font.
Only a regular face is available at present, though there
are plans to add italic, bold and bold italic in the future.
- The font only supports LGR in TeX and is meant to serve as
+ The font only supports LGR in \TeX{} and is meant to serve as
a Greek complement to a Times-like font such as
.
The font supports polytonic Greek.},
@@ -63859,7 +63859,7 @@
@manual{swetex,
title = {The \texttt{swetex} package},
- subtitle = {Plain TeX support for writing Swedish},
+ subtitle = {Plain \TeX{} support for writing Swedish},
author = {Erik Engdahl},
date = {2016-06-24},
license = {lppl},
@@ -63894,7 +63894,7 @@
including the document
class. DocTeX mode was designed to be significantly more useful
than the alternatives provided by standard Emacs and
- (AUC TeX has since caught up
+ (AUC \TeX{} has since caught up
in this regard). SwifTeX mode is for editing buffers
containing normal \LaTeX{} files and provides an alternative to the
\LaTeX{} modes in the standard Emacs distribution and in
@@ -64927,7 +64927,7 @@
@manual{tds,
title = {The \texttt{tds} package},
- subtitle = {The TeX Directory Structure standard},
+ subtitle = {The \TeX{} Directory Structure standard},
author = {{TUG TWG-TDS}},
date = {2022-09-22},
version = {1.1},
@@ -64949,7 +64949,7 @@
@manual{techexplorer,
title = {The \texttt{techexplorer} package},
- subtitle = {Browser plugin for viewing TeX and \LaTeX{} sources},
+ subtitle = {Browser plugin for viewing \TeX{} and \LaTeX{} sources},
author = {{IBM Corporation}},
date = {2020-03-20},
version = {2.0},
@@ -65017,7 +65017,7 @@
@manual{teencontrex,
title = {The \texttt{TeEncontreX} package},
- subtitle = {Help for users of TeX and \LaTeX{}},
+ subtitle = {Help for users of \TeX{} and \LaTeX{}},
author = {Manuel Gutierrez Algaba},
date = {2016-06-24},
license = {gpl},
@@ -65048,7 +65048,7 @@
@manual{templates-fenn,
title = {The \texttt{templates-fenn} package},
- subtitle = {Templates for TeX usage},
+ subtitle = {Templates for \TeX{} usage},
author = {Jürgen Fenn},
date = {2017-04-18},
version = {},
@@ -65073,7 +65073,7 @@
@manual{templates-sommer,
title = {The \texttt{templates-sommer} package},
- subtitle = {Templates for TeX usage},
+ subtitle = {Templates for \TeX{} usage},
author = {Jörg Sommer},
date = {2016-06-24},
version = {},
@@ -65121,7 +65121,7 @@
note = {Typesets Eldarin language texts in Fëanorian Tengwar, using
either the or the
fonts. Versions of the
- macros for both \LaTeX{} (2.09) and Plain TeX are provided.},
+ macros for both \LaTeX{} (2.09) and Plain \TeX{} are provided.},
}
@manual{tengwar,
@@ -65314,7 +65314,7 @@
@manual{tetex,
title = {The \texttt{tetex} package},
- subtitle = {Obsolete TeX distribution for Unix/Linux},
+ subtitle = {Obsolete \TeX{} distribution for Unix/Linux},
author = {Thomas Esser},
date = {2021-08-26},
version = {3.0},
@@ -65347,7 +65347,7 @@
@manual{tex--xet,
title = {The \texttt{tex--xet} package},
- subtitle = {Bidirectional extension of TeX},
+ subtitle = {Bidirectional extension of \TeX{}},
author = {Peter Breitenlohner and Donald E. Knuth and Pierre A. MacKay},
date = {2016-06-24},
version = {3.141},
@@ -65385,7 +65385,7 @@
@manual{tex-extensions,
title = {The \texttt{tex-extensions} package},
- subtitle = {Proposals for extensions to TeX},
+ subtitle = {Proposals for extensions to \TeX{}},
author = {Matthias Clasen},
date = {2016-06-24},
version = {},
@@ -65396,7 +65396,7 @@
@manual{tex-font-errors-cheatsheet,
title = {The \texttt{tex-font-errors-cheatsheet} package},
- subtitle = {Cheat sheet outlining the most common TeX font errors},
+ subtitle = {Cheat sheet outlining the most common \TeX{} font errors},
author = {Nico Schlömer},
date = {2019-02-13},
version = {0.1},
@@ -65407,7 +65407,7 @@
@manual{tex-fpc,
title = {The \texttt{TeX-FPC} package},
- subtitle = {A collection of change files for a TeX system based on Free Pascal},
+ subtitle = {A collection of change files for a \TeX{} system based on Free Pascal},
author = {Wolfgang Helbig},
date = {2021-04-08},
version = {4th ed.},
@@ -65423,7 +65423,7 @@
@manual{tex-gpc,
title = {The \texttt{TeX-GPC} package},
- subtitle = {A collection of change files for a TeX system based on GNU Pascal},
+ subtitle = {A collection of change files for a \TeX{} system based on GNU Pascal},
author = {Wolfgang Helbig},
date = {2019-02-22},
version = {3rd edition},
@@ -65489,7 +65489,7 @@
@manual{tex-gyre-math-bonum,
title = {The \texttt{tex-gyre-math-bonum} package},
- subtitle = {Maths fonts to match TeX Gyre Bonum},
+ subtitle = {Maths fonts to match \TeX{} Gyre Bonum},
author = {Bogusław Jackowski and Piotr Strzelczyk and Piotr Pianowski},
date = {2021-08-26},
version = {1.005},
@@ -65500,7 +65500,7 @@
@manual{tex-gyre-math-dejavu,
title = {The \texttt{tex-gyre-math-dejavu} package},
- subtitle = {Maths fonts to match TeX Gyre Dejavu},
+ subtitle = {Maths fonts to match \TeX{} Gyre Dejavu},
author = {Bogusław Jackowski and Piotr Pianowski and Piotr Strzelczyk},
date = {2021-08-26},
version = {1.106},
@@ -65522,7 +65522,7 @@
@manual{tex-gyre-math-schola,
title = {The \texttt{tex-gyre-math-schola} package},
- subtitle = {Maths fonts to match TeX Gyre Schola},
+ subtitle = {Maths fonts to match \TeX{} Gyre Schola},
author = {Bogusław Jackowski and Piotr Pianowski and Piotr Strzelczyk},
date = {2021-08-26},
version = {1.533},
@@ -65533,7 +65533,7 @@
@manual{tex-gyre-math-termes,
title = {The \texttt{tex-gyre-math-termes} package},
- subtitle = {Maths fonts to match TeX Gyre Termes},
+ subtitle = {Maths fonts to match \TeX{} Gyre Termes},
author = {Bogusław Jackowski and Piotr Pianowski and Piotr Strzelczyk},
date = {2021-08-26},
version = {1.543},
@@ -65610,7 +65610,7 @@
@manual{tex-ini-files,
title = {The \texttt{tex-ini-files} package},
- subtitle = {Model TeX format creation files},
+ subtitle = {Model \TeX{} format creation files},
author = {Joseph Wright},
date = {2019-03-02},
version = {},
@@ -65621,14 +65621,14 @@
@manual{tex-it,
title = {The \texttt{tex-it} package},
- subtitle = {Controller for TeX processing},
+ subtitle = {Controller for \TeX{} processing},
author = {Norman Walsh},
date = {2019-02-03},
license = {gpl},
url = {https://mirror.ctan.org/support/tex-it},
pkgurl = {https://ctan.org/pkg/tex-it},
- note = {is a perl script for running TeX. It examines the log file
- of the TeX run and determines whether TeX needs to be run again;
+ note = {is a perl script for running \TeX{}. It examines the log file
+ of the \TeX{} run and determines whether \TeX{} needs to be run again;
it runs BibTeX if necessary, and can be told to run Makeindex.
Its "end-document" action may be selected from a menu, and
includes a "tidy up" to delete all those scribble files.},
@@ -65658,7 +65658,7 @@
@manual{tex-locale,
title = {The \texttt{tex-locale} package},
- subtitle = {Localisation support for TeX and \LaTeX{} documents},
+ subtitle = {Localisation support for \TeX{} and \LaTeX{} documents},
author = {Nicola Talbot},
date = {2018-08-28},
version = {1.0},
@@ -65669,7 +65669,7 @@
@manual{tex-mag,
title = {The \texttt{TeX-mag} package},
- subtitle = {An on-line TeX magazine},
+ subtitle = {An on-line \TeX{} magazine},
author = {Don Hosek},
date = {2016-06-24},
version = {},
@@ -65691,7 +65691,7 @@
@manual{tex-nutshell,
title = {The \texttt{TeX-nutshell} package},
- subtitle = {A short document about TeX principles},
+ subtitle = {A short document about \TeX{} principles},
author = {Petr Olšák},
date = {2022-05-18},
version = {0.8},
@@ -65702,7 +65702,7 @@
@manual{tex-overview,
title = {The \texttt{tex-overview} package},
- subtitle = {An overview of the development of TeX},
+ subtitle = {An overview of the development of \TeX{}},
author = {Arno L Trautmann},
date = {2016-06-24},
version = {0.2},
@@ -65723,7 +65723,7 @@
@manual{tex-references,
title = {The \texttt{tex-references} package},
- subtitle = {References for TeX and Friends},
+ subtitle = {References for \TeX{} and Friends},
author = {Michael Wiedmann},
date = {2020-12-30},
version = {0.4.8},
@@ -65791,7 +65791,7 @@
@manual{tex2mail,
title = {The \texttt{tex2mail} package},
- subtitle = {Converts TeX to mailable "ASCII art"},
+ subtitle = {Converts \TeX{} to mailable "ASCII art"},
author = {Ilya Zakharevich},
date = {2016-06-24},
version = {},
@@ -65802,7 +65802,7 @@
@manual{tex2page,
title = {The \texttt{tex2page} package},
- subtitle = {Produce HTML from TeX/LaTeX},
+ subtitle = {Produce HTML from \TeX{}/LaTeX},
author = {Dorai Sitaram},
date = {2020-06-10},
version = {},
@@ -65822,7 +65822,7 @@
@manual{tex2tok,
title = {The \texttt{tex2tok} package},
- subtitle = {Convert a TeX source file into tokens},
+ subtitle = {Convert a \TeX{} source file into tokens},
author = {Jonathan Fine},
date = {2016-06-24},
version = {1.1},
@@ -65833,7 +65833,7 @@
@manual{tex2word,
title = {The \texttt{tex2word} package},
- subtitle = {Convert TeX/LaTeX to MSWord},
+ subtitle = {Convert \TeX{}/LaTeX to MSWord},
author = {Kirill A Chikrii},
date = {2017-04-18},
version = {2.0},
@@ -65895,7 +65895,7 @@
@manual{texas,
title = {The \texttt{texas} package},
- subtitle = {32-bit TeX 3.14 compiled for MS-DOS 386/486 computers},
+ subtitle = {32-bit \TeX{} 3.14 compiled for MS-DOS 386/486 computers},
author = {Shih-Ping Chan},
date = {2016-06-24},
license = {noinfo},
@@ -65905,7 +65905,7 @@
@manual{texbook,
title = {The \texttt{texbook} package},
- subtitle = {The source of The TeXbook},
+ subtitle = {The source of The \TeX{}book},
author = {Donald E. Knuth},
date = {2021-02-09},
version = {},
@@ -65916,7 +65916,7 @@
@manual{texbuch,
title = {The \texttt{texbuch} package},
- subtitle = {"The little TeXBook"},
+ subtitle = {"The little \TeX{}Book"},
author = {Fritz Cremer},
date = {2016-06-24},
version = {},
@@ -65927,7 +65927,7 @@
@manual{texbytopic,
title = {The \texttt{TeXbyTopic} package},
- subtitle = {Freed version of the book TeX by Topic},
+ subtitle = {Freed version of the book \TeX{} by Topic},
author = {Victor Eijkhout},
date = {2017-04-18},
version = {},
@@ -65974,7 +65974,7 @@
@manual{texdate,
title = {The \texttt{texdate} package},
- subtitle = {Date printing, formatting, and manipulation in TeX},
+ subtitle = {Date printing, formatting, and manipulation in \TeX{}},
author = {Donald P. Goodman},
date = {2018-12-09},
version = {2.0},
@@ -65982,7 +65982,7 @@
url = {https://mirror.ctan.org/macros/generic/texdate},
pkgurl = {https://ctan.org/pkg/texdate},
note = {TeX and \LaTeX{} provide few facilities for dates by default, though many packages
- have filled this gap. This package fills it, as well, with a pure TeX-primitive
+ have filled this gap. This package fills it, as well, with a pure \TeX{}-primitive
implementation. It can print dates, advance them by numbers of days, weeks, or months,
determine the weekday automatically (with an algorithm cribbed from the
file written by Martin Minow), and print them in (mostly) arbitrary format.
@@ -65992,7 +65992,7 @@
@manual{texdef,
title = {The \texttt{texdef} package},
- subtitle = {Display the definitions of TeX commands},
+ subtitle = {Display the definitions of \TeX{} commands},
author = {Martin Scharrer},
date = {2020-09-28},
version = {1.9},
@@ -66037,7 +66037,7 @@
license = {artistic},
url = {https://mirror.ctan.org/support/texdiff},
pkgurl = {https://ctan.org/pkg/texdiff},
- note = {Two files are compared and a new TeX file is output.
+ note = {Two files are compared and a new \TeX{} file is output.
When the output file is processed with (La)TeX it marks new
changes with blue and old text with red with a strike-through
line. Furthermore, passages with changes are marked at the margin
@@ -66047,14 +66047,14 @@
@manual{texdimens,
title = {The \texttt{texdimens} package},
- subtitle = {Conversion of TeX dimensions to decimals},
+ subtitle = {Conversion of \TeX{} dimensions to decimals},
author = {Jean-François Burnol},
date = {2021-11-16},
version = {1.1},
license = {lppl1.3c},
url = {https://mirror.ctan.org/macros/generic/texdimens},
pkgurl = {https://ctan.org/pkg/texdimens},
- note = {Utilities and documentation related to TeX dimensional units,
+ note = {Utilities and documentation related to \TeX{} dimensional units,
usable both with Plain ()
and with \LaTeX{} ().},
}
@@ -66072,7 +66072,7 @@
@manual{texdoc,
title = {The \texttt{texdoc} package},
- subtitle = {Documentation access for TeX Live},
+ subtitle = {Documentation access for \TeX{} Live},
author = {Takuto Asakura and Thomas Esser and Manuel Pégourié-Gonnard and {The TeX Live Team}},
date = {2022-03-19},
version = {3.4.1},
@@ -66080,7 +66080,7 @@
url = {https://mirror.ctan.org/support/texdoc},
pkgurl = {https://ctan.org/pkg/texdoc},
note = {is a Lua script providing easy access to the
- documentation in TeX Live: PDF, DVI, plain text files, and more.
+ documentation in \TeX{} Live: PDF, DVI, plain text files, and more.
Viewing and other configuration can be extensively customized.
It is distributed with ;
provides a program by the same
@@ -66110,14 +66110,14 @@
@manual{texed,
title = {The \texttt{texed} package},
- subtitle = {A TeX shell for OS/2},
+ subtitle = {A \TeX{} shell for OS/2},
author = {Frank Stippich},
date = {2016-06-24},
version = {1.50},
license = {shareware},
url = {https://mirror.ctan.org/systems/os2/texed},
pkgurl = {https://ctan.org/pkg/texed},
- note = {A TeX shell for OS/2, FSS-TeXEdit provides an easy interface
+ note = {A \TeX{} shell for OS/2, FSS-TeXEdit provides an easy interface
for \LaTeX{}2e, ,
and
.},
@@ -66142,11 +66142,11 @@
version = {3.28},
license = {pd},
pkgurl = {https://ctan.org/pkg/texfaq},
- note = {The FAQ that has in the past been published in the UK TeX Users
+ note = {The FAQ that has in the past been published in the UK \TeX{} Users
Group journal Baskerville. This is the last version released
on CTAN in 2014.
- The actual TeX FAQ can be found on .
+ The actual \TeX{} FAQ can be found on .
Some
are also available.},
@@ -66167,7 +66167,7 @@
@manual{texfot,
title = {The \texttt{texfot} package},
- subtitle = {Filter clutter from the output of a TeX run},
+ subtitle = {Filter clutter from the output of a \TeX{} run},
author = {Karl Berry},
date = {2022-09-24},
version = {1.47},
@@ -66178,7 +66178,7 @@
@manual{texhax,
title = {The \texttt{TeXhax} package},
- subtitle = {Digests of a general TeX mailing list},
+ subtitle = {Digests of a general \TeX{} mailing list},
author = {{Unknown}},
date = {2021-08-26},
license = {pd},
@@ -66199,7 +66199,7 @@
@manual{texi2html,
title = {The \texttt{texi2html} package},
- subtitle = {Converts TeXinfo to HTML},
+ subtitle = {Converts \TeX{}info to HTML},
author = {Derek Price and Patrice Dumas and Karl Berry and Lionel Cons},
date = {2017-04-18},
version = {1.76},
@@ -66219,7 +66219,7 @@
pkgurl = {https://ctan.org/pkg/texi2roff},
note = {Texi2roff translates
documents to nroff/troff (it does deal with Plain
- TeX or \LaTeX{} sources). While the conversion is not complete, it
+ \TeX{} or \LaTeX{} sources). While the conversion is not complete, it
provides a solid basis for translating most texinfo documentation.},
}
@@ -66245,7 +66245,7 @@
@manual{texilikecover,
title = {The \texttt{texi-like cover} package},
- subtitle = {A cover-page package, like TeXinfo},
+ subtitle = {A cover-page package, like \TeX{}info},
author = {Alberto Manuel Brandão Simões},
date = {2016-06-24},
version = {0.1},
@@ -66308,7 +66308,7 @@
@manual{texline,
title = {The \texttt{TeXline} package},
- subtitle = {A TeX-based magazine},
+ subtitle = {A \TeX{}-based magazine},
author = {Malcolm Clark},
date = {2016-06-24},
version = {},
@@ -66326,7 +66326,7 @@
license = {other-free},
url = {https://mirror.ctan.org/support/texlipse},
pkgurl = {https://ctan.org/pkg/texlipse},
- note = {The TeXlipse plugin for the
+ note = {The \TeX{}lipse plugin for the
provides support
for \LaTeX{} projects. It is primarily aimed at users who already
know the basics about \LaTeX{}, but new users will surely find it
@@ -66346,7 +66346,7 @@
@manual{texlive-dummy-enterprise-linux-6,
title = {The \texttt{texlive-dummy-enterprise-linux-6} package},
- subtitle = {Dummy TeX Live RPM for use with RHEL 6 and derived distributions},
+ subtitle = {Dummy \TeX{} Live RPM for use with RHEL 6 and derived distributions},
author = {Bob Tennent},
date = {2016-06-24},
version = {},
@@ -66357,7 +66357,7 @@
@manual{texlive-dummy-enterprise-linux-7,
title = {The \texttt{texlive-dummy-enterprise-linux-7} package},
- subtitle = {Dummy TeX Live RPM for use with RHEL 7 and derived distributions},
+ subtitle = {Dummy \TeX{} Live RPM for use with RHEL 7 and derived distributions},
author = {Bob Tennent},
date = {2016-06-24},
version = {},
@@ -66368,7 +66368,7 @@
@manual{texlive-dummy-enterprise-linux-8,
title = {The \texttt{texlive-dummy-enterprise-linux-8} package},
- subtitle = {Dummy TeX Live RPM for use with RHEL 8 and derived distributions},
+ subtitle = {Dummy \TeX{} Live RPM for use with RHEL 8 and derived distributions},
author = {Bob Tennent},
date = {2020-02-15},
version = {},
@@ -66379,7 +66379,7 @@
@manual{texlive-dummy-enterprise-linux,
title = {The \texttt{texlive-dummy-enterprise-linux} package},
- subtitle = {Dummy TeX Live RPM for use with RHEL 6 and derived distributions},
+ subtitle = {Dummy \TeX{} Live RPM for use with RHEL 6 and derived distributions},
author = {Bob Tennent},
date = {2016-06-24},
version = {},
@@ -66390,7 +66390,7 @@
@manual{texlive-dummy-fedora,
title = {The \texttt{texlive-dummy-fedora} package},
- subtitle = {Dummy TeX Live RPM for use with Fedora and similar distributions},
+ subtitle = {Dummy \TeX{} Live RPM for use with Fedora and similar distributions},
author = {Hendrik G Seliger},
date = {2022-07-14},
version = {},
@@ -66401,7 +66401,7 @@
@manual{texlive-dummy-opensuse,
title = {The \texttt{texlive-dummy-opensuse} package},
- subtitle = {Dummy TeX Live RPM for use with Open SUSE},
+ subtitle = {Dummy \TeX{} Live RPM for use with Open SUSE},
author = {Rolf Niepraschk},
date = {2022-04-21},
version = {2022.9999-1},
@@ -66412,7 +66412,7 @@
@manual{texlive-repo,
title = {The \texttt{texlive-repo} package},
- subtitle = {A mirror of the TeX Live repository},
+ subtitle = {A mirror of the \TeX{} Live repository},
author = {{The TeX Live Team}},
date = {2021-08-26},
version = {2016},
@@ -66423,7 +66423,7 @@
@manual{texlive-source,
title = {The \texttt{TeX Live source tree} package},
- subtitle = {Sources of the TeX Live distribution},
+ subtitle = {Sources of the \TeX{} Live distribution},
author = {{The TeX Live Team}},
date = {2021-08-26},
license = {other-free},
@@ -66433,7 +66433,7 @@
@manual{texlive,
title = {The \texttt{texlive} package},
- subtitle = {A comprehensive distribution of TeX and friends},
+ subtitle = {A comprehensive distribution of \TeX{} and friends},
author = {{The TeX Live Team}},
date = {2022-04-04},
version = {2022},
@@ -66444,7 +66444,7 @@
@manual{texliveonfly,
title = {The \texttt{texliveonfly} package},
- subtitle = {On-the-fly download of missing TeX live packages},
+ subtitle = {On-the-fly download of missing \TeX{} live packages},
author = {Saitulaa Naranong},
date = {2020-06-24},
version = {},
@@ -66455,7 +66455,7 @@
@manual{texlog-extract,
title = {The \texttt{texlog-extract} package},
- subtitle = {Extract errors and warnings from TeX logs},
+ subtitle = {Extract errors and warnings from \TeX{} logs},
author = {Wybo H. Dekker},
date = {2019-02-05},
version = {3.04},
@@ -66466,7 +66466,7 @@
@manual{texloganalyser,
title = {The \texttt{texloganalyser} package},
- subtitle = {Analyse TeX logs},
+ subtitle = {Analyse \TeX{} logs},
author = {Thomas van Oudenhove},
date = {2020-03-26},
version = {0.11},
@@ -66519,7 +66519,7 @@
@manual{texmacs,
title = {The \texttt{TeXmacs} package},
- subtitle = {Structured text editor for TeX},
+ subtitle = {Structured text editor for \TeX{}},
author = {Joris van der Hoeven},
date = {2017-04-18},
version = {1.0.7.20},
@@ -66567,7 +66567,7 @@
@manual{texmuse,
title = {The \texttt{TeXmuse} package},
- subtitle = {Music typesetting system using TeX and Metafont},
+ subtitle = {Music typesetting system using \TeX{} and Metafont},
author = {Federico Garcia-De Castro},
date = {2016-06-24},
license = {lppl},
@@ -66598,15 +66598,15 @@
@manual{texonly,
title = {The \texttt{texonly} package},
- subtitle = {A sample document in Plain TeX},
+ subtitle = {A sample document in Plain \TeX{}},
author = {Matthias Borck-Elsner},
date = {2019-05-06},
version = {2},
license = {lppl1.3c},
url = {https://mirror.ctan.org/info/texonly},
pkgurl = {https://ctan.org/pkg/texonly},
- note = {A file written with TeX, not using any packgages or sty-files,
- to be compiled with TeX or pdfTeX only, with \LaTeX{}
+ note = {A file written with \TeX{}, not using any packgages or sty-files,
+ to be compiled with \TeX{} or pdfTeX only, with \LaTeX{}
et al.},
}
@@ -66632,7 +66632,7 @@
note = {Texpack is a little bundle of scripts to create documented \LaTeX{}
style, class files and docs. Texpack provides useful scripts for
the automated creation of the skeleton required by
- documented TeX files. It is useful both for creating packages
+ documented \TeX{} files. It is useful both for creating packages
() and new classes (). Texpack also
provides a command to automate the creation of commonly needed
\LaTeX{} skeleton files. This feature is mostly useful for the
@@ -66692,7 +66692,7 @@
The application name is a word play on and ,
so the purpose seems quite obvious: we want to provide an easy and
straightforward framework for reducing the typical code boilerplate
- when writing TeX documents.
+ when writing \TeX{} documents.
Also note that one can easily extrapolate the use beyond articles
and theses: the application is powerful enough to generate
text-based structure, given that
@@ -66758,20 +66758,20 @@
url = {https://mirror.ctan.org/macros/latex/contrib/texshade},
pkgurl = {https://ctan.org/pkg/texshade},
note = {TeXshade is alignment shading software completely written in
- TeX/LaTeX; it can process multiple sequence alignments in the
+ \TeX{}/LaTeX; it can process multiple sequence alignments in the
and the file formats. In addition to
common shading algorithms, it provides special shading modes
showing functional aspects, e.g. charge or hydropathy, and a wide
range of commands for handling shading colours, text styles,
labels, legends; it even allows the user to define completely new
- shading modes. TeXshade combines highest flexibility with TeX
+ shading modes. \TeX{}shade combines highest flexibility with \TeX{}
output quality — all in a bundle that does not demand excessive
development time of the user.},
}
@manual{texshell,
title = {The \texttt{TeXshell} package},
- subtitle = {X-Window Shell for TeX},
+ subtitle = {X-Window Shell for \TeX{}},
author = {Marc Mittelbach},
date = {2016-06-24},
version = {2.8},
@@ -66782,7 +66782,7 @@
@manual{texshell32,
title = {The \texttt{texshell32} package},
- subtitle = {A free TeXShell for MS-Windows 95 and NT},
+ subtitle = {A free \TeX{}Shell for MS-Windows 95 and NT},
author = {Dirk Struve},
date = {2016-06-24},
version = {0.71},
@@ -66800,15 +66800,15 @@
license = {gpl},
url = {https://mirror.ctan.org/support/texshop},
pkgurl = {https://ctan.org/pkg/texshop},
- note = {TeXShop is a TeX previewer for Mac OS X, written in Cocoa.
- TeXShop uses and in its default
+ note = {TeXShop is a \TeX{} previewer for Mac OS X, written in Cocoa.
+ \TeX{}Shop uses and in its default
configuration, to conform with Mac OS X’s predilection for
PDF.},
}
@manual{texsis,
title = {The \texttt{TeXsis} package},
- subtitle = {Plain TeX macros for Physicists},
+ subtitle = {Plain \TeX{} macros for Physicists},
author = {Eric Myers and Frank Paige},
date = {2019-06-21},
version = {2.18},
@@ -66978,7 +66978,7 @@
@manual{textmerg,
title = {The \texttt{textmerg} package},
- subtitle = {Merge text in TeX and \LaTeX{}},
+ subtitle = {Merge text in \TeX{} and \LaTeX{}},
author = {Mike Piff and Robin Fairbairns and David Carlisle},
date = {2018-09-15},
version = {2.01},
@@ -67088,7 +67088,7 @@
@manual{texware,
title = {The \texttt{texware} package},
- subtitle = {Utility programs for use with TeX},
+ subtitle = {Utility programs for use with \TeX{}},
author = {Donald E. Knuth},
date = {2021-08-26},
version = {},
@@ -67147,7 +67147,7 @@
@manual{tgrind,
title = {The \texttt{tgrind} package},
- subtitle = {Produce beautiful program listings using plain TeX},
+ subtitle = {Produce beautiful program listings using plain \TeX{}},
author = {Van Jacobson},
date = {2016-06-24},
license = {nosell},
@@ -67645,10 +67645,10 @@
and
/ps2pdf.
The script uses to
- generate the thumbnails which get represented in a TeX readable
+ generate the thumbnails which get represented in a \TeX{} readable
file that is read by the package to automatically
include the thumbnails. This arrangement works with both plain
- TeX and \LaTeX{}.},
+ \TeX{} and \LaTeX{}.},
}
@manual{thumbs,
@@ -67869,8 +67869,8 @@
title = {The \texttt{tikz-ext} package},
subtitle = {A collection of libraries for PGF/TikZ},
author = {{Unknown}},
- date = {2022-09-24},
- version = {0.3},
+ date = {2022-10-10},
+ version = {0.4},
license = {fdl,lppl},
url = {https://mirror.ctan.org/graphics/pgf/contrib/tikz-ext},
pkgurl = {https://ctan.org/pkg/tikz-ext},
@@ -68600,7 +68600,7 @@
@manual{tipos,
title = {The \texttt{tipos} package},
- subtitle = {Description of fonts for TeX, in Spanish},
+ subtitle = {Description of fonts for \TeX{}, in Spanish},
author = {Javier Bezos López},
date = {2016-06-24},
license = {nosource},
@@ -68949,7 +68949,7 @@
@manual{tlaunch,
title = {The \texttt{tlaunch} package},
- subtitle = {A Windows GUI to run a networked TeX Live as if installed locally},
+ subtitle = {A Windows GUI to run a networked \TeX{} Live as if installed locally},
author = {Siep Kroonenberg},
date = {2019-06-21},
version = {0.5.3},
@@ -68992,7 +68992,7 @@
@manual{tlcockpit,
title = {The \texttt{TLCockpit} package},
- subtitle = {A GUI frontend to TeX Live Manager (tlmgr)},
+ subtitle = {A GUI frontend to \TeX{} Live Manager (tlmgr)},
author = {Norbert Preining},
date = {2020-04-22},
version = {1.2},
@@ -69107,7 +69107,7 @@
@manual{toc-zar,
title = {The \texttt{toc-zar} package},
- subtitle = {Plain TeX table of contents macros},
+ subtitle = {Plain \TeX{} table of contents macros},
author = {Dan Zirin},
date = {2020-08-29},
version = {},
@@ -69121,7 +69121,7 @@
@manual{toc,
title = {The \texttt{toc} package},
- subtitle = {Table of contents macros for Plain TeX},
+ subtitle = {Table of contents macros for Plain \TeX{}},
author = {{Unknown}},
date = {2016-06-24},
version = {},
@@ -69234,7 +69234,7 @@
@manual{toil,
title = {The \texttt{toil} package},
- subtitle = {An installer of PostScript fonts for TeX},
+ subtitle = {An installer of PostScript fonts for \TeX{}},
author = {Bogusław Jackowski and Piotr Pianowski and Piotr Strzelczyk},
date = {2021-08-26},
version = {1.07},
@@ -69497,7 +69497,7 @@
@manual{trace,
title = {The \texttt{trace} package},
- subtitle = {Make sensible use of TeX tracing in \LaTeX{}},
+ subtitle = {Make sensible use of \TeX{} tracing in \LaTeX{}},
author = {Frank Mittelbach and {The LaTeX Project Team}},
date = {2021-08-26},
version = {1.1f},
@@ -69566,7 +69566,7 @@
@manual{trans,
title = {The \texttt{trans} package},
- subtitle = {A simple TeX macro package for PostScript transformations},
+ subtitle = {A simple \TeX{} macro package for PostScript transformations},
author = {{BOP}},
date = {2016-06-24},
version = {0.55},
@@ -69834,7 +69834,7 @@
@manual{treedef,
title = {The \texttt{treedef} package},
- subtitle = {Macros to typeset trees in Plain TeX},
+ subtitle = {Macros to typeset trees in Plain \TeX{}},
author = {David Eppstein},
date = {2021-08-26},
version = {},
@@ -69900,7 +69900,7 @@
@manual{trigonometry,
title = {The \texttt{trigonometry} package},
- subtitle = {Demonstration code for cos and sin in TeX macros},
+ subtitle = {Demonstration code for cos and sin in \TeX{} macros},
author = {Philip Taylor},
date = {2017-01-24},
version = {},
@@ -70017,7 +70017,7 @@
@manual{try,
title = {The \texttt{TrY} package},
- subtitle = {Automation of TeX/LaTeX compilation},
+ subtitle = {Automation of \TeX{}/LaTeX compilation},
author = {Ajabu Tex},
date = {2016-06-24},
version = {4.0},
@@ -70025,7 +70025,7 @@
url = {https://mirror.ctan.org/support/try},
pkgurl = {https://ctan.org/pkg/try},
note = {The package offers a script that automates the compilation of
- TeX/LaTeX documents. TrY reads commands from the comment lines of
+ \TeX{}/LaTeX documents. TrY reads commands from the comment lines of
the document and executes them automatically. TrY may be compared
to , but is simpler.
TrY has been written for Linux and works on Linux.},
@@ -70033,7 +70033,7 @@
@manual{tsconfig,
title = {The \texttt{tsconfig} package},
- subtitle = {Setup support for TeXshell},
+ subtitle = {Setup support for \TeX{}shell},
author = {Dirk Nitschke},
date = {2016-06-24},
version = {},
@@ -70073,7 +70073,7 @@
@manual{tt2001,
title = {The \texttt{tt2001} package},
- subtitle = {Type 1 EC fonts generated by TeXtrace},
+ subtitle = {Type 1 EC fonts generated by \TeX{}trace},
author = {Péter Szabó},
date = {2016-06-24},
license = {lppl},
@@ -70083,7 +70083,7 @@
@manual{ttf-howto,
title = {The \texttt{ttf-howto} package},
- subtitle = {Using TrueType fonts with TeX systems},
+ subtitle = {Using TrueType fonts with \TeX{} systems},
author = {Harald Harders},
date = {2019-03-12},
version = {},
@@ -70150,7 +70150,7 @@
@manual{tth,
title = {The \texttt{tth} package},
- subtitle = {A TeX to HTML translator},
+ subtitle = {A \TeX{} to HTML translator},
author = {Ian Hutchinson},
date = {2017-04-18},
version = {3.85},
@@ -70231,7 +70231,7 @@
@manual{tugboat-plain,
title = {The \texttt{tugboat-plain} package},
- subtitle = {Plain TeX macros for TUGboat},
+ subtitle = {Plain \TeX{} macros for TUGboat},
author = {Barbara Beeton and Karl Berry},
date = {2022-05-22},
version = {1.27},
@@ -70240,7 +70240,7 @@
pkgurl = {https://ctan.org/pkg/tugboat-plain},
note = {The macros defined in this directory (in files
and ) are used in papers
- written in Plain TeX for publication in TUGboat.},
+ written in Plain \TeX{} for publication in TUGboat.},
}
@manual{tugboat-toc,
@@ -70385,7 +70385,7 @@
@manual{tweb,
title = {The \texttt{tweb} package},
- subtitle = {A web system for TeX macro sources},
+ subtitle = {A web system for \TeX{} macro sources},
author = {Włodek Bzyl},
date = {2016-06-24},
version = {},
@@ -70393,7 +70393,7 @@
url = {https://mirror.ctan.org/web/tweb},
pkgurl = {https://ctan.org/pkg/tweb},
note = {Tweb uses to provide a better
- means of printing TeX macro sources.},
+ means of printing \TeX{} macro sources.},
}
@manual{twemoji-colr,
@@ -70459,7 +70459,7 @@
@manual{twoside,
title = {The \texttt{twoside} package},
- subtitle = {Two-side typesetting in Plain TeX},
+ subtitle = {Two-side typesetting in Plain \TeX{}},
author = {{Unknown}},
date = {2016-06-24},
version = {},
@@ -70780,13 +70780,13 @@
@manual{u8tex,
title = {The \texttt{u8tex} package},
- subtitle = {Input Unicode characters in TeX notation, in emacs},
+ subtitle = {Input Unicode characters in \TeX{} notation, in emacs},
author = {Sergei Pokrovsky},
date = {2016-06-24},
license = {gpl},
url = {https://mirror.ctan.org/support/emacs-modes/u8tex.el},
pkgurl = {https://ctan.org/pkg/u8tex},
- note = {A file to provide an alternative, TeX-style, input method for
+ note = {A file to provide an alternative, \TeX{}-style, input method for
UTF-8 characters in Otfried Cheong's
.},
}
@@ -71127,7 +71127,7 @@
@manual{uktex,
title = {The \texttt{UK-TeX} package},
- subtitle = {The UK TeX digest},
+ subtitle = {The UK \TeX{} digest},
author = {{Unknown}},
date = {2016-06-24},
license = {pd},
@@ -71215,7 +71215,7 @@
@manual{ultratex,
title = {The \texttt{Ultra-TeX} package},
- subtitle = {An emacs TeX mode with "lightning completion'},
+ subtitle = {An emacs \TeX{} mode with "lightning completion'},
author = {John H. Palmieri},
date = {2016-06-24},
license = {gpl},
@@ -71586,7 +71586,7 @@
@manual{unicode-data,
title = {The \texttt{unicode-data} package},
- subtitle = {Unicode data and loaders for TeX},
+ subtitle = {Unicode data and loaders for \TeX{}},
author = {Joseph Wright and {The LaTeX Project Team}},
date = {2022-09-17},
version = {1.16},
@@ -71817,7 +71817,7 @@
@manual{unouter,
title = {The \texttt{unouter} package},
- subtitle = {Suppress \textbackslash{}outer flags in Plain TeX},
+ subtitle = {Suppress \textbackslash{}outer flags in Plain \TeX{}},
author = {Éamonn McManus},
date = {2016-06-24},
version = {},
@@ -71825,7 +71825,7 @@
url = {https://mirror.ctan.org/macros/plain/contrib/misc/unouter.tex},
pkgurl = {https://ctan.org/pkg/unouter},
note = {The package suppresses all the flags on macros in
- Plain TeX; it also suppresses the command.},
+ Plain \TeX{}; it also suppresses the command.},
}
@manual{unpacked,
@@ -71840,7 +71840,7 @@
@manual{unravel,
title = {The \texttt{unravel} package},
- subtitle = {Watching TeX digest tokens},
+ subtitle = {Watching \TeX{} digest tokens},
author = {Bruno Le Floch},
date = {2021-05-12},
version = {0.3a},
@@ -72007,14 +72007,14 @@
@manual{uptex-base,
title = {The \texttt{uptex-base} package},
- subtitle = {Plain TeX formats and documents for upTeX},
+ subtitle = {Plain \TeX{} formats and documents for upTeX},
author = {Kazuki Maeda and Takuji Tanaka and {Japanese TeX Development Community}},
date = {2022-07-31},
version = {},
license = {bsd3},
url = {https://mirror.ctan.org/macros/jptex/generic/uptex-base},
pkgurl = {https://ctan.org/pkg/uptex-base},
- note = {The bundle contains plain TeX format files and documents
+ note = {The bundle contains plain \TeX{} format files and documents
for and and e-upTeX.},
}
@@ -72117,7 +72117,7 @@
@manual{urw-antiqua,
title = {The \texttt{urw-antiqua} package},
- subtitle = {URW Antiqua condensed font, for use with TeX},
+ subtitle = {URW Antiqua condensed font, for use with \TeX{}},
author = {{URW GmbH} and Walter A. Schmidt and Keiran Harcombe},
date = {2021-12-07},
version = {001.003},
@@ -72602,7 +72602,7 @@
command. For example, with it you can generate multiple index
entries in almost any form by a single command. The package is
highly customizable, and works with all versions of \LaTeX{} and
- probably most other TeX formats.},
+ probably most other \TeX{} formats.},
}
@manual{varioref,
@@ -72618,7 +72618,7 @@
@manual{varisize,
title = {The \texttt{varisize} package},
- subtitle = {Change font size in Plain TeX},
+ subtitle = {Change font size in Plain \TeX{}},
author = {Don Hosek},
date = {2016-06-24},
version = {},
@@ -72808,7 +72808,7 @@
@manual{verbatim-pln,
title = {The \texttt{verbatim-pln} package},
- subtitle = {Define new verbatim "environments" in Plain TeX},
+ subtitle = {Define new verbatim "environments" in Plain \TeX{}},
author = {{Unknown}},
date = {2016-06-24},
version = {},
@@ -72819,7 +72819,7 @@
@manual{verbatim-tub,
title = {The \texttt{verbatim-tub} package},
- subtitle = {Plain TeX macros for verbatim},
+ subtitle = {Plain \TeX{} macros for verbatim},
author = {Barbara Beeton},
date = {2016-06-24},
version = {},
@@ -72923,7 +72923,7 @@
@manual{verbtim2,
title = {The \texttt{verbtim2} package},
- subtitle = {Verbatim listings in Plain TeX},
+ subtitle = {Verbatim listings in Plain \TeX{}},
author = {Tim Morgan},
date = {2016-06-24},
version = {},
@@ -73142,7 +73142,7 @@
url = {https://mirror.ctan.org/language/vietnamese/vietnet},
pkgurl = {https://ctan.org/pkg/vietnet},
note = {VNTeX is a preprocessor (written in C) that translates Vietnamese
- text, written according to a specific set of rules, into TeX.
+ text, written according to a specific set of rules, into \TeX{}.
VNTeX takes an file and creates a corresponding
file, together with a file of supporting macros.},
}
@@ -73222,7 +73222,7 @@
@manual{visualtex,
title = {The \texttt{visualtex} package},
- subtitle = {A TeX-oriented visual editor for Windows platforms},
+ subtitle = {A \TeX{}-oriented visual editor for Windows platforms},
author = {Alex Romanenko},
date = {2017-04-18},
version = {3.99},
@@ -73443,7 +73443,7 @@
@manual{vrb,
title = {The \texttt{vrb} package},
- subtitle = {Verbatim macros in plain TeX},
+ subtitle = {Verbatim macros in plain \TeX{}},
author = {Kees van der Laan},
date = {2016-06-24},
version = {1.1},
@@ -73537,7 +73537,7 @@
@manual{vutex,
title = {The \texttt{vutex} package},
- subtitle = {View TeX output on an ASCII-only terminal},
+ subtitle = {View \TeX{} output on an ASCII-only terminal},
author = {Warren Wolfe},
date = {2016-06-24},
version = {1.02},
@@ -73594,14 +73594,14 @@
@manual{w32tex,
title = {The \texttt{w32tex} package},
- subtitle = {A comprehensive TeX system for Windows},
+ subtitle = {A comprehensive \TeX{} system for Windows},
author = {Akira Kakuto},
date = {2021-09-15},
version = {},
license = {other-free},
pkgurl = {https://ctan.org/pkg/w32tex},
- note = {A Japanese-oriented (full) TeX distribution, which provides the
- basis of the Windows TeX offered by
+ note = {A Japanese-oriented (full) \TeX{} distribution, which provides the
+ basis of the Windows \TeX{} offered by
.},
}
@@ -73748,7 +73748,7 @@
@manual{weave,
title = {The \texttt{weave} package},
- subtitle = {Generate TeX source from web},
+ subtitle = {Generate \TeX{} source from web},
author = {Donald E. Knuth},
date = {2021-02-09},
version = {4.5},
@@ -73757,7 +73757,7 @@
pkgurl = {https://ctan.org/pkg/weave},
note = {This is the component of Knuth’s
that
- produces TeX input from the web representation of a program, ready
+ produces \TeX{} input from the web representation of a program, ready
for typesetting.},
}
@@ -73773,14 +73773,14 @@
note = {The system processes ‘web’ files in two ways:
firstly to rearrange them to produce compilable code (using the
program ), and secondly to
- produce a TeX source (using the program
+ produce a \TeX{} source (using the program
) that may be typeset for
comfortable reading.},
}
@manual{web2c,
title = {The \texttt{Web2C} package},
- subtitle = {Conversion programs and supporting code to compile TeX in C},
+ subtitle = {Conversion programs and supporting code to compile \TeX{} in C},
author = {Olaf Weber and {The TeX Live Team}},
date = {2022-01-17},
license = {gpl},
@@ -73789,7 +73789,7 @@
@manual{web2w,
title = {The \texttt{web2w} package},
- subtitle = {Converting TeX from WEB to cweb},
+ subtitle = {Converting \TeX{} from WEB to cweb},
author = {Martin Ruckert},
date = {2019-06-21},
version = {0.4},
@@ -73928,7 +73928,7 @@
@manual{wichura-table,
title = {The \texttt{wichura-table} package},
- subtitle = {Table macros for plain TeX (and \LaTeX{})},
+ subtitle = {Table macros for plain \TeX{} (and \LaTeX{})},
author = {Michael Wichura and David Carlisle},
date = {2021-06-09},
version = {1.0},
@@ -74056,7 +74056,7 @@
@manual{winedt,
title = {The \texttt{WinEdt} package},
- subtitle = {MS-Windows shell and editor for TeX},
+ subtitle = {MS-Windows shell and editor for \TeX{}},
author = {Aleksander Simonic},
date = {2017-04-18},
version = {6.0},
@@ -74074,7 +74074,7 @@
pkgurl = {https://ctan.org/pkg/winemtex},
note = {A full distribution
for MS-Windows98 including Ghostscript and WinEdit and
- preconfigured to work with TeX.},
+ preconfigured to work with \TeX{}.},
}
@manual{winfonts,
@@ -74090,7 +74090,7 @@
@manual{winlatex,
title = {The \texttt{winlatex} package},
- subtitle = {FrontEnd for TeX, Win98/NT, needs Microsoft VisualBasic-DLLs},
+ subtitle = {FrontEnd for \TeX{}, Win98/NT, needs Microsoft VisualBasic-DLLs},
author = {Thomas Reinhardt},
date = {2016-06-18},
version = {0.8},
@@ -74101,7 +74101,7 @@
@manual{winshell,
title = {The \texttt{winshell} package},
- subtitle = {A MS-Windows32 user interface for TeX},
+ subtitle = {A MS-Windows32 user interface for \TeX{}},
author = {Ingo H. de Boer},
date = {2021-11-06},
version = {4.0.0.2},
@@ -74112,7 +74112,7 @@
@manual{wintex2000,
title = {The \texttt{WinTeX XP} package},
- subtitle = {A Win32 TeX Editor with the MS Office look and feel},
+ subtitle = {A Win32 \TeX{} Editor with the MS Office look and feel},
author = {Michael Muecke},
date = {2017-05-21},
license = {shareware},
@@ -74217,7 +74217,7 @@
@manual{wntamil,
title = {The \texttt{wntamil} package},
- subtitle = {Tamil to TeX converter},
+ subtitle = {Tamil to \TeX{} converter},
author = {{Unknown}},
date = {2019-06-21},
license = {other-nonfree},
@@ -74262,7 +74262,7 @@
@manual{word2tex,
title = {The \texttt{word2tex} package},
- subtitle = {Convert TeX/MSWord to \LaTeX{}},
+ subtitle = {Convert \TeX{}/MSWord to \LaTeX{}},
author = {Kirill A Chikrii},
date = {2017-04-18},
version = {4.0},
@@ -74443,7 +74443,7 @@
@manual{wrtfile,
title = {The \texttt{wrtfile} package},
- subtitle = {Write TeX files from a TeX document},
+ subtitle = {Write \TeX{} files from a \TeX{} document},
author = {Cameron Smith},
date = {2016-06-24},
version = {},
@@ -74451,7 +74451,7 @@
url = {https://mirror.ctan.org/macros/plain/contrib/wrtfile},
pkgurl = {https://ctan.org/pkg/wrtfile},
note = {Wrtfile is a means of creating self-extracting distributions in
- TeX files; it is similar in conception to the \LaTeX{}
+ \TeX{} files; it is similar in conception to the \LaTeX{}
mechanism, but is somewhat
more efficient. Wrtfile is (of course) distributed using its own
mechanisms.},
@@ -74487,7 +74487,7 @@
url = {https://mirror.ctan.org/support/wsuipa2tipa},
pkgurl = {https://ctan.org/pkg/wsuipa2tipa},
note = {Old fonts don't compile well
- on newer TeX distributions, and may be unavailable on your local
+ on newer \TeX{} distributions, and may be unavailable on your local
installation. The fonts are superseded by the newer
fonts. The program wsu2tipa works as a
filter that translates an old \LaTeX{} document, replacing all
@@ -74783,7 +74783,7 @@
@manual{xduts,
title = {The \texttt{xduts} package},
- subtitle = {Xidian University TeX Suite},
+ subtitle = {Xidian University \TeX{} Suite},
author = {{Unknown}},
date = {2022-08-15},
version = {2.12.2.0},
@@ -74868,7 +74868,7 @@
package;
but it was decided that it should remain available
for the benefit of users wishing to run their
- old TeX files using .},
+ old \TeX{} files using .},
}
@manual{xecyr,
@@ -74977,7 +74977,7 @@
@manual{xet-tex,
title = {The \texttt{XeT-TeX} package},
- subtitle = {A bi-directional version of TeX},
+ subtitle = {A bi-directional version of \TeX{}},
author = {Pierre A. MacKay},
date = {2016-06-24},
version = {},
@@ -74988,7 +74988,7 @@
@manual{xetal,
title = {The \texttt{xetal} package},
- subtitle = {Strip TeX constructs from a file},
+ subtitle = {Strip \TeX{} constructs from a file},
author = {Raphael Cerf},
date = {2016-06-24},
version = {1.2},
@@ -75069,7 +75069,7 @@
@manual{xetex,
title = {The \texttt{xetex} package},
- subtitle = {An extended variant of TeX for use with Unicode sources},
+ subtitle = {An extended variant of \TeX{} for use with Unicode sources},
author = {Jonathan Kew and Arthur Rosendahl and Khaled Hosny and {The TeX Live Team}},
date = {2022-01-25},
license = {x11},
@@ -75410,7 +75410,7 @@
@manual{xlatex,
title = {The \texttt{xlatex} package},
- subtitle = {A TeX/LaTeX shell for X-windows},
+ subtitle = {A \TeX{}/LaTeX shell for X-windows},
author = {Mario Dragone},
date = {2016-06-24},
version = {3.3c},
@@ -75650,7 +75650,7 @@
@manual{xprintlen,
title = {The \texttt{xprintlen} package},
- subtitle = {Print TeX lengths in a variety of units},
+ subtitle = {Print \TeX{} lengths in a variety of units},
author = {Liam Huang},
date = {2017-04-18},
version = {1.0},
@@ -75806,7 +75806,7 @@
@manual{xtem,
title = {The \texttt{xtem} package},
- subtitle = {An X11 TeX menu built on Tcl/Tk},
+ subtitle = {An X11 \TeX{} menu built on Tcl/Tk},
author = {Guenther Lamprecht and Wolfhard Lotz and Roland Weibezahn},
date = {2016-06-24},
version = {7.03},
@@ -76057,7 +76057,7 @@
@manual{yandy,
title = {The \texttt{yandy} package},
- subtitle = {TUG release of Y and Y’s TeX distribution},
+ subtitle = {TUG release of Y and Y’s \TeX{} distribution},
author = {Clerk Ma and Berthold K. P. Horn},
date = {2017-04-18},
version = {0.5},
@@ -76556,7 +76556,7 @@
@manual{zhmetrics,
title = {The \texttt{zhmetrics} package},
- subtitle = {TFM subfont files for using Chinese fonts in 8-bit TeX},
+ subtitle = {TFM subfont files for using Chinese fonts in 8-bit \TeX{}},
author = {Yue Wang and LingYun Wu},
date = {2016-06-24},
version = {r206},
@@ -76812,7 +76812,7 @@
@manual{zztex,
title = {The \texttt{ZzTeX} package},
- subtitle = {A full-featured TeX macro package for producing books, journals, and manuals},
+ subtitle = {A full-featured \TeX{} macro package for producing books, journals, and manuals},
author = {Paul C. Anagnostopoulos},
date = {2020-07-20},
version = {17.7},
diff --git a/biblio/ctan-bibdata/ctan.pdf b/biblio/ctan-bibdata/ctan.pdf
index 0ace0b636b..180349cb60 100644
--- a/biblio/ctan-bibdata/ctan.pdf
+++ b/biblio/ctan-bibdata/ctan.pdf
Binary files differ
diff --git a/graphics/mcf2graph/CHANGELOG b/graphics/mcf2graph/CHANGELOG
index cab0e24d66..a5160a5a14 100644
--- a/graphics/mcf2graph/CHANGELOG
+++ b/graphics/mcf2graph/CHANGELOG
@@ -1,6 +1,11 @@
*******************************************************************************
- Changelog of mcf2graph software package by Akira Yamaji 2022-08-22
+ Changelog of mcf2graph software package by Akira Yamaji 2022-10-10
*******************************************************************************
+[ver. 4.88 / 2022-10-10]
+ -change format of mcf_library.mcf
+ -update MCF manual,example
+ -update mcf_library.mcf
+
[ver. 4.87 / 2022-08-22]
-change format of mcf_library.mcf
-change output file name
diff --git a/graphics/mcf2graph/README b/graphics/mcf2graph/README
index 3596c877de..bbeb4dcb83 100644
--- a/graphics/mcf2graph/README
+++ b/graphics/mcf2graph/README
@@ -1,7 +1,7 @@
********************************************************************************
mcf2graph : Convert Molecular Coding Format to graphics with MetaPost
Author : Akira Yamaji
- version : 4.87 2022-08-22
+ version : 4.88 2022-10-10
E-mail : mcf2graph@gmail.com
Located at : http://www.ctan.org/pkg/mcf2graph
********************************************************************************
@@ -48,7 +48,7 @@
(11) >mpost -s ahlength=7 filename => output report file
4. License
- mcf2graph ver 4.87 Copyright (c) 2013-2022 Akira Yamaji
+ mcf2graph ver 4.88 Copyright (c) 2013-2022 Akira Yamaji
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/graphics/mcf2graph/mcf2graph.mp b/graphics/mcf2graph/mcf2graph.mp
index a5c880ed0b..729be297d0 100644
--- a/graphics/mcf2graph/mcf2graph.mp
+++ b/graphics/mcf2graph/mcf2graph.mp
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 4.87 Copyright (c) 2013-2022 Akira Yamaji
+% mcf2graph ver 4.88 Copyright (c) 2013-2022 Akira Yamaji
%
% Permission is hereby granted, free of charge, to any person obtaining a copy of this software
% and associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -33,7 +33,7 @@
% Set output MOL file (V3000) : mpost -s ahlength=6 FILENAME
% Set output report : mpost -s ahlength=7 FILENAME
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-message "* This is mcf2graph ver 4.87 2022.08.22";
+message "* This is mcf2graph ver 4.88 2022.10.10";
tracingstats:=1; prologues:=3; warningcheck:=0;
%-------------------------------------------------------------------------------------------------
newinternal string EN_;
@@ -185,13 +185,13 @@ def beginfigm(text s)=
save ',mc,f_ext,blen,ext,add,ang_br,fw_n,bw_n,at_colon,info_cnt,group_num,bond_cntA,warning_cnt,
hideH,hideH_cnt,filter_s,mc_indent,cntM,cntA,cntB,minX,minY,maxX,maxY,posA,posM,lineB,
sB,eB,angB,angA,lenB,angX,numS,sumA,bond_num,wdM,htM,chargeA,addA,add_rot,cal_FM,cal_MW,
- cal_MI,inf_Cat,inf_NO,inf_EN,inf_JN,inf_FM,inf_CAS,inf_USE,inf_EXA,inf_EXB,inf_MW,
- mol_pic,sC,sI,sS,sT,sV,color_list,unit_cnt,f_end,semic_cnt,f_match,var_n,tag_a,var_a;
- numeric mc_indent[],hideH[],lineB[],sB[],eB[],angB[],angA[],lenB[],angX[],strA[],sumA[],
- bond_num[],wdM[],htM[],chargeA[],addA[],add_rot[];
+ cal_MI,inf_Cat,inf_NO,inf_EN,inf_JN,inf_FM,inf_CAS,inf_USE,inf_EXA,inf_EXB,inf_MW,mol_pic,
+ sC,sI,sS,sT,sV,color_list,unit_cnt,f_end,semic_cnt,f_match,var_n,tag_a,var_a;
+ numeric mc_indent[],op_indent[],ex_indent[],ad_indent[],hideH[],lineB[],sB[],eB[],angB[],angA[],
+ lenB[],angX[],strA[],sumA[],bond_num[],wdM[],htM[],chargeA[],addA[],add_rot[];
pair posA[],posM[][];
- string mc[],tag_a[],var_a[],mc,filter_s,cal_FM,cal_MW,cal_MI,inf_Cat,inf_NO,inf_EN,inf_JN,
- inf_FM,inf_CAS,inf_USE,inf_EXA,inf_EXB,inf_MW,sC,sI,sS,sT,sV;
+ string mc[],ex[],ad[],op[],tag_a[],var_a[],mc,ex,ad,op,filter_s,cal_FM,cal_MW,cal_MI,inf_Cat,
+ inf_NO,inf_EN,inf_JN,inf_FM,inf_CAS,inf_USE,inf_EXA,inf_EXB,inf_MW,sC,sI,sS,sT,sV,firstc;
picture mol_pic[];
color color_list[];
%------------------------------------------------------------------------------------------------
@@ -200,17 +200,22 @@ def beginfigm(text s)=
let ext=ext_to_fig; let add=add_to_molecule; def '=read_ud enddef;
%------------------------------------------------------------------------------------------------
inf_NO:=inf_EN:=inf_JN:=inf_MW:=inf_FM:=inf_CAS:=inf_Cat:=inf_EXA:=inf_EXB:="-";
- mc:=temps:=cal_MW:=cal_MI:=cal_FM:=filter_s:=""; file_input:=default_library;
+ mc:=ex:=ad:=op:=temps:=cal_MW:=cal_MI:=cal_FM:=filter_s:=""; file_input:=default_library;
%------------------------------------------------------------------------------------------------
parts_num:=parts_usr_start; parts_int:=parts_int_start;
- fig_num:=fig_num+1; f_ext:=cntM:=mc_row:=info_cnt:=f_EOF:=0;
+ fig_num:=fig_num+1; f_ext:=cntM:=mc_row:=ex_row:=ad_row:=op_row:=info_cnt:=f_EOF:=0;
%------------------------------------------------------------------------------------------------
for list=s:
- at_colon:=scan_c(":",list);
- if at_colon=1:
- fw_n:=scan_char(" ",list,1,2); bw_n:=scan_char(" ",list,-1,2);
- mc_indent[incr mc_row]:=fw_n-2;
- mc[mc_row]:=substring(fw_n-1,bw_n) of list; mc:=mc&mc[mc_row];
+ at_colon:=scan_c(":",list); firstc:=subc(1,list);
+ fw_n:=scan_char(" ",list,1,2); bw_n:=scan_char(" ",list,-1,2);
+ if firstc=":": mc_indent[incr mc_row]:=fw_n-2;
+ mc[mc_row]:=substring(fw_n-1,bw_n) of list; mc:=mc&mc[mc_row];
+ ef firstc="*": ex_indent[incr ex_row]:=fw_n-2;
+ ex[ex_row]:=substring(fw_n-1,bw_n) of list; ex:=ex&ex[ex_row];
+ ef firstc="+": ad_indent[incr ad_row]:=fw_n-2;
+ ad[ad_row]:=substring(fw_n-1,bw_n) of list; ad:=ad&ad[ad_row];
+ ef firstc="=": op_indent[incr op_row]:=fw_n-2;
+ op[op_row]:=substring(fw_n-1,bw_n) of list; op:=op&op[op_row];
ef at_colon>=1:
info_s[incr info_cnt]:=list;
sT:=substring(0,at_colon-1) of list; sV:=substring(at_colon,length(list)) of list;
@@ -292,29 +297,31 @@ def pickup_data_unit(expr t,v,f)=
f_end:=unit_cnt:=semic_cnt:=f_match:=inf_num:=0;
if t="n": var_n:=scantokens(v); fi
forever:
- sS:=readfrom file_input; if sS=EOF: f_EOF:=1; fi exitif f_EOF=1;
- if subc(1,sS)="%":
- ef subc(1,sS)="+":
+ temps:=readfrom file_input; if temps=EOF: f_EOF:=1; fi exitif f_EOF=1; firstc:=subc(1,temps);
+ if firstc="%":
+ ef (firstc=":")or(firstc="="):
+ if firstc=":": nF:=1; ef firstc="=": nF:=2; fi
unit_cnt:=unit_cnt+1; if v="*": f_match:=1; ef t="n": if unit_cnt=var_n: f_match:=1; fi fi
if f_match=1:
forever:
- sS:=readfrom file_input;
- if sS=EOF: f_EOF:=1; fi exitif f_EOF=1; exitif subc(1,sS)="+";
- if subc(1,sS)<>"%":
- fw_n:=scan_char(" ",sS,1,1); mc_indent[incr mc_row]:=fw_n-1;
- mc[mc_row]:=substring(fw_n-1,length(sS)) of sS; mc:=mc&mc[mc_row]; fi
+ sS:=readfrom file_input; firstc:=subc(1,sS); nS:=length(sS);
+ if sS=EOF: f_EOF:=1; fi exitif f_EOF=1; exitif firstc=";";
+ if firstc=":": nF:=1; ef firstc="=": nF:=2; ef firstc="*": nF:=3; ef firstc="+": nF:=4;
+ else: fw_n:=scan_char(" ",sS,1,1)-1; temps:=substring(fw_n,nS) of sS;
+ if nF=1: mc_indent[incr mc_row]:=fw_n; mc[mc_row]:=temps; mc:=mc&mc[mc_row];
+ ef nF=2: op_indent[incr op_row]:=fw_n; op[op_row]:=temps; op:=op&op[op_row];
+ ef nF=3: ex_indent[incr ex_row]:=fw_n; ex[ex_row]:=temps; ex:=ex&ex[ex_row];
+ ef nF=4: ad_indent[incr ad_row]:=fw_n; ad[ad_row]:=temps; ad:=ad&ad[ad_row]; fi fi
endfor
for i=1 upto inf_num:
- if known scantokens("inf_"&tag_a[i]): scantokens("inf_"&tag_a[i]):=var_a[i]; fi
- endfor
+ if known scantokens("inf_"&tag_a[i]): scantokens("inf_"&tag_a[i]):=var_a[i]; fi endfor
f_end:=1;
else:
- forever:
- sS:=readfrom file_input; if sS=EOF: f_EOF:=1; fi exitif f_EOF=1; exitif subc(1,sS)="+";
- endfor
+ forever: sS:=readfrom file_input;
+ if sS=EOF: f_EOF:=1; fi exitif f_EOF=1; exitif subc(1,sS)=";"; endfor
fi
else:
- inf_num:=split_str(sS,";")(arg_s);
+ inf_num:=split_str(temps,";")(arg_s);
for i=1 upto inf_num:
get_tag_var(arg_s[i])(tag_a[i],var_a[i]); if t=tag_a[i]: if v=var_a[i]: f_match:=1; fi fi
endfor
@@ -553,12 +560,12 @@ enddef;
%-------------------------------------------------------------------------------------------------
def add_to_molecule(text t)=
begingroup
- save w,h,n,l,p,am,aw,A,B,plus,minus,lonepair,__,**,=>,<<,/*;
+ save w,h,n,l,p,am,aw,A,B,plus,minus,lonepair,wave_line,__,**,=>,<<,/*;
numeric A[]dir,B[]up,A[]ang,B[]ang;
pair __,p[],A[],B[]s,B[]e,B[]m,A[]up,A[]left,A[]right,A[]down,B[]up,B[]left,B[]right,B[]down;
path B[];
def plus = circled_plus_add enddef; def minus = circled_minus_add enddef;
- def lonepair = lone_pair_add enddef;
+ def lonepair = lone_pair_add enddef; def wave_line = wave_line_add enddef;
ext_setup;
w:=mol_wd; h:=mol_ht; l:=blen; aw:=atom_wd; p0:=(minX,minY);
lonepairdiam:=0.3aw; lonepairspace:=.7aw; circlediam:=.6aw; circlepen:=.2;
@@ -595,6 +602,10 @@ vardef circled_minus_add= nA:=circlediam; nB:=circlepen;
vardef lone_pair_add expr n=
image(draw (0,0) wpcs lonepairdiam; draw ((0,lonepairspace) rotated n) wpcs lonepairdiam;)
enddef;
+%-------------------------------------------------------------------------------------------------
+vardef wave_line_add expr n=
+ image()
+enddef;
%=================================================================================================
def MCat(expr w,h)(text t)=
save_mposition:=mposition; mposition:=(w,h); MC(t) mposition:=save_mposition; enddef;
@@ -966,10 +977,9 @@ def draw_bond(expr n)=
ef nL=zf: wz_put(Ls,sfrt(Le,ww,ap),sfrt(Le,ww,am));
ef nL=zb: wz_put(Le,sfrt(Ls,ww,am),sfrt(Ls,ww,ap));
ef nL=dt: for i=0 step .75hash_gap/lenL until 1: drawdot i[Ls,Le]; endfor
- ef nL=wv: nA:=3bond_pen_wd; nB:=lenL/nA;
- draw Le for i=1 upto nB:
- ..controls(((i-.5)/nB)[sfrt(Le,nA,iif(odd(i),ap,am)),sfrt(Ls,nA,iif(odd(i),ap,am))])
- ..(i/nB)[Le,Ls] endfor ..Ls;
+ ef nL=wv: nA:=.4bondgap; nB:=round(lenL/nA);
+ draw Ls for i=1 upto nB: ..controls(point (i-.5)/nB of sfrt(zA,nA,iif(odd i,ap,am)))
+ ..point i/nB of zA endfor
ef nL=wf_r: filldraw Ls--sfrt(Le,.35ww,am)--sfrt(Le,.35ww,ap)--cycle wpcs .05ww;
ef nL=wb_r: filldraw sfrt(Ls,.35ww,am)--Le--sfrt(Ls,.35ww,ap)--cycle wpcs .05ww;
ef nL=bd_r: draw zA wpcs .65bondgap;
@@ -1013,15 +1023,12 @@ def draw_bond(expr n)=
if f_col=1: drawoptions(); fi
enddef;
%------------------------------------------------------------------------------------------------
-def wz_put(expr a,b,c)=
- for i=0 upto lenL/hash_gap:
- nA:=hash_gap*i/lenL; nD:=(hash_gap*i+ratio_hash_black*hash_gap)/lenL;
- if nD>((lenL-hash_gap)/lenL): nD:=1; fi
- fill nA[b,a]--nA[c,a]--nD[c,a]--nD[b,a]--cycle; endfor enddef;
+def wz_put(expr a,b,c)= nB:=round(lenL/hash_gap);
+ for i=1 upto nB: nA:=i/nB; if i=1: nD:=0; else: nD:=(i-ratio_hash_black)/nB; fi
+ fill nD[a,b]--nD[a,c]--nA[a,c]--nA[a,b]--cycle; endfor enddef;
%------------------------------------------------------------------------------------------------
-def bz_put(expr a,b,c,d)=
- for i=0 upto lenL/hash_gap:
- nA:=hash_gap*i/lenL; nD:=(hash_gap*i+ratio_hash_black*hash_gap)/lenL;
+def bz_put(expr a,b,c,d)= nB:=round(lenL/hash_gap);
+ for i=0 upto nB-1: nA:=i/nB; nD:=nA+ratio_hash_black/nB;
fill nA[b,a]--nA[d,c]--nD[d,c]--nD[b,a]--cycle; endfor enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
def char_size_set(expr w,h)(expr s)=
@@ -1588,7 +1595,7 @@ def mc_query(text s)=
temps:=readfrom file_input; exitif temps=EOF;
if subc(1,temps)<>"%":
line_s[unit_cnt][incr unit_row]:=temps;
- if (substring(0,2) of temps)="+-":
+ if subc(1,temps)=";":
row_cnt[unit_cnt]:=unit_row; f_mcf:=unit_row:=0; filter_n:=1;
for i=1 upto filter_cnt: filter_p[i]:=0; endfor
sort_s:="";
@@ -1609,7 +1616,7 @@ def mc_query(text s)=
for i=1 upto filter_cnt: if filter_p[i]=0: filter_n:=0; fi endfor
info_cnt:=0; lib_unit_cnt:=lib_unit_cnt+1;
if filter_n=1: if key_s<>"": sort_tbl[unit_cnt]:=sort_s; fi unit_cnt:=unit_cnt+1; fi
- ef subc(1,temps)="+": f_mcf:=1; mc_row:=1;
+ ef (subc(1,temps)=":")or(subc(1,temps)="="): f_mcf:=1; mc_row:=1;
ef subc(1,temps)<>"%":
if f_mcf=1: mc_row:=mc_row+1; else: info_cnt:=split_str(temps,";")(arg_s); fi fi
fi
diff --git a/graphics/mcf2graph/mcf_exa_code.pdf b/graphics/mcf2graph/mcf_exa_code.pdf
index e172c0175f..b0efde435d 100644
--- a/graphics/mcf2graph/mcf_exa_code.pdf
+++ b/graphics/mcf2graph/mcf_exa_code.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_exa_code.tex b/graphics/mcf2graph/mcf_exa_code.tex
index 73b13f6f19..7500dcfdf3 100644
--- a/graphics/mcf2graph/mcf_exa_code.tex
+++ b/graphics/mcf2graph/mcf_exa_code.tex
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Print out mcf data list by A.Yamaji 2022.08.22
+% Print out mcf data list by A.Yamaji 2022.10.10
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% ** mcf2graph.mf must be version 4.87
+% ** mcf2graph.mf must be version 4.88
% ** use mcf_library.mcf
% ** typeset by LuaLaTeX(luamplib)
\documentclass{article}
@@ -78,6 +78,7 @@
\begin{mplibcode}%
%%%%%% beginfigm("t:EXA","v+:*")
%%%%%% beginfigm("t:EXA","v+:1")
+%%%%%% beginfigm("t:EXA","v+:9")
beginfigm("t:EXA","v+:2")
if mc_check(mc)=0:
MC(scantokens(mc))
diff --git a/graphics/mcf2graph/mcf_exa_soc.mp b/graphics/mcf2graph/mcf_exa_soc.mp
index 23fd6742a2..4757efc670 100644
--- a/graphics/mcf2graph/mcf_exa_soc.mp
+++ b/graphics/mcf2graph/mcf_exa_soc.mp
@@ -1,8 +1,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format by Akira Yamaji 2022.08.22
+% Molecular Coding Format by Akira Yamaji 2022.10.10
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph; %%% it must be version 4.87
-message "* mcf_exa_soc 2022.08.22";
+input mcf2graph; %%% it must be version 4.88
+message "* mcf_exa_soc 2022.10.10";
message "";
%------------------------------------------------------------------------------
%%%%sw_frame:=Outside;
@@ -15,7 +15,7 @@ tag1:="J"; tag2:="C"; tag3:="fm"; tag4:="mw"; tag5:="EN"; tag6:="MW";
%% outputformat:="png"; hppp:=vppp:=0.1; outputtemplate:="p%3c-%{EN_}.png";
%% outputformat:="svg"; outputtemplate:="s%3c-%{EN_}.svg";
%------------------------------------------------------------------------------
-%ext(defaultfont:=mpfont; defaultscale:=.3; label.rt(inf_EN,(0,0));)
+%ext(defaultscale:=.3; label.rt(inf_EN,(0,0));)
%------------------------------------------------------------------------------
%sw_output:=Fig+Info;
%ext(defaultfont:=mpfont; defaultscale:=.3;
@@ -35,8 +35,16 @@ forever:
%%%% beginfigm("f:mcf_library","v+:*") % 'mcf_library.mcf'(default)
%%%% beginfigm("f:temp","v+:*") % use query output 'temp.mcf'
%%%% beginfigm("v+:*") % select all
+%%%% beginfigm("t:EXA","v+:1","* defaultscale:=.3; label.rt(inf_EN,(0,0));")
+%%%% beginfigm("t:EXA","v+:1","+ defaultscale:=.5; label(decimal(fig_num),p0);")
+%%%% beginfigm("t:EXA","v+:1","= sw_frame:=Outside;")
beginfigm("t:EXA","v+:1") % 'v+:1': select EXA=1
- if f_EOF=0: if mc_check(mc)=0: MC(scantokens(mc)) fi fi
+ if f_EOF=0:
+ if op_row>=1: scantokens(op) fi
+ if mc_check(mc)=0: MC(scantokens(mc)) fi
+ if ex_row>=1: ext(scantokens(ex)) fi
+ if ad_row>=1: add(scantokens(ad)) fi
+ fi
endfigm
exitif f_EOF=1; % exit if file end
endfor
diff --git a/graphics/mcf2graph/mcf_example.pdf b/graphics/mcf2graph/mcf_example.pdf
index 7f98f432f3..fd1caad561 100644
--- a/graphics/mcf2graph/mcf_example.pdf
+++ b/graphics/mcf2graph/mcf_example.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_example.tex b/graphics/mcf2graph/mcf_example.tex
index 0ccfa64654..8d5ea965f0 100644
--- a/graphics/mcf2graph/mcf_example.tex
+++ b/graphics/mcf2graph/mcf_example.tex
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF Typeset with LuaLaTeX(luamplib) by A.Yamaji 2022.08.22
+% Example of MCF Typeset with LuaLaTeX(luamplib) by A.Yamaji 2022.10.10
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% ** mcf2graph.mf must be version 4.87
+% ** mcf2graph.mf must be version 4.88
% ** use mcf_library.mcf
% ** typeset by LuaLaTeX(luamplib)
\documentclass{article}
diff --git a/graphics/mcf2graph/mcf_library.mcf b/graphics/mcf2graph/mcf_library.mcf
index 0e9ee8f4c2..61909067d0 100644
--- a/graphics/mcf2graph/mcf_library.mcf
+++ b/graphics/mcf2graph/mcf_library.mcf
@@ -1,1129 +1,1154 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% molecular library file mcf_library.mcf by Akira Yamaji 2022.08.22
+% molecular library file mcf_library.mcf by Akira Yamaji 2022.10.10
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% tag1:var1;tag2:var2;tag3:var3 .....
% first character of line "%" comment out
-% first character of line "+" start,stop MCF
+% first character of line ":" start MCF
+% first character of line "=" start parameter setting
+% first character of line "*" start ext(...)
+% first character of line "+" start add(...)
+% first character of line ";" stop MCF
% Cat = Category,EN = Name,MW = Molecular weight
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Cat:Category;EN:Example;MW:100.00;EXA:%
+=
+ sw_frame:=Atom;
+:
+<30,?6,3=?5,{1,3,5,9}=dl,{2,6,9}:N,5:/NH2,7:NH
+*
+ defaultscale:=.5;
+ label.bot(decimal(fig_num)&":"&inf_EN,(.5w,0));
++
+ defaultscale:=.3;
+ label.bot("A2",A2) withcolor red;
+ label.top("A6",A6) withcolor red;
+ label.top("A9",A9) withcolor red;
+;
%==============================================================================
% molecular data for mcf_example.tex EXA:1[155] EXA:2[7]
%==============================================================================
Cat:biological;EN:Adenine;MW:135.13;EXA:1
-+
+:
<30,?6,3=?5,{1,3,5,9}=dl,{2,6,9}:N,5:/NH2,7:NH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Guanine;MW:151.13;EXA:1
-+
+:
<30,?6,3=?5,{1,3,9}=dl,{2,9}:N,{6,7}:NH,5://O,1:/NH2
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Cytosine;MW:111.10;EXA:1
-+
+:
<30,?6,{4,6}=dl,4:N,3://O,2:NH,5:/NH2
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Thymine;MW:126.11;EXA:1
-+
+:
<30,?6,3=dl,{2,6}:NH,{1,5}://O,4:/_
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Uracil;MW:112.09;EXA:1
-+
+:
<30,?6,6=dl,{3,5}://O,{2,4}:NH
-+
+;
%== Amino acid ================================================================
Cat:biological;EN:Glycine;MW:75.07;EXA:-
-+
+:
<30,NH2,!2,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Glycine;MW:75.07;EXA:-
-+
+:
<30,NH2,!2,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Alanine;MW:89.10;EXA:-
-+
+:
<30,NH2,!~wb,?!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Valine;MW:117.15;EXA:-
-+
+:
<30,NH2,!~wb,/?!,!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Leucine;MW:131.16;EXA:1
-+
+:
<30,NH2,!~wb,/!?!,!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Isoleucine;MW:131.16;EXA:-
-+
+:
<30,NH2,!~wb,/'(/*_,!2),!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Serine;MW:105.09;EXA:-
-+
+:
<30,NH2,!~wb,/!OH,!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Threonine;MW:119.12;EXA:-
-+
+:
<30,NH2,!~wb,/'(/_,!~wf,OH),!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Cysteine;MW:121.16;EXA:-
-+
+:
<30,NH2,!~wb,/!SH,!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Methionine;MW:149.21;EXA:-
-+
+:
<30,NH2,!~wb,/'(!2,S,!),!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Phenylalanine;MW:165.19;EXA:-
-+
+:
<30,NH2,!~wb,/!Ph,!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Tyrosine;MW:181.19;EXA:-
-+
+:
<30,NH2,!~wb,/'(!Ph,-3:/OH),!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Triptophan;MW:204.21;EXA:-
-+
+:
<30,NH2,!~wb,!,COOH,@2,\,!,<24,|,?5,{2',5}=dl,2=Ph,4:NH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Proline;MW:115.13;EXA:-
-+
+:
<18,?5,3:NH,4:*/COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Glutamine;MW:146.15;EXA:-
-+
+:
<30,NH2,!~wb,!,COOH,@2,\`1,!`1,!,//O,!,NH2
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Asparagine;MW:132.12;EXA:-
-+
+:
<30,NH2,!~wb,/'(!,//O,!,NH2),!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Aspartic acid;MW:133.10;EXA:-
-+
+:
<30,NH2,!~wb,/!COOH,!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Glutamic acid;MW:147.13;EXA:-
-+
+:
<30,NH2,!~wb,/'(!2,COOH),!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Lysine;MW:146.19;EXA:-
-+
+:
<30,NH2,!~wb,/'(!4,NH2),!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Arginine;MW:174.21;EXA:-
-+
+:
<30,NH2,!~wb,!,COOH,@2,\`1,!`1,!2,NH,!,//NH,!,NH2
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Hystidine;MW:155.16;EXA:-
-+
+:
<30,NH2,!~wb,!,COOH,@2,\,!,|,?5,{1,3}=dl,3:N,5:NH
-+
+;
%==============================================================================
Cat:biological;EN:L-DOPA;MW:197.19;EXA:-
-+
+:
<30,NH2,!~wb,!,COOH,@2,\,!,Ph,{-3,-4}:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Ornithine;MW:132.16;EXA:-
-+
+:
<30,NH2,!~wb,/'(!3,NH2),!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Citrulline;MW:175.2;EXA:-
-+
+:
<30,NH2,!~wb,/'(!3,NH,!,//O,!,NH2),!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:GABA;MW:103.12;EXA:-
-+
+:
<30,NH2,!4,COOH
-+
+;
%==============================================================================
Cat:biological;EN:Citrate;MW:192.12;EXA:-
-+
+:
<30,COOH,!,!2`1.2,!,COOH,@-4`1,\,COOH,4:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:cis-Aconitate;MW:174.11;EXA:-
-+
+:
<30,COOH,!2,!!,!,COOH,@-4`1,\,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Isocitrate;MW:192.12;EXA:-
-+
+:
<30,COOH,!4,COOH,@-3,\`1,COOH,4:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Oxalosuccinate;MW:190.11;EXA:-
-+
+:
<30,COOH,!,!2`1.2,//O,!,COOH,@-4,\`1,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:alfa-Ketoglutarate;MW:146.1;EXA:-
-+
+:
<30,COOH,!3,//O,!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Succinate;MW:118.09;EXA:-
-+
+:
<30,COOH,!3,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Fumarate;MW:116.07;EXA:-
-+
+:
<30,COOH,!,!!,!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Malate;MW:132.07;EXA:-
-+
+:
<30,COOH,!3,COOH,3:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Oxaloacetate;MW:132.07;EXA:-
-+
+:
<30,COOH,!,//O,!2,COOH
-+
+;
%==============================================================================
Cat:biological;EN:Glucose 1;MW:180.16;EXA:1
-+
+:
<30,?6,5:O,2:*/OH,{1,3}:/*OH,4:*/*OH,6:*/!OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Glucose 2;MW:180.16;EXA:1
-+
+:
<-30,OH,!2,*/OH,!,/*OH,!,/*OH,!,/*OH,!,//O,!,H
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:D-Glucose;MW:180.16;EXA:1
-+
+:
hexose_hp,#.5,{1^$-90,2^$90,3^$-90,4^$-90}:/OH,6^$90:/!OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Fructose 1;MW:180.16;EXA:1
-+
+:
<30,OH,!2,/*OH,!,*/OH,!,*/OH,!,//O,!2,OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Fructose 2;MW:180.16;EXA:1
-+
+:
<-18,?5,5:O,1^-48:*/*!OH,1^48:/OH,{2',3}:*/OH,4:/*!OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:D-Fluctose;MW:180.16;EXA:1
-+
+:
Pyranose_hp,#.5,1^$-90:/OH,{2^$-90,3^$90}:/OH,{1^$90,4^$-90}:/!OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:D-Galactose;MW:180.16;EXA:1
-+
+:
hexose_hp,#.5,{1^$90,2^$90,3^$-90,4^$-90}:/OH,6^$90:/!OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:D-Mannose;MW:180.16;EXA:1
-+
+:
hexose_hp,#.5,{1^$-90,2^$90,3^$90,4^$-90}:/OH,6^$90:/!OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:L-Fucose;MW:164.16;EXA:1
-+
+:
hexose_hp,#.5,{1^$-90,,2^$-90,3^$90,4^$90}:/OH,6^$-90:/_
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:D-Ribose;MW:150.13;EXA:1
-+
+:
Pyranose_hp,#.5,{2^$-90,3^$-90,4^$90}:/OH,1^$90:/!OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:D-Deoxyribose;MW:134.13;EXA:1
-+
+:
Pyranose_hp,#.5,{2^$-90,4^$90}:/OH,1^$90:/!OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:D-Glucosamine;MW:179.17;EXA:1
-+
+:
hexose_hp,#.5,{1^$-90,2^$90,4^$-90}:/OH,3^$-90:/NH2,6^$90:/!OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:N-acetyl-Glucosamine;MW:221.21;EXA:1
-+
+:
hexose_hp,#.5,{1^$-90,2^$90,4^$-90}:/OH,3^$-90>lr:/NHCO!,6^$90:/!OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Glucuronic acid;MW:194.14;EXA:1
-+
+:
hexose_hp,#.5,{1^$-90,2^$90,3^$-90,4^$-90}:/OH,6^$90:/COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Maltose;MW:342.3;EXA:1
-+
+:
hexose_hp,#.5,{1^$-90,2^$90,3^$-90}:/OH,6^$90:/!OH,##,
@4,$-50~arc_lb`1,O,$50~arc_br`1,<$0,
|,hexose_hp,#.5,{2^$90,3^$-90,4^$-90}:/OH,6^$90:/!OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Sucrose;MW:342.3;EXA:1
-+
+:
hexose_hp,#.5,{1^$-90,2^$90,3^$-90}:/OH,6^$90:/!OH,##,
@4,$-50~arc_lb`1,O,$50~arc_br`1,<$0,
|,#1.4,-35~wf_r,35~bd_r`1,30~wb_r,130`1.66,O,&1,##,
#.5,{2^$-90,3^$90}:/OH,{1^$90,4^$-90}:/!OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Lactose;MW:342.3;EXA:1
-+
+:
hexose_hp,#.5,{1^$90,2^$90,3^$-90}:/OH,6^$90:/!OH,##,
@4,$0~arc_ltr,O,$0~arc_lbr,
|,hexose_hp,#.5,{2^$90,3^$-90,4^$-90}:/OH,6^$90:/!OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Cellobiose;MW:342.3;EXA:1
-+
+:
hexose_hp,#.5,{1^$-90,2^$90,3^$-90}:/OH,6^$90:/!OH,##,
@4,$0~arc_lbr,O,$0~arc_ltr,
|,hexose_hp,#.5,{2^$90,3^$-90,4^$-90}:/OH,6^$90:/!OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Trehalose;MW:342.3;EXA:1
-+
+:
hexose_hp,#.5,{1^$-90,2^$90,3^$-90}:/OH,6^$90:/!OH,##,
@4,@(1,0),|,hexose_hp,#.5,{1^$-90,2^$90,3^$-90}:/OH,6^$90:/!OH,##,
||,@4,$-37~arc_lb`3.25,O,&10~arc_br
-+
+;
%==============================================================================
Cat:biological;EN:Geraniol;MW:154.25;EXA:1
-+
+:
<30,!8,OH,{2,6}=dr,{2,6}:/_
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Limonene;MW:136.24;EXA:-
-+
+:
<30,?6,2=dl,2:/_,@5,*\,/_,!!
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:l-Menthol;MW:156.27;EXA:1
-+
+:
<30,?6,2:/*?!,5:*/_,3:*/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Allicin;MW:162.28;EXA:1
-+
+:
<-30,!!,!2,SO,!,S,!2,!!
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Benzoic acid;MW:122.12;EXA:-
-+
+:
<30,Ph,3:/COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Gallic acid;MW:170.12;EXA:-
-+
+:
<30,Ph,3:/COOH,{1,5,6}:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Salicylic acid;MW:138.12;EXA:-
-+
+:
<30,Ph,3:/COOH,4:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Cinnamic acid;MW:148.16;EXA:-
-+
+:
<30,Ph,@3,\,!!,!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Cinnamaldehyde;MW:132.16;EXA:-
-+
+:
<30,Ph,@3,\,!!,!,CHO
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Caffeic acid;MW:180.16;EXA:1
-+
+:
<30,Ph,{1,6}:/OH,@3,\,!!,!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Vanillin;MW:152.15;EXA:1
-+
+:
<30,Ph,2:/OH,3:/O!,5:/CHO
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Stearic acid;MW:284.48;EXA:1
-+
+:
<30,!17,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Linoleic acid;MW:280.45;EXA:1
-+
+:
<30,!5,-30,-30,!,-30,-30,!7,COOH,{6,9}=dr
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Sphingosine;MW:299.50;EXA:1
-+
+:
<30,!18,OH,14=dr,-3:*/OH,-2:/*NH2
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Tocopherol;MW:430.717;EXA:1
-+
+:
<30,Ph,3=?6,7:O,{1,2,5}:/_,8:/*_^60,6:/OH,@8,\,|,!12,{4,8}:/*_,12:/_
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Thiamine;MW:265.35;EXA:1
-+
+:
<30,Ph,4:/NH2,@3,\`1,!,<-12,?5,{-1,-4}=dl,{1,5,8}:N,11:S,{6,9}:/_,
@-3,\^-12,!2,OH,8:p_^72
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Riboflavin;MW:376.37;EXA:1
-+
+:
<30,Ph,{3,9}=?6,{8,16}=dl,{7,10,14}:N,12:NH,{11,13}://O,{1,6}:/_,
@10,\`1.5,!,*/OH,!,/*OH,!,*/OH,!2,OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Nicotinic acid;MW:123.11;EXA:1
-+
+:
<30,Ph,2:N,4:/COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Nicotinamide;MW:122.12;EXA:1
-+
+:
<30,Ph,2:N,4:/CONH2
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Pantothenic acid;MW:219.23;EXA:1
-+
+:
<30,OH,!8,COOH,3:??,4^35:/*H,4^-20:*/OH,5://O,6:NH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Pyridoxine;MW:169.18;EXA:1
-+
+:
<30,Ph,2:N,3:/_,4:/OH,{5,6}:/!OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Biotin;MW:244.31;EXA:1
-+
+:
<18,?5,4=?5,2:S,{6,8}:NH,7://O,{4^-54,5^54}:*/H,
@3,\*^-12,!4,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Folic acid;MW:441.3975;EXA:1
-+
+:
<30,?6,3=Ph2,1=dl,{2,7,10}:N,6:NH,5://O,1:/NH2,
@9,\,!,NH,!,Ph,@-3,\,//O,!,NH,!,/*COOH,!3,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Carotene;MW:536.8726;EXA:1
-+
+:
<30,?6,4=dl,3:??,5:/_,
@4,\,|,!18,{1,3,5,7,9,11,13,15,17}=dr,{3,7,12,16}:/_,?6,-6=dl,-5:/_,-1:??
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Adrenalin;MW:183.21;EXA:1
-+
+:
<30,Ph,{1,6}:/OH,@4,\,*/OH,!2,NH,!
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Caffeine;MW:194.194;EXA:1
-+
+:
<30,?6,3=dl,{1,5}://O,-4=?5,-3=dl,7:N,{2,6,9}:N!
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Nicotine;MW:162.23;EXA:1
-+
+:
<30,Ph,2:N,@4,\,?5,8:N!
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Capsaicin;MW:305.418;EXA:1
-+
+:
<30,Ph,1:/OH,6:/O!,@4,\,!,NH,!,//O,!7,?!,-3=dl
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Gibberellin A3;MW:346.379;EXA:1
-+
+:
<18,?5,3=?7,5=?6[12],@8,160`1.3,&3,13=dl,6=wf,8=wb,
@5,40~zf`1,O,50,//O^180,&14~zb,2:/COOH,7://_,{13,8'}:*/OH,14:*/_,{1,4}:*/H^60
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Cholesterol;MW:386.664;EXA:1
-+
+:
<30,?6,{-4,-2}=?6,-4=?5,7=dl,
1:*/OH,{4,12}:*/_^60,{9'^60,10^180,11^-60,-1^-60}:/*H,@-1,17,/*_,!4,?!
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Resveratrol;MW:228.24;EXA:1
-+
+:
<30,Ph,@4,\,!!,!,Ph,{2,6,-3}:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Glutathione;MW:307.33;EXA:1
-+
+:
<-30,COOH,!,/*NH2,!3,//O,!,NH,!,*/!SH,!,//O,!,NH,!2,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Trenbolone;MW:270.37;EXA:1
-+
+:
<30,?6,{3,10}=?6,13=?5,{2,11,15}=dl,1://O,12:*/_^60,-1:/*OH,{9^60,11'^-60}:*/H
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Luciferin;MW:280.33;EXA:1
-+
+:
<30,Ph,3=?5,@8,\,?5,{9,16}=dl,{9,14}:N,{7,11}:S,1:/OH,-2:*/COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Chlorophyll a;MW:893.509;EXA:1
-+
+:
<-36,#1,?5,@3,\,54,?5,@-2,\,54,?5,@-2,\,54,?5,@-2,\,&5,@6,22,70,&8,##,
{4,6,8,10,14,16,18,21,23,27}=dl,@4,\`1.48~vf,Mg,&17~vb,@11,&27,@27,&23,
{4,11,17,23}:N,{1~zf,9,15,21}:/_,14:/!,20:/!!,25:/*COO!,26://O,
@2,*\^-6,!2,//O,!,O,!2,!!,|,!13,{1,5,9,13}:/_
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Alizarin;MW:240.21;EXA:1
-+
+:
<30,Ph,3=?6,-3=Ph2,{7,10}://O,{13,14}:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Indigo;MW:262.26;EXA:1
-+
+:
<30,Ph,3=?5,@-2,\\,?5,-3=Ph2,{7,14}:NH,{9,11}://O
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:6,6'-dibromoindigo;MW:420.0549;EXA:1
-+
+:
<30,Ph,3=?5,@-2,\\,?5,-3=Ph2,{7,14}:NH,{9,11}://O,{1,-2}:/Br
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Carminic Acid;MW:492.39;EXA:1
-+
+:
<30,Ph,3=?6,-3=Ph2,{7,10}://O,{2,5,6,13}:/OH,11:/_,12:/COOH,
@1,\~wb`1,?6,-5:O,{-1,-2',-3}:/*OH,-4:*/!OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Curcumin;MW:368.38;EXA:1
-+
+:
<30,Ph,@3,\,!7,Ph,{8,13}=dr,{9,11}://O,{6,-3}:/OH,{5,-4}:/O!
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Berberine;MW:336.36;EXA:1
-+
+:
<30,Ph,3=Ph,-3=?6,-2=Ph2,-3=?5,8:N,8:p_^60,{-1,-3}:O,{1>vt,2}:/!OH
-+
+;
%==============================================================================
Cat:biological;EN:Apigenin;MW:270.24;EXA:-
-+
+:
<30,Ph,3=?6,9=dl,10:O,7://O,@9,\,Ph,{2,6,14}:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Luteolin;MW:286.24;EXA:-
-+
+:
<30,Ph,3=?6,9=dl,10:O,7://O,@9,\,Ph,{2,6,14,15}:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Flavone;MW:222.24;EXA:1
-+
+:
<30,Ph,3=?6,9=dl,10:O,7://O,9:/Ph,
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Isoflavone;MW:222.24;EXA:-
-+
+:
<30,Ph,3=?6,9=dl,10:O,7://O,8:/Ph,
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Flavanone;MW:224.25;EXA:-
-+
+:
<30,Ph,3=?6,10:O,7://O,9:/Ph,
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Flavonol;MW:238.24;EXA:1
-+
+:
<30,Ph,3=?6,9=dl,10:O,7://O,8:/OH,9:/Ph,
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Cianidanol;MW:290.27;EXA:1
-+
+:
<30,Ph,3=?6,@8,*\,Ph,7:O,{1,5,9~zf,13,14}:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Quercetin;MW:302.24;EXA:1
-+
+:
<30,Ph,3=?6,@9,\,Ph,9=dl,10:O,7://O,{2,6,8,13,14}:/OH
-+
+;
%==============================================================================
Cat:biological;EN:Limonin;MW:470.518;EXA:1
-+
+:
<30,?6,{-3,-4}=?6,-5=?3,-2=wf,-1=wb,6=?5,-4=?6,-5=wf,{13,15,17,20}:O,
{3,12,21}://O,{4^60,8'^60}:*/_,18:??,{1^60,5^180,16^60}:/*H,
@14,\*,|,?5,{1,4}=dl,3:O
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Cromolyn;MW:468.37;EXA:1
-+
+:
<30,Ph,|,-1=?6,3=dl,1:O,4://O,2:/COOH,
@$2,\,O,!2,/OH,!2,O,60,Ph,|,-5=?6,3=dl,4:O,1://O,3:/COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Emetine;MW:480.649;EXA:1
-+
+:
<30,Ph,{-4,-4}=?6,8:N,{1,6}:/O!,-2:/*!,{7^-60,12^-60}:/*H,
@-3,\,!~zb,<-60,|,?6,5=dl,2:NH,-6^-60:*/H,|,-2=?6,{2,4}=dl,{-2,-3}:/O!
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Acronycine;MW:321.376;EXA:1
-+
+:
<30,Ph,|,-4=?6,1:N!,4://O,-3=Ph2,-1:/O!,|,-4=?6,2=dl,4:O,3:??
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Piperine;MW:285.343;EXA:1
-+
+:
<30,Ph,-1=?5,{-1,-3}:O,@4,\,!!,!,!!,!,//O,!,?6,-6:N
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Febrifugine;MW:301.34;EXA:1
-+
+:
<30,Ph,3=?6,@9,8=dl,\,!2,!~zb,?6,{7,9}:N,-5:NH,{10,12}://O,-1:*/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Hypericin;MW:504.44;EXA:1
-+
+:
<30,Ph,{-4,-3,(11,4),(16',17),19,(23',24),(22,29)}=?6,
{12,14,16,17,22',24,26,28,33,35}=dl,
{7,25}://O,{13,26}:/_, {2,6,11,21,23,28}:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Camphor;MW:152.23;EXA:1
-+
+:
#1,15,-30,90,90,30,##,&1,@2,0~si_`1.6,&5,{-1^45,-1^-65,5^-45}:/_,4://O
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Sparteine;MW:234.3803;EXA:1
-+
+:
<30,?6,3=?6,9=wf,10=wb,@8,#1,60,60,N,60,##,&10,-3=?6,3:N,{4^60,11'^-60}:*/H
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Mitomycine C;MW:334.332;EXA:1
-+
+:
<30,?6,{3,6}=dl,{2,5}://O,1:/_,-4=?5,-3:N,
6:/NH2,,-3=?5,-2=?3,-1=wb,-2=wf,-1:NH,8:/*O!^35,@$9,\,!,O,60,//O,!,NH2
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Podophyllotoxin;MW:414.41;EXA:1
-+
+:
<0,?5,{2,5}:O,-3=Ph2,-3=?6,-3=?5,-2:O,-1=wb,-3://O,
@10,\*,Ph,{-2,-3,-4}:/O!,13:/*OH,{11^-60,12'^60}:*/H
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Warfarin;MW:308.333;EXA:1
-+
+:
<30,Ph,3=?6,8=dl,10:O,7:/OH,9://O,@8,\,/Ph`1,60,!,//O,!
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Genistein;MW:270.24;EXA:1
-+
+:
<30,Ph,3=?6,9=dl,10:O,{2,6}:/OH,7://O,@8,\,Ph,-3:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Baicalein;MW:270.24;EXA:1
-+
+:
<30,Ph,3=?6,9=dl,10:O,{1,2,6}:/OH,7://O,@8,\,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Reserpine;MW:608.688;EXA:1
-+
+:
<54,Ph,-4=?5,{-2,-4,-3}=?6,9=dl,11:N,7:NH,{10'^-60,15^-60,16^60}:/*H,
@20,*\,O,!,//O,!,Ph,{-2,-3,-4,1,19~zf>rl}:/O!,18:*/COO!>lr
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Rotenone;MW:394.423;EXA:1
-+
+:
<-60,?5,{-3,-2,-3,-4}=?6,{3',7,9,17',-2,-4}=dl,
{2,13,16}:O,10://O,{11^-60,12^60}:*/H,{-2,-3}:/O!,@1,*\,/_,!!
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Pyrethrin I;MW:328.452;EXA:1
-+
+:
<30,?3,{3^35,3'^-35}:*/_,@1,*\,!!,?!,
@2,\*,//O,!,O,-36~zb,|,?5,-2=dl,-1:/_,-3://O,@-2,\,!4,{-1,-3}=dl
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Oseltamivir;MW:312.40;EXA:1
-+
+:
<30,?6,3=dl,6:*/NH2,@1,\*,NH,!,//O,!,@2,*\,O,!,/!,!2,@4,\,//O,!,O,!2
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Paclitaxel;MW:853.918;EXA:1
-+
+:
?6,5=dl,@3,#1,36,45,45,45,45,##,&5,-4=?6,-4=?4,-1=wb,-3=wf,-1:O,
4:??,6:/_,{3^-60,15}:*/OH,8:/*H^-60,9:*/_^60,10://O,
@1,\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph,
@7,\*,O,-45,//O,60,Ph,{11>rl,12'^-15>lr}:*/OCO!
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Mevastatin;MW:390.52;EXA:1
-+
+:
<30,?6,2=dl,4:*/H^60,-4=?6,-4=dl,9:*/_,
@10,*\,!,60~wb,?6,6:O,-2://O,-4:/*OH,@5,\*,O,60,//O,!,*/_,!2
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Sesamine;MW:354.35;EXA:1
-+
+:
<54,?5,1=?5,{4,7}:O,{1^-54,2^54}:*/H,{5,8}:*/'(Ph,4=?5,7:O,9:O)^-12
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Morphine;MW:285.343;EXA:1
-+
+:
<30,Ph,{2,-4}=?6,(1,12)=?5[2],-1:O,-1=zb,
@7,60~wf`0.75,70~si_`1.3,45,N!,&9~wb,15=dl,6:/OH,8^180:*/H,12:/*OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Quinine;MW:324.424;EXA:1
-+
+:
<30,Ph,3=Ph,7:N,6:/O!,
@10,\,*/OH,/*H^-60,!,|,?6,2:N,1:*/H^60,@4,*\,!!,@2,165~zf,60,&5~zb
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Atoropin;MW:289.375;EXA:1
-+
+:
<30,O,!,//O,!2,Ph,@$1,\~zb^-60,|,?7`1.1,@6,*\^190`1.25,N!,&3~wb,$3:/!OH~wv
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Colchicine;MW:399.443;EXA:1
-+
+:
<30,Ph,{1,2,6}:/O!,{-4,-5}=?7,{-1,-4,-6}=dl,-2://O,-3:/O!,9:/NHCO!
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Lycorine;MW:287.315;EXA:1
-+
+:
<30,Ph,{-4,-2}=?6,{6,(9,12)}=?5,13=dl,8:N,{15,17}:O,
{9'^180,10^60}:*/H,{13,14'}:*/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Ibotenic acid;MW:158.113;EXA:1
-+
+:
<18,?5,4=dl,3:O,2:NH,1://O,@4,-24,/NH2,!COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Illudin S;MW:264.3;EXA:1
-+
+:
<30,?6,3=?5,6:**?3,{4,7}=dl,2://O,5:/_,
{1^35,8^35}:*/_,{1'^-35,9}:*/OH,8:/*!OH^-35
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Muscarine;MW:174.26;EXA:1
-+
+:
<18,?5,2:O,1:*/_,5:/*OH,@3,*\,48,N,??,p_^180,!
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Psilocybin;MW:284.248;EXA:1
-+
+:
<30,Ph,3=?5,8=dl,9:NH,@2,\,O,-60,P,//O^-45,/OH^45,90,OH,@7,\,!,-60,N?!
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Tetrodotoxine;MW:319.27;EXA:1
-+
+:
#1,<60,-90,60,-30`1.15,150,60,&1,@3,-135,60,-30`1.15,150,&4,
@10,\,O,60`1.33,60,&($3)~si_,@8,-15~si_,O,&12,##,
- @9,45,-60,OH,1^120://NH,{5~zf^-15,7,9^-75,12,13~zf}:/OH,{2,6^180}:NH
-+
+ @9,45,-60,OH,1^120://NH,{5~zf^-15,7,9^-75,12,13~zf}:/OH,2:NH,6^180:NH
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Aflatoxin B1;MW:312.27;EXA:1
-+
+:
<30,Ph,6=?6,-2=?5,4=?5,-2=?5,{-2,10}=dl,{7,14,17}:O,
2:/O!,{8,11}://O,{15^-54,16^54}:*/H
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Aflatoxin B2;MW:314.3;EXA:-
-+
+:
<30,Ph,6=?6,-2=?5,4=?5,-2=?5,10=dl,{7,14,17}:O,
2:/O!,{8,11}://O,{15^-54,16^54}:*/H
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Aflatoxin G1;MW:328.27;EXA:2
-+
+:
<30,Ph,6=?6,-2=?6,4=?5,-2=?5,{-2,10}=dl,{7,12,15,18}:O,
2:/O!,{8,11}://O,{16^-54,17^54}:*/H
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Aflatoxin G2;MW:330.29;EXA:-
-+
+:
<30,Ph,6=?6,-2=?6,4=?5,-2=?5,10=dl,{7,12,15,18}:O,
2:/O!,{8,11}://O,{16^-54,17^54}:*/H
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Aflatoxin M1;MW:328.3;EXA:-
-+
+:
<30,Ph,6=?6,-2=?5,4=?5,-2=?5,{-2,10}=dl,{7,14,17}:O,
2:/O!,{8,11}://O,15^-54:*/H,16^54:*/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Aflatoxin M2;MW:330.29;EXA:-
-+
+:
<30,Ph,6=?6,-2=?5,4=?5,-2=?5,10=dl,{7,14,17}:O,
2:/O!,{8,11}://O,15^-54:*/H,16^54:*/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Ochratoxin A;MW:403.813;EXA:1
-+
+:
<30,Ph,@4,\,!,/*COOH,!`1.2,NH,!`1.2,//O,!,
Ph,-2:/Cl,-5:/OH,-4=?6,-3:O,-2:*/_,-4://O
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Deoxynivalenol;MW:296.32;EXA:1
-+
+:
<30,?6,3=?6,5=dl,1://O,6:/_,-1:O,{4'^60,-2}:*/H,7^30:*/_,@7,72`.9,80`1.3,&9,
@8,?3,-3=wf_,-1=si_,-1:O,{2,12^18}:/*OH,3:/*!OH^-60`1
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Patulin;MW:154.12;EXA:1
-+
+:
<30,?6,3=?5,{2,10}=dl,{6,7}:O,5:/OH,8://O
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Citrinin;MW:250.247;EXA:1
-+
+:
<30,?6,3=?6,{2,5,11}=dl,9:O,1://O,2:/_,{7,8'}:*/_,5:/OH,6:/COOH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Zearalenone;MW:318.364;EXA:1
-+
+:
<30,Ph,@3,#1,\,!5,60,60,!4,&4,##,{1,5,8}=dl,17:O,16:*/_,{1,5}:/OH,{12,18}://O
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Fumonisin B1;MW:721.83;EXA:1
-+
+:
<30,!19,@6,*\,O,!,//O,!2,/COOH,!2,COOH,@7,\*`1.2,O,!,//O,!2,/COOH,!2,COOH,
{5,9}:/*_,{11,16,18'}:*/OH,19:/*NH2
-+
+;
%==============================================================================
Cat:synthetic;EN:Benzene;MW:78.11;EXA:-
-+
+:
<30,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Phenol;MW:94.11;EXA:-
-+
+:
<30,Ph,3:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Aniline;MW:93.13;EXA:-
-+
+:
<30,Ph,3:/NH2
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Picric acid;MW:229.10;EXA:-
-+
+:
<30,Ph,{1,3,5}:/NO2,2:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Hexaphenylbenzene;MW:534.6876;EXA:1
-+
+:
<30,Ph,{1,2,3,4,5,6}:/Ph
-+
+;
%==============================================================================
Cat:synthetic;EN:Naphthalene;MW:128.17;EXA:-
-+
+:
<30,Ph,3=Ph
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Anthracene;MW:178.23;EXA:-
-+
+:
<30,Ph,{3,6}=Ph
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Phenanthrene;MW:178.23;EXA:-
-+
+:
<30,Ph,{4,6}=Ph
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Naphthacene;MW:228.3;EXA:-
-+
+:
<30,Ph,{6,3,-3}=Ph
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Chrysene;MW:228.3;EXA:-
-+
+:
<30,Ph2,{6,4,-4}=Ph
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Pyrene;MW:202.25;EXA:-
-+
+:
<30,Ph2,{6,4}=Ph,(16,7)=?6[3],-2=dl
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Coronene;MW:300.35;EXA:1
-+
+:
<30,Ph,{1,(11,2),(15,3),(19,4),(23,5),(27',7)}=?6,
{9,12,14,17,20,22,25,28,30}=dl
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Kekulene;MW:600.7;EXA:1
-+
+:
<30,?6,{3,-3,-2,-3,-2,-3,-2,-3,-2,-3,(-2',5'),(5',-4')}=?6,
{1,5',7,9,11,13,17,19,21,23,27,29,31,33,37,39,41,43,47,49,51,53,57,60}=dl
-+
+;
%==============================================================================
Cat:synthetic;EN:12-Crown-4;MW:176.21;EXA:-
-+
+:
<-180,O,30,60,60,O,-30,60,60,O,-30,60,60,O,-30,60,&1
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:15-Crown-5;MW:220.26;EXA:2
-+
+:
<-180,O,48,60,60,O,-48,60,60,O,-48,60,60,O,-48,60,60,O,-48,60,&1
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:18-Crown-6;MW:264.32;EXA:1
-+
+:
<-180,O,60,60,60,O,-60,60,60,O,-60,60,60,O,-60,60,60,O,-60,60,60,O,-60,60,&1
-+
+;
%==============================================================================
Cat:synthetic;EN:Porphyrin;MW:310.4;EXA:1
-+
+:
<9,#1,?5,@3,\,54,?5,@-2,\,54,?5,@-2,\,54,?5,@-2,\,&5,##,
{1,4,6,8,10,14,16,18,21,23,27}=dl,{4,17}:N,{11,23}:NH
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Sulflower;MW:448.69;EXA:1
-+
+:
<67.5,?8,{1,3,5,7}=?5,@11,30`1.15,&12,@14,30`1.15,&15,
@17,30`1.15,&18,@20,30`1.15,&9,{9,12,13,16,17,20,21,24}=dl,
{10,13,16,19,21,22,23,24}:S
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Arsphenamine x5;MW:915.2;EXA:1
-+
+:
<18,?5,{1,2,3,4,5}:As,{1,2,3,4,5}:/'(Ph,3:/NH2,4:/OH)
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Melamine;MW:126.12;EXA:1
-+
+:
<30,Ph,{2,4,6}:N,{1,3,5}:/NH2
-+
+;
%==============================================================================
Cat:synthetic;EN:Tartrazine;MW:534.3;EXA:1
-+
+:
<30,Ph,1:/SO3Na,@4,\,N,!!,N,!,<-12,?5,{-2,-5}=dl,{-2,-3}:N,-1:/COONa,-4:/OH,
@-3,-12,Ph,-3:/SO3Na
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Erythrosine;MW:835.9;EXA:1
-+
+:
<30,Ph,{3,9}=?6,{8,13,16}=dl,10:O,-2://O,{1,5,12,14}:/I,@7,\,Ph,-1:/COOH,6:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Sudan red 1;MW:248.28;EXA:1
-+
+:
<30,Ph,1=Ph,4:/OH,@3,\,N,!!,N,!,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Basic blue 1;MW:319.86;EXA:
-+
+:
<30,Ph,3=Ph,6=Ph,2:S,5:N,{8,13}:/N?!,2:p_,@2,@(3.5,1.5),Cl,n_^15
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Disperse violet 1;MW:238.25;EXA:1
-+
+:
<30,Ph,3=?6,-3=dr,9=Ph,{7,10}://O,{-1,-4}:/NH2
-+
+;
%------------------------------------------------------------------------------
Cat:synthetic;EN:Vat blue 1;MW:262.27;EXA:1
-+
+:
<30,Ph,3=?5,@8,\\,?5,-3=dr,-3=Ph,{7,14}:NH,{9,11}://O
-+
+;
%==============================================================================
Cat:antibiotics;EN:Amoxicillin;MW:365.4042;EXA:1
-+
+:
<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
@4,*\^15,NH,!,//O,!,*/NH2,!,Ph,-3:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Ampicillin;MW:349.405;EXA:1
-+
+:
<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
@4,*\^15,NH,!,//O,!,/*NH2,!,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Penicillin G;MW:334.4;EXA:1
-+
+:
<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
@4,*\^15,NH,!,//O,!2,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Penicillin V;MW:350.3895;EXA:1
-+
+:
<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
@4,*\^15,NH,!,//O,!2,O,!,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Mecillinam;MW:325.4264;EXA:1
-+
+:
<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
@4,*\^15,N,!!,!,?7,-7:N
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Nafcillin;MW:414.4748;EXA:1
-+
+:
<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
@4,*\^15,NH,!,//O,!,Ph,-2=Ph,-9:/O!2
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Oxacillin;MW:401.4363;EXA:1
-+
+:
<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
@4,*\^15,NH,!,//O,!,<-24,?5,{-2,-5}=dl,-2:N,-3:O,-4:/_,@-1,-24,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Cloxacillin;MW:435.8813;EXA:1
-+
+:
<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
@4,*\^15,NH,!,//O,!,<-24,?5,{-2,-5}=dl,-2:N,-3:O,-4:/_,@-1,-24,Ph,-5:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Dicloxacillin;MW:470.3264;EXA:1
-+
+:
<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
@4,*\^15,NH,!,//O,!,<-24,?5,{-2,-5}=dl,-2:N,-3:O,-4:/_,
@-1,-24,Ph,{-1,-5}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Cefalexin;MW:347.3889;EXA:1
-+
+:
<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,5:/*COOH,6:/_,
@4,*\^15,NH,!,//O,!,*/NH2,!,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Cefalonium;MW:458.5107;EXA:1
-+
+:
<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,@5,\*,//O,!,O,n_^40,
@4,*\^15,NH,!,//O,!2,?5,{-1,-3}=dl,-4:S,
@6,\,!,|,Ph,1:N,1:p_^180,@4,\,//O,!,NH2
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Cefazorin;MW:454.51;EXA:1
-+
+:
<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,5:/*COOH,
@4,*\^15,NH,!,//O,!2,?5,{-2,-4}=dl,{-1,-2,-3,-5}:N,
@6,\,!,S,!,?5,{-3,-5}=dl,-1:S,-2:/_,{-3,-4}:N
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Cefoperazone;MW:645.67;EXA:1
-+
+:
<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,5:/*COOH,
@4,*\^15,NH,!,//O,!2,NH,!,//O,!,?6,{-3,-6}:N,{-4,-5}://O,-3:/!,
@6,\,!,S,!,?5,{-3,-5}=dl,-1:/_,{-1,-2,-3,-4}:N,
@11,\*,Ph,-3:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Cefquinome;MW:528.6;EXA:1
-+
+:
<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,@5,\*,//O,!,O,n_^40,
@4,*\^15,NH,!,//O,!,//'(N,!,O,!),!,?5,{-2,-5}=dl,-3:S,-1:N,-2:/NH2,
@6,\,!,Ph,-2=?6,-10:N,-10:p_^180
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Ceftiofur;MW:523.5626;EXA:-
-+
+:
<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,5:/*COOH,
@4,*\^15,NH,!,//O,!,//'(N,!,O,!),!,?5,{-2,-5}=dl,-3:S,-1:N,-2:/NH2,
@6,\,!,S,!,//O,!,?5,{-1,-3}=dl,-4:O
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Cefuroxime;MW:424.3852;EXA:1
-+
+:
<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,5:/*COOH,
@4,*\^15,NH,!,//O,!,//'(N,!,O,!),!,?5,{-1,-3}=dl,-4:O,@6,\,!,O,!,//O,!,NH2
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Apramycin;MW:539.58;EXA:1
-+
+:
<30,?6,-4=?6,{2,10}:O,@1,\*,O,60~zb,?6,@9,\*,O,-60~zb,?6,-5:O,
{7,13,14',-1',-2}:*/OH,{6',15,17,-3'}:*/NH2,8:*/NH!^-20,
-4:*/!OH,{3'^-60,4^60}:*/H
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Gentamycin;MW:477.596;EXA:1
-+
+:
<-30,?6,@1,\*,O,0~zb,?6,-5:O,@5,\*,O,0~zb,?6,-5:O,{2,4,20'}:*/NH2,6:*/OH,
11:*/OH^-35,11:/*_^35,12:*/NH!,13:/*OH,17:/'(*/_,!NH!)
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Kanamycin;MW:484.499;EXA:1
-+
+:
<-30,?6,@1,\*,O,0~zb,?6,-5:O,@5,\,O,0,?6,-5:O,
{2,4,12}:*/NH2,{6',11,13,18,19',20}:/*OH,10:*/!OH,17:*/!NH2
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Neomycin;MW:614.644;EXA:1
-+
+:
<30,?6,3:O,2:/*!NH2,{1,6'}:*/OH,5:*/NH2,
@4,*\,O,!~wb,?6,{-3,-5^15}:/*NH2,-2:*/OH^-15,
@-1,\*,O,-72~wb,?5,-4:O,-1:/*OH>vt,-3:*/!OH>vt,
@-2,\*^-24,O,-60~zb,?6,-5:O,-1:/*NH2,{-2,-3'}:*/OH,-4:/*!NH2>60
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Streptmycin;MW:581.574;EXA:1
-+
-<54,?5,3:O,4:/*_,5:/OH^35,@1,\*,O,-24~wb,?6,-5:O,@2,*\,O,24~zb,?6,
+:
+<54,?5,3:O,4:/*_,5:/OH^45,@1,\*,O,-24~wb,?6,-5:O,@2,*\,O,24~zb,?6,
@5,-48,!!,O,{10,11',15,16',18'}:*/OH,9:/*!OH,12:*/NH!,
@17,*\^-18,NH,!,//NH,!,NH2,@19,*\,NH,!,//NH,!,NH2
-+
+;
+%------------------------------------------------------------------------------
+Cat:antibiotics;EN:Streptmycin_H2O;MW:599.574;EXA:-
+:
+<54,?5,3:O,4:/*_,5:/OH^60,@1,\*,O,-24~wb,?6,-5:O,@2,*\,O,24~zb,?6,
+ @5,-18,/OH^15,45,OH,{10,11',15,16',18'}:*/OH,9:/*!OH,12:*/NH!,
+ @17,*\^-18,NH,!,//NH,!,NH2,@19,*\,NH,!,//NH,!,NH2
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:dihydro-Streptmycin;MW:583.574;EXA:1
-+
+:
<54,?5,3:O,4:/*_,5:/!OH^-48,5:/*OH^35,@1,\*,O,-24~wb,?6,-5:O,@2,*\,O,24~zb,?6,
{10,11',15,16',18'}:*/OH,9:/*!OH,12:*/NH!,
@17,*\^-18,NH,!,//NH,!,NH2,@19,*\,NH,!,//NH,!,NH2
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Spectinomycin;MW:332.35;EXA:1
-+
+:
<30,?6,{3,9}=?6,7=zf,11=wb,{7,10,14}:O,9^60:*/H,11://O,{1,5',8^-60}:*/OH,
13:/*_,{2,6}:*/NH!
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Tobramycin;MW:467.51;EXA:1
-+
+:
<-30,?6,@1,\*,O,0~zb,?6,-5:O,@5,\,O,0,?6,-5:O,
{2,4,12,20'}:*/NH2,{6',11,13,18}:/*OH,10:*/!OH,17:*/!NH2
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Spiramycin;MW:843.1;EXA:1
-+
+:
<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
{12,14}=dl,2:O,{1,10^-30}:/*_,5:/*OH,3://O,6:/*O!>vt,
@-6,\*^-30,O,!~wb,?6`.7,-5:O,#.5,-3:/*N?!,-4:*/_,##,
@7,\*,O,0~wb,?6`.7,-5:O,#.5,-2:*/N?!,-1:/*OH,-4:*/_,##,
@-3,\*`1,O,60~wb,?6`.7,-5:O,#.5,{-2^35,-3}:*/OH,{-2^-35,-4}:/*_,##,
@8,\*,!,!!,O
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Neospiramycin;MW:698.9;EXA:1
-+
+:
<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
{12,14}=dl,2:O,{1,10^-30}:/*_,5:/*OH,3://O,6:/*O!>vt,
@-6,\*^-30,O,!~wb,?6`.7,-5:O,#.5,-3:/*N?!,-4:*/_,##,
@7,\*,O,0~wb,?6`.7,-5:O,#.5,-2:*/N?!,-4:*/_,{-1,-3}:/*OH,##,
@8,\*,!,!!,O
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Josamycin;MW:827.995;EXA:1
-+
+:
<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
{12,14}=dl,2:O,1:/*_,3://O,10:/*_,6:/*O!>vt,-6:/*OH,
@5,\*^-25,O,!,//O,!,
@@ -1131,1684 +1156,1684 @@ Cat:antibiotics;EN:Josamycin;MW:827.995;EXA:1
@-3,\*`1,O,60~wb,?6`.7,-5:O,#.5,-2^35:*/OH,{-2^-35,-4}:/*_,##,
@-3,*\,O,60,//O,60,-60,/_,!,
@8,\*,!,!!,O
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Leucomycin A5;MW:771.942;EXA:1
-+
+:
<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
{12,14}=dl,2:O,1:/*_,3://O,10:/*_,6:/*O!>vt,-6:/*OH,5:/*OH,
@7,\*,O,0~wb,?6`.7,-5:O,#.5,-2:*/N?!,-1:/*OH,-4:*/_,##,
@-3,\*`1,O,60~wb,?6`.7,-5:O,#.5,-2^35:*/OH,{-2^-35,-4}:/*_,##,
@-3,*\,O,60,//O,60,-60,60,
@8,\*,!,!!,O
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Erythromycin;MW:733.93;EXA:1
-+
+:
<30,#1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,##,&1,
14:O,13:/*Et,{1,9}://O,{2',4,6^-35,8,10',12^35}:/*_,
{6^35,11,12^-35}:*/OH,
@$3,\*,O,30~zb,|,?6`.7,6:O,#.5,{5~wf,3^35}:/_,4:/*OH,3^-35:/*O!,##,
@$5,\*^30`1.7,O,!~zb,|,?6`.7,6:O,#.5,5:/*_,2:*/OH,3:/*N?!
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Emamectine;MW:886.133;EXA:1
-+
+:
<24,?6,6=?5,3=dl,9:O,2:*/OH,3:/_,6:/*OH^-60,
@5,#1.04,6,//O,-60,O,60~wb,60,-60,60~wf,60,-60,60,60,60,-60,60,##,&7,
{-1,-3,-7}=dl,(-11,-10)=?6,@-2,?6,-6=wf,-1=zb,-5=dl,
{-1,-6}:O,-3:*/_,@-2,\,*/_,!2,
17:/_,19:/*_,@18,\,O,!,?6`.7,-1:O,#.5,-2:*/_,-4:*/O!,##,
@-3,\,O,60,?6`.7,-5:O,#.5,-4:*/_,-3:/*NH!,-2:*/O!
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Spinosad;MW:731.968;EXA:2
-+
+:
<30,#1,<-120,60,60,-60,60,60,60,-60,60,60,60,-60,&1,##,
5=?5,-1=dl,{-2^60,-3^-35}:/*H,-3=?6,-4=dl,
{-1^35,-2'^-60}:*/H,-2=?5,2:O,{3^25,7^-25}://O,1:*/!,
@-2,\*,O,66~zb,?6`.7,-1:O,#.5,-2:*/_,{-3',-4,-5}:*/O!,8:*/_,5^-65:*/H,##,
@9,\*,O,!~zb,|,?6`.7,6:O,#.5,5:/*_,4:*/N?!
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Natamycin;MW:665.733;EXA:1
-+
+:
<-90,#1,60,60,-60,60,-60,60,-60,60,-60,60,60,60,O,-60,
60,60,-60,60,-60,60,-60,60,60,-60,&1,##,(12,13)=?6,
{2,4,6,8,20}=dl,11=zb,23:O,-2:/*OH,-3:*/COOH,
18=?3,-1=wb,-2=wf,-1:O,22://O,24:*/_,{14^60,16}:*/OH,
@10,*\^15,O,90,?6`.7,-1:O,#.5,{-3,-5'}:*/OH,-4:/*NH2,-2:/*_
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Tylocin;MW:916.10;EXA:1
-+
+:
<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
{12,14}=dl,2:O,1:/*!,5:/*OH,3://O,10:/*_,6:/*_,-6://O,-3:/_,
@-1,*\,-60,O,0~wb,?6`.7,-5:O,#.5,-3:/*OH,-4:*/_,{-1,-2}:/*O!,##,
@7,\*,O,0~wb,?6`.7,-5:O,#.5,-2:*/N?!,-1:/*OH,-4:*/_,##,
@-3,\*`1,O,60~wb,?6`.7,-5:O,#.5,{-2^35,-3}:*/OH,{-2^-35,-4}:/*_,##,
@8,\*,!,!!,O
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Tilmicosin;MW:869.133;EXA:1
-+
+:
<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
{12,14}=dl,2:O,1:/*!,5:/*OH,{3,11}://O,{6,10}:/*_,14:/_,
@-1,*\,-60,O,0~zb,?6`.7,-5:O,#.5,{-1,-2}:*/O!,-3:*/OH,-4:/*_,##,
@7,\*,O,0,?6`.7,-5:O,#.5,-2:*/N?!,{-1,-3}:/*OH,-4:*/_,##,
@8,\*,!2,?6`.7,-6:N,#.5,{-2,-4}:*/_
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Mirosamicin;MW:727.8791;EXA:1
-+
+:
<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
@8,\*,O,0,?6`.7,-5:O,#.5,-2:*/N?!,-1:/*OH,-4:*/_,##,
{5,13}=dl,15=?3,-2=wf,-1=wb,-1:O,3:O,2:/*!,{4,12}://O,{7,9,11'}:*/_,1:/*OH^-80,
@1,*\,!,O,!~wb,?6`.7,-5:O,#.5,-3:/*OH,-4:*/_,{-1,-2}:/O!
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Chlortetracyclin;MW:478.88;EXA:1
-+
+:
<30,Ph,{-4,-3,-3}=?6,{16,19}=dl,{10,18}://O,7:*/_^-35,2:/Cl,
{5,7~zf^35,13~wf^60,14,16}:/OH,15:*/N?!,17:/CONH2
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Oxytetracyclin;MW:460.434;EXA:1
-+
+:
<30,Ph,{-4,-3,-3}=?6,{16,19}=dl,{10,18}://O,7:*/_^-35,11:*/OH,
{5,7~zf^35,13~wf^60,14,16}:/OH,15:*/N?!,17:/CONH2
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Tetracyclin;MW:444.435;EXA:1
-+
+:
<30,Ph,{-4,-3,-3}=?6,{16,19}=dl,{10,18}://O,7:*/_^-35,
{5,7~zf^35,13~wf^60,14,16}:/OH,15:*/N?!,17:/CONH2
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Doxycyclin;MW:444.43;EXA:1
-+
+:
<30,Ph,{-4,-3,-3}=?6,{16,19}=dl,{10,18}://O,7:*/_,
{5,13~wf^60,11~wf,14,16}:/OH,15:*/N?!,@17,\,//O,!,NH2
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Tiamulin;MW:493.74;EXA:1
-+
+:
<-45.5,?8,-3=?5,@8,#.8,-210~zf,/_^60,45,56,##,&6~zb,
{3^-45,5,8}:*/_,@3,\*^30,!~dl,4:/*OH,11://O,7:*/H^60,
@1,15,O,!,//O,!2,S,60,60,-60,N!2,60,-60
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Rifampicin;MW:822.94;EXA:1
-+
+:
<30,Ph,6:/_^30,5:/OH,-6=?5,-3:O,-8=?6,{-2,-4}=dl,{-1,-4}:/OH,
#1,@-2,\,NH,60,-60,60~dl,60,60~dl,-60,
60,-60,60,60,-60,60,-53,66,-53~dl,66`1.2,O,##,&$8,
||,{9,15}://O,16:/_,{20,24^30}:*/_,{21,23}:/*OH,{8^60,22,26^30}:/*_,
-4:/*O!,@-6,-30,O,!,//O,!,@$11,\,!!,N,!,|,?6,1:N,4:N!
-+
+;
%==============================================================================
Cat:pesticide;EN:BHC;MW:290.83;EXA:-
-+
+:
<30,?6,{1,2',3,4,5',6}:*/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:pp-DDT;MW:354.49;EXA:-
-+
+:
<30,Ph,6:/Cl,@3,\,/CCl3,!,Ph,-3:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:op-DDT;MW:354.49;EXA:-
-+
+:
<30,Ph,4:/Cl,@3,\,/CCl3,!,Ph,-3:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:pp-DDD;MW:320;EXA:-
-+
+:
<30,Ph,6:/Cl,@3,\,/CCl2,!,Ph,-3:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:pp-DDE;MW:318;EXA:-
-+
+:
<30,Ph,6:/Cl,@3,\,//CCl2,!,Ph,-3:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:EPN;MW:323.303;EXA:-
-+
+:
<30,!2,O,!,P,//S,/Ph^170,!,O,!,Ph,-3:/NO2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:XMC;MW:179.2;EXA:-
-+
+:
<30,Ph,{1,5}:/_,@3,\,O,!,//O,!,NH,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Acrinathrin;MW:541.45;EXA:-
-+
+:
<-30,?3,{2^-35,2'^35}:*/_,
@1,\,!~dl,!,//O,!,O,!,/CF3,!,CF3,@3,\,//O,!,O,!,/CN,!,Ph,-4:/OPh>rl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Azaconazole;MW:300.139;EXA:-
-+
+:
<30,Ph,{4,6}:/Cl,@3,\,!2,?5,{-2,-4}=dl,{-2,-4,-5}:N,@7,?5,{-1,-4}:O
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Acetochlor;MW:269.769;EXA:-
-+
+:
<30,Ph,2:/_,4:/!,@3,\,N,!2,O,!2,@7,\,//O,!2,Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Atrazine;MW:215.7;EXA:-
-+
+:
<30,Ph,{2,4,6}:N,5:/Cl,1:/NH!2,@3,\,NH,!?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Anilofos;MW:367.9;EXA:-
-+
+:
<-30,!,O,!,P,//S,/O!^160,!,S,!2,//O,!,N,/?!,!,Ph,-3:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Alachrol;MW:269.8;EXA:-
-+
+:
<-30,!,O,!2,N,!,//O,!2,Cl,@4,\,|,Ph,{2,6}:/!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Isazofos;MW:313.74;EXA:-
-+
+:
<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,|,?5,{2,5}=dl,{2,4,5}:N,4:/Cl,3:/?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Isoprcarb;MW:193.246;EXA:-
-+
+:
<30,Ph,2:/?!,@3,\,O,!,//O,!,NH,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Isoprothiolane;MW:290.4;EXA:-
-+
+:
<30,!?!,O,!,//O,!2,//O,!,O,!?!,@5,\\,|,?5,{2,5}:S
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Iprobenfos;MW:288.34;EXA:-
-+
+:
<30,!?!,O,!,P,//O,/O!?!^170,!,S,!2,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Uninnazole-P;MW:291.779;EXA:-
-+
+:
<30,Ph,6:/Cl,@3,\,!~dl,!,/OH,!,??!,@8,\,|,?5,{2,4}=dl,{1,2,4}:N
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Esprocarb;MW:265.4;EXA:-
-+
+:
<30,Ph,@3,\,!,S,!,//O,!,N,/!,!,/?!,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Ethalfluralin;MW:333.3;EXA:-
-+
+:
<30,Ph,{1,3}:/NO2,5:/CF3,@2,\`1.1,/!,N,!2,/_,!!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Ethion;MW:384.46;EXA:-
-+
+:
<30,!2,O,!,P,//S,/O!2^160>rl,!,S,!2,S,!,P,//S,/O!2^200>lr,!,O,!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Edifenphos;MW:310.37;EXA:-
-+
+:
<30,Ph,@3,\,O,!,P,//S,/O!2>rl^160,!,S,!,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Ethofenprox;MW:376.5;EXA:-
-+
+:
<30,Ph,@5,\,O,!,Ph,@10,\,O,!3,??,!,Ph,-3:/O!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Ethoprophos;MW:242.33;EXA:-
-+
+:
<-30,!3,S,!,P,//O,/S!3^160>rl,!,O,!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Ethrimfos;MW:292.29;EXA:-
-+
+:
<-30,!,O,!,P,//S,/O!^160,!,O,!,|,Ph,{2,4}:N,5:/!,3:/O!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Endrin;MW:380.91;EXA:-
-+
+:
<30,?6`1.3,3=?6,6=dl,9=?3,-1:O,
@2,210~wf`1.5,&5~wb,@7,210~zf`1.5,&10~zb,{1,2,5,6,12^-210,12^-150}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Oxadiazon;MW:345.2;EXA:-
-+
+:
<30,Ph,{4,6}:/Cl,1:/O!?!,@3,\,|,?5,2=dl,{1,2}:N,4:O,5://O,3:/??!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Oxadixyl;MW:278.3;EXA:-
-+
+:
<30,Ph,{2,4}:/_,@3,\,N,!1,//O,!2,O,!,@7,\,|,?5,1:N,2:O,5://O
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Oxyfluorfen;MW:361.701;EXA:-
-+
+:
<30,Ph,6:/CF3,4:/Cl,@3,\,O,!,Ph,-3:/NO2,@-4,\,O,!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Cadusafos;MW:270.386;EXA:-
-+
+:
<-30,!2,?!,S,!,P,//O,/O!2^160>rl,!,S,!?,!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Cafenstrole;MW:350.4;EXA:-
-+
+:
<30,Ph,{2,4,6}:/_,@3,\,SOO,!,|,?5,{2,5}=dl,{2,4,5}:N,@-2,\,//O,!,N,/!,!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Carfentrazone-ethyl;MW:412.19;EXA:-
-+
+:
<30,Ph,4:/F,6:/Cl,@1,\,!,/Cl,!,//O,!,O,!2,
@3,\,|,?5,4=dl,{1,3,5}:N,-4://O,-3:/CF2,-2:/_
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Carboxin;MW:235.301;EXA:-
-+
+:
<30,?6,3=dl,2:S,5:O,4:/_,@3,\,//O,!,NH,!,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Quinalphos;MW:298.30;EXA:-
-+
+:
<30,!,O,!2,P,//S,/O!2^160>rl,!,O,!,|,Ph,3=Ph,{2,5}:N
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Quinoxyfen;MW:308.13;EXA:-
-+
+:
<30,Ph,4=Ph,10:N,{2,6}:/Cl,@7,\,O,!,|,Ph,4:/F
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Quitozene;MW:295.3;EXA:-
-+
+:
<30,Ph,{1,2,3,4,6}:/Cl,5:/NO2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Kresoxim-Methyl;MW:313.348;EXA:-
-+
+:
<30,Ph,@3,\,/COO!,!!,N,!,O,!,@4,\,!,O,!,Ph,-1:/_
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Clomazone;MW:239.7;EXA:-
-+
+:
<30,Ph,2:/Cl,@3,\,!,|,?5,1:N,2:O,-2:??,-1://O
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Chlorpyrifos;MW:350.59;EXA:-
-+
+:
<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,|,Ph,6:N,{2,4,5}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Chlorpyrifos-methyl;MW:322.53;EXA:-
-+
+:
<-30,!,O,!,P,//S,/O!^160>rl,!,O,!,|,Ph,6:N,{2,4,5}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Chlorfenapyr;MW:407.62;EXA:-
-+
+:
<18,?5,3=dl,5=dl,2:N,4:/CN,5:/Br,1:/CF3,@2,\,!,O,!2,@3,\,Ph,-3:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Chlorfenson;MW:303.153;EXA:-
-+
+:
<30,Ph,@3,\,O,!,SOO,!,Ph,{6,12}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Chlorfenvinphos;MW:359.58;EXA:-
-+
+:
<30,!2,O,!,P,//O,/O!2^160>rl,!,O,!,!!,!,Cl,@6,\`1,|,Ph,{2,4}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Chlorpropham;MW:213.7;EXA:-
-+
+:
<30,Ph,6:/Cl,@4,\,NH,!,//O,!,O,!?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Chlorbenside;MW:269.183;EXA:-
-+
+:
<30,Ph,@3,\,S,!2,Ph,{6,12}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Chlorobenzilate;MW:325.2;EXA:-
-+
+:
<30,Ph,@3,\,/OH^-35,/COO!2^30>lr,!,Ph,{6,11}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Chlorantraniliprole;MW:483.15;EXA:-
-+
+:
<30,Ph,@5,\,//O,60,NH,!,@4,\,NH,!,//O,!,<24,?5,{-1,-3}=db,{-3,-4}:N,-2:/Br,
@-4,24,Ph,-5:N,-1:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Azoxystrobin;MW:403.4;EXA:-
-+
+:
<30,Ph,2:/OH,@3,\,O,!,Ph,{-1,-3}:N,@-4,\,O,!,Ph,@-5,\,/O!,!,//O,!,O!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Thiuram;MW:240.43;EXA:-
-+
+:
<30,!,N!,!,//S,!,S,!,S,!,//S,!,N!,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Probenazole;MW:223.25;EXA:-
-+
+:
<12,Ph,3=?5,9=dl,7:S,8:N,{7^35,7^-35}://O,@9,\,O,!2,!!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Penflufen;MW:317.41;EXA:-
-+
+:
<30,Ph,@3,\,NH,!,//O,!,?5,{-1,-4}=db,{-2,-3}:N,{-2,-4}:/_,-1:/F,@4,\,/_,60,!?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:MCPA;MW:200.62;EXA:-
-+
+:
<30,Ph,1:/Cl,5:/_,@4,\,O,!2,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Asulam;MW:230.2;EXA:-
-+
+:
<30,Ph,@3,\,SOO,!,NH,!,//O,!,O!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Imazasulfuron;MW:412.81;EXA:-
-+
+:
<-11.8,?6,3=?5,{1,5,7,9}=db,-3:N,8:/Cl,
@-1,\,SOO,!,NH,!,//O,!,NH,!,Ph,{-1,-5}:N,{-3,-5}:/O!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Triaziflam;MW:333.4;EXA:-
-+,
+:,
<30,Ph,{2,6}:/_,@4,\,O,!2,?!,NH,!,Ph,{-1,-3,-5}:N,-2:/NH2,@-4,\,??,!,F
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Trichlopyr;MW:256.47;EXA:-
-+,
+:,
<30,Ph,2:N,{1,4,6}:/Cl,@3,\,O,!2,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Halosulfuron-methyl;MW:434.82;EXA:-
-+,
+:,
<6,?5,{3,5}=db,{1,2}:N,5:/Cl,@3,\,SOO,!,NH,!,//O,!,NH,!,Ph,@4,\,//O,!,O,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Flupoxam;MW:460.8;EXA:2
-+
+:
<30,Ph,4:/Cl,@1,\,?5,{-2,-4}=db,{-2,-4,-5}:N,-1:/Ph,@-3,\,//O,!,NH2,
@3,\,!,O,!,/F^35,/F^-35,!,CF3
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Cyanazine;MW:240.7;EXA:-
-+
+:
<30,Ph,{2,4,6}:N,5:/Cl,1:/NH!2,@3,\,NH,!,??,!,CN
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Cyanophos;MW:243.22;EXA:-
-+
+:
<-30,!,O,!,P,//S,/O!^160,!,O,!,|,Ph,4:/CN
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Diethofencarb;MW:267.3;EXA:-
-+
+:
<30,Ph,@4,\,NH,!,//O,!,O,!?!,{1,6}:/O!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Dichlofenthion;MW:315.2;EXA:-
-+
+:
<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,|,Ph,{2,4}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Diclofop-methyl;MW:341.2;EXA:-
-+
+:
<30,Ph,{4,6}:/Cl,@3,\,O,!,Ph,@-4,\,O,!?!,COO!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Cyhalothrin;MW:449.86;EXA:-
-+
+:
<-30,?3,{2^-35,2'^35}:*/_,@1,\,!~dl,/CF3,!,Cl,
@3,\,//O,!,O,!,/CN,!,Ph,-4:/OPh>rl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Cyhalofop-Buthyl;MW:357.381;EXA:-
-+
+:
<30,Ph,1:/CN,4:/F,@3,\,O,!,|,Ph,@-3,\,O,!?!,//O,!,O,!4
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Diphenamid;MW:239.3;EXA:-
-+
+:
<30,Ph,@3,\,!,Ph,@-5,\,//O,!,N,?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Cyfluthrin;MW:434.3;EXA:-
-+
+:
<-30,?3,{2^-35,2'^35}:*/_,
@1,\,!~dl,/Cl,!,Cl,@3,\,//O,!,O,!,/CN,!,Ph,-3:/F,-4:/OPh>rl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Diflufenican;MW:394.29;EXA:-
-+
+:
<30,Ph,{1,5}:/F,@4,\,NH,!,//O,!,Ph,6:N,@-5,\,O,!,Ph,-3:/CF3
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Cyproconazole;MW:291.8;EXA:-
-+
+:
<30,?3,@2,\,?!,/OH^30,-90,!,|,<-18,?5,{2,4}=dl,{1,3,5}:N,@$5,-30,Ph,-3:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Cypermethrin;MW:416.3;EXA:-
-+
+:
<-30,?3,{2^-35,2'^35}:*/_,
@1,\,!~dl,/Cl,!,Cl,@3,\,//O,!,O,!,/CN,!,Ph,-4:/OPh>rl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Simazine;MW:201.7;EXA:-
-+
+:
<30,Ph,{2,4,6}:N,5:/Cl,1:/NH!2,3:/NH!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Dimethametryn;MW:255.4;EXA:-
-+
+:
<30,Ph,{2,4,6}:N,5:/S!,1:/NH!2,@3,\,NH,!?!,?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Dimethylvinphos;MW:331.52;EXA:-
-+
+:
<-30,!,O,!,P,//O,/O!^160,!,O,!,!~dl,!,Cl,@5,\`1,Ph,{-5,-3}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Dimethenamid;MW:275.8;EXA:-
-+
+:
<-6,?5,{3,5}=dl,2:S,{3,5}:/_,@4,\,N,!,//O,!2,Cl,@6,\,?!2,O,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Dimethoate;MW:229.25;EXA:-
-+
+:
<-30,!,O,!,P,//S,/O!^160,!,S,!2,//O,!,NH,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Simetryn;MW:213.3;EXA:-
-+
+:
<30,Ph,{2,4,6}:N,5:/S!,{1,3}:/NH!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Dimepiperate;MW:263.4;EXA:-
-+
+:
<30,Ph,@3,\,??,!,S,!,//O,!,|,?6,1:N
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Diazinon;MW:304.35;EXA:-
-+
+:
<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,|,Ph,{4,6}:N,5:/_,3:/?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Thiobencarb;MW:257.776;EXA:-
-+
+:
<30,Ph,1:/Cl,@4,\,!,S,!,//O,!,N,/!,!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Thiometon;MW:246.34;EXA:-
-+
+:
<-30,!,O,!,P,//S,/O!^160,!,S,!3,S,!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Thifluzamide;MW:528.08;EXA:-
-+
+:
<-12,?5,{3,5}=dl,2:S,5:N,3:/CF3,1:/_,
@4,\,//O,!,NH,!,<6,|,Ph,{2,6}:/Br,@-3,\,O,!,CF3
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Dieldrin;MW:380.895;EXA:-
-+
+:
<30,?6`1.2,3=?6,6=dl,9=?3,-1:O,@2,148~wf`1.4,&5~wb,
@7,*\^145`1.3,&10~zb,{1,2,5,6,12^-210,12^-150}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Aldrin;MW:364.908;EXA:-
-+
+:
<30,?6`1.3,3=?6,{6,9}=dl,
@2,210~wf`1.5,&5~wb,@7,210~zf`1.5,&10~zb,{1,2,5,6,11^-210,11^-150}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Tecnazene;MW:260.879;EXA:-
-+
+:
<30,Ph,{1,3,4,6}:/Cl,5:/NO2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Tetrachlorvinfos;MW:365.97;EXA:-
-+
+:
<-30,!,O,!,P,//O,/O!^160,!,O,!,!!,!,Cl,@5,\`1,|,Ph,{2,4,5}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Tetraconazole;MW:372.14;EXA:-
-+
+:
<-6,?5,{2,5}=dl,{1,2,4}:N,@4,\,!3,O,!,/F^35,/F^-35,!,CF2,@7,\,|,Ph,{4,6}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Tetradifon;MW:356.038;EXA:-
-+
+:
<30,Ph,@3,\,SOO,!,Ph,{6,10,11,13}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Thenylchlor;MW:323.835;EXA:-
-+
+:
<6,?5,{2,5}=dl,4:S,2:/O!,@3,\,!,N,!,//O,!2,Cl,@7,-15,Ph,{-1,-5}:/_
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Tebuconazole;MW:307.8;EXA:-
-+
+:
<36,?5,{1,4}=dl,{1,3,5}:N,@3,30,!4,Ph,-3:/Cl,7^-30:/??!,7^30:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Tebufenpyrad;MW:333.86;EXA:-
-+
+:
<6,?5,{3,5}=dl,{1,2}:N,4:/Cl,5:/!,2:/_,@3,\,//O,!,NH,!2,Ph,-3:/??!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Tefluthrin;MW:418.736;EXA:-
-+
+:
<-30,?3,{2^-35,2'^35}:*/_,@1,\,!!,/CF3,!,Cl,
@3,\,//O,!,O,!2,|,Ph,{2,3,5,6}:/F,4:/_
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Terbutryn;MW:241.4;EXA:-
-+
+:
<30,Ph,{2,4,6}:N,5:/S!,1:/NH!2,@3,\,NH,!,??!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Terbufos;MW:288.42;EXA:-
-+
+:
<30,!2,O,!,P,//S,/O!2^160>rl,!,S,!2,S,!,??!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Triadimefon;MW:293.8;EXA:-
-+
+:
<30,Ph,6:/Cl,@3,\,O,!2,//O,!,??!,@8,\,|,?5,{2,4}=dl,{1,2,4}:N
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Triazophos;MW:313.31;EXA:-
-+
+:
<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,<-12,|,?5,{2,5}=dl,{2,4,5}:N,4:/Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Triallate;MW:304.7;EXA:-
-+
+:
<-30,!?!,N,/?!,!,//O,!,S,!2,/Cl,!!,/Cl,!,Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Tribufos;MW:314.50;EXA:-
-+
+:
<30,!4,S,!,P,//O,/'(S,!4)^160>rl,!,S,!4
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Tolclofos-methyl;MW:301.13;EXA:-
-+
+:
<-30,!,O,!,P,//S,/O!^160,!,O,!,|,Ph,{2,6}:/Cl,4:/_
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Trifluralin;MW:335.3;EXA:-
-+
+:
<30,Ph,{1,3}:/NO2,5:/CF3,@2,\,N,/!2,!3
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Napropamide;MW:271.4;EXA:-
-+
+:
<-30,Ph,4=Ph,@10,\,O,!,??,!,//O,!,N,/!,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Nitrothal-isopropyl;MW:295.3;EXA:-
-+
+:
<30,Ph,5:/NO2,@1,\,//O,!,O,!?!,@3,\,//O,!,O,!?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Norflurazon;MW:303.7;EXA:-
-+
+:
<30,?6,{1,5}=dl,{4,5}:N,1:/NH!,3://O,2:/Cl,@4,\,Ph,-4:/CF3
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Paclobutrazole;MW:293.795;EXA:-
-+
+:
<30,Ph,6:/Cl,@3,\,!2,/OH,!,??!,@8,\,|,?5,{2,4}=dl,{1,2,4}:N
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Picolinafen;MW:376.331;EXA:-
-+
+:
<30,Ph,5:/CF3,@3,\,O,!,|,|,Ph,2:N,@3,\,//O,!,NH,!,|,Ph,4:/F
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Bitertanol;MW:337.4;EXA:-
-+
+:
<30,Ph,@3,\,Ph,@-3,\,O,!2,/OH,!,??!,@14,\,|,?5,{2,4}=dl,{1,2,4}:N
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Bifenox;MW:342.14;EXA:-
-+
+:
<30,Ph,{4,6}:/Cl,@3,\,O,!,Ph,-4:/COO!,-3:/NO2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Bifenthrin;MW:422.88;EXA:-
-+
+:
<-30,?3,{2^-35,2'^35}:*/_,
@1,\,!~dl,/Cl,!,CF3,@3,\,//O,!,O,!,-60,Ph,-1:/_,-2:/Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Piperophos;MW:353.48;EXA:-
-+
+:
<-30,!3,O,!,P,//S,/O!?!^160>rl,!,S,!2,//O,!,|,?6,1:N,6:/_
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Pyraclofos;MW:360.80;EXA:-
-+
+:
<30,!2,O,!,P,//O,/S!3^160>rl,!,O,!,
<-12,|,?5,{1,4}=dl,{3,4}:N,@-3,-12,|,Ph,4:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Pyrazophos;MW:373.37;EXA:-
-+
+:
<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,
|,?5,3=?6,{2,5,7,9}=dl,{4,5,6}:N,7:/_,-2:/COO!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Pyraflufen-ethyl;MW:413.174;EXA:-
-+
+:
<30,Ph,6:/Cl,4:/F,@3,\,|,?5,{1,4}=dl,{2,3}:N,-3:/_,5:/Cl,
@-2,\,O,!,/F,!,F,@$1,\,O,!2,//O,!,O,!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Pyridaben;MW:364.9;EXA:-
-+
+:
<30,?6,{2,4}=dl,{5,6}:N,6:/??!,1://O,2:/Cl,@-4,\,S,!2,|,Ph,4:/??!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Pyridaphenthion;MW:340.34;EXA:-
-+
+:
<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,|,?6,{1,5}=dl,{2,3}:N,4://O,3:/Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Pyributicarb;MW:330.4;EXA:-
-+
+:
<30,Ph,5:/??!,@3,\,//O,!,S,!,N,?!,|,Ph,2:N,3:/O!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Pyriproxyfen;MW:321.5;EXA:-
-+
+:
<30,Ph,@5,\,O,!,Ph,@-3,\,O,!2,?!,O,-60,|,Ph,2:N
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Pyriminobac-Methyl;MW:361.354;EXA:-
-+
+:
<30,Ph,2:/OCO!,@5,\,/_,!!,N,!,O,!,@3,\,O,!,|,Ph,{2,6}:N,{3,5}:/O!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Pirimiphos-methyl;MW:305.333;EXA:-
-+
+:
<-30,!,O,!,P,//S,/O!^160,!,O,!,|,Ph,{2,4}:N,5:/_,@-4,\,N,/!,!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Pyrimethanil;MW:199.257;EXA:-
-+
+:
<30,Ph,@3,\,NH,!,|,Ph,{2,6}:N,{3,5}:/_
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Pyroquilon;MW:173.2;EXA:-
-+
+:
<30,Ph,3=?6,10:N,9://O,(11,4)=?5
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Vinclozolin;MW:286.108;EXA:-
-+
+:
<36,?5,3:N,5:O,{2,4}://O,1:/_^54,@1,-30,!!,@3,\,|,Ph,{3,5}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fipronil;MW:437.2;EXA:-
-+
+:
<30,Ph,{2,4}:/Cl,6:/CF3,@3,\,|,?5,{2,4}=dl,{1,2}:N,3:/CN,5:/NH2,
@-2,\,S,//O,!,CF3
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fenomiphos;MW:303.36;EXA:-
-+
+:
<30,!2,O,!,P,//O,/NH!?!^160,!,O,!,|,Ph,3:/_,4:/S!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fenarimol;MW:331.2;EXA:-
-+
+:
<30,Ph,@3,\,!,Ph,{4,11}:/Cl,7:/OH^30,@7,-30,|,Ph,{3,5}:N
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fenitrothion;MW:277.23;EXA:-
-+
+:
<-30,!,O,!,P,//S,/O!^160,!,O,!,|,Ph,3:/_,2:/NO2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fenothiocarb;MW:253.4;EXA:-
-+
+:
<30,Ph,@3,\,O,!5,S,!,//O,!,N,?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fensulfothion;MW:308.35;EXA:-
-+
+:
<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,|,Ph,@-3,\,S,//O,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fenthion;MW:278.33;EXA:-
-+
+:
<-30,!,O,!,P,//S,/O!^160,!,O,!,|,Ph,3:/_,4:/S!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Phenthoate;MW:320.358;EXA:-
-+
+:
<-30,!,O,!,P,//S,/O!^160,!,S,!,/Ph,!,//O,!,O,!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fenvalerate;MW:419.91;EXA:-
-+
+:
<30,Ph,6:/Cl,@3,\,/?!,!,//O,!,O,!,/CN,!,Ph,@-4,\,O,-60,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fenpropathrin;MW:349.4;EXA:-
-+
+:
<-30,?3,{1^35,2^-35}:*/_,{1^-35,2^35}:/*_,
@3,\,//O,!,O,!,/CN,!,Ph,@-4,\,O,-60,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fenpropimorph;MW:303.49;EXA:-
-+
+:
<30,?6,3:N,6:O,{1,5}:*/_,@3,\,!?,!2,|,Ph,4:/??!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Phthalide;MW:271.9;EXA:-
-+
+:
<30,Ph,3=?5,8:O,9://O,{1,2,5,6}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Butachlor;MW:311.85;EXA:-
-+
+:
<30,!4,O,!2,N,!,//O,!2,Cl,@7,\,Ph,{-1,-5}:/!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Butamifos;MW:332.36;EXA:-
-+
+:
<-30,!2,?!,NH,!,P,//S,/O!2^170>rl,!,O,!,|,Ph,2:/NO2,5:/_
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Bupirimate;MW:316.42;EXA:-
-+
+:
<30,Ph,{4,6}:N,1:/_,@3,\,O,!,SOO,!,N,?!,2:/!3,@5,\,NH,!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Buprofezin;MW:305.4;EXA:-
-+
+:
<-30,?6,{1,5}:N,1:/Ph,3:S,6://O,5:/?!,@4,\~dm,N,!,??!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Flamprop-methyl;MW:335.8;EXA:-
-+
+:
<30,Ph,1:/Cl,6:/F,@3,\,N,!?!,//O,!,O,!,@7,\,//O,-60,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fluacrypyrim;MW:426.392;EXA:-
-+
+:
<30,Ph,{4,6}:N,1:/CF3,5:/O!?!,@3,\,O,!2,Ph,@-1,\,|,!!,!,O,!,1:/COO!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fluquinconazole;MW:376.2;EXA:-
-+
+:
<30,Ph,3=?6,8=dl,{7,9}:N,6:/F,10://O,@8,\,
|,?5,{2,4}=dl,{1,3,5}:N,@$9,\,|,Ph,{4,6}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fludioxonil;MW:248.2;EXA:-
-+
+:
<30,Ph,5=?5,{7,9}:O,{8^-40,8^40}:/F,@4,\,|,?5,{2,5}=dl,-2:NH,-4:/CN
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Flucythrinate;MW:451.5;EXA:-
-+
+:
<30,Ph,@6,\,O,!,/F,!,F,@3,\,/?!,!,//O,!,O,!,/CN,!,Ph,@-4,\,O,-60,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Flutolanil;MW:323.3;EXA:-
-+
+:
<30,Ph,2:/CF3,@3,\,//O,!,NH,!,Ph,-1:/O!?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fluvalinate;MW:502.92;EXA:-
-+
+:
<30,Ph,5:/Cl,1:/CF3,@4,\,NH,!,/?!,!,//O,!,O,!,/CN,!,Ph,@-4,\,O,-60,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Flumioxazin;MW:354.337;EXA:-
-+
+:
<30,Ph,6:/F,3=?6,-1:O,-4:N,-3://O,@-4,\,!,!!!,
@1,\,|,?5,3=?6,3=dr,1:N,{2,5}://O
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Pretilachlor;MW:311.85;EXA:-
-+
+:
<30,Ph,{2,4}:/!,@3,\,N,!3,O,!3,@$7,\,//O,!2,Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Procymidone;MW:284.136;EXA:-
-+
+:
?6,1:N,@3,&5,{2,6}://O,{3,5}:/_,@1,\,|,Ph,{3,5}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Prothyophos;MW:329.18;EXA:-
-+
+:
<-30,!3,O,!,P,//S,/O!2^160>rl,!,O,!,|,Ph,{2,4}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Propachlor;MW:211.689;EXA:-
-+
+:
<30,Ph,@3,\,N,/?!,!,//O,!2,Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Propazine;MW:229.7;EXA:-
-+
+:
<30,Ph,{2,4,6}:N,5:/Cl,{1,3}:/NH!?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Propanil;MW:218.077;EXA:-
-+
+:
<30,Ph,{1,6}:/Cl,@3,\,NH,!,//O,!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Propaphos;MW:304.343;EXA:-
-+
+:
<-30,!3,O,!,P,//O,/O!3^160>rl,!,O,!,|,Ph,4:/S!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Propyzamide;MW:256.1;EXA:-
-+
+:
<30,Ph,{1,5}:/Cl,@3,\,//O,!,NH,!,??,!,!!!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Propiconazole;MW:342.22;EXA:-
-+
+:
<30,Ph,{4,6}:/Cl,@3,\,!2,|,?5,{2,4}=dl,{1,2,4}:N,@$7,?5,{-1,-4}:O,-3:/!2^-15
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Prohydrojasmon;MW:254.37;EXA:-
-+
+:
<18,?5,2://O,3:*\^-12,!4,@4,\*,!,//O,!,O,!3
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Profenofos;MW:373.6;EXA:-
-+
+:
<30,!2,O,!,P,//S,/O!3^160>rl,!,O,!,|,Ph,2:/Cl,4:/Br
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Bromacil;MW:261.119;EXA:-
-+
+:
<30,?6,6=dl,3:N,1:/Br,{2,4}://O,5:NH,6:/_,3:/?!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Prometryn;MW:241.4;EXA:-
-+
+:
<30,Ph,{2,4,6}:N,5:/S!,{1,3}:/NH!?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Bromobutide;MW:312.2;EXA:-
-+
+:
<30,Ph,@3,\,??,!,NH,!,//O,!,/Br,!,??!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Bromophos;MW:365.99;EXA:-
-+
+:
<-30,!,O,!, P,//S,/O!^160,!,O,!,|,Ph,{3,6}:/Cl,4:/Br
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Bromopropylate;MW:428.12;EXA:-
-+
+:
<30,Ph,@3,\,!,Ph,{6,11}:/Br,7:/OH^-45,@7,30,//O,!,O,-60,?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Hexaconazole;MW:314.2;EXA:-
-+
+:
<36,?5,{1,4}=dl,{1,3,5}:N,@3,30,!5,-4^30:/OH,@-5,-30,|,Ph,{4,6}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Hexazinone;MW:252.31;EXA:-
-+
+:
<30,?6,3=dl,{2,4,6}:N,2:/_,{1,5}://O,6:/?6,3:/N?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Benalaxyl;MW:325.4;EXA:-
-+
+:
<30,Ph,@3,\,!,//O,!,N,!?!,//O,!,O,!,@-5,\,|,Ph,{2,6}:/_
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Benoxacor;MW:260.1;EXA:-
-+
+:
<90,Ph,3=?6,7:N,10:O,8:/_,@7,\,//O,!,/Cl,!,Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Heptachlor;MW:373.35;EXA:-
-+
+:
<30,?6`1.3,3=?5,{6,8}=dl,@2,210~wf`1.5,&5~wb,{1,2,5,6,9,10^-210,10^-150}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Permethrin;MW:391.30;EXA:-
-+
+:
<-30,?3,{2^-35,2'^35}:*/_,@1,\,!~dl,/Cl,!,Cl,
@3,\,//O,!,O,!2,Ph,@-4,\,O,-60,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Penconazole;MW:284.184;EXA:-
-+
+:
<30,Ph,{4,6}:/Cl,@3,\,/!2,!2,|,<30,?5,{2,4}=dl,{1,2,4}:N
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Pendimethalin;MW:281.3;EXA:-
-+
+:
<30,Ph,{3,5}:/NO2,{1,2}:/_,@4,\,NH,!?,!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Benfluralin;MW:335.3;EXA:-
-+
+:
<30,Ph,{1,3}:/NO2,5:/CF3,@2,\,N,/!,!4
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Benfuresate;MW:256.3;EXA:-
-+
+:
<30,Ph,3=?5,7:O,9:??,@6,\,O,!,SOO,!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Bensulide;MW:397.5;EXA:-
-+
+:
<30,!?!,O,!,P,//S,/O!?!^160>rl,!,S,!3,NH,!,SOO,!,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Phosalone;MW:367.80;EXA:-
-+
+:
<30,!2,O,!,P,//S,/O!2^160>rl,!,S,!2,|,?5,4=Ph,4=dr,1:N,2://O,3:O,8:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Phosmet;MW:317.32;EXA:-
-+
+:
<-30,!,O,!,P,//S,/O!^160,!,S,!2,|,?5,3=Ph2,1:N,{2,5}://O
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Phorate;MW:260.4;EXA:-
-+
+:
<30,!2,O,!,P,//S,!,S,!2,S,!2,4^160>rl:/O!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Malathion;MW:330.35;EXA:-
-+
+:
<-30,!,O,!,P,//S,/O!^160,!,S,!2,//O,!,O,!2,@5,\`1,!,//O,!,O,!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Myclobutanil;MW:288.8;EXA:-
-+
+:
<36,?5,{1,4}=dl,{1,3,5}:N,@3,30,!5,7:/CN^30,@7,-30,|,Ph,4:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Methidathion;MW:302.32;EXA:-
-+
+:
<-30,!,O,!,P,//S,/O!^160,!,S,!2,|,?5,4=dl,{1,5}:N,3:S,2://O,4:/O!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Methoxychlor;MW:345.644;EXA:-
-+
+:
<30,Ph,@3,\,!,Ph,{6,11}:/O!,7:/CCl3
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Metolachlor;MW:283.8;EXA:-
-+
+:
<30,Ph,5:/!,3:/_,@4,\,N,!,//O,!2,Cl,@7,\,?!2,O,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Mevinphos;MW:224.15;EXA:-
-+
+:
<-30,!,O,!,P,//O,/O!^160,!,O,!?,!!,!,//O,!,O,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Mefenacet;MW:298.4;EXA:-
-+
+:
<12,Ph,3=?5,9=dl,9:N,7:S,@8,\,O,!2,//O,!,N,?!,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Mefenpyr-diethyl;MW:373.23;EXA:-
-+
+:
<18,?5,5=dl,{4,5}:N,3^65:/_,{1^12,3^-12}:/COO!2,@4,-24,|,Ph,{4,6}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Mepronil;MW:269.3;EXA:-
-+
+:
<30,Ph,2:/_,@3,\,//O,!,NH,!,|,Ph,5:/O!?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Molinate;MW:187.3;EXA:-
-+
+:
<47,?7,3:N,@3,\,//O,!,S,!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Resmethrin;MW:338.4;EXA:-
-+
+:
<-30,?3,{2^-35,2'^35}:*/_,@1,\,!!,?!,@3,\,//O,!,O,!2,
|,?5,{3,5}=dl,2:O,@3,\,!,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Lenacil;MW:234.3;EXA:-
-+
+:
<30,?6,3=?5,3=dl,6:N,2:NH,{1,5}://O,6:/?6
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Halfenprox;MW:477.4;EXA:-
-+
+:
<30,Ph,@6,\,O,!,/F^35,/F^-35,!,Br,@3,\,!,??,!,O,!2,Ph,@-2,\,O,60,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Paraquat;MW:257.16;EXA:-
-+
+:
Ph,@4,\,Ph,{1,10}:N!,1:p_^-90,10:p_^90,@1,@(0,1.2),Cl,n_^15,
@10,@(0,1.2),Cl,n_^15
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Oxine-Copper;MW:351.852;EXA:-
-+
+:
Ph,4:N,5=Ph,@-4,\,O,-60,<90,Cu,-90,O,60,|,Ph,5=Ph,10:N,||,@4,&12~vf,@23,&12~vf
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Endosulfan;MW:406.904;EXA:-
-+
+:
<26,?7,7=?6[13],@11,208~wf`1.45,&8~wb,10=dl,{3,5}:O,4:S,4://O,
{8,9,10,11,12^-210,12^-150}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Uniconazole-P;MW:291.779;EXA:-
-+
+:
<30,Ph,6:/Cl,@3,\,!~dl,!,/OH,!,??!,@8,\,|,?5,{2,4}=dl,{1,2,4}:N
-+
+;
%******************************************************************************
Cat:pesticide;EN:Azinphos-methyl;MW:317.318;EXA:-
-+
+:
<-30,!,O,!,P,//S,/O!^160,!,S,!2,|,?6,-3=?6,{2,4,8,10}=dl,{1:3}:N,6://O
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Azoxystorbin;MW:403.394;EXA:-
-+
+:
<30,Ph,2:/CN,@3,\,O,!,Ph,{-1,-3}:N,@-4,\,O,!,Ph,@-5,\,//!O!,!,//O,!,O,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Aramite;MW:334.859;EXA:-
-+
+:
<30,Ph,6:/??!,@3,\,O,!2,?!,O,!,S,//O,!,O,!3,Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Aldicarb;MW:190.3;EXA:-
-+
+:
<-30,!,S,!,??,!,!!,N,!,O,!,//O,!,NH,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Aldoxycarb;MW:222.3;EXA:-
-+
+:
<30,!,//O,!,NH,!,O,!,N,!!,!,??,!,SOO,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Isoxaflutole;MW:359.319;EXA:-
-+
+:
<30,Ph,6:/CF3,@4,\,SOO,!,@3,\`1,//O,!`1,<-12,|,?5,{1,4}=dl,3:O,4:N,2:/?3
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Iprovalicarb;MW:320.4;EXA:-
-+
+:
<30,Ph,6:/_,@3,\,!?!,NH,!,//O,!,??,!,NH,!,//O,!,O,!?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Imazalil;MW:297.2;EXA:-
-+
+:
<-30,!2,O,!2,!!,@1,60,|,?5,{2,4}=dl,{1,3}:N,@$2,\,|,Ph,{4,6}:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Imidacloprid;MW:255.662;EXA:-
-+
+:
<30,Ph,1:N,6:/Cl,@3,\,!,|,?5,1:N,3:NH,@2,\\,N,!,NO2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Indanofan;MW:340.80;EXA:-
-+
+:
<30,Ph,3=?5,{7,9}://O,8^55>lr:/!,@8,-30,!2,|,Ph,5:/Cl,||,@11,?3,-2:O
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Indoxacarb;MW:527.837;EXA:-
-+
+:
<-6,Ph,3=?5,9=?6,15=dl,10:O,{12,13}:N,1:/Cl,8`1^-54:/COO!,
@12,\,//O,!,N,/COO!,!,Ph,@-3,\,O,!,CF3
-+
+;
Cat:pesticide;EN:Oxamyl;MW:219.3;EXA:-
-+
+:
<-30,!,N,?!,//O,!,/S!,!!,N,!,O,!,//O,!,NH,!
-+
+;
Cat:pesticide;EN:Oryzalin;MW:346.4;EXA:-
-+
+:
<30,Ph,{1,3}:/NO2,@5,\,SOO,!,NH2,@2,\,/!2,N,!3
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Carbaryl;MW:201.22;EXA:-
-+
+:
<30,Ph,5=Ph,@4,\,//O,!,O,!,NH,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Carpropamid;MW:334.665;EXA:-
-+
+:
<-30,?3,1:/_,{2^-35,2'^35}:*/Cl,3^70:/!,@3,\,//O,!,NH,!?!,Ph,-3:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Cumyluron;MW:302.802;EXA:-
-+
+:
<30,Ph,@4,\,??,!,NH,!,//O,!,NH,!2,|,Ph,6:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Cloquintocet-methyl;MW:335.83;EXA:-
-+
+:
<90,Ph,4=Ph,2:N,10:/Cl,@7,\,O,!2,//O,!,O,!?,!5
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Clotianidin;MW:249.673;EXA:-
-+
+:
<6,?5,{3,5}=dl,2:S,5:N,1:/Cl,@3,\,!,NH,!,/NH!,!!,N,!,NO2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Chromafenozide;MW:394.515;EXA:-
-+
+:
<30,?6,3=?6,5:O,{7,9,11}=dl,7:/_,@8,\,//O,!,NH,!,N,/??!,!,//O,!,|,Ph,{3,5}:/_
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Clomeprop;MW:324.2;EXA:-
-+
+:
<30,Ph,{4,6}:/Cl,5:/_,@3,\,O,!?!,//O,!,NH,!,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Chloridazon;MW:221.6;EXA:-
-+
+:
<30,?6,{3,4}:N,{2,6}=dl,5://O,1:/NH2,6:/Cl,4:/Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Chloroxuron;MW:290.745;EXA:-
-+
+:
<30,Ph,6:/Cl,@3,\,O,!,Ph,@-3,\,NH,!,//O,!,N,?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Cyazofamid;MW:324.783;EXA:-
-+
+:
<18,?5,{2,5}=dl,{2,4}:N,1:/Cl,3:/CN,@4,\,SOO,!,N,?!,@5,\,Ph,-3:/_
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Diuron;MW:233.1;EXA:-
-+
+:
<30,Ph,{1,6}:/Cl,@3,\,NH,!,//O,!,N,?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Cyflufenamid;MW:412.36;EXA:-
-+
+:
<30,Ph,4^20:/CF3,{1,2}:/F,@3,\,!,NH,!,//O,!2,Ph,@-10,\\,N,!,<-12,O,!2,?3
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Diflubenzuron;MW:310.7;EXA:-
-+
+:
<30,Ph,{2,4}:/F,@3,\,//O,!,NH,!,//O,!,NH,!,Ph,-3:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Cyprodinil;MW:225.295;EXA:-
-+
+:
<30,Ph,{2,4}:N,5:/_,1:/?3,@3,\,NH,!,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Simeconazole;MW:293.417;EXA:-
-+
+:
<36,?5,{1,3,5}:N,{1,4}=dl,@3,30,!,/OH^30,!2,Si,??!,@7,-30,Ph,-3:/F
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Dimethirimol;MW:209.29;EXA:-
-+
+:
<30,?6,{3,5}=dl,1://O,2:NH,3:/N?!,4:N,5:/_,6:/??!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Dimethomorph;MW:387.86;EXA:-
-+
+:
<30,?6,1:O,4:N,@4,\,//O,!,!!`1,!,|,Ph,{4,5}:/O!,||,@9,\,Ph,-3:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Silafluofen;MW:408.588;EXA:-
-+
+:
<30,Ph,@5,\,O,!,Ph,-1:/F,@10,\,!3,Si,??,!,Ph,-3:/O!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Di-allate;MW:270.212;EXA:-
-+
+:
<-30,!?!,N,!,//O,!,S,!2,!!,!,Cl,3:/?!,7:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Daimuron;MW:268.4;EXA:-
-+
+:
<30,Ph,@4,\,??,!,NH,!,//O,!,NH,!,Ph,-3:/_
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Thiacloprid;MW:252.72;EXA:-
-+
+:
<30,Ph,1:N,6:/Cl,@3,\,!,<-12,|,?5,1:N,3:S,@-4,\\,N,!,CN
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Thiabendazole;MW:201.247;EXA:-
-+
+:
<30,Ph,3=?5,8=dl,9:NH,7:N,@8,\,|,?5,{1,4}=dl,3:S,5:N
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Thiamethoxam;MW:291.71;EXA:-
-+
+:
<30,?6,2:O,{4,6}:N,6:/_,@5,\\,N,!,NO2,@4,\,!,|,?5,{1,3}=dl,3:N,5:S,4:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Tebuthiuron;MW:228.3;EXA:-
-+
+:
<18,?5,{3,5}=dl,{4,5}:N,2:S,1:/??!,@3,\,N,?!,//O,!,NH,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Tebufenozide;MW:352.5;EXA:-
-+
+:
<30,Ph,6:/!,@3,\,//O,!,NH,!,N,/??!,!,//O,!,|,Ph,{3,5}:/_
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Teflubenzuron;MW:381.1;EXA:-
-+
+:
<30,Ph,{2,4}:/F,@3,\,//O,!,NH,!,//O,!,NH,!,|,Ph,{3,5}:/Cl,{4,6}:/F
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Tridemorph;MW:297.5;EXA:-
-+
+:
<30,?6,3:N,6:O,{1,5}:/_,3:/!12
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Triflumuron;MW:358.701;EXA:-
-+
+:
<30,Ph,4:/Cl,@3,\,//O,!,NH,!,//O,!,NH,!,|,Ph,@5,\,O,!,CF3
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Naproanilide;MW:291.35;EXA:-
-+
+:
<30,Ph,4=Ph,@8,\,O,!?!,//O,!,NH,!,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Novaluron;MW:492.706;EXA:-
-+
+:
<30,Ph,{2,4}:/F,@3,\,//O,!,NH,!,//O,!,NH,!,
Ph,-4:/Cl,@-3,\,O,!,/F^-35,/F^35,!,/F,!,O,!,CF3
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Pyraclostrobin;MW:387.817;EXA:-
-+
+:
<30,Ph,@3,\,!,O,!,<12,|,?5,{2,5}=dl,{4,5}:N,
@4,12,Ph,-3:/Cl,||,@2,\,N,/O!,!,COO!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Pirimicarb;MW:238.291;EXA:-
-+
+:
<30,Ph,{1,5}:N,{2,3}:/_,6:/N?!,@4,\,O,!,//O,!,N,?!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fenoxycarb;MW:301.35;EXA:-
-+
+:
<30,Ph,@5,\,O,!,Ph,@-3,\,O,!3,NH,!,//O,!,O,!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fenobucarb;MW:207.3;EXA:-
-+
+:
<30,Ph,5:/?!2,@4,\,O,!,//O,!,NH!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Ferimzone;MW:254.337;EXA:-
-+
+:
<30,Ph,4:/_,@3,\,/_,!!,N,!,NH,!,|,Ph,{2,6}:N,{3,5}:/_
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fenamidone;MW:311.403;EXA:-
-+
+:
<18,?5,4=dl,{3,5}:N,2://O,@3,\,NH,!,Ph,4:/S!,1^52:*/_,1^-48:/*Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fenpyroximate;MW:421.49;EXA:-
-+
+:
<-6,?5,{3,5}=db,{1,2}:N,{2,5}:/_,@3,-15,O,!,Ph,
@4,\,!!,N,!,O,!2,|,Ph,@4,\,//O,-60,O,!4
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Phenmedipham;MW:300.32;EXA:-
-+
+:
<30,Ph,5:/_,@3,\,NH,!,//O,!,O,!,Ph,@-4,\,NH,!,//O,!,O!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Butafenacil;MW:474.817;EXA:-
-+
+:
<30,?6,6=dl,{3,5}:N,{2,4}://O,5:/_,6:/CF3,
@3,\,Ph,-3:/Cl,@-2,\,//O,!,O,!,??,!,//O,!,O,!2,!!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Flufenacet;MW:363.331;EXA:-
-+
+:
<6,?5,{2,5}=dl,{1,2}:N,4:S,5:/CF3,@3,\,O,!,-60,//O,!,N,/?!,!,|,Ph,4:/F
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Flufenoxuron;MW:488.77;EXA:-
-+
+:
<30,Ph,{2,4}:/F,@3,\,//O,!,NH,!,//O,!,NH,!,Ph,-1:/F,@-3,\,O,!,|,Ph,4:/CF3,6:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Fluridone;MW:329.3;EXA:-
-+
+:
<30,?6,{3,6}=dl,2:N,2:/_,5://O,@4,\,Ph,-4:/CF3,6:/Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Propaquizafop;MW:443.884;EXA:-
-+
+:
<90,Ph,3=?6,{8,10}=dl,{7,10}:N,1:/Cl,
@8,\,O,!,|,Ph,@4,\,O,|,!2,//O,!,O,!,-60,!,O,-60,N,-60~dr,!,{2,9}:/_
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Hexaflumuron;MW:461.14;EXA:-
-+
+:
<30,Ph,{2,4}:/F,@3,\,//O,!,NH,!,//O,!,NH,!,
|,Ph,{3,5}:/Cl,@4,\,O,!,/F^-35,/F^35,!,/F,!,F
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Hexathiazox;MW:352.877;EXA:-
-+
+:
<30,?6,@3,\,NH,!,//O,!,<-24,|,?5,1:N,3:S,2://O,5:/_,@4,\,Ph,-3:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Pencycuron;MW:328.84;EXA:-
-+
+:
<30,Ph,6:/Cl,@3,\,!,N,/?5,!,//O,!,NH,!,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Bendiocarb;MW:223.228;EXA:-
-+
+:
<30,Ph,5=?5,{7,9}:O,8:??,@4,\,O,!,//O,!,NH!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Pentoxazone;MW:353.774;EXA:-
-+
+:
<66,?5,5://?!,1:O,3:N,{2,4}://O,@3,\,|,Ph,4:/Cl,6:/F,@3,\,O,!,?5
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Boscalid;MW:343.21;EXA:-
-+
+:
<30,Ph,5:N,4:/Cl,@3,\,//O,!,NH,!,Ph,@-1,\,Ph,-3:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Methabenzthiazuron;MW:221.3;EXA:-
-+
+:
Ph,3=?5,9=dl,7:S,9:N,@8,\,N,?!,//O,!,NH,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Methoxyfenozide;MW:368.48;EXA:-
-+
+:
<30,Ph,2:/_,1:/O!,@3,\,//O,!,NH,!,N,/??!,!,//O,!,|,Ph,{3,5}:/_
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Monolinuron;MW:214.6;EXA:-
-+
+:
<30,Ph,6:/Cl,@3,\,NH,!,//O,!,N,?!,O,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Lactofen;MW:461.78;EXA:-
-+
+:
<30,Ph,4:/Cl,6:/CF3,@3,\,O,!,Ph,-3:/NO2,@-4,\,//O,!,O,!?!,//O,!,O,!2
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Linuron;MW:249.1;EXA:-
-+
+:
<30,Ph,{1,6}:/Cl,@3,\,NH,!,//O,!,N,?!,O,!
-+
+;
%------------------------------------------------------------------------------
Cat:pesticide;EN:Lufenuron;MW:511.15;EXA:-
-+
+:
<30,Ph,{2,4}:/F,
@3,\,//O,!,NH,!,//O,!,NH,!,Ph,{-1,-4}:/Cl,@-3,\,O,!,/F^35,/F^-35,!,/F,!,CF3
-+
+;
%******************************************************************************
Cat:antibacterial;EN:Sulfacetamide;MW:214.239;EXA:-
-+
+:
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,//O,!
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Sulfatiazole;MW:255.31;EXA:-
-+
+:
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,?5,{1,3}=dl,2:N,5:S
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Chlopidol;MW:192.039;EXA:-
-+
+:
<30,Ph,{1,3}:/_,2:N,{4,6}:/Cl,5:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Sulfadiadine;MW:250.276;EXA:1
-+
+:
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,6}:N
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Levamisole;MW:204.29;EXA:-
-+
+:
?5,3=?5,6=dl,2:S,{4,6}:N,@7,\,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:5-(Propylsulphonyl)-1-H-Benzimidazole-2-Amine;MW:239.29;EXA:-
-+
+:
<30,Ph,3=?6,8=dl,7:N,9:NH,6:/S!3,8:/NH2
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Sulfapyrizine;MW:249.288;EXA:-
-+
+:
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,6:N
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Marbofloxacin;MW:362.361;EXA:-
-+
+:
<30,Ph,{3,(2,7)}=?6,9=dl,6:/F,{7,13}:N,11:O,9:/COOH,10://O,13:/_,
@1,\,|,?6,{1,4}:N,4:/_
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Sulfamerazine;MW:264.303;EXA:-
-+
+:
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,6}:N,3:/_
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Trimethoprim;MW:290.323;EXA:-
-+
+:
<30,Ph,{1,5}:N,{2,6}:/NH2,@3,\,!,|,Ph,{3,4,5}:/O!
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Ofloxacin;MW:361.373;EXA:-
-+
+:
<30,Ph,{3,(2,7)}=?6,9=dl,7:N,11:O,
6:/F,9:/COOH,10://O,13:/_,@1,\,|,?6,{1,4}:N,4:/_
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Ciprofloxacin;MW:331.347;EXA:-
-+
+:
<30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,@1,\,|,?6,1:N,4:NH
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Enrofloxacin;MW:359.401;EXA:-
-+
+:
<30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,@1,\,|,?6,{1,4}:N,4:/!
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Danofloxacin;MW:357.385;EXA:-
-+
+:
<30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,
@1,\,|,?6,@2,-200`1.1,&5,{1,4}:N,4:*/_
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Ormetoprim;MW:274.324;EXA:-
-+
+:
<30,Ph,{1,5}:N,{2,6}:/NH2,@3,\,!,|,Ph,2:/_,{4,5}:/O!
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Sulfadimidine;MW:278.33;EXA:-
-+
+:
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,4}:N,{3,5}:/_
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Orbifloxacin;MW:395.382;EXA:-
-+
+:
<30,Ph,-4=?6,9=dl,7:N,{2,5,6}:/F,7:/?3,9:/COOH,10://O,
@1,\,|,?6,1:N,{3,5}:*/_,4:NH
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Sulfamethoxypyridazine;MW:280.302;EXA:-
-+
+:
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{5,6}:N,4:/O!
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Sarafloxacin;MW:385.371;EXA:-
-+
+:
<30,Ph,3=?6,9=dl,7:N,6:/F,9:/COOH,10://O,@1,\,?6,-6:N,-3:NH,@7,\,Ph,-3:/F
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Difloxacin;MW:399.398;EXA:-
-+
+:
<30,Ph,-4=?6,9=dl,7:N,6:/F,9:/COOH,10://O,@1,\,|,?6,{1,4}:N,4:/_,
||,@7,\,Ph,-3:/F
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Sulfamonomethoxine;MW:280.302;EXA:-
-+
+:
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,4}:N,3:/O!
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Sulfachlorpyridazine;MW:284.723;EXA:-
-+
+:
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{5,6}:N,4:/Cl
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Sulfadoxine;MW:310.328;EXA:-
-+
+:
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{4,6}:N,{2,3}:/O!
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Sulfamethoxazole;MW:253.276;EXA:-
-+
+:
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,?5,{2,5}=dl,4:O,5:N,3:/_
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Pirimethamin;MW:248.714;EXA:-
-+
+:
<30,Ph,6:/Cl,@3,\,Ph,{-2,-4}:N,-1:/!,{-3,-5}:/NH2
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Oxibendazole;MW:249.27;EXA:-
-+
+:
<30,Ph,-4=?5,9=dl,7:NH,9:N,1:/O!3,@8,\,NH,!,COOH
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Oxolinic acid;MW:261.233;EXA:-
-+
+:
<30,Ph,3=?6,6=?5,9=dl,7:N,{11,13}:O,10://O,7:/!,9:/COOH
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Sulfabenzamide;MW:276.31;EXA:-
-+
+:
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,//O,!,Ph
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Ethopabate;MW:237.255;EXA:-
-+
+:
<30,Ph,1:/NHCO!,3:/O!2,4:/COO!
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Sulfadimethoxine;MW:310.33;EXA:-
-+
+:
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,4}:N,{3,5}:/O!
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Sulfaquinoxaline;MW:300.337;EXA:-
-+
+:
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,3=Ph,{2,5}:N
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Nalidixic acid;MW:232.239;EXA:-
-+
+:
<30,Ph,3=?6,9=dl,{5,10}:N,6:/_,7://O,8:/COOH,10:/!
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Flubendazole;MW:313.288;EXA:-
-+
+:
<30,Ph,-4=?5,9=dl,7:NH,9:N,@1,\,O,!,Ph,@8,\,NH,!,COO!
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Flumequine;MW:261.225;EXA:-
-+
+:
<30,Ph,{3,(2,7)}=?6,9=dl,7:N,6:/F,9:/COOH,10://O,13:/_
-+
+;
%------------------------------------------------------------------------------
34;Cat:antibacterial;EN:Sulfanitran;MW:335.334;EXA:-
-+
+:
<30,Ph,@1,\,NH,!,//O,!,@4,\,SOO,!,NH,!,|,Ph,4:/NO2
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Xylazine;MW:220.334;EXA:-
-+
+:
<30,?6,3=dl,2:S,4:N,@3,\,NH,!,|,Ph,{2,6}:/_
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Famphur;MW:325.3;EXA:-
-+
+:
<-30,!,O,!,P,//S,/O!^160,!,O,!,Ph,@-3,\,SOO,!,N!,!
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Lincomycin;MW:406.54;EXA:-
-+
+:
<6,?5,5:N,5:*/_,2:*/!2,
@3,\*,//O,!,NH,!,!~wb,?6,-1:O,{-3',-4,-5}:*/OH,-2:/*S!,@8,-30,/_,60,OH
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:2-acethylamino-5-nitrothiazole;MW:187.178;EXA:-
-+
+:
<18,?5,{2,5}=dl,2:N,4:S,3:/NHCO!,5:/NO2
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Chlorsulron;MW:357.77;EXA:-
-+
+:
<30,Ph,6:/NH2,@1,\,SOO,!,NH2,@3,\,SOO,!,NH2,@4,\,/Cl,60~dl,/Cl,!,Cl
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Florfenicol;MW:358.21;EXA:-
-+
+:
<30,Ph,@1,\,SOO,!,@4,\,/OH,!,/!F,!,NH,!,//O,!,/Cl,!,Cl
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Thiamphenicol;MW:355;EXA:-
-+
+:
<30,Ph,@1,\,SOO,!,@4,\,/OH,!,/!OH,!`1.1,NH,!`1.1,//O,!,/Cl,!,Cl
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Oxadiargyl;MW:341.19;EXA:-
-+
+:
<30,Ph,{1,3}:/Cl,6:/'(O,!2,!!!),@4,\,|,?5,2=dl,{1,2}:N,4:O,5://O,3:/??!
-+
+;
%------------------------------------------------------------------------------
Cat:antibacterial;EN:Oxaziclomefone;MW:376.277;EXA:-
-+
+:
<30,?6,6=dl,4:N,2:O,1:/_,5://O,6:/Ph,@4,\,??,!,|,Ph,{3,5}:/Cl
-+
+;
%******************************************************************************
Cat:biological;EN:Okadaic acid;MW:805.00;EXA:2
-+
+:
<30,?6,@4,?6,@-4,\,!3,<-12,?5,@-3,<-12,?6,-3=?6,@-3,*\,!3,
?6,@-4,?6,@6,\,!,/*_^-40,*/OH^20,!,//O,!1,OH,
3=wb,11=dl,15=dr,17=wf,19=wf,38=wb,{5,7,16,24,25,33,42}:O,
32:*/H^60,10:/_,{12,31,37'}:*/_,27://_,28:/OH,{3,29}:/*OH
-+
+;
%------------------------------------------------------------------------------
Cat:antibiotics;EN:Vancomycin;MW:1449.25;EXA:2
-+
+:
<-30,#1,!12,{1,3,12}=zf,7=wf,60,60,Ph,@-3,\,O,!,Ph,@-4,\,O,!,Ph,@-3,\,&1,
@7,&26,@$1,60,60,NH,60,-60,Ph,@-1,\,Ph,@-2,&4,##,
{36,3^40,6,9,12}://O,{2,5,8,11}:NH,{1,4^180,7'^-60,10'^60,14'^60,35^-60}:*/H,
@@ -2816,10 +2841,10 @@ Cat:antibiotics;EN:Vancomycin;MW:1449.25;EXA:2
@10,*\^-60,60,//O,!,NH2,@13,*\,NH,!,//O,!,/??!,*/H^60,!~zf,NH,!,
@23,\,O,!~zf,|,?6`.7,2:O,3^10:*/!OH,{4',5}:*/OH,
@-1,\*,O,!~wb,|,?6`.7,6:O,{3'^35,5}:*/_,3^-35:/NH2,4:/*OH,
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Maitotoxin;MW:3425.86;EXA:2
-+
+:
<55.8,?6,-4=?7 ,{-4,-3,-3,-3}=?6,@-3,\,!3,?6,{-4,-3,-3,-3}=?6,@-3,\,?6,-3=?6,
@-3,\,!3,60,<-30,?6,-3=?6,@-3,30,<30,?6,{-3,-3}=?6,-3=?7,{-4,-3,-3}=?6,
@-2,\,?6,-3=?6,-3=?7,{-3,-3}=?6,-3=?8,-3=dl,{-5,-3,-3,-3}=?6,
@@ -2835,5 +2860,5 @@ Cat:biological;EN:Maitotoxin;MW:3425.86;EXA:2
@6,\,O,30,SO3Na,
@$36,-45~zf,O,30,SO3Na,
@$150,\,|,!7,{1,2}:/*OH,4:*/_,5:/*_,7=dl
-+
+;
%------------------------------------------------------------------------------
diff --git a/graphics/mcf2graph/mcf_man_soc.mp b/graphics/mcf2graph/mcf_man_soc.mp
index 7eef412e3e..2443a83c70 100644
--- a/graphics/mcf2graph/mcf_man_soc.mp
+++ b/graphics/mcf2graph/mcf_man_soc.mp
@@ -1,13 +1,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% MCF file for mcf_manual.tex by Akira.Yamaji 2022.08.22
+% MCF file for mcf_manual.tex by Akira.Yamaji 2022.10.10
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph; %% it must be version 4.87
+input mcf2graph; %% it must be version 4.88
% ** use library file 'mcf_library.mcf'
-message "mcf_man_soc 2022.08.22"; message "";
+message "mcf_man_soc 2022.10.10"; message "";
%------------------------------------------------------------------------
sw_mframe:=0;
sw_expand:=0;
-%%ext(defaultscale:=.5; label.bot(decimal(char_num)&":"&inf_EN,(.5w,0));)
+%%ext(defaultscale:=.5; label.bot(decimal(fig_num)&":"&inf_EN,(.5w,0));)
%***********************************************************************
fsize:=(40mm,25mm);
blength:=6mm;
diff --git a/graphics/mcf2graph/mcf_manual.pdf b/graphics/mcf2graph/mcf_manual.pdf
index bc2657e39f..24bd35cb07 100644
--- a/graphics/mcf2graph/mcf_manual.pdf
+++ b/graphics/mcf2graph/mcf_manual.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_manual.tex b/graphics/mcf2graph/mcf_manual.tex
index f6e773eb33..a756a684e1 100644
--- a/graphics/mcf2graph/mcf_manual.tex
+++ b/graphics/mcf2graph/mcf_manual.tex
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format manual by Akira Yamaji 2022.08.22
+% Molecular Coding Format manual by Akira Yamaji 2022.10.10
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
%%%\usepackage{graphicx}
@@ -1553,60 +1553,61 @@ bye
\subsection{Molecular library file}
\begin{verbatim}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% molecular library file mcf_library.mcf by Akira Yamaji 2022.08.21
+% molecular library file mcf_library.mcf by Akira Yamaji 2022.10.10
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% tag1:var1;tag2:var2;tag3:var3 .....
% first character of line "%" comment out
-% first character of line "+" start,stop MCF
+% first character of line ":" start MCF
+% first character of line ";" stop MCF
+% first character of line "=" start parameter setting
+% first character of line "*" start ext(...)
+% first character of line "+" start add(...)
% Cat = Category,EN = Name,MW = Molecular weight
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%==============================================================================
-% molecular data for mcf_example.tex EXA:1[155] EXA:2[7]
+Cat:Category;EN:Example;MW:100.00;EXA:%
+=
+ sw_frame:=Atom;
+:
+<30,?6,3=?5,{1,3,5,9}=dl,{2,6,9}:N,5:/NH2,7:NH
+*
+ defaultscale:=.5;
+ label.bot(decimal(fig_num)&":"&inf_EN,(.5w,0));
++
+ defaultscale:=.3;
+ label.bot("A2",A2) withcolor red;
+ label.top("A6",A6) withcolor red;
+ label.top("A9",A9) withcolor red;
+;
%==============================================================================
Cat:biological;EN:Adenine;MW:135.13;EXA:1
-+
+:
<30,?6,3=?5,{1,3,5,9}=dl,{2,6,9}:N,5:/NH2,7:NH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Guanine;MW:151.13;EXA:1
-+
+:
<30,?6,3=?5,{1,3,9}=dl,{2,9}:N,{6,7}:NH,5://O,1:/NH2
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Cytosine;MW:111.10;EXA:1
-+
+:
<30,?6,{4,6}=dl,4:N,3://O,2:NH,5:/NH2
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Thymine;MW:126.11;EXA:1
-+
+:
<30,?6,3=dl,{2,6}:NH,{1,5}://O,4:/_
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Uracil;MW:112.09;EXA:1
-+
+:
<30,?6,6=dl,{3,5}://O,{2,4}:NH
-+
+;
%== Amino acid ================================================================
Cat:biological;EN:Glycine;MW:75.07;EXA:-
-+
-<30,NH2,!2,COOH
-+
-%------------------------------------------------------------------------------
-Cat:biological;EN:Glycine;MW:75.07;EXA:-
-+
+:
<30,NH2,!2,COOH
-+
-%------------------------------------------------------------------------------
-Cat:biological;EN:L-Alanine;MW:89.10;EXA:-
-+
-<30,NH2,!~wb,?!,COOH
-+
-%------------------------------------------------------------------------------
-Cat:biological;EN:L-Valine;MW:117.15;EXA:-
-+
-<30,NH2,!~wb,/?!,!,COOH
-+
+;
%------------------------------------------------------------------------------
\end{verbatim}
%------------------------------------------------------------------------------
@@ -1647,31 +1648,31 @@ mc_query("Cat=biological","MW>=285","MW<=290","a:EN");
% Sort key : EN (ascending)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Cat:biological;EN:Atoropin;MW:289.375;EXA:1
-+
+:
<30,O,!,//O,!2,Ph,@$1,\~zb^-60,|,?7`1.1,@6,*\^190`1.25,N!,&3~wb,$3:/!OH~wv
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Luteolin;MW:286.24;EXA:-
-+
+:
<30,Ph,3=?6,9=dl,10:O,7://O,@9,\,Ph,{2,6,14,15}:/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Lycorine;MW:287.315;EXA:1
-+
+:
<30,Ph,{-4,-2}=?6,{6,(9,12)}=?5,13=dl,8:N,{15,17}:O,
{9'^180,10^60}:*/H,{13,14'}:*/OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Morphine;MW:285.343;EXA:1
-+
+:
<30,Ph,{2,-4}=?6,(1,12)=?5[2],-1:O,-1=zb,
@7,60~wf`0.75,70~si_`1.3,45,N!,&9~wb,15=dl,6:/OH,8^180:*/H,12:/*OH
-+
+;
%------------------------------------------------------------------------------
Cat:biological;EN:Piperine;MW:285.343;EXA:1
-+
+:
<30,Ph,-1=?5,{-1,-3}:O,@4,\,!!,!,!!,!,//O,!,?6,-6:N
-+
+;
%------------------------------------------------------------------------------
\end{verbatim}
%------------------------------------------------------------------------------
diff --git a/graphics/mcf2graph/mcf_mplib_exa.pdf b/graphics/mcf2graph/mcf_mplib_exa.pdf
index f1afb95eba..749c4ce4f6 100644
--- a/graphics/mcf2graph/mcf_mplib_exa.pdf
+++ b/graphics/mcf2graph/mcf_mplib_exa.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_mplib_exa.tex b/graphics/mcf2graph/mcf_mplib_exa.tex
index 81801ae47a..7106de782c 100644
--- a/graphics/mcf2graph/mcf_mplib_exa.tex
+++ b/graphics/mcf2graph/mcf_mplib_exa.tex
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2022.08.22
+% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2022.10.10
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% ** mcf2graph.mp must be version 4.87
+% ** mcf2graph.mp must be version 4.88
% ** use mcf_library.mcf
\documentclass{article}
%------------------------------------------------------------------------------
@@ -85,7 +85,7 @@ beginfigm("EN:Paclitaxel","MW:853.918",
": @7,\*,O,-45,//O,60,Ph,11:*/OCO!>rl,12:/*OCO!^-15>lr ")
%---------------------------------------------------------------------
fsize:=(140mm,30mm);
- if mc_check(mc)=0: MCat(0,0.5)(scantokens(mc))
+ if mc_check(mc)=0: MCat(0,0.5)(scantokens(mc))
sw_numbering:=Atom; MCat(0.6,0.5)(scantokens(mc))
sw_numbering:=Bond; MCat(1,0.5)(scantokens(mc))
fi
@@ -113,9 +113,10 @@ endfigm
\noindent%
( read library file )
\begin{verbatim}
-beginfigm("f:mcf_library.mcf","t:EN","v:Chlorophyll a","NO:-")
- sw_output:=Fig+Calc+Mcode; %%%% output temp-mc.aux %%%%
- fsize:=(100mm,30mm);
+beginfigm("f:mcf_library.mcf","t:EN","v:Chlorophyll a","NO:-",
+ "= sw_output:=Fig+Calc+Mcode;",
+ "= fsize:=(100mm,30mm);")
+ if op_row>=1: scantokens(op) fi
if mc_check(mc)=0:
MC(scantokens(mc))
VerbatimTeX("\gdef\EN{"&inf_EN&"}\gdef\MW{"&inf_MW&"}");
@@ -128,8 +129,10 @@ endfigm
\end{verbatim}
%------------------------------------------------------------------------------------
\begin{mplibcode}
-beginfigm("f:mcf_library.mcf","t:EN","v:Chlorophyll a","NO:-")
- sw_output:=Fig+Calc+Mcode; fsize:=(100mm,30mm);
+beginfigm("f:mcf_library.mcf","t:EN","v:Chlorophyll a","NO:-",
+ "= sw_output:=Fig+Calc+Mcode;",
+ "= fsize:=(100mm,30mm);")
+ if op_row>=1: scantokens(op) fi
if mc_check(mc)=0:
MC(scantokens(mc))
VerbatimTeX("\gdef\EN{"&inf_EN&"}\gdef\MW{"&inf_MW&"}");
diff --git a/graphics/pgf/contrib/tikz-ext/README.md b/graphics/pgf/contrib/tikz-ext/README.md
index bee9e3512a..33ec46d366 100644
--- a/graphics/pgf/contrib/tikz-ext/README.md
+++ b/graphics/pgf/contrib/tikz-ext/README.md
@@ -30,7 +30,7 @@ These are
* `ext.shapes.circlecrosssplit`
* `ext.shapes.heatmark`
* `ext.shapes.rectangleroundedcorners`
- * `ext.shapes.superellopse`
+ * `ext.shapes.superellipse`
These were developed in response to questions on tex.stackexchange.com.
Some of these can be find by searching for my [user id](https://tex.stackexchange.com/search?q=user%3A16595+%22my+library%22). \ No newline at end of file
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-calendar.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-calendar.tex
index 4f2300a458..09bd261a21 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-calendar.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-calendar.tex
@@ -13,7 +13,7 @@
\begin{package}{calendar-ext}
This package adds week numbers and more conditionals to the \pgfname\space package |pgfcalendar|.
(Despite the code example above, this package is not set up to work with Con\TeX t.)
- \inspiration{WeekNum-Q,CalCond-Q}{WeekNum-A,CalCond-A}
+ \inspiration{WeekNum-Q,CalCond-Q,CalFullWeek-Q}{WeekNum-A,CalCond-A,CalFullWeek-A}
\end{package}
%This package extends the |pgfcalendar| package.
@@ -43,12 +43,30 @@ The following tests are added.
This test passes when all \meta{tests} pass.
\itemcalendaroption{not}|=|\marg{tests}
This test passes when \meta{tests} do not pass.
+\itemcalendaroption{week of month}|=|\meta{num}
+ This test passes when the date is in \meta{num}th week of the month.
+ The first week of the month start at day~1 and ends with day~7.
+\itemcalendaroption{week of month'}|=|\meta{num}
+ As above but counts from the last day of the month.
+ For a month with 31~days, this means the ``1st'' week starts at day~25 and ends with day~31.
+\itemcalendaroption{calendar week of month}|=|\meta{num}
+ This test passes when the date is in \meta{num}th calendar week of the month.
+ The first week starts at the first day of the month and ends at the next Sunday.
+\itemcalendaroption{calendar week of month'}|=|\meta{num}
+ As above but counts from the last day of the month.
+\begin{codeexample}[width=5cm,preamble=\usetikzlibrary{ext.calendar-plus}]
+\tikz
+ \calendar[
+ dates=2022-10-01 to 2022-10-31,
+ week list]
+ if (week of month=2) [red]
+ if (calendar week of month'=2) [blue];
+\end{codeexample}
\itemcalendaroption{yesterday}|=|\marg{tests}
This test passes when the previous day passes \meta{tests}.
\itemcalendaroption{week}|=|\meta{num}
This test passes when the current week of the year equals \marg{num}.
\end{itemize}
-
The shorthands for |d-| and |m-| are slightly changed so that they are
expandable. This makes it possible to use these shorthands inside of \pgfname math.
The shorthands for the week (see section~\ref{calendar:weeknumbering})
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-intro.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-intro.tex
index f9468175cb..f9468175cb 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-intro.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-intro.tex
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-calendar-plus.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-calendar-plus.tex
index bdfd225f3c..bdfd225f3c 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-calendar-plus.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-calendar-plus.tex
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-misc.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-misc.tex
index 163097e6a1..163097e6a1 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-misc.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-misc.tex
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-node-families.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-node-families.tex
index d4b274511c..d4b274511c 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-node-families.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-node-families.tex
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-paths.arcto.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-paths.arcto.tex
index 8ed660b3a3..8ed660b3a3 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-paths.arcto.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-paths.arcto.tex
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-paths.ortho.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-paths.ortho.tex
index a46f6be023..ba78f47dcb 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-paths.ortho.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-paths.ortho.tex
@@ -33,7 +33,7 @@ the path operations \verb!|-|! and \verb!-|-!.
This operation means ``first horizontal, then vertical and then horizontal again''.
\end{pathoperation}
}
-\begin{key}{/tikz/hvvh/ratio=\meta{ratio} (initially 0.5)}
+\begin{key}{/tikz/ortho/ratio=\meta{ratio} (initially 0.5)}
This sets the ratio for the middle part of the Zig-Zag connection.
For values $\meta{ratio} < 0$ and $\meta{ratio} > 1$ the Zig-Zag lines will
@@ -47,7 +47,7 @@ the path operations \verb!|-|! and \verb!-|-!.
\end{codeexample}
\end{key}
%TODO: hvvh/distance needs fixing, maybe?
-\begin{key}{/tikz/hvvh/distance=\meta{distance}}
+\begin{key}{/tikz/ortho/distance=\meta{distance}}
This sets the distance between the start point
and the middle part of the Zig-Zag connection.
@@ -64,7 +64,7 @@ the path operations \verb!|-|! and \verb!-|-!.
\end{tikzpicture}
\end{codeexample}
\end{key}
-\begin{key}{/tikz/hvvh/from center=\opt{\meta{true or false}} (default true)}
+\begin{key}{/tikz/ortho/from center=\opt{\meta{true or false}} (default true)}
When nodes get connected the placement of the middle part of the Zig-Zag
and the Zig-Zig (see below) connections will be calculated from the border
of these nodes.
@@ -79,7 +79,7 @@ these can be configured through the following keys.
foreach \p in {0.0, 0.25, 0.5, 0.75, 1.0}{
node [pos=\p] {\p}};
\end{codeexample}
-\begin{key}{/tikz/hvvh/spacing=\meta{number} (initially 4)}
+\begin{key}{/tikz/ortho/spacing=\meta{number} (initially 4)}
Unless $\meta{number} = 0$ is set
\begin{itemize}
\item |pos = 0| will be at the start,\indexKeyO{pos}
@@ -98,63 +98,59 @@ these can be configured through the following keys.
\item |pos = .5| will still be in the middle of the middle part of the connection.
\end{itemize}
\end{key}
-\begin{key}{/tikz/hvvh/middle 0 to 1}
+\begin{key}{/tikz/ortho/middle 0 to 1}
This is an alias for |spacing = 0|.
\end{key}
\subsection{Zig-Zig}
\begin{pathoperation}{r-ud}{\opt{\oarg{options}}\meta{coordinate or cycle}}
This operation means ``first up, then horizontal and then down''.
- \begin{key}{/tikz/udlr/ud distance=\meta{length} (initially .5cm)}
+ \begin{key}{/tikz/ortho/ud distance=\meta{length} (initially .5cm)}
This sets the distance between the start and the horizontal line to \meta{length}.
\end{key}
\end{pathoperation}
\begin{pathoperation}{r-du}{\opt{\oarg{options}}\meta{coordinate or cycle}}
This operation means ``first down, then horizontal and then up''.
- \begin{key}{/tikz/udlr/du distance=\meta{length} (initially .5cm)}
+ \begin{key}{/tikz/ortho/du distance=\meta{length} (initially .5cm)}
This sets the distance between the start and the horizontal line to \meta{length}.
\end{key}
\end{pathoperation}
\begin{pathoperation}{r-lr}{\opt{\oarg{options}}\meta{coordinate or cycle}}
This operation means ``left down, then vertical and then right''.
- \begin{key}{/tikz/udlr/lr distance=\meta{length} (initially .5cm)}
+ \begin{key}{/tikz/ortho/lr distance=\meta{length} (initially .5cm)}
This sets the distance between the start and the vertical line to \meta{length}.
\end{key}
\end{pathoperation}
\begin{pathoperation}{r-rl}{\opt{\oarg{options}}\meta{coordinate or cycle}}
This operation means ``first right, then vertical and then down''.
- \begin{key}{/tikz/udlr/rl distance=\meta{length} (initially .5cm)}
+ \begin{key}{/tikz/ortho/rl distance=\meta{length} (initially .5cm)}
This sets the distance between the start and the vertical line to \meta{length}.
\end{key}
\end{pathoperation}
All distances can be set with on key.
-\begin{key}{/tikz/udlr/distance=\meta{length}}
- Sets all distances in the |/tikz/udlr| namespace.
-\end{key}
-
-\begin{key}{/tikz/udlr/from center=\opt{\meta{true or false}} (initially false, default true)}
- This is an alias for |/tikz/hvvh/from center|.
+\begin{key}{/tikz/ortho/udlr distance=\meta{length}}
+ Sets all the previous distances to the same value \meta{length}.
\end{key}
\subsection{Even more Horizontal and Vertical Lines}
The following keys can be used to access vertical and horizontal line path operations.
\begin{stylekey}{/tikz/horizontal vertical}
- This installs \verb!to path = -| (\tikztotarget) \tikztonodes! that can be used with\indexKeyO{to path}
- the path operations |to| or |edge|.
+ This installs \verb!to path = -| (\tikztotarget) \tikztonodes!\indexKeyO{to path}
+ that can be used with the path operations |to| or |edge|.
\end{stylekey}
\begin{stylekey}{/tikz/vertical horizontal}
- This installs \verb!to path = |- (\tikztotarget) \tikztonodes! that can be used with
- the path operations |to| or |edge|.
+ This installs \verb!to path = |- (\tikztotarget) \tikztonodes!
+ that can be used with the path operations |to| or |edge|.
\end{stylekey}
\begin{stylekey}{/tikz/horizontal vertical horizontal}
- This installs \verb!to path = -|- (\tikztotarget) \tikztonodes! that can be used with
- the path operations |to| or |edge|.
+ This installs \verb!to path = -|- (\tikztotarget) \tikztonodes!
+ that can be used with the path operations |to| or |edge|.
\end{stylekey}
\begin{stylekey}{/tikz/vertical horizontal vertical}
- This installs \verb!to path = |-| (\tikztotarget) \tikztonodes! that can be used with
- the path operations |to| or |edge|.
+ This installs \verb!to path = |-| (\tikztotarget) \tikztonodes!
+ that can be used with the path operations |to| or |edge|.
\end{stylekey}
When connecting rectangular nodes, these keys could be useful as well.
@@ -183,3 +179,21 @@ it connects to the start point in the center (or at its border in case it is a n
The optional \meta{length} can be used to shift the line orthogonally to its direction.
\end{stylekey}
+
+\pagebreak
+Since all previous key are rather cumbersome, one can install shortcuts for these.
+\begin{stylekey}{/tikz/ortho/install shortcuts}
+Installs the following shortcuts:\\
+{\ttfamily
+\begin{tabular}{l@{\hspace{.5em}${}\to{}$\hspace{.5em}}l}
+ \pgfmanualbar- & vertical horizontal \\
+ -\pgfmanualbar & horizontal vertical \\
+ -\pgfmanualbar- & horizontal vertical horizontal \\
+ \pgfmanualbar-\pgfmanualbar & vertical horizontal vertical \\
+ \pgfmanualbar* & only vertical first \\
+ *\pgfmanualbar & only vertical second \\
+ \pgfmanualbar* & only vertical first \\
+ *\pgfmanualbar & only vertical second
+\end{tabular}
+}
+\end{stylekey}
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-paths.timer.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-paths.timer.tex
index 595a647917..595a647917 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-paths.timer.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-paths.timer.tex
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-patterns.images.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-patterns.images.tex
index c3c38a8517..c3c38a8517 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-patterns.images.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-patterns.images.tex
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-positioning-plus.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-positioning-plus.tex
index 56c81376aa..56c81376aa 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-positioning-plus.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-positioning-plus.tex
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-topaths.arcthrough.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-topaths.arcthrough.tex
index 1d9e5ba9df..1d9e5ba9df 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-topaths.arcthrough.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-topaths.arcthrough.tex
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-trans.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-trans.tex
index 97011bc4d0..97011bc4d0 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-trans.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-library-trans.tex
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-main-body.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-main-body.tex
index 1185cdb6d7..fd071e009e 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-main-body.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-main-body.tex
@@ -8,7 +8,7 @@
% 2. under the GNU Free Documentation License.
%
\newcommand*\tikzextname{Ti\textit kZ-Extensions}
-\newcommand*\tikzextversion{0.3}
+\newcommand*\tikzextversion{0.4}
\begin{document}
{\colorlet{blue}{black}% links shall be black
\title{\bfseries The \tikzextname\space Package\\
@@ -167,6 +167,19 @@ These libraries (should) work with both \pgfname\space and \tikzname.
\section*{Changelog}\addcontentsline{toc}{section}{Changelog}
\begin{multicols}{2}\raggedright
\noindent
+Version 0.4
+\begin{itemize}
+\item CTAN version of 0.3.1
+\end{itemize}
+Version 0.3.1
+\begin{itemize}
+\item Fixed |ext.paths.ortho| keys |only vertical first| and |only horizontal first|.
+\item Moved all (except the |to path|s) to namespace |/tikz/ortho|.
+ |/tikz/hvvh| and |/tikz/udlr| are considered deprecated.
+\item Fixed |\pgfcalendarjulianyeartoweek|.
+\item Added more calendar tests.
+\item Added directory structure.
+\end{itemize}
Version 0.3
\begin{itemize}
\item \addShape[circle arrow]{circlearrow}
@@ -199,6 +212,17 @@ Version 0.1
\end{multicols}
\printindex
+\makeatletter
+\def\url#1{%
+ \in@{/16595}{#1}%
+ \ifin@
+ \hyper@linkurl{\expandafter\Hurl\expandafter{\strip@url#1\relax}}{#1}%
+ \else
+ \hyper@linkurl{\Hurl{#1}}{#1}%
+ \fi
+}
+\def\strip@url#1/16595\relax{#1}
+\makeatother
\printbibliography[heading=bibintoc]
%\typeout{Examples: \the\codeexamplecount}%
\end{document} \ No newline at end of file
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-main-preamble.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-main-preamble.tex
index 494d63e012..494d63e012 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-main-preamble.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-main-preamble.tex
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-circlearrow.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-circlearrow.tex
index e26711bb35..e26711bb35 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-circlearrow.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-circlearrow.tex
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-circlecrosssplit.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-circlecrosssplit.tex
index e7b2b9ba5a..e7b2b9ba5a 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-circlecrosssplit.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-circlecrosssplit.tex
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-heatmark.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-heatmark.tex
index fa13cb0000..fa13cb0000 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-heatmark.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-heatmark.tex
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-rectround.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-rectround.tex
index 78bab76925..78bab76925 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-rectround.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-rectround.tex
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-superellipse.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-superellipse.tex
index 580ef0d93f..580ef0d93f 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-shapes-superellipse.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-shapes-superellipse.tex
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-trans.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-trans.tex
index ccd378a6e7..ccd378a6e7 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-pgf-trans.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual-en-pgf-trans.tex
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.bib b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual.bib
index 7bb85bf7b2..5a13e91d41 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.bib
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual.bib
@@ -296,4 +296,27 @@
year = {2013},
}
+'
+@Online{CalFullWeek-Q,
+ author = {jd6},
+ file = {Snapshot:https\://tex.stackexchange.com/questions/576673/full-weeks-in-tikz-calendar/660335#660335:text/html},
+ month = dec,
+ title = {Full weeks in Tikz Calendar},
+ titleaddon = {{TeX} - {LaTeX} Stack Exchange},
+ url = {https://tex.stackexchange.com/q/576673/16595},
+ urldate = {2022-10-09},
+ year = {2020},
+}
+
+@Online{CalFullWeek-A,
+ author = {Qrrbrbirlbel},
+ file = {Snapshot:https\://tex.stackexchange.com/questions/576673/full-weeks-in-tikz-calendar/660335#660335:text/html},
+ month = oct,
+ title = {Answer to \enquote{Full weeks in Tikz Calendar}},
+ titleaddon = {{TeX} - {LaTeX} Stack Exchange},
+ url = {https://tex.stackexchange.com/a/660335/16595},
+ urldate = {2022-10-09},
+ year = {2022},
+}
+
@Comment{jabref-meta: databaseType:bibtex;}
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.pdf b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual.pdf
index afeef21a22..f4a31a8c6a 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.pdf
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.tex b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual.tex
index 1f2400847a..253944ca7d 100644
--- a/graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.tex
+++ b/graphics/pgf/contrib/tikz-ext/doc/generic/tikz-ext/tikz-ext-manual.tex
@@ -11,12 +11,8 @@
%
\documentclass[a4paper,doc2,landscape]{ltxdoc}
-
\input{tikz-ext-manual-en-main-preamble.tex}
\usetikzlibrary{external}
-%\newif\iftikzextmanualexternalize
-%\tikzextmanualexternalizetrue
-%\iftikzextmanualexternalize
\tikzexternalize[
prefix=tikz/,
% mode=convert with system call,
@@ -24,9 +20,9 @@
%mode=list only,export=true,% simply skips EVERY picture -> good for debugging the text.
]
\tikzexternalenable
- \tikzifexternalizing{%
- \pgfkeys{/pdflinks/codeexample links=false}%
- }{}%
-%\fi
+% \tikzexternaldisable
+ \tikzifexternalizing{
+ \pgfkeys{/pdflinks/codeexample links=false}
+ }{}
\input{tikz-ext-manual-en-main-body.tex}
diff --git a/graphics/pgf/contrib/tikz-ext/pgfcalendar-ext.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgfcalendar-ext.code.tex
index b32ac9a3a6..90b42a0011 100644
--- a/graphics/pgf/contrib/tikz-ext/pgfcalendar-ext.code.tex
+++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgfcalendar-ext.code.tex
@@ -26,6 +26,24 @@
\expandafter
\endgroup\pgf@cal@temp
},
+ relative/.code 2 args={%
+ \begingroup
+ \pgfutil@tempcnta=\pgfcalendarifdatejulian\relax
+ \advance\pgfutil@tempcnta by #1\relax
+ \pgfcalendarjuliantodate{\pgfutil@tempcnta}{\pgfcalendarifdateyear}{\pgfcalendarifdatemonth}{\pgfcalendarifdateday}%
+ \edef\pgfcalendarifdatejulian{\the\pgfutil@tempcnta}%
+ \pgfcalendarjuliantoweekday\pgfutil@tempcnta\pgfutil@tempcntb
+ \edef\pgfcalendarifdateweekday{\the\pgfutil@tempcntb}%
+ \pgfcalendarjulianyeartoweek\pgfutil@tempcnta\pgfcalendarifdateyear\pgfutil@tempcntb
+ \edef\pgfcalendarifdateweek{\the\pgfutil@tempcntb}%
+ \pgfcalendar@launch@ifdate{#2}{%
+ \def\pgf@cal@temp{\pgfcalendarmatchestrue}%
+ }{%
+ \let\pgf@cal@temp\pgfutil@empty
+ }%
+ \expandafter
+ \endgroup\pgf@cal@temp
+ },
Jan/.code={\ifnum\pgfcalendarifdatemonth=1 \expandafter\pgfcalendarmatchestrue\fi},Jan/.value forbidden,
Feb/.code={\ifnum\pgfcalendarifdatemonth=2 \expandafter\pgfcalendarmatchestrue\fi},Feb/.value forbidden,
Mar/.code={\ifnum\pgfcalendarifdatemonth=3 \expandafter\pgfcalendarmatchestrue\fi},Mar/.value forbidden,
@@ -39,20 +57,6 @@
Nov/.code={\ifnum\pgfcalendarifdatemonth=11 \expandafter\pgfcalendarmatchestrue\fi},Nov/.value forbidden,
Dec/.code={\ifnum\pgfcalendarifdatemonth=12 \expandafter\pgfcalendarmatchestrue\fi},Dec/.value forbidden,
%
- difference between/.code args={#1and#2 #3 #4}{%
- \pgfcalendardatetojulian{#1}\pgfutil@tempcnta
- \pgfcalendardatetojulian{#2}\pgfutil@tempcntb
- \advance\pgfutil@tempcntb by -\pgfutil@tempcnta
- \ifnum\pgfutil@tempcntb#3#4\relax
- \pgfcalendarmatchestrue
- \fi},
- weekday before or same/.code args={#1and#2}{%
- \pgfcalendarjuliantoweekday{#1}\pgfutil@tempcnta
- \pgfcalendarjuliantoweekday{#2}\pgfutil@tempcntb
- \ifnum\pgfutil@tempcntb<\pgfutil@tempcnta
- \pgfcalendarmatchestrue
- \fi
- },
leap year/.code={%
\pgfutil@tempcnta=#1\relax
\divide\pgfutil@tempcnta4
@@ -71,6 +75,7 @@
\fi
\fi},
leap year/.default=\pgfcalendarifdateyear,
+ between days/.value required,
between days/.code args={#1and#2}{%
\pgfutil@tempcnta=#1\relax
\ifnum\pgfcalendarifdateday<\pgfutil@tempcnta\else
@@ -135,8 +140,31 @@
\pgfcalendar@launch@ifdate{\pgfkeyscurrentname={#1}}%
{\let\pgf@cal@temp\pgfutil@empty}{\def\pgf@cal@temp{\pgfcalendarmatchesfalse}}
\expandafter\endgroup\pgf@cal@temp
- }%
-}
+ },%
+ calendar week of month/.default=1,
+ calendar week of month'/.default=1,
+ calendar week of month/.code={%
+ \begingroup
+ \pgfutil@tempcnta=\pgfcalendarifdateday\relax
+ \advance\pgfutil@tempcnta by 5
+ \advance\pgfutil@tempcnta by -\pgfcalendarifdateweekday\relax
+ \divide\pgfutil@tempcnta by 7
+ \advance\pgfutil@tempcnta by -#1\relax
+ \expandafter\endgroup\expandafter
+ \ifnum\the\pgfutil@tempcnta=-1
+ \pgfcalendarmatchestrue
+ \fi},
+ calendar week of month'/.code={%
+ \begingroup
+ \pgfcalendar@getlastYMX\pgfcalendarifdateyear\pgfcalendarifdatemonth\pgfutil@tempcnta
+ \advance\pgfutil@tempcnta by -\pgfcalendarifdateday\relax
+ \edef\pgfcalendarifdateday{\the\pgfutil@tempcnta}%
+ \pgfutil@tempcnta=-\pgfcalendarifdateweekday\relax
+ \advance\pgfutil@tempcnta by 5
+ \edef\pgfcalendarifdateweekday{\the\pgfutil@tempcnta}%
+ \let\pgf@cal@temp\pgfutil@empty
+ \pgfcalendar@launch@ifdate{calendar week of month={#1}}{\def\pgf@cal@temp{\pgfcalendarmatchestrue}}{}%
+ \expandafter\endgroup\pgf@cal@temp}}
\def\pgfcalendar@ifdate@first#1#2:#3\pgf@stop{%
\pgfqkeys{/pgf/calendar}{and={#3, week of month#1={#2}}}}
@@ -178,9 +206,8 @@
\advance\pgfutil@tempcnta by 7\relax
\fi
% setup macro for year with {Julian number for day of first week}{weekday of -01-01}
- \edef\pgf@cal@temp{\def\expandafter\noexpand\csname pgfcalendar@week@#1\endcsname
- {{\the\pgfutil@tempcnta}{\the\pgfutil@tempcntb}}}%
- \expandafter\endgroup\pgf@cal@temp
+ \expandafter\xdef\csname pgfcalendar@week@#1\endcsname{{\the\pgfutil@tempcnta}{\the\pgfutil@tempcntb}}%
+ \endgroup
}{}%
}
@@ -211,12 +238,12 @@
{% we need to check the week of the previous year
#3=#2\relax
\advance#3 by -1
- \edef\pgf@cal@temp{\noexpand\pgfcalendarjulianyeartoweek@#1{\the#3}#3\noexpand\iffalse}%
+ \edef\pgf@cal@temp{\noexpand\pgfcalendarjulianyeartoweek@{#1}{\the#3}{#3}\noexpand\iffalse}%
\pgf@cal@temp
}{% yeah, it's weird
\divide#3 by 7
\advance#3 by 1
- }
+ }%
}{%
\divide#3 by 7
\advance#3 by 1
@@ -315,6 +342,22 @@
\let\pgfcalendarifdateweek=\pgfcalendarcurrentweek
\pgfcalendar@launch@ifdate%
}
+%
+% Overwritigin original \pgfcalendarifdate
+%
+\def\pgfcalendarifdate#1#2#3#4{%
+ \pgfcalendardatetojulian{#1}{\pgfutil@tempcnta}%
+ \pgfcalendarjuliantodate{\pgfutil@tempcnta}
+ {\pgfcalendarifdateyear}{\pgfcalendarifdatemonth}{\pgfcalendarifdateday}%
+ \edef\pgfcalendarifdatejulian{\the\pgfutil@tempcnta}%
+ % Compute info about date
+ \pgfcalendarjuliantoweekday{\pgfutil@tempcnta}{\pgfutil@tempcntb}%
+ \edef\pgfcalendarifdateweekday{\the\pgfutil@tempcntb}%
+ \pgfcalendarjulianyeartoweek{\pgfcalendarifdatejulian}{\pgfcalendarifdateyear}{\pgfutil@tempcntb}%
+ \edef\pgfcalendarifdateweek{\ifnum\pgfutil@tempcntb<10 0\fi\the\pgfutil@tempcntb}%
+ %
+ \pgfcalendar@launch@ifdate{#2}{#3}{#4}%
+}
\pgfqkeys{/pgf/calendar/week}{.value required,.code=\ifnum#1=\pgfcalendarifdateweek\relax\expandafter\pgfcalendarmatchestrue\fi}
diff --git a/graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.circlearrow.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.circlearrow.code.tex
index 9eb1c6ab09..9eb1c6ab09 100644
--- a/graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.circlearrow.code.tex
+++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.circlearrow.code.tex
diff --git a/graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.circlecrosssplit.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.circlecrosssplit.code.tex
index 7bc2761fb4..7bc2761fb4 100644
--- a/graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.circlecrosssplit.code.tex
+++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.circlecrosssplit.code.tex
diff --git a/graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.heatmark.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.heatmark.code.tex
index 477d0442da..477d0442da 100644
--- a/graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.heatmark.code.tex
+++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.heatmark.code.tex
diff --git a/graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.rectangleroundedcorners.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.rectangleroundedcorners.code.tex
index 37baf7abbf..37baf7abbf 100644
--- a/graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.rectangleroundedcorners.code.tex
+++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.rectangleroundedcorners.code.tex
diff --git a/graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.superellipse.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.superellipse.code.tex
index 9a89b5a8a6..9a89b5a8a6 100644
--- a/graphics/pgf/contrib/tikz-ext/pgflibraryext.shapes.superellipse.code.tex
+++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.shapes.superellipse.code.tex
diff --git a/graphics/pgf/contrib/tikz-ext/pgflibraryext.transformations.mirror.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.transformations.mirror.code.tex
index 4d962ccb1c..4d962ccb1c 100644
--- a/graphics/pgf/contrib/tikz-ext/pgflibraryext.transformations.mirror.code.tex
+++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/pgflibraryext.transformations.mirror.code.tex
diff --git a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.calendar-plus.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.calendar-plus.code.tex
index 195ecf9414..195ecf9414 100644
--- a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.calendar-plus.code.tex
+++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.calendar-plus.code.tex
diff --git a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.misc.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.misc.code.tex
index 830b3513e5..830b3513e5 100644
--- a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.misc.code.tex
+++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.misc.code.tex
diff --git a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.node-families.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.node-families.code.tex
index 699170d178..c0ecda441a 100644
--- a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.node-families.code.tex
+++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.node-families.code.tex
@@ -290,7 +290,7 @@
\ifdim\wd\pgfnodeparttextbox<\pgfutil@tempdima
\pgfutil@tempdimb=\pgfutil@tempdima
\advance\pgfutil@tempdimb-\wd\pgfnodeparttextbox
- \setbox\pgfnodeparttextbox=\hbox to \pgfutil@tempdima{\tikzext@nf@align@action\pgfutil@tempdimb\box\pgfnodeparttextbox}%
+ \setbox\pgfnodeparttextbox=\hbox to \pgfutil@tempdima{\tikzext@nf@align@action\pgfutil@tempdimb\unhbox\pgfnodeparttextbox}%
\fi
\tikzext@nf@getandset{\the\dp\pgfnodeparttextbox}{text depth}{\pgfutil@tempdima}%
\ifdim\dp\pgfnodeparttextbox<\pgfutil@tempdima
diff --git a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.node-families.shapes.geometric.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.node-families.shapes.geometric.code.tex
index 58384960a8..58384960a8 100644
--- a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.node-families.shapes.geometric.code.tex
+++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.node-families.shapes.geometric.code.tex
diff --git a/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.arcto.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.arcto.code.tex
new file mode 100644
index 0000000000..c75f31b60a
--- /dev/null
+++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.arcto.code.tex
@@ -0,0 +1,326 @@
+% Copyright 2022 by Qrrbrbirlbel
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Free Documentation License.
+%
+\tikzset{
+ arc to/.code=\pgfqkeys{/tikz/arc to}{#1},
+ arc to={
+ counter clockwise/.code=\pgfkeyssetvalue{/tikz/arc to/ccw flag}{1},
+ clockwise/.code=\pgfkeyssetvalue{/tikz/arc to/ccw flag}{0},
+ x radius/.code=\pgfkeyssetvalue{/tikz/x radius}{#1},
+ y radius/.code=\pgfkeyssetvalue{/tikz/y radius}{#1},
+ radius/.code=\pgfkeyssetvalue{/tikz/x radius}{#1}\pgfkeyssetvalue{/tikz/y radius}{#1},
+ large/.code=\pgfkeyssetvalue{/tikz/arc to/large flag}{1},
+ small/.code=\pgfkeyssetvalue{/tikz/arc to/large flag}{0},
+ % defaults
+ rotate/.initial=0, counter clockwise, small,
+ counter clockwise/.value forbidden,
+ clockwise/.value forbidden,
+ large/.value forbidden,
+ small/.value forbidden}}
+\def\tikz@arcA rc{\pgfutil@ifnextchar t%
+ {\tikz@flush@moveto\expandafter\expandafter\expandafter\tikz@arcB@cont\expandafter\pgfutil@gobble\pgfutil@gobble}
+ {\tikz@flush@moveto\tikz@arc@cont}}
+\def\tikz@arcB@cont{%
+ \pgfutil@ifnextchar[\tikz@@do@arcB{
+ \advance\tikz@expandcount by -10\relax% go down quickly
+ \ifnum\tikz@expandcount<0\relax%
+ \def\@next{\tikz@@do@arcB[]}%
+ \else%
+ \def\@next{\expandafter\tikz@arcB@cont}%
+ \fi%
+ \@next}}%
+\def\tikz@@do@arcB[#1]{%
+ \def\tikz@arcB@options{#1}%
+ \tikz@do@@arcB}
+\def\tikz@do@@arcB{%
+ \pgfutil@ifnextchar n{\tikz@collect@label@onpath\tikz@do@@arcB}
+ {\pgfutil@ifnextchar c{\tikz@collect@coordinate@onpath\tikz@do@@arcB}
+ {\pgfutil@ifnextchar p{\tikz@collect@pic@onpath\tikz@do@@arcB}
+ {\tikz@scan@one@point\tikz@do@arcB}}}}
+
+\def\tikz@do@arcB#1{%
+ \edef\tikz@timer@start{\noexpand\pgfqpoint{\the\tikz@lastx}{\the\tikz@lasty}}
+ \tikz@make@last@position{#1}%
+ \edef\tikz@timer@end{\noexpand\pgfqpoint{\the\tikz@lastx}{\the\tikz@lasty}}%
+ \iftikz@shapeborder
+ \edef\tikz@moveto@waiting{\tikz@shapeborder@name}%
+ \fi
+ \begingroup
+ \tikzset{every arc/.try,every arc to/.try,arc to/.expand once=\tikz@arcB@options}%
+ \pgfmathsetmacro\tikz@arc@x{\pgfkeysvalueof{/tikz/x radius}}%
+ \ifpgfmathunitsdeclared
+ \pgfmathsetmacro\tikz@arc@y{\pgfkeysvalueof{/tikz/y radius}}%
+ \ifpgfmathunitsdeclared
+ \tikzext@pgfpatharcto{\tikz@arc@x pt}{\tikz@arc@y pt}
+ {\pgfkeysvalueof{/tikz/arc to/rotate}}{\pgfkeysvalueof{/tikz/arc to/large flag}}
+ {\pgfkeysvalueof{/tikz/arc to/ccw flag}}{#1}%
+ \else
+ \tikzerror{You cannot mix dimensions and dimension values in an arc}%
+ \fi
+ \else
+ \pgfmathsetmacro\tikz@arc@y{\pgfkeysvalueof{/tikz/y radius}}%
+ \ifpgfmathunitsdeclared
+ \tikzerror{You cannot mix dimensions and dimension values in an arc}%
+ \else
+ \pgf@process{\pgfpointxy{\tikz@arc@x}{0}}%
+ \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y}%
+ \let\tikz@arc@x\pgfmathresult
+ \pgf@process{\pgfpointxy{0}{\tikz@arc@y}}%
+ \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y}%
+ \let\tikz@arc@y\pgfmathresult
+ \tikzext@pgfpatharcto{+\tikz@arc@x pt}{+\tikz@arc@y pt}
+ {\pgfkeysvalueof{/tikz/arc to/rotate}}{\pgfkeysvalueof{/tikz/arc to/large flag}}
+ {\pgfkeysvalueof{/tikz/arc to/ccw flag}}{#1}%
+ \fi
+ \fi
+ \endgroup
+ % check whether \pgf@marshall starts with \pgfpathlineto
+ \pgfutil@ifxempty\pgf@marshal{}{%
+ \edef\tikz@temp{\expandafter\expandafter\expandafter\noexpand\expandafter\pgfutil@firstgobblerest\pgf@marshal\relax}%
+ \expandafter\let\expandafter\tikz@temp\tikz@temp
+ \pgfutil@ifx\tikz@temp\pgfpathlineto{}{%
+ % getting rid of \pgfpatharcaxes inside \pgf@marshal
+ \expandafter\expandafter\expandafter\def\expandafter\expandafter\expandafter\pgf@marshal
+ \expandafter\expandafter\expandafter{\expandafter\pgfutil@gobble\pgf@marshal}%
+ % extracting the other four values needed for the timer
+ \edef\tikz@timer@start@angle{\expandafter\pgfutil@firstoffour\pgf@marshal}%
+ \edef\tikz@timer@end@angle{\expandafter\pgfutil@secondoffour\pgf@marshal}%
+ \pgfextract@process\tikz@timer@zero@axis{\expandafter\pgfutil@thirdoffour\pgf@marshal}%
+ \pgfextract@process\tikz@timer@ninety@axis{\expandafter\pgfutil@fourthoffour\pgf@marshal}%
+ %
+ \let\tikz@timer=\tikz@timer@arc
+ }%
+ }%
+ \tikz@scan@next@command
+}
+\def\pgfutil@firstoffour#1#2#3#4{#1}
+\def\pgfutil@secondoffour#1#2#3#4{#2}
+\def\pgfutil@thirdoffour#1#2#3#4{#3}
+\def\pgfutil@fourthoffour#1#2#3#4{#4}
+\def\pgfutil@firstgobblerest#1#2\relax{#1}
+
+% original from pgfcorepathconstruct.code.tex
+\def\tikzext@pgfpatharcto#1#2#3#4#5#6{%
+ {%
+ % The following code is based on the transformation described in svg
+ % 1.1 specification Section F.6.5
+ %
+ % Step 1: store the simple parameters (xa=x1 since TeX does not
+ % allow numbers in names)
+ %
+ \pgfmathsetmacro\pgf@arcto@rx{abs(#1)}%
+ \pgfmathsetmacro\pgf@arcto@ry{abs(#2)}%
+ \ifdim\pgf@arcto@rx pt=0pt% special rule: zero radius=straight line
+ \gdef\pgf@marshal{\pgfpathlineto{#6}}%
+ \else
+ \ifdim\pgf@arcto@ry pt=0pt% special rule: zero radius=straight line
+ \gdef\pgf@marshal{\pgfpathlineto{#6}}%
+ \else
+ \pgfmathsetmacro\pgf@arcto@phi{#3}%
+ \pgfmathsetmacro\pgf@arcto@fA{#4}%
+ \ifdim\pgf@arcto@fA pt=0pt
+ \else
+ \pgfmathsetmacro\pgf@arcto@fA{1.0}% Special rule: every non-zero value is 1.
+ \fi
+ \pgfmathsetmacro\pgf@arcto@fS{#5}%
+ \ifdim\pgf@arcto@fS pt=0pt
+ \else
+ \pgfmathsetmacro\pgf@arcto@fS{1.0}% Special rule: every non-zero value is 1.
+ \fi
+ \pgf@process{#6}%
+ \edef\pgf@arcto@xb{\the\pgf@x}%
+ \edef\pgf@arcto@yb{\the\pgf@y}%
+ %
+ % Step 2: x1,y1 is more complicated to compute: It is given by lastx
+ % and lasty, but these are transformed coordinates, we need the
+ % untransformed ones. So, we inverse the transformation (arghh...)
+ %
+ \pgftransforminvert%
+ \pgf@process{\pgfpointtransformed{\pgfqpoint{\pgf@path@lastx}{\pgf@path@lasty}}}%
+ \edef\pgf@arcto@xa{\the\pgf@x}%
+ \edef\pgf@arcto@ya{\the\pgf@y}%
+ \edef\pgf@temp@a{\pgf@arcto@xa,\pgf@arcto@ya}%
+ \edef\pgf@temp@b{\pgf@arcto@xb,\pgf@arcto@yb}%
+ \ifx\pgf@temp@a\pgf@temp@b% special rule: skip!
+ \global\let\pgf@marshal\pgfutil@empty
+ \else
+ %
+ % Ok, now we got all the parameters setup. Now comes the
+ % computation...
+ %
+ %
+ % Step 3: Start with a new coordinate system and rotate everything
+ % by the negated phi.
+ %
+ \pgftransformreset
+ \pgftransformrotate{-\pgf@arcto@phi}%
+ % Ok, using \pgfpointtransformed we now get transformed points...
+ %
+ % Step 4: Compute x1' and y1' (xaprime and yaprime)
+ %
+ \pgf@process{%
+ \pgfpointtransformed{\pgfpointscale{.5}{\pgfpointdiff
+ {\pgfqpoint{\pgf@arcto@xb}{\pgf@arcto@yb}}
+ {\pgfqpoint{\pgf@arcto@xa}{\pgf@arcto@ya}}%
+ }%
+ }%
+ }%
+ \edef\pgf@arcto@xaprime{\pgf@sys@tonumber\pgf@x}%
+ \edef\pgf@arcto@yaprime{\pgf@sys@tonumber\pgf@y}%
+ %
+ % Compute Lambda
+ %
+ \pgfmathsetmacro\pgf@arcto@frac@x{\pgf@arcto@xaprime/\pgf@arcto@rx}%
+ \pgfmathsetmacro\pgf@arcto@frac@y{\pgf@arcto@yaprime/\pgf@arcto@ry}%
+ \pgfmathsetmacro\pgf@arcto@lambda{
+ \pgf@arcto@frac@x*\pgf@arcto@frac@x+\pgf@arcto@frac@y*\pgf@arcto@frac@y
+ }%
+ \ifdim\pgf@arcto@lambda pt>1pt
+ \pgfmathsetmacro\pgf@arcto@sqrt@lambda{sqrt(\pgf@arcto@lambda)}%
+ \pgfmathsetmacro\pgf@arcto@rx{\pgf@arcto@sqrt@lambda*\pgf@arcto@rx}%
+ \pgfmathsetmacro\pgf@arcto@ry{\pgf@arcto@sqrt@lambda*\pgf@arcto@ry}%
+ \fi
+ %
+ % Do some scaling
+ %
+ \pgfmathsetmacro\pgf@arcto@xaprime@abs{abs(\pgf@arcto@xaprime)}%
+ \pgfmathsetmacro\pgf@arcto@yaprime@abs{abs(\pgf@arcto@yaprime)}%
+ \pgfmathmax@{\pgf@arcto@rx,\pgf@arcto@ry,\pgf@arcto@xaprime@abs,\pgf@arcto@yaprime@abs}%
+ \pgfmathsetmacro\pgf@arcto@scaling{20/\pgfmathresult}%
+ \pgfmathsetmacro\pgf@arcto@rx@scaled{\pgf@arcto@scaling*\pgf@arcto@rx}%
+ \pgfmathsetmacro\pgf@arcto@ry@scaled{\pgf@arcto@scaling*\pgf@arcto@ry}%
+ \pgfmathsetmacro\pgf@arcto@xaprime@scaled{\pgf@arcto@scaling*\pgf@arcto@xaprime}%
+ \pgfmathsetmacro\pgf@arcto@yaprime@scaled{\pgf@arcto@scaling*\pgf@arcto@yaprime}%
+ %
+ % Step 5: Now comes the messy computation of c1' and c2'.
+ %
+ \ifdim\pgf@arcto@rx pt>\pgf@arcto@ry pt
+ \pgfmathsetmacro\pgf@arcto@rx@over@ry{\pgf@arcto@rx/\pgf@arcto@ry}%
+ \pgfmathsetmacro\pgf@arcto@ry@over@rx{\pgf@arcto@ry/\pgf@arcto@rx}%
+ \pgfmathsetmacro\pgf@arcto@temp{\pgf@arcto@ry@over@rx*\pgf@arcto@xaprime@scaled}%
+ \pgfmathsetmacro\pgf@arcto@numerator{
+ \pgf@arcto@ry@scaled*\pgf@arcto@ry@scaled-
+ \pgf@arcto@yaprime@scaled*\pgf@arcto@yaprime@scaled-
+ \pgf@arcto@temp*\pgf@arcto@temp
+ }%
+ \pgfmathsetmacro\pgf@arcto@denominator{
+ \pgf@arcto@yaprime@scaled*\pgf@arcto@yaprime@scaled+
+ \pgf@arcto@temp*\pgf@arcto@temp
+ }%
+ \else
+ \pgfmathsetmacro\pgf@arcto@rx@over@ry{\pgf@arcto@rx/\pgf@arcto@ry}%
+ \pgfmathsetmacro\pgf@arcto@ry@over@rx{\pgf@arcto@ry/\pgf@arcto@rx}%
+ \pgfmathsetmacro\pgf@arcto@temp{\pgf@arcto@rx@over@ry*\pgf@arcto@yaprime@scaled}%
+ \pgfmathsetmacro\pgf@arcto@numerator{
+ \pgf@arcto@rx@scaled*\pgf@arcto@rx@scaled-
+ \pgf@arcto@xaprime@scaled*\pgf@arcto@xaprime@scaled-
+ \pgf@arcto@temp*\pgf@arcto@temp
+ }%
+ \pgfmathsetmacro\pgf@arcto@denominator{
+ \pgf@arcto@xaprime@scaled*\pgf@arcto@xaprime@scaled+
+ \pgf@arcto@temp*\pgf@arcto@temp
+ }%
+ \fi
+ \pgfmathsetmacro\pgf@arcto@frac{
+ \pgf@arcto@numerator/\pgf@arcto@denominator
+ }%
+ \ifdim\pgf@arcto@frac pt<0pt
+ \pgfmathsetmacro\pgf@arcto@factor{0}%
+ \else
+ \pgfmathsetmacro\pgf@arcto@factor{sqrt(\pgf@arcto@frac)}%
+ \fi
+ \ifx\pgf@arcto@fA\pgf@arcto@fS
+ \pgfmathsetmacro\pgf@arcto@factor{-\pgf@arcto@factor}%
+ \fi
+ \pgfmathsetmacro\pgf@arcto@cxprime{
+ \pgf@arcto@factor*\pgf@arcto@rx@over@ry*\pgf@arcto@yaprime
+ }%
+ \pgfmathsetmacro\pgf@arcto@cyprime{
+ -\pgf@arcto@factor*\pgf@arcto@ry@over@rx*\pgf@arcto@xaprime
+ }%
+ %
+ % Step 6: Ok, now compute cx,cy
+ %
+ \pgftransformreset
+ \pgftransformrotate{\pgf@arcto@phi}%
+ \pgf@process{%
+ \pgfpointtransformed{\pgfqpoint{\pgf@arcto@cxprime pt}{\pgf@arcto@cyprime pt}}%
+ }%
+ \edef\pgf@arcto@temp{\noexpand\pgfqpoint{\the\pgf@x}{\the\pgf@y}}%
+ \pgf@process{\pgfpointadd{\pgf@arcto@temp}{%
+ \pgfpointscale{.5}{%
+ \pgfpointadd
+ {\pgfqpoint{\pgf@arcto@xa}{\pgf@arcto@ya}}
+ {\pgfqpoint{\pgf@arcto@xb}{\pgf@arcto@yb}}}%
+ }%
+ }%
+ \edef\pgf@arcto@cx{\the\pgf@x}%
+ \edef\pgf@arcto@cy{\the\pgf@y}%
+ %
+ % Step 7: Compute start angle:
+ %
+ \pgfmathsetmacro\pgf@arcto@vec@x{(\pgf@arcto@xaprime-\pgf@arcto@cxprime)/\pgf@arcto@rx}%
+ \pgfmathsetmacro\pgf@arcto@vec@y{(\pgf@arcto@yaprime-\pgf@arcto@cyprime)/\pgf@arcto@ry}%
+ \pgfmathsetmacro\pgf@arcto@denominator{veclen(\pgf@arcto@vec@x,\pgf@arcto@vec@y)}%
+ \pgfmathsetmacro\pgf@arcto@frac{\pgf@arcto@vec@x/\pgf@arcto@denominator}%
+ \pgfmathsetmacro\pgf@arcto@theta@start{acos(\pgf@arcto@frac)}%
+ \ifdim\pgf@arcto@vec@y pt<0pt
+ \pgfmathsetmacro\pgf@arcto@theta@start{-\pgf@arcto@theta@start}%
+ \fi
+ %
+ % Step 8: Compute end angle:
+ %
+ \pgfmathsetmacro\pgf@arcto@vec@x{(-\pgf@arcto@xaprime-\pgf@arcto@cxprime)/\pgf@arcto@rx}%
+ \pgfmathsetmacro\pgf@arcto@vec@y{(-\pgf@arcto@yaprime-\pgf@arcto@cyprime)/\pgf@arcto@ry}%
+ \pgfmathsetmacro\pgf@arcto@denominator{veclen(\pgf@arcto@vec@x,\pgf@arcto@vec@y)}%
+ \pgfmathsetmacro\pgf@arcto@frac{\pgf@arcto@vec@x/\pgf@arcto@denominator}%
+ \pgfmathsetmacro\pgf@arcto@theta@end{acos(\pgf@arcto@frac)}%
+ \ifdim\pgf@arcto@vec@y pt<0pt
+ \pgfmathsetmacro\pgf@arcto@theta@end{-\pgf@arcto@theta@end}%
+ \fi
+ \pgfmathsetmacro\pgf@arcto@delta@theta{abs(\pgf@arcto@theta@start-\pgf@arcto@theta@end)}%
+ \ifdim\pgf@arcto@fA pt=0pt
+ \ifdim\pgf@arcto@delta@theta pt>180pt
+ % Ok, we need to adjust the angle!
+ \ifdim\pgf@arcto@theta@end pt>\pgf@arcto@theta@start pt
+ \pgfmathsetmacro\pgf@arcto@theta@end{\pgf@arcto@theta@end-360}%
+ \else
+ \pgfmathsetmacro\pgf@arcto@theta@end{\pgf@arcto@theta@end+360}%
+ \fi
+ \fi
+ \else
+ \ifdim\pgf@arcto@delta@theta pt<180pt
+ % Ok, we need to adjust the angle!
+ \ifdim\pgf@arcto@theta@end pt>\pgf@arcto@theta@start pt
+ \pgfmathsetmacro\pgf@arcto@theta@end{\pgf@arcto@theta@end-360}%
+ \else
+ \pgfmathsetmacro\pgf@arcto@theta@end{\pgf@arcto@theta@end+360}%
+ \fi
+ \fi
+ \fi
+ % Qrr:
+ % make sure direction is properly followed
+ \ifdim\pgf@arcto@fS pt=1pt
+ % counter clockwise
+ \ifdim\pgf@arcto@theta@end pt<\pgf@arcto@theta@start path
+ \pgfmathsetmacro\pgf@arcto@theta@end{\pgf@arcto@theta@end+360}%
+ \fi
+ \else
+ % clockwise
+ \ifdim\pgf@arcto@theta@end pt>\pgf@arcto@theta@start path
+ \pgfmathsetmacro\pgf@arcto@theta@end{\pgf@arcto@theta@end-360}%
+ \fi
+ \fi
+ \xdef\pgf@marshal{\noexpand
+ \pgfpatharcaxes{\pgf@arcto@theta@start}{\pgf@arcto@theta@end}
+ {\noexpand\pgfpointpolar{\pgf@arcto@phi}{\pgf@arcto@rx}}
+ {\noexpand\pgfpointpolar{\pgf@arcto@phi+90}{\pgf@arcto@ry}}%
+ }%
+ \fi\fi\fi
+ }%
+ \pgf@marshal
+} \ No newline at end of file
diff --git a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.paths.ortho.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.ortho.code.tex
index e7a3b02ed7..9740c39cc2 100644
--- a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.paths.ortho.code.tex
+++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.ortho.code.tex
@@ -51,14 +51,13 @@
%%% HVVH/UDLR
\tikzset{%
- hvvh/.code={\pgfqkeys{/tikz/hvvh}{#1}},%
- udlr/.code={\pgfqkeys{/tikz/udlr}{#1}},%
- hvvh/.search also=/tikz,%
- udlr/.search also=/tikz,%
- hvvh/middle 0 to 1/.style={hvvh/spacing=0},%
- hvvh/from center/.is if=tikzext@tikz@hvvh@fromcenter,%
- udlr/from center/.style={/tikz/hvvh/from center={#1}},
- hvvh/spacing/.code=% spacing = 0 means that the middle part are the pos-itions 0 to 1,
+ ortho/.code=\pgfqkeys{/tikz/ortho}{#1},
+ hvvh/.code=\pgfqkeys{/tikz/ortho}{#1},%
+ udlr/.code=\pgfqkeys{/tikz/ortho}{#1},%
+ ortho/.search also=/tikz,
+ ortho/middle 0 to 1/.style={/tikz/ortho/spacing=0},%
+ ortho/from center/.is if=tikzext@tikz@hvvh@fromcenter,%
+ ortho/spacing/.code=% spacing = 0 means that the middle part are the pos-itions 0 to 1,
% the first part is -1 to 0, the last part is to 2
\pgfmathint{#1}\let\tikzext@tikz@hvvh@timing@parts\pgfmathresult% in case they are calculations to be done
\ifcase\tikzext@tikz@hvvh@timing@parts\relax
@@ -76,20 +75,20 @@
\let\tikzext@tikz@hvvh@timing@subtr\pgfmathresult
\pgfmathsetmacro\tikzext@tikz@hvvh@timing@factor{1+2*\pgfmathresult}%
\fi,%
- hvvh/ratio/.code=\pgfmathsetmacro\tikzext@tikz@hvvh@ratio{#1},%
+ ortho/ratio/.code=\pgfmathsetmacro\tikzext@tikz@hvvh@ratio{#1},%
% TODO: not possible to do distance in TikZ coordinate system
- hvvh/distance/.code=\pgfmathsetlength\tikzext@tikz@hvvh@distance{#1}\let\tikzext@tikz@hvvh@ratio\pgfutil@empty,%
- udlr/distance/.style={%
- /tikz/udlr/ud distance={#1},%
- /tikz/udlr/du distance={#1},%
- /tikz/udlr/lr distance={#1},%
- /tikz/udlr/rl distance={#1}},%
- udlr/ud distance/.initial=+.5cm,%
- udlr/du distance/.initial=+.5cm,%
- udlr/lr distance/.initial=+.5cm,%
- udlr/rl distance/.initial=+.5cm,%
- hvvh/ratio=.5,% default value
- hvvh/spacing=4,% default value
+ ortho/distance/.code=\pgfmathsetlength\tikzext@tikz@hvvh@distance{#1}\let\tikzext@tikz@hvvh@ratio\pgfutil@empty,%
+ ortho/udlr distance/.style={%
+ /tikz/ortho/ud distance={#1},%
+ /tikz/ortho/du distance={#1},%
+ /tikz/ortho/lr distance={#1},%
+ /tikz/ortho/rl distance={#1}},%
+ ortho/ud distance/.initial=+.5cm,%
+ ortho/du distance/.initial=+.5cm,%
+ ortho/lr distance/.initial=+.5cm,%
+ ortho/rl distance/.initial=+.5cm,%
+ ortho/ratio=.5,% default value
+ ortho/spacing=4,% default value
}%
%BEGIN_FOLD Timer
@@ -207,7 +206,7 @@
\tikz@make@last@position{#1}%
\tikz@flush@moveto@toward{\pgfqpoint{\tikz@lastx}{\pgf@yc}}\pgf@xc\pgf@yc
\begingroup
- \pgfqkeys{/tikz/hvvh}{/tikz/style/.expand once=\tikz@hvvh@currentoption}%
+ \pgfqkeys{/tikz/ortho}{/tikz/style/.expand once=\tikz@hvvh@currentoption}%
\iftikz@shapeborder
\pgf@process{\pgfpointshapeborder{\tikz@shapeborder@name}{\pgfqpoint{\pgf@xb}{\tikz@lasty}}}%
\iftikzext@tikz@hvvh@fromcenter
@@ -277,7 +276,7 @@
\tikz@make@last@position{#1}%
\tikz@flush@moveto@toward{\pgfqpoint{\pgf@xc}{\tikz@lasty}}\pgf@xc\pgf@yc
\begingroup
- \pgfqkeys{/tikz/hvvh}{/tikz/style/.expand once=\tikz@hvvh@currentoption}%
+ \pgfqkeys{/tikz/ortho}{/tikz/style/.expand once=\tikz@hvvh@currentoption}%
\iftikz@shapeborder
\pgf@process{\pgfpointshapeborder{\tikz@shapeborder@name}{\pgfqpoint{\tikz@lastx}{\pgf@yb}}}%
\iftikzext@tikz@hvvh@fromcenter
@@ -348,8 +347,8 @@
\tikz@flush@moveto@toward{\pgfqpoint{\tikz@lastx}{\tikz@lasty}}\pgf@xc\pgf@yc
\tikz@make@last@position{#1}%
\begingroup
- \pgfqkeys{/tikz/udlr}{/tikz/style/.expand once=\tikz@hvvh@currentoption}%
- \pgfmathsetlength\tikzext@tikz@udlr@distance{\pgfkeysvalueof{/tikz/udlr/ud distance}}%
+ \pgfqkeys{/tikz/ortho}{/tikz/style/.expand once=\tikz@hvvh@currentoption}%
+ \pgfmathsetlength\tikzext@tikz@udlr@distance{\pgfkeysvalueof{/tikz/ortho/ud distance}}%
\iftikz@shapeborder
\advance\pgf@y1pt%
\pgf@process{\pgfpointshapeborder{\tikz@shapeborder@name}{\pgfqpoint{\pgf@x}{\pgf@y}}}%
@@ -399,8 +398,8 @@
\tikz@flush@moveto@toward{\pgfqpoint{\tikz@lastx}{\tikz@lasty}}\pgf@xc\pgf@yc
\tikz@make@last@position{#1}%
\begingroup
- \pgfqkeys{/tikz/udlr}{/tikz/style/.expand once=\tikz@hvvh@currentoption}%
- \pgfmathsetlength\tikzext@tikz@udlr@distance{\pgfkeysvalueof{/tikz/udlr/du distance}}%
+ \pgfqkeys{/tikz/ortho}{/tikz/style/.expand once=\tikz@hvvh@currentoption}%
+ \pgfmathsetlength\tikzext@tikz@udlr@distance{\pgfkeysvalueof{/tikz/ortho/du distance}}%
\iftikz@shapeborder
\advance\pgf@y-1pt%
\pgf@process{\pgfpointshapeborder{\tikz@shapeborder@name}{\pgfqpoint{\pgf@x}{\pgf@y}}}%
@@ -450,8 +449,8 @@
\tikz@flush@moveto@toward{\pgfqpoint{\tikz@lastx}{\tikz@lasty}}\pgf@xc\pgf@yc
\tikz@make@last@position{#1}%
\begingroup
- \pgfqkeys{/tikz/udlr}{/tikz/style/.expand once=\tikz@hvvh@currentoption}%
- \pgfmathsetlength\tikzext@tikz@udlr@distance{\pgfkeysvalueof{/tikz/udlr/lr distance}}%
+ \pgfqkeys{/tikz/ortho}{/tikz/style/.expand once=\tikz@hvvh@currentoption}%
+ \pgfmathsetlength\tikzext@tikz@udlr@distance{\pgfkeysvalueof{/tikz/ortho/lr distance}}%
\iftikz@shapeborder
\advance\pgf@x-1pt%
\pgf@process{\pgfpointshapeborder{\tikz@shapeborder@name}{\pgfqpoint{\pgf@x}{\pgf@y}}}%
@@ -501,8 +500,8 @@
\tikz@flush@moveto@toward{\pgfqpoint{\tikz@lastx}{\tikz@lasty}}\pgf@xc\pgf@yc
\tikz@make@last@position{#1}%
\begingroup
- \pgfqkeys{/tikz/udlr}{/tikz/style/.expand once=\tikz@hvvh@currentoption}%
- \pgfmathsetlength\tikzext@tikz@udlr@distance{\pgfkeysvalueof{/tikz/udlr/rl distance}}%
+ \pgfqkeys{/tikz/udlr}{/tikz/ortho/.expand once=\tikz@hvvh@currentoption}%
+ \pgfmathsetlength\tikzext@tikz@udlr@distance{\pgfkeysvalueof{/tikz/ortho/rl distance}}%
\iftikz@shapeborder%
\advance\pgf@x1pt%
\pgf@process{\pgfpointshapeborder{\tikz@shapeborder@name}{\pgfqpoint{\pgf@x}{\pgf@y}}}%
@@ -546,6 +545,16 @@
\tikzset{
node as new start/.is if=tikzext@ortho@preflush,
node as new start,
+ ortho/install shortcuts/.style={
+ *|/.style={only vertical second={#1}}, *|/.default=,
+ |*/.style={only vertical first={#1}}, |*/.default=,
+ *-/.style={only horizontal second={#1}}, *-/.default=,
+ -*/.style={only horizontal first={#1}}, -*/.default=,
+ |-/.style={to path={|-(\tikztotarget)\tikztonodes}},
+ -|/.style={to path={-|(\tikztotarget)\tikztonodes}},
+ -|-/.style=/tikz/horizontal vertical horizontal,
+ |-|/.style=/tikz/vertical horizontal vertical,
+ },
horizontal vertical/.style={to path={-| (\tikztotarget) \tikztonodes}},
vertical horizontal/.style={to path={|- (\tikztotarget) \tikztonodes}},
horizontal vertical horizontal/.style={to path={-|- (\tikztotarget) \tikztonodes}},
@@ -611,10 +620,11 @@
\let\tikzext@ortho@anchor\pgfutil@empty
\let\tikzext@origtotarget\pgfutil@empty
\tikz@scan@one@point\pgfutil@firstofone(\tikztotarget)\relax
+ \pgf@ya=\pgf@y
\iftikz@shapeborder
\let\tikzext@origtotarget\tikztotarget
\tikz@scan@one@point\pgfutil@firstofone(\tikztostart)\relax
- \ifdim\pgf@y>\tikz@lasty\relax
+ \ifdim\pgf@ya>\tikz@lasty\relax
\edef\tikztotarget{\tikztotarget.south}%
\iftikz@shapeborder\def\tikzext@ortho@anchor{.north}\fi
\else
@@ -640,10 +650,11 @@
\let\tikzext@ortho@anchor\pgfutil@empty
\let\tikzext@origtotarget\pgfutil@empty
\tikz@scan@one@point\pgfutil@firstofone(\tikztotarget)\relax
+ \pgf@xa=\pgf@x
\iftikz@shapeborder
\let\tikzext@origtotarget\tikztotarget
\tikz@scan@one@point\pgfutil@firstofone(\tikztostart)\relax
- \ifdim\pgf@x>\tikz@lastx\relax
+ \ifdim\pgf@xa>\tikz@lastx\relax
\edef\tikztotarget{\tikztotarget.west}%
\iftikz@shapeborder\def\tikzext@ortho@anchor{.east}\fi
\else
diff --git a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.paths.timer.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.timer.code.tex
index 3a4d30e68f..3a4d30e68f 100644
--- a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.paths.timer.code.tex
+++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.timer.code.tex
diff --git a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.patterns.images.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.patterns.images.code.tex
index aa732ab835..aa732ab835 100644
--- a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.patterns.images.code.tex
+++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.patterns.images.code.tex
diff --git a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.positioning-plus.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.positioning-plus.code.tex
index 98de181c27..98de181c27 100644
--- a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.positioning-plus.code.tex
+++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.positioning-plus.code.tex
diff --git a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.topaths.arcthrough.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.topaths.arcthrough.code.tex
index d90a2edc78..d90a2edc78 100644
--- a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.topaths.arcthrough.code.tex
+++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.topaths.arcthrough.code.tex
diff --git a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.transformations.mirror.code.tex b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.transformations.mirror.code.tex
index 026b39ab2f..026b39ab2f 100644
--- a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.transformations.mirror.code.tex
+++ b/graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.transformations.mirror.code.tex
diff --git a/graphics/pgf/contrib/tikz-ext/pgfcalendar-ext.sty b/graphics/pgf/contrib/tikz-ext/tex/latex/tikz-ext/pgfcalendar-ext.sty
index a0f5ef3bc0..a0f5ef3bc0 100644
--- a/graphics/pgf/contrib/tikz-ext/pgfcalendar-ext.sty
+++ b/graphics/pgf/contrib/tikz-ext/tex/latex/tikz-ext/pgfcalendar-ext.sty
diff --git a/graphics/pgf/contrib/tikz-ext/pgfcalendar-ext.tex b/graphics/pgf/contrib/tikz-ext/tex/plain/tikz-ext/pgfcalendar-ext.tex
index 30c44187a4..30c44187a4 100644
--- a/graphics/pgf/contrib/tikz-ext/pgfcalendar-ext.tex
+++ b/graphics/pgf/contrib/tikz-ext/tex/plain/tikz-ext/pgfcalendar-ext.tex
diff --git a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.paths.arcto.code.tex b/graphics/pgf/contrib/tikz-ext/tikzlibraryext.paths.arcto.code.tex
deleted file mode 100644
index 213fc1b74a..0000000000
--- a/graphics/pgf/contrib/tikz-ext/tikzlibraryext.paths.arcto.code.tex
+++ /dev/null
@@ -1,104 +0,0 @@
-% Copyright 2022 by Qrrbrbirlbel
-%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Free Documentation License.
-%
-\tikzset{
- arc to/.code=\pgfqkeys{/tikz/arc to}{#1},
- arc to={
- counter clockwise/.code=\pgfkeyssetvalue{/tikz/arc to/ccw flag}{1},
- clockwise/.code=\pgfkeyssetvalue{/tikz/arc to/ccw flag}{0},
- x radius/.code=\pgfkeyssetvalue{/tikz/x radius}{#1},
- y radius/.code=\pgfkeyssetvalue{/tikz/y radius}{#1},
- radius/.code=\pgfkeyssetvalue{/tikz/x radius}{#1}\pgfkeyssetvalue{/tikz/y radius}{#1},
- large/.code=\pgfkeyssetvalue{/tikz/arc to/large flag}{1},
- small/.code=\pgfkeyssetvalue{/tikz/arc to/large flag}{0},
- % defaults
- rotate/.initial=0, counter clockwise, small,
- counter clockwise/.value forbidden,
- clockwise/.value forbidden,
- large/.value forbidden,
- small/.value forbidden}}
-\def\tikz@arcA rc{\pgfutil@ifnextchar t%
- {\tikz@flush@moveto\expandafter\expandafter\expandafter\tikz@arcB@cont\expandafter\pgfutil@gobble\pgfutil@gobble}
- {\tikz@flush@moveto\tikz@arc@cont}}
-\def\tikz@arcB@cont{%
- \pgfutil@ifnextchar[\tikz@@do@arcB{
- \advance\tikz@expandcount by -10\relax% go down quickly
- \ifnum\tikz@expandcount<0\relax%
- \def\@next{\tikz@@do@arcB[]}%
- \else%
- \def\@next{\expandafter\tikz@arcB@cont}%
- \fi%
- \@next}}%
-\def\tikz@@do@arcB[#1]{%
- \def\tikz@arcB@options{#1}%
- \tikz@do@@arcB}
-\def\tikz@do@@arcB{%
- \pgfutil@ifnextchar n{\tikz@collect@label@onpath\tikz@do@@arcB}
- {\pgfutil@ifnextchar c{\tikz@collect@coordinate@onpath\tikz@do@@arcB}
- {\pgfutil@ifnextchar p{\tikz@collect@pic@onpath\tikz@do@@arcB}
- {\tikz@scan@one@point\tikz@do@arcB}}}}
-
-\def\tikz@do@arcB#1{%
- \edef\tikz@timer@start{\noexpand\pgfqpoint{\the\tikz@lastx}{\the\tikz@lasty}}
- \tikz@make@last@position{#1}%
- \edef\tikz@timer@end{\noexpand\pgfqpoint{\the\tikz@lastx}{\the\tikz@lasty}}%
- \iftikz@shapeborder
- \edef\tikz@moveto@waiting{\tikz@shapeborder@name}%
- \fi
- \begingroup
- \tikzset{every arc/.try,every arc to/.try,arc to/.expand once=\tikz@arcB@options}%
- \pgfmathsetmacro\tikz@arc@x{\pgfkeysvalueof{/tikz/x radius}}%
- \ifpgfmathunitsdeclared
- \pgfmathsetmacro\tikz@arc@y{\pgfkeysvalueof{/tikz/y radius}}%
- \ifpgfmathunitsdeclared
- \pgfpatharcto{\tikz@arc@x pt}{\tikz@arc@y pt}
- {\pgfkeysvalueof{/tikz/arc to/rotate}}{\pgfkeysvalueof{/tikz/arc to/large flag}}
- {\pgfkeysvalueof{/tikz/arc to/ccw flag}}{#1}%
- \else
- \tikzerror{You cannot mix dimensions and dimension values in an arc}%
- \fi
- \else
- \pgfmathsetmacro\tikz@arc@y{\pgfkeysvalueof{/tikz/y radius}}%
- \ifpgfmathunitsdeclared
- \tikzerror{You cannot mix dimensions and dimension values in an arc}%
- \else
- \pgf@process{\pgfpointxy{\tikz@arc@x}{0}}%
- \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y}%
- \let\tikz@arc@x\pgfmathresult
- \pgf@process{\pgfpointxy{0}{\tikz@arc@y}}%
- \pgfmathveclen@{\pgf@sys@tonumber\pgf@x}{\pgf@sys@tonumber\pgf@y}%
- \let\tikz@arc@y\pgfmathresult
- \pgfpatharcto{+\tikz@arc@x pt}{+\tikz@arc@y pt}
- {\pgfkeysvalueof{/tikz/arc to/rotate}}{\pgfkeysvalueof{/tikz/arc to/large flag}}
- {\pgfkeysvalueof{/tikz/arc to/ccw flag}}{#1}%
- \fi
- \fi
- \endgroup
- % check whether \pgf@marshall starts with \pgfpathlineto
- \pgfutil@ifxempty\pgf@marshal{}{%
- \edef\tikz@temp{\expandafter\expandafter\expandafter\noexpand\expandafter\pgfutil@firstgobblerest\pgf@marshal\relax}%
- \expandafter\let\expandafter\tikz@temp\tikz@temp
- \pgfutil@ifx\tikz@temp\pgfpathlineto{}{%
- % getting rid of \pgfpatharcaxes inside \pgf@marshal
- \expandafter\expandafter\expandafter\def\expandafter\expandafter\expandafter\pgf@marshal
- \expandafter\expandafter\expandafter{\expandafter\pgfutil@gobble\pgf@marshal}%
- % extracting the other four values needed for the timer
- \edef\tikz@timer@start@angle{\expandafter\pgfutil@firstoffour\pgf@marshal}%
- \edef\tikz@timer@end@angle{\expandafter\pgfutil@secondoffour\pgf@marshal}%
- \pgfextract@process\tikz@timer@zero@axis{\expandafter\pgfutil@thirdoffour\pgf@marshal}%
- \pgfextract@process\tikz@timer@ninety@axis{\expandafter\pgfutil@fourthoffour\pgf@marshal}%
- %
- \let\tikz@timer=\tikz@timer@arc
- }%
- }%
- \tikz@scan@next@command
-}
-\def\pgfutil@firstoffour#1#2#3#4{#1}
-\def\pgfutil@secondoffour#1#2#3#4{#2}
-\def\pgfutil@thirdoffour#1#2#3#4{#3}
-\def\pgfutil@fourthoffour#1#2#3#4{#4}
-\def\pgfutil@firstgobblerest#1#2\relax{#1} \ No newline at end of file
diff --git a/macros/latex/contrib/centeredline/README.md b/macros/latex/contrib/centeredline/README.md
index 8be6413692..d92cd59fd5 100644
--- a/macros/latex/contrib/centeredline/README.md
+++ b/macros/latex/contrib/centeredline/README.md
@@ -2,9 +2,9 @@
Author: Jean-Francois Burnol
Package: centeredline
- Version: 1.1 (2019/05/03)
+ Version: 1.2 (2022/10/10)
License: LPPL 1.3c
- Copyright (C) 2019 Jean-Francois Burnol
+ Copyright (C) 2019, 2022 Jean-Francois Burnol
<jfbu at free dot fr>
# DESCRIPTION #
@@ -13,21 +13,37 @@ After `\usepackage{centeredline}` one can use
\centeredline{....}
-to get the argument centered, in a better way than with `\centerline`:
+to get the argument centered, without ending the current paragraph, and
+without adding extra vertical spacing, in a better way than if using
+`\centerline`:
1. `\verb` or other catcode changes inside the argument are allowed,
-2. the centering (with respect to the surrounding text paragraph) will
+2. The centering (with respect to the surrounding text paragraph) will
be as expected if this all happens inside an item from a LaTeX list
environment.
+3. One does not need to use `\newline` before and after (or at least
+ leave a space token after). Doing so does not hurt, though.
-Material whose natural width exceeds the linewidth will get properly
-centered too.
+The macro itself may be used while in paragraph or in vertical mode.
+Like `\centerline`, if used in vertical mode, it does not enter
+paragraph mode.
-The macro itself may be encountered in paragraph or in vertical mode.
-It places the argument inside a `\hbox` (inside an extra simple group).
+The macro places its argument in a `\hbox` and assignments done inside
+the argument see thus their scope limited to the line.
+The macro is usable from inside a (paragraph mode) table cell.
-# HISTORY #
+It can be nested (for example the argument is a `tabular` or a `\parbox`
+and inside it another `\centeredline` is used).
+
+Material whose natural width exceeds the line width will get properly
+centered too, the extra width going into the margins (or into the
+neighboring cells, if used in a paragraph mode table cell).
+
+
+# CHANGE LOG #
+
+Initial statement:
I have used this macro since 2013 and it has served me well.
@@ -36,11 +52,15 @@ have some limitations which I somehow did not encounter in my personal usage.
Suggestions for improvements are welcome, and will be recorded although I do
not expect to update the package anytime soon.
-
-# CHANGE LOG #
-
- v1.0 (2019/04/27): First release.
-- v1.1 (2019/05/03): Improved description (this file).
+- v1.1 (2019/05/03): Improve this README.
+- v1.2 (2022/10/10):
+ * make the macro usable in table cells
+ (thanks to Antoine Missier for pointing out this limitation;
+ see his package `spacingtricks` for another centering macro)
+ * avoid an extra empty line if the macro is used following a `\\`
+ or a `\newline` (but why should it be? ;-) )
+ (thanks to Kroum Tzanev for a related discussion)
# LICENSE #
diff --git a/macros/latex/contrib/centeredline/centeredline.sty b/macros/latex/contrib/centeredline/centeredline.sty
index d1afe19f3e..240ac64b90 100644
--- a/macros/latex/contrib/centeredline/centeredline.sty
+++ b/macros/latex/contrib/centeredline/centeredline.sty
@@ -1,26 +1,18 @@
%% File: centeredline.sty
-%% Version: 1.1 (2019/05/03)
+%% Version: 1.2 (2022/10/10)
%% License: LPPL 1.3c
-%% Copyright (C) 2019 Jean-Francois Burnol <jfbu at free dot fr>
+%% Copyright (C) 2019, 2022 Jean-Francois Burnol <jfbu at free dot fr>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{centeredline}[2019/05/03 v1.1 centering a line the JFB way]
+\ProvidesPackage{centeredline}[2022/10/10 v1.2 centering a line the JFB way]
% \centeredline: OUR OWN LITTLE MACRO FOR CENTERING LINES
%
-% 7 mars 2013
-% \ignorespaces added June 9, 2013
-%
-% This macro allows to conveniently center a line inside a paragraph and still
-% allow usage therein of \verb or other macros changing catcodes.
-%
-% It works nicely in list environments (as it uses \linewidth, not \hsize...;
-% maybe there is an even better LaTeX parameter to use, but I don't know
-% LaTeX2e that well enough and never typeset in two-column mode.)
-%
-% Note: \centeredline is scope limiting for assignments done during execution
-% of its argument.
+% March 7, 2013 : first version
+% June 9, 2013 : \ignorespaces added
+% Oct. 10, 2022 : \unpenalty\newline replaces \\\relax
%
+% See README.md for documentation.
\newcommand*\centeredline{%
- \ifhmode \\\relax
+ \ifhmode \unpenalty\newline
\def\centeredline@@{\hss\egroup\hskip\z@skip\ignorespaces}%
\else
\def\centeredline@@{\hss\egroup}%
diff --git a/macros/latex/contrib/currfile/README b/macros/latex/contrib/currfile/README
index d8c9f7be4c..26eb70dd62 100644
--- a/macros/latex/contrib/currfile/README
+++ b/macros/latex/contrib/currfile/README
@@ -1,8 +1,8 @@
LaTeX package 'currfile'
~~~~~~~~~~~~~~~~~~~~~~~~
-Copyright (c) 2010-2020 by Martin Scharrer <martin@scharrer-online.de>
-WWW: https://sourceforge.net/projects/currfile/
-Code repository: https://sourceforge.net/p/currfile/code/
+Copyright (c) 2010-2022 by Martin Scharrer <martin.scharrer@web.de>
+Repository: https://github.com/MartinScharrer/currfile
+Issues: https://github.com/MartinScharrer/currfile/issues
Provides macros holding the file name information (dir, base name, extension, full name and full path) for
files read by LaTeX's \input and \include macros.
diff --git a/macros/latex/contrib/currfile/currfile.dtx b/macros/latex/contrib/currfile/currfile.dtx
index 5f677130a0..539c8dc728 100644
--- a/macros/latex/contrib/currfile/currfile.dtx
+++ b/macros/latex/contrib/currfile/currfile.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%<=*COPYRIGHT>
%%
-%% Copyright (c) 2010-2020 by Martin Scharrer <martin@scharrer-online.de>
+%% Copyright (c) 2010-2022 by Martin Scharrer <martin.scharrer@web.de>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -29,10 +29,10 @@
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{currfile.dtx}[%
%<=*DATE>
- 2020/09/29
+ 2022/10/10
%<=/DATE>
%<=*VERSION>
- v0.7d
+ v0.8
%<=/VERSION>
DTX file for currfile package]
@@ -59,7 +59,7 @@
%</driver>
% \fi
%
-% \CheckSum{1114}
+% \CheckSum{1115}
%
% \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
@@ -91,6 +91,7 @@
% \changes{v0.7b}{2013/02/01}{Support for \cs{\subinput*} etc.\ from the \pkg{import} package which requires a different path search order.}
% \changes{v0.7c}{2015/04/23}{Removed stack underflow warning if loaded by other package. Set default file name in this case to main file name.}
% \changes{v0.7d}{2020/09/29}{Updated documentation for 2020/10/01 \LaTeX\ release.}
+% \changes{v0.8}{2022/10/10}{Fixed issue with filename with spaces.}
%
%
% \GetFileInfo{currfile.dtx}
@@ -103,8 +104,8 @@
% \DoNotIndex{\message,\jobname,\@namedef}
%
% \author{Martin Scharrer}
-% \email{martin@scharrer-online.de}
-% \repository{https://sourceforge.net/projects/currfile/}
+% \email{martin.scharrer@web.de}
+% \repository{https://github.com/MartinScharrer/currfile}
% \maketitle
%
% \begin{abstract}
@@ -529,6 +530,16 @@
% \end{macro}
%
%
+% \begin{macro}{\currfile@openin}[2]{file handle}{file path}
+% Opens the given file for reading.
+% \begin{macrocode}
+\def\currfile@openin#1#2{%
+\openin#1="#2"\relax
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
% \begin{macro}{\currfile@checkpath}
% This loop is placed in an own macro for efficiency reasons.
% In the majority of cases it should not be needed and having it as
@@ -537,7 +548,7 @@
% \changes{2011/09/18}{v0.5}{New macro as part of the \cs{input@path} support.}
% \begin{macrocode}
\def\currfile@checkpath{%
- \openin\@inputcheck\@filef@und\relax
+\currfile@openin{\@inputcheck}{\@filef@und}%
\ifeof\@inputcheck
\currfile@check@inputpath
\fi
@@ -554,7 +565,7 @@
\expandafter\@tfor
\expandafter\@tempb
\expandafter:\expandafter=\input@path\do{%
- \openin\@inputcheck\@tempb\@filef@und\relax
+\currfile@openin{\@inputcheck}{\@tempb\@filef@und}%
\ifeof\@inputcheck\else
\edef\@filef@und{\@tempb\@filef@und}%
\@break@tfor
@@ -572,7 +583,7 @@
\ifx\IfFileExists\@iffileonpath
\currfile@check@inputpath
\else
- \openin\@inputcheck\@filef@und\relax
+\currfile@openin{\@inputcheck}{\@filef@und}%
\ifeof\@inputcheck
\currfile@check@inputpath
\fi
diff --git a/macros/latex/contrib/currfile/currfile.pdf b/macros/latex/contrib/currfile/currfile.pdf
index fa175e5248..21c3c7f4b2 100644
--- a/macros/latex/contrib/currfile/currfile.pdf
+++ b/macros/latex/contrib/currfile/currfile.pdf
Binary files differ
diff --git a/macros/latex/contrib/exam-n/A1.clo b/macros/latex/contrib/exam-n/A1.clo
deleted file mode 100644
index d40b8c26a9..0000000000
--- a/macros/latex/contrib/exam-n/A1.clo
+++ /dev/null
@@ -1,82 +0,0 @@
-\ProvidesFile{A1.clo}[2016/12/19 1.1.4]
-\typeout{A1 exam options, 1.1.4}
-%%%% Source: Mercurial revision e8a612cb25f4, 2016-12-19 16:49 +0000, tag exam-n-1.1.4 + 0
-%%%% File: A1.clo
-%%%% Copyright 2005--2016, Norman Gray
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
-%% This work has the LPPL maintenance status `maintained'.
-%%
-%% The Current Maintainer of this work is Norman Gray <http://nxg.me.uk>
-%%
-%% This work consists of the files exam-n.dtx and exam-n.ins,
-%% the derived file exam-n.cls,
-%% and the associated *.clo files.
-
-% Nothing here beyond the constants sheet
-\constantssheet{
-\begin{center}
-\def\e{{\rm e}}\def\deg{^\circ}
-\def\dmin{^{\rm m}}
-\def\dsec{^{\rm s}}
-\def\ez{\epsilon_{\rm 0}} % permittivity of free space
-\def\er{\epsilon_{\rm r}} % relative permittivity
-\def\ep{\epsilon} % permittivity
-\def\muz{\mu_{\rm 0}} % permeability of free space
-\def\mur{\mu_{\rm r}} % relative permeability
-\def\me{m_{\rm e}} % mass of the electron
-\def\mprot{m_{\rm p}} % mass of the proton
-\def\az{\a_{\rm 0}} % Bohr radius
-\def\mub{\mu_{\rm B}} % Bohr magneton
-%
-\def\tothe#1{$^{#1}$} % raise to the power #1
-\def\metre{\,{\rm m}}
-\def\kg{\,{\rm kg}}
-\def\sec{\,{\rm s}}
-\def\mm{\,{\rm mm}}
-\def\mol{\,{\rm mol}}
-\def\kelvin{\,{\rm K}}
-\def\joule{\,{\rm J}}
-\def\farad{\,{\rm F}}
-\def\ampere{\,{\rm A}}
-\def\ev{\,{\rm eV}}
-\def\hz{\,{\rm Hz}}
-\def\volt{\,{\rm V}}
-\def\watt{\,{\rm W}}
-\def\newton{\,{\rm N}}
-\def\unit#1{\,{\rm #1}}
-%
-{\Large\textbf{Values of astrophysical constants}}\\[\bigskipamount]
-\begin{tabular}{lll} \hline\\[-1.5ex] % slightly hacky extra space after hline
- speed of light & $c$ & $2.998\times 10^8 \metre\sec^{-1}$\\
- gravitational constant & $G$ & $6.673\times10^{-11}\newton\metre^2\kg^{-2}$\\
- Planck constant & $h$ & $6.626\times10^{-34}\joule\sec$\\
- Boltzmann constant & $k_{\rm B}$ & $1.381\times10^{-23} \joule\kelvin^{-1}$\\
- Stefan-Boltzmann constant & $\sigma$ & $5.671\times10^{-8}\watt\metre^{-2}\kelvin^{-4}$\\
- Rydberg constant & $R_\infty$ &$1.097\times10^{7}\metre^{-1}$\\
- Avogadro constant & $N_{\rm A}$ & $6.022\times 10^{23}\unit{mol}^{-1}$\\
- gas constant & $R$ & $8.315 \joule\mol^{-1}\kelvin^{-1}$\\
- proton mass & $\mprot$ & $1.673\times10^{-27} \kg$\\
- electron mass & $\me$ & $9.109\times10^{-31} \kg$\\
- elementary charge & $e$ & $1.602\times 10^{-19}\unit{C}$\\
- electronvolt & ${\rm eV}$ & $1.602\times 10^{-19}\unit{J}$\\[3pt]
- astronomical unit & au & $1.496\times10^{11} \metre$\\
- parsec & pc & $3.086\times10^{16}\metre$\\
- light year & ly & $9.461\times10^{15} \metre$\\[3pt]
- solar mass & $M_\odot$ & $1.989\times10^{30} \kg$\\
- solar radius & $R_\odot$ & $6.960\times10^8 \metre$\\
- solar luminosity & $L_\odot$ & $3.826\times10^{26}\watt$\\
- Earth mass & $M_\oplus$ & $5.976\times10^{24} \kg$\\
- Earth radius & $R_\oplus$ & $6.378\times10^6 \metre$\\
- obliquity of the ecliptic & $\epsilon$ & $23^\circ\,26'$\\[\medskipamount]
-\hline
-\end{tabular}
-\end{center}
-}
diff --git a/macros/latex/contrib/exam-n/README b/macros/latex/contrib/exam-n/README
deleted file mode 100644
index a128c336ef..0000000000
--- a/macros/latex/contrib/exam-n/README
+++ /dev/null
@@ -1,69 +0,0 @@
-
-exam-n: LaTeX class file for exams, version 1.1.4, 2016 December 19.
-====================================
-
-[ Mercurial revision e8a612cb25f4, 2016-12-19 16:49 +0000, tag exam-n-1.1.4 + 0 ]
-
-
-Overview
---------
-
-The class is designed to be localised to a particular institution's
-exam layout, by a suitably skilled LaTeX hacker. There are three
-possible ways of doing this, in increasing order of sophistication:
-
- 1. Make suitable adjustments to individual exam `.tex` files; or
-
- 2. Rename the distributed `exam-n.dtx` file to something more locally
- suitable, and edit it with suitable changes (search for
- `%%%CONFIGURE` for hints on where to adjust); or
-
- 3. Fork the Mercurial repository at
- [bitbucket](https://bitbucket.org/nxg/exam-n), change the
- value of the `EXAM-N` variable in the `Makefile`, and then
- edit the `exam-n.dtx` file. See the comments at the top of the
- `Makefile`.
-
-In case 2, you _must_ change the name of the `.dtx` file, and in case
-3, you must change the `EXAM-N` variable, to avoid terrible confusion
-(you probably also want to avoid the names of the other exam style
-files at CTAN, since they just might have found their way into your
-TEXINPUTS path).
-
-For general details, talk to Norman Gray <norman@astro.gla.ac.uk>.
-
-This is free software, and you are encouraged to use and adapt it as
-you see fit. Norman can give advice. If, however, you need more
-substantial help with the customisations of option 3 above, or need
-continuing support, then we can surely arrange something more
-elaborate.
-
-With the version 1.1 release, the interface should now be regarded
-as rather stable. However version 1.1 was the first to be released
-outside Glasgow University, so there may be some changes to the
-interface which will emerge with broader use, as well as some bug
-fixes. The interface _may_, therefore, yet change. If you use
-this class to produce exams, it would be wise to include a copy of
-the class file locally, rather than relying on a central version. If
-you need an earlier version of the class, let me know.
-
-
-Documentation
-------------
-
- * Documentation for question authors is in `notes-for-authors.pdf`.
- * The full version of the documentation, for 'exam conveners' (or
- equivalent) is in `exam-n.pdf`. This and the author
- documentation are built as part of the distribution.
- * Basic documentation for a LaTeX localiser is in this file (see
- above), with extra remarks at the top of the `Makefile`.
-
-There are brief release notes in exam-n.html.
-
-
-Distribution and copyright
---------------------------
-
-Copyright 2005--2016, Norman Gray <http://nxg.me.uk>
-Distributed under the terms of The LaTeX Project Public License (LPPL);
-see the file lppl.txt for details.
diff --git a/macros/latex/contrib/exam-n/README.ctan b/macros/latex/contrib/exam-n/README.md
index 872ae0b92a..872ae0b92a 100644
--- a/macros/latex/contrib/exam-n/README.ctan
+++ b/macros/latex/contrib/exam-n/README.md
diff --git a/macros/latex/contrib/exam-n/exam-n.dtx b/macros/latex/contrib/exam-n/exam-n.dtx
index 043d2c9f7c..ce752727b8 100644
--- a/macros/latex/contrib/exam-n/exam-n.dtx
+++ b/macros/latex/contrib/exam-n/exam-n.dtx
@@ -3,10 +3,13 @@
%
% Generated file : DO NOT EDIT
%
-%% Release version 1.1.4, 2016 December 19.
+%% Release version exam-n-1.4.0, 2022 October 10.
+%% See https://purl.org/nxg/dist/exam-n
+%% and https://heptapod.host/nxg/exam-n
+%% and https://www.ctan.org/pkg/exam-n
%%
%%%% File: exam-n.dtx
-%%%% Copyright 2005--2016, Norman Gray
+%%%% Copyright 2005--2022, Norman Gray
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -18,136 +21,47 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Norman Gray <http://nxg.me.uk>
+%% The Current Maintainer of this work is Norman Gray <https://nxg.me.uk>
%%
%% This work consists of the files exam-n.dtx and exam-n.ins,
%% the derived file exam-n.cls,
%% and the associated *.clo files.
-%<+package|driver|example>%%%% Source: Mercurial revision e8a612cb25f4, 2016-12-19 16:49 +0000, tag exam-n-1.1.4 + 0
+
+%<+package|driver|example>%%%% Source: a91e9cff7cac, 2022-10-10T13:33:17+01:00
%%
%<*package|driver>
%</package|driver>
%<+package>\NeedsTeXFormat{LaTeX2e}
-%<+package>\ProvidesClass{exam-n}[2016/12/19 1.1.4]
-%<+package>\typeout{Class: `exam-n 1.1.4 <2016/12/19>}
+%<+package>\ProvidesClass{exam-n}[2022/10/10 exam-n-1.4.0]
+%<+package>\typeout{Class: `exam-n-1.4.0 <2022/10/10>}
%
%<*driver>
\documentclass{ltxdoc}
\title{exam-n: exam papers}
-\author{Norman Gray\\(\texttt{norman@astro.gla.ac.uk})}
-\date{Release 1.1.4}
+\author{Norman Gray\\(\texttt{norman.gray@glasgow.ac.uk})}
+\date{Version exam-n-1.4.0, 2022 October 10}% ...rather than exam-n-1.4.0, which isn't reader-focused
\usepackage{url}
\newcommand\Lopt[1]{\textsf {#1}} % options
\newcommand\file[1]{\texttt {#1}}
\newcommand\Lcount[1]{\textsl {\small#1}}
\newcommand\Lenv[1]{\texttt{\{#1\}}} %environments
-\newcommand\Lpackage[1]{\{\textsf{#1}\}} %packages
-%Make command strings easier to write
+\newcommand\Lpackage[1]{[\textsf{#1}]} %packages
+%Make command strings easier to write, with \cmd|\foo|
%{\catcode`\<=\active \gdef<#1>{\meta{#1}}}
{\catcode`\<=\active
\gdef<#1>{{\ensuremath\langle\normalfont\textsl{#1}\ensuremath\rangle}}}
\def\cmd{\begingroup
- \catcode`\\=12 \catcode`\{=12 \catcode`\}=12
+ \catcode`\\=12 \catcode`\{=12 \catcode`\}=12 \catcode`\#=12
\catcode`\<=\active \catcode`\|=12
\docmd}
\def\docmd|#1|{\texttt{#1}\endgroup}
-%%% \url macro (url.sty does this better)
-%\def\setpathdots{\discretionary{.}{}{.}}
-%\def\setpathslash{\discretionary{/}{}{/}}
-%{\catcode`\.=\active
-% \catcode`\/=\active
-% \gdef\pathcats{%
-% \catcode`\%=12 \catcode`\~=12
-% \catcode`\.=\active \let.\setpathdots
-% \catcode`\/=\active \let/\setpathslash
-% \catcode`\#=12 \catcode`\_=12}%
-% }
-%\def\setpath#1{\ttfamily <\nobreak #1\nobreak>\endgroup}
-%\def\url{\begingroup\pathcats\setpath}
-\def\bs{$\backslash$}
-\makeatletter
-% See Makefile for gymnastics here...
-% This hoiks the extra symbols at the bottom of the file, into the
-% text here, so they can be documented.
-% Abbreviations for degrees.
-% \begin{macrocode}
-\newcommand\BSc{B.Sc.{}}
-\newcommand\MSci{M.Sci.{}}
-\newcommand\MSc{M.Sc.{}}
-\newcommand\MA{M.A.{}}
-\newcommand\MEng{M.Eng.{}}
-\newcommand\BEng{B.Eng.{}}
-% \end{macrocode}
-%
-% Tweaks to differentials.
-% \begin{macrocode}
-\newcommand{\dd}{\mathrm{d}}
-\newcommand{\ddd}{\,\mathrm{d}} % inside an integral, including thinspace
+\def\secref#1{Sect.~\ref{#1}}
-\def\Diffl{\@ifstar\@Difflflat\@Diffl}
-\def\Partial{\@ifstar\@Partialflat\@Partial}
-\def\@Partial{\@ifnextchar[{\@@Diffl\partial}{\@@Diffl\partial[]}}
-\def\@Partialflat{\@ifnextchar[{\@@Difflflat\partial}{\@@Difflflat\partial[]}}
-\def\@Diffl{\@ifnextchar[{\@@Diffl\dd}{\@@Diffl\dd[]}}
-\def\@Difflflat{\@ifnextchar[{\@@Difflflat\dd}{\@@Difflflat\dd[]}}
-\def\@@Diffl#1[#2]#3#4{%
- \def\@tempa{#2}%
- \ifx\@tempa\empty
- \frac{#1#3}{#1#4}%
- \else
- \frac{{#1}^{#2}#3}{#1{#4}^{#2}}%
- \fi}
-\def\@@Difflflat#1[#2]#3#4{%
- \def\@tempa{#2}%
- \ifx\@tempa\empty
- #1#3\mskip-0.8mu/\mskip-1.2mu #1#4%
- \else
- {#1}^{#2}#3\mskip-0.8mu /\mskip-1.2mu #1{#4}^{#2}%
- \fi}
-% \end{macrocode}
-%
-% The exponential sign
-% \begin{macrocode}
-\def\e{{\mathrm e}}
-% \end{macrocode}
-%
-% Physical units in |\rm|. Unstarred version includes leading
-% |\thinspace|. Starred version doesn't, and is used when referring to
-% the unit by itself (eg axis is |$B/\units*T$|), and is not qualifying
-% a number.
-% FIXME: |\mu| in |\units| can come out wrong in some fonts (mtpro2?)
-% -- needs investigation.
-% \begin{macrocode}
-\def\units{\begingroup
- \catcode`\.=\active
- \@ifstar{\let\un@tsspace\relax \un@ts}%
- {\let\un@tsspace\thinspace\un@ts}}
-\begingroup
- \catcode`\.=\active
- \gdef\un@ts#1{\let~\thinspace\let.\thinspace
- \ifmmode
- \un@tsspace\mathrm{#1}%
- \else
- \nobreak$\un@tsspace\mathrm{#1}$%
- \fi
- \endgroup}
-\endgroup
-% \end{macrocode}
-%
-% Other miscellaneous symbols:
-% The AU is nothing exciting, but may be adjusted in future
-% \begin{macrocode}
-\def\au{au}
-% \end{macrocode}
-% The symbol for Compton wavelength is a crossed lambda -- the following isn't perfect, but is OK for now.
-% \begin{macrocode}
-\def\lambdabar{\setbox\@tempboxa\hbox{$\lambda$}%
- \hbox to 0pt{\hbox to \wd\@tempboxa{\hss$\bar{}$\hss}\hss}\box\@tempboxa}
-% \end{macrocode}
-\makeatother
+% Various definitions of this package, so we can document them.
+\usepackage{examndefs}
% Uncomment \OnlyDescription to skip the implementation
%\OnlyDescription
@@ -214,14 +128,74 @@
% |\comment| command.
%
% \item[\Lopt{cmfonts}, \Lopt{psfonts}, \Lopt{mathptm},
-% \Lopt{mathtime}, \Lopt{mtpro2}]
-% The \Lopt{cmfonts} option uses the Computer Modern fonts for the
-% document, and the \Lopt{psfonts} uses PostScript fonts. In this
-% latter case, you will possibly want to use one of the
-% \Lopt{mathtime} or \Lopt{mtpro2} options also, to use the
-% mathtime or MTPro2 font set for the maths in the document;
-% alternatively you can use the \Lopt{mathptm} option to use that
-% free but less good alternative.
+% \Lopt{mathtime}, \Lopt{mtpro2}, \Lopt{stix2}]
+% The \Lopt{cmfonts} option (the default) uses the Computer Modern fonts for the
+% document, and the other options use PostScript or OpenType fonts.
+%
+% The \Lopt{mathtime} or \Lopt{mtpro2} options select PostScript
+% Times Roman, Helvetica and Courier for the body text, plus either Mathtime or
+% Mathtime Professional~2 to typeset maths (this is commercially
+% distributed by
+% PC\TeX\footnote{\url{https://www.pctex.com/mtpro2.html}}, and
+% designed to be compatible with Times Roman). A broadly
+% compatible alternative to this is to use the \Lopt{mathptm}
+% option, but although this is free, the results aren't impressive.
+%
+% A final option is to use the \Lopt{stix2} option to choose
+% specifically and exclusively the
+% (free) STIX2 font set\footnote{\url{https://www.stixfonts.org}}
+% for both text and maths.
+% On this site, you will need to download and install
+% the files in the \url{static_otf.zip} bundle.
+% Note that the support for this option is somewhat experimental, and
+% at present, this package simply uses (serif) STIX2 roman
+% for all font shapes. Since the exam style doesn't use any sans serif by
+% default, this doesn't matter, at some level. The
+% \Lopt{sansserif} option is not compatible with this option (the option
+% won't produce any error, but neither will it produce any effect).
+%
+% \textbf{FIXME: remove this when unicode-math is working.}
+% \textbf{Note:} because of an unfortunate interaction between packages, the
+% \Lpackage{stix2} and \Lpackage{siunitx} packages can produce unexpected
+% results with some combinations of \TeX\ engine and package version
+% (specifically, \Lpackage{stix2} plus \Lpackage{siunitx}
+% and \cmd|\micro| or \cmd|\circ| can produce garbled characters
+% without \LaTeX\ reporting an error). Before \TeX Live 2021, this
+% worked correctly with Xe\LaTeX\ and Lua\LaTeX, but not with
+% pdf\LaTeX; from \TeX Live 2021 this works as expected with
+% pdf\LaTeX, but works with the other two \emph{only} if you load
+% the \Lpackage{siunitx} package with
+% \cmd|\usepackage{siunitx}[=v2]|. I hope that future versions of
+% one or other of these packages will make clear how this package
+% should handle them, in a way which avoids this special-casing.
+% \iffalse See
+% https://github.com/josephwright/siunitx/issues/550
+% https://github.com/josephwright/siunitx/issues/547
+% https://github.com/stipub/stixfonts/issues/235
+% \fi
+%
+% The handling of non-standard fonts has always been slightly
+% fragile in \LaTeX.
+% The \Lopt{mtpro2} and \Lopt{stix2} options are those currently
+% most used by the author, and are therefore the ones most likely
+% to get the various font nuances correct.
+%
+% \item[\Lopt{uprightpi}]By default $\pi$ is set slanted, as is the
+% usual \LaTeX\ default. When this is referring to the circular
+% constant, however, this should (in some typesetting styles) be set as an upright letter, in
+% fonts which support this. If the option \Lopt{uprightpi} is
+% present, then |\pi| is defined to produce an upright letter, and
+% the command |\italicpi| is defined to produce the slanted version.
+% Whether this option is supplied or not, the macro |\uppi| will
+% produce a single upright~$\pi$.
+% Note: this is at present implemented
+% only for the \Lopt{mtpro2} and \Lopt{stix2} options,
+% and the combination of pdflatex+stix2 does not support |\uppi| at present.
+%
+% \item[\Lopt{(no)siunitx}] Load the \Lpackage{siunitx} package, or
+% not. The default is yes. The |\units| macro, described below,
+% still exists as an alternative, but will be removed in a
+% forthcoming release (probably after 1.4.x).
%
% \item[\Lopt{(no)showsolutions}]
% These control whether the solutions to
@@ -235,7 +209,7 @@
% These control whether mark totals and subtotals are tracked within
% the question (perquestionmarks), and whether the total available
% marks are displayed at the end of the question (showmarktotals).
-% See Sect.\,\ref{s:question} for more discussion (this
+% See \secref{s:question} for more discussion (this
% option was called \Lopt{showmarks} up to release 0.15).
%
% \item[\Lopt{(no)pageperquestion}]
@@ -269,8 +243,9 @@
% \item[\Lopt{sansserif}]
% Use a sans serif font for the body text. This is plug-ugly, not
% least because it doesn't match the maths font; also, it may be
-% easier or harder for dyslexic students to read (depending on your
-% superstition -- there seems remarkably little actual evidence
+% easier or harder for dyslexic students to read (there seems to be
+% a variety of advice here, in both directions, ranging from
+% confident to dogmatic, but remarkably little solid evidence
% either way).
%
% \item[\Lopt{largefont}, or \Lopt{hugefont}]
@@ -283,9 +258,9 @@
% \file{.clo} file, containing course-, department- or group-specific style
% modifications. Most typically, these changes will affect the
% rubric, and the sheet of physical constants.
-% The only generic style option is \Lopt{A1}
+% The only generic style option is \Lopt{myclass}
% (which is included as an example of how such a file is written).
-% See section~\ref{s:custom} below.
+% See \secref{s:custom} below.
%
% In some circumstances -- for example when processing exam scripts
% under the control of a Makefile or script -- it can be convenient to
@@ -390,6 +365,9 @@
% preamble. After that, you must provide a question-number argument
% (in square brackets) for every question.
%
+% Using |\label| within a question sets a label for the question number;
+% using it within a |\part| (see below) labels the part number.
+%
% In some odder circumstances, you might not want to have any question
% numbers at all; for example, you might want to require examinees to
% attempt \emph{all} of the questions, and so simply have a mark for
@@ -467,7 +445,8 @@
% different questions, but cannot be |\input|
% unedited, as described above. If, however, they have \emph{only}
% these structures (that is, only the |\documentclass| command,
-% the \Lenv{document} environment, and zero or more |\usepackage| commands),
+% the \Lenv{document} environment, and zero or more |\usepackage|
+% or |\RequirePackage| commands),
% then you can most conveniently import them unedited using the
% |\includequestion| command.
% \begin{verbatim}
@@ -483,6 +462,12 @@
% question, you will have to make sure that whoever is assembling the
% master file includes those packages there, too.
%
+% That is, we don't try too hard to support including just any old \LaTeX, here:
+% any complicated preamble requirements in an included file should
+% probably be managed by the exams convener transplanting them into
+% the preamble of the main document. This may be an overly
+% simple-minded approach, and may change in future versions.
+%
% The |\includequestion| command takes an optional argument which
% overrides the question number. This caters for the case where
% question authors have (unhelpfully) included question numbers in the
@@ -505,7 +490,7 @@
% (c)..., or (i), (ii), (iii), and so on. Precede each of these with
% this |\part| command. The formatting of the part numbers is
% controlled by the exam style, as customised in
-% Sect.~\ref{s:custom}. This macro starts a new paragraph.
+% \secref{s:custom}. This macro starts a new paragraph.
%
% You can use the |\part| macro within solutions: this is useful if
% you have the entire \Lenv{solution} environment at the end of the
@@ -515,6 +500,13 @@
% so if you use this in the solutions, you must have as many
% |\part|s in the solution as there are parts in the question.
%
+% In some (rare) cases, you may want to force a particular part
+% number. You can do that with an optional argument |\part[99]|
+% which overrides the auto-incremented numbering. Note that this
+% skips the auto-increment of the number but doesn't cancel it, so
+% if you do this for one part number you should probably do it for
+% all of them.
+%
% \DescribeMacro{\partmarks}
% \DescribeMacro{\partmarks*}
% Macros \cmd|\partmarks{<num>}| and \cmd|\partmarks*{<num>}| announce
@@ -523,21 +515,55 @@
% number declared at the beginning of the {question} environment.
% You will typically have just one |\partmarks| per |\part|, but
% you can have more if you want.
-% The starred version differs by adjusting the position of the mark
-% indicator, and should be used either (i) after (for example) an
-% itemized list, or some other structure which leaves an expanse of
-% white space on the right-hand side of the page; or (ii) within
-% an \emph{unnumbered} equation. If, in case (ii), the style of
-% the part-marks indicators is such that the indicator may be
-% mistaken for an equation number, then it would be wise to use
-% either |\partmarks*| or plain |\partmarks| after the equation,
-% instead.
+%
+% The |\partmarks| command will most typically go at the end of a
+% paragraph, but it may also appear inside an equation (that is, in
+% |\[...\]|; don't use |$$...$$|), inside one or other
+% \Lpackage{amsmath} display or \Lenv{equation} environments, or in
+% a list or other environment. If it appears
+% inside an environment, the indicator will appear at the
+% \emph{end} of the environment, independent of where in the
+% environment the command was typed (which implies that you can't
+% have more than one inside an environment). The alignment of
+% the partmarks indicator is not currently as good as I'd like it
+% to be, in the case of \Lpackage{amsmath} alignments, but this
+% turns out to be hard to improve.
+%
+% The starred version is similar, but budges its indicator upwards
+% a little, and is a heuristic alternative which is useful in some
+% cases \emph{after} a list or display, if the placement of the
+% indicator is otherwise inaesthetic
+% (if the style of the part-marks indicators happens to be such
+% that the indicator may be mistaken for an equation number, then
+% it would be wise to use either |\partmarks| or |\partmarks*|
+% after the equation, instead). If you use |\partmarks*| within a
+% display, you might be confronted by an error message, talking
+% about |\eqno| in maths mode, which is even more incomprehensible
+% than most \LaTeX\ messages.
%
% The unstarred version should only be used at the end of a
% paragraph, and in fact forces a paragraph end; the starred
% version should on stylistic grounds generally be used only at the
% end of a paragraph, but it doesn't force one.
%
+% The |\partmarks| command has an optional argument which
+% indicates the category of the question, thus `bookwork', `unseen',
+% and so on. If this is present, then the category is included in the
+% marks indicator.
+%
+% The |\partmarks| category/comment will typically be only one or two words
+% long, and can sit comfortably in the margin. If an author wants to
+% write more here, then it will be turned into a footnote on the
+% page. This will obviously change the layout of the page, though
+% since this text appears only in \Lopt{showsolutions} mode, that
+% shouldn't be a problem.
+%
+% \DescribeMacro{\defaultpartmarkscategory}
+% If the exams convener wishes to \emph{oblige} people to
+% include such a category, then they might call
+% |\defaultpartmarkscategory{category?}| in a package-options (|.clo|)
+% file, to default the category with a highlighted remark to the question setter.
+%
% \DescribeMacro{\comment}
% \cmd|\comment{<text>}| associates a comment with a part of the text.
% This is ignored in \Lopt{final} mode, but appears in the margin in the
@@ -585,11 +611,10 @@
% Since the contents of this command is automatically uppercased in
% some styles, and there are per-department specifics about the punctuation
% of abbreviations, you should use the commands |\BSc|, |\MSci|, and
-% friends (see section~\ref{s:othercommands}) to set the degree names
+% friends (see \secref{s:othercommands}) to set the degree names
% appropriately.
%
% \DescribeMacro{\universitycoursecode}
-% \DescribeMacro{\schoolcoursecode}
% \DescribeMacro{\degreedescriptions}
% \DescribeMacro{\coursetitle}
% Declare the identity of the exam with
@@ -600,11 +625,6 @@
% This is the code for the course (and thus for the paper) as it
% appears in university information systems, and is a
% university-unique code such as `PHYS3031'.
-% \item[School course code]
-% This is a more informal, but more recognisable, code for the
-% course/paper, as it is generally recognised within the school;
-% for example, the honours Quantum Mechanics course is known
-% within the school as P304H.
% \item[Course title]
% This is just a textual name for the course, for example `Quantum Mechanics'.
% \item[Degree descriptions]
@@ -623,6 +643,13 @@
% |\rubric|) are suppressed. The layout may end up looking a little
% funny.
%
+% \DescribeMacro{\schoolcoursecode}
+% There is also a command |\schoolcoursecode|, which is a more
+% informal, but possibly more recognisable, code for the course/paper,
+% as it is generally recognised within the school; for example, the
+% honours Quantum Mechanics course is known within the school as
+% P304H. Its use is optional.
+%
% \DescribeMacro{\paperident}
% It can be convenient to add some identification to each page, if for
% no other reason than to double-check that you haven't inserted a
@@ -645,7 +672,7 @@
% Sometimes an exam may
% have different time limits for different qualifications: this case,
% separate the various times with |\\|, as in
-% \texttt{\bs examtime\{9.30am -- 12 noon\bs\bs (or) 9.30am -- 1.45am\}}
+% \cmd|\examtime{9.30am -- 12 noon\\ (or) 9.30am -- 1.45am}|.
%
% \DescribeMacro{\rubric}
% \DescribeMacro{\norubric}
@@ -666,6 +693,12 @@
% You will typically not have to change this, but if you do for some
% reason, you can override it with the |\baserubric| command.
%
+% Note that the |\baserubric| command is typically used within a |.clo|
+% file, within the argument to |\OverrideFormatting|. If you wish to
+% further override this on a per-exam basis, then you will need to do
+% so after |\OverrideFormatting| has done its work, and thus
+% immediately after the |\begin{document}|.
+%
% \DescribeMacro{\numquestions}
% Finally, declare the number of questions which are to be in the
% paper with |\numquestions|.
@@ -711,6 +744,13 @@
% There is analogous support for partial derivatives with |\Partial|.
%
% \DescribeMacro{\units}
+% You should generally type units, and numbers with units, using
+% the \Lpackage{siunitx} package, which is loaded by the
+% \Lopt{siunitx} option (which is now enabled by default). However
+% this class currently also supports a basic |\units| command,
+% described below. This macro will be removed in a future version
+% of the class.
+%
% Macros |\units|, |\units*|: you can typeset physical units in
% |\rm|, with tilde or dot
% acting as a separator between units. Since this is typeset in maths mode, all
@@ -719,19 +759,20 @@
% $v=10\units{m.s^{-1}}$. The starred
% version can be used when referring to the unit by itself
% (eg axis is |$B/\units*T$|, or $B/\units*T$), and is not
-% qualifying a number. These macros might be replaced, in the
-% future, by a recommendation to use the \Lpackage{siunitx} package.
+% qualifying a number.
%
-% For other useful symbols, see table~\ref{t:symbols}.
+% \def\cs#1{$\backslash$\texttt{#1}}
+% For other useful symbols, see table~\ref{t:symbols}.\footnote{The
+% package used to support an \cs{au} macro, for astronomical
+% unit, and \cs{lambdabar} for Compton wavelength, but these have
+% since been removed. The former is available via
+% \Lpackage{siunitx}.}
%
% \begin{table}
% \hrule \medskip
% \begin{tabular}{rlp{8cm}}
% |\e|&$\e^{i\pi}=-1$& the exponential is typeset in an upright rather than
% italic shape, as in |$\e^{i\pi}=-1$|.\\
-% |\au|&10\au& use this macro for astronomical units.\\
-% |\lambdabar|&$\lambdabar$& the Compton wavelength, as a lambda with a
-% bar through it.\\
% \end{tabular}
% \caption{\label{t:symbols}Miscellaneous symbols}
% \medskip\hrule
@@ -741,7 +782,7 @@
% \section{Customising the exam style}
% \label{s:custom}
%
-% As described in section~\ref{s:options} above, any unrecognised
+% As described in \secref{s:options} above, any unrecognised
% options are interpreted as an instruction to search for and include
% a class options file, formed from the name of the unrecognised
% option, suffixed with \file{.clo}, which can be anywhere in the
@@ -751,7 +792,7 @@
% The most typical changes here will be to adjust the exam rubric for
% a particular class, with the command |\baserubric|, and to change the
% sheet of physical constants, with the command |\constantssheet|.
-% See the sample file |A1.clo| for examples.
+% See the sample file |myclass.clo| for examples.
%
% Examine this sample \file{SpecialExam.clo} file:
% \begin{verbatim}
@@ -817,13 +858,32 @@
% If you really want to go to town on reformatting, you can redefine
% the command |\maketitle|, which formats the front-page title. When
% formatting this, you have access to each of the fragments of text
-% described in section~\ref{s:preamble}, via a macro named after the
+% described in \secref{s:preamble}, via a macro named after the
% corresponding command. Thus the argument of the |\exambanner| command
% is available in the macro |\@exambanner|. The exception is
% |\numquestions|. If you find yourself needing to do this, it might
% be worth having a discussion with the style's maintainer -- there
% may be a simpler way to get what you want.
%
+% \DescribeMacro{\CheckExamMetadata}
+% One of the things you may change within the |\maketitle| is the
+% checking of exam metadata -- which fields are required and which are
+% optional. You can change these from the default (in
+% \secref{s:preamble}) by defining a command |\CheckExamMetadata|.
+% \DescribeMacro{\RequiredMetadata}
+% This macro takes no arguments, and should use the command
+% \cmd|\RequiredMetadata{<field>}{<description>}{<help-text>}| to
+% perform its tests.
+% {\catcode`\<=\active Here <field> is the metadata key, such as
+% |{examdate}|, which corresponds to the macro |\examdate|, <description> is
+% a brief description of the field, such as |{exam date}|, and
+% <help-text> is a longer bit of explanation. If the corresponding
+% data is missing, then \LaTeX\ stops with an error, and the user can
+% examine the <help-text> by pressing the \texttt h key. You can
+% adjust the test by examining the value of
+% |\iffussydescription ... \fi|, which is set to |\false| if the \Lopt{sloppydescription}
+% option was provided.}
+%
% No more clues. If you want to hack at this, see the definition of
% |\maketitle| in the class file \file{exam-n.cls}.
% Aspire not to break things.
@@ -944,12 +1004,11 @@ $\Delta=6\pi M^2/h^2$, stating clearly any assumptions that
you make.\partmarks{6}
The solar-mass star HD83443 has a 0.35 Jupiter-mass planet that
-follows a circular orbit of period 2.986 days and radius 0.038\units\au.
+follows a circular orbit of period 2.986 days and radius \SI{0.038}{\astronomicalunit}.
Calculate the rate of precession, in arcseconds per year, of the
pericentre line of the planet's orbit.\partmarks{4}
-[Schwartzschild radius of the Sun${}= 3.0\times10^3\units{m}$,
-$1\units\au=1.5\times10^{11}\units m$].
+[Schwartzschild radius of the Sun: \SI{3e3}m; $\SI1\astronomicalunit = \SI{1.5e11}m$]
\begin{solution}
In the first type of calculation, we do a calculation in the LIF, in
@@ -987,6 +1046,12 @@ have a clue.
%</example>
% \end{macrocode}
%
+% \section{Release notes}
+% Recent release notes are below. For older notes, see the source
+% distribution.
+%
+% \input{release-notes.dtx}
+%
% \subsection*{Acknowledgements}
% \addcontentsline{toc}{subsection}{Acknowledgements}
%
@@ -998,6 +1063,26 @@ have a clue.
% \section{Implementation}
%
+% \subsection{\LaTeX3 compatibility}\label{s:compatibility}
+%
+% As of release 1.4.0, we depend on the \LaTeX3 hooks mechanism, which
+% was introduced in 2020. We therefore cannot work with versions
+% older than that.
+%
+% Note that we can't use the (apparently preferable)
+% |\IfFormatAtLeastTF| command to do this test: we want to continue to
+% work even when we're using a \LaTeX\ which is too old for this
+% command to be defined.
+% \begin{macrocode}
+\@ifl@t@r\fmtversion{2020/10/01}
+ {\typeout{Format is \fmtversion -- OK!}}
+ {\ClassError{exam-n}
+ {You need a more recent version of LaTeX}
+ {This class now requires a
+ LaTeX version at least 2020/10/01; version
+ \fmtversion\ is too old}}
+% \end{macrocode}
+%
% \subsection{Options}
%
% First, process the compose/draft/final option.
@@ -1031,13 +1116,33 @@ have a clue.
% from within this class file -- the only reliable way of checking if
% they're present is to look for something like rmtmi.pfa, but
% |\IfFileExists| isn't able to search for any of those files, only ones
-% on the TEXINPUTS path such as mathtime.sty, which can be, and are
+% on the \texttt{TEXINPUTS} path such as \texttt{mathtime.sty}, which can be, and are
% often, installed without the fonts themselves being present.
% \begin{macrocode}
\newcount\examn@mtselect \examn@mtselect=0
\DeclareOption{mathptm}{\@psfontstrue\examn@mtselect=0}
\DeclareOption{mathtime}{\@psfontstrue\examn@mtselect=1}
\DeclareOption{mtpro2}{\@psfontstrue\examn@mtselect=2}
+\DeclareOption{stix2}{\@psfontstrue\examn@mtselect=3}
+% \end{macrocode}
+%
+% The letter $\pi$ is usually the circular constant, and as such
+% should be set in an upright greek font. Don't this by default,
+% since that goes against the usual \LaTeX\ default, but instead
+% define the [uprightpi] option to support this, where possible.
+% Not all fonts make this easy.
+% \begin{macrocode}
+\newif\ifexamn@uprightpi \examn@uprightpifalse
+\DeclareOption{uprightpi}{\examn@uprightpitrue}
+% \end{macrocode}
+%
+% Load the \Lpackage{siunitx} package, or not, defaulting yes.
+% This is now preferred to the |\units| macro, and the latter will be
+% removed in a forthcoming release.
+% \begin{macrocode}
+\newif\ifexamn@siunitx \examn@siunitxtrue
+\DeclareOption{siunitx}{\examn@siunitxtrue}
+\DeclareOption{nosiunitx}{\examn@siunitxfalse}
% \end{macrocode}
%
% Switch between serif and sans serif fonts. We make little attempt
@@ -1109,12 +1214,12 @@ have a clue.
% \end{macrocode}
%
% If \Lopt{sloppydescription} is given, then we don't demand that all
-% the exam metadata is provided. Failing this, we object, fatally, to
+% the required exam metadata is provided. Failing this, we object, fatally, to
% missing information.
% \begin{macrocode}
-\newif\if@fussydescription
-\@fussydescriptiontrue
-\DeclareOption{sloppydescription}{\@fussydescriptionfalse}
+\newif\iffussydescription
+\fussydescriptiontrue
+\DeclareOption{sloppydescription}{\fussydescriptionfalse}
% \end{macrocode}
%
% The university logo is typeset in colour by default; the \Lopt{mono}
@@ -1127,7 +1232,7 @@ have a clue.
% \begin{macrocode}
\def\examn@header@shoutformat#1{{\Large\bfseries #1}}
\DeclareOption{mono}{
- \PassOptionsToPackage{monochrome}{color}
+ \PassOptionsToPackage{monochrome}{xcolor}
\def\examn@header@shoutformat#1{{\Huge\bfseries #1}}
}
\DeclareOption{colour}{}
@@ -1137,13 +1242,16 @@ have a clue.
% exam in `big' or `huge' font sizes, to help students with visual impairments.
% The available font variants are represented as numbers.
% Note: the |\examn@fontvariant| mechanism is in principle more
-% general than simply size variants, but some of the code below
+% general than simply size variants, but some of the code below
% assumes that |\examn@fontvariant| greater than zero means large
% text, and so would need to be adjusted if this becomes untrue.
%
-% The flag |\ifbigfont| is true if the font is `significantly large';
+% The flag |\ifbigfont| is true if the font is `significantly large',
+% in the sense that exam text, or hyphenation or layout, may have to
+% be adjusted in this case:
% option \Lopt{hugefont} sets it true, option \Lopt{largefont} does
-% not; it's intended to be a user-visible and -settable flag.
+% not. It's intended to be a user-visible and -settable flag.
+%
% \emph{Note:} the \Lopt{hugefont} option used to be \Lopt{bigfont};
% the latter is deprecated and may be removed in v1.2.
% \begin{macrocode}
@@ -1174,10 +1282,20 @@ have a clue.
\@styleoverrides={}
\def\OverrideFormatting{\@styleoverrides=}
% \end{macrocode}
+%
+% There are a few other settings which may be defaulted within a
+% \file{.clo} file:
+% \begin{itemize}
+% \item |\constantsheet{...}|: is a table of, for example, physical
+% constants which should appear in exams associated with a particular
+% course. Despite the name, this can be any text which should appear
+% on the first non-cover sheet of the exam.
+% \item |\baserubric|: a modified `base rubric' -- see the
+% documentation of |\rubric| below.
+% \end{itemize}
+%
% If \@constantssheet is defined (using |\constantsheet{...}| in a
-% .clo file), then display it on a page by itself. The macro
-% |\constantssheet| is declared above, before the point where we include
-% .clo files.
+% .clo file), then display it on a page by itself.
% \begin{macrocode}
\newtoks\@constantstoks
\def\@@displayconstants{%
@@ -1198,6 +1316,38 @@ have a clue.
\@constantstoks=}
% \end{macrocode}
%
+% Similarly for the |\baserubric| and |\rubric| commands.
+%
+% The rubric is typically a per-exam thing. The `base rubric' is
+% more-or-less common to all exams, though it's possible to override
+% it in a .clo file.
+% \begin{macrocode}
+\def\@rubric{}
+\def\rubric{\long\def\@rubric}
+\def\norubric{\let\@rubric\@nnil}
+% \end{macrocode}
+% \dots and the base rubric:
+% \begin{macrocode}
+\def\@baserubric{%
+\textbf{Answer each question in a separate booklet}\par
+Candidates are reminded that devices able to store or display text or
+images may not be used in examinations without prior arrangement.
+\if@perquestionmarks
+ \par
+ Approximate marks are indicated in brackets as a guide for candidates.
+\fi
+}
+\def\baserubric{\long\def\@baserubric}
+% \end{macrocode}
+%
+% The |\defaultpartmarkscategory| macro creates a default partmarks
+% `category'. See below. This is declared here, so that it can be
+% used in a |.clo| file without error.
+% \begin{macrocode}
+\let\examn@defaultpartmarkscategory\relax
+\def\defaultpartmarkscategory#1{\def\examn@defaultpartmarkscategory{#1}}
+% \end{macrocode}
+%
% Spit out the style overrides at the beginning of the document,
% rather than here.
% \begin{macrocode}
@@ -1279,11 +1429,23 @@ have a clue.
\hrule}}
% \end{macrocode}
%
-% Other required packages
+% Other required packages.
% \begin{macrocode}
\RequirePackage[english]{babel} % UK hyphenation
\RequirePackage{amsmath}
-\RequirePackage{color}
+\ifexamn@siunitx
+ \RequirePackage{siunitx}
+\fi
+% \end{macrocode}
+% We use the \Lpackage{xcolor} package, in preference to
+% \Lpackage{color}, so that we are compatible with TikZ (TikZ loads
+% the \Lpackage{xcolor} package internally, and that isn't compatible
+% with \Lpackage{color}). We could probably work around this some
+% other way, but \Lpackage{xcolor} seems to be relatively standard,
+% and appears to be backward compatible with \Lpackage{color},
+% so this change is harmless.
+% \begin{macrocode}
+\RequirePackage{xcolor}
% \end{macrocode}
%
% I think flush-left equations look MUCH better than centred, but
@@ -1294,74 +1456,52 @@ have a clue.
%
% \subsection{Layout}
%
-% First, handle PDF metadata, and other document identifiers.
-%
-% Generate an identifier, |\examn@docident| for this paper. This is obtained
-% from the university or school course code, followed by the
-% day-of-year, and the number of minutes since midnight (the goal here
-% is to produce an identifier which automatically increments in time,
-% but which isn't obviously a date
-% \begin{macrocode}
-\def\examn@setdocident{%
- \begingroup
- % yes, a big \ifcase would be more straightforward;
- % no, that wouldn't be any fun at all
- % (also it ends up looking messy and even tricksier).
- \def\@step##1##2\@nil{\advance\@tempcnta##1 \def\@tempa{##2}}
- \def\@tempa{{31}{28}{31}{30}{31}{30}{31}{31}{30}{31}{30}{31}}%
- \@tempcnta=\day % day of month
- \@tempcntb=\month % month of year (unit-offset)
- \loop
- \advance\@tempcntb-1
- \ifnum \@tempcntb>0
- \expandafter\@step\@tempa\@nil
- \repeat
- \@tempcntb=\year % yes, do calculate leap years
- \divide\@tempcntb 4 \multiply\@tempcntb 4
- \ifnum\@tempcntb=\year
- \ifnum\month>2 % but let's not worry about century years...
- \advance\@tempcnta 1
- \fi
+% \subsubsection{The \TeX\ engine}
+% Identify the \TeX\ engine we're using. If we are using pdf\TeX,
+% Xe\TeX, or Lua\TeX, we presume we're generating PDF. The
+% \Lpackage{ifpdf} package exists, and evaluates to true for Lua\TeX,
+% but doesn't distinguish between Xe- and Lua\TeX.
+% It would be nice to use a package such as \Lpackage{iftex}, but (as of late
+% 2017) this seems to do something sufficiently exotic with
+% respect to |\if| nesting, that it confuses the logic here.
+% It seems safer to do this test ourselves, so (a) we know what
+% we're getting, and (b) we have the result in a convenient integer form.
+% \begin{macrocode}
+\newcount\examn@engine
+\examn@engine=0
+\expandafter\ifx\csname pdfmatch\endcsname\relax
+ \expandafter\ifx\csname XeTeXinterchartoks\endcsname\relax
+ \expandafter\ifx\csname directlua\endcsname\relax
+ \examn@engine=0 % this is presumably original-TeX (how unutterably retro!)
+ \else
+ \examn@engine=3
\fi
- % remove any \\ or ~ in the coursecode fields
- \let\\\space
- \let~\space
- \xdef\examn@docident{% first element is based on uni/school course code
- \ifx\@coursetitle\@empty
- \ifx\@schoolcoursecode\@empty
- exam%
- \else
- \@schoolcoursecode
- \fi
- \else
- \@coursetitle
- \fi
- /\the\@tempcnta % day-of-year
- -\the\time} % minutes since midnight
- \endgroup
-}
-% \end{macrocode}
-% Check whether we're generating PDF, and define the |\ifpdf| macro
-% accordingly. This does depend on Oberdiek's \Lpackage{ifpdf} package being
-% available, but that's been available for quite a long while, and if
-% it isn't for some people's installations, we can potentially bring
-% back the code which it replaces.
-% \begin{macrocode}
-\RequirePackage{ifpdf}
-\def\@SetDocumentInfo{%
- \ifpdf
- {\pdfinfo{/Title (\examn@docident)}}%
- % Don't put out an /Author(xxx) info entry -- there may be
- % multiple authors, and it isn't obviously useful
+ \else
+ \examn@engine=2
\fi
-}
-\AtBeginDocument{\examn@setdocident\@SetDocumentInfo}
+\else
+ \ifnum\pdfoutput>0
+ \examn@engine=1
+ \else
+ % this _is_ pdftex, but it's in generate-dvi mode
+ % (we decide not to detect this case with the other engines)
+ \examn@engine=0
+ \fi
+\fi
% \end{macrocode}
%
+% \subsubsection{Fonts}
+%
% Choose the font set, based on |\if@psfonts| and |\examn@mtselect|.
+% The following is \emph{messy}, and it's not clear to me if it's
+% irreducibly so, or whether I'm just doing it the wrong way.
+%
+% Case |\examn@mtselect| is 0: the rather hacky \Lpackage{mathptm} solution.
% \begin{macrocode}
+\def\ex@fontlabel{???}
\if@psfonts
\ifcase\examn@mtselect
+ \def\ex@fontlabel{mathptm}
\ifexamn@serif
\RequirePackage{times}
\else
@@ -1369,7 +1509,14 @@ have a clue.
\fi
\RequirePackage{mathptm}
\ClassWarningNoLine{exam-n}{Using mathptm fonts}
- \or % use mathtime fonts
+% \end{macrocode}
+%
+% Case |\examn@mtselect| is 1 or 2: use mathtime or Mathtime Pro 2 fonts
+% for maths. We use postscript Times and Helvetica for the body fonts
+% in both cases.
+% \begin{macrocode}
+ \or
+ \def\ex@fontlabel{mathtime}
\RequirePackage[LY1]{fontenc} % specify text font encoding
\RequirePackage[LY1,mtbold]{mathtime} % switch math fonts
\ifexamn@serif
@@ -1379,6 +1526,7 @@ have a clue.
\fi
\ClassWarningNoLine{exam-n}{Using Mathtime fonts}
\or % use mtpro2 fonts
+ \def\ex@fontlabel{mtpro2}
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}
\ifexamn@serif
@@ -1389,13 +1537,103 @@ have a clue.
\fi
\RequirePackage[mtpbb]{mtpro2}
\ClassWarningNoLine{exam-n}{Using MTPro2 fonts}
+% \end{macrocode}
+%
+% Finally, case |\examn@mtselect| is 3: use STIX2 fonts: \url{http://www.stixfonts.org}.
+% Since this requires fontspec, it also requires either XeLaTeX or
+% LuaLaTeX. If we are in this branch, and not using either
+% engine, then fail with what we hope is a reasonably clear error.
+%
+% First off, refuse to work with original TeX.
+% \begin{macrocode}
+ \or
+ \def\ex@fontlabel{stix2}
+ \ifcase\examn@engine
+ \ClassError{exam-n}
+ {You can't use STIX fonts with original/DVI LaTeX}
+ {You must use either XeLaTeX or LuaLaTeX}
+% \end{macrocode}
+%
+% Use of the STIX fonts with pdflatex mostly works, but there is a
+% tricky current/legacy issue here.
+% The \Lpackage{stix2} package is intended to use the STIX2
+% fonts with `legacy' \TeX\ engines. Does this apply to pdflatex, now
+% it defaults to unicode input? See the discussion of
+% \Lpackage{unicode-math} below.
+%
+% As of TeXLive 2022, this mostly works, in the sense that we do use STIX
+% fonts, but the upright-pi support below fails (no LaTeX errors, but
+% |\uppi| produces slanted pi).
+% \begin{macrocode}
+ \or % pdflatex
+ \RequirePackage{stix2}
+% \end{macrocode}
+%
+% We support only Xe\TeX\ and Lua\TeX\ here, since only these can use
+% `system' fonts. For Xe\LaTeX\ we use `system' Helvetica and Courier
+% fonts (slightly scaled) as the sans and mono fonts, respectively, for the sake of
+% completeness.
+%
+% Note: unicode-math is a little complicated. As I (unfortunately)
+% discovered via mistaken bug report
+% \url{https://github.com/stipub/stixfonts/issues/235},
+% the \Lpackage{stix} package is intended to be used \emph{only} for
+% `legacy' \TeX\ engines, and \Lpackage{unicode-math} for current ones
+% such as Xe\LaTeX\ and Lua\LaTeX.
+% I'm fairly confident (as of 2022 July 11) that the following does
+% the right thing, but not yet 100% confident.
+%
+% Note that (as explained in the \Lpackage{unicode-math} manual, we
+% should use the STIX Two \emph{Math} font for symbols, and not the
+% text font.
+% \begin{macrocode}
+ \or % XeLaTeX
+ \RequirePackage[bold-style=ISO,math-style=ISO]{unicode-math}
+ \setmathfont{STIX Two Math}
+ \setmainfont{STIX Two Text}
+ \or % LuaLaTeX: like XeLaTeX
+ \RequirePackage[bold-style=ISO,math-style=ISO]{unicode-math}
+ \setmathfont{STIX Two Math}
+ \setmainfont{STIX Two Text}
+ \fi
+% \end{macrocode}
+% The no-match case shouldn't happen.
+% \begin{macrocode}
\else
- \ClassError{exam-n}{Impossible value of mtselect: \examn@mtselect}
+ \def\ex@fontlabel{ERROR}
+ \ClassError{exam-n}
+ {Impossible value of mtselect: \examn@mtselect}
+ {This shouldn't happen -- this is a class file bug}
\fi
+% \end{macrocode}
+%
+% There are no font complications when using CM fonts. That's nice.
+% \begin{macrocode}
\else
+ \def\ex@fontlabel{CM}
\ClassWarningNoLine{exam-n}{Using CM fonts}
\fi
% \end{macrocode}
+%
+% Report what engine and font configuration we're using.
+% \begin{macrocode}
+\typeout{Environment:
+ engine: \ifcase\examn@engine original/DVI\or pdfTeX\or XeTeX\or LuaTeX\else ???\fi;
+ fonts: \ex@fontlabel;
+ options: % show any non-default options
+ \ifexamn@uprightpi uprightpi, \fi
+ \ifexamn@siunitx siunitx, \fi
+ \ifexamn@serif\else noserif, \fi
+ \if@pageperquestion pageperquestion, \fi
+ \if@perquestionmarks\else noperquestionmarks, \fi
+ \if@showmarktotals\else noshowmarktotals, \fi
+ \if@twosidepages twoside, \fi
+ \if@fleqn fleqn, \fi
+ \iffussydescription\else sloppydescription, \fi
+ \ifbigfont hugefont, \fi
+ \if@showsolutions showsolutions\else noshowsolutions\fi}
+% \end{macrocode}
+%
% If we're using a sans serif font, then redefine |\normalfont| appropriately.
% The macro |\examn@bodyfontchange| stores up these font changes until
% they're applied just after |\maketitle|.
@@ -1415,6 +1653,14 @@ have a clue.
% \begin{macrocode}
\ifcase\examn@fontvariant
% default: do nothing
+ \def\examn@bodyfontchange{
+ % ...apart from redefine \small to be more clearly distinct from \normalsize
+ \renewcommand\small{%
+ \@setfontsize\normalsize{9}{11}%
+ \abovedisplayskip 9\p@ \@plus1.5\p@ \@minus5\p@
+ \abovedisplayshortskip \z@ \@plus2.5\p@
+ \belowdisplayshortskip 5\p@ \@plus2.5\p@ \@minus2.5\p@
+ \belowdisplayskip \abovedisplayskip}}
\or
% font variant 1: 18pt
\def\examn@bodyfontchange{
@@ -1425,6 +1671,12 @@ have a clue.
\belowdisplayshortskip 10\p@ \@plus5\p@ \@minus5\p@
\belowdisplayskip \abovedisplayskip
\let\@listi\@listI}
+ \renewcommand\small{%
+ \@setfontsize\normalsize{12}{16}%
+ \abovedisplayskip 12\p@ \@plus2\p@ \@minus6\p@
+ \abovedisplayshortskip \z@ \@plus4\p@
+ \belowdisplayshortskip 6.5\p@ \@plus3\p@ \@minus3\p@
+ \belowdisplayskip \abovedisplayskip}
\parindent=24pt
\parskip=18pt
% Redefine \FormatPartMarks so that it doesn't push the text off the paper
@@ -1440,6 +1692,12 @@ have a clue.
\belowdisplayshortskip 21\p@ \@plus10.5\p@ \@minus10.5\p@
\belowdisplayskip \abovedisplayskip
\let\@listi\@listI}
+ \renewcommand\small{%
+ \@setfontsize\normalsize{24}{28}%
+ \abovedisplayskip 24\p@ \@plus5\p@ \@minus12\p@
+ \abovedisplayshortskip \z@ \@plus8\p@
+ \belowdisplayshortskip 14\p@ \@plus8\p@ \@minus8\p@
+ \belowdisplayskip \abovedisplayskip}
\parindent=48pt
\parskip=36pt
% Redefine \FormatPartMarks so that it doesn't push the text off the paper
@@ -1466,6 +1724,79 @@ have a clue.
\fi}
% \end{macrocode}
%
+% Adjust maths font sizes for the various cases:
+% \begin{macrocode}
+\DeclareMathSizes\@xiipt{12}{9}{7}
+\DeclareMathSizes\@xipt{10}{8}{6}
+% \end{macrocode}
+%
+% \subsubsection{PDF metadata, and other document identifiers}
+%
+% Generate an identifier, |\examn@docident| for this paper. This is obtained
+% from the university or school course code, followed by the
+% day-of-year, and the number of minutes since midnight (the goal here
+% is to produce an identifier which automatically increments in time,
+% but which isn't obviously a date.
+%
+% Yes, a big |\ifcase| would be more straightforward;
+% no, that wouldn't be any fun at all
+% (also it ends up looking messy and even tricksier).
+% \begin{macrocode}
+\def\examn@setdocident{%
+ \begingroup
+ \def\@step##1##2\@nil{\advance\@tempcnta##1 \def\@tempa{##2}}
+ \def\@tempa{{31}{28}{31}{30}{31}{30}{31}{31}{30}{31}{30}{31}}%
+ \@tempcnta=\day % day of month
+ \@tempcntb=\month % month of year (unit-offset)
+ \loop
+ \advance\@tempcntb-1
+ \ifnum \@tempcntb>0
+ \expandafter\@step\@tempa\@nil
+ \repeat
+ \@tempcntb=\year % yes, do calculate leap years
+ \divide\@tempcntb 4 \multiply\@tempcntb 4
+ \ifnum\@tempcntb=\year
+ \ifnum\month>2 % but let's not worry about century years...
+ \advance\@tempcnta 1
+ \fi
+ \fi
+ % remove any \\ or ~ in the coursecode fields
+ \let\\\space
+ \let~\space
+ \xdef\examn@docident{% first element is based on uni/school course code
+ \ifx\@coursetitle\@empty
+ \ifx\@schoolcoursecode\@empty
+ exam%
+ \else
+ \@schoolcoursecode
+ \fi
+ \else
+ \@coursetitle
+ \fi
+ /\the\@tempcnta % day-of-year
+ -\the\time} % minutes since midnight
+ \endgroup
+}
+% \end{macrocode}
+%
+% Add information to the PDF document metadata.
+% \begin{macrocode}
+\ifcase\examn@engine
+ \let\@SetDocumentInfo\relax % original TeX
+\or % pdfTeX
+ \def\@SetDocumentInfo{\pdfinfo{/Title (\examn@docident)}}%
+ % Don't put out an /Author(xxx) info entry -- there may be
+ % multiple authors, and it isn't obviously useful
+\or % XeTeX
+ % dvipdfm special -- see the dvipdfm manual
+ \def\@SetDocumentInfo{\special{pdf: docinfo << /Title (\examn@docident) >>}}%
+\or % LuaTeX
+ % from the LuaTeX manual
+ \def\@SetDocumentInfo{\pdfextension info {/Title (\examn@docident)}}%
+\fi
+\AtBeginDocument{\examn@setdocident\@SetDocumentInfo}
+% \end{macrocode}
+%
% \subsubsection{Exam metadata}
%
% \begin{macrocode}
@@ -1508,25 +1839,6 @@ have a clue.
\next}
\expandafter\dd\@degreedescriptions\\}
% \end{macrocode}
-% The rubric is typically a per-exam thing. The `base rubric' is
-% more-or-less common to all exams, though it's possible to override
-% it in a .clo file.
-% \begin{macrocode}
-\def\@rubric{}
-\def\rubric{\long\def\@rubric}
-\def\norubric{\let\@rubric\@nnil}
-
-\def\@baserubric{%
-\textbf{Answer each question in a separate booklet}\par
-Candidates are reminded that devices able to store or display text or
-images may not be used in examinations without prior arrangement.
-\if@perquestionmarks
- \par
- Approximate marks are indicated in brackets as a guide for candidates.
-\fi
-}
-\def\baserubric{\long\def\@baserubric}
-% \end{macrocode}
%
% We can optionally check the total number of questions. Store this
% if it is present, and add a check to the |\end{document}| to check
@@ -1623,7 +1935,10 @@ images may not be used in examinations without prior arrangement.
%% headheight=\the\headheight, headsep=\the\headsep, topmargin=\the\topmargin}
\marginparsep=0.5cm
}
-
+% \end{macrocode}
+% In the \Lopt{draft} case, we nudge the text block to the side, to
+% give a larger margin.
+% \begin{macrocode}
\ifnum\@draftstatus > 0
\@settextblock{2cm}
\else
@@ -1660,7 +1975,7 @@ images may not be used in examinations without prior arrangement.
% |begingroup |ttfamily
% \catcode`\{=12 \catcode`\}=12 \catcode`\\=12
% |noindent \newcommand\FormatPartNumber{|linebreak
-% |noindent|quad\hbox to 2em{(\StylePartNumber{partnumber})\hss}}
+% |noindent|null|quad\hbox to 2em{(\StylePartNumber{partnumber})\hss}}
% |endgroup
% \end{quotation}
% works adequately as a part number,
@@ -1782,7 +2097,7 @@ images may not be used in examinations without prior arrangement.
\fancyhead[C]{\examn@bighead{\highlighted{DRAFT + SOLUTIONS, p\thepage/\pageref{lastpage}}}}
\else
\fancyhead[C]{\examn@bighead{\highlighted{DRAFT, p\thepage/\pageref{lastpage}}}}
- \fi
+ \fi
\else
\if@showsolutions
% Add a very prominent banner
@@ -1805,8 +2120,9 @@ images may not be used in examinations without prior arrangement.
%
% \subsubsection{The title page}
%
-% Define a special page style for the title page
-% No header: all of the text on the page is handled by |\maketitle|
+% Define a special page style for the title page.
+%
+% There is no header: all of the text on the page is handled by |\maketitle|
% The first-page footer doesn't show anything, but it does have to set
% |\examn@topmark| in case Q1 starts on this page.
% \begin{macrocode}
@@ -1817,53 +2133,52 @@ images may not be used in examinations without prior arrangement.
% \end{macrocode}
%
% Create a custom maketitle.
-% First, handle the 'final' or 'draft' versions.
% Check all required information is present.
% \begin{macrocode}
-\renewcommand\maketitle{
- \ifnum\@draftstatus < 2 % final or draft version
- \ifx\@examdate\@empty
- \ClassError{exam-n}
- {No exam date given}
- {Specify an exam date using \protect\examdate}
- \fi
- \ifx\@examtime\@empty
- \ClassError{exam-n}
- {No exam time given}
- {Specify an exam time using \protect\examtime}
- \fi
- \ifx\@exambanner\@empty
- \ClassError{exam-n}
- {No exam banner given}
- {Specify an exam banner (eg Examination for the degree...) using \protect\exambanner}
- \fi
- \if@fussydescription
- \ifx\@schoolcoursecode\@empty
- \ClassError{exam-n}
- {No school course code given}
- {Specify a school course code (eg P304H) using \protect\schoolcoursecode}
- \fi
- \ifx\@universitycoursecode\@empty
- \ClassError{exam-n}
+\def\RequiredMetadata#1#2#3{
+ \expandafter\ifx\csname @#1\endcsname\@empty
+ \ClassError{exam-n}{#2}{#3 (command \@backslashchar #1)}
+ \else
+ \typeout{#1 check OK}
+ \fi}
+% \end{macrocode}
+% Define a |\CheckExamMetadata| test, but only if the macro wasn't defined in a |.clo| file.
+% \begin{macrocode}
+\@ifundefined{CheckExamMetadata}{
+ \def\CheckExamMetadata{
+ % First, data which is always required
+ \RequiredMetadata{examdate}
+ {No exam date given}
+ {Specify an exam date}
+ \RequiredMetadata{examtime}
+ {No exam time given}
+ {Specify an exam time}
+ \RequiredMetadata{exambanner}
+ {No exam banner given}
+ {Specify an exam banner (eg Examination for the degree...)}
+ \iffussydescription
+ % The following tests can be skipped by using the option [sloppydescription]
+ \RequiredMetadata{universitycoursecode}
{No paper title given}
- {Specify a university course code (eg PHYS3031) using \protect\universitycoursecode}
- \fi
- \ifx\@coursetitle\@empty
- \ClassError{exam-n}
+ {Specify a university course code (eg PHYS3031)}
+ \RequiredMetadata{coursetitle}
{No course title given}
- {Specify a course title (eg Quantum Mechanics) using \protect\coursetitle}
- \fi
- \ifx\@degreedescriptions\@empty
- \ClassError{exam-n}
+ {Specify a course title (eg Quantum Mechanics)}
+ \RequiredMetadata{degreedescriptions}
{No paper subject given}
- {Specify a 'degree description' (eg Physics 3) using \protect\degreedescriptions}
- \fi
- \ifx\@rubric\@empty
- \ClassError{exam-n}
+ {Specify a 'degree description' (eg Physics 3)}
+ \RequiredMetadata{rubric}
{No rubric given}
- {Specify a rubric using \protect\rubric, or declare its absence with \protect\norubric}
- \fi
+ {Specify a rubric, or declare its absence with \protect\norubric}
\fi
+ }}{}
+% \end{macrocode}
+% Start the |\maketitle| command.
+% First, handle the 'final' or 'draft' versions.
+% \begin{macrocode}
+\renewcommand\maketitle{
+ \ifnum\@draftstatus < 2 % final or draft version
+ \CheckExamMetadata
% \end{macrocode}
% All OK so far\dots. Now produce the actual text.
% \begin{macrocode}
@@ -2073,6 +2388,8 @@ images may not be used in examinations without prior arrangement.
%
% \subsection{Structuring commands}
%
+% \subsubsection{Sections}
+%
% Define simple sectioning commands. We also check that these aren't
% inside questions.
% \begin{macrocode}
@@ -2143,6 +2460,7 @@ images may not be used in examinations without prior arrangement.
\@starttoc{toc}}
% \end{macrocode}
%
+% \subsubsection{Questions and solutions}
% Counters:
% \begin{macrocode}
\newcount\marktotal % number of marks accumulated so far
@@ -2155,9 +2473,17 @@ images may not be used in examinations without prior arrangement.
% within a question. It's a \LaTeX\ counter, so we can use |\roman|.
%
% We override the \Lenv{article} |\part| command.
+%
+% FIXME:
+% We would like to use |\StylePartNumber| here, but can't, because
+% that's defined as being eg |\alph|, and not |\@alph|. To change
+% this, we'll have to retire |\StylePartNumber|, in favour of saying
+% that, to change the formatting here, it's merely necessary to
+% redefine |\thepartnumber|.
% \begin{macrocode}
\newcounter{partnumber}
-\renewcommand\part{%
+\renewcommand\thepartnumber{\thequestionnumber\@alph\c@partnumber}
+\renewcommand\part[1][]{%
\if@nobreak \else
\par
\@nobreakfalse
@@ -2166,14 +2492,28 @@ images may not be used in examinations without prior arrangement.
\vskip 0pt plus 4\bigskipamount
\penalty-50
\fi
- \stepcounter{partnumber}%
- \noindent\FormatPartNumber
+ \def\@tempa{#1}%
+ \ifx\@tempa\@empty
+ \refstepcounter{partnumber}%
+ \noindent\FormatPartNumber
+ \else
+ \noindent\FormatPartNumber[#1]%
+ \fi
}
% \end{macrocode}
% The default |\FormatPartNumber| creates a box the same size as a
% parindent. This therefore assumes that it's following a |\noindent|.
% \begin{macrocode}
-\newcommand\FormatPartNumber{\hbox to \parindent{(\StylePartNumber{partnumber})\hss}}
+\newcommand\FormatPartNumber[1][]{%
+ \def\@tempa{#1}%
+ \hbox to \parindent{(%
+ \ifx\@tempa\@empty
+ \StylePartNumber{partnumber}%
+ \else
+ \@tempa
+ \fi
+ )\hss}%
+}
% \end{macrocode}
% And by default we use alphanumeric counters for parts (we abstract
% this, rather than simply including |\alph| in the definition of
@@ -2235,102 +2575,355 @@ images may not be used in examinations without prior arrangement.
}
% \end{macrocode}
%
+% \subsubsection{Partmarks}
+%
% |\partmarks| is used at the end of a paragraph to indicate the
% number of marks associated with this part. The starred variant
-% |\partmarks*| is used when the end of a part is the end of a display
+% |\partmarks*| is used only when the end of a part is the end of a display
% maths block which doesn't have an equation number. This moves the
% part note up a bit, which looks nicer.
+%
+% It's also permissible to use |\partmarks| in the solution, to
+% indicate precisely where marks accrue. It's reasonable for this to
+% be more fine-grained than in the question. We don't check that the
+% partmarks in the solution add up to the mark goal.
+%
+% Manage the partmarks comments as the contents of a zero-width hbox,
+% which is sized to fit reasonably well in the margin. We insert this
+% into the output just before formatting the partmarks.
+%
+% The |\defaultpartmarkscategory| macro creates a default partmarks
+% `category'. If this is something like |{category?}|, then this
+% should prompt question authors to indicate the category in each call
+% to |\partmarks|. This can be declared within a |.clo| option file
+% (and is declared above, so that it can be read from there without error).
+%
+% Below, we must add the footnote text after the end of the paragraph,
+% otherwise this inserts vertical mode material, which causes a
+% linebreak, at least in the case where the last line is almost full.
+% Because we are using the hook mechanism, this package now depends on
+% the expl3 modules, and thus on TeXLive versions which aren't too old
+% (how old is too old? I'm not sure, but I expect TeXLive 2020 is new enough).
+% \begin{macrocode}
+\newbox\examn@partmarkscomment
+\def\examn@makepartmarkscomment#1{%
+ \setbox0=\hbox{\small #1}%
+ \ifdim\wd0 < 3\marginparwidth % let shortish comments wrap here
+ \setbox\examn@partmarkscomment=\hbox to 0pt{\hbox{%
+ \vtop to 0pt{%
+ \hsize=\marginparwidth
+ \parindent=0pt
+ \parskip=0pt
+ \leftskip=1em % 1em matches the hskip in default \FormatPartMarks
+ \rightskip=0pt plus 0.5\marginsize
+ \hangindent=2em \hangafter=-1
+ \small
+ #1\vss}}\hss
+ }%
+ \else
+ \stepcounter\@mpfn
+ \protected@xdef\@thefnmark{\thempfn}%
+ \@footnotetext{#1}%
+ % 3em matches the \leftskip+\hangindent above
+ \setbox\examn@partmarkscomment=\hbox to 0pt{%
+ \hskip3em\highlighted{\small [comment \thempfn]}\hss}%
+ \fi
+ }
+\def\examn@getpartmarkscomment{%
+ \ifhbox\examn@partmarkscomment
+ \box\examn@partmarkscomment
+ \fi}
+% \end{macrocode}
+% Now, finally, define the actual |\partmarks| command.
% \begin{macrocode}
\def\partmarks{%
\@ifstar{\@tempswatrue \@partmarks}{\@tempswafalse \@partmarks}}
\newdimen\@partmarksspace
\@partmarksspace=2em % default value
% \end{macrocode}
-% Now implement the part marks indicator. First, check that
+% Check whether there's an optional (comment/category) argument,
+% enclosed in |[...]|.
+% \begin{macrocode}
+\def\@partmarks{%
+ \@ifnextchar[%]
+ \@@partmarks{\@@partmarks[]}}
+% \end{macrocode}
+% Implement the part marks indicator. First, check that
% `perquestionmarks' is turned on; if it's not, then we shouldn't be
% using |\partmarks|.
% \begin{macrocode}
-\def\@partmarks#1{%
+\def\@@partmarks[#1]#2{%
\if@perquestionmarks
\if@insolution
- % visual display only -- doesn't count towards mark total
- \setbox0=\vbox to 0pt{\vss
- \hbox to \textwidth{\hfil\hbox to 0pt{\quad\small[\dots #1]\hss}}
- \vskip0.25ex }%
- % the next line is probably unnecessary, but guarantees that box0
- % has zero depth, so no extra vertical space appears because of
- % this new box
- \dp0=0pt
- \ifvmode
- \box0
+ \@@partmarks@solution{#1}{#2}%
+ \else
+ \@@partmarks@question{#1}{#2}%
+ \fi
+ \else
+ \ClassError{exam-n}{\string\partmarks\ is not compatible with
+ noperquestionmarks}{Either remove \string\partmarks\ or remove
+ the noperquestionmarks option}
+ \fi
+}
+% \end{macrocode}
+%
+% Finally, implement the two partmarks variants for questions and solutions.
+%
+% The |\@@partmarks@endenv| command is called when |\partmarks| is
+% invoked within an environment, and is used to add a suitable vbox to
+% an after-environment hook.
+%
+% First prepare the vbox that's to be inserted, and then work out how
+% to place it. The |\vskip\baselineskip| in the |\@partmarksbox| is
+% to better position the box relative to where it ends up in the
+% vertical list, and the value has a large heuristic element.
+% \begin{macrocode}
+\newbox\@partmarksbox
+\def\@@partmarks@endenv@display{\@tempswatrue\@@partmarks@endenv@common}
+\def\@@partmarks@endenv@nodisplay{\@tempswafalse\@@partmarks@endenv@common}
+\def\@@partmarks@endenv@common#1{%
+ \ifvbox\@partmarksbox % ooops -- been here before: two \partmarks in one env
+ \ClassError{exam-n}
+ {Two partmarks commands in one environment! First one IGNORED!}
+ {You can (currently) have only one partmarks command per environment}
+ \fi
+ \global\setbox\@partmarksbox=\vbox to 0pt{\vss
+ \hbox to \textwidth{%
+ \strut\hfill
+ \examn@getpartmarkscomment
+ \FormatPartMarks{#1}}%
+ \vskip\baselineskip}%
+ %\dp\@partmarksbox=0pt
+% \end{macrocode}
+% Test whether we have the |{question}| environment as our immediate
+% container, as opposed to being in an inner environment.
+% \begin{macrocode}
+ \def\@tempa{question}%
+ \ifx\@tempa\@currenvir
+ \setbox1=\vbox to 0pt{\vss\box\@partmarksbox}%
+ \ifvmode
+ \box1
+ \else
+ \vadjust{\box1}%
+ \fi
+ \else
+% \end{macrocode}
+% Generally the \cmd|env/<env>/end| hook seems to
+% produce better results, in terms of positioning things at the end of
+% environments, but this does not work for environments
+% where the command is located inside a display (ie, in \TeX\ terms,
+% inside |$$...$$|); in these situations we have to use the
+% \texttt{.../after} hook instead. Such displays are most typically amsmath
+% alignment environments, but an \cmd|\halign| inside a display will
+% also qualify (see the discussion of `alignment displays' in \TeX
+% Book ch.19). There isn't a completely straightforward way of
+% detecting this situation (though amsmath's \cmd|\start@align| sets
+% \cmd|\xatlevel@| to be non-\cmd|\@empty|, which we take to indicate the
+% amsmath case), so we have to rely on the caller of this
+% command to invoke the \texttt{...@display} or \texttt{...@nodisplay}
+% variant appropriately.
+% \begin{macrocode}
+ \if@tempswa % display variant
+ \AddToHookNext{env/\@currenvir/after}{%
+ %\typeout{hook:endenv/display #1}%
+ \ifvmode\box\@partmarksbox
+ \else\vadjust{\box\@partmarksbox}\fi}%
+ \else
+ \AddToHookNext{env/\@currenvir/end}{%
+ %\typeout{hook:endenv/nodisplay: env/\@currenvir/end #1}%
+ \ifvmode\box\@partmarksbox
+ \else\vadjust{\box\@partmarksbox}\fi}%
+ \fi
+ \fi
+}
+% \end{macrocode}
+%
+% First, define the questions version, for appearing in the version candidates see.
+% Here, \cmd|#1| is the possibly empty `classification' text, and \cmd|#2| is the
+% number of marks. At this point |\if@tempswa| is true if we got here
+% via the \cmd|\partmarks*| variant, and false if it's the unstarred one.
+%
+% The argument |#2| must be a number: any non-number text will not
+% cause an error but will appear in the text.
+%
+% But first\dots!
+%
+% The |\partmarks| command increments a global counter, and we
+% \emph{don't} want to do this when an \Lpackage{amsmath} alignment is evaluating
+% the content in its `measuring' phase. Fortunately,
+% \Lpackage{amsmath} has an (internal) flag |\ifmeasuring@| which is
+% true in that phase, which it uses for this purpose, so make this macro a no-op in that case.
+% \begin{macrocode}
+\def\@@partmarks@question{%
+ \ifmeasuring@
+ \let\@@partmarksnext\@gobbletwo
+ \else
+ \let\@@partmarksnext\@@partmarks@question@do
+ \fi
+ \@@partmarksnext
+}
+% \end{macrocode}
+% On with the main business.
+% \begin{macrocode}
+\def\@@partmarks@question@do#1#2{%
+ \global\advance\marktotal #2
+ \let\@@partmarksnext\relax % base case
+% \end{macrocode}
+% Display the `part category', \emph{visible in the question},
+% if \Lopt{showsolutions} is true, either
+% explicitly, or implicitly as a consequence of the
+% compose/draft/final mode. It's arguable that this should be
+% dependent on the mode only, but after some discussion, it ended up
+% seeming more reasonable to tie this to \Lopt{showsolutions} directly.
+% \begin{macrocode}
+ \if@showsolutions
+ \def\@tempa{#1}%
+ \ifx\@tempa\@empty
+ \ifx\examn@defaultpartmarkscategory\relax
+ \let\examn@category\relax
\else
- \vadjust{\nointerlineskip\box0}%
+ \examn@makepartmarkscomment{\highlighted{\examn@defaultpartmarkscategory}}%
\fi
\else
- \global\advance\marktotal #1
- \if@tempswa
+ \examn@makepartmarkscomment{\highlighted{#1}}%
+ \fi
+ \fi
% \end{macrocode}
-% This is the starred form of |\partmarks|. That is, this is being invoked
-% (i) just after maths (or some other display which doesn't fill the line),
-% \emph{or} (ii) at the end of an unnumbered equation. In case (i),
-% we move the part mark up a bit; in case (ii), we format the
-% partmarks as a type of equation number
-%
-% We handle case (ii) first, by detecting whether we're in a maths
-% display. If so, we format the partmarks as an equation number, using
-% |\eqno|. Note that \Lpackage{amsmath} maths (which is what we're
-% using here) formats this differently if the material following
-% |\eqno| is of zero size, so we make this slightly larger than that.
-% \begin{macrocode}
- \ifdim\displaywidth>0pt
- \if@eqnsw
- \ClassError{exam-n}{\string\partmarks* may not be used
- within numbered equations}{Replace \string\partmarks*
- with a \string\partmarks\ after the equation}
- \global\advance\marktotal -#1 % to cause the mark total to be wrong
- \else
- \eqno \hbox to 1sp{\FormatPartMarks{#1}\hfil}%
- \fi
+%
+% If |\@tempswa|, then this is the starred form of |\partmarks|.
+% This is intended to be used only occasionally, after a display or
+% list environment, where for some reason the command can't go inside
+% the environment.
+% \begin{macrocode}
+ \if@tempswa
+ \ifdim\displaywidth>0pt
+ \ClassError{exam-n}
+ {Don't use \partmarks* inside a display}
+ {Use \partmarks inside the display, or \partmarks*
+ after it, if necessary}
% \end{macrocode}
-% Case (i), not in maths: We don't automatically end the
-% paragraph here, because a display will often not be the end of a paragraph.
-% I am not at all convinced that this is the correct approach
-% to nudging the partmarks text up the right amount. The
-% following appears to do roughly the right thing, but there's a
-% strong element of trial and error in it.
+% Else we are most likely just after an equation or just after a list
+% environment, or something similar.
+% (here and below we include some |{#2:n}| debugging code for when I,
+% inevitably, revisit this to worry about the spacing).
% \begin{macrocode}
- \else
- \setbox0=\vbox to 0pt{\vss
- \hbox to \textwidth{\strut\hfill\FormatPartMarks{#1}}%
- \vskip 1\baselineskip}% vskip means box has zero depth
- \ifvmode
- \box0
- \else
- \vadjust{\box0}%
- \fi
+ \else
+ \@@partmarks@endenv@nodisplay{#2}%{#2:1*}%
+ \fi
+% \end{macrocode}
+% We've called the unstarred version of |\partmarks|.
+% This is the more usual mode.
+% \begin{macrocode}
+ \else
+ \ifdim\displaywidth>0pt
+% \end{macrocode}
+% We're in a display, after |$$|: \TeX\ is probably (but not certainly) in
+% maths mode just now; if we're in an amsmath alignment, we're in
+% specifically inner maths mode; there are other, rarer, ways of being
+% in an `alignment display'. Additionally, and commonly, if we're in
+% an \Lenv{equation} environment now -- which we can detect because
+% that, amongst other amsmath environments, sets |\eqnsw| to be true
+% -- then we're \emph{not} in an alignment, but we \emph{are} in a
+% case where the |\eqno| technique will fail (with `You can't use
+% `eqno' in math mode.'), so catch that.
+%
+% CONSIDER: is this |\@eqnsw| test in fact the only one I have to do
+% -- is the inner math mode test equivalent? That is, is this, when
+% it comes down to it, testing the actual thing I need to test here?
+% This will require another dive into the amsmath magic.
+% \begin{macrocode}
+ \@tempswafalse
+ \ifmmode\ifinner \else \@tempswatrue \fi\fi
+ \if@tempswa
+ \if@eqnsw % not so fast... we're in an {equation}
+ \@tempswafalse
\fi
+ \fi
+ \if@tempswa
% \end{macrocode}
-% We've called the unstarred version of |\partmarks|. We also end the paragraph here
-% (this technique is filched from the TeXBook, p106).
+% We're in outer maths mode, which we can take to mean a |\[...\]| equation.
+% In this case, we can very neatly position the partmarks indicator
+% using |\eqno|.
+% \begin{macrocode}
+ \def\@@partmarksnext{\eqno \hbox to 1sp{% the \eqno argument must not be zero size
+ \examn@getpartmarkscomment
+ \FormatPartMarks{#2}%{#2:1}
+ \hss}}%
+% \end{macrocode}
+% Or we're in one or other type of display.
% \begin{macrocode}
\else
+ \def\@@partmarksnext{\@@partmarks@endenv@display{#2}}%
+ %\def\@@partmarksnext{\@@partmarks@endenv@display{#2:2,\@currenvir}}%
+ \fi
+% \end{macrocode}
+%
+% Otherwise, |\displaywidth=0pt|, and we're not in a display.
+% If we are in the |{question}| environment, as opposed to any sub-environment,
+% we end the paragraph here and put the partmarks indicator at the end
+% of the final line of the paragraph (this technique is filched from the TeXBook, p106).
+% Otherwise, we add a suitable box to an end-of-environment hook.
+%
+% Omitting the |{question}| test below, and handling all cases with
+% the end-of-paragraph technique, works in most case, in the sense of
+% looking fine. Where it fails is in the case of, eg, |{quote}|,
+% where the end-of-line ends up indented from the right.
+%
+% Using the hook has the additional advantage that |\partmarks| can be anywhere
+% within the environment and this locates it at the end.
+%
+% The dimension |\@partmarksspace| controls how much space the
+% partmarks-number takes up, the default is the special case of 0pt,
+% which puts it in the margin.
+% \begin{macrocode}
+ \else
+ \def\@tempa{question}%
+ \ifx\@tempa\@currenvir
\ifdim\@partmarksspace > 0pt
{\unskip\nobreak\hfil\penalty50 \hskip\@partmarksspace
- \hbox{}\nobreak\hfil\FormatPartMarks{#1}%
+ \hbox{}\nobreak\hfil\examn@getpartmarkscomment\FormatPartMarks{#2}%{#2:3}%
\parfillskip=0pt \finalhyphendemerits=0 \par}
\else
- \unskip\nobreak\hfill\FormatPartMarks{#1}\par
+ \unskip\nobreak\hfill\examn@getpartmarkscomment\FormatPartMarks{#2}\par%{#2:4}\par
\fi
+ \let\@@partmarksnext\relax
+ \else
+ \def\@@partmarksnext{\@@partmarks@endenv@nodisplay{#2}}%
+ %\def\@@partmarksnext{\@@partmarks@endenv@nodisplay{#2:5,\@currenvir}}%
\fi
\fi
- \else
- \ClassError{exam-n}{\string\partmarks\ is not compatible with
- noperquestionmarks}{Either remove \string\partmarks\ or remove
- the noperquestionmarks option}
\fi
+% \end{macrocode}
+%
+% The `question' variant of this macro includes an |\ignorespaces| at the
+% end, since that is generally the right thing to do (the command
+% almost always appears at the end of paragraphs, or after equations).
+% \begin{macrocode}
+ \@@partmarksnext
\ignorespaces
}
% \end{macrocode}
+% Then the solutions version, for the benefit of markers, which is
+% typically more finely itemized, and which isn't summed (ie, we don't
+% at present confirm that the marks here match the question's marks goal).
+% The solutions variant of this macro omits the |\ignorespaces|
+% (since in solutions this macro is scattered within the text).
+% Setting |\dp0=0pt| is probably unnecessary, but guarantees that box0
+% has zero depth, so no extra vertical space appears because of
+% this new box.
+% \begin{macrocode}
+\def\@@partmarks@solution#1#2{%
+ \setbox0=\vbox to 0pt{\vss
+ \hbox to \textwidth{\hfil\hbox to 0pt{\quad\small[\dots #2]\hss}}
+ \vskip0.25ex }%
+ \dp0=0pt
+ \ifvmode
+ \box0
+ \else
+ \vadjust{\nointerlineskip\box0}%
+ \fi
+}
+% \end{macrocode}
%
% The code above permits page-breaks between lists and |\partmarks|.
% That's because |\@endparenv|, which is called within |\endtrivlist|,
@@ -2340,7 +2933,6 @@ images may not be used in examinations without prior arrangement.
% \begin{macrocode}
\@endparpenalty=\@M
% \end{macrocode}
-
%
% The number of marks is formatted by the command |\FormatPartMarks|, which
% may be overridden, using |\renewcommand| in a |.clo| file.
@@ -2430,7 +3022,7 @@ images may not be used in examinations without prior arrangement.
% \begin{macrocode}
\def\item{\@tempswafalse\ex@mcqitem}
\def\answer{\@tempswatrue\ex@mcqitem}
-% \end{macrocode
+% \end{macrocode}
% Initialise counters, and invoke the common |\do@question| macro.
% \begin{macrocode}
\ex@mcqi=0
@@ -2863,9 +3455,15 @@ images may not be used in examinations without prior arrangement.
% \end{macrocode}
%
% The |\includequestion| command includes a question from another
-% file. For convenience, we disable |\documentclass|, |\usepackage|, and the
+% file. For convenience, we disable
+%|\documentclass|, |\usepackage|, |\RequirePackage|, and the
% \Lenv{document} environment, so that the included file may be a
% complete \LaTeX\ document.
+% We don't try too hard to support including just any old \LaTeX, here:
+% any complicated preamble requirements in an included file should
+% probably be managed by the exams convener transplanting them into
+% the preamble of the main document. This may be an overly
+% simple-minded approach, and may change in future versions.
% \begin{macrocode}
\def\dummy@documentclass{%
\@ifnextchar[\dummy@@documentclass{\dummy@@documentclass[]}}
@@ -2877,7 +3475,7 @@ images may not be used in examinations without prior arrangement.
\begingroup
\let\documentclass\dummy@documentclass
\let\document\@empty % not \relax: makes \begin think {document} is undef'd
- \let\enddocument\relax
+ \let\enddocument\endinput % stop reading, discarding any junk below \end{document}
\def\@tempa{#1}
\ifx\@tempa\@empty \else
\def\@includequestionoverridenumber{#1}
@@ -2885,6 +3483,7 @@ images may not be used in examinations without prior arrangement.
\fi
\def\usepackage##1{\ClassWarning{exam-n}
{Ignoring \string\usepackage{##1} in included question #2}}
+ \let\RequirePackage\usepackage
\input{#2}
\endgroup
}
@@ -2930,6 +3529,15 @@ images may not be used in examinations without prior arrangement.
% Putting a box round the solution would be desirable (it keeps it all
% together and would allow a coloured background), but that's rather
% hard to arrange in practice.
+%
+% Solutions are shown in a slightly smaller size (namely |\small|).
+% It's debatable whether this is a good thing or not. Note that if
+% this is changed by removing the |\small|, then
+% |\examn@dummycaptions| will have to be adjusted, too.
+%
+% If either of the `enlarged font' options has been given, then we set
+% the solutions in the same large font, since these might be
+% distributed to students as model answers.
% \begin{macrocode}
\def\@formatsolution{\par
\if@insolution
@@ -2937,7 +3545,7 @@ images may not be used in examinations without prior arrangement.
\else
\@insolutiontrue % this happens within a group
\fi
- \examn@dummycaptions % dummy captions within solutions
+ \examn@dummycaptions % dummy captions within solutions
\typeout{SHOWING SOLUTIONS}
\let\part\examn@solutionpart
% \end{macrocode}
@@ -2948,9 +3556,7 @@ images may not be used in examinations without prior arrangement.
\parskip 0.5\baselineskip
\raggedright
\color{solutiontext}%\slshape
- \ifbigfont \else
- \small
- \fi
+ \normalsize
\hrule
\hbox to \textwidth{\vrule height 1ex \hfil \vrule height 1ex}
\nobreak
@@ -2984,20 +3590,32 @@ images may not be used in examinations without prior arrangement.
\if@showsolutions
\let\solution\@formatsolution
\let\endsolution\end@formatsolution
+% \end{macrocode}
+% In the case where we're not showing solutions, note that we
+% \emph{do} format the contents, so any |\global| effects will still
+% happen, unless we take action to avoid them.
+%
+% In particular, |\part|, which is normally redefined in solutions to
+% increment \texttt{answerpartnumber} rather than
+% \texttt{partnumber}, would increment \texttt{partnumber} in answers
+% unless we take action to stop it.
+% \begin{macrocode}
\else
- \def\solution{%
+ \def\solution{% make a vbox...
+ \par
\if@insolution
\ClassError{exam-n}{Misplaced solution}{You can't have a solution within a solution}
\fi
\let\endfigure\endfloat@skipsolutions
\let\endtable\endfloat@skipsolutions
- \examn@dummycaptions % dummy captions avoid counter increments
+ \examn@dummycaptions % dummy captions avoid counter increments
+ \let\part\relax % make \part a no-op in discarded {solution}
\@ifundefined{includepdf}{}{\let\includepdf\examn@disabledpdfpages}
- \par
\setbox\@tempboxa\vbox\bgroup
- \@insolutiontrue}
- \def\endsolution{%
- \egroup % ...and do nothing with this box
+ \@insolutiontrue
+ }
+ \def\endsolution{%...and do nothing with this box
+ \egroup
}
\fi
% \end{macrocode}
@@ -3025,9 +3643,14 @@ images may not be used in examinations without prior arrangement.
% re-using the standard LaTeX parameter means that \caption works
\def\@captype{#1}
\setbox\@tempboxa\vbox\bgroup}
+% \end{macrocode}
+% End both |{figure}| and |{table}| environments.
+% End the |\@tempboxa| and add some space and good breaks before displaying it.
+% We're typically in hmode here, but don't depend on it.
+% \begin{macrocode}
\def\examn@endfloat{%
\egroup % end \@tempboxa
- \unskip
+ \ifvmode\else \unskip \fi % bare \unskip would can an error in vmode
\nobreak
% add lots of stretchability, but non-infinite, for the sake of tidiness
\vskip 0pt plus 0.5\textheight
@@ -3055,6 +3678,18 @@ images may not be used in examinations without prior arrangement.
\let\endfigure\examn@endfloat
\let\endtable\examn@endfloat
% \end{macrocode}
+% And disable the \texttt{figure*} and \texttt{table*} environments.
+% \begin{macrocode}
+\expandafter\def\csname figure*\endcsname{%
+ \ClassError{exam-n}
+ {Bad environment figure* -- there is no figure* environment in exam-n}
+ {Use plain {figure} instead. See the documentation for discussion}}
+\expandafter\def\csname table*\endcsname{%
+ \ClassError{exam-n}
+ {Bad environment table* -- there is no table* environment in exam-n}
+ {Use plain {table} instead. See the documentation for discussion}}
+% \end{macrocode}
+%
% Within these 'floats', we must redefine |\caption|, so that we don't
% increment the float counters. One motivation for this is so that we don't have
% table numbers changing depending on whether solutions are included
@@ -3110,25 +3745,83 @@ images may not be used in examinations without prior arrangement.
\WriteLastPageLabel}
% \end{macrocode}
%
+% \iffalse extradefs:start
+% This is a magic comment -- see Makefile.
+% these definitions are referred to, in order to document
+% them, both in this class's documentation, and in the
+% notes-for-authors. \fi
+%
% \subsection{Other formatting niceties}
%
% Format vectors (the default for |\vec| is a symbol with an arrow
% over it):
+%
+% Note: the STIX2+(XeLaTeX/LuaLaTeX) support depends on the LaTeX hook
+% mechanism released in 2020. It therefore does not work on versions of
+% LaTeX older than that. There is a check for this above (see
+% Sect~\ref{s:compatibility}).
% \begin{macrocode}
-\ifcase\examn@mtselect
- % mathptm fonts
- % This is a very clumsy version, but it appears to be our only option
- \def\vec#1{\mathchoice{\mbox{\boldmath $\displaystyle #1$}}
- {\mbox{\boldmath $ #1$}}
- {\mbox{\boldmath $\scriptstyle #1$}}
- {\mbox{\boldmath $\scriptscriptstyle #1$}}}
-\or % mathtime (should this be the same for mathtime as for mtpro2?
+\if@psfonts
+ \ifcase\examn@mtselect
+ % mathptm fonts
+ % This is a very clumsy version, but it appears to be our only option
+ \def\vec#1{\mathchoice{\mbox{\boldmath $\displaystyle #1$}}
+ {\mbox{\boldmath $ #1$}}
+ {\mbox{\boldmath $\scriptstyle #1$}}
+ {\mbox{\boldmath $\scriptscriptstyle #1$}}}
+ \ifexamn@uprightpi
+ \ClassWarning{exam-n}{Can't do uprightpi in [mathptm] -- sorry}
+ \let\italicpi\pi
+ \examn@uprightpifalse
+ \fi
+ \or % mathtime (should this be the same for mathtime as for mtpro2?
+ \let\vec\mathbf
+ \ifexamn@uprightpi
+ \ClassWarning{exam-n}{Can't do uprightpi in [mathtime] -- sorry}
+ \let\italicpi\pi
+ \examn@uprightpifalse
+ \fi
+ \or % mtpro2
+ \let\vec\mathbold
+ % \uppi is predefined in mtpro2
+ \ifexamn@uprightpi
+ \let\italicpi\pi
+ \let\pi\uppi
+ \fi
+ \else
+ % STIX2: the unicode-math package provides a \symbf for bold math symbols,
+ \ifnum\examn@engine<2 % pdflatex
+ \let\vec\mathbf
+ % pdftex (or original tex)
+ % The following should, I think, create an upright pi, but doesn't
+ \def\uppi{\mathrm{\pi}}
+ \let\italicpi\pi %for consistency
+ \let\symup\mathrm %not fully the right thing, but avoid errors below
+ \else % xelatex or lualatex
+ % This is where the dependence on a recent LaTeX enters.
+ \let\vec\symbf
+ \typeout{stix2: upright=\ifexamn@uprightpi true\else false\fi}
+ \AddToHook{begindocument/end}{\gdef\uppi{\symup{𝜋}}}
+ \ifexamn@uprightpi
+ \AddToHook{begindocument/end}{\gdef\italicpi{\symit{𝜋}}\global\let\pi\uppi}
+ \fi
+ \fi
+ \fi
+\else
+ % CM fonts: \mathbf doesn't work with greek in CM
\let\vec\mathbf
-\or % mtpro2
- \let\vec\mathbold
+ \ifexamn@uprightpi
+ % upright greek is hard to do portably, so give up
+ % See eg https://tex.stackexchange.com/questions/145926/ for discussion
+ \ClassWarning{exam-n}{Can't do uprightpi in [cmfonts] -- sorry}
+ \let\italicpi\pi
+ \let\uppi\pi %but avoid errors
+ \examn@uprightpifalse
+ \fi
\fi
% \end{macrocode}
-% Abbreviations for degrees.
+%
+% Abbreviations for various degrees.
% \begin{macrocode}
\newcommand\BSc{B.Sc.{}}
\newcommand\MSci{M.Sci.{}}
@@ -3138,10 +3831,22 @@ images may not be used in examinations without prior arrangement.
\newcommand\BEng{B.Eng.{}}
% \end{macrocode}
%
-% Tweaks to differentials.
+% Formatting differentials, and the base of natural logs,
+% which should be in an upright font.
+% See section~\ref{s:othercommands}, or the `notes for authors',
+% for a description of these macros.
+% The macro |\ddd| is used inside an integral, and includes a leading thinspace
% \begin{macrocode}
-\newcommand{\dd}{\mathrm{d}}
-\newcommand{\ddd}{\,\mathrm{d}} % inside an integral, including thinspace
+\ifnum\examn@mtselect>2
+ % ie, STIX2, and thus using the unicode-math package (see above)
+ \def\e{\symup{e}}
+ \newcommand{\dd}{\symup{d}}
+ \newcommand{\ddd}{\,\symup{d}}
+\else
+ \def\e{\mathrm{e}}
+ \newcommand{\dd}{\mathrm{d}}
+ \newcommand{\ddd}{\,\mathrm{d}}
+\fi
\def\Diffl{\@ifstar\@Difflflat\@Diffl}
\def\Partial{\@ifstar\@Partialflat\@Partial}
@@ -3165,19 +3870,31 @@ images may not be used in examinations without prior arrangement.
\fi}
% \end{macrocode}
%
-% The exponential sign
-% \begin{macrocode}
-\def\e{{\mathrm e}}
-% \end{macrocode}
+% Physical units in upright roman. This macro is now deprecated in
+% favour of use of the \Lopt{siunitx} option (which uses the
+% \Lpackage{siunitx} package, qv), and it will be removed in a
+% minor release after v1.4.
%
-% Physical units in |\rm|. Unstarred version includes leading
-% |\thinspace|. Starred version doesn't, and is used when referring to
+% The unstarred version includes leading
+% |\thinspace|. The starred version doesn't, and is used when referring to
% the unit by itself (eg axis is |$B/\units*T$|), and is not qualifying
% a number.
-% FIXME: |\mu| in |\units| can come out wrong in some fonts (mtpro2?)
-% -- needs investigation.
+% Separate units with either \texttt{.} or |~|, as in |\units{m~s^{-1}}| or
+% |\units{m.s^{-1}}|.
+% Note that although \texttt{.} and |~| are both possible unit separators in
+% general, the former won't work if used within a table (due to the timing of
+% token-reading).
+%
+% This is a rather simple-minded approach to unit formatting. For a much more
+% comprehensive treatment, see the \texttt{siunitx} package,
+% \url{https://ctan.org/pkg/siunitx}, which is now preferred, in place
+% of further use of this macro.
+%
+% Note: there are detailed prescriptions on the formatting of units and symbols in
+% ISO-80000-1:2009, Sect. 7.
% \begin{macrocode}
-\def\units{\begingroup
+\def\units{\examn@unitswarning
+ \begingroup
\catcode`\.=\active
\@ifstar{\let\un@tsspace\relax \un@ts}%
{\let\un@tsspace\thinspace\un@ts}}
@@ -3191,18 +3908,15 @@ images may not be used in examinations without prior arrangement.
\fi
\endgroup}
\endgroup
-% \end{macrocode}
-%
-% Other miscellaneous symbols:
-% The AU is nothing exciting, but may be adjusted in future
-% \begin{macrocode}
-\def\au{au}
-% \end{macrocode}
-% The symbol for Compton wavelength is a crossed lambda -- the following isn't perfect, but is OK for now.
-% \begin{macrocode}
-\def\lambdabar{\setbox\@tempboxa\hbox{$\lambda$}%
- \hbox to 0pt{\hbox to \wd\@tempboxa{\hss$\bar{}$\hss}\hss}\box\@tempboxa}
-% \end{macrocode}
+\newif\ifexamn@warnunits \examn@warnunitstrue
+\def\examn@unitswarning{\ifexamn@warnunits
+ \ClassWarning{exam-n}{The units macro will be removed in the next
+ version; the [siunitx] option is now on by default, so you can use
+ the macros in the siunits package}%
+ \global\examn@warnunitsfalse
+\fi}
+% \end{macrocode}
+% \iffalse extradefs:end % magic comment -- see Makefile \fi
%
% All done.
% \begin{macrocode}
diff --git a/macros/latex/contrib/exam-n/exam-n.html b/macros/latex/contrib/exam-n/exam-n.html
index 717d683aa9..f0b7547897 100644
--- a/macros/latex/contrib/exam-n/exam-n.html
+++ b/macros/latex/contrib/exam-n/exam-n.html
@@ -1,10 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>exam-n class</title>
-<link href="http://nxg.me.uk" rev="author"/>
-<link type="text/css" rel="stylesheet"
- href="style.css"/>
-<style type='text/css'>
+<link href="https://nxg.me.uk" rev="author"/>
+
+
+<style class="distonly" type="text/css">body {
+ color: #333;
+ background: white;
+ margin-left: +30%;
+ width: 50%; /* body is 50% of screen width */
+ margin-right: auto; /* ie, 20% */
+ padding: 0.5em; /* this will make a difference if I decide to
+ have the background a different colour */
+ /* I can't decide on font: Optima's always nice, but Gill looks
+ agreeably intense. Helvetica's a decent fallback. */
+ font-family: "Helvetica Neue", Helvetica, "Gill Sans", gill, sans-serif;
+ /* font-family: Optima, "Gill Sans", gill, Helvetica, sans-serif; */
+ /* font-family: "Gill Sans", gill, Helvetica, sans-serif; */
+ /* I seem to have used 11pt at some point in the past, but this
+ is far too big -- did I ever have a reason for that, or is it
+ just due to browser changes? */
+ font-size: 10pt;
+ line-height: 150%;
+}
+
+div.topsidebar {
+ float: right;
+ width: 50%; /* ...of the body width (ie, 50% x 50% of screen) */
+ font-size: smaller;
+ margin-left: 1em;
+ padding-left: 1em;
+ border-left: solid thin #AAA;
+}
+
+/* On wider screens, move the sidebar out to the right hand side */
+/* This uses CSS3 media queries: http://www.w3.org/TR/css3-mediaqueries/ */
+@media screen and (min-width: 700pt) and (max-width: 850pt) {
+ body {
+ margin-left: 210pt;
+ width: 350pt; /* 50% of 700pt */
+ margin-right: auto;
+ }
+ div.topsidebar {
+ position: absolute;
+ /* I feel this size should be 595pt (350 + 210 + 0.05*700),
+ but that's clearly not right -- I don't think I understand what the -5%
+ in the h1 spec below is actually 5% of! */
+ left: 570pt;
+ width: auto;
+ margin-left: 0pt;
+ padding-left: 0pt;
+ border: none;
+ }
+}
+/* On still-wider screens, expand the left-margin, keeping the sidebar attached to the right-hand edge.
+ When the screen is 850pt wide (expanding from the @media case above),
+ the left margin will be 210pt, the width 350pt, and the right margin therefore 290pt.*/
+@media screen and (min-width: 850pt) {
+ body {
+ margin-right: 290pt; /* 290 = 850-(210+350) */
+ width: 350pt;
+ margin-left: auto; /* ...takes up the slack */
+ }
+ div.topsidebar {
+ position: absolute;
+ width: 290pt; /* same 290pt as above */
+ left: auto;
+ right: 0%;
+ padding-left: 0pt;
+ border: none;
+ }
+}
+
+
+code, pre {
+ font-family: Monaco, fixed;
+ font-size: 9pt;
+}
+
+a { text-decoration: none; }
+a:link { color: #66C; }
+a:visited { color: #669; }
+a[href]:hover { background: #EEE; }
+
+div.abstract {
+ font-style: oblique;
+ text-align: left;
+}
+div.abstract em { font-style: normal; }
+div.abstract code {
+ font-style: normal;
+ font-size: 80%;
+}
+
+/* a span/div style for attracting attention */
+.attention {
+ color: #822;
+}
+
+h1, h2, h3, h4, h5, h6 {
+ color: #822;
+ font-weight: 100; /* few fonts have ultra-light weights */
+ line-height: 100%; /* no need to spread out titles */
+}
+h1 {
+ margin-left: -40%;
+ margin-right: -5%;
+ padding: 0.5em;
+ border: solid thin #666;
+ text-align: right;
+}
+h2 {
+ margin-left: -40%;
+ margin-right: -5%;
+ padding: 0.2em;
+ border-top: solid thin #666;
+ clear: both;
+}
+
+h2.appendices {
+ margin-top: 10ex;
+ border-top: double medium #666;
+}
+h3 {
+ margin-left: -30%;
+ float: left;
+ width: 25%;
+ display: block;
+ text-align: right;
+ vertical-align: bottom;
+ padding-top: 0pt;
+ padding-right: 0.5em;
+ margin-top: 0pt;
+ line-height: 100%;
+}
+
+/*
+h4 {
+ color: #C66;
+}
+*/
+
+pre, table { background: #dde; }
+
+pre {
+ padding: 1em;
+ line-height: 130%;
+}
+
+table {
+ font-size: smaller;
+}
+td {
+ padding: 0.5ex;
+}
+
+Q:before { content: "“"; }
+Q:after { content: "”"; }
+
+img.smallimage {
+ float: right;
+ margin: 24pt;
+ margin-right: -30%;
+}
+
+div.signature {
+ margin-left: -40%;
+ margin-right: -5%;
+ margin-top: 4ex;
+ text-align: right;
+ border: solid thin #666;
+ padding: 0.3em;
+ clear: both;
+}
+
+/* ============================================================
+ * Some other curiosities of my one-time formatting for web pages
+ */
+.doc-history {
+ font-size: xx-small;
+ background: #eee;
+ line-height: 100%;
+}
+
+div.subtoc, div.subsubtoc { display: none; }
+
+/* ============================================================
+ * Special formatting for ToC
+ */
+
+/*
+ If there's significant amount of text in front of the first subsection,
+ then the following are good to put in the per-document stylesheet:
+ width: 25%;
+ float: right;
+*/
+div#toc {
+ color: #888;
+ padding: 0;
+ font-size: smaller;
+ text-align: right;
+}
+div#toc a:link { color: #888; }
+div#toc &gt; ul {
+ padding: 0pt;
+ margin: 0pt;
+ list-style: none;
+}
+div#toc li {
+ padding: 0pt;
+ display: inline-block;
+}
+div#toc li:before {
+ content: "§ ";
+ margin-left: 1em;
+}
+/* the following elements aren't currently generated by structure.lx */
+div#toc li ul {
+ padding-left: 1em;
+ margin-left: 0;
+ font-style: italic;
+ display: inline;
+}
+div#toc li ul:before {
+ content: "( ";
+}
+div#toc li ul:after {
+ content: " ) ";
+}
+div#toc li li {
+ padding-left: 0pt;
+}
+div#toc li li:after {
+ content: "; ";
+}
+</style>
+<style type="text/css">
dd ul { padding: 0pt; margin: 0pt; }
</style>
</head>
@@ -14,26 +246,24 @@ dd ul { padding: 0pt; margin: 0pt; }
<p>Format exam papers</p>
-<p>Version 1.1.4, 2016 December 19.</p>
+<p class="distonly">This is version exam-n-1.4.0, 2022 October 10.</p>
+
+
<ul>
-<li>Download: <a href='exam-n-1.1.4.tar.gz'>tarball</a>
-or <a href='exam-n-1.1.4.zip'>zip file</a></li>
-<li>You may want to look at a <a href='sample_exam.pdf'>sample
-exam</a>. See the <code>sample/</code> directory in the distribution
-for the source of this. That demonstrates the final version of the
-paper, as opposed to the ‘draft’ and ‘compose’ versions; there’s also
-a version with this layout but
-<a href='sample_exam_solution.pdf'>showing the solutions</a>.</li>
+
+<li class="distonly">See the sample exam in the distribution.</li>
<li>If you're a question author, you probably don't want to read the
full documentation. Stick to the shorter
-<a href='notes-for-authors.pdf'>notes for authors</a>.</li>
-<li>See the <a href='exam-n.pdf' >documentation</a> for fuller
+<a href="notes-for-authors.pdf">notes for authors</a>.</li>
+<li>See the <a href="exam-n.pdf">documentation</a> for fuller
discussion.</li>
<li>The package's 'home page' is
-<a href='http://purl.org/nxg/dist/exam-n'><code>http://purl.org/nxg/dist/exam-n</code></a>,
-and the repository is available at
-<a href='https://bitbucket.org/nxg/exam-n'>bitbucket</a>.</li>
+<a href="https://purl.org/nxg/dist/exam-n"><code>https://purl.org/nxg/dist/exam-n</code></a>,
+and the repository is available to
+<a href="https://heptapod.host/nxg/exam-n">browse</a>
+or clone.</li>
+<li>And it's on CTAN at <a href="https://www.ctan.org/pkg/exam-n">/pkg/exam-n</a>.</li>
</ul>
<h2>Overview</h2>
@@ -41,13 +271,13 @@ and the repository is available at
<h3>Other exam styles</h3>
<p>There are already multiple ‘exam’ LaTeX styles on CTAN,
including
-the (original?) <a href='http://dante.ctan.org/tex-archive/macros/latex/contrib/exam/'>exam class</a>,
-the extensive <a href='http://www.math.uakron.edu/~dpstory/webeq.html' >AcroTeX</a> bundle,
+the (original?) <a href="http://dante.ctan.org/tex-archive/macros/latex/contrib/exam/">exam class</a>,
+the extensive <a href="http://www.math.uakron.edu/~dpstory/webeq.html">AcroTeX</a> bundle,
the
-<a href='http://dante.ctan.org/tex-archive/macros/latex/contrib/examdesign/'>examdesign</a> and
-<a href='http://dante.ctan.org/tex-archive/macros/latex/contrib/exams/'>exams</a>
+<a href="http://dante.ctan.org/tex-archive/macros/latex/contrib/examdesign/">examdesign</a> and
+<a href="http://dante.ctan.org/tex-archive/macros/latex/contrib/exams/">exams</a>
classes, and
-<a href='http://www.tex.ac.uk/cgi-bin/CTANcataloguesearch.pl?CATSTRING=exam'>a variety of other packages</a>
+<a href="http://www.tex.ac.uk/cgi-bin/CTANcataloguesearch.pl?CATSTRING=exam">a variety of other packages</a>
which mention exams in some way.
Some of these are more focused on generating quizzes
(even doing things like randomising answers)
@@ -82,6 +312,45 @@ checks to avoid mistakes. The result has, in effect, been validated
by practice.</p>
+<h2>To install</h2>
+<p>Unpack the distribution tarball or zip
+file, and move the directory <code>move-to-texmf</code> (or its
+contents) to some
+location on the LaTeX search path. You're probably looking for a
+directory called <code>texmf-local</code>, or something like that.</p>
+
+<p>‘Move…to a suitable place’ is admittedly very vague. Here are some
+pointers, however:</p>
+<ul>
+<li>This can be the same location as your exam source files. This
+will work, but you'll have to do this for each directory.</li>
+<li>See the good generic advice in
+<a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-wlcf">the
+TeX FAQ</a>.</li>
+<li>Your LaTeX environment might have some hints on ‘installing new
+style files’, or you can search online with some search string like
+that.</li>
+<li>If you're on a unix-like OS, then the command <code>kpsewhich
+guexam.cls</code> will show you which class file LaTeX will use (so if
+it produces no result, that's telling you that LaTeX won't find the
+files); also <code>kpsepath tex</code> will display, in an admittedly
+very oblique form, the list of places where TeX will search.</li>
+<li>If you're using MikTeX, then the documentation on the
+‘<a href="https://miktex.org/howto/miktex-console">MikTeX console</a>’
+includes a section on ‘Registering a user-managed TEXMF root
+directory’. This rather obliquely says that you can ‘register a
+user-managed TEXMF root directory’. What that means is that (i)
+you should go to a folder such as
+<code>...\Users\<em>yourname</em>\AppData\MikTeX</code>, (ii) create a
+sequence of folders so that you end up with
+<code>...\MikTeX\texmf\tex\latex\exam-n</code>, and (iii) put the
+distributed <code>.sty</code> and <code>.clo</code> files in the
+latter folder. The directory <code>...\MikTex\texmf</code> is your
+‘user-managed TEXMF root directory’, and you should add it to MikTeX's
+search path using the instructions above.</li>
+</ul>
+
+
<h2>Releases</h2>
<p>With the version 1.1 release, the interface should now be regarded
@@ -99,65 +368,113 @@ renamed to avoid a conflict with a pre-existing LaTeX class with the
same name; and in the second it was renamed to make it more
generically useful to other institutions.</p>
-<dl>
-
-<!-- @RELEASENOTES@ -->
-<dt><span class='attention'>1.1.4, 2016 December 19</span></dt>
-<dd><ul>
-<li>Documentation: add notes about use of pdfpages.</li>
-<li>Added <code>[largefont]</code> option.
-<strong>Note</strong>:
-option <code>[hugefont]</code> has replaced <code>[bigfont]</code>;
-the latter is now deprecated, and may be removed in v1.2.</li>
-<li>Use of the <code>\part</code> macro is now supported within
-solutions (it produced the wrong numbers before), and there is a new
-<code>\StylePartNumber</code> customisation macro.</li>
-</ul></dd>
-
-<dt>1.1.3</dt>
-<dd><ul>
-<li>Version 1.1.3 was never released</li>
-</ul></dd>
-
-<dt>1.1.2, 2015 November 26</dt>
-<dd><ul>
-<li>Handled trailing floats at end of document (generated by packages
-such as <code>rotating</code>.</li>
-<li><code>\label</code> within question environment now refers to the
-question number.</li>
-<li>Work around a problem when a paragraph starts with <code>{\bf ...}</code>
-rather than (post-1995) <code>\textbf{...}</code>.</li>
-<li><code>\begin{questiondata}</code> now starts a new paragraph.</li>
-<li>Some documentation adjustments.</li>
-</ul></dd>
-
-<dt>1.1.1, 2014 November 27</dt>
-<dd><ul>
-<li>Adjust <code>\partmarks*</code> behaviour; now behaves differently
-within display maths (addresses
-<a href='https://bitbucket.org/nxg/exam-n/issue/1/'>issue 1</a>).</li>
-<li>Various documentation and release fixes.</li>
-</ul></dd>
-
-<dt>1.1, 2014 May 3</dt>
-<dd>Converted to a generic class, <code>exam-n</code>, ready for wider
-distribution.
-Available on <a href='https://bitbucket.org/nxg/exam-n/'>bitbucket</a>
-and at CTAN.</dd>
-
-
-<dt>...</dt>
-<dd><a href='release-notes.html'>Earlier release notes</a> are available</dd>
-
-</dl>
+<h:dl xmlns:h="http://www.w3.org/1999/xhtml">
+<h:dt><h:span class="attention">1.4.0, 2022 October 10</h:span></h:dt><h:dd>
+ <ul>
+ <li>The [siunitx] option is now on by default, and the
+ <code>\units</code> macro produces a one-time-per-document
+ warning that it will be removed in the next version.</li>
+ <li>Having two <code>\partmarks</code> commands in an
+ environment is now detected as an error (it was documented as an
+ error, but not checked, so the extra <code>\partmarks</code>
+ commands were simply ignored).</li>
+ </ul>
+ </h:dd>
+
+<h:dt>1.4.0-b1, 2022 August 7</h:dt><h:dd>
+ <ul>
+ <li>The class file now depends on a version of LaTeX which is at least
+ the 2020/10/01 release. This is so that we can use the current LaTeX
+ hooks mechanism.</li>
+ <li>Rework <code>\partmarks</code>: the <code>\partmarks</code>
+ indicator can now go <em>inside</em> most environments, including
+ list, quotes, unnumbered equations, and the various amsmath displays. In these
+ cases, the indicator will automatically appear at the end of the
+ environment. The starred variant of the command still exists, but
+ should rarely be necessary.</li>
+ </ul>
+ </h:dd>
+
+<h:dt>1.3.5-b1, 2022 July 11</h:dt><h:dd><ul>
+<li>Fix erroneous broken line before <code>\partmarks</code>, in
+compose mode, when a paragraph fills the last line.</li>
+<li>Fix support for STIX2 fonts in XeLaTeX and LuaLaTeX (it was
+working inaccurately before).</li>
+<li>Add an optional argument for <code>\part</code> to override part numbering.</li>
+<li>Use the <code>xcolor</code> package for colour management, instead
+of the core <code>color</code> package (the <code>xcolor</code>
+package is well-known and stable, and this means that we are
+compatible with TikZ).</li>
+<li><code>\partmarks</code> in solutions no longer gobble trailing space
+(doing so is probably right in questions, and is still the case, but
+<code>\partmarks</code> in solutions tend to be more interspersed with
+text).</li>
+<li><code>\label</code> within a <code>\part</code> now refers to the
+part number (as opposed to the question number).</li>
+<li>Avoid a ‘You can't use `\unskip' in vertical mode’ error,
+in certain circumstances.</li>
+<li>Add the <code>[siunitx]</code> option, indicating that we should
+load the <a href="https://www.ctan.org/pkg/siunitx">siunitx</a> package (default no).
+This is now preferred to the <code>\units</code> macro, and the latter will be
+removed in a forthcoming release.</li>
+<li>Renamed <code>A1.clo</code> to clearer <code>myclass.clo</code></li>
+<li>Repository moved from bitbucket to
+<a href="https://heptapod.host/nxg/exam-n">https://heptapod.host/nxg/exam-n</a>,
+when bitbucket dropped support for Mercurial.
+This means, incidentally, that links to specific issues at bitbucket
+are now broken.</li>
+<li>Bold-italic maths should now work correctly with STIX.</li>
+<li>Long <code>\partmarks</code> comments now appear as footnotes.</li>
+<li>Solutions are now set <code>\normalsize</code>.</li>
+<li>Bugfix: move definition of <code>\defaultpartmarkscategory</code>
+so it can be invoked within a <code>.clo</code> file straightforwardly.</li>
+<li>Define the <code>[uprightpi]</code> option to set <code>\pi</code>
+as an upright character, as appropriate for a constant (this is
+implemented fully only for the <code>[mtpro2]</code> and
+<code>[stix2]</code> options)..</li>
+<li>Note that the <code>\units</code> macro is likely to be deprecated
+in a forthcoming version, and replaced by a recommendation to use the
+standard <code>[siunitx]</code> package.</li>
+</ul></h:dd>
+
+<h:dt>1.3, 2018 November 21</h:dt><h:dd><ul>
+<li>Add a ‘category’ optional argument to <code>\partmarks</code>, and
+add <code>\defaultpartmarkscategory</code>.</li>
+</ul>
+</h:dd>
+
+<h:dt>1.2.1, 2018 July 2</h:dt><h:dd><ul>
+<li>Bugfix: ignore any content which appears after
+<code>\end{document}</code>, in <code>\includequestion</code> (author)
+files (fixes issue 6).</li>
+<li>The environments <code>{figure*}</code> and <code>{table*}</code> now produce an error.</li>
+<li>The macro <code>\vec</code> now produces correct greek bold maths.</li>
+<li>Docmentation: notes on unit formatting.</li>
+</ul>
+</h:dd>
+
+<h:dt>1.2, 2017 December 1</h:dt><h:dd><ul>
+<li>Use serif STIX2 fonts for sans and monospace cases, when using
+Lua- or XeLaTeX (the style doesn't use/encourage any sans-serif text,
+so this shouldn't matter).</li>
+<li>Fix font sizes in solutions.</li>
+<li>Adjustments to font-handling, which appear to have fixed LuaLaTeX differences.</li>
+<li>Add the <code>stix2</code> option, to use the
+<a href="http://www.stixfonts.org/">STIX2 font set</a>.</li>
+<li>Make it possible to use <code>\rubric</code> and <code>\baserubric</code> within a <code>.clo</code> file.
+This was advertised as being possible, but it seems it had never been tested!</li>
+</ul></h:dd>
+</h:dl>
+
+
+
+<p class="distonly"><a href="release-notes-dist.html">Earlier release notes</a> are available</p>
<div class="signature">
-<a href='http://nxg.me.uk'>Norman Gray</a><br/>
-2016 December 19
+<a href="https://nxg.me.uk">Norman Gray</a><br/>
+2022 October 10
</div>
</body>
</html>
-
-
diff --git a/macros/latex/contrib/exam-n/exam-n.pdf b/macros/latex/contrib/exam-n/exam-n.pdf
index 66e4392de8..1505f61f4b 100644
--- a/macros/latex/contrib/exam-n/exam-n.pdf
+++ b/macros/latex/contrib/exam-n/exam-n.pdf
Binary files differ
diff --git a/macros/latex/contrib/exam-n/examndefs.sty b/macros/latex/contrib/exam-n/examndefs.sty
new file mode 100644
index 0000000000..5ad56f1e26
--- /dev/null
+++ b/macros/latex/contrib/exam-n/examndefs.sty
@@ -0,0 +1,121 @@
+% Generated file : DO NOT EDIT
+\@ifundefined{@psfontsfalse}{\newif\if@psfonts \@psfontsfalse}{}
+\@ifundefined{examn@uprightpifalse}{\newif\ifexamn@uprightpi \examn@uprightpifalse}{}
+\@ifundefined{examn@mtselect}{\newcount\examn@mtselect \examn@mtselect=0}{}
+\if@psfonts
+ \ifcase\examn@mtselect
+ % mathptm fonts
+ % This is a very clumsy version, but it appears to be our only option
+ \def\vec#1{\mathchoice{\mbox{\boldmath $\displaystyle #1$}}
+ {\mbox{\boldmath $ #1$}}
+ {\mbox{\boldmath $\scriptstyle #1$}}
+ {\mbox{\boldmath $\scriptscriptstyle #1$}}}
+ \ifexamn@uprightpi
+ \ClassWarning{exam-n}{Can't do uprightpi in [mathptm] -- sorry}
+ \let\italicpi\pi
+ \examn@uprightpifalse
+ \fi
+ \or % mathtime (should this be the same for mathtime as for mtpro2?
+ \let\vec\mathbf
+ \ifexamn@uprightpi
+ \ClassWarning{exam-n}{Can't do uprightpi in [mathtime] -- sorry}
+ \let\italicpi\pi
+ \examn@uprightpifalse
+ \fi
+ \or % mtpro2
+ \let\vec\mathbold
+ % \uppi is predefined in mtpro2
+ \ifexamn@uprightpi
+ \let\italicpi\pi
+ \let\pi\uppi
+ \fi
+ \else
+ % STIX2: the unicode-math package provides a \symbf for bold math symbols,
+ \ifnum\examn@engine<2 % pdflatex
+ \let\vec\mathbf
+ % pdftex (or original tex)
+ % The following should, I think, create an upright pi, but doesn't
+ \def\uppi{\mathrm{\pi}}
+ \let\italicpi\pi %for consistency
+ \let\symup\mathrm %not fully the right thing, but avoid errors below
+ \else % xelatex or lualatex
+ % This is where the dependence on a recent LaTeX enters.
+ \let\vec\symbf
+ \typeout{stix2: upright=\ifexamn@uprightpi true\else false\fi}
+ \AddToHook{begindocument/end}{\gdef\uppi{\symup{𝜋}}}
+ \ifexamn@uprightpi
+ \AddToHook{begindocument/end}{\gdef\italicpi{\symit{𝜋}}\global\let\pi\uppi}
+ \fi
+ \fi
+ \fi
+\else
+ % CM fonts: \mathbf doesn't work with greek in CM
+ \let\vec\mathbf
+ \ifexamn@uprightpi
+ % upright greek is hard to do portably, so give up
+ % See eg https://tex.stackexchange.com/questions/145926/ for discussion
+ \ClassWarning{exam-n}{Can't do uprightpi in [cmfonts] -- sorry}
+ \let\italicpi\pi
+ \let\uppi\pi %but avoid errors
+ \examn@uprightpifalse
+ \fi
+\fi
+\newcommand\BSc{B.Sc.{}}
+\newcommand\MSci{M.Sci.{}}
+\newcommand\MSc{M.Sc.{}}
+\newcommand\MA{M.A.{}}
+\newcommand\MEng{M.Eng.{}}
+\newcommand\BEng{B.Eng.{}}
+\ifnum\examn@mtselect>2
+ % ie, STIX2, and thus using the unicode-math package (see above)
+ \def\e{\symup{e}}
+ \newcommand{\dd}{\symup{d}}
+ \newcommand{\ddd}{\,\symup{d}}
+\else
+ \def\e{\mathrm{e}}
+ \newcommand{\dd}{\mathrm{d}}
+ \newcommand{\ddd}{\,\mathrm{d}}
+\fi
+
+\def\Diffl{\@ifstar\@Difflflat\@Diffl}
+\def\Partial{\@ifstar\@Partialflat\@Partial}
+\def\@Partial{\@ifnextchar[{\@@Diffl\partial}{\@@Diffl\partial[]}}
+\def\@Partialflat{\@ifnextchar[{\@@Difflflat\partial}{\@@Difflflat\partial[]}}
+\def\@Diffl{\@ifnextchar[{\@@Diffl\dd}{\@@Diffl\dd[]}}
+\def\@Difflflat{\@ifnextchar[{\@@Difflflat\dd}{\@@Difflflat\dd[]}}
+\def\@@Diffl#1[#2]#3#4{%
+ \def\@tempa{#2}%
+ \ifx\@tempa\empty
+ \frac{#1#3}{#1#4}%
+ \else
+ \frac{{#1}^{#2}#3}{#1{#4}^{#2}}%
+ \fi}
+\def\@@Difflflat#1[#2]#3#4{%
+ \def\@tempa{#2}%
+ \ifx\@tempa\empty
+ #1#3\mskip-0.8mu/\mskip-1.2mu #1#4%
+ \else
+ {#1}^{#2}#3\mskip-0.8mu /\mskip-1.2mu #1{#4}^{#2}%
+ \fi}
+\def\units{\examn@unitswarning
+ \begingroup
+ \catcode`\.=\active
+ \@ifstar{\let\un@tsspace\relax \un@ts}%
+ {\let\un@tsspace\thinspace\un@ts}}
+\begingroup
+ \catcode`\.=\active
+ \gdef\un@ts#1{\let~\thinspace\let.\thinspace
+ \ifmmode
+ \un@tsspace\mathrm{#1}%
+ \else
+ \nobreak$\un@tsspace\mathrm{#1}$%
+ \fi
+ \endgroup}
+\endgroup
+\newif\ifexamn@warnunits \examn@warnunitstrue
+\def\examn@unitswarning{\ifexamn@warnunits
+ \ClassWarning{exam-n}{The units macro will be removed in the next
+ version; the [siunitx] option is now on by default, so you can use
+ the macros in the siunits package}%
+ \global\examn@warnunitsfalse
+\fi}
diff --git a/macros/latex/contrib/exam-n/myclass.clo b/macros/latex/contrib/exam-n/myclass.clo
new file mode 100644
index 0000000000..9fd69120cc
--- /dev/null
+++ b/macros/latex/contrib/exam-n/myclass.clo
@@ -0,0 +1,42 @@
+\ProvidesFile{myclass.clo}[2022/10/10 exam-n-1.4.0]
+\typeout{myclass exam options, exam-n-1.4.0}
+%%%% Source: a91e9cff7cac, 2022-10-10T13:33:17+01:00
+%%%% File: myclass.clo
+%%%% Copyright 2005--2022, Norman Gray
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Norman Gray <https://nxg.me.uk>
+%%
+%% This work consists of the files exam-n.dtx and exam-n.ins,
+%% the derived file exam-n.cls,
+%% and the associated *.clo files.
+
+
+% It's possible to change the rubric and base rubric here.
+%\rubric{Answer questions.}
+%
+%\baserubric{\emph{Do not attempt to write on both sides of the paper at once.}
+%
+%You may sing, if you feel you must.}
+
+% Nothing here beyond the constants sheet
+\constantssheet{
+\begin{center}
+{\Large\textbf{Values of astrophysical constants}}\\[\bigskipamount]
+\begin{tabular}{lll} \hline\\[-1.5ex] % slightly hacky extra space after hline
+ speed of light & $c$ & $2.998\times 10^8 \,{\rm ms^{-1}}$\\
+ gravitational constant & $G$ & $6.673\times10^{-11}\,{\rm Nm^2kg^{-2}}$\\
+ \vdots \\
+\hline
+\end{tabular}
+\end{center}
+}
diff --git a/macros/latex/contrib/exam-n/notes-for-authors.pdf b/macros/latex/contrib/exam-n/notes-for-authors.pdf
index ca51908af3..8cbe643d87 100644
--- a/macros/latex/contrib/exam-n/notes-for-authors.pdf
+++ b/macros/latex/contrib/exam-n/notes-for-authors.pdf
Binary files differ
diff --git a/macros/latex/contrib/exam-n/notes-for-authors.tex b/macros/latex/contrib/exam-n/notes-for-authors.tex
index de9e3a8ba7..d2798c9ed0 100644
--- a/macros/latex/contrib/exam-n/notes-for-authors.tex
+++ b/macros/latex/contrib/exam-n/notes-for-authors.tex
@@ -6,33 +6,46 @@
\title{Notes for exam question authors}
\author{Norman Gray}
-\date{exam-n 1.1.4, 2016 December 19}
+\date{Version exam-n-1.4.0, 2022 October 10}
\parindent=0pt
\parskip=\medskipamount
\makeatletter
-\def\csarg#1{\texttt\{\textit{#1}\texttt\}%
+\def\cs@arg#1{\texttt\{\textit{#1}\texttt\}%
\advance\@tempcnta-1
\ifnum\@tempcnta>0
- \let\next\csarg
+ \let\next\cs@arg
\else
\let\next\endgroup % begun in \cs
\fi
\next}
+{\catcode`\|=0 \catcode`\\=12
+|gdef|cs@textbackslash#1{|texttt{\#1}}}
+% \cs{foo} typeset \foo
+% \cs[2]{foo}{bar}{baz} typeset \foo{bar}{baz}
\newcommand\cs[2][0]{\begingroup
\color{cscolour}%
- $\backslash$\texttt{#2}%
+ \cs@textbackslash{#2}%
\@tempcnta=#1
\ifnum\@tempcnta>0
- \let\next\csarg
+ \let\next\cs@arg
\else
\let\next\endgroup
\fi
\next}
-\def\env#1{\texttt{\textcolor{cscolour}{#1}}}
+\let\origvec\vec
+% We'd like to say here
+% \newif\ifexamn@uprightpi \examn@uprightpitrue
+% but that's not supported for CM fonts
+\usepackage{examndefs}
+
+\makeatother
+
+\def\env#1{\texttt{\textcolor{cscolour}{\{#1\}}}}
\def\opt#1{\texttt{[#1]}}
+\def\package#1{\textsf{#1}}
\setcounter{secnumdepth}0
@@ -61,7 +74,7 @@ together. It follows from that that you should be hesitant about putting anythi
the preamble other than \cs{usepackage} commands, and you should
consult with the exams convener to ensure that such packages go into
the master file, too. It's probably a safe bet that the `graphicx'
-package will be included in the master file. If you want to include
+package will be included in the master file. If you want to include
a \cs{newcommand}, or anything like that,
it can be placed inside the \env{question} environment. For
other customisations, negotiate with the exams convener.
@@ -76,16 +89,54 @@ not displayed in the final version (obviously), but which do appear in
draft modes. You'll most typically have a \cs{partmarks} macro and a
\env{solution} environment for each \cs{part}, but they don't have to
match up, and you can have the entire solution at the end if you prefer.
-The \cs[1]{partmarks*}n command is almost the same, but places the
-mark indicator in a slightly different position which looks better
-when there would otherwise be a gap at the right of the page. It can
-be placed after a list, or inside but at the end of an equation.
+
+The \cs{partmarks} command will most typically go at the end of a
+paragraph, but it may also appear inside an equation (that is, in
+\verb|\[...\]|; don't use \verb|$$...$$|), inside one or other
+\package{amsmath} display environments, or in a list or other
+environment. If it appears inside an environment, the indicator will
+appear at the \emph{end} of the environment, independent of where in
+the environment the command was typed (which implies that you can't
+have more than one inside an environment).
+
+The starred version is similar, but budges its indicator upwards
+a little, and is a heuristic alternative which is useful in some
+cases \emph{after} a list or display, or after a numbered equation, if the placement of the
+indicator is otherwise inaesthetic
+(if the style of the part-marks indicators happens to be such
+that the indicator may be mistaken for an equation number, then
+it would be wise to use either \cs{partmarks} or \cs{partmarks*}
+after the equation, instead). If you use \cs{partmarks*} within a
+display, you might be confronted by an error message, talking
+about \cs{eqno} in maths mode, which is even more incomprehensible
+than most \LaTeX\ messages.
+
Note that \cs{partmarks} ends a paragraph (\cs{partmarks*} doesn't): this is
probably good style, but if you insist on mid-paragraph marks, then a following
\verb|\noindent| will be useful. It's helpful to use \cs{partmarks} inside a
\env{solution} to indicate the distribution of marks -- this doesn't mess up
the mark-totalling calculation.
+You may optionally give a question number as an argument to the
+\env{question} environment: \cs[1]{begin\{question\}[n]}{markgoal}.
+In \opt{compose} mode, this simply sets the question number, but in the other
+modes, when the question file is included in a master file, this
+checks that the given number~$n$ is what would be assigned
+automatically, to help detect missing or out-of-order questions. If
+the question identifier is not a number, such as `D1', then you can
+provide that identifier here also, but in this case you must also set
+\cs{QuestionNumberChecksOff} in the question preamble.
+
+The \cs{partmarks} command has an optional argument which
+indicates the category of the question, thus `bookwork', `unseen',
+and so on. If this is present -- for example
+\cs[1]{partmarks[bookwork]}{5} -- then the category is included in the
+marks indicator.
+As you might hope, the \cs{partmarks*} command can take this
+optional argument also: \cs[1]{partmarks*[bookwork]}{5}.
+This extra text will typically be only one or two words long, but if
+the text is much longer than that, it will be turned into a footnote.
+
One common exam or test question type is a multiple-choice question.
This is indicated by a \cs{begin\{mcq\}} environment, which contains a
textual question followed by a sequence of possible answers indicated by
@@ -115,15 +166,17 @@ The \cs[1]{caption}{text} command works as usual; the figure and table
numbering sequences continue through the solutions, if they're shown,
but this isn't expected to be a problem.
-If you use \cs{label} within a \env{question} environment, that label
-will, as you might expect, refer to the question number.
+There is neither a \env{figure*} nor a \env{table*} environment,
+because this is a single-column class.
+Use the no-option unstarred versions instead.
+
+\subsection{Hints}
-Hints:
Figures can be included with \cs{includegraphics} as usual, as long as
-the `graphicx' package has been included at the top of the master
+the \package{graphicx} package has been included at the top of the master
file. If you want to include complete pages from a PDF (most
typically containing a scanned handwritten model answer), then you can
-do so by including the `pdfpages' package at the top of the file, and
+do so by including the \package{pdfpages} package at the top of the file, and
then \cs[1]{includepdf[pages=\{-\}]}{filename} inside a \env{solution}
environment.
The \texttt{pages=\{-\}} option means that all pages from the file are
@@ -131,7 +184,10 @@ inserted; you may wish to use \texttt{scale=0.8} to shrink the PDF;
the option \verb|pagecommand={\thispagestyle{fancy}}| will cause the other
class apparatus, such as page numbers and headers, to be
superimposed on the included pages.
-See the documentation of the `pdfpages' package for more information.
+See the documentation of the \package{pdfpages} package for more information.
+
+If you use \cs{label} within a \env{question} environment, that label
+will, as you might expect, refer to the question number.
Include marginal notes with \cs[1]{comment}{remark} -- these show up in drafting
modes (\opt{draft} and \opt{compose}), but not in the final version.
@@ -139,99 +195,27 @@ The \cs[1]{author}{name} command is just
a type of comment. If you need to make more noise, then
\cs[1]{shout}{remark} inserts a highlighted \emph{remark} in the flow of text
(so it can be used anywhere) and includes the remark in a prominent
-list of exclamations at the end of the document.
+list of exclamations at the end of the document. Note that \cs{shout}
+text \emph{appears in the \opt{final} version}: it is to draw
+attention to problems (for example \cs[1]{shout}{solution wrong!})
+which must be resolved before the exam is presented to students.
At the bottom of each page, you see a faint identification code, such
as `QM/123-456'. This consists of an exam identifier, extracted from
the exam preamble, plus a code which changes each time \LaTeX\ is
-run. This helps you avoid collation accidents, and to distinguish
+run, but which is otherwise meaningless.
+This helps you avoid collation accidents, and to distinguish
between slightly different versions of the printed document.
\subsection{Various convenience commands}
\label{s:othercommands}
-\makeatletter
-% Definitions edited in at build time...
-% Abbreviations for degrees.
-% \begin{macrocode}
-\newcommand\BSc{B.Sc.{}}
-\newcommand\MSci{M.Sci.{}}
-\newcommand\MSc{M.Sc.{}}
-\newcommand\MA{M.A.{}}
-\newcommand\MEng{M.Eng.{}}
-\newcommand\BEng{B.Eng.{}}
-% \end{macrocode}
-%
-% Tweaks to differentials.
-% \begin{macrocode}
-\newcommand{\dd}{\mathrm{d}}
-\newcommand{\ddd}{\,\mathrm{d}} % inside an integral, including thinspace
-
-\def\Diffl{\@ifstar\@Difflflat\@Diffl}
-\def\Partial{\@ifstar\@Partialflat\@Partial}
-\def\@Partial{\@ifnextchar[{\@@Diffl\partial}{\@@Diffl\partial[]}}
-\def\@Partialflat{\@ifnextchar[{\@@Difflflat\partial}{\@@Difflflat\partial[]}}
-\def\@Diffl{\@ifnextchar[{\@@Diffl\dd}{\@@Diffl\dd[]}}
-\def\@Difflflat{\@ifnextchar[{\@@Difflflat\dd}{\@@Difflflat\dd[]}}
-\def\@@Diffl#1[#2]#3#4{%
- \def\@tempa{#2}%
- \ifx\@tempa\empty
- \frac{#1#3}{#1#4}%
- \else
- \frac{{#1}^{#2}#3}{#1{#4}^{#2}}%
- \fi}
-\def\@@Difflflat#1[#2]#3#4{%
- \def\@tempa{#2}%
- \ifx\@tempa\empty
- #1#3\mskip-0.8mu/\mskip-1.2mu #1#4%
- \else
- {#1}^{#2}#3\mskip-0.8mu /\mskip-1.2mu #1{#4}^{#2}%
- \fi}
-% \end{macrocode}
-%
-% The exponential sign
-% \begin{macrocode}
-\def\e{{\mathrm e}}
-% \end{macrocode}
-%
-% Physical units in |\rm|. Unstarred version includes leading
-% |\thinspace|. Starred version doesn't, and is used when referring to
-% the unit by itself (eg axis is |$B/\units*T$|), and is not qualifying
-% a number.
-% FIXME: |\mu| in |\units| can come out wrong in some fonts (mtpro2?)
-% -- needs investigation.
-% \begin{macrocode}
-\def\units{\begingroup
- \catcode`\.=\active
- \@ifstar{\let\un@tsspace\relax \un@ts}%
- {\let\un@tsspace\thinspace\un@ts}}
-\begingroup
- \catcode`\.=\active
- \gdef\un@ts#1{\let~\thinspace\let.\thinspace
- \ifmmode
- \un@tsspace\mathrm{#1}%
- \else
- \nobreak$\un@tsspace\mathrm{#1}$%
- \fi
- \endgroup}
-\endgroup
-% \end{macrocode}
-%
-% Other miscellaneous symbols:
-% The AU is nothing exciting, but may be adjusted in future
-% \begin{macrocode}
-\def\au{au}
-% \end{macrocode}
-% The symbol for Compton wavelength is a crossed lambda -- the following isn't perfect, but is OK for now.
-% \begin{macrocode}
-\def\lambdabar{\setbox\@tempboxa\hbox{$\lambda$}%
- \hbox to 0pt{\hbox to \wd\@tempboxa{\hss$\bar{}$\hss}\hss}\box\@tempboxa}
-% \end{macrocode}
-\makeatother
-
-Macro \cs[1]{vec}{v} is redefined to give bold-font vectors, rather than
-vectors with arrows, which is the (weird) \LaTeX\ default. This
-should work for bold greek as well as roman.
+Macro \cs[1]{vec}{v} is redefined to give bold-font vectors
+rather than vectors with arrows, which is the (weird) \LaTeX\ default
+-- thus $\vec v$ rather than $\origvec v$.
+This is intended to work for bold greek as well as roman,
+but it does so reliably only for the \opt{mtpro2} and \opt{stix2}
+options.
Macros \cs{dd} and \cs{ddd}: \cs{dd} is a roman d, as used for
differentials; \cs{ddd} is the same with a preceding thinspace,
@@ -254,6 +238,12 @@ The unstarred versions are for displayed equations, the starred
ones for inline maths.
There is analogous support for partial derivatives with \cs[2]{Partial}ab.
+You should generally type units, and numbers with units, using the
+\package{siunitx} package (use the \opt{siunitx} \cs{documentclass} option).
+
+However this package currently also
+supports a basic \verb|\units| command, described here. This macro
+is very likely to be removed in a future version of this package.
Macros \cs[1]{units}{expr}, \cs[1]{units*}{expr}: These typeset
physical units in an upright shape, with tilde or dot acting as a
separator between units. Since this is typeset in maths mode, all
@@ -261,22 +251,21 @@ other spacing is ignored. For example, \verb|$v=10\units{m.\mu s^{-1}}$|
gives $v=10\units{m.\mu s^{-1}}$. The unstarred version includes some
leading space; the starred version can be used when referring to the
unit by itself, where it is not qualifying a number (eg labelling an
-axis with units \verb|$B/\units*T$|, or $B/\units*T$). These macros
-might be replaced, in the future, by a recommendation to use the
-\texttt{siunitx} package.
-
-For some other useful symbols, see the table below:
-
-\def\arraystretch{1.5}
-\begin{tabular}{rcp{8cm}}
-\cs{e}&$\e^{i\pi}+1=0$& the exponential is typeset in an upright rather than
-an italic shape, as in \verb|$\e^{i\pi} + 1 = 0$|.\\
-\cs{au}&10\units\au& astronomical units:
-\verb|10\units{\au}|.\\
-\cs{lambdabar}&$\lambdabar$& the Compton wavelength, as a lambda with a
-bar through it.\\
-\end{tabular}
-
+axis with units \verb|$B/\units*T$|, or $B/\units*T$).
+
+The command \cs{e} sets an upright~`e':
+\verb|$\e^{i\pi} + 1 = 0$| produces $\e^{i\pi} + 1 = 0$.
+Other shortcuts may be available in customisations of this class.\footnote{%
+The package used to support an \cs{au} macro, for astronomical
+unit, and \cs{lambdabar} for Compton wavelength, but these have
+since been removed. The former is available via \package{siunitx}.}
+
+Note: $\pi$ is set as an italic pi character, matching the
+\LaTeX\ default. Since it's (usually) used as the circular constant,
+it should more properly be set upright, and you can get that using the
+\opt{uprightpi} option. This option also defines a \verb|\italicpi|
+command, for completeness. This option is at present
+implemented only for the \opt{mtpro2} and \opt{stix2} options.
\subsection{Extra: Creating complete exams}
\label{s:complete}
@@ -288,7 +277,7 @@ below. For more detail, see the complete documentation in \texttt{exam-n.pdf}.
\goodbreak
\listinginput1{template-master.tex}
-The \texttt{exam-n} class currently supports a sample class option \opt{A1}.
+The \texttt{exam-n} class currently supports a sample class option \opt{myclass}.
This automatically includes a suitable constants sheet in the
formatted paper.
diff --git a/macros/latex/contrib/exam-n/release-notes-dist.html b/macros/latex/contrib/exam-n/release-notes-dist.html
new file mode 100644
index 0000000000..1200c9828f
--- /dev/null
+++ b/macros/latex/contrib/exam-n/release-notes-dist.html
@@ -0,0 +1,656 @@
+<?xml version="1.0" encoding="utf-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>exam-n class – full release notes</title>
+
+
+<style class="distonly" type="text/css">body {
+ color: #333;
+ background: white;
+ margin-left: +30%;
+ width: 50%; /* body is 50% of screen width */
+ margin-right: auto; /* ie, 20% */
+ padding: 0.5em; /* this will make a difference if I decide to
+ have the background a different colour */
+ /* I can't decide on font: Optima's always nice, but Gill looks
+ agreeably intense. Helvetica's a decent fallback. */
+ font-family: "Helvetica Neue", Helvetica, "Gill Sans", gill, sans-serif;
+ /* font-family: Optima, "Gill Sans", gill, Helvetica, sans-serif; */
+ /* font-family: "Gill Sans", gill, Helvetica, sans-serif; */
+ /* I seem to have used 11pt at some point in the past, but this
+ is far too big -- did I ever have a reason for that, or is it
+ just due to browser changes? */
+ font-size: 10pt;
+ line-height: 150%;
+}
+
+div.topsidebar {
+ float: right;
+ width: 50%; /* ...of the body width (ie, 50% x 50% of screen) */
+ font-size: smaller;
+ margin-left: 1em;
+ padding-left: 1em;
+ border-left: solid thin #AAA;
+}
+
+/* On wider screens, move the sidebar out to the right hand side */
+/* This uses CSS3 media queries: http://www.w3.org/TR/css3-mediaqueries/ */
+@media screen and (min-width: 700pt) and (max-width: 850pt) {
+ body {
+ margin-left: 210pt;
+ width: 350pt; /* 50% of 700pt */
+ margin-right: auto;
+ }
+ div.topsidebar {
+ position: absolute;
+ /* I feel this size should be 595pt (350 + 210 + 0.05*700),
+ but that's clearly not right -- I don't think I understand what the -5%
+ in the h1 spec below is actually 5% of! */
+ left: 570pt;
+ width: auto;
+ margin-left: 0pt;
+ padding-left: 0pt;
+ border: none;
+ }
+}
+/* On still-wider screens, expand the left-margin, keeping the sidebar attached to the right-hand edge.
+ When the screen is 850pt wide (expanding from the @media case above),
+ the left margin will be 210pt, the width 350pt, and the right margin therefore 290pt.*/
+@media screen and (min-width: 850pt) {
+ body {
+ margin-right: 290pt; /* 290 = 850-(210+350) */
+ width: 350pt;
+ margin-left: auto; /* ...takes up the slack */
+ }
+ div.topsidebar {
+ position: absolute;
+ width: 290pt; /* same 290pt as above */
+ left: auto;
+ right: 0%;
+ padding-left: 0pt;
+ border: none;
+ }
+}
+
+
+code, pre {
+ font-family: Monaco, fixed;
+ font-size: 9pt;
+}
+
+a { text-decoration: none; }
+a:link { color: #66C; }
+a:visited { color: #669; }
+a[href]:hover { background: #EEE; }
+
+div.abstract {
+ font-style: oblique;
+ text-align: left;
+}
+div.abstract em { font-style: normal; }
+div.abstract code {
+ font-style: normal;
+ font-size: 80%;
+}
+
+/* a span/div style for attracting attention */
+.attention {
+ color: #822;
+}
+
+h1, h2, h3, h4, h5, h6 {
+ color: #822;
+ font-weight: 100; /* few fonts have ultra-light weights */
+ line-height: 100%; /* no need to spread out titles */
+}
+h1 {
+ margin-left: -40%;
+ margin-right: -5%;
+ padding: 0.5em;
+ border: solid thin #666;
+ text-align: right;
+}
+h2 {
+ margin-left: -40%;
+ margin-right: -5%;
+ padding: 0.2em;
+ border-top: solid thin #666;
+ clear: both;
+}
+
+h2.appendices {
+ margin-top: 10ex;
+ border-top: double medium #666;
+}
+h3 {
+ margin-left: -30%;
+ float: left;
+ width: 25%;
+ display: block;
+ text-align: right;
+ vertical-align: bottom;
+ padding-top: 0pt;
+ padding-right: 0.5em;
+ margin-top: 0pt;
+ line-height: 100%;
+}
+
+/*
+h4 {
+ color: #C66;
+}
+*/
+
+pre, table { background: #dde; }
+
+pre {
+ padding: 1em;
+ line-height: 130%;
+}
+
+table {
+ font-size: smaller;
+}
+td {
+ padding: 0.5ex;
+}
+
+Q:before { content: "“"; }
+Q:after { content: "”"; }
+
+img.smallimage {
+ float: right;
+ margin: 24pt;
+ margin-right: -30%;
+}
+
+div.signature {
+ margin-left: -40%;
+ margin-right: -5%;
+ margin-top: 4ex;
+ text-align: right;
+ border: solid thin #666;
+ padding: 0.3em;
+ clear: both;
+}
+
+/* ============================================================
+ * Some other curiosities of my one-time formatting for web pages
+ */
+.doc-history {
+ font-size: xx-small;
+ background: #eee;
+ line-height: 100%;
+}
+
+div.subtoc, div.subsubtoc { display: none; }
+
+/* ============================================================
+ * Special formatting for ToC
+ */
+
+/*
+ If there's significant amount of text in front of the first subsection,
+ then the following are good to put in the per-document stylesheet:
+ width: 25%;
+ float: right;
+*/
+div#toc {
+ color: #888;
+ padding: 0;
+ font-size: smaller;
+ text-align: right;
+}
+div#toc a:link { color: #888; }
+div#toc &gt; ul {
+ padding: 0pt;
+ margin: 0pt;
+ list-style: none;
+}
+div#toc li {
+ padding: 0pt;
+ display: inline-block;
+}
+div#toc li:before {
+ content: "§ ";
+ margin-left: 1em;
+}
+/* the following elements aren't currently generated by structure.lx */
+div#toc li ul {
+ padding-left: 1em;
+ margin-left: 0;
+ font-style: italic;
+ display: inline;
+}
+div#toc li ul:before {
+ content: "( ";
+}
+div#toc li ul:after {
+ content: " ) ";
+}
+div#toc li li {
+ padding-left: 0pt;
+}
+div#toc li li:after {
+ content: "; ";
+}
+</style>
+<style type="text/css">
+dd ul { padding: 0pt; margin: 0pt; }
+</style>
+</head>
+
+<body>
+<h1>The exam-n class – release notes</h1>
+
+<h:dl xmlns:h="http://www.w3.org/1999/xhtml">
+
+
+
+
+<h:dt><h:span class="attention">1.4.0, 2022 October 10</h:span></h:dt><h:dd>
+ <ul>
+ <li>The [siunitx] option is now on by default, and the
+ <code>\units</code> macro produces a one-time-per-document
+ warning that it will be removed in the next version.</li>
+ <li>Having two <code>\partmarks</code> commands in an
+ environment is now detected as an error (it was documented as an
+ error, but not checked, so the extra <code>\partmarks</code>
+ commands were simply ignored).</li>
+ </ul>
+ </h:dd>
+
+<h:dt>1.4.0-b1, 2022 August 7</h:dt><h:dd>
+ <ul>
+ <li>The class file now depends on a version of LaTeX which is at least
+ the 2020/10/01 release. This is so that we can use the current LaTeX
+ hooks mechanism.</li>
+ <li>Rework <code>\partmarks</code>: the <code>\partmarks</code>
+ indicator can now go <em>inside</em> most environments, including
+ list, quotes, unnumbered equations, and the various amsmath displays. In these
+ cases, the indicator will automatically appear at the end of the
+ environment. The starred variant of the command still exists, but
+ should rarely be necessary.</li>
+ </ul>
+ </h:dd>
+
+<h:dt>1.3.5-b1, 2022 July 11</h:dt><h:dd><ul>
+<li>Fix erroneous broken line before <code>\partmarks</code>, in
+compose mode, when a paragraph fills the last line.</li>
+<li>Fix support for STIX2 fonts in XeLaTeX and LuaLaTeX (it was
+working inaccurately before).</li>
+<li>Add an optional argument for <code>\part</code> to override part numbering.</li>
+<li>Use the <code>xcolor</code> package for colour management, instead
+of the core <code>color</code> package (the <code>xcolor</code>
+package is well-known and stable, and this means that we are
+compatible with TikZ).</li>
+<li><code>\partmarks</code> in solutions no longer gobble trailing space
+(doing so is probably right in questions, and is still the case, but
+<code>\partmarks</code> in solutions tend to be more interspersed with
+text).</li>
+<li><code>\label</code> within a <code>\part</code> now refers to the
+part number (as opposed to the question number).</li>
+<li>Avoid a ‘You can't use `\unskip' in vertical mode’ error,
+in certain circumstances.</li>
+<li>Add the <code>[siunitx]</code> option, indicating that we should
+load the <a href="https://www.ctan.org/pkg/siunitx">siunitx</a> package (default no).
+This is now preferred to the <code>\units</code> macro, and the latter will be
+removed in a forthcoming release.</li>
+<li>Renamed <code>A1.clo</code> to clearer <code>myclass.clo</code></li>
+<li>Repository moved from bitbucket to
+<a href="https://heptapod.host/nxg/exam-n">https://heptapod.host/nxg/exam-n</a>,
+when bitbucket dropped support for Mercurial.
+This means, incidentally, that links to specific issues at bitbucket
+are now broken.</li>
+<li>Bold-italic maths should now work correctly with STIX.</li>
+<li>Long <code>\partmarks</code> comments now appear as footnotes.</li>
+<li>Solutions are now set <code>\normalsize</code>.</li>
+<li>Bugfix: move definition of <code>\defaultpartmarkscategory</code>
+so it can be invoked within a <code>.clo</code> file straightforwardly.</li>
+<li>Define the <code>[uprightpi]</code> option to set <code>\pi</code>
+as an upright character, as appropriate for a constant (this is
+implemented fully only for the <code>[mtpro2]</code> and
+<code>[stix2]</code> options)..</li>
+<li>Note that the <code>\units</code> macro is likely to be deprecated
+in a forthcoming version, and replaced by a recommendation to use the
+standard <code>[siunitx]</code> package.</li>
+</ul></h:dd>
+
+<h:dt>1.3, 2018 November 21</h:dt><h:dd><ul>
+<li>Add a ‘category’ optional argument to <code>\partmarks</code>, and
+add <code>\defaultpartmarkscategory</code>.</li>
+</ul>
+</h:dd>
+
+<h:dt>1.2.1, 2018 July 2</h:dt><h:dd><ul>
+<li>Bugfix: ignore any content which appears after
+<code>\end{document}</code>, in <code>\includequestion</code> (author)
+files (fixes issue 6).</li>
+<li>The environments <code>{figure*}</code> and <code>{table*}</code> now produce an error.</li>
+<li>The macro <code>\vec</code> now produces correct greek bold maths.</li>
+<li>Docmentation: notes on unit formatting.</li>
+</ul>
+</h:dd>
+
+<h:dt>1.2, 2017 December 1</h:dt><h:dd><ul>
+<li>Use serif STIX2 fonts for sans and monospace cases, when using
+Lua- or XeLaTeX (the style doesn't use/encourage any sans-serif text,
+so this shouldn't matter).</li>
+<li>Fix font sizes in solutions.</li>
+<li>Adjustments to font-handling, which appear to have fixed LuaLaTeX differences.</li>
+<li>Add the <code>stix2</code> option, to use the
+<a href="http://www.stixfonts.org/">STIX2 font set</a>.</li>
+<li>Make it possible to use <code>\rubric</code> and <code>\baserubric</code> within a <code>.clo</code> file.
+This was advertised as being possible, but it seems it had never been tested!</li>
+</ul></h:dd>
+
+
+<h:dt><h:span class="attention">1.1.5, 2016 December 22</h:span></h:dt><h:dd><ul>
+<li>Make <code>\schoolcoursecode</code> optional exam metadata.
+Rework how this is checked, and support customising this in a
+<code>.clo</code> file.</li>
+</ul></h:dd>
+
+<h:dt>1.1.4, 2016 December 19</h:dt><h:dd><ul>
+<li>Documentation: add notes about use of pdfpages.</li>
+<li>Added <code>[largefont]</code> option.
+<strong>Note</strong>:
+option <code>[hugefont]</code> has replaced <code>[bigfont]</code>;
+the latter is now deprecated, and may be removed in v1.2.</li>
+<li>Use of the <code>\part</code> macro is now supported within
+solutions (it produced the wrong numbers before), and there is a new
+<code>\StylePartNumber</code> customisation macro.</li>
+</ul></h:dd>
+
+<h:dt>1.1.3, n/d</h:dt><h:dd><ul>
+<li>Version 1.1.3 was never released</li>
+</ul></h:dd>
+
+<h:dt>1.1.2, 2015 November 26</h:dt><h:dd><ul>
+<li>Handled trailing floats at end of document (generated by packages
+such as <code>rotating</code>.</li>
+<li><code>\label</code> within question environment now refers to the
+question number.</li>
+<li>Work around a problem when a paragraph starts with <code>{\bf ...}</code>
+rather than (post-1995) <code>\textbf{...}</code>.</li>
+<li><code>\begin{questiondata}</code> now starts a new paragraph.</li>
+<li>Some documentation adjustments.</li>
+</ul></h:dd>
+
+<h:dt>1.1.1, 2014 November 27</h:dt><h:dd><ul>
+<li>Adjust <code>\partmarks*</code> behaviour; now behaves differently
+within display maths (addresses
+<a href="https://bitbucket.org/nxg/exam-n/issue/1/">issue 1</a>).</li>
+<li>Various documentation and release fixes.</li>
+</ul></h:dd>
+
+<h:dt>1.1, 2014 May 3</h:dt><h:dd><p>Converted to a generic class, <code>exam-n</code>, ready for wider
+distribution.
+Available on <a href="https://bitbucket.org/nxg/exam-n/">bitbucket</a>
+and at CTAN.</p>
+</h:dd>
+
+<h:dt>1.0.16, 2014 February 28</h:dt><h:dd><ul>
+<li>Option mtpro2 now switches to times (this fixes a pre-existing bug
+ exposed by the [sansserif] option).</li>
+<li>The [bigfont] option now works (this fixes a pre-existing bug, to
+ do with <code>\subsections</code>, which was exposed by the addition
+ of the [bigfont] option).</li>
+<li>Added the [bigfont] option</li>
+<li>Fixed 'shouts' warning at start (again)</li>
+<li>Forbid *section commands inside questions (and don't freak out)</li>
+<li>Rename <code>\questiontrailer</code> to <code>\questionpreamble</code> (more logical)</li>
+<li>Fixed mcq warnings, and 'question continued' errors.</li>
+<li>Renamed <code>\multiplechoicequestions</code> to more logical
+ <code>\multiplechoiceanswers</code></li>
+<li>Various (further) spacing changes</li>
+<li>Added <code>\subsection</code></li>
+<li>Release includes
+1.0.16b1 (2014 January 20);
+1.0.16b2 (20 January);
+1.0.16b3 (22 January);
+1.0.16b4 (14 February).
+</li>
+</ul>
+</h:dd>
+
+<h:dt>1.0.15, 2014 January 19</h:dt><h:dd><ul>
+<li>Fixed mcq and showsolutions, to suppress incorrect warning of missing answers.</li>
+</ul></h:dd>
+
+<h:dt>1.0.14, 2014 January 10</h:dt><h:dd><ul>
+<li>pdfpages content now appears in draft mode.</li>
+<li>The <code>[draft]</code> option now implies [showsolutions] (so if
+you want to suppress the solutions in this mode, you must now follow
+<code>[draft]</code> with <code>[noshowsolutions]</code>).</li>
+<li>Showing missing information: shouts and missing exam date/time are
+now highlighted.</li>
+<li>Fixed bug where excess <code>\QuestionNumberChecksOff</code>
+caused question numbers to disappear.</li>
+<li>Remove indent at start of question.</li>
+</ul></h:dd>
+
+<h:dt>1.0.13, 2013 December 4</h:dt><h:dd><ul>
+<li>Added a <code>[sansserif]</code> class option.</li>
+<li>Improved spacing and linebreaking; there are now fewer bad page-breaks.</li>
+<li>Added the <code>{mcq}</code> environment.</li>
+<li>Changed the distribution licence from GPL to LPPL.</li>
+</ul>
+</h:dd>
+
+<h:dt>1.0.12, 2013 November 11</h:dt><h:dd><ul>
+<li>Adjustments to banner text and base rubric (consulting with Morag Casey).</li>
+<li>Added notes about <code>\includepdf</code> in ‘notes for authors’.</li>
+<li>Adjustments to the distributed example files.</li>
+</ul></h:dd>
+
+<h:dt>1.0.11, 2013 July 18</h:dt><h:dd>
+<p>Adjustments to question data: k_B, etc, should have roman
+subscripts.</p>
+</h:dd>
+
+<h:dt>1.0.10, 2013 June 27</h:dt><h:dd>
+ <p>Minor documentation and distribution fixes</p>
+</h:dd>
+
+<h:dt>1.0.9, 2013 March 22</h:dt><h:dd>
+ <p>Remove leftover debugging code (garhhh)</p>
+</h:dd>
+
+<h:dt>1.0.8, 2013 March 14</h:dt><h:dd>
+ <p>Add the <code>mono</code> and <code>colour</code> options.</p>
+</h:dd>
+
+<h:dt>1.0.7, 2013 March 14</h:dt><h:dd><ul>
+<li>pdfpages is now disabled <em>only</em> in solutions</li>
+<li>Minor layout changes (exam title adjusts size for long
+titles)</li>
+</ul></h:dd>
+
+<h:dt>1.0.6, 2013 March 13</h:dt><h:dd><ul>
+<li>Avoid tables and figures in solutions incrementing the float counter.</li>
+<li>Layout changes; adjustment to default base rubric; A345 rubric change</li>
+<li>Some documentation changes</li>
+</ul>
+</h:dd>
+
+<h:dt>1.0.4-1, 2013 March 8</h:dt><h:dd>
+ <p>This is a bugfix release: it's a re-release of now-deprecated
+1.0.5 minus a breaking change.</p>
+<ul>
+<li>Add <code>{table}</code> support, paralleling existing
+<code>{figure}</code> support (ie tables don't float, but captions
+work as expected).</li>
+<li>Blank lines after a <code>\begin{question}</code> no longer
+result in extra space.</li>
+<li>Adjust spacing and layout of front page (again); various other
+cosmetic changes.</li>
+<li>A document identifier appears at the bottom of each page,
+corroborating the exam the page is for (to avoid photocopier collation
+accidents), and giving a numeric identifier which increases with time
+(allowing you to identify which of two printouts is later).</li>
+</ul></h:dd>
+
+<h:dt>1.0.4, 2013 March 6</h:dt><h:dd>
+ <p>Adjust base rubric; assorted distribution and detail fixes.</p>
+</h:dd>
+
+<h:dt>1.0.3, 2013 January 25</h:dt><h:dd>
+ <p>Added <code>[A2]</code> class option.</p>
+</h:dd>
+
+<h:dt>1.0.2, 2013 January 25</h:dt><h:dd><ul>
+<li>The `pdfpages' package wasn't working when the `noshowsolutions'
+option was present. Fixed, by special-casing, specifically disabling the
+<code>\includepdf</code> command in this case.</li>
+<li>Adjust display of <code>\partmarks</code> (no need for extra
+space, since <code>\partmarks</code> is now fully in the margin).</li>
+<li>Adjusting the front-page layout. Again.</li>
+</ul></h:dd>
+
+<h:dt>1.0.1, 2013 January 18</h:dt><h:dd><ul>
+<li><code>{figure}</code> now works, because it's explicitly
+supported (<code>{figure}</code> inside solutions could cause problems
+before). The contents don't float.</li>
+<li>Layout adjustments.</li>
+<li>Graphics now appear in draft mode.</li>
+</ul>
+</h:dd>
+
+<h:dt>1.0, 2012 December 11</h:dt><h:dd>
+ <p>This is the nominal version 1.0 release, and will be used for the
+2012-13 Honours Astronomy exams (it might get further tweaks along the
+ way, but we believe this is a complete distribution set).</p>
+ <ul>
+<li>More adjustments to notes-for-authors, now showing example LaTeX results.</li>
+<li>Addition of template-question.tex</li>
+<li>Adjustments to base rubric.</li>
+ </ul>
+</h:dd>
+
+<h:dt>1.0b5, 2012 December 3</h:dt><h:dd><ul>
+<li>Fine formatting adjustments: occasional <code>\nobreak</code> and
+rationalisation of <code>\maketitle</code>.</li>
+<li>Improvements to notes-for-authors.</li>
+</ul></h:dd>
+
+<h:dt>1.0b4, 2012 November 30</h:dt><h:dd><ul>
+<li>Improve generation of PDF metadata.</li>
+<li>Add macro <code>\shout</code>, for highlighted `FIXME' comments.</li>
+<li>Add showmarktotals option.</li>
+<li>Permit <code>\partmarks</code> in solutions, without it adding to
+the marks added up for the question (at the same time, forbid having a
+solution within a solution).</li>
+<li>Various formatting adjustments.</li>
+</ul>
+</h:dd>
+
+<h:dt>1.0b3, 2012 November 8</h:dt><h:dd><ul>
+<li>Add [A345] option.</li>
+<li>Make compose/draft material appear in red.</li>
+<li>Some packaging changes and bugfixes.</li>
+</ul></h:dd>
+
+<h:dt>1.0b2, 2012 November 6</h:dt><h:dd><p>Mild formatting adjustments.</p></h:dd>
+
+<h:dt>1.0rc1, 2012 November 2</h:dt><h:dd><ul>
+<li>Significant rewrite of formatting, producing a consensus
+AandA/PhysHons style, and renaming some confusingly named
+commands.</li>
+<li>Consequently, the AandA.clo and PhysHons.clo options have
+disappeared.</li>
+<li>The <code>\constantssheet</code> macro has appeared, and setting
+this is now the principal function of per-class <code>.clo</code>
+files.
+See the new <code>A1.clo</code> and modified <code>P2.clo</code> option files.</li>
+</ul>
+</h:dd>
+
+<h:dt>0.17.1, 2012 September 21</h:dt><h:dd><p>Fix packaging infelicity</p></h:dd>
+
+<h:dt>0.17, 2012 September 21</h:dt><h:dd><ul>
+<li>Rework <code>solutions</code> environment to make it a little more robust.</li>
+<li>Add <code>\MSc</code> degree shorthand.</li>
+<li>Bugfix: continuation headers now appear if a question starts on page 1.</li>
+<li>Bugfix: fix wrong syntax in draft+showsolutions mode -- now works again</li>
+</ul>
+</h:dd>
+
+<h:dt>0.16, 2012 July 26</h:dt><h:dd><ul>
+<li>Renamed the [showmarks] option to more rational [perquestionmarks]
+(because the option doesn't control whether per-question marks are
+<em>displayed</em>, but whether they're tracked at all). Slightly
+improved the documentation of this at the same time.</li>
+<li>Added <code>\lambdabar</code> macro</li>
+<li>Fix long-standing problem with continuation lines -- these should now be robust.</li>
+</ul></h:dd>
+<h:dt>0.15, 2011 November 23</h:dt><h:dd>
+ <p>Avoid conflict with <code>ifpdf</code> package. Now
+ <em>depends</em> on <code>ifpdf</code>.</p>
+</h:dd>
+
+<h:dt>0.14, 2010 August 6</h:dt><h:dd><ul>
+<li>Fixed the problem where the question-continuation marks would be
+messed up by the presence of floats.</li>
+<li>Added P2.clo; adjust 'showing solutions' banner
+to avoid collision with other headers (thanks to Morag Casey for the .clo
+file and the report).</li>
+<li>Changed the name of the class to 'guexam', from potentially confusing 'exam'.
+Support guexam.config for forcing options (for example).</li>
+</ul></h:dd>
+
+<h:dt>0.13-1, 2008 November 21</h:dt><h:dd>
+ <p>Make the gulogo style optional, so that question authors don't
+have to download and install that before they can draft a question.
+ Also adjust the logo size.</p>
+</h:dd>
+
+<h:dt>0.13, 2008 November 11</h:dt><h:dd><p>Add university logo, and slightly rearrange the header.
+Add <code>{questiondata}</code> environment.</p></h:dd>
+
+<h:dt>0.12-2, 2008 April 14</h:dt><h:dd><p>...keep on truckin'. Further changes to the
+<code>\partmarks*</code> spacing code, still largely unprincipled, but
+looking closer to what's required.</p></h:dd>
+
+<h:dt>0.12-1, 2008 April 3</h:dt><h:dd><p>...and again. This time, I think I actually see what the problem
+was. Macro <code>\partmarks</code> now forces a new paragraph (it was
+documented to be usable at the end of a paragraph, so this is again
+forced, and the documentation made more explicit), this makes what I
+thought was the solution actually work. Which is nice. Redefined
+<code>enumerate</code> and <code>itemize</code> environments, to
+improve spacing somewhat.</p></h:dd>
+
+<h:dt>0.12, 2008 April 3</h:dt><h:dd><p>Further adjustments to <code>\partmarks</code>: again, it should
+be more consistent without necessarily being more principled, alas.</p></h:dd>
+
+<h:dt>0.11, 2008 March 30</h:dt><h:dd><p>Minor fixes: Adjust display of partmarks -- should now be more
+consistent; option [showsolutions] no longer defaults
+[{no,}pageperquestion]; add macro <code>\e</code> to format roman
+exponential.</p></h:dd>
+
+<h:dt>0.10, 2008 January 17</h:dt><h:dd><p>Fix <code>\vec</code> when it appears in sub- or superscript
+position. Add <code>\paperident</code> command.</p></h:dd>
+
+<h:dt>0.9, 2007 December 10</h:dt><h:dd><p>Various formatting changes. Added optional argument to
+<code>\includequestion</code> overriding question number.</p></h:dd>
+
+<h:dt>0.8, 2007 November 25</h:dt><h:dd><p>You can now use <code>\usepackage</code> within
+<code>[compose]</code> mode.</p></h:dd>
+
+<h:dt>0.7, 2007 November 20</h:dt><h:dd><p>Make changes to the display of the 'University of Glasgow' banner
+at the top: resolves some font problems. Other minor layout tweaks.</p></h:dd>
+
+<h:dt>0.6, 2007 November 18</h:dt><h:dd><p>Fixed bold maths problems: <code>\vec</code> now works with greek
+letters, too. Support MTpro2 (mathtime maths fonts) with the new
+<code>[mtpro2]</code> class option. The <code>{solution}</code>
+environment can appear multiple times within a question. Question
+numbers now appear correctly in 'final' mode.</p></h:dd>
+
+<h:dt>0.5, 2007 October 30</h:dt><h:dd><p>Fix collision with LaTeX internal: a <code>\comment</code> at the
+start of a <code>{question}</code> now works.</p></h:dd>
+
+</h:dl>
+
+
+</body>
+</html>
diff --git a/macros/latex/contrib/exam-n/release-notes.dtx b/macros/latex/contrib/exam-n/release-notes.dtx
new file mode 100644
index 0000000000..84cde9c3a5
--- /dev/null
+++ b/macros/latex/contrib/exam-n/release-notes.dtx
@@ -0,0 +1,43 @@
+% \begin{description}\item[1.4.0, 2022 October 10]\relax \P\thinspace The [siunitx] option is now on by default, and the
+% |\units| macro produces a one-time-per-document
+% warning that it will be removed in the next version. \P\thinspace Having two |\partmarks| commands in an
+% environment is now detected as an error (it was documented as an
+% error, but not checked, so the extra |\partmarks|
+% commands were simply ignored).\par\item[1.4.0-b1, 2022 August 7]\relax \P\thinspace The class file now depends on a version of LaTeX which is at least
+% the 2020/10/01 release. This is so that we can use the current LaTeX
+% hooks mechanism. \P\thinspace Rework |\partmarks|: the |\partmarks|
+% indicator can now go \emph{inside} most environments, including
+% list, quotes, unnumbered equations, and the various amsmath displays. In these
+% cases, the indicator will automatically appear at the end of the
+% environment. The starred variant of the command still exists, but
+% should rarely be necessary.\par\item[1.3.5-b1, 2022 July 11]\relax \P\thinspace Fix erroneous broken line before |\partmarks|, in
+% compose mode, when a paragraph fills the last line. \P\thinspace Fix support for STIX2 fonts in XeLaTeX and LuaLaTeX (it was
+% working inaccurately before). \P\thinspace Add an optional argument for |\part| to override part numbering. \P\thinspace Use the |xcolor| package for colour management, instead
+% of the core |color| package (the |xcolor|
+% package is well-known and stable, and this means that we are
+% compatible with TikZ). \P\thinspace |\partmarks| in solutions no longer gobble trailing space
+% (doing so is probably right in questions, and is still the case, but
+% |\partmarks| in solutions tend to be more interspersed with
+% text). \P\thinspace |\label| within a |\part| now refers to the
+% part number (as opposed to the question number). \P\thinspace Avoid a ‘You can't use `\unskip' in vertical mode’ error,
+% in certain circumstances. \P\thinspace Add the |[siunitx]| option, indicating that we should
+% load the siunitx\footnote{\url{https://www.ctan.org/pkg/siunitx}} package (default no).
+% This is now preferred to the |\units| macro, and the latter will be
+% removed in a forthcoming release. \P\thinspace Renamed |A1.clo| to clearer |myclass.clo| \P\thinspace Repository moved from bitbucket to
+% https://heptapod.host/nxg/exam-n\footnote{\url{https://heptapod.host/nxg/exam-n}},
+% when bitbucket dropped support for Mercurial.
+% This means, incidentally, that links to specific issues at bitbucket
+% are now broken. \P\thinspace Bold-italic maths should now work correctly with STIX. \P\thinspace Long |\partmarks| comments now appear as footnotes. \P\thinspace Solutions are now set |\normalsize|. \P\thinspace Bugfix: move definition of |\defaultpartmarkscategory|
+% so it can be invoked within a |.clo| file straightforwardly. \P\thinspace Define the |[uprightpi]| option to set |\pi|
+% as an upright character, as appropriate for a constant (this is
+% implemented fully only for the |[mtpro2]| and
+% |[stix2]| options).. \P\thinspace Note that the |\units| macro is likely to be deprecated
+% in a forthcoming version, and replaced by a recommendation to use the
+% standard |[siunitx]| package.\par\item[1.3, 2018 November 21]\relax \P\thinspace Add a ‘category’ optional argument to |\partmarks|, and
+% add |\defaultpartmarkscategory|.\par\item[1.2.1, 2018 July 2]\relax \P\thinspace Bugfix: ignore any content which appears after
+% |\end{document}|, in |\includequestion| (author)
+% files (fixes issue 6). \P\thinspace The environments |{figure*}| and |{table*}| now produce an error. \P\thinspace The macro |\vec| now produces correct greek bold maths. \P\thinspace Docmentation: notes on unit formatting.\par\item[1.2, 2017 December 1]\relax \P\thinspace Use serif STIX2 fonts for sans and monospace cases, when using
+% Lua- or XeLaTeX (the style doesn't use/encourage any sans-serif text,
+% so this shouldn't matter). \P\thinspace Fix font sizes in solutions. \P\thinspace Adjustments to font-handling, which appear to have fixed LuaLaTeX differences. \P\thinspace Add the |stix2| option, to use the
+% STIX2 font set\footnote{\url{http://www.stixfonts.org/}}. \P\thinspace Make it possible to use |\rubric| and |\baserubric| within a |.clo| file.
+% This was advertised as being possible, but it seems it had never been tested!\par\end{description} \ No newline at end of file
diff --git a/macros/latex/contrib/exam-n/release-notes.html b/macros/latex/contrib/exam-n/release-notes.html
deleted file mode 100644
index 9f843e11f6..0000000000
--- a/macros/latex/contrib/exam-n/release-notes.html
+++ /dev/null
@@ -1,340 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>exam-n class – release notes</title>
-<link href="http://nxg.me.uk" rev="author"/>
-<link type="text/css" rel="stylesheet"
- href="style.css"/>
-<style type='text/css'>
-dd ul { padding: 0pt; margin: 0pt; }
-</style>
-</head>
-
-<body>
-<h1>The exam-n class – release notes</h1>
-
-<dl>
-<!-- @CURRENT@ -->
-<dt><span class='attention'>1.1.4, 2016 December 19</span></dt>
-<dd><ul>
-<li>Documentation: add notes about use of pdfpages.</li>
-<li>Added <code>[largefont]</code> option.
-<strong>Note</strong>:
-option <code>[hugefont]</code> has replaced <code>[bigfont]</code>;
-the latter is now deprecated, and may be removed in v1.2.</li>
-<li>Use of the <code>\part</code> macro is now supported within
-solutions (it produced the wrong numbers before), and there is a new
-<code>\StylePartNumber</code> customisation macro.</li>
-</ul></dd>
-
-<dt>1.1.3</dt>
-<dd><ul>
-<li>Version 1.1.3 was never released</li>
-</ul></dd>
-
-<dt>1.1.2, 2015 November 26</dt>
-<dd><ul>
-<li>Handled trailing floats at end of document (generated by packages
-such as <code>rotating</code>.</li>
-<li><code>\label</code> within question environment now refers to the
-question number.</li>
-<li>Work around a problem when a paragraph starts with <code>{\bf ...}</code>
-rather than (post-1995) <code>\textbf{...}</code>.</li>
-<li><code>\begin{questiondata}</code> now starts a new paragraph.</li>
-<li>Some documentation adjustments.</li>
-</ul></dd>
-
-<dt>1.1.1, 2014 November 27</dt>
-<dd><ul>
-<li>Adjust <code>\partmarks*</code> behaviour; now behaves differently
-within display maths (addresses
-<a href='https://bitbucket.org/nxg/exam-n/issue/1/'>issue 1</a>).</li>
-<li>Various documentation and release fixes.</li>
-</ul></dd>
-
-<dt>1.1, 2014 May 3</dt>
-<dd>Converted to a generic class, <code>exam-n</code>, ready for wider
-distribution.
-Available on <a href='https://bitbucket.org/nxg/exam-n/'>bitbucket</a>
-and at CTAN.</dd>
-
-<!-- @ENDCURRENT@ -->
-
-<dt>1.0.16, 2014 February 28</dt>
-<dd><ul>
-<li>Option mtpro2 now switches to times (this fixes a pre-existing bug
- exposed by the [sansserif] option).</li>
-<li>The [bigfont] option now works (this fixes a pre-existing bug, to
- do with <code>\subsections</code>, which was exposed by the addition
- of the [bigfont] option).</li>
-<li>Added the [bigfont] option</li>
-<li>Fixed 'shouts' warning at start (again)</li>
-<li>Forbid *section commands inside questions (and don't freak out)</li>
-<li>Rename <code>\questiontrailer</code> to <code>\questionpreamble</code> (more logical)</li>
-<li>Fixed mcq warnings, and 'question continued' errors.</li>
-<li>Renamed <code>\multiplechoicequestions</code> to more logical
- <code>\multiplechoiceanswers</code></li>
-<li>Various (further) spacing changes</li>
-<li>Added <code>\subsection</code></li>
-<li>Release includes
-1.0.16b1 (2014 January 20);
-1.0.16b2 (20 January);
-1.0.16b3 (22 January);
-1.0.16b4 (14 February).
-</li>
-</ul>
-</dd>
-
-<dt>1.0.15, 2014 January 19</dt>
-<dd><ul>
-<li>Fixed mcq and showsolutions, to suppress incorrect warning of missing answers.</li>
-</ul></dd>
-
-<dt>1.0.14, 2014 January 10</dt>
-<dd><ul>
-<li>pdfpages content now appears in draft mode.</li>
-<li>The <code>[draft]</code> option now implies [showsolutions] (so if
-you want to suppress the solutions in this mode, you must now follow
-<code>[draft]</code> with <code>[noshowsolutions]</code>).</li>
-<li>Showing missing information: shouts and missing exam date/time are
-now highlighted.</li>
-<li>Fixed bug where excess <code>\QuestionNumberChecksOff</code>
-caused question numbers to disappear.</li>
-<li>Remove indent at start of question.</li>
-</ul></dd>
-
-<dt>1.0.13, 2013 December 4</dt>
-<dd><ul>
-<li>Added a <code>[sansserif]</code> class option.</li>
-<li>Improved spacing and linebreaking; there are now fewer bad page-breaks.</li>
-<li>Added the <code>{mcq}</code> environment.</li>
-<li>Changed the distribution licence from GPL to LPPL.</li>
-</ul>
-</dd>
-
-<dt>1.0.12, 2013 November 11</dt>
-<dd><ul>
-<li>Adjustments to banner text and base rubric (consulting with Morag Casey).</li>
-<li>Added notes about <code>\includepdf</code> in <q>notes for authors</q>.</li>
-<li>Adjustments to the distributed example files.</li>
-</ul></dd>
-
-<dt>1.0.11, 2013 July 18</dt>
-<dd>Adjustments to question data: k_B, etc, should have roman subscripts.</dd>
-
-<dt>1.0.10, 2013 June 27</dt>
-<dd>Minor documentation and distribution fixes</dd>
-
-<dt><span>1.0.9, 2013 March 22</span></dt>
-<dd>Remove leftover debugging code (garhhh)</dd>
-
-<dt>1.0.8, 2013 March 14</dt>
-<dd>Add the <code>mono</code> and <code>colour</code> options.</dd>
-
-<dt>1.0.7, 2013 March 14</dt>
-<dd><ul>
-<li>pdfpages is now disabled <em>only</em> in solutions</li>
-<li>Minor layout changes (exam title adjusts size for long
-titles)</li>
-</ul></dd>
-
-<dt>1.0.6, 2013 March 13</dt>
-<dd><ul>
-<li>Avoid tables and figures in solutions incrementing the float counter.</li>
-<li>Layout changes; adjustment to default base rubric; A345 rubric change</li>
-<li>Some documentation changes</li>
-</ul>
-</dd>
-
-<dt>1.0.4-1, 2013 March 8</dt>
-<dd>This is a bugfix release: it's a re-release of now-deprecated
-1.0.5 minus a breaking change.<ul>
-<li>Add <code>{table}</code> support, paralleling existing
-<code>{figure}</code> support (ie tables don't float, but captions
-work as expected).</li>
-<li>Blank lines after a <code>\begin{question}</code> no longer
-result in extra space.</li>
-<li>Adjust spacing and layout of front page (again); various other
-cosmetic changes.</li>
-<li>A document identifier appears at the bottom of each page,
-corroborating the exam the page is for (to avoid photocopier collation
-accidents), and giving a numeric identifier which increases with time
-(allowing you to identify which of two printouts is later).</li>
-</ul></dd>
-
-<dt>1.0.4, 2013 March 6</dt>
-<dd>Adjust base rubric; assorted distribution and detail fixes.</dd>
-
-<dt>1.0.3, 2013 January 25</dt>
-<dd>Added <code>[A2]</code> class option.</dd>
-
-<dt>1.0.2, 2013 January 25</dt>
-<dd><ul>
-<li>The `pdfpages' package wasn't working when the `noshowsolutions'
-option was present. Fixed, by special-casing, specifically disabling the
-<code>\includepdf</code> command in this case.</li>
-<li>Adjust display of <code>\partmarks</code> (no need for extra
-space, since <code>\partmarks</code> is now fully in the margin).</li>
-<li>Adjusting the front-page layout. Again.</li>
-</ul></dd>
-
-<dt>1.0.1, 2013 January 18</dt>
-<dd><ul>
-<li><code>{figure}</code> now works, because it's explicitly
-supported (<code>{figure}</code> inside solutions could cause problems
-before). The contents don't float.</li>
-<li>Layout adjustments.</li>
-<li>Graphics now appear in draft mode.</li>
-</ul>
-</dd>
-
-<dt>1.0, 2012 December 11</dt>
-<dd>This is the nominal version 1.0 release, and will be used for the
-2012-13 Honours Astronomy exams (it might get further tweaks along the
-way, but we believe this is a complete distribution set).<ul>
-<li>More adjustments to notes-for-authors, now showing example LaTeX results.</li>
-<li>Addition of template-question.tex</li>
-<li>Adjustments to base rubric.</li>
-</ul></dd>
-
-<dt>1.0b5, 2012 December 3</dt>
-<dd><ul>
-<li>Fine formatting adjustments: occasional <code>\nobreak</code> and
-rationalisation of <code>\maketitle</code>.</li>
-<li>Improvements to notes-for-authors.</li>
-</ul></dd>
-
-<dt>1.0b4, 2012 November 30</dt>
-<dd><ul>
-<li>Improve generation of PDF metadata.</li>
-<li>Add macro <code>\shout</code>, for highlighted `FIXME' comments.</li>
-<li>Add showmarktotals option.</li>
-<li>Permit <code>\partmarks</code> in solutions, without it adding to
-the marks added up for the question (at the same time, forbid having a
-solution within a solution).</li>
-<li>Various formatting adjustments.</li>
-</ul>
-</dd>
-
-<dt>1.0b3, 2012 November 8</dt>
-<dd><ul>
-<li>Add [A345] option.</li>
-<li>Make compose/draft material appear in red.</li>
-<li>Some packaging changes and bugfixes.</li>
-</ul></dd>
-
-<dt>1.0b2, 2012 November 6</dt>
-<dd>Mild formatting adjustments.</dd>
-
-<dt>1.0rc1, 2012 November 2</dt>
-<dd><ul>
-<li>Significant rewrite of formatting, producing a consensus
-AandA/PhysHons style, and renaming some confusingly named
-commands.</li>
-<li>Consequently, the AandA.clo and PhysHons.clo options have
-disappeared.</li>
-<li>The <code>\constantssheet</code> macro has appeared, and setting
-this is now the principal function of per-class <code>.clo</code>
-files.
-See the new <code>A1.clo</code> and modified <code>P2.clo</code> option files.</li>
-</ul>
-</dd>
-
-<dt>0.17.1, 2012 September 21</dt>
-<dd>Fix packaging infelicity</dd>
-
-<dt>0.17, 2012 September 21</dt>
-<dd><ul>
-<li>Rework <code>solutions</code> environment to make it a little more robust.</li>
-<li>Add <code>\MSc</code> degree shorthand.</li>
-<li>Bugfix: continuation headers now appear if a question starts on page 1.</li>
-<li>Bugfix: fix wrong syntax in draft+showsolutions mode -- now works again</li>
-</ul>
-</dd>
-
-<dt>0.16, 2012 July 26</dt>
-<dd><ul>
-<li>Renamed the [showmarks] option to more rational [perquestionmarks]
-(because the option doesn't control whether per-question marks are
-<em>displayed</em>, but whether they're tracked at all). Slightly
-improved the documentation of this at the same time.</li>
-<li>Added <code>\lambdabar</code> macro</li>
-<li>Fix long-standing problem with continuation lines -- these should now be robust.</li>
-</ul></dd>
-<dt>0.15, 2011 November 23</dt>
-<dd>Avoid conflict with <code>ifpdf</code> package.
-Now <em>depends</em> on <code>ifpdf</code>.</dd>
-<dt>0.14, 2010 August 6</dt>
-<dd><ul>
-<li>Fixed the problem where the question-continuation marks would be
-messed up by the presence of floats.</li>
-<li>Added P2.clo; adjust 'showing solutions' banner
-to avoid collision with other headers (thanks to Morag Casey for the .clo
-file and the report).</li>
-<li>Changed the name of the class to 'guexam', from potentially confusing 'exam'.
-Support guexam.config for forcing options (for example).</li>
-</ul></dd>
-
-<dt>0.13-1, 2008 November 21</dt>
-<dd>Make the gulogo style optional, so that question authors don't
-have to download and install that before they can draft a question.
-Also adjust the logo size.</dd>
-
-<dt>0.13, 2008 November 11</dt>
-<dd>Add university logo, and slightly rearrange the header.
-Add <code>{questiondata}</code> environment.</dd>
-
-<dt>0.12-2, 2008 April 14</dt>
-<dd>...keep on truckin'. Further changes to the
-<code>\partmarks*</code> spacing code, still largely unprincipled, but
-looking closer to what's required.</dd>
-
-<dt>0.12-1, 2008 April 3</dt>
-<dd>...and again. This time, I think I actually see what the problem
-was. Macro <code>\partmarks</code> now forces a new paragraph (it was
-documented to be usable at the end of a paragraph, so this is again
-forced, and the documentation made more explicit), this makes what I
-thought was the solution actually work. Which is nice. Redefined
-<code>enumerate</code> and <code>itemize</code> environments, to
-improve spacing somewhat.</dd>
-
-<dt>0.12, 2008 April 3</dt>
-<dd>Further adjustments to <code>\partmarks</code>: again, it should
-be more consistent without necessarily being more principled, alas.</dd>
-
-<dt>0.11, 2008 March 30</dt>
-<dd>Minor fixes: Adjust display of partmarks -- should now be more
-consistent; option [showsolutions] no longer defaults
-[{no,}pageperquestion]; add macro <code>\e</code> to format roman
-exponential.</dd>
-
-<dt>0.10, 2008 January 17</dt>
-<dd>Fix <code>\vec</code> when it appears in sub- or superscript
-position. Add <code>\paperident</code> command.</dd>
-
-<dt>0.9, 2007 December 10</dt>
-<dd>Various formatting changes. Added optional argument to
-<code>\includequestion</code> overriding question number.</dd>
-
-<dt>0.8, 2007 November 25</dt>
-<dd>You can now use <code>\usepackage</code> within
-<code>[compose]</code> mode.</dd>
-
-<dt>0.7, 2007 November 20</dt>
-<dd>Make changes to the display of the 'University of Glasgow' banner
-at the top: resolves some font problems. Other minor layout tweaks.</dd>
-
-<dt>0.6, 2007 November 18</dt>
-<dd>Fixed bold maths problems: <code>\vec</code> now works with greek
-letters, too. Support MTpro2 (mathtime maths fonts) with the new
-<code>[mtpro2]</code> class option. The <code>{solution}</code>
-environment can appear multiple times within a question. Question
-numbers now appear correctly in 'final' mode.</dd>
-
-<dt>0.5, 2007 October 30</dt>
-<dd>Fix collision with LaTeX internal: a <code>\comment</code> at the
-start of a <code>{question}</code> now works.</dd>
-
-</dl>
-
-</body>
-</html>
diff --git a/macros/latex/contrib/exam-n/sample/Makefile b/macros/latex/contrib/exam-n/sample/Makefile
index 253245e534..91223625a3 100644
--- a/macros/latex/contrib/exam-n/sample/Makefile
+++ b/macros/latex/contrib/exam-n/sample/Makefile
@@ -1,16 +1,31 @@
+LATEX=pdflatex
+
+QUESTIONS=cosmo1.tex \
+ cosmo2.tex \
+ cosmo3.tex \
+ dynamical1.tex \
+ dynamical2.tex \
+ dynamical3.tex \
+ excos1.tex \
+ numerical1.tex \
+ numerical2.tex \
+ numerical3.tex
+
%.pdf: %.tex ../exam-n.cls
- TEXINPUTS=..: pdflatex $<
- if grep 'Rerun to get cross' ${<:.tex=.log}; then TEXINPUTS=..: pdflatex $<; else :; fi
+ TEXINPUTS=..: $(LATEX) $<
+ if grep 'Rerun to get cross' ${<:.tex=.log}; then TEXINPUTS=..: $(LATEX) $<; else :; fi
all: sample_exam.pdf
-sample_exam.pdf: numerical1-solution.pdf
+sample_exam.pdf: numerical1-solution.pdf $(QUESTIONS)
-sample_exam_solution.pdf: sample_exam_solution.tex
+sample_exam_solution.pdf: sample_exam_solution.tex $(QUESTIONS)
sample_exam_solution.tex: sample_exam.tex
rm -f $@
- sed '1s/documentclass/documentclass[showsolutions]/' sample_exam.tex >sample_exam_solution.tex
+ sed -e '1s/documentclass\[/documentclass[showsolutions,/' \
+ -e '1s/documentclass{/documentclass[showsolutions]{/' \
+ sample_exam.tex >sample_exam_solution.tex
# This will depend somehow on the .dtx file in the parent directory,
# but expressing that here second-guesses how that file is actually
diff --git a/macros/latex/contrib/exam-n/sample/cosmo1.tex b/macros/latex/contrib/exam-n/sample/cosmo1.tex
index 27045d026a..a9e13b790b 100644
--- a/macros/latex/contrib/exam-n/sample/cosmo1.tex
+++ b/macros/latex/contrib/exam-n/sample/cosmo1.tex
@@ -21,21 +21,25 @@ included as a graphic. Fully zenned up? Then let us begin\dots.
\caption{\label{f:spiral}A spiral}
\end{figure}
-\part Show that, under the action of gravity alone, the scale size
-of the Universe varies according to
+\part Show that, under the action of \textsf{gravity} alone, the scale size
+of the Universe (which we should note is larger than \SI1m in
+diameter and more massive than \SI{10}{kg}) varies according to
\begin{equation}
\ddot{R}=-\frac{4\pi G \rho_0}{3R^2}
+\partmarks[demonstration]{4}
\end{equation}
-\partmarks*{4}
and that, consequently,
\begin{equation*}
\dot{R}^2=-\frac{8\pi G \rho_0}{3R}=-K.
-\partmarks*{3}
+\partmarks[another remarkably long remark]{3}
\end{equation*}
Express $K$ in terms of the present values of the Hubble constant
$H_0$ and of the density parameter $\Omega_0$.
-\partmarks{3}
+\partmarks[bookwork from a very long and boring book, which goes on
+ and on at really quite unreasonable length, line after line,
+ until the reader is adequately cudgelled into intellectual
+ submission]{3}
\begin{solution}
This can be solved by \emph{remembering} the solution
\partmarks{3}
@@ -74,8 +78,14 @@ Finis.
Hubble's law: $v=H_0 D$
\end{questiondata}
\partmarks{4}
+% Test uprightness of \pi
+All is geometry: $\mathrm e^{\mathrm{i}\pi} = -1^{x^x}, \forall x=1$, or $E=mc^2$.
+% and that \vec produces italic bold, in greek as well as roman
+That includes vectors: $\vec v=\Diffl*{\vec x}t + \vec\gamma$.
\begin{solution}
-Explanations are superfluous; all that is, is.
+ \tracingmacros=2 \tracingcommands=2
+Explanations are superfluous;\partmarks1 all that is, is.
+ \tracingmacros=0 \tracingcommands=0
\begin{table}
\begin{tabular}{r|l}
First rows&are premier\\
@@ -83,11 +93,20 @@ subsequent rows&are of secondary interest
\end{tabular}
\caption{\label{t:dullnessII}A table o'erbrimming with otioseness}
\end{table}
-In addition, Table~\ref{t:dullnessII} adds nothing to the discussion,
-adds nothing to our understanding of our place in the cosmos, but it
+In addition, Table~\ref{t:dullnessII} adds nothing to the discussion,\partmarks{1}
+and adds nothing to our understanding of our place in the cosmos, but it
\emph{does} contribute slightly to the heat-death of the universe (can
you work out how many deuterium nuclei decayed during the typing of
-this table?).
+this table?).\partmarks1
+
+All is geometry\partmarks1 (in here, too): $\mathrm e^{\mathrm{i}\pi} = -1^{x^x}, \forall x=1$,
+or $E=mc^2$, or
+\begin{align*}
+\mathrm e^{\mathrm{i}\pi} &= \cos\pi + i \sin\pi = -1^{x^x}\\
+E&= mc^2\qquad\text{inevitably}.
+\end{align*}
\end{solution}
\end{question}
\end{document}
+
+Here are some further ramblings & rantings. This text should be ignored.
diff --git a/macros/latex/contrib/exam-n/sample/cosmo2.tex b/macros/latex/contrib/exam-n/sample/cosmo2.tex
index bb6c512b9d..51253d590a 100644
--- a/macros/latex/contrib/exam-n/sample/cosmo2.tex
+++ b/macros/latex/contrib/exam-n/sample/cosmo2.tex
@@ -12,8 +12,8 @@ distance $r$, observed with radiation flux $\ge F$ is (neglecting
other selection and redshift effects)
\begin{equation*}
N(F)=4\pi\int_0^{(\frac{L}{4\pi F})^{1/2}} n(r) r^2\ddd r.
+\partmarks{5}
\end{equation*}
-\partmarks*{5}
Use this to show that for $n=n_1=$constant at $r<r_1$ and
$n=n_2=$constant at $r>r_1$,
@@ -42,19 +42,19 @@ Reduce these two expressions to the result for a completely
uniform density universe with $n_1=n_2=n_0$.
\partmarks{3}
-% An itemized list followed by partmarks*
+% An itemized list containing partmarks
Sketch how $n(F)$ would look in universes which are
\begin{itemize}
\item flat,
\item open,
\item and closed.
+\partmarks3
\end{itemize}
-\partmarks*{3}
\begin{solution}
A sufficiently heavy weight will reduce expressions to completely
uniform sheets of paper if it is placed on top of them.\partmarks3
-In a flat universe, $n(F)$ will look like n(F).\partmarks*3
+In a flat universe, $n(F)$ will look like n(F).\partmarks3
\end{solution}
\end{question}
\end{document}
diff --git a/macros/latex/contrib/exam-n/sample/cosmo3.tex b/macros/latex/contrib/exam-n/sample/cosmo3.tex
index b7b74c0107..aa3f78868a 100644
--- a/macros/latex/contrib/exam-n/sample/cosmo3.tex
+++ b/macros/latex/contrib/exam-n/sample/cosmo3.tex
@@ -32,7 +32,7 @@ equivalent to an empty, flat, Universe with a non-zero $\Lambda$.
of state with $w = 0$ for $0 < t < t_0$, but which changes to
$W=0$ for $t\ge t_0$ without any discontinuity in $H(t)$.
Regarding this second stage as driven by a non-zero $\Lambda$ what
-is the value of $\Lambda$ if $t_0 = 10^{24}$\units{\mu s}? Define the
+is the value of $\Lambda$ if $t_0 = \SI{1e24}{\mu s}$? Define the
dimensionless deceleration parameter, $q$, and find its value
before and after $t_0$.
\shout{Shout it loud: I'm a geek and I'm proud}
@@ -40,7 +40,7 @@ before and after $t_0$.
Note: that's
\[
-t_0=10^{24}\units{\mu s}\qquad\text{with a letter mu: $\mu$}.
+t_0=\SI{1e24}{\mu s}\qquad\text{with a letter mu: $\mu$}.
\]
\part To what extent does this idealized model resemble the currently
diff --git a/macros/latex/contrib/exam-n/sample/dynamical1.tex b/macros/latex/contrib/exam-n/sample/dynamical1.tex
index e3a51a803b..c371e9f900 100644
--- a/macros/latex/contrib/exam-n/sample/dynamical1.tex
+++ b/macros/latex/contrib/exam-n/sample/dynamical1.tex
@@ -23,20 +23,20 @@ $a(t)$ is the semimajor axis at time $t$)
\begin{equation*}
\frac{a(t)}{a_0}=\left[1-\frac{t\Delta V}{2^{1/2}\pi
a_0(1-e_0)^{1/2}}\right]^2
+\partmarks{2}
\end{equation*}
-\partmarks*{2}
and
\begin{equation*}
\frac{T(t)}{T_0}=\left[1-\frac{t\Delta V}{2^{1/2}\pi
a_0(1-e_0)^{1/2}}\right]^3
+\partmarks{1}
\end{equation*}
-\partmarks*{1}
and the eccentricity satisfies (with $e_0=e(0)$)
\begin{equation*}
e(t)=1-\frac{1-e_0}{\left[1-\frac{t\Delta V}{2^{1/2}\pi
a_0(1-e_0)^{1/2}}\right]^2}.
+\partmarks{2}
\end{equation*}
-\partmarks*{2}
Show that, once the orbit is circular, its radius decays
exponentially with time on timescale $m_0/2\dot{m}$ where $m_0$
@@ -62,8 +62,8 @@ passage distances for the system, show that this leads to a natural
time $T$ for the system, where
\begin{equation*}
T\propto\frac{\bar{u}u^2}{m^2\nu\log N}.
+\partmarks{5}
\end{equation*}
-\partmarks*{5}
\begin{questiondata}
You may assume that the sphere of influence radius of a star is
diff --git a/macros/latex/contrib/exam-n/sample/sample_exam.tex b/macros/latex/contrib/exam-n/sample/sample_exam.tex
index 98031e6091..4ae4e18f0a 100644
--- a/macros/latex/contrib/exam-n/sample/sample_exam.tex
+++ b/macros/latex/contrib/exam-n/sample/sample_exam.tex
@@ -1,19 +1,39 @@
-\documentclass{exam-n}
+% A suitable documentclass line is the following.
+% Change this to [final] for the final version.
+% This option enables showing solutions, showing comments, and a few
+% other adjustments which seem useful at draft time. The [final]
+% option turns all of these off.
+\documentclass[stix2,uprightpi]{exam-n}
+
+% Include a local .clo file like this:
+%\documentclass[myclass]{exam-n}
+%
+% Choose different font sets:
+%\documentclass[stix2]{exam-n}
+%\documentclass[mtpro2]{exam-n}
+%\documentclass[mtpro2,sansserif]{exam-n}
+%
+% There are some alternatives for those who need special versions
+% with large fonts:
%\documentclass[largefont]{exam-n}
%\documentclass[hugefont,sansserif]{exam-n}
-%\documentclass[mtpro2,showsolutions]{exam-n}
-%\documentclass[mtpro2,showsolutions,sansserif]{exam-n}
-%\documentclass[draft,showsolutions,sansserif]{exam-n}
-
-% Note: this sample question dates from an earlier phase, in which
-% `paper n' would contain a bundle of questions from various courses.
-% That's why the \coursetitle doesn't match the broad range of
-% subjects being 'examined'.
%
-% Several of the questions are gibberish.
+% It wouldn't make sense for this file, but the files being included
+% using \includequestion should start with:
+%\documentclass[compose]{exam-n}
%
-% This collection of questions has in part turned into an informal
-% regression test for the class file.
+% For discussion of these various class options, and more, see the
+% guexam.pdf documentation.
+%
+% Note:
+%
+% * Several of the questions are gibberish.
+% * This collection of questions has in part turned into an
+% informal regression test for the class file. Thus they
+% shouldn't necessarily be regarded as canonically best practice.
+
+% Include a default category for \partmarks
+%\defaultpartmarkscategory{category?}
\examdate{Wednesday, 23 May 2007}
\examtime{9:30 -- 10:45 (1 course)\\9:30 -- 12:00 (2 courses)}
@@ -25,7 +45,7 @@
Astrophysics 3\\Theoretical Physics 3M\\Joint Physics 3}
\schoolcoursecode{P304D and P304H}
\universitycoursecode{PHYS3031 and PHYS4025}
-\coursetitle{Quantum Mechanics}
+\coursetitle{Quantum Mechanics (and other bits of physics)}
\usepackage{pdfpages}
diff --git a/macros/latex/contrib/exam-n/sample/sample_mcq.tex b/macros/latex/contrib/exam-n/sample/sample_exam_mcq.tex
index 268417ff7d..268417ff7d 100644
--- a/macros/latex/contrib/exam-n/sample/sample_mcq.tex
+++ b/macros/latex/contrib/exam-n/sample/sample_exam_mcq.tex
diff --git a/macros/latex/contrib/exam-n/sample/sample_exam_solution.tex b/macros/latex/contrib/exam-n/sample/sample_exam_solution.tex
deleted file mode 100644
index 853bccbce9..0000000000
--- a/macros/latex/contrib/exam-n/sample/sample_exam_solution.tex
+++ /dev/null
@@ -1,65 +0,0 @@
-\documentclass[showsolutions]{exam-n}
-%\documentclass[largefont]{exam-n}
-%\documentclass[hugefont,sansserif]{exam-n}
-%\documentclass[mtpro2,showsolutions]{exam-n}
-%\documentclass[mtpro2,showsolutions,sansserif]{exam-n}
-%\documentclass[draft,showsolutions,sansserif]{exam-n}
-
-% Note: this sample question dates from an earlier phase, in which
-% `paper n' would contain a bundle of questions from various courses.
-% That's why the \coursetitle doesn't match the broad range of
-% subjects being 'examined'.
-%
-% Several of the questions are gibberish.
-%
-% This collection of questions has in part turned into an informal
-% regression test for the class file.
-
-\examdate{Wednesday, 23 May 2007}
-\examtime{9:30 -- 10:45 (1 course)\\9:30 -- 12:00 (2 courses)}
-
-\exambanner{Examination for the degrees of \BSc\,
- \MSci\ and \MA\ on the honours standard }
-
-\degreedescriptions{Physics 3\\Chemical Physics 3\\Physics with
- Astrophysics 3\\Theoretical Physics 3M\\Joint Physics 3}
-\schoolcoursecode{P304D and P304H}
-\universitycoursecode{PHYS3031 and PHYS4025}
-\coursetitle{Quantum Mechanics}
-
-\usepackage{pdfpages}
-
-\rubric{Candidates should answer Questions 1 and 2 (10~marks each),
- \linebreak\textbf{and either} Question 3 \textbf{or} Question 4 (30~marks).
- \linebreak The content of this sample exam derives from real
- questions, but the result is in many cases test gibberish.}
-%\norubric
-
-\numquestions{13}
-
-\usepackage{graphicx} % for graphic in dynamical1
-
-\begin{document}
-\maketitle
-
-\section{I}
-\includequestion{cosmo1}
-\includequestion{numerical1}
-\includequestion{dynamical1}
-
-\section{II}
-\includequestion{cosmo2}
-\subsection{Cosmology question number 3}
-\includequestion{cosmo3}
-\includequestion{excos1} % four multiple-choice questions
-
-\section{III}
-% Override the question number, to test/demo this
-\includequestion[99]{numerical2}
-\includequestion{numerical3}
-
-\section{IV}
-\includequestion{dynamical2}
-\includequestion{dynamical3}
-
-\end{document}
diff --git a/macros/latex/contrib/exam-n/sample_exam.pdf b/macros/latex/contrib/exam-n/sample_exam.pdf
deleted file mode 100644
index db389f7e34..0000000000
--- a/macros/latex/contrib/exam-n/sample_exam.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/exam-n/sample_exam_solution.pdf b/macros/latex/contrib/exam-n/sample_exam_solution.pdf
deleted file mode 100644
index 994205d6e9..0000000000
--- a/macros/latex/contrib/exam-n/sample_exam_solution.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/exam-n/style.css b/macros/latex/contrib/exam-n/style.css
deleted file mode 100644
index c7be40749a..0000000000
--- a/macros/latex/contrib/exam-n/style.css
+++ /dev/null
@@ -1,230 +0,0 @@
-body {
- color: #333;
- background: white;
- margin-left: +30%;
- width: 50%; /* body is 50% of screen width */
- margin-right: auto; /* ie, 20% */
- padding: 0.5em; /* this will make a difference if I decide to
- have the background a different colour */
- /* I can't decide on font: Optima's always nice, but Gill looks
- agreeably intense. Helvetica's a decent fallback. */
- font-family: "Helvetica Neue", Helvetica, "Gill Sans", gill, sans-serif;
- /* font-family: Optima, "Gill Sans", gill, Helvetica, sans-serif; */
- /* font-family: "Gill Sans", gill, Helvetica, sans-serif; */
- /* I seem to have used 11pt at some point in the past, but this
- is far too big -- did I ever have a reason for that, or is it
- just due to browser changes? */
- font-size: 10pt;
- line-height: 150%;
-}
-
-div.topsidebar {
- float: right;
- width: 50%; /* ...of the body width (ie, 50% x 50% of screen) */
- font-size: smaller;
- margin-left: 1em;
- padding-left: 1em;
- border-left: solid thin #AAA;
-}
-
-/* On wider screens, move the sidebar out to the right hand side */
-/* This uses CSS3 media queries: http://www.w3.org/TR/css3-mediaqueries/ */
-@media screen and (min-width: 700pt) and (max-width: 850pt) {
- body {
- margin-left: 210pt;
- width: 350pt; /* 50% of 700pt */
- margin-right: auto;
- }
- div.topsidebar {
- position: absolute;
- /* I feel this size should be 595pt (350 + 210 + 0.05*700),
- but that's clearly not right -- I don't think I understand what the -5%
- in the h1 spec below is actually 5% of! */
- left: 570pt;
- width: auto;
- margin-left: 0pt;
- padding-left: 0pt;
- border: none;
- }
-}
-/* On still-wider screens, expand the left-margin, keeping the sidebar attached to the right-hand edge.
- When the screen is 850pt wide (expanding from the @media case above),
- the left margin will be 210pt, the width 350pt, and the right margin therefore 290pt.*/
-@media screen and (min-width: 850pt) {
- body {
- margin-right: 290pt; /* 290 = 850-(210+350) */
- width: 350pt;
- margin-left: auto; /* ...takes up the slack */
- }
- div.topsidebar {
- position: absolute;
- width: 290pt; /* same 290pt as above */
- left: auto;
- right: 0%;
- padding-left: 0pt;
- border: none;
- }
-}
-
-
-code, pre {
- font-family: Monaco, fixed;
- font-size: 9pt;
-}
-
-a { text-decoration: none; }
-a:link { color: #66C; }
-a:visited { color: #669; }
-a[href]:hover { background: #EEE; }
-
-div.abstract {
- font-style: oblique;
- text-align: left;
-}
-div.abstract em { font-style: normal; }
-div.abstract code {
- font-style: normal;
- font-size: 80%;
-}
-
-/* a span/div style for attracting attention */
-.attention {
- color: #822;
-}
-
-h1, h2, h3, h4, h5, h6 {
- color: #822;
- font-weight: 100; /* few fonts have ultra-light weights */
- line-height: 100%; /* no need to spread out titles */
-}
-h1 {
- margin-left: -40%;
- margin-right: -5%;
- padding: 0.5em;
- border: solid thin #666;
- text-align: right;
-}
-h2 {
- margin-left: -40%;
- margin-right: -5%;
- padding: 0.2em;
- border-top: solid thin #666;
- clear: both;
-}
-
-h2.appendices {
- margin-top: 10ex;
- border-top: double medium #666;
-}
-h3 {
- margin-left: -30%;
- float: left;
- width: 25%;
- display: block;
- text-align: right;
- vertical-align: bottom;
- padding-top: 0pt;
- padding-right: 0.5em;
- margin-top: 0pt;
- line-height: 100%;
-}
-
-/*
-h4 {
- color: #C66;
-}
-*/
-
-pre, table { background: #dde; }
-
-pre {
- padding: 1em;
- line-height: 130%;
-}
-
-table {
- font-size: smaller;
-}
-td {
- padding: 0.5ex;
-}
-
-Q:before { content: "“"; }
-Q:after { content: "”"; }
-
-img.smallimage {
- float: right;
- margin: 24pt;
- margin-right: -30%;
-}
-
-div.signature {
- margin-left: -40%;
- margin-right: -5%;
- margin-top: 4ex;
- text-align: right;
- border: solid thin #666;
- padding: 0.3em;
- clear: both;
-}
-
-/* ============================================================
- * Some other curiosities of my one-time formatting for web pages
- */
-.doc-history {
- font-size: xx-small;
- background: #eee;
- line-height: 100%;
-}
-
-div.subtoc, div.subsubtoc { display: none; }
-
-/* ============================================================
- * Special formatting for ToC
- */
-
-/*
- If there's significant amount of text in front of the first subsection,
- then the following are good to put in the per-document stylesheet:
- width: 25%;
- float: right;
-*/
-div#toc {
- color: #888;
- padding: 0;
- font-size: smaller;
- text-align: right;
-}
-div#toc a:link { color: #888; }
-div#toc > ul {
- padding: 0pt;
- margin: 0pt;
- list-style: none;
-}
-div#toc li {
- padding: 0pt;
- display: inline-block;
-}
-div#toc li:before {
- content: "§ ";
- margin-left: 1em;
-}
-/* the following elements aren't currently generated by structure.lx */
-div#toc li ul {
- padding-left: 1em;
- margin-left: 0;
- font-style: italic;
- display: inline;
-}
-div#toc li ul:before {
- content: "( ";
-}
-div#toc li ul:after {
- content: " ) ";
-}
-div#toc li li {
- padding-left: 0pt;
-}
-div#toc li li:after {
- content: "; ";
-}
diff --git a/macros/latex/contrib/exam-n/template-master.pdf b/macros/latex/contrib/exam-n/template-master.pdf
new file mode 100644
index 0000000000..30f7de8e5b
--- /dev/null
+++ b/macros/latex/contrib/exam-n/template-master.pdf
Binary files differ
diff --git a/macros/latex/contrib/exam-n/template-master.tex b/macros/latex/contrib/exam-n/template-master.tex
new file mode 100644
index 0000000000..9ac66cc13a
--- /dev/null
+++ b/macros/latex/contrib/exam-n/template-master.tex
@@ -0,0 +1,20 @@
+\documentclass[siunitx]{exam-n}
+
+\exambanner{Examination for the degree of Master of Examinations}
+\universitycoursecode{EX-666}
+\schoolcoursecode{Exams001}
+\coursetitle{Advanced setting of exams}
+\degreedescriptions{Examinations 3}
+
+\examdate{2012 December 25}
+\examtime{12:00 -- 23:00}
+\rubric{Be creative, but not vindictive}
+
+\numquestions{1}
+
+\begin{document}
+\maketitle
+
+\includequestion{template-question}
+
+\end{document}
diff --git a/macros/latex/contrib/exam-n/template-question.pdf b/macros/latex/contrib/exam-n/template-question.pdf
new file mode 100644
index 0000000000..a0fad417f9
--- /dev/null
+++ b/macros/latex/contrib/exam-n/template-question.pdf
Binary files differ
diff --git a/macros/latex/contrib/exam-n/template-question.tex b/macros/latex/contrib/exam-n/template-question.tex
new file mode 100644
index 0000000000..6337f5970c
--- /dev/null
+++ b/macros/latex/contrib/exam-n/template-question.tex
@@ -0,0 +1,22 @@
+\documentclass[compose,siunitx]{exam-n}
+\begin{document}
+\begin{question}{20} \author{Frieda Bloggs}
+\shout{Dummy question}
+\part Show that, under the action of gravity alone, the scale size
+of the Universe varies according to
+\[
+\ddot{R}=-\frac{4\pi G \rho_0}{3R^2}.
+\]
+Is $\ddot{R}=\Diffl*[2]{R}{t} > \SI{10}{\astronomicalunit. s^{-2}}$?
+\partmarks*{4}
+\begin{solution}
+This can be solved by remembering the answer.
+\end{solution}
+
+\part Explain the nature of being.
+\partmarks{16}
+\begin{solution}
+Om.
+\end{solution}
+\end{question}
+\end{document}
diff --git a/macros/latex/contrib/iexec/iexec.dtx b/macros/latex/contrib/iexec/iexec.dtx
index 2478ac224a..28c2a62136 100644
--- a/macros/latex/contrib/iexec/iexec.dtx
+++ b/macros/latex/contrib/iexec/iexec.dtx
@@ -50,7 +50,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{iexec}
%<*package>
-[09.10.20220 0.7.0 Inputable Shell Executions]
+[2022-10-10 0.8.1 Inputable Shell Executions]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -210,7 +210,23 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}.
\usepackage{iexec}
\begin{document}
\iexec[log]{echo 'Hello, \\LaTeX!'}
-\input{foo.txt}
+\end{document}
+\end{verbatim}
+%\iffalse
+%</verb>
+%\fi
+% \end{macro}
+
+% \begin{macro}{null}
+% The stdout of the command will be sent to |/dev/null|:
+%\iffalse
+%<*verb>
+%\fi
+\begin{verbatim}
+\documentclass{article}
+\usepackage{iexec}
+\begin{document}
+\iexec[null]{rm some-file.txt}
\end{document}
\end{verbatim}
%\iffalse
@@ -226,6 +242,8 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}.
% \changes{v0.4.0}{2021/08/01}{Runtime verification for --shell-escape option}
% \changes{v0.4.1}{2021/08/08}{Options trace, stdout, and quiet added}
% \changes{v0.5.0}{2022/01/08}{Major bug fixes}
+% \changes{v0.6.0}{2022/10/09}{Additional options 'log' and 'append'}
+% \changes{v0.7.0}{2022/10/10}{Additional option 'null'}
% First, we include a few packages:
% \begin{macrocode}
@@ -248,6 +266,7 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}.
trace/.estore in = \iexec@traceit,
append/.estore in = \iexec@append,
log/.estore in = \iexec@log,
+ null/.estore in = \iexec@null,
quiet/.estore in = \iexec@quiet,
stdout
}\makeatother
@@ -300,23 +319,25 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}.
% \end{macrocode}
% Then, we execute it:
% \begin{macrocode}
- \ShellEscape{#2 \ifdefined\iexec@append>\fi> \iexec@stdout}%
+ \ShellEscape{#2 \ifdefined\iexec@append>\fi>\ifdefined\iexec@null/dev/null\else\iexec@stdout\fi}%
% \end{macrocode}
% Then, a message is printed to TeX log:
% \begin{macrocode}
- \message{^^Jiexec: [#2 > \iexec@stdout]^^J}%
+ \message{^^Jiexec: [#2 \ifdefined\iexec@append>\fi>\ifdefined\iexec@null/dev/null\else\iexec@stdout\fi]^^J}%
\endgroup%
% \end{macrocode}
% Then, if required, the content of the stdout file will be printed to the log:
% \begin{macrocode}
+ \ifdefined\iexec@null\else
\ifdefined\iexec@log
\message{^^Jiexec: this is the content of \iexec@stdout:^^J}%
\iexec@typeout{\iexec@stdout}
\message{^^J<EOF>^^J}%
- \fi%
+ \fi\fi%
% \end{macrocode}
% Then, include the produced output into the current document:
% \begin{macrocode}
+ \ifdefined\iexec@null\else
\ifdefined\iexec@quiet
\message{^^Jiexec: Due to 'quiet' option we didn't read
the content of '\iexec@stdout' (\pdffilesize{} bytes)^^J}%
@@ -326,10 +347,11 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}.
\input{\iexec@stdout}%
\message{^^Jiexec: The content of '\iexec@stdout'
was included into the document^^J}%
- \fi%
+ \fi\fi%
% \end{macrocode}
% Finally, delete the file or leave it untouched:
% \begin{macrocode}
+ \ifdefined\iexec@null\else
\ifiexec@trace%
\message{^^Jiexec: Due to package option 'trace',
the file '\iexec@stdout' was not deleted^^J}%
@@ -341,7 +363,7 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}.
\ShellEscape{rm \iexec@stdout}%
\message{^^Jiexec: The file '\iexec@stdout' was deleted^^J}%
\fi%
- \fi%
+ \fi\fi%
\endgroup
}\makeatother
% \end{macrocode}
diff --git a/macros/latex/contrib/iexec/iexec.pdf b/macros/latex/contrib/iexec/iexec.pdf
index 6030b3fa7a..58c79fa6a3 100644
--- a/macros/latex/contrib/iexec/iexec.pdf
+++ b/macros/latex/contrib/iexec/iexec.pdf
Binary files differ
diff --git a/macros/latex/contrib/pdfpages/pdfpages.dtx b/macros/latex/contrib/pdfpages/pdfpages.dtx
index 1342d7ba42..7496cc82d0 100644
--- a/macros/latex/contrib/pdfpages/pdfpages.dtx
+++ b/macros/latex/contrib/pdfpages/pdfpages.dtx
@@ -27,12 +27,12 @@
%<*dtx>
\makeatletter
%</dtx>
-\def\AM@fileversion{v0.5v}
+\def\AM@fileversion{v0.5w}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2022-05-22 20:11:16 +0200 $
-\AM@Git@SHA@process$SHA-1: 059ee4174cc52b0e6a4c834c1a9719bcf5a453b0 $
+\AM@Git@Date@process$Date: 2022-10-09 23:29:26 +0200 $
+\AM@Git@SHA@process$SHA-1: b912335fcefa15a5e7de97ef3732a2dcb82fe755 $
%</!(example1,example2,example3,installer)>
%
%
@@ -3208,11 +3208,11 @@
\def\AM@pagestemp{#1}}
\define@key{pdfpages}{pages}{\AM@CheckValue{pages}{#1}%
\edef\AM@pagestemp{#1}}
-\define@key{pdfpages}{nup}{\AM@parse@nup#1x\END}
-\define@key{pdfpages}{deltax}{\AM@parse@deltax#1 \\}
-\define@key{pdfpages}{deltay}{\AM@parse@deltay#1 \\}
-\define@key{pdfpages}{delta}{\AM@parse@delta#1 \\}
-\define@key{pdfpages}{offset}{\AM@parse@offset#1 \\}
+\define@key{pdfpages}{nup}{\expandafter\AM@parse@nup\expanded{#1}x\END}
+\define@key{pdfpages}{deltax}{\expandafter\AM@parse@deltax\expanded{#1} \\}
+\define@key{pdfpages}{deltay}{\expandafter\AM@parse@deltay\expanded{#1} \\}
+\define@key{pdfpages}{delta}{\expandafter\AM@parse@delta\expanded{#1} \\}
+\define@key{pdfpages}{offset}{\expandafter\AM@parse@offset\expanded{#1} \\}
\define@key{pdfpages}{frame}[true]{\setboolean{AM@frame}{#1}}
\define@key{pdfpages}{openright}[true]{\setboolean{AM@openright}{#1}}
\define@key{pdfpages}{openrighteach}[true]{\setboolean{AM@openrighteach}{#1}}
@@ -3225,13 +3225,12 @@
\define@key{pdfpages}{noautoscale}[true]%
{\setboolean{AM@noautoscale}{#1}}
\define@key{pdfpages}{thread}[true]{\setboolean{AM@thread}{#1}}
-\define@key{pdfpages}{threadname}{\def\AM@threadname{#1}}
+\define@key{pdfpages}{threadname}{\edef\AM@threadname{#1}}
\define@key{pdfpages}{link}[true]{\setboolean{AM@link}{#1}}
-%\define@key{pdfpages}{linkfit}{\def\AM@linkfit{#1}}
-\define@key{pdfpages}{linkfit}{\AM@convert@dest{#1}}
-\define@key{pdfpages}{linkname}{\def\AM@linkname@option{#1}}
+\define@key{pdfpages}{linkfit}{\expandafter\AM@convert@dest\expanded{{#1}}}
+\define@key{pdfpages}{linkname}{\edef\AM@linkname@option{#1}}
\define@key{pdfpages}{linktodoc}[true]{\setboolean{AM@linktodoc}{#1}}
-\define@key{pdfpages}{linktodocfit}{\def\AM@linktodocfit{#1}}
+\define@key{pdfpages}{linktodocfit}{\edef\AM@linktodocfit{#1}}
\define@key{pdfpages}{linkfilename}{\pdfstringdef\AM@linkfilename{#1}%
\AM@linkfilenametrue}
\define@key{pdfpages}{survey}[true]{%
@@ -3241,10 +3240,10 @@
\ifAM@pkg@survey\setboolean{AM@surveynolink}{#1}%
\setboolean{AM@survey}{#1}
\else\AM@outputfalse\fi}
-\define@key{pdfpages}{xr-prefix}{\def\AM@xrprefix{#1}}
+\define@key{pdfpages}{xr-prefix}{\edef\AM@xrprefix{#1}}
\define@key{pdfpages}{fitpaper}[true]{\setboolean{AM@fitpaper}{#1}}
-\define@key{pdfpages}{addtotoc}{\def\AM@toclist{#1,}}
-\define@key{pdfpages}{addtolist}{\def\AM@loflist{#1,}}
+\define@key{pdfpages}{addtotoc}{\edef\AM@toclist{#1,}}
+\define@key{pdfpages}{addtolist}{\edef\AM@loflist{#1,}}
\define@key{pdfpages}{doublepages}[true]%
{\setboolean{AM@doublepages}{#1}}
\define@key{pdfpages}{doublepagestwist}[true]%
@@ -3266,16 +3265,16 @@
\AM@doublepagestmpfalse\AM@doublepagestmpitrue
\AM@doublepagestwistxtrue}
\define@key{pdfpages}{duplicatepages}[2]%
- {\def\AM@nduplicatepages{#1}%
+ {\edef\AM@nduplicatepages{#1}%
\AM@duplicatepagestrue}
-\define@key{pdfpages}{signature}{\def\AM@signature{#1}}
-\define@key{pdfpages}{signature*}{\def\AM@signature{#1}%
+\define@key{pdfpages}{signature}{\edef\AM@signature{#1}}
+\define@key{pdfpages}{signature*}{\edef\AM@signature{#1}%
\AM@signaturestartrue}
\define@key{pdfpages}{booklet}[true]{\setboolean{AM@booklet}{#1}%
\def\AM@signature{x}}
\define@key{pdfpages}{pagetemplate}{\AM@CheckValue{pagetemplate}{#1}%
\def\AM@pagetemplate{#1}}
-\define@key{pdfpages}{templatesize}{\AM@parse@templatesize#1\END}
+\define@key{pdfpages}{templatesize}{\expandafter\AM@parse@templatesize\expanded{#1}\END}
\define@key{pdfpages}{rotateoversize}[true]%
{\setboolean{AM@rotateoversize}{#1}}
\define@key{pdfpages}{picturecommand}{\def\AM@picturecommand{#1}}
@@ -3283,7 +3282,7 @@
\define@key{pdfpages}{newwindow}[true]{\setboolean{AM@newwindow}{#1}}
\define@key{pdfpages}{reflect*}[true]{\setboolean{AM@reflect}{#1}}
\define@key{pdfpages}{reflect}[true]{\setboolean{AM@reflectall}{#1}}
-\define@key{pdfpages}{lastpage}{\def\AM@pagecount{#1}}
+\define@key{pdfpages}{lastpage}{\edef\AM@pagecount{#1}}
% \end{macrocode}
% \macro{\AM@parse@nup}
% Parsing \texttt{nup} item.
@@ -4859,13 +4858,18 @@
% \subsection*{2022/01/29 v0.5u}
% \begin{itemize}
% \item Adding |\leavevmode| before |\@chapter|,... in |addtotoc|.
-% Bug fix for \url{https://tex.stackexchange.com/questions/631514/}.
+% Bug fix for \url{https://tex.stackexchange.com/questions/631514/}.
% \end{itemize}
%
% \subsection*{2022/05/21 v0.5v}
% \begin{itemize}
% \item Do not enter an infinite loop if the PDF file doesn't exist.
-% Bug fix for \url{https://tex.stackexchange.com/questions/644971/}.
+% Bug fix for \url{https://tex.stackexchange.com/questions/644971/}.
+% \end{itemize}
+%
+% \subsection*{2022/10/09 v0.5w}
+% \begin{itemize}
+% \item Keyval arguments get fully expanded.
% \end{itemize}
% \Finale
%
diff --git a/macros/latex/contrib/pdfpages/pdfpages.pdf b/macros/latex/contrib/pdfpages/pdfpages.pdf
index 15703669ad..918fc0a62f 100644
--- a/macros/latex/contrib/pdfpages/pdfpages.pdf
+++ b/macros/latex/contrib/pdfpages/pdfpages.pdf
Binary files differ
diff --git a/macros/latex/contrib/standalone/DEPENDS.txt b/macros/latex/contrib/standalone/DEPENDS.txt
new file mode 100644
index 0000000000..6f17f86d9b
--- /dev/null
+++ b/macros/latex/contrib/standalone/DEPENDS.txt
@@ -0,0 +1,10 @@
+hard xkeyval
+hard currfile
+hard adjustbox
+hard gincltex
+hard filemod
+soft varwidth
+soft shellesc
+soft ifluatex
+soft ifpdf
+soft ifxetex \ No newline at end of file
diff --git a/macros/latex/contrib/standalone/README b/macros/latex/contrib/standalone/README
index 577a44994c..04e021db29 100644
--- a/macros/latex/contrib/standalone/README
+++ b/macros/latex/contrib/standalone/README
@@ -1,11 +1,12 @@
LaTeX class and package 'standalone'
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Copyright (c) 2010-2018 by Martin Scharrer <martin@scharrer-online.de>
-Repository: http://bitbucket.org/martin_scharrer/standalone
+Copyright (c) 2010-2022 by Martin Scharrer <martin.scharrer@web.de>
+Repository: https://github.com/MartinScharrer/standalone
+Issues: https://github.com/MartinScharrer/standalone/issues
-Allows TeX pictures or other TeX code in sub-files to be compiled standalone
+Allows TeX diagrams or other TeX code in sub-files to be compiled standalone
or as part of a main document.
-Provides support for pictures with beamer overlays.
+Provides support for diagrams with beamer overlays.
Since v0.3 the package provides options to automatically or manually include
all sub-files preambles in the main document preamble.
diff --git a/macros/latex/contrib/standalone/standalone.dtx b/macros/latex/contrib/standalone/standalone.dtx
index e2b20a99e8..322797c310 100644
--- a/macros/latex/contrib/standalone/standalone.dtx
+++ b/macros/latex/contrib/standalone/standalone.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%<=*COPYRIGHT>
-%% Copyright (C) 2011-2017 by Martin Scharrer <martin@scharrer-online.de>
+%% Copyright (C) 2010-2022 by Martin Scharrer <martin.scharrer@web.de>
%% ---------------------------------------------------------------------------
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -26,10 +26,10 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{standalone.dtx}[%
%<=*DATE>
- 2018/03/26
+ 2022/10/10
%<=/DATE>
%<=*VERSION>
- v1.3a
+ v1.3b
%<=/VERSION>
DTX file of the standalone bundle]
\documentclass[a4paper,11pt]{ydoc}
@@ -61,7 +61,7 @@
%</driver>
% \fi
%
-% \CheckSum{3781}
+% \CheckSum{3934}
%
% \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
@@ -94,6 +94,7 @@
% Added loading of LuaTeX compatibility packages.
% Changed filemodedate code to support LuaTeX.
% Fixes for option combination multi,convert.}
+% \changes{v1.3b}{2022/10/10}{Fixed incorrect/unwanted messages for conversion feature. Updated project URLs in documentation. Added dependency list file.}
%
% \GetFileInfo{\jobname.dtx}
%
@@ -113,15 +114,15 @@
%
% \ifpdf
% \hypersetup{%
-% pdfauthor = {Martin Scharrer <martin@scharrer-online.de>},
+% pdfauthor = {Martin Scharrer <martin.scharrer@web.de>},
% pdftitle = {The standalone class and package},
% pdfsubject = {Documentation of LaTeX class and package 'standalone'},
% pdfkeywords = {standalone, LaTeX, TeX}
% }%
% \fi
% \author{Martin Scharrer}
-% \email{martin@scharrer-online.de}
-% \repository{https://bitbucket.org/martin_scharrer/standalone}
+% \email{martin.scharrer@web.de}
+% \repository{https://github.com/MartinScharrer/standalone}
% \maketitle
%
%
@@ -142,8 +143,8 @@
% This bundle is released on the comprehensive \TeX\ archive network (CTAN) under \url{https://ctan.org/pkg/standalone}.
% Any modern \LaTeX\ distribution should pick it from there automatically, though. CTAN now allows votes and comments on packages and such feedback is very welcome.
%
-% The source code of this bundle is hosted on Bitbucket as Mercurial repository under \url{https://bitbucket.org/martin_scharrer/standalone/}.
-% The ticket system there should be used to report bugs or request new features: \url{https://bitbucket.org/martin_scharrer/standalone/issues/new}.
+% The source code of this bundle is hosted on Github under \url{https://github.com/MartinScharrer/standalone}.
+% The ticket system there should be used to report bugs or request new features: \url{https://github.com/MartinScharrer/standalone/issues}.
%
% User which need help with should search for an existing solution on the site TeX.Stackexchange.com: \url{https://tex.stackexchange.com/questions/tagged/standalone}
% or post a new question: \url{https://tex.stackexchange.com/questions/ask?tags=standalone}.
@@ -156,8 +157,7 @@
%
% \subsection{Installation with TeX Live}
% Using a normal TeX Live the bundle is easily installed using the package manager \texttt{tlmgr}.
-% The command \texttt{tlmgr install \csname @package\endcsname} will install it and \texttt{tlmgr update \csname
-% @package\endcsname} can be used to update it.
+% The command \texttt{tlmgr install standalone} will install it and \texttt{tlmgr update standalone} can be used to update it.
%
% Because the Ubuntu/Debian version of TeX Live may not include \texttt{tlmgr} a manual install of the package is
% required. The author recommends to manually install the vanilla version of TeX Live instead which will include
@@ -175,7 +175,8 @@
%
% \subsubsection{Installation from TDS ZIP file}
% The TDS (\TeX\ Directory Structur) ZIP file includes all package files in the final form and relative location.
-% It can be downloaded from CTAN: \Eurl{http://mirrors.ctan.org/install/macros/latex/contrib/\csname @package\endcsname.tds.zip} and from the Bitbucket project site \Eurl{https://bitbucket.org/martin_scharrer/standalone/downloads/\csname @package\endcsname.tds.zip}.
+% It can be downloaded from CTAN: \url{http://mirrors.ctan.org/install/macros/latex/contrib/standalone.tds.zip} and
+% from the Github project site \url{https://github.com/MartinScharrer/standalone/releases/}.
% It needs only to be unzipped in a TEXMF directory. Under Linux/Unix this is usually the user TEXMF directory
% \path{~/texmf}.
% Under Windows it is usually \path{C:\Users\<user name>\texmf} (Windows Vista/7) or \path{C:\Documents and
@@ -191,7 +192,7 @@
%
% \subsubsection{Installation from DTX File}
% The package is also provided as DTX (Documented TeX file) which is accompanied by an INS (Install) file
-% under \Eurl{http://www.ctan.org/tex-archive/macros/latex/contrib/\csname @package\endcsname}.
+% under \url{http://www.ctan.org/tex-archive/macros/latex/contrib/standalone}.
% To unpack all package files from the DTX file compile the INS file with |tex| once.
% The manual can be compiled from the DTX file with |pdflatex|. This requires the \pkg{ydoc} bundle to be installed.
%
@@ -211,8 +212,8 @@
%
% \section{Bug reports, feature requests and other feedback}
% Bug reports, feature requests and other feedback about the \cls{standalone} bundle can be sent to the author
-% either by email to \href{mailto:martin@scharrer-online.de?subject=standalone:%20}{martin@scharrer-online.de}
-% or using the issue tracker for the bundle under \url{https://bitbucket.org/martin_scharrer/standalone/issues}.
+% either by email to \href{mailto:martin.scharrer@web.de?subject=standalone:%20}{martin.scharrer@web.de}
+% or using the issue tracker for the bundle under \url{https://github.com/MartinScharrer/standalone/issues}.
% Bug reports should include the used version of \cls{standalone} as well as the used \LaTeX\ format (|pdflatex|, |latex|, |xelatex|, etc.) and distribution including its version.
% Usually a minimal example which recreate the issue is immensely helpful in analysing and solving any bug.
% Please look for existing related issue tickets first and check the FAQ/troubleshooting in \autoref{sec:classfaq} first.
@@ -2598,7 +2599,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\let\sa@convert@stop\stop
+\def\sa@convert@stop{\csname fi\endcsname\stop}%
\begingroup
\let\on@line\@gobble
% \end{macrocode}
@@ -2664,16 +2665,16 @@
\def\sa@multi@pagemark{}%
\edef\sa@lastoutfile{\outfile}%
\else
+ \begingroup
+ \def\sa@multi@pagemark{-\the\@tempcnta}%
+ \xdef\sa@lastoutfile{\outfile}%
+ \endgroup
\@tempcntb\z@
\loop\ifnum\@tempcnta>0
\advance\@tempcntb\@ne
\divide\@tempcnta by 10\relax
\repeat
\edef\sa@multi@pagemark{-\percent0\the\@tempcntb d}%
- \begingroup
- \def\sa@multi@pagemark{-\the\@tempcnta}%
- \xdef\sa@lastoutfile{\outfile}%
- \endgroup
\fi
%
\if@tempswa
@@ -2686,8 +2687,10 @@
% \begin{macrocode}
\edef\sa@convert@precommand{\sa@convert@precommand}%
\ifx\sa@convert@precommand\@empty\else
+\message{Executing precommand:^^J\sa@convert@precommand^^J^^J}%
\ShellEscape{\sa@convert@precommand}%
\fi
+\message{Executing command:^^J\sa@convert@command^^J^^J}%
\ShellEscape{\sa@convert@command}%
\@tempswafalse
\IfFileExists{\sa@lastoutfile}{%
diff --git a/macros/latex/contrib/standalone/standalone.pdf b/macros/latex/contrib/standalone/standalone.pdf
index e0c4f081a1..3c494438ff 100644
--- a/macros/latex/contrib/standalone/standalone.pdf
+++ b/macros/latex/contrib/standalone/standalone.pdf
Binary files differ
diff --git a/macros/luatex/latex/japanese-mathformulas/README.txt b/macros/luatex/latex/japanese-mathformulas/README.txt
index 8f5c0199b8..adab40bf2c 100644
--- a/macros/luatex/latex/japanese-mathformulas/README.txt
+++ b/macros/luatex/latex/japanese-mathformulas/README.txt
@@ -1,5 +1,5 @@
japanese-mathformulas - mathematical formula using amsmath and tikz==================================
-version 1.0.1
+version 1.0.2
Licence----------------------------------------------------------------------------------------------
lppl1.3c
@@ -12,7 +12,7 @@ http://www.latex-project.org/lppl.txt
and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later.
Description------------------------------------------------------------------------------------------
-This is a style file for compiling basic math formulas. \NewDocumentCommand allows you to specify whether the formula should be used within a sentence or on a new line. The main packages used are amsmath, amssymb, siunitx, ifthen, xparse, tikz, mathtools, graphics.
+This is a style file for compiling basic math formulas. \NewDocumentCommand allows you to specify whether the formula should be used within a sentence or on a new line. The main packages used are mathtools(loading amsmath), amssymb, siunitx, ifthen, xparse, tikz, graphics.
Contents---------------------------------------------------------------------------------------------
japanese-mathformulas.sty the main file
diff --git a/macros/luatex/latex/japanese-mathformulas/japanese-mathformulas-sample.tex b/macros/luatex/latex/japanese-mathformulas/japanese-mathformulas-sample.tex
index 4eb0ec70a2..08786e5a34 100644
--- a/macros/luatex/latex/japanese-mathformulas/japanese-mathformulas-sample.tex
+++ b/macros/luatex/latex/japanese-mathformulas/japanese-mathformulas-sample.tex
@@ -2,7 +2,7 @@
\usepackage{iwona}%
\usepackage{bookmark,xurl}
-\usepackage{japanese-mathformulas,ascolorbox,enumerate,environ,tcolorbox,color}%
+\usepackage{mathformula,ascolorbox,enumerate,environ,tcolorbox,color}%
\usepackage[hiragino-pron,deluxe,expert,bold]{luatexja-preset}%
\usepackage[usetype1]{uline--}
\usepackage[margin=15mm]{geometry}
diff --git a/macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.pdf b/macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.pdf
index 8514e8de6a..06d3dcd74c 100644
--- a/macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.pdf
+++ b/macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.pdf
Binary files differ
diff --git a/macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.sty b/macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.sty
index 5038049b59..8664e026ff 100644
--- a/macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.sty
+++ b/macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.sty
@@ -1,12 +1,13 @@
-\NeedsTeXFormat{LaTeX2e}%
+\NeedsTeXFormat{LaTeX2e}% lualatex
-\ProvidesPackage{japanese-mathformulas}[2022/10/3,Version 1.0.1]%
+\ProvidesPackage{mathformula}%[2022/10/5,Version 1.0.2]%
\RequirePackage{luatexja}%
\RequirePackage{luatexja-fontspec}%
\RequirePackage{luatexja-otf}%
%\RequirePackage[hiragino-pron,deluxe,expert,bold]{luatexja-preset}%
-\RequirePackage{amsmath,amssymb,siunitx,ifthen,xparse,tikz,mathtools,graphics}%
+\RequirePackage{mathtools,amssymb,ifthen,xparse,tikz,graphics}%
+\usepackage[b]{esvect}%
\usetikzlibrary{arrows,shapes,intersections,calc,angles,decorations.shapes,arrows.meta,quotes,through,decorations.text}%
\newcommand{\空行}{\vskip0.00001\baselineskip}%
@@ -26,16 +27,43 @@
\newcommand{\証明開始}{\noindent\textgt{【証明】}\par}%
\newcommand{\証明終了}{\@rightalign{\ (Q.E.D.)}\par}%
\newcommand{\数式カンマスペース}{,\ }%
+\let\original@sqrt\sqrt%
+\NewDocumentCommand\@@sqrt{ O{} m }%
+ {\ifthenelse{\equal{#1}{}}{\ensuremath{\original@sqrt{\vphantom{b}#2}}}{\ensuremath{\original@sqrt[#1]{\vphantom{b}#2}}}}%
+\def\sqrt{\@@sqrt}%
\NewDocumentCommand\根号{ O{} m }%
- {\ifthenelse{\equal{#1}{}}{\sqrt{#2\,}}{\sqrt[#1]{#2\,}}}%
-\newcommand{\ベクトル}[1]{\vec{\mathstrut #1}}%
-\newcommand{\overrightarrowtext}[1]{\overrightarrow{\text{#1}}}%
+ {\ifthenelse{\equal{#1}{}}{\ensuremath{\original@sqrt{\vphantom{b}#2\,}}}{\ensuremath{\original@sqrt[#1]{\vphantom{b}#2\,}}}}%
+\newcommand{\ベクトル}[1]{\vv{\mathstrut#1}}%
+\newcommand{\階乗}{\ensuremath{\mkern1mu!\mkern1mu}}%
+\newcommand{\実数入り}{\ensuremath{\in\mathbb{R}}}%
+\newcommand{\共役}[1]{\ensuremath{\overline{\mathstrut#1}}}%
+\def\相似sizeratio#1{\Mulself\sz@s{#1}\Mulself\sz@r{#1}\ignorespaces}%
+\edef\sz@s{1.4}%
+\edef\sz@r{.33}%
+\def\souzisizeratio#1{\Mulself\sz@s{#1}\Mulself\sz@r{#1}\ignorespaces}%
+\DeclareRobustCommand\相似{\@ifnextchar[{\@相似}{\@相似[\empty]}}%
+\def\@相似[#1]{%
+ \ifx\empty #1\else
+ \Mulself\sz@s{#1}%
+ \Mulself\sz@r{#1}%
+ \fi
+ \mathrel{\hbox{\chgfontsizeratio{\sz@s}\raisebox{-\sz@r ex}{∽}\!\!}}%
+}%
+\def\chgfontsizeratio#1{\setlength{\@tempdima@math}{\f@size pt}%
+ \setlength{\@tempdima@math}{#1\@tempdima@math}%
+ \@tempdimb@math=\@tempdima@math\advance\@tempdimb@math2\p@
+ \def\@tmp@size{%
+ \@setfontsize\@tmp@size{\strip@pt\@tempdima@math}{\strip@pt\@tempdimb@math}}%
+ \@tmp@size\ignorespaces
+}%
+\def\平行{\mathrel{/\kern-.25em/}}%
+\newcommand{\vvtext}[1]{\ensuremath{\vv{\text{#1}}}}%
\newcommand{\overarc}[1]%
{%
- \tikz[baseline = (N.base),every node/.style={}]%
+ \tikz[baseline=(N.base),every node/.style={}]%
{%
- \node[inner sep = 0pt](N){\text{#1}};%
- \draw[line width = 0.4pt] plot [smooth, tension=1.3]coordinates%
+ \node[inner sep=0pt](N){\text{#1}};%
+ \draw[line width=0.4pt]plot[smooth,tension=1.3]coordinates%
{($(N.north west)+(0.1ex,0)$)($(N.north)+(0,0.5ex)$)($(N.north east)+(0,0)$)};%
}%
}%
@@ -51,7 +79,7 @@
\newcommand{\Tzettaiti}[1]{\left|\,#1\,\right|}%
\def\shikimaru#1{\text{\quad$\cdots\cdots$\,\ajMaru{#1}}}
\let\originalbigtriangleup\bigtriangleup
-\def\bigtriangleup#1{\originalbigtriangleup{\mathrm{#1}}}
+\def\bigtriangleup#1{\originalbigtriangleup{\text{#1}}}
\DeclareRobustCommand\bunsuu{\@ifstar{\bunsuu@}{\@@bunsuu}}
\def\@@bunsuu#1#2{%
\dfrac{\lower.44ex\hbox{$\,#1\,$}}{\lower-.1ex\hbox{$\,#2\,$}}}%
@@ -64,7 +92,6 @@
\def\@EMvphantom[#1]{\@ifnextchar[{\@@EMvphantom[#1]}{%
\@@EMvphantom[#1][#1]}}
\def\@@EMvphantom[#1][#2]#3{{%
-% \edef\apnd@ht{#1}\edef\apnd@dp{#2}%
\@ifundefined{hakobanpush}{%
\@@@EMvphantom{#3}\ignorespaces
}{%
@@ -96,7 +123,7 @@
\long\def\@icolonforloop#1:#2\@@#3#4{\def#3{#1}\ifx #3\@nnil
\expandafter\@fornoop \else
#4\relax\expandafter\@icolonforloop\fi#2\@@#3{#4}}%
-\def\phrases@math{\renewcommand{\arraystretch}{1}\@ifnextchar<{\@phrases@math}{\@phrases@math<lr>}}
+\def\phrasesmath{\renewcommand{\arraystretch}{1}\@ifnextchar<{\@phrases@math}{\@phrases@math<lr>}}
\def\@phrases@math<#1>{\@ifnextchar[{\@@phrases@math<#1>}{\@@phrases@math<#1>[l]}}
\def\@@phrases@math<#1>[#2]{\@ifnextchar({\@@@phrases@math<#1>[#2]}{\@@@phrases@math<#1>[#2](c)}}
\def\@@@phrases@math<#1>[#2](#3){\@ifnextchar|{\@@@@phrases@math<#1>[#2](#3)}{\@@@phrases@math<#1>[#2](#3)|0pt|}}
@@ -136,7 +163,7 @@
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
{$\Ttyuukakko{a-b}^2=a^2-2ab+b^2$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
- {\[\Ttyuukakko{a-b}^2=a^2-2ab+b^2\]}{\relax}%
+ {\[\Ttyuukakko{a-b}^2=a^2-2ab+b^2\]}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
{$\Ttyuukakko{x-a}\Ttyuukakko{x+a}=x^2-a^2$}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}
@@ -153,52 +180,52 @@
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{i}}%
{$a^2+2ab+b^2=\Ttyuukakko{a+b}^2$}{\relax}%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
- {\[a^2+2ab+b^2=\Ttyuukakko{a+b}^2\]}{\relax}%
+ {\[a^2+2ab+b^2=\Ttyuukakko{a+b}^2\]}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
{$a^2-2ab+b^2=\Ttyuukakko{a-b}^2$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
- {\[a^2-2ab+b^2=\Ttyuukakko{a-b}^2\]}{\relax}%
+ {\[a^2-2ab+b^2=\Ttyuukakko{a-b}^2\]}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
{$x^2-a^2=\Ttyuukakko{x-a}\Ttyuukakko{x+a}$}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}
- {\[x^2-a^2=\Ttyuukakko{x-a}\Ttyuukakko{x+a}\]}{\relax}%
+ {\[x^2-a^2=\Ttyuukakko{x-a}\Ttyuukakko{x+a}\]}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{i}}%
{$x+\Ttyuukakko{a+b}x+ab=\Ttyuukakko{x+a}\Ttyuukakko{x+b}$}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{b}}%
{\[x+\Ttyuukakko{a+b}x+ab=\Ttyuukakko{x+a}\Ttyuukakko{x+b}\]}{\relax}%
- }%
+ }%
\NewDocumentCommand{\平方根}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{i}}%
- {$a$は実数として,$\根号{a^2}=\Tzettaiti{a}$}%
+ {$a$は実数として,\,\,$\sqrt{a^2}=\Tzettaiti{a}$}%
{\relax}%
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{b}}%
{%
$a$は実数として,%
\[\根号{a^2}=\Tzettaiti{a}\]%
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{性質A}\AND\equal{#2}{i}}%
{%
$a\geqq0$のとき,%
$\Ttyuukakko{\根号{a}}^2=\Ttyuukakko{-\根号{a}}^2=a\数式カンマスペース\根号{a}\leqq0$%
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{性質A}\AND\equal{#2}{b}}%
{%
$a\leqq0$のとき,%
- \[\Ttyuukakko{\根号{a}}^2=\Ttyuukakko{-\根号{a}}^2=a\数式カンマスペース\根号{a}\leqq0\]%
+\[\Ttyuukakko{\根号{a}}^2=\Ttyuukakko{-\根号{a}}^2=a\数式カンマスペース\根号{a}\leqq0\]%
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{性質B}\AND\equal{#2}{i}}%
{$\根号{a}=\Tzettaiti{a}$}%
{\relax}%
\ifthenelse{\equal{#1}{性質B}\AND\equal{#2}{b}}%
{\[\根号{a}=\Tzettaiti{a}\]}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{性質C}\AND\equal{#2}{i}}%
{%
$a>0\数式カンマスペース b>0\数式カンマスペース a\neq b$のとき,%
@@ -208,7 +235,8 @@
\ifthenelse{\equal{#1}{性質C}\AND\equal{#2}{b}}%
{%
$a>0\数式カンマスペース b>0\数式カンマスペース a\neq b$のとき,%
- \[\根号{a}\根号{b}=\根号{ab}\]%
+\[\根号{a}\根号{b}=\根号{ab}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{性質D}\AND\equal{#2}{i}}%
@@ -223,36 +251,39 @@
\ifthenelse{\equal{#1}{性質E}\AND\equal{#2}{b}}%
{\[\根号{k^2a}=k\根号{a}\]}%
{\relax}%
- }%
+ }%
\NewDocumentCommand{\一次不等式}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{性質A}\AND\equal{#2}{i}}%
- {$a<b$のとき\数式カンマスペース $a+c<b+c$}{\relax}%
+ {$a<b$のとき\数式カンマスペース $a+c<b+c$}{\relax}%
\ifthenelse{\equal{#1}{性質A}\AND\equal{#2}{b}}%
{%
$a<b$のとき\数式カンマスペース %
- \[a+c<b+c\]%
+\[a+c<b+c\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{性質B}\AND\equal{#2}{i}}%
- {$c>0$のとき,$ac<bc$}{\relax}%
+ {$c>0$のとき,$ac<bc$}{\relax}%
\ifthenelse{\equal{#1}{性質B}\AND\equal{#2}{b}}%
{%
$c>0$のとき,%
- \[ac<bc\]%
+\[ac<bc\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{性質C}\AND\equal{#2}{i}}%
- {$c<0$のとき,$ac>bc$}{\relax}%
+ {$c<0$のとき,$ac>bc$}{\relax}%
\ifthenelse{\equal{#1}{性質C}\AND\equal{#2}{b}}%
{%
$c<0$のとき,%
- \[ac>bc\]%
+\[ac>bc\]%
+
}%
{\relax}%
- }%
+ }%
\NewDocumentCommand{\集合}{ m O{i} }%
@@ -260,44 +291,54 @@
\ifthenelse{\equal{#1}{積集合}\AND\equal{#2}{i}}%
{$\Ttyuukakko{A\cap B}$}{\relax}%
\ifthenelse{\equal{#1}{積集合}\AND\equal{#2}{b}}%
- {\[\Ttyuukakko{A\cap B}\]}{\relax}%
+ {\[\Ttyuukakko{A\cap B}\]}{\relax}%
\ifthenelse{\equal{#1}{和集合}\AND\equal{#2}{i}}%
{$\Ttyuukakko{A\cup B}$}{\relax}%
\ifthenelse{\equal{#1}{和集合}\AND\equal{#2}{b}}%
- {\[\Ttyuukakko{A\cup B}\]}{\relax}%
+ {\[\Ttyuukakko{A\cup B}\]}{\relax}%
\ifthenelse{\equal{#1}{補集合}\AND\equal{#2}{i}}%
- {$\Ttyuukakko{\overline{A}}$}{\relax}%
+ {$\Ttyuukakko{\共役{A}}$}{\relax}%
\ifthenelse{\equal{#1}{補集合}\AND\equal{#2}{b}}%
- {\[\Ttyuukakko{\overline{A}}\]}{\relax}%
- }%
+ {\[\Ttyuukakko{\共役{A}}\]}{\relax}%
+ }%
\NewDocumentCommand{\対偶}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{定理}\AND\equal{#2}{i}}%
{%
- $P$ならば$Q$の命題において,\par%
- 逆は$Q$ならば$P$\par%
- 裏は$P$でないならば$Q$でない\par%
- 対偶は$Q$でないならば$P$でない\par%
+ $P$ならば$Q$の命題において,%
+
+ 逆は$Q$ならば$P$%
+
+ 裏は$P$でないならば$Q$でない%
+
+ 対偶は$Q$でないならば$P$でない%
+
対偶と元の命題の真偽は一致する。%
}%
{\relax}%
\ifthenelse{\equal{#1}{定理}\AND\equal{#2}{b}}%
{%
- $P$ならば$Q$の命題において,\par%
- 逆は$Q$ならば$P$\par%
- 裏は$P$でないならば$Q$でない\par%
- 対偶は$Q$でないならば$P$でない\par%
+ $P$ならば$Q$の命題において,%
+
+ 逆は$Q$ならば$P$%
+
+ 裏は$P$でないならば$Q$でない%
+
+ 対偶は$Q$でないならば$P$でない%
+
対偶と元の命題の真偽は一致する。%
}%
{\relax}%
\ifthenelse{\equal{#1}{証明}}%
{%
\証明開始%
- 命題を「$p$ならば$q$」とし$p$の真理集合を$P$\数式カンマスペース $q$の真理集合を$Q$とする。\par%
- 「$p$ならば$q$」が真のとき,$Q\subset P\Leftrightarrow\overline{P}\subset\overline{Q}$より対偶命題「$q$でないならば$p$でない」は真。\par%
- 「$p$ならば$q$」が偽のとき,$Q\not\subset P\Leftrightarrow\overline{P}\not\subset\overline{Q}$より対偶命題「$q$でないならば$p$でない」は偽。\par
+ 命題を「$p$ならば$q$」とし,$p$の真理集合を$P$\数式カンマスペース $q$の真理集合を$Q$とする。%
+
+ 「$p$ならば$q$」が真のとき,$Q\subset P\Leftrightarrow\共役{P}\subset\共役{Q}$より対偶命題「$q$でないならば$p$でない」は真。%
+
+ 「$p$ならば$q$」が偽のとき,$Q\not\subset P\Leftrightarrow\共役{P}\not\subset\共役{Q}$より対偶命題「$q$でないならば$p$でない」は偽。\par
従って,対偶命題と元の命題の真偽は一致する。%
\証明終了%
}%
@@ -313,7 +354,7 @@
\ifthenelse{\equal{#1}{標準形}\AND\equal{#2}{i}}%
{$y=a\Ttyuukakko{x-p}^2+q$}{\relax}%
\ifthenelse{\equal{#1}{標準形}\AND\equal{#2}{b}}%
- {\[y=a\Ttyuukakko{x-p}^2+q\]}{\relax}%
+ {\[y=a\Ttyuukakko{x-p}^2+q\]}{\relax}%
\ifthenelse{\equal{#1}{一般形}\AND\equal{#2}{i}}%
{$y=ax^2+bx+c$}{\relax}%
\ifthenelse{\equal{#1}{一般形}\AND\equal{#2}{b}}%
@@ -321,26 +362,28 @@
\ifthenelse{\equal{#1}{切片形}\AND\equal{#2}{i}}%
{$y=a\Ttyuukakko{x-\alpha}\Ttyuukakko{x-\beta}$}{\relax}%
\ifthenelse{\equal{#1}{切片形}\AND\equal{#2}{b}}%
- {\[y=a\Ttyuukakko{x-\alpha}\Ttyuukakko{x-\beta}\]}{\relax}%
+ {\[y=a\Ttyuukakko{x-\alpha}\Ttyuukakko{x-\beta}\]}{\relax}%
\ifthenelse{\equal{#1}{平方完成}\AND\equal{#2}{i}}%
- {$y=ax^2+bx+c$に対して,$y=a\Ttyuukakko{x+\bunsuu{b}{2a}}-\bunsuu{b^2-4ac}{4a}$}{\relax}%
+ {$y=ax^2+bx+c$に対して,$y=a\Ttyuukakko{x+\bunsuu{b}{2a}}-\bunsuu{b^2-4ac}{4a}$}{\relax}%
\ifthenelse{\equal{#1}{平方完成}\AND\equal{#2}{b}}%
{%
$y=ax^2+bx+c$に対して,%
- \[y=a\Ttyuukakko{x+\bunsuu{b}{2a}}-\bunsuu{b^2-4ac}{4a}\]%
+\[y=a\Ttyuukakko{x+\bunsuu{b}{2a}}-\bunsuu{b^2-4ac}{4a}\]%
+
}%
{\relax}%
- }%
+ }%
\NewDocumentCommand{\二次方程式の解の公式}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
- {$ax^2+bx+c=0 \Ttyuukakko{a\neq0}$に対して,$x=\bunsuu{-b\pm\根号{b^2-4ac}}{2a}$}{\relax}%
+ {$ax^2+bx+c=0 \Ttyuukakko{a\neq0}$に対して,$x=\bunsuu{-b\pm\根号{b^2-4ac}}{2a}$}{\relax}%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
$ax^2+bx+c=0 \Ttyuukakko{a\neq0}$に対して,%
- \[x=\bunsuu{-b\pm\根号{b^2-4ac}}{2a}\]%
+\[x=\bunsuu{-b\pm\根号{b^2-4ac}}{2a}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{証明A}}%
@@ -391,12 +434,13 @@
\draw pic["$\theta$",draw=black,->,thin,angle eccentricity=1.4,angle radius=0.4cm]{angle=B--A--C};%
\end{tikzpicture}%
\空行%
- 図の様な直角$\triangle{\text{ABC}}$において$\angle\mathrm{CAB}=\theta$のとき,%
+ 図の様な直角$\triangle{\text{ABC}}$において$\angle\text{CAB}=\theta$のとき,%
\[%
\sin\theta=\bunsuu{\text{BC}}{\text{AC}}\数式カンマスペース%
\cos\theta=\bunsuu{\text{AB}}{\text{AC}}\数式カンマスペース%
\tan\theta=\bunsuu{\text{BC}}{\text{AB}}%
\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{定義B}\AND\equal{#2}{i}}%
@@ -420,7 +464,8 @@
\end{tikzpicture}%
\空行%
図において%
- \[\sin\theta=\bunsuu{y}{r}\数式カンマスペース\cos\theta=\bunsuu{x}{r}\数式カンマスペース\tan\theta=\bunsuu{y}{x}\]%
+\[\sin\theta=\bunsuu{y}{r}\数式カンマスペース\cos\theta=\bunsuu{x}{r}\数式カンマスペース\tan\theta=\bunsuu{y}{x}\]%
+
このとき,$r=1$にしても一般性を失わない。%
}%
{\relax}%
@@ -432,11 +477,11 @@
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{i}}%
{$\sin^2\theta+\cos^2\theta=1$}{\relax}%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
- {\[\sin^2\theta+\cos^2\theta=1\]}{\relax}%
+ {\[\sin^2\theta+\cos^2\theta=1\]}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
{$\tan\theta=\bunsuu{\sin\theta}{\cos\theta}$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
- {\[\tan\theta=\bunsuu{\sin\theta}{\cos\theta}\]}{\relax}%
+ {\[\tan\theta=\bunsuu{\sin\theta}{\cos\theta}\]}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
{$1+\tan^2\theta=\bunsuu{1}{\cos^2\theta}$}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}%
@@ -463,21 +508,24 @@
\end{tikzpicture}%
\空行%
図において,$\sin\theta=\bunsuu{y}{r}\数式カンマスペース\quad\cos\theta=\bunsuu{x}{r}$より%
- \[\sin^2\theta+\cos^2\theta=\bunsuu{y^2+x^2}{r^2}\]%
+\[\sin^2\theta+\cos^2\theta=\bunsuu{y^2+x^2}{r^2}\]%
+
ここで,三平方の定理より$x^2+y^2=r^2$なので%
- \[\sin^2\theta+\cos^2\theta=\bunsuu{r^2}{r^2}=1\]%
+\[\sin^2\theta+\cos^2\theta=\bunsuu{r^2}{r^2}=1\]%
+
\空行%
- $\sin\theta=\bunsuu{y}{r}\数式カンマスペース\quad\cos\theta=\bunsuu{x}{r}\quad\tan\theta=\bunsuu{y}{x}$より%
- \[\bunsuu{\sin\theta}{\cos\theta}=\bunsuu{y}{x}=\tan\theta\]%
+ $\sin\theta=\bunsuu{y}{r}\数式カンマスペース\quad\cos\theta=\bunsuu{x}{r}\quad\tan\theta=\bunsuu{y}{x}$より% \[\bunsuu{\sin\theta}{\cos\theta}=\bunsuu{y}{x}=\tan\theta\]%
+
\空行%
$\sin^2\theta+\cos^2\theta=1$の両辺を$\cos^2\theta$で割ることで,%
- \[\bunsuu{\sin^2\theta}{\cos^2\theta}+1=\bunsuu{1}{\cos^2\theta}\]%
+\[\bunsuu{\sin^2\theta}{\cos^2\theta}+1=\bunsuu{1}{\cos^2\theta}\]%
+
ここで,$\bunsuu{\sin\theta}{\cos\theta}=\tan\theta$なので%
- \[\tan^2\theta+1=\bunsuu{1}{\cos^2\theta}\]%
+\[\tan^2\theta+1=\bunsuu{1}{\cos^2\theta}\]%
\証明終了%
}%
{\relax}%
- }%
+ }%
\NewDocumentCommand{\ユークリッド幾何の公理}{ m O{i} }%
@@ -500,9 +548,10 @@
\newcommand{\距離}
{%
- 空でない集合Xの元$x\数式カンマスペース y$に対して,実数値$d(x\数式カンマスペース y)$が定義され,%
+ 空でない集合$X$の元$x\数式カンマスペース y$に対して,実数値$d(x\数式カンマスペース y)$が定義され,%
\[d(x\数式カンマスペース y)=0\Leftrightarrow x=y\数式カンマスペース\quad(x\数式カンマスペース y)=d(y\数式カンマスペース x)\数式カンマスペース\quad(x\数式カンマスペース y)\leqq d(x\数式カンマスペース y)+d(y\数式カンマスペース x)\]%
- の三つの性質を満たす$d$をX上の距離といい,$(\text{X}\数式カンマスペース d)$を距離空間という。 %
+
+ の三つの性質を満たす$d$を$X$上の距離といい,$(X\数式カンマスペース d)$を距離空間という。 %
}%
@@ -530,11 +579,11 @@
\draw(2,0)coordinate(B);%
\draw(0,2)coordinate(C); %
\draw(1,1)coordinate(D);%
- \draw pic["A",draw=black,-,thin,angle eccentricity=1.4,angle radius=0.4cm] {angle=A--D--C};%
+ \draw pic["A",draw=black,-,thin,angle eccentricity=1.4,angle radius=0.4cm] {angle=A--D--C};%
\draw pic["B",draw=black,-,thin,angle eccentricity=1.4,angle radius=0.4cm] {angle=O--D--B};%
\end{tikzpicture}%
\空行%
- 図において,$\angle\mathrm{A}$と$\angle\mathrm{B}$を対頂角という。%
+ 図において,$\angle\text{A}$と$\angle\text{B}$を対頂角という。%
}%
{\relax}%
\ifthenelse{\equal{#1}{性質}}%
@@ -550,14 +599,14 @@
\draw(2,0)coordinate(B);%
\draw(0,2)coordinate(C);%
\draw(1,1)coordinate(D);%
- \draw pic["A",draw=black,-,thin,angle eccentricity=1.4,angle radius=0.4cm] {angle=A--D--C};%
- \draw pic["\,C",draw=black,-,thin,angle eccentricity=1.4,angle radius=0.3cm] {angle=B--D--A};%
+ \draw pic["A",draw=black,-,thin,angle eccentricity=1.4,angle radius=0.4cm] {angle=A--D--C};%
+ \draw pic["\,C",draw=black,-,thin,angle eccentricity=1.4,angle radius=0.3cm] {angle=B--D--A};%
\draw pic["B",draw=black,-,thin,angle eccentricity=1.4,angle radius=0.4cm] {angle=O--D--B};%
\end{tikzpicture}%
\空行%
- \[180^\circ =\angle\mathrm{A}+\angle\mathrm{C}\]%
- \[180^\circ=\angle\mathrm{B}+\angle\mathrm{C}\]%
- \[\Leftrightarrow\angle\mathrm{A}=\angle\mathrm{B}\]%
+\[180^\circ =\angle\text{A}+\angle\text{C}\]%
+ \[180^\circ=\angle\text{B}+\angle\text{C}\]%
+\[\Leftrightarrow\angle\text{A}=\angle\text{B}\]%
\証明終了%
}%
{\relax}%
@@ -584,11 +633,11 @@
\draw pic["B\,\,\,",draw=black,-,thin,angle eccentricity=1.4,angle radius=0.3cm] {angle=B--E--G};%
\end{tikzpicture}
\空行%
- 図において,$\angle\mathrm{A}$と$\angle\mathrm{B}$を錯角という。%
+ 図において,$\angle\text{A}$と$\angle\text{B}$を錯角という。%
}%
{\relax}%
\ifthenelse{\equal{#1}{性質}}%
- {直線$l\数式カンマスペース m$において,錯角が等しい$\Leftrightarrow$直線$l\数式カンマスペース m$は平行。}{\relax}%
+ {直線$l\数式カンマスペース m$において,錯角が等しい$\Leftrightarrow$直線$l\数式カンマスペース m$は平行}{\relax}%
\ifthenelse{\equal{#1}{証明}}%
{%
\証明開始%
@@ -613,16 +662,20 @@
\item 「平行ならば錯角が等しい」の証明。%
\空行%
対頂角は等しいので,%
- \[\angle\mathrm{A}=\angle\mathrm{C}\]%
- ここで,$\angle\mathrm{B}$と$\angle\mathrm{C}$は同位角なので等しいので,%
- \[\angle\mathrm{A}=\angle\mathrm{B}\]%
+\[\angle\text{A}=\angle\text{C}\]%
+
+ ここで,$\angle\text{B}$と$\angle\text{C}$は同位角なので等しいので,%
+\[\angle\text{A}=\angle\text{B}\]%
+
\item 「錯角が等しいならば平行」の証明。%
\空行%
錯角が等しいので,%
- \[\angle\mathrm{A}=\angle\mathrm{B}\]%
+\[\angle\text{A}=\angle\text{B}\]%
+
対頂角は等しいので,%
- \[\angle\mathrm{A}=\angle\mathrm{C}\]%
- \[\Leftrightarrow\angle\mathrm{C}=\angle\mathrm{B}\]%
+\[\angle\text{A}=\angle\text{C}\]%
+\[\Leftrightarrow\angle\text{C}=\angle\text{B}\]%
+
即ち,同位角が等しいので二直線は平行。%
\end{enumerate}%
\証明終了%
@@ -650,7 +703,7 @@
\draw pic["\,\,B",draw=black,-,thin,angle eccentricity=1.4,angle radius=0.4cm] {angle=D--E--B};%
\end{tikzpicture}
\空行%
- 図において,$\angle\mathrm{A}$と$\angle\mathrm{B}$を同位角という。
+ 図において,$\angle\text{A}$と$\angle\text{B}$を同位角という。
}%
{\relax}%
\ifthenelse{\equal{#1}{公理}}%
@@ -658,15 +711,91 @@
}%
+\NewDocumentCommand{\平行線と線分比の性質}{ m O{i} }%
+ {%
+ \ifthenelse{\equal{#1}{公式A}}%
+ {%
+ \begin{tikzpicture}%
+ \draw(0,0)--(3,4)--(5,0)--cycle;%
+ \draw(0,0)node[below]{B};%
+ \draw(3,4)node[above]{A};%
+ \draw(5,0)node[below]{C};%
+ \draw(1.5,2)--(4,2);%
+ \draw(1.5,2)node[left]{D};%
+ \draw(4,2)node[right]{E};%
+ \end{tikzpicture}%
+ \空行%
+ 図において,%
+\[\text{AD}:\text{AB}=\text{AE}:\text{AC}=\text{DE}:\text{BC}\]%
+
+ }%
+ {\relax}%
+ \ifthenelse{\equal{#1}{公式B}}%
+ {%
+ \begin{tikzpicture}%
+ \draw(0,0)--(3,4)--(5,0)--cycle;%
+ \draw(0,0)node[below]{B};%
+ \draw(3,4)node[above]{A};%
+ \draw(5,0)node[below]{C};%
+ \draw(1.5,2)--(4,2);%
+ \draw(1.5,2)node[left]{D};%
+ \draw(4,2)node[right]{E};%
+ \end{tikzpicture}%
+ \空行%
+ 図において,%
+\[\text{AD}:\text{DB}=\text{AE}:\text{EC}\]%
+
+ }%
+ {\relax}%
+ \ifthenelse{\equal{#1}{証明}}%
+ {%
+ \証明開始%
+ \begin{tikzpicture}%
+ \draw(0,0)--(3,4)--(5,0)--cycle;%
+ \draw(0,0)node[below]{B};%
+ \draw(3,4)node[above]{A};%
+ \draw(5,0)node[below]{C};%
+ \draw(1.5,2)--(4,2);%
+ \draw(1.5,2)node[left]{D};%
+ \draw(4,2)node[right]{E};%
+ \draw(2.5,0)--(4,2);%
+ \draw(2.5,0)node[below]{F};%
+ \end{tikzpicture}%
+ \空行%
+ 図において, %
+\[\text{DE}\平行\text{BC}\]%
+\[\Leftrightarrow\angle\text{ADE}=\angle\text{ABC}\数式カンマスペース\angle\text{AED}=\angle\text{ACB}\]%
+
+ よって,$\triangle\text{ADE}\相似\triangle\text{ABC}\Leftrightarrow\text{AD}:\text{AB}=\text{AE}:\text{AC}=\text{DE}:\text{BC}$%
+
+ また,図において,%
+\[\text{AB}\平行\text{EF}\Leftrightarrow\angle\text{CEF}=\angle\text{CAB}\数式カンマスペース\angle\text{CFE}=\angle\text{CBA}\]%
+
+ また,%
+\[\text{DE}\平行\text{BC}\Leftrightarrow\angle\text{EDA}=\angle\text{CBA}\]%
+
+ これと$\angle\text{CFE}=\angle\text{CBA}$より,%
+\[\angle\text{EDA}=\angle\text{CFE}\]%
+
+ よって,$\triangle\text{ADE}\相似\triangle\text{EFC}\Leftrightarrow\text{AD}:\text{EF}=\text{AE}:\text{EC}$%
+ ここで,%
+\[\text{EF}=\text{DB}\Leftrightarrow\text{AD}:\text{DB}=\text{AE}:\text{EC}\]%
+ \証明終了%
+ }%
+ {\relax}%
+ }%
+
+
\NewDocumentCommand{\正弦定理}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
- {$\triangle{\text{ABC}}$の外接円の半径を$R$として,$\bunsuu{a}{\sin\text{A}}=2\text{R}\text{\ (}b\数式カンマスペース\text{B
-}\数式カンマスペース c\数式カンマスペース\text{Cについても同様に成立})$}{\relax}%
+ {$\triangle{\text{ABC}}$の外接円の半径を$R$として,$\bunsuu{a}{\sin\text{A}}=2\text{R}\text{\ (\,$b\数式カンマスペース\text{B
+}\数式カンマスペース c\数式カンマスペース\text{C}$についても同様に成立)}$}{\relax}%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
$\triangle{\text{ABC}}$の外接円の半径を$R$として,%
- \[\bunsuu{a}{sin\text{A}}=2R\text{\ (\,$b\数式カンマスペース\text{B}\数式カンマスペース c\数式カンマスペース\text{C}$についても同様に成立)}\]%
+ \[\bunsuu{a}{\sin\text{A}}=2R\text{\ (\,$b\数式カンマスペース\text{B}\数式カンマスペース c\数式カンマスペース\text{C}$についても同様に成立)}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{証明}}%
@@ -693,9 +822,10 @@
\end{tikzpicture}%
\空行%
図において円周角の定理より,%
- \[\angle\mathrm{A}=\angle\mathrm{D}\]%
+\[\angle\text{A}=\angle\text{D}\]%
+
なので,円Oの半径をRとして$\sin\text{A}=\sin\text{D}=\bunsuu{a}{2\text{R}}$より,%
- \[\bunsuu{a}{\sin\text{A}}=2\text{R}\]%
+\[\bunsuu{a}{\sin\text{A}}=2\text{R}\]%
\証明終了%
}%
{\relax}%
@@ -705,11 +835,12 @@
\NewDocumentCommand{\余弦定理}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
- {$\triangle{\text{ABC}}$において,$a^2=b^2+c^2-2bc\cos\text{A}$}{\relax}%
+ {$\triangle{\text{ABC}}$において,$a^2=b^2+c^2-2bc\cos\text{A}$}{\relax}%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
$\triangle{\text{ABC}}$において,%
- \[a^2=b^2+c^2-2bc\cos\text{A}\]%
+\[a^2=b^2+c^2-2bc\cos\text{A}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{証明}}%
@@ -731,10 +862,12 @@
\end{tikzpicture}%
\空行%
図において$\text{BC}=a,\text{CA}=b,\text{AC}=c$として,%
- \[\text{BH}=c\sin\text{A},\quad\text{AH}=c\cos\text{A}\]%
+\[\text{BH}=c\sin\text{A},\quad\text{AH}=c\cos\text{A}\]%
+
また,$\triangle{\text{BHC}}$に三平方の定理を用いることにより%
- \[\text{CB}^2=\text{BH}^2+\text{HC}^2\]%
- ここで,$\text{HC}=\text{AC}-\text{AH}=b-c\cos\text{A},\quad\text{BH}=c\sin\text{A}$より%
+\[\text{CB}^2=\text{BH}^2+\text{HC}^2\]%
+
+ ここで,$\text{HC}=\text{AC}-\text{AH}=b-c\cos\text{A}\数式カンマスペース\text{BH}=c\sin\text{A}$より%
\begin{align*}%
a^2&=\Ttyuukakko{c\sin\text{A}}^2+\Ttyuukakko{b-c\cos\text{A}}^2&\\%
&=c^2\sin^2\text{A}+b^2-2bc\cos\text{A}+c^2\cos^2\text{A}&\\%
@@ -742,21 +875,22 @@
&=b^2+c^2-2bc\cos\text{A}%
\end{align*}%
よって,%
- \[a^2=b^2+c^2-2bc\cos\text{A}\]%
+\[a^2=b^2+c^2-2bc\cos\text{A}\]%
\証明終了%
}%
{\relax}%
}%
-\NewDocumentCommand{\三角形の面積}{ m O{i} }%
+\NewDocumentCommand{\三角比の三角形の面積公式}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
- {$\triangle{\text{ABC}}$の面積を$S$として,$S=\bunsuu{1}{2}bc\sin\text{A}$}{\relax}%
+ {$\triangle{\text{ABC}}$の面積を$S$として,$S=\bunsuu{1}{2}bc\sin\text{A}$}{\relax}%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
$\triangle{\text{ABC}}$の面積を$S$として,%
- \[S=\bunsuu{1}{2}bc\sin\text{A}\]%
+\[S=\bunsuu{1}{2}bc\sin\text{A}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{証明}}%
@@ -777,167 +911,290 @@
\end{tikzpicture}%
\空行%
図において%
- \[\text{BC}=a\数式カンマスペース\text{CA}=B\数式カンマスペース\text{AC}=c\]%
+\[\text{BC}=a\数式カンマスペース\text{CA}=B\数式カンマスペース\text{AC}=c\]%
+
また,$\triangle{\text{ABC}}$の面積を$S$として$S=\bunsuu{1}{2}\text{AC}\times\text{BH}$と,$\text{AB}\sin\text{A}=\text{BH}$から,%
- \[S=\bunsuu{1}{2}bc\sin\text{A}\]%
+\[S=\bunsuu{1}{2}bc\sin\text{A}\]%
\証明終了%
}%
{\relax}%
}%
+\NewDocumentCommand{\ヘロンの公式}{ m O{i} }%
+ {%
+ \ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
+ {%
+ \begin{tikzpicture}%
+ \draw(0,0)--(3,4)--(5,0)--cycle;%
+ \draw(0,0)node[below]{B};%
+ \draw(3,4)node[above]{A};%
+ \draw(5,0)node[below]{C};%
+ \draw(1.5,2)node[left]{$c$};%
+ \draw(2.5,0)node[below]{$a$};%
+ \draw(4,2)node[right]{$b$};%
+  \end{tikzpicture}%
+ \空行%
+ 図において$s=\bunsuu{a+b+c}{2}$のとき三角形の面積$S$は,$\根号{s(s-a)(s-b)(s-c)}$%
+ }%
+ {\relax}%
+ \ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
+ {%
+ \begin{tikzpicture}%
+ \draw(0,0)--(3,4)--(5,0)--cycle;%
+ \draw(0,0)node[below]{B};%
+ \draw(3,4)node[above]{A};%
+ \draw(5,0)node[below]{C};%
+ \draw(1.5,2)node[left]{$c$};%
+ \draw(2.5,0)node[below]{$a$};%
+ \draw(4,2)node[right]{$b$};%
+  \end{tikzpicture}%
+ \空行%
+ 図において$s=\bunsuu{a+b+c}{2}$のとき三角形の面積$S$は,%
+\[\根号{s(s-a)(s-b)(s-c)}\]%
+
+ }%
+ {\relax}%
+ \ifthenelse{\equal{#1}{証明}}%
+ {%
+ \証明開始%
+ \begin{tikzpicture}%
+ \draw(0,0)--(3,4)--(5,0)--cycle;%
+ \draw(0,0)node[below]{B};%
+ \draw(3,4)node[above]{A};%
+ \draw(5,0)node[below]{C};%
+ \draw(1.5,2)node[left]{$c$};%
+ \draw(2.5,0)node[below]{$a$};%
+ \draw(4,2)node[right]{$b$};%
+  \end{tikzpicture}%
+ \空行%
+ 三角形の面積公式より,%
+\[S=\bunsuu{1}{2}ab\sin\text{C}\]%
+
+ ここで$\sin^2\theta+\cos^2\theta=1$より,%
+\[S=\bunsuu{1}{2}ac\根号{1-\cos^2\text{C}}\]%
+
+ 余弦定理より$\cos\text{C}=\bunsuu{a^2+b^2-c^2}{2ab}$なので,%
+ \begin{align*}%
+ S&=\bunsuu{1}{2}ab\根号{1-\Ttyuukakko{\bunsuu{a^2+b^2-c^2}{2ab}}^2}&\\%
+ &=\bunsuu{1}{4}\根号{(2ab)^2-(a-2+b^2-c^2)^2}&\\%
+ &=\bunsuu{1}{4}\根号{(2ab+a^2+b^2-c^2)(2ab-a^2-b^2+c^2)}&\\%
+ &=\bunsuu{1}{2}\根号{\Tdaikakko{(a+b)^2-c^2}\Tdaikakko{c^2-(a-b)^2}}&\\%
+ &=\根号{\bunsuu{(a+b+c)(-a+b+c)(a-b+c)(a+b-c)}{2\cdot2\cdot2\cdot2}}&\\%
+ &=\根号{s(s-a)(s-b)(s-c)}
+ \end{align*}%
+ \証明終了%
+ }%
+ {\relax}%
+ }%
+
+
+\NewDocumentCommand{\外接円の半径と三角形の面積}{ m O{i} }%
+ {%
+ \ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
+ {%
+ $3$辺の長さが$a\数式カンマスペース b\数式カンマスペース c$の三角形の外接円の半径を$R$,面積を$S$とおくと,$S=\bunsuu{abc}{4R}$
+ }%
+ {\relax}%
+ \ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
+ {%
+ $3$辺の長さが$a\数式カンマスペース b\数式カンマスペース c$の三角形の外接円の半径を$R$,面積を$S$とおくと,%
+ \[S=\bunsuu{abc}{4R}\]%
+ }%
+ {\relax}%
+ \ifthenelse{\equal{#1}{証明}}%
+ {%
+ \証明開始%
+ 正弦定理より,%
+ \[a=2R\sin\text{A}\]%
+
+ 三角形の面積の公式から,%
+ \[S=\bunsuu{1}{2}bc\sin\text{A}\]%
+
+ 以上の2式より,%
+ \[S=\bunsuu{abc}{4R}\]%
+ \証明終了%
+ }%
+ {\relax}%
+ }%
+
+\newlength{\sankekkeinomensekikoushiki}%
+\settowidth{\sankekkeinomensekikoushiki}{$\sqrt{s(s-a)(s-b)(s-c)}\ \Ttyuukakko{s=\bunsuu{a+b+c}{2}}$}%
+\NewDocumentCommand{\三角形の面積公式}{ O{} }%
+ {%
+ \begin{align*}%
+ S&=\parbox[c]{\the\sankekkeinomensekikoushiki}{$\bunsuu12bc\sin{\text{A}}$}\shikimaru{1}\\%
+ &=\parbox[c]{\the\sankekkeinomensekikoushiki}{$\sqrt{s(s-a)(s-b)(s-c)}\ \Ttyuukakko{s=\bunsuu{a+b+c}{2}}$}\shikimaru{2}\\%
+ &=\parbox[c]{\the\sankekkeinomensekikoushiki}{$rs$}\shikimaru{3}\\%
+ &=\parbox[c]{\the\sankekkeinomensekikoushiki}{$\bunsuu{abc}{4R}$}\shikimaru{4}\\%
+ &=\parbox[c]{\the\sankekkeinomensekikoushiki}{$\bunsuu12\sqrt{\Tzettaiti{\ベクトル{a}}^2\Tzettaiti{\ベクトル{b}}^2-\Ttyuukakko{\ベクトル{a}\cdot\ベクトル{b}}^2}$}\shikimaru{5}\\%
+ &=\parbox[c]{\the\sankekkeinomensekikoushiki}{$\bunsuu12|x_1y_2-x_2y_1|$}\shikimaru{6}%
+ \end{align*}%
+ }%
+
+
\NewDocumentCommand{\場合の数と確率}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{和集合の要素の個数}\AND\equal{#2}{i}}%
{$n\Ttyuukakko{A\cup B}=n\Ttyuukakko{A}+n\Ttyuukakko{B}-n\Ttyuukakko{A\cap B}$}{\relax}%
\ifthenelse{\equal{#1}{和集合の要素の個数}\AND\equal{#2}{b}}%
- {\[n\Ttyuukakko{A\cup B}=n\Ttyuukakko{A}+n\Ttyuukakko{B}-n\Ttyuukakko{A\cap B}\]}{\relax}%
+ {\[n\Ttyuukakko{A\cup B}=n\Ttyuukakko{A}+n\Ttyuukakko{B}-n\Ttyuukakko{A\cap B}\]}{\relax}%
\ifthenelse{\equal{#1}{補集合の要素の個数}\AND\equal{#2}{i}}%
- {全体集合を$U$として,$n\Ttyuukakko{\overline{A}}=n\Ttyuukakko{U}-n\Ttyuukakko{A}$}{\relax}%
+ {全体集合を$U$として,$n\Ttyuukakko{\共役{A}}=n\Ttyuukakko{U}-n\Ttyuukakko{A}$}{\relax}%
\ifthenelse{\equal{#1}{補集合の要素の個数}\AND\equal{#2}{b}}%
- {全体集合を$U$として,\[n\Ttyuukakko{\overline{A}}=n\Ttyuukakko{U}-n\Ttyuukakko{A}\]}{\relax}%
+ {全体集合を$U$として,\[n\Ttyuukakko{\共役{A}}=n\Ttyuukakko{U}-n\Ttyuukakko{A}\]}{\relax}%
\ifthenelse{\equal{#1}{和の法則}\AND\equal{#2}{i}}%
- {二つの事象$\text{A}$\数式カンマスペース Bにたいして,Aの起こりかたが$a$通り,Bの起こりかたが$b$通りのとき,AまたはBの起こる場合の数は$a+b$通り}{\relax}%
+ {二つの事象$A$\数式カンマスペース$B$に対して,Aの起こり方が$a$通り,Bの起こり方が$b$通りのとき,AまたはBの起こる場合の数は$a+b$通り}{\relax}%
\ifthenelse{\equal{#1}{和の法則}\AND\equal{#2}{b}}%
- {二つの事象$\text{A}$\数式カンマスペース Bにたいして,Aの起こりかたが$a$通り,Bの起こりかたが$b$通りのとき,AまたはBの起こる場合の数は$a+b$通り}{\relax}%
+ {二つの事象$A$\数式カンマスペース$B$に対して,Aの起こり方が$a$通り,Bの起こり方が$b$通りのとき,AまたはBの起こる場合の数は$a+b$通り}{\relax}%
\ifthenelse{\equal{#1}{積の法則}\AND\equal{#2}{i}}%
- {二つの事象$\text{A}$\数式カンマスペース Bにたいして,Aの起こりかたが$a$通り,Bの起こりかたが$b$通りのとき,AかつBの起こる場合の数は$ab$通り}{\relax}%
+ {二つの事象$A$\数式カンマスペース$B$に対して,Aの起こり方が$a$通り,Bの起こり方が$b$通りのとき,AかつBの起こる場合の数は$ab$通り}{\relax}%
\ifthenelse{\equal{#1}{積の法則}\AND\equal{#2}{b}}%
- {二つの事象$\text{A}$\数式カンマスペース Bにたいして,Aの起こりかたが$a$通り,Bの起こりかたが$b$通りのとき,AかつBの起こる場合の数は$ab$通り}{\relax}%
+ {二つの事象$A$\数式カンマスペース$B$に対して,Aの起こり方が$a$通り,Bの起こり方が$b$通りのとき,AかつBの起こる場合の数は$ab$通り}{\relax}%
\ifthenelse{\equal{#1}{順列}\AND\equal{#2}{i}}%
- {異なる$n$個のものから$r$個選んで並べる場合の数は${}_{n}P_{r}=\bunsuu{n!}{\Ttyuukakko{n-r}!}$}{\relax}%
+ {異なる$n$個のものから$r$個選んで並べる場合の数は${}_{n}\text{P}_{r}=\bunsuu{n\階乗}{\Ttyuukakko{n-r}\階乗}$}{\relax}%
\ifthenelse{\equal{#1}{順列}\AND\equal{#2}{b}}%
{%
異なる$n$個のものから$r$個選んで並べる場合の数は%
- \[{}_{n}P_{r}=\bunsuu{n!}{\Ttyuukakko{n-r}!}\]%
+\[{}_{n}\text{P}_{r}=\bunsuu{n\階乗}{\Ttyuukakko{n-r}\階乗}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{順列の証明}}%
{%
\証明開始%
異なる$n$個のものから$r$個選んで並べる場合の数は,%
- \[n\times\Ttyuukakko{n-1}\times\Ttyuukakko{n-2}\times\cdots\Ttyuukakko{n-r+1}=\bunsuu{n!}{\Ttyuukakko{n-r}!}\]%
- ここで,$\bunsuu{n!}{\Ttyuukakko{n-r}!}$を${}_{n} P_{r}$と表す。%
+\[n\times\Ttyuukakko{n-1}\times\Ttyuukakko{n-2}\times\cdots\times\Ttyuukakko{n-r+1}=\bunsuu{n\階乗}{\Ttyuukakko{n-r}\階乗}\]%
+
+ ここで,$\bunsuu{n\階乗}{\Ttyuukakko{n-r}\階乗}$を${}_{n} P_{r}$と表す。%
\証明終了%
}%
{\relax}%
\ifthenelse{\equal{#1}{円順列}\AND\equal{#2}{i}}%
- {異なる$n$個のものを円に並べる場合の数は$\Ttyuukakko{n-1}!$}{\relax}%
+ {異なる$n$個のものを円に並べる場合の数は$\Ttyuukakko{n-1}\階乗 $}{\relax}%
\ifthenelse{\equal{#1}{円順列}\AND\equal{#2}{b}}%
- {異なる$n$個のものを円に並べる場合の数は\[\Ttyuukakko{n-1}!\]}{\relax}%
+ {異なる$n$個のものを円に並べる場合の数は\[\Ttyuukakko{n-1}\階乗\]}{\relax}%
\ifthenelse{\equal{#1}{円順列の証明}}%
{%
\証明開始%
- $n$個のものを円形に並べるとき,1つを固定して考えると,残り$n-1$個を並べる順列の個数に等しい。よって$\Ttyuukakko{n-1}!$通りとなる。%
+ $n$個のものを円形に並べるとき,1つを固定して考えると,残り$n-1$個を並べる順列の個数に等しい。よって$\Ttyuukakko{n-1}\階乗 $通りとなる。%
}%
{\relax}%
\ifthenelse{\equal{#1}{重複順列}\AND\equal{#2}{i}}%
- {$n$個から$r$個,重複を許して並べる場合の数は$n^r$}{\relax}%
+ {$n$個から$r$個,重複を許して並べる場合の数は$n^r$}{\relax}%
\ifthenelse{\equal{#1}{重複順列}\AND\equal{#2}{b}}%
- {$n$個から$r$個,重複を許して並べる場合の数は\[n^r\]}{\relax}%
+ {$n$個から$r$個,重複を許して並べる場合の数は\[n^r\]}{\relax}%
\ifthenelse{\equal{#1}{組み合わせ}\AND\equal{#2}{i}}%
- {異なる$n$個のものから$r$個選ぶ場合の数は,${}_{n}C_{r}=\bunsuu{n!}{r!\Ttyuukakko{n-r}!}$}{\relax}%
+ {異なる$n$個のものから$r$個選ぶ場合の数は,${}_{n}\text{C}_{r}=\bunsuu{n\階乗}{r\階乗\Ttyuukakko{n-r}\階乗}$}{\relax}%
\ifthenelse{\equal{#1}{組み合わせ}\AND\equal{#2}{b}}%
{%
異なる$n$個のものから$r$個選ぶ場合の数は,%
- \[{}_{n}C_{r}=\bunsuu{n!}{r!\Ttyuukakko{n-r}!}\]%
+\[{}_{n}\text{C}_{r}=\bunsuu{n\階乗}{r\階乗\Ttyuukakko{n-r}\階乗}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{組み合わせの証明}}%
{%
\証明開始%
異なる$n$個のものから$r$個選ぶ場合の数は,順列を重複度で割ったものなので%
- \[\bunsuu{{}_{n} P_{r}}{r!}=\bunsuu{n!}{r!\Ttyuukakko{n-r}!}\]%
- ここで,$\bunsuu{n!}{r!\Ttyuukakko{n-r}!}$を${}_{n}C_{r}$と表す。
- \証明終了%
+\[\bunsuu{{}_{n} P_{r}}{r\階乗}=\bunsuu{n\階乗}{r\階乗\Ttyuukakko{n-r}\階乗}\]%
+
+ ここで,$\bunsuu{n\階乗}{r\階乗\Ttyuukakko{n-r}\階乗}$を${}_{n}\text{C}_{r}$と表す。 \証明終了%
}%
{\relax}%
\ifthenelse{\equal{#1}{同じものを含む順列}\AND\equal{#2}{i}}%
- {$a$が$p$個,$b$が$q$個,$c$が$r$個,とあるとき,それら全部を並べる場合の数は,$\bunsuu{n!}{p!q!r!}$(ただし,$p+q+r=n$)}{\relax}%
+ {$a$が$p$個,$b$が$q$個,$c$が$r$個,とあるとき,それら全部を並べる場合の数は,$\bunsuu{n\階乗}{p\階乗 q\階乗 r\階乗}$(ただし,$p+q+r=n$)}{\relax}%
\ifthenelse{\equal{#1}{同じものを含む順列}\AND\equal{#2}{b}}%
{%
$a$が$p$個,$b$が$q$個,$c$が$r$個,とあるとき,それら全部を並べる場合の数は,%
- \[\bunsuu{n!}{p!q!r!}\text{\ (ただし,$p+q+r=n$)}\]%
+\[\bunsuu{n\階乗}{p\階乗 q\階乗 r\階乗}\text{\ (ただし,$p+q+r=n$)}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{同じものを含む順列の証明}}%
{%
\証明開始%
- $n$個のものを並べる場合の数は$n!$通りだが,$n$個の中に同じものが含まれているので,重複度で割ることで$\bunsuu{n!}{p!q!r!}$を得る。%
+ $n$個のものを並べる場合の数は$n\階乗 $通りだが,$n$個の中に同じものが含まれているので,重複度で割ることで$\bunsuu{n\階乗}{p\階乗 q\階乗 r\階乗}$を得る。%
\証明終了%
}%
{\relax}%
\ifthenelse{\equal{#1}{確率の定義}\AND\equal{#2}{i}}%
- {全事象$\text{U}$のどの根元事象も同様に確からしいとき,事象$\text{A}$の起こる確率は,$P\Ttyuukakko{A}=\bunsuu{n\Ttyuukakko{A}}{n\Ttyuukakko{U}}$}{\relax}%
+ {全事象$U$のどの根元事象も同様に確からしいとき,事象$A$の起こる確率は,$P\Ttyuukakko{A}=\bunsuu{n\Ttyuukakko{A}}{n\Ttyuukakko{U}}$}{\relax}%
\ifthenelse{\equal{#1}{確率の定義}\AND\equal{#2}{b}}%
{%
- 全事象$\text{U}$のどの根元事象も同様に確からしいとき,事象$\text{A}$の起こる確率は,%
- \[P\Ttyuukakko{A}=\bunsuu{n\Ttyuukakko{A}}{n\Ttyuukakko{U}}\]%
+ 全事象$U$のどの根元事象も同様に確からしいとき,事象$A$の起こる確率は,%
+\[P\Ttyuukakko{A}=\bunsuu{n\Ttyuukakko{A}}{n\Ttyuukakko{U}}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{排反の定義}\AND\equal{#2}{i}}%
- {事象$\text{A}$\数式カンマスペース$\text{B}$が同時に起こりえないとき,AとBは互いに排反であるという。}{\relax}%
+ {事象$A$\数式カンマスペース$B$が同時に起こりえないとき,$A$と$B$は互いに排反であるという。}{\relax}%
\ifthenelse{\equal{#1}{排反の定義}\AND\equal{#2}{b}}%
- {事象$\text{A}$\数式カンマスペース$\text{B}$が同時に起こりえないとき,AとBは互いに排反であるという。}{\relax}%
+ {事象$A$\数式カンマスペース$B$が同時に起こりえないとき,$A$と$B$は互いに排反であるという。}{\relax}%
\ifthenelse{\equal{#1}{確率の性質A}\AND\equal{#2}{i}}%
- {任意の事象$\text{A}$に対して,$0\leqq A\leqq1$}{\relax}%
+ {任意の事象$A$に対して,$0\leqq A\leqq1$}{\relax}%
\ifthenelse{\equal{#1}{確率の性質A}\AND\equal{#2}{b}}%
{%
- 任意の事象$\text{A}$に対して,%
- \[0\leqq A\leqq1\]%
+ 任意の事象$A$に対して,%
+\[0\leqq A\leqq1\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{確率の性質B}\AND\equal{#2}{i}}%
- {全事象$\text{U}$の確率$P\Ttyuukakko{U}=1$}{\relax}%
+ {全事象$U$の確率$P\Ttyuukakko{U}=1$}{\relax}%
\ifthenelse{\equal{#1}{確率の性質B}\AND\equal{#2}{b}}%
{%
- 全事象$\text{U}$の確率%
- \[P\Ttyuukakko{U}=1\]%
+ 全事象$U$の確率%
+\[P\Ttyuukakko{U}=1\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{和事象の確率}\AND\equal{#2}{i}}%
{$P\Ttyuukakko{A\cup B}=P\Ttyuukakko{A}+P\Ttyuukakko{B}-P\Ttyuukakko{A\cap B}$}{\relax}%
\ifthenelse{\equal{#1}{和事象の確率}\AND\equal{#2}{b}}%
- {\[P\Ttyuukakko{A\cup B}=P\Ttyuukakko{A}+P\Ttyuukakko{B}-P\Ttyuukakko{A\cap B}\]}{\relax}%
+ {\[P\Ttyuukakko{A\cup B}=P\Ttyuukakko{A}+P\Ttyuukakko{B}-P\Ttyuukakko{A\cap B}\]}{\relax}%
\ifthenelse{\equal{#1}{余事象の確率}\AND\equal{#2}{i}}%
- {$P\Ttyuukakko{\overline{A}}=1-P\Ttyuukakko{A}$}{\relax}%
+ {$P\Ttyuukakko{\共役{A}}=1-P\Ttyuukakko{A}$}{\relax}%
\ifthenelse{\equal{#1}{余事象の確率}\AND\equal{#2}{b}}%
- {\[P\Ttyuukakko{\overline{A}}=1-P\Ttyuukakko{A}\]}{\relax}%
+ {\[P\Ttyuukakko{\共役{A}}=1-P\Ttyuukakko{A}\]}{\relax}%
\ifthenelse{\equal{#1}{独立な事象の確率}\AND\equal{#2}{i}}%
- {事象$\text{A}$とBが独立のとき,事象$\text{A}$が起こりかつ事象$\text{B}$が起こる確率$p$は,$p=P\Ttyuukakko{A}P\Ttyuukakko{B}$}{\relax}%
+ {事象$A$と$B$が独立のとき,事象$A$が起こりかつ事象$B$が起こる確率$p$は,$p=P\Ttyuukakko{A}P\Ttyuukakko{B}$}{\relax}%
\ifthenelse{\equal{#1}{独立な事象の確率}\AND\equal{#2}{b}}%
{%
- 事象$\text{A}$とBが独立のとき,事象$\text{A}$が起こりかつ事象$\text{B}$が起こる確率$p$は,%
- \[p=P\Ttyuukakko{A}P\Ttyuukakko{B}\]%
+ 事象$A$と$B$が独立のとき,事象$A$が起こりかつ事象$B$が起こる確率$p$は,%
+\[p=P\Ttyuukakko{A}P\Ttyuukakko{B}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{反復試行の確率}\AND\equal{#2}{i}}%
- {一回の試行で事象$\text{A}$の起こる確率を$p$として,この試行を$n$回行う反復試行でAが$r$回起こる確率は,${}_{n}C_{r}\Ttyuukakko{p}^r\Ttyuukakko{1-p}^{n-r}$}{\relax}%
+ {一回の試行で事象$A$の起こる確率を$p$として,この試行を$n$回行う反復試行でAが$r$回起こる確率は,${}_{n}\text{C}_{r}\Ttyuukakko{p}^r\Ttyuukakko{1-p}^{n-r}$}{\relax}%
\ifthenelse{\equal{#1}{反復試行の確率}\AND\equal{#2}{b}}%
{%
- 一回の試行で事象$\text{A}$の起こる確率を$p$として,この試行を$n$回行う反復試行でAが$r$回起こる確率は,%
- \[{}_{n}C_{r}\Ttyuukakko{p}^r\Ttyuukakko{1-p}^{n-r}\]%
+ 一回の試行で事象$A$の起こる確率を$p$として,この試行を$n$回行う反復試行でAが$r$回起こる確率は,%
+\[{}_{n}\text{C}_{r}\Ttyuukakko{p}^r\Ttyuukakko{1-p}^{n-r}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{反復試行の確率の証明}}%
{%
\証明開始%
- $n$回の試行のうち事象$\text{A}$が$r$回起こる順番の場合の数は${}_{n} C_{r}$通り。さらに,Aが起こる確率は$p$で$r$回起こり,Aの余事象が起こる確率は$p-1$で$n-r$回起こるので,%
- \[{}_{n}C_{r}\Ttyuukakko{p}^r\Ttyuukakko{1-p}^{n-r}\]%
- となる。
- \証明終了%
+ $n$回の試行のうち事象$A$が$r$回起こる順番の場合の数は${}_{n} C_{r}$通り。さらに,Aが起こる確率は$p$で$r$回起こり,Aの余事象が起こる確率は$p-1$で$n-r$回起こるので,%
+\[{}_{n}\text{C}_{r}\Ttyuukakko{p}^r\Ttyuukakko{1-p}^{n-r}\]%
+
+ となる。 \証明終了%
}%
{\relax}%
\ifthenelse{\equal{#1}{条件付き確率}\AND\equal{#2}{i}}%
- {事象$\text{A}$が起こったときの事象$\text{B}$の起こる確率は,$P_{A}\Ttyuukakko{B}=\bunsuu{P\Ttyuukakko{A\cap B}}{P\Ttyuukakko{A}}$}{\relax}%
+ {事象$A$が起こったときの事象$B$の起こる確率は,$P_{A}\Ttyuukakko{B}=\bunsuu{P\Ttyuukakko{A\cap B}}{P\Ttyuukakko{A}}$}{\relax}%
\ifthenelse{\equal{#1}{条件付き確率}\AND\equal{#2}{b}}%
{%
- 事象$\text{A}$が起こったときの事象$\text{B}$の起こる確率は,%
- \[P_{A}\Ttyuukakko{B}=\bunsuu{P\Ttyuukakko{A\cap B}}{P\Ttyuukakko{A}}\]%
+ 事象$A$が起こったときの事象$B$の起こる確率は,%
+\[P_{A}\Ttyuukakko{B}=\bunsuu{P\Ttyuukakko{A\cap B}}{P\Ttyuukakko{A}}\]%
+
}%
{\relax}%
- }%
+ }%
\newcommand{\図形の性質}[1]%
@@ -955,7 +1212,7 @@
\空行%
図においてOが内心%
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{外心}}%
{%
\begin{tikzpicture}%
@@ -969,7 +1226,7 @@
\空行%
図においてOが外心%
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{垂心}}%
{%
\begin{tikzpicture}%
@@ -1069,15 +1326,15 @@
\end{tikzpicture}%
\空行%
図において三角形の面積比を考えると,%
- \[\bigtriangleup{ABO}:\bigtriangleup{ACO}=\mathrm{BP}:\mathrm{CP}\]%
- \[\Leftrightarrow\bunsuu{\bigtriangleup{ABO}}{\bigtriangleup{ACO}}=\bunsuu{BP}{PC}\]%
- 同様にして,%
- \[\bunsuu{\bigtriangleup{BCO}}{\bigtriangleup{BAO}}=\bunsuu{CQ}{QA}\]%
- \[\bunsuu{\bigtriangleup{CAO}}{\bigtriangleup{CBO}}=\bunsuu{AR}{RB}\]%
+\[\bigtriangleup{ABO}:\bigtriangleup{ACO}=\text{BP}:\text{CP}\]%
+\[\Leftrightarrow\bunsuu{\bigtriangleup{ABO}}{\bigtriangleup{ACO}}=\bunsuu{\text{BP}}{\text{PC}}\]%
+
+ 同様にして,$\bunsuu{\bigtriangleup{BCO}}{\bigtriangleup{BAO}}=\bunsuu{\text{CQ}}{\text{QA}}\数式カンマスペース\bunsuu{\bigtriangleup{CAO}}{\bigtriangleup{CBO}}=\bunsuu{\text{AR}}{\text{RB}}$%
+
ここで,%
- \[\bunsuu{\bigtriangleup{ABO}}{\bigtriangleup{ACO}}\cdot\bunsuu{\bigtriangleup{BCO}}{\bigtriangleup{BAO}}\cdot\bunsuu{\bigtriangleup{CAO}}{\bigtriangleup{CBO}}=1\]%
- \[\Leftrightarrow\bunsuu{\text{BP}}{\text{PC}}\cdot\bunsuu{\text{CQ}}{\text{QA}}\cdot\bunsuu{\text{AR}}{\text{RB}}=1\]%
- \証明終了%
+\[\bunsuu{\bigtriangleup{ABO}}{\bigtriangleup{ACO}}\cdot\bunsuu{\bigtriangleup{BCO}}{\bigtriangleup{BAO}}\cdot\bunsuu{\bigtriangleup{CAO}}{\bigtriangleup{CBO}}=1\]%
+\[\Leftrightarrow\bunsuu{\text{BP}}{\text{PC}}\cdot\bunsuu{\text{CQ}}{\text{QA}}\cdot\bunsuu{\text{AR}}{\text{RB}}=1\]%
+ \証明終了%
}%
{\relax}%
\ifthenelse{\equal{#1}{メネラウスの定理}}%
@@ -1114,9 +1371,9 @@
\draw(0.65,0.975)--(3,0);%
\end{tikzpicture}%
\空行%
- $\text{SC}/ \!/ \text{RP}$より,%
- \[\text{RA}:\text{SR}=\text{QA}:\text{CQ},\text{BR}:\text{RS}=\text{BP}:\text{PC}\]%
- \[\Leftrightarrow\bunsuu{\text{CQ}}{\text{QA}}=\bunsuu{\text{SR}}{\text{AR}},\bunsuu{\text{BP}}{\text{PC}}=\bunsuu{\text{BR}}{\text{RS}}\]%
+ $\text{SC}\平行\text{RP}$より,%
+\[\text{RA}:\text{SR}=\text{QA}:\text{CQ}\数式カンマスペース\text{BR}:\text{RS}=\text{BP}:\text{PC}\]%
+\[\Leftrightarrow\bunsuu{\text{CQ}}{\text{QA}}=\bunsuu{\text{SR}}{\text{AR}}\数式カンマスペース\bunsuu{\text{BP}}{\text{PC}}=\bunsuu{\text{BR}}{\text{RS}}\]%
\[\bunsuu{\text{BP}}{\text{PC}}\cdot\bunsuu{\text{CQ}}{\text{QA}}\cdot\bunsuu{\text{AR}}{\text{RB}}=\bunsuu{\text{BR}}{\text{RS}}\cdot\bunsuu{\text{SR}}{\text{AR}}
\cdot\bunsuu{\text{AR}}{\text{RB}}=1\]%
\証明終了%
@@ -1134,7 +1391,7 @@
\draw(0,0)circle[radius=2];%
\end{tikzpicture}%
\空行%
- $\angle\mathrm{APB}=\angle\mathrm{AQB}$%
+ $\angle\text{APB}=\angle\text{AQB}$%
}%
{\relax}%
\ifthenelse{\equal{#1}{円周角の定理の証明}}%
@@ -1153,10 +1410,12 @@
\end{tikzpicture}%
\空行%
$\triangle{\text{AOP}}$\数式カンマスペース$\triangle{\text{BOP}}$は二等辺三角形なので,%
- \[\angle\mathrm{APO}=\angle\mathrm{OAP}\数式カンマスペース\angle\mathrm{BPO}=\angle\mathrm{OBP}\]%
+\[\angle\text{APO}=\angle\text{OAP}\数式カンマスペース\angle\text{BPO}=\angle\text{OBP}\]%
+
外角定理より,%
- \[\angle\mathrm{AOD}=2\angle\mathrm{APO}\数式カンマスペース\angle\mathrm{BOD}=2\angle\mathrm{BPO}\]%
- \[\Leftrightarrow\angle\mathrm{AOB}=2\angle\mathrm{APB}\]%
+\[\angle\text{AOD}=2\angle\text{APO}\数式カンマスペース\angle\text{BOD}=2\angle\text{BPO}\]%
+\[\Leftrightarrow\angle\text{AOB}=2\angle\text{APB}\]%
+
\空行%
\begin{tikzpicture}%
\draw(-1.6,-1.2)--(1.6,-1.2)--(1.6,1.2)--cycle;%
@@ -1164,14 +1423,16 @@
\draw(-1.6,-1.2)node[left]{A};%
\draw(1.6,-1.2)node[right]{B};%
\draw(1.6,1.2)node[above]{P};%
- \draw(0,0)node[above]{O};%
+ \draw(0,0)node[above]{O};%
\draw(0,0)circle[radius=2];%
\end{tikzpicture}%
\空行%
$\triangle{\text{OPB}}$は二等辺三角形なので,%
- \[\angle\mathrm{OPB}=\angle\mathrm{OBP}\]%
+\[\angle\text{OPB}=\angle\text{OBP}\]%
+
外角定理より%
- \[\angle\mathrm{AOB}=2\angle\mathrm{OPB}\]%
+\[\angle\text{AOB}=2\angle\text{OPB}\]%
+
\空行%
\begin{tikzpicture}%
\draw(-1.6,-1.2)--(1.2,-1.6)--(0,0)--cycle;%
@@ -1180,19 +1441,21 @@
\draw(-1.6,-1.2)node[left]{A};%
\draw(1.2,-1.6)node[right]{B};%
\draw(0,0)node[above]{O};%
- \draw(2,0)node[right]{D};%
+ \draw(2,0)node[right]{D};%
\draw(-2,0)node[left]{Q};%
\draw(0,0)circle[radius=2];%
\end{tikzpicture}%
\空行%
$\triangle{\text{QOA}}\数式カンマスペース\triangle{\text{OQB}}$は二等辺三角形なので,%
- \[\angle\mathrm{OQA}=\angle\mathrm{OAQ}\数式カンマスペース\angle\mathrm{OQB}=\angle\mathrm{OBQ}\]%
+\[\angle\text{OQA}=\angle\text{OAQ}\数式カンマスペース\angle\text{OQB}=\angle\text{OBQ}\]%
+
外角定理より,%
- \[\angle\mathrm{OQA}+\angle\mathrm{OAQ}=\angle\mathrm{DOA}\数式カンマスペース\angle\mathrm{OQB}+\angle\mathrm{OBQ}=\angle\mathrm{DOB}\]%
- \[\Leftrightarrow\angle\mathrm{DOA}-\angle\mathrm{DOB}=2\Ttyuukakko{\angle\mathrm{OQA}-\angle\mathrm{BQO}}\]%
- \[\Leftrightarrow\angle\mathrm{AOB}=2\angle\mathrm{AQB}\]%
+\[\angle\text{OQA}+\angle\text{OAQ}=\angle\text{DOA}\数式カンマスペース\angle\text{OQB}+\angle\text{OBQ}=\angle\text{DOB}\]%
+\[\Leftrightarrow\angle\text{DOA}-\angle\text{DOB}=2\Ttyuukakko{\angle\text{OQA}-\angle\text{BQO}}\]%
+\[\Leftrightarrow\angle\text{AOB}=2\angle\text{AQB}\]%
+
従って,円に内接する三角形について,円周角の$2$倍が中心角である。%
- \空行%
+ \空行~\空行%
\begin{tikzpicture}%
\draw(-1.6,-1.2)--(1.2,-1.6)--(1.2,1.6)--cycle;%
\draw(-1.6,-1.2)--(1.2,-1.6)--(-2,0)--cycle;%
@@ -1204,8 +1467,9 @@
\draw(0,0)node[above]{O};%
\draw(0,0)circle[radius=2];%
\end{tikzpicture}%
- \[\angle\mathrm{APB}=2\angle\mathrm{AOB},\angle\mathrm{AQB}=2\angle\mathrm{AOB}\]%
- \[\Leftrightarrow\angle\mathrm{AQB}=\angle\mathrm{APB}\]が成立。
+ \空行%
+ 以上より,以下が成立。 \[\angle\text{APB}=2\angle\text{AOB},\angle\text{AQB}=2\angle\text{AOB}\]%
+\[\Leftrightarrow\angle\text{AQB}=\angle\text{APB}\]
\証明終了%
}%
{\relax}%
@@ -1223,7 +1487,7 @@
\draw(0,0)circle[radius=2];%
\end{tikzpicture}%
\空行%
- $\angle\mathrm{ADC}=\angle\mathrm{CBT}$%
+ $\angle\text{ADC}=\angle\text{CBT}$%
}%
{\relax}%
\ifthenelse{\equal{#1}{内接四角形の定理の証明}}%
@@ -1245,10 +1509,11 @@
\fill[black](O)circle(0.03);%
\end{tikzpicture}%
\空行%
- \[\angle\mathrm{AOC}=2\angle\mathrm{ABC}\]%
- \[\angle\mathrm{AOC}=2\angle\mathrm{ADC}\]%
- ここで,$\angle\mathrm{ABC}+\angle\mathrm{ADC}=180^\circ$%
- \[\Leftrightarrow\angle\mathrm{AOC}+\angle\mathrm{AOC}=180^\circ\]%
+\[\angle\text{AOC}=2\angle\text{ABC}\]%
+ \[\angle\text{AOC}=2\angle\text{ADC}\]%
+
+ ここで,$\angle\text{ABC}+\angle\text{ADC}=180^\circ$%
+\[\Leftrightarrow\angle\text{AOC}+\angle\text{AOC}=180^\circ\]%
\証明終了%
}%
{\relax}%
@@ -1265,7 +1530,7 @@
\draw(0,0)circle[radius=2];%
\end{tikzpicture}
\空行%
- $\angle\mathrm{BAT}=\angle\mathrm{ACB}$%
+ $\angle\text{BAT}=\angle\text{ACB}$%
}%
{\relax}%
\ifthenelse{\equal{#1}{接弦定理の証明}}%
@@ -1293,12 +1558,15 @@
\end{tikzpicture}%
\空行%
$\triangle{\text{ACB}}$と$\triangle{\text{ABE}}$について円周角の定理より,%
- \[\angle\mathrm{ACB}=\angle\mathrm{AEB}\]%
+ \[\angle\text{ACB}=\angle\text{AEB}\]%
+
ここで,$\triangle{\text{ABE}}$について%
- \[\angle\mathrm{BEA}+\angle\mathrm{BAE}=90^\circ\]%
- また,ATが円の接線なので$\angle\mathrm{BAE}+\angle\mathrm{BAT}=90^\circ$から,%
- \[\angle\mathrm{BAT}=\angle\mathrm{AEB}\]%
- \[\Leftrightarrow\angle\mathrm{ACB}=\angle\mathrm{BAT}\]%
+ \[\angle\text{BEA}+\angle\text{BAE}=90^\circ\]%
+
+ また,$\text{AT}$が円の接線なので$\angle\text{BAE}+\angle\text{BAT}=90^\circ$から,%
+ \[\angle\text{BAT}=\angle\text{AEB}\]%
+ \[\Leftrightarrow\angle\text{ACB}=\angle\text{BAT}\]%
+
\空行%
\item 直角のとき%
\空行
@@ -1318,8 +1586,9 @@
\end{tikzpicture}%
\空行%
ATが円の接線なので,%
- \[\angle\mathrm{EAS}=90^\circ\]%
- \[\Leftrightarrow\angle\mathrm{EBA}=\angle\mathrm{EAS}\]%
+ \[\angle\text{EAS}=90^\circ\]%
+ \[\Leftrightarrow\angle\text{EBA}=\angle\text{EAS}\]%
+
\空行%
\item 鈍角のとき%
\空行%
@@ -1335,10 +1604,12 @@
\end{tikzpicture}%
\空行%
鋭角のときの接弦定理より,%
- \[\angle\mathrm{BCA}=\angle\mathrm{BAS}\]%
+ \[\angle\text{BCA}=\angle\text{BAS}\]%
+
また,$\triangle{\text{ABC}}$において%
- \[\angle\mathrm{ABC}=\angle\mathrm{ACB}+\angle\mathrm{BAC}\]%
- \[\Leftrightarrow\angle\mathrm{ABC}=\angle\mathrm{CAT}\]%
+ \[\angle\text{ABC}=\angle\text{ACB}+\angle\text{BAC}\]%
+ \[\Leftrightarrow\angle\text{ABC}=\angle\text{CAT}\]%
+
\空行%
\end{enumerate}%
従って円に内接する三角形について成り立つことが証明された。%
@@ -1360,8 +1631,8 @@
\draw(6.3,0.950943395)node[above]{R};%
\end{tikzpicture}%
\空行%
- $\angle\mathrm{BAP}=\angle\mathrm{PAC},\angle\mathrm{CAQ}=\angle\mathrm{QAR}$のとき,\par%
- $\text{BP}:\text{PC}=\text{BQ}:\text{QC}=\text{AB}:\text{AC}$%
+ $\angle\text{BAP}=\angle\text{PAC},\angle\text{CAQ}=\angle\text{QAR}$のとき,%
+\[\text{BP}:\text{PC}=\text{BQ}:\text{QC}=\text{AB}:\text{AC}\]%
}%
{\relax}%
\ifthenelse{\equal{#1}{方べきの定理A}}%
@@ -1397,9 +1668,10 @@
\end{tikzpicture}%
\空行%
円周角の定理より,%
- \[\angle\mathrm{CAP}=\angle\mathrm{BDP},\quad\angle\mathrm{ACP}=\angle\mathrm{DBP}\]%
- $\triangle{\text{ACP}}$と$\triangle{\text{DBP}}$は相似なので,%
- \[\text{PA}\cdot\text{PB}=\text{PC}\cdot\text{PD}\]%
+\[\angle\text{CAP}=\angle\text{BDP},\quad\angle\text{ACP}=\angle\text{DBP}\]%
+
+ $\triangle{\text{ACP}}\相似\triangle{\text{DBP}}$より,%
+\[\text{PA}\cdot\text{PB}=\text{PC}\cdot\text{PD}\]%
\証明終了%
}%
{\relax}%
@@ -1435,9 +1707,10 @@
\end{tikzpicture}%
\空行%
内接四角形の証明より,%
- \[\angle\mathrm{CDB}=\angle\mathrm{CAP}\数式カンマスペース\angle\mathrm{DBA}=\angle\mathrm{PCA}\]%
- $\triangle{\text{ACP}}$と$\triangle{\text{DPB}}$は相似なので,%
- \[\text{PA}\cdot\text{PB}=\text{PC}\cdot\text{PD}\]%
+\[\angle\text{CDB}=\angle\text{CAP}\数式カンマスペース\angle\text{DBA}=\angle\text{PCA}\]%
+
+ $\triangle{\text{ACP}}\相似\triangle{\text{DPB}}$より,%
+\[\text{PA}\cdot\text{PB}=\text{PC}\cdot\text{PD}\]%
\証明終了%
}%
{\relax}%
@@ -1472,9 +1745,10 @@
\end{tikzpicture}%
\空行%
接弦定理より,%
- \[\angle\mathrm{TBA}=\angle\mathrm{PTA}\]%
- これと,$\angle\mathrm{P}$共通なので$\triangle{\text{PTA}}$と$\triangle{\text{PBT}}$は相似より,%
- \[\text{PA}\cdot\text{PB}=\text{PT}^2\]%
+\[\angle\text{TBA}=\angle\text{PTA}\]%
+
+ これと,$\angle\text{P}$は共通なので$\triangle{\text{PTA}}\相似\triangle{\text{PBT}}$より,%
+\[\text{PA}\cdot\text{PB}=\text{PT}^2\]%
\証明終了%
}%
{\relax}%
@@ -1487,15 +1761,15 @@
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{i}}%
{$\Ttyuukakko{a+b}^{3}=a^{3}+3a^2b+3ab^2+b^{3}$}{\relax}%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
- {\[\Ttyuukakko{a+b}^{3}=a^{3}+3a^2b+3ab^2+b^{3}\]}{\relax}%
+ {\[\Ttyuukakko{a+b}^{3}=a^{3}+3a^2b+3ab^2+b^{3}\]}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
{$\Ttyuukakko{a-b}^{3}=a^{3}-3a^2b+3ab^2-b^{3}$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
- {\[\Ttyuukakko{a-b}^{3}=a^{3}-3a^2b+3ab^2-b^{3}\]}{\relax}%
+ {\[\Ttyuukakko{a-b}^{3}=a^{3}-3a^2b+3ab^2-b^{3}\]}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
{$\Ttyuukakko{a+b}\Ttyuukakko{a^2-ab+b^2}=a^{3}+b^{3}$}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}%
- {\[\Ttyuukakko{a+b}\Ttyuukakko{a^2-ab+b^2}=a^{3}+b^{3}\]}{\relax}%
+ {\[\Ttyuukakko{a+b}\Ttyuukakko{a^2-ab+b^2}=a^{3}+b^{3}\]}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{i}}%
{$\Ttyuukakko{a-b}\Ttyuukakko{a^2+ab+b^2}=a^{3}-b^{3}$}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{b}}%
@@ -1508,15 +1782,15 @@
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{i}}%
{$a^{3}+b^{3}=\Ttyuukakko{a+b}\Ttyuukakko{a^2-ab+b^2}$}{\relax}%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
- {\[a^{3}+b^{3}=\Ttyuukakko{a+b}\Ttyuukakko{a^2-ab+b^2}\]}{\relax}%
+ {\[a^{3}+b^{3}=\Ttyuukakko{a+b}\Ttyuukakko{a^2-ab+b^2}\]}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
{$a^{3}-b^{3}=\Ttyuukakko{a-b}\Ttyuukakko{a^2+ab+b^2}$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
- {\[a^{3}-b^{3}=\Ttyuukakko{a-b}\Ttyuukakko{a^2+ab+b^2}\]}{\relax}%
+ {\[a^{3}-b^{3}=\Ttyuukakko{a-b}\Ttyuukakko{a^2+ab+b^2}\]}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
{$a^{3}+3a^2b+3ab^2+b^{3}=\Ttyuukakko{a+b}^{3}$}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}%
- {\[a^{3}+3a^2b+3ab^2+b^{3}=\Ttyuukakko{a+b}^{3}\]}{\relax}%
+ {\[a^{3}+3a^2b+3ab^2+b^{3}=\Ttyuukakko{a+b}^{3}\]}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{i}}%
{$a^{3}-3a^2b+3ab^2-b^{3}=\Ttyuukakko{a-b}^{3}$}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{b}}%
@@ -1527,18 +1801,19 @@
\NewDocumentCommand{\二項定理}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
- {$\Ttyuukakko{a+b}^{n}={}_{n}C_{0} a^{n}+{}_{n}C_{1} a^{n-1}b+{}_{n}C_{2} a^{n-2}b^2+....{}_{n}C_{n-1} ab^{n-1}+{}_{n}C_{n} b^{n}$}{\relax}%
+ {$\Ttyuukakko{a+b}^{n}={}_{n}\text{C}_{0} a^{n}+{}_{n}\text{C}_{1} a^{n-1}b+{}_{n}\text{C}_{2} a^{n-2}b^2+....{}_{n}\text{C}_{n-1} ab^{n-1}+{}_{n}\text{C}_{n} b^{n}$}{\relax}%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
- {\[\Ttyuukakko{a+b}^{n}={}_{n}C_{0} a^{n}+{}_{n}C_{1} a^{n-1}b+{}_{n}C_{2} a^{n-2}b^2+....{}_{n}C_{n-1} ab^{n-1}+{}_{n}C_{n} b^{n}\]}{\relax}%
+ {\[\Ttyuukakko{a+b}^{n}={}_{n}\text{C}_{0} a^{n}+{}_{n}\text{C}_{1} a^{n-1}b+{}_{n}\text{C}_{2} a^{n-2}b^2+....{}_{n}\text{C}_{n-1} ab^{n-1}+{}_{n}\text{C}_{n} b^{n}\]}{\relax}%
\ifthenelse{\equal{#1}{一般項}\AND\equal{#2}{i}}%
- {${}_{n}C_{r}a^{n-r}b^{r}$}{\relax}%
+ {${}_{n}\text{C}_{r}a^{n-r}b^{r}$}{\relax}%
\ifthenelse{\equal{#1}{一般項}\AND\equal{#2}{b}}%
- {\[{}_{n}C_{r}a^{n-r}b^{r}\]}{\relax}%
+ {\[{}_{n}\text{C}_{r}a^{n-r}b^{r}\]}{\relax}%
\ifthenelse{\equal{#1}{証明}}%
{%
\証明開始%
$\Ttyuukakko{a+b}^{n}$を展開すると,$a^{r}b^{n-r}$の項の係数は$n$個の$a$から$r$個$a$を選ぶ場合の数に等しいので係数は${}_{n} C_{r}$よって,一般項は%
- \[{}_{n}C_{r}a^{n-r}b^{r}\]%
+\[{}_{n}\text{C}_{r}a^{n-r}b^{r}\]%
+
この$r$に$1$から順番に自然数を代入したものが二項定理となる。%
\証明終了%
}%
@@ -1551,15 +1826,15 @@
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{i}}%
{$\bunsuu{A}{B}\times\bunsuu{C}{D}=\bunsuu{AC}{BD}$}{\relax}%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
- {\[\bunsuu{A}{B}\times\bunsuu{C}{D}=\bunsuu{AC}{BD}\]}{\relax}%
+ {\[\bunsuu{A}{B}\times\bunsuu{C}{D}=\bunsuu{AC}{BD}\]}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
{$\bunsuu{A}{B}\div \bunsuu{C}{D}=\bunsuu{AD}{BC}$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
- {\[\bunsuu{A}{B}\div \bunsuu{C}{D}=\bunsuu{AD}{BC}\]}{\relax}%
+ {\[\bunsuu{A}{B}\div \bunsuu{C}{D}=\bunsuu{AD}{BC}\]}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
{$\bunsuu{A}{C}+\bunsuu{B}{C}=\bunsuu{A+B}{C}$}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}%
- {\[\bunsuu{A}{C}+\bunsuu{B}{C}=\bunsuu{A+B}{C}\]}{\relax}%
+ {\[\bunsuu{A}{C}+\bunsuu{B}{C}=\bunsuu{A+B}{C}\]}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{i}}%
{$\bunsuu{A}{C}-\bunsuu{B}{C}=\bunsuu{A-B}{C}$}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{b}}%
@@ -1574,18 +1849,21 @@
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
$a>0\数式カンマスペース b>0$のとき,%
- \[\bunsuu{a+b}{2}\geqq\根号{ab}\]%
+\[\bunsuu{a+b}{2}\geqq\根号{ab}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{証明}}%
{%
\証明開始%
$a+b-2\根号{ab}\geqq0$を示す。%
- \[a+b-2\根号{ab}=\Ttyuukakko{\根号{a}-\根号{b}}^2\]%
+\[a+b-2\根号{ab}=\Ttyuukakko{\根号{a}-\根号{b}}^2\]%
+
より,$\根号{a}-\根号{b}$は実数なので,%
- \[\Ttyuukakko{\根号{a}-\根号{b}}^2\geqq0\]%
+\[\Ttyuukakko{\根号{a}-\根号{b}}^2\geqq0\]%
+
よって,$a>0\数式カンマスペース b>0$のとき,%
- \[\bunsuu{a+b}{2}\geqq\根号{ab}\text{\ (等号成立条件は$a=b$)}\]%
+\[\bunsuu{a+b}{2}\geqq\根号{ab}\text{\ (等号成立条件は$a=b$)}\]%
\証明終了%
}%
{\relax}%
@@ -1598,7 +1876,7 @@
{$i=\根号{-1}$}{\relax}%
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{b}}%
{\[i=\根号{-1}\]}{\relax}%
- }%
+ }%
\NewDocumentCommand{\複素数の定義}{ m O{i} }%
@@ -1608,7 +1886,8 @@
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{b}}%
{%
実数$a\数式カンマスペース b$を用いて,%
- \[a+bi\]%
+\[a+bi\]%
+
}%
{\relax}%
}%
@@ -1617,7 +1896,7 @@
\newcommand{\二次方程式の解の判別}%
{%
$ax^2+bx+c=0\数式カンマスペース\Ttyuukakko{a\neq0}$の判別式を$D=b^2-4ac$とすると,%
- \phrases@math[l]%
+ \phrasesmath[l]%
{%
$D>0$のとき,異なる二つの実数解\\%
$D=0$のとき,重解\\%
@@ -1634,7 +1913,8 @@
\ifthenelse{\equal{#1}{二次方程式の解と係数の関係A}\AND\equal{#2}{b}}%
{%
$ax^2+bx+c=0 \Ttyuukakko{a\neq0}$の解を$\alpha\数式カンマスペース\beta$として,%
- \[\alpha+\beta=-\bunsuu{b}{a}\]%
+\[\alpha+\beta=-\bunsuu{b}{a}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{二次方程式の解と係数の関係B}\AND\equal{#2}{i}}%
@@ -1642,17 +1922,19 @@
\ifthenelse{\equal{#1}{二次方程式の解と係数の関係B}\AND\equal{#2}{b}}%
{%
$ax^2+bx+c=0 \Ttyuukakko{a\neq0}$の解を$\alpha\数式カンマスペース\beta$として,%
- \[\alpha\beta=\bunsuu{c}{a}\]%
+\[\alpha\beta=\bunsuu{c}{a}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{二次方程式の解と係数の関係の証明}}%
{%
\証明開始%
\vspace{-2.5\zw}%
- \[ax^2+bx+c=a\Ttyuukakko{x-\alpha}\Ttyuukakko{x-\beta}=a\Tdaikakko{x^2-\Ttyuukakko{\alpha+\beta}x+\alpha\beta}\]%
- \[\Leftrightarrow ax^2+bx+c=a\Ttyuukakko{x^2+\bunsuu{b}{a}x+\bunsuu{c}{a}}\]%
- 係数比較することで,%
- \[\alpha+\beta=-\bunsuu{b}{a}\数式カンマスペース\alpha\beta=\bunsuu{c}{a}\]%
+\[ax^2+bx+c=a\Ttyuukakko{x-\alpha}\Ttyuukakko{x-\beta}=a\Tdaikakko{x^2-\Ttyuukakko{\alpha+\beta}x+\alpha\beta}\]%
+\[\Leftrightarrow ax^2+bx+c=a\Ttyuukakko{x^2+\bunsuu{b}{a}x+\bunsuu{c}{a}}\]%
+
+ 係数比較法より,両辺同次の係数を比較して,%
+\[\alpha+\beta=-\bunsuu{b}{a}\数式カンマスペース\alpha\beta=\bunsuu{c}{a}\]%
\証明終了%
}%
{\relax}%
@@ -1661,32 +1943,35 @@
\ifthenelse{\equal{#1}{三次方程式の解と係数の関係A}\AND\equal{#2}{b}}%
{%
$ax^{3}+bx^2+cx+d=0\Ttyuukakko{a\neq0}$の解を$\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$として,%
- \[\alpha+\beta+\gamma=-\bunsuu{b}{a}\]%
+\[\alpha+\beta+\gamma=-\bunsuu{b}{a}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{三次方程式の解と係数の関係B}\AND\equal{#2}{i}}%
{$ax^{3}+bx^2+cx+d=0\Ttyuukakko{a\neq0}$の解を$\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$として,$\alpha\beta+\beta\gamma+\gamma\alpha=\bunsuu{c}{a}$}{\relax}%
\ifthenelse{\equal{#1}{三次方程式の解と係数の関係B}\AND\equal{#2}{b}}%
{%
$ax^{3}+bx^2+cx+d=0\Ttyuukakko{a\neq0}$の解を$\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$として,%
- \[\alpha\beta+\beta\gamma+\gamma\alpha=\bunsuu{c}{a}\]
+\[\alpha\beta+\beta\gamma+\gamma\alpha=\bunsuu{c}{a}\]
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{三次方程式の解と係数の関係C}\AND\equal{#2}{i}}%
{$ax^{3}+bx^2+cx+d=0\Ttyuukakko{a\neq0}$の解を$\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$として,$\alpha\beta\gamma=-\bunsuu{d}{a}$}{\relax}%
\ifthenelse{\equal{#1}{三次方程式の解と係数の関係C}\AND\equal{#2}{b}}%
{%
$ax^{3}+bx^2+cx+d=0\Ttyuukakko{a\neq0}$の解を$\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$として,%
- \[\alpha\beta\gamma=-\bunsuu{d}{a}\]%
+\[\alpha\beta\gamma=-\bunsuu{d}{a}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{三次方程式の解と係数の関係の証明}}%
{%
\証明開始%
\vspace{-2.5\zw}%
- \[ax^{3}+bx^2+cx+d=a\Ttyuukakko{x-\alpha}\Ttyuukakko{x-\beta}\Ttyuukakko{x-\gamma}=a\Tdaikakko{x^3-\Ttyuukakko{\alpha+\beta+\gamma}x^2+\Ttyuukakko{\alpha\beta+\beta\gamma+\gamma\alpha}x-\alpha\beta\gamma}\]%
- \[\Leftrightarrow ax^{3}+bx^2+cx+d=a\Ttyuukakko{x^3+\bunsuu{b}{a}x^2+\bunsuu{c}{a}x+\bunsuu{d}{a}}\]%
- 係数比較することで,\par%
+\[ax^{3}+bx^2+cx+d=a\Ttyuukakko{x-\alpha}\Ttyuukakko{x-\beta}\Ttyuukakko{x-\gamma}=a\Tdaikakko{x^3-\Ttyuukakko{\alpha+\beta+\gamma}x^2+\Ttyuukakko{\alpha\beta+\beta\gamma+\gamma\alpha}x-\alpha\beta\gamma}\]%
+\[\Leftrightarrow ax^{3}+bx^2+cx+d=a\Ttyuukakko{x^3+\bunsuu{b}{a}x^2+\bunsuu{c}{a}x+\bunsuu{d}{a}}\]%
+
+ 係数比較法より,両辺同次の係数を比較して,%
\[\alpha+\beta+\gamma=-\bunsuu{b}{a}\数式カンマスペース\alpha\beta+\beta\gamma+\gamma\alpha=\bunsuu{c}{a}\数式カンマスペース\alpha\beta\gamma=-\bunsuu{d}{a}\]%
\証明終了%
}%
@@ -1701,7 +1986,7 @@
\ifthenelse{\equal{#1}{定理A}\AND\equal{#2}{b}}%
{%
整式 $P\Ttyuukakko{x}$を$x-k$で割った余りは%
- \[P\Ttyuukakko{k}\]%
+\[P\Ttyuukakko{k}\]%
}%
{\relax}%
\ifthenelse{\equal{#1}{定理B}\AND\equal{#2}{i}}%
@@ -1709,18 +1994,21 @@
\ifthenelse{\equal{#1}{定理B}\AND\equal{#2}{b}}%
{%
整式$P\Ttyuukakko{x}$を$ax-b$で割った余りは%
- \[P\Ttyuukakko{\bunsuu{b}{a}}\]%
+\[P\Ttyuukakko{\bunsuu{b}{a}}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{証明}}%
{%
\証明開始%
$P\Ttyuukakko{x}$を$\Ttyuukakko{x-k}$で割った商を$Q\Ttyuukakko{x}$あまりを$R$として,%
- \[P\Ttyuukakko{x}=\Ttyuukakko{x-k}Q\Ttyuukakko{x}+R\]%
+\[P\Ttyuukakko{x}=\Ttyuukakko{x-k}Q\Ttyuukakko{x}+R\]%
+
$x=k$のとき,%
- \[P\Ttyuukakko{k}=R\]%
+\[P\Ttyuukakko{k}=R\]%
+
よって,余りは%
- \[P\Ttyuukakko{k}\]%
+\[P\Ttyuukakko{k}\]%
\証明終了%
}%
{\relax}%
@@ -1737,14 +2025,16 @@
\ifthenelse{\equal{#1}{定理}\AND\equal{#2}{b}}%
{%
整式$P\Ttyuukakko{x}$が$x-k$を因数に持つ%
- \[\Leftrightarrow P\Ttyuukakko{k}=0\]%
+\[\Leftrightarrow P\Ttyuukakko{k}=0\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{証明}}%
{%
\証明開始%
剰余の定理より,$x-k$で割った余りが$0$なので,%
- \[P\Ttyuukakko{k}=0\]%
+\[P\Ttyuukakko{k}=0\]%
+
剰余の定理より,$P\Ttyuukakko{k}=0$ということは$P\Ttyuukakko{x}$を$x-k$で割った余りが$0$ということなので,$P\Ttyuukakko{x}$は$x-k$を因数に持つ。%
\証明終了%
}%
@@ -1759,23 +2049,25 @@
\ifthenelse{\equal{#1}{二点間の距離}\AND\equal{#2}{b}}%
{%
$\text{A}\Ttyuukakko{x_{1}\数式カンマスペース y_{1}}\数式カンマスペース \text{B}\Ttyuukakko{x_{2}\数式カンマスペース y_{2}}$として,線分$\text{AB}$間の距離は,%
- \[\根号{\Ttyuukakko{x_{2}-x_{1}}^2-\Ttyuukakko{y_{2}-y_{1}}^2}\]%
+\[\根号{\Ttyuukakko{x_{2}-x_{1}}^2-\Ttyuukakko{y_{2}-y_{1}}^2}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{内分点の座標}\AND\equal{#2}{i}}%
{$\text{A}\Ttyuukakko{x_{1}\数式カンマスペース y_{1}}\数式カンマスペース \text{B}\Ttyuukakko{x_{2}\数式カンマスペース y_{2}}$として,線分$\text{AB}$を$m:n$に内分する点の座標は,$\Ttyuukakko{\bunsuu{nx_{1}+mx_{2}}{n+m}\数式カンマスペース\bunsuu{ny_{1}+my_{2}}{n+m}}$}{\relax}%
\ifthenelse{\equal{#1}{内分点の座標}\AND\equal{#2}{b}}%
{%
$\text{A}\Ttyuukakko{x_{1}\数式カンマスペース y_{1}}\数式カンマスペース \text{B}\Ttyuukakko{x_{2}\数式カンマスペース y_{2}}$として,線分$\text{AB}$を$m:n$に内分する点の座標は,%
- \[\Ttyuukakko{\bunsuu{nx_{1}+mx_{2}}{n+m}\数式カンマスペース\bunsuu{ny_{1}+my_{2}}{n+m}}\]%
+\[\Ttyuukakko{\bunsuu{nx_{1}+mx_{2}}{n+m}\数式カンマスペース\bunsuu{ny_{1}+my_{2}}{n+m}}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{内分点の座標の証明}}%
{%
\証明開始%
$m:n$に内分する点の座標を$\text{P}\Ttyuukakko{x\数式カンマスペース y}$として,%
- \[m:n=x-x_{1}:x_{2}-x\]%
- \[\Leftrightarrow\Ttyuukakko{\bunsuu{nx_{1}+mx_{2}}{n+m}\数式カンマスペース\bunsuu{ny_{1}+my_{2}}{n+m}}\]%
+\[m:n=x-x_{1}:x_{2}-x\]%
+\[\Leftrightarrow\Ttyuukakko{\bunsuu{nx_{1}+mx_{2}}{n+m}\数式カンマスペース\bunsuu{ny_{1}+my_{2}}{n+m}}\]%
\証明終了%
}%
{\relax}%
@@ -1784,7 +2076,8 @@
\ifthenelse{\equal{#1}{外分点の座標}\AND\equal{#2}{b}}%
{%
$\text{A}\Ttyuukakko{x_{1}\数式カンマスペース y_{1}}\数式カンマスペース \text{B}\Ttyuukakko{x_{2}\数式カンマスペース y_{2}}$として,線分$\text{AB}$を$m:n$に外分する点の座標は,%
- \[\Ttyuukakko{\bunsuu{-nx_{1}+mx_{2}}{m-n}\数式カンマスペース \bunsuu{-ny_{1}+my_{2}}{m-n}}\]%
+\[\Ttyuukakko{\bunsuu{-nx_{1}+mx_{2}}{m-n}\数式カンマスペース \bunsuu{-ny_{1}+my_{2}}{m-n}}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{外分点の座標の証明}}%
@@ -1792,17 +2085,22 @@
\証明開始%
\vspace{-1\zw}%
\begin{enumerate}%
- \item $m>n$のとき\par%
+ \item $m>n$のとき%
+
$n:m$に外分する点の座標を$\text{P}\Ttyuukakko{x\数式カンマスペース y}$として,%
- \[m:n=x-x_{1}:x-x_{2}\]%
- \[\Leftrightarrow\Ttyuukakko{\bunsuu{-nx_{1}+mx_{2}}{m-n}\数式カンマスペース \bunsuu{-ny_{1}+my_{2}}{m-n}}\]%
- \item $m<n$のとき\par%
+\[m:n=x-x_{1}:x-x_{2}\]%
+\[\Leftrightarrow\Ttyuukakko{\bunsuu{-nx_{1}+mx_{2}}{m-n}\数式カンマスペース \bunsuu{-ny_{1}+my_{2}}{m-n}}\]%
+
+ \item $m<n$のとき%
+
$n:m$に外分する点の座標を$\text{P}\Ttyuukakko{x\数式カンマスペース y}$として,%
\[m:n=x-x_{2}:x-x_{1}\]%
\[\Leftrightarrow\Ttyuukakko{\bunsuu{-nx_{1}+mx_{2}}{m-n}\数式カンマスペース \bunsuu{-ny_{1}+my_{2}}{m-n}}\]%
+
\end{enumerate}%
- よって$m\数式カンマスペース n$の大小に依らず%
+ よって$m\数式カンマスペース n$の大小によらず%
\[\Ttyuukakko{\bunsuu{-nx_{1}+mx_{2}}{m-n}\数式カンマスペース \bunsuu{-ny_{1}+my_{2}}{m-n}}\]%
+
となる。%
\証明終了%
}%
@@ -1812,14 +2110,15 @@
\ifthenelse{\equal{#1}{中点の座標}\AND\equal{#2}{b}}%
{%
$\text{A}\Ttyuukakko{x_{1}\数式カンマスペース y_{1}}\数式カンマスペース \text{B}\Ttyuukakko{x_{2}\数式カンマスペース y_{2}}$として,線分$\text{AB}$の中点は,%
- \[\Ttyuukakko{\bunsuu{x_{1}+x_{2}}{2}\数式カンマスペース\bunsuu{y_{1}+y_{2}}{2}}\]%
+\[\Ttyuukakko{\bunsuu{x_{1}+x_{2}}{2}\数式カンマスペース\bunsuu{y_{1}+y_{2}}{2}}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{中点の座標の証明}}%
{%
\証明開始%
内分点の公式において$m=n$のとき,%
- \[\Ttyuukakko{\bunsuu{x_{1}+x_{2}}{2}\数式カンマスペース\bunsuu{y_{1}+y_{2}}{2}}\]%
+\[\Ttyuukakko{\bunsuu{x_{1}+x_{2}}{2}\数式カンマスペース\bunsuu{y_{1}+y_{2}}{2}}\]%
\証明終了%
}%
{\relax}%
@@ -1828,15 +2127,17 @@
\ifthenelse{\equal{#1}{重心の座標}\AND\equal{#2}{b}}%
{%
$A\Ttyuukakko{x_{1}\数式カンマスペース y_{1}}\数式カンマスペース B\Ttyuukakko{x_{2}\数式カンマスペース y_{2}}\数式カンマスペース C\Ttyuukakko{x_{3}\数式カンマスペース y_{3}}$として,$\triangle{\text{ABC}}$の重心の座標は,%
- \[\Ttyuukakko{\bunsuu{x_{1}+x_{2}+x_{3}}{3}\数式カンマスペース\bunsuu{y_{1}+y_{2}+y_{3}}{3}}\]%
+\[\Ttyuukakko{\bunsuu{x_{1}+x_{2}+x_{3}}{3}\数式カンマスペース\bunsuu{y_{1}+y_{2}+y_{3}}{3}}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{重心の座標の証明}}%
{%
\証明開始%
- $A$と$B$の中点$M$の座標は$\Ttyuukakko{\bunsuu{x_{1}+x_{2}}{2}\数式カンマスペース\bunsuu{y_{1}+y_{2}}{2}}$\par%
+ $A$と$B$の中点$M$の座標は$\Ttyuukakko{\bunsuu{x_{1}+x_{2}}{2}\数式カンマスペース\bunsuu{y_{1}+y_{2}}{2}}$%
+
重心は$CM$を$2:1$に内分するので,重心の座標は内分点の公式より,%
- \[\Ttyuukakko{\bunsuu{x_{1}+x_{2}+x_{3}}{3}\数式カンマスペース\bunsuu{y_{1}+y_{2}+y_{3}}{3}}\]%
+\[\Ttyuukakko{\bunsuu{x_{1}+x_{2}+x_{3}}{3}\数式カンマスペース\bunsuu{y_{1}+y_{2}+y_{3}}{3}}\]%
\証明終了%
}%
{\relax}%
@@ -1848,29 +2149,33 @@
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{i}}%
{$ax+by+c=0$}{\relax}%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
- {\[ax+by+c=0\]}{\relax}%
+ {\[ax+by+c=0\]}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
{点$\Ttyuukakko{x_{1}\数式カンマスペース y_{1}}$を通り傾きが$m$の直線は,$y-y_{1}=m\Ttyuukakko{x-x_{1}}$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
{%
点$\Ttyuukakko{x_{1}\数式カンマスペース y_{1}}$を通り傾きが$m$の直線は,%
- \[y-y_{1}=m\Ttyuukakko{x-x_{1}}\]%
+\[y-y_{1}=m\Ttyuukakko{x-x_{1}}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
{異なる二点$\Ttyuukakko{x_{1}\数式カンマスペース y_{1}}\数式カンマスペース\Ttyuukakko{x_{2}\数式カンマスペース y_{2}}$を通る直線$\Ttyuukakko{x_{1}\neq x_{2}}$は,$y-y_{1}=\bunsuu{y_{2}-y_{1}}{x_{2}-x_{1}}\Ttyuukakko{x-x_{1}}$}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}%
{%
異なる二点$\Ttyuukakko{x_{1}\数式カンマスペース y_{1}}\数式カンマスペース\Ttyuukakko{x_{2}\数式カンマスペース y_{2}}$を通る直線,$\Ttyuukakko{x_{1}\neq x_{2}}$は,%
- \[y-y_{1}=\bunsuu{y_{2}-y_{1}}{x_{2}-x_{1}}\Ttyuukakko{x-x_{1}}\]%
+\[y-y_{1}=\bunsuu{y_{2}-y_{1}}{x_{2}-x_{1}}\Ttyuukakko{x-x_{1}}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{公式Bの証明}}%
{%
\証明開始%
- 傾き$m$なので,$y=mx+a$と置ける(\,$a$は切片)。\par%
- ここで,$\Ttyuukakko{x_{1\数式カンマスペース x_{2}}}$を通るので,$y_{1}=mx_{1}+a$となり,連立することで%
- \[y-y_{1}=m\Ttyuukakko{x-x_{1}}\]%
+ 傾き$m$なので,$y=mx+a$と置ける(\,$a$は切片)。%
+
+ ここで,$\Ttyuukakko{x_{1}\数式カンマスペース x_{2}}$を通るので,$y_{1}=mx_{1}+a$となり,連立することで%
+\[y-y_{1}=m\Ttyuukakko{x-x_{1}}\]%
+
を得る。%
\証明終了%
}%
@@ -1885,23 +2190,26 @@
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
{%
二直線$y=m_{1}x+n_{1}\数式カンマスペース y=m_{2}x+n_{2}$が平行%
- \[\Leftrightarrow m_{1}=m_{2}\]%
+\[\Leftrightarrow m_{1}=m_{2}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
{二直線$y=m_{1}x+n_{1}\数式カンマスペース y=m_{2}x+n_{2}$が垂直$\Leftrightarrow m_{1}m_{2}=-1$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
{%
二直線$y=m_{1}x+n_{1}\数式カンマスペース y=m_{2}x+n_{2}$が垂直%
- \[\Leftrightarrow m_{1}m_{2}=-1\]%
+\[\Leftrightarrow m_{1}m_{2}=-1\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{公式Bの証明}}%
{%
\証明開始%
- $y=mx_{1}$上に点A$\Ttyuukakko{1\数式カンマスペース m_{1}}$\数式カンマスペース $y=mx_{2}$上にB$\Ttyuukakko{-m_{1}\数式カンマスペース 1}$をとる。\par%
+ $y=mx_{1}$上に点A$\Ttyuukakko{1\数式カンマスペース m_{1}}$\数式カンマスペース $y=mx_{2}$上にB$\Ttyuukakko{-m_{1}\数式カンマスペース 1}$をとる。%
+
H$\Ttyuukakko{1\数式カンマスペース 0}$\数式カンマスペース I$\Ttyuukakko{0\数式カンマスペース 1}$として,$\bigtriangleup{OAH}$と$\bigtriangleup{OBI}$は合同。よって,%
- \[m_{1}m_{2}=-1\]%
+\[m_{1}m_{2}=-1\]%
\証明終了%
}%
{\relax}%
@@ -1917,25 +2225,31 @@
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
点$\Ttyuukakko{x_{1}\数式カンマスペース y_{2}}$と直線$ax+bx+c=0$の距離は,%
- \[\bunsuu{\Tzettaiti{ax_{1}+by_{2}+c}}{\根号{a^2+b^2}}\]%
+\[\bunsuu{\Tzettaiti{ax_{1}+by_{2}+c}}{\根号{a^2+b^2}}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{証明}}%
{%
\証明開始%
- 全体を$x$軸方向に$-x_{1}$\数式カンマスペース $y$軸方向に$-y_{1}$平行移動するとき,直線$l$は$a\Ttyuukakko{x+x_{1}}+b\Ttyuukakko{y+y_{1}}+c=0$となる。\par%
+ 全体を$x$軸方向に$-x_{1}$\数式カンマスペース $y$軸方向に$-y_{1}$平行移動するとき,直線$l$は$a\Ttyuukakko{x+x_{1}}+b\Ttyuukakko{y+y_{1}}+c=0$となる。%
+
また,直線$l$に原点Oからおろした垂線との交点をHとする。ここでOH間の距離を$d$と置くと,%
\vspace{-1\zw}%
\begin{enumerate}%
- \item $a\neq0$のとき\par%
- 直線$l$の垂線の傾きは$b$の値に依らず,$y=\bunsuu{b}{a}$となる。\par%
+ \item $a\neq0$のとき%
+
+ 直線$l$の垂線の傾きは$b$の値によらず,$y=\bunsuu{b}{a}$となる。%
+
よって,Hの座標は二式を連立することで得られ,%
\[\Ttyuukakko{\bunsuu{-a\Ttyuukakko{ax_{1}+by_{1}+c}}{a^2+b^2}\数式カンマスペース\bunsuu{-b\Ttyuukakko{ax_{1}+by_{1}+c}}{a^2+b^2}}\]%
+
\begin{align*}%
\Leftrightarrow d&=\根号{\Tdaikakko{\Ttyuukakko{\bunsuu{-a\Ttyuukakko{ax_{1}+by_{1}+c}}{a^2+b^2}}^2+\Tdaikakko{\bunsuu{-b\Ttyuukakko{ax_{1}+by_{1}+c}}{a^2+b^2}}}^2}&\\%
&=\bunsuu{\Tzettaiti{ax_{1}+by_{2}+c}}{\根号{a^2+b^2}} %
\end{align*}%
- \item $a=0$のとき\par%
+ \item $a=0$のとき%
+
直線$l$は$y=-\bunsuu{by_{1}+c}{b}$となるので,%
\begin{align*}%
d&=\Tzettaiti{-\bunsuu{by_{1}+c}{b}}&\\%
@@ -1944,7 +2258,8 @@
これは,$\bunsuu{\Tzettaiti{ax_{1}+by_{2}+c}}{\根号{a^2+b^2}}$に$a=0$を代入したものである。
\end{enumerate}%
よって,いずれの場合も%
- \[\bunsuu{\Tzettaiti{ax_{1}+by_{2}+c}}{\根号{a^2+b^2}}\]%
+\[\bunsuu{\Tzettaiti{ax_{1}+by_{2}+c}}{\根号{a^2+b^2}}\]%
+
を得る。%
\証明終了%
}%
@@ -1955,13 +2270,15 @@
\NewDocumentCommand{\円の方程式}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
- {中心$\Ttyuukakko{a\数式カンマスペース b}$で半径$r$の円は,$\Ttyuukakko{x-a}^2+\Ttyuukakko{y-b}^2=r^2$と表す(\,$x^2+y^2+Ax+By+C=0\Ttyuukakko{A^2+B^2-4C>0}$の形でもよい)。}{\relax}%
+ {中心$\Ttyuukakko{a\数式カンマスペース b}$で半径$r$の円は,$\Ttyuukakko{x-a}^2+\Ttyuukakko{y-b}^2=r^2$と表す(通る$3$点がわかっている問題では,$x^2+y^2+Ax+By+C=0\Ttyuukakko{A^2+B^2-4C>0}$と置くこともある)。}{\relax}%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
中心$\Ttyuukakko{a\数式カンマスペース b}$で半径$r$の円は,%
- \[\Ttyuukakko{x-a}^2+\Ttyuukakko{y-b}^2=r^2\]%
+\[\Ttyuukakko{x-a}^2+\Ttyuukakko{y-b}^2=r^2\]%
+
また,円は%
- \[x^2+y^2+Ax+By+C=0\Ttyuukakko{A^2+B^2-4C>0}\]%
+\[x^2+y^2+Ax+By+C=0\Ttyuukakko{A^2+B^2-4C>0}\]%
+
とも表せられる。%
}%
{\relax}%
@@ -1969,7 +2286,7 @@
{%
\証明開始%
円の中心をO\数式カンマスペース 円周上の任意の点を$\text{P}\Ttyuukakko{x\数式カンマスペース y}$として,三平方の定理より%
- \[\Ttyuukakko{x-a}^2+\Ttyuukakko{y-b}^2=r^2\]%
+\[\Ttyuukakko{x-a}^2+\Ttyuukakko{y-b}^2=r^2\]%
\証明終了%
}%
{\relax}%
@@ -1979,11 +2296,12 @@
\NewDocumentCommand{\円と直線}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
- {円$x^2+y^2=r^2$上の点 $\Ttyuukakko{x_{1}\数式カンマスペース y_{1}}$における接線の方程式は,$xx_{1}+yy_{1}=r^2$}{\relax}%
+ {円$x^2+y^2=r^2$上の点 $\Ttyuukakko{x_{1}\数式カンマスペース y_{1}}$における接線の方程式は,$xx_{1}+yy_{1}=r^2$}{\relax}%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
円$x^2+y^2=r^2$上の点 $\Ttyuukakko{x_{1}\数式カンマスペース y_{1}}$における接線の方程式は,%
- \[xx_{1}+yy_{1}=r^2\]%
+\[xx_{1}+yy_{1}=r^2\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{証明}}%
@@ -1991,17 +2309,23 @@
\証明開始%
\vspace{-1\zw}%
\begin{enumerate}%
- \item $x_{0}\neq0\数式カンマスペース y_{0}\neq0$のとき\par%
+ \item $x_{0}\neq0\数式カンマスペース y_{0}\neq0$のとき%
+
$A\Ttyuukakko{x_{0}\数式カンマスペース y_{0}}$と置いて,OAの傾きは$\bunsuu{y_{0}}{x_{0}}$となる。接線の傾きはこれに垂直なので,$-\bunsuu{x_{0}}{y_{0}}$また接線は点$\Ttyuukakko{x_{0}\数式カンマスペース y_{0}}$を通るので%
- \[y=-\bunsuu{x_{0}}{y_{0}}\Ttyuukakko{x-x_{0}}+y_{0}\]%
- より,$\Ttyuukakko{x_{0}\数式カンマスペース y_{0}}$が$x^2+y^2=r^2$上に存在することに留意して,$x_{0}x+y_{0}y=r^2$となる。\par%
- \item $x_{0}\neq0$のとき\par%
- $y_{0}=\pm r$より接線は$y=\pm r\text{\ (複号同順)}$\par%
- \item $y_{0}=0$のとき\par%
+ \[y=-\bunsuu{x_{0}}{y_{0}}\Ttyuukakko{x-x_{0}}+y_{0}\]%
+
+ より,$\Ttyuukakko{x_{0}\数式カンマスペース y_{0}}$が$x^2+y^2=r^2$上に存在することに留意して,$x_{0}x+y_{0}y=r^2$となる。%
+
+ \item $x_{0}\neq0$のとき%
+
+ $y_{0}=\pm r$より接線は$y=\pm r\text{\ (複号同順)}$%
+
+ \item $y_{0}=0$のとき%
+
$x_{0}=\pm r$より接線は$x=\pm r\text{\ (複号同順)}$%
\end{enumerate}%
よって,接線の方程式は%
- \[xx_{1}+yy_{1}=r^2\]%
+\[xx_{1}+yy_{1}=r^2\]%
\証明終了%
}%
{\relax}%
@@ -2044,16 +2368,21 @@
\end{tikzpicture}%
\空行%
図において,$\sin\theta=\bunsuu{y}{r}\数式カンマスペース\quad\cos\theta=\bunsuu{x}{r}$より%
- \[\sin^2\theta+\cos^2\theta=\bunsuu{y^2+x^2}{r^2}\]%
- ここで,三平方の定理より$x^2+y^2=r^2$なので\par%
+\[\sin^2\theta+\cos^2\theta=\bunsuu{y^2+x^2}{r^2}\]%
+
+ ここで,三平方の定理より$x^2+y^2=r^2$なので%
+
$\sin^2\theta+\cos^2\theta=\bunsuu{r^2}{r^2}=1$%
\空行%
- $\sin\theta=\bunsuu{y}{r}\数式カンマスペース\quad\cos\theta=\bunsuu{x}{r}\quad\tan\theta=\bunsuu{y}{x}$より\par%
+ $\sin\theta=\bunsuu{y}{r}\数式カンマスペース\quad\cos\theta=\bunsuu{x}{r}\quad\tan\theta=\bunsuu{y}{x}$より%
+
$\bunsuu{\sin\theta}{\cos\theta}=\bunsuu{y}{x}=\tan\theta$%
\空行%
- $\sin^2\theta+\cos^2\theta=1$の両辺を$\cos^2\theta$で割ることで,\par%
+ $\sin^2\theta+\cos^2\theta=1$の両辺を$\cos^2\theta$で割ることで,%
\[\bunsuu{\sin^2\theta}{\cos^2\theta}+1=\bunsuu{1}{\cos^2\theta}\]%
- ここで,$\bunsuu{\sin\theta}{\cos\theta}=\tan\theta$なので\par%
+
+ ここで,$\bunsuu{\sin\theta}{\cos\theta}=\tan\theta$なので%
+
$\tan^2\theta+1=\bunsuu{1}{\cos^2\theta}$%
\証明終了%
}%
@@ -2164,26 +2493,36 @@
\end{tikzpicture}%
\空行%
図において,三角関数の性質より$\cos\Ttyuukakko{\beta-\alpha}=\cos\Ttyuukakko{\alpha-\beta}$なので,$\triangle{\text{QOP}}$について余弦定理より%
- \[\mathrm{QP}^2=1^2+1^2-2\cdot1\cdot1\cdot\cos\Ttyuukakko{\alpha-\beta}\]%
+\[\text{QP}^2=1^2+1^2-2\cdot1\cdot1\cdot\cos\Ttyuukakko{\alpha-\beta}\]%
+
また,QP間の距離について三平方の定理を用いて%
- \[\mathrm{QP}^2=\Ttyuukakko{\cos\beta-\cos\alpha}^2+\Ttyuukakko{\sin\alpha-\sin\beta}^2\]%
- \[\Leftrightarrow 2-2\cos\Ttyuukakko{\alpha-\beta}=\Ttyuukakko{\cos\beta-\cos\alpha}^2+\Ttyuukakko{\sin\alpha-\sin\beta}^2\]%
+\[\text{QP}^2=\Ttyuukakko{\cos\beta-\cos\alpha}^2+\Ttyuukakko{\sin\alpha-\sin\beta}^2\]%
+\[\Leftrightarrow 2-2\cos\Ttyuukakko{\alpha-\beta}=\Ttyuukakko{\cos\beta-\cos\alpha}^2+\Ttyuukakko{\sin\alpha-\sin\beta}^2\]%
+
両辺整理して,%
- \[\cos\Ttyuukakko{\alpha-\beta}=\cos\alpha\cos\beta+\sin\alpha\sin\beta\]%
- を得る。\par%
+\[\cos\Ttyuukakko{\alpha-\beta}=\cos\alpha\cos\beta+\sin\alpha\sin\beta\]%
+
+ を得る。%
+
また,$\sin-\theta=-\sin\theta$より,%
- \[\cos\Ttyuukakko{\alpha+\beta}=\cos\alpha\cos\beta-\sin\alpha\sin\beta\]%
+\[\cos\Ttyuukakko{\alpha+\beta}=\cos\alpha\cos\beta-\sin\alpha\sin\beta\]%
+
\空行%
- \[\cos\Ttyuukakko{\alpha-\beta}=\cos\alpha\cos\beta+\sin\alpha\sin\beta\]%
+\[\cos\Ttyuukakko{\alpha-\beta}=\cos\alpha\cos\beta+\sin\alpha\sin\beta\]%
+
において,$\alpha$を$\bunsuu{\pi}{2}-\alpha$にすることで,%
- \[\sin\Ttyuukakko{\alpha+\beta}=\sin\alpha \cos\beta+ \cos\alpha \sin\beta\]%
+\[\sin\Ttyuukakko{\alpha+\beta}=\sin\alpha \cos\beta+ \cos\alpha \sin\beta\]%
+
ここで,$\beta$を$-\beta$にすることで,%
- \[\sin\Ttyuukakko{\alpha-\beta}=\sin\alpha \cos\beta-\cos\alpha \sin\beta\]%
+\[\sin\Ttyuukakko{\alpha-\beta}=\sin\alpha \cos\beta-\cos\alpha \sin\beta\]%
+
\空行%
$\tan\theta=\bunsuu{\sin\theta}{\cos\theta}$より,%
- \[\tan\Ttyuukakko{\alpha\pm\beta}=\bunsuu{\sin\alpha \cos\beta\pm \cos\alpha \sin\beta}{\cos\alpha \cos\beta\mp \sin\alpha \sin\beta}\text{\ (複号同順)}\]%
+\[\tan\Ttyuukakko{\alpha\pm\beta}=\bunsuu{\sin\alpha \cos\beta\pm \cos\alpha \sin\beta}{\cos\alpha \cos\beta\mp \sin\alpha \sin\beta}\text{\ (複号同順)}\]%
+
両辺を$\cos\alpha\cos\beta$でわることで,%
- \[\tan\Ttyuukakko{\alpha\pm\beta}=\bunsuu{\tan\alpha \pm \tan\beta}{1\mp \tan\alpha \tan\beta}\text{\ (複号同順)}\]%
+\[\tan\Ttyuukakko{\alpha\pm\beta}=\bunsuu{\tan\alpha \pm \tan\beta}{1\mp \tan\alpha \tan\beta}\text{\ (複号同順)}\]%
+
を得る。%
\証明終了%
}%
@@ -2217,23 +2556,26 @@
{%
\証明開始%
三角関数の加法定理%
- \phrases@math[c]%
+ \phrasesmath[c]%
{%
$\sin\Ttyuukakko{\alpha+\beta}=\sin\alpha \cos\beta+\cos\alpha \sin\beta$\\%
$\cos\Ttyuukakko{\alpha+\beta}=\cos\alpha \cos\beta-\sin\alpha \sin\beta$\\%
$\tan\Ttyuukakko{\alpha+\beta}=\bunsuu{\tan\alpha+\tan\beta}{1-\tan\alpha \tan\beta}$%
}%
- において,$\alpha=\beta=\theta$として,\par%
- \hspace{3\zw}\phrases@math[c]%
+ において,$\alpha=\beta=\theta$として,%
+
+ \hspace{3\zw}\phrasesmath[c]%
{%
$\sin2\theta=2\sin\theta\cos\theta$\\%
$\cos2\theta=\cos^{2}\theta-\sin^{2}\theta$\\%
$\tan2\theta=\bunsuu{2\tan\theta}{1-\tan^{2}\theta}$%
}%
- を得る。\par%
+ を得る。%
+
また,$\cos2\theta=\cos^{2}\theta-\sin^{2}\theta$において,三角関数の相互関係$\sin^2\theta+\cos^2\theta=1$を用いて,%
- \[\cos2\theta=2\cos^{2}\theta-1\]%
- \[\Leftrightarrow\cos2\theta=1-2\sin^{2}\theta\]%
+\[\cos2\theta=2\cos^{2}\theta-1\]%
+\[\Leftrightarrow\cos2\theta=1-2\sin^{2}\theta\]%
+
を得る。%
\証明終了%
}%
@@ -2255,11 +2597,13 @@
{%
\証明開始%
三角関数の加法定理%
- \[\sin\Ttyuukakko{\alpha+\beta}=\sin\alpha \cos\beta+ \cos\alpha \sin\beta\]%
+\[\sin\Ttyuukakko{\alpha+\beta}=\sin\alpha \cos\beta+ \cos\alpha \sin\beta\]%
\[\cos\Ttyuukakko{\alpha+\beta}=\cos\alpha \cos\beta- \sin\alpha \sin\beta\]%
+
において,$\alpha=\theta\数式カンマスペース\beta=2\theta$のとき,%
- \[\sin3\theta=\sin\theta \cos2\theta+ \cos\theta \sin2\theta\]%
+\[\sin3\theta=\sin\theta \cos2\theta+ \cos\theta \sin2\theta\]%
\[\cos3\theta=\cos\theta\cos2\theta-\sin\theta\sin2\theta\]%
+
二倍角の公式と三角関数の相互関係より,%
\begin{align*}%
\sin3\theta&=\sin\theta\Ttyuukakko{1-2\sin^{2}\theta}+2\sin\theta\cos^2\theta&\\%
@@ -2300,13 +2644,15 @@
\cos\Ttyuukakko{\alpha-\beta}=\cos\alpha\cos\beta+\sin\alpha\sin\beta\shikimaru{4}%
\end{align*}
より,$\text{\ajMaru{1}}+\text{\ajMaru{2}}$から%
- \[\sin\alpha\cos\beta=\bunsuu{1}{2}\Tdaikakko{\sin\Ttyuukakko{\alpha+\beta}+\sin\Ttyuukakko{\alpha-\beta}}\]%
+\[\sin\alpha\cos\beta=\bunsuu{1}{2}\Tdaikakko{\sin\Ttyuukakko{\alpha+\beta}+\sin\Ttyuukakko{\alpha-\beta}}\]%
+
\半空行%
$\text{\ajMaru{3}}+\text{\ajMaru{4}}$から%
- \[\cos\alpha\cos\beta=\bunsuu{1}{2}\Tdaikakko{\cos\Ttyuukakko{\alpha+\beta}+\cos\Ttyuukakko{\alpha-\beta}}\]%
+\[\cos\alpha\cos\beta=\bunsuu{1}{2}\Tdaikakko{\cos\Ttyuukakko{\alpha+\beta}+\cos\Ttyuukakko{\alpha-\beta}}\]%
+
\半空行%
$\text{\ajMaru{4}}-\text{\ajMaru{3}}$から%
- \[\sin\alpha\sin\beta=\bunsuu{1}{2}\Tdaikakko{\cos\Ttyuukakko{\alpha-\beta}-\cos\Ttyuukakko{\alpha+\beta}}\]%
+\[\sin\alpha\sin\beta=\bunsuu{1}{2}\Tdaikakko{\cos\Ttyuukakko{\alpha-\beta}-\cos\Ttyuukakko{\alpha+\beta}}\]%
\証明終了%
}%
{\relax}%
@@ -2335,11 +2681,12 @@
{%
\証明開始%
三角関数の積和の公式%
- \[\sin\alpha\cos\beta=\bunsuu{1}{2}\Tdaikakko{\sin\Ttyuukakko{\alpha+\beta}+\sin\Ttyuukakko{\alpha-\beta}}\]%
+\[\sin\alpha\cos\beta=\bunsuu{1}{2}\Tdaikakko{\sin\Ttyuukakko{\alpha+\beta}+\sin\Ttyuukakko{\alpha-\beta}}\]%
\[\cos\alpha\cos\beta=\bunsuu{1}{2}\Tdaikakko{\cos\Ttyuukakko{\alpha+\beta}+\cos\Ttyuukakko{\alpha-\beta}}\]%
\[\sin\alpha\sin\beta=\bunsuu{1}{2}\Tdaikakko{\cos\Ttyuukakko{\alpha-\beta}-\cos\Ttyuukakko{\alpha+\beta}}\]%
+
において,$\alpha+\beta=A\数式カンマスペース\alpha-\beta=B$と置くことで,$\alpha=\bunsuu{A+B}{2}\数式カンマスペース\beta=\bunsuu{A-B}{2}$となるので,%
- \[\sin{A}+\sin{B}=2 \sin\bunsuu{A+B}{2}\cos\bunsuu{A-B}{2}\]%
+\[\sin{A}+\sin{B}=2 \sin\bunsuu{A+B}{2}\cos\bunsuu{A-B}{2}\]%
\[\sin{A}-\sin{B}=2 \cos\bunsuu{A+B}{2}\sin\bunsuu{A-B}{2}\]%
\[\cos{A}+\cos{B}=2 \cos\bunsuu{A+B}{2}\cos\bunsuu{A-B}{2}\]%
\[\cos{A}-\cos{B}=-2 \sin\bunsuu{A+B}{2}\sin\bunsuu{A-B}{2}\]%
@@ -2371,17 +2718,21 @@
{\relax}%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
- \[a\sin\theta+b\cos\theta=\根号{a^2+b^2}\sin\Ttyuukakko{\theta+\alpha}\text{\ $\Ttyuukakko{\text{ただし,$\sin\alpha=\bunsuu{b}{\根号{a^2+b^2}}\数式カンマスペース\cos\alpha=\bunsuu{a}{\根号{a^2+b^2}}$}}$}\]%
+\[a\sin\theta+b\cos\theta=\根号{a^2+b^2}\sin\Ttyuukakko{\theta+\alpha}\text{\ $\Ttyuukakko{\text{ただし,$\sin\alpha=\bunsuu{b}{\根号{a^2+b^2}}\数式カンマスペース\cos\alpha=\bunsuu{a}{\根号{a^2+b^2}}$}}$}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{証明}}%
{%
\証明開始%
- 三角関数の加法定理\par%
+ 三角関数の加法定理%
+
$\sin\Ttyuukakko{\alpha+\beta}=\sin\alpha \cos\beta+ \cos\alpha \sin\beta$について,%
- \[\bunsuu{a}{\根号{a^2+b^2}}=\cos\alpha\数式カンマスペース\bunsuu{b}{\根号{a^2+b^2}}=\sin\alpha\]%
- とすることで,\par%
+\[\bunsuu{a}{\根号{a^2+b^2}}=\cos\alpha\数式カンマスペース\bunsuu{b}{\根号{a^2+b^2}}=\sin\alpha\]%
+
+ とすることで,%
\[a\sin\theta+b\cos\theta=\根号{a^2+b^2}\sin\Ttyuukakko{\theta+\alpha}\]%
+
となる。%
\証明終了%
}%
@@ -2395,8 +2746,8 @@
{$a>0$また$m\数式カンマスペース n$が正の整数,$r$が正の有理数のとき,$a^{\frac{m}{n}}=\sqrt[n]{a^{m}}$}{\relax}%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
{%
- $a>0$また$m\数式カンマスペース n$が正の整数,$r$が正の有理数のとき,%
- \[a^{\frac{m}{n}}=\sqrt[n]{a^{m}}\]%
+ $a>0$また$m\数式カンマスペース n$が正の整数,$r$が正の有理数のとき,% \[a^{\frac{m}{n}}=\sqrt[n]{a^{m}}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
@@ -2404,7 +2755,8 @@
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
{%
$a>0$また$n$が正の整数のとき,%
- \[a^{\frac{1}{n}}=\根号[n]{a}\]%
+\[a^{\frac{1}{n}}=\根号[n]{a}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
@@ -2412,7 +2764,8 @@
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}%
{%
$a>0$,$r$が正の有理数のとき,%
- \[a^{-r}=\bunsuu{1}{a^{r}}\]%
+\[a^{-r}=\bunsuu{1}{a^{r}}\]%
+
}%
{\relax}%
}%
@@ -2425,7 +2778,8 @@
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
{%
$a>0$また,$r\数式カンマスペース s$は有理数のとき,%
- \[a^{r}a^{s}=a^{r+s}\]%
+\[a^{r}a^{s}=a^{r+s}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
@@ -2433,31 +2787,35 @@
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
{%
$a>0$また,$r\数式カンマスペース s$は有理数のとき,%
- \[\Ttyuukakko{a^{r}}^{s}=a^{rs}\]%
+\[\Ttyuukakko{a^{r}}^{s}=a^{rs}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
{$a>0\数式カンマスペース b>0$また,$r$は有理数のとき,$\Ttyuukakko{ab}^{r}=a^{r}b^{r}$}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}%
{%
$a>0\数式カンマスペース b>0$また,$r$は有理数のとき,%
- \[\Ttyuukakko{ab}^{r}=a^{r}b^{r}\]%
+\[\Ttyuukakko{ab}^{r}=a^{r}b^{r}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{i}}%
{$a>0$また,$r\数式カンマスペース s$は有理数のとき,$\bunsuu{a^{r}}{a^{s}}=a^{r-s}$}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{b}}%
{%
$a>0$また,$r\数式カンマスペース s$は有理数のとき,%
- \[\bunsuu{a^{r}}{a^{s}}=a^{r-s}\]%
+\[\bunsuu{a^{r}}{a^{s}}=a^{r-s}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式E}\AND\equal{#2}{i}}%
{$a>0\数式カンマスペース b>0$また,$r$は有理数のとき,$\Ttyuukakko{\bunsuu{a}{b}}^{r}=\bunsuu{a^{r}}{b^{r}}$}{\relax}%
\ifthenelse{\equal{#1}{公式E}\AND\equal{#2}{b}}%
{%
$a>0\数式カンマスペース b>0$また,$r$は有理数のとき,%
- \[\Ttyuukakko{\bunsuu{a}{b}}^{r}=\bunsuu{a^{r}}{b^{r}}\]%
+\[\Ttyuukakko{\bunsuu{a}{b}}^{r}=\bunsuu{a^{r}}{b^{r}}\]%
+
}%
{\relax}%
}%
@@ -2467,17 +2825,17 @@
{%
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{i}}%
{%
- $a>0\数式カンマスペース b>0$で,$r\数式カンマスペース s$は有理数とする。\par%
- $a^{p}=M$ならば,$\log_{a}M$,$\log_{a}M \log_{a}M$ならば,$a^{p}=M$%
+ $a>0\数式カンマスペース b>0$で,$r\数式カンマスペース s$は有理数とすると,%
+ \phrasesmath{$a^{p}=M$ならば,$\log_{a}M$\\$\log_{a}M \log_{a}M$ならば,$a^{p}=M$}%
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{b}}%
{%
- $a>0\数式カンマスペース b>0$で,$r\数式カンマスペース s$は有理数とする。\par%
- $a^{p}=M$ならば,$\log_{a}M$\par%
- $\log_{a}M$ならば,$a^{p}=M$%
+ $a>0\数式カンマスペース b>0$で,$r\数式カンマスペース s$は有理数とすると,%
+\[a^{p}=M\Rightarrow\log_{a}M\数式カンマスペース\log_{a}M\Rightarrow a^{p}=M\]%
+
}%
- {\relax}%
+ {\relax}%
}%
@@ -2488,73 +2846,85 @@
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
{%
$a>0\数式カンマスペース a\neq1$とするとき,%
- \[\log_{a}a=1\]%
+\[\log_{a}a=1\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
{$a>0\数式カンマスペース a\neq1$とするとき,$\log_{a}1=0$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
{%
$a>0\数式カンマスペース a\neq1$とするとき,%
- \[\log_{a}1=0\]%
+\[\log_{a}1=0\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
{$a>0\数式カンマスペース a\neq1$とするとき,$\log_{a}\bunsuu{1}{a}=-1$}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}%
{%
$a>0\数式カンマスペース a\neq1$とするとき,%
- \[\log_{a}\bunsuu{1}{a}=-1\]%
+\[\log_{a}\bunsuu{1}{a}=-1\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{i}}%
{$a>0\数式カンマスペース a\neq1\数式カンマスペース M>0\数式カンマスペース N>0$とするとき,$\log_{a}MN=\log_{a}M+\log_{a}N$}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{b}}%
{%
$a>0\数式カンマスペース a\neq1\数式カンマスペース M>0\数式カンマスペース N>0$とするとき,%
- \[\log_{a}MN=\log_{a}M+\log_{a}N\]%
+\[\log_{a}MN=\log_{a}M+\log_{a}N\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式E}\AND\equal{#2}{i}}%
{$a>0\数式カンマスペース a\neq1\数式カンマスペース M>0\数式カンマスペース N>0$とするとき,$\log_{a}\bunsuu{M}{N}=\log_{a}M-\log_{a}N$}{\relax}%
\ifthenelse{\equal{#1}{公式E}\AND\equal{#2}{b}}%
{%
$a>0\数式カンマスペース a\neq1\数式カンマスペース M>0\数式カンマスペース N>0$とするとき,%
- \[\log_{a}\bunsuu{M}{N}=\log_{a}M-\log_{a}N\]%
+\[\log_{a}\bunsuu{M}{N}=\log_{a}M-\log_{a}N\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式F}\AND\equal{#2}{i}}%
{$a>0\数式カンマスペース a\neq1\数式カンマスペース M>0\数式カンマスペース N>0$とするとき,$\log_{a}M^{k}=k\log_{a}M$}{\relax}%
\ifthenelse{\equal{#1}{公式F}\AND\equal{#2}{b}}%
{%
$a>0\数式カンマスペース a\neq1\数式カンマスペース M>0\数式カンマスペース N>0$とするとき,%
- \[\log_{a}M^{k}=k\log_{a}M\]%
+\[\log_{a}M^{k}=k\log_{a}M\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{証明}}%
{%
\証明開始%
- $p=\log_{a}M\数式カンマスペース q=\log_{a}N$として,\par%
- $MN=a^{p}a^{q}$指数法則より%
- \[MN=a^{p+q}\]%
- ここで,対数の定義より%
- \[\log_{a}MN=p+q\]%
-    \[\Leftrightarrow\log_{a}MN=\log_{a}M+\log_{a}N\]%
+ $p=\log_{a}M\数式カンマスペース q=\log_{a}N$として,$MN=a^{p}a^{q}$から,指数法則より%
+\[MN=a^{p+q}\]%
+
+ また,対数の定義より%
+\[\log_{a}MN=p+q\]%
+\[\Leftrightarrow\log_{a}MN=\log_{a}M+\log_{a}N\]%
+
\空行%
$p=\log_{a}M\数式カンマスペース q=\log_{a}N$として,%
- \[\bunsuu{M}{N}=\bunsuu{a^{p}}{a^{q}}\]%
+\[\bunsuu{M}{N}=\bunsuu{a^{p}}{a^{q}}\]%
+
指数法則より%
- \[\bunsuu{M}{N}=a^{p-q}\]%
+\[\bunsuu{M}{N}=a^{p-q}\]%
+
ここで,対数の定義より%
- \[\log_{a}\bunsuu{M}{N}=p-q\]%
- \[\Leftrightarrow\log_{a}\bunsuu{M}{N}=\log_{a}M-\log_{a}N\]%
+\[\log_{a}\bunsuu{M}{N}=p-q\]%
+\[\Leftrightarrow\log_{a}\bunsuu{M}{N}=\log_{a}M-\log_{a}N\]%
+
\空行%
$p=\log_{a}M$として,$a^{p}=M$より両辺$k$乗して%
- \[a^{pk}=M^{k}\]%
+\[a^{pk}=M^{k}\]%
+
対数を取ると%
- \[pk=\log_{a}M^{k}\]%
+\[pk=\log_{a}M^{k}\]%
+
$p=\log_{a}M$より,%
- \[\log_{a}M^{k}=k\log_{a}M\]%
+\[\log_{a}M^{k}=k\log_{a}M\]%
\証明終了%
}%
{\relax}%
@@ -2564,23 +2934,27 @@
\NewDocumentCommand{\底の変換公式}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
- {$a\数式カンマスペース b\数式カンマスペース c$は正の実数で,$a\neq1\数式カンマスペース b\neq1\数式カンマスペース c\neq1$のとき,$\log_{a}b=\bunsuu{\log_{c}b}{\log_{c}a}$}{\relax}%
+ {$a\数式カンマスペース b\数式カンマスペース c$は正の実数で,$a\neq1\数式カンマスペース b\neq1\数式カンマスペース c\neq1$のとき,$\log_{a}b=\bunsuu{\log_{c}b}{\log_{c}a}$}{\relax}%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
$a\数式カンマスペース b\数式カンマスペース c$は正の実数で,$a\neq1\数式カンマスペース b\neq1\数式カンマスペース c\neq1$のとき,%
- \[\log_{a}b=\bunsuu{\log_{c}b}{\log_{c}a}\]%
+\[\log_{a}b=\bunsuu{\log_{c}b}{\log_{c}a}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{証明}}%
{%
\証明開始%
- 対数の定義より$a^{\log_{a}b}=b$が成立。\par%
+ 対数の定義より$a^{\log_{a}b}=b$が成立。%
+
底が$c$の対数を取ると,%
- \[\log_{c}a^{\log_{a}b}=\log_{c}b\]%
+\[\log_{c}a^{\log_{a}b}=\log_{c}b\]%
+
対数の性質より,%
- \[\log_{a}b\log_{c}a=\log_{c}b\]%
+\[\log_{a}b\log_{c}a=\log_{c}b\]%
+
よって,%
- \[\log_{a}b=\bunsuu{\log_{c}b}{\log_{c}a}\]%
+\[\log_{a}b=\bunsuu{\log_{c}b}{\log_{c}a}\]%
\証明終了%
}%
{\relax}%
@@ -2593,7 +2967,7 @@
{$f'\Ttyuukakko{x}=\displaystyle\lim_{h \to 0}\bunsuu{f\Ttyuukakko{x+h}-f\Ttyuukakko{x}}{h}$}{\relax}%
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{b}}%
{\[f'\Ttyuukakko{x}=\displaystyle\lim_{h \to 0}\bunsuu{f\Ttyuukakko{x+h}-f\Ttyuukakko{x}}{h}\]}{\relax}%
- }%
+ }%
\NewDocumentCommand{\べき乗関数と定数関数の導関数}{ m O{i} }%
@@ -2601,7 +2975,7 @@
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{i}}%
{$\Ttyuukakko{x^{n}}'=nx^{n-1}$}{\relax}%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
- {\[\Ttyuukakko{x^{n}}'=nx^{n-1}\]}{\relax}%
+ {\[\Ttyuukakko{x^{n}}'=nx^{n-1}\]}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
{$\Ttyuukakko{c}'=0$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
@@ -2609,15 +2983,17 @@
\ifthenelse{\equal{#1}{証明}}%
{%
\証明開始%
- 導関数の定義より,\par%
- \[\Ttyuukakko{x^{n}}'=\displaystyle\lim_{h \to 0}\bunsuu{\Ttyuukakko{x+h}^{n}-x^{n}}{h}\]%
- 二項定理より,\par%
+ 導関数の定義より,%
+\[\Ttyuukakko{x^{n}}'=\displaystyle\lim_{h \to 0}\bunsuu{\Ttyuukakko{x+h}^{n}-x^{n}}{h}\]%
+
+ 二項定理より,%
+
\begin{align*}%
\Ttyuukakko{x^{n}}'&=\displaystyle\lim_{h \to 0} \bunsuu{\Ttyuukakko{x+h}^{n}-x^{n}}{h}&\\%
- &=\displaystyle\lim_{h \to 0}\bunsuu{{}_{n}C_{0} x^{n}+{}_{n}C_{1} x^{n-1}h+{}_{n}C_{2}x^{n-2}h^2+\cdots\cdot{}_{n}C_{n-1} xh^{n-1}+{}_{n}C_{n} h^{n}-x^{n}}{h}&\\%
- &=\displaystyle\lim_{h \to 0}\Ttyuukakko{{}_{n}C_{1} x^{n-1}+{}_{n}C_{2}x^{n-2}h+\cdots+{}_{n}C_{n-1} xh^{n-2}+{}_{n}C_{n} h^{n-1}}&\\%
- &=\displaystyle\lim_{h \to 0}\Tdaikakko{{}_{n}C_{1} x^{n-1}+\Ttyuukakko{{}_{n}C_{2}x^{n-2}+\cdots\cdot{}_{n}C_{n-1} xh^{n-3}+{}_{n}C_{n} h^{n-2}}h}&\\%
- &={}_{n}C_{1} x^{n-1}&\\%
+ &=\displaystyle\lim_{h \to 0}\bunsuu{{}_{n}\text{C}_{0} x^{n}+{}_{n}\text{C}_{1} x^{n-1}h+{}_{n}\text{C}_{2}x^{n-2}h^2+\cdots\cdot{}_{n}\text{C}_{n-1} xh^{n-1}+{}_{n}\text{C}_{n} h^{n}-x^{n}}{h}&\\%
+ &=\displaystyle\lim_{h \to 0}\Ttyuukakko{{}_{n}\text{C}_{1} x^{n-1}+{}_{n}\text{C}_{2}x^{n-2}h+\cdots+{}_{n}\text{C}_{n-1} xh^{n-2}+{}_{n}\text{C}_{n} h^{n-1}}&\\%
+ &=\displaystyle\lim_{h \to 0}\Tdaikakko{{}_{n}\text{C}_{1} x^{n-1}+\Ttyuukakko{{}_{n}\text{C}_{2}x^{n-2}+\cdots\cdot{}_{n}\text{C}_{n-1} xh^{n-3}+{}_{n}\text{C}_{n} h^{n-2}}h}&\\%
+ &={}_{n}\text{C}_{1} x^{n-1}&\\%
&=nx^{n-1}%
\end{align*}%
\証明終了%
@@ -2631,11 +3007,11 @@
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{i}}%
{${kf\Ttyuukakko{x}}'=kf'\Ttyuukakko{x}$}{\relax}%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
- {\[{kf\Ttyuukakko{x}}'=kf'\Ttyuukakko{x}\]}{\relax}%
+ {\[{kf\Ttyuukakko{x}}'=kf'\Ttyuukakko{x}\]}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
{${f\Ttyuukakko{x}\pm g\Ttyuukakko{x}}'=f'\Ttyuukakko{x}\pm g'\Ttyuukakko{x}$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
- {\[{f\Ttyuukakko{x}\pm g\Ttyuukakko{x}}'=f'\Ttyuukakko{x}\pm g'\Ttyuukakko{x}\]}{\relax}%
+ {\[{f\Ttyuukakko{x}\pm g\Ttyuukakko{x}}'=f'\Ttyuukakko{x}\pm g'\Ttyuukakko{x}\]}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
{${kf\Ttyuukakko{x}+lg\Ttyuukakko{x}}'=kf'\Ttyuukakko{x}+lg'\Ttyuukakko{x}$}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}%
@@ -2646,55 +3022,58 @@
\NewDocumentCommand{\接線の方程式}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
- {曲線$y=f\Ttyuukakko{x}$上の点$\Ttyuukakko{a\数式カンマスペース f\Ttyuukakko{a}}$における曲線の接線の方程式は,$y-f\Ttyuukakko{a}=f'\Ttyuukakko{x}\Ttyuukakko{x-a}$}{\relax}%
+ {曲線$y=f\Ttyuukakko{x}$上の点$\Ttyuukakko{a\数式カンマスペース f\Ttyuukakko{a}}$における曲線の接線の方程式は,$y-f\Ttyuukakko{a}=f'\Ttyuukakko{x}\Ttyuukakko{x-a}$}{\relax}%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
曲線$y=f\Ttyuukakko{x}$上の点$\Ttyuukakko{a\数式カンマスペース f\Ttyuukakko{a}}$における曲線の接線の方程式は,%
- \[y-f\Ttyuukakko{a}=f'\Ttyuukakko{x}\Ttyuukakko{x-a}\]%
+\[y-f\Ttyuukakko{a}=f'\Ttyuukakko{x}\Ttyuukakko{x-a}\]%
+
}%
- {\relax}%
+ {\relax}%
}%
\NewDocumentCommand{\不定積分の定義}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{i}}%
- {$F'\Ttyuukakko{x}=f\Ttyuukakko{x}$のとき,$\displaystyle\int_{}^{} f\Ttyuukakko{x}dx=F\Ttyuukakko{x}+C\text{($C$は積分定数)}$}{\relax}%
+ {$F'\Ttyuukakko{x}=f\Ttyuukakko{x}$のとき,$\displaystyle\int_{}^{}f\Ttyuukakko{x}dx=F\Ttyuukakko{x}+C\text{($C$は積分定数)}$}{\relax}%
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{b}}%
{%
$F'\Ttyuukakko{x}=f\Ttyuukakko{x}$のとき,%
- \[\int_{}^{} f\Ttyuukakko{x}dx=F\Ttyuukakko{x}+C\text{\ (\,$C$は積分定数)}\]%
+\[\int_{}^{}f\Ttyuukakko{x}dx=F\Ttyuukakko{x}+C\text{\ (\,$C$は積分定数)}\]%
+
}%
{\relax}%
}%
-\NewDocumentCommand{\べき乗関数の不定積分}{ m O{i} }%
- {%
- \ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
- {$\displaystyle\int_{}^{} x^{n}dx=\bunsuu{1}{n+1}x^{n+1}+C\text{\ (\,$C$は積分定数)}$}{\relax}%
- \ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
- {%
- \[\int_{}^{} x^{n}dx=\bunsuu{1}{n+1}x^{n+1}+C\text{\ (\,$C$は積分定数)}\]%
- }%
- {\relax}%
- }%
+%\NewDocumentCommand{\べき乗関数の不定積分}{ m O{i} }%
+ %{%
+ %\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
+ %{$\displaystyle\int_{}^{}x^{n}dx=\bunsuu{1}{n+1}x^{n+1}+C\text{\ (\,$C$は積分定数)}$}{\relax}%
+ %\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
+ %{%
+ %\[\int_{}^{}x^{n}dx=\bunsuu{1}{n+1}x^{n+1}+C\text{\ (\,$C$は積分定数)}\]%
+
+ %}%
+ %{\relax}%
+ %}%
\NewDocumentCommand{\不定積分の性質}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{i}}%
- {$\displaystyle\int_{}^{} kf\Ttyuukakko{x}dx=k\displaystyle \int_{}^{} f\Ttyuukakko{x}dx$}{\relax}%
+ {$\displaystyle\int_{}^{}kf\Ttyuukakko{x}dx=k\displaystyle\int_{}^{}f\Ttyuukakko{x}dx$}{\relax}%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
- {\[\int_{}^{} kf\Ttyuukakko{x}dx=k\int_{}^{} f\Ttyuukakko{x}dx\]}{\relax}%
+ {\[\int_{}^{}kf\Ttyuukakko{x}dx=k\int_{}^{}f\Ttyuukakko{x}dx\]}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
- {$\displaystyle\int_{}^{} {f\Ttyuukakko{x}\pm g\Ttyuukakko{x}}dx=\displaystyle \int_{}^{} f\Ttyuukakko{x}dx\pm\displaystyle \int_{}^{} g\Ttyuukakko{x}dx$}{\relax}%
+ {$\displaystyle\int_{}^{}{f\Ttyuukakko{x}\pm g\Ttyuukakko{x}}dx=\displaystyle\int_{}^{}f\Ttyuukakko{x}dx\pm\displaystyle\int_{}^{}g\Ttyuukakko{x}dx\text{\ (複号同順)}$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
- {\[\int_{}^{} {f\Ttyuukakko{x}\pm g\Ttyuukakko{x}}dx=\int_{}^{} f\Ttyuukakko{x}dx\pm\int_{}^{} g\Ttyuukakko{x}dx\]}{\relax}%
+ {\[\int_{}^{}{f\Ttyuukakko{x}\pm g\Ttyuukakko{x}}dx=\int_{}^{}f\Ttyuukakko{x}dx\pm\int_{}^{}g\Ttyuukakko{x}dx\text{\ (複号同順)}\]}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
- {$\displaystyle\int_{}^{} {kf\Ttyuukakko{x}+lg\Ttyuukakko{x}}dx=k\displaystyle \int_{}^{} f\Ttyuukakko{x}dx+l\displaystyle \int_{}^{} g\Ttyuukakko{x}$}{\relax}%
+ {$\displaystyle\int_{}^{}{kf\Ttyuukakko{x}+lg\Ttyuukakko{x}}dx=k\displaystyle\int_{}^{}f\Ttyuukakko{x}dx+l\displaystyle\int_{}^{}g\Ttyuukakko{x}$}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}%
- {\[\int_{}^{} {kf\Ttyuukakko{x}+lg\Ttyuukakko{x}}dx=k\int_{}^{} f\Ttyuukakko{x}dx+l\int_{}^{} g\Ttyuukakko{x}\]}{\relax}%
+ {\[\int_{}^{}{kf\Ttyuukakko{x}+lg\Ttyuukakko{x}}dx=k\int_{}^{}f\Ttyuukakko{x}dx+l\int_{}^{}g\Ttyuukakko{x}\]}{\relax}%
}%
@@ -2705,7 +3084,8 @@
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{b}}%
{%
曲線$y=f\Ttyuukakko{x}$と$x$軸(区間は$a$から$b$)に囲まれた部分の面積$S$について,$F'\Ttyuukakko{x}=f\Ttyuukakko{x}$のとき,%
- \[S=\int_{b}^{a} f\Ttyuukakko{x}dx=[F\Ttyuukakko{x}]^{b}_{a}=F\Ttyuukakko{b}-F\Ttyuukakko{a}\]%
+\[S=\int_{b}^{a} f\Ttyuukakko{x}dx=[F\Ttyuukakko{x}]^{b}_{a}=F\Ttyuukakko{b}-F\Ttyuukakko{a}\]%
+
}%
{\relax}%
}%
@@ -2716,19 +3096,19 @@
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{i}}%
{$\displaystyle\int_{b}^{a} kf\Ttyuukakko{x}dx=k\int_{b}^{a} f\Ttyuukakko{x}dx$}{\relax}%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
- {\[\int_{b}^{a} kf\Ttyuukakko{x}dx=k\int_{b}^{a} f\Ttyuukakko{x}dx\]}{\relax}%
+ {\[\int_{b}^{a} kf\Ttyuukakko{x}dx=k\int_{b}^{a} f\Ttyuukakko{x}dx\]}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
- {$\displaystyle\int_{b}^{a} {f\Ttyuukakko{x}\pm g\Ttyuukakko{x}}dx=\int_{b}^{a} f\Ttyuukakko{x}dx\pm\int_{b}^{a} g\Ttyuukakko{x}dx$}{\relax}%
+ {$\displaystyle\int_{b}^{a}{f\Ttyuukakko{x}\pm g\Ttyuukakko{x}}dx=\int_{b}^{a} f\Ttyuukakko{x}dx\pm\int_{b}^{a} g\Ttyuukakko{x}dx$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
- {\[\int_{b}^{a} {f\Ttyuukakko{x}\pm g\Ttyuukakko{x}}dx=\int_{b}^{a} f\Ttyuukakko{x}dx\pm\int_{b}^{a} g\Ttyuukakko{x}dx\]}{\relax}%
+ {\[\int_{b}^{a}{f\Ttyuukakko{x}\pm g\Ttyuukakko{x}}dx=\int_{b}^{a} f\Ttyuukakko{x}dx\pm\int_{b}^{a} g\Ttyuukakko{x}dx\]}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
{$\displaystyle\int_{a}^{a} f\Ttyuukakko{x}dx=0$}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}%
- {\[\int_{a}^{a} f\Ttyuukakko{x}dx=0\]}{\relax}%
+ {\[\int_{a}^{a} f\Ttyuukakko{x}dx=0\]}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{i}}%
{$\displaystyle\int_{b}^{a} f\Ttyuukakko{x}dx=-\int_{a}^{b} f\Ttyuukakko{x}dx$}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{b}}%
- {\[\int_{b}^{a} f\Ttyuukakko{x}dx=-\int_{a}^{b} f\Ttyuukakko{x}dx\]}{\relax}%
+ {\[\int_{b}^{a} f\Ttyuukakko{x}dx=-\int_{a}^{b} f\Ttyuukakko{x}dx\]}{\relax}%
\ifthenelse{\equal{#1}{公式E}\AND\equal{#2}{i}}%
{$\displaystyle\int_{b}^{a} f\Ttyuukakko{x}dx=\int_{a}^{c} f\Ttyuukakko{x}dx+\int_{c}^{b} f\Ttyuukakko{x}dx$}{\relax}%
\ifthenelse{\equal{#1}{公式E}\AND\equal{#2}{b}}%
@@ -2739,84 +3119,90 @@
\NewDocumentCommand{\ベクトルの演算}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{i}}%
- {$k\数式カンマスペース l$が実数のとき,$\ベクトル{a}+\ベクトル{b}=\ベクトル{b}+\ベクトル{a}$}{\relax}%
+ {$k\数式カンマスペース l$が実数のとき,$\ベクトル{a}+\ベクトル{b}=\ベクトル{b}+\ベクトル{a}$}{\relax}%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
{%
$k\数式カンマスペース l$が実数のとき%
- \[\ベクトル{a}+\ベクトル{b}=\ベクトル{b}+\ベクトル{a}\]%
+\[\ベクトル{a}+\ベクトル{b}=\ベクトル{b}+\ベクトル{a}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
- {$k\数式カンマスペース l$が実数のとき,$\Ttyuukakko{\ベクトル{a}+\ベクトル{b}}+\ベクトル{c}=\ベクトル{a}+\Ttyuukakko{\ベクトル{b}+\ベクトル{c}}$}{\relax}%
+ {$k\数式カンマスペース l$が実数のとき,$\Ttyuukakko{\ベクトル{a}+\ベクトル{b}}+\ベクトル{c}=\ベクトル{a}+\Ttyuukakko{\ベクトル{b}+\ベクトル{c}}$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
{%
$k\数式カンマスペース l$が実数のとき%
- \[\Ttyuukakko{\ベクトル{a}+\ベクトル{b}}+\ベクトル{c}=\ベクトル{a}+\Ttyuukakko{\ベクトル{b}+\ベクトル{c}}\]%
+\[\Ttyuukakko{\ベクトル{a}+\ベクトル{b}}+\ベクトル{c}=\ベクトル{a}+\Ttyuukakko{\ベクトル{b}+\ベクトル{c}}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
{$\ベクトル{a}+\Ttyuukakko{a\ベクトル{a}}=\ベクトル{0}$}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}%
- {\[\ベクトル{a}+\Ttyuukakko{a\ベクトル{a}}=\ベクトル{0}\]}{\relax}%
+ {\[\ベクトル{a}+\Ttyuukakko{a\ベクトル{a}}=\ベクトル{0}\]}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{i}}%
{$\ベクトル{a}+\ベクトル{0}=\ベクトル{a}$}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{b}}%
- {\[\ベクトル{a}+\ベクトル{0}=\ベクトル{a}\]}{\relax}%
+ {\[\ベクトル{a}+\ベクトル{0}=\ベクトル{a}\]}{\relax}%
\ifthenelse{\equal{#1}{公式E}\AND\equal{#2}{i}}%
{$\ベクトル{a}-\ベクトル{b}=\ベクトル{a}+\Ttyuukakko{-\ベクトル{b}}$}{\relax}%
\ifthenelse{\equal{#1}{公式E}\AND\equal{#2}{b}}%
- {\[\ベクトル{a}-\ベクトル{b}=\ベクトル{a}+\Ttyuukakko{-\ベクトル{b}}\]}{\relax}%
+ {\[\ベクトル{a}-\ベクトル{b}=\ベクトル{a}+\Ttyuukakko{-\ベクトル{b}}\]}{\relax}%
\ifthenelse{\equal{#1}{公式F}\AND\equal{#2}{i}}%
- {$k\数式カンマスペース l$が実数のとき,$k\Ttyuukakko{l\ベクトル{a}}=l\Ttyuukakko{k\ベクトル{b}}$}{\relax}%
+ {$k\数式カンマスペース l$が実数のとき,$k\Ttyuukakko{l\ベクトル{a}}=l\Ttyuukakko{k\ベクトル{b}}$}{\relax}%
\ifthenelse{\equal{#1}{公式F}\AND\equal{#2}{b}}%
{%
$k\数式カンマスペース l$が実数のとき%
- \[k\Ttyuukakko{l\ベクトル{a}}=l\Ttyuukakko{k\ベクトル{b}}\]%
+\[k\Ttyuukakko{l\ベクトル{a}}=l\Ttyuukakko{k\ベクトル{b}}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式G}\AND\equal{#2}{i}}%
- {$k\数式カンマスペース l$が実数のとき,$\Ttyuukakko{k+l}\ベクトル{a}=k\ベクトル{a}+l\ベクトル{a}$}{\relax}%
+ {$k\数式カンマスペース l$が実数のとき,$\Ttyuukakko{k+l}\ベクトル{a}=k\ベクトル{a}+l\ベクトル{a}$}{\relax}%
\ifthenelse{\equal{#1}{公式G}\AND\equal{#2}{b}}%
{%
$k\数式カンマスペース l$が実数のとき%
- \[\Ttyuukakko{k+l}\ベクトル{a}=k\ベクトル{a}+l\ベクトル{a}\]%
+\[\Ttyuukakko{k+l}\ベクトル{a}=k\ベクトル{a}+l\ベクトル{a}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式H}\AND\equal{#2}{i}}%
- {$k$が実数のとき,$k\Ttyuukakko{\ベクトル{a}+\ベクトル{b}}=k\ベクトル{a}+k\ベクトル{b}$}{\relax}%
+ {$k$が実数のとき,$k\Ttyuukakko{\ベクトル{a}+\ベクトル{b}}=k\ベクトル{a}+k\ベクトル{b}$}{\relax}%
\ifthenelse{\equal{#1}{公式H}\AND\equal{#2}{b}}%
{%
$k$が実数のとき%
- \[k\Ttyuukakko{\ベクトル{a}+\ベクトル{b}}=k\ベクトル{a}+k\ベクトル{b}\]%
+\[k\Ttyuukakko{\ベクトル{a}+\ベクトル{b}}=k\ベクトル{a}+k\ベクトル{b}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式I}\AND\equal{#2}{i}}%
- {$\overrightarrowtext{AB}+\overrightarrowtext{BC}=\overrightarrowtext{AC}$}{\relax}%
+ {$\vvtext{AB}+\vvtext{BC}=\vvtext{AC}$}{\relax}%
\ifthenelse{\equal{#1}{公式I}\AND\equal{#2}{b}}%
- {\[\overrightarrowtext{AB}+\overrightarrowtext{BC}=\overrightarrowtext{AC}\]}{\relax}%
+ {\[\vvtext{AB}+\vvtext{BC}=\vvtext{AC}\]}{\relax}%
\ifthenelse{\equal{#1}{公式J}\AND\equal{#2}{i}}%
- {$\overrightarrowtext{OA}-\overrightarrowtext{OB}=\overrightarrowtext{BA}$}{\relax}%
+ {$\vvtext{OA}-\vvtext{OB}=\vvtext{BA}$}{\relax}%
\ifthenelse{\equal{#1}{公式J}\AND\equal{#2}{b}}%
- {\[\overrightarrowtext{OA}-\overrightarrowtext{OB}=\overrightarrowtext{BA}\]}{\relax}%
+ {\[\vvtext{OA}-\vvtext{OB}=\vvtext{BA}\]}{\relax}%
\ifthenelse{\equal{#1}{公式K}\AND\equal{#2}{i}}%
- {$\overrightarrowtext{AA}=\ベクトル{0}$}{\relax}%
+ {$\vvtext{AA}=\ベクトル{0}$}{\relax}%
\ifthenelse{\equal{#1}{公式K}\AND\equal{#2}{b}}%
- {\[\overrightarrowtext{AA}=\ベクトル{0}\]}{\relax}%
+ {\[\vvtext{AA}=\ベクトル{0}\]}{\relax}%
\ifthenelse{\equal{#1}{公式L}\AND\equal{#2}{i}}%
- {$\overrightarrowtext{BA}=\overrightarrowtext{AB}$}{\relax}%
+ {$\vvtext{BA}=\vvtext{AB}$}{\relax}%
\ifthenelse{\equal{#1}{公式L}\AND\equal{#2}{b}}%
- {\[\overrightarrowtext{BA}=\overrightarrowtext{AB}\]}{\relax}%
+ {\[\vvtext{BA}=\vvtext{AB}\]}{\relax}%
}%
\NewDocumentCommand{\平面ベクトルの分解}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
- {$\ベクトル{a}\neq0\数式カンマスペース\ベクトル{b}\neq0$で,$\ベクトル{a}$と$\ベクトル{b}$が平行でないとき,任意の$\ベクトル{p}$はただ一通りに,$\ベクトル{p}=s\ベクトル{a}+t\ベクトル{b}$の形に表せられる。}{\relax}%
+ {$\ベクトル{a}\neq0\数式カンマスペース\ベクトル{b}\neq0$で,$\ベクトル{a}$と$\ベクトル{b}$が平行でないとき,任意の$\ベクトル{p}$はただ一通りに,$\ベクトル{p}=s\ベクトル{a}+t\ベクトル{b}$の形に表せられる。}{\relax}%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
$\ベクトル{a}\neq0\数式カンマスペース\ベクトル{b}\neq0$で,$\ベクトル{a}$と$\ベクトル{b}$が平行でないとき,任意の$\ベクトル{p}$はただ一通りに,%
- \[\ベクトル{p}=s\ベクトル{a}+t\ベクトル{b}\]%
+\[\ベクトル{p}=s\ベクトル{a}+t\ベクトル{b}\]%
+
の形に表せられる。%
}%
{\relax}%
@@ -2826,37 +3212,44 @@
\NewDocumentCommand{\平面ベクトルの成分}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{i}}%
- {$\ベクトル{a}=\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}\数式カンマスペース\ベクトル{b}=\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}$とすると,$\ベクトル{a}=\ベクトル{b}\Leftrightarrow a_{1}=b_{1}\数式カンマスペース a_{2}=b_{2}$}{\relax}%
+ {$\ベクトル{a}=\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}\数式カンマスペース\ベクトル{b}=\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}$とすると,$\ベクトル{a}=\ベクトル{b}\Leftrightarrow a_{1}=b_{1}\数式カンマスペース a_{2}=b_{2}$}{\relax}%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
{%
$\ベクトル{a}=\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}\数式カンマスペース\ベクトル{b}=\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}$とすると,%
- $\ベクトル{a}=\ベクトル{b}$%
- \[\Leftrightarrow a_{1}=b_{1}\数式カンマスペース a_{2}=b_{2}\]%
+\[\ベクトル{a}=\ベクトル{b}\Leftrightarrow a_{1}=b_{1}\数式カンマスペース a_{2}=b_{2}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
- {$\ベクトル{a}=\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}\数式カンマスペース\ベクトル{b}=\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}$とすると,$a_{1}=b_{1}\数式カンマスペース a_{2}=b_{2}\Leftrightarrow\ベクトル{a}=\ベクトル{b}$}{\relax}%
+ {$\ベクトル{a}=\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}\数式カンマスペース\ベクトル{b}=\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}$とすると,$a_{1}=b_{1}\数式カンマスペース a_{2}=b_{2}\Leftrightarrow\ベクトル{a}=\ベクトル{b}$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
{%
$\ベクトル{a}=\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}\数式カンマスペース\ベクトル{b}=\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}$とすると,%
- $a_{1}=b_{1}\数式カンマスペース a_{2}=b_{2}$%
- \[\Leftrightarrow\ベクトル{a}=\ベクトル{b}\]%
+\[a_{1}=b_{1}\数式カンマスペース a_{2}=b_{2}\Leftrightarrow\ベクトル{a}=\ベクトル{b}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
- {$\ベクトル{a}=\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}$とすると,$\Tzettaiti{\ベクトル{a}}=\根号{a_{1}^2+a_{2}^2}$}{\relax}%
+ {$\ベクトル{a}=\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}$とすると,$\Tzettaiti{\ベクトル{a}}=\根号{a_{1}^2+a_{2}^2}$}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}%
{%
$\ベクトル{a}=\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}$とすると,%
- \[\Tzettaiti{\ベクトル{a}}=\根号{a_{1}^2+a_{2}^2}\]%
+\[\Tzettaiti{\ベクトル{a}}=\根号{a_{1}^2+a_{2}^2}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{i}}%
- {$\ベクトル{a}=\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}\数式カンマスペース\ベクトル{b}=\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}$また,$k\数式カンマスペース l$を実数として,$k\ベクトル{a}+l\ベクトル{b}=k\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}+l\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}=\Ttyuukakko{ka_{1}+lb_{1}\数式カンマスペース ka_{2}+lb_{2}}$}{\relax}%
+ {%
+ $k\数式カンマスペース l$を実数,$\ベクトル{a}=\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}\数式カンマスペース\ベクトル{b}=\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}$として,%
+
+ \hfill{$k\ベクトル{a}+l\ベクトル{b}=k\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}+l\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}=\Ttyuukakko{ka_{1}+lb_{1}\数式カンマスペース ka_{2}+lb_{2}}$}%
+ }%
+ {\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{b}}%
{%
- $\ベクトル{a}=\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}\数式カンマスペース\ベクトル{b}=\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}$また,$k\数式カンマスペース l$を実数として,%
- \[k\ベクトル{a}+l\ベクトル{b}=k\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}+l\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}=\Ttyuukakko{ka_{1}+lb_{1}\数式カンマスペース ka_{2}+lb_{2}}\]%
+ $k\数式カンマスペース l$を実数,$\ベクトル{a}=\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}\数式カンマスペース\ベクトル{b}=\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}$として,%
+\[k\ベクトル{a}+l\ベクトル{b}=k\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}+l\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}=\Ttyuukakko{ka_{1}+lb_{1}\数式カンマスペース ka_{2}+lb_{2}}\]%
+
}%
{\relax}%
}%
@@ -2865,26 +3258,28 @@
\NewDocumentCommand{\ベクトルの成分と大きさ}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{i}}%
- {$A\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}\数式カンマスペース B\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}$とすると,$\overrightarrowtext{AB}=\Ttyuukakko{b_{1}-a_{1}\数式カンマスペース b_{2}-a_{2}}$}{\relax}%
+ {$A\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}\数式カンマスペース B\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}$とすると,$\vvtext{AB}=\Ttyuukakko{b_{1}-a_{1}\数式カンマスペース b_{2}-a_{2}}$}{\relax}%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
{%
$A\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}\数式カンマスペース B\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}$とすると,%
- \[\overrightarrowtext{AB}=\Ttyuukakko{b_{1}-a_{1}\数式カンマスペース b_{2}-a_{2}}\]%
+\[\vvtext{AB}=\Ttyuukakko{b_{1}-a_{1}\数式カンマスペース b_{2}-a_{2}}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
- {$A\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}\数式カンマスペース B\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}$とすると,$\Tzettaiti{\overrightarrowtext{AB}}=\根号{\Ttyuukakko{b_{1}-a_{1}}^2+\Ttyuukakko{b_{2}-a_{2}}^2}$}{\relax}%
+ {$A\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}\数式カンマスペース B\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}$とすると,$\Tzettaiti{\vvtext{AB}}=\根号{\Ttyuukakko{b_{1}-a_{1}}^2+\Ttyuukakko{b_{2}-a_{2}}^2}$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
{%
$A\Ttyuukakko{a_{1}\数式カンマスペース a_{2}}\数式カンマスペース B\Ttyuukakko{b_{1}\数式カンマスペース b_{2}}$とすると,%
- \[\Tzettaiti{\overrightarrowtext{AB}}=\根号{\Ttyuukakko{b_{1}-a_{1}}^2+\Ttyuukakko{b_{2}-a_{2}}^2}\]%
+\[\Tzettaiti{\vvtext{AB}}=\根号{\Ttyuukakko{b_{1}-a_{1}}^2+\Ttyuukakko{b_{2}-a_{2}}^2}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{証明}}%
{%
\証明開始%
三平方の定理より,%
- \[\Tzettaiti{\overrightarrowtext{AB}}=\根号{\Ttyuukakko{b_{1}-a_{1}}^2+\Ttyuukakko{b_{2}-a_{2}}^2}\]%
+\[\Tzettaiti{\vvtext{AB}}=\根号{\Ttyuukakko{b_{1}-a_{1}}^2+\Ttyuukakko{b_{2}-a_{2}}^2}\]%
\証明終了%
}%
{\relax}%
@@ -2894,11 +3289,12 @@
\NewDocumentCommand{\平面ベクトルの内積}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
- {ベクトルの内積は,$\ベクトル{a} \cdot\ベクトル{b}=|\ベクトル{a}||\ベクトル{b}|\cos\theta \Ttyuukakko{0^{\circ} \leqq \theta \leqq 180^{\circ}}\text{\ (ただし,$\theta$は$\ベクトル{a}$と$\ベクトル{b}$のなす角)}$}{\relax}%
+ {ベクトルの内積は,$\ベクトル{a} \cdot\ベクトル{b}=|\ベクトル{a}||\ベクトル{b}|\cos\theta \Ttyuukakko{0^{\circ} \leqq \theta \leqq 180^{\circ}}\text{\ (ただし,$\theta$は$\ベクトル{a}$と$\ベクトル{b}$のなす角)}$}{\relax}%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
ベクトルの内積は,%
- \[\ベクトル{a} \cdot\ベクトル{b}=|\ベクトル{a}||\ベクトル{b}|\cos\theta \Ttyuukakko{0^{\circ} \leqq \theta \leqq 180^{\circ}}\text{\ (ただし,$\theta$は$\ベクトル{a}$と$\ベクトル{b}$のなす角)}\]%
+\[\ベクトル{a} \cdot\ベクトル{b}=|\ベクトル{a}||\ベクトル{b}|\cos\theta \Ttyuukakko{0^{\circ} \leqq \theta \leqq 180^{\circ}}\text{\ (ただし,$\theta$は$\ベクトル{a}$と$\ベクトル{b}$のなす角)}\]%
+
}%
{\relax}%
}%
@@ -2909,27 +3305,28 @@
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{i}}%
{$\ベクトル{a} \cdot\ベクトル{b}=\ベクトル{b} \cdot\ベクトル{a}$}{\relax}%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
- {\[\ベクトル{a} \cdot\ベクトル{b}=\ベクトル{b} \cdot\ベクトル{a}\]}{\relax}%
+ {\[\ベクトル{a} \cdot\ベクトル{b}=\ベクトル{b} \cdot\ベクトル{a}\]}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
{$\Ttyuukakko{\ベクトル{a}+\ベクトル{b}} \cdot\ベクトル{c}=\ベクトル{a} \cdot\ベクトル{c}+\ベクトル{b} \cdot\ベクトル{c}$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
- {\[\Ttyuukakko{\ベクトル{a}+\ベクトル{b}} \cdot\ベクトル{c}=\ベクトル{a} \cdot\ベクトル{c}+\ベクトル{b} \cdot\ベクトル{c}\]}{\relax}%
+ {\[\Ttyuukakko{\ベクトル{a}+\ベクトル{b}} \cdot\ベクトル{c}=\ベクトル{a} \cdot\ベクトル{c}+\ベクトル{b} \cdot\ベクトル{c}\]}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
{$\ベクトル{c} \cdot\Ttyuukakko{\ベクトル{b}+\ベクトル{c}}=\ベクトル{a} \cdot\ベクトル{c}+\ベクトル{b} \cdot\ベクトル{c}$}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}%
- {\[\ベクトル{c} \cdot\Ttyuukakko{\ベクトル{b}+\ベクトル{c}}=\ベクトル{a} \cdot\ベクトル{c}+\ベクトル{b} \cdot\ベクトル{c}\]}{\relax}%
+ {\[\ベクトル{c} \cdot\Ttyuukakko{\ベクトル{b}+\ベクトル{c}}=\ベクトル{a} \cdot\ベクトル{c}+\ベクトル{b} \cdot\ベクトル{c}\]}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{i}}%
- {$k$が実数のとき,$\Ttyuukakko{k\ベクトル{a}} \cdot\ベクトル{b}=\ベクトル{a} \cdot\Ttyuukakko{k\ベクトル{b}}=k\Ttyuukakko{\ベクトル{a} \cdot\ベクトル{b}}$}{\relax}%
+ {$k$が実数のとき,$\Ttyuukakko{k\ベクトル{a}} \cdot\ベクトル{b}=\ベクトル{a} \cdot\Ttyuukakko{k\ベクトル{b}}=k\Ttyuukakko{\ベクトル{a} \cdot\ベクトル{b}}$}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{b}}%
{%
$k$が実数のとき,%
- \[\Ttyuukakko{k\ベクトル{a}} \cdot\ベクトル{b}=\ベクトル{a} \cdot\Ttyuukakko{k\ベクトル{b}}=k\Ttyuukakko{\ベクトル{a} \cdot\ベクトル{b}}\]%
+\[\Ttyuukakko{k\ベクトル{a}} \cdot\ベクトル{b}=\ベクトル{a} \cdot\Ttyuukakko{k\ベクトル{b}}=k\Ttyuukakko{\ベクトル{a} \cdot\ベクトル{b}}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式E}\AND\equal{#2}{i}}%
{$\ベクトル{a} \cdot\ベクトル{a}=\Tzettaiti{\ベクトル{a}}^2$}{\relax}%
\ifthenelse{\equal{#1}{公式E}\AND\equal{#2}{b}}%
- {\[\ベクトル{a} \cdot\ベクトル{a}=\Tzettaiti{\ベクトル{a}}^2\]}{\relax}%
+ {\[\ベクトル{a} \cdot\ベクトル{a}=\Tzettaiti{\ベクトル{a}}^2\]}{\relax}%
\ifthenelse{\equal{#1}{公式F}\AND\equal{#2}{i}}%
{$\Tzettaiti{\ベクトル{a}}=\根号{\ベクトル{a} \cdot\ベクトル{a}}$}{\relax}%
\ifthenelse{\equal{#1}{公式F}\AND\equal{#2}{b}}%
@@ -2941,17 +3338,17 @@
{%
\ifthenelse{\equal{#1}{条件}\AND\equal{#2}{i}}%
{%
- $\ベクトル{a}\neq\ベクトル{0}\数式カンマスペース\ベクトル{b}\neq\ベクトル{0}$また,$k$は実数とする,\par%
- $\ベクトル{a}/ \!/ \ベクトル{b}\Leftrightarrow\ベクトル{b}=k\ベクトル{a}$,$\ベクトル{b}=k\ベクトル{a}$%
+ $\ベクトル{a}\neq\ベクトル{0}\数式カンマスペース\ベクトル{b}\neq\ベクトル{0}\数式カンマスペース k\実数入り$として,%
+ $\ベクトル{a}\平行\ベクトル{b}\Leftrightarrow\ベクトル{b}=k\ベクトル{a}$%
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{条件}\AND\equal{#2}{b}}%
{%
- $\ベクトル{a}\neq\ベクトル{0}\数式カンマスペース\ベクトル{b}\neq\ベクトル{0}$また,$k$は実数とする,\par%
- $\ベクトル{a}/ \!/ \ベクトル{b}$%
- \[\Leftrightarrow\ベクトル{b}=k\ベクトル{a}\]%
+ $\ベクトル{a}\neq\ベクトル{0}\数式カンマスペース\ベクトル{b}\neq\ベクトル{0}\数式カンマスペース k\実数入り$として,%
+\[\ベクトル{a}\平行\ベクトル{b}\Leftrightarrow\ベクトル{b}=k\ベクトル{a}\]%
+
}%
- {\relax}%
+ {\relax}%
}%
@@ -2959,29 +3356,31 @@
{%
\ifthenelse{\equal{#1}{条件}\AND\equal{#2}{i}}%
{%
- $\ベクトル{a}\neq\ベクトル{0}\数式カンマスペース\ベクトル{b}\neq\ベクトル{0}$で,$k$は実数とすると,%
- $\ベクトル{a} \perp \ベクトル{b}\Leftrightarrow\ベクトル{a} \cdot\ベクトル{b}=0$%
+ $\ベクトル{a}\neq\ベクトル{0}\数式カンマスペース\ベクトル{b}\neq\ベクトル{0}\数式カンマスペース k\実数入り$とすると,%
+ $\ベクトル{a}\perp\ベクトル{b}\Leftrightarrow\ベクトル{a} \cdot\ベクトル{b}=0$%
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{条件}\AND\equal{#2}{b}}%
{%
- $\ベクトル{a}\neq\ベクトル{0}\数式カンマスペース\ベクトル{b}\neq\ベクトル{0}$で,$k$は実数とすると,%
- \[\ベクトル{a} \perp \ベクトル{b}\Leftrightarrow\ベクトル{a} \cdot\ベクトル{b}=0\]%
+ $\ベクトル{a}\neq\ベクトル{0}\数式カンマスペース\ベクトル{b}\neq\ベクトル{0}\数式カンマスペース k\実数入り$とすると,%
+\[\ベクトル{a}\perp\ベクトル{b}\Leftrightarrow\ベクトル{a} \cdot\ベクトル{b}=0\]%
+
}%
{\relax}%
- }%
+ }%
\NewDocumentCommand{\位置ベクトル}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{i}}%
- {$A\Ttyuukakko{\ベクトル{a}}\数式カンマスペース B\Ttyuukakko{\ベクトル{b}}$とすると,線分$\text{AB}$を$m:n$に内分する点は,$\bunsuu{n\ベクトル{a}+m\ベクトル{b}}{m+n}$}{\relax}%
+ {$A\Ttyuukakko{\ベクトル{a}}\数式カンマスペース B\Ttyuukakko{\ベクトル{b}}$とすると,線分$\text{AB}$を$m:n$に内分する点は,$\bunsuu{n\ベクトル{a}+m\ベクトル{b}}{m+n}$}{\relax}%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
{%
$A\Ttyuukakko{\ベクトル{a}}\数式カンマスペース B\Ttyuukakko{\ベクトル{b}}$とすると,線分$\text{AB}$を$m:n$に内分する点は,%
- \[\bunsuu{n\ベクトル{a}+m\ベクトル{b}}{m+n}\]%
+\[\bunsuu{n\ベクトル{a}+m\ベクトル{b}}{m+n}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{内分点の位置ベクトルの証明}}%
{%
\証明開始%
@@ -2994,34 +3393,37 @@
}%
{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
- {$A\Ttyuukakko{\ベクトル{a}}\数式カンマスペース B\Ttyuukakko{\ベクトル{b}}$とする,線分$\text{AB}$を$m:n$に外分する点は,$\bunsuu{-n\ベクトル{a}+m\ベクトル{b}}{m-n}$}{\relax}%
+ {$A\Ttyuukakko{\ベクトル{a}}\数式カンマスペース B\Ttyuukakko{\ベクトル{b}}$とすると,線分$\text{AB}$を$m:n$に外分する点は,$\bunsuu{-n\ベクトル{a}+m\ベクトル{b}}{m-n}$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
{%
- $A\Ttyuukakko{\ベクトル{a}}\数式カンマスペース B\Ttyuukakko{\ベクトル{b}}$とする,線分$\text{AB}$を$m:n$に外分する点は,%
- \[\bunsuu{-n\ベクトル{a}+m\ベクトル{b}}{m-n}\]%
+ $A\Ttyuukakko{\ベクトル{a}}\数式カンマスペース B\Ttyuukakko{\ベクトル{b}}$とすると,線分$\text{AB}$を$m:n$に外分する点は,%
+\[\bunsuu{-n\ベクトル{a}+m\ベクトル{b}}{m-n}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{外分点の位置ベクトルの証明}}%
{%
\証明開始%
- $m:n$に外分ということは$m:-n$に内分ということなので,$\bunsuu{-n\ベクトル{a}+m\ベクトル{b}}{m-n}$%
+ $m:n$に外分ということは$m:\Ttyuukakko{-n}$に内分ということなので,$\bunsuu{-n\ベクトル{a}+m\ベクトル{b}}{m-n}$%
\証明終了%
}%
{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
- {$A\Ttyuukakko{\ベクトル{a}}\数式カンマスペース B\Ttyuukakko{\ベクトル{b}}$とする,線分$\text{AB}$の中点は,$\bunsuu{\ベクトル{a}+\ベクトル{b}}{2}$}{\relax}%
+ {$A\Ttyuukakko{\ベクトル{a}}\数式カンマスペース B\Ttyuukakko{\ベクトル{b}}$とすると,線分$\text{AB}$の中点は,$\bunsuu{\ベクトル{a}+\ベクトル{b}}{2}$}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}%
{%
- $A\Ttyuukakko{\ベクトル{a}}\数式カンマスペース B\Ttyuukakko{\ベクトル{b}}$とする,線分$\text{AB}$の中点は,%
- \[\bunsuu{\ベクトル{a}+\ベクトル{b}}{2}\]%
+ $A\Ttyuukakko{\ベクトル{a}}\数式カンマスペース B\Ttyuukakko{\ベクトル{b}}$とすると,線分$\text{AB}$の中点は,%
+\[\bunsuu{\ベクトル{a}+\ベクトル{b}}{2}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{i}}%
- {$A\Ttyuukakko{\ベクトル{a}}\数式カンマスペース B\Ttyuukakko{\ベクトル{b}}\数式カンマスペース C\Ttyuukakko{\ベクトル{c}}$とする,$\triangle{\text{ABC}}$の重心は,$\bunsuu{\ベクトル{a}+\ベクトル{b}+\ベクトル{c}}{3}$}{\relax}%
+ {$A\Ttyuukakko{\ベクトル{a}}\数式カンマスペース B\Ttyuukakko{\ベクトル{b}}\数式カンマスペース C\Ttyuukakko{\ベクトル{c}}$とすると,$\triangle{\text{ABC}}$の重心は,$\bunsuu{\ベクトル{a}+\ベクトル{b}+\ベクトル{c}}{3}$}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{b}}%
{%
- $A\Ttyuukakko{\ベクトル{a}}\数式カンマスペース B\Ttyuukakko{\ベクトル{b}}\数式カンマスペース C\Ttyuukakko{\ベクトル{c}}$とする,$\triangle{\text{ABC}}$の重心は,%
- \[\bunsuu{\ベクトル{a}+\ベクトル{b}+\ベクトル{c}}{3}\]%
+ $A\Ttyuukakko{\ベクトル{a}}\数式カンマスペース B\Ttyuukakko{\ベクトル{b}}\数式カンマスペース C\Ttyuukakko{\ベクトル{c}}$とすると,$\triangle{\text{ABC}}$の重心は,%
+\[\bunsuu{\ベクトル{a}+\ベクトル{b}+\ベクトル{c}}{3}\]%
+
}%
{\relax}%
}%
@@ -3030,36 +3432,45 @@
\NewDocumentCommand{\ベクトル方程式}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{i}}%
- {$s\数式カンマスペース t$を実数とする。点$A\Ttyuukakko{\ベクトル{a}}$をとおり,$\ベクトル{d}$に平行な直線は,$\ベクトル{p}=\ベクトル{a}+t\ベクトル{b}$}{\relax}%
+ {$s\数式カンマスペース t$を実数とする。点$A\Ttyuukakko{\ベクトル{a}}$をとおり,$\ベクトル{d}$に平行な直線は,$\ベクトル{p}=\ベクトル{a}+t\ベクトル{b}$}{\relax}%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
{%
$s\数式カンマスペース t$を実数とする。点$A\Ttyuukakko{\ベクトル{a}}$をとおり,$\ベクトル{d}$に平行な直線は,%
- \[\ベクトル{p}=\ベクトル{a}+t\ベクトル{b}\]%
+\[\ベクトル{p}=\ベクトル{a}+t\ベクトル{b}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
- {$s\数式カンマスペース t$を実数とする。二点$A\Ttyuukakko{\ベクトル{a}}\数式カンマスペース B\Ttyuukakko{\ベクトル{b}}$を通る直線は,$\ベクトル{p}=\Ttyuukakko{1-t}\ベクトル{a}+t\ベクトル{b}\数式カンマスペース\ベクトル{p}=a\ベクトル{a}+t\ベクトル{b}\text{\ (ただし,$s+t=1$)}$}{\relax}%
+ {%
+ $s\数式カンマスペース t$を実数とする。二点$A\Ttyuukakko{\ベクトル{a}}\数式カンマスペース B\Ttyuukakko{\ベクトル{b}}$を通る直線は,%
+
+ \hfill{$\ベクトル{p}=\Ttyuukakko{1-t}\ベクトル{a}+t\ベクトル{b}\数式カンマスペース\ベクトル{p}=a\ベクトル{a}+t\ベクトル{b}\text{\ (ただし,$s+t=1$)}$}%
+ }%
+ {\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
{%
$s\数式カンマスペース t$を実数とする。二点$A\Ttyuukakko{\ベクトル{a}}\数式カンマスペース B\Ttyuukakko{\ベクトル{b}}$を通る直線は,%
- \[\ベクトル{p}=\Ttyuukakko{1-t}\ベクトル{a}+t\ベクトル{b}\数式カンマスペース\ベクトル{p}=a\ベクトル{a}+t\ベクトル{b}\text{\ (ただし,$s+t=1$)}\]%
+\[\ベクトル{p}=\Ttyuukakko{1-t}\ベクトル{a}+t\ベクトル{b}\数式カンマスペース\ベクトル{p}=a\ベクトル{a}+t\ベクトル{b}\text{\ (ただし,$s+t=1$)}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
- {点$A\Ttyuukakko{\ベクトル{a}}$を通り,$\ベクトル{n}$に垂直な直線$\ベクトル{p}$について,$\ベクトル{n}\cdot\Ttyuukakko{\ベクトル{p}-\ベクトル{a}}=0$}{\relax}%
+ {点$A\Ttyuukakko{\ベクトル{a}}$を通り,$\ベクトル{n}$に垂直な直線$\ベクトル{p}$について,$\ベクトル{n}\cdot\Ttyuukakko{\ベクトル{p}-\ベクトル{a}}=0$}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}%
{%
点$A\Ttyuukakko{\ベクトル{a}}$を通り,$\ベクトル{n}$に垂直な直線$\ベクトル{p}$について,%
- \[\ベクトル{n}\cdot\Ttyuukakko{\ベクトル{p}-\ベクトル{a}}=0\]%
+\[\ベクトル{n}\cdot\Ttyuukakko{\ベクトル{p}-\ベクトル{a}}=0\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{i}}%
{中心$C\Ttyuukakko{\ベクトル{c}}$,半径$r$の円は,$\Tzettaiti{\ベクトル{p}-\ベクトル{c}}=r\数式カンマスペース\Ttyuukakko{\ベクトル{p}-\ベクトル{c}}\cdot\Ttyuukakko{\ベクトル{p}-\ベクトル{c}}=r^2$}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{b}}%
{%
中心$C\Ttyuukakko{\ベクトル{c}}$,半径$r$の円は,%
- \[\Tzettaiti{\ベクトル{p}-\ベクトル{c}}=r\]%
+\[\Tzettaiti{\ベクトル{p}-\ベクトル{c}}=r\]%
\[\Ttyuukakko{\ベクトル{p}-\ベクトル{c}}\cdot\Ttyuukakko{\ベクトル{p}-\ベクトル{c}}=r^2\]%
+
}%
{\relax}%
}%
@@ -3068,13 +3479,14 @@
\NewDocumentCommand{\等差数列}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{一般項}\AND\equal{#2}{i}}%
- {初項$a_{1}$,公差$d$のとき,$a_{n}=a_{1}+\Ttyuukakko{n-1}d$}{\relax}%
+ {初項$a_{1}$,公差$d$のとき,$a_{n}=a_{1}+\Ttyuukakko{n-1}d$}{\relax}%
\ifthenelse{\equal{#1}{一般項}\AND\equal{#2}{b}}%
{%
初項$a_{1}$,公差$d$のとき,%
- \[a_{n}=a_{1}+\Ttyuukakko{n-1}d\]%
+\[a_{n}=a_{1}+\Ttyuukakko{n-1}d\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{総和}\AND\equal{#2}{i}}%
{$S_{n}=\bunsuu{n\Ttyuukakko{a_{1}+a_{n}}}{2}$}{\relax}%
\ifthenelse{\equal{#1}{総和}\AND\equal{#2}{b}}%
@@ -3082,9 +3494,11 @@
\ifthenelse{\equal{#1}{証明}}%
{%
\証明開始%
- \[S_{n}=a_{1}+\Ttyuukakko{a_{1}+d}+\Ttyuukakko{a_{1}+2d}+\cdots+\Tdaikakko{a_{1}+\Ttyuukakko{n-1}d}\]%
- \[S_{n}=\Tdaikakko{a_{1}+\Ttyuukakko{n-1}d}+\cdots+a_{1}+\Ttyuukakko{a_{1}+d}+\Ttyuukakko{a_{1}+2d}\]%
- 連立して,$2S=\Ttyuukakko{a_{1}+a_{n}}n$より,\par%
+\[S_{n}=a_{1}+\Ttyuukakko{a_{1}+d}+\Ttyuukakko{a_{1}+2d}+\cdots+\Tdaikakko{a_{1}+\Ttyuukakko{n-1}d}\]%
+ \[S_{n}=\Tdaikakko{a_{1}+\Ttyuukakko{n-1}d}+\cdots+a_{1}+\Ttyuukakko{a_{1}+d}+\Ttyuukakko{a_{1}+2d}\]%
+
+ 連立して,$2S=\Ttyuukakko{a_{1}+a_{n}}n$より,%
+
$S_{n}=\bunsuu{n\Ttyuukakko{a_{1}+a_{n}}}{2}$%
\証明終了%
}%
@@ -3097,35 +3511,43 @@
\ifthenelse{\equal{#1}{一般項}\AND\equal{#2}{i}}%
{$a_{n}=ar^{n-1}$}{\relax}%
\ifthenelse{\equal{#1}{一般項}\AND\equal{#2}{b}}%
- {\[a_{n}=ar^{n-1}\]}{\relax}%
+ {\[a_{n}=ar^{n-1}\]}{\relax}%
\ifthenelse{\equal{#1}{総和}\AND\equal{#2}{i}}%
{%
- $r\neq1$のとき,$S_{n}=\bunsuu{a_{1}\Ttyuukakko{1-r^{n}}}{1-r}$もしくは,$\bunsuu{a_{1}\Ttyuukakko{r^{n}-1}}{r-1}$\par%
+ $r\neq1$のとき,$S_{n}=\bunsuu{a_{1}\Ttyuukakko{1-r^{n}}}{1-r}$もしくは,$\bunsuu{a_{1}\Ttyuukakko{r^{n}-1}}{r-1}$%
+
$r=1$のとき,$S_{n}=na_{1}$%
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{総和}\AND\equal{#2}{b}}%
{%
$r\neq1$のとき,%
- \[S_{n}=\bunsuu{a_{1}\Ttyuukakko{1-r^{n}}}{1-r}\]%
+\[S_{n}=\bunsuu{a_{1}\Ttyuukakko{1-r^{n}}}{1-r}\]%
+
もしくは,%
- \[S_{n}=\bunsuu{a_{1}\Ttyuukakko{r^{n}-1}}{r-1}\]%
+\[S_{n}=\bunsuu{a_{1}\Ttyuukakko{r^{n}-1}}{r-1}\]%
+
$r=1$のとき,%
- \[S_{n}=na_{1}\]%
+\[S_{n}=na_{1}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{証明}}%
{%
\証明開始%
- \[S_{n}=a_{1}+ra_{1}+r^2a_{1}+\cdots+r^{n-1}a_{1}\]%
+\[S_{n}=a_{1}+ra_{1}+r^2a_{1}+\cdots+r^{n-1}a_{1}\]%
\[S_{n}r=ra_{1}+r^2a_{2}+r^{3}a_{1}+\cdots+r^{n}\]%
- 連立することで,$S\Ttyuukakko{1-r}=a_{1}-r^{n}a_{1}$となる。\par%
+
+ 連立することで,$S\Ttyuukakko{1-r}=a_{1}-r^{n}a_{1}$となる。%
+
よって,%
- \[S=\bunsuu{a_{1}\Ttyuukakko{1-r^{n}}}{1-r}\]%
+\[S=\bunsuu{a_{1}\Ttyuukakko{1-r^{n}}}{1-r}\]%
+
また,$\bunsuu{-1}{-1}$をかけることで,%
- \[S=\bunsuu{a_{1}\Ttyuukakko{r^{n}-1}}{r-1}\]%
+\[S=\bunsuu{a_{1}\Ttyuukakko{r^{n}-1}}{r-1}\]%
+
以上より,%
- \[S=\bunsuu{a_{1}\Ttyuukakko{1-r^{n}}}{1-r}=\bunsuu{a_{1}\Ttyuukakko{r^{n}-1}}{r-1}\]%
+\[S=\bunsuu{a_{1}\Ttyuukakko{1-r^{n}}}{1-r}=\bunsuu{a_{1}\Ttyuukakko{r^{n}-1}}{r-1}\]%
\証明終了%
}%
{\relax}%
@@ -3135,36 +3557,38 @@
\NewDocumentCommand{\シグマの公式}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{i}}%
- {$c$は$k$に無関係なとき,$\displaystyle \sum_{k=1}^{n} c=nc$}{\relax}%
+ {$c$は$k$に無関係なとき,$\displaystyle\sum_{k=1}^{n} c=nc$}{\relax}%
\ifthenelse{\equal{#1}{公式A}\AND\equal{#2}{b}}%
{%
$c$は$k$に無関係なとき,%
- \[\displaystyle \sum_{k=1}^{n} c=nc\]%
+\[\displaystyle\sum_{k=1}^{n} c=nc\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{i}}%
- {$\displaystyle \sum_{k=1}^{n} k=\bunsuu{1}{2}n\Ttyuukakko{n+1}$}{\relax}%
+ {$\displaystyle\sum_{k=1}^{n} k=\bunsuu{1}{2}n\Ttyuukakko{n+1}$}{\relax}%
\ifthenelse{\equal{#1}{公式B}\AND\equal{#2}{b}}%
- {\[\displaystyle \sum_{k=1}^{n} k=\bunsuu{1}{2}n\Ttyuukakko{n+1}\]}{\relax}%
+ {\[\displaystyle\sum_{k=1}^{n} k=\bunsuu{1}{2}n\Ttyuukakko{n+1}\]}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{i}}%
- {$\displaystyle \sum_{k=1}^{n} k^2=\bunsuu{1}{6}n\Ttyuukakko{n+1}\Ttyuukakko{2n+1}$}{\relax}%
+ {$\displaystyle\sum_{k=1}^{n} k^2=\bunsuu{1}{6}n\Ttyuukakko{n+1}\Ttyuukakko{2n+1}$}{\relax}%
\ifthenelse{\equal{#1}{公式C}\AND\equal{#2}{b}}%
- {\[\displaystyle \sum_{k=1}^{n} k^2=\bunsuu{1}{6}n\Ttyuukakko{n+1}\Ttyuukakko{2n+1}\]}{\relax}%
+ {\[\displaystyle\sum_{k=1}^{n} k^2=\bunsuu{1}{6}n\Ttyuukakko{n+1}\Ttyuukakko{2n+1}\]}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{i}}%
- {$\displaystyle \sum_{k=1}^{n} k^{3}=\Tdaikakko{\bunsuu{1}{2}n\Ttyuukakko{n+1}}^2$}{\relax}%
+ {$\displaystyle\sum_{k=1}^{n} k^{3}=\Tdaikakko{\bunsuu{1}{2}n\Ttyuukakko{n+1}}^2$}{\relax}%
\ifthenelse{\equal{#1}{公式D}\AND\equal{#2}{b}}%
- {\[\displaystyle \sum_{k=1}^{n} k^{3}=\Tdaikakko{\bunsuu{1}{2}n\Ttyuukakko{n+1}}^2\]}{\relax}%
+ {\[\displaystyle\sum_{k=1}^{n} k^{3}=\Tdaikakko{\bunsuu{1}{2}n\Ttyuukakko{n+1}}^2\]}{\relax}%
\ifthenelse{\equal{#1}{公式E}\AND\equal{#2}{i}}%
- {$\displaystyle \sum_{k=1}^{n} r^{k-1}=\bunsuu{\Ttyuukakko{1-r^{n}}}{1-r}=\bunsuu{r^{n}-1}{r-1}$}{\relax}%
+ {$\displaystyle\sum_{k=1}^{n} r^{k-1}=\bunsuu{\Ttyuukakko{1-r^{n}}}{1-r}=\bunsuu{r^{n}-1}{r-1}$}{\relax}%
\ifthenelse{\equal{#1}{公式E}\AND\equal{#2}{b}}%
- {\[\displaystyle \sum_{k=1}^{n} r^{k-1}=\bunsuu{\Ttyuukakko{1-r^{n}}}{1-r}=\bunsuu{r^{n}-1}{r-1}\]}{\relax}%
+ {\[\displaystyle\sum_{k=1}^{n} r^{k-1}=\bunsuu{\Ttyuukakko{1-r^{n}}}{1-r}=\bunsuu{r^{n}-1}{r-1}\]}{\relax}%
\ifthenelse{\equal{#1}{証明}}%
{%
\証明開始%
- $\Ttyuukakko{k+1}^{3}=k^{3}+3k^2+3k+1$を用いる。\par%
+ $\Ttyuukakko{k+1}^{3}=k^{3}+3k^2+3k+1$を用いる。%
+
$\Ttyuukakko{k+1}^{3}-k^{3}=3k^2+3k+1$の$k$に$1$から$n$までの自然数を代入したものを足したものは,%
- \[\Ttyuukakko{n+1}^{3}-1=3\displaystyle \sum_{k=1}^{n} k^2+3\displaystyle \sum_{k=1}^{n} k=\bunsuu{1}{2}n\Ttyuukakko{n+1}+n\]%
- \[\Leftrightarrow\displaystyle \sum_{k=1}^{n} k^2=\bunsuu{1}{6}n\Ttyuukakko{n+1}\Ttyuukakko{2n+1}\]
+\[\Ttyuukakko{n+1}^{3}-1=3\displaystyle\sum_{k=1}^{n} k^2+3\displaystyle\sum_{k=1}^{n} k=\bunsuu{1}{2}n\Ttyuukakko{n+1}+n\]%
+\[\Leftrightarrow\displaystyle\sum_{k=1}^{n} k^2=\bunsuu{1}{6}n\Ttyuukakko{n+1}\Ttyuukakko{2n+1}\]
となる。%
\証明終了%
}%
@@ -3179,56 +3603,62 @@
\ifthenelse{\equal{#1}{性質}\AND\equal{#2}{b}}%
{%
$p\数式カンマスペース q$が$k$に無関係な定数のとき,%
- \[\displaystyle\sum_{k=1}^{n}\Ttyuukakko{pa_{k}+qb_{k}}=p\displaystyle\sum_{k=1}^{n}a_{k}+q\displaystyle\sum_{k=1}^{n}a_{k}\]%
+\[\displaystyle\sum_{k=1}^{n}\Ttyuukakko{pa_{k}+qb_{k}}=p\displaystyle\sum_{k=1}^{n}a_{k}+q\displaystyle\sum_{k=1}^{n}a_{k}\]%
+
}%
- {\relax}%
+ {\relax}%
}%
\NewDocumentCommand{\階差数列}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{一般項}\AND\equal{#2}{i}}%
- {数列${a_{n}}$の階差数列を${b_{n}}$とすると,$2\leqq n$のとき,$a_{n}=a_{1}+\displaystyle\sum_{k=1}^{n-1}b_{k}$}{\relax}%
+ {数列${a_{n}}$の階差数列を${b_{n}}$とすると,$2\leqq n$のとき,$a_{n}=a_{1}+\displaystyle\sum_{k=1}^{n-1}b_{k}$}{\relax}%
\ifthenelse{\equal{#1}{一般項}\AND\equal{#2}{b}}%
{%
数列${a_{n}}$の階差数列を${b_{n}}$とすると,$2\leqq n$のとき,%
- \[a_{n}=a_{1}+\displaystyle\sum_{k=1}^{n-1}b_{k}\]%
+\[a_{n}=a_{1}+\displaystyle\sum_{k=1}^{n-1}b_{k}\]%
+
}%
- {\relax}%
+ {\relax}%
}%
\NewDocumentCommand{\漸化式}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{等差型}\AND\equal{#2}{i}}%
- {$a_{n+1}=a_{n}+d$のとき,$a_{n}=a_{1}+\Ttyuukakko{n-1}d$}{\relax}%
+ {$a_{n+1}=a_{n}+d$のとき,$a_{n}=a_{1}+\Ttyuukakko{n-1}d$}{\relax}%
\ifthenelse{\equal{#1}{等差型}\AND\equal{#2}{b}}%
{%
$a_{n+1}=a_{n}+d$のとき,%
- \[a_{n}=a_{1}+\Ttyuukakko{n-1}d\]%
+\[a_{n}=a_{1}+\Ttyuukakko{n-1}d\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{等比型}\AND\equal{#2}{i}}%
- {$a_{n+1}=ra_{n}$のとき,$a_{n}=a_{1}r^{n-1}$}{\relax}%
+ {$a_{n+1}=ra_{n}$のとき,$a_{n}=a_{1}r^{n-1}$}{\relax}%
\ifthenelse{\equal{#1}{等比型}\AND\equal{#2}{b}}%
{%
$a_{n+1}=ra_{n}$のとき,%
- \[a_{n}=a_{1}r^{n-1}\]%
+\[a_{n}=a_{1}r^{n-1}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{階差型}\AND\equal{#2}{i}}%
- {$a_{n+1}-a_{n}=f\Ttyuukakko{n}$のとき,$a_{1}+\displaystyle \sum_{k=1}^{n-1}f\Ttyuukakko{k}$ただし,$2\leqq n$}{\relax}%
+ {$a_{n+1}-a_{n}=f\Ttyuukakko{n}$のとき,$a_{1}+\displaystyle\sum_{k=1}^{n-1}f\Ttyuukakko{k}$(ただし,$n\geqq 2$)}{\relax}%
\ifthenelse{\equal{#1}{階差型}\AND\equal{#2}{b}}%
{%
$a_{n+1}-a_{n}=f\Ttyuukakko{n}$のとき,%
- \[a_{1}+\displaystyle \sum_{k=1}^{n-1}f\Ttyuukakko{k}\text{\ (ただし,$2\leqq n$)}\]%
+\[a_{1}+\displaystyle\sum_{k=1}^{n-1}f\Ttyuukakko{k}\text{\ (ただし,$n\geqq 2$)}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{特性方程式}\AND\equal{#2}{i}}%
- {$a_{n+1}=pa_{n}+q \Ttyuukakko{p\neq0\数式カンマスペース q\neq0}$のとき,$a_{n+1}-c=p\Ttyuukakko{a_{n}-c}$と変形して等差型に(ただし,$c=pc+q$を満たす)。}{\relax}%
+ {$a_{n+1}=pa_{n}+q \Ttyuukakko{p\neq0\数式カンマスペース q\neq0}$のとき,$a_{n+1}-c=p\Ttyuukakko{a_{n}-c}$と変形して等差型に(ただし,$c=pc+q$を満たす)。}{\relax}%
\ifthenelse{\equal{#1}{特性方程式}\AND\equal{#2}{b}}%
{%
$a_{n+1}=pa_{n}+q \Ttyuukakko{p\neq0\数式カンマスペース q\neq0}$のとき,%
- \[a_{n+1}-c=p\Ttyuukakko{a_{n}-c}\]%
+\[a_{n+1}-c=p\Ttyuukakko{a_{n}-c}\]%
+
と変形して等差型に(ただし,$c=pc+q$を満たす)。%
}%
{\relax}%
@@ -3242,65 +3672,68 @@
\NewDocumentCommand{\共役複素数}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{i}}%
- {$\alpha=a+bi$のとき,共役な複素数$\overline{\alpha}$は$a-bi$}{\relax}%
+ {$\alpha=a+bi$のとき,共役な複素数$\共役{\alpha}$は$a-bi$}{\relax}%
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{b}}%
{%
- $\alpha=a+bi$のとき,共役な複素数$\overline{\alpha}$は%
- \[a-bi\]%
+ $\alpha=a+bi$のとき,共役な複素数$\共役{\alpha}$は%
+\[a-bi\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{性質A}\AND\equal{#2}{i}}%
- {$z$が実数かつ,$\overline{z}=z$ならば,$z$が実数。}{\relax}%
+ {$z$が実数かつ,$\共役{z}=z$ならば,$z$が実数。}{\relax}%
\ifthenelse{\equal{#1}{性質A}\AND\equal{#2}{b}}%
- {$z$が実数かつ,$\overline{z}=z$ならば,$z$が実数。}{\relax}%
+ {$z$が実数かつ,$\共役{z}=z$ならば,$z$が実数。}{\relax}%
\ifthenelse{\equal{#1}{性質B}\AND\equal{#2}{i}}%
- {$z$が純虚数ならば,$\overline{z}=-z\数式カンマスペース z\neq0$}{\relax}%
+ {$z$が純虚数ならば,$\共役{z}=-z\数式カンマスペース z\neq0$}{\relax}%
\ifthenelse{\equal{#1}{性質B}\AND\equal{#2}{b}}%
{%
$z$が純虚数ならば,%
- \[\overline{z}=-z\数式カンマスペース z\neq0\]%
+\[\共役{z}=-z\数式カンマスペース z\neq0\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{性質C}\AND\equal{#2}{i}}%
- {$\overline{z}=-z\数式カンマスペース z\neq0$ならば,$z$が純虚数。 }{\relax}%
+ {$\共役{z}=-z\数式カンマスペース z\neq0$ならば,$z$が純虚数。 }{\relax}%
\ifthenelse{\equal{#1}{性質C}\AND\equal{#2}{b}}%
{%
- \[\overline{z}=-z\数式カンマスペース z\neq0\]%
+\[\共役{z}=-z\数式カンマスペース z\neq0\]%
+
ならば,$z$が純虚数。 %
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{性質D}\AND\equal{#2}{i}}%
- {$\overline{\alpha+\beta}=\overline{\alpha}+\overline{\beta}$}{\relax}%
+ {$\共役{\alpha+\beta}=\共役{\alpha}+\共役{\beta}$}{\relax}%
\ifthenelse{\equal{#1}{性質D}\AND\equal{#2}{b}}%
- {\[\overline{\alpha+\beta}=\overline{\alpha}+\overline{\beta}\]}{\relax}%
+ {\[\共役{\alpha+\beta}=\共役{\alpha}+\共役{\beta}\]}{\relax}%
\ifthenelse{\equal{#1}{性質E}\AND\equal{#2}{i}}%
- {$\overline{\alpha-\beta}=\overline{\alpha}-\overline{\beta}$}{\relax}%
+ {$\共役{\alpha-\beta}=\共役{\alpha}-\共役{\beta}$}{\relax}%
\ifthenelse{\equal{#1}{性質E}\AND\equal{#2}{b}}%
- {\[\overline{\alpha-\beta}=\overline{\alpha}-\overline{\beta}\]}{\relax}%
+ {\[\共役{\alpha-\beta}=\共役{\alpha}-\共役{\beta}\]}{\relax}%
\ifthenelse{\equal{#1}{性質F}\AND\equal{#2}{i}}%
- {$\overline{\alpha\beta}=\overline{\alpha}\overline{\beta}$}{\relax}%
+ {$\共役{\alpha\beta}=\共役{\alpha}\共役{\beta}$}{\relax}%
\ifthenelse{\equal{#1}{性質F}\AND\equal{#2}{b}}%
- {\[\overline{\alpha\beta}=\overline{\alpha}\overline{\beta}\]}{\relax}%
+ {\[\共役{\alpha\beta}=\共役{\alpha}\共役{\beta}\]}{\relax}%
\ifthenelse{\equal{#1}{性質G}\AND\equal{#2}{i}}%
- {$\overline{\Ttyuukakko{\bunsuu{\alpha}{\beta}}}=\bunsuu{\overline{\alpha}}{\overline{\beta}}$}{\relax}%
+ {$\共役{\Ttyuukakko{\bunsuu{\alpha}{\beta}}}=\bunsuu{\共役{\alpha}}{\共役{\beta}}$}{\relax}%
\ifthenelse{\equal{#1}{性質G}\AND\equal{#2}{b}}%
- {\[\overline{\Ttyuukakko{\bunsuu{\alpha}{\beta}}}=\bunsuu{\overline{\alpha}}{\overline{\beta}}\]}{\relax}%
+ {\[\共役{\Ttyuukakko{\bunsuu{\alpha}{\beta}}}=\bunsuu{\共役{\alpha}}{\共役{\beta}}\]}{\relax}%
\ifthenelse{\equal{#1}{証明}}%
{%
\証明開始%
$\alpha=a+bi\数式カンマスペース\beta=c+di$\quad($a\数式カンマスペース b c\数式カンマスペース d$は実数かつ$a\neq0\数式カンマスペース c\neq0$)として,%
\begin{align*}%
- \overline{\alpha+\beta}&=\overline{\Ttyuukakko{a+c}+\Ttyuukakko{b+d}i}&\\%
+ \共役{\alpha+\beta}&=\共役{\Ttyuukakko{a+c}+\Ttyuukakko{b+d}i}&\\%
&=\Ttyuukakko{a+c}-\Ttyuukakko{b+d}i&\\%
&=\Ttyuukakko{a-ci}+\Ttyuukakko{b-di}&\\%
- &=\overline{\alpha}+\overline{\beta}%
+ &=\共役{\alpha}+\共役{\beta}%
\end{align*}%
\begin{align*}%
- \overline{\alpha\beta}&=\overline{\Ttyuukakko{a+bi}\Ttyuukakko{c+di}}&\\%
- &=\overline{\Ttyuukakko{ac-bd}+\Ttyuukakko{ad+bc}i}&\\
+ \共役{\alpha\beta}&=\共役{\Ttyuukakko{a+bi}\Ttyuukakko{c+di}}&\\%
+ &=\共役{\Ttyuukakko{ac-bd}+\Ttyuukakko{ad+bc}i}&\\
&=\Ttyuukakko{ac-bd}-\Ttyuukakko{ad+bc}i&\\%
&=\Ttyuukakko{a-bi}\Ttyuukakko{c-di}&\\%
- &=\overline{\alpha}\overline{\beta}%
+ &=\共役{\alpha}\共役{\beta}%
\end{align*}%
\証明終了%
}%
@@ -3315,17 +3748,18 @@
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{b}}%
{%
複素数$z=a+bi$に対して,%
- \[\Tzettaiti{z}=\Tzettaiti{a+bi}=\根号{a^2+b^2}\]%
+\[\Tzettaiti{z}=\Tzettaiti{a+bi}=\根号{a^2+b^2}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{性質A}\AND\equal{#2}{i}}%
- {$\Tzettaiti{z}=\Tzettaiti{\overline{z}}=\Tzettaiti{-z}$}{\relax}%
+ {$\Tzettaiti{z}=\Tzettaiti{\共役{z}}=\Tzettaiti{-z}$}{\relax}%
\ifthenelse{\equal{#1}{性質A}\AND\equal{#2}{b}}%
- {\[\Tzettaiti{z}=\Tzettaiti{\overline{z}}=\Tzettaiti{-z}\]}{\relax}%
+ {\[\Tzettaiti{z}=\Tzettaiti{\共役{z}}=\Tzettaiti{-z}\]}{\relax}%
\ifthenelse{\equal{#1}{性質B}\AND\equal{#2}{i}}%
- {$z\overline{z}=\Tzettaiti{z^2}$}{\relax}%
+ {$z\共役{z}=\Tzettaiti{z^2}$}{\relax}%
\ifthenelse{\equal{#1}{性質B}\AND\equal{#2}{b}}%
- {\[z\overline{z}=\Tzettaiti{z^2}\]}{\relax}%
+ {\[z\共役{z}=\Tzettaiti{z^2}\]}{\relax}%
}%
@@ -3337,27 +3771,32 @@
{%
複素数$\alpha=a+bi$について,%
\[\alpha=r\Ttyuukakko{\cos\theta+i\sin\theta}\text{\ (ただし$z>0$)}\]%
+
また,$r=\Tzettaiti{\alpha}=\根号{a^2+b^2}\数式カンマスペース\cos\theta=\bunsuu{a}{r}\数式カンマスペース\sin\theta=\bunsuu{b}{r}$を極形式という。%
}%
{\relax}%
\ifthenelse{\equal{#1}{性質A}\AND\equal{#2}{i}}%
{%
- $\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$を複素数とする。$\alpha=r_{1}\Ttyuukakko{\cos\theta_{1}+i\sin\theta_{1}}\数式カンマスペース\beta=r_{2}\Ttyuukakko{\cos\theta_{2}+i\sin\theta_{2}}$のとき,\par%
+ $\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$を複素数とする。$\alpha=r_{1}\Ttyuukakko{\cos\theta_{1}+i\sin\theta_{1}}\数式カンマスペース\beta=r_{2}\Ttyuukakko{\cos\theta_{2}+i\sin\theta_{2}}$のとき,%
+
$\alpha\beta=r_{1}r_{2}\Tdaikakko{\cos\Ttyuukakko{\theta_{1}+\theta_{2}}+i\sin\Ttyuukakko{\theta_{1}+\theta_{2}}}$}{\relax}%
\ifthenelse{\equal{#1}{性質A}\AND\equal{#2}{b}}%
{%
$\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$を複素数とする。$\alpha=r_{1}\Ttyuukakko{\cos\theta_{1}+i\sin\theta_{1}}\数式カンマスペース\beta=r_{2}\Ttyuukakko{\cos\theta_{2}+i\sin\theta_{2}}$のとき,%
- \[\alpha\beta=r_{1}r_{2}\Tdaikakko{\cos\Ttyuukakko{\theta_{1}+\theta_{2}}+i\sin\Ttyuukakko{\theta_{1}+\theta_{2}}}\]%
+\[\alpha\beta=r_{1}r_{2}\Tdaikakko{\cos\Ttyuukakko{\theta_{1}+\theta_{2}}+i\sin\Ttyuukakko{\theta_{1}+\theta_{2}}}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{性質B}\AND\equal{#2}{i}}%
{%
- $\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$を複素数とする。$\alpha=r_{1}\Ttyuukakko{\cos\theta_{1}+i\sin\theta_{1}}\数式カンマスペース\beta=r_{2}\Ttyuukakko{\cos\theta_{2}+i\sin\theta_{2}}$のとき,\par%
+ $\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$を複素数とする。$\alpha=r_{1}\Ttyuukakko{\cos\theta_{1}+i\sin\theta_{1}}\数式カンマスペース\beta=r_{2}\Ttyuukakko{\cos\theta_{2}+i\sin\theta_{2}}$のとき,%
+
$\bunsuu{\alpha}{\beta}=\bunsuu{r_{1}}{r_{2}}\Tdaikakko{\cos\Ttyuukakko{\theta_{1}+\theta_{2}}+i\sin\Ttyuukakko{\theta_{1}+\theta_{2}}}$}{\relax}%
\ifthenelse{\equal{#1}{性質B}\AND\equal{#2}{b}}%
{%
$\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$を複素数とする。$\alpha=r_{1}\Ttyuukakko{\cos\theta_{1}+i\sin\theta_{1}}\数式カンマスペース\beta=r_{2}\Ttyuukakko{\cos\theta_{2}+i\sin\theta_{2}}$のとき,%
- \[\bunsuu{\alpha}{\beta}=\bunsuu{r_{1}}{r_{2}}\Tdaikakko{\cos\Ttyuukakko{\theta_{1}+\theta_{2}}+i\sin\Ttyuukakko{\theta_{1}+\theta_{2}}}\]%
+\[\bunsuu{\alpha}{\beta}=\bunsuu{r_{1}}{r_{2}}\Tdaikakko{\cos\Ttyuukakko{\theta_{1}+\theta_{2}}+i\sin\Ttyuukakko{\theta_{1}+\theta_{2}}}\]%
+
}%
{\relax}%
}%
@@ -3368,41 +3807,46 @@
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{i}}%
{%
複素数$\alpha=a+bi$について,$\alpha=r\Ttyuukakko{\cos\theta+i\sin\theta}$\par
- ただし$z>0$のとき$\theta$を偏角といい,$\mathrm{aug}\alpha$で表す。%
+ ただし$z>0$のとき$\theta$を偏角といい,$\text{aug}\alpha$で表す。%
}%
{\relax}%
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{b}}%
{%
複素数$\alpha=a+bi$について,%
- \[\alpha=r\Ttyuukakko{\cos\theta+i\sin\theta}\]%
+\[\alpha=r\Ttyuukakko{\cos\theta+i\sin\theta}\]%
+
ただし$z>0$のとき$\theta$を偏角といい,%
- \[\mathrm{aug}\alpha\]%
+\[\text{aug}\alpha\]%
+
で表す。%
}%
{\relax}%
\ifthenelse{\equal{#1}{性質A}\AND\equal{#2}{i}}%
- {$\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$を複素数とする。$\alpha=r_{1}\Ttyuukakko{\cos\theta_{1}+i\sin\theta_{1}}\数式カンマスペース\beta=r_{2}\Ttyuukakko{\cos\theta_{2}+i\sin\theta_{2}}$のとき,$\theta_{1}=\mathrm{arg}\alpha$また,$\mathrm{arg}\alpha=\theta_{1}+2n\pi$ ($n$は整数)}{\relax}%
+ {$\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$を複素数とする。$\alpha=r_{1}\Ttyuukakko{\cos\theta_{1}+i\sin\theta_{1}}\数式カンマスペース\beta=r_{2}\Ttyuukakko{\cos\theta_{2}+i\sin\theta_{2}}$のとき,$\theta_{1}=\text{arg}\alpha$また,$\text{arg}\alpha=\theta_{1}+2n\pi$ ($n$は整数)}{\relax}%
\ifthenelse{\equal{#1}{性質A}\AND\equal{#2}{b}}%
{%
$\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$を複素数とする。$\alpha=r_{1}\Ttyuukakko{\cos\theta_{1}+i\sin\theta_{1}}\数式カンマスペース\beta=r_{2}\Ttyuukakko{\cos\theta_{2}+i\sin\theta_{2}}$のとき,%
- \[\theta_{1}=\theta_{1}+2n\pi=\mathrm{arg}\alpha\]%
+\[\theta_{1}=\theta_{1}+2n\pi=\text{arg}\alpha\]%
+
($n$は整数)%
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{性質B}\AND\equal{#2}{i}}%
- {$\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$を複素数とする。$\alpha=r_{1}\Ttyuukakko{\cos\theta_{1}+i\sin\theta_{1}}\数式カンマスペース\beta=r_{2}\Ttyuukakko{\cos\theta_{2}+i\sin\theta_{2}}$のとき,$\mathrm{arg}z_{1}z_{2}=\mathrm{arg}z_{1}+\mathrm{arg}z_{2}$}{\relax}%
+ {$\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$を複素数とする。$\alpha=r_{1}\Ttyuukakko{\cos\theta_{1}+i\sin\theta_{1}}\数式カンマスペース\beta=r_{2}\Ttyuukakko{\cos\theta_{2}+i\sin\theta_{2}}$のとき,$\text{arg}z_{1}z_{2}=\text{arg}z_{1}+\text{arg}z_{2}$}{\relax}%
\ifthenelse{\equal{#1}{性質B}\AND\equal{#2}{b}}%
{%
$\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$を複素数とする。$\alpha=r_{1}\Ttyuukakko{\cos\theta_{1}+i\sin\theta_{1}}\数式カンマスペース\beta=r_{2}\Ttyuukakko{\cos\theta_{2}+i\sin\theta_{2}}$のとき,%
- \[\mathrm{arg}z_{1}z_{2}=\mathrm{arg}z_{1}+\mathrm{arg}z_{2}\]%
+\[\text{arg}z_{1}z_{2}=\text{arg}z_{1}+\text{arg}z_{2}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{性質C}\AND\equal{#2}{i}}%
- {$\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$を複素数とする。$\alpha=r_{1}\Ttyuukakko{\cos\theta_{1}+i\sin\theta_{1}}\数式カンマスペース\beta=r_{2}\Ttyuukakko{\cos\theta_{2}+i\sin\theta_{2}}$のとき,$\mathrm{arg}\bunsuu{z_{1}}{z_{2}}=\mathrm{arg}z_{1}-\mathrm{arg}z_{2}$}{\relax}%
+ {$\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$を複素数とする。$\alpha=r_{1}\Ttyuukakko{\cos\theta_{1}+i\sin\theta_{1}}\数式カンマスペース\beta=r_{2}\Ttyuukakko{\cos\theta_{2}+i\sin\theta_{2}}$のとき,$\text{arg}\bunsuu{z_{1}}{z_{2}}=\text{arg}z_{1}-\text{arg}z_{2}$}{\relax}%
\ifthenelse{\equal{#1}{性質C}\AND\equal{#2}{b}}%
{%
$\alpha\数式カンマスペース\beta\数式カンマスペース\gamma$を複素数とする。$\alpha=r_{1}\Ttyuukakko{\cos\theta_{1}+i\sin\theta_{1}}\数式カンマスペース\beta=r_{2}\Ttyuukakko{\cos\theta_{2}+i\sin\theta_{2}}$のとき,%
- \[\mathrm{arg}\bunsuu{z_{1}}{z_{2}}=\mathrm{arg}z_{1}-\mathrm{arg}z_{2}\]%
+\[\text{arg}\bunsuu{z_{1}}{z_{2}}=\text{arg}z_{1}-\text{arg}z_{2}\]%
+
}%
{\relax}%
}%
@@ -3415,19 +3859,21 @@
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
$n$が整数のとき,%
- \[\Ttyuukakko{\cos\theta+i\sin\theta}^{n}=\cos n\theta+i\sin n\theta\]%
+\[\Ttyuukakko{\cos\theta+i\sin\theta}^{n}=\cos n\theta+i\sin n\theta\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{証明}}%
{%
\証明開始%
複素数%
- \[\alpha_{1}=r_{1}\Ttyuukakko{\cos\theta_{1}+i\sin\theta_{1}}\数式カンマスペース\alpha_{2}=r_{2}\Ttyuukakko{\cos\theta_{2}+i\sin\theta_{2}}\ldots\alpha_{n}=r_{n}\Ttyuukakko{\cos\theta_{n}+i\sin\theta_{n}}\]
+\[\alpha_{1}=r_{1}\Ttyuukakko{\cos\theta_{1}+i\sin\theta_{1}}\数式カンマスペース\alpha_{2}=r_{2}\Ttyuukakko{\cos\theta_{2}+i\sin\theta_{2}}\ldots\alpha_{n}=r_{n}\Ttyuukakko{\cos\theta_{n}+i\sin\theta_{n}}\]
に対して,$\alpha_{1}\alpha_{2}\cdots\alpha_{n}$を考えると,三角関数の積和の公式から%
\[\alpha_{1}\alpha_{2}\cdots\alpha_{n}=r_{1}r_{2}\cdots r_{n}\Tdaikakko{\cos\Ttyuukakko{\theta_{1}+\theta_{2}+\cdots+\theta_{n}}+i\sin\Ttyuukakko{\theta_{1}+\theta_{2}+\cdots+\theta_{n}}}\]%
- となる。ここで,$\alpha_{1}=\alpha_{2}=\cdots=\alpha_{n}$のとき,%
- \[\alpha^{n}=r^{n}\Ttyuukakko{\cos\theta+i\sin\theta}^{n}=r^{n}\Ttyuukakko{\cos n\theta+i\sin n\theta}\]%
- \[\Leftrightarrow\Ttyuukakko{\cos\theta+i\sin\theta}^{n}=\cos n\theta+i\sin n\theta\]%
+
+ となる。ここで,$\alpha_{1}=\alpha_{2}=\cdots=\alpha_{n}$のとき,% \[\alpha^{n}=r^{n}\Ttyuukakko{\cos\theta+i\sin\theta}^{n}=r^{n}\Ttyuukakko{\cos n\theta+i\sin n\theta}\]%
+\[\Leftrightarrow\Ttyuukakko{\cos\theta+i\sin\theta}^{n}=\cos n\theta+i\sin n\theta\]%
+
を得る。%
\証明終了%
}%
@@ -3442,28 +3888,31 @@
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{b}}%
{定点$F$ (焦点)と$F$を通らない直線$l$ (準線)があるとき,焦点と準線からの距離の和が一定な点の軌跡。}{\relax}%
\ifthenelse{\equal{#1}{性質A}\AND\equal{#2}{i}}%
- {放物線は$y^2=4px$と表せられる。}{\relax}%
+ {放物線は$y^2=4px$と表せられる。}{\relax}%
\ifthenelse{\equal{#1}{性質A}\AND\equal{#2}{b}}%
{%
放物線は%
- \[y^2=4px\]%
+\[y^2=4px\]%
+
と表せられる。%
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{性質B}\AND\equal{#2}{i}}%
{放物線の焦点は$F\Ttyuukakko{p\数式カンマスペース 0}$}{\relax}%
\ifthenelse{\equal{#1}{性質B}\AND\equal{#2}{b}}%
{%
放物線の焦点は%
- \[F\Ttyuukakko{p\数式カンマスペース 0}\]%
+\[F\Ttyuukakko{p\数式カンマスペース 0}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{性質C}\AND\equal{#2}{i}}%
{放物線の準線は$x=-p$}{\relax}%
\ifthenelse{\equal{#1}{性質C}\AND\equal{#2}{b}}%
{%
放物線の準線は%
- \[x=-p\]%
+\[x=-p\]%
+
}%
{\relax}%
}%
@@ -3480,24 +3929,27 @@
\ifthenelse{\equal{#1}{性質A}\AND\equal{#2}{b}}%
{%
楕円は%
- \[\bunsuu{x^2}{a^2}+\bunsuu{y^2}{b^2}=1\]%
+\[\bunsuu{x^2}{a^2}+\bunsuu{y^2}{b^2}=1\]%
+
と表せられる。%
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{性質B}\AND\equal{#2}{i}}%
{楕円の焦点は$F\Ttyuukakko{\根号{a^2-b^2}\数式カンマスペース 0}$と,$F'\Ttyuukakko{\根号{a^2-b^2}\数式カンマスペース 0}$}{\relax}%
\ifthenelse{\equal{#1}{性質B}\AND\equal{#2}{b}}%
{%
楕円の焦点は%
- \[F\Ttyuukakko{\根号{a^2-b^2}\数式カンマスペース 0} F'\Ttyuukakko{\根号{a^2-b^2}\数式カンマスペース 0}\]%
+\[F\Ttyuukakko{\根号{a^2-b^2}\数式カンマスペース 0} F'\Ttyuukakko{\根号{a^2-b^2}\数式カンマスペース 0}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{性質C}\AND\equal{#2}{i}}%
{楕円の二つの焦点からの距離の和は$2a$である。}{\relax}%
\ifthenelse{\equal{#1}{性質C}\AND\equal{#2}{b}}%
{%
楕円の二つの焦点からの距離の和は%
- \[2a\]%
+\[2a\]%
+
}%
{\relax}%
}%
@@ -3514,32 +3966,36 @@
\ifthenelse{\equal{#1}{性質A}\AND\equal{#2}{b}}%
{%
双曲線は%
- \[\bunsuu{x^2}{a^2}-\bunsuu{y^2}{b^2}=1\]%
+\[\bunsuu{x^2}{a^2}-\bunsuu{y^2}{b^2}=1\]%
+
と表せられる。%
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{性質B}\AND\equal{#2}{i}}%
{双曲線の焦点は$F\Ttyuukakko{\根号{a^2+b^2}\数式カンマスペース 0}$と,$F'\Ttyuukakko{\根号{a^2+b^2}\数式カンマスペース 0}$}{\relax}%
\ifthenelse{\equal{#1}{性質B}\AND\equal{#2}{b}}%
{%
双曲線の焦点は%
- \[F\Ttyuukakko{\根号{a^2+b^2}\数式カンマスペース 0} F'\Ttyuukakko{\根号{a^2+b^2}\数式カンマスペース 0}\]%
+\[F\Ttyuukakko{\根号{a^2+b^2}\数式カンマスペース 0} F'\Ttyuukakko{\根号{a^2+b^2}\数式カンマスペース 0}\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{性質C}\AND\equal{#2}{i}}%
{双曲線の二つの焦点からの距離の差は$2a$ }{\relax}%
\ifthenelse{\equal{#1}{性質C}\AND\equal{#2}{b}}%
{%
双曲線の二つの焦点からの距離の差は%
- \[2a\]%
+\[2a\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{性質D}\AND\equal{#2}{i}}%
{双曲線の漸近線は$\bunsuu{x}{a}-\bunsuu{y}{b}=0\数式カンマスペース\bunsuu{x}{a}+\bunsuu{y}{b}=0$}{\relax}%
\ifthenelse{\equal{#1}{性質D}\AND\equal{#2}{b}}%
{%
双曲線の漸近線は%
- \[\bunsuu{x}{a}-\bunsuu{y}{b}=0\数式カンマスペース\bunsuu{x}{a}+\bunsuu{y}{b}=0\]%
+\[\bunsuu{x}{a}-\bunsuu{y}{b}=0\数式カンマスペース\bunsuu{x}{a}+\bunsuu{y}{b}=0\]%
+
}%
{\relax}%
}%
@@ -3548,11 +4004,12 @@
\NewDocumentCommand{\連続な関数}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
- {定義域の$x$の値$a$に関して,$\displaystyle \lim_{x \to a}f\Ttyuukakko{x}=f\Ttyuukakko{a}$のとき,$f\Ttyuukakko{x}$は$x=a$で連続。}{\relax}%
+ {定義域の$x$の値$a$に関して,$\displaystyle\lim_{x \to a}f\Ttyuukakko{x}=f\Ttyuukakko{a}$のとき,$f\Ttyuukakko{x}$は$x=a$で連続。}{\relax}%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
定義域の$x$の値$a$に関して,%
- \[\displaystyle \lim_{x \to a}f\Ttyuukakko{x}=f\Ttyuukakko{a}\]%
+\[\displaystyle\lim_{x \to a}f\Ttyuukakko{x}=f\Ttyuukakko{a}\]%
+
のとき,$f\Ttyuukakko{x}$は$x=a$で連続。%
}%
{\relax}%
@@ -3566,7 +4023,8 @@
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
閉区間$[a\数式カンマスペース b]$で連続な関数$f\Ttyuukakko{x}$について,$f\Ttyuukakko{a}\neq f\Ttyuukakko{b}$のとき,$f\Ttyuukakko{a}$と$f\Ttyuukakko{b}$の間の任意の実数$k$について,%
- \[f\Ttyuukakko{c}=k\]%
+\[f\Ttyuukakko{c}=k\]%
+
となる$c$が少なからず一つ存在する。%
}%
{\relax}%
@@ -3580,7 +4038,8 @@
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
関数$f\Ttyuukakko{x}$が閉区間$[a\数式カンマスペース b]$で連続,開区間$\Ttyuukakko{a\数式カンマスペース b}$で微分可能ならば,%
- \[\bunsuu{f\Ttyuukakko{b}-f\Ttyuukakko{a}}{b-a}=f'\Ttyuukakko{c} \Ttyuukakko{a<c<b}\]%
+\[\bunsuu{f\Ttyuukakko{b}-f\Ttyuukakko{a}}{b-a}=f'\Ttyuukakko{c} \Ttyuukakko{a<c<b}\]%
+
を満たす$c$が存在する。%
}%
{\relax}%
@@ -3613,34 +4072,35 @@
{$\Ttyuukakko{x^{\alpha}}'=\alpha x^{\alpha-1}$ ($\alpha$は実数)}{\relax}%
\ifthenelse{\equal{#1}{初等関数の微分公式B}\AND\equal{#2}{b}}%
{%
- \[\Ttyuukakko{x^{\alpha}}'=\alpha x^{\alpha-1}\]%
+\[\Ttyuukakko{x^{\alpha}}'=\alpha x^{\alpha-1}\]%
+
$\alpha$は実数%
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{初等関数の微分公式C}\AND\equal{#2}{i}}%
{$\Ttyuukakko{\sin x}'=\cos x$}{\relax}%
\ifthenelse{\equal{#1}{初等関数の微分公式C}\AND\equal{#2}{b}}%
- {\[\Ttyuukakko{\sin x}'=\cos x\]}{\relax}%
+ {\[\Ttyuukakko{\sin x}'=\cos x\]}{\relax}%
\ifthenelse{\equal{#1}{初等関数の微分公式D}\AND\equal{#2}{i}}%
{$\Ttyuukakko{\cos x}'=-\sin x$}{\relax}%
\ifthenelse{\equal{#1}{初等関数の微分公式D}\AND\equal{#2}{b}}%
- {\[\Ttyuukakko{\cos x}'=-\sin x\]}{\relax}%
+ {\[\Ttyuukakko{\cos x}'=-\sin x\]}{\relax}%
\ifthenelse{\equal{#1}{初等関数の微分公式E}\AND\equal{#2}{i}}%
{$\Ttyuukakko{\tan x}'=\bunsuu{1}{\cos^2x}$}{\relax}%
\ifthenelse{\equal{#1}{初等関数の微分公式E}\AND\equal{#2}{b}}%
- {\[\Ttyuukakko{\tan x}'=\bunsuu{1}{\cos^2x}\]}{\relax}%
+ {\[\Ttyuukakko{\tan x}'=\bunsuu{1}{\cos^2x}\]}{\relax}%
\ifthenelse{\equal{#1}{初等関数の微分公式F}\AND\equal{#2}{i}}%
{$\Ttyuukakko{\log\Tzettaiti{x}}'=\bunsuu{1}{x}$}{\relax}%
\ifthenelse{\equal{#1}{初等関数の微分公式F}\AND\equal{#2}{b}}%
- {\[\Ttyuukakko{\log\Tzettaiti{x}}'=\bunsuu{1}{x}\]}{\relax}%
+ {\[\Ttyuukakko{\log\Tzettaiti{x}}'=\bunsuu{1}{x}\]}{\relax}%
\ifthenelse{\equal{#1}{初等関数の微分公式G}\AND\equal{#2}{i}}%
{$\Ttyuukakko{\log_{a}\Tzettaiti{x}}'=\bunsuu{1}{x\log a}$}{\relax}%
\ifthenelse{\equal{#1}{初等関数の微分公式G}\AND\equal{#2}{b}}%
- {\[\Ttyuukakko{\log_{a}\Tzettaiti{x}}'=\bunsuu{1}{x\log a}\]}{\relax}%
+ {\[\Ttyuukakko{\log_{a}\Tzettaiti{x}}'=\bunsuu{1}{x\log a}\]}{\relax}%
\ifthenelse{\equal{#1}{初等関数の微分公式H}\AND\equal{#2}{i}}%
{$\Ttyuukakko{e^{x}}'=e^{x}$}{\relax}%
\ifthenelse{\equal{#1}{初等関数の微分公式H}\AND\equal{#2}{b}}%
- {\[\Ttyuukakko{e^{x}}'=e^{x}\]}{\relax}%
+ {\[\Ttyuukakko{e^{x}}'=e^{x}\]}{\relax}%
\ifthenelse{\equal{#1}{初等関数の微分公式I}\AND\equal{#2}{i}}%
{$\Ttyuukakko{a^{x}}'=a^{x}\log a$}{\relax}%
\ifthenelse{\equal{#1}{初等関数の微分公式I}\AND\equal{#2}{b}}%
@@ -3677,13 +4137,15 @@
&=\log e\cdot\bunsuu{1}{x}&\\%
&=\bunsuu{1}{x}
\end{align*}%
- $f\Ttyuukakko{x}=e^{x}$とおく。\par%
+ $f\Ttyuukakko{x}=e^{x}$とおく。%
+
\begin{align*}%
\Ttyuukakko{e^{x}}'&=\displaystyle\lim_{h \to 0} \bunsuu{e^{x+h}-e^{x}}{h}&\\%
&=e^{x}\displaystyle\lim_{h \to 0} \bunsuu{e^{h}-1}{h}%
\end{align*}%
- ここで$\Ttyuukakko{\log x}'=\bunsuu{1}{x}$より,$y=\log x$の$x=1$においての接線の傾きは$1$であり,$y=\log x$と$y=e^{x}$は$y=x$において対称であるので$y=e^{x}$の$x=0$においての接線の傾きも$1$なので,
+ ここで$\Ttyuukakko{\log x}'=\bunsuu{1}{x}$より,$y=\log x$の$x=1$においての接線の傾きは$1$であり,$y=\log x$と$y=e^{x}$は$y=x$において対称であるので$y=e^{x}$の$x=0$においての接線の傾きも$1$なので,%
\[f'\Ttyuukakko{0}\displaystyle\lim_{h \to 0} \bunsuu{e^{h}-1}{h}=1\]%
+
よって,%
\begin{align*}%
\Ttyuukakko{e^{x}}'&=e^{x}\displaystyle\lim_{h \to 0} \bunsuu{e^{h}-1}{h}&\\%
@@ -3703,7 +4165,8 @@
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
曲線$f\Ttyuukakko{x}$上の点$A\Ttyuukakko{a\数式カンマスペース f\Ttyuukakko{a}}$における法線の方程式は,%
- \[y-f\Ttyuukakko{a}=-\bunsuu{1}{f'\Ttyuukakko{a}}\Ttyuukakko{x-a}\]%
+\[y-f\Ttyuukakko{a}=-\bunsuu{1}{f'\Ttyuukakko{a}}\Ttyuukakko{x-a}\]%
+
}%
{\relax}%
}%
@@ -3712,71 +4175,79 @@
\NewDocumentCommand{\不定積分}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{i}}%
- {$F'\Ttyuukakko{x}=f\Ttyuukakko{x}$とすると,$\displaystyle \int_{}^{} f\Ttyuukakko{x}dx=F\Ttyuukakko{x}+C\text{\ (\,$C$は積分定数)}$}{\relax}%
+ {$F'\Ttyuukakko{x}=f\Ttyuukakko{x}$とすると,$\displaystyle\int_{}^{}f\Ttyuukakko{x}dx=F\Ttyuukakko{x}+C\text{\ (\,$C$は積分定数)}$}{\relax}%
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{b}}%
{%
$F'\Ttyuukakko{x}=f\Ttyuukakko{x}$とすると,%
- \[\displaystyle \int_{}^{} f\Ttyuukakko{x}dx=F\Ttyuukakko{x}+C\text{\ (\,$C$は積分定数)}\]%
+\[\displaystyle\int_{}^{}f\Ttyuukakko{x}dx=F\Ttyuukakko{x}+C\text{\ (\,$C$は積分定数)}\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{置換積分}\AND\equal{#2}{i}}%
- {$\displaystyle \int_{}^{} f\Ttyuukakko{x}dx=\displaystyle \int_{}^{}f\Ttyuukakko{g\Ttyuukakko{t}}g'\Ttyuukakko{t}dt$ ($x=g\Ttyuukakko{t}$に置換)}{\relax}%
+ {$\displaystyle\int_{}^{}f\Ttyuukakko{x}dx=\displaystyle\int_{}^{}f\Ttyuukakko{g\Ttyuukakko{t}}g'\Ttyuukakko{t}dt$ ($x=g\Ttyuukakko{t}$に置換)}{\relax}%
\ifthenelse{\equal{#1}{置換積分}\AND\equal{#2}{b}}%
{%
- \[\displaystyle \int_{}^{} f\Ttyuukakko{x}dx=\displaystyle \int_{}^{}f\Ttyuukakko{g\Ttyuukakko{t}}g'\Ttyuukakko{t}dt\]%
+\[\displaystyle\int_{}^{}f\Ttyuukakko{x}dx=\displaystyle\int_{}^{}f\Ttyuukakko{g\Ttyuukakko{t}}g'\Ttyuukakko{t}dt\]%
+
($x=g\Ttyuukakko{t}$に置換)%
}%
{\relax}%
\ifthenelse{\equal{#1}{部分積分}\AND\equal{#2}{i}}%
- {$\displaystyle \int_{}^{} f\Ttyuukakko{x}g'\Ttyuukakko{x}dx=f\Ttyuukakko{x}g\Ttyuukakko{x}-\displaystyle \int_{}^{}f'\Ttyuukakko{x}g\Ttyuukakko{x}$}{\relax}%
+ {$\displaystyle\int_{}^{}f\Ttyuukakko{x}g'\Ttyuukakko{x}dx=f\Ttyuukakko{x}g\Ttyuukakko{x}-\displaystyle\int_{}^{}f'\Ttyuukakko{x}g\Ttyuukakko{x}$}{\relax}%
\ifthenelse{\equal{#1}{部分積分}\AND\equal{#2}{b}}%
- {\[\displaystyle \int_{}^{} f\Ttyuukakko{x}g'\Ttyuukakko{x}dx=f\Ttyuukakko{x}g\Ttyuukakko{x}-\displaystyle \int_{}^{}f'\Ttyuukakko{x}g\Ttyuukakko{x}\]}{\relax}%
+ {\[\displaystyle\int_{}^{}f\Ttyuukakko{x}g'\Ttyuukakko{x}dx=f\Ttyuukakko{x}g\Ttyuukakko{x}-\displaystyle\int_{}^{}f'\Ttyuukakko{x}g\Ttyuukakko{x}\]}{\relax}%
\ifthenelse{\equal{#1}{初等関数の積分公式A}\AND\equal{#2}{i}}%
- {$C$は積分定数とする。$\displaystyle \int_{}^{} x^{\alpha}dx=\bunsuu{1}{\alpha+1}x^{\alpha+1}+C$}{\relax}%
+ {$C$は積分定数とする。$\displaystyle\int_{}^{}x^{\alpha}dx=\bunsuu{1}{\alpha+1}x^{\alpha+1}+C$}{\relax}%
\ifthenelse{\equal{#1}{初等関数の積分公式A}\AND\equal{#2}{b}}%
{%
$C$は積分定数とする。%
- \[\displaystyle \int_{}^{} x^{\alpha}dx=\bunsuu{1}{\alpha+1}x^{\alpha+1}+C\]%
+\[\displaystyle\int_{}^{}x^{\alpha}dx=\bunsuu{1}{\alpha+1}x^{\alpha+1}+C\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{初等関数の積分公式B}\AND\equal{#2}{i}}%
- {$C$は積分定数とする。$\displaystyle \int_{}^{} \bunsuu{1}{x}dx=\log\Tzettaiti{x}+C$}{\relax}%
+ {$C$は積分定数とする。$\displaystyle\int_{}^{}\bunsuu{1}{x}dx=\log\Tzettaiti{x}+C$}{\relax}%
\ifthenelse{\equal{#1}{初等関数の積分公式B}\AND\equal{#2}{b}}%
{%
$C$は積分定数とする。%
- \[\displaystyle \int_{}^{} \bunsuu{1}{x}dx=\log\Tzettaiti{x}+C\]%
+\[\displaystyle\int_{}^{}\bunsuu{1}{x}dx=\log\Tzettaiti{x}+C\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{初等関数の積分公式C}\AND\equal{#2}{i}}%
- {$C$は積分定数とする。$\displaystyle \int_{}^{} \sin xdx=-\cos x+C$}{\relax}%
+ {$C$は積分定数とする。$\displaystyle\int_{}^{}\sin xdx=-\cos x+C$}{\relax}%
\ifthenelse{\equal{#1}{初等関数の積分公式C}\AND\equal{#2}{b}}%
{%
$C$は積分定数とする。%
- \[\displaystyle \int_{}^{} \sin xdx=-\cos x+C\]%
+\[\displaystyle\int_{}^{}\sin xdx=-\cos x+C\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{初等関数の積分公式D}\AND\equal{#2}{i}}%
- {$C$は積分定数とする。$\displaystyle \int_{}^{} \cos xdx=\sin x+C$}{\relax}%
+ {$C$は積分定数とする。$\displaystyle\int_{}^{}\cos xdx=\sin x+C$}{\relax}%
\ifthenelse{\equal{#1}{初等関数の積分公式D}\AND\equal{#2}{b}}%
{%
$C$は積分定数とする。%
- \[\displaystyle \int_{}^{} \cos xdx=\sin x+C\]%
+\[\displaystyle\int_{}^{}\cos xdx=\sin x+C\]%
+
}%
{\relax}%
\ifthenelse{\equal{#1}{初等関数の積分公式E}\AND\equal{#2}{i}}%
- {$C$は積分定数とする。$\displaystyle \int_{}^{} e^{x}dx=e^{x}+C$}{\relax}%
+ {$C$は積分定数とする。$\displaystyle\int_{}^{}e^{x}dx=e^{x}+C$}{\relax}%
\ifthenelse{\equal{#1}{初等関数の積分公式E}\AND\equal{#2}{b}}%
{%
$C$は積分定数とする。%
- \[\displaystyle \int_{}^{} e^{x}dx=e^{x}+C\]%
+\[\displaystyle\int_{}^{}e^{x}dx=e^{x}+C\]%
+
}%
- {\relax}%
+ {\relax}%
\ifthenelse{\equal{#1}{初等関数の積分公式F}\AND\equal{#2}{i}}%
- {$C$は積分定数とする。$\displaystyle \int_{}^{} a^{x}dx=\bunsuu{a^{x}}{\log a}+C$}{\relax}%
+ {$C$は積分定数とする。$\displaystyle\int_{}^{}a^{x}dx=\bunsuu{a^{x}}{\log a}+C$}{\relax}%
\ifthenelse{\equal{#1}{初等関数の積分公式F}\AND\equal{#2}{b}}%
{%
$C$は積分定数とする。%
- \[\displaystyle \int_{}^{} a^{x}dx=\bunsuu{a^{x}}{\log a}+C\]%
+\[\displaystyle\int_{}^{}a^{x}dx=\bunsuu{a^{x}}{\log a}+C\]%
+
}%
{\relax}%
}%
@@ -3785,12 +4256,13 @@
\NewDocumentCommand{\定積分}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{i}}%
- {曲線$y=f\Ttyuukakko{x}$と$x$軸(間は$a$から$b$)に囲まれた部分の面積$S$について,$F'\Ttyuukakko{x}=f\Ttyuukakko{x}$のとき,$S=\displaystyle \int_{b}^{a} f\Ttyuukakko{x}dx=[F\Ttyuukakko{x}]^{b}_{a}=F\Ttyuukakko{b}-F\Ttyuukakko{a}$}{\relax}%
+ {曲線$y=f\Ttyuukakko{x}$と$x$軸(間は$a$から$b$)に囲まれた部分の面積$S$について,$F'\Ttyuukakko{x}=f\Ttyuukakko{x}$のとき,$S=\displaystyle\int_{b}^{a} f\Ttyuukakko{x}dx=[F\Ttyuukakko{x}]^{b}_{a}=F\Ttyuukakko{b}-F\Ttyuukakko{a}$}{\relax}%
\ifthenelse{\equal{#1}{定義}\AND\equal{#2}{b}}%
{%
曲線$y=f\Ttyuukakko{x}$と$x$軸(間は$a$から$b$)に囲まれた部分の面積$S$について,$F'\Ttyuukakko{x}=f\Ttyuukakko{x}$のとき,%
- \[S=\displaystyle \int_{b}^{a} f\Ttyuukakko{x}dx=[F\Ttyuukakko{x}]^{b}_{a}=F\Ttyuukakko{b}-F\Ttyuukakko{a}\]%
+\[S=\displaystyle\int_{b}^{a} f\Ttyuukakko{x}dx=[F\Ttyuukakko{x}]^{b}_{a}=F\Ttyuukakko{b}-F\Ttyuukakko{a}\]%
+
}%
{\relax}%
}%
@@ -3798,13 +4270,15 @@
\NewDocumentCommand{\区分求積法}{ m O{i} }%
{%
- \ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
- {$\displaystyle \lim_{n \to \infty} \sum_{k=0}^{n-1}f\Ttyuukakko{x_{k}}\mathit{\Delta}x=\displaystyle \lim_{n \to \infty} \sum_{k=1}^{n}f\Ttyuukakko{x_{k}}\mathit{\Delta}x$ここで,$\mathit{\Delta}x=\bunsuu{b-a}{n}\数式カンマスペース x_{k}=a+k\mathit{\Delta}x$}{\relax}%
+ \ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
+ {$\displaystyle\lim_{n \to \infty} \sum_{k=0}^{n-1}f\Ttyuukakko{x_{k}}\mathit{\Delta}x=\displaystyle\lim_{n \to \infty} \sum_{k=1}^{n}f\Ttyuukakko{x_{k}}\mathit{\Delta}x$ここで,$\mathit{\Delta}x=\bunsuu{b-a}{n}\数式カンマスペース x_{k}=a+k\mathit{\Delta}x$}{\relax}%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
- \[\displaystyle \lim_{n \to \infty} \sum_{k=0}^{n-1}f\Ttyuukakko{x_{k}}\mathit{\Delta}x=\displaystyle \lim_{n \to \infty} \sum_{k=1}^{n}f\Ttyuukakko{x_{k}}\mathit{\Delta}x\]%
+\[\displaystyle\lim_{n \to \infty} \sum_{k=0}^{n-1}f\Ttyuukakko{x_{k}}\mathit{\Delta}x=\displaystyle\lim_{n \to \infty} \sum_{k=1}^{n}f\Ttyuukakko{x_{k}}\mathit{\Delta}x\]%
+
ここで,%
- \[\mathit{\Delta}x=\bunsuu{b-a}{n}\数式カンマスペース x_{k}=a+k\mathit{\Delta}x\]%
+\[\mathit{\Delta}x=\bunsuu{b-a}{n}\数式カンマスペース x_{k}=a+k\mathit{\Delta}x\]%
+
}%
{\relax}%
}%
@@ -3813,11 +4287,12 @@
\NewDocumentCommand{\体積の積分}{ m O{i} }%
{%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{i}}%
- {曲線$y=f\Ttyuukakko{x}$と$x$軸の間の部分($a\leqq x\leqq b$)を$x$軸の周りに一回転させてできる回転体の体積は,$V=\pi\displaystyle \int_{a}^{b} \Tdaikakko{f\Ttyuukakko{x}}^2dx$}{\relax}%
+ {曲線$y=f\Ttyuukakko{x}$と$x$軸の間の部分($a\leqq x\leqq b$)を$x$軸の周りに一回転させてできる回転体の体積は,$V=\pi\displaystyle\int_{a}^{b} \Tdaikakko{f\Ttyuukakko{x}}^2dx$}{\relax}%
\ifthenelse{\equal{#1}{公式}\AND\equal{#2}{b}}%
{%
曲線$y=f\Ttyuukakko{x}$と$x$軸の間の部分($a\leqq x\leqq b$)を$x$軸の周りに一回転させてできる回転体の体積は,%
- \[V=\pi\displaystyle \int_{a}^{b} \Tdaikakko{f\Ttyuukakko{x}}^2dx\]%
+\[V=\pi\displaystyle\int_{a}^{b} \Tdaikakko{f\Ttyuukakko{x}}^2dx\]%
+
}%
{\relax}%
}% \ No newline at end of file
diff --git a/macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.tex b/macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.tex
index 7c68dffbd7..d838416444 100644
--- a/macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.tex
+++ b/macros/luatex/latex/japanese-mathformulas/japanese-mathformulas.tex
@@ -1,14 +1,12 @@
\documentclass[fleqn]{ltjsarticle}% !lualatex
+\usepackage{mathformulas,framed}%
\usepackage[hiragino-pron,deluxe,expert,bold]{luatexja-preset}%
-\usepackage{japanese-mathformulas,framed,comment}%
\usepackage[usetype1]{uline--}%
-\title{\LARGE\uline{japanese-mathformulas.sty}\Large\\manual pdf\\(mainly for Japanese, lulatex)}%
+\title{\LARGE\uline{japanese-mathformulas.sty}\Large\\manual pdf\\(mainly for Japanese, Lua\LaTeX)}%
\author{\Large Hugh / Ponkichi}%
\date{\today}
\def\texttt#1{{\gtfamily #1}}
-%\def\auto#1#2{\ascboxB{#2}}
-%\def\auto#1#2{\bf{\u{● #2}}}
\def\auto#1#2{\noindent\leftline{\uline{\textgt{#2}}}}
\makeatletter
@@ -184,7 +182,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{二次式因数分解}
%\begin{description}
\auto{9}{\detokenize{\二次式因数分解{公式A}[i]}}
@@ -222,7 +220,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{平方根}
%\begin{description}
\auto{17}{\detokenize{\平方根{定義}[i]}}
@@ -278,7 +276,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{一次不等式}
%\begin{description}
\auto{29}{\detokenize{\一次不等式{性質A}[i]}}
@@ -311,7 +309,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{集合}
%\begin{description}
\auto{35}{\detokenize{\集合{積集合}[i]}}
@@ -341,7 +339,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{対偶}
%\begin{description}
\auto{41}{\detokenize{\対偶{定理}[i]}}
@@ -361,7 +359,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{背理法}
%\begin{description}
\auto{42}{\detokenize{\背理法}}
@@ -370,7 +368,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{二次関数}
%\begin{description}
\auto{43}{\detokenize{\二次関数{標準形}[i]}}
@@ -409,7 +407,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{二次方程式の解の公式}
%\begin{description}
\auto{51}{\detokenize{\二次方程式の解の公式{公式}[i]}}
@@ -431,7 +429,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
\auto{52}{\detokenize{\三角比の定義{定義A}[i]}}
\三角比の定義{定義A}[i]
@@ -475,7 +473,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{正弦定理}
%\begin{description}
\auto{59}{\detokenize{\正弦定理{公式}[i]}}
@@ -493,7 +491,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{余弦定理}
%\begin{description}
\auto{61}{\detokenize{\余弦定理{公式}[i]}}
@@ -510,24 +508,52 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{三角形の面積}
%\begin{description}
-\auto{63}{\detokenize{\三角形の面積{公式}[i]}}
+\auto{63}{\detokenize{\三角比の三角形の面積公式{公式}[i]}}
+
+\三角比の三角形の面積公式{公式}[i]
+
+\auto{64}{\detokenize{\三角比の三角形の面積公式{公式}[b]}}
+
+\三角比の三角形の面積公式{公式}[b]
+
+\auto{63}{\detokenize{\三角比の三角形の面積公式{証明}}}
+
+\三角比の三角形の面積公式{証明}
+
+\auto{63}{\detokenize{\ヘロンの公式{公式}[i]}}
-\三角形の面積{公式}[i]
+\ヘロンの公式{公式}[i]
-\auto{64}{\detokenize{\三角形の面積{公式}[b]}}
+\auto{63}{\detokenize{\ヘロンの公式{公式}[b]}}
-\三角形の面積{公式}[b]
+\ヘロンの公式{公式}[b]
-\auto{63}{\detokenize{\三角形の面積{証明}}}
+\auto{63}{\detokenize{\ヘロンの公式{証明}}}
-\三角形の面積{証明}
+\ヘロンの公式{証明}
+
+\auto{63}{\detokenize{\外接円の半径と三角形の面積{公式}[i]}}
+
+\外接円の半径と三角形の面積{公式}[i]
+
+\auto{63}{\detokenize{\外接円の半径と三角形の面積{公式}[b]}}
+
+\外接円の半径と三角形の面積{公式}[b]
+
+\auto{63}{\detokenize{\外接円の半径と三角形の面積{証明}}}
+
+\外接円の半径と三角形の面積{証明}
+
+\auto{64}{\detokenize{\三角形の面積公式}}
+
+\三角形の面積公式
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{場合の数と確率}
%\begin{description}
\auto{65}{\detokenize{\場合の数と確率{和集合の要素の個数}[i]}}
@@ -714,9 +740,22 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{図形の性質}
%\begin{description}
+
+\auto{105}{\detokenize{\平行線と線分比の性質{公式A}}}
+
+\平行線と線分比の性質{公式A}
+
+\auto{105}{\detokenize{\平行線と線分比の性質{公式B}}}
+
+\平行線と線分比の性質{公式B}
+
+\auto{105}{\detokenize{\平行線と線分比の性質{証明}}}
+
+\平行線と線分比の性質{証明}
+
\auto{105}{\detokenize{\図形の性質{内心}}}
\図形の性質{内心}
@@ -1939,19 +1978,42 @@ Now, here are the actual examples!
\不定積分の定義{定義}[b]
+\auto{316}{\detokenize{\不定積分の性質{公式A}[i]}}
+
+\不定積分の性質{公式A}[i]
+
+\auto{316}{\detokenize{\不定積分の性質{公式A}[b]}}
+
+\不定積分の性質{公式A}[b]
+
+\auto{316}{\detokenize{\不定積分の性質{公式B}[i]}}
+
+\不定積分の性質{公式B}[i]
+
+\auto{316}{\detokenize{\不定積分の性質{公式B}[b]}}
+
+\不定積分の性質{公式B}[b]
+
+\auto{316}{\detokenize{\不定積分の性質{公式C}[i]}}
+
+\不定積分の性質{公式C}[i]
+
+\auto{316}{\detokenize{\不定積分の性質{公式C}[b]}}
+
+\不定積分の性質{公式C}[b]
%\end{description}
%\end{simplesquarebox}
%\begin{simplesquarebox}{べき乗関数の不定積分}
%\begin{description}
-\auto{317}{\detokenize{\べき乗関数の不定積分{公式}[i]}}
+%\auto{317}{\detokenize{\べき乗関数の不定積分{公式}[i]}}
-\べき乗関数の不定積分{公式}[i]
+%\べき乗関数の不定積分{公式}[i]
-\auto{318}{\detokenize{\べき乗関数の不定積分{公式}[b]}}
+%\auto{318}{\detokenize{\べき乗関数の不定積分{公式}[b]}}
-\べき乗関数の不定積分{公式}[b]
+%\べき乗関数の不定積分{公式}[b]
%\end{description}
@@ -1962,7 +2024,6 @@ Now, here are the actual examples!
%\auto{319}{\texttt{\textbackslash 不定積分の性質\h{-0.1mm}$\lbrace$\h{公式A}\h{-0.1mm}$\rbrace$\kakkokukuri[[]{i}}}
\auto[1]{\不定積分の性質{公式A}[i]
-}
\不定積分の性質{公式A}[i]
@@ -1970,14 +2031,12 @@ Now, here are the actual examples!
%\auto{320}{\texttt{\textbackslash 不定積分の性質\h{-0.1mm}$\lbrace$\h{公式A}\h{-0.1mm}$\rbrace$\kakkokukuri[[]{i}}}
\auto[1]{\不定積分の性質{公式A}[b]
-}
\不定積分の性質{公式A}[b]
%\auto{321}{\texttt{\textbackslash 不定積分の性質\h{-0.1mm}$\lbrace$\h{公式B}\h{-0.1mm}$\rbrace$\kakkokukuri[[]{i}}}
\auto[1]{\不定積分の性質{公式B}[i]
-}
\不定積分の性質{公式B}[i]
@@ -1985,14 +2044,12 @@ Now, here are the actual examples!
%\auto{322}{\texttt{\textbackslash 不定積分の性質\h{-0.1mm}$\lbrace$\h{公式B}\h{-0.1mm}$\rbrace$\kakkokukuri[[]{i}}}
\auto[1]{\不定積分の性質{公式B}[b]
-}
\不定積分の性質{公式B}[b]
%\auto{323}{\texttt{\textbackslash 不定積分の性質\h{-0.1mm}$\lbrace$\h{公式C}\h{-0.1mm}$\rbrace$\kakkokukuri[[]{i}}}
\auto[1]{\不定積分の性質{公式C}[i]
-}
\不定積分の性質{公式C}[i]
@@ -2001,7 +2058,6 @@ Now, here are the actual examples!
%\不定積分の性質{公式C}\h{-0.1mm}$\rbrace$\kakkokukuri[[]{i}}}
\auto[1]{\不定積分の性質{公式C}[b]
-}
\不定積分の性質{公式C}[b]
@@ -2689,7 +2745,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{複素数の絶対値}
%\begin{description}
\auto{458}{\detokenize{\複素数の絶対値{定義}[i]}}
@@ -2718,7 +2774,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{極形式}
%\begin{description}
\auto{464}{\detokenize{\極形式{定義}[i]}}
@@ -2748,7 +2804,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{偏角}
%\begin{description}
\auto{470}{\detokenize{\偏角{定義}[i]}}
@@ -2842,7 +2898,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{楕円}
%\begin{description}
\auto{488}{\detokenize{\楕円{定義}[i]}}
@@ -2881,7 +2937,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{双曲線}
%\begin{description}
\auto{496}{\detokenize{\双曲線{定義}[i]}}
@@ -2928,7 +2984,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{連続な関数}
%\begin{description}
\auto{506}{\detokenize{\連続な関数{公式}[i]}}
@@ -2941,7 +2997,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{中間値の定理}
%\begin{description}
\auto{508}{\detokenize{\中間値の定理{公式}[i]}}
@@ -2967,7 +3023,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{微分}
%\begin{description}
\auto{512}{\detokenize{\微分{定義}[i]}}
@@ -3084,7 +3140,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{接線の方程式}
%\begin{description}
\auto{538}{\detokenize{\接線の方程式{公式}[i]}}
@@ -3097,7 +3153,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{法線の方程式}
%\begin{description}
\auto{540}{\detokenize{\法線の方程式{公式}[i]}}
@@ -3110,7 +3166,7 @@ Now, here are the actual examples!
%\end{description
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{不定積分}
%\begin{description}
\auto{542}{\detokenize{\不定積分{定義}[i]}}
@@ -3189,7 +3245,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{定積分}
%\begin{description}
\auto{560}{\detokenize{\定積分{定義}[i]}}
@@ -3215,7 +3271,7 @@ Now, here are the actual examples!
%\end{description}
%\end{simplesquarebox}
-
+
%\begin{simplesquarebox}{体積の積分}
%\begin{description}
\auto{564}{\detokenize{\体積の積分{公式}[i]}}
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 2694c2f9f3..792fa084fe 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -11,7 +11,6 @@ $mirrors = {
'Asia' => {
'China' => {
'https://mirror.bjtu.edu.cn/CTAN/' => 1,
- 'https://mirrors.aliyun.com/CTAN/' => 1,
'https://mirrors.bfsu.edu.cn/CTAN/' => 1,
'https://mirrors.cloud.tencent.com/CTAN/' => 1,
'https://mirrors.cqu.edu.cn/CTAN/' => 1,
@@ -82,7 +81,6 @@ $mirrors = {
'https://ctan.mines-albi.fr/' => 1,
'https://ctan.tetaneutral.net/' => 1,
'https://distrib-coffee.ipsl.jussieu.fr/pub/mirrors/ctan/' => 1,
- 'https://mirror.ibcp.fr/pub/CTAN/' => 1,
'https://mirrors.ircam.fr/pub/CTAN/' => 1,
'https://texlive.mycozy.space/' => 1,
},
@@ -148,6 +146,7 @@ $mirrors = {
'https://ctan.ijs.si/tex-archive/' => 1,
},
'Spain' => {
+ 'https://ctan.fisiquimicamente.com/' => 1,
'https://ctan.javinator9889.com/' => 1,
'https://osl.ugr.es/CTAN/' => 1,
},
@@ -186,7 +185,6 @@ $mirrors = {
'https://mirror.las.iastate.edu/tex-archive/' => 1,
'https://mirror.math.princeton.edu/pub/CTAN/' => 1,
'https://mirror.mwt.me/ctan/' => 1,
- 'https://mirror2.sandyriver.net/pub/ctan/' => 1,
'https://mirrors.concertpass.com/tex-archive/' => 1,
'https://mirrors.mit.edu/CTAN/' => 1,
'https://mirrors.rit.edu/CTAN/' => 1,
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 96347bc254..d1372ceffe 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/2022
-depend revision/64666
+depend revision/64678
name 00texlive.image
category TLCore
-revision 64667
+revision 64677
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
@@ -40,7 +40,7 @@ longdesc IgnorePatterns in the check_files routine in tlmgr.pl augment
longdesc this list. Those are not included in the source/ tarball. For
longdesc information on the 00texlive prefix see
longdesc 00texlive.installation(.tlpsrc)
-runfiles size=12924
+runfiles size=12925
.mkisofsrc
autorun.inf
texmf-dist/README
@@ -4647,7 +4647,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 64659
+revision 64669
shortdesc TeX Live standalone installer package
longdesc This package defines the files to go into the installer
longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built by the
@@ -52662,7 +52662,7 @@ catalogue-version 4.2
name centeredline
category Package
-revision 50971
+revision 64672
shortdesc A macro for centering lines
relocated 1
longdesc This package provides a macro \centeredline{...} which allows
@@ -52671,10 +52671,10 @@ longdesc usage therein of \verb or other macros changing catcodes. It
longdesc works nicely in list environments, and material whose natural
longdesc width exceeds the current linewidth will get properly centered
longdesc too.
-containersize 1168
-containerchecksum 7b1359bd93853830d85fd84c9132d997c1384211c504999f4bc819cd6fe85effbe9f0fba64cc502419484cea3cacedf02beae22052bd10a7a7dbad3f97583731
-doccontainersize 1288
-doccontainerchecksum 237af456a51f539d02d96bc1c2bfd1fde1328cb270985b50a0ee9760f4b6f3675610ca088af135a86f07c02a0cd84c651118726915a0a01546468030acd596f3
+containersize 1024
+containerchecksum b9db432378f6b24ab52c20e1189734dc7b1285792e5fc392808a04f98ce784d00ed9b87459017f1f798c5e6ff769639f650c3d3abe2cd5975306b6875e1fc067
+doccontainersize 1716
+doccontainerchecksum 023be77780a79180deae33a27b25c333f4499b302d026e5ddc34a2d1b7d45496dc0940027e7982816be0f398837ceb7b0de27ffabe0d1096c9fcab096784659a
docfiles size=1
RELOC/doc/latex/centeredline/README.md details="Readme"
runfiles size=1
@@ -52682,7 +52682,7 @@ runfiles size=1
catalogue-ctan /macros/latex/contrib/centeredline
catalogue-license lppl1.3c
catalogue-topics layout alignment
-catalogue-version 1.1
+catalogue-version 1.2
name centerlastline
category Package
@@ -87184,7 +87184,7 @@ catalogue-version 0.4
name currfile
category Package
-revision 56478
+revision 64673
shortdesc Provide file name and path of input files
relocated 1
longdesc The package provides macros holding file name information
@@ -87198,28 +87198,27 @@ longdesc of such a file. The depth of inclusion is made available,
longdesc together with the "parent" (including file) and "parents" (all
longdesc including files to the root of the tree). The package
longdesc supersedes FiNK.
-containersize 3740
-containerchecksum 8305bee1b1375f3157a938714b0803d976818dce716d0587ae3aac2020c38fdd987ca45d55aa8605c497b3bd0cb5ac909f5c8347f30836dd5ec2b36d18d06a64
-doccontainersize 173380
-doccontainerchecksum 7efdf77590627c00ebf0741cc7c77f7813f64fa7a9596c7b35c48e0b0364328a9166fdae5d93f0426ce2b8878c42e1c8f2e7d36823a08ddc7e5fcbba4bebc2d9
-docfiles size=44
+containersize 3748
+containerchecksum 4c63d6d33c21a0ac9aed990fa79eb1457908d9301dfb81b3dc7167d5b8089ebd20abfbcf29380a7dd348c6ca8c131260e366aa55819a6affde146408a8e80014
+doccontainersize 180748
+doccontainerchecksum e891b03438257ae5e8eb3b6bf21a44b05df274cc18877a6c39569e94dcc9f5e678aed5a5858eb2e9762b4a8ac6b04856839dd47d81b5de55e4023a369e09ba7e
+docfiles size=46
RELOC/doc/latex/currfile/README details="Readme"
RELOC/doc/latex/currfile/currfile.pdf details="Package documentation"
-srccontainersize 11704
-srccontainerchecksum 34db7dc10bc9573093242480a7e9a2b1138458dfdf3e71bc5a7a8fa3642a9e2545f1fbd308e27096213f031c55638f778594a9844ce96c6921e3f2290c9d0fc1
+srccontainersize 11756
+srccontainerchecksum e68a86c05be5c92eb8a7a224bb404cfbf96e7950e6154e2446237692320f06368c0097d7ad0b57438012a36994e838b514e4588b6eb7d31478160bdf66bce4d7
srcfiles size=13
RELOC/source/latex/currfile/currfile.dtx
RELOC/source/latex/currfile/currfile.ins
runfiles size=5
RELOC/tex/latex/currfile/currfile-abspath.sty
RELOC/tex/latex/currfile/currfile.sty
-catalogue-contact-bugs https://sourceforge.net/p/currfile/tickets/
-catalogue-contact-home https://sourceforge.net/p/currfile/
-catalogue-contact-repository https://sourceforge.net/p/currfile/code/
+catalogue-contact-bugs https://github.com/MartinScharrer/currfile/issues
+catalogue-contact-repository https://github.com/MartinScharrer/currfile
catalogue-ctan /macros/latex/contrib/currfile
-catalogue-license lppl1.3
+catalogue-license lppl1.3c
catalogue-topics doc-tool
-catalogue-version 0.7d
+catalogue-version 0.8
name currvita
category Package
@@ -114445,7 +114444,7 @@ catalogue-version 2.7
name exam-n
category Package
-revision 42755
+revision 64674
shortdesc Exam class, focused on collaborative authoring
relocated 1
longdesc The class design offers: Direct support for collaborative
@@ -114456,21 +114455,21 @@ longdesc process is in regular use within a physics and astronomy
longdesc department). All of the 'traditional' exam paper features such
longdesc as sectioning, per-part running marks, 'Question n continued'
longdesc catchwords, and so on. Readily configured local adaptation.
-containersize 11804
-containerchecksum 6cb28928125f1164fcf2a78980345373a094fc1a2f2f22756c8f9b27da05b88b6011f000508354b4d73aafa09a2a877bd0e6913a274518b471380074762be392
-doccontainersize 820032
-doccontainerchecksum 502d6fd1073f4ce68477e6be652dd131bb0a74818df2b1fc6b0a97aafeb946de1d0fe3fe90ed5843bd63305c528031acde37697cfd756c9839b083f9926a363c
-docfiles size=271
- RELOC/doc/latex/exam-n/A1.clo
- RELOC/doc/latex/exam-n/README details="Readme"
- RELOC/doc/latex/exam-n/README.ctan
+containersize 14112
+containerchecksum bdd3f8a1e7836ce86fe022e27c554c125403247a9ca4e4cec7a0f32937eb517351d815248ce67815610bd063a9d0e5111868c301847aa5b6e5d666dd1cfc2f8e
+doccontainersize 429124
+doccontainerchecksum 3cd31c7cb86e66901eca162e7bd0ced047fdf22f2d8306d9f8cc8dffb299d027305e950ff1f188d366226614aaa2db2ece78008bf1a34d4076eaf3db7edab319
+docfiles size=190
+ RELOC/doc/latex/exam-n/README.md details="Readme"
RELOC/doc/latex/exam-n/exam-n-example.tex
RELOC/doc/latex/exam-n/exam-n.html
RELOC/doc/latex/exam-n/exam-n.pdf details="Package documentation"
+ RELOC/doc/latex/exam-n/examndefs.sty
RELOC/doc/latex/exam-n/lppl.txt
+ RELOC/doc/latex/exam-n/myclass.clo
RELOC/doc/latex/exam-n/notes-for-authors.pdf
RELOC/doc/latex/exam-n/notes-for-authors.tex
- RELOC/doc/latex/exam-n/release-notes.html
+ RELOC/doc/latex/exam-n/release-notes-dist.html
RELOC/doc/latex/exam-n/sample/Makefile
RELOC/doc/latex/exam-n/sample/cosmo1.tex
RELOC/doc/latex/exam-n/sample/cosmo2.tex
@@ -114486,24 +114485,26 @@ docfiles size=271
RELOC/doc/latex/exam-n/sample/numerical2.tex
RELOC/doc/latex/exam-n/sample/numerical3.tex
RELOC/doc/latex/exam-n/sample/sample_exam.tex
- RELOC/doc/latex/exam-n/sample/sample_exam_solution.tex
- RELOC/doc/latex/exam-n/sample/sample_mcq.tex
- RELOC/doc/latex/exam-n/sample_exam.pdf details="Sample exam"
- RELOC/doc/latex/exam-n/sample_exam_solution.pdf
- RELOC/doc/latex/exam-n/style.css
-srccontainersize 34424
-srccontainerchecksum 7241ce6d5e83e75142d8f3df652af4eaed554a7a2c93ee3b2868bb8c5918cfd950c7fa1413464604607b120eefed14fece4f801b08a6f0fbbded59f29e8ba620
-srcfiles size=32
+ RELOC/doc/latex/exam-n/sample/sample_exam_mcq.tex
+ RELOC/doc/latex/exam-n/template-master.pdf
+ RELOC/doc/latex/exam-n/template-master.tex
+ RELOC/doc/latex/exam-n/template-question.pdf
+ RELOC/doc/latex/exam-n/template-question.tex
+srccontainersize 44332
+srccontainerchecksum 4234bf167451fadba8b098e686490b517c44063c76bb4a780aa0d585db0df75fb30050efbe539cf6ce2658414db6a69c5f0c6e63de6e024a825ea45070ee894d
+srcfiles size=42
RELOC/source/latex/exam-n/exam-n.drv
RELOC/source/latex/exam-n/exam-n.dtx
RELOC/source/latex/exam-n/exam-n.ins
-runfiles size=11
+ RELOC/source/latex/exam-n/release-notes.dtx
+runfiles size=13
RELOC/tex/latex/exam-n/exam-n.cls
-catalogue-contact-home http://purl.org/nxg/dist/exam-n
+catalogue-contact-home https://purl.org/nxg/dist/exam-n
+catalogue-contact-repository https://heptapod.host/nxg/exam-n/
catalogue-ctan /macros/latex/contrib/exam-n
-catalogue-license lppl1.3
+catalogue-license lppl1.3c
catalogue-topics exam
-catalogue-version 1.1.4
+catalogue-version 1.4.0
name exam-randomizechoices
category Package
@@ -145989,7 +145990,7 @@ catalogue-version 1.0.0
name iexec
category Package
-revision 64663
+revision 64675
shortdesc Execute shell commands and input their output
relocated 1
longdesc With the help of the \iexec command, you can execute a shell
@@ -145998,28 +145999,27 @@ longdesc package also lets you use any special symbols inside your
longdesc command.
depend tools
depend xkeyval
-containersize 2116
-containerchecksum 1283e4f6563ddd0bd69a726e368bd348ac8d7e554f4563ff912b2bccea00f3f0d213e985a6c76178aeaf132d5f1f9b1c0049d62bdcd4a6017fb6eabd1fdc74b4
-doccontainersize 294484
-doccontainerchecksum 78b2eeed7f402d70118930462d82d41ca3eac0c864fc37f9c77b7d333c6d748607f1ffdf21a02daeb02123e0bb8b9bea6d026b1ae21cbb030969f92b071f4b80
+containersize 2128
+containerchecksum 44f8285f39894b60997a16be23f8ad4d4b4bd9f8399b643e22901a1af5ee1f7d9e602332d925cf8762fb12cdb11fabb590f60467bf1d98f7bcd65baf2268998b
+doccontainersize 294060
+doccontainerchecksum 52631a63ecfdcbfa3f0ddc653d1b45ae8b5935db444cb325fa445c7d4c08d4c2e215b25a67c187826dc75f6e9499e82e292158be1e737802ea858d8aa6184e7a
docfiles size=75
RELOC/doc/latex/iexec/DEPENDS.txt
RELOC/doc/latex/iexec/LICENSE.txt
RELOC/doc/latex/iexec/README.md details="Readme"
RELOC/doc/latex/iexec/iexec.pdf details="Package documentation"
-srccontainersize 4388
-srccontainerchecksum e48afbd9b17d15c2d7e168200521cd501e34593706191605d33418a208015ff9d460ad9f6550ef27c233f73e33ccd95b3111bac4c65f6ad4aaab1084f53d8caa
+srccontainersize 4500
+srccontainerchecksum 338c9ea7dd3519cd51ce4f835c58ec290c3b3733e0abb6e777f9213ff178af1dd63ff2a7836a03d81c59252101d3091bedcf4842d321ea24d87e9246957067a9
srcfiles size=4
RELOC/source/latex/iexec/iexec.dtx
RELOC/source/latex/iexec/iexec.ins
runfiles size=1
RELOC/tex/latex/iexec/iexec.sty
-catalogue-contact-bugs https://github.com/yegor256/iexec/issues
catalogue-contact-repository https://github.com/yegor256/iexec
catalogue-ctan /macros/latex/contrib/iexec
catalogue-license mit
catalogue-topics sys-supp exec-foreign
-catalogue-version 0.7.0
+catalogue-version 0.8.1
name ifallfalse
category Package
@@ -154390,7 +154390,7 @@ catalogue-version 1.12
name japanese-mathformulas
category Package
-revision 64617
+revision 64678
shortdesc Compiling basic math formulas in Japanese using LuaLaTeX
relocated 1
longdesc This is a style file for compiling basic maths formulas in
@@ -154399,22 +154399,22 @@ longdesc specify whether the formula should be used within a sentence or
longdesc on a new line. The main packages used in
longdesc japanese-mathformulas.sty are amsmath, amssymb, siunitx,
longdesc ifthen, xparse, TikZ, mathtools, and graphics.
-containersize 21100
-containerchecksum 18509c50fd5314f6536bc3d62e53cb320a23f481a39ecc66ad6cd486731dee0bd126bfe7482246e8bbd2a659e08c39fbba6a463e53cf973f5e0fd1878f0f05f8
-doccontainersize 684100
-doccontainerchecksum a4f18bca9529878d20adbd72f74c49e7731a94cc685f2d41d61867359b25b3a89c152a9aa1d207124e530cb728398e0ee7169bdce8f7be9b9b8316ae3a66c3e2
-docfiles size=191
+containersize 22132
+containerchecksum 35245333f0ad08ba0772aff54e5ed1b252ad1b1d298c55934ade4a0e33dec29fc67adfebcce22f10b61b9469a2a2d208c4b9977519271457f1538c4bba8bce24
+doccontainersize 698872
+doccontainerchecksum cfa07138896028186773970685309030f587fc39f95b2fb0d993e2827a124ae4172acc91f9276ae65b32fdc614cd9525d557505b2f1fc11750a982a5c9cebb42
+docfiles size=195
RELOC/doc/lualatex/japanese-mathformulas/README.txt details="Readme"
RELOC/doc/lualatex/japanese-mathformulas/japanese-mathformulas-sample.pdf details="Example of use" language="ja"
RELOC/doc/lualatex/japanese-mathformulas/japanese-mathformulas-sample.tex
RELOC/doc/lualatex/japanese-mathformulas/japanese-mathformulas.pdf details="Package documentation" language="ja"
RELOC/doc/lualatex/japanese-mathformulas/japanese-mathformulas.tex
-runfiles size=47
+runfiles size=48
RELOC/tex/lualatex/japanese-mathformulas/japanese-mathformulas.sty
catalogue-ctan /macros/luatex/latex/japanese-mathformulas
catalogue-license lppl1.3c
catalogue-topics maths japanese luatex
-catalogue-version 1.0.1
+catalogue-version 1.0.2
name japanese-otf
category Package
@@ -199670,17 +199670,17 @@ catalogue-version 0.5
name mcf2graph
category Package
-revision 64164
+revision 64671
shortdesc Draw chemical structure diagrams with MetaPost
relocated 1
longdesc The Molecular Coding Format (MCF) is a linear notation for
longdesc describing chemical structure diagrams. This package converts
longdesc MCF to graphic files using MetaPost.
containersize 448
-containerchecksum 0ae5baab172288c3ff905a25af2edc8198b83decba961f1f5fa51aa9cc98c2232ae16233a6e277e454b082281a2acf08060e1c897b1e7cdd58794f002964ddba
-doccontainersize 1054764
-doccontainerchecksum c4c88ae5f48f2ad8f4451e5f97b394322f8b5e698752789411f3f1a71359407e22e90b36d35e4f8d267dd5aa1b97fe60ce5510c1ffd744c90d5adc25bbe5792c
-docfiles size=339
+containerchecksum f89751f7e000367bf5ed1dfa3a3ce18f798a4b39837cafc82cb570fe8573423ed20469a96b1e68b499e9d82bd75c5270d8da08bf6c0548a0fc58a56f9dde4eba
+doccontainersize 1053472
+doccontainerchecksum 440d2e2c2b0be205f59306e5720aea76f1cff6406a3715b31524e9dcb2e9a415dfaef755d3ea21eee8192cefe9c72e7778874126f1588f8d6386e8af1e9ea763
+docfiles size=340
RELOC/doc/metapost/mcf2graph/CHANGELOG
RELOC/doc/metapost/mcf2graph/README details="Readme"
RELOC/doc/metapost/mcf2graph/mcf2graph.mp
@@ -199698,7 +199698,7 @@ docfiles size=339
catalogue-ctan /graphics/mcf2graph
catalogue-license mit
catalogue-topics graphics graphics-mpost chemistry
-catalogue-version 4.87
+catalogue-version 4.88
name mcite
category Package
@@ -240441,7 +240441,7 @@ catalogue-version 1.4
name pdfpages
category Package
-revision 63386
+revision 64676
shortdesc Include PDF documents in LaTeX
relocated 1
longdesc This package simplifies the inclusion of external multi-page
@@ -240456,10 +240456,10 @@ depend eso-pic
depend graphics
depend oberdiek
depend tools
-containersize 14048
-containerchecksum b5fc67c43932c8cffa44024599daaa571438846cd8418ca1e2851322d95581e0b37ce9d728f5830c3e82a41c5a8a5e9dae27ca7370664dcbfd2da61602978fe5
-doccontainersize 322280
-doccontainerchecksum bcc2922ea6f88e5f6a3a16e392b8ea61d71c5c2b36ab996291dbf26f960afa7cabdb68d962f3812229c115a7f481856ab58bba2d89bbe4a30d1a0eea29d0b73e
+containersize 14064
+containerchecksum a8398274a5a17b5c8a24c212b5a1bdbcb2014439e6090fc5c89debf8c3d79f99e923055c3be6859ba2e86e5c771ebc320c3d7e3f8998a10bc2008f21e4b47912
+doccontainersize 322700
+doccontainerchecksum 3669e4c9bd0007d874b7e39ef60df52043efa29871cab04931fa44ffa538201b2136a87ce06168dbc5a156154089b284da134cef133963b706408c8103147718
docfiles size=90
RELOC/doc/latex/pdfpages/dummy-l.pdf
RELOC/doc/latex/pdfpages/dummy.pdf
@@ -240467,8 +240467,8 @@ docfiles size=90
RELOC/doc/latex/pdfpages/pdf-hyp.tex
RELOC/doc/latex/pdfpages/pdf-toc.tex
RELOC/doc/latex/pdfpages/pdfpages.pdf details="Package documentation"
-srccontainersize 35348
-srccontainerchecksum d4c8b85963b8370307eae893a66f3441db2af0ab1422c62fa7df7d9b2f8cc9890d426bfecd0f3d4147c1c6dced2e82e6738baf829378f2d97a4573424aba212d
+srccontainersize 35388
+srccontainerchecksum a4fa4e5fbeff7bafa86bdd8ab25acca58844f1f49f7093f773d5ea3c1de9a43ac37b998006a760e718d62ad10adb15a1c496c747769afff4c0d1220e5ed2654c
srcfiles size=46
RELOC/source/latex/pdfpages/README
RELOC/source/latex/pdfpages/pdfpages.dtx
@@ -240485,7 +240485,7 @@ runfiles size=25
catalogue-ctan /macros/latex/contrib/pdfpages
catalogue-license lppl1.3c
catalogue-topics graphics-incl pdf-feat
-catalogue-version 0.5v
+catalogue-version 0.5w
name pdfpc
category Package
@@ -287634,7 +287634,7 @@ catalogue-version 1.03
name standalone
category Package
-revision 56291
+revision 64677
shortdesc Compile TeX pictures stand-alone or as part of a document
relocated 1
longdesc A class and package is provided which allows TeX pictures or
@@ -287647,15 +287647,21 @@ longdesc package is used to display the typeset code without margins.
longdesc The behaviour in standalone mode may adjusted using a
longdesc configuration file standalone.cfg to redefine the standalone
longdesc environment.
-containersize 11884
-containerchecksum d9fd4051c18908b69041805c4a4c631a14d8e3c35b6161ca6731962f2ad0d343db3d1dcf6a8e012d6a96971b3e0a0f00204634ac9c836b3bd28c0a96e132d946
-doccontainersize 270488
-doccontainerchecksum 5e1696289be97de97c4c68cf81933bd15ed542e3943b9a718d8f04c8ea16b9a31ddeaf5360e45d356110c7e6663872f354302cb07ca38bf0900380f575ea76bd
-docfiles size=68
+depend adjustbox
+depend currfile
+depend filemod
+depend gincltex
+depend xkeyval
+containersize 11904
+containerchecksum 8e74a676232ffe9fbe93ee3a1095c0c29cd65bd23f8e4602308d8fc1abfde9025c01e8ba379782d4c79d3349b4298806419735c624436a7b0c93e2170c592efb
+doccontainersize 278396
+doccontainerchecksum 358fb3b29f4c2d37d03b7d98ee02b35ff8571ffaf30b8d3fa1a9b0f74965ca4b0bcbf2a7172b8771dd3f1240c7dad1acccc7710dad302411dc43a301149597cd
+docfiles size=71
+ RELOC/doc/latex/standalone/DEPENDS.txt
RELOC/doc/latex/standalone/README details="Readme"
RELOC/doc/latex/standalone/standalone.pdf details="Package documentation"
-srccontainersize 38568
-srccontainerchecksum a921b3956908990f216f5d8da1449e7a47c4d74f34284f2c58b7c3cfa601c57de880d78e3680947349f3b5d20e0366f020d70b7c1348a9a374d2d0b57b58ef9c
+srccontainersize 38588
+srccontainerchecksum a29880dfca00e77b19ee828333c72f7c95a26470b8edd5ecea53bae3300868266ad4aa0db2bc6e16f72c14493b43659434ef4880b025b5bccad3305d0ea18b33
srcfiles size=47
RELOC/source/latex/standalone/standalone.dtx
RELOC/source/latex/standalone/standalone.ins
@@ -287663,15 +287669,14 @@ runfiles size=18
RELOC/tex/latex/standalone/standalone.cfg
RELOC/tex/latex/standalone/standalone.cls
RELOC/tex/latex/standalone/standalone.sty
- RELOC/tex/plain/standalone/standalone.tex
+ RELOC/tex/latex/standalone/standalone.tex
catalogue-also combine docmute includex newclude
-catalogue-contact-bugs https://sourceforge.net/p/standalone/tickets/
-catalogue-contact-home https://sourceforge.net/p/standalone/
-catalogue-contact-repository https://sourceforge.net/p/standalone/code/ci/default/tree/
+catalogue-contact-bugs https://github.com/MartinScharrer/standalone/issues
+catalogue-contact-repository https://github.com/MartinScharrer/standalone
catalogue-ctan /macros/latex/contrib/standalone
catalogue-license lppl1.3
catalogue-topics subdocs class
-catalogue-version 1.3a
+catalogue-version 1.3b
name stanli
category Package
@@ -307798,7 +307803,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 64659
+revision 64669
shortdesc TeX Live infrastructure programs
longdesc Includes install-tl, tl-portable, rungs, etc.; not needed for
longdesc tlmgr to run but still ours. Not included in tlcritical.
@@ -307806,10 +307811,10 @@ depend texlive-scripts.ARCH
depend texlive.infra
execute addMap mathpple.map
postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat
-containersize 113660
-containerchecksum c834eebea252e531087c23b8979cbb0788f2602de93762268ee51e81d51972429c86c85f243b4090fad75acf9af1fcf32e8de4af252b488b1fcd824206502fa1
-doccontainersize 421840
-doccontainerchecksum b1f7d12006ba585e6a2ebb6f2f2b72134e5358363a0c4a28dd5ae013e0c88cf2beacd593e840435dcd908019f543227520fe918dc66a2fbd7cf797c3c7cc8f73
+containersize 113636
+containerchecksum a1bed0816d75b93842e96dff65a34c3dcfe97e3b68037f251e8a979a0eb0e2ddcda7ee4f614b41f050a72084e556ab24d69822cb2db7c3421c3232e57a7276bb
+doccontainersize 421724
+doccontainerchecksum 3aa91319c54700dc4b20ef7ca4e551d98a641665163e56ec452d4d8a17015febda8facfd23842fdcf6999460b1369e1c8cbcc796c81ccae01b6bdc0cefe1aae4
docfiles size=523
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
@@ -313718,7 +313723,7 @@ catalogue-version 1.0
name tikz-ext
category Package
-revision 64506
+revision 64670
shortdesc A collection of libraries for PGF/TikZ
relocated 1
longdesc This is a collection of libraries for PGF/TikZ. Currently these
@@ -313726,11 +313731,11 @@ longdesc are transformations.mirror, paths.arcto, paths.ortho,
longdesc paths.timer, patterns.images, topaths.arcthrough and misc. Most
longdesc of these libraries were developed in response to questions on
longdesc TeX.stackexchange.com.
-containersize 20824
-containerchecksum d1a80d628f1596faf8b9eb892f523bcc5c627781194613bffa1802af518005e549defb53b1d2cb27960eebc80e657f06307e9cf97059c924055295ed6b527a5c
-doccontainersize 483896
-doccontainerchecksum ed48fa7ace640f2cee318a401c1d555d3622cac6dbd134ac1325e2c5cde6036c2483441c0d1ede8d72abb0fc7e8aa2f15d2a0f1cfd43af23798c1f783fe8952d
-docfiles size=167
+containersize 22376
+containerchecksum e23462295c0d45baed05d8a54d9874b8326428f41901e8fb2cec52d2a5832ffd155ba5d5563e11377664d62aac7e5eba0574564a79c482b190a782e22d5b31b3
+doccontainersize 489892
+doccontainerchecksum 231190b52f1eebab78bdda8420ed0310f7a191aaddcfe7d1f207ebca7593aefe9aa87e5a49804cff4f111a510120ece815da89512c403e4f7db24f2ec59fc86e
+docfiles size=171
RELOC/doc/latex/tikz-ext/README.md details="Readme"
RELOC/doc/latex/tikz-ext/tikz-ext-manual-en-calendar.tex
RELOC/doc/latex/tikz-ext/tikz-ext-manual-en-intro.tex
@@ -313755,7 +313760,7 @@ docfiles size=167
RELOC/doc/latex/tikz-ext/tikz-ext-manual.bib
RELOC/doc/latex/tikz-ext/tikz-ext-manual.pdf details="Package documentation"
RELOC/doc/latex/tikz-ext/tikz-ext-manual.tex
-runfiles size=45
+runfiles size=48
RELOC/tex/latex/tikz-ext/pgfcalendar-ext.code.tex
RELOC/tex/latex/tikz-ext/pgfcalendar-ext.sty
RELOC/tex/latex/tikz-ext/pgfcalendar-ext.tex
@@ -313783,7 +313788,7 @@ catalogue-contact-repository https://github.com/Qrrbrbirlbel/tikz-extensions
catalogue-ctan /graphics/pgf/contrib/tikz-ext
catalogue-license fdl lppl
catalogue-topics pgf-tikz
-catalogue-version 0.3
+catalogue-version 0.4
name tikz-feynhand
category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index e2b4c6417a..d28a2737ff 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-fbd6d26d71e4e5ebe07d3fea507b6102 texlive.tlpdb
+c28a0ad60fc031c3e92b7397b75217d9 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 4ff2631c2a..cf23af2719 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-aca4fa5198767a99b5edf3072f3d5370cc79323f0886eac1062a2af5419bc7b9940b3c12098c08e0dc4de8d2ed11bb4f8bab8f470b09bf32a2de2566e817c813 texlive.tlpdb
+7c635d99600b3bb611a2ec3fed7438f0c8ae6ff236b88faa03652b15e9830cacfb9ad821392706a25c77ed48a053cd4c3542e64d807e35cd2be9b9e172e998f7 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index d0f4127097..3f55c53806 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-----
-iQEcBAEBCgAGBQJjQ18lAAoJEEzhh34ZQ4xwH7cIAKnJdQljMeFpjLz0wdftN/FR
-HN0dBmNX3m7L13UoxBHCwJcBKYp/mNh7we3dJkuOY1uGXLCSXg0mR2yPvLEHOMMP
-KzMlSsGBUaZndseNYRAO4ZAZ30S/1KV0u1s9dmnE8fL888FYQUvTs7gcXVish2fM
-jjNSNiSlGEDRnev4W51Eh+5pLtUKSabAAQj1T2PcOV4NE5ebmxDaHUKLwt1JMG/U
-YGQN4IWfmWUVfmgZ5f4yu7nq/RXSrUlLPwQWG9vjL4kijfpsN4ugNDSQI/infu+v
-jzV6BbR8TFlemmMF/VpcisXkMB9jFgcNBkiA9x6NCe+mxa0BWkHuFNqkc3l1wR0=
-=2DrE
+iQEcBAEBCgAGBQJjRLCTAAoJEEzhh34ZQ4xwKOEH/316BlSbMjRh5nZMDeLmV0/z
+Lsxr/EuyI/Q+xzv3Z+TPBg7deey4ScA62ZRdkV0Hf5WiceoBbLOpeI8711cnZYA3
+Kuq0nE/K0xJYzbkkJ7vZaTA1vDRgMnisR2pk1YjY9QAGPnH3k6y1XPqQeJ377D42
+RtCFV2Wu9ZuzXzRvAS9uqDrDpmLI0TmiV/FcUnxEmf4MMQAgU1XS4vQFgHFwzshQ
+m7vr8CX8sIXv1WSCJTkp22JTb+7YX6km/jAy2MQi0m4KcGXk2b3cn48kQGSNRS/4
+dUwDU8JxtVi+sU1HjwoNmDKIxDoMXSqdYP1Cd33/HW9QECZgL3igzhhcqD0uc30=
+=NZrK
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 0cbf09bd9c..52a8fc352e 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index d1132437a2..1ffae93cda 100644
--- a/systems/win32/miktex/tm/packages/next/pr.ini
+++ b/systems/win32/miktex/tm/packages/next/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1665346562
+date=1665433045
lastupd=miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-x64-2.9 miktex-bibarts-bin-x64-2.9 miktex-bibtex-bin-x64-2.9 miktex-bibtex8bit-bin-x64-2.9 miktex-bzip2-bin-x64-2.9 miktex-cairo-bin-x64-2.9 miktex-chktex-bin-x64-2.9 miktex-cjkutils-bin-x64-2.9 miktex-console-bin-x64-2.9 miktex-curl-bin-x64-2.9 miktex-cweb-bin-x64-2.9 miktex-devnag-bin-x64-2.9 miktex-doc miktex-dvicopy-bin-x64-2.9 miktex-dvipdfmx-bin-x64-2.9 miktex-dvipng-bin-x64-2.9 miktex-dvips-bin-x64-2.9
-lstdigest=6533fb6b2ccf5efdb19e34a6bca94777
+lstdigest=edb04a9370dd4c95c90d735dcd963dec
numpkg=6057
relstate=next
-version=8317
+version=8318
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: rG/7gM7HXiwg6NGo2UIi2uGF7VimGiKgyKk2c4NU4aWKRff3b6fV6tTRCDnU0rbrNJ75ncmcl+5wxLfcCzijOg4Hk4DTQIf49z31+69pgNTT6yEsU5vQ0/m96iz2u7Yn4XkPqckcQaaTTv4/gHc/Ccp8i5CgjhAxbU7/oRLdYDCH7/gXYEMrFeOWTPnwkyUcMrOiaOLCTVXuUpLbygMraZsiORehEeDP1ZBlWmF68nim4Mp1yG+4IX91Cn/FS+crTqXZjMRCpgozMTDBbuVuSfjjPmWdh9JB7AeITuj9elpcWmY8QbPqSA4ZwtjDUcO4BL52l7oZ7uiuYbFkmde6xQ==
+;;;; signature/miktex: Vf1a+4hjJpQz2sXL48n4dhFVkuGahk8JdjmJm6IixK4RoaAnrEIEl4wSSlMbcgZOZlHg1GR5rYVN5LqwCFoaM4zdclDrD81sPVfWTagFptYCbI8zYopBRQut7gl6GzFelZl2FirfB8w4AMNz/Ri5e+pmfqtD3t15ujsbu5/ZA4+3ShDUn7y8iCC928y+7xfq5ctcsx6z1WmXArdnsJQLx7/JKBgdQGyYPLAn43bhj0Uwr09QI9vZWNtJQtu8czjDQX79u/exnOJBg4TMklAh4p+cEt4kDKTR4Mlog/cvMw9coioM63fIRZ8z2Bk7dUVOCvEws/YdE4v9MXlwl/h1Tg==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 85eeeb5ddc..735f2d7b5a 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1665346264
+date=1665432723
lastupd=abntexto abntexto__doc abntexto__source achemso achemso__doc achemso__source almendra almendra__doc andika andika__doc arimo arimo__doc babel babel-serbian babel-serbian__doc babel-serbian__source babel-serbianc babel-serbianc__doc babel-serbianc__source babel__doc
-lstdigest=e9cb4a76db2b653f6aec316225ab198e
+lstdigest=859a4103718f2a62df305751328ad60b
numpkg=6057
relstate=stable
-version=8317
+version=8318
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: M1149Bc6fhhwdczeWSZYAOBlYAH20H0vK5WNX3+9uJ9VS7lDyg8nVa/2JgM6nbs3kLY17Bhv5Mo/n2fVw+O6jOF58voN3MFkPKBIVqEz16w8J2S6SYPit/fVkMaaJ0oFBkB5NLEvU32UglNXgXgGB5FAw1zfdhaBBlfOKvOqn5U9Qs2yKg5ULUdlhN1rCW51QZOF9wAWIbY1HNGf7+OxL5r9d0qeIy6Kva8tkojIrkSm5bHx8Rb7tyW3+Xs79dnJenBLkc5Dx8BvOW2HAVcAAFalSGyyF+cIvcEMSR/yzfQr0acd10BcRIRHJWSJJwdDKDS/M7NQs6OCQMMHvFchTg==
+;;;; signature/miktex: DsID4gyOHrGdwrqwbFwkkKIRgC1/LKCwoThsSiMlGbK6+dwrkZom2Lvw85E6oZ1fzglBnTZ531sJBDQwdhszb6exCGAhZBFXy2p9Uy/qFKo30b1djqcmNMQHJy+8hOfLM+0X48aGWd07j+X/oZJMkxcvDOHZ2Wc3oJ0cz1AKHdY3JIxNLOpNE5A8S/hGuV1yDVUFG3yDaxFpV6t0N6EqzSWVRRjEGAB+tzjohIHiTf4ISRbRPb+04KzGADJM1qEJKedKxX6i8YviO5+VkmjS0ANcyNkHeM4Zv8H+pz8J6m9Hn05sM0t+RFP9jYVkvch+DsrBNlML2nGAhuVL6h5aCA==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index 21c0092a1d..4d6d71a35d 100644
--- a/timestamp
+++ b/timestamp
@@ -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:
-2022-10-10-02-02
+2022-10-11-02-02