summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FILES.byname287
-rw-r--r--FILES.byname.gzbin2661513 -> 2661177 bytes
-rw-r--r--FILES.last07days184
-rw-r--r--biblio/ctan-bibdata/ctan.bib22
-rw-r--r--graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.pdfbin767807 -> 801892 bytes
-rw-r--r--graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.tex55
-rw-r--r--graphics/pgf/contrib/tkz-grapheur/tex/tkz-grapheur.sty49
-rw-r--r--info/ptex-manual/LICENSE2
-rw-r--r--info/ptex-manual/README.md2
-rw-r--r--info/ptex-manual/eptexdoc.pdfbin380927 -> 381916 bytes
-rw-r--r--info/ptex-manual/eptexdoc.tex26
-rw-r--r--info/ptex-manual/jfm.pdfbin231315 -> 235593 bytes
-rw-r--r--info/ptex-manual/jfm.tex56
-rw-r--r--info/ptex-manual/ptex-guide-en.pdfbin115974 -> 115730 bytes
-rw-r--r--info/ptex-manual/ptex-guide-en.tex11
-rw-r--r--info/ptex-manual/ptex-manual.pdfbin391671 -> 404345 bytes
-rw-r--r--info/ptex-manual/ptex-manual.sty23
-rw-r--r--info/ptex-manual/ptex-manual.tex662
-rw-r--r--macros/latex/contrib/scontents/README.md6
-rw-r--r--macros/latex/contrib/scontents/scontents.dtx638
-rw-r--r--macros/latex/contrib/scontents/scontents.ins8
-rw-r--r--macros/latex/contrib/scontents/scontents.pdfbin385642 -> 429100 bytes
-rw-r--r--support/TeX4ht/source/ChangeLog6
-rw-r--r--support/TeX4ht/source/tex4ht-4ht.tex13
-rw-r--r--support/latexindent/LatexIndent/GetYamlSettings.pm32
-rw-r--r--support/latexindent/LatexIndent/Logger.pm2
-rw-r--r--support/latexindent/LatexIndent/Special.pm4
-rw-r--r--support/latexindent/LatexIndent/TrailingComments.pm32
-rw-r--r--support/latexindent/LatexIndent/UTF8CmdLineArgsFileOperation.pm40
-rw-r--r--support/latexindent/LatexIndent/Version.pm4
-rw-r--r--support/latexindent/README2
-rw-r--r--support/latexindent/bin/linux/latexindentbin7847681 -> 7875395 bytes
-rw-r--r--support/latexindent/bin/macos/latexindentbin7564693 -> 7569205 bytes
-rw-r--r--support/latexindent/defaultSettings.yaml4
-rw-r--r--support/latexindent/documentation/contributors.bib11
-rw-r--r--support/latexindent/documentation/latexindent-yaml-schema.json9
-rw-r--r--support/latexindent/documentation/latexindent.pdfbin1298414 -> 1297627 bytes
-rw-r--r--support/latexindent/documentation/latexindent.tex72
-rwxr-xr-xsupport/latexindent/latexindent.pl2
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl7
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb99
-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.asc16
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2577396 -> 2580108 bytes
-rw-r--r--timestamp2
46 files changed, 1567 insertions, 825 deletions
diff --git a/FILES.byname b/FILES.byname
index 700ef6ef8a..444859ccd3 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -2078,12 +2078,12 @@
2024/06/09 | 1837 | biblio/citation-style-language/README.md
2024/06/09 | 12878 | biblio/citation-style-language/vancouver.csl
2024/06/09 | 4562284 | biblio/citation-style-language.zip
-2024/06/14 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2024/06/15 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx
-2024/06/14 | 2873098 | biblio/ctan-bibdata/ctan.bib
-2024/06/14 | 3708800 | biblio/ctan-bibdata/ctan.pdf
+2024/06/15 | 2873038 | biblio/ctan-bibdata/ctan.bib
+2024/06/15 | 3708800 | biblio/ctan-bibdata/ctan.pdf
2023/01/16 | 1489 | biblio/ctan-bibdata/README
-2024/06/14 | 4122445 | biblio/ctan-bibdata.zip
+2024/06/15 | 4122446 | biblio/ctan-bibdata.zip
2023/02/23 | 3126 | biblio/pbibtex/pbibtex-base/cpp.awk
2023/02/23 | 1009 | biblio/pbibtex/pbibtex-base/generate.sh
2023/02/23 | 22362 | biblio/pbibtex/pbibtex-base/jabbrv.bst
@@ -5445,7 +5445,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
-2024/06/14 | 114802 | FILES.last07days
+2024/06/15 | 122487 | 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
@@ -174293,13 +174293,13 @@
2023/09/09 | 474 | graphics/pgf/contrib/tkz-bernoulli/README.md
2023/11/05 | 11097 | graphics/pgf/contrib/tkz-bernoulli/tex/tkz-bernoulli.sty
2023/11/05 | 196410 | graphics/pgf/contrib/tkz-bernoulli.zip
-2024/06/06 | 767807 | graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.pdf
-2024/06/06 | 72531 | graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.tex
+2024/06/15 | 801892 | graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.pdf
+2024/06/15 | 74691 | graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.tex
2024/05/28 | 141384 | graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-exemples-integrales.pdf
2024/05/28 | 10208 | graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-exemples-integrales.tex
2024/05/11 | 472 | graphics/pgf/contrib/tkz-grapheur/README.md
-2024/06/05 | 73930 | graphics/pgf/contrib/tkz-grapheur/tex/tkz-grapheur.sty
-2024/06/06 | 919004 | graphics/pgf/contrib/tkz-grapheur.zip
+2024/06/15 | 74552 | graphics/pgf/contrib/tkz-grapheur/tex/tkz-grapheur.sty
+2024/06/15 | 951902 | graphics/pgf/contrib/tkz-grapheur.zip
2016/01/15 | 951 | graphics/pgf/contrib/tkz-orm/LICENSE
2016/01/15 | 4601 | graphics/pgf/contrib/tkz-orm/Makefile
2010/01/25 | 7949 | graphics/pgf/contrib/tkz-orm/pgfmanualstyle.sty
@@ -205351,30 +205351,30 @@
2014/06/23 | 584 | info/pstricks_calcnotes/README
2014/04/03 | 652952 | info/pstricks_calcnotes/ThreeAppsPDF.pdf
2014/06/22 | 2060099 | info/pstricks_calcnotes.zip
-2023/09/02 | 380927 | info/ptex-manual/eptexdoc.pdf
-2023/09/02 | 77869 | info/ptex-manual/eptexdoc.tex
-2023/09/02 | 1012994 | info/ptex-manual/eptex_resume.pdf
-2023/09/02 | 95260 | info/ptex-manual/eptex_resume.tex
-2023/09/02 | 3173 | info/ptex-manual/fam256d.tex
-2023/09/02 | 3372 | info/ptex-manual/fam256p.tex
-2023/09/02 | 231315 | info/ptex-manual/jfm.pdf
-2023/09/02 | 47453 | info/ptex-manual/jfm.tex
-2023/09/02 | 251872 | info/ptex-manual/jtex_asciimw.pdf
-2023/09/02 | 35293 | info/ptex-manual/jtex_asciimw.tex
-2023/09/02 | 145704 | info/ptex-manual/jtexdoc_asciimw.pdf
-2023/09/02 | 20341 | info/ptex-manual/jtexdoc_asciimw.tex
-2023/09/02 | 1516 | info/ptex-manual/LICENSE
-2023/09/02 | 264764 | info/ptex-manual/ptexdoc_asciimw.pdf
-2023/09/02 | 42357 | info/ptex-manual/ptexdoc_asciimw.tex
-2023/09/02 | 115974 | info/ptex-manual/ptex-guide-en.pdf
-2023/09/02 | 49092 | info/ptex-manual/ptex-guide-en.tex
-2023/09/02 | 391671 | info/ptex-manual/ptex-manual.pdf
-2023/09/02 | 5001 | info/ptex-manual/ptex-manual.sty
-2023/09/02 | 137430 | info/ptex-manual/ptex-manual.tex
-2023/09/02 | 164929 | info/ptex-manual/ptexskip_asciimw.pdf
-2023/09/02 | 19615 | info/ptex-manual/ptexskip_asciimw.tex
-2023/09/02 | 1206 | info/ptex-manual/README.md
-2023/09/02 | 3069194 | info/ptex-manual.zip
+2024/06/15 | 381916 | info/ptex-manual/eptexdoc.pdf
+2024/06/15 | 78046 | info/ptex-manual/eptexdoc.tex
+2024/06/15 | 1012994 | info/ptex-manual/eptex_resume.pdf
+2024/06/15 | 95260 | info/ptex-manual/eptex_resume.tex
+2024/06/15 | 3173 | info/ptex-manual/fam256d.tex
+2024/06/15 | 3372 | info/ptex-manual/fam256p.tex
+2024/06/15 | 235593 | info/ptex-manual/jfm.pdf
+2024/06/15 | 48981 | info/ptex-manual/jfm.tex
+2024/06/15 | 251872 | info/ptex-manual/jtex_asciimw.pdf
+2024/06/15 | 35293 | info/ptex-manual/jtex_asciimw.tex
+2024/06/15 | 145704 | info/ptex-manual/jtexdoc_asciimw.pdf
+2024/06/15 | 20341 | info/ptex-manual/jtexdoc_asciimw.tex
+2024/06/15 | 1516 | info/ptex-manual/LICENSE
+2024/06/15 | 264764 | info/ptex-manual/ptexdoc_asciimw.pdf
+2024/06/15 | 42357 | info/ptex-manual/ptexdoc_asciimw.tex
+2024/06/15 | 115730 | info/ptex-manual/ptex-guide-en.pdf
+2024/06/15 | 48698 | info/ptex-manual/ptex-guide-en.tex
+2024/06/15 | 404345 | info/ptex-manual/ptex-manual.pdf
+2024/06/15 | 5742 | info/ptex-manual/ptex-manual.sty
+2024/06/15 | 145802 | info/ptex-manual/ptex-manual.tex
+2024/06/15 | 164929 | info/ptex-manual/ptexskip_asciimw.pdf
+2024/06/15 | 19615 | info/ptex-manual/ptexskip_asciimw.tex
+2024/06/15 | 1206 | info/ptex-manual/README.md
+2024/06/15 | 3089922 | info/ptex-manual.zip
1994/01/21 | 22111 | info/qh2winh.zip
2021/04/25 | 3133138 | info/russian/basiclatex-ru/BasicLatex.pdf
2021/07/05 | 628 | info/russian/basiclatex-ru/README
@@ -214538,7 +214538,7 @@
2013/04/01 | 14776 | macros/context/contrib/context-visualcounter/tex/context/third/visualcounter/t-visualcounter.mkvi
2018/03/05 | 11 | macros/context/contrib/context-visualcounter/VERSION
2018/03/22 | 276789 | macros/context/contrib/context-visualcounter.zip
-2024/05/31 | 122901555 | macros/context/latest/cont-tmf.zip
+2024/06/14 | 134450644 | macros/context/latest/cont-tmf.zip
2016/04/21 | 32846 | macros/cstex/base/cmexb.tar.gz
2016/06/26 | 1728262 | macros/cstex/base/csfonts-t1.tar.gz
2007/03/01 | 187106 | macros/cstex/base/csfonts.tar.gz
@@ -249697,11 +249697,11 @@
2014/08/31 | 2171 | macros/latex/contrib/sclang-prettifier/sclang-prettifier.ins
2014/08/31 | 513246 | macros/latex/contrib/sclang-prettifier/sclang-prettifier.pdf
2014/09/01 | 521589 | macros/latex/contrib/sclang-prettifier.zip
-2022/04/03 | 2342 | macros/latex/contrib/scontents/README.md
-2022/04/03 | 135079 | macros/latex/contrib/scontents/scontents.dtx
-2022/04/03 | 2223 | macros/latex/contrib/scontents/scontents.ins
-2022/04/03 | 385642 | macros/latex/contrib/scontents/scontents.pdf
-2022/04/04 | 398398 | macros/latex/contrib/scontents.zip
+2024/06/15 | 2350 | macros/latex/contrib/scontents/README.md
+2024/06/15 | 148019 | macros/latex/contrib/scontents/scontents.dtx
+2024/06/15 | 2224 | macros/latex/contrib/scontents/scontents.ins
+2024/06/15 | 429100 | macros/latex/contrib/scontents/scontents.pdf
+2024/06/15 | 440419 | macros/latex/contrib/scontents.zip
2021/09/26 | 833 | macros/latex/contrib/scrambledenvs/README.md
2021/09/26 | 22002 | macros/latex/contrib/scrambledenvs/scrambledenvs.dtx
2021/09/26 | 198912 | macros/latex/contrib/scrambledenvs/scrambledenvs.pdf
@@ -299249,62 +299249,62 @@
2024/05/31 | 1327 | support/latex-git-log/po/de.po
2024/05/31 | 3554 | support/latex-git-log/README.md
2024/05/31 | 66988 | support/latex-git-log.zip
-2024/05/12 | 7847681 | support/latexindent/bin/linux/latexindent
-2024/05/12 | 7564693 | support/latexindent/bin/macos/latexindent
-2024/05/12 | 9468184 | support/latexindent/bin/windows/latexindent.exe
-2024/05/12 | 22229 | support/latexindent/defaultSettings.yaml
-2024/05/12 | 6664 | support/latexindent/documentation/contributors.bib
-2024/05/12 | 7161 | support/latexindent/documentation/figure-schematic.png
-2024/05/12 | 4402 | support/latexindent/documentation/latex-indent.bib
-2024/05/12 | 1298414 | support/latexindent/documentation/latexindent.pdf
-2024/05/12 | 446337 | support/latexindent/documentation/latexindent.tex
-2024/05/12 | 61245 | support/latexindent/documentation/latexindent-yaml-schema.json
-2024/05/12 | 44096 | support/latexindent/documentation/logo.png
-2024/05/12 | 68177 | support/latexindent/LatexIndent/AlignmentAtAmpersand.pm
-2024/05/12 | 24449 | support/latexindent/LatexIndent/Arguments.pm
-2024/05/12 | 6616 | support/latexindent/LatexIndent/BackUpFileProcedure.pm
-2024/05/12 | 4860 | support/latexindent/LatexIndent/BlankLines.pm
-2024/05/12 | 12653 | support/latexindent/LatexIndent/Braces.pm
-2024/05/12 | 5432 | support/latexindent/LatexIndent/Check.pm
-2024/05/12 | 10648 | support/latexindent/LatexIndent/Command.pm
-2024/05/12 | 25865 | support/latexindent/LatexIndent/Document.pm
-2024/05/12 | 1500 | support/latexindent/LatexIndent/DoubleBackSlash.pm
-2024/05/12 | 6391 | support/latexindent/LatexIndent/Else.pm
-2024/05/12 | 8346 | support/latexindent/LatexIndent/Environment.pm
-2024/05/12 | 11509 | support/latexindent/LatexIndent/FileContents.pm
-2024/05/12 | 9005 | support/latexindent/LatexIndent/FileExtension.pm
-2024/05/12 | 57020 | support/latexindent/LatexIndent/GetYamlSettings.pm
-2024/05/12 | 11206 | support/latexindent/LatexIndent/Heading.pm
-2024/05/12 | 13470 | support/latexindent/LatexIndent/HiddenChildren.pm
-2024/05/12 | 3517 | support/latexindent/LatexIndent/HorizontalWhiteSpace.pm
-2024/05/12 | 8893 | support/latexindent/LatexIndent/IfElseFi.pm
-2024/05/12 | 20870 | support/latexindent/LatexIndent/Indent.pm
-2024/05/12 | 6890 | support/latexindent/LatexIndent/Item.pm
-2024/05/12 | 5478 | support/latexindent/LatexIndent/KeyEqualsValuesBraces.pm
-2024/05/12 | 9859 | support/latexindent/LatexIndent/Lines.pm
-2024/05/12 | 14059 | support/latexindent/LatexIndent/LogFile.pm
-2024/05/12 | 2320 | support/latexindent/LatexIndent/Logger.pm
-2024/05/12 | 7379 | support/latexindent/LatexIndent/MandatoryArgument.pm
-2024/05/12 | 18591 | support/latexindent/LatexIndent/ModifyLineBreaks.pm
-2024/05/12 | 1558 | support/latexindent/latexindent-module-installer.pl
-2024/05/12 | 4388 | support/latexindent/LatexIndent/NamedGroupingBracesBrackets.pm
-2024/05/12 | 6620 | support/latexindent/LatexIndent/OptionalArgument.pm
-2024/05/12 | 4946 | support/latexindent/latexindent.pl
-2024/05/12 | 2733 | support/latexindent/LatexIndent/Preamble.pm
-2024/05/12 | 3515 | support/latexindent/LatexIndent/Replacement.pm
-2024/05/12 | 4404 | support/latexindent/LatexIndent/RoundBrackets.pm
-2024/05/12 | 22345 | support/latexindent/LatexIndent/Sentence.pm
-2024/05/12 | 13935 | support/latexindent/LatexIndent/Special.pm
-2024/05/12 | 2712 | support/latexindent/LatexIndent/Switches.pm
-2024/05/12 | 3353 | support/latexindent/LatexIndent/Tokens.pm
-2024/05/12 | 6953 | support/latexindent/LatexIndent/TrailingComments.pm
-2024/05/12 | 5857 | support/latexindent/LatexIndent/UnNamedGroupingBracesBrackets.pm
-2024/05/12 | 5883 | support/latexindent/LatexIndent/UTF8CmdLineArgsFileOperation.pm
-2024/05/12 | 27422 | support/latexindent/LatexIndent/Verbatim.pm
-2024/05/12 | 838 | support/latexindent/LatexIndent/Version.pm
-2024/05/12 | 35225 | support/latexindent/LatexIndent/Wrap.pm
-2024/05/12 | 2008 | support/latexindent/README
-2024/05/12 | 12919204 | support/latexindent.zip
+2024/06/15 | 7875395 | support/latexindent/bin/linux/latexindent
+2024/06/15 | 7569205 | support/latexindent/bin/macos/latexindent
+2024/06/15 | 9482185 | support/latexindent/bin/windows/latexindent.exe
+2024/06/15 | 22228 | support/latexindent/defaultSettings.yaml
+2024/06/15 | 6892 | support/latexindent/documentation/contributors.bib
+2024/06/15 | 7161 | support/latexindent/documentation/figure-schematic.png
+2024/06/15 | 4402 | support/latexindent/documentation/latex-indent.bib
+2024/06/15 | 1297627 | support/latexindent/documentation/latexindent.pdf
+2024/06/15 | 446500 | support/latexindent/documentation/latexindent.tex
+2024/06/15 | 61421 | support/latexindent/documentation/latexindent-yaml-schema.json
+2024/06/15 | 44096 | support/latexindent/documentation/logo.png
+2024/06/15 | 68177 | support/latexindent/LatexIndent/AlignmentAtAmpersand.pm
+2024/06/15 | 24449 | support/latexindent/LatexIndent/Arguments.pm
+2024/06/15 | 6616 | support/latexindent/LatexIndent/BackUpFileProcedure.pm
+2024/06/15 | 4860 | support/latexindent/LatexIndent/BlankLines.pm
+2024/06/15 | 12653 | support/latexindent/LatexIndent/Braces.pm
+2024/06/15 | 5432 | support/latexindent/LatexIndent/Check.pm
+2024/06/15 | 10648 | support/latexindent/LatexIndent/Command.pm
+2024/06/15 | 25865 | support/latexindent/LatexIndent/Document.pm
+2024/06/15 | 1500 | support/latexindent/LatexIndent/DoubleBackSlash.pm
+2024/06/15 | 6391 | support/latexindent/LatexIndent/Else.pm
+2024/06/15 | 8346 | support/latexindent/LatexIndent/Environment.pm
+2024/06/15 | 11509 | support/latexindent/LatexIndent/FileContents.pm
+2024/06/15 | 9005 | support/latexindent/LatexIndent/FileExtension.pm
+2024/06/15 | 55478 | support/latexindent/LatexIndent/GetYamlSettings.pm
+2024/06/15 | 11206 | support/latexindent/LatexIndent/Heading.pm
+2024/06/15 | 13470 | support/latexindent/LatexIndent/HiddenChildren.pm
+2024/06/15 | 3517 | support/latexindent/LatexIndent/HorizontalWhiteSpace.pm
+2024/06/15 | 8893 | support/latexindent/LatexIndent/IfElseFi.pm
+2024/06/15 | 20870 | support/latexindent/LatexIndent/Indent.pm
+2024/06/15 | 6890 | support/latexindent/LatexIndent/Item.pm
+2024/06/15 | 5478 | support/latexindent/LatexIndent/KeyEqualsValuesBraces.pm
+2024/06/15 | 9859 | support/latexindent/LatexIndent/Lines.pm
+2024/06/15 | 14059 | support/latexindent/LatexIndent/LogFile.pm
+2024/06/15 | 2331 | support/latexindent/LatexIndent/Logger.pm
+2024/06/15 | 7379 | support/latexindent/LatexIndent/MandatoryArgument.pm
+2024/06/15 | 18591 | support/latexindent/LatexIndent/ModifyLineBreaks.pm
+2024/06/15 | 1558 | support/latexindent/latexindent-module-installer.pl
+2024/06/15 | 4388 | support/latexindent/LatexIndent/NamedGroupingBracesBrackets.pm
+2024/06/15 | 6620 | support/latexindent/LatexIndent/OptionalArgument.pm
+2024/06/15 | 4946 | support/latexindent/latexindent.pl
+2024/06/15 | 2733 | support/latexindent/LatexIndent/Preamble.pm
+2024/06/15 | 3515 | support/latexindent/LatexIndent/Replacement.pm
+2024/06/15 | 4404 | support/latexindent/LatexIndent/RoundBrackets.pm
+2024/06/15 | 22345 | support/latexindent/LatexIndent/Sentence.pm
+2024/06/15 | 13923 | support/latexindent/LatexIndent/Special.pm
+2024/06/15 | 2712 | support/latexindent/LatexIndent/Switches.pm
+2024/06/15 | 3353 | support/latexindent/LatexIndent/Tokens.pm
+2024/06/15 | 7180 | support/latexindent/LatexIndent/TrailingComments.pm
+2024/06/15 | 5857 | support/latexindent/LatexIndent/UnNamedGroupingBracesBrackets.pm
+2024/06/15 | 6520 | support/latexindent/LatexIndent/UTF8CmdLineArgsFileOperation.pm
+2024/06/15 | 27422 | support/latexindent/LatexIndent/Verbatim.pm
+2024/06/15 | 838 | support/latexindent/LatexIndent/Version.pm
+2024/06/15 | 35225 | support/latexindent/LatexIndent/Wrap.pm
+2024/06/15 | 2008 | support/latexindent/README
+2024/06/15 | 12969815 | support/latexindent.zip
2021/10/26 | 16439 | support/latex-make/figlatex.dtx
2021/10/26 | 238535 | support/latex-make/figlatex.pdf
2001/06/07 | 302 | support/latexmake/latexmake.diz
@@ -308433,9 +308433,9 @@
2020/03/04 | 408 | systems/texlive/tlnet/archive/collection-langpolish.r54074.tar.xz
2023/05/16 | 400 | systems/texlive/tlnet/archive/collection-langportuguese.r67125.tar.xz
2023/06/09 | 396 | systems/texlive/tlnet/archive/collection-langspanish.r67307.tar.xz
-2024/06/14 | 7220 | systems/texlive/tlnet/archive/collection-latexextra.r71514.tar.xz
+2024/06/15 | 7224 | systems/texlive/tlnet/archive/collection-latexextra.r71526.tar.xz
2023/12/14 | 704 | systems/texlive/tlnet/archive/collection-latex.r69131.tar.xz
-2024/02/14 | 740 | systems/texlive/tlnet/archive/collection-latexrecommended.r69841.tar.xz
+2024/06/15 | 740 | systems/texlive/tlnet/archive/collection-latexrecommended.r71527.tar.xz
2024/05/20 | 1044 | systems/texlive/tlnet/archive/collection-luatex.r71305.tar.xz
2024/06/11 | 1764 | systems/texlive/tlnet/archive/collection-mathscience.r71466.tar.xz
2024/05/23 | 572 | systems/texlive/tlnet/archive/collection-metapost.r71319.tar.xz
@@ -308717,6 +308717,9 @@
2019/02/28 | 968 | systems/texlive/tlnet/archive/coseoul.r23862.tar.xz
2023/08/13 | 203544 | systems/texlive/tlnet/archive/couleurs-fr.doc.r67901.tar.xz
2023/08/13 | 11444 | systems/texlive/tlnet/archive/couleurs-fr.r67901.tar.xz
+2024/06/15 | 539720 | systems/texlive/tlnet/archive/count1to.doc.r71526.tar.xz
+2024/06/15 | 1700 | systems/texlive/tlnet/archive/count1to.r71526.tar.xz
+2024/06/15 | 6148 | systems/texlive/tlnet/archive/count1to.source.r71526.tar.xz
2023/06/11 | 315768 | systems/texlive/tlnet/archive/counterz.doc.r67335.tar.xz
2023/06/11 | 2488 | systems/texlive/tlnet/archive/counterz.r67335.tar.xz
2023/06/11 | 10872 | systems/texlive/tlnet/archive/counterz.source.r67335.tar.xz
@@ -308922,11 +308925,11 @@
2019/02/28 | 348 | systems/texlive/tlnet/archive/ctanupload.x86_64-linuxmusl.r46840.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/ctanupload.x86_64-linux.r23866.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/ctanupload.x86_64-solaris.r23866.tar.xz
-2023/02/24 | 1143636 | systems/texlive/tlnet/archive/ctex.doc.r66115.tar.xz
+2024/06/15 | 1143636 | systems/texlive/tlnet/archive/ctex.doc.r71527.tar.xz
2019/02/28 | 474648 | systems/texlive/tlnet/archive/ctex-faq.doc.r15878.tar.xz
2019/02/28 | 432 | systems/texlive/tlnet/archive/ctex-faq.r15878.tar.xz
-2023/02/24 | 130980 | systems/texlive/tlnet/archive/ctex.r66115.tar.xz
-2023/02/24 | 89524 | systems/texlive/tlnet/archive/ctex.source.r66115.tar.xz
+2024/06/15 | 130984 | systems/texlive/tlnet/archive/ctex.r71527.tar.xz
+2024/06/15 | 89520 | systems/texlive/tlnet/archive/ctex.source.r71527.tar.xz
2019/02/28 | 217796 | systems/texlive/tlnet/archive/ctib.doc.r15878.tar.xz
2019/02/28 | 116552 | systems/texlive/tlnet/archive/ctib.r15878.tar.xz
2019/02/28 | 8532 | systems/texlive/tlnet/archive/ctib.source.r15878.tar.xz
@@ -309821,9 +309824,9 @@
2021/07/19 | 313228 | systems/texlive/tlnet/archive/easing.doc.r59975.tar.xz
2021/07/19 | 2220 | systems/texlive/tlnet/archive/easing.r59975.tar.xz
2021/07/19 | 7876 | systems/texlive/tlnet/archive/easing.source.r59975.tar.xz
-2024/06/14 | 654508 | systems/texlive/tlnet/archive/easybook.doc.r71511.tar.xz
-2024/06/14 | 18352 | systems/texlive/tlnet/archive/easybook.r71511.tar.xz
-2024/06/14 | 18244 | systems/texlive/tlnet/archive/easybook.source.r71511.tar.xz
+2024/06/15 | 655276 | systems/texlive/tlnet/archive/easybook.doc.r71519.tar.xz
+2024/06/15 | 18388 | systems/texlive/tlnet/archive/easybook.r71519.tar.xz
+2024/06/15 | 18292 | systems/texlive/tlnet/archive/easybook.source.r71519.tar.xz
2019/02/28 | 4540 | systems/texlive/tlnet/archive/easy.doc.r19440.tar.xz
2023/10/12 | 344 | systems/texlive/tlnet/archive/easydtx.aarch64-linux.r68514.tar.xz
2023/10/12 | 344 | systems/texlive/tlnet/archive/easydtx.amd64-freebsd.r68514.tar.xz
@@ -313507,9 +313510,9 @@
2022/07/12 | 12872 | systems/texlive/tlnet/archive/luamesh.r63875.tar.xz
2023/11/19 | 205824 | systems/texlive/tlnet/archive/luamodulartables.doc.r68893.tar.xz
2023/11/19 | 1384 | systems/texlive/tlnet/archive/luamodulartables.r68893.tar.xz
-2024/06/14 | 217040 | systems/texlive/tlnet/archive/luamplib.doc.r71512.tar.xz
-2024/06/14 | 21288 | systems/texlive/tlnet/archive/luamplib.r71512.tar.xz
-2024/06/14 | 40024 | systems/texlive/tlnet/archive/luamplib.source.r71512.tar.xz
+2024/06/15 | 217072 | systems/texlive/tlnet/archive/luamplib.doc.r71524.tar.xz
+2024/06/15 | 21292 | systems/texlive/tlnet/archive/luamplib.r71524.tar.xz
+2024/06/15 | 40020 | systems/texlive/tlnet/archive/luamplib.source.r71524.tar.xz
2023/11/21 | 137048 | systems/texlive/tlnet/archive/luanumint.doc.r68918.tar.xz
2023/11/21 | 2332 | systems/texlive/tlnet/archive/luanumint.r68918.tar.xz
2022/10/31 | 32152 | systems/texlive/tlnet/archive/luaoptions.doc.r64870.tar.xz
@@ -314449,14 +314452,11 @@
2024/04/09 | 11920 | systems/texlive/tlnet/archive/mptrees.r70887.tar.xz
2023/07/24 | 251380 | systems/texlive/tlnet/archive/msc.doc.r67718.tar.xz
2023/07/24 | 20168 | systems/texlive/tlnet/archive/msc.r67718.tar.xz
-2021/01/20 | 573400 | systems/texlive/tlnet/archive/ms.doc.r57473.tar.xz
2019/02/28 | 763960 | systems/texlive/tlnet/archive/msg.doc.r49578.tar.xz
2019/02/28 | 7808 | systems/texlive/tlnet/archive/msg.r49578.tar.xz
2019/02/28 | 18688 | systems/texlive/tlnet/archive/msg.source.r49578.tar.xz
2020/03/04 | 277424 | systems/texlive/tlnet/archive/mslapa.doc.r54080.tar.xz
2020/03/04 | 8972 | systems/texlive/tlnet/archive/mslapa.r54080.tar.xz
-2021/01/20 | 3064 | systems/texlive/tlnet/archive/ms.r57473.tar.xz
-2021/01/20 | 10948 | systems/texlive/tlnet/archive/ms.source.r57473.tar.xz
2024/06/11 | 540456 | systems/texlive/tlnet/archive/msu-thesis.doc.r71472.tar.xz
2024/06/11 | 13744 | systems/texlive/tlnet/archive/msu-thesis.r71472.tar.xz
2019/02/28 | 160144 | systems/texlive/tlnet/archive/mtgreek.doc.r17967.tar.xz
@@ -314548,6 +314548,9 @@
2021/03/16 | 600192 | systems/texlive/tlnet/archive/multirow.doc.r58396.tar.xz
2021/03/16 | 2796 | systems/texlive/tlnet/archive/multirow.r58396.tar.xz
2021/03/16 | 20244 | systems/texlive/tlnet/archive/multirow.source.r58396.tar.xz
+2024/06/15 | 276500 | systems/texlive/tlnet/archive/multitoc.doc.r71520.tar.xz
+2024/06/15 | 1512 | systems/texlive/tlnet/archive/multitoc.r71520.tar.xz
+2024/06/15 | 5780 | systems/texlive/tlnet/archive/multitoc.source.r71520.tar.xz
2019/02/28 | 276956 | systems/texlive/tlnet/archive/munich.doc.r15878.tar.xz
2019/02/28 | 6916 | systems/texlive/tlnet/archive/munich.r15878.tar.xz
2020/04/16 | 80296 | systems/texlive/tlnet/archive/musical.doc.r54758.tar.xz
@@ -315573,7 +315576,7 @@
2020/03/24 | 242488 | systems/texlive/tlnet/archive/pgf-blur.doc.r54512.tar.xz
2020/03/24 | 2628 | systems/texlive/tlnet/archive/pgf-blur.r54512.tar.xz
2020/03/24 | 9236 | systems/texlive/tlnet/archive/pgf-blur.source.r54512.tar.xz
-2023/01/16 | 9995120 | systems/texlive/tlnet/archive/pgf.doc.r65553.tar.xz
+2024/06/15 | 9995120 | systems/texlive/tlnet/archive/pgf.doc.r71527.tar.xz
2019/11/07 | 929720 | systems/texlive/tlnet/archive/pgfgantt.doc.r52662.tar.xz
2019/11/07 | 7928 | systems/texlive/tlnet/archive/pgfgantt.r52662.tar.xz
2019/11/07 | 37128 | systems/texlive/tlnet/archive/pgfgantt.source.r52662.tar.xz
@@ -315605,7 +315608,7 @@
2022/01/24 | 13086868 | systems/texlive/tlnet/archive/pgfplots.doc.r61719.tar.xz
2022/01/24 | 529468 | systems/texlive/tlnet/archive/pgfplots.r61719.tar.xz
2022/01/24 | 1768536 | systems/texlive/tlnet/archive/pgfplots.source.r61719.tar.xz
-2023/01/16 | 717460 | systems/texlive/tlnet/archive/pgf.r65553.tar.xz
+2024/06/15 | 717460 | systems/texlive/tlnet/archive/pgf.r71527.tar.xz
2019/02/28 | 351348 | systems/texlive/tlnet/archive/pgf-soroban.doc.r32269.tar.xz
2019/02/28 | 1852 | systems/texlive/tlnet/archive/pgf-soroban.r32269.tar.xz
2023/04/29 | 2231980 | systems/texlive/tlnet/archive/pgf-spectra.doc.r66961.tar.xz
@@ -317258,8 +317261,8 @@
2019/02/28 | 292656 | systems/texlive/tlnet/archive/simplecv.doc.r35537.tar.xz
2019/02/28 | 2112 | systems/texlive/tlnet/archive/simplecv.r35537.tar.xz
2019/02/28 | 5844 | systems/texlive/tlnet/archive/simplecv.source.r35537.tar.xz
-2024/06/11 | 2563368 | systems/texlive/tlnet/archive/simpleicons.doc.r71475.tar.xz
-2024/06/11 | 3512312 | systems/texlive/tlnet/archive/simpleicons.r71475.tar.xz
+2024/06/15 | 2572176 | systems/texlive/tlnet/archive/simpleicons.doc.r71518.tar.xz
+2024/06/15 | 3524676 | systems/texlive/tlnet/archive/simpleicons.r71518.tar.xz
2019/02/28 | 224844 | systems/texlive/tlnet/archive/simpleinvoice.doc.r45673.tar.xz
2019/02/28 | 2420 | systems/texlive/tlnet/archive/simpleinvoice.r45673.tar.xz
2023/10/03 | 142696 | systems/texlive/tlnet/archive/simplekv.doc.r68439.tar.xz
@@ -317295,9 +317298,9 @@
2021/06/26 | 250232 | systems/texlive/tlnet/archive/siunits.doc.r59702.tar.xz
2021/06/26 | 6040 | systems/texlive/tlnet/archive/siunits.r59702.tar.xz
2021/06/26 | 34532 | systems/texlive/tlnet/archive/siunits.source.r59702.tar.xz
-2024/05/07 | 1286820 | systems/texlive/tlnet/archive/siunitx.doc.r71193.tar.xz
-2024/05/07 | 67920 | systems/texlive/tlnet/archive/siunitx.r71193.tar.xz
-2024/05/07 | 123104 | systems/texlive/tlnet/archive/siunitx.source.r71193.tar.xz
+2024/06/15 | 1286784 | systems/texlive/tlnet/archive/siunitx.doc.r71521.tar.xz
+2024/06/15 | 67904 | systems/texlive/tlnet/archive/siunitx.r71521.tar.xz
+2024/06/15 | 123128 | systems/texlive/tlnet/archive/siunitx.source.r71521.tar.xz
2024/04/06 | 709888 | systems/texlive/tlnet/archive/sjtutex.doc.r70867.tar.xz
2024/04/06 | 154544 | systems/texlive/tlnet/archive/sjtutex.r70867.tar.xz
2024/04/06 | 39888 | systems/texlive/tlnet/archive/sjtutex.source.r70867.tar.xz
@@ -318242,7 +318245,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
-2024/06/14 | 436236 | systems/texlive/tlnet/archive/texlive-scripts.doc.r71516.tar.xz
+2024/06/15 | 436256 | systems/texlive/tlnet/archive/texlive-scripts.doc.r71528.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
@@ -318264,7 +318267,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
-2024/06/14 | 114412 | systems/texlive/tlnet/archive/texlive-scripts.r71516.tar.xz
+2024/06/15 | 114376 | systems/texlive/tlnet/archive/texlive-scripts.r71528.tar.xz
2022/09/13 | 580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz
2024/05/10 | 60592 | systems/texlive/tlnet/archive/texlive-scripts.windows.r71215.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz
@@ -318300,12 +318303,12 @@
2022/01/29 | 344 | systems/texlive/tlnet/archive/texlogfilter.amd64-freebsd.r61780.tar.xz
2022/01/29 | 340 | systems/texlive/tlnet/archive/texlogfilter.amd64-netbsd.r61780.tar.xz
2022/01/29 | 340 | systems/texlive/tlnet/archive/texlogfilter.armhf-linux.r61780.tar.xz
-2024/02/17 | 29452 | systems/texlive/tlnet/archive/texlogfilter.doc.r69918.tar.xz
+2024/06/15 | 29540 | systems/texlive/tlnet/archive/texlogfilter.doc.r71525.tar.xz
2022/01/29 | 340 | systems/texlive/tlnet/archive/texlogfilter.i386-freebsd.r61780.tar.xz
2022/01/29 | 336 | systems/texlive/tlnet/archive/texlogfilter.i386-linux.r61780.tar.xz
2022/01/29 | 340 | systems/texlive/tlnet/archive/texlogfilter.i386-netbsd.r61780.tar.xz
2022/01/29 | 340 | systems/texlive/tlnet/archive/texlogfilter.i386-solaris.r61780.tar.xz
-2024/02/17 | 3884 | systems/texlive/tlnet/archive/texlogfilter.r69918.tar.xz
+2024/06/15 | 3944 | systems/texlive/tlnet/archive/texlogfilter.r71525.tar.xz
2022/01/29 | 344 | systems/texlive/tlnet/archive/texlogfilter.universal-darwin.r61780.tar.xz
2023/02/20 | 2308 | systems/texlive/tlnet/archive/texlogfilter.windows.r65891.tar.xz
2022/01/29 | 344 | systems/texlive/tlnet/archive/texlogfilter.x86_64-cygwin.r61780.tar.xz
@@ -318498,9 +318501,9 @@
2024/01/10 | 2524 | systems/texlive/tlnet/archive/thematicpuzzle.r69356.tar.xz
2020/03/24 | 333032 | systems/texlive/tlnet/archive/theoremref.doc.r54512.tar.xz
2020/03/24 | 4104 | systems/texlive/tlnet/archive/theoremref.r54512.tar.xz
-2023/12/11 | 266980 | systems/texlive/tlnet/archive/thermodynamics.doc.r69086.tar.xz
-2023/12/11 | 9176 | systems/texlive/tlnet/archive/thermodynamics.r69086.tar.xz
-2023/12/11 | 34088 | systems/texlive/tlnet/archive/thermodynamics.source.r69086.tar.xz
+2024/06/15 | 328944 | systems/texlive/tlnet/archive/thermodynamics.doc.r71522.tar.xz
+2024/06/15 | 11124 | systems/texlive/tlnet/archive/thermodynamics.r71522.tar.xz
+2024/06/15 | 42000 | systems/texlive/tlnet/archive/thermodynamics.source.r71522.tar.xz
2024/04/19 | 197892 | systems/texlive/tlnet/archive/thesis-ekf.doc.r70980.tar.xz
2024/04/19 | 113128 | systems/texlive/tlnet/archive/thesis-ekf.r70980.tar.xz
2024/04/19 | 8944 | systems/texlive/tlnet/archive/thesis-ekf.source.r70980.tar.xz
@@ -318873,9 +318876,9 @@
2019/02/28 | 142452 | systems/texlive/tlnet/archive/toolbox.doc.r32260.tar.xz
2019/02/28 | 3052 | systems/texlive/tlnet/archive/toolbox.r32260.tar.xz
2019/02/28 | 24148 | systems/texlive/tlnet/archive/toolbox.source.r32260.tar.xz
-2024/06/03 | 6310328 | systems/texlive/tlnet/archive/tools.doc.r71408.tar.xz
-2024/06/03 | 45880 | systems/texlive/tlnet/archive/tools.r71408.tar.xz
-2024/06/03 | 241352 | systems/texlive/tlnet/archive/tools.source.r71408.tar.xz
+2024/06/15 | 6310444 | systems/texlive/tlnet/archive/tools.doc.r71523.tar.xz
+2024/06/15 | 45888 | systems/texlive/tlnet/archive/tools.r71523.tar.xz
+2024/06/15 | 241392 | systems/texlive/tlnet/archive/tools.source.r71523.tar.xz
2019/02/28 | 40340 | systems/texlive/tlnet/archive/topfloat.doc.r19084.tar.xz
2019/02/28 | 1392 | systems/texlive/tlnet/archive/topfloat.r19084.tar.xz
2020/04/16 | 379756 | systems/texlive/tlnet/archive/topiclongtable.doc.r54758.tar.xz
@@ -320213,16 +320216,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
2024/05/02 | 125808 | systems/texlive/tlnet/install-tl
-2024/06/14 | 5752962 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2024/06/14 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2024/06/14 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2024/06/15 | 5752802 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2024/06/15 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2024/06/15 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2024/04/13 | 5743 | systems/texlive/tlnet/install-tl-windows.bat
-2024/06/14 | 27718687 | systems/texlive/tlnet/install-tl-windows.exe
-2024/06/14 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2024/06/14 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2024/06/14 | 34426660 | systems/texlive/tlnet/install-tl.zip
-2024/06/14 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2024/06/14 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2024/06/15 | 27718492 | systems/texlive/tlnet/install-tl-windows.exe
+2024/06/15 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2024/06/15 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2024/06/15 | 34426635 | systems/texlive/tlnet/install-tl.zip
+2024/06/15 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2024/06/15 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2024/03/13 | 1229 | systems/texlive/tlnet/README.md
2024/03/13 | 0 | systems/texlive/tlnet/TEXLIVE_2024
2024/01/02 | 9011 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -320232,7 +320235,7 @@
2024/01/02 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2024/01/16 | 50726 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2024/06/14 | 7312 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2024/06/15 | 7141 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2024/03/15 | 229654 | 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
@@ -320274,12 +320277,12 @@
2023/02/21 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2024/05/02 | 5898 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2023/04/08 | 28167 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2024/06/14 | 19511356 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2024/06/14 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2024/06/15 | 19512783 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2024/06/15 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2024/05/02 | 87729 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2024/06/14 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2024/06/14 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2024/06/14 | 2582532 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2024/06/15 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2024/06/15 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2024/06/15 | 2577396 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2023/02/20 | 58928 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2023/06/11 | 42749 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2023/02/21 | 16138 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -331843,7 +331846,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
-2024/06/15 | 186 | timestamp
+2024/06/16 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2021/11/11 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 65d5438158..9eb4c0f45a 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index d1e6ed7413..c1e5e373ec 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,3 +1,145 @@
+2024/06/15 | 9995120 | systems/texlive/tlnet/archive/pgf.doc.r71527.tar.xz
+2024/06/15 | 9859 | support/latexindent/LatexIndent/Lines.pm
+2024/06/15 | 95260 | info/ptex-manual/eptex_resume.tex
+2024/06/15 | 951902 | graphics/pgf/contrib/tkz-grapheur.zip
+2024/06/15 | 9482185 | support/latexindent/bin/windows/latexindent.exe
+2024/06/15 | 9005 | support/latexindent/LatexIndent/FileExtension.pm
+2024/06/15 | 89520 | systems/texlive/tlnet/archive/ctex.source.r71527.tar.xz
+2024/06/15 | 8893 | support/latexindent/LatexIndent/IfElseFi.pm
+2024/06/15 | 838 | support/latexindent/LatexIndent/Version.pm
+2024/06/15 | 8346 | support/latexindent/LatexIndent/Environment.pm
+2024/06/15 | 801892 | graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.pdf
+2024/06/15 | 7875395 | support/latexindent/bin/linux/latexindent
+2024/06/15 | 78046 | info/ptex-manual/eptexdoc.tex
+2024/06/15 | 7569205 | support/latexindent/bin/macos/latexindent
+2024/06/15 | 74691 | graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.tex
+2024/06/15 | 74552 | graphics/pgf/contrib/tkz-grapheur/tex/tkz-grapheur.sty
+2024/06/15 | 740 | systems/texlive/tlnet/archive/collection-latexrecommended.r71527.tar.xz
+2024/06/15 | 7379 | support/latexindent/LatexIndent/MandatoryArgument.pm
+2024/06/15 | 7224 | systems/texlive/tlnet/archive/collection-latexextra.r71526.tar.xz
+2024/06/15 | 7180 | support/latexindent/LatexIndent/TrailingComments.pm
+2024/06/15 | 717460 | systems/texlive/tlnet/archive/pgf.r71527.tar.xz
+2024/06/15 | 7161 | support/latexindent/documentation/figure-schematic.png
+2024/06/15 | 7141 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2024/06/15 | 6892 | support/latexindent/documentation/contributors.bib
+2024/06/15 | 6890 | support/latexindent/LatexIndent/Item.pm
+2024/06/15 | 68177 | support/latexindent/LatexIndent/AlignmentAtAmpersand.pm
+2024/06/15 | 67904 | systems/texlive/tlnet/archive/siunitx.r71521.tar.xz
+2024/06/15 | 6620 | support/latexindent/LatexIndent/OptionalArgument.pm
+2024/06/15 | 6616 | support/latexindent/LatexIndent/BackUpFileProcedure.pm
+2024/06/15 | 655276 | systems/texlive/tlnet/archive/easybook.doc.r71519.tar.xz
+2024/06/15 | 6520 | support/latexindent/LatexIndent/UTF8CmdLineArgsFileOperation.pm
+2024/06/15 | 6391 | support/latexindent/LatexIndent/Else.pm
+2024/06/15 | 6310444 | systems/texlive/tlnet/archive/tools.doc.r71523.tar.xz
+2024/06/15 | 6148 | systems/texlive/tlnet/archive/count1to.source.r71526.tar.xz
+2024/06/15 | 61421 | support/latexindent/documentation/latexindent-yaml-schema.json
+2024/06/15 | 5857 | support/latexindent/LatexIndent/UnNamedGroupingBracesBrackets.pm
+2024/06/15 | 5780 | systems/texlive/tlnet/archive/multitoc.source.r71520.tar.xz
+2024/06/15 | 5752802 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2024/06/15 | 5742 | info/ptex-manual/ptex-manual.sty
+2024/06/15 | 55478 | support/latexindent/LatexIndent/GetYamlSettings.pm
+2024/06/15 | 5478 | support/latexindent/LatexIndent/KeyEqualsValuesBraces.pm
+2024/06/15 | 5432 | support/latexindent/LatexIndent/Check.pm
+2024/06/15 | 539720 | systems/texlive/tlnet/archive/count1to.doc.r71526.tar.xz
+2024/06/15 | 4946 | support/latexindent/latexindent.pl
+2024/06/15 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2024/06/15 | 48981 | info/ptex-manual/jfm.tex
+2024/06/15 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2024/06/15 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2024/06/15 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2024/06/15 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2024/06/15 | 48698 | info/ptex-manual/ptex-guide-en.tex
+2024/06/15 | 4860 | support/latexindent/LatexIndent/BlankLines.pm
+2024/06/15 | 45888 | systems/texlive/tlnet/archive/tools.r71523.tar.xz
+2024/06/15 | 446500 | support/latexindent/documentation/latexindent.tex
+2024/06/15 | 44096 | support/latexindent/documentation/logo.png
+2024/06/15 | 4404 | support/latexindent/LatexIndent/RoundBrackets.pm
+2024/06/15 | 440419 | macros/latex/contrib/scontents.zip
+2024/06/15 | 4402 | support/latexindent/documentation/latex-indent.bib
+2024/06/15 | 4388 | support/latexindent/LatexIndent/NamedGroupingBracesBrackets.pm
+2024/06/15 | 436256 | systems/texlive/tlnet/archive/texlive-scripts.doc.r71528.tar.xz
+2024/06/15 | 429100 | macros/latex/contrib/scontents/scontents.pdf
+2024/06/15 | 42357 | info/ptex-manual/ptexdoc_asciimw.tex
+2024/06/15 | 42000 | systems/texlive/tlnet/archive/thermodynamics.source.r71522.tar.xz
+2024/06/15 | 4122446 | biblio/ctan-bibdata.zip
+2024/06/15 | 404345 | info/ptex-manual/ptex-manual.pdf
+2024/06/15 | 40020 | systems/texlive/tlnet/archive/luamplib.source.r71524.tar.xz
+2024/06/15 | 3944 | systems/texlive/tlnet/archive/texlogfilter.r71525.tar.xz
+2024/06/15 | 381916 | info/ptex-manual/eptexdoc.pdf
+2024/06/15 | 3708800 | biblio/ctan-bibdata/ctan.pdf
+2024/06/15 | 35293 | info/ptex-manual/jtex_asciimw.tex
+2024/06/15 | 3524676 | systems/texlive/tlnet/archive/simpleicons.r71518.tar.xz
+2024/06/15 | 35225 | support/latexindent/LatexIndent/Wrap.pm
+2024/06/15 | 3517 | support/latexindent/LatexIndent/HorizontalWhiteSpace.pm
+2024/06/15 | 3515 | support/latexindent/LatexIndent/Replacement.pm
+2024/06/15 | 34426635 | systems/texlive/tlnet/install-tl.zip
+2024/06/15 | 3372 | info/ptex-manual/fam256p.tex
+2024/06/15 | 3353 | support/latexindent/LatexIndent/Tokens.pm
+2024/06/15 | 328944 | systems/texlive/tlnet/archive/thermodynamics.doc.r71522.tar.xz
+2024/06/15 | 3173 | info/ptex-manual/fam256d.tex
+2024/06/15 | 3089922 | info/ptex-manual.zip
+2024/06/15 | 29540 | systems/texlive/tlnet/archive/texlogfilter.doc.r71525.tar.xz
+2024/06/15 | 2873038 | biblio/ctan-bibdata/ctan.bib
+2024/06/15 | 27718492 | systems/texlive/tlnet/install-tl-windows.exe
+2024/06/15 | 276500 | systems/texlive/tlnet/archive/multitoc.doc.r71520.tar.xz
+2024/06/15 | 27422 | support/latexindent/LatexIndent/Verbatim.pm
+2024/06/15 | 2733 | support/latexindent/LatexIndent/Preamble.pm
+2024/06/15 | 2712 | support/latexindent/LatexIndent/Switches.pm
+2024/06/15 | 264764 | info/ptex-manual/ptexdoc_asciimw.pdf
+2024/06/15 | 25865 | support/latexindent/LatexIndent/Document.pm
+2024/06/15 | 2577396 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2024/06/15 | 2572176 | systems/texlive/tlnet/archive/simpleicons.doc.r71518.tar.xz
+2024/06/15 | 251872 | info/ptex-manual/jtex_asciimw.pdf
+2024/06/15 | 24449 | support/latexindent/LatexIndent/Arguments.pm
+2024/06/15 | 241392 | systems/texlive/tlnet/archive/tools.source.r71523.tar.xz
+2024/06/15 | 235593 | info/ptex-manual/jfm.pdf
+2024/06/15 | 2350 | macros/latex/contrib/scontents/README.md
+2024/06/15 | 2331 | support/latexindent/LatexIndent/Logger.pm
+2024/06/15 | 22345 | support/latexindent/LatexIndent/Sentence.pm
+2024/06/15 | 2224 | macros/latex/contrib/scontents/scontents.ins
+2024/06/15 | 22228 | support/latexindent/defaultSettings.yaml
+2024/06/15 | 217072 | systems/texlive/tlnet/archive/luamplib.doc.r71524.tar.xz
+2024/06/15 | 21292 | systems/texlive/tlnet/archive/luamplib.r71524.tar.xz
+2024/06/15 | 20870 | support/latexindent/LatexIndent/Indent.pm
+2024/06/15 | 20341 | info/ptex-manual/jtexdoc_asciimw.tex
+2024/06/15 | 2008 | support/latexindent/README
+2024/06/15 | 19615 | info/ptex-manual/ptexskip_asciimw.tex
+2024/06/15 | 19512783 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2024/06/15 | 18591 | support/latexindent/LatexIndent/ModifyLineBreaks.pm
+2024/06/15 | 18388 | systems/texlive/tlnet/archive/easybook.r71519.tar.xz
+2024/06/15 | 18292 | systems/texlive/tlnet/archive/easybook.source.r71519.tar.xz
+2024/06/15 | 1700 | systems/texlive/tlnet/archive/count1to.r71526.tar.xz
+2024/06/15 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2024/06/15 | 164929 | info/ptex-manual/ptexskip_asciimw.pdf
+2024/06/15 | 1558 | support/latexindent/latexindent-module-installer.pl
+2024/06/15 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2024/06/15 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2024/06/15 | 1516 | info/ptex-manual/LICENSE
+2024/06/15 | 1512 | systems/texlive/tlnet/archive/multitoc.r71520.tar.xz
+2024/06/15 | 1500 | support/latexindent/LatexIndent/DoubleBackSlash.pm
+2024/06/15 | 148019 | macros/latex/contrib/scontents/scontents.dtx
+2024/06/15 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2024/06/15 | 145802 | info/ptex-manual/ptex-manual.tex
+2024/06/15 | 145704 | info/ptex-manual/jtexdoc_asciimw.pdf
+2024/06/15 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2024/06/15 | 14059 | support/latexindent/LatexIndent/LogFile.pm
+2024/06/15 | 13923 | support/latexindent/LatexIndent/Special.pm
+2024/06/15 | 13470 | support/latexindent/LatexIndent/HiddenChildren.pm
+2024/06/15 | 130984 | systems/texlive/tlnet/archive/ctex.r71527.tar.xz
+2024/06/15 | 1297627 | support/latexindent/documentation/latexindent.pdf
+2024/06/15 | 12969815 | support/latexindent.zip
+2024/06/15 | 1286784 | systems/texlive/tlnet/archive/siunitx.doc.r71521.tar.xz
+2024/06/15 | 12653 | support/latexindent/LatexIndent/Braces.pm
+2024/06/15 | 123128 | systems/texlive/tlnet/archive/siunitx.source.r71521.tar.xz
+2024/06/15 | 1206 | info/ptex-manual/README.md
+2024/06/15 | 115730 | info/ptex-manual/ptex-guide-en.pdf
+2024/06/15 | 11509 | support/latexindent/LatexIndent/FileContents.pm
+2024/06/15 | 114376 | systems/texlive/tlnet/archive/texlive-scripts.r71528.tar.xz
+2024/06/15 | 1143636 | systems/texlive/tlnet/archive/ctex.doc.r71527.tar.xz
+2024/06/15 | 11206 | support/latexindent/LatexIndent/Heading.pm
+2024/06/15 | 11124 | systems/texlive/tlnet/archive/thermodynamics.r71522.tar.xz
+2024/06/15 | 10648 | support/latexindent/LatexIndent/Command.pm
+2024/06/15 | 1012994 | info/ptex-manual/eptex_resume.pdf
2024/06/14 | 9620 | systems/texlive/tlnet/archive/afm2pl.r71515.tar.xz
2024/06/14 | 9559 | macros/latex/required/tools/shellesc.dtx
2024/06/14 | 9443 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
@@ -15,15 +157,12 @@
2024/06/14 | 777 | macros/latex/contrib/count1to/README.md
2024/06/14 | 73673 | macros/latex/required/tools/tools-overview.pdf
2024/06/14 | 732 | systems/texlive/tlnet/archive/texworks.doc.r71515.tar.xz
-2024/06/14 | 7312 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2024/06/14 | 72911 | macros/latex/required/tools/verbatim.dtx
-2024/06/14 | 7220 | systems/texlive/tlnet/archive/collection-latexextra.r71514.tar.xz
2024/06/14 | 703908 | macros/latex/contrib/siunitx/siunitx.pdf
2024/06/14 | 6789 | macros/latex/required/tools/delarray.dtx
2024/06/14 | 677334 | macros/latex/contrib/easybook.zip
2024/06/14 | 66063 | macros/latex/required/tools/changes.txt
2024/06/14 | 656 | systems/texlive/tlnet/archive/collection-xetex.r71515.tar.xz
-2024/06/14 | 654508 | systems/texlive/tlnet/archive/easybook.doc.r71511.tar.xz
2024/06/14 | 645866 | macros/latex/contrib/siunitx/siunitx-code.pdf
2024/06/14 | 643100 | systems/texlive/tlnet/archive/texlive-common.doc.r71516.tar.xz
2024/06/14 | 6424314 | fonts/simpleicons.zip
@@ -33,7 +172,6 @@
2024/06/14 | 5816 | macros/latex/contrib/siunitx/siunitx-locale.dtx
2024/06/14 | 5791 | macros/latex/required/tools/somedefs.dtx
2024/06/14 | 5771 | macros/latex/required/tools/tools.ins
-2024/06/14 | 5752962 | systems/texlive/tlnet/install-tl-unx.tar.gz
2024/06/14 | 55714 | macros/latex/contrib/siunitx/siunitx-table.dtx
2024/06/14 | 552995 | macros/latex/contrib/count1to/count1to.pdf
2024/06/14 | 544801 | macros/latex/contrib/count1to.zip
@@ -43,21 +181,13 @@
2024/06/14 | 5211 | macros/latex/required/tools/tools-overview.tex
2024/06/14 | 4959 | macros/latex/required/tools/fileerr.dtx
2024/06/14 | 492 | systems/texlive/tlnet/archive/texworks.r71515.tar.xz
-2024/06/14 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2024/06/14 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2024/06/14 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2024/06/14 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2024/06/14 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2024/06/14 | 482622 | macros/latex/required/tools/l3sys-query.pdf
2024/06/14 | 4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
2024/06/14 | 43854 | macros/latex/contrib/siunitx/siunitx-compound.dtx
-2024/06/14 | 436236 | systems/texlive/tlnet/archive/texlive-scripts.doc.r71516.tar.xz
2024/06/14 | 43446 | macros/latex/required/tools/theorem.dtx
2024/06/14 | 41300 | systems/texlive/tlnet/archive/afm2pl.doc.r71515.tar.xz
-2024/06/14 | 4122445 | biblio/ctan-bibdata.zip
2024/06/14 | 4079 | support/texlogfilter/texlogfilter.html
2024/06/14 | 4072 | systems/texlive/tlnet/archive/spelatex.r71514.tar.xz
-2024/06/14 | 40024 | systems/texlive/tlnet/archive/luamplib.source.r71512.tar.xz
2024/06/14 | 399651 | macros/latex/required/tools/longtable.pdf
2024/06/14 | 39697 | macros/latex/required/tools/ftnright.dtx
2024/06/14 | 3938 | fonts/simpleicons/enc/simpleiconsfive.enc
@@ -71,7 +201,6 @@
2024/06/14 | 37462 | macros/latex/required/tools/tabularx.dtx
2024/06/14 | 374324 | macros/latex/contrib/thermodynamics.zip
2024/06/14 | 3727 | fonts/simpleicons/enc/simpleiconsoneone.enc
-2024/06/14 | 3708800 | biblio/ctan-bibdata/ctan.pdf
2024/06/14 | 370660 | macros/latex/required/tools/calc.pdf
2024/06/14 | 3684 | fonts/simpleicons/enc/simpleiconsonezero.enc
2024/06/14 | 3682 | macros/latex/contrib/siunitx/siunitx.ins
@@ -83,7 +212,6 @@
2024/06/14 | 3544 | fonts/simpleicons/enc/simpleiconseight.enc
2024/06/14 | 351671 | macros/latex/required/tools/theorem.pdf
2024/06/14 | 348 | systems/texlive/tlnet/archive/texlive-common.r71516.tar.xz
-2024/06/14 | 34426660 | systems/texlive/tlnet/install-tl.zip
2024/06/14 | 340 | systems/texlive/tlnet/archive/collection-texworks.r71515.tar.xz
2024/06/14 | 3401 | fonts/simpleicons/enc/simpleiconssix.enc
2024/06/14 | 34011 | macros/latex/required/tools/varioref-2016-02-16.sty
@@ -104,11 +232,9 @@
2024/06/14 | 29812 | macros/latex/required/tools/multicol-2017-04-11.sty
2024/06/14 | 2941 | macros/latex/contrib/siunitx/siunitx-binary.dtx
2024/06/14 | 289601 | macros/latex/required/tools/tabularx.pdf
-2024/06/14 | 2873098 | biblio/ctan-bibdata/ctan.bib
2024/06/14 | 285181 | macros/latex/contrib/multitoc/multitoc.pdf
2024/06/14 | 281130 | macros/latex/contrib/multitoc.zip
2024/06/14 | 279 | fonts/simpleicons/tex/usimpleiconsonethree.fd
-2024/06/14 | 27718687 | systems/texlive/tlnet/install-tl-windows.exe
2024/06/14 | 274 | fonts/simpleicons/tex/usimpleiconsonezero.fd
2024/06/14 | 2749 | macros/latex/required/tools/xr-2023-07-04.sty
2024/06/14 | 2748 | fonts/simpleicons/enc/simpleiconsonethree.enc
@@ -124,7 +250,6 @@
2024/06/14 | 259 | fonts/simpleicons/tex/usimpleiconsnine.fd
2024/06/14 | 259 | fonts/simpleicons/tex/usimpleiconsfour.fd
2024/06/14 | 259 | fonts/simpleicons/tex/usimpleiconsfive.fd
-2024/06/14 | 2582532 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2024/06/14 | 2576 | macros/latex/required/tools/multicol.ins
2024/06/14 | 257027 | macros/latex/required/tools/xspace.pdf
2024/06/14 | 2560887 | fonts/simpleicons/doc/simpleicons.pdf
@@ -147,21 +272,16 @@
2024/06/14 | 222074 | macros/latex/required/tools/trace.pdf
2024/06/14 | 2219 | macros/latex/required/tools/indentfirst.dtx
2024/06/14 | 221038 | macros/latex/required/tools/dcolumn.pdf
-2024/06/14 | 217040 | systems/texlive/tlnet/archive/luamplib.doc.r71512.tar.xz
2024/06/14 | 215077 | macros/latex/required/tools/enumerate.pdf
-2024/06/14 | 21288 | systems/texlive/tlnet/archive/luamplib.r71512.tar.xz
2024/06/14 | 21076 | macros/latex/required/tools/l3sys-query.dtx
2024/06/14 | 20624 | systems/texlive/tlnet/archive/spelatex.source.r71514.tar.xz
2024/06/14 | 198100 | macros/latex/required/tools/afterpage.pdf
-2024/06/14 | 19511356 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
2024/06/14 | 191058 | macros/latex/required/tools/delarray.pdf
2024/06/14 | 189678 | macros/latex/required/tools/hhline.pdf
2024/06/14 | 188159 | macros/latex/required/tools/multicol.dtx
2024/06/14 | 187633 | macros/latex/required/tools/fileerr.pdf
2024/06/14 | 18426 | macros/latex/contrib/siunitx/siunitx-angle.dtx
-2024/06/14 | 18352 | systems/texlive/tlnet/archive/easybook.r71511.tar.xz
2024/06/14 | 182611 | fonts/simpleicons/doc/bindings.tex
-2024/06/14 | 18244 | systems/texlive/tlnet/archive/easybook.source.r71511.tar.xz
2024/06/14 | 1812 | fonts/simpleicons/doc/simpleicons.tex
2024/06/14 | 17856 | macros/latex/required/tools/xspace.dtx
2024/06/14 | 17624 | macros/latex/contrib/count1to/count1to.dtx
@@ -170,28 +290,24 @@
2024/06/14 | 1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
2024/06/14 | 16905 | macros/latex/contrib/multitoc/multitoc.dtx
2024/06/14 | 168559 | macros/latex/contrib/siunitx/siunitx.tex
-2024/06/14 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2024/06/14 | 167583 | macros/latex/required/tools/somedefs.pdf
2024/06/14 | 1651 | macros/latex/required/tools/README.md
2024/06/14 | 163202 | macros/latex/contrib/siunitx/siunitx-number.dtx
2024/06/14 | 1591628 | install/macros/latex/contrib/siunitx.tds.zip
2024/06/14 | 157352 | macros/latex/required/tools/indentfirst.pdf
2024/06/14 | 1544090 | macros/latex/contrib/siunitx.zip
-2024/06/14 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2024/06/14 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
2024/06/14 | 15296 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
2024/06/14 | 15280 | systems/texlive/tlnet/archive/pdfxup.r71513.tar.xz
2024/06/14 | 152056 | systems/texlive/tlnet/archive/texlive-msg-translations.r71515.tar.xz
2024/06/14 | 1476 | fonts/simpleicons/map/simpleicons.map
2024/06/14 | 146438 | macros/latex/required/tools/fontsmpl.pdf
-2024/06/14 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2024/06/14 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
2024/06/14 | 1413 | macros/latex/contrib/count1to/count1to.ins
2024/06/14 | 1412 | macros/latex/contrib/multitoc/multitoc.ins
2024/06/14 | 14075 | macros/latex/required/tools/afterpage.dtx
2024/06/14 | 140114 | macros/latex/required/tools/array.dtx
2024/06/14 | 138956 | macros/latex/required/tools/rawfonts.pdf
2024/06/14 | 13459 | support/texlogfilter.zip
+2024/06/14 | 134450644 | macros/context/latest/cont-tmf.zip
2024/06/14 | 1318 | macros/latex/contrib/multitoc/README.md
2024/06/14 | 12830 | support/texlogfilter/texlogfilter
2024/06/14 | 12706 | macros/latex/required/tools/dcolumn.dtx
@@ -216,7 +332,6 @@
2024/06/14 | 11849 | macros/latex/required/tools/array-2016-10-06.sty
2024/06/14 | 1166 | macros/latex/contrib/siunitx/README.md
2024/06/14 | 114484 | macros/latex/required/tools/varioref.dtx
-2024/06/14 | 114412 | systems/texlive/tlnet/archive/texlive-scripts.r71516.tar.xz
2024/06/14 | 11252 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
2024/06/14 | 11148 | macros/latex/required/tools/hhline.dtx
2024/06/14 | 10771 | macros/latex/required/tools/fontsmpl.dtx
@@ -1286,7 +1401,6 @@
2024/06/11 | 36134 | macros/latex/base/ltnews39.tex
2024/06/11 | 35431 | macros/latex/base/ltdirchk.dtx
2024/06/11 | 353555 | macros/latex/base/utf8ienc.pdf
-2024/06/11 | 3512312 | systems/texlive/tlnet/archive/simpleicons.r71475.tar.xz
2024/06/11 | 3434 | macros/latex/base/makeindx.ins
2024/06/11 | 34139 | macros/latex/base/ltproperties.dtx
2024/06/11 | 3401 | macros/latex/base/proc.ins
@@ -1340,7 +1454,6 @@
2024/06/11 | 26000 | systems/texlive/tlnet/archive/se2thesis.source.r71473.tar.xz
2024/06/11 | 257825 | macros/latex/base/modguide.pdf
2024/06/11 | 257359 | macros/latex/base/cyrguide.pdf
-2024/06/11 | 2563368 | systems/texlive/tlnet/archive/simpleicons.doc.r71475.tar.xz
2024/06/11 | 2561 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerthemeArguelles.sty
2024/06/11 | 254384 | systems/texlive/tlnet/archive/citation-style-language.doc.r71468.tar.xz
2024/06/11 | 252519 | macros/latex/base/lb2.pdf
@@ -1531,7 +1644,6 @@
2024/06/09 | 64261 | biblio/citation-style-language/citeproc-output.lua
2024/06/09 | 6212 | biblio/citation-style-language/citeproc-ir-node.lua
2024/06/09 | 62104 | macros/latex/contrib/aomart/aomsample1.tex
-2024/06/09 | 61992 | macros/latex/contrib/aomart/aomsample.tex
2024/06/09 | 617 | biblio/citation-style-language/citeproc-lua.1
2024/06/09 | 60592 | macros/latex/contrib/biblatex-contrib/biblatex-sbl/biblatex-sbl-ibid.pdf
2024/06/09 | 5834 | biblio/citation-style-language/nature.csl
@@ -1655,13 +1767,3 @@
2024/06/09 | 10723 | biblio/citation-style-language/harvard-cite-them-right.csl
2024/06/09 | 10588 | biblio/citation-style-language/american-chemical-society.csl
2024/06/09 | 10095 | biblio/citation-style-language/citation-style-language-init.sty
-2024/06/08 | 564444 | macros/latex/contrib/msu-thesis.zip
-2024/06/08 | 35944 | graphics/pgf/contrib/argumentation/argumentation-doc.tex
-2024/06/08 | 313388 | systems/texlive/tlnet/archive/pst-optic.doc.r71455.tar.xz
-2024/06/08 | 307239 | graphics/pgf/contrib/argumentation/argumentation-doc.pdf
-2024/06/08 | 306578 | graphics/pgf/contrib/argumentation.zip
-2024/06/08 | 302 | graphics/pgf/contrib/argumentation/README.md
-2024/06/08 | 2529796 | systems/texlive/tlnet/archive/circuitikz.doc.r71455.tar.xz
-2024/06/08 | 180304 | systems/texlive/tlnet/archive/circuitikz.r71455.tar.xz
-2024/06/08 | 14696 | systems/texlive/tlnet/archive/pst-optic.r71455.tar.xz
-2024/06/08 | 11356 | graphics/pgf/contrib/argumentation/argumentation.sty
diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib
index 2688445df7..e0f83a8637 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 15-06-2024, 02:00:03
+%% created at 16-06-2024, 02:00:03
%%
%% This file is provided under the terms of the LPPL v1.3 or
@@ -15949,7 +15949,7 @@
title = {The \texttt{count1to} package},
subtitle = {Make use of count1 to count9},
author = {Martin Schröder and Marei Peischl},
- date = {2024-06-14},
+ date = {2024-06-15},
version = {2.11},
license = {lppl},
mirror = {https://mirror.ctan.org/macros/latex/contrib/count1to},
@@ -39023,8 +39023,8 @@
title = {The \texttt{latexindent} package},
subtitle = {Indent a \LaTeX{} document, highlighting the programming structure},
author = {Chris Hughes},
- date = {2024-05-12},
- version = {3.24.1},
+ date = {2024-06-15},
+ version = {3.24.2},
license = {gpl3},
mirror = {https://mirror.ctan.org/support/latexindent},
url = {https://ctan.org/pkg/latexindent},
@@ -47575,7 +47575,7 @@
title = {The \texttt{ms} package},
subtitle = {Various \LaTeX{} packages by Martin Schröder},
author = {Martin Schröder},
- date = {2024-06-14},
+ date = {2024-06-15},
license = {lppl},
url = {https://ctan.org/pkg/ms},
}
@@ -47993,7 +47993,7 @@
title = {The \texttt{multitoc} package},
subtitle = {Set table of contents in multiple columns},
author = {Martin Schröder and Marei Peischl},
- date = {2024-06-14},
+ date = {2024-06-15},
version = {2.02},
license = {lppl},
mirror = {https://mirror.ctan.org/macros/latex/contrib/multitoc},
@@ -58179,7 +58179,7 @@
title = {The \texttt{ptex-manual} package},
subtitle = {Japanese pTeX manual},
author = {{Japanese TeX Development Community}},
- date = {2023-09-02},
+ date = {2024-06-15},
version = {},
license = {bsd3},
mirror = {https://mirror.ctan.org/info/ptex-manual},
@@ -62025,8 +62025,8 @@
title = {The \texttt{scontents} package},
subtitle = {Stores \LaTeX{} contents in memory or files},
author = {Pablo González Luengo},
- date = {2022-04-04},
- version = {2.0},
+ date = {2024-06-15},
+ version = {2.1},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/scontents},
url = {https://ctan.org/pkg/scontents},
@@ -72206,8 +72206,8 @@
title = {The \texttt{tkz-grapheur} package},
subtitle = {A \LaTeX{} package with tools for graph plotting (and TikZ)},
author = {Cédric Pierquet},
- date = {2024-06-06},
- version = {0.1.3},
+ date = {2024-06-15},
+ version = {0.1.4},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/graphics/pgf/contrib/tkz-grapheur},
url = {https://ctan.org/pkg/tkz-grapheur},
diff --git a/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.pdf b/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.pdf
index 808c1421a7..83fcc4e4f5 100644
--- a/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.pdf
+++ b/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.tex b/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.tex
index 4d58cdb3ac..1a79a83cf8 100644
--- a/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.tex
+++ b/graphics/pgf/contrib/tkz-grapheur/doc/tkz-grapheur-doc-fr.tex
@@ -29,8 +29,8 @@
\hypersetup{pdfborder=0 0 0}
\usepackage[margin=2cm]{geometry}
\setlength{\parindent}{0pt}
-\def\TPversion{0.1.3}
-\def\TPdate{06/06/2024}
+\def\TPversion{0.1.4}
+\def\TPdate{15/06/2024}
\usepackage{soul}
\usepackage{codehigh}
\usepackage{tabularray}
@@ -150,6 +150,7 @@
\vfill
+\hfill{\footnotesize\textit{\ttfamily À mon papa.}}
\vspace*{5mm}
@@ -331,10 +332,11 @@ Concernant les styles des \textit{objets}, ils sont donnés ci-dessous.
\tikzset{pflgrilles/.style={very thin,lightgray}}
\tikzset{pflaxes/.style={line width=0.8pt,->,>=latex}}
-%style des points (courbe / nuage)
+%style des points (courbe / nuage /labels)
\tikzset{pflpoint/.style={line width=0.95pt}}
\tikzset{pflpointc/.style={radius=1.75pt}}
\tikzset{pflpointnuage/.style={radius=1.75pt}}
+\tikzset{pflnoeud/.style={}} %pour les inner sep par exemple :-)
%style des courbes
\tikzset{pflcourbe/.style={line width=1.05pt}}
@@ -762,8 +764,8 @@ Les \MontreCode{[clés]}, optionnelles, disponibles sont :
\end{itemize}
\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5}
-\begin{GraphiqueTikz}[x=1.5cm,y=1.5cm]
- \TracerAxesGrilles[Agrandir=2.5mm]{auto}{auto}
+\begin{GraphiqueTikz}[x=1.5cm,y=1.5cm,Ymin=-2]
+ \TracerAxesGrilles[Elargir=2.5mm]{auto}{auto}
\DefinirPts{A/1.75,-1.25}\MarquerPts[Couleur=pink]{(A)/A/below} %rond (par défaut)
\MarquerPts[Couleur=teal]{(1,1)/M/below}
\MarquerPts[Couleur=red,Style=x]{(1.25,1)/$A$/below} %croix
@@ -778,8 +780,25 @@ Les \MontreCode{[clés]}, optionnelles, disponibles sont :
\end{GraphiqueTikz}
\end{tcblisting}
+À noter qu'il est également possible de modifier la taille des marques \MontreCode{o/x/+/c} via les \MontreCode{[clés]} :
+
+\begin{itemize}
+ \item \MontreCode{Taillex=...} (\MontreCode{2pt} par défaut) pour les points \textit{croix} ;
+ \item \MontreCode{Tailleo=...} (\MontreCode{1.75pt} par défaut) pour les points \textit{cercle} ;
+ \item \MontreCode{Taillec=...} (\MontreCode{2pt} par défaut) pour les points \textit{carré}.
+\end{itemize}
+
\pagebreak
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5}
+\begin{GraphiqueTikz}[x=1cm,y=1cm,Xmin=0,Ymin=0]
+ \TracerAxesGrilles[Elargir=2.5mm]{auto}{auto}
+ \MarquerPts[Couleur=red,Style=x,Taillex=3.5pt]{(1.25,1.25)/$A$/below}
+ \MarquerPts[Couleur=teal,Tailleo=2.5pt]{(2,2)/$A$/right}
+ \MarquerPts*[Couleur=orange,Style=c,Taillec=4pt]{(0.5,2.5)}
+\end{GraphiqueTikz}
+\end{tcblisting}
+
\subsection{Récupérer les coordonnées de nœuds}\label{recupcoordo}
Il est également possible, dans l'optique d'une réutilisation de coordonnées, de récupérer les coordonnées d'un nœud (défini ou déterminé).
@@ -795,6 +814,30 @@ Les calculs étant effectués en flottant en fonction des unités (re)calculées
\RecupererCoordonnees{nœud}[\macrox][\macroy]
\end{tcblisting}
+\subsection{Placer du texte}\label{placetxt}
+
+À noter qu'une commande de placement de texte est disponible.
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5,listing only}
+%dans l'environnement GraphiqueTikz
+\PlacerTexte[clés]{(nœud ou coordonnées)}{texte}
+\end{tcblisting}
+
+Les \MontreCode{[clés]} disponibles sont :
+
+\begin{itemize}
+ \item \MontreCode{Police=...} (\MontreCode{\textbackslash normalsize\textbackslash normalfont} par défaut) pour la police ;
+ \item \MontreCode{Couleur=...} (\MontreCode{black} par défaut) pour la couleur ;
+ \item \MontreCode{Position=...} (\MontreCode{vide} par défaut) pour la position du texte par rapport aux coordonnées.
+\end{itemize}
+
+\begin{tcblisting}{listing engine=minted,minted language=latex,colframe=lightgray,colback=lightgray!5}
+ \begin{GraphiqueTikz}[x=1cm,y=1cm,Xmin=0,Xmax=5,Ymin=0,Ymax=1]
+ \TracerAxesGrilles[Elargir=2.5mm]{auto}{auto}
+ \PlacerTexte[Couleur=red,Police=\LARGE,Position=right]{(1.5,0.5)}{courbe $C_1$}
+ \end{GraphiqueTikz}
+\end{tcblisting}
+
\pagebreak
\section{Commandes spécifiques d'exploitation des courbes}
@@ -1702,6 +1745,7 @@ Les commandes disponibles sont :
\lstcmd{tracé droite~~~}{\TracerDroite}{tracdroite}
\lstcmd{def points~~~~~}{\DefinirPts}{defpts}
\lstcmd{marq pts~~~~~~~}{\MarquerPts}{markpts}
+ \lstcmd{placer txt~~~~~}{\PlacerTexte}{placetxt}
\lstcmd{récup absc~~~~~}{\RecupererAbscisse}{recupcoordo}
\lstcmd{récup ordo~~~~~}{\RecupererOrdonnee}{recupcoordo}
\lstcmd{récup coordos~~}{\RecupererCoordonnees}{recupcoordo}
@@ -1729,6 +1773,7 @@ Les commandes disponibles sont :
\begin{quote}
\begin{verbatim}
+0.1.4 : Placement de texte
0.1.3 : Ajout de régressions avec le package xint-regression
0.1.2 : Droites + Extremums
0.1.1 : Densité loi normale et khi deux + Marquage points + Améliorations
diff --git a/graphics/pgf/contrib/tkz-grapheur/tex/tkz-grapheur.sty b/graphics/pgf/contrib/tkz-grapheur/tex/tkz-grapheur.sty
index 1efc551b5b..7fc03cde3c 100644
--- a/graphics/pgf/contrib/tkz-grapheur/tex/tkz-grapheur.sty
+++ b/graphics/pgf/contrib/tkz-grapheur/tex/tkz-grapheur.sty
@@ -2,9 +2,10 @@
% licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tkz-grapheur}[2024/06/06 0.1.3.Des outils en TikZ pour travailler comme avec un grapheur]
+\ProvidesPackage{tkz-grapheur}[2024/06/15 0.1.4.Des outils en TikZ pour travailler comme avec un grapheur]
%====HISTORIQUE
+% v 0.1.4 Ajout des placements de textes
% v 0.1.3 Régressions, avec xintreg (désactivable)
% v 0.1.2 Max/Min + Droites
% v 0.1.1 Densité loi normale + khi deux + Améliorations diverses
@@ -85,6 +86,7 @@
}%
%====STYLES DE BASE
+\tikzset{pflnoeud/.style={}}
\tikzset{pflpoint/.style={line width=0.95pt}}
\tikzset{pflpointc/.style={radius=1.75pt}}
\tikzset{pflpointnuage/.style={radius=1.75pt}}
@@ -437,7 +439,7 @@
%origine
\ifboolKV[GraphiqueTikzAxes]{Origine}%
{%
- \draw ({\pflOx},{\pflOy}) node[below left,font={\useKV[GraphiqueTikzAxes]{Police}}] {\FormatterValeurAxex{\pflformataxex}{\pflOx}} ;
+ \draw ({\pflOx},{\pflOy}) node[pflnoeud,below left,font={\useKV[GraphiqueTikzAxes]{Police}}] {\FormatterValeurAxex{\pflformataxex}{\pflOx}} ;
%\draw (\pflOx,\pflOy) node[below left,font={\useKV[GraphiqueTikzAxes]{Police}}] {\ifboolKV[GraphiqueTikzAxes]{Num}{\num{\pflOx}}{\pflOx}} ;
}%
{}%
@@ -445,22 +447,22 @@
\foreach \x in \tmprangexvalues {%
\IfBooleanTF{#1}%
{%
- \xintifboolexpr{\x == \pflOx}{}{\draw ([yshift=-\pflthickgrad]{\x},{\pflOy}) node[below,font={\useKV[GraphiqueTikzAxes]{Police}}] {\FormatterValeurAxex{\pflformataxex}{\x}} ;}
+ \xintifboolexpr{\x == \pflOx}{}{\draw ([yshift=-\pflthickgrad]{\x},{\pflOy}) node[pflnoeud,below,font={\useKV[GraphiqueTikzAxes]{Police}}] {\FormatterValeurAxex{\pflformataxex}{\x}} ;}
%\xintifboolexpr{\x == \pflOx}{}{\draw ([yshift=-\pflthickgrad]\x,\pflOy) node[below,font={\useKV[GraphiqueTikzAxes]{Police}}] {\ifboolKV[GraphiqueTikzAxes]{Num}{\num{\x}}{\x}} ;}
}%
{%
- \draw ([yshift=-\pflthickgrad]{\x},{\pflOy}) node[below,font={\useKV[GraphiqueTikzAxes]{Police}}] {\FormatterValeurAxex{\pflformataxex}{\x}} ;
+ \draw ([yshift=-\pflthickgrad]{\x},{\pflOy}) node[pflnoeud,below,font={\useKV[GraphiqueTikzAxes]{Police}}] {\FormatterValeurAxex{\pflformataxex}{\x}} ;
%\draw ([yshift=-\pflthickgrad]\x,\pflOy) node[below,font={\useKV[GraphiqueTikzAxes]{Police}}] {\ifboolKV[GraphiqueTikzAxes]{Num}{\num{\x}}{\x}} ;
}%
}%
\foreach \y in \tmprangeyvalues {%
\IfBooleanTF{#1}%
{%
- \xintifboolexpr{\y == \pflOy}{}{\draw ([xshift=-\pflthickgrad]{\pflOx},{\y}) node[left,font={\useKV[GraphiqueTikzAxes]{Police}}] {\FormatterValeurAxey{\pflformataxey}{\y}} ;}
+ \xintifboolexpr{\y == \pflOy}{}{\draw ([xshift=-\pflthickgrad]{\pflOx},{\y}) node[pflnoeud,left,font={\useKV[GraphiqueTikzAxes]{Police}}] {\FormatterValeurAxey{\pflformataxey}{\y}} ;}
%\xintifboolexpr{\y == \pflOy}{}{\draw ([xshift=-\pflthickgrad]\pflOx,\y) node[left,font={\useKV[GraphiqueTikzAxes]{Police}}] {\ifboolKV[GraphiqueTikzAxes]{Num}{\num{\y}}{\y}} ;}
}%
{%
- \draw ([xshift=-\pflthickgrad]{\pflOx},{\y}) node[left,font={\useKV[GraphiqueTikzAxes]{Police}}] {\FormatterValeurAxey{\pflformataxey}{\y}} ;
+ \draw ([xshift=-\pflthickgrad]{\pflOx},{\y}) node[pflnoeud,left,font={\useKV[GraphiqueTikzAxes]{Police}}] {\FormatterValeurAxey{\pflformataxey}{\y}} ;
%\draw ([xshift=-\pflthickgrad]\pflOx,\y) node[left,font={\useKV[GraphiqueTikzAxes]{Police}}] {\ifboolKV[GraphiqueTikzAxes]{Num}{\num{\y}}{\y}} ;
}%
}%
@@ -589,7 +591,7 @@
\draw[{\useKV[GraphiqueTikzMarkPoints]{Couleur}},pfltraitantec] let \p1 = \Point in ({\x1},{\pflOy}) |- ({\pflOx},{\y1}) ;
}%
{}%
- \draw[{\useKV[GraphiqueTikzMarkPoints]{Couleur}}] \Point pic{pflptcroix={\useKV[GraphiqueTikzMarkPoints]{Taillex}}/45} node[\Pos,font=#3] {\Label} ;
+ \draw[{\useKV[GraphiqueTikzMarkPoints]{Couleur}}] \Point pic{pflptcroix={\useKV[GraphiqueTikzMarkPoints]{Taillex}}/45} node[pflnoeud,\Pos,font=#3] {\Label} ;
}%
}%
{}%
@@ -601,7 +603,7 @@
\draw[{\useKV[GraphiqueTikzMarkPoints]{Couleur}},pfltraitantec] let \p1 = \Point in ({\x1},{\pflOy}) |- ({\pflOx},{\y1}) ;
}%
{}%
- \draw[{\useKV[GraphiqueTikzMarkPoints]{Couleur}}] \Point pic{pflptcroix={\useKV[GraphiqueTikzMarkPoints]{Taillex}}/90} node[\Pos,font=#3] {\Label} ;
+ \draw[{\useKV[GraphiqueTikzMarkPoints]{Couleur}}] \Point pic{pflptcroix={\useKV[GraphiqueTikzMarkPoints]{Taillex}}/90} node[pflnoeud,\Pos,font=#3] {\Label} ;
}%
}%
{}%
@@ -613,7 +615,7 @@
\draw[{\useKV[GraphiqueTikzMarkPoints]{Couleur}},pfltraitantec] let \p1 = \Point in ({\x1},{\pflOy}) |- ({\pflOx},{\y1}) ;
}%
{}%
- \filldraw[draw=none,fill={\useKV[GraphiqueTikzMarkPoints]{Couleur}}] \Point pic{pflptcarre={\useKV[GraphiqueTikzMarkPoints]{Taillec}}/0} node[\Pos,{\useKV[GraphiqueTikzMarkPoints]{Couleur}},font=#3] {\Label} ;
+ \filldraw[draw=none,fill={\useKV[GraphiqueTikzMarkPoints]{Couleur}}] \Point pic{pflptcarre={\useKV[GraphiqueTikzMarkPoints]{Taillec}}/0} node[pflnoeud,\Pos,{\useKV[GraphiqueTikzMarkPoints]{Couleur}},font=#3] {\Label} ;
}%
}%
{}%
@@ -625,7 +627,7 @@
\draw[{\useKV[GraphiqueTikzMarkPoints]{Couleur}},pfltraitantec] let \p1 = \Point in ({\x1},{\pflOy}) |- ({\pflOx},{\y1}) ;
}%
{}%
- \filldraw[draw=none,fill={\useKV[GraphiqueTikzMarkPoints]{Couleur}}] \Point pic{pflptcarre={\useKV[GraphiqueTikzMarkPoints]{Tailleo}}/45} node[\Pos,{\useKV[GraphiqueTikzMarkPoints]{Couleur}},font=#3] {\Label} ;
+ \filldraw[draw=none,fill={\useKV[GraphiqueTikzMarkPoints]{Couleur}}] \Point pic{pflptcarre={\useKV[GraphiqueTikzMarkPoints]{Tailleo}}/45} node[pflnoeud,\Pos,{\useKV[GraphiqueTikzMarkPoints]{Couleur}},font=#3] {\Label} ;
}%
}%
{}%
@@ -640,7 +642,7 @@
\draw[{\useKV[GraphiqueTikzMarkPoints]{Couleur}},pfltraitantec] let \p1 = \Point in ({\x1},{\pflOy}) |- ({\pflOx},{\y1}) ;
}%
{}%
- \draw[pfltrait,\pflcouleurpointsA,fill=\pflcouleurpointsB] \Point circle[radius={\useKV[GraphiqueTikzMarkPoints]{Tailleo}}] node[\Pos,font=#3] {\Label} ;
+ \draw[pfltrait,\pflcouleurpointsA,fill=\pflcouleurpointsB] \Point circle[radius={\useKV[GraphiqueTikzMarkPoints]{Tailleo}}] node[pflnoeud,\Pos,font=#3] {\Label} ;
}%
}%
{%
@@ -650,7 +652,7 @@
\draw[{\useKV[GraphiqueTikzMarkPoints]{Couleur}},pfltraitantec] let \p1 = \Point in ({\x1},{\pflOy}) |- ({\pflOx},{\y1}) ;
}%
{}%
- \filldraw[\pflcouleurpoints] \Point circle[radius={\useKV[GraphiqueTikzMarkPoints]{Tailleo}}] node[\Pos,font=#3] {\Label} ;
+ \filldraw[\pflcouleurpoints] \Point circle[radius={\useKV[GraphiqueTikzMarkPoints]{Tailleo}}] node[pflnoeud,\Pos,font=#3] {\Label} ;
}%
}%
}%
@@ -668,7 +670,7 @@
\foreach \i in {1,...,\LstValXlen}{%
\itemtomacro\LstValX[\i]\mavalx%
\itemtomacro\LstValFmtX[\i]\mavalfmtx%
- \draw ([yshift=-\pflthickgrad]{\mavalx},{\pflOy}) node[below,font={\useKV[GraphiqueTikzAxes]{Police}}] {\mavalfmtx} ;
+ \draw ([yshift=-\pflthickgrad]{\mavalx},{\pflOy}) node[pflnoeud,below,font={\useKV[GraphiqueTikzAxes]{Police}}] {\mavalfmtx} ;
}%
}
@@ -681,7 +683,7 @@
\foreach \i in {1,...,\LstValXlen}{%
\itemtomacro\LstValY[\i]\mavaly%
\itemtomacro\LstValFmtY[\i]\mavalfmty%
- \draw ([xshift=-\pflthickgrad]{\pflOx},{\mavaly}) node[left,font={\useKV[GraphiqueTikzAxes]{Police}}] {\mavalfmty} ;
+ \draw ([xshift=-\pflthickgrad]{\pflOx},{\mavaly}) node[pflnoeud,left,font={\useKV[GraphiqueTikzAxes]{Police}}] {\mavalfmty} ;
}%
}
@@ -1287,7 +1289,7 @@
}%
{%
\foreach \Point/\Pos/\Label in {#4}{%
- \filldraw[#2] \Point circle[pflpointc] node[\Pos,font=#3] {\Label} ;
+ \filldraw[#2] \Point circle[pflpointc] node[pflnoeud,\Pos,font=#3] {\Label} ;
}
}%
}
@@ -2014,4 +2016,21 @@
\end{scope}
}
+%====TEXTES
+\defKV[GraphiqueTikzNode]{%
+ Couleur=\def\pflnodecol{#1},%
+ Police=\def\pflnodefonte{#1},%
+ Position=\def\pfnodepos{#1}
+}
+\setKVdefault[GraphiqueTikzNode]{%
+ Couleur=black,%
+ Debut={\normalfont\normalsize},%
+ Position={}
+}
+\NewDocumentCommand\PlacerTexte{ O{} m m }{%
+ \restoreKV[GraphiqueTikzNode]%
+ \setKV[GraphiqueTikzNode]{#1}%
+ \draw #2 node[pflnoeud,font=\pflnodefonte,text=\pflnodecol,\pfnodepos] {#3} ;
+}
+
\endinput \ No newline at end of file
diff --git a/info/ptex-manual/LICENSE b/info/ptex-manual/LICENSE
index 75ba828650..ca91de652c 100644
--- a/info/ptex-manual/LICENSE
+++ b/info/ptex-manual/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2017-2023 Japanese TeX Development Community
+Copyright (C) 2017-2024 Japanese TeX Development Community
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/info/ptex-manual/README.md b/info/ptex-manual/README.md
index 979ba3ba92..7e3eadc629 100644
--- a/info/ptex-manual/README.md
+++ b/info/ptex-manual/README.md
@@ -36,6 +36,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2023-09-02
+2024-06-15
Japanese TeX Development Community
diff --git a/info/ptex-manual/eptexdoc.pdf b/info/ptex-manual/eptexdoc.pdf
index 3c6017f971..a833601d95 100644
--- a/info/ptex-manual/eptexdoc.pdf
+++ b/info/ptex-manual/eptexdoc.pdf
Binary files differ
diff --git a/info/ptex-manual/eptexdoc.tex b/info/ptex-manual/eptexdoc.tex
index 3fa8e0c573..5955b33582 100644
--- a/info/ptex-manual/eptexdoc.tex
+++ b/info/ptex-manual/eptexdoc.tex
@@ -27,12 +27,16 @@
\MakeShortVerb*{|}
%%%%%%%%%%%%%%%%
-\makeatletter
+\makeatletter % adjust for lmodern
{\lccode`\!=`\_
\lowercase{%
\protected\gdef\_{\ifdefstrequal{\f@family}{\ttdefault}{!}%
{\leavevmode\vrule width .45em height -.2ex depth .3ex\relax}%
}}
+\global\let\adj@underbar@\_
+\catcode`\_=13
+\gdef\adj@underbar{% depend on ptex-manual.sty
+ \catcode`\_=13 \let_\adj@underbar@}
}
\makeatother
@@ -41,7 +45,7 @@
\begin{document}
\title{\emph{\epTeX ã«ã¤ã„ã¦}}
\author{åŒ—å· å¼˜å…¸\null
-\thanks{\url{http://osdn.jp/projects/eptex/wiki/},\
+\thanks{\url{https://github.com/h-kitagawa/eptex-wiki/blob/main/README.md},\
e-mail: \texttt{h\_kitagawa2001(at)yahoo.co.jp}}}
\date{version \the\epTeXversion,\today}
\maketitle
@@ -208,18 +212,18 @@ tracing機能やæ¡ä»¶åˆ¤æ–­æ–‡ã®å¼·åŒ–ãªã©ã‚ã‚‹ãŒï¼Œãã“ら辺ã¯ãƒ‘ッã
以下,\eTeX 拡張を\pTeX æ‹¡å¼µã¨ãƒžãƒ¼ã‚¸ã™ã‚‹ã«ã‚ãŸã£ã¦èª¿æ•´ã—ãŸç®‡æ‰€ã‚’è¿°ã¹ã‚‹ï¼Ž
\begin{cslist}
\csitem[\.{lastnodetype} (read-only integer)]
- \pTeX æ‹¡å¼µã§ã¯ï¼Œ\TeX ã¨æ¯”較ã—ã¦\node{dir\_node}ã¨\node{disp\_node}ã¨ã„ã†2種類ã®ãƒŽãƒ¼ãƒ‰ãŒ
+ \pTeX æ‹¡å¼µã§ã¯ï¼Œ\TeX ã¨æ¯”較ã—ã¦\node{dir_node}ã¨\node{disp_node}ã¨ã„ã†2種類ã®ãƒŽãƒ¼ãƒ‰ãŒ
追加ã•ã‚ŒãŸï¼Žå‰è€…ã¯ï¼Œç¾åœ¨ã®ãƒªã‚¹ãƒˆã®ä¸­ã«é•ã†çµ„æ–¹å‘ã®boxを挿入ã™ã‚‹éš›ã«å¯¸æ³•ã‚’補正ã™ã‚‹ãŸã‚ã«ä½œã‚‰ã‚Œï¼Œ
\.{hbox}ã‚„\.{vbox}ã®ã‚³ãƒ³ãƒ†ãƒŠã¨ãªã£ã¦ã„る.
ã¾ãŸå¾Œè€…ã¯ï¼Œæ¬§æ–‡æ–‡å­—ã®ãƒ™ãƒ¼ã‚¹ãƒ©ã‚¤ãƒ³è£œæ­£ã®ãŸã‚ã«ä½¿ã‚れる.
\epTeX~110102ã¾ã§ã¯ã“れらã®ãƒŽãƒ¼ãƒ‰ã‚‚\.{lastnodetype}ã®å€¤ã¨ã—ã¦å‡ºåŠ›ã•ã›ã‚‹ã‚ˆã†ã«ã—ãŸï¼Ž
ã—ã‹ã—,両者ã¨ã‚‚ã«\epTeX ãŒè‡ªå‹•çš„ã«æŒ¿å…¥ã™ã‚‹ï¼ˆãƒ¦ãƒ¼ã‚¶ãƒ¼ãŒæ„è­˜ã™ã‚‹å¿…è¦ã¯ãªã„)ノードã§ã‚ã‚‹ã“ã¨ã‹ã‚‰ï¼Œ
- \epTeX~110227以é™ã§ã¯\node{dir\_node}ã¨\node{disp\_node}ã¯
+ \epTeX~110227以é™ã§ã¯\node{dir_node}ã¨\node{disp_node}ã¯
\.{lastnodetype}ã®å¯¾è±¡ã¨ã™ã‚‹ã€Œæœ€å¾Œã®ãƒŽãƒ¼ãƒ‰ã€ã¨ã¯ãªã‚‰ãªã„よã†ã«ã—ã¦ã„ã‚‹
\footnote{%
- 最後ã®ãƒŽãƒ¼ãƒ‰ãŒ\node{dir\_node}ã§ã‚ã£ãŸå ´åˆï¼Œ\.{lastnodetype}ã¯ãã®ãƒŽãƒ¼ãƒ‰ãŒæ ¼ç´ã—ã¦ã„ã‚‹
- \node{hlist\_node}ã‹\node{vlist\_node}ã®ç¨®é¡žã‚’è¿”ã™ï¼Ž
+ 最後ã®ãƒŽãƒ¼ãƒ‰ãŒ\node{dir_node}ã§ã‚ã£ãŸå ´åˆï¼Œ\.{lastnodetype}ã¯ãã®ãƒŽãƒ¼ãƒ‰ãŒæ ¼ç´ã—ã¦ã„ã‚‹
+ \node{hlist_node}ã‹\node{vlist_node}ã®ç¨®é¡žã‚’è¿”ã™ï¼Ž
}.\\
\parbox{.9\linewidth}{%
\begin{multilist}{3}{\hfil\hskip1.5zw#:&\quad#\qquad\hfil}
@@ -300,8 +304,8 @@ tracing機能やæ¡ä»¶åˆ¤æ–­æ–‡ã®å¼·åŒ–ãªã©ã‚ã‚‹ãŒï¼Œãã“ら辺ã¯ãƒ‘ッã
上記ã§ã€Œå’Œæ–‡æ–‡å­—コードã¨ã—ã¦æœ‰åŠ¹ã‹ã©ã†ã‹ã€ã¯ï¼Œé–¢æ•°|is_char_kanji|ã‚’å‚照.
ã“ã®é–¢æ•°ã¯å†…部コードã«ã‚ˆã£ã¦ç•°ãªã‚‹ãŸã‚,マクロã§å®Ÿè£…ã™ã‚‹ã®ã¯é¢å€’ã§ã‚ã‚‹ãŒï¼Œ
\epTeX~190709以é™ã§ã¯\.{iffontchar}ã§å®¹æ˜“ã«å®Ÿç¾ã§ãる.
- ãªãŠï¼Œå†…部Unicodeã®\upTeX ã§ã¯ä»»æ„ã®éžè² ã®å€¤ãŒå’Œæ–‡æ–‡å­—コードã¨ã—ã¦æœ‰åŠ¹ãªãŸã‚,
- |is_char_kanji|ã¯éžè² ã‹ã©ã†ã‹ã®åˆ¤å®šã«ãªã£ã¦ã„る.
+ ãªãŠï¼Œå†…部Unicodeã®\upTeX ã§ã¯0以上0xFFFFFF以下ã®å€¤ãŒå’Œæ–‡æ–‡å­—コードã¨ã—ã¦
+ 有効ã§ã‚る.% https://github.com/texjporg/tex-jp-build/issues/160
\end{dangerous}
@@ -685,7 +689,7 @@ p\number\ptexversion.\number\ptexminorversion\ptexrevision-%
「,ã€ã®å¾Œã®åŠè§’空ãã¨ï¼Œã€Œã€Žã€ã®å‰ã®åŠè§’空ããŒä¸¡æ–¹
å…¥ã£ã¦ã—ã¾ã†ã¨ã„ã†\pTeX ã®å’Œæ–‡å‡¦ç†ã®ä»•æ§˜
\footnote{%
- \TeX82 ã®æ¬§æ–‡ã®ã‚«ãƒ¼ãƒ‹ãƒ³ã‚°ã‚„åˆå­—処ç†ã‚‚åŒã˜ã‚ˆã†ãªä»•æ§˜ã«ãªã£ã¦ã„る.
+ \TeX82ã®æ¬§æ–‡ã®ã‚«ãƒ¼ãƒ‹ãƒ³ã‚°ã‚„åˆå­—処ç†ã‚‚åŒã˜ã‚ˆã†ãªä»•æ§˜ã«ãªã£ã¦ã„る.
例ãˆã°\texttt{W\.{relax}\ oWo}ã‹ã‚‰ã¯W\relax oWoã¨ã„ã†å‡ºåŠ›ã«ãªã‚Šï¼Œ
Wã¨oã®é–“ã®ã‚«ãƒ¼ãƒ‹ãƒ³ã‚°ãŒ\.{relax}ã«ã‚ˆã£ã¦æŒ¿å…¥ã•ã‚Œãªããªã£ãŸã“ã¨ãŒã‚ã‹ã‚‹ï¼Ž
}ã«ã‚ˆã‚‹ï¼Ž
@@ -1351,7 +1355,7 @@ $3$\,sp)ã ãŒï¼Œã©ã“ã‹æ°—ã«ãªã‚‹ã¨ã“ã‚ã§ã‚る.
\begin{thebibliography}{99}
\bibitem{h7k} åŒ—å· å¼˜å…¸ï¼Œã€Œè¨ˆç®—æ•°å­¦II 作業記録ã€ï¼Œ2008.\\
\url{https://osdn.jp/projects/eptex/document/resume/ja/1/resume.pdf}ã»ã‹ï¼Œ
- 本pdfã¨åŒã˜ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ã‚ã‚‹\texttt{eptex\_resume.pdf}ãŒãã‚Œã«ã‚ãŸã‚‹ï¼Ž
+ 本PDFã¨åŒã˜ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ã‚ã‚‹\file{eptex_resume.pdf}ãŒãã‚Œã«ã‚ãŸã‚‹ï¼Ž
\bibitem{yamamoto} 山本 和義,「数å¼famã®åˆ¶é™ã¨luatexã€ï¼Œ
掲示æ¿ã€Œ\TeX\ Q\ \&\ Aã€ï¼Œ2009/02/12.\\
\url{https://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/52744.html}
@@ -1378,7 +1382,7 @@ $3$\,sp)ã ãŒï¼Œã©ã“ã‹æ°—ã«ãªã‚‹ã¨ã“ã‚ã§ã‚る.
|\lastnodechar| ã®å®Ÿè£…ã€ï¼Œ\TeX~Forum,2014/11/19.
\url{https://okumuralab.org/tex/mod/forum/discuss.php?d=1435#p8053}
\bibitem{lnc} åŒ—å· å¼˜å…¸ï¼Œã€Œ|\lastnodechar| プリミティブã«ã¤ã„ã¦ã€ï¼Œ2014/12/15.\\
- \url{https://ja.osdn.net/projects/eptex/wiki/lastnodechar}
+ \url{https://github.com/h-kitagawa/eptex-wiki/blob/main/lastnodechar/README.md}
\bibitem{xe5} Joseph Wright, ``[XeTeX] |\(pdf)mdfivesum|'',
2015/07/01,\\
\url{http://tug.org/pipermail/xetex/2015-July/026044.html}
diff --git a/info/ptex-manual/jfm.pdf b/info/ptex-manual/jfm.pdf
index b86833c46c..2e9d3b35cc 100644
--- a/info/ptex-manual/jfm.pdf
+++ b/info/ptex-manual/jfm.pdf
Binary files differ
diff --git a/info/ptex-manual/jfm.tex b/info/ptex-manual/jfm.tex
index b3852a69fc..0d9e25817d 100644
--- a/info/ptex-manual/jfm.tex
+++ b/info/ptex-manual/jfm.tex
@@ -12,8 +12,6 @@
\MakeShortVerb*{|}
\def\size#1{\mathit{#1}}
-\def\code#1{\texttt{#1}}
-\def\codechar#1{\ensuremath{\langle\mbox{\kern0pt\code{#1}\kern0pt}\rangle}}
\title{\emph{JFMファイルフォーマット}}
\author{ASCII Corporation \& Japanese \TeX\ Development Community}
@@ -24,7 +22,7 @@
\pTeX ã§å’Œæ–‡ãƒ•ã‚©ãƒ³ãƒˆã‚’扱ã†ãŸã‚ã®ãƒ•ã‚©ãƒ³ãƒˆãƒ¡ãƒˆãƒªãƒƒã‚¯ã§ã‚り,
オリジナルã®\TeX ã®TFM (\TeX\ Font Metric)ã«ç›¸å½“ã™ã‚‹ï¼Ž
\pTeX ã¨åŒã˜ãæ ªå¼ä¼šç¤¾ã‚¢ã‚¹ã‚­ãƒ¼ã«ã‚ˆã£ã¦é–‹ç™ºã•ã‚Œï¼Œ
-ã“ã®æ–‡æ›¸ã‚‚\pTeX ã«ä»˜å±žã—ã¦ã„ãŸã‚‚ã®ã§ã‚ã‚‹ãŒï¼Œã“ã“ã§ã¯2018å¹´ã«
+ã“ã®æ–‡æ›¸ã‚‚\pTeX ã«ä»˜å±žã—ã¦ã„ãŸã‚‚ã®ã§ã‚ã‚‹ãŒï¼Œã“ã“ã§ã¯2018年以é™ã«
日本語\TeX 開発コミュニティã«ã‚ˆã£ã¦æ‹¡å¼µã•ã‚ŒãŸJFMフォーマットã«
基ã¥ã„ã¦èª¬æ˜Žã™ã‚‹ï¼Ž
@@ -93,8 +91,8 @@ JFMファイルã§ã‚‚TFMファイルã¨åŒã˜ã,拡張å­ã¯\code{.tfm}ãŒç”¨
ã“ã®ãƒ†ãƒ¼ãƒ–ルã®å„エントリーã¯1ワード(ï¼4ãƒã‚¤ãƒˆï¼‰ã§æ§‹æˆã•ã‚Œï¼Œ
上ä½3ãƒã‚¤ãƒˆã«æ–‡å­—コード(符å·ä½ç½®ï¼‰ï¼Œä¸‹ä½1ãƒã‚¤ãƒˆã«æ–‡å­—タイプをæŒã¤
-\footnote{日本語\TeX{}開発コミュニティã«ã‚ˆã‚‹æ–°ä»•æ§˜ï¼›
-詳細ã¯ç¬¬\ref{jfm-new}節をå‚照.}.
+\footnote{文字コードを3ãƒã‚¤ãƒˆã§æŒã¤ã®ã¯ï¼Œæ—¥æœ¬èªž\TeX{}開発コミュニティã«ã‚ˆã‚‹
+新仕様.詳細ã¯ç¬¬\ref{jfm-new}節をå‚照.}.
文字コードã¯ï¼Œãã‚ŒãŒ16進数24bit(3ãƒã‚¤ãƒˆï¼‰ã§\code{0xABcdef}ã¨è¡¨ã•ã‚Œã‚‹ã¨ã,
\node{char\_type}テーブルã«ã¯\code{cd ef AB}ã¨ã—ã¦æ ¼ç´ã•ã‚Œã‚‹ï¼Ž
テーブル内ã«ã¯ã‚³ãƒ¼ãƒ‰ã®å€¤ã®é †ç•ªã«åŽã‚られã¦ã„ãªã‘ã‚Œã°ãªã‚‰ãªã„.
@@ -142,7 +140,7 @@ JFMã§ã¯$\size{bc}$ã¯å¿…ãšã‚¼ãƒ­\footnote{å‰ç¯€ã«ã‚ã‚‹ã¨ãŠã‚Šï¼Œæ–‡å­—ã‚
% 文字タイプã®é€£ç¶šæ€§ã«ã¤ã„ã¦ã¯ã©ã“ã«ã‚‚明記ã•ã‚Œã¦ã„ãªã„æ°—ãŒã™ã‚‹â€¦ï¼‰
\subsection{\node{glue\_kern}テーブル}
-特定ã®æ–‡å­—タイプã®çµ„ã¿åˆã›æ™‚ã«æŒ¿å…¥ã™ã¹ã\node{glue}åˆã¯\node{kern}ã‚’
+特定ã®æ–‡å­—タイプã®çµ„ã¿åˆã‚ã›æ™‚ã«æŒ¿å…¥ã™ã¹ã\node{glue}åˆã¯\node{kern}ã‚’
ç°¡å˜ãªãƒ—ログラム言語ã«ã‚ˆã£ã¦æŒ‡å®šã™ã‚‹ï¼Ž
å„命令ã¯ï¼Œä»¥ä¸‹ã®4ãƒã‚¤ãƒˆã§æ§‹æˆã•ã‚Œã‚‹ï¼Ž
\begin{description}\itemindent=2zw
@@ -153,8 +151,8 @@ JFMã§ã¯$\size{bc}$ã¯å¿…ãšã‚¼ãƒ­\footnote{å‰ç¯€ã«ã‚ã‚‹ã¨ãŠã‚Šï¼Œæ–‡å­—ã‚
ã§ã‚ã‚‹å ´åˆã¯ï¼Œå®Ÿéš›ã®\node{glue\_kern}プログラムãŒ
\node{glue\_kern}[$256\times\size{op\_byte}+\size{remainder}$]ã‹ã‚‰
åŽã‚られã¦ã„る(ã™ãªã‚ã¡ï¼Œå†é…ç½®ã•ã‚Œã¦ã„る)ã“ã¨ã‚’示ã™
- \footnote{日本語\TeX{}開発コミュニティã«ã‚ˆã£ã¦æ–°ãŸã«ã‚µãƒãƒ¼ãƒˆï¼›
- 詳細ã¯ç¬¬\ref{jfm-new}節をå‚照.}.
+ \footnote{å†é…ç½®ã¯ï¼Œæ—¥æœ¬èªž\TeX{}開発コミュニティã«ã‚ˆã£ã¦
+ æ–°ãŸã«ã‚µãƒãƒ¼ãƒˆï¼Žè©³ç´°ã¯ç¬¬\ref{jfm-new}節をå‚照.}.
最åˆã®ãƒ¯ãƒ¼ãƒ‰ã§ãªã„å ´åˆï¼ˆã™ãªã‚ã¡ï¼Œæ—¢ã«å†é…置先ã‚ã‚‹ã„ã¯
プログラムã®ã‚¹ãƒ†ãƒƒãƒ—を開始ã—ãŸå¾Œã®ãƒ¯ãƒ¼ãƒ‰ã§ã‚ã‚‹å ´åˆï¼‰ã¯ï¼Œ
ãã®å ´ã§ãƒ—ログラムを終了ã™ã‚‹ï¼Ž
@@ -163,8 +161,8 @@ JFMã§ã¯$\size{bc}$ã¯å¿…ãšã‚¼ãƒ­\footnote{å‰ç¯€ã«ã‚ã‚‹ã¨ãŠã‚Šï¼Œæ–‡å­—ã‚
\item 128よりå°ã•ã„ã¨ã\\
ã“ã®ãƒ¯ãƒ¼ãƒ‰ã‚’実行ã—ãŸå¾Œï¼Œæ¬¡ã®ã‚¹ãƒ†ãƒƒãƒ—ã¾ã§ã‚¹ã‚­ãƒƒãƒ—ã™ã‚‹
ワード数を示ã™
- \footnote{日本語\TeX{}開発コミュニティã«ã‚ˆã£ã¦æ–°ãŸã«ã‚µãƒãƒ¼ãƒˆï¼›
- 詳細ã¯ç¬¬\ref{jfm-new}節をå‚照.}.
+ \footnote{スキップã¯ï¼Œæ—¥æœ¬èªž\TeX{}開発コミュニティã«ã‚ˆã£ã¦
+ æ–°ãŸã«ã‚µãƒãƒ¼ãƒˆï¼Žè©³ç´°ã¯ç¬¬\ref{jfm-new}節をå‚照.}.
\end{itemize}
\item[第2ãƒã‚¤ãƒˆ] (\node{char\_type})
\begin{itemize}
@@ -176,14 +174,18 @@ JFMã§ã¯$\size{bc}$ã¯å¿…ãšã‚¼ãƒ­\footnote{å‰ç¯€ã«ã‚ã‚‹ã¨ãŠã‚Šï¼Œæ–‡å­—ã‚
\item ãã†ã§ãªã‘ã‚Œã°æ¬¡ã®ã‚¹ãƒ†ãƒƒãƒ—ã¸ï¼Ž
\end{itemize}
\item[第3ãƒã‚¤ãƒˆ] (\node{op\_byte})\\
- ã“ã®å€¤ã«ã‚ˆã£ã¦ã‚°ãƒ«ãƒ¼ã‚’扱ã†ã‹ã‚«ãƒ¼ãƒ³ã‚’扱ã†ã‹ã‚’è¦å®šã™ã‚‹ï¼Ž
+ ã“ã®å€¤ã«ã‚ˆã£ã¦ã‚°ãƒ«ãƒ¼ã‚’扱ã†ã‹ã‚«ãƒ¼ãƒ³ã‚’扱ã†ã‹ã‚’è¦å®šã™ã‚‹ã¨ã¨ã‚‚ã«ï¼Œ
+ インデックスã®ä¸€éƒ¨ã‚’å…¼ã­ã‚‹
+ \footnote{インデックスã®ä¸€éƒ¨ã‚’å…¼ã­ã‚‹ã“ã¨ã§
+ 256種類以上を扱ã†ä»•æ§˜ã¯ï¼Œæ—¥æœ¬èªž\TeX{}開発コミュニティã«ã‚ˆã£ã¦
+ æ–°ãŸã«ã‚µãƒãƒ¼ãƒˆï¼Žè©³ç´°ã¯ç¬¬\ref{jfm-new}節をå‚照.}.
\begin{itemize}
- \item 127以下ã®å ´åˆ\node{glue}[$\size{remainder}\times 3$]ã®ã‚°ãƒ«ãƒ¼ã‚’挿入.
- \item 128以上ã®å ´åˆ\node{kern}[$\size{remainder}$]ã®ã‚«ãƒ¼ãƒ³ã‚’挿入.
+ \item 127以下ã®å ´åˆ\node{glue}[$(\size{op\_byte}\times256+\size{remainder})\times 3$]ã®ã‚°ãƒ«ãƒ¼ã‚’挿入.
+ \item 128以上ã®å ´åˆ\node{kern}[$(\size{op\_byte}-128)\times256+\size{remainder}$]ã®ã‚«ãƒ¼ãƒ³ã‚’挿入.
\end{itemize}
\item[第4ãƒã‚¤ãƒˆ] (\node{remainder})\\
第3ãƒã‚¤ãƒˆã«ã‚ˆã‚Šè¦å®šã•ã‚Œã‚‹
- \node{glue}ã¾ãŸã¯\node{kern}ã¸ã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’示ã™ï¼Ž
+ \node{glue}ã¾ãŸã¯\node{kern}ã¸ã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã®ä¸€éƒ¨ã‚’ãªã™ï¼Ž
\end{description}
\subsection{\node{glue}テーブル}
@@ -231,6 +233,12 @@ JFMフォーマットã®ä»•æ§˜ã‚’æ‹¡å¼µã—ãŸï¼Ž
\item \node{glue\_kern}テーブルã§ã®å†é…ç½®(rearrangement)
\end{enumerate}
和文JFMã§ã“れらã®æ‹¡å¼µæ©Ÿèƒ½ãŒä½¿ã‚ã‚Œã¦ã„ã‚‹å ´åˆã¯\pTeX~p3.8.0以上ãŒå¿…è¦ã§ã‚る.
+% https://github.com/texjporg/tex-jp-build/issues/8
+% https://github.com/texjporg/tex-jp-build/pull/47
+
+ã¾ãŸï¼Œ2023å¹´9月ã«ã€Œ\node{glue\_kern}テーブルã¸ã®256種類以上ã®
+グルーåˆã¯ã‚«ãƒ¼ãƒ³ã®æ ¼ç´ã€ã‚’サãƒãƒ¼ãƒˆã—ãŸï¼Ž
+% https://github.com/texjporg/tex-jp-build/pull/162
\subsubsection{\node{char\_type}テーブルã¸ã®3ãƒã‚¤ãƒˆã®æ–‡å­—コード格ç´}
\node{char\_type}テーブルã®å„エントリーã¯1ワード(ï¼4ãƒã‚¤ãƒˆï¼‰ã§
@@ -271,6 +279,17 @@ JFMã§æ‰±ã†ã“ã¨ãŒã§ããªã‹ã£ãŸï¼Žã¾ãŸï¼Œã‚ªãƒªã‚¸ãƒŠãƒ«ã®ä»•æ§˜ã§ã
ãã‚Œã¨åŒæ§˜ã§ã‚る.2018å¹´2月ã«æ—¥æœ¬èªž\TeX{}開発コミュニティã«ã‚ˆã£ã¦ï¼Œ
\pTeX{}åŠã³pPLtoTFã§æ–°ãŸã«ã‚µãƒãƒ¼ãƒˆã•ã‚ŒãŸï¼Ž
+\subsubsection{\node{glue\_kern}テーブルã¸ã®256種類以上ã®ã‚°ãƒ«ãƒ¼åˆã¯ã‚«ãƒ¼ãƒ³ã®æ ¼ç´}
+上記ã®ã€Œå†é…ç½®ã€ã‚µãƒãƒ¼ãƒˆã«ã‚ˆã£ã¦ã‚°ãƒ«ãƒ¼ã‚„カーンを挿入ã™ã‚‹æ–‡å­—ã®çµ„ã¿åˆã‚ã›ã‚’
+多種類定義ã§ãるよã†ã«ãªã£ãŸãŒï¼Œä¾ç„¶ãã®ã‚°ãƒ«ãƒ¼ã‚„カーンã®å¯¸æ³•ã¯256種類ã«
+é™ã‚‰ã‚Œã¦ã„ãŸï¼Žã“ã‚Œã¯å¾“æ¥ã®JFMã§ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’第4ãƒã‚¤ãƒˆ(\node{remainder})ã®ã¿ã§
+「\node{glue}[$\size{remainder}\times 3$]ã®ã‚°ãƒ«ãƒ¼ã€
+「\node{kern}[$\size{remainder}$]ã®ã‚«ãƒ¼ãƒ³ã€
+ã¨è¦å®šã—ã¦ã„ãŸãŸã‚ã§ã‚る.
+欧文TFMã®\node{lig\_kern}テーブルã§ã¯5,000種類ã®ã‚«ãƒ¼ãƒ³ã‚’扱ãˆãŸã®ã§ï¼Œ
+2023å¹´9月以é™ã®æ—¥æœ¬èªž\TeX{}開発コミュニティã®æ”¹ä¿®ã§ã“れをå–り入れ,
+第3ãƒã‚¤ãƒˆ(\node{op\_byte})も活用ã—ã¦ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã®ç¯„囲を増やã—ãŸï¼Ž
+
\subsection{JFMフォーマットã®åˆ¶ç´„事項}
冒頭ã«è¿°ã¹ãŸã¨ãŠã‚Šï¼Œæ–‡å­—タイプ(\node{char\_type})ã®ä¸Šé™ã¯255ã§ã‚り,
@@ -562,18 +581,19 @@ $ chkdvifont upjisr-v.tfm
\paragraph{和文JFMã®æ‹¡å¼µæ©Ÿèƒ½ãŒä½¿ã‚ã‚Œã¦ã„ã‚‹å ´åˆ}
第\ref{jfm-new}節ã§è¿°ã¹ãŸã¨ãŠã‚Šï¼Œæ—¥æœ¬èªž\TeX 開発コミュニティã«ã‚ˆã£ã¦
-下記ã®3点ã«ã¤ãJFMフォーマットã®ä»•æ§˜ãŒæ‹¡å¼µã•ã‚Œã¦ã„る.
+下記ã®4点ã«ã¤ãJFMフォーマットã®ä»•æ§˜ãŒæ‹¡å¼µã•ã‚Œã¦ã„る.
\begin{enumerate}
\item \node{char\_type}テーブルã¸ã®3ãƒã‚¤ãƒˆã®æ–‡å­—コード格ç´
\item \node{glue\_kern}テーブルã§ã®ã‚¹ã‚­ãƒƒãƒ—(SKIP)コマンド使用
\item \node{glue\_kern}テーブルã§ã®å†é…ç½®(rearrangement)
+ \item \node{glue\_kern}テーブルã¸ã®256種類以上ã®ã‚°ãƒ«ãƒ¼åˆã¯ã‚«ãƒ¼ãƒ³ã®æ ¼ç´
\end{enumerate}
-和文JFMã§ã“れらã®æ‹¡å¼µæ©Ÿèƒ½ãŒä½¿ã‚ã‚Œã¦ã„ã‚‹å ´åˆã¯\pTeX~p3.8.0以上ãŒå¿…è¦ã§ã‚ã‚‹ãŒï¼Œ
-ã“ã®æƒ…報も表示ã•ã‚Œã‚‹ï¼ˆä¸‹ã®ä¾‹ã¯å†é…ç½®ã‚り):
+ã‚‚ã—ã“れらã®æ‹¡å¼µæ©Ÿèƒ½ãŒä½¿ã‚ã‚Œã¦ã„ã‚Œã°ï¼Œæƒ…å ±ã¨ã—ã¦è¡¨ç¤ºã•ã‚Œã‚‹
+(下ã®ä¾‹ã¯å†é…ç½®ã‚り):
\begin{verbatim}
$ chkdvifont upphiraminw3-h.tfm
"upphiraminw3-h" is a jfm file : 0 -> 146
- New features in pTeX p3.8.0 / JFM 2.0:
+ New features in Community pTeX / JFM 2.0:
+ rearrangement in glue_kern
checksum = 00000000
design size = 10485760 2^{-20} points = 10 points
diff --git a/info/ptex-manual/ptex-guide-en.pdf b/info/ptex-manual/ptex-guide-en.pdf
index d7d1a15136..06930809cd 100644
--- a/info/ptex-manual/ptex-guide-en.pdf
+++ b/info/ptex-manual/ptex-guide-en.pdf
Binary files differ
diff --git a/info/ptex-manual/ptex-guide-en.tex b/info/ptex-manual/ptex-guide-en.tex
index dace64fcc7..999ce22caa 100644
--- a/info/ptex-manual/ptex-guide-en.tex
+++ b/info/ptex-manual/ptex-guide-en.tex
@@ -33,20 +33,11 @@
}
\makeatother
-\def\file#1{\textsf{#1}}
-\def\code#1{\texttt{#1}}
-
%%%%%%%%%%%%%%%%
\makeatletter
\setlist{leftmargin=2zw}
\setlist[description]{labelwidth=2zw,labelindent=1zw,topsep=\medskipamount}
-\def\>{\ifhmode\hskip\xkanjiskip\fi}
-
-\def\tsp{_{\mbox{\fontsize\sf@size\z@\ttfamily \char32}}}
-\def\tpar{_{\mbox{\fontsize\sf@size\z@\ttfamily \string\par}}}
-\def\tign{_{\mbox{\fontsize\sf@size\z@\selectfont --}}}
-
\usepackage{shortvrb}
\MakeShortVerb*{|}
%%%%%%%%%%%%%%%%
@@ -829,8 +820,6 @@ is as follows:
% "7FFF = 32767
\item 32768--134217727: \.{omathchardef} (only for \epTeX/\eupTeX)
% "7FFFFFF = 134217727
- \item (optional) 256--2147483647: \.{chardef} (only for \upTeX/\eupTeX)
- % "7FFFFFFF = 2147483647 (+1 => ! Number too big.)
\end{itemize}
%%% 指定ã®ã‚³ãƒ¼ãƒ‰ã®å’Œæ–‡ãƒˆãƒ¼ã‚¯ãƒ³ã‚’得る方法
diff --git a/info/ptex-manual/ptex-manual.pdf b/info/ptex-manual/ptex-manual.pdf
index cfeefbae6f..d0ba0689fb 100644
--- a/info/ptex-manual/ptex-manual.pdf
+++ b/info/ptex-manual/ptex-manual.pdf
Binary files differ
diff --git a/info/ptex-manual/ptex-manual.sty b/info/ptex-manual/ptex-manual.sty
index 74fc75c8c3..5bbe7172b8 100644
--- a/info/ptex-manual/ptex-manual.sty
+++ b/info/ptex-manual/ptex-manual.sty
@@ -1,6 +1,5 @@
%%% common macros for ptex-manual documents
\def\headfont{\normalfont\mathversion{bold}\sffamily}
-\def\node#1{\textit{#1}}
\def\.#1{\texorpdfstring{%
\leavevmode\hbox{\texttt{\textbackslash#1}}\ifmmode\else\textcompwordmark\fi}{\textbackslash #1}}
@@ -24,12 +23,28 @@
\def\paragraph#1{\par\medskip\par\noindent\emph{â– #1}\par\nobreak}
\def\Pkg#1{\textsf{#1}}
+\def\adj@underbar{\catcode`\_=12 }
+\def\code{\begingroup\adj@underbar\code@}
+\def\code@#1{\endgroup\texttt{#1}}
+\def\file{\begingroup\adj@underbar\file@}
+\def\file@#1{\endgroup\textsf{#1}}
+\def\node{\begingroup\adj@underbar\node@}
+\def\node@#1{\endgroup\textit{#1}}
+\def\hex#1{\ifmmode\mbox\fi{\texttt{"#1}}}%"
+\def\codechar#1{\ensuremath{\langle\mbox{\kern0pt\code{#1}\kern0pt}\rangle}}
+\def\>{\ifhmode\hskip\xkanjiskip\fi}
+
+% print character code in hexadecimal
+\def\codeHEX#1{\code{\omathchardef\omc@=#1\relax\strip@omch@r{\meaning\omc@}}}
+{\escapechar-1 \xdef\omch@r{\string\omathchar}}
+\def\strip@omch@r#1{\expandafter\strip@omch@r@#1}
+\expandafter\def\expandafter\strip@omch@r@\expandafter#\expandafter1\omch@r#2{#2}
+
\let\@lessthan <
\begingroup
\catcode`\<=13
\gdef<{\ifmmode\@lessthan\else\expandafter\@@meta\fi}
\gdef\@@meta#1>{\ensuremath{\langle\hbox{\normalfont\textit{#1}}\rangle}}
-\gdef\hex#1{\ifmmode\mbox\fi{\texttt{"#1}}}%"
\endgroup
\AtBeginDocument{\catcode`\<=13\relax}
\let\OR |
@@ -37,6 +52,7 @@
\xspcode`\\=3
\xspcode`\*=3
\xspcode`\-=3
+\xspcode`\"=3
\xspcode23=3 % \textcompwordmark
\normalsize
@@ -152,4 +168,7 @@
\def\TL{\TeX\ Live\xspace}
\AtBeginDocument{\providecommand{\texorpdfstring}[2]{#1}}
+% ptex-manual check
+\def\ptErr#1{\errhelp{}\errmessage{ptex-manual: #1}}
+
%%% EOF
diff --git a/info/ptex-manual/ptex-manual.tex b/info/ptex-manual/ptex-manual.tex
index bf968264c7..4cad105e60 100644
--- a/info/ptex-manual/ptex-manual.tex
+++ b/info/ptex-manual/ptex-manual.tex
@@ -19,16 +19,11 @@
% common
\usepackage{ptex-manual}
-\def\size#1{\mathit{#1}}
-\def\code#1{\texttt{#1}}
-
%%%%%%%%%%%%%%%%
\makeatletter
\setlist{leftmargin=2zw}
\setlist[description]{labelwidth=2zw,labelindent=1zw,topsep=\medskipamount}
-\def\>{\ifhmode\hskip\xkanjiskip\fi}
-
\def\tsp{_{\mbox{\fontsize\sf@size\z@\ttfamily \char32}}}
\def\tpar{_{\mbox{\fontsize\sf@size\z@\ttfamily \string\par}}}
\def\tign{_{\mbox{\fontsize\sf@size\z@\selectfont --}}}
@@ -80,7 +75,7 @@ p3.1.11 (2009/08/17).\url{https://asciidwango.github.io/ptex/}}ã®ã§ï¼Œ
本ドキュメント(\jobname.pdf)ã§ã¯ï¼Œ\pTeX 系列ã«ãŠã‘る共通機能ã¨
\upTeX ã«ã‚ˆã‚‹æ‹¡å¼µã‚’説明ã™ã‚‹ï¼Ž% 和文文字トークンã®æ‰±ã„ãŒç•°ãªã‚‹
-\epTeX ã«ã‚ˆã‚‹æ‹¡å¼µã«ã¤ã„ã¦ã¯eptexdoc.pdfã‚’å‚ç…§ã•ã‚ŒãŸã„.
+\epTeX/\eupTeX ã«ã‚ˆã‚‹æ‹¡å¼µã«ã¤ã„ã¦ã¯eptexdoc.pdfã‚’å‚ç…§ã•ã‚ŒãŸã„.
\begin{itemize}
\item コミュニティ版\pTeX ã®é–‹ç™ºå…ƒï¼š\\
@@ -117,7 +112,7 @@ p3.1.11 (2009/08/17).\url{https://asciidwango.github.io/ptex/}}ã®ã§ï¼Œ
\section*{\TeX~Liveã«ãŠã‘ã‚‹é…布}
\def\MODEext{{\tiny 拡張モード}}
-\the\year ç¾åœ¨ï¼Œ\TeX~Liveã§é…布ã•ã‚Œã¦ã„る主è¦ãªã‚¨ãƒ³ã‚¸ãƒ³ã¨
+ç¾åœ¨ï¼Œ\TeX~Liveã§é…布ã•ã‚Œã¦ã„る主è¦ãªã‚¨ãƒ³ã‚¸ãƒ³ã¨
\pTeX 系列ã®é–¢ä¿‚性ã¯ä»¥ä¸‹ã®å›³ã§è¡¨ã•ã‚Œã‚‹ï¼Ž
独立ã—ãŸãƒ—ログラム(ãƒã‚¤ãƒŠãƒªï¼‰ã¨ã—ã¦é…布ã•ã‚Œã¦ã„ã‚‹ã‚‚ã®ã‚’
\fbox{æž }ã§å›²ã‚“ã§ã‚る.\par\vskip-35pt
@@ -125,7 +120,7 @@ p3.1.11 (2009/08/17).\url{https://asciidwango.github.io/ptex/}}ã®ã§ï¼Œ
\xymatrix@ur{
\text{\fbox{\TeX}} \ar[r]\ar[d] & \text{\eTeX} \ar[r]\ar[d]\ar[rd]
& \text{\fbox{\pdfTeX}} \ar[rd] & \\
- \text{\pTeX} \ar[r]\ar[d] & \text{\fbox{\epTeX}} \ar[d]
+ \text{\pTeX} \ar[r]\ar[d] & \text{\epTeX} \ar[d]
& \text{\fbox{\hologo{XeTeX}}} & \text{\fbox{Lua\TeX}} \\
\text{\upTeX} \ar[r] & \text{\fbox{\eupTeX}} & & %\\ &&&
}
@@ -135,23 +130,45 @@ p3.1.11 (2009/08/17).\url{https://asciidwango.github.io/ptex/}}ã®ã§ï¼Œ
\pTeX, \upTeX, \epTeX, \eupTeX ã®4種類ã®ã‚¨ãƒ³ã‚¸ãƒ³ãŒ
独立ã—ãŸãƒ—ログラムã¨ã—ã¦é…布ã•ã‚Œã¦ã„ãŸãŒï¼Œ
\TeX~Live 2023ã§ã¯ç´ ã®\pTeX ã¨\upTeX ã®é…布ãŒåœæ­¢ã•ã‚Œï¼Œ
-ãã‚Œãžã‚Œ\epTeX ã¨\eupTeX ã®äº’æ›ãƒ¢ãƒ¼ãƒ‰ï¼ˆ\code{-etex}スイッãƒç„¡åŠ¹ï¼Œ
-ã™ãªã‚ã¡extended modeã§ãªã„状態)ã«ç½®ãæ›ãˆã‚‰ã‚ŒãŸ
-\footnote{例ãˆã°ï¼Œ2022å¹´ã¾ã§ã¯ã‚³ãƒžãƒ³ãƒ‰\code{ptex}ã§
-\code{This is pTeX, Version ...}ãŒèµ·å‹•ã—ã¦ã„ãŸãŒï¼Œ2023å¹´ã¯
-\code{This is e-pTeX, Version ...}ãŒèµ·å‹•ã™ã‚‹ï¼Ž
-ã“ã“ã ã‘見るã¨ã‚³ãƒžãƒ³ãƒ‰\code{eptex}ã¨ä¼¼ã¦ã„ã‚‹ãŒï¼Œ\code{eptex}ã§ã¯
-直後ã«\code{entering extended mode}ã¨æ‹¡å¼µãƒ¢ãƒ¼ãƒ‰ã«å…¥ã‚‹ã®ã¨ç•°ãªã‚Šï¼Œ
-\code{ptex}ã§ã¯æ‹¡å¼µãƒ¢ãƒ¼ãƒ‰ã«å…¥ã‚‰ãªã„ã®ã§ï¼Œ\eTeX 特有ã®
-機能ãŠã‚ˆã³ãƒ—リミティブã¯ç„¡åŠ¹åŒ–ã•ã‚ŒãŸçŠ¶æ…‹ã¨ãªã‚‹ï¼Ž}.
+ãã‚Œãžã‚Œ\epTeX ã¨\eupTeX ã®äº’æ›ãƒ¢ãƒ¼ãƒ‰ã«ç½®ãæ›ãˆã‚‰ã‚ŒãŸï¼Ž
+ã•ã‚‰ã«\TeX~Live 2024ã§ã¯ã‚ªãƒªã‚¸ãƒŠãƒ«ã®\epTeX ã®é…布もåœæ­¢ã•ã‚Œï¼Œ
+4種類ã®ã‚¨ãƒ³ã‚¸ãƒ³ã¯å…¨ã¦\eupTeX ã¨ã„ã†å˜ä¸€ã®ãƒ—ログラムã«ã‚ˆã‚‹
+エミュレートã¸ã¨æ•´ç†ã•ã‚ŒãŸï¼Žè¡¨ã«ã¾ã¨ã‚ã‚‹ã¨æ¬¡ã®ã‚ˆã†ã«ãªã‚‹ï¼Ž
+
+\begin{description}\small
+ \item[互æ›ãƒ¢ãƒ¼ãƒ‰]
+ \eTeX ã®æ‹¡å¼µãƒ¢ãƒ¼ãƒ‰(extended mode)ã§ãªã„状態,
+ ã™ãªã‚ã¡\code{-etex}スイッãƒç„¡åŠ¹çŠ¶æ…‹ï¼Ž\\
+ 例ãˆã°ï¼Œ2022å¹´ã¾ã§ã¯ã‚³ãƒžãƒ³ãƒ‰\code{ptex}ã§
+ \code{This is pTeX, Version ...}ãŒèµ·å‹•ã—ã¦ã„ãŸãŒï¼Œ2023å¹´ã¯
+ \code{This is e-pTeX, Version ...}ãŒèµ·å‹•ã™ã‚‹ï¼Ž
+ ã“ã“ã ã‘見るã¨ã‚³ãƒžãƒ³ãƒ‰\code{eptex}ã¨ä¼¼ã¦ã„ã‚‹ãŒï¼Œ\code{eptex}ã§ã¯
+ 直後ã«\code{entering extended mode}ã¨æ‹¡å¼µãƒ¢ãƒ¼ãƒ‰ã«å…¥ã‚‹ã®ã¨ç•°ãªã‚Šï¼Œ
+ \code{ptex}ã§ã¯æ‹¡å¼µãƒ¢ãƒ¼ãƒ‰ã«å…¥ã‚‰ãªã„ã®ã§ï¼Œ\eTeX 特有ã®
+ 機能ãŠã‚ˆã³ãƒ—リミティブã¯ç„¡åŠ¹åŒ–ã•ã‚ŒãŸçŠ¶æ…‹ã¨ãªã‚‹ï¼Ž
+ \item[内部レガシー]
+ (\eTeXpre)\upTeX ãŒæ–‡å­—コードã«é–¢ã™ã‚‹å†…部処ç†ã‚’
+ Unicodeã§ã¯ãªã(\eTeXpre)\pTeX åŒæ§˜ã®
+ レガシーエンコーディング(EUC-JPã‚„Shift-JIS)ã§è¡Œã†ã“ã¨ã‚’指ã™ï¼Ž
+ 内部コードã®å·®ç•°ã ã‘ã§ã‚り,ãã®ä»–ã®(\eTeXpre)\upTeX 特有ã®
+ 機能ãŠã‚ˆã³ãƒ—リミティブã¯åˆ©ç”¨å¯èƒ½ãªçŠ¶æ…‹ã§ã‚る.
+ 本文中\code{-kanji-internal}ã®èª¬æ˜Žã‚‚å‚照.\\
+ 例ãˆã°ï¼Œ2023å¹´ã®ã‚³ãƒžãƒ³ãƒ‰\code{eptex}ãŒ
+ \code{This is e-pTeX, Version ... (utf8.euc)}ã§ã‚ã£ãŸãªã‚‰ã°ï¼Œ
+ 2024å¹´ã«ã¯
+ \code{This is e-upTeX, Version ... (utf8.euc)}ã«å¤‰ã‚ã£ã¦ã„る.
+ 一方\code{euptex}ã¯
+ \code{This is e-upTeX, Version ... (utf8.uptex)}ã§ã‚ã‚‹ã‹ã‚‰
+ 内部コードãŒç•°ãªã‚‹ï¼Ž
+\end{description}
\begin{table}[ht]
\centering
- \begin{tabular}{ccc}
- \code{コマンドå} & \TeX~Live 2022ã¾ã§ & \TeX~Live 2023 \\
- \code{ptex} & \pTeX & \epTeX ã®äº’æ›ãƒ¢ãƒ¼ãƒ‰ \\
- \code{uptex} & \upTeX & \eupTeX ã®äº’æ›ãƒ¢ãƒ¼ãƒ‰ \\
- \code{eptex} & \epTeX\MODEext & →変更ãªã— \\
- \code{euptex} & \eupTeX\MODEext & →変更ãªã— \\
+ \begin{tabular}{cccc}\hline
+ \code{コマンドå} & \TeX~Live 2022ã¾ã§ & \TeX~Live 2023 & \TeX~Live 2024ä»¥é™ \\ \hline
+ \code{ptex} & \pTeX & \epTeX ã®äº’æ›ãƒ¢ãƒ¼ãƒ‰ & \eupTeX ã®å†…部レガシーã®äº’æ›ãƒ¢ãƒ¼ãƒ‰ \\
+ \code{uptex} & \upTeX & \eupTeX ã®äº’æ›ãƒ¢ãƒ¼ãƒ‰ & →変更ãªã— \\
+ \code{eptex} & \epTeX\MODEext & →変更ãªã— & \eupTeX ã®å†…部レガシー \\
+ \code{euptex} & \eupTeX\MODEext & →変更ãªã— & →変更ãªã— \\ \hline
\end{tabular}
\end{table}
@@ -182,21 +199,14 @@ p3.1.11 (2009/08/17).\url{https://asciidwango.github.io/ptex/}}ã®ã§ï¼Œ
\TeX~Liveã§ã®ã‚¨ãƒ³ã‚¸ãƒ³åˆ©ç”¨çŠ¶æ³ã¯ä»¥ä¸‹ã®é€šã‚Šã§ã‚る.
ã“ã“ã§ï¼Œ2023-06-01以é™ã¯\code{platex}ã§\epTeX ã§ã¯ãªã
-「\eupTeX ã®å†…部処ç†ã‚’レガシーãªEUC-JP/Shift-JISã«å¤‰æ›´ã—ãŸçŠ¶æ…‹ã€
-ãŒèµ·å‹•ã™ã‚‹ã“ã¨ã«æ³¨æ„\footnote{(\eTeXpre)\upTeX ã¯
-通常ã®ã‚³ãƒžãƒ³ãƒ‰å\code{uptex}ã‚„\code{euptex}ã§èµ·å‹•ã•ã‚Œã‚‹ã¨
-内部処ç†ã‚’Unicodeã§è¡Œã†ãŒï¼Œ
-コマンドå\code{ptex}ã‚„\code{eptex}ã§èµ·å‹•ã•ã‚Œã‚‹ã¨
-内部処ç†ã‚’(\eTeXpre)\pTeX åŒæ§˜ã®ãƒ¬ã‚¬ã‚·ãƒ¼ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã§è¡Œã†ï¼Ž
-内部コードã®å·®ç•°ã ã‘ã§ã‚り,ãã®ä»–ã®(\eTeXpre)\upTeX 特有ã®
-機能ãŠã‚ˆã³ãƒ—リミティブã¯åˆ©ç”¨å¯èƒ½ãªçŠ¶æ…‹ã§ã‚る.
-本文中\code{-kanji-internal}ã®èª¬æ˜Žã‚‚å‚照.}.
+\eupTeX ã®å†…部レガシーãŒèµ·å‹•ã™ã‚‹ã“ã¨ã«æ³¨æ„
+(\code{eptex}より一足早ã変更ã•ã‚ŒãŸï¼‰ï¼Ž
\begin{table}[ht]
\centering
- \begin{tabular}{ccc}
- \code{コマンドå} & \TeX~Live 2012ã‹ã‚‰2023åˆæœŸã¾ã§ & \TeX~Live 2023ã®2023-06-01ä»¥é™ \\
+ \begin{tabular}{ccc}\hline
+ \code{コマンドå} & \TeX~Live 2012ã‹ã‚‰2023åˆæœŸã¾ã§ & \TeX~Live 2023ã®2023-06-01ä»¥é™ \\ \hline
\code{platex} & \epTeX\MODEext & \eupTeX\MODEext ã®å†…部レガシー \\
- \code{uplatex} & \eupTeX\MODEext & →変更ãªã— \\
+ \code{uplatex} & \eupTeX\MODEext & →変更ãªã— \\ \hline
\end{tabular}
\end{table}
@@ -217,7 +227,8 @@ p3.1.11 (2009/08/17).\url{https://asciidwango.github.io/ptex/}}ã®ã§ï¼Œ
% http://ajt.ktug.org/assets/2008/5/1/0201tsuchimura_kuroki.pdf
% https://okumuralab.org/tex/mod/forum/discuss.php?d=460
-\TeX82ã§æ‰±ãˆã‚‹æ–‡å­—コードã®ç¯„囲ã¯0--255ã§ã‚ã£ãŸï¼Ž
+オリジナルã®\TeX ã§æ‰±ãˆã‚‹æ–‡å­—コードã®ç¯„囲ã¯0--255ã§ã‚ã£ãŸ
+\footnote{当åˆã®\TeX82ã§ã¯7-bitã ã£ãŸï¼š\TeX90ã§8-bitã«ãªã£ãŸï¼Ž}.
\pTeX 系列ã§ã¯ï¼Œæ—¥æœ¬èªžã®æ–‡å­—を(\LaTeX ã®\code{inpuenc}ã®ã‚ˆã†ãªã‚¢ã‚¯ãƒ†ã‚£ãƒ–化
ã«ã‚ˆã‚‰ãšï¼‰ç›´æŽ¥æ‰±ãˆã‚‹ã‚ˆã†ã«ï¼Œæ–‡å­—コードã¨ã—ã¦æœ‰åŠ¹ãªç¯„囲を拡張ã—ã¦ã„る.
以é™ã§ã¯ï¼Œå¾“æ¥ã®æž çµ„ã¿ã§æ‰±ãˆã‚‹æ–‡å­—ã‚’\emph{欧文文字},
@@ -269,11 +280,11 @@ Windowsã§ã¯Shift-JIS,ãれ以外ã§ã¯UTF-8ã§ã‚ã£ãŸï¼Ž
ãªãŠï¼ŒISO-2022-JPã§ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã•ã‚ŒãŸæ–‡å­—ã¯ç¾åœ¨ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã«ã‚ˆã‚‰ãšæ­£ã—ã読ã¾ã‚Œã‚‹ï¼Ž
% ISO-2022-JP (JIS) ã§ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã•ã‚ŒãŸãƒã‚¤ãƒˆåˆ—㯠7 ビットã§ã‚ã£ã¦ï¼Œ
-% ä»–ã® 3 ã¤ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã¨æ˜Žã‚‰ã‹ã«åŒºåˆ¥ãŒã§ãã‚‹ãŸã‚。
+% ä»–ã® 3 ã¤ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã¨æ˜Žã‚‰ã‹ã«åŒºåˆ¥ãŒã§ãã‚‹ãŸã‚.
% 実際ã«ã¯ï¼Œä»–ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®é€”中㫠JIS ã®æ–‡å­—列ãŒæ··ã–ã£ã¦ã„ã¦ã‚‚
-% å…¨ã¦æ­£å¸¸ã«èª­ã¿è¾¼ã¾ã‚Œã‚‹ã€‚
+% å…¨ã¦æ­£å¸¸ã«èª­ã¿è¾¼ã¾ã‚Œã‚‹ï¼Ž
% https://qiita.com/zr_tex8r/items/beda5a7702b84409436e
-ã¾ãŸï¼Œ\eTeXpre(u)\pTeX ã®|\epTeXinputencoding|を使用ã™ã‚Œã°ãã®æ¬¡ã®è¡Œã‹ã‚‰
+ã¾ãŸï¼Œ\eTeXpre(u)\pTeX ã®\.{epTeXinputencoding}を使用ã™ã‚Œã°ãã®æ¬¡ã®è¡Œã‹ã‚‰
æ–°ã—ã„エンコードã§èª­ã¾ã‚Œã‚‹ï¼ˆ\texttt{./eptexdoc.pdf}ã‚’å‚照).
\begin{dangerous}
@@ -286,13 +297,14 @@ EUC-JP,Shift-JIS,ISO-2022-JPã®ã©ã‚Œã‹ä¸€ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã—ã‹å‡¦ç†ã§
% JIS ã®ãƒ•ã‚¡ã‚¤ãƒ«ãªã‚‰ EUC/SJIS ã©ã¡ã‚‰ã® ptex ã§ã‚‚読ã¿è¾¼ã‚ã¾ã™ãŒï¼Œ
% ã“れも最åˆã‹ã‚‰ã§ã¯ãªã p2.1.5 (1997å¹´) 以é™ã®ã‚ˆã†ã§ï¼Œ
% ãã‚Œã¾ã§ã¯ã‚¹ã‚¿ã‚¤ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã‚‚ EUC ã‚„ SJIS ã«ã—ã¦ãŠãå¿…è¦ãŒã‚ã£ãŸã‚ˆã†ã§ã™ï¼Ž
-|-kanji| オプションãŒè¿½åŠ ã•ã‚Œï¼Œä¸€ã¤ã®\pTeX ãƒã‚¤ãƒŠãƒªã§è¤‡æ•°ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã‚’
+|-kanji|オプションãŒè¿½åŠ ã•ã‚Œï¼Œä¸€ã¤ã®\pTeX ãƒã‚¤ãƒŠãƒªã§è¤‡æ•°ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã‚’
é¸æŠžå‡¦ç†ã§ãるよã†ã«ãªã£ãŸã®ã¯\pTeX~3.0.1ã¨3.0.4ã®é–“(2002å¹´10月頃)ã§ã‚る.
% http://tutimura.ath.cx/ptexlive/?ptexenc%2FDetails
% ã®åœŸæ‘ã•ã‚“ã®ã‚³ãƒ¡ãƒ³ãƒˆ (2008-02-23) より
コミュニティ版\pTeX ã¯ï¼ŒUNIXå‘ã‘日本語\TeX ディストリビューション
-pte\TeX\footnote{土æ‘展之ã•ã‚“ã«ã‚ˆã£ã¦2004å¹´ã‹ã‚‰2009å¹´ã¾ã§é–‹ç™ºï¼Ž
+pte\TeX\footnote{Thomas Esserã•ã‚“ã«ã‚ˆã‚‹te\TeX をベースã¨ã—ã¦ï¼Œ
+土æ‘展之ã•ã‚“ã«ã‚ˆã£ã¦2004å¹´ã‹ã‚‰2009å¹´ã¾ã§é–‹ç™ºï¼Ž
ãã®å¾Œç¶™ã®ptexliveã¯ï¼Œ2010å¹´ã«\pTeX ãŒ\TeX~Liveã«å–ã‚Šè¾¼ã¾ã‚Œã‚‹éš›ã®ãƒ™ãƒ¼ã‚¹ã«
ãªã£ãŸï¼Ž}ã®é–‹ç™ºéŽç¨‹ã§èª•ç”Ÿã—ãŸï¼Ž
% コミュニティ版ã¨ã„ã†å‘¼ç§°ã¯2004年当åˆã‹ã‚‰ã®ã‚‚ã®ã§ã¯ãªã
@@ -369,7 +381,7 @@ virtual modeã§ã¯ï¼Œèµ·å‹•ç›´å¾Œã«ãƒãƒŠãƒ¼ã‚’表示ã—ã¦ã‹ã‚‰ï¼Œãƒ•ã‚©ãƒ¼ãƒ
ãã—ã¦ï¼Œä»¥ä¸‹ã®è¦å‰‡ã«ã‚ˆã‚Šå’Œæ–‡æ–‡å­—ã¨æ¬§æ–‡æ–‡å­—ã«åŒºåˆ¥ã—ã¦å–り扱ã‚れる.
\begin{itemize}
\item 7ビットASCII文字集åˆã¯\emph{欧文文字}ã¨ã—ã¦æ‰±ã‚れる.
- ã¾ãŸï¼Œ\TeX82互æ›ã®ã€Œ|^^|記法ã€ã¨ã„ã†é–“接的ãªå…¥åŠ›æ³•
+ ã¾ãŸï¼Œ\TeX90互æ›ã®ã€Œ|^^|記法ã€ã¨ã„ã†é–“接的ãªå…¥åŠ›æ³•
\footnote{|^^ab|ã®ã‚ˆã†ã«ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰7ã®æ–‡å­—2ã¤ã«ç¶šã„ã¦
|0|--|9|, |a|--|f|ã®ã„ãšã‚Œã‹ãŒ2ã¤ç¶šãã¨ï¼Œ
ãれを16進文字コードã¨ã™ã‚‹æ–‡å­—入力ãŒãªã•ã‚ŒãŸã®ã¨åŒã˜å‡¦ç†ã«å›žã‚‹ï¼Ž}ã‚‚
@@ -378,6 +390,10 @@ virtual modeã§ã¯ï¼Œèµ·å‹•ç›´å¾Œã«ãƒãƒŠãƒ¼ã‚’表示ã—ã¦ã‹ã‚‰ï¼Œãƒ•ã‚©ãƒ¼ãƒ
\pTeX~3.1.8ã§åˆ¶å¾¡ç¶´å†…ã§ã®æ‰±ã„ãŒæ”¹å–„ã•ã‚ŒãŸï¼Žã¾ãŸï¼Œ
コミュニティ版\pTeX~4.0.0ã§æ–‡å­—列化ã«ãŠã„ã¦ã‚‚常ã«æ¬§æ–‡æ‰±ã„ã™ã‚‹ã‚ˆã†ã«æ”¹ä¿®ã—ãŸï¼Ž
ã“ã‚Œã«ã¤ã„ã¦ã¯\ref{sec:printkanji16bit}節をå‚照.}.
+ % |^^|記法ã¯ï¼Œ|^^@|ã®ã‚ˆã†ã«ASCII一文字(0--9,~a-f以外)ãŒç¶šãã‚‚ã®ã¨
+ % |^^ab|ã®ã‚ˆã†ã«16進数2æ¡ãŒç¶šãã‚‚ã®ãŒã‚る.
+ % å‰è€…ã¯\TeX82ã‹ã‚‰ã‚ã£ãŸã‚‚ã®ã§ï¼Œå¾Œè€…ãŒ\TeX90ã§è¿½åŠ ã•ã‚ŒãŸï¼Ž
+ % å‚考:Knuth, TUGboat, Volume 10 (1989), No.~3, p.325
\item 最上ä½ãƒ“ットãŒ1ã®å ´åˆï¼Œãã®ãƒã‚¤ãƒˆã§å§‹ã¾ã‚‹åˆ—ã«ã¤ã„ã¦
ファイルã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã‹ã‚‰å†…部コード(EUC-JPã¾ãŸã¯Shift-JIS)ã¸ã®
変æ›ã‚’試ã¿ã‚‹ï¼ˆåŒä¸€ã‚³ãƒ¼ãƒ‰ãªã‚‰æ’等変æ›ï¼‰ï¼Ž
@@ -410,7 +426,7 @@ virtual modeã§ã¯ï¼Œèµ·å‹•ç›´å¾Œã«ãƒãƒŠãƒ¼ã‚’表示ã—ã¦ã‹ã‚‰ï¼Œãƒ•ã‚©ãƒ¼ãƒ
\code{ptexenc}ã«ã‚ˆã‚‹å‰å‡¦ç†ã«ã¯
「内部コードã«å¤‰æ›ã§ããªã„入力ã®ãƒã‚¤ãƒˆåˆ—ã‚’|^^ab|å½¢å¼ã«å¤‰æ›ã€ã‚‚
å«ã¾ã‚Œã‚‹ãŒï¼Œã“ã®æ™‚点ã§ã¯ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã«ã¤ã„ã¦çŸ¥ã‚‰ãªã„ãŸã‚,
-文字|^|ã®|\catcode|ãŒ7ã‹ã©ã†ã‹ã¯é–¢ä¿‚ãªã|^^|ãŒç”¨ã„られる.
+文字|^|ã®\.{catcode}ãŒ7ã‹ã©ã†ã‹ã¯é–¢ä¿‚ãªã|^^|ãŒç”¨ã„られる.
\end{dangerous}
\pTeX ã«ãŠã‘る有効ãªæ–‡å­—コードã®ç¯„囲ã¯
@@ -429,14 +445,25 @@ virtual modeã§ã¯ï¼Œèµ·å‹•ç›´å¾Œã«ãƒãƒŠãƒ¼ã‚’表示ã—ã¦ã‹ã‚‰ï¼Œãƒ•ã‚©ãƒ¼ãƒ
\begin{itemize}
\item Unicodeã§ã®ãƒãƒ©ãƒ„ã‚­ã‚’åŒä¸€è¦–ã™ã‚‹å¤šå¯¾ä¸€å¤‰æ›ï¼ˆè¡¨\ref{table:jis_uni_var})
\footnote{例ãˆã°ï¼Œã‚½ãƒ¼ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ä¸­ã®å…¨è§’ダーシ(\code{U+2015})ã¨
- EMダーシ(\code{U+2014})ã¯åŒä¸€è¦–ã•ã‚Œï¼Œå†…部的ã«ã¯JISコード\code{"213D}ã¨
+ EMダーシ(\code{U+2014})ã¯åŒä¸€è¦–ã•ã‚Œï¼Œå†…部的ã«ã¯JISコード\hex{213D}ã¨
ã—ã¦æ‰±ã‚れ,ファイルã«æ›¸ã出ã•ã‚Œã‚‹æ™‚ã¯\code{U+2015}ã«ãªã‚‹ï¼Ž}
\item BOMã®ç„¡è¦–(ファイル先頭ã«é™ã‚‰ãšï¼‰
\item çµåˆæ¿ç‚¹(\code{U+3099})・åŠæ¿ç‚¹(\code{U+309A})ã®åˆå­—処ç†
\item JIS外ã®ãŸã‚変æ›ã§ããªã„文字を|^^ab|å½¢å¼ã«å¤‰æ›
\footnote{例ãˆã°ï¼Œã‚½ãƒ¼ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ä¸­ã«Ã§ã®ã‚ˆã†ãªJIS~X~0208外ã®æ–‡å­—を直接書ãã¨ï¼Œ
- ã“ã‚Œã¯å’Œæ–‡æ–‡å­—ã®å†…部コードã«å¤‰æ›ã§ããªã„ãŸã‚|ç|ã«å¤‰æ›ã•ã‚Œã¦æ¬§æ–‡æ‰±ã„ã•ã‚Œã‚‹ï¼Ž}% => ^^c3^^a7
- …★
+ ã“ã‚Œã¯å’Œæ–‡æ–‡å­—ã®å†…部コードã«å¤‰æ›ã§ããªã„ãŸã‚|ç|ã«å¤‰æ›ã•ã‚Œã¦æ¬§æ–‡æ‰±ã„ã•ã‚Œã‚‹ï¼Ž}…★
+ %%%
+ % [動作ãƒã‚§ãƒƒã‚¯ï¼]
+ % 上ã®è¡Œã®èª¬æ˜Žæ–‡ã§ã¯ |ç| ãŒã€Žptexenc ã«ã‚ˆã‚‹ |^^| å½¢å¼ã¸ã®å¤‰æ›ã€ã‚’経ã¦
+ % 欧文 8 文字 |^^c3^^a7| ã¨ã—ã¦ãƒªãƒ†ãƒ©ãƒ«å°å­—ã•ã‚Œã‚‹ã“ã¨ã‚’期待ã—ã¦ã„ã‚‹ï¼
+ % 本ソースを pLaTeX ã§å‡¦ç†ã™ã‚Œã°çœŸï¼Ž
+ % 内部 Unicode ã® upLaTeX ã§ã¯ã€Žptexenc ã«ã‚ˆã‚‹ |^^| å½¢å¼ã¸ã®å¤‰æ›ã€ãŒèµ·ã“らãš
+ % 内部コード 0xE7 ã¨ã—ã¦ãƒãƒƒãƒ•ã‚¡ã«æ ¼ç´ã•ã‚Œã‚‹ï¼Ž
+ % ãã—㦠\kcatcode"E7=15 ãªã®ã§ã‚¤ãƒ³ãƒ—ットプロセッサã®æ®µéšŽã§æ¬§æ–‡æ‰±ã„ã•ã‚Œã‚‹ï¼Ž
+ % 既定㮠inputenc UTF-8 ãªã‚‰ã°ã“れ㯠"E7 ã®æ¬§æ–‡ 1 文字ã«ãªã‚‹ï¼Ž
+ % ã‚‚ã— \UseRawInputEncoding ãªã‚‰ã° "C3 "A7 ã®æ¬§æ–‡ 2 文字ã«ãªã‚‹ï¼Ž
+ \setbox0=\hbox{|ç|}\unless\ifdim\wd0>2em\ptErr{Check above: pLaTeX assumed}\fi
+ %%%
\end{itemize}
ãªãŠï¼ŒUTF-8ファイル出力時ã«ã¯ã“ã®ã‚ˆã†ãªåŠ å·¥ã®é€†å¤‰æ›ã¯è¡Œã‚ãªã„(入力時ã«
加工ã•ã‚ŒãŸã¾ã¾ã§å‡ºåŠ›ã•ã‚Œã‚‹ï¼‰ï¼Ž
@@ -451,16 +478,16 @@ virtual modeã§ã¯ï¼Œèµ·å‹•ç›´å¾Œã«ãƒãƒŠãƒ¼ã‚’表示ã—ã¦ã‹ã‚‰ï¼Œãƒ•ã‚©ãƒ¼ãƒ
JIS~X~0213ã§è¦å®šã•ã‚ŒãŸã€Œ85区1点ã€ã®ä½ç½®ã®æ–‡å­—を入力ファイル中ã«æ›¸ã„ãŸå ´åˆï¼Œ
\begin{description}
- \item[エンコードãŒEUC,~Shift-JISã®å ´åˆ] DVIã«ã¯29985~(\texttt{"7521})%"
+ \item[エンコードãŒEUC,~Shift-JISã®å ´åˆ] DVIã«ã¯29985~(\hex{7521})%"
番ã®æ–‡å­—ã¨ã—ã¦å‡ºåŠ›ã•ã‚Œã‚‹ï¼Ž
- \item[エンコードãŒJISã®å ´åˆ] 「\verb+! Missing $ inserted.+ã€ã¨ã„ã†ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã™ã‚‹ï¼Ž
+ \item[エンコードãŒJISã®å ´åˆ] ``\verb|! Missing $ inserted.|''ã¨ã„ã†ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã™ã‚‹ï¼Ž
ã“ã‚Œã¯ï¼Œ\pTeX ãŒJIS~X~0213ã®1é¢ã‚’指示ã™ã‚‹ã‚¨ã‚¹ã‚±ãƒ¼ãƒ—シーケンス
\texttt{1B 24 28 4F} (JIS2000), \texttt{1B 24 28 51} (JIS2004)ã‚’èªè­˜ã›ãšï¼Œ
\texttt{24}~(\texttt{\$})ã‚’æ•°å¼ãƒ¢ãƒ¼ãƒ‰åŒºåˆ‡ã‚Šã¨è§£é‡ˆã—ã¦ã—ã¾ã†ãŸã‚ã§ã‚る.
\item[エンコードãŒUTF-8ã®å ´åˆ] UTF-8ã®ãƒã‚¤ãƒˆåˆ—\texttt{E6 93 84}ã¨ã—ã¦èª­ã¿è¾¼ã¾ã‚Œã‚‹ï¼Ž
\end{description}
- ãªãŠï¼Œ\.{char}ã«ã‚ˆã‚Šã€Œ\verb+\char\kuten"5521+ã€%"
- ã®ã‚ˆã†ã«ã—ã¦åŒºç‚¹ã‚³ãƒ¼ãƒ‰ã‚’指定ã—ãŸå ´åˆã¯ï¼ŒDVIã«ã¯29985~(\texttt{"7521})%"
+ ãªãŠï¼Œ\.{char}ã«ã‚ˆã‚Šã€Œ\verb|\char\kuten"5521|ã€%"
+ ã®ã‚ˆã†ã«ã—ã¦åŒºç‚¹ã‚³ãƒ¼ãƒ‰ã‚’指定ã—ãŸå ´åˆã¯ï¼ŒDVIã«ã¯29985~(\hex{7521})%"
番ã®æ–‡å­—ã¨ã—ã¦å‡ºåŠ›ã•ã‚Œã‚‹ï¼Ž
ã¾ãŸï¼ŒDVIã«æ–‡å­—ã¨ã—ã¦å‡ºåŠ›ã•ã‚ŒãŸã‹ã‚‰ã¨ã„ã£ã¦ï¼ŒãれをPostScriptã‚„PDFã«å¤‰æ›ã—ãŸã¨ãã«
æ„図通りã«å‡ºåŠ›ã•ã‚Œã‚‹ã‹ã¯å…¨ãã®åˆ¥å•é¡Œã§ã‚る.
@@ -482,7 +509,7 @@ virtual modeã§ã¯ï¼Œèµ·å‹•ç›´å¾Œã«ãƒãƒŠãƒ¼ã‚’表示ã—ã¦ã‹ã‚‰ï¼Œãƒ•ã‚©ãƒ¼ãƒ
%
\begin{itemize}
\item 7ビットASCII文字集åˆã¯æ¬§æ–‡æ–‡å­—ã¨ã—ã¦æ‰±ã‚れる.
- ã¾ãŸï¼Œ\TeX82互æ›ã®ã€Œ|^^|記法ã€ã¨ã„ã†é–“接的ãªå…¥åŠ›æ³•ã‚‚
+ ã¾ãŸï¼Œ\TeX90互æ›ã®ã€Œ|^^|記法ã€ã¨ã„ã†é–“接的ãªå…¥åŠ›æ³•ã‚‚
常ã«æ¬§æ–‡æ‰±ã„ã•ã‚Œã‚‹ï¼Žï¼ˆ\pTeX ã¨åŒæ§˜ï¼‰
\item 最上ä½ãƒ“ットãŒ1ã®å ´åˆï¼Œãã®ãƒã‚¤ãƒˆã§å§‹ã¾ã‚‹åˆ—ã«ã¤ã„ã¦
ファイルã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã‹ã‚‰å†…部コードã¸ã®å¤‰æ›ã‚’試ã¿ã‚‹ï¼ˆåŒä¸€ã‚³ãƒ¼ãƒ‰ãªã‚‰æ’等変æ›ï¼‰ï¼Ž
@@ -523,35 +550,7 @@ virtual modeã§ã¯ï¼Œèµ·å‹•ç›´å¾Œã«ãƒãƒŠãƒ¼ã‚’表示ã—ã¦ã‹ã‚‰ï¼Œãƒ•ã‚©ãƒ¼ãƒ
%
\end{itemize}
-\upTeX ã«ãŠã‘る有効ãªæ–‡å­—コードã®ç¯„囲ã¯
-「欧文文字ã¨ã—ã¦æœ‰åŠ¹ãªæ–‡å­—コード(0--255)ã€ã¨
-「和文文字ã¨ã—ã¦æœ‰åŠ¹ãªæ–‡å­—コードã€ã®å’Œé›†åˆã§ã‚る.
-内部レガシーã®å ´åˆã¯\pTeX ã¨å…¨ãåŒã˜ã§ã‚り,
-å‰è€…ã¯1ãƒã‚¤ãƒˆãƒ»å¾Œè€…ã¯2ãƒã‚¤ãƒˆãªã®ã§äº’ã„ã«é‡ãªã‚‰ãªã„.
-内部Unicodeã®å ´åˆã¯å¾Œè€…ãŒUnicode全体(0以上0x10FFFF以下
-\footnote{実ã¯ä¸Šé™ãŒ0x10FFFFã¨ã„ã†ã®ã¯å˜˜ã§ã‚る:24bit整数値ãŒ
-有効ã§ã‚り,0x110000以上0x1000000未満ã¯ç‰¹æ®Šãªç”¨é€”ã§åˆ©ç”¨ã•ã‚Œã‚‹ï¼Ž
-内部コードUnicode (\code{uptex})ã®
-\upTeX ã§ã¯ï¼Œå’Œæ–‡æ–‡å­—トークンãŠã‚ˆã³å’Œæ–‡æ–‡å­—ノードã«ãŠã„ã¦
-文字コードをUTF-32ã®ä¸‹ä½24bitã§æ ¼ç´ã™ã‚‹ï¼Ž
-DVI出力時ã«ã¯ã€Œæ–‡å­—コード mod 0x110000ã€ã§æ›¸ãè¾¼ã¾ã‚Œã‚‹ï¼Ž
-ã“ã‚Œã¯Unicodeã®æ­£è¦ã®æ–‡å­—コード(0x10FFFF以下)ã®ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã‚„
-ç¦å‰‡ãƒšãƒŠãƒ«ãƒ†ã‚£ã®ã—ãŒã‚‰ã¿ã®å½±éŸ¿ã‚’å—ã‘ãªã„目的ã§OTFパッケージã§ä½¿ã‚れる.}ã®
-整数値)ã¨ãªã‚‹ã®ã§ï¼Œ\emph{0--255ã®ç¯„囲ã¯é‡ãªã£ã¦ãŠã‚Š
-和文・欧文ã©ã¡ã‚‰ã®æ–‡å­—コードã¨ã—ã¦ã‚‚有効ã§ã‚ã‚‹}ã“ã¨ã«æ³¨æ„.
-% 内部コードã®ç¯„囲:kanji.c ã® |is_char_kanji| ã®å®Ÿè£…
-% 0x110000 以上ã®æ‰±ã„:0x1000000 以下㯠otf ã§æ„図的ã«åˆ©ç”¨ï¼Ž
-% https://okumuralab.org/~okumura/texfaq/qa/50036.html
-% [TODO] 実装上「0..0x1000000ã€ã‚ˆã‚Šã‚‚広ã„「TeX ãŒæ‰±ãˆã‚‹ 0 以上ã®æ•´æ•°å€¤å…¨ä½“ã€ãŒæœ‰åŠ¹ï¼Ÿ
-% https://gist.github.com/aminophen/43b5f7f8592fc66210935f67d4d88391
-
-ã„ãšã‚Œã®å ´åˆã‚‚,\upTeX ã¯
-オリジナルã®\TeX ã‚„\pdfTeX ãªã©ã®æ¬§æ–‡\TeX ã¨ã¯å…¥åŠ›ã«é–¢ã—ã¦å¿…ãšã—ã‚‚
-互æ›ã§ãªã„(内部Unicodeã¸ã®UTF-8入力ã«é™ã£ã¦ã‚‚「BOMã®ç„¡è¦–ã€ã¨
-「çµåˆæ¿ç‚¹ãƒ»åŠæ¿ç‚¹ã®åˆå­—処ç†ã€ã ã‘ã¯èµ·ã“る)ãŒï¼Œ
-\pTeX ã¨æ¯”較ã™ã‚Œã°å¹¾åˆ†å·®ç•°ãŒè»½æ¸›ã•ã‚Œã¦ã„る.
-
-\begin{table}[tbp]
+\begin{table}[bp]
\caption{JIS⇔Unicode一対多変æ›ï¼ŽUnicode→JIS変æ›ã§ã¯è¤‡æ•°ã®æ–‡å­—ãŒåŒä¸€è¦–
ã•ã‚Œã‚‹ï¼ŽJIS→Unicode変æ›ã§ã¯è¤‡æ•°å€™è£œã®ã†ã¡\emph{太字}ãŒé¸æŠžã•ã‚Œã‚‹ï¼Ž}
\label{table:jis_uni_var}
@@ -559,40 +558,97 @@ DVI出力時ã«ã¯ã€Œæ–‡å­—コード mod 0x110000ã€ã§æ›¸ãè¾¼ã¾ã‚Œã‚‹ï¼Ž
% http://www.t-lab.opal.ne.jp/tex/jis_uni_variation_uptex.html
% 下記ZR㯠https://github.com/texjporg/jsclasses/issues/49 ã§è¨€åŠã‚ã‚Š
\centering\small
-\begin{tabular}{cccc}
+\begin{tabular}{ccccc}
\toprule
-区点 & Character Name & JIS~X~0208 & Unicode \\
+区点 & Character Name & 文字 & JIS~X~0208 & Unicode \\
\midrule
-1-17 & \code{OVERLINE}
+1-17 & \code{OVERLINE} & \kchar\jis"2131
& \code{0x2131} & \code{U+203E}, \emph{\code{U+FFE3}} \\
-1-29 & \code{EM DASH}
+1-29 & \code{EM DASH} & \kchar\jis"213D
& \code{0x213D} & \code{U+2014}, \emph{\code{U+2015}} \\ %ZR
-1-33 & \code{WAVE DASH}
+1-33 & \code{WAVE DASH} & \kchar\jis"2141
& \code{0x2141} & \emph{\code{U+301C}}, \code{U+FF5E} \\ %ZR
-1-34 & \code{DOUBLE VERTICAL LINE}
+1-34 & \code{DOUBLE VERTICAL LINE} & \kchar\jis"2142
& \code{0x2142} & \emph{\code{U+2016}}, \code{U+2225} \\ %ZR
-1-36 & \code{HORIZONTAL ELLIPSIS}
+1-36 & \code{HORIZONTAL ELLIPSIS} & \kchar\jis"2144
& \code{0x2144} & \emph{\code{U+2026}}, \code{U+22EF} \\
-1-61 & \code{MINUS SIGN}
+1-61 & \code{MINUS SIGN} & \kchar\jis"215D
& \code{0x215D} & \emph{\code{U+2212}}, \code{U+FF0D} \\ %ZR
-1-79 & \code{YEN SIGN}
+1-79 & \code{YEN SIGN} & \kchar\jis"216F
& \code{0x216F} & \code{U+00A5}, \emph{\code{U+FFE5}} \\
-1-81 & \code{CENT SIGN}
+1-81 & \code{CENT SIGN} & \kchar\jis"2171
& \code{0x2171} & \code{U+00A2}, \emph{\code{U+FFE0}} \\ %ZR
-1-82 & \code{POUND SIGN}
+1-82 & \code{POUND SIGN} & \kchar\jis"2172
& \code{0x2172} & \code{U+00A3}, \emph{\code{U+FFE1}} \\ %ZR
-2-44 & \code{NOT SIGN}
+2-44 & \code{NOT SIGN} & \kchar\jis"224C
& \code{0x224C} & \code{U+00AC}, \emph{\code{U+FFE2}} \\ %ZR
\bottomrule
\end{tabular}
\end{table}
+\upTeX ã«ãŠã‘る有効ãªæ–‡å­—コードã®ç¯„囲ã¯
+「欧文文字ã¨ã—ã¦æœ‰åŠ¹ãªæ–‡å­—コード(0--255)ã€ã¨
+「和文文字ã¨ã—ã¦æœ‰åŠ¹ãªæ–‡å­—コードã€ã®å’Œé›†åˆã§ã‚る.
+内部レガシーã®å ´åˆã¯\pTeX ã¨å…¨ãåŒã˜ã§ã‚り,
+å‰è€…ã¯1ãƒã‚¤ãƒˆãƒ»å¾Œè€…ã¯2ãƒã‚¤ãƒˆãªã®ã§äº’ã„ã«é‡ãªã‚‰ãªã„.
+内部Unicodeã®å ´åˆã¯å¾Œè€…ãŒUnicode全体(0以上0x10FFFF以下ã®
+整数値)ã¨ãªã‚‹ã®ã§ï¼Œ\emph{0--255ã®ç¯„囲ã¯é‡ãªã£ã¦ãŠã‚Š
+和文・欧文ã©ã¡ã‚‰ã®æ–‡å­—コードã¨ã—ã¦ã‚‚有効ã§ã‚ã‚‹}ã“ã¨ã«æ³¨æ„.
+% 内部コードã®ç¯„囲:kanji.c ã® |is_char_kanji| ã®å®Ÿè£…
+
+ã„ãšã‚Œã®å ´åˆã‚‚,\upTeX ã¯
+オリジナルã®\TeX ã‚„\pdfTeX ãªã©ã®æ¬§æ–‡\TeX ã¨ã¯å…¥åŠ›ã«é–¢ã—ã¦å¿…ãšã—ã‚‚
+互æ›ã§ãªã„(内部Unicodeã¸ã®UTF-8入力ã«é™ã£ã¦ã‚‚「BOMã®ç„¡è¦–ã€ã¨
+「çµåˆæ¿ç‚¹ãƒ»åŠæ¿ç‚¹ã®åˆå­—処ç†ã€ã ã‘ã¯èµ·ã“る)ãŒï¼Œ
+\pTeX ã¨æ¯”較ã™ã‚Œã°å¹¾åˆ†å·®ç•°ãŒè»½æ¸›ã•ã‚Œã¦ã„る.
+
+\begin{dangerous}
+ 内部コードUnicode (\code{uptex})ã®å ´åˆã®ä¸Šé™ãŒ0x10FFFFã¨ã„ã†ã®ã¯
+ 実ã¯å˜˜ã§ã‚る.24bit整数値ãŒæœ‰åŠ¹ã§ã‚り,ã†ã¡0x110000以上0xFFFFFF以下ã¯
+ 特殊ãªç”¨é€”ã§åˆ©ç”¨ã§ãるよã†ç•™ä¿ã•ã‚Œã¦ã„る.
+ \begin{itemize}
+ \item \verb|Bad character code|エラーãŒå‡ºãªã„範囲:0以上0xFFFFFF以下
+ \footnote{\verb|Invalid KANSUJI char|エラーãŒå‡ºãªã„範囲もåŒã˜ï¼Ž}
+ \item 和文文字トークンã®æ–‡å­—コードã¨ã—ã¦å¯èƒ½ãªç¯„囲:0以上0x10FFFF以下
+ \item 和文文字ノードã®æ–‡å­—コードã¨ã—ã¦å¯èƒ½ãªç¯„囲:0以上0xFFFFFF以下
+ \end{itemize}
+ %
+ \upTeX ã§ã¯å’Œæ–‡æ–‡å­—トークンãŠã‚ˆã³å’Œæ–‡æ–‡å­—ノードã«ãŠã„ã¦
+ 文字コードをUTF-32ã®ä¸‹ä½24bitã§æ ¼ç´ã™ã‚‹ä»•æ§˜ã¨ãªã£ã¦ã„る.
+ Unicode文字入力ã§0x110000以上0xFFFFFF以下ã®æ–‡å­—コードã¯ã‚ã‚Šãˆãªã„ãŒï¼Œ
+ 文字コードを数値ã§æŒ‡å®šã™ã‚‹å ´åˆã®æ‰±ã„ã¯ä»¥ä¸‹ã¨ã—ã¦ã„る:
+ \begin{itemize}
+ \item \.{char}, \.{chardef}åŠã³\.{kchar}, \.{kchardef}:
+ 文字コードãŒ0x110000以上ã§ã‚‚ãã®ã¾ã¾ã®å€¤ã§å’Œæ–‡æ–‡å­—ノードを生æˆã™ã‚‹ï¼Ž
+ DVI出力時ã«ã¯ã€Œæ–‡å­—コード mod 0x110000ã€ã§æ›¸ãè¾¼ã¾ã‚Œã‚‹ï¼Ž
+ % Output node |p| ... ã®å‡¦ç†ã§ toDVI()
+ \item \.{kansujichar}ã¸ã®æ–‡å­—コード代入:
+ 値ã®æ ¼ç´æ™‚ã«ã€Œæ–‡å­—コード mod 0x110000ã€ã‚’è¡Œã†ã®ã§ï¼Œ
+ 以é™ã®\.{kansuji}ã«ã‚ˆã‚Šç”Ÿæˆã™ã‚‹æ–‡å­—トークンã¯0以上0x10FFFF以下.
+ % eqtb テーブル格ç´æ™‚ã« toDVI()
+ \item \eTeXpre(u)\pTeX ã®\.{Uchar}, \.{Ucharcat}:
+ 文字トークン生æˆæ™‚ã«ã€Œæ–‡å­—コード mod 0x110000ã€ã‚’è¡Œã†ã®ã§ï¼Œ
+ ã‚„ã¯ã‚Š0以上0x10FFFF以下ã«ãªã‚‹ï¼Ž
+ % print_kanji() ã®å‡¦ç†ã§ toUCS()
+ \end{itemize}
+ 特ã«\.{kchar}ã®ä¸Šè¨˜ä»•æ§˜ã¯OTFパッケージã§ä½¿ã‚ã‚Œã¦ã„る.
+ ã“ã‚Œã¯ï¼Œ|\CID| (Adobe-Japan1)ã®ã‚ˆã†ãª
+ Unicodeã§ãªã„文字コードを扱ã†å†…部処ç†ã«ãŠã„ã¦
+ Unicodeã®æ­£è¦ã®æ–‡å­—コード(0x10FFFF以下)ã®
+ カテゴリーコードやç¦å‰‡ãƒšãƒŠãƒ«ãƒ†ã‚£ã®ã—ãŒã‚‰ã¿ã®å½±éŸ¿ã‚’å—ã‘ãªã„目的ã§ã‚る.
+ % 0x110000 以上ã®æ‰±ã„:ç¾çŠ¶ã§ã¯ otf ã§æ„図的ã«åˆ©ç”¨ï¼Ž
+ % å°†æ¥çš„ã«ç•°ä½“字対応ã®å†…部コードã«ä½¿ã†å¯èƒ½æ€§ã‚’ç•™ä¿ï¼Ž
+ % https://okumuralab.org/~okumura/texfaq/qa/50036.html
+ % https://github.com/texjporg/tex-jp-build/issues/160
+ % https://github.com/texjporg/tex-jp-build/issues/46
+\end{dangerous}
+
\subsection{文字コードã®å–å¾—ã¨æŒ‡å®š}\label{sec:getcode}
(u)\pTeX ã§ã¯ã€Œæ–‡å­—コードを引数ã«ã¨ã‚‹ãƒ—リミティブã€ã¨ã„ã£ã¦ã‚‚,状æ³ã«ã‚ˆã£ã¦
\begin{itemize}
- \item 欧文文字ã®æ–‡å­—コード0--255ã‚’ã¨ã‚‹ï¼ˆä¾‹ï¼š|\catcode|)
- \item 和文文字ã®å†…部コードをã¨ã‚‹ï¼ˆä¾‹ï¼š|\inhibitxspcode|)
- \item 上記2ã¤ã®ã©ã¡ã‚‰ã§ã‚‚ã¨ã‚Œã‚‹ï¼ˆä¾‹ï¼š|\prebreakpenalty|)
+ \item 欧文文字ã®æ–‡å­—コード0--255ã‚’ã¨ã‚‹ï¼ˆä¾‹ï¼š\.{catcode})
+ \item 和文文字ã®å†…部コードをã¨ã‚‹ï¼ˆä¾‹ï¼š\.{inhibitxspcode})
+ \item 上記2ã¤ã®ã©ã¡ã‚‰ã§ã‚‚ã¨ã‚Œã‚‹ï¼ˆä¾‹ï¼š\.{prebreakpenalty})
\end{itemize}
ã®ã„ãšã‚Œã®å ´åˆã‚‚ã‚ã‚Šã†ã‚‹ï¼Ž
@@ -686,7 +742,7 @@ DVI出力時ã«ã¯ã€Œæ–‡å­—コード mod 0x110000ã€ã§æ›¸ãè¾¼ã¾ã‚Œã‚‹ï¼Ž
「|\!|ã€ã®ã‚ˆã†ãªæ¬§æ–‡ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã‚·ãƒ³ãƒœãƒ«ã¨åŒæ§˜ã«æ”¹è¡Œç”±æ¥ã®ç©ºç™½ãŒè¿½åŠ ã•ã‚Œã¦ã—ã¾ã„,
和文文字直後ã®æ”¹è¡Œã¯ä½•ã‚‚発生ã—ãªã„ã¨ã„ã†åŽŸå‰‡ã«åã—ã¦ã„ãŸãŒï¼Œ
ã“ã‚Œã¯\TeX~Live 2019ã®\pTeX~3.8.2ã§ä¿®æ­£ã•ã‚ŒãŸ\cite{tjb37}.}.
- \item 後ã§èª¬æ˜Žã™ã‚‹|\jcharwidowpenalty|ã¯ï¼Œã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã®å€¤ãŒ16,~17ã®
+ \item 後ã§èª¬æ˜Žã™ã‚‹\.{jcharwidowpenalty}ã¯ï¼Œã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã®å€¤ãŒ16,~17ã®
和文文字ã®å‰ã«ã®ã¿æŒ¿å…¥ã•ã‚Œã†ã‚‹ã‚‚ã®ã§ï¼Œå€¤ãŒ18ã®å’Œæ–‡æ–‡å­—ã®å‰ã«ã¯æŒ¿å…¥ã•ã‚Œãªã„.
\item ã„ãšã‚Œã«ã›ã‚ˆï¼Œå’Œæ–‡æ–‡å­—ã¯æ±ºã—ã¦â€œã‚¢ã‚¯ãƒ†ã‚£ãƒ–â€ï¼ˆæ¬§æ–‡æ–‡å­—ã«ãŠã‘ã‚‹
カテゴリーコード13ã®ã‚ˆã†ãªçŠ¶æ…‹ï¼‰ã«ã¯ãªã‚‰ãªã„.
@@ -703,7 +759,7 @@ DVI出力時ã«ã¯ã€Œæ–‡å­—コード mod 0x110000ã€ã§æ›¸ãè¾¼ã¾ã‚Œã‚‹ï¼Ž
和文カテゴリーコードをå–得・設定ã™ã‚‹ãƒ—リミティブãŒ\.{kcatcode}ã§ã‚る.
\begin{cslist}
\csitem[\.{kcatcode} <character code>=<16--18>]
- コミュニティ版\pTeX ã§ã¯ï¼Œå’Œæ–‡ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰(|\kcatcode|)ã¯
+ コミュニティ版\pTeX ã§ã¯ï¼Œå’Œæ–‡ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰(\.{kcatcode})ã¯
DVI中ã®ä¸Šä½ãƒã‚¤ãƒˆã”ã¨ï¼ˆã™ãªã‚ã¡ï¼ŒJISコードã§ã„ã†åŒºã”ã¨ï¼‰ã«å€¤ãŒè¨­å®šå¯èƒ½ã§ã‚ã‚‹
\footnote{%
オリジナルã®ã‚¢ã‚¹ã‚­ãƒ¼\pTeX ã§ã¯ï¼Œå†…部コードã®ä¸Šä½ãƒã‚¤ãƒˆã”ã¨ã«å€¤ãŒè¨­å®šå¯èƒ½ã§ã‚ã£ãŸï¼Ž
@@ -712,21 +768,21 @@ DVI出力時ã«ã¯ã€Œæ–‡å­—コード mod 0x110000ã€ã§æ›¸ãè¾¼ã¾ã‚Œã‚‹ï¼Ž
$2n-1$区・$2n$区($1\leq n\leq 47$)ã¯åŒä¸€ã®ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã‚’æŒã¤ã“ã¨ã«ãªã‚‹ï¼Ž
}.\end{cslist}
\begin{dangerous}
- |\kcatcode|ã§ã¯æ¬§æ–‡æ–‡å­—ã®æ–‡å­—コード(0--255)も指定ã™ã‚‹ã“ã¨ãŒã§ãã‚‹ãŒï¼Œ
+ \.{kcatcode}ã§ã¯æ¬§æ–‡æ–‡å­—ã®æ–‡å­—コード(0--255)も指定ã™ã‚‹ã“ã¨ãŒã§ãã‚‹ãŒï¼Œ
ãã®å ´åˆã€Œ0区扱ã„ã€ã¨ã—ã¦æ‰±ã‚れる.
- \pTeX ã®å‡¦ç†ã§ã“ã®ã€Œ0区ã€ã®|\kcatcode|ãŒä½¿ã‚れるã“ã¨ã¯ãªã„ã®ã§ï¼Œ
+ \pTeX ã®å‡¦ç†ã§ã“ã®ã€Œ0区ã€ã®\.{kcatcode}ãŒä½¿ã‚れるã“ã¨ã¯ãªã„ã®ã§ï¼Œ
事実上ã¯ã€Œ16--18ã®ã©ã‚Œã‹ã‚’æ ¼ç´å¯èƒ½ãªè¿½åŠ ãƒ¬ã‚¸ã‚¹ã‚¿ã€ç¨‹åº¦ã®ä½¿ã„æ–¹ã—ã‹ãªã„.
\end{dangerous}
ã—ã‹ã—,
-\pTeX ã«ãŠã„ã¦ã¯ï¼Œ|\kcatcode|を文書ã®å‡¦ç†é€”中ã§å¤‰æ›´ã™ã‚‹ã“ã¨ã¯æƒ³å®šã•ã‚Œã¦ã„ãªã„.
+\pTeX ã«ãŠã„ã¦ã¯ï¼Œ\.{kcatcode}を文書ã®å‡¦ç†é€”中ã§å¤‰æ›´ã™ã‚‹ã“ã¨ã¯æƒ³å®šã•ã‚Œã¦ã„ãªã„.
ã¨ã„ã†ã®ã‚‚,\pTeX ã§ã¯ï¼ˆ\upTeX ã¨ç•°ãªã‚Šï¼‰å’Œæ–‡æ–‡å­—トークンã«
カテゴリーコードã®æƒ…å ±ã¯ä¿å­˜ã•ã‚Œãšï¼Œ
和文文字ãŒå‡¦ç†å¯¾è±¡ã¨ãªã‚‹ãŸã³ã«ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã®å€¤ãŒéšæ™‚算出ã•ã‚Œã‚‹ãŸã‚ã§ã‚る.
ãŸã ã—,\pTeX ã§ã‚‚ |\let\CS=ã‚| ãªã©ã¨ã—ã¦å’Œæ–‡æ–‡å­—トークンを|\let|ã™ã‚‹ã¨ï¼Œ|\CS|ã«ã¯
-ãã®æ™‚ã®ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰(|\kcatcode|)ãŒä¿å­˜ã•ã‚Œã‚‹\footnote{コミュニティ版\pTeX ã§ã¯ï¼Œ
+ãã®æ™‚ã®ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰(\.{kcatcode})ãŒä¿å­˜ã•ã‚Œã‚‹\footnote{コミュニティ版\pTeX ã§ã¯ï¼Œ
一時的ã«ã€Œå’Œæ–‡æ–‡å­—トークンを|\let|ã—ãŸ|\CS|ã«ãŠã„ã¦ã‚‚,ãã‚ŒãŒå‡¦ç†å¯¾è±¡ã¨ãªã‚‹ãŸã³ã«
カテゴリーコードã®å€¤ã‚’å†å–å¾—ã™ã‚‹ã€ã¨ã„ã†æŒ™å‹•ã«å¤‰æ›´ã—よã†ã¨ã—ãŸ(r51021).
-ã—ã‹ã—,ã“ã®å¤‰æ›´ãŒä¸å®Œå…¨ã§ã€Œ|\ifcat|ã§ã¯å†å–å¾—ã™ã‚‹ãŒï¼Œ|\ifx|ã§ã¯å†å–å¾—ã—ãªã„ã€ã¨ã„ã†
+ã—ã‹ã—,ã“ã®å¤‰æ›´ãŒä¸å®Œå…¨ã§ã€Œ\.{ifcat}ã§ã¯å†å–å¾—ã™ã‚‹ãŒï¼Œ\.{ifx}ã§ã¯å†å–å¾—ã—ãªã„ã€ã¨ã„ã†
ä¸çµ±ä¸€ãªçŠ¶æ…‹ã¨ãªã£ã¦ã—ã¾ã£ãŸãŸã‚,r59699ã§å¾“æ¥ã®æŒ™å‹•ã«æˆ»ã—ãŸï¼ˆã‚¢ã‚¹ã‚­ãƒ¼ç‰ˆã¨åŒã˜ï¼‰ï¼Ž
çµæžœçš„ã«ï¼Œ\TeX~Live 2019--2021ã§ã¯ã€ŒãŸã ã—,…ã€ãŒå½“ã¦ã¯ã¾ã‚‰ãªã„\cite{man4}.}.
% ä¸çµ±ä¸€ãªæŒ™å‹•ã«ãªã£ã¦ã„ã‚‹ã®ã¯ä»¥ä¸‹ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼Ž
@@ -752,7 +808,7 @@ DVI出力時ã«ã¯ã€Œæ–‡å­—コード mod 0x110000ã€ã§æ›¸ãè¾¼ã¾ã‚Œã‚‹ï¼Ž
CJK文字トークン(CJKトークン)ã¨å‘¼ã¶ã¹ãã ãŒï¼Œæœ¬æ–‡æ›¸ã§ã¯å˜ç´”化ã®ãŸã‚
\pTeX ã¨åŒã˜ç”¨èªžã‚’用ã„る.}:
\begin{itemize}
- \item |\kcatcode|プリミティブã«å’Œæ–‡æ–‡å­—ã®å½¹å‰²ã®åˆ†é¡žã ã‘ã§ãªã,
+ \item \.{kcatcode}プリミティブã«å’Œæ–‡æ–‡å­—ã®å½¹å‰²ã®åˆ†é¡žã ã‘ã§ãªã,
トークン列生æˆã«ãŠã‘る和文文字ã¨æ¬§æ–‡æ–‡å­—ã®åŒºåˆ¥ã¨ã„ã†æ©Ÿèƒ½ã‚‚付与ã™ã‚‹ï¼Ž
具体的ã«ã¯ï¼Œ\emph{\.{kcatcode}ã«ç‰¹åˆ¥ãªå€¤ã¨ã—ã¦15~}($\mathit{not\_cjk})$\emph{ã‚’
設定ã™ã‚‹ã¨ï¼Œãã‚Œã¯8ビット欧文文字ã®ãƒã‚¤ãƒˆåˆ—ã¨ã—ã¦æ‰±ã‚れ,和文扱ã„ã•ã‚Œãªããªã‚‹}.
@@ -769,17 +825,42 @@ CJK文字トークン(CJKトークン)ã¨å‘¼ã¶ã¹ãã ãŒï¼Œæœ¬æ–‡æ›¸ã§ã
\csitem[\.{kcatcode} <character code>=<15--19>]
内部レガシーã®\upTeX ã§ã¯ï¼Œ\pTeX ã¨åŒæ§˜ã«
JISコードã§ã„ã†åŒºã”ã¨ã«å€¤ãŒè¨­å®šå¯èƒ½ï¼Ž
- 内部Unicodeã®\upTeX ã§ã¯ï¼Œå’Œæ–‡ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰(|\kcatcode|)ã¯
+ 内部Unicodeã®\upTeX ã§ã¯ï¼Œå’Œæ–‡ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰(\.{kcatcode})ã¯
概ã­Unicodeã®ãƒ–ロックã”ã¨ï¼ˆâ€»ä¸€éƒ¨ã®ãƒ–ロックã¯åˆ†å‰²ã—ã¦ã‚る)ã«å€¤ãŒè¨­å®šå¯èƒ½ã§ã‚る.
% 分割状æ³: https://github.com/texjporg/tex-jp-build/issues/43
\end{cslist}
+ã“ã®ã‚ˆã†ã«å†…部Unicodeã®\upTeX ã§ã¯\.{kcatcode}ã®è¨­å®šãŒ
+Unicodeã®ãƒ–ロックã”ã¨ã§ã‚ã‚‹ã®ã§ï¼Œ
+\pTeX ã®JISコードã®åŒºã”ã¨ã«è¨­å®šã—ãŸã‚‚ã®ã¨ã¯åˆ†é¡žãŒå¿…ãšã—も一致ã—ãªã„.
+å„ブロックã®åˆæœŸå€¤ã«ã¤ã„ã¦ã¯
+\href{https://github.com/texjporg/uptex-base}{\file{uptex-base}}ã§é…布ã—ã¦ã„ã‚‹
+\file{01uptex_doc_utf8.txt}ã‚’å‚ç…§ã®ã“ã¨ï¼Ž
+\begin{dangerous}
+例ãˆã°é•·éŸ³è¨˜å·ã€Œãƒ¼ã€ã¯JISコードã§\codeHEX{\tojis`ー}% JIS 0x213C
+ã§ã‚り,記å·ã¨ã—ã¦1区ã«å«ã¾ã‚Œã‚‹ã‹ã‚‰\pTeX ã§ã®\.{kcatcode}ã¯18ã§ã‚ã‚‹
+(内部レガシーã®\upTeX ã§ã‚‚åŒæ§˜ï¼‰ï¼Žä¸€æ–¹Unicodeã§ã¯\codeHEX{\toucs`ー}% U+30FC
+ã§ã‚り,カタカナã¨åŒã˜ãƒ–ロックã«å«ã¾ã‚Œã‚‹ã‹ã‚‰å†…部Unicodeã®\upTeX ã§ã®
+\.{kcatcode}ã¯17ã§ã‚る.ã™ãªã‚ã¡ï¼Œ\pTeX ã§ã¯ã€Œãƒ¼ã€ã‚’コントロールワード中ã«
+å«ã‚られãªã„ãŒï¼Œ\upTeX ã§ã¯è¨±ã•ã‚Œã‚‹ï¼Ž
+\begin{verbatim}
+\def\黄マーカー{...}
+ % => pTeX ã§ã¯ã€Œ\黄マã€ã¨ã„ã†å‘½ä»¤ã¨ã€Œãƒ¼ã‚«ãƒ¼ã€ã¨ã„ã†çµ‚端
+ % => upTeX ã§ã¯ã€Œ\黄マーカーã€ã¨ã„ã†å‘½ä»¤ãŒå®šç¾©ã•ã‚Œã‚‹
+\newcommand{\黄マーカー}[1]{...}% => pTeX ã§ã¯ã‚¨ãƒ©ãƒ¼ï¼ŒupTeX ã§ã¯é€šã‚‹
+\end{verbatim}
+% https://okumuralab.org/tex/mod/forum/discuss.php?d=2703
+ã‚‚ã¡ã‚ã‚“ã“ã®é€†ã®ä¾‹ã‚‚ã‚り,
+\pTeX ã§ã¯å…¨è§’æ•°å­—ã¨ã‚¢ãƒ«ãƒ•ã‚¡ãƒ™ãƒƒãƒˆ(Halfwidth and Fullwidth Forms),
+ギリシャ文字ãŒ17ã§ã‚ã£ãŸãŒï¼Œ\upTeX ã§ã¯ï¼ˆã‚­ãƒªãƒ«æ–‡å­—ã¨åŒã˜ã)18ã¨ã—ã¦ã„る.
+\end{dangerous}
+
ãªãŠ\ref{sec:uptex_code}節ã§è¿°ã¹ãŸé€šã‚Šï¼Œ\upTeX ã§ã¯å†…部コードã«ã‚ˆã‚‰ãš
0--127ã®7ビットASCII文字集åˆã¯å¸¸ã«æ¬§æ–‡æ–‡å­—トークンã¨ã—ã¦æ‰±ã†ã“ã¨ã¨ã—ã¦ã„る.
è£ã‚’è¿”ã›ã°\emph{和文文字トークンã§æ–‡å­—コードãŒ0--127ã¨ã„ã†çŠ¶æ³ã¯
èµ·ã“ã‚Šãˆãªã„}\footnote{和文文字ノードã¨ã—ã¦ã¯æ–‡å­—コード0--127ã‚‚å¯èƒ½ï¼š
\ref{sec:kchar}節ã§å‡ºã¦ãã‚‹\.{kchar}ã§ç”Ÿæˆã•ã‚Œã‚‹ï¼Ž}ã—,
-ã“ã®ãƒ–ロックã®|\kcatcode|ã‚’15以外ã«è¨­å®šã—ã¦ã‚‚和文扱ã„ã¯ã•ã‚Œãªã„.
+ã“ã®ãƒ–ロックã®\.{kcatcode}ã‚’15以外ã«è¨­å®šã—ã¦ã‚‚和文扱ã„ã¯ã•ã‚Œãªã„.
\begin{dangerous}
例ãˆã°\upTeX ã®æ—¢å®šï¼ˆå†…部Unicode)ã‹ã‚‰ |\kcatcode`ã‚=15| を実行ã™ã‚‹ã¨ï¼Œ
以é™ã®ã€Œ|ã‚|\relaxã€ã¯ |^^e3^^81^^82| を入力ã—ãŸã¨ã¿ãªã•ã‚Œã‚‹
@@ -870,7 +951,7 @@ CJK文字トークン(CJKトークン)ã¨å‘¼ã¶ã¹ãã ãŒï¼Œæœ¬æ–‡æ›¸ã§ã
\autoref{fig:ptex_input}ã¯\emph{\pTeX~4.0.0既定時}ã«ãŠã‘る入力プロセッサã®çŠ¶æ…‹é·ç§»å›³ã§ã‚る.
\TeX82ã‹ã‚‰æ‹¡å¼µã•ã‚ŒãŸç‚¹ï¼ŒãŠã‚ˆã³èª¬æ˜ŽãŒå¿…è¦ãªç‚¹ã‚’以下ã«è¿°ã¹ã‚‹ï¼Ž
\begin{description}
- \item[内部状態ã®è¿½åŠ ] \TeX82 ã§ã¯çŠ¶æ…‹\textit{N} (new line),状態\textit{M} (middle of line),
+ \item[内部状態ã®è¿½åŠ ] \TeX82ã§ã¯çŠ¶æ…‹\textit{N} (new line),状態\textit{M} (middle of line),
状態\textit{S} (skipping spaces)ã¨ã„ã†3状態ã§ã‚ã£ãŸãŒï¼Œ\pTeX ã§ã¯
次ã®2状態ãŒè¿½åŠ ã•ã‚ŒãŸï¼š
\begin{description}
@@ -1117,19 +1198,22 @@ CJK文字トークン(CJKトークン)ã¨å‘¼ã¶ã¹ãã ãŒï¼Œæœ¬æ–‡æ›¸ã§ã
\subsection{和文文字ã®æ–‡å­—列化ã®æŒ™å‹•}% \pTeX~4.0.0ã§ã®æ”¹ä¿®ã‚’å«ã‚€
\label{sec:printkanji16bit}
-|\string|ã‚„|\meaning|ãªã©ã®æ–‡å­—トークン列生æˆã«ã¤ã„ã¦ã¯ä»¥ä¸‹ã®é€šã‚Šã§ã‚る.
+\.{meaning}ã‚„\.{string}ãªã©ã®æ–‡å­—トークン列生æˆï¼ˆã„ã‚ゆる“\.{the}-文字列化â€ï¼‰ã«
+ã¤ã„ã¦ã¯ä»¥ä¸‹ã®é€šã‚Šã§ã‚る.
\begin{itemize}
\item 欧文文字ã¯\TeX82ã¨åŒæ§˜ã§ï¼Œï¼ˆæ–‡å­—コード32ã®ç©ºç™½ã‚’除ã)
- ã™ã¹ã¦ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰12ã®æ–‡å­—トークンã«ãªã‚‹ãŒï¼Œ
- 和文文字ã¯16--18ã®ã„ãšã‚Œã‹ã®ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã‚’æŒã¤ï¼Ž
- \item 「コントロールワードã®æ–‡å­—列化ã§ã¯å¾Œã‚ã«ç©ºç™½æ–‡å­—を補ã„,
+ ã™ã¹ã¦ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰12ã®æ¬§æ–‡æ–‡å­—トークンã«ãªã‚‹ãŒï¼Œ
+ 和文文字ã¯å’Œæ–‡æ–‡å­—トークンã«ãªã‚‹ï¼Žãã®å’Œæ–‡ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã¯
+ \pTeX ã§ã¯éšæ™‚算出ã«ã‚ˆã‚Šï¼Œ\upTeX ã§ã¯ã€Œãã®æ™‚ã®\.{kcatcode}ã®å€¤ã€ï¼ˆãŸã ã—
+ ãã‚ŒãŒ15ã®å ´åˆã¯18)ã«ãªã‚‹ï¼Ž
+ \item 制御綴åã®æ–‡å­—列化ã«ãŠã„ã¦ã€Œã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ãƒ¯ãƒ¼ãƒ‰ã®æ–‡å­—列化ã§ã¯å¾Œã‚ã«ç©ºç™½æ–‡å­—を補ã„,
コントロールシンボルã®æ–‡å­—列化ã§ã¯ç©ºç™½æ–‡å­—を補ã‚ãªã„ã€ã¨ã„ã†ç‚¹ã¯ï¼Œ
和文文字をå«ã‚€å ´åˆã‚‚åŒæ§˜ã§ã‚ã‚‹
\footnote{「|\】|ã€ã®ã‚ˆã†ã«å’Œæ–‡æ–‡å­—ã‹ã‚‰ãªã‚‹ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã‚·ãƒ³ãƒœãƒ«ã‚’文字列化ã™ã‚‹éš›ã«ï¼Œ
ãƒãƒ¼ã‚¸ãƒ§ãƒ³p3.7.2以å‰ã®\pTeX ã§ã¯ã€Œ|\】 |ã€ã¨å¾Œã‚ã«ä½™è¨ˆãªç©ºç™½æ–‡å­—を補ã£ã¦ã—ã¾ã†
ã¨ã„ã†å•é¡ŒãŒã‚ã£ãŸï¼Ž
\TeX~Live 2018ã®\pTeX~3.8.1ã§ã“ã®å•é¡Œã¯ä¿®æ­£ã•ã‚ŒãŸ\cite{tjb37}.}.
- \item 和文文字ã¯ãã®ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã«ã‚ˆã‚‰ãšï¼Œ|\meaning|ã™ã‚‹ã¨
+ \item 和文文字ã¯ãã®ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã«ã‚ˆã‚‰ãšï¼Œ\.{meaning}ã™ã‚‹ã¨
\begin{itemize}% ã™ã¹ã¦ "kanji character " ã«ãªã‚‹
\item \the\kcatcode`æ¼¢:\quad \texttt{\meaning æ¼¢}
\item \the\kcatcode`ã‚:\quad \texttt{\meaning ã‚}
@@ -1138,12 +1222,28 @@ CJK文字トークン(CJKトークン)ã¨å‘¼ã¶ã¹ãã ãŒï¼Œæœ¬æ–‡æ›¸ã§ã
ã¨ãªã‚‹ï¼Ž
\end{itemize}
-ã•ã¦ï¼Œ\pTeX~version 3系列(\TeX~Live 2021ã¾ã§ï¼‰ã§ã¯|\meaning|,|\string|ç­‰ã®
+ã•ã¦ï¼Œ\pTeX~version 3系列(\TeX~Live 2021ã¾ã§ï¼‰ã§ã¯\.{meaning},\.{string}ç­‰ã®
文字列化や制御綴åã«ãŠã„ã¦å’Œæ–‡æ–‡å­—ã¨æ¬§æ–‡æ–‡å­—ã®åŒºåˆ¥ãŒå¤±ã‚ã‚Œã¦ã—ã¾ã†ã‚±ãƒ¼ã‚¹ãŒã‚ã£ãŸï¼Ž
% 途中ã®çµæžœã‚’一旦é…列 |str_pool| ã«æ ¼ç´ã™ã‚‹å‡¦ç†ã§å’Œæ¬§æ–‡ã®åŒºåˆ¥ãŒå¤±ã‚ã‚Œã¦ã„ãŸï¼Ž
\emph{\pTeX~4.0.0以é™}(\TeX~Live 2022)ã§ã¯ï¼Œã“ã®çŠ¶æ³ã§ã‚‚
和欧文ã®åŒºåˆ¥ãŒç¶­æŒã•ã‚Œã‚‹\cite{tjb81}.
\begin{dangerous}
+\eTeX ç”±æ¥ã®\.{scantokens}(\eTeXpre(u)\pTeX ã§åˆ©ç”¨å¯èƒ½ï¼‰ã¯
+和文文字ã¨æ¬§æ–‡æ–‡å­—ã®åŒºåˆ¥ãŒç¶­æŒã•ã‚Œãªã„.
+例ãˆã°\.{forcecjktoken}ã®çŠ¶æ…‹ã§æ¬§æ–‡ãƒã‚¤ãƒˆåˆ—ã‚’\.{scantokens}ã™ã‚‹ã¨å’Œæ–‡ã«ãªã‚‹
+\footnote{\.{scantokens}ã¯ï¼Œå¼•æ•°ã®ãƒˆãƒ¼ã‚¯ãƒ³åˆ—を脱トークン化ã—ã¦ï¼Œ
+改ã‚ã¦å­—å¥è§£æžå¯¾è±¡ã¨ãªã‚‹æ–‡å­—列ã¨ã—ã¦èª­ã¿è¾¼ã‚€å±•é–‹å¯èƒ½ãƒ—リミティブã§ã‚る.
+基本的ã«ã¯ãƒˆãƒ¼ã‚¯ãƒ³åˆ—を一旦(仮想的ãªï¼‰ãƒ•ã‚¡ã‚¤ãƒ«ã«æ›¸ã出ã—ã¦
+ãれをã™ãã«èª­ã¿è¾¼ã‚“ã ã®ã¨åŒã˜ã«ãªã‚‹ãŒï¼Œ
+% https://qiita.com/zr_tex8r/items/0cc96144dd46c212a989
+「引数を文字列化→bufferã«æ›¸ã戻ã—→ãれを入力ã¨ã—ã¦æ‰±ã†ã€ã¨ã„ã†å‹•ä½œæ‰‹é †ã®ã†ã¡
+bufferã«æ›¸ã戻ã™æ™‚点ã§å’Œæ¬§æ–‡ã®åŒºåˆ¥ãŒå¤±ã‚れる.
+実際ã«ä¸€æ—¦ãƒ•ã‚¡ã‚¤ãƒ«ã«æ›¸ã„ã¦èª­ã¿è¾¼ã‚€å ´åˆã¯ï¼Œæ¬§æ–‡ãƒã‚¤ãƒˆã¯
+|^^|å½¢å¼ã§æ›¸ã出ã•ã‚Œã¦æ¬§æ–‡ã®ã¾ã¾ã«ãªã‚‹ã®ã§ï¼Œãã‚Œã¨ã¯ç•°ãªã‚‹ï¼Ž}.
+% [TODO] -translate-file=cp8bit ãªã‚‰ 8bit 全部㌠printable ã«ãªã‚‹ã®ã§ ^^ab å½¢å¼ã«ã¯ãªã‚‰ãªã„.
+\end{dangerous}
+
+\begin{dangerous}
\TeX~Live 2021ã§ã¯ï¼Œãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰UTF-8,内部コードEUC-JPã®å ´åˆã«ä¾‹ãˆã°
\begin{verbatim}
\def\fuga{^^c3^^bf 耽}\fuga
@@ -1151,7 +1251,7 @@ CJK文字トークン(CJKトークン)ã¨å‘¼ã¶ã¹ãã ãŒï¼Œæœ¬æ–‡æ›¸ã§ã
\end{verbatim}
ã¨å…¥åŠ›ã™ã‚‹ã¨ï¼Œä¸€è¡Œç›®ã¯\def\fuga{^^c3^^bf 耽}「\code{\fuga}ã€ã§ã‚ã‚‹ã®ã«å¯¾ã—
二行目ã¯ã€Œ\code{macro:->耽 耽}ã€ã¨ãªã£ã¦ã„ãŸï¼ˆ\char\euc"C3BFã¯EUC-JPã§
-\code{"C3BF}ã§ã‚る.|^^c3^^bf|ã®ä»£ã‚ã‚Šã«ç›´æŽ¥\code{ÿ}ã¨å…¥åŠ›ã—ã¦ã‚‚åŒæ§˜ï¼‰ï¼Ž
+\hex{C3BF}ã§ã‚る.|^^c3^^bf|ã®ä»£ã‚ã‚Šã«ç›´æŽ¥\code{ÿ}ã¨å…¥åŠ›ã—ã¦ã‚‚åŒæ§˜ï¼‰ï¼Ž
ã¾ãŸ
\begin{verbatim}
\catcode"C3=11 \catcode"BF=11
@@ -1165,6 +1265,12 @@ CJK文字トークン(CJKトークン)ã¨å‘¼ã¶ã¹ãã ãŒï¼Œæœ¬æ–‡æ›¸ã§ã
\def\耽{P} \def\^^c3^^bf{Q}
「\code{\meaning\耽}ã€% 和欧文ãŒåŒºåˆ¥ã•ã‚Œã‚‹ã®ã§ "P" ã«ãªã‚‹ã¯ãš
ã¨ãªã‚‹ï¼Ž
+ %%%
+ % [動作ãƒã‚§ãƒƒã‚¯ï¼]
+ % 上ã®è¡Œã®èª¬æ˜Žæ–‡ã§ã¯ |\耽| 㨠|\^^c3^^bf| ãŒåŒºåˆ¥ã•ã‚Œã‚‹ TL2022 以é™ã‚’期待ã—ã¦ã„ã‚‹ï¼
+ \def\XXXX{P}\unless\ifx\耽\XXXX\ptErr{Check above: pTeX 4.x assumed}\fi
+ %%%
+\end{dangerous}
% メモ:上ã®ä¾‹ã¯ã€Œ^^c5^^bf <=> é¡›ã€ã§ã‚‚よã‹ã£ãŸã®ã ãŒï¼Œ
% マニュアルã®æ¬§æ–‡ãƒ•ã‚©ãƒ³ãƒˆ newtx/newpx ã§è¡¨ç¤ºå¯èƒ½ãªæ–‡å­—ã«ã—ãŸï¼Ž
% 外部ファイル出力ã®å¤‰åŒ–例:
@@ -1172,7 +1278,6 @@ CJK文字トークン(CJKトークン)ã¨å‘¼ã¶ã¹ãã ãŒï¼Œæœ¬æ–‡æ›¸ã§ã
% \label{^^c3^^9f}% % TL2021: <C3>^^9f => TL2022: ^^c3^^9f
% \label{ÿ}% % TL2021: 耽 => TL2022: ^^c3^^bf
% \label{^^c3^^bf}% % TL2021: 耽 => TL2022: ^^c3^^bf
-\end{dangerous}
\section{和文文字ã®å‡ºåŠ›}\label{sec:outchar}
@@ -1204,9 +1309,9 @@ CJK文字トークン(CJKトークン)ã¨å‘¼ã¶ã¹ãã ãŒï¼Œæœ¬æ–‡æ›¸ã§ã
% 段è½çµ‚了をæ„味ã™ã‚‹|\par|命令や空行を見ã¤ã‘ã‚‹ã¨ï¼Œ
% 段è½æœ€å¾Œã®è¡Œã‚’作ã£ã¦å…ƒã®åž‚直モードã«å¾©å¸°ã™ã‚‹ï¼Ž
-欧文文字ノードã¯1ã¤ã®$\size{char\_node}$ã«
+欧文文字ノードã¯1ã¤ã®\node{char_node}ã«
フォントã¨æ–‡å­—コードã®æƒ…報を格ç´ã—ã¦ã„る.
-和文文字ノードã¯å†…部的ã«ã¯é€£ç¶šã™ã‚‹2ã¤ã®$\size{char\_node}$を用ã„ã¦
+和文文字ノードã¯å†…部的ã«ã¯é€£ç¶šã™ã‚‹2ã¤ã®\node{char_node}を用ã„ã¦
\begin{itemize}
\item 1ã¤ç›®ã«ãƒ•ã‚©ãƒ³ãƒˆã¨æ–‡å­—タイプã®æƒ…å ±
\item 2ã¤ç›®ã«æ–‡å­—コードã®æƒ…報(\upTeX ã§ã¯ã•ã‚‰ã«\.{kcatcode}ã®æƒ…報も)
@@ -1293,20 +1398,20 @@ JFMファイルもTFMファイルã¨åŒæ§˜ã®æƒ…報をæŒã¤ãŒï¼Œ
\begin{cslist}
\csitem[\.{jfont}, \.{tfont}]
- 欧文フォントを定義ã—ãŸã‚Šï¼Œç¾åœ¨ã®æ¬§æ–‡ãƒ•ã‚©ãƒ³ãƒˆã‚’å–å¾—ã—ãŸã‚Šã™ã‚‹|\font|ã®å’Œæ–‡ç‰ˆã§ã‚る.
- 一応|\jfont|ãŒã€Œå’Œæ–‡ã®æ¨ªçµ„用フォントã€ã®ï¼Œ|\tfont|ãŒã€Œå’Œæ–‡ã®ç¸¦çµ„用フォントã€ã®ãŸã‚ã«
+ 欧文フォントを定義ã—ãŸã‚Šï¼Œç¾åœ¨ã®æ¬§æ–‡ãƒ•ã‚©ãƒ³ãƒˆã‚’å–å¾—ã—ãŸã‚Šã™ã‚‹\.{font}ã®å’Œæ–‡ç‰ˆã§ã‚る.
+ 一応\.{jfont}ãŒã€Œå’Œæ–‡ã®æ¨ªçµ„用フォントã€ã®ï¼Œ\.{tfont}ãŒã€Œå’Œæ–‡ã®ç¸¦çµ„用フォントã€ã®ãŸã‚ã«
用ã„る命令ã§ã‚る.
\begin{itemize}
\item フォントを定義ã™ã‚‹éš›ã¯ï¼Œæ¬§æ–‡ãƒ•ã‚©ãƒ³ãƒˆãƒ»å’Œæ–‡ã®æ¨ªçµ„用フォント・
和文ã®ç¸¦çµ„用フォントã®ã„ãšã‚Œã‚‚
- |\font|, |\jfont|, |\tfont|ã®ã©ã‚Œã‚’用ã„ã¦ã‚‚定義ã§ãã‚‹
+ \.{tfont}, \.{jfont}, \.{tfont}ã®ã©ã‚Œã‚’用ã„ã¦ã‚‚定義ã§ãã‚‹
(è¦æ±‚ã•ã‚ŒãŸå®Ÿéš›ã®TFM/JFMã«å¿œã˜ã¦ï¼Œè‡ªå‹•çš„ã«ã‚¢ã‚µã‚¤ãƒ³ã•ã‚Œã‚‹ï¼‰ï¼Ž
書å¼ã«ã¤ã„ã¦ã¯å¾Œè¿°ï¼Ž
- \item |\the|ç­‰ã§ã€Œç¾åœ¨ã®ãƒ•ã‚©ãƒ³ãƒˆã€ã‚’å–å¾—ã™ã‚‹éš›ã«ã¯ï¼Œ
- |\jfont|ã§ã€Œå’Œæ–‡ã®æ¨ªçµ„用フォントã€ã‚’,
- |\tfont|ã§ã€Œå’Œæ–‡ã®ç¸¦çµ„用フォントã€ã‚’è¿”ã™ï¼Ž
- \item |\nullfont|ã¯å…¨ã¦ã®æ–‡å­—ãŒæœªå®šç¾©ãªã€Œç©ºãƒ•ã‚©ãƒ³ãƒˆã€ã‚’指ã™ãŒï¼Œ
- ã“ã‚Œã¯æ¬§æ–‡ãƒ•ã‚©ãƒ³ãƒˆã§ã‚り,和文版|\nullfont|ã¨ã„ã†æ¦‚念ã¯å­˜åœ¨ã—ãªã„.
+ \item \.{the}ç­‰ã§ã€Œç¾åœ¨ã®ãƒ•ã‚©ãƒ³ãƒˆã€ã‚’å–å¾—ã™ã‚‹éš›ã«ã¯ï¼Œ
+ \.{jfont}ã§ã€Œå’Œæ–‡ã®æ¨ªçµ„用フォントã€ã‚’,
+ \.{tfont}ã§ã€Œå’Œæ–‡ã®ç¸¦çµ„用フォントã€ã‚’è¿”ã™ï¼Ž
+ \item \.{nullfont}ã¯å…¨ã¦ã®æ–‡å­—ãŒæœªå®šç¾©ãªã€Œç©ºãƒ•ã‚©ãƒ³ãƒˆã€ã‚’指ã™ãŒï¼Œ
+ ã“ã‚Œã¯æ¬§æ–‡ãƒ•ã‚©ãƒ³ãƒˆã§ã‚り,和文版\.{nullfont}ã¨ã„ã†æ¦‚念ã¯å­˜åœ¨ã—ãªã„.
ã“ã‚Œã¯ï¼Œ\pTeX ã§ã¯ã€Œå…¨ã¦ã®å’Œæ–‡ãƒ•ã‚©ãƒ³ãƒˆã«ã¯ï¼Œå’Œæ–‡æ–‡å­—コードã¨ã—ã¦æœ‰åŠ¹ãª
å…¨ã¦ã®æ–‡å­—ãŒå­˜åœ¨ã™ã‚‹ã€ã¨ã„ã†æ‰±ã„ã«ãªã£ã¦ã„ã‚‹ãŸã‚ã§ã‚る.
\end{itemize}
@@ -1319,10 +1424,10 @@ JFMファイルもTFMファイルã¨åŒæ§˜ã®æƒ…報をæŒã¤ãŒï¼Œ
$\.{tracinglostchars}>0$ã§ã‚‚
\code{Missing character: There is no ã‚ in font nullfont!}ã®ã‚ˆã†ãª
警告ã¯å‡ºãªã„.}ã®ã§ï¼Œ
- 「和文版|\nullfont|ãŒé¸æŠžã•ã‚Œã¦ã„ã‚‹ã€ã¨è¨€ãˆãªãã‚‚ãªã„.
+ 「和文版\.{nullfont}ãŒé¸æŠžã•ã‚Œã¦ã„ã‚‹ã€ã¨è¨€ãˆãªãã‚‚ãªã„.
ãŸã ï¼Œã„ã£ãŸã‚“実際ã®å’Œæ–‡ãƒ•ã‚©ãƒ³ãƒˆã‚’é¸æŠžã—ãŸå¾Œã«
- 「和文版|\nullfont|ã‚’é¸æŠžã™ã‚‹ã€ã¨ã„ã†åˆ¶å¾¡ç¶´ã¯ä½œã‚Œãªã„ã¨æ€ã‚れる.
- % ã¤ã¾ã‚Šï¼Œtikzpicture 環境ã®ã‚ˆã†ã«|\selectfont|ã‚’|\nullfont|ã«
+ 「和文版\.{nullfont}ã‚’é¸æŠžã™ã‚‹ã€ã¨ã„ã†åˆ¶å¾¡ç¶´ã¯ä½œã‚Œãªã„ã¨æ€ã‚れる.
+ % ã¤ã¾ã‚Šï¼Œtikzpicture環境ã®ã‚ˆã†ã«|\selectfont|ã‚’\.{nullfont}ã«
% å†å®šç¾©ã—ãŸçŠ¶æ…‹ã§ã¯ï¼Œå’Œæ–‡æ–‡å­—ã ã‘消ãˆãšã«æ®‹ã‚‹ï¼Ž
% https://tex.stackexchange.com/questions/18602/
% https://twitter.com/doraTeX/status/1098584763277824000
@@ -1388,15 +1493,15 @@ so I use .notdef glyph instead.
Missing character警告ã¨é•ã£ã¦ãƒŽãƒ¼ãƒ‰ã¯ç ´æ£„ã•ã‚Œãªã„ã®ã§lostã¨ã„ã†
å称ã¯å¾®å¦™ã ãŒâ€¦ï¼Žã¾ãŸï¼ŒJIS範囲外ã®è­¦å‘ŠãŒç™ºç”Ÿã™ã‚‹ã‚¿ã‚¤ãƒŸãƒ³ã‚°ã¯
Missing character警告(ノード生æˆå¤±æ•—時ã«ç™ºç”Ÿï¼‰ã¨ã¯ç•°ãªã‚‹ã®ã§ï¼Œ
- \.{shipout}時ã®\.{tracinglostchars}ã®å€¤ã«ä¾ã‚‹ã“ã¨ã«ãªã‚‹ï¼Ž}ãŒç™ºç”Ÿã—,
- DVIã«ã¯è±†è…(\verb+set2 0+)ãŒæ›¸ã‹ã‚Œã‚‹ï¼Ž
+ |\shipout|時ã®\.{tracinglostchars}ã®å€¤ã«ä¾ã‚‹ã“ã¨ã«ãªã‚‹ï¼Ž}ãŒç™ºç”Ÿã—,
+ DVIã«ã¯è±†è…(\verb|set2 0|)ãŒæ›¸ã‹ã‚Œã‚‹ï¼Ž
\end{dangerous}
\begin{dangerous}
ãªãŠï¼Œ\TeX82ã«ãŠã‘る読込済フォントã®åˆ¤å®š
(「åŒã˜TFMファイルåã€ã‹ã¤ã€ŒåŒã˜ã‚µã‚¤ã‚ºã€ï¼‰ã¯
(u)\pTeX ã§ã‚‚変更ã—ã¦ã„ãªã„ãŸã‚,
- エンコード無指定・\verb+in jis+指定・\verb+in ucs+指定ã ã‘を変ãˆã¦
+ エンコード無指定・\verb|in jis|指定・\verb|in ucs|指定ã ã‘を変ãˆã¦
複数回読ã¿è¾¼ã‚‚ã†ã¨ã—ã¦ã‚‚,新ã—ã„フォント識別å­(font identifier)ã¯
発行ã•ã‚Œãªã„ã—,最åˆã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ãŒå¸¸ã«ä½¿ã‚れる.
\begin{verbatim}
@@ -1425,8 +1530,8 @@ so I use .notdef glyph instead.
\begin{cslist}
\csitem[\.{ifjfont} <\,font>, \.{iftfont} <\,font>]
- |\ifjfont|ã¯<font>ãŒå’Œæ–‡ã®æ¨ªçµ„用フォントã‹ã©ã†ã‹ï¼Œ
- |\iftfont|ã¯å’Œæ–‡ã®ç¸¦çµ„用フォントã‹ã©ã†ã‹ã‚’判定ã™ã‚‹ï¼Ž
+ \.{ifjfont}ã¯<font>ãŒå’Œæ–‡ã®æ¨ªçµ„用フォントã‹ã©ã†ã‹ï¼Œ
+ \.{iftfont}ã¯å’Œæ–‡ã®ç¸¦çµ„用フォントã‹ã©ã†ã‹ã‚’判定ã™ã‚‹ï¼Ž
2020-02-05ã®ã‚³ãƒŸãƒƒãƒˆ(r53681)ã§è¿½åŠ ã•ã‚Œï¼Œ
\TeX~Live 2020ã®\pTeX~(p3.8.3)ã§åˆ©ç”¨å¯èƒ½ã§ã‚る.
@@ -1445,7 +1550,7 @@ so I use .notdef glyph instead.
\begin{dangerous}
上述ã®é€šã‚Šï¼Œæ¬§æ–‡ãƒ•ã‚©ãƒ³ãƒˆãƒ»å’Œæ–‡ã®æ¨ªçµ„用フォント・
- 和文ã®ç¸¦çµ„用フォントã®ã„ãšã‚Œã‚‚|\font|一ã¤ã§å®šç¾©å¯èƒ½ã ãŒï¼Œ
+ 和文ã®ç¸¦çµ„用フォントã®ã„ãšã‚Œã‚‚\.{font}一ã¤ã§å®šç¾©å¯èƒ½ã ãŒï¼Œ
定義ã—ãŸãƒ•ã‚©ãƒ³ãƒˆãŒå®Ÿéš›ã«ã©ã®ç¨®é¡žã ã£ãŸã‹ã‚’知る手段ã¯
ãƒãƒ¼ã‚¸ãƒ§ãƒ³p3.8.2ã¾ã§ã®\pTeX ã«ã¯å­˜åœ¨ã—ãªã‹ã£ãŸï¼Ž
% https://github.com/texjporg/tex-jp-build/pull/97
@@ -1454,21 +1559,21 @@ so I use .notdef glyph instead.
\begin{dangerous}
ã¡ãªã¿ã«ï¼Œ\epTeX, \eupTeX ã«ã¯\.{iffontchar}プリミティブãŒå­˜åœ¨ã™ã‚‹ï¼Ž
ã—ã‹ã—,<\,font>ãŒå’Œæ–‡ãƒ•ã‚©ãƒ³ãƒˆã‹å¦ã‹ã‚’判定ã™ã‚‹ãŸã‚ã«
- \texttt{\.{iffontchar}~<\,font>~256}ãªã©ã¨ç¬¬äºŒå¼•æ•°ã«256以上ã®å€¤ã‚’指定ã™ã‚‹ã“ã¨ã¯ã§ããªã„.
+ \code{\.{iffontchar}~<\,font>~256}ãªã©ã¨ç¬¬äºŒå¼•æ•°ã«256以上ã®å€¤ã‚’指定ã™ã‚‹ã“ã¨ã¯ã§ããªã„.
ãªãœãªã‚‰ï¼Œæ¬§æ–‡ãƒ•ã‚©ãƒ³ãƒˆã«å¯¾ã—第二引数ã«0--255以外ã®å€¤ã‚’指定ã™ã‚‹ã¨
- 「\verb+! Bad character code (...).+ã€ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã™ã‚‹ã‹ã‚‰ã§ã‚る.
+ ``\verb|! Bad character code (...).|''エラーãŒç™ºç”Ÿã™ã‚‹ã‹ã‚‰ã§ã‚る.
\end{dangerous}
\begin{cslist}
\csitem[\.{jfam}=<number>]
ç¾åœ¨ã®å’Œæ–‡æ•°å¼ãƒ•ã‚©ãƒ³ãƒˆãƒ•ã‚¡ãƒŸãƒªã®ç•ªå·ã‚’æ ¼ç´ã™ã‚‹
\footnote{\pTeX,~\upTeX ã§ã¯0--15ã®ç¯„囲ãŒè¨±ã•ã‚Œã‚‹ï¼Ž
- \epTeX, \eupTeX ã§ã¯æ¬§æ–‡ã®|\fam|ã¨å…±ã«0--255ã«ç¯„囲ãŒæ‹¡å¼µã•ã‚Œã¦ã„る.}.
- ç¾åœ¨ã®æ¬§æ–‡æ•°å¼ãƒ•ã‚¡ãƒŸãƒªã®ç•ªå·ã‚’æ ¼ç´ã™ã‚‹|\fam|ã¨åŽŸç†çš„ã«åŒã˜ç•ªå·ã‚’指定ã™ã‚‹ã“ã¨ã¯
+ \epTeX, \eupTeX ã§ã¯æ¬§æ–‡ã®\.{fam}ã¨å…±ã«0--255ã«ç¯„囲ãŒæ‹¡å¼µã•ã‚Œã¦ã„る.}.
+ ç¾åœ¨ã®æ¬§æ–‡æ•°å¼ãƒ•ã‚¡ãƒŸãƒªã®ç•ªå·ã‚’æ ¼ç´ã™ã‚‹\.{fam}ã¨åŽŸç†çš„ã«åŒã˜ç•ªå·ã‚’指定ã™ã‚‹ã“ã¨ã¯
原ç†çš„ã«ã¯å¯èƒ½ã ãŒï¼Œæ•°å¼ãƒ•ã‚¡ãƒŸãƒªã¯å’Œæ–‡ãƒ»æ¬§æ–‡å…±ç”¨ã§ã‚ã‚‹ã®ã§å®Ÿéš›ã«ã¯
ç•°ãªã‚‹å€¤ã‚’指定ã™ã‚‹ã“ã¨ã«ãªã‚‹ï¼Ž
- 欧文フォントãŒè¨­å®šã•ã‚Œã¦ã„ã‚‹æ•°å¼ãƒ•ã‚¡ãƒŸãƒªã®ç•ªå·ã‚’|\jfam|ã«æŒ‡å®šã—,
+ 欧文フォントãŒè¨­å®šã•ã‚Œã¦ã„ã‚‹æ•°å¼ãƒ•ã‚¡ãƒŸãƒªã®ç•ªå·ã‚’\.{jfam}ã«æŒ‡å®šã—,
æ•°å¼ä¸­ã§å’Œæ–‡æ–‡å­—を記述ã™ã‚‹ã¨
\begin{verbatim}
! Not two-byte family.
@@ -1493,7 +1598,7 @@ so I use .notdef glyph instead.
\item 値を2以上ã«è¨­å®šã™ã‚‹ã¨ï¼Œè¿½åŠ ã§(u)\pTeX 特有ã®ä»¥ä¸‹ã®æƒ…報を表示ã™ã‚‹ï¼Ž
\begin{itemize}
\item 和文フォント(JFM)ã®æ¨ªçµ„(|/YOKO|)・縦組(|/TATE|)ã®åŒºåˆ¥
- \item 明示的ãªã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰æŒ‡å®šï¼ˆ\verb+in jis+ → |+JIS| / \verb+in ucs+ → |+Unicode|)
+ \item 明示的ãªã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰æŒ‡å®šï¼ˆ\verb|in jis| → |+JIS| / \verb|in ucs| → |+Unicode|)
\end{itemize}
\end{itemize}
書å¼ã¯ä»¥ä¸‹ã®ã‚ˆã†ã«ãªã‚‹ï¼Ž
@@ -1515,16 +1620,16 @@ so I use .notdef glyph instead.
ã¾ãŸï¼Œå’Œæ–‡ãƒ•ã‚©ãƒ³ãƒˆã«å¯¾ã—ã¦ã¯è¿½åŠ æƒ…å ±ã¨ã—ã¦ä»¥ä¸‹ã‚‚表示ã™ã‚‹ï¼Ž
\begin{itemize}
\item 和文フォント(JFM)ã®å ´åˆã¯æ¨ªçµ„・縦組ã®æƒ…報を表示
- \item 明示的ã«\verb+in jis+/\verb+in ucs+ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã«é™ã£ã¦ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã‚’表示
+ \item 明示的ã«\verb|in jis|/\verb|in ucs|ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã«é™ã£ã¦ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã‚’表示
\end{itemize}
書å¼ã¯\.{ptextracingfonts}ã¨åŒã˜ã§ã‚ã‚‹ãŒï¼Œãã®å€¤ã¯\.{ptexfontname}ã®å‡ºåŠ›ã«å½±éŸ¿ã—ãªã„.
ã“ã“ã§ã¯ä¾‹ã‚’示ãã†ï¼Ž
\begin{itemize}
- \item |\font\x=cmr10 at 7pt| → {\font\x=cmr10 at 7pt \code{\ptexfontname\x}}
- \item |\font\x=nmin10| → {\font\x=nmin10 \code{\ptexfontname\x}}
- \item |\font\x=min10 at 8pt| → {\font\x=min10 at 8pt \code{\ptexfontname\x}}
- \item |\font in jis \x=ngoth10 at 6pt| → {\font in jis \x=ngoth10 at 6pt \code{\ptexfontname\x}}
- \item |\font in ucs \x=utgoth10| → {\font in ucs \x=utgoth10 \code{\ptexfontname\x}}
+ \item \verb|\font\x=cmr10 at 7pt| → {\font\x=cmr10 at 7pt \code{\ptexfontname\x}}
+ \item \verb|\font\x=nmin10| → {\font\x=nmin10 \code{\ptexfontname\x}}
+ \item \verb|\font\x=min10 at 8pt| → {\font\x=min10 at 8pt \code{\ptexfontname\x}}
+ \item \verb|\font in jis \x=ngoth10 at 6pt| → {\font in jis \x=ngoth10 at 6pt \code{\ptexfontname\x}}
+ \item \verb|\font in ucs \x=utgoth10| → {\font in ucs \x=utgoth10 \code{\ptexfontname\x}}
\end{itemize}
ã“ã‚Œã«ã‚ˆã‚Š
「ãã®ãƒ•ã‚©ãƒ³ãƒˆãŒJISコードã¨Unicodeã®ã©ã¡ã‚‰ã§DVI出力ã•ã‚Œã‚‹ã‹ã€
@@ -1575,7 +1680,6 @@ so I use .notdef glyph instead.
ç¦å‰‡ãƒ†ãƒ¼ãƒ–ルã«æƒ…報を登録ã™ã‚‹æ‰‹æ®µã¨ã—ã¦ï¼Œ
以下ã®ãƒ—リミティブãŒè¿½åŠ ã•ã‚Œã¦ã„る.
-% アスキー公å¼ã‚µã‚¤ãƒˆã®ãƒ—リミティブ一覧ã‹ã‚‰é©å½“ã«ã¾ã¨ã‚
\begin{cslist}
\csitem[\.{prebreakpenalty} <character code>=<number>]
指定ã—ãŸæ–‡å­—ã®å‰æ–¹ã«ãƒšãƒŠãƒ«ãƒ†ã‚£ã‚’挿入ã™ã‚‹ï¼Ž
@@ -1590,27 +1694,27 @@ so I use .notdef glyph instead.
直後ã«10000ã®ãƒšãƒŠãƒ«ãƒ†ã‚£ãŒä»˜ã‘られ,行末ç¦å‰‡æ–‡å­—ã®å¯¾è±¡ã¨ãªã‚‹ï¼Ž
\end{cslist}
-|\prebreakpenalty|, |\postbreakpenalty|ã¯
+\.{prebreakpenalty}, \.{postbreakpenalty}ã¯
和文文字,欧文文字ã®åŒºåˆ¥ç„¡ã—ã«æŒ‡å®šã§ãる.
ãŸã ã—,欧文文字ã«è¨­å®šã•ã‚ŒãŸã“れらã®ãƒšãƒŠãƒ«ãƒ†ã‚£ãŒå®Ÿéš›ã«æŒ¿å…¥ã•ã‚Œã‚‹ã®ã¯
以下ã®å ´åˆã«é™ã‚‰ã‚Œã‚‹ï¼ˆã¤ã¾ã‚Šï¼Œæ¬§æ–‡çµ„版ã ã‘ã®ç¯„囲ã§ã¯æŒ¿å…¥ã•ã‚Œãªã„).
\begin{itemize}
\item 当該ã®æ¬§æ–‡æ–‡å­—ã®ç›´å¾ŒãŒå’Œæ–‡æ–‡å­—(å‰æ–¹ã«ç¦å‰‡ãƒšãƒŠãƒ«ãƒ†ã‚£ã‚’ä¼´ã£ã¦ã‚‚構ã‚ãªã„)ã®
- å ´åˆã«é™ã‚Šï¼Œãã®æ¬§æ–‡æ–‡å­—ã«è¨­å®šã•ã‚ŒãŸ|\postbreakpenalty|を挿入ã™ã‚‹ï¼Ž
+ å ´åˆã«é™ã‚Šï¼Œãã®æ¬§æ–‡æ–‡å­—ã«è¨­å®šã•ã‚ŒãŸ\.{postbreakpenalty}を挿入ã™ã‚‹ï¼Ž
\item 当該ã®æ¬§æ–‡æ–‡å­—ã®ç›´å‰ãŒå’Œæ–‡æ–‡å­—(後方ã«ç¦å‰‡ãƒšãƒŠãƒ«ãƒ†ã‚£ã‚’ä¼´ã£ã¦ã‚‚構ã‚ãªã„)ã®
- å ´åˆã«é™ã‚Šï¼Œãã®æ¬§æ–‡æ–‡å­—ã«è¨­å®šã•ã‚ŒãŸ|\prebreakpenalty|を挿入ã™ã‚‹ï¼Ž
+ å ´åˆã«é™ã‚Šï¼Œãã®æ¬§æ–‡æ–‡å­—ã«è¨­å®šã•ã‚ŒãŸ\.{prebreakpenalty}を挿入ã™ã‚‹ï¼Ž
\end{itemize}
\iffalse %%%%% [TODO]
\begin{dangerous}
上記ã®ã€Œæ¬§æ–‡æ–‡å­—ã«è¨­å®šã•ã‚ŒãŸç¦å‰‡ãƒšãƒŠãƒ«ãƒ†ã‚£ãŒæŒ¿å…¥ã•ã‚Œã‚‹çŠ¶æ³ã€ã¯
欧文文字ã¨å’Œæ–‡æ–‡å­—ã®å¢ƒç•Œã§ã‚り,
ベースライン補正(\ref{sec:baselineshift}節をå‚照)を実ç¾ã™ã‚‹
-|disp_node|ã®æŒ¿å…¥ç®‡æ‰€ã§ã‚‚ã‚る.
-ベースライン補正ãŒã‚¼ãƒ­ã§ãªã„ã¨ã,|penalty_node|ã¨|disp_node|ã®
+\node{disp_node}ã®æŒ¿å…¥ç®‡æ‰€ã§ã‚‚ã‚る.
+ベースライン補正ãŒã‚¼ãƒ­ã§ãªã„ã¨ã,\node{penalty_node}ã¨\node{disp_node}ã®
挿入順åºã¯ä»¥ä¸‹ã®ã‚ˆã†ã«ã—ã¦ã„る. % tex-jp-build@2c83eb0
\begin{itemize}
- \item 欧文→和文文字間: |disp_node| → |penalty_node| (\.{postbreakpenalty}) ã®é †
- \item 和文→欧文文字間: |penalty_node| (\.{prebreakpenalty}) → |disp_node| ã®é †
+ \item 欧文→和文文字間: \node{disp_node} → \node{penalty_node} (\.{postbreakpenalty}) ã®é †
+ \item 和文→欧文文字間: \node{penalty_node} (\.{prebreakpenalty}) → \node{disp_node} ã®é †
\end{itemize}
\end{dangerous}
\fi %%%%%
@@ -1637,7 +1741,7 @@ so I use .notdef glyph instead.
原ç†çš„ã«\.{lastpenalty}ã§å–å¾—ã§ããªã„ã—,\.{unpenalty}ã§å–り除ãã“ã¨ã‚‚ã§ããªã„.
\end{dangerous}
-åŒä¸€ã®æ–‡å­—ã«å¯¾ã—ã¦|\prebreakpenalty|ã¨|\postbreakpenalty|ã®ä¸¡æ–¹ã‚’
+åŒä¸€ã®æ–‡å­—ã«å¯¾ã—ã¦\.{prebreakpenalty}ã¨\.{postbreakpenalty}ã®ä¸¡æ–¹ã‚’
åŒæ™‚ã«ä¸Žãˆã‚‹ã‚ˆã†ãªæŒ‡å®šã¯ã§ããªã„
(もã—両方指定ã•ã‚ŒãŸå ´åˆï¼Œå¾Œã‹ã‚‰æŒ‡å®šã•ã‚ŒãŸã‚‚ã®ã«ç½®ãæ›ãˆã‚‰ã‚Œã‚‹ï¼‰ï¼Ž
ç¦å‰‡ãƒ†ãƒ¼ãƒ–ルã«ã¯1,024文字分ã®é ˜åŸŸã—ã‹ãªã„ã®ã§ï¼Œ
@@ -1664,18 +1768,18 @@ so I use .notdef glyph instead.
% 「段è½ãŒå’Œæ–‡æ–‡å­—ã®1ã¤ä»¥ä¸Šã®é€£ç¶š%
% \footnote{%
% 正確ã«ã¯ï¼Œå’Œæ–‡æ–‡å­—ã‚’1ã¤ä»¥ä¸Šå«ã‚€ã‚ˆã†ãª
- % 「和文文字,ペナルティ,グルー,カーン,文中数å¼ã®å¢ƒç•Œï¼Œ\textit{mark\_node},
- % \textit{adjust\_node}, \textit{whatsit\_node}, \textit{disp\_node}ã€ã®1ã¤ä»¥ä¸Šã®é€£ç¶šï¼Ž
+ % 「和文文字,ペナルティ,グルー,カーン,文中数å¼ã®å¢ƒç•Œï¼Œ\node{mark_node},
+ % \node{adjust_node}, \node{whatsit_node}, \node{disp_node}ã€ã®1ã¤ä»¥ä¸Šã®é€£ç¶šï¼Ž
% ãŸã ã—,アクセント本体ã¯ç„¡è¦–ã•ã‚Œã‚‹ï¼Ž
% }ã§çµ‚ã‚ã‚‹å ´åˆï¼Œ
- % ãã®ä¸­ã®æœ€å¾Œã«ã‚ã‚‹|\kcatcode|ãŒ16(漢字)ã¾ãŸã¯17(仮å)ã®æ–‡å­—%
+ % ãã®ä¸­ã®æœ€å¾Œã«ã‚ã‚‹\.{kcatcode}ãŒ16(漢字)ã¾ãŸã¯17(仮å)ã®æ–‡å­—%
% \footnote{%
% \pTeX ã®åˆæœŸå€¤ã§ã¯ï¼Œ1,~2,~7--8区\emph{以外}ã«å«ã¾ã‚Œã‚‹æ–‡å­—.
% }ã®ç›´å‰ã€ã«æŒ¿å…¥ã•ã‚Œã‚‹ï¼Ž
% % 警告:ç¾è¡Œã® pTeX ã§ã¯ï¼Œã“ã®ä»•æ§˜ã«æ²¿ã£ã¦ã„ã¾ã›ã‚“(欧文ãŒçµ¡ã‚“ã å ´åˆï¼‰ï¼Ž
% % 仕様を明確ã«æ±ºã‚ã‚‹ã¨ã—ãŸã‚‰ã“ã‚“ãªæ„Ÿã˜ã«ãªã‚‹ã—ょã†ã‹ï¼Ž
% %
- % ã¾ãŸï¼Œãã®ä½ç½®ãŒã™ã§ã«ãƒšãƒŠãƒ«ãƒ†ã‚£ã§ã‚ã£ãŸå ´åˆã¯ï¼Œ|\jcharwidowpenalty|ã®å€¤ãŒåˆç®—ã•ã‚Œã‚‹ï¼Ž
+ % ã¾ãŸï¼Œãã®ä½ç½®ãŒã™ã§ã«ãƒšãƒŠãƒ«ãƒ†ã‚£ã§ã‚ã£ãŸå ´åˆã¯ï¼Œ\.{jcharwidowpenalty}ã®å€¤ãŒåˆç®—ã•ã‚Œã‚‹ï¼Ž
\end{cslist}
\subsection{文字間ã®ã‚¹ãƒšãƒ¼ã‚¹}
@@ -1700,7 +1804,7 @@ so I use .notdef glyph instead.
[TODO] JFMグルーã®æŒ¿å…¥è¦å‰‡ã«ã¤ã„ã¦
\begin{itemize}
\item メトリック由æ¥ç©ºç™½ã®æŒ¿å…¥å‡¦ç†ã¯å±•é–‹ä¸èƒ½ãƒˆãƒ¼ã‚¯ãƒ³ãŒæ¥ãŸã‚‰ä¸­æ–­
- \item 展開ä¸èƒ½ãƒˆãƒ¼ã‚¯ãƒ³ã‚„欧文文字ã¯ã€Œæ–‡å­—クラス0ã€æ‰±ã„.「\verb+)\relax(+ã€ã®ä¾‹
+ \item 展開ä¸èƒ½ãƒˆãƒ¼ã‚¯ãƒ³ã‚„欧文文字ã¯ã€Œæ–‡å­—クラス0ã€æ‰±ã„.「\verb|)\relax(+|ã®ä¾‹
\item ç¦å‰‡ãƒšãƒŠãƒ«ãƒ†ã‚£ï¼ˆ\.{prebreakpenalty}ã‚„\.{postbreakpenalty})ã¨
ãŒåŒã˜ç®‡æ‰€ã«ç™ºè¡Œã•ã‚Œã‚‹å ´åˆã¯
「ç¦å‰‡ãƒšãƒŠãƒ«ãƒ†ã‚£â†’JFMç”±æ¥ç©ºç™½ã€ã®é †ã«ç™ºè¡Œã•ã‚Œã‚‹ï¼Ž
@@ -1716,7 +1820,7 @@ so I use .notdef glyph instead.
切替時ã«ã¯æŒ¿å…¥ã•ã‚Œãªã„.}% tex-jp-build/78c8605 ã§è§£æ±º
\end{itemize}
\fi %%%%%
- \item ã‚‚ã—水平ボックス(\.{hbox})ã‚„\.{noindent}ã§é–‹å§‹ã•ã‚ŒãŸæ®µè½ãŒJFMç”±æ¥ã‚°ãƒ«ãƒ¼ã§å§‹ã¾ã£ãŸ
+ \item ã‚‚ã—水平ボックス(|\hbox|)ã‚„|\noindent|ã§é–‹å§‹ã•ã‚ŒãŸæ®µè½ãŒJFMç”±æ¥ã‚°ãƒ«ãƒ¼ã§å§‹ã¾ã£ãŸ
å ´åˆã¯ï¼Œãã®ã‚°ãƒ«ãƒ¼ã¯å–り除ã‹ã‚Œã‚‹ï¼ˆã‚«ãƒ¼ãƒ³ã¯é™¤ã‹ã‚Œãªã„).
ã¾ãŸæ°´å¹³ãƒœãƒƒã‚¯ã‚¹ãŒJFMç”±æ¥ã‚°ãƒ«ãƒ¼ã§çµ‚了ã—ãŸå ´åˆã¯ï¼Œãã®ã‚°ãƒ«ãƒ¼ã¯è‡ªç„¶é•·ãƒ»ä¼¸ã³é‡ãƒ»ç¸®ã¿é‡ã®
ã™ã¹ã¦ãŒ0ã¨ãªã‚‹ï¼Ž
@@ -1729,23 +1833,23 @@ so I use .notdef glyph instead.
\end{cslist}
\begin{dangerous}
- 和文文字を表ã™ãƒŽãƒ¼ãƒ‰ãŒé€£ç¶šã—ãŸå ´åˆï¼Œãã®é–“ã«|\kanjiskip|ãŒã‚ã‚‹ã‚‚ã®ã¨ã—ã¦è¡Œåˆ†å‰²ã‚„
- ボックスã®å¯¸æ³•è¨ˆç®—ãŒè¡Œã‚れる.|\kanjiskip|ã®å¤§éƒ¨åˆ†ã¯ã“ã®ã‚ˆã†ã«æš—é»™ã®ã†ã¡ã«æŒ¿å…¥
+ 和文文字を表ã™ãƒŽãƒ¼ãƒ‰ãŒé€£ç¶šã—ãŸå ´åˆï¼Œãã®é–“ã«\.{kanjiskip}ãŒã‚ã‚‹ã‚‚ã®ã¨ã—ã¦è¡Œåˆ†å‰²ã‚„
+ ボックスã®å¯¸æ³•è¨ˆç®—ãŒè¡Œã‚れる.\.{kanjiskip}ã®å¤§éƒ¨åˆ†ã¯ã“ã®ã‚ˆã†ã«æš—é»™ã®ã†ã¡ã«æŒ¿å…¥
ã•ã‚Œã‚‹ã‚‚ã®ã§ã‚ã‚‹ã®ã§ï¼Œ|\lastskip|ãªã©ã§å–å¾—ã™ã‚‹ã“ã¨ã¯ã§ããªã„ã—,
|\showlists|ã‚„|\showbox|ã§ã‚‚表示ã•ã‚Œãªã„.
- ãã®ä¸€æ–¹ã§ï¼ŒãƒŽãƒ¼ãƒ‰ã®å½¢ã§æ˜Žç¤ºçš„ã«æŒ¿å…¥ã•ã‚Œã‚‹|\kanjiskip|も存在ã™ã‚‹ï¼Ž
+ ãã®ä¸€æ–¹ã§ï¼ŒãƒŽãƒ¼ãƒ‰ã®å½¢ã§æ˜Žç¤ºçš„ã«æŒ¿å…¥ã•ã‚Œã‚‹\.{kanjiskip}も存在ã™ã‚‹ï¼Ž
ã“ã®ã‚ˆã†ã«ãªã‚‹ã®ã¯æ¬¡ã®å ´åˆã§ã‚る:
\begin{itemize}
\item 水平ボックス(|\hbox|)ãŒå’Œæ–‡æ–‡å­—ã§é–‹å§‹ã—ã¦ãŠã‚Šï¼Œãã®ãƒœãƒƒã‚¯ã‚¹ã®ç›´å‰ãŒ
- 和文文字ã§ã‚ã£ãŸå ´åˆï¼Œãƒœãƒƒã‚¯ã‚¹ã®ç›´å‰ã«|\kanjiskip|ãŒæŒ¿å…¥ã•ã‚Œã‚‹ï¼Ž
+ 和文文字ã§ã‚ã£ãŸå ´åˆï¼Œãƒœãƒƒã‚¯ã‚¹ã®ç›´å‰ã«\.{kanjiskip}ãŒæŒ¿å…¥ã•ã‚Œã‚‹ï¼Ž
\item 水平ボックス(|\hbox|)ãŒå’Œæ–‡æ–‡å­—ã§çµ‚了ã—ã¦ãŠã‚Šï¼Œãã®ãƒœãƒƒã‚¯ã‚¹ã®ç›´å¾ŒãŒ
- 和文文字ã§ã‚ã£ãŸå ´åˆï¼Œãƒœãƒƒã‚¯ã‚¹ã®ç›´å¾Œã«|\kanjiskip|ãŒæŒ¿å…¥ã•ã‚Œã‚‹ï¼Ž
- \item 連続ã—ãŸå’Œæ–‡æ–‡å­—ã®é–“ã«ãƒšãƒŠãƒ«ãƒ†ã‚£ãŒã‚ã£ãŸå ´åˆï¼Œæš—é»™ã®|\kanjiskip|ãŒ
+ 和文文字ã§ã‚ã£ãŸå ´åˆï¼Œãƒœãƒƒã‚¯ã‚¹ã®ç›´å¾Œã«\.{kanjiskip}ãŒæŒ¿å…¥ã•ã‚Œã‚‹ï¼Ž
+ \item 連続ã—ãŸå’Œæ–‡æ–‡å­—ã®é–“ã«ãƒšãƒŠãƒ«ãƒ†ã‚£ãŒã‚ã£ãŸå ´åˆï¼Œæš—é»™ã®\.{kanjiskip}ãŒ
挿入ã•ã‚Œãªã„ã®ã§æ˜Žç¤ºçš„ã«ãƒŽãƒ¼ãƒ‰ãŒä½œã‚‰ã‚Œã‚‹ï¼Ž
\end{itemize}
ãªãŠï¼Œæ°´å¹³ãƒœãƒƒã‚¯ã‚¹ã§ã‚ã£ã¦ã‚‚|\raise|, |\lower|ã§ä¸Šä¸‹ä½ç½®ã‚’シフトã•ã›ãŸå ´åˆã¯
- 上記ã§è¿°ã¹ãŸ|\kanjiskip|ã‚’å‰å¾Œã«æŒ¿å…¥å‡¦ç†ã®å¯¾è±¡ã«ã¯ãªã‚‰ãªã„.
+ 上記ã§è¿°ã¹ãŸ\.{kanjiskip}ã‚’å‰å¾Œã«æŒ¿å…¥å‡¦ç†ã®å¯¾è±¡ã«ã¯ãªã‚‰ãªã„.
\end{dangerous}
\begin{dangerous}
ã—ã°ã—ã°
@@ -1765,9 +1869,9 @@ so I use .notdef glyph instead.
\end{minipage}
\noindent
- ã®ã‚ˆã†ã«|\kanjiskip|ã«ç„¡é™ã®ä¼¸é•·åº¦ã‚’æŒãŸã›ã‚‹ã“ã¨ã§å‡ç­‰å‰²ä»˜ã‚’è¡ŒãŠã†ã¨ã™ã‚‹
+ ã®ã‚ˆã†ã«\.{kanjiskip}ã«ç„¡é™ã®ä¼¸é•·åº¦ã‚’æŒãŸã›ã‚‹ã“ã¨ã§å‡ç­‰å‰²ä»˜ã‚’è¡ŒãŠã†ã¨ã™ã‚‹
コードを見ã‹ã‘ã‚‹ãŒï¼Œé€£ç¶šã™ã‚‹å’Œæ–‡æ–‡å­—ã®é–“ã«ã¯ãƒ¡ãƒˆãƒªãƒƒã‚¯ç”±æ¥ã®ç©ºç™½ã¨
- |\kanjiskip|ã¯åŒæ™‚ã«ã¯å…¥ã‚‰ãªã„ã®ã§ï¼Œä¸Šã«æ›¸ã„ãŸã‚³ãƒ¼ãƒ‰ã¯ä¸é©åˆ‡ã§ã‚ã‚‹
+ \.{kanjiskip}ã¯åŒæ™‚ã«ã¯å…¥ã‚‰ãªã„ã®ã§ï¼Œä¸Šã«æ›¸ã„ãŸã‚³ãƒ¼ãƒ‰ã¯ä¸é©åˆ‡ã§ã‚ã‚‹
\footnote{実際,開ã括弧ã®å‰ãƒ»é–‰ã˜æ‹¬å¼§ï¼ˆå…¨è§’コンマをå«ã‚€ï¼‰ã®å¾Œã«ã¯
JFMグルーãŒå…¥ã£ã¦ã„ã‚‹ã®ã§åŠè§’ã—ã‹ãªã„.
}.
@@ -1780,35 +1884,35 @@ so I use .notdef glyph instead.
段è½çµ‚了時ã®å€¤ãŒæ®µè½å…¨ä½“ã«ã‚ãŸã£ã¦ç”¨ã„られる.
\end{cslist}
\begin{dangerous}
- |\kanjiskip|ã¨ç•°ãªã‚Šï¼Œ|\xkanjiskip|ã¯ãƒŽãƒ¼ãƒ‰ã®å½¢ã§æŒ¿å…¥ã•ã‚Œã‚‹ï¼Ž
+ \.{kanjiskip}ã¨ç•°ãªã‚Šï¼Œ\.{xkanjiskip}ã¯ãƒŽãƒ¼ãƒ‰ã®å½¢ã§æŒ¿å…¥ã•ã‚Œã‚‹ï¼Ž
ã“ã®æŒ¿å…¥å‡¦ç†ã¯æ®µè½ã®è¡Œåˆ†å‰²å‡¦ç†ã®ç›´å‰ã‚„,|\hbox|ã‚’é–‰ã˜ã‚‹ã¨ãã«è¡Œã‚れるã®ã§ï¼Œ
- 「ã©ã“ã«|\xkanjiskip|ãŒå…¥ã£ã¦ã„ã‚‹ã‹ã€ã‚’知るãŸã‚ã«ã¯ç¾åœ¨ã®æ®µè½ã‚„|\hbox|ã‚’
+ 「ã©ã“ã«\.{xkanjiskip}ãŒå…¥ã£ã¦ã„ã‚‹ã‹ã€ã‚’知るãŸã‚ã«ã¯ç¾åœ¨ã®æ®µè½ã‚„|\hbox|ã‚’
終了ã•ã›ã‚‹å¿…è¦ãŒã‚る.
\end{dangerous}
\begin{cslist}
\csitem[\.{xspcode} <8-bit number>=<0--3>]
- コード番å·ãŒ<8-bit number>ã®æ¬§æ–‡æ–‡å­—ã®å‘¨å›²ã«|\xkanjiskip|ãŒ
+ コード番å·ãŒ<8-bit number>ã®æ¬§æ–‡æ–‡å­—ã®å‘¨å›²ã«\.{xkanjiskip}ãŒ
挿入å¯èƒ½ãŒå¦ã‹ã‚’0--3ã®å€¤ã§æŒ‡å®šã™ã‚‹ï¼Žãã‚Œãžã‚Œã®æ„味ã¯æ¬¡ã®é€šã‚Šï¼š
\begin{description}
- \item[0] 欧文文字ã®å‰å´ï¼Œå¾Œå´ã¨ã‚‚ã«|\xkanjiskip|ã®æŒ¿å…¥ã‚’ç¦æ­¢ã™ã‚‹ï¼Ž
- \item[1] 欧文文字ã®å‰å´ã«ã®ã¿|\xkanjiskip|ã®æŒ¿å…¥ã‚’許å¯ã™ã‚‹ï¼Žå¾Œå´ã¯ç¦æ­¢ï¼Ž
- \item[2] 欧文文字ã®å¾Œå´ã«ã®ã¿|\xkanjiskip|ã®æŒ¿å…¥ã‚’許å¯ã™ã‚‹ï¼Žå‰å´ã¯ç¦æ­¢ï¼Ž
- \item[3] 欧文文字ã®å‰å´ï¼Œå¾Œå´ã¨ã‚‚ã«|\xkanjiskip|ã®æŒ¿å…¥ã‚’許å¯ã™ã‚‹ï¼Ž
+ \item[0] 欧文文字ã®å‰å´ï¼Œå¾Œå´ã¨ã‚‚ã«\.{xkanjiskip}ã®æŒ¿å…¥ã‚’ç¦æ­¢ã™ã‚‹ï¼Ž
+ \item[1] 欧文文字ã®å‰å´ã«ã®ã¿\.{xkanjiskip}ã®æŒ¿å…¥ã‚’許å¯ã™ã‚‹ï¼Žå¾Œå´ã¯ç¦æ­¢ï¼Ž
+ \item[2] 欧文文字ã®å¾Œå´ã«ã®ã¿\.{xkanjiskip}ã®æŒ¿å…¥ã‚’許å¯ã™ã‚‹ï¼Žå‰å´ã¯ç¦æ­¢ï¼Ž
+ \item[3] 欧文文字ã®å‰å´ï¼Œå¾Œå´ã¨ã‚‚ã«\.{xkanjiskip}ã®æŒ¿å…¥ã‚’許å¯ã™ã‚‹ï¼Ž
\end{description}
\pTeX ã®æ¨™æº–値ã¯ï¼Œæ•°å­—0--9ã¨è‹±æ–‡å­—A--Z, a--zã«å¯¾ã™ã‚‹å€¤ã¯3(両å´è¨±å¯ï¼‰ï¼Œ
ãã®ä»–ã®æ–‡å­—ã«å¯¾ã—ã¦ã¯0(両å´ç¦æ­¢ï¼‰ï¼Ž
\csitem[\.{inhibitxspcode} <kanji code>=<0--3>]
- コード番å·ãŒ<kanji code>ã®å’Œæ–‡æ–‡å­—ã®å‘¨å›²ã«|\xkanjiskip|ãŒ
+ コード番å·ãŒ<kanji code>ã®å’Œæ–‡æ–‡å­—ã®å‘¨å›²ã«\.{xkanjiskip}ãŒ
挿入å¯èƒ½ãŒå¦ã‹ã‚’0--3ã®å€¤ã§æŒ‡å®šã™ã‚‹ï¼Žãã‚Œãžã‚Œã®æ„味ã¯æ¬¡ã®é€šã‚Šï¼š
\begin{description}
- \item[0] 和文文字ã®å‰å´ï¼Œå¾Œå´ã¨ã‚‚ã«|\xkanjiskip|ã®æŒ¿å…¥ã‚’ç¦æ­¢ã™ã‚‹ï¼Ž
- \item[1] 和文文字ã®å¾Œå´ã«ã®ã¿|\xkanjiskip|ã®æŒ¿å…¥ã‚’許å¯ã™ã‚‹ï¼Žå‰å´ã¯ç¦æ­¢ï¼Ž
- \item[2] 和文文字ã®å‰å´ã«ã®ã¿|\xkanjiskip|ã®æŒ¿å…¥ã‚’許å¯ã™ã‚‹ï¼Žå¾Œå´ã¯ç¦æ­¢ï¼Ž
- \item[3] 和文文字ã®å‰å´ï¼Œå¾Œå´ã¨ã‚‚ã«|\xkanjiskip|ã®æŒ¿å…¥ã‚’許å¯ã™ã‚‹ï¼Ž
+ \item[0] 和文文字ã®å‰å´ï¼Œå¾Œå´ã¨ã‚‚ã«\.{xkanjiskip}ã®æŒ¿å…¥ã‚’ç¦æ­¢ã™ã‚‹ï¼Ž
+ \item[1] 和文文字ã®å¾Œå´ã«ã®ã¿\.{xkanjiskip}ã®æŒ¿å…¥ã‚’許å¯ã™ã‚‹ï¼Žå‰å´ã¯ç¦æ­¢ï¼Ž
+ \item[2] 和文文字ã®å‰å´ã«ã®ã¿\.{xkanjiskip}ã®æŒ¿å…¥ã‚’許å¯ã™ã‚‹ï¼Žå¾Œå´ã¯ç¦æ­¢ï¼Ž
+ \item[3] 和文文字ã®å‰å´ï¼Œå¾Œå´ã¨ã‚‚ã«\.{xkanjiskip}ã®æŒ¿å…¥ã‚’許å¯ã™ã‚‹ï¼Ž
\end{description}
- ã“ã®|\inhibitxspcode|ã®è¨­å®šå€¤ã®æƒ…å ±ã¯1,024文字分ã®ãƒ†ãƒ¼ãƒ–ルã«æ ¼ç´ã•ã‚Œã¦ã„ã‚‹
+ ã“ã®\.{inhibitxspcode}ã®è¨­å®šå€¤ã®æƒ…å ±ã¯1,024文字分ã®ãƒ†ãƒ¼ãƒ–ルã«æ ¼ç´ã•ã‚Œã¦ã„ã‚‹
\footnote{最大1,024文字ã¨ãªã£ãŸã®ã¯\TeX~Live 2023 (r65236--65248)以é™ï¼Ž
ãªãŠï¼Œ\TeX~Live 2022ã¾ã§ã¯256文字分ã®ãƒ†ãƒ¼ãƒ–ルã—ã‹ãªã‹ã£ãŸï¼Ž}.
未登録時ã¯3(両å´è¨±å¯ï¼‰ã§ã‚ã‚‹ã¨ã¿ãªã•ã‚Œï¼Œã¾ãŸã‚°ãƒ­ãƒ¼ãƒãƒ«ã«3を代入ã™ã‚‹ã‹ï¼Œã‚ã‚‹ã„ã¯
@@ -1816,7 +1920,7 @@ so I use .notdef glyph instead.
(ç¦å‰‡ãƒ†ãƒ¼ãƒ–ルã‹ã‚‰ã®å‰Šé™¤ã¨åŒæ§˜ã®è¦å‰‡ï¼‰ï¼Ž
\end{cslist}
\begin{dangerous}
- |\xspcode|ã¨|\inhibitxspcode|ã§ã¯ï¼Œä¸€è¦‹ã™ã‚‹ã¨
+ \.{xspcode}ã¨\.{inhibitxspcode}ã§ã¯ï¼Œä¸€è¦‹ã™ã‚‹ã¨
設定値1ã¨2ã®æ„味ãŒå対ã®ã‚ˆã†ã«æ„Ÿã˜ã‚‹ã‹ã‚‚ã—ã‚Œãªã„.ã—ã‹ã—,実ã¯ä¸¡è€…ã¨ã‚‚
\begin{quote}
1: 「和文文字→欧文文字ã€ã®å ´åˆã®ã¿è¨±å¯ï¼Žã€Œæ¬§æ–‡æ–‡å­—→和文文字ã€ã®å ´åˆã¯ç¦æ­¢ï¼Ž\\
@@ -1827,43 +1931,43 @@ so I use .notdef glyph instead.
\begin{cslist}
\csitem[\.{autospacing}, \.{noautospacing}]
- 連続ã™ã‚‹å’Œæ–‡æ–‡å­—é–“ã«ï¼Œæ¨™æº–ã§|\kanjiskip|ã§æŒ‡å®šã•ã‚ŒãŸã ã‘ã®ã‚°ãƒ«ãƒ¼ã‚’
- 挿入ã™ã‚‹(|\autospacing|)ã‹æŒ¿å…¥ã—ãªã„(|\noautospacing|)を設定ã™ã‚‹ï¼Ž
+ 連続ã™ã‚‹å’Œæ–‡æ–‡å­—é–“ã«ï¼Œæ¨™æº–ã§\.{kanjiskip}ã§æŒ‡å®šã•ã‚ŒãŸã ã‘ã®ã‚°ãƒ«ãƒ¼ã‚’
+ 挿入ã™ã‚‹(\.{autospacing})ã‹æŒ¿å…¥ã—ãªã„(\.{noautospacing})を設定ã™ã‚‹ï¼Ž
段è½é€”中ã§ã“ã®å€¤ã‚’変ãˆã¦ã‚‚影響ã¯ãªã,段è½çµ‚了時ã®å€¤ãŒæ®µè½å…¨ä½“ã«ã‚ãŸã£ã¦ç”¨ã„られる.
\csitem[\.{autoxspacing}, \.{noautoxspacing}]
- 和文文字ã¨æ¬§æ–‡æ–‡å­—ã®é–“ã«ï¼Œæ¨™æº–ã§|\xkanjiskip|ã§æŒ‡å®šã•ã‚ŒãŸã ã‘ã®ã‚°ãƒ«ãƒ¼ã‚’
- 挿入ã™ã‚‹(|\autoxspacing|)ã‹æŒ¿å…¥ã—ãªã„(|\noautoxspacing|)を設定ã™ã‚‹ï¼Ž
+ 和文文字ã¨æ¬§æ–‡æ–‡å­—ã®é–“ã«ï¼Œæ¨™æº–ã§\.{xkanjiskip}ã§æŒ‡å®šã•ã‚ŒãŸã ã‘ã®ã‚°ãƒ«ãƒ¼ã‚’
+ 挿入ã™ã‚‹(\.{autoxspacing})ã‹æŒ¿å…¥ã—ãªã„(\.{noautoxspacing})を設定ã™ã‚‹ï¼Ž
段è½é€”中ã§ã“ã®å€¤ã‚’変ãˆã¦ã‚‚影響ã¯ãªã,段è½çµ‚了時ã®å€¤ãŒæ®µè½å…¨ä½“ã«ã‚ãŸã£ã¦ç”¨ã„られる.
\end{cslist}
-ã©ã¡ã‚‰ã®è¨­å®šã‚‚標準ã§ã¯æœ‰åŠ¹(|\autospacing|, |\autoxspacing|)ã§ã‚る.
+ã©ã¡ã‚‰ã®è¨­å®šã‚‚標準ã§ã¯æœ‰åŠ¹(\.{autospacing}, \.{autoxspacing})ã§ã‚る.
\begin{dangerous}
- ã™ã§ã«è¿°ã¹ãŸã‚ˆã†ã«ï¼Œ|\kanjiskip|ã®ä¸€éƒ¨ã¨|\xkanjiskip|ã¯ãƒŽãƒ¼ãƒ‰ã®å½¢ã§æŒ¿å…¥ã•ã‚Œã‚‹ï¼Ž
- |\noautospacing|ã‚„|\noautoxspacing|を指定ã—ã¦ã‚‚,ã“ã®ãƒŽãƒ¼ãƒ‰ã®å½¢ã§ã®æŒ¿å…¥è‡ªä½“ã¯è¡Œã‚れる
- (ãŸã ãƒŽãƒ¼ãƒ‰ãŒ|\kanjiskip|ã‚„|\xkanjiskip|ã®ä»£ã‚ã‚Šã«é•·ã•0ã®ã‚°ãƒ«ãƒ¼ã‚’表ã™ã ã‘).
+ ã™ã§ã«è¿°ã¹ãŸã‚ˆã†ã«ï¼Œ\.{kanjiskip}ã®ä¸€éƒ¨ã¨\.{xkanjiskip}ã¯ãƒŽãƒ¼ãƒ‰ã®å½¢ã§æŒ¿å…¥ã•ã‚Œã‚‹ï¼Ž
+ \.{noautospacing}ã‚„\.{noautoxspacing}を指定ã—ã¦ã‚‚,ã“ã®ãƒŽãƒ¼ãƒ‰ã®å½¢ã§ã®æŒ¿å…¥è‡ªä½“ã¯è¡Œã‚れる
+ (ãŸã ãƒŽãƒ¼ãƒ‰ãŒ\.{kanjiskip}ã‚„\.{xkanjiskip}ã®ä»£ã‚ã‚Šã«é•·ã•0ã®ã‚°ãƒ«ãƒ¼ã‚’表ã™ã ã‘).
- ã“ã‚Œã«ã‚ˆã‚Šï¼Œä¾‹ãˆã°|\noautoxspacing|状æ³ä¸‹ã§ã€Œ|ã‚a|ã€ã¨
+ ã“ã‚Œã«ã‚ˆã‚Šï¼Œä¾‹ãˆã°\.{noautoxspacing}状æ³ä¸‹ã§ã€Œ|ã‚a|ã€ã¨
入力ã—ã¦ã‚‚,間ã«é•·ã•0ã®ã‚°ãƒ«ãƒ¼ãŒã‚ã‚‹ãŸã‚「ã‚ã€ã¨ã€Œaã€ã®é–“ã§æ”¹è¡Œå¯èƒ½ã¨ãªã‚‹ã“ã¨ã«æ³¨æ„.
\end{dangerous}
\begin{cslist}
\csitem[\.{showmode}]
- |\kanjiskip|ã®æŒ¿å…¥ã‚„|\xkanjiskip|ã®æŒ¿å…¥ãŒæœ‰åŠ¹ã«ãªã£ã¦ã„ã‚‹ã‹å¦ã‹ã‚’
+ \.{kanjiskip}ã®æŒ¿å…¥ã‚„\.{xkanjiskip}ã®æŒ¿å…¥ãŒæœ‰åŠ¹ã«ãªã£ã¦ã„ã‚‹ã‹å¦ã‹ã‚’
\begin{verbatim}
> auto spacing mode;
> no auto xspacing mode.
\end{verbatim}
- ã¨ã„ã†å½¢å¼ï¼ˆä¸Šã®ä¾‹ã§ã¯|\autospacing|ã‹ã¤|\noautoxspacing|ã®çŠ¶æ³ï¼‰ã§ç«¯æœ«ã‚„ログã«è¡¨ç¤ºã™ã‚‹ï¼Ž
+ ã¨ã„ã†å½¢å¼ï¼ˆä¸Šã®ä¾‹ã§ã¯\.{autospacing}ã‹ã¤\.{noautoxspacing}ã®çŠ¶æ³ï¼‰ã§ç«¯æœ«ã‚„ログã«è¡¨ç¤ºã™ã‚‹ï¼Ž
\csitem[\.{inhibitglue}]
ã“ã®å‘½ä»¤ãŒå®Ÿè¡Œã•ã‚ŒãŸä½ç½®ã«ãŠã„ã¦ï¼Œãƒ¡ãƒˆãƒªãƒƒã‚¯ç”±æ¥ã®ç©ºç™½ã®æŒ¿å…¥ã‚’ç¦æ­¢ã™ã‚‹ï¼Žä»¥ä¸‹ã®ç‚¹ã«æ³¨æ„.
\begin{itemize}
\item メトリック由æ¥ã®ç©ºç™½ãŒæŒ¿å…¥ã•ã‚Œãªã„ã ã‘ã§ã‚り,
- ãã®ä»£ã‚ã‚Šã«|\kanjiskip|ã‚„|\xkanjiskip|ãŒæŒ¿å…¥ã•ã‚Œã‚‹ã“ã¨ã¯ç¦æ­¢ã—ã¦ã„ãªã„.
+ ãã®ä»£ã‚ã‚Šã«\.{kanjiskip}ã‚„\.{xkanjiskip}ãŒæŒ¿å…¥ã•ã‚Œã‚‹ã“ã¨ã¯ç¦æ­¢ã—ã¦ã„ãªã„.
\item 本命令ã¯ç¾åœ¨ã®ãƒ¢ãƒ¼ãƒ‰ãŒï¼ˆéžé™å®šï¼Œé™å®šå•ã‚ãšï¼‰æ°´å¹³ãƒ¢ãƒ¼ãƒ‰ã®ã¨ãã—ã‹åŠ¹åŠ›ã‚’発æ®ã—ãªã„
(数å¼ãƒ¢ãƒ¼ãƒ‰ã§ã‚‚効ã‹ãªã„).
- 段è½ãŒå’Œæ–‡æ–‡å­—「\verb+ã€+ã€ã§å§‹ã¾ã‚Šï¼Œãã®æ–‡å­—ã®ç›´å‰ã«ãƒ¡ãƒˆãƒªãƒƒã‚¯ç”±æ¥ã®ç©ºç™½ãŒå…¥ã‚‹ã“ã¨ã‚’抑止
- ã—ãŸã„å ´åˆã¯ï¼Œæ¬¡ã®ã‚ˆã†ã«ä¸€æ—¦æ®µè½ã‚’開始ã—ã¦ã‹ã‚‰|\inhibitglue|を実行ã™ã‚‹å¿…è¦ãŒã‚る.
+ 段è½ãŒå’Œæ–‡æ–‡å­—「\verb|ã€|ã€ã§å§‹ã¾ã‚Šï¼Œãã®æ–‡å­—ã®ç›´å‰ã«ãƒ¡ãƒˆãƒªãƒƒã‚¯ç”±æ¥ã®ç©ºç™½ãŒå…¥ã‚‹ã“ã¨ã‚’抑止
+ ã—ãŸã„å ´åˆã¯ï¼Œæ¬¡ã®ã‚ˆã†ã«ä¸€æ—¦æ®µè½ã‚’開始ã—ã¦ã‹ã‚‰\.{inhibitglue}を実行ã™ã‚‹å¿…è¦ãŒã‚る.
\begin{verbatim}
\leavevmode\inhibitglue ã€
\end{verbatim}
@@ -1872,10 +1976,10 @@ so I use .notdef glyph instead.
\TeX~Live 2019ã®\pTeX~3.8.2以é™ã§ã¯ï¼Œæ˜Žç¢ºã«\emph{æ–°ãŸãªãƒŽãƒ¼ãƒ‰ãŒè¿½åŠ ã•ã‚Œãªã„é™ã‚Š},ã¨
定ã‚ãŸ\cite{tjb28,forum_2566}.ã™ãªã‚ã¡ï¼Œ
\begin{enumerate}
- \item |\inhibitglue|ã¯ï¼ŒãƒŽãƒ¼ãƒ‰æŒ¿å…¥å‡¦ç†ã‚’è¡Œã†å‘½ä»¤
+ \item \.{inhibitglue}ã¯ï¼ŒãƒŽãƒ¼ãƒ‰æŒ¿å…¥å‡¦ç†ã‚’è¡Œã†å‘½ä»¤
(|\null|,~|\hskip|, |\kern|, |\vrule|,~\dots)ãŒå¾Œã‚ã«æ¥ãŸå ´åˆã¯ç„¡åŠ¹åŒ–ã•ã‚Œã‚‹ï¼Ž
\item 一方,|\relax|やレジスタã¸ã®ä»£å…¥ãªã©ã®ãƒŽãƒ¼ãƒ‰ã‚’作らãªã„処ç†ã§ã¯ç„¡åŠ¹åŒ–ã•ã‚Œãªã„.
- \item |\inhibitglue|ã®åŠ¹æžœã¯åˆ¥ãƒ¬ãƒ™ãƒ«ã®ãƒªã‚¹ãƒˆã«ã¯æ³¢åŠã—ãªã„.
+ \item \.{inhibitglue}ã®åŠ¹æžœã¯åˆ¥ãƒ¬ãƒ™ãƒ«ã®ãƒªã‚¹ãƒˆã«ã¯æ³¢åŠã—ãªã„.
\end{enumerate}
\end{cslist}
\begin{dangerous}
@@ -1902,7 +2006,7 @@ so I use .notdef glyph instead.
\end{minipage}
\end{dangerous}
\begin{dangerous}
- p\LaTeX~2017-10-28以é™ã§ã¯ï¼Œ|\inhibitglue|ã®çŸ­ç¸®ã¨ã—ã¦|\<|ãŒæ¬¡ã®ã‚ˆã†ã«
+ p\LaTeX~2017-10-28以é™ã§ã¯ï¼Œ\.{inhibitglue}ã®çŸ­ç¸®ã¨ã—ã¦|\<|ãŒæ¬¡ã®ã‚ˆã†ã«
定義ã•ã‚Œã¦ã„る(|\protected|ã¯\eTeX æ‹¡å¼µã®æ©Ÿèƒ½ã ãŒï¼Œç¾åœ¨ã§ã¯\LaTeX 自体ãŒ
\eTeX 拡張をè¦æ±‚ã—ã¦ã„る).
\begin{verbatim}
@@ -1911,7 +2015,7 @@ so I use .notdef glyph instead.
\end{dangerous}
\begin{cslist}
\csitem[\.{disinhibitglue}]
- |\inhibitglue|ã®åŠ¹æžœã‚’無効化(ã¤ã¾ã‚Šï¼Œãƒ¡ãƒˆãƒªãƒƒã‚¯ç”±æ¥ã®ç©ºç™½ã®æŒ¿å…¥ã‚’許å¯ï¼‰ã™ã‚‹ï¼Ž
+ \.{inhibitglue}ã®åŠ¹æžœã‚’無効化(ã¤ã¾ã‚Šï¼Œãƒ¡ãƒˆãƒªãƒƒã‚¯ç”±æ¥ã®ç©ºç™½ã®æŒ¿å…¥ã‚’許å¯ï¼‰ã™ã‚‹ï¼Ž
\pTeX~3.8.2ã§æ–°ã—ã追加ã•ã‚ŒãŸï¼Ž
\end{cslist}
@@ -1955,7 +2059,7 @@ DtoUæ–¹å‘ã§ã®æ•°å¼ãƒ‡ã‚£ãƒ¬ã‚¯ã‚·ãƒ§ãƒ³ã¯ãã‚Œãžã‚Œéžæ•°å¼ã®å ´åˆã¨å
命令&|\yoko|&|\tate|&|\dtou|&---\\
å­—é€ã‚Šæ–¹å‘&æ°´å¹³å³å‘ã(→)&垂直下å‘ã(↓)&垂直上å‘ã(↑)&垂直下å‘ã(↓)\\
è¡Œé€ã‚Šæ–¹å‘&垂直下å‘ã(↓)&水平左å‘ã(â†ï¼‰&æ°´å¹³å³å‘ã(→)&水平左å‘ã(â†ï¼‰\\
-\parbox[t]{6zw}{使用ã™ã‚‹å’Œæ–‡ãƒ•ã‚©ãƒ³ãƒˆ}&横組用(|\jfont|)&縦組用(|\tfont|)&
+\parbox[t]{6zw}{使用ã™ã‚‹å’Œæ–‡ãƒ•ã‚©ãƒ³ãƒˆ}&横組用(\.{jfont})&縦組用(\.{tfont})&
\multicolumn{2}{c}{%
横組用(\texttt{\string\jfont})ã®$90^\circ$回転}\\[\smallskipamount]
組版例 &\obox{\yoko}&\obox{\tate}&\obox{\dtou}&\def\mathmode{$}\obox{\tate}\\
@@ -1964,10 +2068,8 @@ DtoUæ–¹å‘ã§ã®æ•°å¼ãƒ‡ã‚£ãƒ¬ã‚¯ã‚·ãƒ§ãƒ³ã¯ãã‚Œãžã‚Œéžæ•°å¼ã®å ´åˆã¨å
\end{tabular}
\end{table}
-
以下ãŒï¼Œçµ„æ–¹å‘ã®å¤‰æ›´ã‚„ç¾åœ¨ã®çµ„æ–¹å‘判定ã«é–¢ã‚るプリミティブã®ä¸€è¦§ã§ã‚る.
-% アスキー公å¼ã‚µã‚¤ãƒˆã®ãƒ—リミティブ一覧ã‹ã‚‰é©å½“ã«ã¾ã¨ã‚
\begin{cslist}
\csitem[\.{tate}, \.{yoko}, \.{dtou}]
組方å‘ã‚’ãã‚Œãžã‚Œç¸¦çµ„,横組,DtoUæ–¹å‘ã«å¤‰æ›´ã™ã‚‹ï¼Ž
@@ -2031,15 +2133,15 @@ DtoUæ–¹å‘ã§ã®æ•°å¼ãƒ‡ã‚£ãƒ¬ã‚¯ã‚·ãƒ§ãƒ³ã¯ãã‚Œãžã‚Œéžæ•°å¼ã®å ´åˆã¨å
\end{cslist}
\begin{dangerous}
|\discretionary|命令ã§ã¯
-|\discretionary|\texttt{\{<pre>\}\{<post>\}\{<nobreak>\}}ã¨3ã¤ã®å¼•æ•°ã‚’指
- 定ã™ã‚‹ãŒï¼Œã“ã®3引数ã®ä¸­ã§çµ„æ–¹å‘を変更ã™ã‚‹ã“ã¨ã¯ã§ããªã„(常ã«å‘¨å›²ã®çµ„æ–¹å‘ãŒä½¿ã‚れる).
+ |\discretionary|\code{\{<pre>\}\{<post>\}\{<nobreak>\}}ã¨3ã¤ã®å¼•æ•°ã‚’
+ 指定ã™ã‚‹ãŒï¼Œã“ã®3引数ã®ä¸­ã§çµ„æ–¹å‘を変更ã™ã‚‹ã“ã¨ã¯ã§ããªã„(常ã«å‘¨å›²ã®çµ„æ–¹å‘ãŒä½¿ã‚れる).
\end{dangerous}
\begin{cslist}
\csitem[\.{iftdir}, \.{ifydir}, \.{ifddir}, \.{ifmdir}]
- ç¾åœ¨ã®çµ„æ–¹å‘を判定ã™ã‚‹ï¼Ž|\iftdir|, |\ifydir|, |\ifddir|ã¯ãã‚Œãžã‚Œ
+ ç¾åœ¨ã®çµ„æ–¹å‘を判定ã™ã‚‹ï¼Ž\.{iftdir}, \.{ifydir}, \.{ifddir}ã¯ãã‚Œãžã‚Œ
縦組,横組,DtoUæ–¹å‘ã§ã‚ã‚‹ã‹ã©ã†ã‹ã‚’判定ã™ã‚‹ï¼ˆæ•°å¼ãƒ‡ã‚£ãƒ¬ã‚¯ã‚·ãƒ§ãƒ³ã§ã‚ã‚‹ã‹ã¯å•ã‚ãªã„).
- 一方,|\ifmdir|ã¯æ•°å¼ãƒ‡ã‚£ãƒ¬ã‚¯ã‚·ãƒ§ãƒ³ã§ã‚ã‚‹ã‹ã©ã†ã‹ã‚’判定ã™ã‚‹ï¼Ž
+ 一方,\.{ifmdir}ã¯æ•°å¼ãƒ‡ã‚£ãƒ¬ã‚¯ã‚·ãƒ§ãƒ³ã§ã‚ã‚‹ã‹ã©ã†ã‹ã‚’判定ã™ã‚‹ï¼Ž
従ã£ã¦ï¼Œ\autoref{tab-dir}ã«ç¤ºã—ãŸ4ã¤ã®çŠ¶æ³ã®ã©ã‚Œã«å±žã™ã‚‹ã‹ã¯ä»¥ä¸‹ã®ã‚ˆã†ã«ã—ã¦åˆ¤å®šã§ãã‚‹ã“ã¨ã«ãªã‚‹ï¼Ž
\begin{verbatim}
@@ -2063,7 +2165,7 @@ DtoUæ–¹å‘ã§ã®æ•°å¼ãƒ‡ã‚£ãƒ¬ã‚¯ã‚·ãƒ§ãƒ³ã¯ãã‚Œãžã‚Œéžæ•°å¼ã®å ´åˆã¨å
通常ã®ç¸¦çµ„ã§çµ„ã¾ã‚Œã¦ã„ã‚‹ã®ã‹ï¼Œãã‚Œã¨ã‚‚縦数å¼ãƒ‡ã‚£ãƒ¬ã‚¯ã‚·ãƒ§ãƒ³ã§çµ„ã¾ã‚Œã¦ã„ã‚‹ã®ã‹
ã¨ã„ã†æƒ…å ±ãŒå¤±ã‚ã‚Œã¦ã„ãŸï¼Žã—ã‹ã—,ãã‚Œã§ã¯å¾Œè¿°ã®ã€Œãƒ™ãƒ¼ã‚¹ãƒ©ã‚¤ãƒ³è£œæ­£ã®æˆ»ã—é‡ã€ã‚’
誤り,欧文ã®åž‚ç›´ä½ç½®ãŒæƒã‚ãªã„ã¨ã„ã†å•é¡ŒãŒç”Ÿã˜ãŸ\cite{tatemath}.
- ã“ã®å•é¡Œã‚’解決ã™ã‚‹å‰¯ç”£ç‰©ã¨ã—ã¦ï¼Œãƒãƒ¼ã‚¸ãƒ§ãƒ³p3.7.1ã§|\ifmbox|プリミティブãŒå®Ÿè£…ã•ã‚ŒãŸï¼Ž
+ ã“ã®å•é¡Œã‚’解決ã™ã‚‹å‰¯ç”£ç‰©ã¨ã—ã¦ï¼Œãƒãƒ¼ã‚¸ãƒ§ãƒ³p3.7.1ã§\.{ifmbox}プリミティブãŒå®Ÿè£…ã•ã‚ŒãŸï¼Ž
\end{cslist}
\subsection{ベースライン補正}
@@ -2079,9 +2181,9 @@ DtoUæ–¹å‘ã§ã®æ•°å¼ãƒ‡ã‚£ãƒ¬ã‚¯ã‚·ãƒ§ãƒ³ã¯ãã‚Œãžã‚Œéžæ•°å¼ã®å ´åˆã¨å
\csitem[\.{tbaselineshift}=<dimen>, \.{ybaselineshift}=<dimen>]
指定ã—ãŸç®‡æ‰€ä»¥é™ã®æ¬§æ–‡æ–‡å­—ã®ãƒ™ãƒ¼ã‚¹ãƒ©ã‚¤ãƒ³ã‚·ãƒ•ãƒˆé‡ã‚’æ ¼ç´ã™ã‚‹ï¼Žä¸¡è€…ã®ä½¿ã„分ã‘ã¯
\begin{description}
- \item[\texttt{\string\tbaselineshift}]
+ \item[\.{tbaselineshift}]
縦組用和文フォントãŒä½¿ã‚れるã¨ã(ã¤ã¾ã‚Šçµ„æ–¹å‘ãŒç¸¦çµ„ã®ã¨ã),
- \item[\texttt{\string\ybaselineshift}]
+ \item[\.{ybaselineshift}]
横組用和文フォントãŒä½¿ã‚れるã¨ã(横組,DtoUæ–¹å‘,縦数å¼ãƒ‡ã‚£ãƒ¬ã‚¯ã‚·ãƒ§ãƒ³ï¼‰
\end{description}
ã¨ãªã£ã¦ã„る.
@@ -2090,11 +2192,11 @@ DtoUæ–¹å‘ã§ã®æ•°å¼ãƒ‡ã‚£ãƒ¬ã‚¯ã‚·ãƒ§ãƒ³ã¯ãã‚Œãžã‚Œéžæ•°å¼ã®å ´åˆã¨å
\end{cslist}
\begin{dangerous}
- |disp_node|
+ \node{disp_node}%%% [TODO]
\end{dangerous}
欧文文字ã ã‘ã§ãªã,文中数å¼(|$...$|)もベースライン補正ã®å¯¾è±¡ã§ã‚る.
-文中数å¼ã¯å…¨ä½“ã«|\tbaselineshift|(もã—ãã¯|\ybaselineshift|)ã ã‘ã®
+文中数å¼ã¯å…¨ä½“ã«\.{tbaselineshift}(もã—ãã¯\.{ybaselineshift})ã ã‘ã®
ベースライン補正ãŒã‹ã‹ã‚‹ãŒï¼Œãã‚Œã ã‘ã§ã¯
\begin{quote}
æ•°å¼ä¸­ã®ãƒœãƒƒã‚¯ã‚¹ã®æ¬§æ–‡ã¯ï¼ˆæ–‡ä¸­æ•°å¼å…¨ä½“ã«ã‹ã‹ã‚‹åˆ†ã‚‚åˆã‚ã›ã¦ï¼‰
@@ -2120,7 +2222,7 @@ DtoUæ–¹å‘ã§ã®æ•°å¼ãƒ‡ã‚£ãƒ¬ã‚¯ã‚·ãƒ§ãƒ³ã¯ãã‚Œãžã‚Œéžæ•°å¼ã®å ´åˆã¨å
\TeX~Live 2015以å‰ã®å‹•ä½œã«æˆ»ã™ã«ã¯ï¼Œä¸Šè¨˜ã®3プリミティブã«å…¨ã¦0を指定ã™ã‚Œã°è‰¯ã„.
\begin{dangerous}
-|\scriptbaselineshiftfactor|を設定ã™ã‚‹ã¨ãã«ã¯ï¼Œ|\scriptstyle|下ã§è¿½åŠ ã™ã‚‹ãƒœãƒƒã‚¯ã‚¹å†…ã®
+\.{scriptbaselineshiftfactor}を設定ã™ã‚‹ã¨ãã«ã¯ï¼Œ|\scriptstyle|下ã§è¿½åŠ ã™ã‚‹ãƒœãƒƒã‚¯ã‚¹å†…ã®
ベースライン補正é‡ã‚’ã©ã†ã™ã‚‹ã‹ã‚’常ã«æ°—ã«ã—ãªã„ã¨ã„ã‘ãªã„.
例ãˆã°æ¬¡ã®ã‚³ãƒ¼ãƒ‰ã‚’考ãˆã‚‹ï¼š
\begin{verbatim}
@@ -2151,7 +2253,7 @@ DtoUæ–¹å‘ã§ã®æ•°å¼ãƒ‡ã‚£ãƒ¬ã‚¯ã‚·ãƒ§ãƒ³ã¯ãã‚Œãžã‚Œéžæ•°å¼ã®å ´åˆã¨å
ã ã‘上ã«ç§»å‹•ã™ã‚‹ã®ã§ï¼Œçµæžœã¨ã—ã¦ã€Œyã€ã¯æ·»å­—内ã«ç›´æ›¸ãã—ãŸã€Œ$b$ã€ã¨ä¸Šä¸‹ä½ç½®ãŒ
$10\,\mathrm{pt}-7\,\mathrm{pt}=3\,\mathrm{pt}$ã ã‘上ã«é…ç½®ã•ã‚Œã¦ã—ã¾ã£ã¦ã„る.
-ãªãŠï¼Œ|\scriptscriptbaselineshiftfactor|ã«ã¤ã„ã¦ã‚‚å…¨ãåŒæ§˜ã®æ³¨æ„ãŒå½“ã¦ã¯ã¾ã‚‹ï¼Ž
+ãªãŠï¼Œ\.{scriptscriptbaselineshiftfactor}ã«ã¤ã„ã¦ã‚‚å…¨ãåŒæ§˜ã®æ³¨æ„ãŒå½“ã¦ã¯ã¾ã‚‹ï¼Ž
\end{dangerous}
\section{ãã®ä»–ã®è£œåŠ©æ©Ÿèƒ½}
@@ -2164,8 +2266,10 @@ $10\,\mathrm{pt}-7\,\mathrm{pt}=3\,\mathrm{pt}$ã ã‘上ã«é…ç½®ã•ã‚Œã¦ã—ã¾
ç•°ãªã‚‹ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰é–“ã§ã‚‚åŒã˜æ–‡å­—を数値ã§ç›´æŽ¥è¡¨ç¾ã§ãるよã†ã«ï¼Œ
文字コード変æ›ã‚’è¡Œã†ãƒ—リミティブãŒç”¨æ„ã•ã‚Œã¦ã„る.
ã¾ãŸï¼Œæ¼¢æ•°å­—を出力ã™ã‚‹ãƒ—リミティブも用æ„ã•ã‚Œã¦ã„ã‚‹\footnote{%
-実ã¯|\kansuji|, |\kansujichar|プリミティブã¯p3.1.1ã§ã„ã£ãŸã‚“削除ã•ã‚Œï¼Œ
+実ã¯\.{kansuji}, \.{kansujichar}プリミティブã¯p3.1.1ã§ã„ã£ãŸã‚“削除ã•ã‚Œï¼Œ
p3.1.2ã§å¾©æ´»ã—ãŸã¨ã„ã†çµŒç·¯ãŒã‚る.}.
+ã“れらã®ãƒ—リミティブも\code{ptexenc}を使用ã—ã¦ã„ã‚‹ã®ã§ï¼Œ
+Unicodeã¨ãƒ¬ã‚¬ã‚·ãƒ¼ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ã®é–“ã®å¤‰æ›ã§ã¯è¡¨\ref{table:jis_uni_var}ã«å¾“ã†ï¼Ž
% jtexdoc.tex ã®ã€Œè¿½åŠ ã•ã‚ŒãŸãƒ—リミティブã€ã‚’簡略化
\begin{cslist}
@@ -2190,10 +2294,14 @@ p3.1.2ã§å¾©æ´»ã—ãŸã¨ã„ã†çµŒç·¯ãŒã‚る.}.
内部コードã‹ã‚‰JISコードã¸ã®å¤‰æ›ã‚’è¡Œã†ï¼Ž\pTeX~4.1.0ã§è¿½åŠ ã—ãŸï¼Ž
\end{cslist}
+文字コードã¨ã—ã¦ä¸æ­£ãªå€¤ã‚’与ãˆã¦ã‚‚
+``\verb|! Bad character code (...).|''エラーã¯ç™ºç”Ÿã—ãªã„(下記å‚照).
+ãªãŠï¼ŒJISコード,EUCコード,Shift-JISコードã«ã¤ã„ã¦æ‰±ãˆã‚‹ã®ã¯
+JIS~X~0208ã®ç¯„囲ã«é™ã‚‰ã‚Œã‚‹ï¼ˆ\ref{sec:ptexchar}節ã§ã‚‚è¿°ã¹ãŸé€šã‚Šï¼Ž
+ã™ãªã‚ã¡JIS~X~0213ã«ã¯éžå¯¾å¿œï¼‰ï¼Ž
+
\begin{dangerous}
- \ref{sec:ptexchar}節ã§ã‚‚è¿°ã¹ãŸã‚ˆã†ã«ï¼Œ
- \emph{\pTeX ã¯JIS~X~0213ã«ã¯å¯¾å¿œã›ãšï¼ŒJIS~X~0208ã®ç¯„囲ã®ã¿æ‰±ãˆã‚‹}.
- ãªãŠï¼Œ\pTeX~3.9.1以å‰ã§ã¯ï¼Œä¸æ­£ãªæ–‡å­—コードを与ãˆãŸã¨ãã®æŒ™å‹•ãŒ
+ \pTeX~3.9.1以å‰ã§ã¯ï¼Œä¸æ­£ãªæ–‡å­—コードを与ãˆãŸã¨ãã®æŒ™å‹•ãŒ
ä¸çµ±ä¸€ã§ï¼Œç‰¹ã«ä»¥ä¸‹ã®å€¤ã‚’è¿”ã™ã‚±ãƒ¼ã‚¹ã‚‚ã‚ã£ãŸï¼š
\begin{itemize}
\item 区点コード表ã®JIS~X~0208ã«ãŠã‘る最åˆã®æœªå®šç¾©ä½ç½®
@@ -2207,8 +2315,9 @@ p3.1.2ã§å¾©æ´»ã—ãŸã¨ã„ã†çµŒç·¯ãŒã‚る.}.
\item $-1$…文字コードã¨ã—ã¦ç„¡åŠ¹ï¼Ž
% 発生状æ³ï¼šKUTENtoJIS(ä¸æ­£)→JIStoEUC(-1)
\end{itemize}
- \pTeX~3.10.0ã§ã¯\.{ucs}ã¨\.{toucs}を追加ã—,ã•ã‚‰ã«ä¸æ­£ãªæ–‡å­—コードを
- 容易ã«åˆ¤åˆ¥ã§ãるよã†ã«ä»¥ä¸‹ã®ä»•æ§˜ã«ã—ãŸï¼š
+ \pTeX~3.10.0以é™ã§ã¯ï¼Œ% \.{ucs}ã¨\.{toucs}を追加ã—ãŸã¨åŒæ™‚ã«ï¼Œ
+ ä¸æ­£ãªæ–‡å­—コードを容易ã«åˆ¤åˆ¥ã§ãるよã†ã«ä»¥ä¸‹ã®ä»•æ§˜ã«ã—ãŸï¼š
+ % ã“ã‚Œã¯\pTeX~4.1.0ã§è¿½åŠ ã—ãŸ\.{tojis}ã‚‚åŒæ§˜ã§ã‚る.
\begin{itemize}
\item 文字コード変æ›ãŒ\emph{ä¸è¦}ãªã‚±ãƒ¼ã‚¹\footnote{内部eucã«ãŠã‘ã‚‹\.{euc},
内部sjisã«ãŠã‘ã‚‹\.{sjis},ãŠã‚ˆã³\upTeX ã§å†…部uptexã«ãŠã‘ã‚‹\.{ucs}ã¨
@@ -2217,7 +2326,6 @@ p3.1.2ã§å¾©æ´»ã—ãŸã¨ã„ã†çµŒç·¯ãŒã‚る.}.
\item 文字コード変æ›ãŒ\emph{å¿…è¦}ãªã‚±ãƒ¼ã‚¹â€¦
ä¸æ­£ãªæ–‡å­—コードを与ãˆã‚‹ã¨$-1$ã‚’è¿”ã™ï¼Žï¼ˆè¿”り値を統一)
\end{itemize}
- ã“ã‚Œã¯\pTeX~4.1.0ã§è¿½åŠ ã—ãŸ\.{tojis}ã‚‚åŒæ§˜ã§ã‚る.
%%%
%
% pTeX-3.10.0 ã§ã®å®Ÿè£…メモ (2021-06-29 @aminophen)
@@ -2239,8 +2347,8 @@ p3.1.2ã§å¾©æ´»ã—ãŸã¨ã„ã†çµŒç·¯ãŒã‚る.}.
\begin{cslist}
\csitem[\.{kansuji} <number>, \.{kansujichar} <0--9>=<kanji code>]
- |\kansuji|ã¯ï¼Œç¶šã数値<number>を漢数字ã®æ–‡å­—列ã§å‡ºåŠ›ã™ã‚‹ï¼Ž
- 出力ã•ã‚Œã‚‹æ–‡å­—ã¯|\kansujichar|ã§æŒ‡å®šã§ãる(デフォルトã¯ã€Œã€‡ä¸€äºŒä¸‰å››äº”六七八ä¹ã€ï¼‰ï¼Ž
+ \.{kansuji}ã¯ï¼Œç¶šã数値<number>を漢数字ã®æ–‡å­—列ã§å‡ºåŠ›ã™ã‚‹ï¼Ž
+ 出力ã•ã‚Œã‚‹æ–‡å­—ã¯\.{kansujichar}ã§æŒ‡å®šã§ãる(デフォルトã¯ã€Œã€‡ä¸€äºŒä¸‰å››äº”六七八ä¹ã€ï¼‰ï¼Ž
ãŸã¨ãˆã°
\begin{verbatim}
\kansuji 1978å¹´
@@ -2254,34 +2362,36 @@ p3.1.2ã§å¾©æ´»ã—ãŸã¨ã„ã†çµŒç·¯ãŒã‚る.}.
\end{verbatim}
ã¯ã€Œ{\kansujichar1=`壱 \kansujichar2=\euc"C6F5\relax
\kansujichar3=\jis"3B32\relax \kansuji 1234}ã€ã¨å‡ºåŠ›ã•ã‚Œã‚‹ï¼Ž
- ãªãŠï¼Œ|\kansuji|ã«ç¶šã数値<number>ãŒè² ã®å ´åˆã¯ï¼Œç©ºæ–‡å­—列ã«ãªã‚‹
- (ã¡ã‚‡ã†ã©|\romannumeral|ã«ã‚¼ãƒ­ã¾ãŸã¯è² ã®å€¤ã‚’与ãˆãŸå ´åˆã¨åŒæ§˜ï¼‰ï¼Ž
+ ãªãŠï¼Œ\.{kansuji}ã«ç¶šã数値<number>ãŒè² ã®å ´åˆã¯ï¼Œç©ºæ–‡å­—列ã«ãªã‚‹
+ (ã¡ã‚‡ã†ã©\.{romannumeral}ã«ã‚¼ãƒ­ã¾ãŸã¯è² ã®å€¤ã‚’与ãˆãŸå ´åˆã¨åŒæ§˜ï¼‰ï¼Ž
+\end{cslist}
- |\kansujichar|ã§æŒ‡å®šã§ãã‚‹ã®ã¯ã€Œå’Œæ–‡æ–‡å­—ã®å†…部コードã¨ã—ã¦æœ‰åŠ¹ãªå€¤ã€ã§ã‚り,
+\begin{dangerous}
+ \.{kansujichar}ã§æŒ‡å®šã§ãã‚‹ã®ã¯ã€Œå’Œæ–‡æ–‡å­—ã®å†…部コードã¨ã—ã¦æœ‰åŠ¹ãªå€¤ã€ã§ã‚り,
例ãˆã°\pTeX ã§|\kansujichar1=`A|ã®ã‚ˆã†ã«ç„¡åŠ¹ãªå€¤ï¼ˆ\pTeX ã«ãŠã„ã¦|`A|ã¯
欧文文字コードã§ã‚り,和文文字コードã§ã¯ãªã„)を指定ã™ã‚‹ã¨
\begin{verbatim}
! Invalid KANSUJI char ("41).
\end{verbatim}
- ã¨ã„ã†ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã™ã‚‹\footnote{\upTeX ã§ã¯0--127ã‚‚å«ã‚,
+ ã¨ã„ã†ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã™ã‚‹\footnote{内部Unicodeã®\upTeX ã§ã¯0--127ã‚‚å«ã‚,
Unicodeã®æ–‡å­—コードã™ã¹ã¦ãŒå’Œæ–‡æ–‡å­—コードã¨ã—ã¦æœ‰åŠ¹ã§ã‚ã‚Š
- (|\kchar|ã§ä»»æ„ã®æ–‡å­—コードを和文文字ノードã«å¤‰æ›ã—ã¦å‡ºåŠ›ã§ãる),
+ (\.{kchar}ã§ä»»æ„ã®æ–‡å­—コードを和文文字ノードã«å¤‰æ›ã—ã¦å‡ºåŠ›ã§ãる),
基本的ã«ã“ã®ã‚¨ãƒ©ãƒ¼ã¯ç™ºç”Ÿã—ãªã„.}.
- ã¾ãŸï¼Œ|\kansujichar|ã®å¼•æ•°ã«è¨±ã•ã‚Œã‚‹å€¤ã¯0--9ã«é™ã‚‰ã‚Œï¼Œ
+ ã¾ãŸï¼Œ\.{kansujichar}ã®å¼•æ•°ã«è¨±ã•ã‚Œã‚‹å€¤ã¯0--9ã«é™ã‚‰ã‚Œï¼Œ
例ãˆã°|\kansujichar10=`拾|ã¨ã™ã‚‹ã¨
\begin{verbatim}
! Invalid KANSUJI number (10).
\end{verbatim}
ã¨ã„ã†ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã™ã‚‹ï¼Ž
- % エラーã‹ã‚‰ã®ãƒªã‚«ãƒãƒªã§ï¼Œä»–ã® TeX82 プリミティブãŒ
+ % エラーã‹ã‚‰ã®ãƒªã‚«ãƒãƒªã§ï¼Œä»–ã®\TeX82プリミティブãŒ
% I changed this one to zero.
% ã¨ã™ã‚‹ã®ã«å¯¾ã—,\kansujichar ã§ã¯
% I'm skipping this control sequences.
% ã¨ã‚¹ã‚­ãƒƒãƒ—ã•ã‚Œï¼Œå€¤ã®ä»£å…¥ã¯è¡Œã‚ã‚Œãªã„.
-\end{cslist}
+\end{dangerous}
\begin{dangerous}
- |\kansujichar|ã¯æ•´æ•°å€¤ãƒ‘ラメータã§ã‚ã‚‹ãŒï¼Œp3.8.2ã¾ã§ã¯
+ \.{kansujichar}ã¯æ•´æ•°å€¤ãƒ‘ラメータã§ã‚ã‚‹ãŒï¼Œp3.8.2ã¾ã§ã¯
「代入ã§ãã‚‹ãŒå–å¾—ã¯ã§ããªã„ã€ã¨ã„ã†æŒ™å‹•ã§ã‚ã£ãŸ
(例ãˆã°|\count255=\kansujichar1|ã¯ã‚¨ãƒ©ãƒ¼ï¼‰ï¼Ž
\pTeX~3.8.3ã§å–å¾—ã‚‚ã§ãるよã†ã«ä¿®æ­£ã•ã‚ŒãŸ\cite{tjb93}ãŒï¼Œ
@@ -2293,12 +2403,15 @@ p3.1.2ã§å¾©æ´»ã—ãŸã¨ã„ã†çµŒç·¯ãŒã‚る.}.
% ã“れ㯠\kansujichar ã®ä»£å…¥æ™‚ã®æŒ™å‹•ã«åˆã‚ã›ãŸã‚‚ã®ã§ã‚る.
\end{dangerous}
-% luatexja.dtx より pTeX 用ã«ç§»æ¤
\begin{dangerous}
- 以上ã«æŒ™ã’ãŸãƒ—リミティブ(|\kuten|, |\jis|, |\euc|, |\sjis|, |\ucs|,
- |\toucs|, |\kansuji|)ã¯å±•é–‹å¯èƒ½(expandable)ã§ã‚り,
+ 以上ã®ãƒ—リミティブ(\.{kansujichar}を除ãã™ã¹ã¦ï¼‰ã¯
+ 展開å¯èƒ½(expandable)ã§ã‚り,
内部整数を引数ã«ã¨ã‚‹ãŒï¼Œå®Ÿè¡Œçµæžœã¯\emph{文字列}ã§ã‚ã‚‹ã“ã¨ã«æ³¨æ„
- (\TeX82ã®|\number|, |\romannumeral|ã¨åŒæ§˜ï¼‰ï¼Ž
+ (\TeX82ã®\.{number}, \.{romannumeral}ã¨åŒæ§˜ï¼‰ï¼Ž
+ 以下ã®ä¾‹ã¯å†…部コード
+ \ifnum\jis"2121="3000 Unicode\else
+ \ifnum\jis"2121="A1A1 EUC-JP\else
+ \ifnum\jis"2121="8140 Shift-JIS\else\ptErr{Check here}\fi\fi\fi ã®å ´åˆï¼Ž
\medskip\noindent
\begin{minipage}{.6\linewidth}
@@ -2318,13 +2431,26 @@ p3.1.2ã§å¾©æ´»ã—ãŸã¨ã„ã†çµŒç·¯ãŒã‚る.}.
\kansuji1701
\end{minipage}\medskip
- 以上ã®æŒ™å‹•ã‹ã‚‰ï¼Œ|\kansuji|ã‚’
+\begin{itemize}
+ \item \.{kuten}, \.{jis}, \.{euc}, \.{sjis}, \.{ucs}, \.{toucs}, \.{tojis}
+ → 変æ›çµæžœã‚’カテゴリーコード12ã®æ¬§æ–‡æ–‡å­—トークン列ã§è¿”ã™ï¼Ž
+ \item \.{kansuji}
+ → 変æ›çµæžœã‚’和文文字トークン列ã§è¿”ã™\footnote{例外的ã«ï¼Œ
+ 内部Unicodeã®\upTeX ã§0--127ã®æ–‡å­—コードを\.{kansujichar}ã§æŒ‡å®šã—ãŸ
+ å ´åˆã®ã¿ï¼Œ\.{kansuji}ã§ç”Ÿæˆã•ã‚Œã‚‹ãƒˆãƒ¼ã‚¯ãƒ³ã¯ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰12ã®
+ 欧文文字トークンã«ãªã‚‹\cite{tjb36}.
+ % 文字コードãŒ0--127ã®å’Œæ–‡æ–‡å­—トークンã¯å­˜åœ¨ã—ãªã„,ã¨ã„ã†ä¸€è²«æ€§ï¼Ž
+ % \.{kchar}ãŒå’Œæ–‡æ–‡å­—トークンを経ãšã«ç›´æŽ¥å’Œæ–‡æ–‡å­—ノードã«ãªã‚‹ã®ã¨ã¯ç•°ãªã‚‹ï¼Ž
+ ã¾ãŸï¼Œ\upTeX ã§ã¯ç”Ÿæˆã™ã‚‹å’Œæ–‡æ–‡å­—トークンã«
+ ãã®æ™‚点ã§ã®å’Œæ–‡ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ãŒä¸Žãˆã‚‰ã‚Œã‚‹ãŒï¼Œ
+ ã‚‚ã—\.{kcatcode}ãŒ15ãªã‚‰ã°18扱ã„ã«ãªã‚‹ï¼ˆ\.{forcecjktoken}ã¨åŒæ§˜ï¼‰ï¼Ž}.
+\end{itemize}
+
+ \medskip
+ 以上ã®æŒ™å‹•ã‹ã‚‰ï¼Œ\.{kansuji}ã‚’
「整数値をãã®ç¬¦å·å€¤ã‚’ã‚‚ã¤å’Œæ–‡æ–‡å­—トークンã«å¤‰æ›ã™ã‚‹ã€ã¨ã„ã†ç›®çš„ã«
- 用ã„ã‚‹ã“ã¨ã‚‚ã§ã\footnote{ãŸã ã—,\upTeX ã§
- 0--127ã®æ–‡å­—コードを|\kansujichar|ã§æŒ‡å®šã—ãŸå ´åˆã®ã¿ï¼Œ
- |\kansuji|ã§ç”Ÿæˆã•ã‚Œã‚‹ãƒˆãƒ¼ã‚¯ãƒ³ã¯ã‚«ãƒ†ã‚´ãƒªãƒ¼ã‚³ãƒ¼ãƒ‰12ã®
- 欧文文字トークンã«ãªã‚‹\cite{tjb36}.},
- ã“ã‚Œã¯æ™‚ã«â€œ|\kansuji|トリックâ€ã¨å‘¼ã°ã‚Œã‚‹ï¼Žä¾‹ãˆã°
+ 用ã„ã‚‹ã“ã¨ã‚‚ã§ã,
+ ã“ã‚Œã¯æ™‚ã«â€œ\.{kansuji}トリックâ€ã¨å‘¼ã°ã‚Œã‚‹ï¼Žä¾‹ãˆã°
\begin{verbatim}
\kansujichar1=\jis"2422 \edef\X{\kansuji1}
\end{verbatim}
@@ -2366,7 +2492,7 @@ p3.1.2ã§å¾©æ´»ã—ãŸã¨ã„ã†çµŒç·¯ãŒã‚る.}.
ã™ãªã‚ã¡æ­£æ–¹å½¢ã®ãƒœãƒ‡ã‚£ã«åŽã¾ã‚‹ã‚ˆã†ã«ãƒ‡ã‚¶ã‚¤ãƒ³ã•ã‚Œã¦ã„ã‚‹ã‹ã‚‰ï¼Œã“ã‚Œã¨åˆè‡´ã—ãªã„.
ã—ãŸãŒã£ã¦ï¼Œå˜ä½\texttt{zh}ã¯ã‚ã¾ã‚Šæ„味ã®ã‚る値ã¨ã¯ã„ãˆãªã„.
- ãªãŠï¼Œjapanese-otf(OTFパッケージ)ãŒç”¨ã„ã¦ã„るフォントメトリックã¯
+ ãªãŠï¼Œ\Pkg{japanese-otf}(OTFパッケージ)ãŒç”¨ã„ã¦ã„るフォントメトリックã¯
$1\,\mathrm{zw}=1\,\mathrm{zh}$ã§ã‚る.
\end{dangerous}
@@ -2382,8 +2508,8 @@ p3.1.2ã§å¾©æ´»ã—ãŸã¨ã„ã†çµŒç·¯ãŒã‚る.}.
\begin{cslist}
\csitem[\.{ptexversion}, \.{ptexminorversion}, \.{ptexrevision}]
\pTeX ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ã¯p$x{.}y{.}z$ã®å½¢å¼ã¨ãªã£ã¦ãŠã‚Šï¼Œãれらをå–å¾—ã™ã‚‹ãŸã‚ã®å‘½ä»¤ã§ã‚る.
- |\ptexversion|, |\ptexminorversion|ã¯
- ãã‚Œãžã‚Œ$x$,~$y$ã®å€¤ã‚’内部整数ã§è¿”ã—,|\ptexrevision|ã¯ãã®å¾Œã‚ã®ã€Œ${.}z$ã€ã‚’文字列ã§è¿”ã™ï¼Ž
+ \.{ptexversion}, \.{ptexminorversion}ã¯
+ ãã‚Œãžã‚Œ$x$,~$y$ã®å€¤ã‚’内部整数ã§è¿”ã—,\.{ptexrevision}ã¯ãã®å¾Œã‚ã®ã€Œ${.}z$ã€ã‚’文字列ã§è¿”ã™ï¼Ž
従ã£ã¦ï¼Œå…¨éƒ¨åˆã‚ã›ãŸ\pTeX ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ã¯
\begin{verbatim}
\number\ptexversion.\number\ptexminorversion\ptexrevision
@@ -2392,7 +2518,7 @@ p3.1.2ã§å¾©æ´»ã—ãŸã¨ã„ã†çµŒç·¯ãŒã‚る.}.
\end{cslist}
ã“ã®è¿½åŠ ã¨åŒæ™‚ã«ï¼Œ(\eTeXpre)\upTeX ã§ã¯ä»¥ä¸‹ãŒè¿½åŠ ã•ã‚Œã¦ã„る.
\begin{cslist}
- \csitem[\.{uptexversion}, \.{uptexrevision}]
+ \csitem[\.{uptexversion}, \.{uptexrevision}(\emph{\upTeX ã®ã¿})]
\upTeX ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ã¯u$x{.}y$ã®å½¢å¼ã¨ãªã£ã¦ãŠã‚Šï¼Œ
ãれらをå–å¾—ã™ã‚‹ãŸã‚ã®å‘½ä»¤ã§ã‚る.
\.{uptexversion}ã¯$x$ã®å€¤ã‚’内部整数ã§è¿”ã—,
@@ -2414,7 +2540,7 @@ p3.1.2ã§å¾©æ´»ã—ãŸã¨ã„ã†çµŒç·¯ãŒã‚る.}.
\ifx\epTeXversion\undefined\else -\the\epTeXversion
-\the\eTeXversion\eTeXrevision\fi}
\end{quote}
-ã¨ãªã‚‹ï¼Ž
+ã¨ãªã‚‹ï¼Žæœ€å¾Œã®ã€Œ-\the\eTeXversion\eTeXrevisionã€ã¯\eTeX ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ã§ã‚る.
\newpage
@@ -2437,9 +2563,9 @@ p3.1.2ã§å¾©æ´»ã—ãŸã¨ã„ã†çµŒç·¯ãŒã‚る.}.
\end{quote}
é•åã™ã‚‹ã¨
\begin{verbatim}
-! Bad character code (42146).
+! Bad character code (...).
\end{verbatim}
-ã¨ã„ã†ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã™ã‚‹ï¼Ž
+ã¨ã„ã†ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã™ã‚‹ï¼ˆ|...|ã¯ãã®æ–‡å­—コード).
\begin{dangerous}
以å‰ã®\pTeX ã§ã¯ï¼Œ
ã“れらã®å‘½ä»¤ã®æ–‡å­—コード部分ã«å’Œæ–‡æ–‡å­—ã®å†…部コードを指定ã™ã‚‹ã“ã¨ã‚‚ã§ã,
@@ -2473,7 +2599,7 @@ p3.1.2ã§å¾©æ´»ã—ãŸã¨ã„ã†çµŒç·¯ãŒã‚る.}.
和文文字ã®å†…部コードを指定ã—ãŸå ´åˆã¯å’Œæ–‡æ–‡å­—を出力ã™ã‚‹ï¼Ž
\csitem[\.{font}, \.{fontname}, \.{fontdimen}]
- |\font|ã«ã¤ã„ã¦ã¯\ref{sec:jfont}節をå‚照.
+ \.{tfont}ã«ã¤ã„ã¦ã¯\ref{sec:jfont}節をå‚照.
|\fontname|ã¯å’Œæ–‡ãƒ•ã‚©ãƒ³ãƒˆã‹ã‚‰ã‚‚フォントåã‚’å–å¾—ã§ã,
|\fontdimen|ã¯å’Œæ–‡ãƒ•ã‚©ãƒ³ãƒˆã®ãƒ‘ラメータ表(JFMã§å®šç¾©ã•ã‚Œã‚‹\node{param}テーブル)ã‹ã‚‰ã‚‚
値をå–å¾—ã§ãる.
@@ -2490,21 +2616,21 @@ p3.1.2ã§å¾©æ´»ã—ãŸã¨ã„ã†çµŒç·¯ãŒã‚る.}.
特ã«æ„味をæŒãŸãªã„\footnote{欧文フォントã§ã¯x-heightã§ã‚る.}ãŸã‚ã§ã‚る.
\item 和文文字ã«ã‚¢ã‚¯ã‚»ãƒ³ãƒˆã‚’ã¤ã‘ãŸå ´åˆï¼Œ
\begin{itemize}
- \item å‰å´ã«ã¯JFMグルーや|\kanjiskip|ã¯æŒ¿å…¥ã•ã‚Œãªã„
- (ãŸã ã—|\xkanjiskip|ã¯æŒ¿å…¥ã•ã‚Œã†ã‚‹ï¼‰ï¼Ž
+ \item å‰å´ã«ã¯JFMグルーや\.{kanjiskip}ã¯æŒ¿å…¥ã•ã‚Œãªã„
+ (ãŸã ã—\.{xkanjiskip}ã¯æŒ¿å…¥ã•ã‚Œã†ã‚‹ï¼‰ï¼Ž
\item 後å´ã«ã¯JFMグルーã¯æŒ¿å…¥ã•ã‚Œãªã„
- (ãŸã ã—|\kanjiskip|, |\xkanjiskip|ã¯æŒ¿å…¥ã•ã‚Œã†ã‚‹ï¼‰ï¼Ž
+ (ãŸã ã—\.{kanjiskip}, \.{xkanjiskip}ã¯æŒ¿å…¥ã•ã‚Œã†ã‚‹ï¼‰ï¼Ž
\end{itemize}
\end{itemize}
\csitem[\.{if} <token$_1$> <token$_2$>, \.{ifcat} <token$_1$> <token$_2$>]
- 文字トークンを指定ã™ã‚‹å ´åˆï¼Œãã®æ–‡å­—コードã¯\TeX82ã§ã¯0--255ã®ã¿ãŒè¨±ã•ã‚Œã‚‹ãŒï¼Œ
+ 文字トークンを指定ã™ã‚‹å ´åˆï¼Œãã®æ–‡å­—コードã¯ã‚ªãƒªã‚¸ãƒŠãƒ«ã®\TeX ã§ã¯0--255ã®ã¿ãŒè¨±ã•ã‚Œã‚‹ãŒï¼Œ
\pTeX ã§ã¯å’Œæ–‡æ–‡å­—トークンも指定ã™ã‚‹ã“ã¨ãŒã§ãる.
- |\if|ã«ã‚ˆã‚‹åˆ¤å®šã§ã¯ï¼Œæ¬§æ–‡æ–‡å­—トークン・和文文字トークンã¨ã‚‚ã«
+ \.{if}ã«ã‚ˆã‚‹åˆ¤å®šã§ã¯ï¼Œæ¬§æ–‡æ–‡å­—トークン・和文文字トークンã¨ã‚‚ã«
ãã®æ–‡å­—コードãŒæ¯”較ã•ã‚Œã‚‹ï¼Ž
- |\ifcat|ã«ã‚ˆã‚‹åˆ¤å®šã§ã¯ï¼Œæ¬§æ–‡æ–‡å­—トークンã«ã¤ã„ã¦ã¯|\catcode|,
- 和文文字トークンã«ã¤ã„ã¦ã¯|\kcatcode|ãŒæ¯”較ã•ã‚Œã‚‹ï¼Ž
+ \.{ifcat}ã«ã‚ˆã‚‹åˆ¤å®šã§ã¯ï¼Œæ¬§æ–‡æ–‡å­—トークンã«ã¤ã„ã¦ã¯\.{catcode},
+ 和文文字トークンã«ã¤ã„ã¦ã¯\.{kcatcode}ãŒæ¯”較ã•ã‚Œã‚‹ï¼Ž
% [TODO] TeX Live 2018 ã® upTeX ã§ã¯ï¼Œ
% ^^ab å½¢å¼ã§ã®æ–‡å­—コード指定ã¯æ¬§æ–‡æ‰±ã„ã•ã‚Œã‚‹ã®ã§ï¼Œ
% \ifcat 判定ã§ã¯ \catcode ãŒèª­ã¿å‡ºã•ã‚Œã‚‹ï¼Ž
@@ -2514,7 +2640,7 @@ p3.1.2ã§å¾©æ´»ã—ãŸã¨ã„ã†çµŒç·¯ãŒã‚る.}.
\end{cslist}
\begin{dangerous}
-\TeX bookã«ã¯ï¼Œã‚ªãƒªã‚¸ãƒŠãƒ«ã®\TeX ã«ãŠã‘ã‚‹|\if|ã¨|\ifcat|ã®èª¬æ˜Žã¨ã—ã¦
+\TeX bookã«ã¯ï¼Œã‚ªãƒªã‚¸ãƒŠãƒ«ã®\TeX ã«ãŠã‘ã‚‹\.{if}ã¨\.{ifcat}ã®èª¬æ˜Žã¨ã—ã¦
\begin{quote}
If either token is a control sequence,
\TeX\ considers it to have character code 256 and category code 16,
@@ -2523,16 +2649,16 @@ has been |\let| equal to a non-active character token.
\end{quote}
ã¨ã‚る.ã™ãªã‚ã¡
\begin{quote}
-|\if|ã‚„|\ifcat|ã®åˆ¤å®šã§ã¯ï¼ˆå®Ÿè£…ã®ä¾¿å®œä¸Šï¼‰
+\.{if}ã‚„\.{ifcat}ã®åˆ¤å®šã§ã¯ï¼ˆå®Ÿè£…ã®ä¾¿å®œä¸Šï¼‰
コントロールシークエンスã¯æ–‡å­—コード256,
カテゴリーコード16ã‚’æŒã¤ã¨ã¿ãªã•ã‚Œã‚‹
\end{quote}
ã¨ã„ã†ã®ã§ã‚る.ã¨ã“ã‚ãŒï¼Œtex.webã®å®Ÿè£…ã¯ã“ã®é€šã‚Šã§ãªã,
コントロールシークエンスをカテゴリーコード0ã¨ã¿ãªã—ã¦ã„る.
-ãã®ãŸã‚,\pTeX 系列ã«ãŠã„ã¦å’Œæ–‡æ–‡å­—トークンã®|\kcatcode|ã®å€¤ãŒ
-16ã§ã‚ã‚‹å ´åˆã‚‚,|\ifcat|判定ã§ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã‚·ãƒ¼ã‚¯ã‚¨ãƒ³ã‚¹ã¨æ··åŒã•ã‚Œã‚‹ã“ã¨ã¯ãªã„.
+ãã®ãŸã‚,\pTeX 系列ã«ãŠã„ã¦å’Œæ–‡æ–‡å­—トークンã®\.{kcatcode}ã®å€¤ãŒ
+16ã§ã‚ã‚‹å ´åˆã‚‚,\.{ifcat}判定ã§ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã‚·ãƒ¼ã‚¯ã‚¨ãƒ³ã‚¹ã¨æ··åŒã•ã‚Œã‚‹ã“ã¨ã¯ãªã„.
-一方,文字コードã«ã¤ã„ã¦ã¯ï¼Œç¢ºã‹ã«tex.webã¯|\if|判定ã«ãŠã„ã¦
+一方,文字コードã«ã¤ã„ã¦ã¯ï¼Œç¢ºã‹ã«tex.webã¯\.{if}判定ã«ãŠã„ã¦
コントロールシークエンスを256ã¨ã¿ãªã—ã¦ã„る.ã—ã‹ã—,\upTeX ã§ã¯
文字コード256ã®å’Œæ–‡æ–‡å­—ã¨è¡çªã™ã‚‹ã®ã§ï¼Œ2019-05-06ã®ã‚³ãƒŸãƒƒãƒˆ(r51021)ã§
「原ç†çš„ã«æ–‡å­—コードãŒå–ã‚Šå¾—ãªã„値ã€ã«å¤‰æ›´ã—ãŸ\cite{tjb68}.
@@ -2582,7 +2708,7 @@ has been |\let| equal to a non-active character token.
\bibitem{tatemath} aminophen, 「縦数å¼ãƒ‡ã‚£ãƒ¬ã‚¯ã‚·ãƒ§ãƒ³ã¨ãƒ™ãƒ¼ã‚¹ãƒ©ã‚¤ãƒ³è£œæ­£ã€ï¼Œ
2016/09/05,\\
\url{https://github.com/texjporg/platex/issues/22}
- \bibitem{tjb26} h-kitagawa, 「ç¦å‰‡ãƒ†ãƒ¼ãƒ–ル,|\inhibitxspcode| 情報テーブルã‹ã‚‰ã®ã‚¨ãƒ³ãƒˆãƒªå‰Šé™¤ã€ï¼Œ
+ \bibitem{tjb26} h-kitagawa, 「ç¦å‰‡ãƒ†ãƒ¼ãƒ–ル,\.{inhibitxspcode}情報テーブルã‹ã‚‰ã®ã‚¨ãƒ³ãƒˆãƒªå‰Šé™¤ã€ï¼Œ
2017/09/10,\\
\url{https://github.com/texjporg/tex-jp-build/pull/26}
\bibitem{tjb57} Man-Ting-Fang, \textit{[upTeX] Unexpected behaviour in kinsoku processing},
@@ -2591,13 +2717,13 @@ has been |\let| equal to a non-active character token.
\bibitem{tjb11} aminophen, 「pTeX ã®å¾Œç¦å‰‡ãƒšãƒŠãƒ«ãƒ†ã‚£ã€ï¼Œ
2017/04/05,\\
\url{https://github.com/texjporg/tex-jp-build/issues/11}
- \bibitem{tjb28} h-kitagawa, 「[ptex] |\inhibitglue|ã®åŠ¹åŠ›ã€ï¼Œ
+ \bibitem{tjb28} h-kitagawa, 「[ptex] \.{inhibitglue}ã®åŠ¹åŠ›ã€ï¼Œ
2017/09/20,\\
\url{https://github.com/texjporg/tex-jp-build/issues/28}
- \bibitem{tjb36} aminophen, 「欧文文字ã®|\kansujichar|,|\inhibitxspcode|ã€ï¼Œ
+ \bibitem{tjb36} aminophen, 「欧文文字ã®\.{kansujichar},\.{inhibitxspcode}ã€ï¼Œ
2017/11/26,\\
\url{https://github.com/texjporg/tex-jp-build/issues/36}
- \bibitem{tjb93} aminophen, 「[ptex] reading |\kansujichar|ã€ï¼Œ
+ \bibitem{tjb93} aminophen, 「[ptex] reading \.{kansujichar}ã€ï¼Œ
2019/10/14,\\
\url{https://github.com/texjporg/tex-jp-build/issues/93}
\bibitem{tjb37} aminophen, 「和文ã®ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã‚·ãƒ³ãƒœãƒ«ã€ï¼Œ
@@ -2606,7 +2732,7 @@ has been |\let| equal to a non-active character token.
\bibitem{tjb55} aminophen, 「[(u)pTeX] 内部コード㮠-kanji-internal オプションã€ï¼Œ
2018/04/03,\\
\url{https://github.com/texjporg/tex-jp-build/issues/55}
- \bibitem{forum_2566} aminophen, 「\TeX~Live 2019 ã§ã® |\inhibitglue| ã®æŒ™å‹•å¤‰æ›´ã€äºˆå®šã€‘ã€ï¼Œ
+ \bibitem{forum_2566} aminophen, 「\TeX~Live 2019 ã§ã® \.{inhibitglue} ã®æŒ™å‹•å¤‰æ›´ã€äºˆå®šã€‘ã€ï¼Œ
2019/02/06,\\
\url{https://okumuralab.org/tex/mod/forum/discuss.php?d=2566}
\bibitem{tjb68} aminophen, 「upTeX ã® |\if| 㨠|\ifcat|ã€ï¼Œ
diff --git a/macros/latex/contrib/scontents/README.md b/macros/latex/contrib/scontents/README.md
index 95b0291960..b3424b02e6 100644
--- a/macros/latex/contrib/scontents/README.md
+++ b/macros/latex/contrib/scontents/README.md
@@ -1,6 +1,6 @@
## scontents — Stores LaTeX contents in memory or files
-Release v2.0 \[2022-04-04\]
+Release v2.1 \[2024-06-14\]
## Description
@@ -13,7 +13,7 @@ or show it in <code>&lt;verbatim style&gt;</code>.
The package loads and depends on updated versions of:
- [expl3](https://ctan.org/pkg/expl3)
-- [l3keys2e](https://ctan.org/pkg/l3keys2e)
+- [latex-base](https://www.ctan.org/pkg/latex-base)
## Installation
@@ -68,4 +68,4 @@ conditions of the [LaTeX Project Public License](https://www.latex-project.org/l
## Author and copyright
-Copyright 2019-2022 by Pablo González L.
+Copyright 2019-2023 by Pablo González L.
diff --git a/macros/latex/contrib/scontents/scontents.dtx b/macros/latex/contrib/scontents/scontents.dtx
index d82fec48c0..e7dd0b4e1a 100644
--- a/macros/latex/contrib/scontents/scontents.dtx
+++ b/macros/latex/contrib/scontents/scontents.dtx
@@ -1,12 +1,12 @@
% \iffalse meta-comment
%
-% Copyright (C) 2019-2022 by Pablo González L <pablgonz@educarchile.cl>
+% Copyright (C) 2019-2024 by Pablo González L <pablgonz@educarchile.cl>
%
% This work may be distributed and/or modified under the conditions of the
% LaTeX Project Public License, either version 1.3c of this license or (at
% your option) any later version. The latest version of this license is in
%
-% http://www.latex-project.org/lppl.txt
+% https://www.latex-project.org/lppl.txt
%
% and version 1.3c or later is part of all distributions of LaTeX version
% 2005/12/01 or later.
@@ -32,6 +32,7 @@
% so that entries written to both streams end up in the same file.
\usepackage[english]{babel}
\usepackage[top=0.5in,bottom=0.3in,left=2in,right=0.7in,footskip=0.2in,headheight=1cm,headsep=0.27cm]{geometry}
+\usepackage[llscaled=0.95]{libertine} % need by setup-texlive-action@v3
\usepackage[osf,nomath,mono=false,ScaleSF=0.95,ScaleRM=0.95]{libertinus-otf}
% Set Monospace font, fix 'quotes' in verbatim
\usepackage{sourcecodepro}
@@ -64,7 +65,7 @@
% a letter `j'. The doc package ensures that mathcode and the | actually prints
% a j inside docstrip guards. This changes the mathcode of | to 07C:
\makeatletter
-\def\mod@math@codes{\mathcode`\|="207C \mathcode`\&="2026
+\def\mod@math@codes{\mathcode`\|="207C \mathcode`\&="2026 %
\mathcode`\-="702D \mathcode`\+="702B
\mathcode`\:="703A \mathcode`\=="703D }
\makeatother
@@ -73,7 +74,7 @@
\newfontfamily\fetamontotf{ffmw10.otf}[
Scale = 0.95,%
RawFeature = {+latn,+rand,+kern,+size},%
- FontFace = {b}{n}{ffmw10.otf},% fix raplece font
+ FontFace = {b}{n}{ffmw10.otf},% fix replace font
]
\usepackage[svgnames]{xcolor}
\usepackage[sf,bf,compact,medium,pagestyles]{titlesec}
@@ -173,7 +174,7 @@
% User level commands
\ExplSyntaxOn
% Logo with fetamont font
-\NewDocumentCommand{\pkglogo}{}
+\NewDocumentCommand \pkglogo {}
{
\group_begin:
\fetamontotf{\textcolor{pkgcolor}{s}\textcolor{OrangeRed}{content}\textcolor{pkgcolor}{s}}
@@ -181,15 +182,15 @@
}
% Custom \meta[...]{...}, \marg[...]{...} and \oarg[...]{...} with color
-\NewDocumentCommand{\mymeta}{O{}m}
+\NewDocumentCommand \mymeta {O{}m}
{
\userdoc_meta_generic:Nnn \userdoc_meta:n { #1 } { #2 }
}
-\NewDocumentCommand{\mymarg}{O{}m}
+\NewDocumentCommand \mymarg {O{}m}
{
\userdoc_meta_generic:Nnn \userdoc_marg:n { #1 } { #2 }
}
-\NewDocumentCommand{\myoarg}{O{}m}
+\NewDocumentCommand \myoarg {O{}m}
{
\userdoc_meta_generic:Nnn \userdoc_oarg:n { #1 } { #2 }
}
@@ -263,7 +264,7 @@
}
% \envexamp{m}
\newsavebox{\boxexaenv}
-\NewDocumentCommand{\envexamp}{m}
+\NewDocumentCommand \envexamp {m}
{
\begin{lrbox}{\boxexaenv}%
\begin{minipage}[t]{\marginparwidth}%
@@ -276,7 +277,7 @@
\end{lrbox}%
\usebox{\boxexaenv}
}
-\NewDocumentCommand{\envexaplain}{O{} m O{end}}
+\NewDocumentCommand \envexaplain {O{} m O{end}}
{
\begin{lrbox}{\boxexaenv}%
\begin{minipage}[t]{\marginparwidth}%
@@ -291,7 +292,7 @@
}
% \cmdexamp{s m o m o}
-\DeclareDocumentCommand{\cmdexamp}{o m o m o}
+\DeclareDocumentCommand \cmdexamp {o m o m o}
{
\group_begin:
\small\ttfamily
@@ -309,57 +310,62 @@
\group_end:
}
-% \keyexamp{mmm}
-\DeclareDocumentCommand{\keyexamp}{ m m m }
+% \keyexamp*{m m m}
+\NewDocumentCommand \keyexamp{s m m m }
{
- \par
- \adjustbox{outer=-\marginparsep}{\textcolor{black}{\small\ttfamily{#1}}}
- \textcolor{gray}{\,\bfseries\texttt{=}}\,{}
- \mymarg[type=tt,cbc=gray,ac=lightgray,cf=optcolor]{\small{#2}}
- \hfill\textcolor{gray}{\small\textsf{default}:~\emph{#3}}
- \par
- \MYSortIndex{Keys}{Keys>\texttt{#1}}%
+ \adjustbox{outer=-\marginparsep}{\textcolor{optcolor}{\small\ttfamily{#2}}}
+ \IfBooleanTF{#1}
+ {
+ \hphantom{\textcolor{white}{\,\bfseries\texttt{=}}\,{}}
+ \mymeta[type=tt,cbc=gray,ac=lightgray,cf=lightgray]{\small{#3}}
+ }
+ {
+ \textcolor{gray}{\,\bfseries\texttt{=}}\,{}
+ \mymarg[type=tt,cbc=gray,ac=lightgray,cf=optcolor]{\small{#3}}
+ }
+ \hfill\textcolor{gray}{\small\textsf{default}:~\emph{#4}}\par%
+ \MYSortIndex{Keys}{Keys ~ provide ~ by ~ \pkglogo :>\texttt{#2}}
}
% \mykey{m}
-\DeclareDocumentCommand{\mykey}{ m }
+\NewDocumentCommand \mykey { m }
{
\textcolor{optcolor}{\texttt{#1}}
- \MYSortIndex{Keys}{Keys>\texttt{#1}}%
+ \MYSortIndex{Keys}{Keys ~ provide ~ by ~\pkglogo :>\texttt{#1}}%
}
% \mypkg{sm}
-\NewDocumentCommand{\mypkg}{sm}
+\NewDocumentCommand \mypkg {sm}
{
\group_begin:
\IfBooleanTF{#1}
{
\pkglogo
- \MYSortIndex{packages}{Packages>\texttt{#2}}
+ \MYSortIndex{packages}{Packages:>\texttt{#2}}
}
{
\textcolor{darkgray}{\textsf{#2}}
- \MYSortIndex{packages}{Packages>\texttt{#2}}%
+ \MYSortIndex{packages}{Packages:>\texttt{#2}}%
}
\group_end:
}
% \myenv{sm}
-\DeclareDocumentCommand{\myenv}{sm}
+\NewDocumentCommand \myenv {sm}
{
\IfBooleanTF{#1}
{
\textcolor{pkgcolor}{\ttfamily{#2}}%
- \MYSortIndex{environment}{ Environment ~ provide ~ by ~\pkglogo :>\texttt{#2}}
+ \MYSortIndex{environment}{Environments ~ provide ~ by ~\pkglogo :>\texttt{#2}}
}
{
\textcolor{darkgray}{\ttfamily{#2}}%
- \MYSortIndex{environment}{Environments>\texttt{#2}}
+ \MYSortIndex{environment}{Environments:>\texttt{#2}}
}
}
% \ics{sm}
-\DeclareDocumentCommand{\ics}{sm}
+\NewDocumentCommand \ics {sm}
{
\IfBooleanTF{#1}
{
@@ -373,6 +379,27 @@
\MYSortIndex{#2}{\texttt{\textbackslash#2}}
}
}
+% \bomba
+\NewDocumentCommand \bomba { }
+ {
+ \par\hspace*{-0.5\marginparsep}%
+ \makebox[0pt][r]
+ {
+ \makebox[\marginparsep][r]
+ {
+ \footnotesize\textcolor{pkgcolor}{\faIcon{bomb}}
+ }
+ }
+ \hskip 0.5\marginparsep
+ }
+\NewDocumentEnvironment{important}{ s }
+ {
+ \sffamily
+ \bomba%
+ \IfBooleanTF{#1}
+ { \small }
+ { \color{OrangeRed}\Large }
+ }{}
\ExplSyntaxOff
% email https://tex.stackexchange.com/a/663
@@ -429,7 +456,7 @@
keywords = [3]{document,article,setlength,pagestyle,definecolor},%
% Reserved words 4 (scontents pkg)
keywordstyle = [4]{\color{pkgcolor}},%
- keywords = [4]{scontents,Scontents,getstored,typestored,verbatimsc,%
+ keywords = [4]{scontents,Scontents,getstored,typestored,verbatimsc, mergesc, %
endverbatimsc,countsc,meaningsc,foreachsc,macros,newenvsc,
endscontents,startscontents,stopscontents,scontents.tex},%
% Reserved words 5 (in red)
@@ -483,7 +510,7 @@
{.8}{{\textcolor{MediumOrchid}{.8}}}{2}
{.9}{{\textcolor{MediumOrchid}{.9}}}{2}
{=}{{\textcolor{gray}{=}}}{1},%
-}[keywords,tex,comments,strings]% end languaje
+}[keywords,tex,comments,strings]% end language
% \begin{examplecode}[key=val]...\end{examplecode}
\lstnewenvironment{examplecode}[1][]{%
@@ -550,7 +577,7 @@
}
\setfoot{\rlap{\hskip\dimexpr-\oddsidemargin-1in\relax%
\parbox{1.93\paperwidth}{\hfil\thepage\,/\,\pageref{LastPage}}}}%
- {\parbox{\textwidth}{\raggedright \textcolor{gray}{\raisebox{-1pt}{\textcopyright}{}2019--2022 by Pablo González}}}%
+ {\parbox{\textwidth}{\raggedright \textcolor{gray}{\raisebox{-1pt}{\textcopyright}{}2019--2024 by Pablo González}}}%
{}%
\sethead{\llap{\raisebox{0.55cm}{\parbox{\dimexpr\oddsidemargin+1in\relax}{\makebox[0pt][l]{\hspace{15pt}\pkglogo\space\fileversion}}}}}
{\raisebox{0.55cm}{\parbox{\textwidth}{\hspace*{-\oddsidemargin}\centering\small\S.\thesection\space\sectiontitle}}}%
@@ -605,7 +632,7 @@
% \filedate.}\\[25pt]
% \author{
% \large
-% \raisebox{-1pt}{\textcopyright}{}2019--2022 by Pablo González\thanks{
+% \raisebox{-1pt}{\textcopyright}{}2019--2024 by Pablo González\thanks{
% E-mail: \textcolor{OrangeRed}{\textsf{\guillemotleft}}\email{pablgonz@educarchile.cl}\textcolor{OrangeRed}{\textsf{\guillemotright}}.
% }%
% }
@@ -628,6 +655,10 @@
%
% \tableofcontents
%
+% \begin{important}
+% The next update removes compatibility with versions prior to 2024.
+% \end{important}
+%
% \setlength{\parskip}{3pt}
%
% \section{Description of the package}
@@ -681,12 +712,14 @@
%
% Permission is granted to copy, distribute and/or modify this software under
% the terms of the LaTeX Project Public License (lppl), version 1.3 or later
-% (\url{http://www.latex-project.org/lppl.txt}). The software has the status
+% (\url{https://www.latex-project.org/lppl.txt}). The software has the status
% \enquote{maintained}.
%
-% The \mypkg*{scontents} package loads \mypkg{expl3} (minimum version 2020-02-08) and
-% \mypkg{l3keys2e}. This package can be used with "plain", "context", "xelatex",
-% "lualatex", "pdflatex" and the classical workflow §latex>dvips>ps2pdf§.
+% The The \mypkg*{scontents} package is written (mostly) using
+% \mypkg{expl3}, it requires an updated version of \LaTeX{} to work
+% (minimum version 2022-06-01). This package can be used with "plain",
+% "context", "xelatex", "lualatex", "pdflatex" and the classical workflow
+% §latex>dvips>ps2pdf§.
%
% \section{The \texttt{scontents} package}
% \label{sec:pkgscontents}
@@ -772,6 +805,10 @@
%</example>
% \fi
%
+% \begin{important}*
+% \hologo{ConTeXt} users should use |-luatex|, the implementation does not support LuaMetaTeX.
+% \end{important}
+%
% \subsection{The TAB character}
% \label{sec:tabcharacter}
%
@@ -984,6 +1021,7 @@ This text is in the outer environment (after nested).
% \envexaplain[start]{scontents}[stop]
% \end{syntax}
% \end{function}
+%
% \subsection*{Options for environment}
%
% The environment options can be configured globally using option
@@ -1184,45 +1222,43 @@ This text is in the outer environment (after nested).
% on the contents stored in \mymarg{seq name}. If you pass without options run
% §\getstored§ on all contents stored in \mymarg{seq name}.
%
-% \subsection*{Options for command}
+% \subsubsection*{Options for command}
% \label{sec:optcmdfor}
%
% \keyexamp{sep}{code}{empty}
-% Establishes the separation between each content stored in \mymarg{seq name}.
+% Establishes the separation between each content stored in \mymarg[type=tt]{seq name}.
% For example, you can use §sep={\\[10pt]}§ for vertical separation of stored
% contents.
%
% \keyexamp{step}{integer}{1}
% Sets the increment (\mymeta{step}) applied to the value set by key §start§
-% for each element stored in the \mymarg{seq name}. The value must be a
+% for each element stored in the \mymarg[type=tt]{seq name}. The value must be a
% \mymeta{positive integer}.
%
% \keyexamp{start}{integer}{1}
-% Sets the \mymeta{index} number of the \mymarg{seq name} from which execution
+% Sets the \mymeta{index} number of the \mymarg[type=tt]{seq name} from which execution
% will start. The value must be a \mymeta{positive integer}.
%
% \keyexamp{stop}{integer}{total}
-% Sets the \mymeta{index} number of the \mymarg{seq name} from which execution
+% Sets the \mymeta{index} number of the \mymarg[type=tt]{seq name} from which execution
% it will finish executing. The value must be a \mymeta{positive integer}.
%
% \keyexamp{before}{code}{empty}
-% Sets the \mymarg{code} that will be executed \mymeta{before} each content stored
-% in \mymarg{seq name}. The \mymarg{code} must be passed between braces.
-%
-% \medskip
+% Sets the \mymarg[type=tt]{code} that will be executed \mymeta{before} each content stored
+% in \mymarg[type=tt]{seq name}. The \mymarg[type=tt]{code} must be passed between braces.
%
% \keyexamp{after}{code}{empty}
-% Sets the \mymarg{code} that will be executed \mymeta{after} each content stored
-% in \mymarg{seq name}. The \mymarg{code} must be passed between braces.
+% Sets the \mymarg[type=tt]{code} that will be executed \mymeta{after} each content stored
+% in \mymarg[type=tt]{seq name}. The \mymarg[type=tt]{code} must be passed between braces.
%
% \newsavebox{\hashbox}
% \begin{lrbox}{\hashbox}
-% \lstinline[language=scontents-doc,basicstyle=\ttfamily]+{#1}+
+% \lstinline[language=scontents-doc,basicstyle=\small\ttfamily]+{#1}+
% \end{lrbox}
%
% \keyexamp{wrapper}{code{} \space\usebox{\hashbox} more code}{empty}
-% Wraps the content stored in \mymarg{seq name} referenced by §{#1}§.
-% The \mymarg{code} must be passed between braces. For example
+% Wraps the content stored in \mymarg[type=tt]{seq name} referenced by §{#1}§.
+% The \mymarg[type=tt]{code} must be passed between braces. For example
% §\foreachsc[wrapper={\makebox[1em][l]{#1}}]{contents}§.
%
%
@@ -1233,17 +1269,51 @@ This text is in the outer environment (after nested).
%
% \begin{function}{\typestored}
% \begin{syntax}
-% \cmdexamp{typestored}[index\textnormal{\textcolor{gray}{,}} width-tab \textnormal{\textcolor{gray}{=}} number]{seq name}
+% \cmdexamp{typestored}[index\textnormal{\textcolor{gray}{,}} 1-end\textnormal{\textcolor{gray}{,}} width-tab \textnormal{\textcolor{gray}{=}} number]{seq name}
% \end{syntax}
% The command \ics*{typestored} internally places the content stored in
-% the \mymarg{seq name} into the \myenv*{verbatimsc} environment. The \mymeta{index}
-% corresponds to the position in which the content is stored in the \mymarg{seq name}.
+% the \mymarg[type=tt]{seq name} into the \myenv*{verbatimsc} environment. The \mymeta{index}
+% corresponds to the position in which the content is stored in the \mymarg[type=tt]{seq name},
+% if \mymeta[type=tt]{1-end} is used \emph{\enquote{all}} content stored in \mymarg[type=tt]{seq name} will be printed.
% \end{function}
%
% If the optional argument is not passed it defaults to the first element
-% stored in the \mymarg{seq name}. The key \mykey{width-tab} is available for
+% stored in the \mymarg[type=tt]{seq name}. The key \mykey{width-tab} is available for
% this command.
%
+% \subsection{The command \cs{mergesc}}
+% \label{sec:mergesc}
+%
+% \vspace*{-10pt}
+%
+% \newsavebox{\argmergesc}
+% \begin{lrbox}{\argmergesc}
+% \small\mymarg[type=tt]{seq A}\myoarg[type=tt]{index}\textcolor{gray}{, }\mymarg[type=tt]{seq B}\myoarg[type=tt]{start \textcolor{gray}{-} stop}\textcolor{gray}{, }\mymarg[type=tt]{seq C}\myoarg[type=tt]{1-end}
+% \end{lrbox}
+%
+% \begin{function}{\mergesc}
+% \begin{syntax}
+% \cmdexamp{mergesc}[typestored \textnormal{\textcolor{lightgray}{\textbar}} meaningsc\textcolor{lightgray}{, }keys]{\usebox{\argmergesc}}
+% \end{syntax}
+% The command \ics*{mergesc} internally assembles the content stored in
+% the \mymarg[type=tt]{seq A}§[1]§, \mymarg[type=tt]{seq B}§[2-5]§ and \mymarg[type=tt]{seq C}§[1-end]§ into a temporary internal
+% \mymeta[type=tt]{seq temp}.
+% \end{function}
+%
+% The use of the keys \mykey{typestored} or \mykey{menaingsc} are
+% \emph{\enquote{mandatory}} and disjoint from each other, the rest of the
+% accepted \mymeta{keys} are \mykey{print-cmd}, \mykey{write-out},
+% \mykey{width-tab} and \mykey{overwrite}.
+%
+% The use of the \mykey{write-out} key with this command follows the same
+% rules already described, the main advantage is that it allows to join
+% stored content \emph{without rewriting} the file over and over again,
+% by design \hologo{TeX} does not have an append mode for writing
+% files, this effectively allows you to write chunks of code and then
+% merge them into a single file.
+%
+% \newpage
+%
% \subsection{The environment \env{verbatimsc}}
% \label{sec:verbatimsc}
%
@@ -1537,10 +1607,10 @@ seventies that the \NSA\ has known that for 40 years.\par
\usepackage{tikz}
\setlength{\parindent}{0pt}
\pagestyle{empty}
-\Scontents*{\matrix{ \node (a) {$a$} ; & \node (b) {$b$} ; \\ } ;}
-\Scontents*{\matrix[ampersand replacement=\&]
+\Scontents{\matrix{ \node (a) {$a$} ; & \node (b) {$b$} ; \\ } ;}
+\Scontents{\matrix[ampersand replacement=\&]
{ \node (a) {$a$} ; \& \node (b) {$b$} ; \\ } ;}
-\Scontents*{\matrix{\node (a) {$a$} ; & \node (b) {$b$} ; \\ } ; }
+\Scontents{\matrix{\node (a) {$a$} ; & \node (b) {$b$} ; \\ } ; }
\begin{document}
\section{tikzpicture}
\begin{tikzpicture}
@@ -1706,9 +1776,9 @@ Something in the whole course.
%<*example>
% \fi
\begin{scontents}[write-out=scexamp7.ltx]
-\documentclass{article}
% arara: pdflatex
% arara: clean: { extensions: [ aux, log] }
+\documentclass{article}
\usepackage{scontents}
\makeatletter
\let\verbatimsc\@undefined
@@ -1728,20 +1798,20 @@ breakaftersymbolpre={\,\tiny\ensuremath{\rfloor}}]}%
\setlength{\parindent}{0pt}
\pagestyle{empty}
\begin{document}
-\section{Test \texttt{\textbackslash begin\{scontents\}} whit \texttt{fancyvrb}}
+\section{Test \texttt{\textbackslash begin\{scontents\}} with \texttt{fancyvrb}}
Test \verb+{scontents}+ \par
\begin{scontents}
Using \verb+scontents+ env no \verb+[key=val]+, save in seq \verb+contents+
with index 1.
-Prove new \Verb*{ fancyvrb whit braces } and environment \verb+Verbatim*+
+Prove new \Verb*{ fancyvrb with braces } and environment \verb+Verbatim*+
\begin{verbatim}
verbatim environment
\end{verbatim}
\end{scontents}
-\section{Test \texttt{\textbackslash Scontents} whit \texttt{fancyvrb}}
+\section{Test \texttt{\textbackslash Scontents} with \texttt{fancyvrb}}
\Scontents{ We have coded this in \LaTeX: $E=mc^2$.}
\section{Test \texttt{\textbackslash getstored}}
@@ -1798,7 +1868,7 @@ Prove new \Verb*{ fancyvrb whit braces } and environment \verb+Verbatim*+
\setlength{\parindent}{0pt}
\pagestyle{empty}
\begin{document}
-\section{Test \texttt{\textbackslash begin\{scontents\}} whit \texttt{listings}}
+\section{Test \texttt{\textbackslash begin\{scontents\}} with \texttt{listings}}
Test \verb+{scontents}+ \par
\begin{scontents}
@@ -1810,7 +1880,7 @@ Prove \lstinline[basicstyle=\ttfamily]| lstinline | and environment \verb+Verbat
\end{verbatim}
\end{scontents}
-\section{Test \texttt{\textbackslash Scontents*} whit \texttt{listings}}
+\section{Test \texttt{\textbackslash Scontents*} with \texttt{listings}}
\Scontents*+ We have coded this in \lstinline[basicstyle=\ttfamily]|\LaTeX: $E=mc^2$|
and more.+
@@ -1852,14 +1922,14 @@ and more.+
\pagestyle{empty}
\setlength{\parindent}{0pt}
\begin{document}
-\section{Test \texttt{\textbackslash begin\{scontents\}} whit \texttt{minted}}
+\section{Test \texttt{\textbackslash begin\{scontents\}} with \texttt{minted}}
Test \verb+{scontents}+ \par
\begin{scontents}[overwrite,write-env=\jobname.tsc,force-eol=true]
Using \verb+scontents+ env no \verb+[key=val]+, save in seq \verb+contents+
with index 1.\par
-Prove new \Verb*{ new fvextra whit braces } and environment \verb+Verbatim*+
+Prove new \Verb*{ new fvextra with braces } and environment \verb+Verbatim*+
\begin{Verbatim}[obeytabs, showtabs, tab=\rightarrowfill, tabcolor=red]
No tab
One real tab
@@ -1871,7 +1941,7 @@ No tab
Read \Verb{\jobname.tsc} (shows TABs as red arrows):
\VerbatimInput[obeytabs, showtabs, tab=\rightarrowfill, tabcolor=red]{\jobname.tsc}
-\section{Test \texttt{\textbackslash Scontents} whit \texttt{minted}}
+\section{Test \texttt{\textbackslash Scontents} with \texttt{minted}}
\Scontents{ We have coded \par this in \LaTeX: $E=mc^2$.}
@@ -1892,6 +1962,90 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
% \textattachfile[color=linkcolor,print=false]{scexamp9.ltx}{\faFile*[regular]}.
% \lstinputlisting[language=scontents-doc,numbers=left]{scexamp9.ltx}
%
+% \subsection{The command \texttt{\textbackslash{}mergesc} in action}
+%
+% \iffalse
+%<*example>
+% \fi
+\begin{scontents}[write-out=scexamp10.ltx]
+% arara: pdflatex
+% arara: clean: { extensions: [ aux, log] }
+\documentclass{article}
+\usepackage{scontents}
+% Fix part of a MCE that should go before babel's loading
+\begin{scontents}[store-env=mce]
+\documentclass[french]{article}
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage{lmodern}
+\usepackage[a4paper]{geometry}
+\end{scontents}
+% Fix part of a MCE that should go after (>=) babel's loading
+\begin{scontents}[store-env=mce]
+\usepackage{babel}
+\begin{document}
+\end{scontents}
+% Fix part of a MCE that should go after its body
+\begin{scontents}[store-env=mce]
+\end{document}
+\end{scontents}
+\begin{document}
+\section{First annswer}
+% Variable part of a MCE that should added to the fixed preamble, before babel's loading
+\begin{scontents}[store-env=mce-1]
+\usepackage{amsmath}
+\end{scontents}
+% Variable part of a MCE being the code snippet
+\begin{scontents}[store-env=mce-1]
+\begin{align}
+ 0 & \neq 1 \\
+ 1 & \neq 0
+\end{align}
+\end{scontents}
+\begin{description}
+\item[Preamble's addition]\leavevmode
+ \typestored[1]{mce-1}
+\item[Code snippet]\leavevmode
+ \typestored[2]{mce-1}
+\item[MCE]\leavevmode
+ \mergesc[typestored, print-cmd=true]
+ {
+ {mce}[1], {mce-1}[1], {mce}[2], {mce-1}[2], {mce}[3]
+ }
+\end{description}
+\section{Second annswer}
+% Variable part of a MCE that should added to the fixed preamble, before babel's loading
+\begin{scontents}[store-env=mce-2]
+\usepackage{amsmath}
+\end{scontents}
+% Variable part of a MCE being the code snippet
+\begin{scontents}[store-env=mce-2]
+\begin{flalign}
+ 0 & \neq 1 \\
+ 1 & \neq 0
+\end{flalign}
+\end{scontents}
+
+\begin{description}
+\item[Preamble's addition]\leavevmode
+ \typestored[1]{mce-2}
+\item[Code snippet]\leavevmode
+ \typestored[2]{mce-2}
+\item[MCE]\leavevmode
+ \mergesc[typestored, print-cmd=true, write-out=mce.txt, overwrite=true]
+ {
+ {mce}[1], {mce-2}[1], {mce}[2], {mce-2}[2], {mce}[3]
+ }
+\end{description}
+\end{document}
+\end{scontents}
+% \iffalse
+%</example>
+% \fi
+% The command §\mergesc§ in action, adapted from Denis Bitouzé request at \url{https://github.com/pablgonz/scontents/issues/2}
+% \textattachfile[color=linkcolor,print=false]{scexamp9.ltx}{\faFile*[regular]}.
+% \lstinputlisting[language=scontents-doc,numbers=left]{scexamp10.ltx}
+%
% \newpage
%
% \section{Change history}
@@ -1910,37 +2064,47 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
% \begin{description}[font=\small\sffamily,wide=0pt,style=multiline,leftmargin=\descrwidth,nosep,noitemsep]
% \item [\fileversion{} (ctan), \filedate]
% \begin{itemize}
-% \item Adapting the |verbatimsc| environment (compatibility |verbatim| package).
-% \item Removed compatibility layer for older \hologo{LaTeX} releases.
-% \item Fix loader in \hologo{plainTeX} and \hologo{ConTeXt}.
-% \item Minor adjustments in the documentation.
+% \item Fix |\cleansc| command.
+% \item Add |\mergesc| command.
+% \item Fix internal definition for seq var.
+% \item Fix internal code for |\typestored|.
+% \item Replace |\cs_argument_spec:N| by |\cs_parameter_spec:N|.
+% \item Detect |l3keys2e| package (obsolete in june 2022 \LaTeX{} release).
+% \item Minor adjustments in the documentation.
+% \end{itemize}
+% \item [v2.0 (ctan), 2022-04-04]
+% \begin{itemize}
+% \item Adapting the |verbatimsc| environment (compatibility |verbatim| package).
+% \item Removed compatibility layer for older \hologo{LaTeX} releases.
+% \item Fix loader in \hologo{plainTeX} and \hologo{ConTeXt}.
+% \item Minor adjustments in the documentation.
% \end{itemize}
% \item [v1.9 (ctan), 2020-01-21]
% \begin{itemize}
-% \item Update and improvements in the internal code.
-% \item Updating the generic code for |I/O| verification.
-% \item Add |write-cmd| and |write-out| keys for |\Scontents*|.
-% \item Fix |sep| key in |\foreachsc|.
+% \item Update and improvements in the internal code.
+% \item Updating the generic code for |I/O| verification.
+% \item Add |write-cmd| and |write-out| keys for |\Scontents*|.
+% \item Fix |sep| key in |\foreachsc|.
% \end{itemize}
% \item [v1.8 (ctan), 2019-11-18]
% \begin{itemize}
-% \item Add |\newenvsc| command.
-% \item Fix nested environment in \hologo{plainTeX} and \hologo{ConTeXt}.
-% \item Modified default value in |\getstored|.
-% \item Add |overwrite| key to reduce |I/O| operations.
-% \item Deleted an unnecessary group in the code.
+% \item Add |\newenvsc| command.
+% \item Fix nested environment in \hologo{plainTeX} and \hologo{ConTeXt}.
+% \item Modified default value in |\getstored|.
+% \item Add |overwrite| key to reduce |I/O| operations.
+% \item Deleted an unnecessary group in the code.
% \end{itemize}
% \item [v1.7 (ctan), 2019-10-29]
% \begin{itemize}
-% \item The |verbatimsc| environment was rewritten.
-% \item Minor adjustments in documentation.
+% \item The |verbatimsc| environment was rewritten.
+% \item Minor adjustments in documentation.
% \end{itemize}
% \item [v1.6 (ctan), 2019-10-26]
% \begin{itemize}
-% \item The internal behavior of |\getstored| has been modified.
-% \item The internal behavior of |\foreachsc| has been modified.
-% \item Corrected file extension for \hologo{ConTeXt}.
-% \item Remove spurious warning.
+% \item The internal behavior of |\getstored| has been modified.
+% \item The internal behavior of |\foreachsc| has been modified.
+% \item Corrected file extension for \hologo{ConTeXt}.
+% \item Remove spurious warning.
% \end{itemize}
% \item [v1.5 (ctan), 2019-10-24]
% \begin{itemize}
@@ -1998,15 +2162,15 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
% \begin{thebibliography}{9}
% \bibitem{expl3} The \hologo{LaTeX} Project. \enquote{The \textsf{expl3}
% package}. Available from
-% \textsc{ctan}, \url{https://www.ctan.org/pkg/expl3}, 2020.
+% \textsc{ctan}, \url{https://www.ctan.org/pkg/expl3}, 2023.
%
% \bibitem{xparse} The \hologo{LaTeX} Project. \enquote{The \textsf{xparse}
% package}. Available from
-% \textsc{ctan}, \url{https://www.ctan.org/pkg/xparse}, 2020.
+% \textsc{ctan}, \url{https://www.ctan.org/pkg/xparse}, 2023.
%
% \bibitem{l3keys} The \hologo{LaTeX} Project. \enquote{The \textsf{l3keys2e}
% package}. Available from
-% \textsc{ctan}, \url{https://www.ctan.org/pkg/l3keys2e}, 2020.
+% \textsc{ctan}, \url{https://www.ctan.org/pkg/l3keys2e}, 2022.
%
% \bibitem{keyval} \textsc{Wright, Joseph}. \enquote{Programming
% \textsf{key–value} in \textsf{expl3}}. Available from
@@ -2053,10 +2217,10 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
%
% Now we define some common macros to hold the package date and version:
% \begin{macrocode}
-%<loader>\def\ScontentsFileDate{2022-04-04}%
-%<core>\def\ScontentsCoreFileDate{2022-04-04}%
+%<loader>\def\ScontentsFileDate{2024-06-14}%
+%<core>\def\ScontentsCoreFileDate{2024-06-14}%
%<*loader>
-\def\ScontentsFileVersion{2.0}%
+\def\ScontentsFileVersion{2.1}%
\def\ScontentsFileDescription{Stores LaTeX contents in memory or files}%
% \end{macrocode}
%
@@ -2065,7 +2229,15 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
%
% \begin{macrocode}
%<*latex>
-\RequirePackage{l3keys2e}[2020/02/08]
+\IfFormatAtLeastTF { 2022-06-01 }
+ { }
+ {
+ \RequirePackage{l3keys2e}[2020/02/08]
+ \PackageWarning { scontents }
+ {
+ The next update removes compatibility with versions prior to 2024.
+ }
+ }
\ProvidesExplPackage
{scontents} {\ScontentsFileDate} {\ScontentsFileVersion} {\ScontentsFileDescription}
%</latex>
@@ -2229,6 +2401,13 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\l_@@_keys_tl}
+% Stores unused keys to be frwarded to other commands.
+% \begin{macrocode}
+\tl_new:N \l_@@_keys_tl
+% \end{macrocode}
+% \end{macro}
+%
% \subsection{Compatibility layer with \hologo{plainTeX} and \hologo{ConTeXt}}
%
% When loading the package outside of \LaTeX{} we can't usually use
@@ -2292,9 +2471,14 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
% In \LaTeX{} mode we load \mypkg{l3keys2e} process the \mymeta{keys}
% as options passed on to the package, the package \pkg{l3keys2e} will
% verify the \mymeta{keys} and will return an error when they are
-% \emph{unknown}.
% \begin{macrocode}
-%<latex>\ProcessKeysOptions { scontents }
+%<*latex>
+\IfFormatAtLeastTF { 2022-06-01 }
+ {
+ \ProcessKeyOptions [ scontents ]
+ }
+ { \ProcessKeysOptions { scontents } }
+%</latex>
%<*core>
% \end{macrocode}
%
@@ -2333,8 +2517,8 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\l_@@_seq_item_int,\l_@@_env_nesting_int,\l_@@_foreach_stop_int}
-% \cs{l_@@_seq_item_int} stores the index in the sequence of the item
+% \begin{macro}{\l_@@_env_nesting_int,\l_@@_foreach_stop_int}
+% \cs{l_@@_seq_item_seq} stores the indexes in the sequence of the items
% requested to §\typestored§ or §\meaningsc§. \cs{l_@@_env_nesting_int}
% stores the current nesting level of the \env{scontents} environment.
% \cs{l_@@_foreach_stop_int} will save the value at which the §\foreachsc§
@@ -2342,7 +2526,7 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
%
% \begin{macrocode}
\int_new:N \l_@@_foreach_stop_int
-\int_new:N \l_@@_seq_item_int
+\seq_new:N \l_@@_seq_item_seq
\int_new:N \l_@@_env_nesting_int
% \end{macrocode}
% \end{macro}
@@ -2382,6 +2566,7 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
%
% \begin{macrocode}
\seq_new:N \l_@@_foreach_print_seq
+\seq_new:c { g_@@_name_sc!internal_seq }
% \end{macrocode}
% \end{macro}
%
@@ -2407,6 +2592,27 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\s_@@_stop,\s_@@_mark}
+% \begin{macrocode}
+\scan_new:N \s_@@_stop
+\scan_new:N \s_@@_mark
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\l_@@_cur_seq_name_str}
+% \begin{macrocode}
+\str_new:N \l_@@_cur_seq_name_str
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_use_i_delimit_by_s_stop:nw,\@@_use_none_delimit_by_s_stop:w}
+% \begin{macrocode}
+\cs_new:Npn \@@_use_delimit_by_s_stop:nw #1 \s_@@_stop {#1}
+\cs_new:Npn \@@_use_i_delimit_by_s_stop:nw #1 #2 \s_@@_stop {#1}
+\cs_new:Npn \@@_use_none_delimit_by_s_stop:w #1 \s_@@_stop { }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\l_@@_save_sf_int,\l_@@_save_skip}
% Internal variables used by functions \cs{@@_bsphack:} and \cs{@@_esphack:}.
%
@@ -2450,7 +2656,7 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
\cs_generate_variant:Nn \tl_remove_once:Nn { NV }
\cs_generate_variant:Nn \tl_replace_all:Nnn { Nx, Nxx, Nnx }
\cs_generate_variant:Nn \msg_error:nnnn { nnx }
-\prg_generate_conditional_variant:Nnn \tl_if_empty:n { f } { TF }
+\prg_generate_conditional_variant:Nnn \tl_if_empty:n { f } { p, TF }
% \end{macrocode}
% \end{macro}
%
@@ -2566,16 +2772,25 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
% a common \mymeta{key}.
%
% \begin{macrocode}
+\bool_new:N \l_@@_print_aux_bool
+\bool_set_true:N \l_@@_print_aux_bool
\keys_define:nn { scontents / typemeaning }
{
- width-tab .meta:nn = { scontents } { width-tab = #1 },
- unknown .code:n = { \@@_parse_type_meaning_key:n {#1} }
+ width-tab .meta:nn = { scontents } { width-tab = #1 },
+ write-out .code:n = {
+ \bool_set_false:N \l_@@_storing_bool
+ \bool_set_true:N \l_@@_writing_bool
+ \tl_set:Nn \l_@@_fname_out_tl {#1}
+ },
+ overwrite .meta:nn = { scontents } { overwrite = #1 },
+ overwrite .default:n = true,
+ unknown .code:n = { \@@_parse_type_meaning_key:n {#1} }
}
% \end{macrocode}
%
% \subsection{Handling undefined keys}
%
-% The \mymeta{keys} are stored in the token list variable \cs{l_keys_key_str},
+% The \mymeta{keys} are stored in the string variable \cs{l_keys_key_str},
% and the value (if any) is passed as an argument to each \mymeta{function}.
%
% \subsubsection{Undefined keys for environment \env{scontents}}
@@ -2666,16 +2881,42 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
{ \exp_args:NV \@@_parse_type_meaning_key:nn \l_keys_key_str {#1} }
\cs_new_protected:Npn \@@_parse_type_meaning_key:nn #1#2
{
- \tl_if_empty:fTF { \int_to_roman:n { -0 #1 } }
+ \tl_if_blank:nTF {#2}
+ { \@@_parse_type_meaning_range:w #1 - \q_@@_mark - \s_@@_mark }
+ { \msg_error:nnnn { scontents } { type-key-value-unknown } {#1} {#2} }
+ }
+\cs_new_protected:Npn \@@_parse_type_meaning_range:w #1 - #2 - #3 \s_@@_mark
+ {
+ \@@_range_parser:nnxn {#1} {#2}
+ { \seq_count:c { g_@@_name_\l_@@_cur_seq_name_str _seq } }
+ { \msg_error:nnn { scontents } { type-key-unknown } }
+ }
+\cs_generate_variant:Nn \@@_range_parser:nnnn { nnx }
+\cs_new_protected:Npn \@@_range_parser:nnnn #1 #2 #3
+ {
+ \exp_args:Nxx \@@_range_parser_aux:nnn
+ { \str_if_eq:nnTF {#1} { end } {#3} { \exp_not:n {#1} } }
+ { \str_if_eq:nnTF {#2} { end } {#3} { \exp_not:n {#2} } }
+ }
+\cs_new_protected:Npn \@@_range_parser_aux:nnn #1 #2 #3
+ {
+ \@@_tl_if_head_is_q_mark:nTF {#2}
{
- \tl_if_blank:nTF {#2}
- { \int_set:Nn \l_@@_seq_item_int {#1} }
- { \msg_error:nnnn { scontents } { type-key-value-unknown } {#1} {#2} }
+ \tl_if_empty:fTF { \int_to_roman:n { -0 #1 } }
+ { \seq_put_right:Nx \l_@@_seq_item_seq { \int_eval:n {#1} } }
+ { #3 {#1} }
}
{
- \tl_if_blank:nTF {#2}
- { \msg_error:nnn { scontents } { type-key-unknown } {#1} }
- { \msg_error:nnnn { scontents } { type-key-value-unknown } {#1} {#2} }
+ \bool_lazy_and:nnTF
+ { \tl_if_empty_p:f { \int_to_roman:n { -0 #1 } } }
+ { \tl_if_empty_p:f { \int_to_roman:n { -0 #2 } } }
+ {
+ \int_compare:nNnTF {#2} > {#1}
+ { \int_step_inline:nnnn {#1} { 1 } {#2} }
+ { \int_step_inline:nnnn {#1} { -1 } {#2} }
+ { \seq_put_right:Nn \l_@@_seq_item_seq {##1} }
+ }
+ { #3 { #1-#2 } }
}
}
% \end{macrocode}
@@ -2704,11 +2945,24 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_getfrom_seq:nn,\@@_getfrom_seq:nnn}
+% \begin{macro}{\@@_getfrom_seq:nn,\@@_getfrom_seq:Nn,\@@_getfrom_seq:nnn}
% The function \cs{@@_getfrom_seq:nn} retrieves the saved item from the
% sequence.
%
% \begin{macrocode}
+\cs_new:Npn \@@_getfrom_seq:Nn #1#2
+ {
+ \seq_if_exist:cTF { g_@@_name_#2_seq }
+ {
+ \exp_args:Nf \@@_getfrom_seq:nNn
+ { \seq_count:c { g_@@_name_#2_seq } } #1 {#2}
+ }
+ { \msg_expandable_error:nnn { scontents } { undefined-storage } {#2} }
+ }
+\cs_new:Npn \@@_getfrom_seq:nNn #1 #2 #3
+ { \seq_map_tokens:Nn #2 { \@@_getfrom_seq_aux:nnn {#1} {#3} } }
+\cs_new:Npn \@@_getfrom_seq_aux:nnn #1 #2 #3
+ { \exp_args:Nnf \use:n { \@@_getfrom_seq:nnn {#1} } { \int_eval:n {#3} } {#2} }
\cs_new:Npn \@@_getfrom_seq:nn #1#2
{
\seq_if_exist:cTF { g_@@_name_#2_seq }
@@ -2765,7 +3019,7 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
%
% In order to be able to define environments that behave similarly to
% \myenv{scontents}, we define a generic environment and make all other
-% environment as wappers around that one.
+% environment as wrappers around that one.
%
% \subsubsection{The command \cs{newenvsc}}
%
@@ -2853,7 +3107,7 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
% \startscontents,
% \stopscontents,
% }
-% Finaly defining the \myenv{scontents} environment should be easy :)
+% Finally defining the \myenv{scontents} environment should be easy :)
% \begin{macrocode}
%</core>
%<loader>\newenvsc{scontents}
@@ -2910,7 +3164,7 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
% The function \cs{@@_start_after_option:w} also checks for trailing
% tokens after the optional argument and issues an error if any.
%
-% In all cases, the function \cs{@@_check_line_process:xn} ckecks that
+% In all cases, the function \cs{@@_check_line_process:xn} checks that
% everything past §\begin{scontents}§ is empty and then process
% the environment.
%
@@ -3407,7 +3661,7 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
% \end{macrocode}
%
% The function \cs{@@_norm_arg:n} grabs a normal argument, adds it to
-% the |seq| varaible and optionally prints it.
+% the |seq| variable and optionally prints it.
%
% \begin{macrocode}
\cs_new_protected:Npn \@@_norm_arg:n #1
@@ -3438,7 +3692,7 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
% }
%
% The function \cs{@@_verb_arg_internal:n} replace all §\^^M§ by
-% §\^^J§ then adds it to the |seq| varaible.
+% §\^^J§ then adds it to the |seq| variable.
%
% \begin{macrocode}
\cs_new_protected:Npn \@@_verb_arg_internal:n #1
@@ -3593,21 +3847,36 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
%<*core>
\cs_new_protected:Npn \@@_typestored_internal:nn #1 #2
{
+ \@@_bsphack:
\group_begin:
- \int_set:Nn \l_@@_seq_item_int { 1 }
+ \seq_clear:N \l_@@_seq_item_seq
+ \str_set:Nx \l_@@_cur_seq_name_str {#2}
\tl_if_novalue:nF {#1} { \keys_set:nn { scontents / typemeaning } {#1} }
+ \seq_if_empty:NT \l_@@_seq_item_seq
+ { \seq_set_from_clist:Nn \l_@@_seq_item_seq { 1 } }
\tl_set:Nx \l_@@_temp_tl
- { \exp_args:NV \@@_getfrom_seq:nn \l_@@_seq_item_int {#2} }
- \tl_remove_once:NV \l_@@_temp_tl \c_@@_hidden_space_str
+ { \@@_getfrom_seq:Nn \l_@@_seq_item_seq {#2} }
+ \@@_remove_trailing_eol:N \l_@@_temp_tl
+ \tl_replace_all:Nxn \l_@@_temp_tl \c_@@_hidden_space_str { ^^J }
\tl_log:N \l_@@_temp_tl
\tl_if_empty:NF \l_@@_temp_tl
- { \@@_verb_print:N \l_@@_temp_tl }
+ {
+ \bool_if:NT \l_@@_print_aux_bool
+ {
+ \@@_verb_print:N \l_@@_temp_tl
+ }
+ }
+ \@@_file_write_cmd:VV \l_@@_fname_out_tl \l_@@_temp_tl
+ \use:x
+ {
\group_end:
+ \bool_if:NF \l_@@_print_aux_bool { \@@_esphack: }
+ }
}
% \end{macrocode}
%
% The \cs{@@_verb_print:N} macro is defined with active carriage return
-% (\textsc{ascii} 13) characters to mimick an actual verbatim environment
+% (\textsc{ascii} 13) characters to mimic an actual verbatim environment
% \enquote{on the loose}. The contents of the environment are placed in a
% §verbatimsc§ environment and rescanned using \cs{@@_rescan_tokens:x}.
%
@@ -3645,6 +3914,109 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
% \end{macrocode}
% \end{macro}
%
+% \subsection{The command \cs{mergesc}}
+%
+% \begin{macro}{\mergesc}
+% The §\mergesc§ command parses a list given as argument, and just assembles
+% it as a temporary internal sequence, then passes it to the requested command.
+% \begin{macrocode}
+%<*loader>
+\NewDocumentCommand \mergesc { o m }
+ { \@@_mergesc_internal:nn {#1} {#2} }
+%</loader>
+%<*core>
+\keys_define:nn { scontents / mergesc }
+ {
+ , typestored .code:n =
+ { \cs_set_eq:NN \@@_mergesc_output_cmd:nn \@@_typestored_internal:nn }
+ , meaningsc .code:n =
+ { \cs_set_eq:NN \@@_mergesc_output_cmd:nn \@@_meaningsc_internal:nn }
+ }
+\cs_new_protected:Npn \@@_mergesc_output_cmd:nn #1 #2
+ { \msg_error:nn { scontents } { mergesc-missing-cmd } }
+\msg_new:nnn { scontents } { mergesc-missing-cmd }
+ { Missing~output~command~for~\iow_char:N\\mergesc~\msg_line_context:. }
+\cs_new_protected:Npn \@@_mergesc_internal:nn #1 #2
+ {
+ \group_begin:
+ \tl_clear:N \l_@@_keys_tl
+ \tl_if_novalue:nF {#1}
+ {
+ % Add print-cmd here :D
+ \keys_define:nn { scontents / typemeaning }
+ {
+ print-cmd .bool_set:N = \l_@@_print_aux_bool,
+ print-cmd .initial:n = false,
+ print-cmd .default:n = true,
+ }
+ \keys_set_known:nnN { scontents / mergesc } {#1} \l_@@_keys_tl
+ }
+ \seq_gclear:c { g_@@_name_sc!internal_seq }
+ \@@_mergesc_parse_list:n {#2}
+ \exp_args:Nx \@@_mergesc_output_cmd:nn
+ { 1-end, \exp_not:V \l_@@_keys_tl } { sc!internal }
+ \group_end:
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_mergesc_parse_list:n #1
+ {
+ \clist_map_inline:nn {#1} { \@@_parse_mergesc:nw ##1 \s_@@_stop }
+ \seq_gpop_right:cN { g_@@_name_sc!internal_seq } \l_@@_temp_tl
+ \@@_remove_trailing_eol:N \l_@@_temp_tl
+ \seq_gput_right:cV { g_@@_name_sc!internal_seq } \l_@@_temp_tl
+ }
+\cs_new_protected:Npx \@@_remove_trailing_eol:N #1
+ {
+ \exp_not:N \exp_after:wN \exp_not:N \@@_remove_trailing_eol:w
+ #1 \s_@@_stop \c_@@_hidden_space_str \s_@@_stop \s_@@_mark #1
+ }
+\use:e
+ {
+ \cs_new_protected:Npn \exp_not:N \@@_remove_trailing_eol:w #1
+ \c_@@_hidden_space_str \s_@@_stop #2 \s_@@_mark #3
+ } {
+ \tl_set:Nx #3
+ {
+ \tl_if_empty:nTF {#2}
+ { \exp_not:o { \@@_use_delimit_by_s_stop:nw #1 } }
+ { \exp_not:n {#1} }
+ }
+ }
+\cs_new_protected:Npn \@@_parse_mergesc:nw #1
+ {
+ \peek_charcode_ignore_spaces:NTF [ % ]
+ { \@@_parse_mergesc_aux:nw {#1} }
+ { \@@_parse_mergesc_aux:nw {#1} [ 1-\seq_count:c { g_@@_name_#1_seq } ] }
+ }
+\cs_new_protected:Npn \@@_parse_mergesc_aux:nw #1 [#2]
+ {
+ \seq_clear:N \l_@@_seq_item_seq
+ \clist_map_inline:nn {#2}
+ { \@@_parse_mergesc_range:nw {#1} ##1 - \q_@@_mark - \s_@@_mark }
+ \seq_map_inline:Nn \l_@@_seq_item_seq
+ {
+ \seq_gput_right:cx { g_@@_name_sc!internal_seq }
+ { \seq_item:cn { g_@@_name_#1_seq } {##1} }
+ }
+ \@@_use_none_delimit_by_s_stop:w
+ }
+\cs_new_protected:Npn \@@_parse_mergesc_range:nw #1 #2 - #3 - #4 \s_@@_mark
+ {
+ \cs_set_protected:Npn \@@_tmp:w ##1
+ {
+ \msg_error:nnxxx { scontents } { index-out-of-range }
+ {##1} {#1} { \seq_count:c { g_@@_name_#1_seq } }
+ }
+ \@@_range_parser:nnxn {#2} {#3}
+ { \seq_count:c { g_@@_name_#1_seq } }
+ { \@@_tmp:w }
+ }
+%</core>
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{verbatimsc,\startverbatimsc,\stopverbatimsc}
% Finally the \hologo{LaTeX} and \hologo{ConTeXt} version of
% §verbatimsc§ environment is defined.
@@ -3697,20 +4069,20 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
% §\do@noligs§ which makes sure to not consume following space
% tokens. The \LaTeXe{} version ends with §\char`#1§, which
% leaves \TeX{} still looking for an \mymeta{optional~space}.
-% This version uses \cs{char_generate:nn} to ensure that doesn't
-% happen.
-%
+%^^A This version uses \cs{char_generate:nn} to ensure that doesn't
+%^^A happen.
+%^^A Maintain documentation at this point.
% \begin{macrocode}
-\cs_new:Npn \@@_do_noligs:N #1
+\cs_new_protected:Npn \@@_do_noligs:N #1
{
\char_set_catcode_active:N #1
- \char_set_active_eq:Nc #1 { @@_active_char_ \token_to_str:N #1 : }
\cs_set:cpx { @@_active_char_ \token_to_str:N #1 : }
{
\mode_leave_vertical:
\tex_kern:D \c_zero_dim
- \char_generate:nn { `#1 } { 12 }
+ \tex_char:D `\exp_not:N #1
}
+ \char_set_active_eq:Nc #1 { @@_active_char_ \token_to_str:N #1 : }
}
% \end{macrocode}
% \end{macro}
@@ -3721,7 +4093,8 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
\prg_new_protected_conditional:Npnn \@@_tl_if_head_is_q_mark:n #1
{ T, F, TF }
{
- \if_meaning:w \q_@@_mark #1 \scan_stop:
+ \exp_after:wN \if_meaning:w
+ \exp_after:wN \q_@@_mark \@@_use_i_delimit_by_s_stop:nw #1 ? \s_@@_stop
\prg_return_true:
\else:
\prg_return_false:
@@ -3805,8 +4178,11 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
\cs_new_protected:Npn \@@_meaningsc_internal:nn #1 #2
{
\group_begin:
- \int_set:Nn \l_@@_seq_item_int { 1 }
+ \seq_clear:N \l_@@_seq_item_seq
+ \str_set:Nx \l_@@_cur_seq_name_str {#2}
\tl_if_novalue:nF {#1} { \keys_set:nn { scontents / typemeaning } {#1} }
+ \seq_if_empty:NT \l_@@_seq_item_seq
+ { \seq_set_from_clist:Nn \l_@@_seq_item_seq { 1 } }
\@@_meaningsc:n {#2}
\group_end:
}
@@ -3815,9 +4191,9 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
\cs_new_protected:Npn \@@_meaningsc:n #1
{
\tl_set:Nx \l_@@_temp_tl
- { \exp_args:NV \@@_getfrom_seq:nn \l_@@_seq_item_int {#1} }
+ { \@@_getfrom_seq:Nn \l_@@_seq_item_seq {#1} }
\tl_replace_all:Nxn \l_@@_temp_tl { \iow_char:N \^^J } { ~ }
- \tl_remove_once:NV \l_@@_temp_tl \c_@@_hidden_space_str
+ \tl_replace_all:Nxn \l_@@_temp_tl \c_@@_hidden_space_str { ~ }
\tl_log:N \l_@@_temp_tl
\tl_use:N \l_@@_verb_font_tl
\tl_replace_all:Nnx \l_@@_temp_tl { ^^I } { \@@_tabs_to_spaces: }
@@ -3852,7 +4228,7 @@ Read \Verb{\jobname.tsc} (shows TABs as red arrows):
%</core>
%<*loader>
\NewDocumentCommand \cleanseqsc { m }
- { \seq_clear_new:c { g_@@_name_#1_seq } }
+ { \seq_gclear_new:c { g_@@_name_#1_seq } }
%</loader>
%<*core>
% \end{macrocode}
diff --git a/macros/latex/contrib/scontents/scontents.ins b/macros/latex/contrib/scontents/scontents.ins
index 32b3e52331..39ec569e83 100644
--- a/macros/latex/contrib/scontents/scontents.ins
+++ b/macros/latex/contrib/scontents/scontents.ins
@@ -3,13 +3,13 @@
\askforoverwritefalse
\declarepreamble\standard
-Copyright (C) 2019-2022 by Pablo González L <pablgonz@educarchile.cl>
+Copyright (C) 2019-2024 by Pablo González L <pablgonz@educarchile.cl>
This work may be distributed and/or modified under the conditions of the
LaTeX Project Public License, either version 1.3c of this license or (at
your option) any later version. The latest version of this license is in
- http://www.latex-project.org/lppl.txt
+ https://www.latex-project.org/lppl.txt
and version 1.3c or later is part of all distributions of LaTeX version
2005/12/01 or later.
@@ -33,11 +33,11 @@ and the derived files scontents.sty,
\declarepreamble\context
\string\module
[ file=t-scontents,
- version=2.0,
+ version=2.1,
title=\string\CONTEXT\ User Module,
subtitle=Storing Contents,
author=Pablo González,
- date=2022-04-04,
+ date=2024-06-14,
copyright=Pablo González,
email=pablgonz@educarchile.cl,
license=LPPL]
diff --git a/macros/latex/contrib/scontents/scontents.pdf b/macros/latex/contrib/scontents/scontents.pdf
index 73255df198..44bf07e5ce 100644
--- a/macros/latex/contrib/scontents/scontents.pdf
+++ b/macros/latex/contrib/scontents/scontents.pdf
Binary files differ
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index d9cfcceeac..08cc3090c3 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,9 @@
+2024-06-15 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (nameref.4ht): use \@currentlabelname if \NR:Title
+ is not set.
+ https://tex.stackexchange.com/a/720647/2891
+
2024-06-10 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (babel-sty-hooks.4ht): use \ProvideDocumentCommand
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index 998a21722f..8c5eca3dc9 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1528 2024-06-10 18:18:47Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1529 2024-06-15 17:59:08Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2024 TeX Users Group
@@ -3487,11 +3487,20 @@ configuration until now. It seems to be useful when we need to inject something
into the environment without messing the existing \`|\ConfigureEnv|
definitions.
+% Michal 2024-06-15
+% I've added use of \a:newlabel{\@currentlabelname} if \NR:Type is empty.
+% It seems to add support for name ref labels that are not supported yet
+% We need to empty \NR:Type after \label. I hope this doesn't break anything.
+% https://tex.stackexchange.com/a/720647/2891
+
\<nameref v.2 configurations\><<<
\let\NR:Type\relax
\let\ltx@label\label
-\def\prf:label{{\ifx \NR:Title\:UnDef \else \NR:Title\fi}%
+\def\prf:label{{\ifx \NR:Title\:UnDef \a:newlabel{\@currentlabelname}\else \NR:Title\fi}%
{\ifx \NR:Type\relax \else \NR:Type .1\fi}{}}%
+
+\append:defI\label{\let\NR:Title\undefined}
+
\let\NR:StartSec\:StartSec
\let\NR:no@sect\no@sect
\def\no@sect#1#2#3#4#5#6[#7]#8{\gdef\NR:Title{\a:newlabel{#7}}%
diff --git a/support/latexindent/LatexIndent/GetYamlSettings.pm b/support/latexindent/LatexIndent/GetYamlSettings.pm
index 4d4940371d..6365e0fd93 100644
--- a/support/latexindent/LatexIndent/GetYamlSettings.pm
+++ b/support/latexindent/LatexIndent/GetYamlSettings.pm
@@ -389,36 +389,8 @@ sub yaml_read_settings {
# output the contents of indentconfig to the log file
$logger->info( Dump \%{ $userSettings->[0] } );
- # change the encoding of the paths according to the field `encoding`
- if ( $userSettings and ( ref( $userSettings->[0] ) eq 'HASH' ) and $userSettings->[0]->{encoding} ) {
- use Encode;
- my $encoding = $userSettings->[0]->{encoding};
- my $encodingObject = find_encoding($encoding);
-
- # Check if the encoding is valid.
- if ( ref($encodingObject) ) {
- $logger->info("*Encoding of the paths is $encoding");
- foreach ( @{ $userSettings->[0]->{paths} } ) {
- my $temp = $encodingObject->encode("$_");
- $logger->info("Transform file encoding: $_ -> $temp");
- push( @absPaths, $temp );
- }
- }
- else {
- $logger->warn("*encoding \"$encoding\" not found");
- $logger->warn("Ignore this setting and will take the default encoding.");
- @absPaths = @{ $userSettings->[0]->{paths} };
- foreach ( @{ $userSettings->[0]->{paths} } ) {
- push( @absPaths, $_ );
- }
- }
- }
- else # No such setting, and will take the default
- {
- # $logger->info("*Encoding of the paths takes the default.");
- foreach ( @{ $userSettings->[0]->{paths} } ) {
- push( @absPaths, $_ );
- }
+ foreach ( @{ $userSettings->[0]->{paths} } ) {
+ push( @absPaths, $_ );
}
}
diff --git a/support/latexindent/LatexIndent/Logger.pm b/support/latexindent/LatexIndent/Logger.pm
index 425c8eae07..7c4352a95f 100644
--- a/support/latexindent/LatexIndent/Logger.pm
+++ b/support/latexindent/LatexIndent/Logger.pm
@@ -18,7 +18,7 @@ package LatexIndent::Logger;
use strict;
use warnings;
-use Exporter;
+use Exporter qw/import/;
use LatexIndent::Switches qw/%switches/;
our @ISA = "LatexIndent::Document"; # class inheritance, Programming Perl, pg 321
our @EXPORT_OK = qw/@logFileLines/;
diff --git a/support/latexindent/LatexIndent/Special.pm b/support/latexindent/LatexIndent/Special.pm
index 096d2935c9..8dac47bfc0 100644
--- a/support/latexindent/LatexIndent/Special.pm
+++ b/support/latexindent/LatexIndent/Special.pm
@@ -17,14 +17,14 @@ package LatexIndent::Special;
# For all communication, please visit: https://github.com/cmhughes/latexindent.pl
use strict;
use warnings;
+use Exporter qw/import/;
use LatexIndent::Tokens qw/%tokens/;
use LatexIndent::TrailingComments qw/$trailingCommentRegExp/;
use LatexIndent::GetYamlSettings qw/%mainSettings/;
use LatexIndent::Switches qw/$is_t_switch_active $is_tt_switch_active/;
use LatexIndent::LogFile qw/$logger/;
-use LatexIndent::IfElseFi qw/$ifElseFiBasicRegExp/;
+use LatexIndent::IfElseFi;
use Data::Dumper;
-use Exporter qw/import/;
our @ISA = "LatexIndent::Document"; # class inheritance, Programming Perl, pg 321
our @EXPORT_OK
= qw/find_special construct_special_begin $specialBeginAndBracesBracketsBasicRegExp $specialBeginBasicRegExp/;
diff --git a/support/latexindent/LatexIndent/TrailingComments.pm b/support/latexindent/LatexIndent/TrailingComments.pm
index 9d6532500a..5e47ae3f3f 100644
--- a/support/latexindent/LatexIndent/TrailingComments.pm
+++ b/support/latexindent/LatexIndent/TrailingComments.pm
@@ -27,12 +27,20 @@ our @EXPORT_OK
= qw/remove_trailing_comments put_trailing_comments_back_in $trailingCommentRegExp add_comment_symbol construct_trailing_comment_regexp @trailingComments/;
our @trailingComments;
our $commentCounter = 0;
+our $notPrecededByRegExp;
our $trailingCommentRegExp;
sub construct_trailing_comment_regexp {
- my $notPreceededBy = qr/${${$mainSettings{fineTuning}}{trailingComments}}{notPreceededBy}/;
+ $notPrecededByRegExp = qr/${${$mainSettings{fineTuning}}{trailingComments}}{notPrecededBy}/;
+ my $notPreceededBy = ${${mainSettings{fineTuning}}{trailingComments}}{notPreceededBy};
- $trailingCommentRegExp = qr/$notPreceededBy%$tokens{trailingComment}\d+$tokens{endOfToken}/;
+ if ( $notPreceededBy ) {
+ $logger->warn(
+ "*fineTuning:trailingComments:notPreceededBy is ok for now, but in future versions, fineTuning:trailingComments:notPrecededBy will be used" );
+ $notPrecededByRegExp = qr/$notPreceededBy/;
+ }
+
+ $trailingCommentRegExp = qr/$notPrecededByRegExp%$tokens{trailingComment}\d+$tokens{endOfToken}/;
}
sub add_comment_symbol {
@@ -66,17 +74,16 @@ sub remove_trailing_comments {
$logger->trace("*Storing trailing comments") if $is_t_switch_active;
- my $notPreceededBy = qr/${${$mainSettings{fineTuning}}{trailingComments}}{notPreceededBy}/;
- my $afterComment = qr/${${$mainSettings{fineTuning}}{trailingComments}}{afterComment}/;
+ my $afterComment = qr/${${$mainSettings{fineTuning}}{trailingComments}}{afterComment}/;
# perform the substitution
${$self}{body} =~ s/
- $notPreceededBy # not preceded by a \
- % # %
+ $notPrecededByRegExp # not preceded by a \
+ % # %
(
- $afterComment # anything else
+ $afterComment # anything else
)
- $ # up to the end of a line
+ $ # up to the end of a line
/
# increment comment counter and store comment
$commentCounter++;
@@ -134,14 +141,13 @@ sub put_trailing_comments_back_in {
# replace the line-broken trailing comment ID with a non-broken trailing comment ID
${$self}{body} =~ s/%\R?$trailingcommentIDwithLineBreaksRegExp/%$trailingcommentID/s;
}
- my $notPreceededBy = qr/${${$mainSettings{fineTuning}}{trailingComments}}{notPreceededBy}/;
if (${$self}{body} =~ m/%$trailingcommentID
(
- (?! # not immediately preceded by
- $notPreceededBy # \
- % # %
+ (?! # not immediately preceded by
+ $notPrecededByRegExp # \
+ % # %
).*?
- ) # captured into $1
+ ) # captured into $1
(\h*)?$
/mx and $1 ne ''
)
diff --git a/support/latexindent/LatexIndent/UTF8CmdLineArgsFileOperation.pm b/support/latexindent/LatexIndent/UTF8CmdLineArgsFileOperation.pm
index 45a2b6f538..d6d8b595c0 100644
--- a/support/latexindent/LatexIndent/UTF8CmdLineArgsFileOperation.pm
+++ b/support/latexindent/LatexIndent/UTF8CmdLineArgsFileOperation.pm
@@ -5,22 +5,39 @@ use warnings;
use feature qw( say state );
use utf8;
use Config qw( %Config );
-use Encode qw( decode encode );
+use Encode qw(find_encoding decode encode );
use Exporter qw/import/;
our @EXPORT_OK
= qw/commandlineargs_with_encode @new_args copy_with_encode exist_with_encode open_with_encode zero_with_encode read_yaml_with_encode isdir_with_encode mkdir_with_encode/;
+our $encodingObject;
+
+if ($^O eq 'MSWin32') {
+ my $encoding_sys = 'cp' . Win32::GetACP();
+ $encodingObject = find_encoding( $encoding_sys );
+
+ # Check if the encoding is valid.
+ unless ( ref($encodingObject) ) {
+ $encodingObject = find_encoding( 'utf-8' );
+ }
+}
+else {
+ $encodingObject = find_encoding( 'utf-8' );
+}
+
sub copy_with_encode {
use File::Copy;
my ( $source, $destination ) = @_;
- if ( $FindBin::Script eq 'latexindent.exe' ) {
+ if ( $FindBin::Script =~ /\.exe$/ ) {
require Win32::Unicode::File;
Win32::Unicode::File->import(qw(copyW));
copyW( $source, $destination, 1 );
}
else {
+ $source = $encodingObject->encode($source);
+ $destination = $encodingObject->encode($destination);
copy( $source, $destination );
}
}
@@ -28,12 +45,13 @@ sub copy_with_encode {
sub exist_with_encode {
my ($filename) = @_;
- if ( $FindBin::Script eq 'latexindent.exe' ) {
+ if ( $FindBin::Script =~ /\.exe$/ ) {
require Win32::Unicode::File;
Win32::Unicode::File->import(qw(statW));
return statW($filename);
}
else {
+ $filename = $encodingObject->encode($filename);
return -e $filename;
}
}
@@ -41,7 +59,7 @@ sub exist_with_encode {
sub zero_with_encode {
my ($filename) = @_;
- if ( $FindBin::Script eq 'latexindent.exe' ) {
+ if ( $FindBin::Script =~ /\.exe$/ ) {
require Win32::Unicode::File;
Win32::Unicode::File->import(qw(file_size));
my $size = file_size($filename);
@@ -53,6 +71,7 @@ sub zero_with_encode {
}
}
else {
+ $filename = $encodingObject->encode($filename);
return -z $filename;
}
}
@@ -62,7 +81,7 @@ sub open_with_encode {
my $filename = shift;
my $fh;
- if ( $FindBin::Script eq 'latexindent.exe' ) {
+ if ( $FindBin::Script =~ /\.exe$/ ) {
require Win32::Unicode::File;
Win32::Unicode::File->import;
$fh = Win32::Unicode::File->new;
@@ -74,6 +93,7 @@ sub open_with_encode {
}
}
else {
+ $filename = $encodingObject->encode($filename);
if ( open( $fh, $mode, $filename ) ) {
return $fh;
}
@@ -95,13 +115,14 @@ sub read_yaml_with_encode {
sub isdir_with_encode {
my $path = shift;
- if ( $FindBin::Script eq 'latexindent.exe' ) {
+ if ( $FindBin::Script =~ /\.exe$/ ) {
require Win32::Unicode::File;
Win32::Unicode::File->import(qw(file_type));
return file_type( 'd', $path );
}
else {
+ $path = $encodingObject->encode($path);
return -d $path;
}
}
@@ -109,7 +130,7 @@ sub isdir_with_encode {
sub mkdir_with_encode {
my $path = shift;
- if ( $FindBin::Script eq 'latexindent.exe' ) {
+ if ( $FindBin::Script =~ /\.exe$/ ) {
require Win32::Unicode::Dir;
Win32::Unicode::Dir->import(qw(mkdirW));
@@ -118,7 +139,7 @@ sub mkdir_with_encode {
else {
require File::Path;
File::Path->import(qw(make_path));
-
+ $path = $encodingObject->encode($path);
make_path($path);
}
}
@@ -126,7 +147,7 @@ sub mkdir_with_encode {
#https://stackoverflow.com/a/63868721
#https://stackoverflow.com/a/44489228
sub commandlineargs_with_encode {
- if ( $FindBin::Script eq 'latexindent.exe' ) {
+ if ( $FindBin::Script =~ /\.exe$/ ) {
require Win32::API;
import Win32::API qw( ReadMemory );
@@ -207,7 +228,6 @@ sub commandlineargs_with_encode {
@ARGV = @{$args};
}
else {
- my $encodingObject = "utf-8";
@ARGV = map { decode( $encodingObject, $_ ) } @ARGV;
our @new_args = @ARGV;
}
diff --git a/support/latexindent/LatexIndent/Version.pm b/support/latexindent/LatexIndent/Version.pm
index 0198585f92..5232967fb9 100644
--- a/support/latexindent/LatexIndent/Version.pm
+++ b/support/latexindent/LatexIndent/Version.pm
@@ -20,6 +20,6 @@ use warnings;
use Exporter qw/import/;
our @EXPORT_OK = qw/$versionNumber $versionDate/;
-our $versionNumber = '3.24.1';
-our $versionDate = '2024-05-12';
+our $versionNumber = '3.24.2';
+our $versionDate = '2024-06-15';
1
diff --git a/support/latexindent/README b/support/latexindent/README
index ec2f300c52..0b58c4ee72 100644
--- a/support/latexindent/README
+++ b/support/latexindent/README
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- latexindent.pl, version 3.24.1, 2024-05-12
+ latexindent.pl, version 3.24.2, 2024-06-15
PERL script to indent code within environments, and align delimited
environments in .tex files.
diff --git a/support/latexindent/bin/linux/latexindent b/support/latexindent/bin/linux/latexindent
index f2077b8920..00a6b1c1ae 100644
--- a/support/latexindent/bin/linux/latexindent
+++ b/support/latexindent/bin/linux/latexindent
Binary files differ
diff --git a/support/latexindent/bin/macos/latexindent b/support/latexindent/bin/macos/latexindent
index 884fcefe84..649392d07e 100644
--- a/support/latexindent/bin/macos/latexindent
+++ b/support/latexindent/bin/macos/latexindent
Binary files differ
diff --git a/support/latexindent/defaultSettings.yaml b/support/latexindent/defaultSettings.yaml
index 80120978ed..15073c2f98 100644
--- a/support/latexindent/defaultSettings.yaml
+++ b/support/latexindent/defaultSettings.yaml
@@ -1,5 +1,5 @@
#
-# latexindent.pl, version 3.24.1, 2024-05-12
+# latexindent.pl, version 3.24.2, 2024-06-15
#
# defaultSettings.yaml, the default settings for latexindent.pl
#
@@ -649,7 +649,7 @@ fineTuning:
before: (?:#\d\h*;?,?\/?)+|\<.*?\>
between: _|\^|\*
trailingComments:
- notPreceededBy: (?<!\\)
+ notPrecededBy: (?<!\\)
afterComment: .*?
modifyLineBreaks:
doubleBackSlash: \\\\(?:\h*\[\h*\d+\h*[a-zA-Z]+\h*\])?
diff --git a/support/latexindent/documentation/contributors.bib b/support/latexindent/documentation/contributors.bib
index 2da6ea818d..49fc2debe7 100644
--- a/support/latexindent/documentation/contributors.bib
+++ b/support/latexindent/documentation/contributors.bib
@@ -224,3 +224,14 @@
author = "Jesse Stricker",
urldate = {2023-07-12},
keywords = {contributor},}
+
+%
+% 2024
+%
+@online{fengzyf,
+ title = "Encoding work",
+ url = "https://github.com/cmhughes/latexindent.pl/pull/548",
+ date = {2024-06-15},
+ author = "fengzyf",
+ urldate = {2024-06-15},
+ keywords = {contributor},}
diff --git a/support/latexindent/documentation/latexindent-yaml-schema.json b/support/latexindent/documentation/latexindent-yaml-schema.json
index 65c9fd1d9c..8f457e916f 100644
--- a/support/latexindent/documentation/latexindent-yaml-schema.json
+++ b/support/latexindent/documentation/latexindent-yaml-schema.json
@@ -2,7 +2,7 @@
"$schema": "http://json-schema.org/schema",
"$id": "latexindent-yaml-schema.json",
"title": "latexindent.pl YAML schema",
- "description": "latexindent.pl YAML schema helper, V3.24.1 2024-05-12",
+ "description": "latexindent.pl YAML schema helper, V3.24.2 2024-06-15",
"type": "object",
"properties": {
"fileExtensionPreference": {
@@ -1496,10 +1496,15 @@
"description": "fine tuning, for trailing comments",
"type": "object",
"properties": {
- "notPreceededBy": {
+ "notPrecededBy": {
"description": "regular expression for what can NOT come before %, for example \\%",
"type": "string"
},
+ "notPreceededBy": {
+ "description": "please use notPrecededBy instead",
+ "type": "string",
+ "deprecated": true
+ },
"afterComment": {
"description": "regular expression for what can come after %",
"type": "string"
diff --git a/support/latexindent/documentation/latexindent.pdf b/support/latexindent/documentation/latexindent.pdf
index 770e9c5498..60f57e8d37 100644
--- a/support/latexindent/documentation/latexindent.pdf
+++ b/support/latexindent/documentation/latexindent.pdf
Binary files differ
diff --git a/support/latexindent/documentation/latexindent.tex b/support/latexindent/documentation/latexindent.tex
index fc96a1db9a..e5a2ae3b16 100644
--- a/support/latexindent/documentation/latexindent.tex
+++ b/support/latexindent/documentation/latexindent.tex
@@ -859,6 +859,9 @@
throughout this document for details}.
\subsection{Quick start}\label{sec:quickstart}
+ When \texttt{latexindent.pl} reads and writes files, the files are read and written in UTF-8 format by default.
+ That is to say, the encoding format for tex and yaml files needs to be in UTF-8 format.
+
If you'd like to get started with \texttt{latexindent.pl} then simply type
\begin{commandshell}
@@ -1224,6 +1227,10 @@ perl latexindent-module-installer.pl
written to \texttt{indent.log}, but other additional information will be written
depending on which of the following options are used.
+ When using \texttt{latexindent.pl} in different ways on different systems, the range of
+ characters supported by its switches/flags/options may vary. We discuss these in Section
+ \cref{app:encoding}.
+
\flagbox{-v, --version}
\index{switches!-v, --version definition and details}
\announce{2017-06-25}{version}
@@ -1865,17 +1872,6 @@ latexindent.pl myfile.tex
\texttt{latexindent.yaml} and friends settings files. This can lead to creative nesting
of configuration files; a demonstration is given in \vref{sec:appendix:paths}.
- If you find that \announce{2021-06-19}{encoding option for indentconfig.yaml}
- \texttt{latexindent.pl} does not read your YAML file, then it might be as a result of
- the default commandline encoding not being UTF-8; normally this will only occur for
- Windows users. In this case, you might like to explore the \texttt{encoding} option for
- \texttt{indentconfig.yaml} as demonstrated in \cref{lst:indentconfig-encoding}.%
-
- \cmhlistingsfromfile[style=yaml-LST]{demonstrations/encoding.yaml}[yaml-TCB]{The \texttt{encoding} option for \texttt{indentconfig.yaml}}{lst:indentconfig-encoding}
-
- Thank you to \cite{qiancy98} for this contribution; please see \vref{app:encoding} and
- details within \cite{encoding} for further information.
-
\subsection{localSettings.yaml and friends}\label{sec:localsettings}
The \texttt{-l} switch tells \texttt{latexindent.pl} to look for
\texttt{localSettings.yaml} and/or friends in the \emph{same directory} as
@@ -8567,8 +8563,8 @@ perl latexindent-module-installer.pl
\begin{commandshell}
sudo apt-get install perlbrew
perlbrew init
-perlbrew install perl-5.34.0
-perlbrew switch perl-5.34.0
+perlbrew install perl-5.39.1
+perlbrew switch perl-5.39.1
sudo apt-get install curl
curl -L http://cpanmin.us | perl - App::cpanminus
cpanm YAML::Tiny
@@ -8614,21 +8610,19 @@ sudo apt install texlive-extra-utils
\index{latexindent-linux} \index{linux} \index{TeXLive}
\paragraph{Arch-based distributions}
- First install the dependencies
+ \texttt{latexindent} is included in Arch-packaged TeX Live, and can be installed by:
\begin{commandshell}
-sudo pacman -S perl cpanminus
+sudo pacman -S texlive-binextra perl-yaml-tiny perl-file-homedir
\end{commandshell}
- In addition, install \texttt{perl-file-homedir} from AUR, using your AUR helper of
- choice,
+ To enable optional \texttt{--GCString} switch, install
+ \texttt{perl-unicode-linebreak}:
\begin{commandshell}
-sudo paru -S perl-file-homedir
+sudo pacman -S perl-unicode-linebreak
\end{commandshell}
- then run the latexindent-module-installer.pl file located at helper-scripts/
-
\paragraph{Alpine}
If you are using Alpine, some \texttt{Perl} modules are not build-compatible with
Alpine, but replacements are available through \texttt{apk}. For example, you might
@@ -9427,21 +9421,33 @@ TRACE: Searching myenv for optional and mandatory arguments
and \lstinline!-----! respectively.
\end{example}
- \section{Encoding indentconfig.yaml}\label{app:encoding}
- In relation to \vref{sec:indentconfig}, Windows users that encounter encoding issues
- with \texttt{indentconfig.yaml}, may wish to run the following command in either
- \texttt{cmd.exe} or \texttt{powershell.exe}:
+ \section{Encoding}\label{app:encoding}
+
+ When using latexindent in different ways on different systems, the range of characters
+ supported by its switches/flags/options (see \vref{sec:commandline}) may vary.
+
+ For the Windows executable file \texttt{latexindent.exe}, its options support UTF-8
+ characters.
+
+ For the Windows Perl script \texttt{latexindent.pl}, its option switch supports the
+ characters supported by the encoding corresponding to the system code page. You can
+ check the system code page by running the following command in either \texttt{cmd.exe}
+ or \texttt{powershell.exe}:
\begin{dosprompt}
-chcp
- \end{dosprompt}
- They may receive the following result
+ chcp
+ \end{dosprompt}
+ which may receive the following result
\begin{dosprompt}
-Active code page: 936
- \end{dosprompt}
- and can then use the settings given in \cref{lst:indentconfig-encoding1} within their
- \texttt{indentconfig.yaml}, where 936 is the result of the \texttt{chcp} command.
-
- \cmhlistingsfromfile[style=yaml-LST]{demonstrations/encoding1.yaml}[yaml-TCB]{\texttt{encoding} demonstration for \texttt{indentconfig.yaml}}{lst:indentconfig-encoding1}
+ Active code page: 936
+ \end{dosprompt}
+ and then the characters supported by the code page can be found in \href{Microsoft's
+ code page identifier
+ table}{https://learn.microsoft.com/en-us/windows/win32/intl/code-page-identifiers}. For
+ example, the characters supported by the encoding corresponding to code page 936 are:
+ ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312).
+
+ For Ubuntu Linux and macOS users, whether using the Perl script or the executable file,
+ the options support UTF-8 characters.
\section{dos2unix linebreak adjustment}
diff --git a/support/latexindent/latexindent.pl b/support/latexindent/latexindent.pl
index 36855f46e3..c85bdf2047 100755
--- a/support/latexindent/latexindent.pl
+++ b/support/latexindent/latexindent.pl
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
#
-# latexindent.pl, version 3.24.1, 2024-05-12
+# latexindent.pl, version 3.24.2, 2024-06-15
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 1974e3cafd..d3fb8e0e41 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -9,6 +9,7 @@ $mirrors = {
},
'Asia' => {
'China' => {
+ 'https://mirror.bjtu.edu.cn/CTAN/' => 1,
'https://mirror.nyist.edu.cn/CTAN/' => 1,
'https://mirrors.aliyun.com/CTAN/' => 1,
'https://mirrors.bfsu.edu.cn/CTAN/' => 1,
@@ -38,6 +39,7 @@ $mirrors = {
},
'Japan' => {
'http://ring.airnet.ne.jp/archives/text/CTAN/' => 1,
+ 'https://ftp.jaist.ac.jp/pub/CTAN/' => 1,
'https://ftp.kddilabs.jp/CTAN/' => 1,
'https://ftp.yz.yamagata-u.ac.jp/pub/CTAN/' => 1,
'https://jp.mirrors.cicku.me/ctan/' => 1,
@@ -68,6 +70,10 @@ $mirrors = {
'Belarus' => {
'https://mirror.datacenter.by/pub/mirrors/CTAN/' => 1,
},
+ 'Bulgaria' => {
+ 'https://mirrors.neterra.net/CTAN/' => 1,
+ 'https://mirrors.netix.net/CTAN/' => 1,
+ },
'Czech Republic' => {
'http://ftp.cvut.cz/tex-archive/' => 1,
'https://mirrors.nic.cz/tex-archive/' => 1,
@@ -133,7 +139,6 @@ $mirrors = {
'Poland' => {
'https://ctan.gust.org.pl/tex-archive/' => 1,
'https://polish-mirror.evolution-host.com/ctan/' => 1,
- 'https://sunsite.icm.edu.pl/pub/CTAN/' => 1,
},
'Portugal' => {
'https://ftp.eq.uc.pt/software/TeX/' => 1,
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 49b00e30fb..b7c060e732 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,7 +26,7 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2024
-depend revision/71528
+depend revision/71537
name 00texlive.image
category TLCore
@@ -4913,7 +4913,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 71528
+revision 71537
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
@@ -186927,17 +186927,17 @@ catalogue-topics version-control doc-mgmt
name latexindent
category Package
-revision 71245
+revision 71532
shortdesc Indent a LaTeX document, highlighting the programming structure
longdesc The Perl script processes a LaTeX file, indenting parts so as
longdesc to highlight the structure for the reader. Included are also
longdesc binary (executable) files for Windows, Ubuntu Linux, and macOS.
depend latexindent.ARCH
-containersize 76412
-containerchecksum b696b07137914f78cf523aa5d9364024729894aa1c61d6a61ae575f964c85ccf8f4c89c60c7c2adb2f340b88ddcc2979994826684ac469a35ed8722cd6f649b7
-doccontainersize 1373928
-doccontainerchecksum 866152a59dd9a5dea0e82c9a00a5840df143b1164300c8668e8fc58b949fc93b34f676f76f3fcdd1bf35cf6012da137c44043cd3a76caad60b0101030a1f53de
-docfiles size=460
+containersize 76472
+containerchecksum 38bd3fe5c0b918350af0c730e148110d2bfb20e828cdf32dc281b0082a67a1c840cd6ba4eb433e59264a9b111f07f86d32bfa05de17b17bdca5593cf111390e0
+doccontainersize 1372876
+doccontainerchecksum cfe890d0534d99bea034281ce68df79f5b3c3af5999da52793f790fe8b0b32037cf2fff4f6454149c8bbac89c1a8032f02ee4592890a770674404e67e7b10770
+docfiles size=461
texmf-dist/doc/support/latexindent/README details="Readme"
texmf-dist/doc/support/latexindent/contributors.bib
texmf-dist/doc/support/latexindent/figure-schematic.png
@@ -186997,7 +186997,7 @@ catalogue-contact-repository https://github.com/cmhughes/latexindent.pl
catalogue-ctan /support/latexindent
catalogue-license gpl3
catalogue-topics code-layout
-catalogue-version 3.24.1
+catalogue-version 3.24.2
name latexindent.aarch64-linux
category Package
@@ -187082,11 +187082,11 @@ binfiles arch=universal-darwin size=1
name latexindent.windows
category Package
-revision 71245
+revision 71532
shortdesc windows files of latexindent
-containersize 3853220
-containerchecksum c2ce9c54239e95a6edd0fc0512516c65eea1fd9d5753b1c90b6bfb88bf601310bfd11ed1e31285c83921c2bf98f8566bb36488623e0827b467916e3f8bbfddcb
-binfiles arch=windows size=2312
+containersize 3859712
+containerchecksum 89bdff573ad1ec538b80b4b4fb7629aeb39333a651ec1ba30550d21139797d5485cee980cc428c1a9b1d0b7c27e909f63a2b050c8fc0e4eec01bb5670a723206
+binfiles arch=windows size=2315
bin/windows/latexindent.exe
name latexindent.x86_64-cygwin
@@ -276117,16 +276117,16 @@ catalogue-topics font-cjk
name ptex-manual
category Package
-revision 68147
+revision 71534
shortdesc Japanese pTeX manual
relocated 1
longdesc This package contains the Japanese pTeX manual. Feedback is
longdesc welcome!
containersize 392
-containerchecksum ffad7c7c67e7c6c92ec7b814cba8ca8cd7fc9935d5b6c7f685ee83b97cca56ac410ee2c15f8d86f4bbf443508f2e2224603c9abc64e734451ee94ce968425d62
-doccontainersize 3035368
-doccontainerchecksum dc2643c258a98410d9a456e16794d70bf6de6e1a40b8db2bcf7fb40e20953bbe482cb26cf3e65b0caa19806e915cfdd3787ddcbf69108e2af0d83e03d3b0104b
-docfiles size=865
+containerchecksum 0b73845dd889b31bc8e24fa9ea2f614eb9f568bc79d789de1e5d8f36bc4f6d8f0b7e8e216bb76cfd3d255c3701e7615f832b389ac34dd8e8289bc5e186bff199
+doccontainersize 3053112
+doccontainerchecksum 7e1c447f93d57adc54bb10fee6b4ac253058294d2d213c92c90a99bf2407f2f1ed9f8d69b3cf0a4b4ceb20089204bf108bdbb0b7daed811d0bec16ddeee60bae
+docfiles size=872
RELOC/doc/ptex/ptex-manual/LICENSE
RELOC/doc/ptex/ptex-manual/README.md details="Readme"
RELOC/doc/ptex/ptex-manual/eptex_resume.pdf
@@ -293726,36 +293726,36 @@ catalogue-version 0.1
name scontents
category Package
-revision 62902
+revision 71533
shortdesc Stores LaTeX contents in memory or files
relocated 1
longdesc This package stores valid LaTeX code in memory (sequences)
longdesc using the l3seq module of expl3. The stored content (including
longdesc verbatim) can be used as many times as desired in the document,
longdesc additionally can be written to external files if desired.
-containersize 8172
-containerchecksum 692fbbe0cfe9153bb4782eabe8f1713e646d5a93d4b1b2fe0f7662bd995bfae25b8200acb9eccd0057b53bff7c33c0f9ff621cd37596e9aa4cd51f84c2a30dc7
-doccontainersize 367028
-doccontainerchecksum f978650de27e8306d70612331c2c98b5e0c047bbf91908c9968c6d613311c034dd00816afdc30b63d7673a8627651467af64a99fb7fd3978947113f8fb6eb563
-docfiles size=96
+containersize 9164
+containerchecksum 39b17762b4803864c40e1d32b5b1ed5c60dab7e902858c2009e6b915c79f2132f01d5d7043c3d2f0a10dc853c236b2d7e5ac0b16def5e326a678c3fa21a0e07e
+doccontainersize 405976
+doccontainerchecksum aabf3b39218e4c9157b4418b5c5e702123a608933aa5fb30406aa860c01d1edd1861842b817dff274f7862c413f8a8953c731638794674afa80915d12d47682b
+docfiles size=106
RELOC/doc/latex/scontents/README.md details="Readme"
RELOC/doc/latex/scontents/scontents.pdf details="Package documentation"
-srccontainersize 29640
-srccontainerchecksum d23c98c16b7f60a1a77c0dba32eb7886f5834c1d05455a172f38f984c7bb61ffc84bae147fa7d143c196179fd719887b160718e04ff3474c5ef176af4d99165a
-srcfiles size=34
+srccontainersize 31868
+srccontainerchecksum cec5f2c0e7b043a53e0f25480ad22ef6df1a39ac0f07335e81a8a53fbfd0821a1f482aef4fbe8a077e6def0e3a22a11580b9361c8643e4cd33fd34babf620114
+srcfiles size=38
RELOC/source/latex/scontents/scontents.dtx
RELOC/source/latex/scontents/scontents.ins
-runfiles size=14
+runfiles size=17
RELOC/tex/context/third/scontents/t-scontents.mkiv
RELOC/tex/generic/scontents/scontents-code.tex
RELOC/tex/generic/scontents/scontents.tex
RELOC/tex/latex/scontents/scontents.sty
-catalogue-contact-bugs https://github.com/pablgonz/scontents/issues
catalogue-contact-repository https://github.com/pablgonz/scontents
+catalogue-contact-support https://github.com/pablgonz/scontents/issues
catalogue-ctan /macros/latex/contrib/scontents
catalogue-license lppl1.3c
catalogue-topics file-mgmt expl3
-catalogue-version 2.0
+catalogue-version 2.1
name scrabble
category Package
@@ -315313,7 +315313,7 @@ binfiles arch=x86_64-solaris size=1
name tex4ht
category Package
-revision 71480
+revision 71536
shortdesc Convert (La)TeX to HTML/XML
longdesc A converter from TeX and LaTeX to SGML-based formats such as
longdesc (X)HTML, MathML, OpenDocument, and Docbook, providing a
@@ -315334,10 +315334,10 @@ longdesc files from them is nontrivial, and generally done with the
longdesc Makefile in development, from which the TeX4ht package in TeX
longdesc Live is updated.
depend tex4ht.ARCH
-containersize 1133076
-containerchecksum 8a38cd293026c446db173e253e576eed2a2e3cebd6a51efc0bdcbb671cb3b26bdcde4da268c761e0ab022eb5dca2ceb23ba2a41e09b321c45c4901d0e9e6abdc
+containersize 1132948
+containerchecksum f26d226f9fc7f77ea7b78e78356247bf1bc3d6abe90eae89f69d1a15c8ccdda6061b25c3b07fb39f589dda144afd0a9e14ae84b86c9ff653099c212a3b5754dc
doccontainersize 136384
-doccontainerchecksum f175b46d45b4b6b7863d93ea825b780e0294c46b56ab5fd664815a6c9ce07bc83ebe9b1c27b8a07620c468b57bb88590ebec2c71fc000c33cc123cba090a4d2e
+doccontainerchecksum 9568216343b49af0afc6eac98bd9af946369aefc253f47a1c9dfa248afc207405acc11d83af7bf802b8eda32375b7d801da71472f0a26d221f5a5d8e83e49744
docfiles size=260
texmf-dist/doc/generic/tex4ht/Makefile
texmf-dist/doc/generic/tex4ht/README details="Readme"
@@ -315409,8 +315409,8 @@ docfiles size=260
texmf-dist/doc/generic/tex4ht/mn56.html
texmf-dist/doc/generic/tex4ht/mn5x.png
texmf-dist/doc/generic/tex4ht/mn6x.png
-srccontainersize 1487096
-srccontainerchecksum d901929025f192cf6330e4076838a9c0f09ea3960494a46f1ea69e7e363f7d27ad078bc84ccdb8122ee319273f9005c868c009a7506ae211056c4db0bbfbb0b6
+srccontainersize 1493684
+srccontainerchecksum fc11cf7311929a1ad27cdd962309c420f3011ffc1be7bdfd1be9a42d5766e5ff8da3cdd8058a3754ba3fae9919654be176dea093d42f5ad3e2216109c09a2ba5
srcfiles size=4651
texmf-dist/source/generic/tex4ht/ChangeLog
texmf-dist/source/generic/tex4ht/Makefile
@@ -327842,7 +327842,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 71528
+revision 71537
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.
@@ -327850,10 +327850,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 114376
-containerchecksum 105323f3bbcffba47dcc9d159a22f7e2510aee07325ac72d7267b36bb6b73ed2abe7580b3052093e2405ba6cd7c54b9366145d4893be3be63bd8f6302c943594
-doccontainersize 436256
-doccontainerchecksum 32cfb016c34575362812e17c07e15f70b337c7930726746b731eaac94921791494bf7407330baf974838d4052634a8deb72b6336eeef176e9e5881236642d999
+containersize 114392
+containerchecksum ef3ede9ea41668d9734b1ab29a69d0f2d4c3daff26da4c7364bd5dc2a506db870fb5d2ef5abbdc95b1fb33b8a99324f6cbae36a668b549855f2af935024264dd
+doccontainersize 436220
+doccontainerchecksum c8812c8b7b0c12e057dfdc1838af6679d048daf73c62f357fe29842ffc229c7725f4bd9f9433665a9029b27ffbd1a2bed161fd2544e1349cbade73fa89e647da
docfiles size=571
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
@@ -337215,7 +337215,7 @@ catalogue-version 2.0
name tkz-grapheur
category Package
-revision 71476
+revision 71535
shortdesc A LaTeX package with tools for graph plotting (and TikZ)
relocated 1
longdesc This package provides some commands to help French mathematics
@@ -337224,11 +337224,11 @@ longdesc and draw functions and interpolations curves work with
longdesc integrals, tangents, intersersections get coordinates of points
longdesc ... The syntax is rather explicit, like \DefinirCourbe,
longdesc \RecupererCoordonnees,\TrouverIntersections, etc.
-containersize 11728
-containerchecksum 331d02d4100c7512780d8fceaaa072246e5622fc21c7d9800777818a141287ad85a6b337c99f8f85a758161b7e8be680af3222825e6e84a4effa121276972d5d
-doccontainersize 903332
-doccontainerchecksum 8c10a600e650b8eb29bc368ce3eac1ed20345dc9a0f4fa683c62a7a40aac0b58302e184b4b28629062703b485fc6dd46cdec5fa703e7ff372110e55923746dfb
-docfiles size=245
+containersize 11868
+containerchecksum 1e974db21b4c486244500484fe2c6d95d9466286e428da2e63772fd6a5733b40dc0b417b5ffe07f176afb81178714d4a702043ea91a256ea6478461d29f8d76b
+doccontainersize 936388
+doccontainerchecksum 657765b734d83107702b54103693b3be379bb409be087436d086ae637b2b07080a752986bea09b37019b25a10e8221cad8f4ba34a9d2a5e76df50cbf02bdb957
+docfiles size=254
RELOC/doc/latex/tkz-grapheur/README.md details="Readme"
RELOC/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.pdf details="Package documentation"
RELOC/doc/latex/tkz-grapheur/tkz-grapheur-doc-fr.tex
@@ -337236,12 +337236,11 @@ docfiles size=245
RELOC/doc/latex/tkz-grapheur/tkz-grapheur-exemples-integrales.tex
runfiles size=19
RELOC/tex/latex/tkz-grapheur/tkz-grapheur.sty
-catalogue-contact-home https://forge.apps.education.fr/pierquetcedric/package-latex-tkz-grapheur
catalogue-contact-repository https://forge.apps.education.fr/pierquetcedric/package-latex-tkz-grapheur
catalogue-ctan /graphics/pgf/contrib/tkz-grapheur
catalogue-license lppl1.3c
-catalogue-topics graphics maths pgf-tikz
-catalogue-version 0.1.3
+catalogue-topics graphics maths graphics-plotfn pgf-tikz
+catalogue-version 0.1.4
name tkz-orm
category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 949bcd334b..dfdf1c1a73 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-f2be80cbf6dfc67800b2dbc72c5317ea texlive.tlpdb
+26a0304b1472e7411e6d5c3d3b49cb16 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 613ddbb661..9f729e76c5 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-f8c1c2cf7a3018e970033314492a377b37dfa9d5ec58844c72f385451130fe6d4b70bc5c645a529f9e08645aea5477b308ee26a37f7dab1ec8594566de32dfd7 texlive.tlpdb
+ef21442d6710c9c858dce73b70ce5969022758b8d06c00b78a74a68eec74190166b8e2bfb7ebaa21c104c796776973c12950fd0960b56d8c07ffc1a88ab15ef6 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 706f9fa52a..a3a4f293a4 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
@@ -1,11 +1,11 @@
-----BEGIN PGP SIGNATURE-----
-iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmZs1sQACgkQTOGHfhlD
-jHCh0wf/XToZRwJYEDQyn7I482QFiMguobtfIqe2MLxrgftKfK/iOG2/QCkDqOex
-FBhcuqM+yxzbziYS2upnu3MLdzOVS63KtbxjoOMmqwxURaWz3p9BAJz2Bo5hzHxX
-n3KXNqGavQTkX+vWYO/NKANA7hpCT29I5rafWAkQmyXvglPpK7SAZgpYUaGTxAep
-u9MuVZmqVKL5la8GYyp1lFVxmXxuxQg89AAS64IEvI8yh8JvsVjyuzOOOFPJEiw6
-xEg1NfRkS+UC9Zm9h/5NAOnsQ90dMxg2ZrXjthJ0EZWjfgkt9GI9jOgqIZB2rXM2
-HbmVl/wEddNLsrZ2Ypq7fK6GP8809g==
-=+WCL
+iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmZuKgUACgkQTOGHfhlD
+jHA2Egf/RWGffiIioOXMPUIKCEYNflOTpd3otp7M3fYEYjRVGZPEytV8bqbiSmM7
+jVQUCa0LQ+bz+z6TY+B5zKvY73oJlLae8BMXpudqkv3pcl1v2ha2Qx1VDfWD2RY4
+2eAbCzXM7jdLavXr1yvee/xfuA0ztBcQXqccoBkkRMrESgqTLwalLctQkA/lIDxW
+p2SAdCHOAyABsjMk/hbjKjSvrNZE3RP2zZIGaIPN2r8G5pT6L+hCUIxguUnkiXgo
+5X6EvM7iO7SQgJ6uAmBuUjyjI3CBdggQVpeX2Bqa/5VRK9Xe6DwCurrGDSRQya4D
+xU4sUqf1XkSuN2ufK0vLVcY+wbpiXA==
+=lbtr
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index d39c961d18..98b83ddf05 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/timestamp b/timestamp
index fa03b86da1..0b54017207 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:
-2024-06-15-02-02
+2024-06-16-02-02