summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-08-26 03:00:52 +0000
committerNorbert Preining <norbert@preining.info>2023-08-26 03:00:52 +0000
commit2c6f7db39402a9980f7423ed3266ad1d18936bcc (patch)
treeb998126ee1c53cfee553777049066ea4b50244f4
parentba73c7edc85ac1310d82920c5f432993f8a9af23 (diff)
CTAN sync 202308260300
-rw-r--r--FILES.byname353
-rw-r--r--FILES.byname.gzbin2543658 -> 2543764 bytes
-rw-r--r--FILES.last07days240
-rw-r--r--biblio/ctan-bibdata/ctan.bib29
-rw-r--r--biblio/ctan-bibdata/ctan.pdfbin3698854 -> 3697834 bytes
-rw-r--r--fonts/parsianfonts/Parsian/Parsian-Bold.ttfbin0 -> 264912 bytes
-rw-r--r--fonts/parsianfonts/Parsian/Parsian-BoldItalic.ttfbin0 -> 282112 bytes
-rw-r--r--fonts/parsianfonts/Parsian/Parsian-Italic.ttfbin0 -> 279632 bytes
-rw-r--r--fonts/parsianfonts/Parsian/Parsian-Regular.ttfbin0 -> 269712 bytes
-rw-r--r--fonts/parsianfonts/ParsianMono/ParsianMono-Bold.ttfbin0 -> 287296 bytes
-rw-r--r--fonts/parsianfonts/ParsianMono/ParsianMono-BoldItalic.ttfbin0 -> 323884 bytes
-rw-r--r--fonts/parsianfonts/ParsianMono/ParsianMono-Italic.ttfbin0 -> 326360 bytes
-rw-r--r--fonts/parsianfonts/ParsianMono/ParsianMono-Regular.ttfbin0 -> 266424 bytes
-rw-r--r--fonts/parsianfonts/ParsianNaskh/ParsianNaskh-Bold.ttfbin0 -> 273052 bytes
-rw-r--r--fonts/parsianfonts/ParsianNaskh/ParsianNaskh-BoldItalic.ttfbin0 -> 291544 bytes
-rw-r--r--fonts/parsianfonts/ParsianNaskh/ParsianNaskh-Italic.ttfbin0 -> 288828 bytes
-rw-r--r--fonts/parsianfonts/ParsianNaskh/ParsianNaskh-Regular.ttfbin0 -> 276860 bytes
-rw-r--r--fonts/parsianfonts/ParsianSans/ParsianSans-Bold.ttfbin0 -> 199220 bytes
-rw-r--r--fonts/parsianfonts/ParsianSans/ParsianSans-BoldItalic.ttfbin0 -> 212256 bytes
-rw-r--r--fonts/parsianfonts/ParsianSans/ParsianSans-Italic.ttfbin0 -> 209160 bytes
-rw-r--r--fonts/parsianfonts/ParsianSans/ParsianSans-Regular.ttfbin0 -> 195532 bytes
-rw-r--r--fonts/parsianfonts/ParsianTeX/ParsianTeX-Bold.ttfbin0 -> 174596 bytes
-rw-r--r--fonts/parsianfonts/ParsianTeX/ParsianTeX-BoldItalic.ttfbin0 -> 225364 bytes
-rw-r--r--fonts/parsianfonts/ParsianTeX/ParsianTeX-Italic.ttfbin0 -> 218212 bytes
-rw-r--r--fonts/parsianfonts/ParsianTeX/ParsianTeX-Regular.ttfbin0 -> 178684 bytes
-rw-r--r--fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-Bold.ttfbin0 -> 198856 bytes
-rw-r--r--fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-BoldItalic.ttfbin0 -> 251176 bytes
-rw-r--r--fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-Italic.ttfbin0 -> 232140 bytes
-rw-r--r--fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-Regular.ttfbin0 -> 198152 bytes
-rw-r--r--fonts/parsianfonts/ParsianTitle/ParsianTitle-Italic.ttfbin0 -> 291740 bytes
-rw-r--r--fonts/parsianfonts/ParsianTitle/ParsianTitle-Regular.ttfbin0 -> 275732 bytes
-rw-r--r--fonts/parsianfonts/README.md29
-rw-r--r--fonts/parsianfonts/parsianfonts-samples.pdfbin0 -> 340348 bytes
-rw-r--r--fonts/parsianfonts/parsianfonts-samples.tex178
-rw-r--r--info/spanish/antique-spanish-units/README3
-rw-r--r--info/spanish/antique-spanish-units/antique-spanish-units.pdf157
-rw-r--r--info/spanish/antique-spanish-units/antique-spanish-units.tex33
-rw-r--r--macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdfbin1071216 -> 1074152 bytes
-rw-r--r--macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex183
-rw-r--r--macros/latex/contrib/proflycee/tex/ProfLycee.sty12
-rw-r--r--macros/latex/contrib/proflycee/tex/proflycee-tools-listings.tex32
-rw-r--r--macros/latex/contrib/proflycee/tex/proflycee-tools-minted.tex16
-rw-r--r--macros/latex/contrib/proflycee/tex/proflycee-tools-piton.tex28
-rw-r--r--macros/latex/contrib/proflycee/tex/proflycee-tools-probas.tex6
-rw-r--r--macros/latex/contrib/proflycee/tex/proflycee-tools-pythontex.tex16
-rw-r--r--macros/latex/contrib/proflycee/tex/proflycee-tools-recreat.tex4
-rw-r--r--macros/luatex/generic/evangelion-jfm/Eva-JFM_doc-sc.pdfbin265483 -> 265161 bytes
-rw-r--r--macros/luatex/generic/evangelion-jfm/Evangelion-JFM.dtx8
-rw-r--r--macros/luatex/generic/evangelion-jfm/README.md12
-rw-r--r--macros/luatex/generic/evangelion-jfm/jfm-eva.lua100
-rw-r--r--macros/luatex/generic/evangelion-jfm/makefile15
-rw-r--r--support/bib2gls/CHANGES15
-rw-r--r--support/bib2gls/bib2gls-begin.pdfbin719965 -> 720293 bytes
-rw-r--r--support/bib2gls/bib2gls-en.xml12
-rw-r--r--support/bib2gls/bib2gls.1593
-rw-r--r--support/bib2gls/bib2gls.pdfbin5327997 -> 5352192 bytes
-rw-r--r--support/bib2gls/convertgls2bib.1138
-rw-r--r--support/bib2gls/examples/sample-authors.pdfbin51563 -> 51564 bytes
-rw-r--r--support/bib2gls/examples/sample-bacteria.pdfbin54232 -> 54287 bytes
-rw-r--r--support/bib2gls/examples/sample-chemical.pdfbin54013 -> 54079 bytes
-rw-r--r--support/bib2gls/examples/sample-citations.pdfbin49752 -> 49756 bytes
-rw-r--r--support/bib2gls/examples/sample-constants.pdfbin97799 -> 97833 bytes
-rw-r--r--support/bib2gls/examples/sample-hierarchical.pdfbin52515 -> 52565 bytes
-rw-r--r--support/bib2gls/examples/sample-markuplanguages.pdfbin61083 -> 61161 bytes
-rw-r--r--support/bib2gls/examples/sample-maths.pdfbin121233 -> 121264 bytes
-rw-r--r--support/bib2gls/examples/sample-media.pdfbin166516 -> 166598 bytes
-rw-r--r--support/bib2gls/examples/sample-msymbols.pdfbin109228 -> 109259 bytes
-rw-r--r--support/bib2gls/examples/sample-multi1.pdfbin255325 -> 255485 bytes
-rw-r--r--support/bib2gls/examples/sample-multi2.pdfbin330719 -> 330891 bytes
-rw-r--r--support/bib2gls/examples/sample-nested.pdfbin52527 -> 52578 bytes
-rw-r--r--support/bib2gls/examples/sample-people.pdfbin50328 -> 50331 bytes
-rw-r--r--support/bib2gls/examples/sample-textsymbols.pdfbin73056 -> 73107 bytes
-rw-r--r--support/bib2gls/examples/sample-textsymbols2.pdfbin70270 -> 70316 bytes
-rw-r--r--support/bib2gls/examples/sample-units1.pdfbin57354 -> 57356 bytes
-rw-r--r--support/bib2gls/examples/sample-units2.pdfbin59088 -> 59092 bytes
-rw-r--r--support/bib2gls/examples/sample-units3.pdfbin44655 -> 44654 bytes
-rw-r--r--support/bib2gls/examples/sample-usergroups.pdfbin23828 -> 24425 bytes
-rw-r--r--support/bib2gls/src/bib2gls-cite.bib9
-rw-r--r--support/bib2gls/src/bib2gls-terms.bib9
-rw-r--r--support/bib2gls/src/bib2gls.bib71
-rw-r--r--support/bib2gls/src/bib2gls.pod459
-rw-r--r--support/bib2gls/src/bib2gls.tex416
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl48
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb423
-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.xzbin2469924 -> 2468580 bytes
-rw-r--r--timestamp2
89 files changed, 2127 insertions, 1542 deletions
diff --git a/FILES.byname b/FILES.byname
index cf19bcc2b6..d1224bf141 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -2056,12 +2056,12 @@
2023/07/04 | 1675 | biblio/citation-style-language/README.md
2023/07/04 | 12878 | biblio/citation-style-language/vancouver.csl
2023/07/04 | 4522435 | biblio/citation-style-language.zip
-2023/08/24 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/08/25 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx
-2023/08/24 | 2805663 | biblio/ctan-bibdata/ctan.bib
-2023/08/24 | 3699673 | biblio/ctan-bibdata/ctan.pdf
+2023/08/25 | 2805663 | biblio/ctan-bibdata/ctan.bib
+2023/08/25 | 3698854 | biblio/ctan-bibdata/ctan.pdf
2023/01/16 | 1489 | biblio/ctan-bibdata/README
-2023/08/24 | 4100893 | biblio/ctan-bibdata.zip
+2023/08/25 | 4100103 | 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
@@ -5421,7 +5421,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
-2023/08/24 | 91735 | FILES.last07days
+2023/08/25 | 92895 | 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
@@ -112123,6 +112123,36 @@
2014/09/13 | 690388 | fonts/parisa/source/parisa-regular.sfd
2014/09/13 | 1618746 | fonts/parisa/source/parisa-shadow.sfd
2014/09/13 | 5749842 | fonts/parisa.zip
+2023/08/25 | 340348 | fonts/parsianfonts/parsianfonts-samples.pdf
+2023/08/25 | 4300 | fonts/parsianfonts/parsianfonts-samples.tex
+2023/08/18 | 323884 | fonts/parsianfonts/ParsianMono/ParsianMono-BoldItalic.ttf
+2023/08/18 | 287296 | fonts/parsianfonts/ParsianMono/ParsianMono-Bold.ttf
+2023/08/18 | 326360 | fonts/parsianfonts/ParsianMono/ParsianMono-Italic.ttf
+2023/08/18 | 266424 | fonts/parsianfonts/ParsianMono/ParsianMono-Regular.ttf
+2023/08/06 | 291544 | fonts/parsianfonts/ParsianNaskh/ParsianNaskh-BoldItalic.ttf
+2023/08/06 | 273052 | fonts/parsianfonts/ParsianNaskh/ParsianNaskh-Bold.ttf
+2023/08/06 | 288828 | fonts/parsianfonts/ParsianNaskh/ParsianNaskh-Italic.ttf
+2023/08/06 | 276860 | fonts/parsianfonts/ParsianNaskh/ParsianNaskh-Regular.ttf
+2023/08/06 | 282112 | fonts/parsianfonts/Parsian/Parsian-BoldItalic.ttf
+2023/08/06 | 264912 | fonts/parsianfonts/Parsian/Parsian-Bold.ttf
+2023/08/06 | 279632 | fonts/parsianfonts/Parsian/Parsian-Italic.ttf
+2023/08/06 | 269712 | fonts/parsianfonts/Parsian/Parsian-Regular.ttf
+2023/08/06 | 212256 | fonts/parsianfonts/ParsianSans/ParsianSans-BoldItalic.ttf
+2023/08/06 | 199220 | fonts/parsianfonts/ParsianSans/ParsianSans-Bold.ttf
+2023/08/06 | 209160 | fonts/parsianfonts/ParsianSans/ParsianSans-Italic.ttf
+2023/08/06 | 195532 | fonts/parsianfonts/ParsianSans/ParsianSans-Regular.ttf
+2023/08/21 | 251176 | fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-BoldItalic.ttf
+2023/08/21 | 198856 | fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-Bold.ttf
+2023/08/21 | 232140 | fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-Italic.ttf
+2023/08/21 | 198152 | fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-Regular.ttf
+2023/08/06 | 225364 | fonts/parsianfonts/ParsianTeX/ParsianTeX-BoldItalic.ttf
+2023/08/06 | 174596 | fonts/parsianfonts/ParsianTeX/ParsianTeX-Bold.ttf
+2023/08/06 | 218212 | fonts/parsianfonts/ParsianTeX/ParsianTeX-Italic.ttf
+2023/08/06 | 178684 | fonts/parsianfonts/ParsianTeX/ParsianTeX-Regular.ttf
+2023/08/06 | 291740 | fonts/parsianfonts/ParsianTitle/ParsianTitle-Italic.ttf
+2023/08/06 | 275732 | fonts/parsianfonts/ParsianTitle/ParsianTitle-Regular.ttf
+2023/08/25 | 1759 | fonts/parsianfonts/README.md
+2023/08/25 | 3073853 | fonts/parsianfonts.zip
2011/01/07 | 740 | fonts/pcarl/pcarl.bib
2011/01/11 | 13268 | fonts/pcarl/pcarl.dtx
2011/01/07 | 1888 | fonts/pcarl/pcarl.ins
@@ -192828,10 +192858,10 @@
2010/11/23 | 109351 | info/simplified-latex/source.zip
2010/11/29 | 948093 | info/simplified-latex.zip
1993/01/12 | 16612 | info/slitex.hlp
-2023/08/23 | 221605 | info/spanish/antique-spanish-units/antique-spanish-units.pdf
-2023/08/23 | 11282 | info/spanish/antique-spanish-units/antique-spanish-units.tex
-2023/08/23 | 744 | info/spanish/antique-spanish-units/README
-2023/08/23 | 212151 | info/spanish/antique-spanish-units.zip
+2023/08/24 | 222096 | info/spanish/antique-spanish-units/antique-spanish-units.pdf
+2023/08/24 | 12107 | info/spanish/antique-spanish-units/antique-spanish-units.tex
+2023/08/24 | 797 | info/spanish/antique-spanish-units/README
+2023/08/25 | 212786 | info/spanish/antique-spanish-units.zip
2004/09/08 | 826651 | info/spanish/guia-atx/guia-atx.pdf
2004/05/27 | 535 | info/spanish/guia-atx/README
2006/08/26 | 2994 | info/spanish/guia-bibtex/biblio.bib
@@ -234268,30 +234298,30 @@
2023/01/02 | 9215 | macros/latex/contrib/proflycee/doc/graphics/pl-solve_b.png
2023/01/02 | 10175 | macros/latex/contrib/proflycee/doc/graphics/pl-solve_c.png
2023/01/02 | 10145 | macros/latex/contrib/proflycee/doc/graphics/pl-solve_d.png
-2023/08/08 | 1071216 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
-2023/08/08 | 295284 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
+2023/08/25 | 1074152 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
+2023/08/25 | 296219 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
2023/08/08 | 58292 | macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pyluatex.pdf
2023/08/08 | 6665 | macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pyluatex.tex
2023/08/08 | 40961 | macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pythontex.pdf
2023/08/08 | 5409 | macros/latex/contrib/proflycee/doc/ProfLycee-exemples-pythontex.tex
-2023/08/08 | 529 | macros/latex/contrib/proflycee/doc/testscript.py
+2023/08/25 | 529 | macros/latex/contrib/proflycee/doc/testscript.py
2022/08/10 | 439 | macros/latex/contrib/proflycee/README.md
-2023/08/08 | 6974 | macros/latex/contrib/proflycee/tex/ProfLycee.sty
+2023/08/25 | 7258 | macros/latex/contrib/proflycee/tex/ProfLycee.sty
2023/05/18 | 4196 | macros/latex/contrib/proflycee/tex/proflycee-tools-aleatoire.tex
2023/05/14 | 22505 | macros/latex/contrib/proflycee/tex/proflycee-tools-analyse.tex
2023/05/20 | 17988 | macros/latex/contrib/proflycee/tex/proflycee-tools-arithm.tex
2023/05/23 | 25515 | macros/latex/contrib/proflycee/tex/proflycee-tools-geom.tex
2023/06/13 | 16259 | macros/latex/contrib/proflycee/tex/proflycee-tools-graphiques.tex
-2023/06/08 | 15716 | macros/latex/contrib/proflycee/tex/proflycee-tools-listings.tex
-2023/06/08 | 3153 | macros/latex/contrib/proflycee/tex/proflycee-tools-minted.tex
-2023/06/08 | 6918 | macros/latex/contrib/proflycee/tex/proflycee-tools-piton.tex
-2023/06/14 | 35636 | macros/latex/contrib/proflycee/tex/proflycee-tools-probas.tex
-2023/06/08 | 6069 | macros/latex/contrib/proflycee/tex/proflycee-tools-pythontex.tex
-2023/04/13 | 8967 | macros/latex/contrib/proflycee/tex/proflycee-tools-recreat.tex
+2023/08/25 | 15751 | macros/latex/contrib/proflycee/tex/proflycee-tools-listings.tex
+2023/08/25 | 3168 | macros/latex/contrib/proflycee/tex/proflycee-tools-minted.tex
+2023/08/25 | 6958 | macros/latex/contrib/proflycee/tex/proflycee-tools-piton.tex
+2023/08/09 | 35636 | macros/latex/contrib/proflycee/tex/proflycee-tools-probas.tex
+2023/08/25 | 6094 | macros/latex/contrib/proflycee/tex/proflycee-tools-pythontex.tex
+2023/08/25 | 8967 | macros/latex/contrib/proflycee/tex/proflycee-tools-recreat.tex
2023/06/03 | 17918 | macros/latex/contrib/proflycee/tex/proflycee-tools-stats.tex
2023/04/13 | 6608 | macros/latex/contrib/proflycee/tex/proflycee-tools-suites.tex
2023/05/03 | 42723 | macros/latex/contrib/proflycee/tex/proflycee-tools-trigo.tex
-2023/08/09 | 1402708 | macros/latex/contrib/proflycee.zip
+2023/08/25 | 1405976 | macros/latex/contrib/proflycee.zip
2023/08/15 | 177356 | macros/latex/contrib/profmaquette/doc/profmaquette-doc.pdf
2023/08/15 | 39807 | macros/latex/contrib/profmaquette/doc/profmaquette-doc.tex
2023/06/23 | 17412 | macros/latex/contrib/profmaquette/doc/TestParcoursPerso.pdf
@@ -244791,18 +244821,19 @@
2013/04/08 | 1519 | macros/luatex/generic/enigma/README
2013/04/08 | 4300 | macros/luatex/generic/enigma/t-enigma.mkvi
2013/04/08 | 288194 | macros/luatex/generic/enigma.zip
-2023/05/19 | 164073 | macros/luatex/generic/evangelion-jfm/Eva-JFM_doc-en.pdf
-2023/05/19 | 278982 | macros/luatex/generic/evangelion-jfm/Eva-JFM_doc-jp.pdf
-2023/05/19 | 265483 | macros/luatex/generic/evangelion-jfm/Eva-JFM_doc-sc.pdf
-2023/05/19 | 47606 | macros/luatex/generic/evangelion-jfm/Evangelion-JFM.dtx
-2023/05/19 | 10077 | macros/luatex/generic/evangelion-jfm/figure/fig-jp.pdf
-2023/05/19 | 10535 | macros/luatex/generic/evangelion-jfm/figure/fig-tc.pdf
-2023/05/19 | 449 | macros/luatex/generic/evangelion-jfm/figure/fig.tex
-2023/05/19 | 19775 | macros/luatex/generic/evangelion-jfm/jfm-eva.lua
-2023/05/19 | 1063 | macros/luatex/generic/evangelion-jfm/LICENSE
-2023/05/19 | 610 | macros/luatex/generic/evangelion-jfm/make.sh
-2023/05/19 | 4250 | macros/luatex/generic/evangelion-jfm/README.md
-2023/05/19 | 742288 | macros/luatex/generic/evangelion-jfm.zip
+2023/08/25 | 164073 | macros/luatex/generic/evangelion-jfm/Eva-JFM_doc-en.pdf
+2023/08/25 | 278982 | macros/luatex/generic/evangelion-jfm/Eva-JFM_doc-jp.pdf
+2023/08/25 | 265161 | macros/luatex/generic/evangelion-jfm/Eva-JFM_doc-sc.pdf
+2023/08/25 | 47618 | macros/luatex/generic/evangelion-jfm/Evangelion-JFM.dtx
+2023/08/25 | 10077 | macros/luatex/generic/evangelion-jfm/figure/fig-jp.pdf
+2023/08/25 | 10535 | macros/luatex/generic/evangelion-jfm/figure/fig-tc.pdf
+2023/08/25 | 449 | macros/luatex/generic/evangelion-jfm/figure/fig.tex
+2023/08/25 | 22150 | macros/luatex/generic/evangelion-jfm/jfm-eva.lua
+2023/08/25 | 1063 | macros/luatex/generic/evangelion-jfm/LICENSE
+2023/08/25 | 437 | macros/luatex/generic/evangelion-jfm/makefile
+2023/08/25 | 610 | macros/luatex/generic/evangelion-jfm/make.sh
+2023/08/25 | 4693 | macros/luatex/generic/evangelion-jfm/README.md
+2023/08/25 | 742618 | macros/luatex/generic/evangelion-jfm.zip
2011/12/03 | 8984 | macros/luatex/generic/interpreter/i-doc.lua
2012/06/10 | 110003 | macros/luatex/generic/interpreter/interpreter-doc.pdf
2012/06/10 | 2828 | macros/luatex/generic/interpreter/interpreter-doc.tex
@@ -280321,98 +280352,98 @@
1994/05/11 | 11989 | support/bbfig/bb.ps
1994/05/11 | 462 | support/bbfig/installation
2006/03/12 | 6604 | support/bbfig.zip
-2023/06/29 | 19865 | support/bib2gls/bib2gls.1
-2023/06/29 | 719965 | support/bib2gls/bib2gls-begin.pdf
-2023/06/29 | 50285 | support/bib2gls/bib2gls-en.xml
-2023/06/29 | 388 | support/bib2gls/bib2gls-extra-en.xml
-2023/06/29 | 402 | support/bib2gls/bib2gls-extra-nl.xml
-2023/06/29 | 414829 | support/bib2gls/bib2gls.jar
-2023/06/29 | 5327997 | support/bib2gls/bib2gls.pdf
-2023/06/29 | 630 | support/bib2gls/bib2gls.sh
-2023/06/29 | 19066 | support/bib2gls/CHANGES
-2023/06/29 | 9614 | support/bib2gls/convertgls2bib.1
-2023/06/29 | 40742 | support/bib2gls/convertgls2bib.jar
-2023/06/29 | 404 | support/bib2gls/convertgls2bib.sh
-2023/06/29 | 22 | support/bib2gls/DEPENDS.txt
-2023/06/29 | 1603 | support/bib2gls/examples/animals.bib
-2023/06/29 | 1219 | support/bib2gls/examples/bacteria.bib
-2023/06/29 | 1031 | support/bib2gls/examples/baseunits.bib
-2023/06/29 | 2994 | support/bib2gls/examples/bigmathsymbols.bib
-2023/06/29 | 576 | support/bib2gls/examples/binaryoperators.bib
-2023/06/29 | 3496 | support/bib2gls/examples/books.bib
-2023/06/29 | 2585 | support/bib2gls/examples/chemicalformula.bib
-2023/06/29 | 1371 | support/bib2gls/examples/citations.bib
-2023/06/29 | 2392 | support/bib2gls/examples/constants.bib
-2023/06/29 | 1580 | support/bib2gls/examples/derivedunits.bib
-2023/06/29 | 5455 | support/bib2gls/examples/films.bib
-2023/06/29 | 338 | support/bib2gls/examples/interpret-preamble2.bib
-2023/06/29 | 328 | support/bib2gls/examples/interpret-preamble.bib
-2023/06/29 | 1772 | support/bib2gls/examples/markuplanguages.bib
-2023/06/29 | 3211 | support/bib2gls/examples/mathgreek.bib
-2023/06/29 | 3672 | support/bib2gls/examples/mathsobjects.bib
-2023/06/29 | 1265 | support/bib2gls/examples/mathsrelations.bib
-2023/06/29 | 2419 | support/bib2gls/examples/minerals.bib
-2023/06/29 | 2301 | support/bib2gls/examples/miscsymbols.bib
-2023/06/29 | 328 | support/bib2gls/examples/no-interpret-preamble.bib
-2023/06/29 | 4446 | support/bib2gls/examples/people.bib
-2023/06/29 | 51563 | support/bib2gls/examples/sample-authors.pdf
-2023/06/29 | 1506 | support/bib2gls/examples/sample-authors.tex
-2023/06/29 | 54232 | support/bib2gls/examples/sample-bacteria.pdf
-2023/06/29 | 1382 | support/bib2gls/examples/sample-bacteria.tex
-2023/06/29 | 54013 | support/bib2gls/examples/sample-chemical.pdf
-2023/06/29 | 1291 | support/bib2gls/examples/sample-chemical.tex
-2023/06/29 | 49752 | support/bib2gls/examples/sample-citations.pdf
-2023/06/29 | 1941 | support/bib2gls/examples/sample-citations.tex
-2023/06/29 | 97799 | support/bib2gls/examples/sample-constants.pdf
-2023/06/29 | 1378 | support/bib2gls/examples/sample-constants.tex
-2023/06/29 | 52515 | support/bib2gls/examples/sample-hierarchical.pdf
-2023/06/29 | 986 | support/bib2gls/examples/sample-hierarchical.tex
-2023/06/29 | 61083 | support/bib2gls/examples/sample-markuplanguages.pdf
-2023/06/29 | 1391 | support/bib2gls/examples/sample-markuplanguages.tex
-2023/06/29 | 121233 | support/bib2gls/examples/sample-maths.pdf
-2023/06/29 | 3129 | support/bib2gls/examples/sample-maths.tex
-2023/06/29 | 166516 | support/bib2gls/examples/sample-media.pdf
-2023/06/29 | 1734 | support/bib2gls/examples/sample-media.tex
-2023/06/29 | 109228 | support/bib2gls/examples/sample-msymbols.pdf
-2023/06/29 | 780 | support/bib2gls/examples/sample-msymbols.tex
-2023/06/29 | 255325 | support/bib2gls/examples/sample-multi1.pdf
-2023/06/29 | 5520 | support/bib2gls/examples/sample-multi1.tex
-2023/06/29 | 330719 | support/bib2gls/examples/sample-multi2.pdf
-2023/06/29 | 12775 | support/bib2gls/examples/sample-multi2.tex
-2023/06/29 | 52527 | support/bib2gls/examples/sample-nested.pdf
-2023/06/29 | 1344 | support/bib2gls/examples/sample-nested.tex
-2023/06/29 | 50328 | support/bib2gls/examples/sample-people.pdf
-2023/06/29 | 2367 | support/bib2gls/examples/sample-people.tex
-2023/06/29 | 70270 | support/bib2gls/examples/sample-textsymbols2.pdf
-2023/06/29 | 913 | support/bib2gls/examples/sample-textsymbols2.tex
-2023/06/29 | 73056 | support/bib2gls/examples/sample-textsymbols.pdf
-2023/06/29 | 1207 | support/bib2gls/examples/sample-textsymbols.tex
-2023/06/29 | 57354 | support/bib2gls/examples/sample-units1.pdf
-2023/06/29 | 1070 | support/bib2gls/examples/sample-units1.tex
-2023/06/29 | 59088 | support/bib2gls/examples/sample-units2.pdf
-2023/06/29 | 1234 | support/bib2gls/examples/sample-units2.tex
-2023/06/29 | 44655 | support/bib2gls/examples/sample-units3.pdf
-2023/06/29 | 1740 | support/bib2gls/examples/sample-units3.tex
-2023/06/29 | 23828 | support/bib2gls/examples/sample-usergroups.pdf
-2023/06/29 | 3254 | support/bib2gls/examples/sample-usergroups.tex
-2023/06/29 | 640 | support/bib2gls/examples/terms.bib
-2023/06/29 | 266 | support/bib2gls/examples/topics.bib
-2023/06/29 | 557 | support/bib2gls/examples/unaryoperators.bib
-2023/06/29 | 4053 | support/bib2gls/examples/usergroups.bib
-2023/06/29 | 1091 | support/bib2gls/examples/vegetables.bib
-2023/06/29 | 6793 | support/bib2gls/README.md
-2023/06/29 | 236672 | support/bib2gls/src/bib2gls-begin.tex
-2023/06/29 | 576667 | support/bib2gls/src/bib2gls.bib
-2023/06/29 | 4078 | support/bib2gls/src/bib2gls-cite.bib
-2023/06/29 | 11831 | support/bib2gls/src/bib2gls.pod
-2023/06/29 | 319218 | support/bib2gls/src/bib2gls-src.zip
-2023/06/29 | 19595 | support/bib2gls/src/bib2gls-terms.bib
-2023/06/29 | 1136935 | support/bib2gls/src/bib2gls.tex
-2023/06/29 | 4045 | support/bib2gls/src/convertgls2bib.pod
-2023/06/29 | 33180 | support/bib2gls/src/gls2bib-src.zip
-2023/06/29 | 1411739 | support/bib2gls/src/texparser-src.zip
-2023/06/29 | 1645098 | support/bib2gls/texparserlib.jar
-2023/06/29 | 11770941 | support/bib2gls.zip
+2023/08/24 | 20170 | support/bib2gls/bib2gls.1
+2023/08/24 | 720293 | support/bib2gls/bib2gls-begin.pdf
+2023/08/24 | 50948 | support/bib2gls/bib2gls-en.xml
+2023/08/24 | 388 | support/bib2gls/bib2gls-extra-en.xml
+2023/08/24 | 402 | support/bib2gls/bib2gls-extra-nl.xml
+2023/08/24 | 417988 | support/bib2gls/bib2gls.jar
+2023/08/24 | 5352192 | support/bib2gls/bib2gls.pdf
+2023/08/24 | 630 | support/bib2gls/bib2gls.sh
+2023/08/24 | 19305 | support/bib2gls/CHANGES
+2023/08/24 | 7108 | support/bib2gls/convertgls2bib.1
+2023/08/24 | 40780 | support/bib2gls/convertgls2bib.jar
+2023/08/24 | 404 | support/bib2gls/convertgls2bib.sh
+2023/08/24 | 22 | support/bib2gls/DEPENDS.txt
+2023/08/24 | 1603 | support/bib2gls/examples/animals.bib
+2023/08/24 | 1219 | support/bib2gls/examples/bacteria.bib
+2023/08/24 | 1031 | support/bib2gls/examples/baseunits.bib
+2023/08/24 | 2994 | support/bib2gls/examples/bigmathsymbols.bib
+2023/08/24 | 576 | support/bib2gls/examples/binaryoperators.bib
+2023/08/24 | 3496 | support/bib2gls/examples/books.bib
+2023/08/24 | 2585 | support/bib2gls/examples/chemicalformula.bib
+2023/08/24 | 1371 | support/bib2gls/examples/citations.bib
+2023/08/24 | 2392 | support/bib2gls/examples/constants.bib
+2023/08/24 | 1580 | support/bib2gls/examples/derivedunits.bib
+2023/08/24 | 5455 | support/bib2gls/examples/films.bib
+2023/08/24 | 338 | support/bib2gls/examples/interpret-preamble2.bib
+2023/08/24 | 328 | support/bib2gls/examples/interpret-preamble.bib
+2023/08/24 | 1772 | support/bib2gls/examples/markuplanguages.bib
+2023/08/24 | 3211 | support/bib2gls/examples/mathgreek.bib
+2023/08/24 | 3672 | support/bib2gls/examples/mathsobjects.bib
+2023/08/24 | 1265 | support/bib2gls/examples/mathsrelations.bib
+2023/08/24 | 2419 | support/bib2gls/examples/minerals.bib
+2023/08/24 | 2301 | support/bib2gls/examples/miscsymbols.bib
+2023/08/24 | 328 | support/bib2gls/examples/no-interpret-preamble.bib
+2023/08/24 | 4446 | support/bib2gls/examples/people.bib
+2023/08/24 | 51564 | support/bib2gls/examples/sample-authors.pdf
+2023/08/24 | 1506 | support/bib2gls/examples/sample-authors.tex
+2023/08/24 | 54287 | support/bib2gls/examples/sample-bacteria.pdf
+2023/08/24 | 1382 | support/bib2gls/examples/sample-bacteria.tex
+2023/08/24 | 54079 | support/bib2gls/examples/sample-chemical.pdf
+2023/08/24 | 1291 | support/bib2gls/examples/sample-chemical.tex
+2023/08/24 | 49756 | support/bib2gls/examples/sample-citations.pdf
+2023/08/24 | 1941 | support/bib2gls/examples/sample-citations.tex
+2023/08/24 | 97833 | support/bib2gls/examples/sample-constants.pdf
+2023/08/24 | 1378 | support/bib2gls/examples/sample-constants.tex
+2023/08/24 | 52565 | support/bib2gls/examples/sample-hierarchical.pdf
+2023/08/24 | 986 | support/bib2gls/examples/sample-hierarchical.tex
+2023/08/24 | 61161 | support/bib2gls/examples/sample-markuplanguages.pdf
+2023/08/24 | 1391 | support/bib2gls/examples/sample-markuplanguages.tex
+2023/08/24 | 121264 | support/bib2gls/examples/sample-maths.pdf
+2023/08/24 | 3129 | support/bib2gls/examples/sample-maths.tex
+2023/08/24 | 166598 | support/bib2gls/examples/sample-media.pdf
+2023/08/24 | 1734 | support/bib2gls/examples/sample-media.tex
+2023/08/24 | 109259 | support/bib2gls/examples/sample-msymbols.pdf
+2023/08/24 | 780 | support/bib2gls/examples/sample-msymbols.tex
+2023/08/24 | 255485 | support/bib2gls/examples/sample-multi1.pdf
+2023/08/24 | 5520 | support/bib2gls/examples/sample-multi1.tex
+2023/08/24 | 330891 | support/bib2gls/examples/sample-multi2.pdf
+2023/08/24 | 12775 | support/bib2gls/examples/sample-multi2.tex
+2023/08/24 | 52578 | support/bib2gls/examples/sample-nested.pdf
+2023/08/24 | 1344 | support/bib2gls/examples/sample-nested.tex
+2023/08/24 | 50331 | support/bib2gls/examples/sample-people.pdf
+2023/08/24 | 2367 | support/bib2gls/examples/sample-people.tex
+2023/08/24 | 70316 | support/bib2gls/examples/sample-textsymbols2.pdf
+2023/08/24 | 913 | support/bib2gls/examples/sample-textsymbols2.tex
+2023/08/24 | 73107 | support/bib2gls/examples/sample-textsymbols.pdf
+2023/08/24 | 1207 | support/bib2gls/examples/sample-textsymbols.tex
+2023/08/24 | 57356 | support/bib2gls/examples/sample-units1.pdf
+2023/08/24 | 1070 | support/bib2gls/examples/sample-units1.tex
+2023/08/24 | 59092 | support/bib2gls/examples/sample-units2.pdf
+2023/08/24 | 1234 | support/bib2gls/examples/sample-units2.tex
+2023/08/24 | 44654 | support/bib2gls/examples/sample-units3.pdf
+2023/08/24 | 1740 | support/bib2gls/examples/sample-units3.tex
+2023/08/24 | 24425 | support/bib2gls/examples/sample-usergroups.pdf
+2023/08/24 | 3254 | support/bib2gls/examples/sample-usergroups.tex
+2023/08/24 | 640 | support/bib2gls/examples/terms.bib
+2023/08/24 | 266 | support/bib2gls/examples/topics.bib
+2023/08/24 | 557 | support/bib2gls/examples/unaryoperators.bib
+2023/08/24 | 4053 | support/bib2gls/examples/usergroups.bib
+2023/08/24 | 1091 | support/bib2gls/examples/vegetables.bib
+2023/08/24 | 6793 | support/bib2gls/README.md
+2023/08/24 | 236672 | support/bib2gls/src/bib2gls-begin.tex
+2023/08/24 | 578124 | support/bib2gls/src/bib2gls.bib
+2023/08/24 | 4298 | support/bib2gls/src/bib2gls-cite.bib
+2023/08/24 | 14139 | support/bib2gls/src/bib2gls.pod
+2023/08/24 | 321594 | support/bib2gls/src/bib2gls-src.zip
+2023/08/24 | 19671 | support/bib2gls/src/bib2gls-terms.bib
+2023/08/24 | 1145929 | support/bib2gls/src/bib2gls.tex
+2023/08/24 | 4045 | support/bib2gls/src/convertgls2bib.pod
+2023/08/24 | 33201 | support/bib2gls/src/gls2bib-src.zip
+2023/08/24 | 1413256 | support/bib2gls/src/texparser-src.zip
+2023/08/24 | 1647214 | support/bib2gls/texparserlib.jar
+2023/08/25 | 11807802 | support/bib2gls.zip
1999/04/14 | 372041 | support/bibdb/bibdb20.zip
1999/04/14 | 1228948 | support/bibdb/bibdbsrc.zip
1999/04/14 | 686556 | support/bibdb/wbibdb22.zip
@@ -292417,8 +292448,8 @@
2019/02/28 | 4124 | systems/texlive/tlnet/archive/comment.r41927.tar.xz
2022/04/05 | 324112 | systems/texlive/tlnet/archive/commonunicode.doc.r62901.tar.xz
2022/04/05 | 5628 | systems/texlive/tlnet/archive/commonunicode.r62901.tar.xz
-2020/06/13 | 549992 | systems/texlive/tlnet/archive/commutative-diagrams.doc.r55526.tar.xz
-2020/06/13 | 12684 | systems/texlive/tlnet/archive/commutative-diagrams.r55526.tar.xz
+2023/08/25 | 615572 | systems/texlive/tlnet/archive/commutative-diagrams.doc.r68044.tar.xz
+2023/08/25 | 12760 | systems/texlive/tlnet/archive/commutative-diagrams.r68044.tar.xz
2019/02/28 | 1860 | systems/texlive/tlnet/archive/compactbib.r15878.tar.xz
2020/03/13 | 708 | systems/texlive/tlnet/archive/compare.r54265.tar.xz
2019/02/28 | 1304 | systems/texlive/tlnet/archive/competences.doc.r47573.tar.xz
@@ -293502,12 +293533,12 @@
2019/02/28 | 340 | systems/texlive/tlnet/archive/dviasm.amd64-freebsd.r16472.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/dviasm.amd64-netbsd.r30191.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/dviasm.armhf-linux.r30015.tar.xz
-2022/09/19 | 24368 | systems/texlive/tlnet/archive/dviasm.doc.r64430.tar.xz
+2023/08/25 | 24344 | systems/texlive/tlnet/archive/dviasm.doc.r68043.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/dviasm.i386-freebsd.r16472.tar.xz
2019/02/28 | 336 | systems/texlive/tlnet/archive/dviasm.i386-linux.r8329.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/dviasm.i386-netbsd.r30191.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/dviasm.i386-solaris.r8563.tar.xz
-2022/09/19 | 10304 | systems/texlive/tlnet/archive/dviasm.r64430.tar.xz
+2023/08/25 | 10304 | systems/texlive/tlnet/archive/dviasm.r68043.tar.xz
2021/02/25 | 340 | systems/texlive/tlnet/archive/dviasm.universal-darwin.r57908.tar.xz
2023/02/20 | 2304 | systems/texlive/tlnet/archive/dviasm.windows.r65891.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/dviasm.x86_64-cygwin.r33557.tar.xz
@@ -294261,9 +294292,9 @@
2019/02/28 | 140404 | systems/texlive/tlnet/archive/expdlist.doc.r15878.tar.xz
2019/02/28 | 2264 | systems/texlive/tlnet/archive/expdlist.r15878.tar.xz
2019/02/28 | 9988 | systems/texlive/tlnet/archive/expdlist.source.r15878.tar.xz
-2023/08/24 | 84368 | systems/texlive/tlnet/archive/expex-acro.doc.r68039.tar.xz
-2023/08/24 | 4540 | systems/texlive/tlnet/archive/expex-acro.r68039.tar.xz
-2023/08/24 | 7180 | systems/texlive/tlnet/archive/expex-acro.source.r68039.tar.xz
+2023/08/25 | 85400 | systems/texlive/tlnet/archive/expex-acro.doc.r68046.tar.xz
+2023/08/25 | 4556 | systems/texlive/tlnet/archive/expex-acro.r68046.tar.xz
+2023/08/25 | 7288 | systems/texlive/tlnet/archive/expex-acro.source.r68046.tar.xz
2019/02/28 | 473776 | systems/texlive/tlnet/archive/expex.doc.r44499.tar.xz
2023/08/18 | 56632 | systems/texlive/tlnet/archive/expex-glossonly.doc.r67958.tar.xz
2023/08/18 | 2184 | systems/texlive/tlnet/archive/expex-glossonly.r67958.tar.xz
@@ -297246,13 +297277,13 @@
2023/08/21 | 88736 | systems/texlive/tlnet/archive/lualibs.doc.r67994.tar.xz
2023/08/21 | 133320 | systems/texlive/tlnet/archive/lualibs.r67994.tar.xz
2023/08/21 | 8612 | systems/texlive/tlnet/archive/lualibs.source.r67994.tar.xz
-2023/08/24 | 195524 | systems/texlive/tlnet/archive/lualinalg.doc.r68039.tar.xz
-2023/08/24 | 6448 | systems/texlive/tlnet/archive/lualinalg.r68039.tar.xz
+2023/08/25 | 196028 | systems/texlive/tlnet/archive/lualinalg.doc.r68049.tar.xz
+2023/08/25 | 6676 | systems/texlive/tlnet/archive/lualinalg.r68049.tar.xz
2022/05/05 | 393088 | systems/texlive/tlnet/archive/luamathalign.doc.r63226.tar.xz
2022/05/05 | 4076 | systems/texlive/tlnet/archive/luamathalign.r63226.tar.xz
2022/05/05 | 5704 | systems/texlive/tlnet/archive/luamathalign.source.r63226.tar.xz
-2023/08/24 | 112072 | systems/texlive/tlnet/archive/luamaths.doc.r68039.tar.xz
-2023/08/24 | 4184 | systems/texlive/tlnet/archive/luamaths.r68039.tar.xz
+2023/08/25 | 112352 | systems/texlive/tlnet/archive/luamaths.doc.r68050.tar.xz
+2023/08/25 | 4372 | systems/texlive/tlnet/archive/luamaths.r68050.tar.xz
2022/07/12 | 251676 | systems/texlive/tlnet/archive/luamesh.doc.r63875.tar.xz
2022/07/12 | 12872 | systems/texlive/tlnet/archive/luamesh.r63875.tar.xz
2023/01/08 | 269380 | systems/texlive/tlnet/archive/luamodulartables.doc.r65485.tar.xz
@@ -299664,8 +299695,8 @@
2023/08/10 | 35900 | systems/texlive/tlnet/archive/proflycee.r67864.tar.xz
2023/08/17 | 178296 | systems/texlive/tlnet/archive/profmaquette.doc.r67948.tar.xz
2023/08/17 | 13664 | systems/texlive/tlnet/archive/profmaquette.r67948.tar.xz
-2023/08/24 | 316488 | systems/texlive/tlnet/archive/profsio.doc.r68039.tar.xz
-2023/08/24 | 8440 | systems/texlive/tlnet/archive/profsio.r68039.tar.xz
+2023/08/25 | 316752 | systems/texlive/tlnet/archive/profsio.doc.r68045.tar.xz
+2023/08/25 | 8608 | systems/texlive/tlnet/archive/profsio.r68045.tar.xz
2019/02/28 | 49880 | systems/texlive/tlnet/archive/program.doc.r44214.tar.xz
2019/02/28 | 11780 | systems/texlive/tlnet/archive/program.r44214.tar.xz
2019/02/28 | 86236 | systems/texlive/tlnet/archive/progressbar.doc.r33822.tar.xz
@@ -300918,9 +300949,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
-2023/08/24 | 1289904 | systems/texlive/tlnet/archive/siunitx.doc.r68039.tar.xz
-2023/08/24 | 67376 | systems/texlive/tlnet/archive/siunitx.r68039.tar.xz
-2023/08/24 | 122236 | systems/texlive/tlnet/archive/siunitx.source.r68039.tar.xz
+2023/08/25 | 1290228 | systems/texlive/tlnet/archive/siunitx.doc.r68048.tar.xz
+2023/08/25 | 67356 | systems/texlive/tlnet/archive/siunitx.r68048.tar.xz
+2023/08/25 | 122228 | systems/texlive/tlnet/archive/siunitx.source.r68048.tar.xz
2022/01/24 | 200108 | systems/texlive/tlnet/archive/skak.doc.r61719.tar.xz
2019/02/28 | 316212 | systems/texlive/tlnet/archive/skaknew.doc.r20031.tar.xz
2019/02/28 | 160064 | systems/texlive/tlnet/archive/skaknew.r20031.tar.xz
@@ -301834,7 +301865,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
-2023/08/24 | 428784 | systems/texlive/tlnet/archive/texlive-scripts.doc.r68026.tar.xz
+2023/08/25 | 428696 | systems/texlive/tlnet/archive/texlive-scripts.doc.r68041.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
@@ -301856,7 +301887,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
-2023/08/24 | 114116 | systems/texlive/tlnet/archive/texlive-scripts.r68026.tar.xz
+2023/08/25 | 114004 | systems/texlive/tlnet/archive/texlive-scripts.r68041.tar.xz
2022/09/13 | 580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz
2023/05/14 | 60312 | systems/texlive/tlnet/archive/texlive-scripts.windows.r67095.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz
@@ -303217,9 +303248,9 @@
2023/04/18 | 5556864 | systems/texlive/tlnet/archive/wintools.windows.r66874.tar.xz
2019/11/05 | 475336 | systems/texlive/tlnet/archive/withargs.doc.r52641.tar.xz
2019/11/05 | 6100 | systems/texlive/tlnet/archive/withargs.r52641.tar.xz
-2023/02/16 | 843716 | systems/texlive/tlnet/archive/witharrows.doc.r65841.tar.xz
-2023/02/16 | 15352 | systems/texlive/tlnet/archive/witharrows.r65841.tar.xz
-2023/02/16 | 53964 | systems/texlive/tlnet/archive/witharrows.source.r65841.tar.xz
+2023/08/25 | 847468 | systems/texlive/tlnet/archive/witharrows.doc.r68047.tar.xz
+2023/08/25 | 15444 | systems/texlive/tlnet/archive/witharrows.r68047.tar.xz
+2023/08/25 | 54344 | systems/texlive/tlnet/archive/witharrows.source.r68047.tar.xz
2019/02/28 | 6784 | systems/texlive/tlnet/archive/wnri.doc.r22459.tar.xz
2019/02/28 | 198684 | systems/texlive/tlnet/archive/wnri-latex.doc.r22338.tar.xz
2019/02/28 | 2664 | systems/texlive/tlnet/archive/wnri-latex.r22338.tar.xz
@@ -303727,16 +303758,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
2023/08/07 | 125713 | systems/texlive/tlnet/install-tl
-2023/08/24 | 5741027 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2023/08/24 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2023/08/24 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/08/25 | 5740983 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/08/25 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/08/25 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2023/05/13 | 5083 | systems/texlive/tlnet/install-tl-windows.bat
-2023/08/24 | 21038066 | systems/texlive/tlnet/install-tl-windows.exe
-2023/08/24 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/08/24 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/08/24 | 26028694 | systems/texlive/tlnet/install-tl.zip
-2023/08/24 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2023/08/24 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/08/25 | 21040744 | systems/texlive/tlnet/install-tl-windows.exe
+2023/08/25 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/08/25 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/08/25 | 26028589 | systems/texlive/tlnet/install-tl.zip
+2023/08/25 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/08/25 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2023/03/19 | 1229 | systems/texlive/tlnet/README.md
2023/03/19 | 0 | systems/texlive/tlnet/TEXLIVE_2023
2023/01/17 | 8401 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -303746,7 +303777,7 @@
2023/01/17 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2023/08/03 | 50576 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2023/08/23 | 7299 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2023/08/24 | 6761 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/08/23 | 221470 | 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
@@ -303788,12 +303819,12 @@
2023/02/21 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2023/04/08 | 28167 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2023/08/24 | 18227164 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2023/08/24 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/08/25 | 18227164 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/08/25 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2023/02/20 | 86803 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2023/08/24 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2023/08/24 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/08/24 | 2468740 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/08/25 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/08/25 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/08/25 | 2469924 | 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
@@ -314482,7 +314513,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
-2023/08/25 | 186 | timestamp
+2023/08/26 | 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 f51c97ff08..a1980352ee 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index d12b733d31..8176249839 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,122 +1,253 @@
+2023/08/25 | 8967 | macros/latex/contrib/proflycee/tex/proflycee-tools-recreat.tex
+2023/08/25 | 8608 | systems/texlive/tlnet/archive/profsio.r68045.tar.xz
+2023/08/25 | 85400 | systems/texlive/tlnet/archive/expex-acro.doc.r68046.tar.xz
+2023/08/25 | 847468 | systems/texlive/tlnet/archive/witharrows.doc.r68047.tar.xz
+2023/08/25 | 742618 | macros/luatex/generic/evangelion-jfm.zip
+2023/08/25 | 7288 | systems/texlive/tlnet/archive/expex-acro.source.r68046.tar.xz
+2023/08/25 | 7258 | macros/latex/contrib/proflycee/tex/ProfLycee.sty
+2023/08/25 | 6958 | macros/latex/contrib/proflycee/tex/proflycee-tools-piton.tex
+2023/08/25 | 67356 | systems/texlive/tlnet/archive/siunitx.r68048.tar.xz
+2023/08/25 | 6676 | systems/texlive/tlnet/archive/lualinalg.r68049.tar.xz
+2023/08/25 | 615572 | systems/texlive/tlnet/archive/commutative-diagrams.doc.r68044.tar.xz
+2023/08/25 | 610 | macros/luatex/generic/evangelion-jfm/make.sh
+2023/08/25 | 6094 | macros/latex/contrib/proflycee/tex/proflycee-tools-pythontex.tex
+2023/08/25 | 5740983 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/08/25 | 54344 | systems/texlive/tlnet/archive/witharrows.source.r68047.tar.xz
+2023/08/25 | 529 | macros/latex/contrib/proflycee/doc/testscript.py
+2023/08/25 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/08/25 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/08/25 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/08/25 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/08/25 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/08/25 | 47618 | macros/luatex/generic/evangelion-jfm/Evangelion-JFM.dtx
+2023/08/25 | 4693 | macros/luatex/generic/evangelion-jfm/README.md
+2023/08/25 | 4556 | systems/texlive/tlnet/archive/expex-acro.r68046.tar.xz
+2023/08/25 | 449 | macros/luatex/generic/evangelion-jfm/figure/fig.tex
+2023/08/25 | 437 | macros/luatex/generic/evangelion-jfm/makefile
+2023/08/25 | 4372 | systems/texlive/tlnet/archive/luamaths.r68050.tar.xz
+2023/08/25 | 4300 | fonts/parsianfonts/parsianfonts-samples.tex
+2023/08/25 | 428696 | systems/texlive/tlnet/archive/texlive-scripts.doc.r68041.tar.xz
+2023/08/25 | 4100103 | biblio/ctan-bibdata.zip
+2023/08/25 | 3698854 | biblio/ctan-bibdata/ctan.pdf
+2023/08/25 | 340348 | fonts/parsianfonts/parsianfonts-samples.pdf
+2023/08/25 | 3168 | macros/latex/contrib/proflycee/tex/proflycee-tools-minted.tex
+2023/08/25 | 316752 | systems/texlive/tlnet/archive/profsio.doc.r68045.tar.xz
+2023/08/25 | 3073853 | fonts/parsianfonts.zip
+2023/08/25 | 296219 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
+2023/08/25 | 2805663 | biblio/ctan-bibdata/ctan.bib
+2023/08/25 | 278982 | macros/luatex/generic/evangelion-jfm/Eva-JFM_doc-jp.pdf
+2023/08/25 | 265161 | macros/luatex/generic/evangelion-jfm/Eva-JFM_doc-sc.pdf
+2023/08/25 | 26028589 | systems/texlive/tlnet/install-tl.zip
+2023/08/25 | 2469924 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/08/25 | 24344 | systems/texlive/tlnet/archive/dviasm.doc.r68043.tar.xz
+2023/08/25 | 22150 | macros/luatex/generic/evangelion-jfm/jfm-eva.lua
+2023/08/25 | 212786 | info/spanish/antique-spanish-units.zip
+2023/08/25 | 21040744 | systems/texlive/tlnet/install-tl-windows.exe
+2023/08/25 | 196028 | systems/texlive/tlnet/archive/lualinalg.doc.r68049.tar.xz
+2023/08/25 | 18227164 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/08/25 | 1759 | fonts/parsianfonts/README.md
+2023/08/25 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/08/25 | 164073 | macros/luatex/generic/evangelion-jfm/Eva-JFM_doc-en.pdf
+2023/08/25 | 15751 | macros/latex/contrib/proflycee/tex/proflycee-tools-listings.tex
+2023/08/25 | 15444 | systems/texlive/tlnet/archive/witharrows.r68047.tar.xz
+2023/08/25 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/08/25 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/08/25 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/08/25 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/08/25 | 1405976 | macros/latex/contrib/proflycee.zip
+2023/08/25 | 1290228 | systems/texlive/tlnet/archive/siunitx.doc.r68048.tar.xz
+2023/08/25 | 12760 | systems/texlive/tlnet/archive/commutative-diagrams.r68044.tar.xz
+2023/08/25 | 122228 | systems/texlive/tlnet/archive/siunitx.source.r68048.tar.xz
+2023/08/25 | 11807802 | support/bib2gls.zip
+2023/08/25 | 114004 | systems/texlive/tlnet/archive/texlive-scripts.r68041.tar.xz
+2023/08/25 | 112352 | systems/texlive/tlnet/archive/luamaths.doc.r68050.tar.xz
+2023/08/25 | 1074152 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
+2023/08/25 | 1063 | macros/luatex/generic/evangelion-jfm/LICENSE
+2023/08/25 | 10535 | macros/luatex/generic/evangelion-jfm/figure/fig-tc.pdf
+2023/08/25 | 10304 | systems/texlive/tlnet/archive/dviasm.r68043.tar.xz
+2023/08/25 | 10077 | macros/luatex/generic/evangelion-jfm/figure/fig-jp.pdf
+2023/08/24 | 986 | support/bib2gls/examples/sample-hierarchical.tex
+2023/08/24 | 97833 | support/bib2gls/examples/sample-constants.pdf
2023/08/24 | 95169 | macros/generic/witharrows/witharrows-french.tex
2023/08/24 | 9234 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
2023/08/24 | 919 | support/texshop/texshop516.html
+2023/08/24 | 913 | support/bib2gls/examples/sample-textsymbols2.tex
2023/08/24 | 902802 | macros/generic/witharrows.zip
2023/08/24 | 9000 | systems/texlive/tlnet/archive/penlightplus.r68037.tar.xz
2023/08/24 | 890 | macros/latex/contrib/photobook/scripts/make-spreads.cfg.example
2023/08/24 | 8866 | macros/latex/contrib/siunitx/siunitx-command.dtx
-2023/08/24 | 8440 | systems/texlive/tlnet/archive/profsio.r68039.tar.xz
-2023/08/24 | 84368 | systems/texlive/tlnet/archive/expex-acro.doc.r68039.tar.xz
+2023/08/24 | 797 | info/spanish/antique-spanish-units/README
+2023/08/24 | 780 | support/bib2gls/examples/sample-msymbols.tex
2023/08/24 | 7761 | graphics/pgf/contrib/commutative-diagrams/tikzlibrarycommutative-diagrams.velos.code.tex
2023/08/24 | 76470 | macros/latex/contrib/siunitx/CHANGELOG.md
2023/08/24 | 751 | support/texshop/README.txt
-2023/08/24 | 7180 | systems/texlive/tlnet/archive/expex-acro.source.r68039.tar.xz
+2023/08/24 | 73107 | support/bib2gls/examples/sample-textsymbols.pdf
+2023/08/24 | 720293 | support/bib2gls/bib2gls-begin.pdf
+2023/08/24 | 7108 | support/bib2gls/convertgls2bib.1
2023/08/24 | 705590 | macros/latex/contrib/siunitx/siunitx.pdf
2023/08/24 | 703440 | systems/texlive/tlnet/archive/stellenbosch.r68039.tar.xz
+2023/08/24 | 70316 | support/bib2gls/examples/sample-textsymbols2.pdf
+2023/08/24 | 6793 | support/bib2gls/README.md
2023/08/24 | 6793664 | systems/texlive/tlnet/archive/newtx.r68035.tar.xz
-2023/08/24 | 67376 | systems/texlive/tlnet/archive/siunitx.r68039.tar.xz
+2023/08/24 | 6761 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/08/24 | 650000 | macros/latex/contrib/siunitx/siunitx-code.pdf
-2023/08/24 | 6448 | systems/texlive/tlnet/archive/lualinalg.r68039.tar.xz
+2023/08/24 | 640 | support/bib2gls/examples/terms.bib
2023/08/24 | 640925 | install/graphics/pgf/contrib/commutative-diagrams.tds.zip
2023/08/24 | 637513 | graphics/pgf/contrib/commutative-diagrams.zip
2023/08/24 | 6368 | systems/texlive/tlnet/archive/hebrew-fonts.r68038.tar.xz
+2023/08/24 | 630 | support/bib2gls/bib2gls.sh
+2023/08/24 | 61161 | support/bib2gls/examples/sample-markuplanguages.pdf
2023/08/24 | 609418 | graphics/pgf/contrib/commutative-diagrams/commutative-diagrams-doc.pdf
+2023/08/24 | 59092 | support/bib2gls/examples/sample-units2.pdf
2023/08/24 | 5831 | macros/latex/contrib/siunitx/siunitx-locale.dtx
-2023/08/24 | 5741027 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/08/24 | 578124 | support/bib2gls/src/bib2gls.bib
+2023/08/24 | 576 | support/bib2gls/examples/binaryoperators.bib
+2023/08/24 | 57356 | support/bib2gls/examples/sample-units1.pdf
2023/08/24 | 560 | systems/texlive/tlnet/archive/antique-spanish-units.r68039.tar.xz
2023/08/24 | 559985 | macros/generic/witharrows/witharrows.pdf
+2023/08/24 | 557 | support/bib2gls/examples/unaryoperators.bib
2023/08/24 | 5574 | graphics/pgf/contrib/commutative-diagrams/tikzlibrarycommutative-diagrams.mitra.code.tex
2023/08/24 | 55313 | macros/latex/contrib/siunitx/siunitx-table.dtx
+2023/08/24 | 5520 | support/bib2gls/examples/sample-multi1.tex
+2023/08/24 | 5455 | support/bib2gls/examples/films.bib
+2023/08/24 | 54287 | support/bib2gls/examples/sample-bacteria.pdf
+2023/08/24 | 54079 | support/bib2gls/examples/sample-chemical.pdf
+2023/08/24 | 5352192 | support/bib2gls/bib2gls.pdf
+2023/08/24 | 52578 | support/bib2gls/examples/sample-nested.pdf
+2023/08/24 | 52565 | support/bib2gls/examples/sample-hierarchical.pdf
2023/08/24 | 52415 | macros/latex/contrib/hvextern/doc/hvextern.tex
2023/08/24 | 52082 | graphics/pgf/contrib/commutative-diagrams/commutative-diagrams-doc.tex
2023/08/24 | 5178 | graphics/pgf/contrib/commutative-diagrams/tikzlibrarycommutative-diagrams.katharizo.code.tex
2023/08/24 | 51684 | systems/texlive/tlnet/archive/penlightplus.doc.r68037.tar.xz
+2023/08/24 | 51564 | support/bib2gls/examples/sample-authors.pdf
+2023/08/24 | 50948 | support/bib2gls/bib2gls-en.xml
+2023/08/24 | 50331 | support/bib2gls/examples/sample-people.pdf
+2023/08/24 | 49756 | support/bib2gls/examples/sample-citations.pdf
2023/08/24 | 4973 | graphics/pgf/contrib/commutative-diagrams/tikzlibrarycommutative-diagrams.koinos.code.tex
-2023/08/24 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2023/08/24 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/08/24 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2023/08/24 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/08/24 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2023/08/24 | 4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
2023/08/24 | 471 | graphics/pgf/contrib/commutative-diagrams/commutative-diagrams.sty
2023/08/24 | 462 | macros/latex/contrib/photobook/DEPENDS.txt
2023/08/24 | 460 | graphics/pgf/contrib/commutative-diagrams/t-commutative-diagrams.tex
-2023/08/24 | 4540 | systems/texlive/tlnet/archive/expex-acro.r68039.tar.xz
2023/08/24 | 45064 | macros/latex/contrib/hvextern/latex/hvextern.sty
+2023/08/24 | 44654 | support/bib2gls/examples/sample-units3.pdf
+2023/08/24 | 4446 | support/bib2gls/examples/people.bib
2023/08/24 | 4382 | graphics/pgf/contrib/commutative-diagrams/tikzlibrarycommutative-diagrams.ramma.code.tex
2023/08/24 | 43622 | macros/latex/contrib/siunitx/siunitx-compound.dtx
-2023/08/24 | 428784 | systems/texlive/tlnet/archive/texlive-scripts.doc.r68026.tar.xz
-2023/08/24 | 4184 | systems/texlive/tlnet/archive/luamaths.r68039.tar.xz
+2023/08/24 | 4298 | support/bib2gls/src/bib2gls-cite.bib
+2023/08/24 | 417988 | support/bib2gls/bib2gls.jar
2023/08/24 | 4172 | macros/latex/contrib/photobook/scripts/cls2tex.sh
2023/08/24 | 415332 | systems/texlive/tlnet/archive/stellenbosch.source.r68039.tar.xz
-2023/08/24 | 4100893 | biblio/ctan-bibdata.zip
+2023/08/24 | 40780 | support/bib2gls/convertgls2bib.jar
2023/08/24 | 405812 | systems/texlive/tlnet/archive/hebrew-fonts.doc.r68038.tar.xz
+2023/08/24 | 4053 | support/bib2gls/examples/usergroups.bib
+2023/08/24 | 404 | support/bib2gls/convertgls2bib.sh
+2023/08/24 | 4045 | support/bib2gls/src/convertgls2bib.pod
+2023/08/24 | 402 | support/bib2gls/bib2gls-extra-nl.xml
+2023/08/24 | 388 | support/bib2gls/bib2gls-extra-en.xml
2023/08/24 | 38831 | macros/latex/contrib/siunitx/siunitx-complex.dtx
-2023/08/24 | 3699673 | biblio/ctan-bibdata/ctan.pdf
2023/08/24 | 3687 | macros/latex/contrib/siunitx/siunitx.ins
2023/08/24 | 36762 | macros/latex/contrib/siunitx/siunitx-print.dtx
+2023/08/24 | 3672 | support/bib2gls/examples/mathsobjects.bib
2023/08/24 | 3592 | systems/texlive/tlnet/archive/brandeis-thesis.source.r68039.tar.xz
2023/08/24 | 355 | graphics/pgf/contrib/commutative-diagrams/commutative-diagrams.tex
+2023/08/24 | 3496 | support/bib2gls/examples/books.bib
+2023/08/24 | 338 | support/bib2gls/examples/interpret-preamble2.bib
+2023/08/24 | 33201 | support/bib2gls/src/gls2bib-src.zip
+2023/08/24 | 330891 | support/bib2gls/examples/sample-multi2.pdf
+2023/08/24 | 328 | support/bib2gls/examples/no-interpret-preamble.bib
+2023/08/24 | 328 | support/bib2gls/examples/interpret-preamble.bib
+2023/08/24 | 3254 | support/bib2gls/examples/sample-usergroups.tex
+2023/08/24 | 321594 | support/bib2gls/src/bib2gls-src.zip
+2023/08/24 | 3211 | support/bib2gls/examples/mathgreek.bib
2023/08/24 | 31812 | macros/latex/contrib/siunitx/siunitx-emulation.dtx
2023/08/24 | 31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg
-2023/08/24 | 316488 | systems/texlive/tlnet/archive/profsio.doc.r68039.tar.xz
+2023/08/24 | 3129 | support/bib2gls/examples/sample-maths.tex
2023/08/24 | 3071164 | systems/texlive/tlnet/archive/stellenbosch.doc.r68039.tar.xz
+2023/08/24 | 2994 | support/bib2gls/examples/bigmathsymbols.bib
2023/08/24 | 2951 | macros/latex/contrib/siunitx/siunitx-binary.dtx
2023/08/24 | 290810 | macros/generic/witharrows/witharrows.dtx
-2023/08/24 | 2805663 | biblio/ctan-bibdata/ctan.bib
2023/08/24 | 279271 | macros/generic/witharrows/witharrows-french.pdf
2023/08/24 | 273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
+2023/08/24 | 266 | support/bib2gls/examples/topics.bib
2023/08/24 | 2636 | macros/latex/contrib/siunitx/siunitx-code.tex
2023/08/24 | 2619 | graphics/pgf/contrib/commutative-diagrams/tikzlibrarycommutative-diagrams.diorthono.code.tex
-2023/08/24 | 26028694 | systems/texlive/tlnet/install-tl.zip
+2023/08/24 | 2585 | support/bib2gls/examples/chemicalformula.bib
2023/08/24 | 2563 | macros/latex/contrib/photobook/README.md
-2023/08/24 | 2468740 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/08/24 | 255485 | support/bib2gls/examples/sample-multi1.pdf
+2023/08/24 | 24425 | support/bib2gls/examples/sample-usergroups.pdf
+2023/08/24 | 2419 | support/bib2gls/examples/minerals.bib
+2023/08/24 | 2392 | support/bib2gls/examples/constants.bib
+2023/08/24 | 2367 | support/bib2gls/examples/sample-people.tex
+2023/08/24 | 236672 | support/bib2gls/src/bib2gls-begin.tex
2023/08/24 | 2302 | graphics/pgf/contrib/commutative-diagrams/tikzlibrarycommutative-diagrams.bapto.code.tex
+2023/08/24 | 2301 | support/bib2gls/examples/miscsymbols.bib
+2023/08/24 | 22 | support/bib2gls/DEPENDS.txt
+2023/08/24 | 222096 | info/spanish/antique-spanish-units/antique-spanish-units.pdf
2023/08/24 | 22205 | macros/latex/contrib/siunitx/siunitx.dtx
2023/08/24 | 211248 | systems/texlive/tlnet/archive/antique-spanish-units.doc.r68039.tar.xz
-2023/08/24 | 21038066 | systems/texlive/tlnet/install-tl-windows.exe
2023/08/24 | 2099 | macros/latex/contrib/hvextern/Changes
2023/08/24 | 2094 | graphics/pgf/contrib/commutative-diagrams/tikzlibrarycommutative-diagrams.code.tex
+2023/08/24 | 20170 | support/bib2gls/bib2gls.1
2023/08/24 | 2009 | graphics/pgf/contrib/commutative-diagrams/tikzlibrarycommutative-diagrams.ektropi.code.tex
2023/08/24 | 2006 | graphics/pgf/contrib/commutative-diagrams/kodi.sty
-2023/08/24 | 195524 | systems/texlive/tlnet/archive/lualinalg.doc.r68039.tar.xz
+2023/08/24 | 19671 | support/bib2gls/src/bib2gls-terms.bib
2023/08/24 | 195281 | macros/latex/contrib/photobook.zip
+2023/08/24 | 1941 | support/bib2gls/examples/sample-citations.tex
+2023/08/24 | 19305 | support/bib2gls/CHANGES
2023/08/24 | 18299 | macros/latex/contrib/siunitx/siunitx-angle.dtx
-2023/08/24 | 18227164 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
2023/08/24 | 181344 | dviware/dvidvi.zip
+2023/08/24 | 1772 | support/bib2gls/examples/markuplanguages.bib
2023/08/24 | 175 | graphics/pgf/contrib/commutative-diagrams/README
2023/08/24 | 174480 | macros/latex/contrib/photobook/photobook.cls
+2023/08/24 | 1740 | support/bib2gls/examples/sample-units3.tex
+2023/08/24 | 1734 | support/bib2gls/examples/sample-media.tex
2023/08/24 | 1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
2023/08/24 | 1720 | systems/texlive/tlnet/archive/brandeis-thesis.r68039.tar.xz
2023/08/24 | 17019 | macros/latex/contrib/photobook/scripts/make-spreads.sh
2023/08/24 | 168660 | macros/latex/contrib/siunitx/siunitx.tex
-2023/08/24 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/08/24 | 166598 | support/bib2gls/examples/sample-media.pdf
+2023/08/24 | 1647214 | support/bib2gls/texparserlib.jar
+2023/08/24 | 1603 | support/bib2gls/examples/animals.bib
2023/08/24 | 1594635 | install/macros/latex/contrib/siunitx.tds.zip
2023/08/24 | 159214 | macros/latex/contrib/siunitx/siunitx-number.dtx
+2023/08/24 | 1580 | support/bib2gls/examples/derivedunits.bib
2023/08/24 | 1569 | graphics/pgf/contrib/commutative-diagrams/tikzlibrarycommutative-diagrams.ozos.code.tex
2023/08/24 | 1547743 | macros/latex/contrib/siunitx.zip
-2023/08/24 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/08/24 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
2023/08/24 | 1527 | macros/latex/contrib/photobook/LICENSE
2023/08/24 | 15153 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
+2023/08/24 | 1506 | support/bib2gls/examples/sample-authors.tex
2023/08/24 | 150536 | systems/texlive/tlnet/archive/brandeis-thesis.doc.r68039.tar.xz
2023/08/24 | 1478943 | macros/latex/contrib/hvextern/doc/hvextern.pdf
-2023/08/24 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2023/08/24 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
2023/08/24 | 144364 | macros/latex/contrib/photobook/photobook.pdf
2023/08/24 | 14221 | macros/latex/contrib/photobook/scripts/README.md
+2023/08/24 | 14139 | support/bib2gls/src/bib2gls.pod
+2023/08/24 | 1413256 | support/bib2gls/src/texparser-src.zip
+2023/08/24 | 1391 | support/bib2gls/examples/sample-markuplanguages.tex
2023/08/24 | 1388893 | macros/latex/contrib/hvextern.zip
+2023/08/24 | 1382 | support/bib2gls/examples/sample-bacteria.tex
+2023/08/24 | 1378 | support/bib2gls/examples/sample-constants.tex
2023/08/24 | 13756 | systems/texlive/tlnet/archive/hebrew-fonts.source.r68038.tar.xz
-2023/08/24 | 1289904 | systems/texlive/tlnet/archive/siunitx.doc.r68039.tar.xz
-2023/08/24 | 122236 | systems/texlive/tlnet/archive/siunitx.source.r68039.tar.xz
+2023/08/24 | 1371 | support/bib2gls/examples/citations.bib
+2023/08/24 | 1344 | support/bib2gls/examples/sample-nested.tex
+2023/08/24 | 1291 | support/bib2gls/examples/sample-chemical.tex
+2023/08/24 | 12775 | support/bib2gls/examples/sample-multi2.tex
+2023/08/24 | 1265 | support/bib2gls/examples/mathsrelations.bib
+2023/08/24 | 1234 | support/bib2gls/examples/sample-units2.tex
+2023/08/24 | 1219 | support/bib2gls/examples/bacteria.bib
+2023/08/24 | 121264 | support/bib2gls/examples/sample-maths.pdf
+2023/08/24 | 12107 | info/spanish/antique-spanish-units/antique-spanish-units.tex
+2023/08/24 | 1207 | support/bib2gls/examples/sample-textsymbols.tex
2023/08/24 | 1179 | macros/latex/contrib/siunitx/README.md
2023/08/24 | 11729 | graphics/pgf/contrib/commutative-diagrams/tikzlibrarycommutative-diagrams.mandyas.code.tex
-2023/08/24 | 114116 | systems/texlive/tlnet/archive/texlive-scripts.r68026.tar.xz
+2023/08/24 | 1145929 | support/bib2gls/src/bib2gls.tex
2023/08/24 | 11266 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
-2023/08/24 | 112072 | systems/texlive/tlnet/archive/luamaths.doc.r68039.tar.xz
+2023/08/24 | 109259 | support/bib2gls/examples/sample-msymbols.pdf
+2023/08/24 | 1091 | support/bib2gls/examples/vegetables.bib
+2023/08/24 | 1070 | support/bib2gls/examples/sample-units1.tex
2023/08/24 | 1053468 | systems/texlive/tlnet/archive/newtx.doc.r68035.tar.xz
2023/08/24 | 10389 | macros/latex/contrib/photobook/Makefile
2023/08/24 | 103396 | macros/latex/contrib/siunitx/siunitx-unit.dtx
+2023/08/24 | 1031 | support/bib2gls/examples/baseunits.bib
2023/08/24 | 1012 | systems/texlive/tlnet/archive/collection-luatex.r68037.tar.xz
2023/08/23 | 9956 | systems/texlive/tlnet/archive/teubner.r68022.tar.xz
2023/08/23 | 92866 | macros/generic/expex-acro.zip
@@ -126,8 +257,6 @@
2023/08/23 | 8220 | systems/texlive/tlnet/archive/hvextern.r68017.tar.xz
2023/08/23 | 7624 | systems/texlive/tlnet/archive/numerica-tables.r68020.tar.xz
2023/08/23 | 745 | dviware/dviasm/README
-2023/08/23 | 744 | info/spanish/antique-spanish-units/README
-2023/08/23 | 7299 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/08/23 | 6576 | macros/luatex/latex/luamaths/luamaths-fractions.lua
2023/08/23 | 628988 | systems/texlive/tlnet/archive/numerica-tables.doc.r68020.tar.xz
2023/08/23 | 62576 | systems/texlive/tlnet/archive/mathfont.source.r68018.tar.xz
@@ -151,13 +280,11 @@
2023/08/23 | 31404 | systems/texlive/tlnet/archive/babel-hebrew.source.r68016.tar.xz
2023/08/23 | 312717 | graphics/pgf/contrib/profsio/doc/ProfSio-doc-fr.pdf
2023/08/23 | 269684 | macros/luatex/latex/lualinalg/lualinalg.pdf
-2023/08/23 | 221605 | info/spanish/antique-spanish-units/antique-spanish-units.pdf
2023/08/23 | 221470 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt
2023/08/23 | 2182 | macros/luatex/latex/luamaths/luamaths.sty
2023/08/23 | 21460 | systems/texlive/tlnet/archive/mathfont.r68018.tar.xz
2023/08/23 | 213708 | systems/texlive/tlnet/archive/notomath.r68014.tar.xz
2023/08/23 | 212308 | macros/luatex/latex/lualinalg.zip
-2023/08/23 | 212151 | info/spanish/antique-spanish-units.zip
2023/08/23 | 21096 | systems/texlive/tlnet/archive/numerica.r68021.tar.xz
2023/08/23 | 21096 | systems/texlive/tlnet/archive/bibtexperllibs.r68024.tar.xz
2023/08/23 | 2090 | macros/luatex/latex/lualinalg/README.txt
@@ -171,7 +298,6 @@
2023/08/23 | 12044 | systems/texlive/tlnet/archive/babel-hebrew.r68016.tar.xz
2023/08/23 | 11536 | systems/texlive/tlnet/archive/xstring.r68015.tar.xz
2023/08/23 | 1134608 | systems/texlive/tlnet/archive/hvextern.doc.r68017.tar.xz
-2023/08/23 | 11282 | info/spanish/antique-spanish-units/antique-spanish-units.tex
2023/08/23 | 1127 | dviware/dvidvi/dvidvi.test
2023/08/23 | 1124712 | systems/texlive/tlnet/archive/numerica.doc.r68021.tar.xz
2023/08/23 | 1117184 | systems/texlive/tlnet/archive/teubner.doc.r68022.tar.xz
@@ -530,6 +656,7 @@
2023/08/21 | 2522 | support/bibtexperllibs/BibTeX-Parser/t/cleaned_field.t
2023/08/21 | 2520 | fonts/notomath/tfm/notosansbmia.tfm
2023/08/21 | 2512 | fonts/simpleicons/enc/simpleiconsonezero.enc
+2023/08/21 | 251176 | fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-BoldItalic.ttf
2023/08/21 | 251002 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
2023/08/21 | 2492 | fonts/notomath/tfm/notosansmia.tfm
2023/08/21 | 2425 | fonts/simpleicons/enc/simpleiconsfive.enc
@@ -542,6 +669,7 @@
2023/08/21 | 234 | support/bibtexperllibs/BibTeX-Parser/t/00-load.t
2023/08/21 | 23444 | macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
2023/08/21 | 2340 | fonts/notomath/vf/notosansmia.vf
+2023/08/21 | 232140 | fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-Italic.ttf
2023/08/21 | 231960 | fonts/simpleicons/tex/simpleiconsglyphs-xeluatex.tex
2023/08/21 | 23005 | fonts/newtx/tex/newtxtext.sty
2023/08/21 | 2289 | fonts/simpleicons/enc/simpleiconsoneone.enc
@@ -572,12 +700,14 @@
2023/08/21 | 199681 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
2023/08/21 | 199278 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
2023/08/21 | 198959 | macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
+2023/08/21 | 198856 | fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-Bold.ttf
2023/08/21 | 198797 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
2023/08/21 | 198794 | macros/latex/contrib/reledmac/examples/1-verses.pdf
2023/08/21 | 198665 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
2023/08/21 | 198615 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
2023/08/21 | 198565 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
2023/08/21 | 198304 | macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
+2023/08/21 | 198152 | fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-Regular.ttf
2023/08/21 | 197819 | macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
2023/08/21 | 19723 | macros/latex/contrib/joinbox/joinbox.sty
2023/08/21 | 1948 | support/bibtexperllibs/LaTeX-ToUnicode/t/convert.t
@@ -918,7 +1048,6 @@
2023/08/19 | 649608 | systems/texlive/tlnet/archive/logoetalab.doc.r67974.tar.xz
2023/08/19 | 649274 | systems/win32/miktex/tm/packages/logoetalab__doc.tar.lzma
2023/08/19 | 629301 | systems/win32/miktex/tm/packages/tikzfill__doc.tar.lzma
-2023/08/19 | 625312 | support/TeX4ht/source/tex4ht-html4.tex
2023/08/19 | 6167 | systems/win32/miktex/tm/packages/naive-ebnf__source.tar.lzma
2023/08/19 | 61087 | systems/win32/miktex/tm/packages/caption.tar.lzma
2023/08/19 | 600085 | systems/win32/miktex/tm/packages/l3kernel__source.tar.lzma
@@ -1135,38 +1264,3 @@
2023/08/19 | 10549 | web/c_cpp/cweb/examples/kspell.el
2023/08/19 | 1053436 | systems/win32/miktex/tm/packages/zref-check__doc.tar.lzma
2023/08/19 | 1012632 | systems/win32/miktex/tm/packages/quran__doc.tar.lzma
-2023/08/18 | 97952 | systems/texlive/tlnet/archive/texinfo.r67954.tar.xz
-2023/08/18 | 960 | fonts/newpx/tfm/zplsups-Bold-ts1.tfm
-2023/08/18 | 956 | fonts/newpx/tfm/zplsups-Regular-ts1.tfm
-2023/08/18 | 85858 | macros/jptex/latex/pxchfon/pxchfon.sty
-2023/08/18 | 816 | systems/texlive/tlnet/archive/collection-langother.r67960.tar.xz
-2023/08/18 | 79013 | macros/latex/contrib/babel-contrib/greek/babel-greek.dtx
-2023/08/18 | 77626 | macros/jptex/latex/pxchfon/pxchfon.tex
-2023/08/18 | 674245 | macros/latex/contrib/logoetalab/doc/logoetalab-doc.pdf
-2023/08/18 | 671967 | macros/latex/contrib/logoetalab.zip
-2023/08/18 | 6717 | macros/jptex/latex/pxchfon/README.md
-2023/08/18 | 644 | macros/jptex/latex/pxchfon/pxjafont.sty
-2023/08/18 | 57479 | macros/latex/contrib/babel-contrib/greek/babel-greek-doc.html
-2023/08/18 | 56632 | systems/texlive/tlnet/archive/expex-glossonly.doc.r67958.tar.xz
-2023/08/18 | 391334 | macros/jptex/latex/pxchfon.zip
-2023/08/18 | 368 | macros/latex/contrib/luacolor/README.md
-2023/08/18 | 358564 | systems/texlive/tlnet/archive/pxpic.doc.r67955.tar.xz
-2023/08/18 | 353916 | macros/latex/contrib/luacolor/luacolor.pdf
-2023/08/18 | 351668 | macros/latex/contrib/luacolor.zip
-2023/08/18 | 34012 | systems/texlive/tlnet/archive/greek-fontenc.r67956.tar.xz
-2023/08/18 | 33361 | macros/latex/contrib/luacolor/luacolor.dtx
-2023/08/18 | 3200 | systems/texlive/tlnet/archive/pxpic.r67955.tar.xz
-2023/08/18 | 2880268 | systems/texlive/tlnet/archive/greek-fontenc.doc.r67956.tar.xz
-2023/08/18 | 263472 | macros/jptex/latex/pxchfon/pxchfon.pdf
-2023/08/18 | 2184 | systems/texlive/tlnet/archive/expex-glossonly.r67958.tar.xz
-2023/08/18 | 2042036 | systems/texlive/tlnet/archive/culmus.source.r67961.tar.xz
-2023/08/18 | 1900 | fonts/newpx/tex/ts1zplsups.fd
-2023/08/18 | 18588 | macros/latex/contrib/babel-contrib/greek/babel-greek-doc.rst
-2023/08/18 | 15771 | macros/latex/contrib/logoetalab/doc/logoetalab-doc.tex
-2023/08/18 | 1518740 | systems/texlive/tlnet/archive/culmus.r67961.tar.xz
-2023/08/18 | 15028 | systems/texlive/tlnet/archive/pxpic.source.r67955.tar.xz
-2023/08/18 | 144300 | systems/texlive/tlnet/archive/culmus.doc.r67961.tar.xz
-2023/08/18 | 1209 | macros/latex/contrib/babel-contrib/greek/README.md
-2023/08/18 | 10951 | macros/jptex/latex/pxchfon/README-ja.md
-2023/08/18 | 1036 | fonts/newpx/tfm/zplsups-Italic-ts1.tfm
-2023/08/18 | 1036 | fonts/newpx/tfm/zplsups-BoldItalic-ts1.tfm
diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib
index d9624a08f9..c4a0258321 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 25-08-2023, 02:00:14
+%% created at 26-08-2023, 02:01:32
%%
%% This file is provided under the terms of the LPPL v1.3 or
@@ -2432,8 +2432,8 @@
title = {The \texttt{antique-spanish-units} package},
subtitle = {A short document about antique spanish units},
author = {Noel Merino Hernández},
- date = {2023-08-23},
- version = {1.2},
+ date = {2023-08-25},
+ version = {1.3},
license = {cc-by-4},
mirror = {https://mirror.ctan.org/info/spanish/antique-spanish-units},
url = {https://ctan.org/pkg/antique-spanish-units},
@@ -6690,8 +6690,8 @@
title = {The \texttt{bib2gls} package},
subtitle = {Command line application to convert .bib files to glossaries-extra.sty resource files},
author = {Nicola Talbot},
- date = {2023-06-29},
- version = {3.4},
+ date = {2023-08-25},
+ version = {3.5},
license = {gpl3+},
mirror = {https://mirror.ctan.org/support/bib2gls},
url = {https://ctan.org/pkg/bib2gls},
@@ -23498,8 +23498,8 @@
title = {The \texttt{Evangelion-JFM} package},
subtitle = {A Japanese font metric supporting many advanced features},
author = {Jing Huang},
- date = {2023-05-19},
- version = {1.0.4 (e)},
+ date = {2023-08-25},
+ version = {1.0.5 (b)},
license = {mit},
mirror = {https://mirror.ctan.org/macros/luatex/generic/evangelion-jfm},
url = {https://ctan.org/pkg/evangelion-jfm},
@@ -51157,6 +51157,17 @@
url = {https://ctan.org/pkg/parselines},
}
+@manual{ctan-parsianfonts,
+ title = {The \texttt{parsianfonts} package},
+ subtitle = {Some of the most used fonts among Persian language users},
+ author = {Sajad Kazemi},
+ date = {2023-08-25},
+ version = {1.0.1},
+ license = {lppl1.3c},
+ mirror = {https://mirror.ctan.org/fonts/parsianfonts},
+ url = {https://ctan.org/pkg/parsianfonts},
+}
+
@manual{ctan-parsitex,
title = {The \texttt{parsitex} package},
subtitle = {A localized Persian and bidirectional extension of \TeX{}},
@@ -54725,8 +54736,8 @@
title = {The \texttt{ProfLycee} package},
subtitle = {A \LaTeX{} package for French maths teachers in high school},
author = {Cédric Pierquet},
- date = {2023-08-09},
- version = {2.7.1},
+ date = {2023-08-25},
+ version = {2.7.2},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/proflycee},
url = {https://ctan.org/pkg/proflycee},
diff --git a/biblio/ctan-bibdata/ctan.pdf b/biblio/ctan-bibdata/ctan.pdf
index 31af08d923..365f4fe058 100644
--- a/biblio/ctan-bibdata/ctan.pdf
+++ b/biblio/ctan-bibdata/ctan.pdf
Binary files differ
diff --git a/fonts/parsianfonts/Parsian/Parsian-Bold.ttf b/fonts/parsianfonts/Parsian/Parsian-Bold.ttf
new file mode 100644
index 0000000000..98e934f66e
--- /dev/null
+++ b/fonts/parsianfonts/Parsian/Parsian-Bold.ttf
Binary files differ
diff --git a/fonts/parsianfonts/Parsian/Parsian-BoldItalic.ttf b/fonts/parsianfonts/Parsian/Parsian-BoldItalic.ttf
new file mode 100644
index 0000000000..acad869dd6
--- /dev/null
+++ b/fonts/parsianfonts/Parsian/Parsian-BoldItalic.ttf
Binary files differ
diff --git a/fonts/parsianfonts/Parsian/Parsian-Italic.ttf b/fonts/parsianfonts/Parsian/Parsian-Italic.ttf
new file mode 100644
index 0000000000..b42f43b482
--- /dev/null
+++ b/fonts/parsianfonts/Parsian/Parsian-Italic.ttf
Binary files differ
diff --git a/fonts/parsianfonts/Parsian/Parsian-Regular.ttf b/fonts/parsianfonts/Parsian/Parsian-Regular.ttf
new file mode 100644
index 0000000000..df1e6de088
--- /dev/null
+++ b/fonts/parsianfonts/Parsian/Parsian-Regular.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianMono/ParsianMono-Bold.ttf b/fonts/parsianfonts/ParsianMono/ParsianMono-Bold.ttf
new file mode 100644
index 0000000000..23b92bda9c
--- /dev/null
+++ b/fonts/parsianfonts/ParsianMono/ParsianMono-Bold.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianMono/ParsianMono-BoldItalic.ttf b/fonts/parsianfonts/ParsianMono/ParsianMono-BoldItalic.ttf
new file mode 100644
index 0000000000..11125dd56f
--- /dev/null
+++ b/fonts/parsianfonts/ParsianMono/ParsianMono-BoldItalic.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianMono/ParsianMono-Italic.ttf b/fonts/parsianfonts/ParsianMono/ParsianMono-Italic.ttf
new file mode 100644
index 0000000000..f722c804d5
--- /dev/null
+++ b/fonts/parsianfonts/ParsianMono/ParsianMono-Italic.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianMono/ParsianMono-Regular.ttf b/fonts/parsianfonts/ParsianMono/ParsianMono-Regular.ttf
new file mode 100644
index 0000000000..9cc19e2d12
--- /dev/null
+++ b/fonts/parsianfonts/ParsianMono/ParsianMono-Regular.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianNaskh/ParsianNaskh-Bold.ttf b/fonts/parsianfonts/ParsianNaskh/ParsianNaskh-Bold.ttf
new file mode 100644
index 0000000000..a5d2fb88f8
--- /dev/null
+++ b/fonts/parsianfonts/ParsianNaskh/ParsianNaskh-Bold.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianNaskh/ParsianNaskh-BoldItalic.ttf b/fonts/parsianfonts/ParsianNaskh/ParsianNaskh-BoldItalic.ttf
new file mode 100644
index 0000000000..52ddbc6a11
--- /dev/null
+++ b/fonts/parsianfonts/ParsianNaskh/ParsianNaskh-BoldItalic.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianNaskh/ParsianNaskh-Italic.ttf b/fonts/parsianfonts/ParsianNaskh/ParsianNaskh-Italic.ttf
new file mode 100644
index 0000000000..3a9fbdef20
--- /dev/null
+++ b/fonts/parsianfonts/ParsianNaskh/ParsianNaskh-Italic.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianNaskh/ParsianNaskh-Regular.ttf b/fonts/parsianfonts/ParsianNaskh/ParsianNaskh-Regular.ttf
new file mode 100644
index 0000000000..a3f86a99ab
--- /dev/null
+++ b/fonts/parsianfonts/ParsianNaskh/ParsianNaskh-Regular.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianSans/ParsianSans-Bold.ttf b/fonts/parsianfonts/ParsianSans/ParsianSans-Bold.ttf
new file mode 100644
index 0000000000..aff7389798
--- /dev/null
+++ b/fonts/parsianfonts/ParsianSans/ParsianSans-Bold.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianSans/ParsianSans-BoldItalic.ttf b/fonts/parsianfonts/ParsianSans/ParsianSans-BoldItalic.ttf
new file mode 100644
index 0000000000..87a58c7b76
--- /dev/null
+++ b/fonts/parsianfonts/ParsianSans/ParsianSans-BoldItalic.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianSans/ParsianSans-Italic.ttf b/fonts/parsianfonts/ParsianSans/ParsianSans-Italic.ttf
new file mode 100644
index 0000000000..c14ed1eae7
--- /dev/null
+++ b/fonts/parsianfonts/ParsianSans/ParsianSans-Italic.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianSans/ParsianSans-Regular.ttf b/fonts/parsianfonts/ParsianSans/ParsianSans-Regular.ttf
new file mode 100644
index 0000000000..1b9bb34d1c
--- /dev/null
+++ b/fonts/parsianfonts/ParsianSans/ParsianSans-Regular.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianTeX/ParsianTeX-Bold.ttf b/fonts/parsianfonts/ParsianTeX/ParsianTeX-Bold.ttf
new file mode 100644
index 0000000000..90bae68d2e
--- /dev/null
+++ b/fonts/parsianfonts/ParsianTeX/ParsianTeX-Bold.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianTeX/ParsianTeX-BoldItalic.ttf b/fonts/parsianfonts/ParsianTeX/ParsianTeX-BoldItalic.ttf
new file mode 100644
index 0000000000..43c1d717e6
--- /dev/null
+++ b/fonts/parsianfonts/ParsianTeX/ParsianTeX-BoldItalic.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianTeX/ParsianTeX-Italic.ttf b/fonts/parsianfonts/ParsianTeX/ParsianTeX-Italic.ttf
new file mode 100644
index 0000000000..f15bc44d2d
--- /dev/null
+++ b/fonts/parsianfonts/ParsianTeX/ParsianTeX-Italic.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianTeX/ParsianTeX-Regular.ttf b/fonts/parsianfonts/ParsianTeX/ParsianTeX-Regular.ttf
new file mode 100644
index 0000000000..6131d08747
--- /dev/null
+++ b/fonts/parsianfonts/ParsianTeX/ParsianTeX-Regular.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-Bold.ttf b/fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-Bold.ttf
new file mode 100644
index 0000000000..f847fc3ba3
--- /dev/null
+++ b/fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-Bold.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-BoldItalic.ttf b/fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-BoldItalic.ttf
new file mode 100644
index 0000000000..0b96804959
--- /dev/null
+++ b/fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-BoldItalic.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-Italic.ttf b/fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-Italic.ttf
new file mode 100644
index 0000000000..d546c2e027
--- /dev/null
+++ b/fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-Italic.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-Regular.ttf b/fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-Regular.ttf
new file mode 100644
index 0000000000..4d13eaf5e4
--- /dev/null
+++ b/fonts/parsianfonts/ParsianTeXClassic/ParsianTeXClassic-Regular.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianTitle/ParsianTitle-Italic.ttf b/fonts/parsianfonts/ParsianTitle/ParsianTitle-Italic.ttf
new file mode 100644
index 0000000000..80e9235bed
--- /dev/null
+++ b/fonts/parsianfonts/ParsianTitle/ParsianTitle-Italic.ttf
Binary files differ
diff --git a/fonts/parsianfonts/ParsianTitle/ParsianTitle-Regular.ttf b/fonts/parsianfonts/ParsianTitle/ParsianTitle-Regular.ttf
new file mode 100644
index 0000000000..259e6ff633
--- /dev/null
+++ b/fonts/parsianfonts/ParsianTitle/ParsianTitle-Regular.ttf
Binary files differ
diff --git a/fonts/parsianfonts/README.md b/fonts/parsianfonts/README.md
new file mode 100644
index 0000000000..87e053a35b
--- /dev/null
+++ b/fonts/parsianfonts/README.md
@@ -0,0 +1,29 @@
+# parsianfonts
+Version 1.0.1
+
+This package containg seven persian font families
+ - Parsian. This font is based on the "Nazli" font, which itself is a free edition of the popular Nazanin font.
+ - Parsian Sans. A font based on the "Roya" font. The name of this font was chosen because of its similar structure to "Nazanin" font and its modern appearance.
+ - Parsian Mono. One of the best monospace fonts you can find that supports Persian language! Unlike other fonts that are based on other fonts, this one is designed by the author himself.
+ - Parsian TeX. Persian language support for TeX's default font, "Persian Modern".
+ - Parsian TeX Classic. One of the oldest Persian fonts used for typesetting scientific and academic texts is the default font of TeX-e-Parsi software. Some publishing houses still type their books with this font. The Parsian TeX Classic font allows you to use this old font in the latest versions of TeX and LaTeX.
+ - Parsian Title. Based on "Titr", which is a title font and is widely used in Persian printed texts.
+ - Parsian Naskh. The "Naskh" script provides good readability when used for official Persian texts. This font is based on "Yas" which is one of the most used fonts among TeX/LaTeX users.
+
+============================================================
+
+Author: Sajad Kazemi <sajad.kazemi.ctan@gmail>
+
+Copyright (C) 2023 by Sajad Kazemi <https://github.com/SajadKazemi>
+
+============================================================
+
+## License
+--------------------------
+This material is subject to the LaTeX Project Public License. See
+
+ https://ctan.org/license/lppl1.3c
+
+for the details of that license.
+
+To get help, please visit <https://github.com/SajadKazemi> or emai the author at <sajad.kazemi.ctan@gmail>. \ No newline at end of file
diff --git a/fonts/parsianfonts/parsianfonts-samples.pdf b/fonts/parsianfonts/parsianfonts-samples.pdf
new file mode 100644
index 0000000000..e22adf1f96
--- /dev/null
+++ b/fonts/parsianfonts/parsianfonts-samples.pdf
Binary files differ
diff --git a/fonts/parsianfonts/parsianfonts-samples.tex b/fonts/parsianfonts/parsianfonts-samples.tex
new file mode 100644
index 0000000000..0a2d58852f
--- /dev/null
+++ b/fonts/parsianfonts/parsianfonts-samples.tex
@@ -0,0 +1,178 @@
+\documentclass[12pt,a4paper]{article}
+\usepackage[a4paper,margin=1.5cm]{geometry}
+
+\usepackage{enumitem}
+\setitemize{nosep}
+
+\pagenumbering{gobble}
+
+\usepackage[computeautoilg=on]{xepersian}
+
+\settextfont{Parsian}
+\setlatintextfont{Parsian}
+
+\title{\lr{``Parsian'' Font Samples (version 1.0.1)}}
+\author{\lr{Sajad Kazemi} \\ \lr{\texttt{sajad.kazemi.ctan@gmail.com}} \\
+\lr{\texttt{https://github.com/SajadKazemi}}}
+
+\date{\latintoday}
+
+\setlength{\parindent}{0pt}
+
+\newcommand{\sample}{%
+\begin{center}
+یک Ùونت استاندارد باید هم از نظر طراحی Ùˆ هم اجرای نرم‌اÙزاری کاملاً استاندارد باشد. 0123456789
+
+طَرَحَتْنÙÙŠ النّوَى مَطَارÙحَهَا حَتّى إذَا ÙˆÙŽØ·Ùئْت٠جÙرْجَان الأَقْصى. ٠١٢٣٤٥٦٧٨٩
+
+\begin{latin}
+Empowering the world to develope technology through collective knowledge. 0123456789
+\end{latin}
+\end{center}
+}
+
+\newcommand{\setfont}[2]{%
+\settextfont{#1}%
+\setlatintextfont{#1}%
+}
+
+
+\begin{document}
+\maketitle
+
+\vspace*{2cm}
+
+
+\begin{latin}
+{\large \textbf{Font list}}
+\begin{itemize}[labelindent=0pt,leftmargin=10pt]
+\item \textbf{Parsian:} Nazli (Persian) + FreeSerif (Latin, Cyrillic, Greek)
+\item \textbf{Parsian Sans:} Roya (Persian) + FreeSans (Latin, Cyrillic, Greek)
+\item \textbf{Parsian Mono:} Rubik (Persian) + FreeMono (Latin, Cyrillic, Greek)
+\item \textbf{Parsian TeX:} Parastoo (Persian) + Computer Modern (Latin, Cyrillic, Greek)
+\item \textbf{Parsian TeX Classic:} Farvardin (of TeX-e-Parsi) (Persian) + Computer Modern (Latin, Cyrillic, Greek)
+\item \textbf{Parsian Naskh:} Yas (Persian) + FreeSerif (Latin, Cyrillic, Greek)
+\item \textbf{Parsian Title:} Titr (Persian) + FreeSerif (Latin, Cyrillic, Greek)
+\end{itemize}
+\end{latin}
+
+\newpage
+
+\section*{پارسیان (\lr{Parsian})}
+
+\subsection*{عادی (\lr{Regular})}
+{\sample}
+
+\subsection*{خوابیده به راست (\lr{Italic})}
+{\itshape \sample}
+
+\subsection*{پررنگ (\lr{Bold})}
+{\bfseries \sample}
+
+\subsection*{خوابیده به راست پررنگ (\lr{Bold Italic})}
+{\bfseries \itshape \sample}
+
+
+
+
+\newpage
+\setfont{Parsian Sans}
+
+\section*{پارسیان سنس (\lr{Parsian Sans})}
+
+\subsection*{عادی (\lr{Regular})}
+{\sample}
+
+\subsection*{خوابیده به راست (\lr{Italic})}
+{\itshape \sample}
+
+\subsection*{پررنگ (\lr{Bold})}
+{\bfseries \sample}
+
+\subsection*{خوابیده به راست پررنگ (\lr{Bold Italic})}
+{\bfseries \itshape \sample}
+
+
+\newpage
+\setfont{Parsian Mono}
+
+\section*{پارسیان مونو (\lr{Parsian Mono})}
+
+\subsection*{عادی (\lr{Regular})}
+{\sample}
+
+\subsection*{خوابیده به راست (\lr{Italic})}
+{\itshape \sample}
+
+\subsection*{پررنگ (\lr{Bold})}
+{\bfseries \sample}
+
+\subsection*{خوابیده به راست پررنگ (\lr{Bold Italic})}
+{\bfseries \itshape \sample}
+
+
+\newpage
+\setfont{Parsian TeX}
+
+\section*{پارسیان تÙÚ© (\lr{Parsian TeX})}
+
+\subsection*{عادی (\lr{Regular})}
+{\sample}
+
+\subsection*{خوابیده به راست (\lr{Italic})}
+{\itshape \sample}
+
+\subsection*{پررنگ (\lr{Bold})}
+{\bfseries \sample}
+
+\subsection*{خوابیده به راست پررنگ (\lr{Bold Italic})}
+{\bfseries \itshape \sample}
+
+
+\newpage
+\setfont{Parsian TeX Classic}
+
+\section*{پارسیان تÙÚ© کلاسیک (\lr{Parsian TeX Classic})}
+
+\subsection*{عادی (\lr{Regular})}
+{\sample}
+
+\subsection*{خوابیده به راست (\lr{Italic})}
+{\itshape \sample}
+
+\subsection*{پررنگ (\lr{Bold})}
+{\bfseries \sample}
+
+\subsection*{خوابیده به راست پررنگ (\lr{Bold Italic})}
+{\bfseries \itshape \sample}
+
+\newpage
+\setfont{Parsian Naskh}
+
+\section*{پارسیان نسخ (\lr{Parsian Naskh})}
+
+\subsection*{عادی (\lr{Regular})}
+{\sample}
+
+\subsection*{خوابیده به راست (\lr{Italic})}
+{\itshape \sample}
+
+\subsection*{پررنگ (\lr{Bold})}
+{\bfseries \sample}
+
+\subsection*{خوابیده به راست پررنگ (\lr{Bold Italic})}
+{\bfseries \itshape \sample}
+
+\newpage
+\setfont{Parsian Title}
+
+\section*{پارسیان عنوان (\lr{Parsian Title})}
+
+\subsection*{عادی (\lr{Regular})}
+{\sample}
+
+\subsection*{خوابیده به راست (\lr{Italic})}
+{\itshape \sample}
+
+
+\end{document} \ No newline at end of file
diff --git a/info/spanish/antique-spanish-units/README b/info/spanish/antique-spanish-units/README
index 881f8e31bb..2d2caf1fb5 100644
--- a/info/spanish/antique-spanish-units/README
+++ b/info/spanish/antique-spanish-units/README
@@ -4,7 +4,7 @@ This short document is about antique spanish units used in Spain and their colon
The document is provided "as is", with no warranties, and is distributed under Creative Commons Attribution 4.0 International License.
-Current version: 1.2 (2023-08-23)
+Current version: 1.3 (2023-08-24)
This "package" is maintained by Noel Merino Hernández
@@ -14,3 +14,4 @@ History versions:
1.1: Initial release (2023-06-07)
1.2: Some improvements in tables (2023-08-23)
+1.3: Added units and subunits in tables (2023-08-24)
diff --git a/info/spanish/antique-spanish-units/antique-spanish-units.pdf b/info/spanish/antique-spanish-units/antique-spanish-units.pdf
index 08c7ddd6c1..d378929351 100644
--- a/info/spanish/antique-spanish-units/antique-spanish-units.pdf
+++ b/info/spanish/antique-spanish-units/antique-spanish-units.pdf
@@ -205,7 +205,7 @@ stream
</dc:rights>
<dc:date>
<rdf:Seq>
- <rdf:li>2023-08-23T01:12:27-06:00</rdf:li>
+ <rdf:li>2023-08-24T20:51:23-06:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:type>
@@ -219,12 +219,12 @@ stream
<rdf:li>es</rdf:li>
</rdf:Bag>
</dc:language>
- <xmp:CreateDate>2023-08-23T01:12:27-06:00</xmp:CreateDate>
- <xmp:ModifyDate>2023-08-23T01:12:27-06:00</xmp:ModifyDate>
- <xmp:MetadataDate>2023-08-23T01:12:27-06:00</xmp:MetadataDate>
+ <xmp:CreateDate>2023-08-24T20:51:23-06:00</xmp:CreateDate>
+ <xmp:ModifyDate>2023-08-24T20:51:23-06:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2023-08-24T20:51:23-06:00</xmp:MetadataDate>
<xmp:CreatorTool>Noel Merino Hernández (muxkernel@gmail.com)</xmp:CreatorTool>
<xmpMM:DocumentID>uuid:f2000a3e-fd13-4954-846c-95fd1d7f754c</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:00546c41-d133-49b1-8d1d-75f26c4c9b6c</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:0a39546c-4c41-4dce-81dc-ef2b67a3959b</xmpMM:InstanceID>
<xmpMM:VersionID>1</xmpMM:VersionID>
<xmpMM:RenditionClass>default</xmpMM:RenditionClass>
<prism:complianceProfile>three</prism:complianceProfile>
@@ -271,82 +271,75 @@ endstream
endobj
15 0 obj
<<
-/Length 5298
+/Length 5303
/Filter /FlateDecode
>>
stream
-xÚí=K‹&In÷þ}™š¡Ò’â…ñeÁ^ð͸éO­¡ÙZûâ9Ú¦ö¯[Š¬ïËx)#3§wwÚÔ©«ªS!…Þ
-ÅÃ<üçƒyøí;£üû›ïþîŸ â˜Å{pþãÁ¢_ÐÛoÜcxøðòðãwÏàÍãï?ü³|í«¯íÂ0ëW/·OªÓ’l¼}òlÌx ÈÈÜý+0þöUªÐìöÕÇá@~!sˆž „ñHn³‘ÖŽçÇlŸ©£Á}´÷áÂâ˜17†ø…‚ßFqÛ-Þ…(–†x'ýËx$Ïⳕpž
-"·aÿÓX~®4›þÕÁTÖQÀ0ëŠù³ûŽß­éNvì1«Q‚#/^ÓkpÌ°f@qÁ[\xQ´"Fß˨a=GÛTÉ',\Àã]@çÑ-fGd8NŠÄ<KÊàÓ㢻sÕÞh å×a±0ð—͘´6žSКòKþÑÆÔ„ gZl
-#œ¦Ái¡åå`úY¢ÿ”åÎcñŸ™öÏäYÅDyj›¤C²Ëô¾†l³ÊŠ‚Z¤Ù ×p·é—2
-$ÚÅcƒýÓ|¾œuË8¯A’å˜jÈ/s:‡±\š"tœyaGj™>jÞ,1Q ùqŽÐ;û4Fè—9ÞÈsÅ 3WçRd_Ñ+p“ÈÄsi¤ÀO®
-X*r0°˜Ð°ë5aD8&,0Ó’ñ2Gmã’’ ž"ähÂuÌí
-2P^£jH…¤†(õu y@’ØÔªC¥È{X%çßš™*Nµ†|õL§µ
-ã“&ÍAP”DÇÆù|jƒ¹§èÖÐ61žÛ%\àJܣēÜÙôÐÉbH:šHÝÐ&ÿÈÁÅàdùçÅr|»„zoÕZ®\î¡ìYUbÁä¦vMSbAt-ÕPŸæ¸"' ¶"ÍÑ¡c v¼¹5÷ÜÔŽ§i‚i.Ž/ÞÒÖ%…ðeŽ.åT²ÂÆ1x«9Õê½D …,µ<RŠÕ0½&ê%àû)©$‚éd¹³ÜvOðÍÚè©fÙƒ.RäðŸs†qJRM8º‚N¶G´š6GÇ…—СÉ-þV±o«—Oi¹ðžà{ŸV{ÄÈ‚ãÇ)ù^„z…|. "uj´³Üw_cg6·j4uÀ¹›õñ¤·‘Æfǹ T» ì|™þ^XNTÜI³Ã¼ùtF«è¬_È¥‘€ý¡@@œ¼ºó–röÁSGöâ6Æ ´ËÆ«ˆ#Ú_ùo§Ô;I/ý@ÏÖ!ö–0﵆ãŠáõ¬©8Y³ª¬"–²!‘îjUÌœl%Œmf0E—8}ÁóžÓ
-Є¯9gÉ°p žg-™u_Y¯3ŒüçÜò9ë¯ÈJ“£ÁøÇ gš%•¼C¤µ=+Ë6ÑÞQMó:âÐYìïÆië$rŠr+D-ší&zò@È•Gè¬c.
-95¦³ëÍFüôÒB ¶Ó\‹„8ŠÁ@„üÛÐ:wæâǼ¦ßE…Ü*cÏòóµãú6F]£
-éenƒúÏsŠsÆwV QcÀžUBÙþ—0 ”ð¬´%y(Úr®uÝ”>,MsäàfÛÀKÓ$J*8g¢žD©ÄJ‡¤ÚÜNˆfvf(åXìMu·¹ÕVnÁ0Že{H9:ï.¤§$MmOÏ¥ÉZåk6ôëX9¢a—cIŠÉI‘<ðCñ;Z!Ì¥ð~m;”£ü[ßÛÍEC-"tfn:dƒTùóadÑëÔÝ#éÕŽl:tÞ=Ò)®Ç«†fªÒé8ý¤„C—´ƒMºƒœn£:ÂÜÜ‘DW@úf“£l–Ë$šÕ¤~zé˜ZßB:j.¢P å\³¨‚þ{µ>÷Å6G©?[rõ•¾ rMskH´’3<¸üãºGYj<éHÉ¿öÛ¬÷á_(v„y3'ÌÃb¨!_æåX3„¡=À‰€\Ow"ßY’ñEÇÐÙ秹¬#å‹ZRíœTYŽñ–|™Ó™äB£Ž7;ËFþ^ÄÉå,ª9ìLRÊ?ò Îs„\ÿJalºØìýS§-7 C]%tâ_³Ìro}ïI‡Ùú9©ÄÖèÚiïõ&}QʹƌßÏñ±yzçtÐñùõÈÞÖøÏÜUtL™ä|nRtIŸ¤4ô9
-\˜$[¨,ñ«“ÔqråÈiÄœ’-žd
-ymMUUr‚l>?oÚ²ÅSš¶'Å!{<Mïgx!95Ö›ãΡ— Rz/ا:/¨€T¶èŠHÈ䄧‚ü~ž< §Í!uNÀð·èdUÒƒŸŽ”³î‚#È;N]c—swŽ^’OßóõP”—K(Ø­_™(;ƒ`èŠ&°3£ßç45»¼nî 0É6N?H×è¹{¬¤HŽ­u"ª6ël·X|™³Pºt´§Ÿ¨C†Üì8oÀRzkϲPî¬ð˜.dÔÄá[=™'g¸Fï-ð€’PX—?¼wBªç­ŒýíR…ñãÁäN Óæ=snçBۣ͘Ãg²Í ºã›·­ì¾ ®Û¹µªhÏɱ€n~Ã×8äuàÓÄæ³í$ç§\¬ì¼ûÚ#VEŠr G*™®äHÜüx•Ü¯%™\-Žùa.—o+®ÀN5°Þæ.V''°þðѹä"EwrÆr 4ùjwL'ä{ÅÎ*p>–b£Ó³h¸P¢ÓŠ+·[ *‘{§Ñ"ŠOœlRi$ñzpf•§=r¾ ;8@1úÜ‘ê4qF1qvx† &ÅÐqè™Ké³\âìù<fÏŠëÏ;1)ódMþ4geë™D³îÀÁ7N°&r~î-šÜsËP?M"—näºç¤ó‚D\„´pw¹ÞÒæ$š˜…â$Êqkû0 Þ#˜cgÉä’çOë ½Âù™v1h÷Jº¢`Š±¶~:rb[z€®‹ÐOFÊ)èsþX¶cæ5eÅÛ¨ó“mÕ¡¶ùƒ‡#s4ô‘öWæ#Âg3 9'‡ µóÃV†3Æ´eÜå?ô*…–«äxÞ{Ë!¹d‚šwÌ•†P.Ï oÜ\u9D5å9r&PÎ.
- G7Òà1‹ê.uc6ü÷ÆX¾q=pqî(ß/¼‘›ãi½#"­«:‹¡±Ž«†êþüáÈi!š‡Pš‘äpúýº÷µÿêÂ+/|ñ—OÅ5õÛœ„Ê™N *®B‹¯ª¨Ñ (òörE±'«žžÏ×ûuo 4ƒ¥òŒ÷Õmö¯ãêϹ×g ÛýÃx.tnb(`ûäœHÞ–—znŸÅÜðQtpû,ÕÏBì*aAƒT£—H¶OØþŒÝyiaûÒR¾:÷öÒBµž×"8G 1!ëõÖ÷÷‚úÊ»œªÜ
-6ž› ê†(•x¡F‡¬)»
-aädÂ/r2o™øе0_mB_d –ââY^Õ²ù3( ¢oÑk|QqׯÛçíÌÊB“µy_Éñ%«OJθmá«ÙXÑf–š4õA@ª½œ–3oÕô¯Þ®ÿñûÿ~wÛ»¤\ðòåÁøéÝ¿7/ü_r>S|øœ?ü)_çl³ÿ×ÿ¾û—w¿ùðšfx¹ü%fËvùá²@ù¶¬OÛ®c¹/ üªyr|ä ¹XÿžÅ¬£m_ÉU¥ª-?¬ã¶/Í~ûPބźŠ¾^³iÊ£ÿ%°ùIñÂe0x6L7ŠŠ©žz±¤ºx¡œ•®¯¼_aûH®¿¬húÓˆ¨˜¯)xý
-ÆÂ(w§È°BVT X:ö’j¿Q­L^Þæ9B²^r ”ùÿ
+xÚí=K‹&9r÷þ}™šáKK¡Æ—{Á7㦠žZCãÚõÅs0,ŒMì_w„ò«/õŠTfN;³ô©«ª3¡x‡’ÌÓ=™§ß¿3Ê¿¿ûðîïþ ">Y¼÷ôáOOý‚Þ>yã–ÃӇקï¿yožÿðáŸåk_}mþƒY¿z}û¤0-ÉÆ·O^Œ™{|Æ¿}•*t†{ûêãp ¿y D/Âx$·€ÙÈkÇóc„¶ÏˆÔÑà1ÚûáPaq̘7†ø…‚ßFqÛ-Þ…(–†ø ýóx$Ïⳕpn
+–ˆñ—  tqŒ¢¡BØ 0Ñú#c…TZÖ6d%§‘EW˜4Úá<oh!fÈ âBäzô ‘âˆ-µ”Mé;d®~¨2¢p±Îc‡çظçzzÉŽk5jb3Ç‘³o vÇ|mO½…WEybô½( qPN¥"Ž'4XŽõgù¬‹û<ºÅì¯ ‡S¬gï‘àéæx„è\µo´„òë°°ôFÑŒIKðaã9‘­)¿ämLM¤jp¦Å¦0ÂiœZ^¦Ÿ%ºñOYî<ÿ™©a7NžULTü‡&ÿI:${VïkÈ&Šk ¬(è EšÍ
+|s­vÝóJ„c‰F-¯sÔ6.)¹ê)BŽ&\î\Ð
+š¦Ä‚èZª¡>ÍqEN@l;Eš£CÇìxó¶¹ç v<MÓLs¡p|Ôðöø°.)”€¯st)§’6ŽÁ[Í9¨V%-d©å‘R¬–€éž¨—€ï§¤r¦“åÎrÛ#Á7ëFO ˆ0ÃÈt‘"ï¬(€ÿœ3ŒS¢jÂÑtÒEÑjÚ^B‡&w´Šý¶zyKûË…Øû´Ú#þC?NÉ÷"Ô+äsi©S£å¾Ç;³¹U£©
+ñ‚Îc^Óï¢BÞ*cÏòÓµãú6F]£
+é¥ ·Aý—9Å9ã;«„(‹1`Ï*¡´ÿ% %| VÚ’<Ûr®uÝ”}Xšæ4ÈÁͶ—¦I”TpÎD=‰R‰•"Iµ¹œÍ8>ìÌPÊ1°Ø›êîäV[¹Ã8–í!åè¼»ž’ljÛxz–(›¬¡U¾¦¡_ÇÊ »óHRLNŠäŠßкa(…÷ë¶C9Ê¿gð½n.(6Ô"Bçaæ¦CA¤ÈŸæ#;ˆ^§I¯v¤éÐy?ôH{t¦¸¯š©J§ãô“]Ò6Ù4àtÕæíÁIt¤oš¥Y˜½K»šÔ÷¨Ž©õ-¤£æ"
+ZÎE1‹*è¿Wës_´9JýÙ’«¯ômkš[C¢•œáÀå×e©ñdGJþ…´¿ÍúÞù…bG˜7sÂ<,!†òuŽPŽ5ChÚœÈõt'ò%_ì:Ûàü4—u¤|ÑBKª“*Ë1¾Ñ’Ïs:“Ü{ÔñfgÙÈ?Š8¹œE5‡IJùG¾ÁùqŽë¿@i ŒM›Þ?uÚrƒ
+Heˆ®ˆ„LNx*ÈoçÉrÚRçÜ‹N¨’üt¤ìœuAî8u]ÎÝ9zI>}Ï×CQ^.¡`·~e¢ì ‚¡+šÀÎ@Ž~Ÿw²©Ùåuso€IÚ8ý \£çî±’r 9¶Ö‰¨jÖÙn±ø<g¡ìÒÑž~¢òfÇy–ŠÐ[{–…rg…Çt!£&6ßêÉ<9£À5zo”„º¤Ðøá½Rx„¼qÞÊØ¿]ª0¾1p<˜Ü)aÚ¼gÎí\¨Ys{tøLÚ ¢;Þ¼m¥û&¸nçÖªb{NŽ”pó¾À!¯Ÿ&6ŸEh'9?åb¥óFìkX)Ê=$t©dº’#póãUr¿–drµ8懹\¾Ô¸;qÔÀz›w±:ÜÀúÃG[ä’‹ÝÉËÒä¨Ý1Hï;«Àù<ZŠNLÏ¢áB‰N+®Üna0¨DîF‹*>urÒ¤ÒHâ~pf•§=r¾ ;8@1ú¼#ÕiâŒbâìÞCOñ LŠ¡ãÐ 2—Ò1f¹ÄÙóyÌžןwbRæÉšüiÎJë™D³îÀÁ7N°&r~î-š¼ç:–¡~šD.ÝÈuÏI牸iáî2r½¥;ÍI41
+;ÅI”ãÖ6öa@2¼g0ÇÎ’É]Ð1žÖz!„ó3%ìbÐî•tEÁcmýtäĶìº.B<)§ ÏùciÇÌkÊŠ·Qç'mÕ¡¶ùƒ‡#s4ô‘öWæ#Âg3 9'‡ µóÃV†3Æ´e\ù?ô*…–«äxÞ{Ë!¹d‚šwÌ•†P.Ï oÜ\u9D5å9r&PÎ.
+ ·9ÒàÍ‹ê.uSÜ%ÿØË7®.Îå›ã…7üÝÖ;"ò×áÙºjg1” ÖqÕPÝŸ?9-dCó^J3’N\÷¾nÅßÝ@¸óÂùT\S¿ÁI¨œ é¤Ñ â*´øªŠÍ€R o\=Yõô|¾Þ¯{k ,•e¼¯n³¿ Œ«?çî¯3¶û§x.tÞÄP(Àö-È9‘½-/õÜ>‹yÃGÑÁí³T¿±«„ R=Ž,Ù>aû3v祅íKKùêÜ·—ªõ¼¸>Á9 Y¯·~<+ÔWÞåTåˆFwu™ð®x%7ƺ/ò“ÿÂãýQÕÊ¥y¾æŠ§"¬>Á~„Üt|³Ò\î‹ïo6ZÒm]ùþÒ_Ýxê¬hûÊ•oo4YIù•¯ž[1CŒr›³?TTc$«¼–SŽåLèžËªÐq:O°Áö$Èărô“6Ê/h­_môgPµoÁÂLÂŽYð=Eùñ×h¾^7ßz…bûÊs¦ÌäY¯¼WÜø] j‘)Ä/dȆú„°ˆ§j•§øª¯
+­˜Û»#ü«Ñ¹OÇÑÚüæ²à_›'“•üö¶™W¬ U#õï2öÈõ ~1__ÔW¤Å9ûÕUüJ„q°mÿñçy‡í®íß¼wøVC.÷™ Œ&éFs4ÉÅÏH?Üx«ÄHÛ#¼¯¤øµÂ…ŒÎ[Tñ·ÇßOKsôñ«EÿʃÿgêòßÿÆŠòã+Z{a¿\LvZýn†o×vÝ?~º1üû›'øªÂmZöM‡Ì½»d:ÿðµ >Z« ùÊúik5ù´ë Oóò¹|ùí¹ê$Ò,4o•×—––¼ á@tFÚ’w$ßyÙgù8)ûfÛ„þQ¿j—[@rRg¸hékýû ׿J±jŽƒÕô‚2\âÄȘb‘zTè
+6ž› êq(ŸŠ8œF‡¬©Þkù“ð³üÉפûšgÏòªVÈ_@Ù ú-zÏ*îú!ûܹ¬¬)Y›[HŽ¯N}R6ÜŒÛÖ¸šVÀŠ6ìÞ¡ISt¡@Ð+g9ñµpþÕÛõ?~x÷?ïÞÚ”‚Tþ)B¾'ø?x÷ýÌÓ+ÿ—EÁŸ~Ìþon¶Y‡ÿûé_ßýË»ß}¸§^îy‰Ù²]~£,P~Ž-kÁmk0–«±À¯š''En¸Èú‚dmûJŽ£*lù`·}iöÛ‡òü+ÖU¼åuOœm(Où—HÀæ×ÃïÀ ïóƒ˜êy=Õ 匨ò=4I®¹´åHC¢b¾ŽàþŒ%!ã a… b‘f•n½$Ûok3ÊìÝhöÝ0õÖa— ´ùÿ‘õÜ€
endstream
endobj
44 0 obj
<<
-/Length 3036
+/Length 3197
/Filter /FlateDecode
>>
stream
-xÚí\Ýo$9Ï_1ÒÞC‚4Æv•?Š§ î儈Ž‡Ë=xá”EBÒ"þvÊ=3ݶÇåvO&Ù¬¸HÑÎîzªíúüÕ‡[ïþ¶Ó»ßÝüúáæ—¿µ‘vÆ(rÎîþº ZEïwÿI[þ—§Ýw·Vû»ï¾N‹ag´"M&-6Æ) ;¬ÀÓ:Ÿ¯óÊÀ¼ê_MR¤@ûÓ’_4©¥a^òhAŸVQ¹ÊžÖüWØ .dîöQß~uXËÓ)‹ñ´ò£°'kír~ëš{âÞÍ”¾iRrÊ.KšdPYc*ûà—#VrQÁømba!›&±¨¼‹dö@À‹›ž¿Ð®˜gƒ2Ö™g
-&a<HGB“-NÏw6퇿ÒØNÅ:ÞN¦_ß [L#‘i¢|„€Íǹü@c‡Ó&5K§m[’Õ
-ÏW‡ íŠCÜüæáæ7i?zgf/ ÙXø›þñæ»ïõî‰ÿïëV@q÷Ó´òÇòRëÓiÿ¾ûÃÍïoôÑ·Ô} ä¾ÆêÈß ;̱xØÌŸ²ýf^I… ß䚺¬ò
-â|ðG­5¯tMzüÑ-ŒÕVgì_VaÚÕüPdî[˜ý&4o¬Š!—ÖÍg³Ü²³Øæ³™3Ñe´<6ŸI*,²žŽ»‡ùèl¡¹kÍ[øÐ$Ìæ«sŽÄŠ䥳¥?MŒ2ö4bbn`K½ÅöFø»0÷Û;£eés×Gmí†8l…Åöв! âb;Ét@·åà”‰”iJ˜ ÉßLÊ O^sòu§‚ÏÄì°IžU6³pÀ)ÎÎFSؤÑ|6ÖšÔFI¬Ð'£d­hŠK£<_)6r*2o<“£Ã>(™›*J yj§åmµŽ¬¹¡
-†ÂƱhéÞðBÖ‘¦,I‘ ÅÛu†V2³Éì”B»p¥BßY:¬Äg۩ȼÀ;ÐJ,b¾ \gà21¶Ë¡+Z¿MŒ× q–¨Õy Û}Sᓈ í]'à
-„ôu?œ£©Ùs3#4?²òÜ.ƒSMÏ]‡–#9G~ÂØÓcÿ-Dña÷l~À+fi“H*r@G_ä{k"Þ>7ùPù̃hE6
-šwxÏÑ'Fº}¾o+s'‚]%êr´ÿ\e?™
-ÊôG7ØŒ«/†VÖ±U\ÕÅÜ@$edE²­ôC ç'mÒ†ÙMRfg¶
-°;¶î»õYpýþÅÐæ‘]€ÛÌ)Ck™T©©ìüM rE~)Ì+‰‚ÖÖq?sÊ.>¹%—þ’2¯N¦–RêejåRÙ>„êp!ñp¯$cÀø:y‡sαæc·:Lg
-[*q›Êã,<Ïy3&Å`LüÖõq³½@Þô6*áÇ Þ²¤í×Îã@ñÜÄzcQZnÙ;7”» Š{m©:®_¿m£¨œQ«Õz3T®ýrýô»Ri÷SÂN›uûöMK±[i·–ƒ…²ç‹Ç–ú“ÀVí//×Ô  >Ä¥¢mw-"ûæYö? –ê^¢j©m«L.c¨“t[ÑPÓaâªÃJ5)ÛOe‘=…[±8$bç…ÿ?°/Ú{~V e2±Jü/’ï›ý”’РÍÂ}NÈ8¢ô¤˜Í'ÞçKOΰíud‘A¿hÝt‚Uà@èP*«Êü¹³øC¢£” ]XÊ+˜£“º•¡» Ñ-fÅö_êcœ›ï
-ՙÓrçªú±õÑ«gÛC*$_æUR–@î5Ð_/§$&kìmM% “Jül«oe«û€e%gÿïì˜Q­åí”#ž3®xÅÇ–6}?\ܾĪ›ØŸ<õâÚõÇŸÃä››žÃÕfPÙúJ›DÙ¶˜‘©íQYC·Ïü#
-oÖMaÙO?Ó3~%µ‘|ñ€¾')`¬ |O…l¤i”ElΰƒrË[Zû$è¯ÑtùTƒìDüXÁôPZ)4ëe‚x$zKOÖxÁA§ZŠ¦EE¸^F3À²TG‚vÙ«DT>ê4v³Ñ.8C.̇h¨÷ÜiÆÈê_ÖÕ¡¨‚u·i­^¶:|î zè{ˆ–ã3½—±Iǘ›©«¶K;éK°]Ã&¥WËë©y·–Â\CWŸ¯§«½iIªØ´–íŒO
-™]A# WïòQ¿­s¢½h-dÂ…xí{’°J¸Nr)X¿A°v+!xå ‚l`ó5O舕™ ·(á5½ø²'1 ¡ÜÌ„‹ªÚp‰Ûê°‹õléMúNKtã‰-æè;cÕPúy=+]6q½žg{ʈ…§X{6LZn}Ñ“²Ú*çV©¿„9ê
-&óÞÉ—ö/¿€ä3âqH1Mæ=°µ5^y¤Ëèqkßdêz‚jÖ­ ^£™®ÕŠJëþàµå%Ó=½bæ°º@Ák˜jÄôÇñ´.ˆ±)rKŸ9©¿Ê;(Þók\Ä—œÀúKN>K•×.€‡Ê«X~%…š®ÏáÛ¢BóÛå·4Ç°ToÄÁ( ¸Ž@Í;’¨<>À³ª¢ n+]µýQé·5“óÀŽu \
-EDÛ/…\î“<#%V¯ýqîí³™
-©täعçc¿Â SÆÀEÓrèúït©Bô›À^<»¹Z¥¥I§],;R_F¡¸ &lKäÛ¥üDŽ—ò›XŽL8pFnró2mÖõg°?^Èp½?n¯-«×V“ó$©æÉÞþ„¨‚È‚KŘºJ½K·Î6)½ðÂNxFZÅ-¡¾·Vñ5@Dõ¶N-³÷TŒÙÙóˆ‘m~÷€<–÷$ž³fñ/W†0ížØB¾Ó *Zï;*f)o¾H;U(£é2ûnp–+¯•¬À‹T‚ùóêó
+xÚí\Ko$·¾ëW °>H†!«Š¯œ„
+Îí<ÿJÿæq÷íí{Ðî/ÓbÜ­¢Ž&-6Æ* ;¬C¤Ó:—¯sÊàyÕ¿›¤¢BíNK~Ó¤â•Æó’÷€ú´*–«à´æÂfh&óp·úö‹ÃBÔTžN…ÓÊŸ…=À|~°Í=ñGgÏ”¾jR²
+æ%M2¤À˜™ÊÞ»ùˆ•\”7nXXȦI,(§ý,™=FäÅÖNÏŸiW̯LôËÌ3…@“0¤#‘ɧç[Hûá¯4¶S±Ž·“é×WÂA=†ӢȴQ¾GOÍÇÙü@cO‡Ó&5K§m[hED„«CDm‹CÜüááæŸ7i?zgÎ^@³±ð7ÿöÓÍ·ßéÝ#ÿß—;­0†Ý/ÓÊŸvÄKÁ¥Óþc÷—›?ßè£o©ÿ>úÌ} èÀßõ;GÌ fê´›¿fÎÜ’ò>“¾ÉUu^å†óÉßk­y¥mÒãvæ¬ñ^Å7ˈÙà™ÿÆ7o@ŸÉKëæ³Óacvh>›YlFËQó™QùYØÓq÷x>:Û…on@ÅóÞ5 ³ýêœã±b§†xéÙÔ'F8D˜ëÙTo©½þ.ž¿ûõѲt#s×Gmí&rÜò³ñ°% âbCÉt@·å`• 1Ó?1“Ù”AŸÜæä
+œ2i7êW(ºeG?W—~æÍ9dE3©ú!Ü!U©UÚÍÄ’Ÿ™|ÍQ9%úD #Îòq¢'Ÿâ}mf‚âmZ¿ qW€Ú íBA»šüà ]$kÙ…ÍèïÃiwÒ³äÇõÌxŸ—€'Ú<V>?ÑÄ£`sU¨pû)—•9€ü:[k¤°‘z_áï[êiOµ…ö¹ÒÇNUªŒÞ+­ã"ƒQaÞÔ}
+°:¶ìíÛåYpýþÙÐæ=+º€¶=š ó(—©RSÙù›ä$Šüƨ(/
+ Z[ÇýÌ)¸äùäÚ—\ú!%^Dó¥{‰Z¹…Ô‚ñ¾:œÃA<Ü É¸*Çm—æq8çë|ìv>G>(m⚪êª^KÏqÞLÄû3ðê½³¾ÙÑt7*ñÇ î³¬í÷AÂ@#‚½ ¡h´ì¬JÏ펶T­öÛ×oÛ0*gÔbçÅ µ^B¿õ2ý,tMÜ”…†y¶oßqj¬ô»&Gr†Í”âÇêš°}*Ãyþaþ`¬kâçàñJ}“M ²'D>ƒ9âìõ'“S-Onœ
+^›™ûœa³C<é-JŒO¼Ï—ž‚[3¨!»¯ä³»]ˆñ †©ä¾Ê”+ó³ÑöÃHá(%Œîçzåh³nMic¯BSÄbûÏõ1V‹
+•-XÎZ2Ì ö0Â"ªçÀo—»Fl¡*P£˜}±³¢bCþôӆ׌Á²ã^Mô¢ó9<©R•³Ö>zñl{L•aïÆ*¤Ñ¾šï­””fomjˆÔð³­¾–­î=y’•œý¿…1‹µ–·k0ñ`̸†-mú~¸[qU77°G>yj®¶ ÊŸÃä«›ž¥Åî^ÙËL›$Ù¶˜‘I®…qE0ñö‰ÿÀ•ÓPÈ ½ -qÎ21k¢×V¦îY°ùÍ
+ʃ]¹M
+îb>Ä-\
endstream
endobj
48 0 obj
<<
-/Length 2525
+/Length 2336
/Filter /FlateDecode
>>
stream
-xÚÝ[Kd7Þ÷¯¸YLG*ãóðKlZHR6¢•HLgÒÀ†¨AB°ÄoçøVÕ½¶Ëç>ª«3™lfJ3.?Îã;ßwì²Ãß;üþî·w¿þFÀšd  zÆ
-‚O±e¿šqýXù¯Æ¨J‡]ÙðLaÚv›‰üN{HÐ>m%á)ÎIìû&~_ÖV°E\I]¨+Ûß
-|k%8AYÒz(wJÍ¡wqQ‘WU9{Ù’Y3X\%´P&.®æÊì/ J³
-µ‰exPD¢ øÙÕ³Fà„ñÀ¥‚íhí@ÍMJiÑS¹ãa‹cKÌèÍØO±vÿ8¡d’{ËòQÊL¢æ™?ÞçJ§^ºÐ‚ÓRU¶ò™lXodq¾ú[uN…s0'ƒoƒüxÚµb/%š
-ötŒö¸9-…©ÖÐj3ìlh]Eý(üK.§ÏÊà-HIý¼AâØc}E´z
-Fÿn@¦J¿’@r@6·8Þ¸°Þ¤¤óóuÂËÎܲd•
-Äßšr &«>Ð8qÁüv†¼ß£*÷=ÑÈw:rö(s"ý<ŸhììóüFÉbDþ¾ÜøÉ^Åב~j.k¹›áz­h%|Âk ñ©;HjW±¬Úº.lí29ÑoN),ãAëý5m†•üž2vD\mÎ܈ùÛ÷fÔãÜÍ‚Ž»×>P ûÞ®ïy´äQ„@àjµÍ½K*Vÿ™°{ƒ6Kj«ôjJB'm_î#«oy0#:Üþw‹Ý*wCêp­/ÅAÜq‹Kͪ 2MÇ`Î÷C?-%Ä×™cƾõÛÍŒ?ªóßí2§O<Ÿòhµ+XðòÙvúkªº¯( ågñܾì^|õOR’á3ƒ- I7+Z)å…HÔÞËÉX Z‚}«¼q-–œ‘Ο.îƒþÜ%´t‡Ÿ™ý† Ç(´2ìHôfEÎV—$öVH'ü ²m·‡iòèÿ4,Ö
+xÚå[Én$ǽó+
+¤€NÇ–Û06 ‹`˜ÐÁCdÓöÅ%@°cøÛYÝ]•YQUÍEÁ—™™K,/â½LÂð†?Ü|ýpó»ßSâÁeÈ8<ü}ÀœH"¢¢ááiøxûÈ,wß?|SF‡ztpȨs£þuÒL˜C8ùª;KtÀÓGb8Êí(:ù¯±™§y¸;$¸ýò8Aš3¢#Iç‘?{"šÖ{dòÝ=éÇ৙¾íÎäÍCºÓˆ#Äy–C óy±óˆ³©v¹å‘
+Å$ÿþtóÇ8!Ëòÿiæ}°Îå‡@Éù»ùKwËÑÅX…Öñ<
+ŽÓdžG
+$€l¯ÄX·ïæÚìÞ\¼l1×ç-ë[ˆU­}ßÝ_i/•’ÑpÐVR$Ç*fç$$EÂô*$<hGËÝ(w`¥U·öy<ë٧нMt ‰éöÙ6—VËXµ!G?-Ïí¿þh f úëÎ-ؤÍàF§›"MSk¤fb\U¥¬X¬»½g36´uÐlbãMÙÒ»"óAY'¡OÊ–HØ̸~ŽüÇêk‡½³„ã´í>8ƒ8]C{MÖøÔ>¶'¿6MÆ=<¹ÊêŠ(ƒÑ³弇(Ë[òä·h„×™ÚWÖâ>¥yÌ6yÜK’ÉjQi‰¹¨?‰ÕÏ®úálµ~´hºÍÚÓ.Ua‹Ø¾/¯Åt¿:P¯³—Ôíf2kz¢Æ­¢@,›¬ÓÚótºOásñZÔÐ×bóƼ–vñÚôùx­†µ=ŽýÃ
+¯- a]¡ -ì HË9Εꋻ±ᚊ¨/¨×"êÁÇ]:Sº†§Ö"Ï<üº*ß‚\ê¾0<:×(¶Jzy6†v1
+žµSgL«êJÓ`Ï“
+ýÌ·EI)ò›Îé¢p æìR Ë`Æ0žv«Øk‰f¤0äàO’e‚I›ÕÅŽÃÛµŠ&Ü/TÒ»Öõö(^+{Æ¥ûÅrérò5ì*¦hàú]¥ÃÎûMýí³¨0i³ÅK.ÍOS>A™Cø ¿b`[oX̼ ë^Çîl#½Å¡¦[âŽh¶ª‰dGMá²E‘t(2ÇÄKÍŒ;‘(.AÉ5¬'d ZWDÎÓ»8ÝZ½gÄê–b:‡ÿ·«~,hGj|×Ë ÈF)´¬3§^2ò0zí%ÎÂñ1u5‘EúBýÔgã‹¿æâØ”P1áf$ðË;Í·ûaMA™ õArRmO ƒQ7jÍy?Uß8ÎI¹*=í¤âŽégˆÿ´'^ñDIFˆ
+÷g
+^v¹>¼€dˆÝ ¨W«[‰žhrÂ]L¬uÖ¯Š&WÀ8F Âù(xjf·y^»S_ÝÉA0ÞQøùYôwFËqOïÊÕH!»ˆ'ÞË£d8õò‹,‰åMÖ
+)LPTëñ‹ÈÖ–*a*EÚÎÁxn2’ÉfÇÎò>k°7õ¼à5Èbÿ¯³¬¹ÿÅͼצFƒtÁ`œjiôͪZ2«Z ¤€6-$qq1`‡K÷=üZ¼ORÀ‹ƒYÔàs)¼¿Fý»ÆÍy-L-qrñÈèJqòÅYÔ¿•à²úÅ™å½GSÒ>;Ò8Ô>!Z;
endstream
endobj
52 0 obj
<<
-/Length 1502
+/Length 2012
/Filter /FlateDecode
>>
stream
-xÚÝYKoE¾ï¯‰¤iº^ý¸!¤€”K„XÁ!Î0p!.äÄo§fìîwí̇$œ¼²k«ëùU}e?ü2øá«ÃÇÃg_b
-€Ë"8¢w)„!ê¯<êon†—W×ýÓWÇç“0 à]ö&a
-KÈ
-‡÷&KXFŒâj^¦·½è s9¦AdB¹+6
-ÊêÂFb3=¼xWªè|߶/ék5½„]]·Ãî‚mßyô{ð—Û8ú2èÏxF&ÀڪݡGÇUà‘À(Fðh§Mœ=Ÿ»œîo±kÜä¬B ¾ÑbÑÃ}¹¼îFPÁ‚Qm²Ë×YzË%Oëù­MÆõN-xL%`ª¾¢ òHäL“‡l—¸¤¤vj0ƺ-ëv´‚1©¦=0¶¨#vI½›Ÿýé鮬U H~—PÖXGÓ‚«)
-ÌÚ{ÕÀì=ÌÉéǶ =õÛ*9|×ð;"²Ï‹k}˜e]ÃÛ⥼4Å0`LFØ⥻h©ì§¥—³R ZÔOØo8Mn¨ï,&j6tò_sSzçÜôí^¬orUG<¬"ÎB÷f犼m.~ͨ°7&µ­P¬3ÍA>o]ä]›\Dö·('ü8§Zg¢í­¬<ðYQ|ôóqç̲–ò|V´™Ààâœø±3:gžš*LýNÖ2¯.Å6 hüÏ:xQ¯½Kt£²½ÎNaÒÝ{Š*Yˆ¡w\ňzpµ×pá€7&ÏÊ/9’¨¦`tš/·|6l‚vŠÆ3–éú eM<ñ辉¨«&ŠNŸkJrÆ­œ5{ÒÞ»÷㜠>F"~ÂvݽvÖ9"¾ÛOêhÂøô‰ø¼âõ Y÷;蟯²9Gû ‡úvíBwk]?YÞ!ñŽmVÊ
-`>Ê›…„QA¦=KŒJ‚àÌ…B“iÇ…‚AÃï­Cݸ&[§I]^³u5:Å#Z³sÉ‹)>ê,•^´W5Nº§oÓï¨Ämû­û òq%D>­Ó¼1à¥ÿÙìA„ñÌý€SS¿æù %…žûg¬hüŸ´ {&Cw(ºü…l›L \šÌ#‘Vîä}O,þåÃÚ-$ëJAV°F¤°æo‹Çpó}Ÿq20[gœ»©
-¬‹ÄÆg5¤­3Î?™Õ`
+xÚÝZËŽ%5Ý×W¤Ô½¨BJãx8lk6h$@bƒ%XP,`
+fbf3,ñí„ó>ҙבâV×tmºSݾáxžˆ™¾ûwç»Ïoþyóñg˜¤p9ìîî¢wI¤‹úOõ_»ïn<ú»ïï¿(‡©ï²ÏP¨°Ã9">“úœ8 ó©ÿ5EeG^NG>jJ‰ÎÓùÈÒY§<=…§3Êð(æþ®Oþöíá yžZçÓéä q´CS'}”p–ôeSRp8¹oŠa‡
+KN|#ÓS&=Âpÿ({æ<Œr\wLZ‚qo™ÄP.÷,úèOêÌ\§êTùõ¥ah¤ÔrZ6¶!”¹y]¨ Ú–ñ|°¶¤Y±¶]Iè3_ž‘}˜qóéýÍoŠ>¾ƒ3
+x-ýå¿~½ùî{ß=êÿ}ÑyG9u¿'íX¢ké¾¾ùêƱeþ÷k¨ÆôÙäNH5Ká Í•Â,¹«èCªã)q”Ζ?xïõdhÊÓÇ £À
+à&h¨7™›²’Kc ÿÑTL3¹ª4ߤQlª”T¥P‰nÞ˜]dª„iÆÐÙ%Z/±©¢Ëùô«7Íûµ®}øÑŠN"a Ü MƒPö «GŒ·µ ¡qvÑãé´=}”Œû3á •M@v+ɾPuBJÕýqˆ3qýX ŸÙ–eLëÞP•± 0pª× @È.h: –æ™æxƒœñ
+õq xsn¿iÊŒ:7TÙm
+Ž®¿lÓžB²v $akD
+kþ<†™/½‘ËÀlmäŽ]U³Gp•¶rŒ°%
endstream
endobj
73 0 obj
@@ -1120,8 +1113,8 @@ endobj
87 0 obj
<<
/Title(El antiguo sistema de unidades españolas)/Subject(Metrología)/Creator(Noel Merino Hernández \(muxkernel@gmail.com\))/Producer(pdfTeX 3.14159265-2.6-1.40.21 \(TeX Live 2020/Debian\))
-/CreationDate (D:20230823011227-06'00')
-/ModDate (D:20230823011227-06'00')
+/CreationDate (D:20230824205123-06'00')
+/ModDate (D:20230824205123-06'00')
/Trapped /False
/PTEX.Fullbanner (This is pdfTeX, Version 3.14159265-2.6-1.40.21 (TeX Live 2020/Debian) kpathsea version 6.3.2)
>>
@@ -1131,32 +1124,22 @@ endobj
/Type /ObjStm
/N 76
/First 616
-/Length 4766
+/Length 4768
/Filter /FlateDecode
>>
stream
-xÚÅ[Y“·Õ}ç¯èGÏ—ûR•J•ËvbÙ²%;vTz g(‰ñ ©Eò¯ÿι莬Lâ*‚h, \ÜåÜ t·®Te+«+Wél*_YãªP9ªXù”ªTE£ª\%o*‹„Ž?f5ÆÅJ‡JÛ˜+Kg4GÓ.XüUÚ+_9\FÍA+Tª,ÊÉ£ÚSÆ”¨Ï6ÏÆËÉVÒ¨+—+£C®l¨ŒÁdõ„ÙT«@7Ú-wh·)TÒ¸¤*o+㣙9U™ 1?êƒÏ•G9*[y<cy/±Œ)TÊU
-¤;ºn JWC[åf·´§*8ÜÒBB!*ü2þtƒñ`¸‘»*{,"†*G°2&pPZШqefX8 ‡¾Xž3@˜c VxáH†°;p±¸ð
-«gSÀ½†Md­Löif0 Õ`¾\¬K,æ²lÓl"]šM#6%²’S¼ "qŒ1 ÇY2S8Ì>Kìã1lbMÀ¢¨k@˸7ñö }ýPmfþsU?«ê/6Ï7Uý¨za¡wßWõãÕþeõ—¿ yV?ÿðvYÕO¯—³úáf½_®÷;ÜÍŽ³úûåns½=_î¨URódy±Z<ؼ¯^(T³y9Ã
- ÀÛèmcÂ*ˆwØ I¿A.é¦ùè¡
-æ±*Ôa ˆÀmQr`2%%cxê_“;´EJŒý¢:¨']…cä´.ËAÚhøÃ%ú’öI´}hÔ
-{q2—XÉI"EÒæÜ£FuPîEnz‘c_ÛŠüÆû¸ÍUEµH`K¼“½qêrÏ=³Í·–|t
-F?PŠo¼ïè0›¡1ÒÑ®ÑZ
-<~A|˜xª¡TxPièˆèL+ß ²¡¼ 5AÖ™]®hÒžˆ„p1ÁUGç%<ƒÇ
-æ‰uyÉ liV7ÐëEï‚%ÝÞ7æ<V8â"1±Gîóâ¨Ò^Жlj4 ÍõNúÈ©Ávõ4Aã\3$ãxòDo¢$I=•Srß'ME8Œ’˵Q%·Jú”¹š21y½ƒu‚ÔõåöÅ/Ê\®CÑ…žDñ3¨sä¿ïï ¼—›‡ª.MË4¤Hù!81ˆã5Y›$eí 6É¢&ñø3°Ì3M$ç,Q銑xs›4±«eR0’;*NÄ‚Ãa”¼Îr¯0
-D+¯©¾< –3²’[‰ÍO•x5­óL!qëÈPTL]ð1r¹>6%Šô
-Oä([ Ý
-Ò©îr—½ô5Lj¹Rr׸šz9t'§
-¾3øTO)SJ#@cÏh¹ g+kˆ¶ô¨mCçI‰àÜÔ2—škÛåÇîa
-½F<'ûR·›<ÈñíÉR§ÉyÒ"78„¨'-žÑ
-%×ÅwšP‚Ú›æ ¢E¹ðU‘ë1„ƒq¸ Z€‘ÈÊ—²o“–4†gWúFŽÉUü!^ÒñY#Ð&'ðLüȸ¥+…‰Š`že,ÃOú¸C¿$‡¶EqyŸ-JÃ:b—¨îeNéÉ@2@T>äjÊÁêÆb`üNªTà-C8æK¨:s1@WTqÆÐŒ0O™ÃYîx(¶ Þ±ä|¼FUW“Kp2e…#\Z¹!œ5¹“ù°ÔÖĦF(:9XmøGƒ£ÏkÐɹ
-“Zò¥—A##–ƒ’³´r~ÄQ|LÊzÌÕ$/24!#[Y#ÞR€±É“Ì4*u²N騬Þƒ”Z£á6¢˜£’c˜.—ùT)"⳨8= ßÃ73J0>ªŒj,ês·kâ!EkM%©‘uÉÖ‚0œÊö&rO'nàW`N,"tšQ4e\{çK8|ô%‡F°>l“âë Je¡Óó†~],5¹QšZÜ ­–®”ònòÆzN•†ç£ ’¡÷‘‘Ú¨Ex–Gžíò„ØGNóðŸ¨è©*Û£ƒq•œ÷—c4Ù˜”hˆVI^Ò4Z+}µÉê
-’1<ß$jroõ”¹ãÃŽZïØWõ åh?•3Ê0y\ÐŽÙú=2ܛҟu>±M<{lædOSNK©xŒ0Úr«ºAËžE^ºÊ±q³»&XD,µÆ%Œ‚d‚!÷T2‡ã{P\[›—XêSK-$ÅS =$e‚†)§<®³Œãšq”%ŽK%o *ÊË^â¥%-l ¶{ O£“ýµp?6I/ð„$H›¼€y‹—×
-rŽ9É ªVP£aòÕ»¤ËQ-†}9x8ÇgX–»óíêí~³-Ï´¾Y\¡åÙÏ÷þÇßÿôdµ^mÖO·›{6—èp¹x½«\éù@žÖÝã~ãžå»h<žÐª¼n°;çS»Ã¬~¸xûårõúÍžú6«9!ÛÔ¬þj¿¸\ß_¿¾\²øl¿¼ú‘¯¢ÍꟚ;œEáá›Å–Ê>«¿Zœ_ï—õ÷õ¢>¯/êe½ª¯êu½©·õ®¾>+t=^a¸h‡Ï o[îOÏŸ>~ö`°Ü¯öÇkÀÐáb•,Öäñbc¿Ø{q¼Ú{Ú´ëñÆåÞ¯¿¬Ÿtk]–ůê_ëËfÙoë·Ëíjs!ëß×ïGð¿‡O¿ºÿów?8ðýòõõåb{ Â=rÊ.X=âB0.蛄ó &<¨ÖêÏëÇõ`È_ë¯Á”oêoëo CžÖßA#žÕÏëêëŸÀ¯Å|w^/Jëb·‹v¿Ö¿€ç›ËÍÿWW °ô‚ÝÀWÉJo¡ üÏ¡ñ»ý‡Ë¦r¾_üÒ×\],voêWõ«Õ»¥üõ½¥4ìüjs½•¿ù¨jÜg»8߃óõëú5ÉyS¿ùðöÍr i¯X^òþ É_²|U_1[×kÉVë¥üÍ/–ëÍÕj½€tKE7ƒ”†S®÷«Ë‹6ã(›z#Y™j³–4___-·2Þf8Üf24‘7¿åÓúËå«}¹Ú
-;ý—héŽÝvËwX›ü&(ånÈRN²[½gš+FöõžÃïßl—Ëò?âH©é{Kqtÿ¿7Lã›P~µÚï—rÙ“ËÒðÎÑH×õ5)¹.Ì|W¿cé}ýžÙ‡ú·ú·åv#Ý#Û¿Çv={ü·ûŸÿéɇíjqq«íjD-÷Œ—w‡áÈüÁÒ®±ƒÚ®¾ÁvÓ¯“Úî
-J`ºž@S>\ÞçëóÍÅjý3®^½ZByøvÈ s¾ßØ2|«˜6¯Î¬áaÙàaÞé<Š‘WÒŠ¡óUdû#D-VLfÿycó•Æ½…z£ÌÄöQåíµ¡Á
-*á2ô
-®§*L¨òéG•Cªlì©JSªÂï§êø>cBS8-¾IúÄ÷i$9; É ØäóïÓh‰Ž‘LKRüÃ$lÊÎ øä§D¹ßOÔ‰MÛ„²tJ§ M±¡+š;Щÿ€.}]úôêŽø¥mîéRw \ÿ ¿ôFcϱï@ÃNl-Æ”%uHÙ°4ð:SÕÿcÂxN30Ê^˜ÁN)3‡”ñö_i¿ðZ[]ìÚo\š¯!šðË»äçf =?{´9¿÷l¿ØîÏøÍ+;~öcòK=esÆo^û²=ã7­}Ùñ[U)ï–ôÿǰͬõ׫«Õ~2á°ça݃¶¶ûzϺa±~XJlVø³ÊÆaE8ãw·ººùºN7Ïøµî`¸V¨aE>«œ>>~<ë;uã¡¥ò:~*Ÿ %{ŠqC@ÇÐ)Ñ݇ l“7¯gEUºoIËšR£ýl{²¹XÖ?ì–ß^ï/±ÚÕO–ûÅîÄ”^ß¾]®ï— n'ú,›¹
+xÚÅ[Ù’DZ}ÇWô£æ:ˆ®}‰p8‚‹(Ñ%J¤dÉ >@3 k  Mêëï9Y½.[ÓS]KWeår2³º¡+UÙÊêÊU:›ÊWÖ¸*T·*V>¥*UѨ*WÉ›Jã&a ÆŸ3ãb¥C¥mÌ•Æ­3š³i,þUÚ+_9ÜFÍI+Tª,êÉcúSÆ’hÏ6ÏæËÉV˜Ò¨+—+£C®l¨ŒÁbí„ÙT«TåÐn«0•qhô¶2Þb?xÎG;sª2ë¢?UyÔ£²•÷(3¶‡ùëXB¥\”¢©@ºó +€ô t¦VnøˆAª‚Ãs -$T¢Â_Æ?]Å`<nE”®Ê›ˆ¡Ê¬Œ T :)0P)3 ¼ÁžÀiÜ8ŒÅö4˜¢ÀcRÀRä2Évn7^a—ì
+xÖ°‹¬5É>Í &´Ì7‹[°EÜ8°M³‹tivEÌlØ•È>JNñ)ˆÄi0Æ€gÉ|,á°ú,qŒÇ´‰-ÿEØz\Ƴ‰gèè‡
+h3ûóŸ«úiUµy¶©êÕs ½û¡ª®ö/ª¿üݳúÙû7˪~²xµœÕ÷7ëýr½ßáiœÕ?,w›ëíùrG­’–ÇË‹ÕâÞæ]õ\¡!€Ä˜Í‹&ØâIÒ+Ãî®×Ìó¼’Ç*™
+ÎÿQþ'ùŸå¿V¥Ð¥)ª³2á¬~zýë^êֿ߬Íê{›íÅr+¤¨õ×õ£úþs-Ò~¾¯ž§8§²™çÊgtž'GÓSóœ5†Ý­&Lúb¿øõr9×gäЭÒì\Áž²s ­49̽ó'h0·OCHó]2:ͳ!Mf®r>Aƒ½}¼›; 1¨ JÄyðö îöipjžˆhàƒÊ‰67* Áß> ÆCþ(•ž{ê…Ms Ù ÂíÓ 5ö»pz0Mnnu8AC¼u4ìÀFÒæF“°Ñx‚„tû$ˆiR% HRg?wÆ !iè‘õç_þ5OððYs@µ¾¾¼|q|dT22„
+š{(*d§ÇB¦ÒÄ9"ƒÌEþD¸ô›¥;áÍ¢H÷s>“Ññ㇠±s‡ø28˜¥± ‡"8¯æ^åäX
+Zlœ›+D`·fFŸÉho¦ŒöêóíõG3z8”ÌC¤àÎê õsx¨z:6[#£ÜÍlqvÄóÏa3D â¹e♿”Ò#¡«÷Ù´ü,Ù#îgÞ^]?’Û]é¤{ å°Þ·¹Ñ˜® ÄT/ëX ¦ ^J¹¾–6̇„ÅÃ÷tãÀ„n¸ÓŽ³†n:èí¯fMæq@_—œ<ÃýÛÁSñˆ´Ò–äÆOsj`àa,4¤RR‚c¤àCuÞk÷H¬(ð4èmcÂ.ˆwȆdÜ ”ë¦õè¡
+æ±+´!Dàˆ¾(¥G0™’’9<Õ¯)ú"%ÆqQ´“®Â1rZŽå ýF´üaf‰±¤=AR#mÁØ
+’ †Ì©d Çï ¸·¶,±ÔçÖZHŠ§zHÊ SNx\/.f™Ç5ó(K—JÙ@U”½ÄKK ZØl÷<žF'ùµp?6—¼^à I>ù
+]W˜.Úá›Åm÷çgO>½7Øî£ýñÍ0t¸Ye›5y¼ÙØoöNïöŽ6í~c¼q»wë¯ëÇÝ^—eó«ú·ú²Ùö›úÍr»Ú\Èþ÷õ»ü§pàÉ£»¿|ÿÓ€?,_]_.¶7°*ܳ!§<à‚Õ#.3à‚¾Iè1Ÿ`½ú~ý þ²~X†üµþLù¶þ®þ®0äIý=4âiý¬þ±þ©þüZÌwçõ¢ô.v{°h÷[ý+Øx¾¹Ü¬ñÿêj–^pø*E-”ÿshünÿþ²iœï¿ö-W‹Ýëúeýrõv)ÿúÑR~¹¹ÞÊ¿ù¨i<f»8߃óõ«úÉy]¿~ÿæõr i¯X_òþ É_²~U_±X×k)Vë¥ü›_,×›«Õzé–†n© —\ïW—mÁY6õFŠ²Ôf-×|}}µÜÊ|›át›ÉlÐD>ü†ïõ/—/÷ån+ìltô_¢¥;Û-ßboò°@©wS–êp‘Ýê¯ù°a4`_ï9ýþõv¹,ÿG)-ýh©Žžÿ÷†×ø!Ô_®öûå…Üöä²6|r4Óu}MJ® 3ßÖoY{W¿cñ¾þ½þ}¹ÝÈ¿nŠ‘íÆO±ÝOþíî—zü~»Z\|Ðv5¢–;ÆË·Ãpd~ˆ`i×È †¶«o°Ý4Äë䆶»‚†˜®'Д·÷åú|s±Z¿ÂŠ«—/—P~Gò\Áœï6¶ ß*¦À«3kxAXö=8d˜÷}:bä‚´bèüÆþ
+¬ùk•]ý½`çБ|Àd
+®§*L¨òéG•Cªlì©JSªÂ§Su<ϘÐN‹o@’¾ñ}IÎh26ù| Âû<šF¢c$Ó’ÿ0Ɇ²3>ù)QîÓ‰:‘´M(K§tÊк¢¹úèÒ7Ñ¥oA¯n‰_Úæž.u ÊõŸðK`4ö ù4ìDj1¦,©Cʆ„¥×™ª~øÆsšQö vJ™9¤Œß¾ïøñû5è€×úÛêb×þÆ¥ù5Dó­~ù”¼óñLÖ0ò‹›ó;O÷‹íþŒ¿yåÀ/Þ`NþRO‡AÝœñ7¯}Ýžñ7­}Ýñ7«Rß-%èÿ?Îa›UëoVW«ýdÁáȺ ÚfÚî×{Ö @ˆõÃPbðÁŸU6Âw;¡«[¯tIñŒ¿ÊL—À
+5lÈg•ÓÇçgý nþ"´T>ÇOågCÉžbÜÁÐ1 JGt÷þiòæÕ¬¨J÷[Ò²§Ôh?ûo.–õ»åw×ûK¤B»úñr¿¸ÀÓ€˜2ê»7ËõÝ’Ðév¡ÿþ–›Ž
endstream
endobj
88 0 obj
@@ -1167,16 +1150,14 @@ endobj
/W [1 3 1]
/Root 86 0 R
/Info 87 0 R
-/ID [<FBE69B7F1C80BA16472F9493EA186BDF> <FBE69B7F1C80BA16472F9493EA186BDF>]
-/Length 216
+/ID [<2D4BB66CB67C4A5EBB27AEF65BCEBC8F> <2D4BB66CB67C4A5EBB27AEF65BCEBC8F>]
+/Length 218
/Filter /FlateDecode
>>
stream
-xÚÑIN‚A@áªþU@DAÀ‘QpœA™a͖ĵ‰ ÷ñ"€…KŽÃF|µùòRI§+)‘?'âD½ÑL(¬À*¬ü€u Û³M•nÜ*ðèBîàn¡¸‡´áBðQˆÁlC
-Ò°»°q«Œ“¶P2PùèÙ, ûUùü²Y.á
-pE(A*p U¨Á‰ÊôÛ>:U-üX©‹þZ«[¤­.à^àÞà†ê ËÿךÌe ßhM
+xÚÑINBQFá¿î³|*Ø Ø7`‹ØŠ öbdhœÊ˜¡K`#.Àc7Ä"HÄS“/'•ÜÜJJ’þ‚dQã[”A€ú `†`FLŠýÙ˜©–ö…\Á5ÔàΠ§p wpU¸€KHÂ=LÀ$¤`f!ó°
endstream
endobj
startxref
-221138
+221627
%%EOF
diff --git a/info/spanish/antique-spanish-units/antique-spanish-units.tex b/info/spanish/antique-spanish-units/antique-spanish-units.tex
index dbf0690d12..77c9c42e5f 100644
--- a/info/spanish/antique-spanish-units/antique-spanish-units.tex
+++ b/info/spanish/antique-spanish-units/antique-spanish-units.tex
@@ -35,9 +35,14 @@
% TABLAS
\usepackage{etoolbox}
+\usepackage{multirow}
\usepackage{booktabs}
\usepackage[toc,enum,lineno]{tabfigures}
+% MACROTIPOGRAFÃA
+
+%\usepackage{showframe}
+
% ENLACES DINÃMICOS
\usepackage[hyperindex=true,final=true,bookmarks=true,bookmarksnumbered=true,
@@ -51,8 +56,8 @@ linkcolor=black,urlcolor=black,pdftitle={El antiguo sistema de unidades español
pdfcopyright={Este documento se distribuye bajo una licencia Creative Commons Atribución 4.0 Internacional (cc by 4.0). Por lo tanto, eres libre de compartir, copiar y redistribuir el material en cualquier medio o formato. Adaptar, remezclar, transformar y construir a partir del material para cualquier propósito, incluso comercialmente. El licenciante no puede revocar estas libertades en tanto usted siga los términos de la licencia, bajo los siguientes términos: Atribución. Usted debe dar crédito de manera adecuada, brindar un enlace a la licencia, e indicar si se han realizado cambios. Puede hacerlo en cualquier forma razonable, pero no de forma tal que sugiera que usted o su uso tienen el apoyo del licenciante. No hay restricciones adicionales. No puede aplicar términos legales ni medidas tecnológicas que restrinjan legalmente a otras a hacer cualquier uso permitido por la licencia. Avisos: Usted no tiene que cumplir con la licencia para elementos del material en el dominio público o cuando su uso esté permitido por una excepción o limitación aplicable. No se dan garantías. La licencia podría no darle todos los permisos que necesita para el uso que tenga previsto. Por ejemplo, otros derechos como publicidad, privacidad, o derechos morales pueden limitar la forma en que utilice el material.},
pdflicenseurl={https://creativecommons.org/licenses/by/4.0/deed.es}
}
-\def\fileversion{1.2}
-\def\filedate{(2023-08-23)}
+\def\fileversion{1.3}
+\def\filedate{(2023-08-24)}
\title{El antiguo sistema de unidades españolas\footnote{versión\space\fileversion\space\filedate}}
\author{Noel Merino Hernández}
\spanishdatedel
@@ -70,8 +75,10 @@ pdflicenseurl={https://creativecommons.org/licenses/by/4.0/deed.es}
\fancyhead[CE,CO]{\scshape\small el antiguo sistema de unidades españolas}
\fancyhead[LE,RO]{\thepage}
\renewcommand{\headrulewidth}{0.4pt}
-\renewcommand{\listtablename}{Ãndice de cuadros}
+\microtypesetup{protrusion=false}
+\renewcommand{\listtablename}{Ãndice de cuadros}
\listoftables
+\microtypesetup{protrusion=true}
% CUADRO (UNIDADES DE LONGITUD)
\renewcommand{\tablename}{Cuadro}
\begin{table}[h]\label{tab:longitud}
@@ -79,6 +86,8 @@ pdflicenseurl={https://creativecommons.org/licenses/by/4.0/deed.es}
\caption[Unidades de longitud]{Unidades de longitud (pág. 50)}
\begin{tabular}{@{}lclllrrr@{}}
\toprule
+\multirow{2}{*}{Unidad} & \multicolumn{7}{c}{Subunidades} \\
+\cmidrule{2-8}
{} & medias & tercias & cuartas & sesmas & pulgadas & líneas & puntos \\
\midrule
Vara & \texttlf{2} & \texttlf{3} & \texttlf{4} & \texttlf{6} & \texttlf{36} & \texttlf{432} & \texttlf{5184} \\
@@ -93,11 +102,14 @@ Punto & {} & {} & {} & {} & {} & {} & \texttlf{1} \\
\end{tabular}
\end{table}
% CUADRO (UNIDADES AGRARIAS)
+% Here siunitx package do not help because we are using common fractions. Dirty hack, use phantom.
\begin{table}[h]\label{tab:agrarias}
\centering
\caption[Unidades agrarias]{Unidades agrarias (pág. 55)}
\begin{tabular}{@{}lrrr@{}}
\toprule
+\multirow{2}{*}{Unidad} & \multicolumn{3}{c}{Subunidades} \\
+\cmidrule{2-4}
{} & largo (varas) & ancho (varas) & área (varas\textsuperscript{\figureversion{lf}2}) \\
\midrule
Sitio de ganado mayor & \texttlf{5000}\phantom{00} & \texttlf{5000}\phantom{00} & \texttlf{25000000}\phantom{00} \\
@@ -119,6 +131,8 @@ Fundo legal para pueblos & \texttlf{1200}\phantom{00} & \texttlf{1200}\phantom{0
\caption[Unidades para áridos]{Unidades para áridos (pág. 59)}
\begin{tabular}{@{}lcccrrr@{}}
\toprule
+\multirow{2}{*}{Unidad} & \multicolumn{5}{c}{Subunidades} \\
+\cmidrule{2-6}
{} & fanegas & medias & cuartillas & almudes & cuartillos \\
\midrule
Carga & \texttlf{2} & \texttlf{4} & \texttlf{8} & \texttlf{24} & \texttlf{96} \\
@@ -136,6 +150,8 @@ Cuartillo & {} & {} & {} & {} & \texttlf{1} \\
\caption[Unidades para líquidos]{Unidades para líquidos (pág. 62)}
\begin{tabular}{@{}lcrrr@{}}
\toprule
+\multirow{2}{*}{Unidad} & \multicolumn{4}{c}{Subunidades} \\
+\cmidrule{2-5}
{} & barriles & jarras & cuartillos & medios \\
\midrule
Pipa & \texttlf{9} & \texttlf{82} & \texttlf{1458} & \texttlf{2916} \\
@@ -152,6 +168,8 @@ Medio & {} & {} & {} & \texttlf{1} \\
\caption[Unidades hidráulicas]{Unidades hidráulicas (pág. 63)}
\begin{tabular}{@{}lrrrrr@{}}
\toprule
+\multirow{2}{*}{Unidad} & \multicolumn{5}{c}{Subunidades} \\
+\cmidrule{2-6}
{} & surcos & naranjas & reales & dedos & pajas \\
\midrule
Buey & \texttlf{48} & \texttlf{144} & \texttlf{1152} & \texttlf{2304} & \texttlf{20736} \\
@@ -169,6 +187,8 @@ Paja & {} & {} & {} & {} & \texttlf{1} \\
\caption[Unidades de peso]{Unidades de peso (pág. 66)}
\begin{tabular}{@{}lcrrrr@{}}
\toprule
+\multirow{2}{*}{Unidad} & \multicolumn{5}{c}{Subunidades} \\
+\cmidrule{2-6}
{} & arrobas & libras & onzas & adarmes & granos \\
\midrule
Quintal & \texttlf{4} & \texttlf{100} & \texttlf{1600} & \texttlf{25600} & \texttlf{921600} \\
@@ -181,12 +201,13 @@ Grano & {} & {} & {} & {} & \texttlf{1} \\
\end{tabular}
\end{table}
% CUADRO (UNIDADES PARA EL ORO)
-% Tables are ``faulty''. We need ``improvement'' these tables. Then we need designed them.
\begin{table}[h]\label{tab:oro}
\centering
\caption[Unidades para el oro (Au)]{Unidades para el oro (pág. 68)}
\begin{tabular}{@{}lccrrr@{}}
\toprule
+\multirow{2}{*}{Unidad} & \multicolumn{5}{c}{Subunidades} \\
+\cmidrule{2-6}
{} & libras & marcos & castellanos & tomines & granos \\
\midrule
Libra & \texttlf{1} & \texttlf{2} & {} & {} & {} \\
@@ -203,6 +224,8 @@ Grano & {} & {} & {} & {} & \texttlf{1} \\
\caption[Unidades para la plata (Ag)]{Unidades para la plata (pág. 68)}
\begin{tabular}{@{}lcccccr@{}}
\toprule
+\multirow{2}{*}{Unidad} & \multicolumn{6}{c}{Subunidades} \\
+\cmidrule{2-7}
{} & libras & marcos & onzas & ochavas & tomines & granos \\
\midrule
Libra & \texttlf{1} & \texttlf{2} & {} & {} & {} & {} \\
@@ -220,6 +243,8 @@ Grano & {} & {} & {} & {} & {} & \texttlf{1} \\
\caption[Unidades medicinales]{Unidades medicinales (pág. 68)}
\begin{tabular}{@{}lcrccccc@{}}
\toprule
+\multirow{2}{*}{Unidad} & \multicolumn{7}{c}{Subunidades} \\
+\cmidrule{2-8}
{} & libras & onzas & dracmas & escrúpulos & óbolos & silicuas & granos \\
\midrule
Libra boticaria & \texttlf{1} & \texttlf{12} & {} & {} & {} & {} & {} \\
diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
index 0ef3c920c5..fff8e4d1bf 100644
--- a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
+++ b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
index 549e60d405..8593461484 100644
--- a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
+++ b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
@@ -5,8 +5,8 @@
% arara: lualatex: {shell: yes, synctex: no, interaction: batchmode} if found('log', '(undefined references|Please rerun|Rerun to get)')
\documentclass[a4paper,french,11pt]{article}
-\def\PLversion{2.7.1}
-\def\PLdate{08 août 2023}
+\def\PLversion{2.7.2}
+\def\PLdate{25 août 2023}
\usepackage{amsfonts}
\usepackage{ProfLycee}
\useproflyclib{piton,minted,pythontex}
@@ -64,10 +64,15 @@
\geometry{margin=1.5cm}
\usepackage{babel}
\usepackage{newverbs}
+
+\definecolor{BleuCadet}{HTML}{5E9EA0}
+\definecolor{Chair}{HTML}{FDDBB8}
+\definecolor{BleuAcier}{HTML}{4483B8}
+
\newverbcommand{\pverb}{\color{purple}}{}
\newverbcommand{\rverb}{\color{red}}{}
-\newverbcommand{\vverb}{\color{ForestGreen}}{}
-\newverbcommand{\averb}{\color{CadetBlue}}{}
+\newverbcommand{\vverb}{\color{CouleurVertForet}}{}
+\newverbcommand{\averb}{\color{BleuCadet}}{}
\newverbcommand{\overb}{\color{orange}}{}
\newverbcommand{\bverb}{\color{blue}}{}
\setlength{\parindent}{0pt}
@@ -76,8 +81,8 @@
\newtcolorbox{PART}[1][]{%
enhanced,top=3mm,bottom=3mm,
bottomtitle=2mm,arc=2pt,outer arc=0pt,
- colframe=LightSteelBlue,colback=white,bicolor,
- colbacklower=LightSteelBlue!15,coltitle=black,
+ colframe=teal,colback=white,bicolor,
+ colbacklower=teal!15,coltitle=black,
fonttitle=\large\sffamily,
title=\centering Thème,
#1%
@@ -91,9 +96,9 @@
\tcbset{vignettelatex/.style={%
fontupper={\vphantom{pf}\footnotesize\ttfamily},
vignettes,%
- colframe=CadetBlue,coltitle=white,colback=CadetBlue!5,%
+ colframe=BleuCadet,coltitle=white,colback=BleuCadet!5,%
overlay={\begin{tcbclipinterior}%
- \fill[fill=lightgray!50]($(interior.south west)$) rectangle node[rotate=90]{\tiny \sffamily{\textcolor{CadetBlue}{\scalebox{0.6}[0.75]{\textbf{\LaTeX}}}}} ($(interior.north west)+(5pt,0pt)$);%
+ \fill[fill=lightgray!50]($(interior.south west)$) rectangle node[rotate=90]{\tiny \sffamily{\textcolor{BleuCadet}{\scalebox{0.6}[0.75]{\textbf{\LaTeX}}}}} ($(interior.north west)+(5pt,0pt)$);%
\end{tcbclipinterior}}
}
}
@@ -101,9 +106,9 @@
\tcbset{vignettelib/.style={%
fontupper={\vphantom{pf}\footnotesize\ttfamily},
vignettes,%
- colframe=ForestGreen,coltitle=white,colback=white,%
+ colframe=CouleurVertForet,coltitle=white,colback=white,%
overlay={\begin{tcbclipinterior}%
- \fill[fill=green!25]($(interior.south west)$) rectangle node[rotate=90]{\tiny \sffamily{\textcolor{ForestGreen}{\scalebox{0.85}[0.75]{\textbf{LIB}}}}} ($(interior.north west)+(5pt,0pt)$);%
+ \fill[fill=green!25]($(interior.south west)$) rectangle node[rotate=90]{\tiny \sffamily{\textcolor{CouleurVertForet}{\scalebox{0.85}[0.75]{\textbf{LIB}}}}} ($(interior.north west)+(5pt,0pt)$);%
\end{tcbclipinterior}}
}
}
@@ -111,9 +116,9 @@
\tcbset{vignetteMaJ/.style={%
fontupper={\vphantom{pf}\footnotesize\ttfamily},
vignettes,%
- colframe=ForestGreen!50!black,coltitle=white,colback=ForestGreen!25,%
+ colframe=CouleurVertForet!50!black,coltitle=white,colback=CouleurVertForet!25,%
overlay={\begin{tcbclipinterior}%
- \fill[fill=ForestGreen!75]($(interior.south west)$) rectangle node[rotate=90]{\tiny \sffamily{\textcolor{Black}{\scalebox{0.85}[0.75]{\textbf{MàJ}}}}} ($(interior.north west)+(5pt,0pt)$);%
+ \fill[fill=CouleurVertForet!75]($(interior.south west)$) rectangle node[rotate=90]{\tiny \sffamily{\textcolor{black}{\scalebox{0.85}[0.75]{\textbf{MàJ}}}}} ($(interior.north west)+(5pt,0pt)$);%
\end{tcbclipinterior}}
}
}
@@ -139,7 +144,7 @@
alsoletter={-},%
morekeywords={\ResolutionApprochee,\SolutionTVI,\CalculTermeRecurrence,\ToileRecurrence,\SolutionSeuil,\IntegraleApprochee,\GrilleTikz,\AxesTikz,\AxexTikz,\AxeyTikz,\FenetreTikz,\FenetreSimpleTikz,\DeclareFonctionTikz,\CourbeTikz,\OrigineTikz,\SplineTikz,\TangenteTikz,\MiniSchemaSignes,\MiniSchemaSignesTkzTab,\IntegraleApprocheeTikz,\CartoucheCapytale,\PaveTikz,\TetraedreTikz,\CercleTrigo,\AffPoint,\AffVecteur,\TrouveEqCartPlan,\TrouveEqParamDroite,\TrouveEqCartDroite,\TrouveNorme,\TrouveDistancePtPlan,\EquationReduite,\CalculsRegLin,\PointsRegLin,\NuagePointsTikz,\PointMoyenTikz,\BoiteMoustaches,\BoiteMoustachesAxe,\Histogramme,\CalcBinomP,\CalcBinomC,\BinomP,\BinomC,\CalcPoissP,\CalcPoissC,\PoissonP,\PoissonC,\CalcGeomP,\CalcGeomC,\GeomP,\GeomC,\CalcHypergeomP,\CalcHypergeomP,\HypergeomP,\HypergeomC,\CalcNormC,\NormaleC,\CalcExpoC,\ExpoC,\ArbreProbasTikz,\LoiNormaleGraphe,\LoiExpoGraphe,\NbAlea,\VarNbAlea,\TirageAleatoireEntiers,\Arrangement,\Combinaison,\ConversionDecBin,\ConversionBinHex,\ConversionVersDec,\ConversionBaseDix,\ConversionDepuisBaseDix,\PresentationPGCD,\EquationDiophantienne,\ConversionFraction,\SimplificationRacine,\EcritureEnsemble,\EcritureTrinome,\MesurePrincipale,\LigneTrigo,\SudoMaths,\FonctionRepartTikz
},%
- keywordstyle={\color{green!75!black}},%
+ keywordstyle={\color{CouleurVertForet}},%
classoffset=3,%
alsoletter={-},%
morekeywords={minimum-decimal-digits,scale,nonamssymb,build,Precision,Intervalle,Variable,NomFct,NomSol,va,vb,Stretch,Balayage,Calculatrice,Majuscule,No,UNo,NomSuite,Simple,Exact,Conclusion,Sens,ResultatBrut,Methode,NbSubDiv,AffFormule,Expr,Signe,Variables,Affp,Affs,Epaisseur,Police,ElargirOx,ElargirOy,Labelx,Labely,AffLabel,PosLabelx,PosLabely,EchelleFleche,TypeFleche,PosGrad,HautGrad,AffGrad,AffOrigine,Annee,Trigo,Dfrac,Style,Coeffs,AffPoints,TaillePoints,xl,xr,Code,Racines,Largeur,Hauteur,Cadre,Fct,Nom,PosLabel,DecalLabel,TailleLabel,AffTermes,RemplirbOpacite,CouleurRemplissage,Lignes,Gobble,Alignement,Filigrane,BarreTitre,CouleurNombres,Centre,EspacementVertical,Label,Titre,Profondeur,Angle,Fuite,Sommets,Math,Aff,Plein,Cube,Alpha,Beta,Rayon,Marge,TailleValeurs,TailleAngles,CouleurFond,Decal,MoinsPi,AffAngles,AffTraits,AffValeurs,Equationcos,Equationsin,sin,cos,AffTraitsEq,CouleurSol,OptionCoeffs,SimplifCoeffs,Facteur,OptionCoeffs,Reel,Oppose,Rgras,SimplifCoeffs,VectDirecteur,NomCoeffa,NomCoeffb,NomCoeffr,NomCoeffrd,NomXmin,NomXmax,Ox,Oy,xg,yg,AffNom,Elevation,Moyenne,AffMoyenne,Pointilles,Valeurs,Elargir,Min,Max,DebutOx,FinOx,ListeCouleurs,ElargirX,ElargirY,LabelX,LabelY,GradX,GradY,AffEffectifs,PosEffectifs,Opacite,AffBornes,GrilleV,PoliceAxes,PoliceEffectifs,EpaisseurTraits,Unite,EspaceNiveau,EspaceFeuille,Type,PoliceProbas,InclineProbas,Fleche,StyleTrait,EpaisseurTrait,CouleurAire,CouleurCourbe,AfficheM,AfficheCadre,ValMin,ValMax,NbVal,Sep,Tri,Repetition,Notation,NotationAncien,Formule,AffBase,Details,BaseDep,Zeros,DecalH,DecalV,Noeud,Rect,CouleurRes,DecalRect,Rectangle,CouleurResultat,AfficheConclusion,AfficheDelimiteurs,Lettre,Inconnues,Entier,Cadres,PresPGCD,Mathpunct,Option,Alea,Anegatif,Crochets,Brut,Etapes,Epaisseurg,CouleurCase,CouleurTexte,NbSubCol,NbLig,NbCol,Legendes,PoliceLeg,ListeLegV,ListeLegH,DecalLegende,Couleur,Uno,Grille,ExtraGrilleY,PosLegende,Pointilles,Extremite,Frac},%
@@ -148,8 +153,8 @@
}
}
-\NewTCBListing{PresCodeTexPL}{ O{CadetBlue} m }{%
- enhanced,width=0.93\linewidth,flush right,boxrule=0.75pt,colframe=#1!85!Black,%
+\NewTCBListing{PresCodeTexPL}{ O{BleuCadet} m }{%
+ enhanced,width=0.93\linewidth,flush right,boxrule=0.75pt,colframe=#1!85!black,%
sharp corners,top=0mm,bottom=0mm,left=0.4em,right=5mm,%
before skip=\baselineskip,after skip=\baselineskip,%
colback=white,
@@ -165,8 +170,8 @@
overlay={\draw[#1!85!black] ($(frame.north west)+(-0.035\linewidth,-0.025\linewidth)$) node[scale=1.66] {\faCode} ;}
}
-\NewTCBListing{PresCodePL}{ O{CadetBlue} m }{%
- enhanced,width=0.93\linewidth,flush right,boxrule=0.75pt,colframe=#1!85!Black,%
+\NewTCBListing{PresCodePL}{ O{BleuCadet} m }{%
+ enhanced,width=0.93\linewidth,flush right,boxrule=0.75pt,colframe=#1!85!black,%
sharp corners,top=0mm,bottom=0mm,left=0.4em,right=5mm,%
before skip=\baselineskip,after skip=\baselineskip,%
colback=white,
@@ -186,8 +191,8 @@
}
}
-\NewTCBListing{PresCodeSortiePL}{ O{CadetBlue} m }{%
- enhanced,width=0.93\linewidth,flush right,boxrule=0.75pt,colframe=#1!85!Black,%
+\NewTCBListing{PresCodeSortiePL}{ O{BleuCadet} m }{%
+ enhanced,width=0.93\linewidth,flush right,boxrule=0.75pt,colframe=#1!85!black,%
sharp corners,top=0mm,bottom=0mm,left=0.4em,right=5mm,%
before skip=\baselineskip,after skip=\baselineskip,%
colback=white,
@@ -207,19 +212,19 @@
colback=white,colframe=red!75!black,title={\small \faCode} Code \LaTeX,fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
\newtcolorbox{codeattention}[1][]{%
- colback=Yellow!50,colframe=Yellow!50!Black,title={\small \faBomb} Attention,fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
+ colback=Yellow!50,colframe=yellow!50!black,title={\small \faBomb} Attention,fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
\newtcolorbox{codesortie}[1][]{%
colback=white,colframe=red!75!black,title={\small \faArrowAltCircleRight[regular]} Sortie \LaTeX,fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
\newtcolorbox{condeidee}[1][]{%
- colback=white,colframe=PeachPuff!75!black,title={\small \faLightbulb[regular]} Idée(s),fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
+ colback=white,colframe=Chair!75!black,title={\small \faLightbulb[regular]} Idée(s),fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
\newtcolorbox{codeinfo}[1][]{%
- colback=white,colframe=SteelBlue,title={\small \faPuzzlePiece} Information(s),fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
+ colback=white,colframe=BleuAcier,title={\small \faPuzzlePiece} Information(s),fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
\newtcolorbox{codecles}[1][]{%
- colback=white,colframe=ForestGreen!75,title={\small \faPaperclip} Clés et options,fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
+ colback=white,colframe=CouleurVertForet!75,title={\small \faPaperclip} Clés et options,fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
%petite vignette tex
\newcommand\ctex[1]{\tcbox[vignettelatex]{#1}}
@@ -259,7 +264,7 @@
\tikzset{noeudexpl/.style={purple,font=\sffamily\small}}
\tikzset{portionexpl/.style={orange,thick,<->,>=latex}}
\tikzset{expl/.style={midway,inner sep=1pt,above right=0,orange,font=\sffamily\scriptsize,rotate=45}}
- \tikzset{coeffs/.style={CadetBlue!50!black,circle,draw=CadetBlue,thick,fill=CadetBlue!5,font=\small\ttfamily}}
+ \tikzset{coeffs/.style={BleuCadet!50!black,circle,draw=BleuCadet,thick,fill=BleuCadet!5,font=\small\ttfamily}}
\tikzset{tangente/.style={teal,line width=1pt,dashed}}
%grilles & axes
\tgrilles[line width=0.3pt,lightgray!50]
@@ -294,7 +299,7 @@
}
\newcommand\listecoeffs[4]{%
- \draw (0,5.5) node[left,CadetBlue,font=\small\ttfamily] {Coeffs} ;
+ \draw (0,5.5) node[left,BleuCadet,font=\small\ttfamily] {Coeffs} ;
\node[coeffs] at (2,5.5) {#1} ;
\node[coeffs] at ({(4+7.5)/2},5.5) {#2} ;
\node[coeffs] at ({(7.5+9)/2},5.5) {#3} ;
@@ -427,12 +432,18 @@ Il se charge de manière classique, dans le préambule, par \ctex{\textbackslash
L'utilisateur est libre de charger ses autres {packages} utiles et habituels, ainsi que ses \textsf{polices} et \textsf{encodages} habituels !
\end{noteblock}
+\begin{cautionblock}
+\cmaj{2.7.2} Pour des soucis de compatibilités, \ctex{xcolor} n'est plus chargé, par défaut, avec les options \textsf{[table,svgnames]}, les couleurs de base de \ctex{xcolor} sont toutefois accessibles (une seule couleur, \textsf{CouleurVertForet} a été définie) !
+
+Il est cependant possible, grâce à l'option \Cle{[xcolor]} à passer au chargement du package, de charger \ctex{xcolor} avec l' option \textsf{[table,svgnames]}.
+\end{cautionblock}
+
\begin{importantblock}
Le {package} \ctex{ProfLycee} charge et utilise les {packages} :
\begin{itemize}
\item \ctex{mathtools}, \ctex{amssymb} ;
- \item \ctex{xcolor} avec l' option \textsf{[table,svgnames]} ;
+% \item \ctex{xcolor} avec l' option \textsf{[table,svgnames]} ;
\item \ctex{tikz}, \ctex{pgf}, \ctex{pgffor}, \ctex{nicefrac}, \ctex{nicematrix} ;
\item \ctex{tcolorbox} avec les librairies \ctex{breakable,fitting,skins,listings,listingsutf8,hooks} ;
\item \ctex{xparse}, \ctex{xstring}, \ctex{simplekv}, \ctex{xinttools} ;
@@ -451,7 +462,7 @@ J'ai utilisé les {packages} de C. Tellechea, je vous conseille d'aller jeter un
\begin{PresCodeTexPL}{listing only}
%exemple de chargement pour une compilation en (pdf)latex
\documentclass{article}
-\usepackage{ProfLycee}
+\usepackage{ProfLycee} % ou \usepackage[xcolor]{ProfLycee}
\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
...
@@ -460,7 +471,7 @@ J'ai utilisé les {packages} de C. Tellechea, je vous conseille d'aller jeter un
\begin{PresCodeTexPL}{listing only}
%exemple de chargement pour une compilation en (xe/lua)latex
\documentclass{article}
-\usepackage{ProfLycee}
+\usepackage{ProfLycee} % ou \usepackage[xcolor]{ProfLycee}
\usepackage{fontspec}
...
\end{PresCodeTexPL}
@@ -599,9 +610,9 @@ En ce qui concerne les codes \textsf{librairies}, il faudra :
\begin{noteblock}
Certaines \textsf{commandes} sont à intégrer dans un environnement \TikZ, afin de pouvoir rajouter des éléments, elles ont été testés dans des environnement \ctex{tikzpicture}, à vérifier que la gestion des axes par l'environnement \ctex{axis} est compatible\ldots
-\smallskip
-
-Certains packages ont une fâcheuse tendance à être tatillons sur leurs options (les \textit{fameux} \textsf{option clash for} \ldots) ou leur \textit{position} dans le chargement, donc attention notamment au chargement de \ctex{xcolor} et de \ctex{amssymb} !
+%\smallskip
+%
+%Certains packages ont une fâcheuse tendance à être tatillons sur leurs options (les \textit{fameux} \textsf{option clash for} \ldots) ou leur \textit{position} dans le chargement, donc attention notamment au chargement de \ctex{xcolor} et de \ctex{amssymb} !
\smallskip
@@ -1351,7 +1362,7 @@ Au niveau du code, il y aura donc plusieurs \textit{aspects} :
xmin=0,xmax=60,xgrille=5,xgrilles=5, %axe Ox
ymin=0,ymax=240,ygrille=30,ygrilles=30] %axe Oy
\FenetreSimpleTikz<Police=\small>{0,5,...,55}<Police=\small>{0,30,...,210} %repère
- \CourbeTikz[line width=1.25pt,ForestGreen,samples=250]%
+ \CourbeTikz[line width=1.25pt,CouleurVertForet,samples=250]%
{\x*\x*exp(-0.05*\x)+1}{0:60} %courbe
\end{tikzpicture}
\end{PresCodeSortiePL}
@@ -1640,7 +1651,7 @@ Cette commande permet de rajouter une courbe sur le graphique (sans se soucier d
\FenetreSimpleTikz%
<Police=\small>{0,5,...,60}%
<Police=\small>{0,30,...,240} %repère
- \CourbeTikz[line width=1.25pt,ForestGreen,samples=250]%
+ \CourbeTikz[line width=1.25pt,CouleurVertForet,samples=250]%
{\x*\x*exp(-0.05*\x)+1}{0:60} %courbe
\end{tikzpicture}
\end{PresCodeTexPL}
@@ -1651,7 +1662,7 @@ Cette commande permet de rajouter une courbe sur le graphique (sans se soucier d
xmin=0,xmax=60,xgrille=5,xgrilles=5,ymin=0,ymax=240,ygrille=30,ygrilles=30]
\FenetreSimpleTikz%
<Police=\small>{0,5,...,60}<Police=\small>{0,30,...,240} %repère
- \CourbeTikz[line width=1.25pt,ForestGreen,samples=250]%
+ \CourbeTikz[line width=1.25pt,CouleurVertForet,samples=250]%
{\x*\x*exp(-0.05*\x)+1}{0:60} %courbe
\end{tikzpicture}
\end{PresCodeSortiePL}
@@ -1682,8 +1693,8 @@ On va utiliser les notions suivantes pour paramétrer le tracé \og automatique
%
\begin{itemize}
\item il faut rentrer les \textcolor{purple}{\textsf{points de contrôle}} ;
- \item il faut préciser les \textcolor{ForestGreen}{\textsf{pentes des tangentes}} (pour le moment on travaille avec les mêmes à gauche et à droite\ldots) ;
- \item on peut \og affiner \fg{} les portions de courbe en paramétrant des \textcolor{CadetBlue}{\textsf{coefficients}} (voir un peu plus loin\ldots).
+ \item il faut préciser les \textcolor{CouleurVertForet}{\textsf{pentes des tangentes}} (pour le moment on travaille avec les mêmes à gauche et à droite\ldots) ;
+ \item on peut \og affiner \fg{} les portions de courbe en paramétrant des \textcolor{BleuCadet}{\textsf{coefficients}} (voir un peu plus loin\ldots).
\end{itemize}
\medskip
@@ -1886,7 +1897,7 @@ Cela permet de tracer la tangente :
%spline
\SplineTikz[AffPoints,Coeffs=3§2,Couleur=red]{\LISTE}
%tangente
- \TangenteTikz[xl=0,xr=0.5,Couleur=ForestGreen,Style=dashed]{\LISTE}
+ \TangenteTikz[xl=0,xr=0.5,Couleur=CouleurVertForet,Style=dashed]{\LISTE}
\TangenteTikz[xl=0.5,xr=0.75,Couleur=orange,Style=dotted,Point=2]{\LISTE}
\TangenteTikz[xl=0.33,xr=0,Couleur=blue,Style=densely dashed,Point=3]{\LISTE}
...
@@ -1908,7 +1919,7 @@ On obtient le résultat suivant (avec les éléments rajoutés utiles à la comp
%spline
\SplineTikz[AffPoints,Coeffs=3§2,Couleur=red]{0/1.5/0§1/2/-0.333§2/0/-5}
%tangente
- \TangenteTikz[xl=0,xr=0.5,Couleur=ForestGreen,Style=dashed]{0/1.5/0§1/2/-0.333§2/0/-5}
+ \TangenteTikz[xl=0,xr=0.5,Couleur=CouleurVertForet,Style=dashed]{0/1.5/0§1/2/-0.333§2/0/-5}
\TangenteTikz[xl=0.5,xr=0.75,Couleur=orange,Style=dotted,Point=2]{0/1.5/0§1/2/-0.333§2/0/-5}
\TangenteTikz[xl=0.33,xr=0,Couleur=blue,Style=densely dashed,Point=3]{0/1.5/0§1/2/-0.333§2/0/-5}
%explications
@@ -1948,7 +1959,7 @@ On obtient le résultat suivant (avec les éléments rajoutés utiles à la comp
\TangenteTikz[xl=0,xr=1,Couleur=blue,Style=dashed]{\liste}
\TangenteTikz[xl=2,xr=2,Couleur=purple,Style=dotted,Point=2]{\liste}
\TangenteTikz[xl=2,xr=2,Couleur=orange,Style=<->,Point=3]{\liste}
- \TangenteTikz[xl=2,xr=0,Couleur=ForestGreen,Point=5]{\liste}
+ \TangenteTikz[xl=2,xr=0,Couleur=CouleurVertForet,Point=5]{\liste}
%la courbe en elle-même
\SplineTikz[AffPoints,Coeffs=3,Couleur=cyan,Style=densely dotted]{\liste}
\end{tikzpicture}
@@ -1970,7 +1981,7 @@ On obtient le résultat suivant (avec les éléments rajoutés utiles à la comp
\TangenteTikz[xl=0,xr=1,Couleur=blue,Style=dashed]{\liste}
\TangenteTikz[xl=2,xr=2,Couleur=purple,Style=dotted,Point=2]{\liste}
\TangenteTikz[xl=2,xr=2,Couleur=orange,Style=<->,Point=3]{\liste}
- \TangenteTikz[xl=2,xr=0,Couleur=ForestGreen,Point=5]{\liste}
+ \TangenteTikz[xl=2,xr=0,Couleur=CouleurVertForet,Point=5]{\liste}
%la courbe en elle-même
\SplineTikz[AffPoints,Coeffs=3,Couleur=cyan,Style=densely dotted]{\liste}
\end{tikzpicture}
@@ -2058,7 +2069,7 @@ Pour la clé \Cle{code}, il est construit par le type (\textsf{a} pour affine ou
\begin{center}
\MiniSchemaSignes*[Code=pa+d+,Racines={1/2},Couleur=orange]
~~~~
-\MiniSchemaSignes*[Code=pa+d-,Couleur=ForestGreen]
+\MiniSchemaSignes*[Code=pa+d-,Couleur=CouleurVertForet]
~~~~
\MiniSchemaSignes*[Code=pa+d0,Racines={5},Couleur=purple]
\end{center}
@@ -2082,7 +2093,7 @@ Pour la clé \Cle{code}, il est construit par le type (\textsf{a} pour affine ou
\begin{center}
\MiniSchemaSignes*[Code=pa+d+,Racines={1/2},Couleur=orange]
~~~~
-\MiniSchemaSignes*[Code=pa+d-,Couleur=ForestGreen]
+\MiniSchemaSignes*[Code=pa+d-,Couleur=CouleurVertForet]
~~~~
\MiniSchemaSignes*[Code=pa+d0,Racines={5},Couleur=purple]
\end{center}
@@ -2098,10 +2109,10 @@ Pour la clé \Cle{code}, il est construit par le type (\textsf{a} pour affine ou
\begin{PresCodePL}{}
\begin{tikzpicture}
- \MiniSchemaSignes[Largeur=3.5,Hauteur=1.5,Code=da-,Racines=\tfrac{-b}{a},Couleur=Plum]
+ \MiniSchemaSignes[Largeur=3.5,Hauteur=1.5,Code=da-,Racines=\tfrac{-b}{a},Couleur=pink]
\end{tikzpicture}
-\MiniSchemaSignes*[Code=da-,Racines=\tfrac{-b}{a},Couleur=Plum]<x=1.75cm,y=1.5cm>
+\MiniSchemaSignes*[Code=da-,Racines=\tfrac{-b}{a},Couleur=pink]<x=1.75cm,y=1.5cm>
\end{PresCodePL}
\pagebreak
@@ -2257,7 +2268,7 @@ On va tracer la \textit{toile} des 4 premiers termes de la suite récurrente :\\
\ToileRecurrence[Fct={\f},No=1,Uno=1,Nb=4,DecalLabel=4pt]
%éléments supplémentaires
\draw[very thick,blue,domain=0:8,samples=250] plot (\x,{\f}) ;
-\draw[very thick,ForestGreen,domain=0:8,samples=2] plot (\x,\x) ;
+\draw[very thick,CouleurVertForet,domain=0:8,samples=2] plot (\x,\x) ;
\end{PresCodePL}
\begin{noteblock}
@@ -2313,7 +2324,7 @@ Peut-être que -- ultérieurement -- des options \textit{booléennes} seront dis
\def\f{1+1/\x}
\ToileRecurrence%
[Fct={\f},No=0,Uno=1,Nb=7,PosLabel=above right,DecalLabel=0pt,AffTermes=false]%
- [line width=1.25pt,ForestGreen,densely dashed][]
+ [line width=1.25pt,CouleurVertForet,densely dashed][]
\draw[line width=1.25pt,blue,domain=0:2.25,samples=2] plot(\x,{\x});
\draw[line width=1.25pt,red,domain=0.8:2.5,samples=250] plot(\x,{\f});
\end{tikzpicture}
@@ -2336,7 +2347,7 @@ Peut-être que -- ultérieurement -- des options \textit{booléennes} seront dis
%tracés
\ToileRecurrence%
[Fct={\f},No=0,Uno=1,Nb=7,PosLabel=above right,DecalLabel=0pt,AffTermes=false]%
- [line width=1.25pt,ForestGreen,densely dashed][]
+ [line width=1.25pt,CouleurVertForet,densely dashed][]
\draw[line width=1.25pt,blue,domain=0:2.25,samples=2] plot(\x,{\x});
\draw[line width=1.25pt,red,domain=0.8:2.5,samples=250] plot(\x,{\f});
\end{tikzpicture}
@@ -3451,7 +3462,7 @@ Il s'agir d'un environnement créé en \ctex{tcolorbox}, et utilisant la présen
Peu de personnalisations pour ces commandes :
\begin{itemize}
- \item le premier argument, \textit{optionnel}, permet de préciser la \textit{couleur} de la présentation ;\hfill{}défaut \Cle{ForestGreen}
+ \item le premier argument, \textit{optionnel}, permet de préciser la \textit{couleur} de la présentation ;\hfill{}défaut \Cle{CouleurVertForet}
\item le second, \textit{obligatoire}, correspond aux éventuelles options liées à la \ctex{tcolorbox}.
\end{itemize}
\vspace*{-\baselineskip}\leavevmode
@@ -3473,7 +3484,7 @@ On peut par exemple utiliser l'option \Cle{listing only} pour ne présenter \tex
Avec $A=\ValAleaA$ et $B=\ValAleaB$, on a $A\times B=\inteval{\ValAleaA * \ValAleaB}$.
\end{PresentationCode}
-\begin{PresentationCode}[DarkBlue]{}
+\begin{PresentationCode}[blue]{}
On peut faire beaucoup de choses avec \LaTeX{} !
\end{PresentationCode}
\end{PresCodePL}
@@ -3640,9 +3651,9 @@ Pour \textit{illustrer} un peu les \Cle{clés}, un petit schéma, avec les diffÃ
\begin{center}
\begin{tikzpicture}[x=1.25cm,y=1.25cm,line width=1pt,line join=bevel]
\TetraedreTikz[Largeur=5,Profondeur=1.95,Hauteur=2.75,Alpha=45,Beta=70]
- \draw[draw=none] (A)--(C) node[midway,sloped,above,font=\small\sffamily,CadetBlue] {Largeur} ;
- \draw[draw=none] (A)--(B) node[midway,sloped,below,font=\small\sffamily,CadetBlue] {Profondeur} ;
- \draw[draw=none] (A)--(D) node[midway,sloped,above,font=\small\sffamily,CadetBlue] {Hauteur} ;
+ \draw[draw=none] (A)--(C) node[midway,sloped,above,font=\small\sffamily,BleuCadet] {Largeur} ;
+ \draw[draw=none] (A)--(B) node[midway,sloped,below,font=\small\sffamily,BleuCadet] {Profondeur} ;
+ \draw[draw=none] (A)--(D) node[midway,sloped,above,font=\small\sffamily,BleuCadet] {Hauteur} ;
\draw[purple] (0.5,0) arc (0:-45:0.5) ;
\draw (-22.5:0.5) node[purple,right] {$\alpha$} ;
\draw[orange] (0.75,0) arc (0:70:0.75) ;
@@ -3655,7 +3666,7 @@ Pour \textit{illustrer} un peu les \Cle{clés}, un petit schéma, avec les diffÃ
\begin{center}
\begin{tikzpicture}[line join=bevel]
\TetraedreTikz[Aff,Largeur=7,Profondeur=3,Hauteur=5,Epaisseur={ultra thick},Alpha=20,Beta=30]
- \draw[very thick,ForestGreen,<->,>=latex] ($(A)!0.5!(D)$)--($(B)!0.5!(D)$) ;
+ \draw[very thick,CouleurVertForet,<->,>=latex] ($(A)!0.5!(D)$)--($(B)!0.5!(D)$) ;
\end{tikzpicture}
\end{center}
\end{PresCodeTexPL}
@@ -3664,7 +3675,7 @@ Pour \textit{illustrer} un peu les \Cle{clés}, un petit schéma, avec les diffÃ
\begin{center}
\begin{tikzpicture}[line join=bevel]
\TetraedreTikz[Aff,Largeur=7,Profondeur=3,Hauteur=5,Epaisseur={ultra thick},Alpha=20,Beta=30]
- \draw[very thick,ForestGreen,<->,>=latex] ($(A)!0.5!(D)$)--($(B)!0.5!(D)$) ;
+ \draw[very thick,CouleurVertForet,<->,>=latex] ($(A)!0.5!(D)$)--($(B)!0.5!(D)$) ;
\end{tikzpicture}
\end{center}
\end{PresCodeSortiePL}
@@ -4774,7 +4785,7 @@ Le package \ctex{pgfplots} peut être utilisé pour traiter ce genre de situatio
\AxexTikz[Annee]{1992,1994,...,2010} %axeOx
\AxeyTikz{1640,1650,...,1720} %axeOy
\NuagePointsTikz{\LLX}{\LLY} %nuage
- \CourbeTikz[line width=1.25pt,ForestGreen,samples=2]%
+ \CourbeTikz[line width=1.25pt,CouleurVertForet,samples=2]%
{\COEFFa*\x+\COEFFb}{\LXmin:\LXmax} %droite de régression
\PointMoyenTikz %point moyen
\end{tikzpicture}
@@ -4786,7 +4797,7 @@ Le package \ctex{pgfplots} peut être utilisé pour traiter ce genre de situatio
[....] %paramètres
\FenetreSimpleTikz<Annee>{1992,1994,...,2010}{1640,1650,...,1720} %fenêtre "simple"
\NuagePointsTikz{\LLX}{\LLY} %nuage
- \CourbeTikz[line width=1.25pt,ForestGreen,samples=2]%
+ \CourbeTikz[line width=1.25pt,CouleurVertForet,samples=2]%
{\COEFFa*\x+\COEFFb}{\LXmin:\LXmax} %droite de régression
\PLnuageptmoy %point moyen
\end{tikzpicture}
@@ -4802,7 +4813,7 @@ Le package \ctex{pgfplots} peut être utilisé pour traiter ce genre de situatio
\AxexTikz[Annee]{1992,1994,...,2010}
\AxeyTikz{1640,1650,...,1720}
\NuagePointsTikz{\LLX}{\LLY}
- \CourbeTikz[line width=1.25pt,ForestGreen,samples=2]{\COEFFa*\x+\COEFFb}{\LXmin:\LXmax}
+ \CourbeTikz[line width=1.25pt,CouleurVertForet,samples=2]{\COEFFa*\x+\COEFFb}{\LXmin:\LXmax}
\PointMoyenTikz
\end{tikzpicture}
\end{PresCodeSortiePL}
@@ -5070,7 +5081,7 @@ Cette commande, liée à la commande \ctex{CalculsRegLin} permet de représenter
\begin{PresCodeTexPL}{listing only}
\begin{tikzpicture}[...]
- \NuagePointsTikz[Couleur=ForestGreen,Style=x,Taille=6pt]{\LLX}{\LLY}
+ \NuagePointsTikz[Couleur=CouleurVertForet,Style=x,Taille=6pt]{\LLX}{\LLY}
\end{tikzpicture}
\end{PresCodeTexPL}
@@ -5083,7 +5094,7 @@ Cette commande, liée à la commande \ctex{CalculsRegLin} permet de représenter
\GrilleTikz \AxesTikz
\AxexTikz[Annee,Police=\small]{1992,1994,...,2010}
\AxeyTikz{1640,1650,...,1720}
- \NuagePointsTikz[Couleur=ForestGreen,Style=x,Taille=6pt]{\LLX}{\LLY}
+ \NuagePointsTikz[Couleur=CouleurVertForet,Style=x,Taille=6pt]{\LLX}{\LLY}
\end{tikzpicture}
\end{PresCodeSortiePL}
@@ -5122,7 +5133,7 @@ Cette commande permet de rajouter le point moyen du nuage, calculé par la comma
\end{tikzpicture}
~~
\begin{tikzpicture}[...]
- \NuagePointsTikz[Couleur=ForestGreen,Style=x,Taille=6pt]{\LLX}{\LLY}
+ \NuagePointsTikz[Couleur=CouleurVertForet,Style=x,Taille=6pt]{\LLX}{\LLY}
\PointMoyenTikz[Couleur=orange,Taille=8pt,Style=+,Nom={$G_1$},Pos=below]
\end{tikzpicture}
\end{PresCodeTexPL}
@@ -5144,7 +5155,7 @@ Cette commande permet de rajouter le point moyen du nuage, calculé par la comma
\GrilleTikz \AxesTikz
\AxexTikz[Annee,Police=\small]{1992,1994,...,2010}
\AxeyTikz{1640,1650,...,1720}
- \NuagePointsTikz[Couleur=ForestGreen,Style=x,Taille=6pt]{\LLX}{\LLY}
+ \NuagePointsTikz[Couleur=CouleurVertForet,Style=x,Taille=6pt]{\LLX}{\LLY}
\PointMoyenTikz[Couleur=orange,Taille=8pt,Style=+,Nom={$G_1$},Pos=below]
\end{tikzpicture}
\end{PresCodeSortiePL}
@@ -5181,7 +5192,7 @@ L'idée principale est de récupérer les variables de la régression linéaire
\begin{tikzpicture}[...]
\NuagePointsTikz[Couleur=blue/red]{\LLX}{\LLY} \PointMoyenTikz
- \CourbeTikz[line width=1.25pt,ForestGreen,samples=2]{\COEFFa*\x+\COEFFb}{\xmin:\xmax}
+ \CourbeTikz[line width=1.25pt,CouleurVertForet,samples=2]{\COEFFa*\x+\COEFFb}{\xmin:\xmax}
\end{tikzpicture}
\end{PresCodeTexPL}
@@ -5195,7 +5206,7 @@ L'idée principale est de récupérer les variables de la régression linéaire
\AxexTikz[Annee,Police=\footnotesize]{1992,1994,...,2010}
\AxeyTikz{1640,1650,...,1720}
\NuagePointsTikz[Couleur=blue/red]{\LLX}{\LLY} \PointMoyenTikz
- \CourbeTikz[line width=1.25pt,ForestGreen,samples=2]{\COEFFa*\x+\COEFFb}{\xmin:\xmax}
+ \CourbeTikz[line width=1.25pt,CouleurVertForet,samples=2]{\COEFFa*\x+\COEFFb}{\xmin:\xmax}
\end{tikzpicture}
\end{PresCodeSortiePL}
@@ -5292,7 +5303,7 @@ Quelques \Cle{clés} sont disponibles pour cette commande :
\BoiteMoustaches[Epaisseur=ultra thick,Couleur=blue]{100/150/170/190/200}
\BoiteMoustaches[Epaisseur=thin,Elevation=2.5,Couleur=red]{80/100/110/120/150}
\BoiteMoustaches%
- [Elevation=4,Couleur=ForestGreen,Remplir=ForestGreen!25]{100/140/145/160/210}
+ [Elevation=4,Couleur=CouleurVertForet,Remplir=CouleurVertForet!25]{100/140/145/160/210}
\end{tikzpicture}
\end{center}
\end{PresCodeTexPL}
@@ -5305,7 +5316,7 @@ Quelques \Cle{clés} sont disponibles pour cette commande :
\foreach \y in {0,0.5,...,4.5} \draw[very thin,lightgray] ($(210,\y)+(-3pt,0)$)--($(210,\y)+(3pt,0)$) node[right] {\num{\y}} ;
\BoiteMoustaches[Epaisseur=ultra thick,Couleur=blue]{100/150/170/190/200}
\BoiteMoustaches[Epaisseur=thin,Elevation=2.5,Couleur=red]{80/100/110/120/150}
- \BoiteMoustaches[Elevation=4,Couleur=ForestGreen,Remplir=ForestGreen!25]{100/140/145/160/210}
+ \BoiteMoustaches[Elevation=4,Couleur=CouleurVertForet,Remplir=CouleurVertForet!25]{100/140/145/160/210}
\end{tikzpicture}
\end{center}
\end{PresCodeSortiePL}
@@ -5348,7 +5359,7 @@ Quelques \Cle{clés} sont disponibles pour cette commande :
\BoiteMoustachesAxe[Min=8,Max=21,AffValeurs,Valeurs={8,9,...,21},Elargir=0.02]
\BoiteMoustaches[Moyenne=18.5,Couleur=blue]{10/15/17/19/20}
\BoiteMoustaches[Elevation=2.5,Couleur=red]{8/10/11/12/15}
- \BoiteMoustaches[Elevation=4,Couleur=ForestGreen,Remplir=ForestGreen!25]{10/14/14.5/16/21}
+ \BoiteMoustaches[Elevation=4,Couleur=CouleurVertForet,Remplir=CouleurVertForet!25]{10/14/14.5/16/21}
\end{tikzpicture}
\end{PresCodePL}
@@ -5950,13 +5961,13 @@ Les nœuds crées par les commandes sont :
\begin{EnvArbreProbasTikz}[Type=3x2,Fleche,EspaceNiveau=5,EspaceFeuille=1.25]%
{\ArbreTroisDeux}
- \draw[ForestGreen,->] (A24)--($(A24)+(2.5,0)$) node[right,font=\sffamily] {code tikz rajouté} ;
+ \draw[CouleurVertForet,->] (A24)--($(A24)+(2.5,0)$) node[right,font=\sffamily] {code tikz rajouté} ;
\end{EnvArbreProbasTikz}
\end{PresCodeTexPL}
\begin{PresCodeSortiePL}{text only}
\begin{EnvArbreProbasTikz}[Type=3x2,Fleche,EspaceNiveau=5,EspaceFeuille=1.25]{$A_1$/\num{0.5}/above,$B$/\num{0.4}/above,$\overline{B}$/.../below,$A_2$/.../above,$B$/.../above,$\overline{B}$/$\frac{1}{3}$/below,$A_3$/.../below,$B$/.../above,$\overline{B}$/$\frac{4}{15}$/below}
- \draw[ForestGreen,->] (A24)--($(A24)+(2.5,0)$) node[right,font=\sffamily] {code tikz rajouté} ;
+ \draw[CouleurVertForet,->] (A24)--($(A24)+(2.5,0)$) node[right,font=\sffamily] {code tikz rajouté} ;
\end{EnvArbreProbasTikz}
\end{PresCodeSortiePL}
@@ -6039,7 +6050,7 @@ Les commandes sont donc des environnements \TikZ, sans possibilité de \og rajou
\begin{PresCodePL}{}
Avec centrage vertical sur l'axe des abscisses :
\LoiNormaleGraphe
- [AfficheM=false,CouleurCourbe=Blue,CouleurAire=LightBlue]<baseline=0pt>%
+ [AfficheM=false,CouleurCourbe=blue,CouleurAire=cyan]<baseline=0pt>%
{1000}{100}{950}{*}
\end{PresCodePL}
@@ -6057,7 +6068,7 @@ Avec centrage vertical :
Avec centrage vertical sur l'axe des abscisses :
\LoiExpoGraphe
- [AfficheM=false,CouleurCourbe=Blue,CouleurAire=LightBlue]<baseline=0pt>{0.05}{*}{32}
+ [AfficheM=false,CouleurCourbe=blue,CouleurAire=cyan]<baseline=0pt>{0.05}{*}{32}
\medskip
@@ -6563,23 +6574,23 @@ Quelques options pour cette commande :
\begin{PresCodeTexPL}{listing only}
%conversion avec changement de couleur
-\ConversionDepuisBaseDix[Couleur=DarkBlue]{45}{2}
+\ConversionDepuisBaseDix[Couleur=blue]{45}{2}
%conversion sans le rectangle
Par divisions euclidiennes successives, \ConversionDepuisBaseDix[Rect=false]{54}{3}.
%conversion avec gestion du decalh pour le placement précis du rectangle
-\ConversionDepuisBaseDix[Couleur=Goldenrod,DecalH=6pt/2pt]{1012}{16}
+\ConversionDepuisBaseDix[Couleur=brown,DecalH=6pt/2pt]{1012}{16}
%conversion avec noeud personnalisé et réutilisation
-\ConversionDepuisBaseDix[Couleur=ForestGreen,CouleurRes,Noeud=TEST]{100}{9}.
+\ConversionDepuisBaseDix[Couleur=CouleurVertForet,CouleurRes,Noeud=TEST]{100}{9}.
\begin{tikzpicture}
- \draw[overlay,ForestGreen,thick,->] (TEST2.south east) to[bend right] ++ (3cm,-1cm) node[right] {test } ;
+ \draw[overlay,CouleurVertForet,thick,->] (TEST2.south east) to[bend right] ++ (3cm,-1cm) node[right] {test } ;
\end{tikzpicture}
\end{PresCodeTexPL}
\begin{PresCodeSortiePL}{text only}
-\ConversionDepuisBaseDix[Couleur=DarkBlue]{45}{2}
+\ConversionDepuisBaseDix[Couleur=blue]{45}{2}
\medskip
@@ -6587,13 +6598,13 @@ Par divisions euclidiennes successives, \ConversionDepuisBaseDix[Rect=false]{54}
\medskip
-\ConversionDepuisBaseDix[Couleur=Goldenrod,DecalH=6pt/2pt]{1012}{16}
+\ConversionDepuisBaseDix[Couleur=brown,DecalH=6pt/2pt]{1012}{16}
\medskip
-On obtient donc \ConversionDepuisBaseDix[Couleur=ForestGreen,CouleurRes,Noeud=TEST]{100}{9}.
+On obtient donc \ConversionDepuisBaseDix[Couleur=CouleurVertForet,CouleurRes,Noeud=TEST]{100}{9}.
\begin{tikzpicture}
- \draw[overlay,ForestGreen,thick,->] (TEST2.south east) to[bend right] ++ (3cm,-1cm) node[right] {test } ;
+ \draw[overlay,CouleurVertForet,thick,->] (TEST2.south east) to[bend right] ++ (3cm,-1cm) node[right] {test } ;
\end{tikzpicture}
\vspace{1.5cm}
@@ -6666,16 +6677,16 @@ La présentation est dans un environnement \ctex{ensuremath} donc les \ctex{\$..
\end{PresCodePL}
\begin{PresCodePL}{}
-\PresentationPGCD[CouleurResultat,Couleur=ForestGreen]{1250}{450}.
+\PresentationPGCD[CouleurResultat,Couleur=CouleurVertForet]{1250}{450}.
-\PresentationPGCD[CouleurResultat,Couleur=DarkBlue]{13500}{2500}.
+\PresentationPGCD[CouleurResultat,Couleur=blue]{13500}{2500}.
\PresentationPGCD[Rectangle=false]{420}{540}. \\
-D'après l'algorithme d'Euclide, on a $\left| \PresentationPGCD[Couleur=LightSkyBlue,AfficheConclusion=false, AfficheDelimiteurs=false]%
+D'après l'algorithme d'Euclide, on a $\left| \PresentationPGCD[Couleur=lime,AfficheConclusion=false, AfficheDelimiteurs=false]%
{123456789}{9876} \right.$
\begin{tikzpicture}
- \draw[overlay,LightSkyBlue,thick,<-] (FFF1.east) to[bend right] ++ (1cm,0.75cm) node[right] {dernier reste non nul} ;
+ \draw[overlay,lime,thick,<-] (FFF1.east) to[bend right] ++ (1cm,0.75cm) node[right] {dernier reste non nul} ;
\end{tikzpicture}
\end{PresCodePL}
@@ -7321,7 +7332,7 @@ Quelques \Cle{clés} sont disponibles pour cette commande :
\item la clé \Cle{Epaisseurg} pour gérer l'épaisseur des traits épais ; \hfill~défaut \Cle{1.5pt}
\item la clé \Cle{Epaisseur} pour gérer l'épaisseur des traits fins ; \hfill~défaut \Cle{0.5pt}
\item la clé \Cle{Unite} qui est l'unité graphique de la figure ; \hfill~défaut \Cle{1cm}
- \item la clé \Cle{CouleurCase} pour la couleur (éventuelles) des cases ; \hfill~défaut \Cle{LightBlue!50}
+ \item la clé \Cle{CouleurCase} pour la couleur (éventuelles) des cases ; \hfill~défaut \Cle{cyan!50}
\item la clé \Cle{CouleurTexte} pour gérer la couleur du label des cases ; \hfill~défaut \Cle{blue}
\item la clé \Cle{NbCol} qui est le nombre de colonnes ; \hfill~défaut \Cle{9}
\item la clé \Cle{NbSubCol} qui est le nombre de sous-colonnes ; \hfill~défaut \Cle{3}
@@ -7401,7 +7412,7 @@ La grille, créée en \TikZ, est portée par le rectangle de \og coins \fg{} $(0
}
\begin{EnvSudoMaths}[%
- Unite=0.66cm,Police=\footnotesize\bfseries\ttfamily,CouleurCase=ForestGreen!50,%
+ Unite=0.66cm,Police=\footnotesize\bfseries\ttfamily,CouleurCase=violet!50,%
ListeLegV=QSDFGHJKL,ListeLegH=poiuytrez]{\grilleSuMaB}
\draw[red,very thick,<-,>=latex] (7.5,-4.5) to[bend right] ++ (4,-1) node[right] {code rajouté...} ;
\end{EnvSudoMaths}
@@ -7421,7 +7432,7 @@ La grille, créée en \TikZ, est portée par le rectangle de \og coins \fg{} $(0
}
\begin{EnvSudoMaths}[%
- Unite=0.66cm,Police=\footnotesize\bfseries\ttfamily,CouleurCase=ForestGreen!50,%
+ Unite=0.66cm,Police=\footnotesize\bfseries\ttfamily,CouleurCase=violet!50,%
ListeLegV=QSDFGHJKL,ListeLegH=poiuytrez]{\grilleSuMaB}
\draw[red,very thick,<-,>=latex] (7.5,-4.5) to[bend right] ++ (4,-1) node[right] {code rajouté pour montrer la case \textsf{Ge}} ;
\foreach \x in {0,1,...,9} \draw[lightgray] (\x,-9) node[below,font=\scriptsize\ttfamily] {\x} ;
@@ -7444,6 +7455,8 @@ La grille, créée en \TikZ, est portée par le rectangle de \og coins \fg{} $(0
\part{Historique}
+{\small \bverb|v 2.7.2|~:~~~~\textsf{xcolor} n'est plus chargé par défaut (option \textsf{[xcolor]} pour le charger)
+
{\small \bverb|v 2.7.1|~:~~~~Chargement de \textsf{tcolorbox} par librairies (au lieu de \textsf{[most]})
{\small \bverb|v 2.7.0|~:~~~~Ajout de la clé \Cle{Frac} pour les axes verticaux (\pageref{reperagetikz})
diff --git a/macros/latex/contrib/proflycee/tex/ProfLycee.sty b/macros/latex/contrib/proflycee/tex/ProfLycee.sty
index d2c18333cf..f2dc4b4765 100644
--- a/macros/latex/contrib/proflycee/tex/ProfLycee.sty
+++ b/macros/latex/contrib/proflycee/tex/ProfLycee.sty
@@ -3,7 +3,8 @@
% or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ProfLycee}[2023/08/08 2.7.1 Aide pour l'utilisation de LaTeX en lycee]
+\ProvidesPackage{ProfLycee}[2023/08/25 2.7.2 Aide pour l'utilisation de LaTeX en lycee]
+% 2.7.2 Modification du chargement de xcolor pour éviter les clash errors (couleurs adaptées du coup), passage en option (test)
% 2.7.1 Modification du chargement de tcolorbox
% 2.7.0 Ajout de la clé [Frac] pour \AxeyTikz + \FonctionRepartTikz
% 2.6.9 Correction de bugs et améliorations des boîtes de codes
@@ -57,8 +58,10 @@
\RequirePackage{mathtools}
%------Option(s)
+\newif\if@xcolor \@xcolorfalse
\newif\if@build \@buildfalse
\newif\if@loadamssymb \@loadamssymbtrue
+\DeclareOption{xcolor}{\@xcolortrue}%
\DeclareOption{build}{\@buildtrue}%
\DeclareOption{nonamssymb}{\@loadamssymbfalse}%
\DeclareOption*{}
@@ -68,7 +71,9 @@
\if@loadamssymb
\RequirePackage{amssymb}
\fi
-\RequirePackage[table,svgnames]{xcolor}%Gestion des couleurs
+\if@xcolor
+ \RequirePackage[table,svgnames]{xcolor}%Gestion des couleurs
+\fi
\RequirePackage{tikz}
\RequirePackage{tkz-tab}
\RequirePackage{pgf,pgffor}
@@ -112,6 +117,9 @@
%divers
\RequirePackage{iftex}
+%couleurs
+\definecolor{CouleurVertForet}{HTML}{1F8B36} %ForestGreen
+
%%------LIBRAIRIES/BIBIOTHÈQUES
\newcommand\useproflyclib[1]{%ajout d'une commande "librairie" pour charger des modules
\IfSubStr{#1}{piton}%
diff --git a/macros/latex/contrib/proflycee/tex/proflycee-tools-listings.tex b/macros/latex/contrib/proflycee/tex/proflycee-tools-listings.tex
index 228639439a..5184ac0eff 100644
--- a/macros/latex/contrib/proflycee/tex/proflycee-tools-listings.tex
+++ b/macros/latex/contrib/proflycee/tex/proflycee-tools-listings.tex
@@ -23,7 +23,7 @@
language = python,
inputencoding = utf8,
basicstyle = \ttfamily\footnotesize,
- keywordstyle = \color{ForestGreen},
+ keywordstyle = \color{CouleurVertForet},
keywordstyle = [2]\color{magenta},
commentstyle = \color{gray}\itshape,
stringstyle = \color{red!75},
@@ -47,7 +47,7 @@
language = python,
inputencoding = utf8/latin1,
basicstyle = \ttfamily\footnotesize,
- keywordstyle = \color{ForestGreen},
+ keywordstyle = \color{CouleurVertForet},
keywordstyle = [2]\color{magenta},
commentstyle = \color{gray}\itshape,
stringstyle = \color{red!75},
@@ -73,14 +73,14 @@
top=\baselineskip,bottom=1mm,right=5mm,
attach boxed title to top right={yshift=-\tcboxedtitleheight},
boxed title style={
- size=small,colback=ForestGreen!25,boxrule=1.25pt,
- colframe=Green,boxsep=1.25pt,
+ size=small,colback=CouleurVertForet!25,boxrule=1.25pt,
+ colframe=green,boxsep=1.25pt,
sharp corners=downhill,
arc=12pt,
top=2pt,bottom=1pt,left=6pt,right=6pt
},
- colframe=Green,colback=ForestGreen!5,%
- fonttitle=\color{ForestGreen}\itshape\ttfamily\footnotesize,
+ colframe=green,colback=CouleurVertForet!5,%
+ fonttitle=\color{CouleurVertForet}\itshape\ttfamily\footnotesize,
title={\scriptsize\faPython}\:Code Python\vphantom{p},
watermark text={\faPython},watermark opacity=0.175,watermark zoom=0.50,
listing only,listing engine=listings,%
@@ -112,7 +112,7 @@
%v2
\tcbset{StylPythonB/.style={%
- enhanced,boxrule=0.75pt,colframe=DarkGray!50!Black,%
+ enhanced,boxrule=0.75pt,colframe=darkgray!50!black,%
sharp corners,top=0mm,bottom=0mm,left=0.2em,right=5mm,%
before skip=0.5\baselineskip,after skip=0.5\baselineskip,%
colback=white,
@@ -121,7 +121,7 @@
watermark text={\faPython},watermark opacity=0.25,watermark zoom=0.50,%
title={{\scriptsize\faCode} Code Python},
lefttitle=0.4em,
- fonttitle=\bfseries\footnotesize\sffamily,colbacktitle=DarkGray!50!Black
+ fonttitle=\bfseries\footnotesize\sffamily,colbacktitle=darkgray!50!black
}
}
@@ -265,7 +265,7 @@
}
\tcbset{stylepseudocodePLalt/.style={%
- enhanced,boxrule=0.75pt,colframe=DarkGray!50!Black,%
+ enhanced,boxrule=0.75pt,colframe=darkgray!50!black,%
sharp corners,top=0mm,bottom=0mm,left=0.4em,right=5mm,%
before skip=0.5\baselineskip,after skip=0.5\baselineskip,%
colback=white,
@@ -274,7 +274,7 @@
watermark text={\faCode},watermark opacity=0.25,watermark zoom=0.50,%
title={{\scriptsize\faCode} PseudoCode},
lefttitle=0.4em,
- fonttitle=\bfseries\footnotesize\sffamily,colbacktitle=DarkGray!50!Black
+ fonttitle=\bfseries\footnotesize\sffamily,colbacktitle=darkgray!50!black
}
}
@@ -314,9 +314,9 @@
}
%%------PRESENTATIONDECODES CLASSIQUES
-\NewTCBListing{PresentationCode}{ O{ForestGreen} m }{%
+\NewTCBListing{PresentationCode}{ O{CouleurVertForet} m }{%
sharp corners=downhill,enhanced,arc=12pt,skin=bicolor,%
- colback=#1!5!white,colframe=#1!75!black,colbacklower=White,%
+ colback=#1!5!white,colframe=#1!75!black,colbacklower=white,%
attach boxed title to top right={yshift=-\tcboxedtitleheight},title=Code \LaTeX,%
boxed title style={%
colframe=#1!75!black,colback=#1!15!white,%
@@ -325,7 +325,7 @@
fonttitle=\color{#1!90!black}\itshape\ttfamily\footnotesize,%
listing options={%
style=tcblatex,basicstyle=\footnotesize\ttfamily,%
- keywordstyle=\bfseries\color{Blue},tabsize=2,%
+ keywordstyle=\bfseries\color{blue},tabsize=2,%
},%
#2
}
@@ -445,9 +445,9 @@
\end{tikzpicture}%
}
-\newcommand{\PLOSXGreen}{%
+\newcommand{\PLOSXgreen}{%
\begin{tikzpicture}[thick,anchor=base,baseline]
- \filldraw[ForestGreen] (0,0.25em) circle[radius=0.45em] ;
+ \filldraw[CouleurVertForet] (0,0.25em) circle[radius=0.45em] ;
\end{tikzpicture}%
}
@@ -463,7 +463,7 @@
\restoreKV[fakeTERMosx]
\setKV[fakeTERMosx]{#1}
\begin{tblr}{colsep=0pt,rowsep=0pt,width=\linewidth,colspec={lX[c]r}}
- \PLOSXRed~\PLOSXOrange~\PLOSXGreen & \vphantom{p}\useKV[fakeTERMosx]{Titre} & \PLOSXLG~\PLOSXLG~\PLOSXLG \\
+ \PLOSXRed~\PLOSXOrange~\PLOSXgreen & \vphantom{p}\useKV[fakeTERMosx]{Titre} & \PLOSXLG~\PLOSXLG~\PLOSXLG \\
\end{tblr}
}
diff --git a/macros/latex/contrib/proflycee/tex/proflycee-tools-minted.tex b/macros/latex/contrib/proflycee/tex/proflycee-tools-minted.tex
index 9f8e2735b1..6b880f2d9f 100644
--- a/macros/latex/contrib/proflycee/tex/proflycee-tools-minted.tex
+++ b/macros/latex/contrib/proflycee/tex/proflycee-tools-minted.tex
@@ -30,23 +30,23 @@
\DeclareTCBListing{CodePythonMinted}{ s O{12cm} m }{% étoilée sans numéro, taille puis options...
\IfBooleanTF{#1}{pytmintedno}{pytminted},
enhanced,width=#2,#3,
- colframe=Green,colback=ForestGreen!5,%
+ colframe=green,colback=CouleurVertForet!5,%
boxrule=1.25pt,
sharp corners=downhill,arc=12pt,
before skip=0.5\baselineskip,after skip=0.5\baselineskip,%
left=0.6em,top=\baselineskip,bottom=2mm,right=5mm,%
attach boxed title to top right={yshift=-\tcboxedtitleheight},
boxed title style={
- size=small,colback=ForestGreen!25,boxrule=1.25pt,
- colframe=Green,boxsep=1.25pt,
+ size=small,colback=CouleurVertForet!25,boxrule=1.25pt,
+ colframe=green,boxsep=1.25pt,
sharp corners=downhill,
arc=12pt,
top=2pt,bottom=1pt,left=6pt,right=6pt
},
- fonttitle=\color{ForestGreen}\itshape\ttfamily\footnotesize,
+ fonttitle=\color{CouleurVertForet}\itshape\ttfamily\footnotesize,
title={\scriptsize\faPython}\:Code Python\vphantom{y},
watermark text={\faPython},watermark opacity=0.175,watermark zoom=0.50,
- before upper=\renewcommand{\theFancyVerbLine}{\scriptsize\ttfamily\color{DarkGray}\arabic{FancyVerbLine}}
+ before upper=\renewcommand{\theFancyVerbLine}{\scriptsize\ttfamily\color{darkgray}\arabic{FancyVerbLine}}
}
%v2
@@ -72,7 +72,7 @@
\DeclareTCBListing{CodePythonMintedAlt}{ s O{12cm} m }{% étoilée sans numéro, taille puis options...
\IfBooleanTF{#1}{pytmintedaltno}{pytmintedalt},
width=#2,#3,
- enhanced,boxrule=0.75pt,colframe=DarkGray!50!Black,%
+ enhanced,boxrule=0.75pt,colframe=darkgray!50!black,%
sharp corners,top=0mm,bottom=0mm,left=0.2em,right=5mm,%
before skip=0.5\baselineskip,after skip=0.5\baselineskip,%
colback=white,
@@ -80,8 +80,8 @@
watermark text={\faPython},watermark opacity=0.25,watermark zoom=0.50,%
title={{\scriptsize\faCode} Code Python},
lefttitle=0.4em,
- fonttitle=\bfseries\footnotesize\sffamily,colbacktitle=DarkGray!50!Black,%
- before upper=\renewcommand{\theFancyVerbLine}{\scriptsize\ttfamily\color{DarkGray}\arabic{FancyVerbLine}}
+ fonttitle=\bfseries\footnotesize\sffamily,colbacktitle=darkgray!50!black,%
+ before upper=\renewcommand{\theFancyVerbLine}{\scriptsize\ttfamily\color{darkgray}\arabic{FancyVerbLine}}
}
\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/proflycee/tex/proflycee-tools-piton.tex b/macros/latex/contrib/proflycee/tex/proflycee-tools-piton.tex
index 89f363b943..0f068ad97b 100644
--- a/macros/latex/contrib/proflycee/tex/proflycee-tools-piton.tex
+++ b/macros/latex/contrib/proflycee/tex/proflycee-tools-piton.tex
@@ -51,20 +51,20 @@
top=\baselineskip,bottom=0mm,left=0.6em,right=5mm,%
attach boxed title to top right={yshift=-\tcboxedtitleheight},
boxed title style={
- size=small,colback=ForestGreen!25,boxrule=1.25pt,
- colframe=Green,boxsep=1.25pt,
+ size=small,colback=CouleurVertForet!25,boxrule=1.25pt,
+ colframe=green,boxsep=1.25pt,
sharp corners=downhill,
arc=12pt,
top=2pt,bottom=1pt,left=6pt,right=6pt
},
- fonttitle=\color{ForestGreen}\itshape\ttfamily\footnotesize,
+ fonttitle=\color{CouleurVertForet}\itshape\ttfamily\footnotesize,
title={{\scriptsize\faPython}\:Code Python}
}
}
%==Style Classique
\tcbset{thonnystyle/.style={%
- enhanced,boxrule=0.75pt,colframe=DarkGray!50!Black,%
+ enhanced,boxrule=0.75pt,colframe=darkgray!50!black,%
sharp corners,top=0mm,bottom=0mm,left=0.4em,right=5mm,%
before skip=\CODPITespV,after skip=\CODPITespV,%
colback=white
@@ -103,7 +103,7 @@
{%
\tcbset{cadre/.style={}}
\tcbset{titre/.style={}}
- \tcbset{stylebase/.style={stylepiton,colframe=Green,colback=ForestGreen!5,width=\CODPITlargeur,fontupper=\CODPITfonte,fontlower=\CODPITfonte,\CODPITalign,leftupper=0.75em}}
+ \tcbset{stylebase/.style={stylepiton,colframe=green,colback=CouleurVertForet!5,width=\CODPITlargeur,fontupper=\CODPITfonte,fontlower=\CODPITfonte,\CODPITalign,leftupper=0.75em}}
\ifboolKV[envpiton]{Filigrane}%si filigrane
{\tcbset{filigrane/.style={watermark text={\faPython},watermark opacity=0.175,watermark zoom=0.50}}}%
{\tcbset{filigrane/.style={}}}%
@@ -112,9 +112,9 @@
\IfEq{\CODPITstyle}{Classique}%style Classique
{%
\ifboolKV[envpiton]{Lignes}%si lignes=true
- {\tcbset{stylebase/.style={thonnystylelineos,leftupper=0.75em,width=\CODPITlargeur,colframe=DarkGray!50!Black,fontupper=\CODPITfonte,fontlower=\CODPITfonte,\CODPITalign}}}%
- {\tcbset{stylebase/.style={thonnystyle,leftupper=0.4em,width=\CODPITlargeur,colframe=DarkGray!50!Black,fontupper=\CODPITfonte,fontlower=\CODPITfonte,\CODPITalign}}}%
- %\tcbset{width=\CODPITlargeur,colframe=DarkGray!50!Black,fontupper=\CODPITfonte,fontlower=\CODPITfonte,\CODPITalign}
+ {\tcbset{stylebase/.style={thonnystylelineos,leftupper=0.75em,width=\CODPITlargeur,colframe=darkgray!50!black,fontupper=\CODPITfonte,fontlower=\CODPITfonte,\CODPITalign}}}%
+ {\tcbset{stylebase/.style={thonnystyle,leftupper=0.4em,width=\CODPITlargeur,colframe=darkgray!50!black,fontupper=\CODPITfonte,fontlower=\CODPITfonte,\CODPITalign}}}%
+ %\tcbset{width=\CODPITlargeur,colframe=darkgray!50!black,fontupper=\CODPITfonte,fontlower=\CODPITfonte,\CODPITalign}
\ifboolKV[envpiton]{Filigrane}%si filigrane
{\tcbset{filigrane/.style={watermark text={\faPython},watermark opacity=0.25,watermark zoom=0.50}}}%
{\tcbset{filigrane/.style={}}}%
@@ -123,7 +123,7 @@
\ifboolKV[envpiton]{Cadre}
{\tcbset{cadre/.style={}}}%
{\tcbset{cadre/.style={boxrule=0pt,frame hidden}}}%
- \tcbset{titre/.style={lefttitle=0.4em,title={\CODPITtitre},fonttitle=\bfseries\footnotesize\sffamily,colbacktitle=DarkGray!50!Black}}
+ \tcbset{titre/.style={lefttitle=0.4em,title={\CODPITtitre},fonttitle=\bfseries\footnotesize\sffamily,colbacktitle=darkgray!50!black}}
}%
{%
\tcbset{titre/.style={notitle}}
@@ -144,7 +144,7 @@
%======CONSOLE PYLUATEX (package à charger manuellement !!)
\tcbset{consolepylua/.style={%base de la boîte
- enhanced,colback=white,colframe=ForestGreen,sharp corners,boxrule=1pt,%
+ enhanced,colback=white,colframe=CouleurVertForet,sharp corners,boxrule=1pt,%
top=1.5mm,bottom=1.5mm,left=2mm,right=2mm,fontupper=\footnotesize,%
before skip=0.5\baselineskip,after skip=0.5\baselineskip,%
}
@@ -153,8 +153,8 @@
\tcbset{consolepyluatexlogo/.style={%avec logo python
consolepylua,%
overlay={%
- \draw ([yshift=0.5pt]frame.south) node[ForestGreen!50!black,fill=white,font=\scriptsize\ttfamily] {\scalebox{0.8}[0.8]{\faPython} Fin de la Console Python \scalebox{0.8}[0.8]{\faPython}} ;
- \draw ([yshift=-0.5pt]frame.north) node[ForestGreen!50!black,fill=white,font=\scriptsize\ttfamily] {\scalebox{0.8}[0.8]{\faPython} Début de la Console Python \scalebox{0.8}[0.8]{\faPython}} ;
+ \draw ([yshift=0.5pt]frame.south) node[CouleurVertForet!50!black,fill=white,font=\scriptsize\ttfamily] {\scalebox{0.8}[0.8]{\faPython} Fin de la Console Python \scalebox{0.8}[0.8]{\faPython}} ;
+ \draw ([yshift=-0.5pt]frame.north) node[CouleurVertForet!50!black,fill=white,font=\scriptsize\ttfamily] {\scalebox{0.8}[0.8]{\faPython} Début de la Console Python \scalebox{0.8}[0.8]{\faPython}} ;
}
}
}
@@ -162,8 +162,8 @@
\tcbset{consolepyluatex/.style={%sans logo python
consolepylua,%
overlay={%
- \draw ([yshift=0.5pt]frame.south) node[ForestGreen!50!black,fill=white,font=\scriptsize\ttfamily] {Fin de la Console Python} ;
- \draw ([yshift=-0.5pt]frame.north) node[ForestGreen!50!black,fill=white,font=\scriptsize\ttfamily] {Début de la Console Python} ;
+ \draw ([yshift=0.5pt]frame.south) node[CouleurVertForet!50!black,fill=white,font=\scriptsize\ttfamily] {Fin de la Console Python} ;
+ \draw ([yshift=-0.5pt]frame.north) node[CouleurVertForet!50!black,fill=white,font=\scriptsize\ttfamily] {Début de la Console Python} ;
}
}
}
diff --git a/macros/latex/contrib/proflycee/tex/proflycee-tools-probas.tex b/macros/latex/contrib/proflycee/tex/proflycee-tools-probas.tex
index b66996a7a6..37cd0a4793 100644
--- a/macros/latex/contrib/proflycee/tex/proflycee-tools-probas.tex
+++ b/macros/latex/contrib/proflycee/tex/proflycee-tools-probas.tex
@@ -649,7 +649,7 @@
}
\setKVdefault[GRPHPROBCONTINUES]{%
- CouleurAire=LightGray,%
+ CouleurAire=lightgray,%
CouleurCourbe=red,%
Largeur=2,%
Hauteur=1,%
@@ -673,7 +673,7 @@
{\draw (0,-0.0375) node[font=\tiny,scale={2*\UNITEX}] {#3} ;}
{}
\ifboolKV[GRPHPROBCONTINUES]{AfficheCadre}%
- {\draw[Gray] (-4,-0.075) rectangle (4,0.425) ;}
+ {\draw[gray] (-4,-0.075) rectangle (4,0.425) ;}
{}
\clip (-4,-0.075) rectangle (4,0.425) ;
\draw[black,semithick,fill=\GRPHPROBcoulsurf] ({\BorneInf},0) -- plot [domain={\BorneInf}:{\BorneSup},samples=100] (\x,{\densnorm{\x}}) -- ({\BorneSup},0) -- cycle;
@@ -697,7 +697,7 @@
%tikzpicture
\begin{tikzpicture}[x=\UNITEX cm,y=\UNITEY cm,#2]
\ifboolKV[GRPHPROBCONTINUES]{AfficheCadre}%
- {\draw[Gray] (-0.2,-0.15) rectangle (3.8,0.85) ;}
+ {\draw[gray] (-0.2,-0.15) rectangle (3.8,0.85) ;}
{}
\clip (-0.2,-0.15) rectangle (3.8,0.85) ;
\draw[black,semithick,fill=\GRPHPROBcoulsurf] ({\BorneInf},0) -- plot [domain={\BorneInf}:{\BorneSup},samples=100] (\x,{0.7*\densexpo{\x}}) -- ({\BorneSup},0) -- cycle;
diff --git a/macros/latex/contrib/proflycee/tex/proflycee-tools-pythontex.tex b/macros/latex/contrib/proflycee/tex/proflycee-tools-pythontex.tex
index e58bdf2901..a326be2af7 100644
--- a/macros/latex/contrib/proflycee/tex/proflycee-tools-pythontex.tex
+++ b/macros/latex/contrib/proflycee/tex/proflycee-tools-pythontex.tex
@@ -37,9 +37,9 @@
\begin{minipage}{\CSPYlargeur}
\ifboolKV[envpythonconsole]{Label}%si label
{\begin{pyconsole}[][%
- framesep=3mm,frame=single,fontsize=\CSPYfonte,framerule=1pt,rulecolor=\color{ForestGreen},label={[\scriptsize Début de la console python]\scriptsize Fin de la console python},baselinestretch=\CSPYstretch]}%
+ framesep=3mm,frame=single,fontsize=\CSPYfonte,framerule=1pt,rulecolor=\color{CouleurVertForet},label={[\scriptsize Début de la console python]\scriptsize Fin de la console python},baselinestretch=\CSPYstretch]}%
{\begin{pyconsole}[][%
- framesep=3mm,frame=single,fontsize=\CSPYfonte,framerule=1pt,rulecolor=\color{ForestGreen},baselinestretch=\CSPYstretch]}
+ framesep=3mm,frame=single,fontsize=\CSPYfonte,framerule=1pt,rulecolor=\color{CouleurVertForet},baselinestretch=\CSPYstretch]}
}%
{%
\end{pyconsole}
@@ -74,16 +74,16 @@
top=\baselineskip,bottom=1mm,right=5mm,left=0.6em,
attach boxed title to top right={yshift=-\tcboxedtitleheight},
boxed title style={
- size=small,colback=ForestGreen!25,boxrule=1.25pt,
- colframe=Green,boxsep=1.25pt,
+ size=small,colback=CouleurVertForet!25,boxrule=1.25pt,
+ colframe=green,boxsep=1.25pt,
sharp corners=downhill,
arc=12pt,
top=2pt,bottom=1pt,left=6pt,right=6pt
},
- fonttitle=\color{ForestGreen}\itshape\ttfamily\footnotesize,
+ fonttitle=\color{CouleurVertForet}\itshape\ttfamily\footnotesize,
title={\scriptsize\faPython}\:Code Python\vphantom{p},
watermark text={\faPython},watermark opacity=0.175,watermark zoom=0.50,
- colframe=Green,colback=ForestGreen!5,%
+ colframe=green,colback=CouleurVertForet!5,%
before upper=\renewcommand\theFancyVerbLine{\scriptsize\ttfamily\color{darkgray}\arabic{FancyVerbLine}}
}
}
@@ -129,7 +129,7 @@
%v2
\tcbset{stylepythontexalt/.style={%
- enhanced,boxrule=0.75pt,colframe=DarkGray!50!Black,%
+ enhanced,boxrule=0.75pt,colframe=darkgray!50!black,%
sharp corners,top=0mm,bottom=0mm,left=0.2em,right=5mm,%
before skip=0.5\baselineskip,after skip=0.5\baselineskip,%
colback=white,
@@ -137,7 +137,7 @@
title={{\scriptsize\faCode} Code Python},
lefttitle=0.4em,
watermark text={\faPython},watermark opacity=0.25,watermark zoom=0.50,
- fonttitle=\bfseries\footnotesize\sffamily,colbacktitle=DarkGray!50!Black,
+ fonttitle=\bfseries\footnotesize\sffamily,colbacktitle=darkgray!50!black,
before upper=\renewcommand\theFancyVerbLine{\scriptsize\ttfamily\color{darkgray}\arabic{FancyVerbLine}}
}
}
diff --git a/macros/latex/contrib/proflycee/tex/proflycee-tools-recreat.tex b/macros/latex/contrib/proflycee/tex/proflycee-tools-recreat.tex
index c44d144633..a90d17e0dc 100644
--- a/macros/latex/contrib/proflycee/tex/proflycee-tools-recreat.tex
+++ b/macros/latex/contrib/proflycee/tex/proflycee-tools-recreat.tex
@@ -105,7 +105,7 @@
{}
%LE BLOC "TITRE"
\ifboolKV[paramfenxcas]{Titre}%si titre=true
- {\draw[\CFcouleur,fill=lightgray!25,rounded corners] ($(A01) + (0,2pt)$) rectangle ++ ($({\CFlarg},2em)$) node[ForestGreen!50!\CFcouleur,midway,font=\CFtailletitre\ttfamily\bfseries] {\CFlabeltitre};}
+ {\draw[\CFcouleur,fill=lightgray!25,rounded corners] ($(A01) + (0,2pt)$) rectangle ++ ($({\CFlarg},2em)$) node[CouleurVertForet!50!\CFcouleur,midway,font=\CFtailletitre\ttfamily\bfseries] {\CFlabeltitre};}
{}
}
@@ -138,7 +138,7 @@
Epaisseurg=1.5pt,%
Epaisseur=0.5pt,%
Unite=1cm,%
- CouleurCase=LightBlue!50,%
+ CouleurCase=cyan!25,%
CouleurTexte=blue,%
NbCol=9,%
NbSubCol=3,%
diff --git a/macros/luatex/generic/evangelion-jfm/Eva-JFM_doc-sc.pdf b/macros/luatex/generic/evangelion-jfm/Eva-JFM_doc-sc.pdf
index 36b355f26f..d67ad71d65 100644
--- a/macros/luatex/generic/evangelion-jfm/Eva-JFM_doc-sc.pdf
+++ b/macros/luatex/generic/evangelion-jfm/Eva-JFM_doc-sc.pdf
Binary files differ
diff --git a/macros/luatex/generic/evangelion-jfm/Evangelion-JFM.dtx b/macros/luatex/generic/evangelion-jfm/Evangelion-JFM.dtx
index 6a67de23a0..cb47b2a246 100644
--- a/macros/luatex/generic/evangelion-jfm/Evangelion-JFM.dtx
+++ b/macros/luatex/generic/evangelion-jfm/Evangelion-JFM.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% Copyright © 2023, RadioNoiseE (Jing Huang)
% Evangelion Japanese Font Metric for LuaTeX
-% Current Version: 1.0.3 (c)
+% Current Version: 1.0.5 (b)
% Dev URL: https://github.com/RadioNoiseE/Evangelion-JFM
% \fi
%<*batchfile>
@@ -39,7 +39,7 @@
%<en>\usepackage[margin=1.2in]{geometry}
\usepackage{graphicx}
%<sc>\usepackage[match]{luatexja-fontspec}
-%<ja>\usepackage[hiragino-pron, match,deluxe]{luatexja-preset}
+%<ja>\usepackage[hiragino-pron, match, deluxe]{luatexja-preset}
%<en>\usepackage{fontspec, luatexja}
%<*en>
\newfontfeature{microtype}{protrusion=default;expansion=default}
@@ -97,10 +97,10 @@
\maketitle
\begin{abstract}
-%<sc> 本文档将介ç»å为Evangelion Japanese Font Metric(下简称为``\textsf{Eva-JFM}'')的JFM文件。其适用于简体中文(以下简称为「简中ã€ï¼‰ã€ç¹ä½“中文(以下简称为「ç¹ä¸­ã€ï¼‰åŠæ—¥æ–‡å­—体的横直排。旨在æ供一个充分利用\LuaTeX-jaçš„\texttt{priority}特性,基于标准\cite{jlreq}çš„åŒæ—¶ï¼Œæ”¯æŒä¸€äº›ç½•ç”¨ç‰¹æ€§çš„JFM文件。文档暂使用中文åŠè¥¿æ–‡æ’°å†™ã€‚
+%<sc> 本文档将介ç»å为Evangelion Japanese Font Metric(下简称为``\textsf{Eva-JFM}'')的JFM文件。其适用于简体中文(以下简称为「简中ã€ï¼‰ã€ç¹ä½“中文(以下简称为「ç¹ä¸­ã€ï¼‰åŠæ—¥æ–‡å­—体的横直排。旨在æ供一个充分利用\LuaTeX-jaçš„\texttt{priority}特性,基于标准\cite{jlreq}çš„åŒæ—¶ï¼Œæ”¯æŒä¸€äº›ç½•ç”¨ç‰¹æ€§çš„JFM文件。文档使用中文ã€æ—¥æ–‡åŠè¥¿æ–‡æ’°å†™ã€‚
%<ja> 本ドキュメントã¯ã€é«˜å“質ãªä¸­å›½èªžãŠã‚ˆã³æ—¥æœ¬èªžã®ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã‚’組版ã™ã‚‹ãŸã‚ã®æ—¥æœ¬èªžãƒ•ã‚©ãƒ³ãƒˆãƒ¡ãƒˆãƒªãƒƒã‚¯ã€ŒEvangelion Japanese Font Metric(以下「\textsf{Eva-JFM}ã€ã¨ã™ã‚‹ï¼‰ã€ã‚’紹介ã™ã‚‹ã‚‚ã®ã§ã™ã€‚ã“ã®ãƒ¡ãƒˆãƒªãƒƒã‚¯ã¯ã€ç¸¦æ›¸ãã¨æ¨ªæ›¸ãã®ä¸¡æ–¹ã®ãƒ†ã‚­ã‚¹ãƒˆã«å¯¾ã—ã¦ã€å¾“æ¥ã®ä¸­å›½èªžã€ç°¡ä½“字中国語ã€ãŠã‚ˆã³æ—¥æœ¬èªžã®ãƒ•ã‚©ãƒ³ãƒˆã¨ã¨ã‚‚ã«ä½¿ç”¨ã§ãã¾ã™ã€‚ã“ã‚Œã¯ã€\LuaTeX-ja ã§æä¾›ã•ã‚Œã‚‹å„ªå…ˆæ©Ÿèƒ½ã‚’最大é™ã«æ´»ç”¨ã™ã‚‹ãƒ•ã‚©ãƒ³ãƒˆãƒ¡ãƒˆãƒªãƒƒã‚¯ã‚’æä¾›ã—ã€æ¨™æº–\cite{jlreq}ã«åŸºã¥ãã€ä¸€éƒ¨ã®é«˜åº¦ãªï¼ˆã™ãªã‚ã¡ã€ã‚ã£ãŸã«ä½¿ç”¨ã•ã‚Œãªã„)機能をサãƒãƒ¼ãƒˆã™ã‚‹ã“ã¨ã‚’目的ã¨ã—ã¦ã„ã¾ã™ã€‚\段
%<ja> 本ドキュメントã¯ã€å®Œå…¨ãªã‚‚ã®ã§ã¯ã‚ã‚Šã¾ã›ã‚“。文法的ãªï¼ˆãŠã‚ˆã³æ–‡è„ˆçš„ãªï¼‰ã‚¨ãƒ©ãƒ¼ãŒå¤šæ•°å«ã¾ã‚Œã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚
-%<en> This documentation is going to introduce Evangelion Japanese Font Metric (hereinafter referred to as ``\textsf{Eva-JFM}''), a Japanese Font Metric for typesetting high quality Chinese and Japanese documents. It can be used with Traditional Chinese, Simplified Chinese and Japanese fonts for both vertically and horizontally typesetted texts. It aims to provide a font metric which makes full use of the \texttt{priority} feature (provided by \textsf{\LuaTeX-ja}), bases on the standard~\cite{jlreq}, and supports some advanced (a.k.a., rarely-used) features. The documentation is now written in both Chinese and English.\par
+%<en> This documentation is going to introduce Evangelion Japanese Font Metric (hereinafter referred to as ``\textsf{Eva-JFM}''), a Japanese Font Metric for typesetting high quality Chinese and Japanese documents. It can be used with Traditional Chinese, Simplified Chinese and Japanese fonts for both vertically and horizontally typesetted texts. It aims to provide a font metric which makes full use of the \texttt{priority} feature (provided by \textsf{\LuaTeX-ja}), bases on the standard~\cite{jlreq}, and supports some advanced (a.k.a., rarely-used) features. The documentation is now written in Chinese, Japanese and English.\par
%<en> This documentation is far from complete. It may have many grammatical (and contextual) errors.
\end{abstract}
diff --git a/macros/luatex/generic/evangelion-jfm/README.md b/macros/luatex/generic/evangelion-jfm/README.md
index 4141648b7b..87abb3e19f 100644
--- a/macros/luatex/generic/evangelion-jfm/README.md
+++ b/macros/luatex/generic/evangelion-jfm/README.md
@@ -42,12 +42,22 @@ This package is also available on [CTAN](https://www.ctan.org/pkg/evangelion-jfm
- 原始 調整ãªã— Plain
+- 原始比例宽度 プロãƒãƒ¼ã‚·ãƒ§ãƒŠãƒ«ï¼ˆèª¿æ•´ãªã—) Proportional (with no aki adjust for punct)
+
+- 比例宽度 プロãƒãƒ¼ã‚·ãƒ§ãƒŠãƒ« Proportional
+
## 状æ€ãƒ»ç¾åœ¨ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ»Current Version
-`Ver 1.0.4 (e)`
+`Ver 1.0.5 (b)`
## 历å²ãƒ»å¤‰æ›´ãƒ­ã‚°ãƒ»Changelog
+- 2023.8.25 Ver 1.0.5 (b): add feature `prop` and `propw` for japanese typesetting.
+
+- 2023.8.23 Ver 1.0.5 (a): add character `U+2E3A` and `U+2E3B` to be compatible with Source Han Fonts' ligatures.
+
+- 2023.8.3 Ver 1.0.4 (f): ''optimized'' the behaviour of TC punct at line end.
+
- 2023.5.19 Ver 1.0.4 (e): update japanese documentation and README.
- 2023.5.17 Ver 1.0.4 (c): sync the documentation (en&sc) for the new feature.
diff --git a/macros/luatex/generic/evangelion-jfm/jfm-eva.lua b/macros/luatex/generic/evangelion-jfm/jfm-eva.lua
index 632b4a85d7..502295772b 100644
--- a/macros/luatex/generic/evangelion-jfm/jfm-eva.lua
+++ b/macros/luatex/generic/evangelion-jfm/jfm-eva.lua
@@ -1,11 +1,11 @@
---- Evangelion Japanese Font Metric for LuaTeX
----- Current Version: 1.0.4 (e)
+---- Current Version: 1.0.5 (b)
---- Dev URL: https://github.com/RadioNoiseE/Evangelion-JFM
---- Copyright 2023, RadioNoiseE ©
-- åˆå§‹åŒ–
-local lang_jp, lang_tc, lang_sc, dir_vt, font_extd, punc_lg, punc_hg, std_nil, al_hw, al_fw, as_nil
+local lang_jp, lang_tc, lang_sc, dir_vt, font_extd, punc_lg, punc_hg, std_nil, al_hw, al_fw, as_nil, fw_prop, fw_xprop
if luatexja.jfont.jfm_feature then
lang_jp = luatexja.jfont.jfm_feature.jp
@@ -19,6 +19,8 @@ if luatexja.jfont.jfm_feature then
al_hw = luatexja.jfont.jfm_feature.hwid
al_fw = luatexja.jfont.jfm_feature.fwid
as_nil = luatexja.jfont.jfm_feature.plain
+ fw_prop = luatexja.jfont.jfm_feature.prop
+ fw_xprop = luatexja.jfont.jfm_feature.propw
end
-- é è™•ç†åŠå®¹éŒ¯
@@ -35,11 +37,19 @@ if punc_lg == true and dir_vt == false then
end
if al_hw == true and al_fw == true then
- tex.error('JFM feature "hwid" cannot be used with "fwid".')
+ tex.error('JFM feature "hwid" cannot be used with "fwid".\n' ..
+ 'For now I\'ll ignore both.')
luatexja.jfont.jfm_feature["hwid"] = nil
luatexja.jfont.jfm_feature["fwid"] = nil
end
+if fw_prop == true and fw_xprop == true then
+ tex.error('JFM feature "prop" cannot be used with "propw".\n' ..
+ 'For now I\'ll ignore both.')
+ luatexja.jfont.jfm_feature["prop"] = nil
+ luatexja.jfont.jfm_feature["propw"] = nil
+end
+
if not ((lang_jp and not (lang_tc or lang_sc)) or
(lang_tc and not (lang_jp or lang_sc)) or
(lang_sc and not (lang_jp or lang_tc))) then
@@ -47,7 +57,7 @@ if not ((lang_jp and not (lang_tc or lang_sc)) or
'"jp", "trad" or "smpl"\n' ..
'is required.\n' ..
'For now I\'ll use "lang_jp" for japanese by default.')
- luatexja.jfont.jfm_feature["hwid"] = nil
+ luatexja.jfont.jfm_feature["jp"] = "eva_langfeat_defl"
end
-- 壓縮比例設定
@@ -64,11 +74,21 @@ local function logic_anif(f1, f2, r1, r2)
return rta
end
+local function logic_orif(f1, f2, r1, r2)
+ local rto = (f1 or f2) and r1 or r2
+ return rto
+end
+
local function logic_if(f1, r1, r2)
local rti = f1 and r1 or r2
return rti
end
+local function context_width(regv)
+ local rtw = (fw_prop or fw_xprop) and 'prop' or (regv)
+ return rtw
+end
+
local function context_height()
local rth = dir_vt and (font_extd and extd_ratio/2 or 0.5) or 0.88
return rth
@@ -89,7 +109,7 @@ local eva = {
xkanjiskip = {0.25, 0.125, 0.125},
[0] = { -- 缺çœé¡ž
- width = 1,
+ width = context_width(1),
height = context_height(),
depth = context_depth(),
italic = 0,
@@ -108,7 +128,7 @@ local eva = {
[1] = { -- 読点類
chars = logic_anif(dir_vt, punc_lg, {}, {'ã€', ','}),
- width = 0.5,
+ width = context_width(0.5),
height = context_height(),
depth = context_depth(),
italic = 0,
@@ -127,7 +147,7 @@ local eva = {
[8] = logic_if(lang_tc, {0.25, 0, 0.125}, {}),
[9] = logic_if(lang_tc, {0.5, 0, 0.25, priority = {0, -1}}, {0.75, 0, 0.25, ratio = 1/3, priority = {0, -1}})
},
- end_adjust = logic_if(lang_tc, {0.25, 0}, logic_if(punc_hg, {-0.5, 0.5, 0}, {0, 0}))
+ end_adjust = logic_if(lang_tc, {0.25, 0, 0.25}, logic_if(punc_hg, {-0.5, 0.5, 0}, {0, 0}))
},
[101] = { -- 読点類(行間a)
@@ -160,7 +180,7 @@ local eva = {
[2] = { -- å¥é»žé¡ž
chars = logic_anif(dir_vt, punc_lg, {}, {'.', '。'}),
- width = 0.5,
+ width = context_width(0.5),
height = context_height(),
depth = context_depth(),
italic = 0,
@@ -179,7 +199,7 @@ local eva = {
[8] = logic_if(lang_tc, {0.25, 0, 0.125, ratio = 0}, {}),
[9] = logic_if(lang_tc, {0.5, 0, 0.25, priority = {0, -1}}, {0.75, 0, 0.25, ratio = 1/3, priority = {0, -1}})
},
- end_adjust = logic_if(lang_tc, {0.25, 0}, logic_if(punc_hg, {-0.5, 0.5, 0}, {0, 0}))
+ end_adjust = logic_if(lang_tc, {0.25, 0, 0.25}, logic_if(punc_hg, {-0.5, 0.5, 0}, {0, 0}))
},
[201] = { -- å¥é»žé¡žï¼ˆè¡Œé–“a)
@@ -212,7 +232,7 @@ local eva = {
[3] = { -- 兩點類
chars = logic_if(lang_jp, {}, (logic_anif(dir_vt, punc_lg, {}, {':', ';'}))),
- width = logic_if(dir_vt, 1, 0.5),
+ width = context_width(logic_if(dir_vt, 1, 0.5)),
height = context_height(),
depth = context_depth(),
italic = 0,
@@ -268,7 +288,7 @@ local eva = {
'ョ', 'ヮ', 'ヵ', 'ヶ', 'ヽ', 'ヾ', 'ㇰ', 'ㇱ', 'ㇲ', 'ㇳ', 'ㇴ',
'ㇵ', 'ㇶ', 'ㇷ', 'ㇸ', 'ㇹ', 'ㇺ', 'ㇻ', 'ㇼ', 'ㇽ', 'ㇾ', 'ㇿ'
},
- width = 1,
+ width = context_width(1),
height = context_height(),
depth = context_depth(),
italic = 0,
@@ -286,7 +306,7 @@ local eva = {
[5] = { -- ç–‘å•æ„Ÿå˜†é¡ž
chars = {'ï¼', '?', '‼︎', 'â‰ï¸Ž', 'âˆ', 'â‡'},
- width = logic_if(dir_vt, 1, logic_if(lang_sc, 0.5, 1)),
+ width = context_width(logic_if(dir_vt, 1, logic_if(lang_sc, 0.5, 1))),
height = context_height(),
depth = context_depth(),
italic = 0,
@@ -307,7 +327,7 @@ local eva = {
[6] = { -- 分離ç¦æ­¢é¡ž
chars = {'—', '―', '‥', '…', '⋯', '〳', '〴', '〵'},
- width = 1,
+ width = context_width(1),
height = context_height(),
depth = context_depth(),
italic = 0,
@@ -326,9 +346,45 @@ local eva = {
}
},
+ [601] = { -- 二連字
+ chars = {'⸺'},
+ width = context_width(2),
+ height = context_height(),
+ depth = context_depth(),
+ italic = 0,
+ left = 0,
+ down = 0,
+ align = 'middle',
+ glue = {
+ [1] = logic_if(lang_tc, {0.25, 0, 0,125, ratio = 1}, {}),
+ [2] = logic_if(lang_tc, {0.25, 0, 0.125, ratio = 1}, {}),
+ [3] = logic_if(dir_vt, {priority = {0, -1}}, logic_if(lang_tc, {0.25, 0, 0.125, ratio = 1, priority = {0, -1}}, {priority = {0, -1}})),
+ [7] = {0.5, 0, 0.25, ratio = 1, priority = {-1, -2}},
+ [9] = {0.25, 0, 0.125, ratio = 1, priority = {0, -1}}
+ }
+ },
+
+ [602] = { -- 三連字
+ chars = {'⸻'},
+ width = context_width(3),
+ height = context_height(),
+ depth = context_depth(),
+ italic = 0,
+ left = 0,
+ down = 0,
+ align = 'middle',
+ glue = {
+ [1] = logic_if(lang_tc, {0.25, 0, 0,125, ratio = 1}, {}),
+ [2] = logic_if(lang_tc, {0.25, 0, 0.125, ratio = 1}, {}),
+ [3] = logic_if(dir_vt, {priority = {0, -1}}, logic_if(lang_tc, {0.25, 0, 0.125, ratio = 1, priority = {0, -1}}, {priority = {0, -1}})),
+ [7] = {0.5, 0, 0.25, ratio = 1, priority = {-1, -2}},
+ [9] = {0.25, 0, 0.125, ratio = 1, priority = {0, -1}}
+ }
+ },
+
[7] = { -- 開括號類
chars = {'(', '〔', 'ï¼»', 'ï½›', '〈', '《', '「', '『', 'ã€', '⦅', '〘', '〖', 'ã€', '‘', '“'},
- width = 0.5,
+ width = context_width(0.5),
height = context_height(),
depth = context_depth(),
italic = 0,
@@ -346,7 +402,7 @@ local eva = {
[8] = { -- 閉括號類
chars = {')', '〕', 'ï¼½', 'ï½', '〉', '》', 'ã€', 'ã€', '】', 'ï½ ', '〙', '〗', '〟', '’', 'â€'},
- width = 0.5,
+ width = context_width(0.5),
height = context_height(),
depth = context_depth(),
italic = 0,
@@ -369,7 +425,7 @@ local eva = {
[9] = { -- 中點類
chars = logic_if(lang_jp, {'・', ':', ';'}, {'・', '·'}),
- width = 0.5,
+ width = context_width(0.5),
height = context_height(),
depth = context_depth(),
italic = 0,
@@ -388,7 +444,7 @@ local eva = {
[8] = {0.25, 0, 0.125, ratio = 0, priority = {0, -1}},
[9] = {0.5, 0, 0.25, priority = {0, -1}}
},
- end_adjust = {0.25, 0}
+ end_adjust = {0.25, 0, 0.25}
},
[10] = { -- 西文
@@ -409,7 +465,7 @@ local eva = {
[7] = {0, 0, 0}
}
}
-}
+}
if al_hw == true or al_fw == true then
eva[10].chars = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
@@ -428,10 +484,16 @@ if al_hw == true and al_fw == false then
eva[10].width = 0.5
end
-if al_fw == false and al_fw == true then
+if al_fw == false and al_hw == true then
eva[10].width = 1
end
+if fw_prop == true and fw_xprop == false then
+ for _, catnum in ipairs({0, 1, 101, 102, 2, 201, 202, 3, 301, 302, 4, 5, 6, 7, 8, 9, 10}) do
+ eva[catnum].glue = {}
+ end
+end
+
if sa_nil == true then
for _, catnum in ipairs({1, 101, 102, 2, 201, 202, 3, 301, 302, 4, 5, 6, 7, 8, 9, 10, 11}) do
eva[catnum] = nil
diff --git a/macros/luatex/generic/evangelion-jfm/makefile b/macros/luatex/generic/evangelion-jfm/makefile
new file mode 100644
index 0000000000..9107953de0
--- /dev/null
+++ b/macros/luatex/generic/evangelion-jfm/makefile
@@ -0,0 +1,15 @@
+doc-manu = Eva-JFM_doc-sc.tex Eva-JFM_doc-en.tex Eva-JFM_doc-jp.tex
+
+.PHONY : release
+release : Evangelion-JFM.dtx jfm-eva.lua
+ luatex Evangelion-JFM.dtx
+ lualatex Eva-JFM_doc-sc.tex
+ lualatex Eva-JFM_doc-sc.tex
+ latexmk -c Eva-JFM_doc-sc.tex
+ lualatex Eva-JFM_doc-jp.tex
+ lualatex Eva-JFM_doc-jp.tex
+ latexmk -c Eva-JFM_doc-jp.tex
+ lualatex Eva-JFM_doc-en.tex
+ lualatex Eva-JFM_doc-en.tex
+ latexmk -c Eva-JFM_doc-en.tex
+ rm $(doc-manu)
diff --git a/support/bib2gls/CHANGES b/support/bib2gls/CHANGES
index 8b9bef1a0f..14997dee5f 100644
--- a/support/bib2gls/CHANGES
+++ b/support/bib2gls/CHANGES
@@ -1,3 +1,18 @@
+v3.5 (2023-08-24)
+
+ * bib2gls
+
+ - new command line switches:
+
+ --default-encoding
+ --log-encoding
+ --debug-mode
+
+ - extra command supported by the interpreter (but not in the
+ document):
+
+ \bibglspaddigits
+
v3.4 (2023-06-29)
* bib2gls
diff --git a/support/bib2gls/bib2gls-begin.pdf b/support/bib2gls/bib2gls-begin.pdf
index c94eac1a77..6af4ccbb2e 100644
--- a/support/bib2gls/bib2gls-begin.pdf
+++ b/support/bib2gls/bib2gls-begin.pdf
Binary files differ
diff --git a/support/bib2gls/bib2gls-en.xml b/support/bib2gls/bib2gls-en.xml
index 232ecca226..7a9aea98ec 100644
--- a/support/bib2gls/bib2gls-en.xml
+++ b/support/bib2gls/bib2gls-en.xml
@@ -34,13 +34,16 @@ file is in or in a location that can be found by kpsewhich.</entry>
<entry key="syntax.version">{1}, {0} Display version and exit.</entry>
<entry key="syntax.help">{1}, {0} Display this help message and exit.</entry>
<entry key="syntax.debug">{0} [&lt;n&gt;] Debug mode.</entry>
+<entry key="syntax.debug-mode">{0} &lt;setting&gt; TeX Parser debug mode.</entry>
<entry key="syntax.verbose">{0} Verbose mode.</entry>
<entry key="syntax.silent">{1}, {2}, {0} Only display error messages.</entry>
<entry key="syntax.group">{1}, {0} Add ''group'' field to entries.</entry>
<entry key="syntax.locale">{1}, {0} &lt;lang&gt; Use language resource file for &lt;lang&gt; and identify this as the default document language.</entry>
<entry key="syntax.log">{1}, {0} &lt;file&gt; Set transcript file name.</entry>
<entry key="syntax.dir">{1}, {0} &lt;directory&gt; Files relative to &lt;directory&gt;.</entry>
-<entry key="syntax.tex.encoding">{0} &lt;name&gt; Set the character encoding for the output files.</entry>
+<entry key="syntax.tex.encoding">{0} &lt;name&gt; Set the character encoding for the glg and glstex output files and the aux and log input files.</entry>
+<entry key="syntax.log.encoding">{0} &lt;name&gt; Set the character encoding for the log input file.</entry>
+<entry key="syntax.default.encoding">{0} &lt;name&gt; Set the default character encoding for all input and output files.</entry>
<entry key="syntax.interpret">{0} Enable interpreter.</entry>
<entry key="syntax.break.space">{0} Interpret tilde character as normal space.</entry>
<entry key="syntax.obey.aux.catcode">{0} Obey known category code changing commands encountered in the aux file.</entry>
@@ -216,6 +219,7 @@ Defaulting to: {0}.
<entry key="message.tex.charset">TeX character encoding: {0}</entry>
<entry key="message.detected.charset">Detected encoding: {0}</entry>
<entry key="message.default.charset">Default encoding: {0}</entry>
+<entry key="message.assuming.charset">Assuming encoding: {0}</entry>
<entry key="message.null">not set</entry>
<entry key="message.detected.fontenc">Detected font encoding: {0}</entry>
<entry key="message.missing.id">id missing</entry>
@@ -295,8 +299,7 @@ Defaulting to: {0}.
<entry key="warning.unsupported.generic">Not supported: {0}</entry>
<!-- bib2gls warnings -->
-<entry key="warning.cant.parse.file">Can''t parse {0}
-{1}</entry>
+<entry key="warning.cant.parse.file">Can''t parse {0} ({1})</entry>
<entry key="warning.ignoring.unknown.entry.type">Ignoring unknown entry type: {0}</entry>
<entry key="warning.private.entry.type">Private entry type ''{0}'' found. Did you mean ''{1}''?</entry>
<entry key="warning.ignoring.unknown.encoding">Ignoring unknown encoding: {0}</entry>
@@ -399,6 +402,8 @@ Have you indexed your entries using commands like \gls?</entry>
<entry key="error.only.one.aux">Only one aux file permitted.</entry>
<entry key="error.no.aux">Aux file not supplied. {0}</entry>
<entry key="error.file.not.found">File not found: {0}</entry>
+<entry key="error.cant.parse.file.malformed.input">Can''t parse {0}: may not be {1} encoded.
+(Try a different encoding with {2} or {3}.)</entry>
<entry key="error.missing.src">File not found: {0}
(Did you forget to use the ''src'' key?)</entry>
<entry key="error.dir.not.found">Directory not found: {0}</entry>
@@ -586,6 +591,7 @@ converted to @dualabbreviationentry.)</entry>
<entry key="error.syntax.batch.missing_in">Input file required for batch mode</entry>
<entry key="error.syntax.batch.missing_out">Output directory required for batch mode</entry>
<entry key="error.syntax.batch.unknown_format">Unknown format ''{0}''</entry>
+<entry key="error.syntax.unknown_debug_mode">Unknown debug mode ''{0}''</entry>
<entry key="error.exists">{0} already exists</entry>
<entry key="error.file_exists.nooverwrite">Can''t write to ''{0}'': file already exists (use {1} to force overwrite)</entry>
<entry key="error.no_matcher">Can''t match group {0}: no match found</entry>
diff --git a/support/bib2gls/bib2gls.1 b/support/bib2gls/bib2gls.1
index c92252702f..fb8ea43d20 100644
--- a/support/bib2gls/bib2gls.1
+++ b/support/bib2gls/bib2gls.1
@@ -1,4 +1,5 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.43)
+.\" -*- mode: troff; coding: utf-8 -*-
+.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.43)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -15,29 +16,12 @@
.ft R
.fi
..
-.\" Set up some character translations and predefined strings. \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.\" \*(C` and \*(C' are quotes in nroff, nothing in troff, for use with C<>.
.ie n \{\
-. ds -- \(*W-
-. ds PI pi
-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
-. ds L" ""
-. ds R" ""
. ds C` ""
. ds C' ""
'br\}
.el\{\
-. ds -- \|\(em\|
-. ds PI \(*p
-. ds L" ``
-. ds R" ''
. ds C`
. ds C'
'br\}
@@ -68,80 +52,18 @@
. \}
.\}
.rr rF
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear. Run. Save yourself. No user-serviceable parts.
-. \" fudge factors for nroff and troff
-.if n \{\
-. ds #H 0
-. ds #V .8m
-. ds #F .3m
-. ds #[ \f1
-. ds #] \fP
-.\}
-.if t \{\
-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-. ds #V .6m
-. ds #F 0
-. ds #[ \&
-. ds #] \&
-.\}
-. \" simple accents for nroff and troff
-.if n \{\
-. ds ' \&
-. ds ` \&
-. ds ^ \&
-. ds , \&
-. ds ~ ~
-. ds /
-.\}
-.if t \{\
-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-. \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-. \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-. \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-. ds : e
-. ds 8 ss
-. ds o a
-. ds d- d\h'-1'\(ga
-. ds D- D\h'-1'\(hy
-. ds th \o'bp'
-. ds Th \o'LP'
-. ds ae ae
-. ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
.IX Title "BIB2GLS 1"
-.TH BIB2GLS 1 "2022-12-05" "perl v5.36.0" "bib2gls"
+.TH BIB2GLS 1 2023-08-24 "perl v5.36.1" bib2gls
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
.nh
-.SH "SYNOPSIS"
+.SH SYNOPSIS
.IX Header "SYNOPSIS"
\&\fBbib2gls\fR [\fIoption\fR]+ \fIauxfile\fR
-.SH "DESCRIPTION"
+.SH DESCRIPTION
.IX Header "DESCRIPTION"
\&\fBbib2gls\fR is designed to work with the \fBglossaries-extra\fR LaTeX
package. (The \fBrecord\fR package option is required.) The application
@@ -155,148 +77,114 @@ The \fIauxfile\fR (and corresponding .log file) should either be in the
current directory or in the directory specified by \fB\-\-dir\fR. Bib files can
either be relative to the directory the \fIauxfile\fR is in
or in a location that can be found by kpsewhich.
-.SH "OPTIONS"
+.SH OPTIONS
.IX Header "OPTIONS"
-.IP "\fB\-\-help\fR or \fB\-h\fR" 4
-.IX Item "--help or -h"
-Display help message and exit.
-.IP "\fB\-\-version\fR or \fB\-v\fR" 4
-.IX Item "--version or -v"
-Display version information and exit.
-.IP "\fB\-\-debug\fR [\fIlevel\fR]" 4
-.IX Item "--debug [level]"
-Switch on the debug mode (optionally at the given \fIlevel\fR, which
-should be a non-negative integer). If \fIlevel\fR is \fB0\fR then the
-debug mode is switched off.
-.IP "\fB\-\-no\-debug\fR (or \fB\-\-nodebug\fR)" 4
-.IX Item "--no-debug (or --nodebug)"
-Switch off debug mode. (Equivalent to \fB\-\-debug\fR \fB0\fR)
-.IP "\fB\-\-verbose\fR" 4
-.IX Item "--verbose"
-Switch on verbose mode.
-.IP "\fB\-\-no\-verbose\fR (or \fB\-\-noverbose\fR)" 4
-.IX Item "--no-verbose (or --noverbose)"
-Switch off verbose mode. (Some messages will still be written to
-\&\s-1STDOUT.\s0)
-.IP "\fB\-\-silent\fR" 4
-.IX Item "--silent"
-Only display error messages. All other messages are just written to
-the transcript file.
-.IP "\fB\-\-locale\fR \fIlang\fR (or \fB\-l\fR \fIlang\fR)" 4
-.IX Item "--locale lang (or -l lang)"
-Use language resource file for \fIlang\fR (which should be an \s-1IETF\s0
-locale tag).
-.IP "\fB\-\-log\-file\fR \fIfile\fR (or \fB\-t\fR <file>)" 4
-.IX Item "--log-file file (or -t <file>)"
-Set the transcript file.
-.IP "\fB\-\-dir\fR \fIdirectory\fR (or \fB\-d\fR <directory>)" 4
-.IX Item "--dir directory (or -d <directory>)"
-Files are relative to \fIdirectory\fR. (This doesn't change the current
-working directory.)
-.IP "\fB\-\-tex\-encoding\fR \fIname\fR" 4
-.IX Item "--tex-encoding name"
-Set the character encoding for the output files. This overrides the
-setting given in \fIauxfile\fR.
-.IP "\fB\-\-interpret\fR" 4
-.IX Item "--interpret"
-Use the TeX parser library to interpret known (La)TeX commands
-(default).
-.IP "\fB\-\-no\-interpret\fR" 4
-.IX Item "--no-interpret"
-Don't try interpreting (La)TeX commands.
-.IP "\fB\-\-break\-space\fR" 4
+.IP \fB\-\-break\-space\fR 4
.IX Item "--break-space"
Interpret \f(CW\*(C`~\*(C'\fR (tilde) character and \f(CW\*(C`\enobreakspace\*(C'\fR as a normal space.
-.IP "\fB\-\-no\-break\-space\fR" 4
-.IX Item "--no-break-space"
-Interpret \f(CW\*(C`~\*(C'\fR (tilde) and \f(CW\*(C`\enobreakspace\*(C'\fR as a non-breaking space (default).
-.IP "\fB\-\-obey\-aux\-catcode\fR" 4
-.IX Item "--obey-aux-catcode"
-Obey known category code changing commands encountered in the aux
-file.
-.IP "\fB\-\-no\-obey\-aux\-catcode\fR" 4
-.IX Item "--no-obey-aux-catcode"
-Ignore category code changing commands encountered in the aux file.
-.IP "\fB\-\-cite\-as\-record\fR" 4
+.IP \fB\-\-cite\-as\-record\fR 4
.IX Item "--cite-as-record"
Treat \f(CW\*(C`\ecitation\*(C'\fR as an ignored record.
-.IP "\fB\-\-no\-cite\-as\-record\fR" 4
-.IX Item "--no-cite-as-record"
-Don't check for instances of \f(CW\*(C`\ecitation\*(C'\fR in the \fI.aux\fR file (default).
-.IP "\fB\-\-warn\-non\-bib\-fields\fR" 4
-.IX Item "--warn-non-bib-fields"
-Warn if internal non-bib fields are found in the \fI.bib\fR file.
-.IP "\fB\-\-no\-warn\-non\-bib\-fields\fR" 4
-.IX Item "--no-warn-non-bib-fields"
-Don't warn if internal non-bib fields are found in the \fI.bib\fR file.
-The use of these internal fields can cause unexpected results, so
-only use this option if you have taken appropriate precautions.
-.IP "\fB\-\-warn\-unknown\-entry\-types\fR" 4
-.IX Item "--warn-unknown-entry-types"
-Warn if any unknown entry types are found in the \fI.bib\fR file.
-.IP "\fB\-\-no\-warn\-unknown\-entry\-types\fR" 4
-.IX Item "--no-warn-unknown-entry-types"
-Don't warn if any unknown entry types are found in the \fI.bib\fR file.
-.IP "\fB\-\-merge\-wrglossary\-records\fR" 4
-.IX Item "--merge-wrglossary-records"
-Merge an entry's \fBwrglossary\fR records for the same page locations.
-(For use with the \fBindexcounter\fR package option.)
-.IP "\fB\-\-no\-merge\-wrglossary\-records\fR" 4
-.IX Item "--no-merge-wrglossary-records"
-Don't merge an entry's \fBwrglossary\fR records.
-.IP "\fB\-\-collapse\-same\-location\-range\fR" 4
+.IP \fB\-\-collapse\-same\-location\-range\fR 4
.IX Item "--collapse-same-location-range"
Collapse an explicit range that has a duplicate start and end
location into a normal record (default).
-.IP "\fB\-\-no\-collapse\-same\-location\-range\fR" 4
-.IX Item "--no-collapse-same-location-range"
-Don't collapse an explicit range that has a duplicate start and end
-location into a normal record.
-.IP "\fB\-\-retain\-formats\fR \fIlist\fR" 4
-.IX Item "--retain-formats list"
-Indicates which location formats should always be retained even if
-it causes a partial duplicate. Only exact duplicates will be merged.
-.IP "\fB\-\-no\-retain\-formats\fR" 4
-.IX Item "--no-retain-formats"
-Normal location merging rules apply (default).
-.IP "\fB\-\-merge\-nameref\-on\fR \fIrule\fR" 4
-.IX Item "--merge-nameref-on rule"
-Rule for merging locations created with the \fBrecord=nameref\fR package option
-(requires \fIglossaries\-extra.sty\fR version 1.37+). The \fIrule\fR may be
-one of: \fBhcounter\fR, \fBhref\fR, \fBtitle\fR or \fBlocation\fR.
-.IP "\fB\-\-force\-cross\-resource\-refs\fR or \fB\-x\fR" 4
-.IX Item "--force-cross-resource-refs or -x"
-Force cross-resource referencing mode on.
-.IP "\fB\-\-no\-force\-cross\-resource\-refs\fR" 4
-.IX Item "--no-force-cross-resource-refs"
-Don't force cross-resource referencing mode on (default).
-.IP "\fB\-\-support\-unicode\-script\fR" 4
-.IX Item "--support-unicode-script"
-Text superscript (\f(CW\*(C`\etextsuperscript\*(C'\fR) or subscripts (\f(CW\*(C`\etextsubscript\*(C'\fR)
-will use Unicode superscript/subscript characters if available.
-For example, \f(CW\*(C`\etextsuperscript{2}\*(C'\fR will be converted to U+00B2
-(superscript two).
-.IP "\fB\-\-no\-support\-unicode\-script\fR" 4
-.IX Item "--no-support-unicode-script"
-Text superscript (\f(CW\*(C`\etextsuperscript\*(C'\fR) or subscripts (\f(CW\*(C`\etextsubscript\*(C'\fR)
-won't be converted to Unicode superscript/subscript characters.
-For example, \f(CW\*(C`\etextsuperscript{2}\*(C'\fR will be converted to \f(CW\*(C`<sup>2</sup>\*(C'\fR
-and the markup will be stripped leaving just the character 2.
-.IP "\fB\-\-packages\fR \fIlist\fR (or \fB\-p\fR \fIlist\fR)" 4
-.IX Item "--packages list (or -p list)"
-Instruct the TeX parser library to pretend the packages listed
-in \fIlist\fR have been used by the document. Note that there's only a
-limited number of packages supported by the TeX parser library.
-This option has a cumulative action so \fB\-\-packages wasysym,pifont\fR
-is the same as \fB\-\-packages wasysym \-\-packages pifont\fR.
-.Sp
-You can find out the list of supported packages with
-\&\fB\-\-list\-known\-packages\fR.
.IP "\fB\-\-custom\-packages\fR \fIlist\fR" 4
.IX Item "--custom-packages list"
Instruct the TeX parser library to attempt to parse the
packages listed in \fIlist\fR. This is intended for simple custom
packages that don't contain complex code.
+.IP "\fB\-\-debug\fR [\fIn\fR]" 4
+.IX Item "--debug [n]"
+Switch on the debug mode at the given setting \fIn\fR, which
+should be a non-negative integer. If \fIn\fR is \fB0\fR then the
+debug mode is switched off. If omitted, \fIn\fR is set to 1, which
+corresponds to \fB\-\-debug\-mode\fR \fBio\fR. Any positive number will
+enable all of \fBbib2gls\fR's debugging messages. The amount of
+TeX Parser Library debugging messages depends on bitwise operation of \fIn\fR.
+.IP "\fB\-\-debug\-mode\fR \fIsetting\fR" 4
+.IX Item "--debug-mode setting"
+May be used instead of \fB\-\-debug\fR where the level number is
+difficult to remember. The \fIsetting\fR may be a comma-separated list
+of any of the keywords:
+.RS 4
+.IP \fBall\fR 4
+.IX Item "all"
+Highest level (likely to result in a large transcript file). Equivalent to
+switching on all settings.
+.IP \fBcatcode\fR 4
+.IX Item "catcode"
+TeX Parser category code changes.
+.IP \fBcs\fR 4
+.IX Item "cs"
+TeX Parser command definitions.
+.IP \fBdecl\fR 4
+.IX Item "decl"
+TeX Parser declarations.
+.IP \fBexpansion\fR 4
+.IX Item "expansion"
+TeX Parser expansions (may result in a large transcript file).
+.IP \fBexpansion-list\fR 4
+.IX Item "expansion-list"
+TeX Parser stack expansions (may result in a large transcript file).
+.IP \fBexpansion-once\fR 4
+.IX Item "expansion-once"
+TeX Parser one-level expansions.
+.IP \fBexpansion-once-list\fR 4
+.IX Item "expansion-once-list"
+TeX Parser one-level list expansions.
+.IP \fBio\fR 4
+.IX Item "io"
+TeX Parser I/O operations (open, close and fetch token).
+.IP \fBpopped\fR 4
+.IX Item "popped"
+TeX Parser stack popping.
+.IP \fBprocess\fR 4
+.IX Item "process"
+TeX Parser macro process (may result in a large transcript file).
+.IP \fBprocess-generic-cs\fR 4
+.IX Item "process-generic-cs"
+TeX Parser generic command process.
+.IP \fBprocess-stack\fR 4
+.IX Item "process-stack"
+TeX Parser stack process (may result in a large transcript file).
+.IP \fBprocess-stack-list\fR 4
+.IX Item "process-stack-list"
+TeX Parser detailed stack process (may result in a large transcript file).
+.IP \fBread\fR 4
+.IX Item "read"
+TeX Parser codepoint read from file (likely to result in a large
+transcript file).
+.IP \fBsty-data\fR 4
+.IX Item "sty-data"
+TeX Parser data (typically relates to internal objects that don't
+have an analogous TeX macro). This includes data gathered from the
+aux file.
+.RE
+.RS 4
+.Sp
+For example: \f(CW\*(C`bib2gls \-\-debug\-mode io,catcode,sty\-data mydoc\*(C'\fR
+.RE
+.IP "\fB\-\-default\-encoding\fR \fIname\fR" 4
+.IX Item "--default-encoding name"
+Set the default character encoding for input and output files.
+If omitted, the JVM default encoding is assumed.
+.IP "\fB\-\-dir\fR \fIdirectory\fR (or \fB\-d\fR <directory>)" 4
+.IX Item "--dir directory (or -d <directory>)"
+Files are relative to \fIdirectory\fR. (This doesn't change the current
+working directory.)
+.IP \fB\-\-expand\-fields\fR 4
+.IX Item "--expand-fields"
+Don't write \f(CW\*(C`\eglsnoexpandfields\*(C'\fR to the \fI.glstex\fR file.
+.IP "\fB\-\-force\-cross\-resource\-refs\fR or \fB\-x\fR" 4
+.IX Item "--force-cross-resource-refs or -x"
+Force cross-resource referencing mode on.
+.IP "\fB\-\-group\fR or \fB\-g\fR" 4
+.IX Item "--group or -g"
+Add \fBgroup\fR field to entries.
+.IP "\fB\-\-help\fR or \fB\-h\fR" 4
+.IX Item "--help or -h"
+Display help message and exit.
.IP "\fB\-\-ignore\-packages\fR \fIlist\fR (or \fB\-k\fR \fIlist\fR)" 4
.IX Item "--ignore-packages list (or -k list)"
Don't parse the log file for the packages listed in \fIlist\fR. Note
@@ -305,11 +193,42 @@ listed in both \fB\-\-ignore\-packages\fR and \fB\-\-packages\fR then the
interpreter will check if it's supported. This option has a
cumulative action. Only known packages may be included in
\&\fIlist\fR.
-.IP "\fB\-\-list\-known\-packages\fR" 4
+.IP \fB\-\-interpret\fR 4
+.IX Item "--interpret"
+Use the TeX Parser Library to interpret known (La)TeX commands
+(default).
+.IP \fB\-\-list\-known\-packages\fR 4
.IX Item "--list-known-packages"
Lists all the packages that have are known to the TeX parser
library and then exits (with exit code 0). Any of the listed
packages may be used in \fB\-\-packages\fR or \fB\-\-ignore\-packages\fR.
+.IP "\fB\-\-locale\fR \fIlang\fR (or \fB\-l\fR \fIlang\fR)" 4
+.IX Item "--locale lang (or -l lang)"
+Use language resource file for \fIlang\fR (which should be an IETF
+locale tag).
+.IP "\fB\-\-log\-encoding\fR \fIname\fR" 4
+.IX Item "--log-encoding name"
+Set the character encoding for the \fIlog\fR files (which may not be
+the same as the encoding for the document LaTeX files).
+.IP "\fB\-\-log\-file\fR \fIfile\fR (or \fB\-t\fR <file>)" 4
+.IX Item "--log-file file (or -t <file>)"
+Set the transcript file.
+.IP "\fB\-\-merge\-nameref\-on\fR \fIrule\fR" 4
+.IX Item "--merge-nameref-on rule"
+Rule for merging locations created with the \fBrecord=nameref\fR package option
+(requires \fIglossaries\-extra.sty\fR version 1.37+). The \fIrule\fR may be
+one of: \fBhcounter\fR, \fBhref\fR, \fBtitle\fR or \fBlocation\fR.
+.IP \fB\-\-merge\-wrglossary\-records\fR 4
+.IX Item "--merge-wrglossary-records"
+Merge an entry's \fBwrglossary\fR records for the same page locations.
+(For use with the \fBindexcounter\fR package option.)
+.IP \fB\-\-mfirstuc\-math\-protection\fR 4
+.IX Item "--mfirstuc-math-protection"
+Switch on the auto-insertion of an empty group for math-shift (\f(CW\*(C`$\*(C'\fR).
+.Sp
+If \fImfirstuc\fR v2.08+, \fIglossaries\fR v4.50+ and \fIglossaries-extra\fR v1.49+
+are detected, the default will be \fB\-\-no\-mfirstuc\-math\-protection\fR
+as there should no longer be any need for this protection.
.IP "\fB\-\-mfirstuc\-protection\fR \fIfields\fR|\fBall\fR (or \fB\-u\fR \fIfields\fR|\fBall\fR)" 4
.IX Item "--mfirstuc-protection fields|all (or -u fields|all)"
Insert an empty group if fields start with certain problematic
@@ -322,19 +241,6 @@ subset of fields, set \fIfields\fR to a comma-separated list of fields
If \fImfirstuc\fR v2.08+, \fIglossaries\fR v4.50+ and \fIglossaries-extra\fR v1.49+
are detected, the default will be \fB\-\-no\-mfirstuc\-protection\fR
as there should no longer be any need for this protection.
-.IP "\fB\-\-no\-mfirstuc\-protection\fR" 4
-.IX Item "--no-mfirstuc-protection"
-Switch off the auto-insertion of an empty group for all fields.
-.IP "\fB\-\-mfirstuc\-math\-protection\fR" 4
-.IX Item "--mfirstuc-math-protection"
-Switch on the auto-insertion of an empty group for math-shift (\f(CW\*(C`$\*(C'\fR).
-.Sp
-If \fImfirstuc\fR v2.08+, \fIglossaries\fR v4.50+ and \fIglossaries-extra\fR v1.49+
-are detected, the default will be \fB\-\-no\-mfirstuc\-math\-protection\fR
-as there should no longer be any need for this protection.
-.IP "\fB\-\-no\-mfirstuc\-math\-protection\fR" 4
-.IX Item "--no-mfirstuc-math-protection"
-Switch off the auto-insertion of an empty group for math-shift (\f(CW\*(C`$\*(C'\fR).
.IP "\fB\-\-nested\-link\-check\fR \fIlist\fR|\fBnone\fR" 4
.IX Item "--nested-link-check list|none"
Check each field listed in \fIlist\fR for potentially problematic
@@ -342,25 +248,114 @@ nested link text. (Default list: name, text, plural, first,
firstplural, short, shortplural, long, longplural, symbol).
.Sp
If \fBnone\fR, disable check.
-.IP "\fB\-\-no\-nested\-link\-check\fR" 4
+.IP \fB\-\-no\-break\-space\fR 4
+.IX Item "--no-break-space"
+Interpret \f(CW\*(C`~\*(C'\fR (tilde) and \f(CW\*(C`\enobreakspace\*(C'\fR as a non-breaking space (default).
+.IP \fB\-\-no\-cite\-as\-record\fR 4
+.IX Item "--no-cite-as-record"
+Don't check for instances of \f(CW\*(C`\ecitation\*(C'\fR in the \fI.aux\fR file (default).
+.IP \fB\-\-no\-collapse\-same\-location\-range\fR 4
+.IX Item "--no-collapse-same-location-range"
+Don't collapse an explicit range that has a duplicate start and end
+location into a normal record.
+.IP "\fB\-\-no\-debug\fR (or \fB\-\-nodebug\fR)" 4
+.IX Item "--no-debug (or --nodebug)"
+Switch off debug mode. (Equivalent to \fB\-\-debug\fR \fB0\fR)
+.IP \fB\-\-no\-expand\-fields\fR 4
+.IX Item "--no-expand-fields"
+Write \f(CW\*(C`\eglsnoexpandfields\*(C'\fR to the \fI.glstex\fR file (default).
+.IP \fB\-\-no\-force\-cross\-resource\-refs\fR 4
+.IX Item "--no-force-cross-resource-refs"
+Don't force cross-resource referencing mode on (default).
+.IP \fB\-\-no\-group\fR 4
+.IX Item "--no-group"
+Don't add \fBgroup\fR field to entries (default).
+.IP \fB\-\-no\-interpret\fR 4
+.IX Item "--no-interpret"
+Don't try interpreting (La)TeX commands. The TeX Parser Library will
+still be used to parse the \fIaux\fR and \fIbib\fR files.
+.IP \fB\-\-no\-merge\-wrglossary\-records\fR 4
+.IX Item "--no-merge-wrglossary-records"
+Don't merge an entry's \fBwrglossary\fR records.
+.IP \fB\-\-no\-mfirstuc\-math\-protection\fR 4
+.IX Item "--no-mfirstuc-math-protection"
+Switch off the auto-insertion of an empty group for math-shift (\f(CW\*(C`$\*(C'\fR).
+.IP \fB\-\-no\-mfirstuc\-protection\fR 4
+.IX Item "--no-mfirstuc-protection"
+Switch off the auto-insertion of an empty group for all fields.
+.IP \fB\-\-no\-nested\-link\-check\fR 4
.IX Item "--no-nested-link-check"
Don't check for potentially problematic nested link text.
(Equivalent to \fB\-\-nested\-link\-check\fR \fBnone\fR)
-.IP "\fB\-\-shortcuts\fR \fIoption\fR" 4
-.IX Item "--shortcuts option"
-Check for the shortcut commands when searching for dependencies.
-Permitted values of \fIoption\fR: \fBacronyms\fR (or \fBacro\fR), \fBac\fR,
-\&\fBabbreviations\fR (or \fBabbr\fR), \fBall\fR (or \fBtrue\fR), \fBnone\fR (or
-\&\fBfalse\fR). This overrides the setting given in \fIauxfile\fR.
-.IP "\fB\-\-map\-format\fR \fIkey\fR\fB:\fR\fIvalue\fR[\fB,\fR\fIkey\fR\fB:\fR\fIvalue\fR]* (or \fB\-m\fR \fIkey\fR\fB:\fR\fIvalue\fR[\fB,\fR\fIkey\fR\fB:\fR\fIvalue\fR]*)" 4
-.IX Item "--map-format key:value[,key:value]* (or -m key:value[,key:value]*)"
-Set location format mappings.
-.IP "\fB\-\-group\fR or \fB\-g\fR" 4
-.IX Item "--group or -g"
-Add \fBgroup\fR field to entries.
-.IP "\fB\-\-no\-group\fR" 4
-.IX Item "--no-group"
-Don't add \fBgroup\fR field to entries (default).
+.IP \fB\-\-no\-obey\-aux\-catcode\fR 4
+.IX Item "--no-obey-aux-catcode"
+Ignore category code changing commands encountered in the aux file.
+.IP \fB\-\-no\-provide\-glossaries\fR 4
+.IX Item "--no-provide-glossaries"
+Don't write \f(CW\*(C`\eprovideignoredglossary*\*(C'\fR to the \fI.glstex\fR file to
+provide unknown glossaries except in documented situations
+(\fBmaster\fR, \fBsecondary\fR and \fBtrigger-type\fR resource options).
+This setting is the default.
+.IP \fB\-\-no\-record\-count\fR 4
+.IX Item "--no-record-count"
+Don't add record count field to entries (default).
+This option automatically implements \fB\-\-no\-record\-count\-unit\fR.
+.IP \fB\-\-no\-record\-count\-unit\fR 4
+.IX Item "--no-record-count-unit"
+Don't add unit record count field to entries (default).
+.IP \fB\-\-no\-replace\-quotes\fR 4
+.IX Item "--no-replace-quotes"
+Don't replace quote characters (default).
+.IP \fB\-\-no\-retain\-formats\fR 4
+.IX Item "--no-retain-formats"
+Normal location merging rules apply (default).
+.IP \fB\-\-no\-support\-unicode\-script\fR 4
+.IX Item "--no-support-unicode-script"
+Text superscript (\f(CW\*(C`\etextsuperscript\*(C'\fR) or subscripts (\f(CW\*(C`\etextsubscript\*(C'\fR)
+won't be converted to Unicode superscript/subscript characters.
+For example, \f(CW\*(C`\etextsuperscript{2}\*(C'\fR will be converted to \f(CW\*(C`<sup>2</sup>\*(C'\fR
+and the markup will be stripped leaving just the character 2.
+.IP \fB\-\-no\-trim\-fields\fR 4
+.IX Item "--no-trim-fields"
+Don't trim leading and trailing spaces from fields (default).
+This option cancels \fB\-\-trim\-only\-fields\fR and \fB\-\-trim\-fields\fR.
+.IP "\fB\-\-no\-verbose\fR (or \fB\-\-noverbose\fR)" 4
+.IX Item "--no-verbose (or --noverbose)"
+Switch off verbose mode. (Some messages will still be written to
+STDOUT.)
+.IP \fB\-\-no\-warn\-non\-bib\-fields\fR 4
+.IX Item "--no-warn-non-bib-fields"
+Don't warn if internal non-bib fields are found in the \fI.bib\fR file.
+The use of these internal fields can cause unexpected results, so
+only use this option if you have taken appropriate precautions.
+.IP \fB\-\-no\-warn\-unknown\-entry\-types\fR 4
+.IX Item "--no-warn-unknown-entry-types"
+Don't warn if any unknown entry types are found in the \fI.bib\fR file.
+.IP \fB\-\-obey\-aux\-catcode\fR 4
+.IX Item "--obey-aux-catcode"
+Obey known category code changing commands encountered in the aux
+file.
+.IP "\fB\-\-packages\fR \fIlist\fR (or \fB\-p\fR \fIlist\fR)" 4
+.IX Item "--packages list (or -p list)"
+Instruct the TeX parser library to pretend the packages listed
+in \fIlist\fR have been used by the document. Note that there's only a
+limited number of packages supported by the TeX parser library.
+This option has a cumulative action so \fB\-\-packages wasysym,pifont\fR
+is the same as \fB\-\-packages wasysym \-\-packages pifont\fR.
+.Sp
+You can find out the list of supported packages with
+\&\fB\-\-list\-known\-packages\fR.
+.IP \fB\-\-provide\-glossaries\fR 4
+.IX Item "--provide-glossaries"
+Write \f(CW\*(C`\eprovideignoredglossary*\*(C'\fR to the \fI.glstex\fR file to provide
+unknown glossaries.
+.IP "\fB\-\-quiet\fR (or \fB\-q\fR)" 4
+.IX Item "--quiet (or -q)"
+Only display error messages. All other messages are just written to
+the transcript file.
+.IP "\fB\-\-record\-count\fR or \fB\-c\fR" 4
+.IX Item "--record-count or -c"
+Add record count fields to entries.
.IP "\fB\-\-record\-count\-rule\fR \fIrule\fR or \fB\-r\fR \fIrule\fR" 4
.IX Item "--record-count-rule rule or -r rule"
Sets the rule used by \fB\-\-record\-count\fR and \fB\-\-record\-count\-unit\fR.
@@ -375,24 +370,52 @@ matches the regular expression \fIregex\fR),
or \f(CW\*(C`f/\*(C'\fR\fIregex1\fR\f(CW\*(C`/c/\*(C'\fR\fIregex2\fR\f(CW\*(C`/\*(C'\fR\fIop\fR (only count records where the format
matches the regular expression \fIregex1\fR and/or the counter name
matches the regular expression \fIregex2\fR). The \fIop\fR part is
-optional. If present it may be one of: \f(CW\*(C`and\*(C'\fR (format \s-1AND\s0 counter
-must match), \f(CW\*(C`or\*(C'\fR (format \s-1OR\s0 counter must match). If \fIop\fR is
-omitted, \s-1AND\s0 is assumed.
-.IP "\fB\-\-record\-count\fR or \fB\-c\fR" 4
-.IX Item "--record-count or -c"
-Add record count fields to entries.
-.IP "\fB\-\-no\-record\-count\fR" 4
-.IX Item "--no-record-count"
-Don't add record count field to entries (default).
-This option automatically implements \fB\-\-no\-record\-count\-unit\fR.
+optional. If present it may be one of: \f(CW\*(C`and\*(C'\fR (format AND counter
+must match), \f(CW\*(C`or\*(C'\fR (format OR counter must match). If \fIop\fR is
+omitted, AND is assumed.
.IP "\fB\-\-record\-count\-unit\fR or \fB\-n\fR" 4
.IX Item "--record-count-unit or -n"
Add unit record count fields to entries.
This option automatically implements \fB\-\-record\-count\fR.
-.IP "\fB\-\-no\-record\-count\-unit\fR" 4
-.IX Item "--no-record-count-unit"
-Don't add unit record count field to entries (default).
-.IP "\fB\-\-trim\-fields\fR" 4
+.IP \fB\-\-replace\-quotes\fR 4
+.IX Item "--replace-quotes"
+Replace single and double quote characters (\f(CW\*(C`\*(Aq\*(C'\fR and \f(CW\*(C`"\*(C'\fR) with
+\&\f(CW\*(C`\ebibglsaposchar\*(C'\fR and \f(CW\*(C`\ebibglsdoublequotechar\*(C'\fR in field values
+and group information written to the \fI.glstex\fR file.
+.IP "\fB\-\-retain\-formats\fR \fIlist\fR" 4
+.IX Item "--retain-formats list"
+Indicates which location formats should always be retained even if
+it causes a partial duplicate. Only exact duplicates will be merged.
+.IP "\fB\-\-shortcuts\fR \fIoption\fR" 4
+.IX Item "--shortcuts option"
+Check for the shortcut commands when searching for dependencies.
+Permitted values of \fIoption\fR: \fBacronyms\fR (or \fBacro\fR), \fBac\fR,
+\&\fBabbreviations\fR (or \fBabbr\fR), \fBall\fR (or \fBtrue\fR), \fBnone\fR (or
+\&\fBfalse\fR). This overrides the setting given in \fIauxfile\fR.
+.IP "\fB\-\-map\-format\fR \fIkey\fR\fB:\fR\fIvalue\fR[\fB,\fR\fIkey\fR\fB:\fR\fIvalue\fR]* (or \fB\-m\fR \fIkey\fR\fB:\fR\fIvalue\fR[\fB,\fR\fIkey\fR\fB:\fR\fIvalue\fR]*)" 4
+.IX Item "--map-format key:value[,key:value]* (or -m key:value[,key:value]*)"
+Set location format mappings.
+.IP \fB\-\-silent\fR 4
+.IX Item "--silent"
+Only display error messages. All other messages are just written to
+the transcript file. (Synonym of \fB\-\-quiet\fR.)
+.IP \fB\-\-support\-unicode\-script\fR 4
+.IX Item "--support-unicode-script"
+Text superscript (\f(CW\*(C`\etextsuperscript\*(C'\fR) or subscripts (\f(CW\*(C`\etextsubscript\*(C'\fR)
+will use Unicode superscript/subscript characters if available.
+For example, \f(CW\*(C`\etextsuperscript{2}\*(C'\fR will be converted to U+00B2
+(superscript two).
+.IP "\fB\-\-tex\-encoding\fR \fIname\fR" 4
+.IX Item "--tex-encoding name"
+Set the character encoding for the \fIglstex\fR files. This overrides the
+setting given in \fIauxfile\fR.
+.IP "\fB\-\-trim\-except\-fields\fR \fIlist\fR" 4
+.IX Item "--trim-except-fields list"
+Trim leading and trailing spaces from all fields except those listed.
+This option is cumulative but is cancelled by \fB\-\-trim\-fields\fR
+and \fB\-\-no\-trim\-fields\fR. This option may not be used with
+\&\fB\-\-trim\-only\-fields\fR.
+.IP \fB\-\-trim\-fields\fR 4
.IX Item "--trim-fields"
Trim leading and trailing spaces from all fields.
This option cancels \fB\-\-trim\-only\-fields\fR and \fB\-\-no\-trim\-fields\fR.
@@ -402,49 +425,27 @@ Trim leading and trailing spaces from only the listed fields.
This option is cumulative but is cancelled by \fB\-\-trim\-fields\fR
and \fB\-\-no\-trim\-fields\fR. This option may not be used with
\&\fB\-\-trim\-except\-fields\fR.
-.IP "\fB\-\-trim\-except\-fields\fR \fIlist\fR" 4
-.IX Item "--trim-except-fields list"
-Trim leading and trailing spaces from all fields except those listed.
-This option is cumulative but is cancelled by \fB\-\-trim\-fields\fR
-and \fB\-\-no\-trim\-fields\fR. This option may not be used with
-\&\fB\-\-trim\-only\-fields\fR.
-.IP "\fB\-\-no\-trim\-fields\fR" 4
-.IX Item "--no-trim-fields"
-Don't trim leading and trailing spaces from fields (default).
-This option cancels \fB\-\-trim\-only\-fields\fR and \fB\-\-trim\-fields\fR.
-.IP "\fB\-\-expand\-fields\fR" 4
-.IX Item "--expand-fields"
-Don't write \f(CW\*(C`\eglsnoexpandfields\*(C'\fR to the \fI.glstex\fR file.
-.IP "\fB\-\-no\-expand\-fields\fR" 4
-.IX Item "--no-expand-fields"
-Write \f(CW\*(C`\eglsnoexpandfields\*(C'\fR to the \fI.glstex\fR file (default).
-.IP "\fB\-\-provide\-glossaries\fR" 4
-.IX Item "--provide-glossaries"
-Write \f(CW\*(C`\eprovideignoredglossary*\*(C'\fR to the \fI.glstex\fR file to provide
-unknown glossaries.
-.IP "\fB\-\-no\-provide\-glossaries\fR" 4
-.IX Item "--no-provide-glossaries"
-Don't write \f(CW\*(C`\eprovideignoredglossary*\*(C'\fR to the \fI.glstex\fR file to
-provide unknown glossaries except in documented situations
-(\fBmaster\fR, \fBsecondary\fR and \fBtrigger-type\fR resource options).
-This setting is the default.
-.IP "\fB\-\-replace\-quotes\fR" 4
-.IX Item "--replace-quotes"
-Replace single and double quote characters (\f(CW\*(C`\*(Aq\*(C'\fR and \f(CW\*(C`"\*(C'\fR) with
-\&\f(CW\*(C`\ebibglsaposchar\*(C'\fR and \f(CW\*(C`\ebibglsdoublequotechar\*(C'\fR in field values
-and group information written to the \fI.glstex\fR file.
-.IP "\fB\-\-no\-replace\-quotes\fR" 4
-.IX Item "--no-replace-quotes"
-Don't replace quote characters (default).
-.SH "REQUIRES"
+.IP \fB\-\-verbose\fR 4
+.IX Item "--verbose"
+Switch on verbose mode.
+.IP "\fB\-\-version\fR or \fB\-v\fR" 4
+.IX Item "--version or -v"
+Display version information and exit.
+.IP \fB\-\-warn\-non\-bib\-fields\fR 4
+.IX Item "--warn-non-bib-fields"
+Warn if internal non-bib fields are found in the \fI.bib\fR file.
+.IP \fB\-\-warn\-unknown\-entry\-types\fR 4
+.IX Item "--warn-unknown-entry-types"
+Warn if any unknown entry types are found in the \fI.bib\fR file.
+.SH REQUIRES
.IX Header "REQUIRES"
Java 8 or later and a TeX distribution.
-.SH "LICENSE"
+.SH LICENSE
.IX Header "LICENSE"
-License GPLv3+: \s-1GNU GPL\s0 version 3 or later
+License GPLv3+: GNU GPL version 3 or later
<http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
-There is \s-1NO WARRANTY,\s0 to the extent permitted by law.
+There is NO WARRANTY, to the extent permitted by law.
.SH "RECOMMENDED READING"
.IX Header "RECOMMENDED READING"
The bib2gls manual:
@@ -464,7 +465,7 @@ The glossaries manual:
.Vb 1
\& texdoc glossaries
.Ve
-.SH "AUTHOR"
+.SH AUTHOR
.IX Header "AUTHOR"
Nicola L. C. Talbot,
<https://www.dickimaw\-books.com/>
diff --git a/support/bib2gls/bib2gls.pdf b/support/bib2gls/bib2gls.pdf
index e33fe72439..264d02977f 100644
--- a/support/bib2gls/bib2gls.pdf
+++ b/support/bib2gls/bib2gls.pdf
Binary files differ
diff --git a/support/bib2gls/convertgls2bib.1 b/support/bib2gls/convertgls2bib.1
index 36295b9a09..5431556207 100644
--- a/support/bib2gls/convertgls2bib.1
+++ b/support/bib2gls/convertgls2bib.1
@@ -1,4 +1,5 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.43)
+.\" -*- mode: troff; coding: utf-8 -*-
+.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.43)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -15,29 +16,12 @@
.ft R
.fi
..
-.\" Set up some character translations and predefined strings. \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.\" \*(C` and \*(C' are quotes in nroff, nothing in troff, for use with C<>.
.ie n \{\
-. ds -- \(*W-
-. ds PI pi
-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
-. ds L" ""
-. ds R" ""
. ds C` ""
. ds C' ""
'br\}
.el\{\
-. ds -- \|\(em\|
-. ds PI \(*p
-. ds L" ``
-. ds R" ''
. ds C`
. ds C'
'br\}
@@ -68,85 +52,23 @@
. \}
.\}
.rr rF
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear. Run. Save yourself. No user-serviceable parts.
-. \" fudge factors for nroff and troff
-.if n \{\
-. ds #H 0
-. ds #V .8m
-. ds #F .3m
-. ds #[ \f1
-. ds #] \fP
-.\}
-.if t \{\
-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-. ds #V .6m
-. ds #F 0
-. ds #[ \&
-. ds #] \&
-.\}
-. \" simple accents for nroff and troff
-.if n \{\
-. ds ' \&
-. ds ` \&
-. ds ^ \&
-. ds , \&
-. ds ~ ~
-. ds /
-.\}
-.if t \{\
-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-. \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-. \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-. \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-. ds : e
-. ds 8 ss
-. ds o a
-. ds d- d\h'-1'\(ga
-. ds D- D\h'-1'\(hy
-. ds th \o'bp'
-. ds Th \o'LP'
-. ds ae ae
-. ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
.\" ========================================================================
.\"
.IX Title "CONVERTGLS2BIB 1"
-.TH CONVERTGLS2BIB 1 "2020-02-11" "perl v5.34.1" "convertgls2bib"
+.TH CONVERTGLS2BIB 1 2020-02-11 "perl v5.36.1" convertgls2bib
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
.nh
-.SH "SYNOPSIS"
+.SH SYNOPSIS
.IX Header "SYNOPSIS"
\&\fBconvertgls2bib\fR [\fIoption\fR]+ \fIauxfile\fR
-.SH "DESCRIPTION"
+.SH DESCRIPTION
.IX Header "DESCRIPTION"
Converts a \fB.tex\fR file containing glossary definitions using
commands like \f(CW\*(C`\enewglossaryentry\*(C'\fR and \f(CW\*(C`\enewacronym\*(C'\fR to
a \fB.bib\fR file in the format required for \fBbib2gls\fR.
-.SH "OPTIONS"
+.SH OPTIONS
.IX Header "OPTIONS"
.IP "\fB\-\-help\fR or \fB\-h\fR" 4
.IX Item "--help or -h"
@@ -154,13 +76,13 @@ Display help message and exit.
.IP "\fB\-\-version\fR or \fB\-v\fR" 4
.IX Item "--version or -v"
Display version information and exit.
-.IP "\fB\-\-silent\fR" 4
+.IP \fB\-\-silent\fR 4
.IX Item "--silent"
Suppress all messages except for errors.
-.IP "\fB\-\-verbose\fR" 4
+.IP \fB\-\-verbose\fR 4
.IX Item "--verbose"
Display messages.
-.IP "\fB\-\-debug\fR" 4
+.IP \fB\-\-debug\fR 4
.IX Item "--debug"
Display debugging messages.
.IP "\fB\-\-texenc\fR \fIname\fR" 4
@@ -169,16 +91,16 @@ Set the character encoding to \fIname\fR for the input \fB.tex\fR files.
.IP "\fB\-\-bibenc\fR \fIname\fR" 4
.IX Item "--bibenc name"
Set the character encoding to \fIname\fR for the output \fB.bib\fR files.
-.IP "\fB\-\-ignore\-sort\fR" 4
+.IP \fB\-\-ignore\-sort\fR 4
.IX Item "--ignore-sort"
Ignore the \fBsort\fR field (default).
-.IP "\fB\-\-no\-ignore\-sort\fR" 4
+.IP \fB\-\-no\-ignore\-sort\fR 4
.IX Item "--no-ignore-sort"
Don't ignore the \fBsort\fR field.
-.IP "\fB\-\-ignore\-type\fR" 4
+.IP \fB\-\-ignore\-type\fR 4
.IX Item "--ignore-type"
Omit the \fBtype\fR field. Default if \fB\-\-split\-on\-type\fR.
-.IP "\fB\-\-no\-ignore\-type\fR" 4
+.IP \fB\-\-no\-ignore\-type\fR 4
.IX Item "--no-ignore-type"
Don't omit the \fBtype\fR field. Default unless \fB\-\-split\-on\-type\fR.
.IP "\fB\-\-split\-on\-type\fR or \fB\-t\fR" 4
@@ -186,14 +108,14 @@ Don't omit the \fBtype\fR field. Default unless \fB\-\-split\-on\-type\fR.
Split the entries into separate files according to the \fBtype\fR field.
This option automatically implements \fB\-\-ignore\-type\fR and
\&\fB\-\-no\-overwrite\fR.
-.IP "\fB\-\-no\-split\-on\-type\fR" 4
+.IP \fB\-\-no\-split\-on\-type\fR 4
.IX Item "--no-split-on-type"
Don't split the entries into separate files according to the \fBtype\fR
field (default).
-.IP "\fB\-\-ignore\-category\fR" 4
+.IP \fB\-\-ignore\-category\fR 4
.IX Item "--ignore-category"
Omit the \fBcategory\fR field. Default if \fB\-\-split\-on\-category\fR.
-.IP "\fB\-\-no\-ignore\-category\fR" 4
+.IP \fB\-\-no\-ignore\-category\fR 4
.IX Item "--no-ignore-category"
Don't omit the \fBcategory\fR field. Default unless \fB\-\-split\-on\-category\fR.
.IP "\fB\-\-split\-on\-category\fR or \fB\-t\fR" 4
@@ -201,7 +123,7 @@ Don't omit the \fBcategory\fR field. Default unless \fB\-\-split\-on\-category\f
Split the entries into separate files according to the \fBcategory\fR field.
This option automatically implements \fB\-\-ignore\-category\fR and
\&\fB\-\-no\-overwrite\fR.
-.IP "\fB\-\-no\-split\-on\-category\fR" 4
+.IP \fB\-\-no\-split\-on\-category\fR 4
.IX Item "--no-split-on-category"
Don't split the entries into separate files according to the \fBcategory\fR
field (default).
@@ -210,15 +132,15 @@ field (default).
Ignore all the fields in the comma-separated \fIlist\fR. If the
list includes \fBsort\fR, \fBtype\fR or \fBcategory\fR it will automatically
implement the corresponding \fB\-\-ignore\-sort\fR, \fB\-\-ignore\-type\fR or
-\&\fB\-\-ignore\*(--category\fR option.
+\&\fB\-\-ignore\-\-category\fR option.
.Sp
This option isn't cumulative. An empty list will clear a previously
set list but won't undo the sort, type or category ignore options.
-.IP "\fB\-\-overwrite\fR" 4
+.IP \fB\-\-overwrite\fR 4
.IX Item "--overwrite"
Overwrite existing .bib files. Default unless \fB\-\-split\-on\-type\fR
used.
-.IP "\fB\-\-no\-overwrite\fR" 4
+.IP \fB\-\-no\-overwrite\fR 4
.IX Item "--no-overwrite"
Don't overwrite existing .bib files. Default if \fB\-\-split\-on\-type\fR
used.
@@ -228,20 +150,20 @@ Any entries that would normally be converted to \f(CW@entry\fR that don't
have a description or just have the description set to
\&\f(CW\*(C`\enopostdesc\*(C'\fR or \f(CW\*(C`\eglsxtrnopostpunc\*(C'\fR will be converted to \f(CW@index\fR
and the \fBdescription\fR field will be omitted.
-.IP "\fB\-\-no\-index\-conversion\fR" 4
+.IP \fB\-\-no\-index\-conversion\fR 4
.IX Item "--no-index-conversion"
Don't use \f(CW@index\fR instead of \f(CW@entry\fR if the description is empty or
just \f(CW\*(C`\enopostdesc\*(C'\fR or \f(CW\*(C`\eglsxtrnopostpunc\*(C'\fR (default).
-.IP "\fB\-\-absorb\-see\fR" 4
+.IP \fB\-\-absorb\-see\fR 4
.IX Item "--absorb-see"
Absorb \f(CW\*(C`\eglssee\*(C'\fR and \f(CW\*(C`\eglsxtrindexseealso\*(C'\fR into the data (default).
-.IP "\fB\-\-no\-absorb\-see\fR" 4
+.IP \fB\-\-no\-absorb\-see\fR 4
.IX Item "--no-absorb-see"
Don't absorb \f(CW\*(C`\eglssee\*(C'\fR and \f(CW\*(C`\eglsxtrindexseealso\*(C'\fR into the data.
.IP "\fB\-\-preamble\-only\fR or \fB\-p\fR" 4
.IX Item "--preamble-only or -p"
Only parse the document preamble.
-.IP "\fB\-\-no\-preamble\-only\fR" 4
+.IP \fB\-\-no\-preamble\-only\fR 4
.IX Item "--no-preamble-only"
Parse the entire document (default).
.IP "\fB\-\-space\-sub\fR \fIvalue\fR or \fB\-s\fR \fIvalue\fR" 4
@@ -252,15 +174,15 @@ Substitute spaces in labels with \fIvalue\fR.
Use the language resource files associated with the given language
tag \fIlang tag\fR. If there isn't an appropriate file, the \fBen\fR
(English) file will be used.
-.SH "REQUIRES"
+.SH REQUIRES
.IX Header "REQUIRES"
Java 8 and a TeX distribution.
-.SH "LICENSE"
+.SH LICENSE
.IX Header "LICENSE"
-License GPLv3+: \s-1GNU GPL\s0 version 3 or later
+License GPLv3+: GNU GPL version 3 or later
<http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
-There is \s-1NO WARRANTY,\s0 to the extent permitted by law.
+There is NO WARRANTY, to the extent permitted by law.
.SH "RECOMMENDED READING"
.IX Header "RECOMMENDED READING"
The bib2gls manual:
@@ -280,7 +202,7 @@ The glossaries manual:
.Vb 1
\& texdoc glossaries
.Ve
-.SH "AUTHOR"
+.SH AUTHOR
.IX Header "AUTHOR"
Nicola L. C. Talbot,
<http://www.dickimaw\-books.com/>
diff --git a/support/bib2gls/examples/sample-authors.pdf b/support/bib2gls/examples/sample-authors.pdf
index ad67a923a1..cf248eb070 100644
--- a/support/bib2gls/examples/sample-authors.pdf
+++ b/support/bib2gls/examples/sample-authors.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-bacteria.pdf b/support/bib2gls/examples/sample-bacteria.pdf
index 672e15481f..50e8174154 100644
--- a/support/bib2gls/examples/sample-bacteria.pdf
+++ b/support/bib2gls/examples/sample-bacteria.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-chemical.pdf b/support/bib2gls/examples/sample-chemical.pdf
index a1eed822aa..465f705f0b 100644
--- a/support/bib2gls/examples/sample-chemical.pdf
+++ b/support/bib2gls/examples/sample-chemical.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-citations.pdf b/support/bib2gls/examples/sample-citations.pdf
index 29524de719..653b81f29d 100644
--- a/support/bib2gls/examples/sample-citations.pdf
+++ b/support/bib2gls/examples/sample-citations.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-constants.pdf b/support/bib2gls/examples/sample-constants.pdf
index aec72fbf2d..a71a83dd82 100644
--- a/support/bib2gls/examples/sample-constants.pdf
+++ b/support/bib2gls/examples/sample-constants.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-hierarchical.pdf b/support/bib2gls/examples/sample-hierarchical.pdf
index 18b906dd99..a91e86effd 100644
--- a/support/bib2gls/examples/sample-hierarchical.pdf
+++ b/support/bib2gls/examples/sample-hierarchical.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-markuplanguages.pdf b/support/bib2gls/examples/sample-markuplanguages.pdf
index a4a69b6bc3..32b1c34d79 100644
--- a/support/bib2gls/examples/sample-markuplanguages.pdf
+++ b/support/bib2gls/examples/sample-markuplanguages.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-maths.pdf b/support/bib2gls/examples/sample-maths.pdf
index e593514ade..87edbafef1 100644
--- a/support/bib2gls/examples/sample-maths.pdf
+++ b/support/bib2gls/examples/sample-maths.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-media.pdf b/support/bib2gls/examples/sample-media.pdf
index ff9ac5b5c9..6c21c9ea15 100644
--- a/support/bib2gls/examples/sample-media.pdf
+++ b/support/bib2gls/examples/sample-media.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-msymbols.pdf b/support/bib2gls/examples/sample-msymbols.pdf
index 2be01e8394..a57dac116c 100644
--- a/support/bib2gls/examples/sample-msymbols.pdf
+++ b/support/bib2gls/examples/sample-msymbols.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-multi1.pdf b/support/bib2gls/examples/sample-multi1.pdf
index 3dc7b614a4..743481f107 100644
--- a/support/bib2gls/examples/sample-multi1.pdf
+++ b/support/bib2gls/examples/sample-multi1.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-multi2.pdf b/support/bib2gls/examples/sample-multi2.pdf
index 1b5748c2ef..60e568beb2 100644
--- a/support/bib2gls/examples/sample-multi2.pdf
+++ b/support/bib2gls/examples/sample-multi2.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-nested.pdf b/support/bib2gls/examples/sample-nested.pdf
index 4d2d3d61d5..2159fcdbde 100644
--- a/support/bib2gls/examples/sample-nested.pdf
+++ b/support/bib2gls/examples/sample-nested.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-people.pdf b/support/bib2gls/examples/sample-people.pdf
index 5d57d027f1..57830f119c 100644
--- a/support/bib2gls/examples/sample-people.pdf
+++ b/support/bib2gls/examples/sample-people.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-textsymbols.pdf b/support/bib2gls/examples/sample-textsymbols.pdf
index c2b1514f1f..946f766255 100644
--- a/support/bib2gls/examples/sample-textsymbols.pdf
+++ b/support/bib2gls/examples/sample-textsymbols.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-textsymbols2.pdf b/support/bib2gls/examples/sample-textsymbols2.pdf
index 0056639401..d912c9b563 100644
--- a/support/bib2gls/examples/sample-textsymbols2.pdf
+++ b/support/bib2gls/examples/sample-textsymbols2.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-units1.pdf b/support/bib2gls/examples/sample-units1.pdf
index c654224a13..b5e3c8b0bc 100644
--- a/support/bib2gls/examples/sample-units1.pdf
+++ b/support/bib2gls/examples/sample-units1.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-units2.pdf b/support/bib2gls/examples/sample-units2.pdf
index 36b2042345..22650ed5fc 100644
--- a/support/bib2gls/examples/sample-units2.pdf
+++ b/support/bib2gls/examples/sample-units2.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-units3.pdf b/support/bib2gls/examples/sample-units3.pdf
index 6a22552650..a17537f587 100644
--- a/support/bib2gls/examples/sample-units3.pdf
+++ b/support/bib2gls/examples/sample-units3.pdf
Binary files differ
diff --git a/support/bib2gls/examples/sample-usergroups.pdf b/support/bib2gls/examples/sample-usergroups.pdf
index 79462d0fb3..42ab0d5a46 100644
--- a/support/bib2gls/examples/sample-usergroups.pdf
+++ b/support/bib2gls/examples/sample-usergroups.pdf
Binary files differ
diff --git a/support/bib2gls/src/bib2gls-cite.bib b/support/bib2gls/src/bib2gls-cite.bib
index 6c57ad1614..17a36f7d25 100644
--- a/support/bib2gls/src/bib2gls-cite.bib
+++ b/support/bib2gls/src/bib2gls-cite.bib
@@ -42,13 +42,20 @@
year = 2018
}
-@misc{tex.sx,
+@misc{tex.sx.2016,
title={Is there a program for managing glossary tags?},
note={\url{https://tex.stackexchange.com/questions/342544}},
key={TeX on StackExchange},
year=2016
}
+@misc{tex.sx.2013,
+ title={What controls the encoding of the {LaTeX} log file – and how to change it?},
+ note={\url{https://tex.stackexchange.com/questions/131238}},
+ key={TeX on StackExchange},
+ year=2013
+}
+
@misc{texparser,
author = "Nicola Talbot",
title={\code{texparserlib}: {Java} code for parsing {(La)TeX} files},
diff --git a/support/bib2gls/src/bib2gls-terms.bib b/support/bib2gls/src/bib2gls-terms.bib
index 27841562da..89fcd9682d 100644
--- a/support/bib2gls/src/bib2gls-terms.bib
+++ b/support/bib2gls/src/bib2gls-terms.bib
@@ -470,9 +470,10 @@ set), and isn't picked up by iterative commands such as
name={encoding},
user1={idx.encoding},
description={A text format that maps a byte or sequence of bytes
- to a character. See \sectionref{sec:bibencoding} and \longarg{tex-encoding}
- for the \ext{bib} file encoding and \csopt{charset} for the \ext{glstex}
- file encoding. See also the blog article
+ to a character. See \sectionref{sec:bibencoding} and \csopt{charset}
+ for the \ext{bib} file encoding, \longarg{tex-encoding} for the
+ \ext{aux} and \ext{glstex} file encoding, and
+ \sectionref{sec:defencoding} for the default encoding. See also the blog article
\href{https://dickimaw-books.com/blog/binary-files-text-files-and-file-encodings/}{Binary
Files, Text Files and File Encodings} for further information about
file encodings in general.}
@@ -520,7 +521,7 @@ Files, Text Files and File Encodings} for further information about
name = {anchored (regular expression)},
text={anchored},
description={An anchored \gls{regular-expression} must match the entire
- string, not a sub-string. For example, \code{l\idx{zeroorone}op} matches \qt{lop}
+ string, not a sub-string. For example, \code{l\idx{regex.question}op} matches \qt{lop}
and \qt{op} but doesn't match \qt{clop} or \qt{cop}.}
}
diff --git a/support/bib2gls/src/bib2gls.bib b/support/bib2gls/src/bib2gls.bib
index e5cbac0004..944345e4fe 100644
--- a/support/bib2gls/src/bib2gls.bib
+++ b/support/bib2gls/src/bib2gls.bib
@@ -223,6 +223,7 @@
@index{regexp,
name={regexp (or regex)},
+ text={regexp},
alias={regex}
}
@@ -5330,13 +5331,13 @@ and \L/\l\ treated as L/l},
}
@package{polyglossia,
- name={\styfmt{polyglossia}},
+ name={\styfmt{poly\-glossia}},
category={package},
parent={packages}
}
@package{fontspec,
- name={\styfmt{fontspec}},
+ name={\styfmt{font\-spec}},
category={package},
parent={packages}
}
@@ -5819,13 +5820,8 @@ with forced line breaks in paragraph column formats)},
text={\code{+}}
}
-@symbol{zeroorone,
- name={\code{?} (regular expression, zero or one)},
- text={\code{?}}
-}
-
@symbol{regex.question,
- name={\code{?} (regular expression)},
+ name={\code{?} (regular expression, zero or one)},
text={\code{?}}
}
@@ -5892,7 +5888,7 @@ with forced line breaks in paragraph column formats)},
}
@command{nobreakspace,
- name={\csfmt{nobreakspace}},
+ name={\csfmt{no\-break\-space}},
description={produces a non-breakable space},
note={kernel command\texparserdefnote},
category={command}
@@ -10223,6 +10219,13 @@ primary formats, if enabled.},
parent={commandlineoptions}
}
+@switch{switch.debug-mode,
+ name={\longargfmt{debug\dhyphen mode}},
+ user1={\meta{setting}},
+ category={switch},
+ parent={commandlineoptions}
+}
+
@switch{switch.no-debug,
name={\longargfmt{no\dhyphen debug}},
symbol={\longargfmt{nodebug}},
@@ -10569,6 +10572,20 @@ primary formats, if enabled.},
parent={commandlineoptions}
}
+@switch{switch.log-encoding,
+ name={\longargfmt{log\dhyphen encoding}},
+ user1={\meta{name}},
+ category={switch},
+ parent={commandlineoptions}
+}
+
+@switch{switch.default-encoding,
+ name={\longargfmt{default\dhyphen encoding}},
+ user1={\meta{name}},
+ category={switch},
+ parent={commandlineoptions}
+}
+
@switch{switch.no-expand-fields,
name={\longargfmt{no\dhyphen expand\dhyphen fields}},
user1={},
@@ -17660,6 +17677,14 @@ has three or more items},
category={command}
}
+@command{unit,
+ name={\csfmt{unit}},
+ user1={\oargm{options}\margm{unit}},
+ description={displays the unit with intelligent formatting},
+ note={\styfmt{siunitx}\texparserdefnote},
+ category={command}
+}
+
@command{ce,
name={\csfmt{ce}},
user1={\margm{formula}},
@@ -18818,6 +18843,34 @@ sectioning commands to write to it},
category={command}
}
+@command{two@digits,
+ name={\csfmt{two\-@\-digits}},
+ user1={\margm{number}},
+ description={expands to \meta{number} zero-padded to ensure at
+ least two digits},
+ note={kernel command\texparserdefnote},
+ category={command}
+}
+
+@command{IfTeXParserLib,
+ name={\csfmt{If\-TeX\-Parser\-Lib}},
+ user1={\margm{interpreter}\margm{\TeX}},
+ description={defined by the \TeX\ parser library to expand to
+ \meta{interpreter} and by \sty{glossaries-extra-bib2gls} to expand
+ to \meta{\TeX}},
+ note={\styfmt{glossaries-extra-bib2gls}\texparserdefnote},
+ category={command}
+}
+
+@command{bibglspaddigits,
+ name={\csfmt{bib\-gls\-pad\-digits}},
+ user1={\margm{num digits}\margm{number}},
+ description={expands to \meta{number} zero-padded to ensure at
+ least \meta{num digits} digits},
+ note={\bibgls\ interpreter only},
+ category={command}
+}
+
@command{underline,
name={\csfmt{under\-line}},
user1={\margm{text}},
diff --git a/support/bib2gls/src/bib2gls.pod b/support/bib2gls/src/bib2gls.pod
index a470b73fc9..e9645adb65 100644
--- a/support/bib2gls/src/bib2gls.pod
+++ b/support/bib2gls/src/bib2gls.pod
@@ -21,196 +21,192 @@ or in a location that can be found by kpsewhich.
=over 4
-=item B<--help> or B<-h>
+=item B<--break-space>
-Display help message and exit.
+Interpret C<~> (tilde) character and C<\nobreakspace> as a normal space.
-=item B<--version> or B<-v>
+=item B<--cite-as-record>
-Display version information and exit.
+Treat C<\citation> as an ignored record.
-=item B<--debug> [I<level>]
+=item B<--collapse-same-location-range>
-Switch on the debug mode (optionally at the given I<level>, which
-should be a non-negative integer). If I<level> is B<0> then the
-debug mode is switched off.
+Collapse an explicit range that has a duplicate start and end
+location into a normal record (default).
-=item B<--no-debug> (or B<--nodebug>)
+=item B<--custom-packages> I<list>
-Switch off debug mode. (Equivalent to B<--debug> B<0>)
+Instruct the TeX parser library to attempt to parse the
+packages listed in I<list>. This is intended for simple custom
+packages that don't contain complex code.
-=item B<--verbose>
+=item B<--debug> [I<n>]
-Switch on verbose mode.
+Switch on the debug mode at the given setting I<n>, which
+should be a non-negative integer. If I<n> is B<0> then the
+debug mode is switched off. If omitted, I<n> is set to 1, which
+corresponds to B<--debug-mode> B<io>. Any positive number will
+enable all of B<bib2gls>'s debugging messages. The amount of
+TeX Parser Library debugging messages depends on bitwise operation of I<n>.
-=item B<--no-verbose> (or B<--noverbose>)
+=item B<--debug-mode> I<setting>
-Switch off verbose mode. (Some messages will still be written to
-STDOUT.)
+May be used instead of B<--debug> where the level number is
+difficult to remember. The I<setting> may be a comma-separated list
+of any of the keywords:
-=item B<--silent>
+=over 4
-Only display error messages. All other messages are just written to
-the transcript file.
+=item B<all>
-=item B<--locale> I<lang> (or B<-l> I<lang>)
+Highest level (likely to result in a large transcript file). Equivalent to
+switching on all settings.
-Use language resource file for I<lang> (which should be an IETF
-locale tag).
+=item B<catcode>
-=item B<--log-file> I<file> (or B<-t> <file>)
+TeX Parser category code changes.
-Set the transcript file.
+=item B<cs>
-=item B<--dir> I<directory> (or B<-d> <directory>)
+TeX Parser command definitions.
-Files are relative to I<directory>. (This doesn't change the current
-working directory.)
+=item B<decl>
-=item B<--tex-encoding> I<name>
+TeX Parser declarations.
-Set the character encoding for the output files. This overrides the
-setting given in I<auxfile>.
+=item B<expansion>
-=item B<--interpret>
+TeX Parser expansions (may result in a large transcript file).
-Use the TeX parser library to interpret known (La)TeX commands
-(default).
+=item B<expansion-list>
-=item B<--no-interpret>
+TeX Parser stack expansions (may result in a large transcript file).
-Don't try interpreting (La)TeX commands.
+=item B<expansion-once>
-=item B<--break-space>
+TeX Parser one-level expansions.
-Interpret C<~> (tilde) character and C<\nobreakspace> as a normal space.
+=item B<expansion-once-list>
-=item B<--no-break-space>
+TeX Parser one-level list expansions.
-Interpret C<~> (tilde) and C<\nobreakspace> as a non-breaking space (default).
+=item B<io>
-=item B<--obey-aux-catcode>
+TeX Parser I/O operations (open, close and fetch token).
-Obey known category code changing commands encountered in the aux
-file.
+=item B<popped>
-=item B<--no-obey-aux-catcode>
+TeX Parser stack popping.
-Ignore category code changing commands encountered in the aux file.
+=item B<process>
-=item B<--cite-as-record>
+TeX Parser macro process (may result in a large transcript file).
-Treat C<\citation> as an ignored record.
+=item B<process-generic-cs>
-=item B<--no-cite-as-record>
+TeX Parser generic command process.
-Don't check for instances of C<\citation> in the F<.aux> file (default).
+=item B<process-stack>
-=item B<--warn-non-bib-fields>
+TeX Parser stack process (may result in a large transcript file).
-Warn if internal non-bib fields are found in the F<.bib> file.
+=item B<process-stack-list>
-=item B<--no-warn-non-bib-fields>
+TeX Parser detailed stack process (may result in a large transcript file).
-Don't warn if internal non-bib fields are found in the F<.bib> file.
-The use of these internal fields can cause unexpected results, so
-only use this option if you have taken appropriate precautions.
+=item B<read>
-=item B<--warn-unknown-entry-types>
+TeX Parser codepoint read from file (likely to result in a large
+transcript file).
-Warn if any unknown entry types are found in the F<.bib> file.
+=item B<sty-data>
-=item B<--no-warn-unknown-entry-types>
+TeX Parser data (typically relates to internal objects that don't
+have an analogous TeX macro). This includes data gathered from the
+aux file.
-Don't warn if any unknown entry types are found in the F<.bib> file.
+=back
-=item B<--merge-wrglossary-records>
+For example: C<bib2gls --debug-mode io,catcode,sty-data mydoc>
-Merge an entry's B<wrglossary> records for the same page locations.
-(For use with the B<indexcounter> package option.)
+=item B<--default-encoding> I<name>
-=item B<--no-merge-wrglossary-records>
+Set the default character encoding for input and output files.
+If omitted, the JVM default encoding is assumed.
-Don't merge an entry's B<wrglossary> records.
+=item B<--dir> I<directory> (or B<-d> <directory>)
-=item B<--collapse-same-location-range>
+Files are relative to I<directory>. (This doesn't change the current
+working directory.)
-Collapse an explicit range that has a duplicate start and end
-location into a normal record (default).
+=item B<--expand-fields>
-=item B<--no-collapse-same-location-range>
+Don't write C<\glsnoexpandfields> to the F<.glstex> file.
-Don't collapse an explicit range that has a duplicate start and end
-location into a normal record.
+=item B<--force-cross-resource-refs> or B<-x>
-=item B<--retain-formats> I<list>
+Force cross-resource referencing mode on.
-Indicates which location formats should always be retained even if
-it causes a partial duplicate. Only exact duplicates will be merged.
+=item B<--group> or B<-g>
-=item B<--no-retain-formats>
+Add B<group> field to entries.
-Normal location merging rules apply (default).
+=item B<--help> or B<-h>
-=item B<--merge-nameref-on> I<rule>
+Display help message and exit.
-Rule for merging locations created with the B<record=nameref> package option
-(requires F<glossaries-extra.sty> version 1.37+). The I<rule> may be
-one of: B<hcounter>, B<href>, B<title> or B<location>.
+=item B<--ignore-packages> I<list> (or B<-k> I<list>)
-=item B<--force-cross-resource-refs> or B<-x>
+Don't parse the log file for the packages listed in I<list>. Note
+that B<--packages> overrides this option, so if the same package is
+listed in both B<--ignore-packages> and B<--packages> then the
+interpreter will check if it's supported. This option has a
+cumulative action. Only known packages may be included in
+I<list>.
-Force cross-resource referencing mode on.
+=item B<--interpret>
-=item B<--no-force-cross-resource-refs>
+Use the TeX Parser Library to interpret known (La)TeX commands
+(default).
-Don't force cross-resource referencing mode on (default).
+=item B<--list-known-packages>
-=item B<--support-unicode-script>
+Lists all the packages that have are known to the TeX parser
+library and then exits (with exit code 0). Any of the listed
+packages may be used in B<--packages> or B<--ignore-packages>.
-Text superscript (C<\textsuperscript>) or subscripts (C<\textsubscript>)
-will use Unicode superscript/subscript characters if available.
-For example, C<\textsuperscript{2}> will be converted to U+00B2
-(superscript two).
+=item B<--locale> I<lang> (or B<-l> I<lang>)
-=item B<--no-support-unicode-script>
+Use language resource file for I<lang> (which should be an IETF
+locale tag).
-Text superscript (C<\textsuperscript>) or subscripts (C<\textsubscript>)
-won't be converted to Unicode superscript/subscript characters.
-For example, C<\textsuperscript{2}> will be converted to C<E<lt>supE<gt>2E<lt>/supE<gt>>
-and the markup will be stripped leaving just the character 2.
+=item B<--log-encoding> I<name>
-=item B<--packages> I<list> (or B<-p> I<list>)
+Set the character encoding for the F<log> files (which may not be
+the same as the encoding for the document LaTeX files).
-Instruct the TeX parser library to pretend the packages listed
-in I<list> have been used by the document. Note that there's only a
-limited number of packages supported by the TeX parser library.
-This option has a cumulative action so B<--packages wasysym,pifont>
-is the same as B<--packages wasysym --packages pifont>.
+=item B<--log-file> I<file> (or B<-t> <file>)
-You can find out the list of supported packages with
-B<--list-known-packages>.
+Set the transcript file.
-=item B<--custom-packages> I<list>
+=item B<--merge-nameref-on> I<rule>
-Instruct the TeX parser library to attempt to parse the
-packages listed in I<list>. This is intended for simple custom
-packages that don't contain complex code.
+Rule for merging locations created with the B<record=nameref> package option
+(requires F<glossaries-extra.sty> version 1.37+). The I<rule> may be
+one of: B<hcounter>, B<href>, B<title> or B<location>.
-=item B<--ignore-packages> I<list> (or B<-k> I<list>)
+=item B<--merge-wrglossary-records>
-Don't parse the log file for the packages listed in I<list>. Note
-that B<--packages> overrides this option, so if the same package is
-listed in both B<--ignore-packages> and B<--packages> then the
-interpreter will check if it's supported. This option has a
-cumulative action. Only known packages may be included in
-I<list>.
+Merge an entry's B<wrglossary> records for the same page locations.
+(For use with the B<indexcounter> package option.)
-=item B<--list-known-packages>
+=item B<--mfirstuc-math-protection>
-Lists all the packages that have are known to the TeX parser
-library and then exits (with exit code 0). Any of the listed
-packages may be used in B<--packages> or B<--ignore-packages>.
+Switch on the auto-insertion of an empty group for math-shift (C<$>).
+
+If F<mfirstuc> v2.08+, F<glossaries> v4.50+ and F<glossaries-extra> v1.49+
+are detected, the default will be B<--no-mfirstuc-math-protection>
+as there should no longer be any need for this protection.
=item B<--mfirstuc-protection> I<fields>|B<all> (or B<-u> I<fields>|B<all>)
@@ -225,54 +221,149 @@ If F<mfirstuc> v2.08+, F<glossaries> v4.50+ and F<glossaries-extra> v1.49+
are detected, the default will be B<--no-mfirstuc-protection>
as there should no longer be any need for this protection.
-=item B<--no-mfirstuc-protection>
+=item B<--nested-link-check> I<list>|B<none>
-Switch off the auto-insertion of an empty group for all fields.
+Check each field listed in I<list> for potentially problematic
+nested link text. (Default list: name, text, plural, first,
+firstplural, short, shortplural, long, longplural, symbol).
-=item B<--mfirstuc-math-protection>
+If B<none>, disable check.
-Switch on the auto-insertion of an empty group for math-shift (C<$>).
+=item B<--no-break-space>
-If F<mfirstuc> v2.08+, F<glossaries> v4.50+ and F<glossaries-extra> v1.49+
-are detected, the default will be B<--no-mfirstuc-math-protection>
-as there should no longer be any need for this protection.
+Interpret C<~> (tilde) and C<\nobreakspace> as a non-breaking space (default).
+
+=item B<--no-cite-as-record>
+
+Don't check for instances of C<\citation> in the F<.aux> file (default).
+
+=item B<--no-collapse-same-location-range>
+
+Don't collapse an explicit range that has a duplicate start and end
+location into a normal record.
+
+=item B<--no-debug> (or B<--nodebug>)
+
+Switch off debug mode. (Equivalent to B<--debug> B<0>)
+
+=item B<--no-expand-fields>
+
+Write C<\glsnoexpandfields> to the F<.glstex> file (default).
+
+=item B<--no-force-cross-resource-refs>
+
+Don't force cross-resource referencing mode on (default).
+
+=item B<--no-group>
+
+Don't add B<group> field to entries (default).
+
+=item B<--no-interpret>
+
+Don't try interpreting (La)TeX commands. The TeX Parser Library will
+still be used to parse the F<aux> and F<bib> files.
+
+=item B<--no-merge-wrglossary-records>
+
+Don't merge an entry's B<wrglossary> records.
=item B<--no-mfirstuc-math-protection>
Switch off the auto-insertion of an empty group for math-shift (C<$>).
-=item B<--nested-link-check> I<list>|B<none>
-
-Check each field listed in I<list> for potentially problematic
-nested link text. (Default list: name, text, plural, first,
-firstplural, short, shortplural, long, longplural, symbol).
+=item B<--no-mfirstuc-protection>
-If B<none>, disable check.
+Switch off the auto-insertion of an empty group for all fields.
=item B<--no-nested-link-check>
Don't check for potentially problematic nested link text.
(Equivalent to B<--nested-link-check> B<none>)
-=item B<--shortcuts> I<option>
+=item B<--no-obey-aux-catcode>
-Check for the shortcut commands when searching for dependencies.
-Permitted values of I<option>: B<acronyms> (or B<acro>), B<ac>,
-B<abbreviations> (or B<abbr>), B<all> (or B<true>), B<none> (or
-B<false>). This overrides the setting given in I<auxfile>.
+Ignore category code changing commands encountered in the aux file.
-=item B<--map-format> I<key>B<:>I<value>[B<,>I<key>B<:>I<value>]* (or
-B<-m> I<key>B<:>I<value>[B<,>I<key>B<:>I<value>]*)
+=item B<--no-provide-glossaries>
-Set location format mappings.
+Don't write C<\provideignoredglossary*> to the F<.glstex> file to
+provide unknown glossaries except in documented situations
+(B<master>, B<secondary> and B<trigger-type> resource options).
+This setting is the default.
-=item B<--group> or B<-g>
+=item B<--no-record-count>
-Add B<group> field to entries.
+Don't add record count field to entries (default).
+This option automatically implements B<--no-record-count-unit>.
-=item B<--no-group>
+=item B<--no-record-count-unit>
-Don't add B<group> field to entries (default).
+Don't add unit record count field to entries (default).
+
+=item B<--no-replace-quotes>
+
+Don't replace quote characters (default).
+
+=item B<--no-retain-formats>
+
+Normal location merging rules apply (default).
+
+=item B<--no-support-unicode-script>
+
+Text superscript (C<\textsuperscript>) or subscripts (C<\textsubscript>)
+won't be converted to Unicode superscript/subscript characters.
+For example, C<\textsuperscript{2}> will be converted to C<E<lt>supE<gt>2E<lt>/supE<gt>>
+and the markup will be stripped leaving just the character 2.
+
+=item B<--no-trim-fields>
+
+Don't trim leading and trailing spaces from fields (default).
+This option cancels B<--trim-only-fields> and B<--trim-fields>.
+
+=item B<--no-verbose> (or B<--noverbose>)
+
+Switch off verbose mode. (Some messages will still be written to
+STDOUT.)
+
+=item B<--no-warn-non-bib-fields>
+
+Don't warn if internal non-bib fields are found in the F<.bib> file.
+The use of these internal fields can cause unexpected results, so
+only use this option if you have taken appropriate precautions.
+
+=item B<--no-warn-unknown-entry-types>
+
+Don't warn if any unknown entry types are found in the F<.bib> file.
+
+=item B<--obey-aux-catcode>
+
+Obey known category code changing commands encountered in the aux
+file.
+
+=item B<--packages> I<list> (or B<-p> I<list>)
+
+Instruct the TeX parser library to pretend the packages listed
+in I<list> have been used by the document. Note that there's only a
+limited number of packages supported by the TeX parser library.
+This option has a cumulative action so B<--packages wasysym,pifont>
+is the same as B<--packages wasysym --packages pifont>.
+
+You can find out the list of supported packages with
+B<--list-known-packages>.
+
+=item B<--provide-glossaries>
+
+Write C<\provideignoredglossary*> to the F<.glstex> file to provide
+unknown glossaries.
+
+=item B<--quiet> (or B<-q>)
+
+Only display error messages. All other messages are just written to
+the transcript file.
+
+=item B<--record-count> or B<-c>
+
+Add record count fields to entries.
=item B<--record-count-rule> I<rule> or B<-r> I<rule>
@@ -292,35 +383,50 @@ optional. If present it may be one of: C<and> (format AND counter
must match), C<or> (format OR counter must match). If I<op> is
omitted, AND is assumed.
-=item B<--record-count> or B<-c>
+=item B<--record-count-unit> or B<-n>
-Add record count fields to entries.
+Add unit record count fields to entries.
+This option automatically implements B<--record-count>.
-=item B<--no-record-count>
+=item B<--replace-quotes>
-Don't add record count field to entries (default).
-This option automatically implements B<--no-record-count-unit>.
+Replace single and double quote characters (C<'> and C<">) with
+C<\bibglsaposchar> and C<\bibglsdoublequotechar> in field values
+and group information written to the F<.glstex> file.
-=item B<--record-count-unit> or B<-n>
+=item B<--retain-formats> I<list>
-Add unit record count fields to entries.
-This option automatically implements B<--record-count>.
+Indicates which location formats should always be retained even if
+it causes a partial duplicate. Only exact duplicates will be merged.
-=item B<--no-record-count-unit>
+=item B<--shortcuts> I<option>
-Don't add unit record count field to entries (default).
+Check for the shortcut commands when searching for dependencies.
+Permitted values of I<option>: B<acronyms> (or B<acro>), B<ac>,
+B<abbreviations> (or B<abbr>), B<all> (or B<true>), B<none> (or
+B<false>). This overrides the setting given in I<auxfile>.
-=item B<--trim-fields>
+=item B<--map-format> I<key>B<:>I<value>[B<,>I<key>B<:>I<value>]* (or
+B<-m> I<key>B<:>I<value>[B<,>I<key>B<:>I<value>]*)
-Trim leading and trailing spaces from all fields.
-This option cancels B<--trim-only-fields> and B<--no-trim-fields>.
+Set location format mappings.
-=item B<--trim-only-fields> I<list>
+=item B<--silent>
-Trim leading and trailing spaces from only the listed fields.
-This option is cumulative but is cancelled by B<--trim-fields>
-and B<--no-trim-fields>. This option may not be used with
-B<--trim-except-fields>.
+Only display error messages. All other messages are just written to
+the transcript file. (Synonym of B<--quiet>.)
+
+=item B<--support-unicode-script>
+
+Text superscript (C<\textsuperscript>) or subscripts (C<\textsubscript>)
+will use Unicode superscript/subscript characters if available.
+For example, C<\textsuperscript{2}> will be converted to U+00B2
+(superscript two).
+
+=item B<--tex-encoding> I<name>
+
+Set the character encoding for the F<glstex> files. This overrides the
+setting given in I<auxfile>.
=item B<--trim-except-fields> I<list>
@@ -329,40 +435,33 @@ This option is cumulative but is cancelled by B<--trim-fields>
and B<--no-trim-fields>. This option may not be used with
B<--trim-only-fields>.
-=item B<--no-trim-fields>
-
-Don't trim leading and trailing spaces from fields (default).
-This option cancels B<--trim-only-fields> and B<--trim-fields>.
-
-=item B<--expand-fields>
+=item B<--trim-fields>
-Don't write C<\glsnoexpandfields> to the F<.glstex> file.
+Trim leading and trailing spaces from all fields.
+This option cancels B<--trim-only-fields> and B<--no-trim-fields>.
-=item B<--no-expand-fields>
+=item B<--trim-only-fields> I<list>
-Write C<\glsnoexpandfields> to the F<.glstex> file (default).
+Trim leading and trailing spaces from only the listed fields.
+This option is cumulative but is cancelled by B<--trim-fields>
+and B<--no-trim-fields>. This option may not be used with
+B<--trim-except-fields>.
-=item B<--provide-glossaries>
+=item B<--verbose>
-Write C<\provideignoredglossary*> to the F<.glstex> file to provide
-unknown glossaries.
+Switch on verbose mode.
-=item B<--no-provide-glossaries>
+=item B<--version> or B<-v>
-Don't write C<\provideignoredglossary*> to the F<.glstex> file to
-provide unknown glossaries except in documented situations
-(B<master>, B<secondary> and B<trigger-type> resource options).
-This setting is the default.
+Display version information and exit.
-=item B<--replace-quotes>
+=item B<--warn-non-bib-fields>
-Replace single and double quote characters (C<'> and C<">) with
-C<\bibglsaposchar> and C<\bibglsdoublequotechar> in field values
-and group information written to the F<.glstex> file.
+Warn if internal non-bib fields are found in the F<.bib> file.
-=item B<--no-replace-quotes>
+=item B<--warn-unknown-entry-types>
-Don't replace quote characters (default).
+Warn if any unknown entry types are found in the F<.bib> file.
=back
diff --git a/support/bib2gls/src/bib2gls.tex b/support/bib2gls/src/bib2gls.tex
index 652eaf6f92..2b9ece8e7c 100644
--- a/support/bib2gls/src/bib2gls.tex
+++ b/support/bib2gls/src/bib2gls.tex
@@ -290,6 +290,8 @@ documents}}
\newcommand*{\pdfLaTeX}{\hologo{pdfLaTeX}}
\newcommand{\langxml}{\hyperref[sec:lang.xml]{language resource file}}
+\newcommand{\texparserlib}{\hyperref[sec:texparserlib]{\TeX\ Parser
+Library}}
\newcommand{\hex}[1]{0x#1}
\newcommand{\hexsb}[1]{\textsubscript{\scriptsize\rmfamily#1}}
@@ -1380,14 +1382,13 @@ first \LaTeX\ run due to the unknown references being replaced with
when the reference is known.
Note that \bibgls\ is a Java application, and requires at least
-Java~8.\footnote{The \code{List.sort} method used to sort the
-entries was only introduced to Java~8.} Additionally,
-\sty{glossaries-extra} must be at least version 1.12. (Although
-the latest version is recommended.) This application was
-developed in response to the question
+Java~8. Additionally, \sty{glossaries-extra} must be at least
+version 1.12. These are minimum requirements, but the latest
+versions are recommended. This
+application was developed in response to the question
\qt{\href{http://tex.stackexchange.com/q/342544}{Is there a program
for managing glossary tags?}} on \TeX\ on
-StackExchange~\cite{tex.sx}. The \ext{bib} file can be managed in an
+StackExchange~\cite{tex.sx.2016}. The \ext{bib} file can be managed in an
application such as JabRef.
If you already have a \ext{tex} file containing
@@ -1430,7 +1431,8 @@ selection, cross-references and locations}, issue 41:3, 2020.
\renewcommand{\glslistitem}[1]{%
\item[\glsentryitem{#1}%
\glstarget{#1}{\glossentryname{#1}}]%
- \glsxtrifhasfield{useri}{#1}{\glsadd{\glscurrentfieldvalue}}{}%
+ \glsxtrifhasfield{useri}{#1}%
+ {\glsadd[format=glsnumberformat]{\glscurrentfieldvalue}}{}%
}
}
@@ -1479,7 +1481,7 @@ manual~\cite{glossaries-extra} for information
on the differences between the basic package and the extended
package, as some of the default settings are different.
-Since the information used by \bibgls\ is
+Since information required by \bibgls\ is
written to the \iext{aux} file, it's not possible to run \bibgls\
through \TeX's shell escape while the \ext{aux} file is open for
write access. (The \ext{aux} file is closed \emph{after} the end
@@ -1495,6 +1497,106 @@ automatically with the \styopt{automake} option if the \ext{aux}
file exists. (Remember that this will require the shell escape to be
enabled.)
+\section{Default Encoding}
+\label{sec:defencoding}
+
+Both \XeLaTeX\ and \LuaLaTeX\ default to UTF-8 \igls{encoding}. With modern \TeX\
+distributions, \pdfLaTeX\ also defaults to UTF-8 but may be changed
+with the \sty{inputenc} package.
+
+The default encoding for Java applications, such as \bibgls, is the
+default encoding of the \idx{JVM}. This typically matches the
+operating system's default, but can be changed (see below). If you don't want
+to alter the \idx{JVM}['s] default, you can set the \bibgls\ default
+with \longarg{default-encoding}.
+
+In general, UTF-8 works best with \bibgls, but you need to be careful if your
+\idx{JVM} isn't set up to use UTF-8 by default as you can end
+up with encoding mismatches. This can happen with some versions of
+Windows, so it's a good idea to double-check the \bibgls\ transcript
+file to make sure all the encoding information is correct.
+
+The default encoding is written at the start of the \ext{glg} file.
+For example:
+\begin{verbatim}
+Default encoding: UTF-8
+\end{verbatim}
+When a file is opened, the associated encoding is written to the \ext{glg}
+file. For example, when the \ext{aux} file is opened:
+\begin{verbatim}
+Reading myDoc.aux
+Encoding: UTF-8
+\end{verbatim}
+If the document encoding is detected in the \ext{aux} file, it will
+be written to the transcript. For example:
+\begin{verbatim}
+TeX character encoding: UTF-8
+\end{verbatim}
+When a \ext{bib} file is read, the \csopt{charset} setting,
+the detected encoding (from the encoding comment line,
+see \sectionref{sec:bibencoding}), if found, and the encoding
+actually used are written. For example, where \csopt{charset} hasn't
+been set but an encoding comment line has been found:
+\begin{verbatim}
+Parsing bib files for resource myDoc.glstex.
+Default encoding: not set
+Detected encoding: UTF-8
+Reading symbols.bib
+Encoding: UTF-8
+\end{verbatim}
+
+The file encodings used by \bibgls\ are as follows:
+\begin{itemize}
+\item Writing the \iext{glg} transcript file: default encoding.
+
+\item Reading the document \iext{log} file: \longarg{log-encoding}
+setting, if supplied, otherwise the default encoding.
+
+Note that the \ext{log} file may not have the same encoding as the
+\ext{tex} file~\cite{tex.sx.2013}. In the case of the T1 font
+encoding, the encoding will be close enough to ISO-8859-1 for that
+to be used with \bibgls. Any problematic character will trigger a
+warning and \bibgls\ will quit reading the file. This will most
+likely be in an overfull warning, by which point \bibgls\ should
+have gathered all the information it requires.
+
+\item Reading the \iext{aux} file: the \longarg{tex-encoding}
+setting, if supplied, or UTF-8 if \sty{fontspec} is detected in the
+\ext{log} file, otherwise the default encoding.
+
+\item Reading the \iext{bib} files: the \csopt{charset} resource
+option, if supplied, or the encoding specified by the encoding
+comment line in the \ext{bib} file (see
+\sectionref{sec:bibencoding}), otherwise the default encoding.
+
+\item Writing the \iext{glstex} files: the \longarg{tex-encoding}
+setting, if supplied, or UTF-8 if \sty{fontspec} detected in the
+\ext{log} file, or the document encoding picked up from the
+\ext{aux} file, otherwise the default encoding.
+\end{itemize}
+For example:
+\begin{verbatim}
+bib2gls --log-encoding ISO-8859-1 --default-encoding UTF-8 myDoc
+\end{verbatim}
+
+To change the default \igls{encoding} for the \idx{JVM} set the
+\code{JAVA\_TOOL\_OPTIONS} environment variable to include
+\code{-Dfile.encoding=\meta{encoding}} where \meta{encoding} is the
+desired default encoding (such as UTF-8). Note that this will
+affect all your installed Java applications, not just \bibgls, (for
+example, JabRef).
+
+If you have a problem with non-ASCII characters not displaying
+correctly in your document:
+\begin{itemize}
+\item Check that the file \gls{encoding} of your document \ext{tex}
+and \ext{bib} files have been correctly set by your text editor.
+\item Check that your document supports that \gls{encoding} (for example,
+through the \isty{inputenc} package).
+\item Check \bibgls's transcript file for the encoding information
+to ensure that the settings are correct.
+\end{itemize}
+
\section{Example Use}
The glossary entries are stored in a \ext{bib} file. For
example, the file \filefmt{entries.bib} might contain:
@@ -2307,11 +2409,12 @@ so you can change the above to the following:
}
\end{codeenv}
-This will locally define the quarks listed below. Since \cs{glsxtrresourceinit}
-is scoped so that it only has an effect within the protected write,
-this shouldn't interfere with the corresponding commands that are required in
-the document. Note that these quarks should only be used in their
-designated contexts.
+This will locally define the quarks listed below. Since
+\cs{glsxtrresourceinit} is used in a scoped context, the
+definitions only have an effect within the protected write, and so this
+shouldn't interfere with the corresponding commands that are
+required in the document. Note that these quarks should only be used
+in their designated contexts.
\begin{description}
@@ -2357,7 +2460,7 @@ syntax recognises \gls{LEN}, \gls{CAT}, \gls{IN}, \gls{NIN}, \gls{PREFIXOF},
\end{description}
Finally, this isn't actually a quark, but \inlinedef{cs} is defined
-to expand to the literal string \csfmt{csname} so you can use it for any
+to expand to the literal string \csfmt{\meta{csname}} so you can use it for any
other escape sequences that aren't covered above. For example,
\code{\gls{cs}\marg{n}} for a newline \ics{n}.
@@ -2729,15 +2832,15 @@ well (unless the document has a different definition that doesn't
have this unbounded recursion).
The \file{texparserlib.jar} library is not a \TeX\ engine and there
-are plenty of situations where it doesn't work. In particular, in
-this case it's being used in a fragmented context without knowing
+are plenty of situations where it doesn't work. In particular, with
+\bibgls, it's being used in a fragmented context without knowing
most of the packages used by the document or any custom commands or
environments provided within the document.
\bibgls\ can detect from the log file a small
number of packages that the parser recognises. Note that in
some cases there's only very limited support. For example,
-\isty{siunitx}'s \ics{si} command is recognised but other
+\isty{siunitx}'s \ics{si} and \ics{unit} commands are recognised but other
commands from that package aren't. See
\longargpageref{list-known-packages} for further details.
@@ -2805,8 +2908,39 @@ rule that recognises these Unicode characters (for example,
\csopt[custom]{sort},
\csopt[\cs{glshex}2694 \string< \cs{glshex}2693 \string< \cs{glshex}26BD]{sort-rule}).
+Another approach is to use \ics{IfTeXParserLib}, which is defined by
+the \texparserlib\ to expand to its first argument. The
+\sty{glossaries-extra-bib2gls} package provides a definition that
+expands to its second argument, so that command may be used to
+provide alternative code. For example:
+\begin{codeenv}
+\atentry{preamble}\marg{\qtdelim{\cs{providecommand}\marg{\cmd{Ord}}[1]\marg{\comment{}
+ \cs{IfTeXParserLib}
+ \marg{\ics{bibglspaddigits}\marg{2}\marg{\idx{param}1}}\comment{interpreter}
+ \marg{\cs{MakeUppercase}\marg{\cmd{romannumeral} \idx{param}1}}\comment{document}
+}}}
+\atentry{index}\marg{John-IV,
+ \field{name}=\marg{John\idx{nbspchar}\cmd{Ord}\marg{4}}
+}
+\atentry{index}\marg{John-VI,
+ \field{name}=\marg{John\idx{nbspchar}\cmd{Ord}\marg{6}}
+}
+\atentry{index}\marg{John-IX,
+ \field{name}=\marg{John\idx{nbspchar}\cmd{Ord}\marg{9}}
+}
+\atentry{index}\marg{John-XII,
+ \field{name}=\marg{John\idx{nbspchar}\cmd{Ord}\marg{12}}
+}
+\end{codeenv}
+The sort values for these entries will be: \qt{John 04}, \qt{John
+06}, \qt{John 09} and \qt{John 12}, but in the document text they
+will be typeset as \qt{John~IV}, \qt{John~VI}, \qt{John~IX} and
+\qt{John~XII}. Note that \ics{bibglspaddigits} is only recognised by
+the \bibgls\ interpreter. Alternatively, you can use the
+\csopt{sort-number-pad} option to pad the numbers.
+
\TeX\ syntax can be quite complicated and, in some cases, far too
-complicated for simple \idxpl!{regex}. The \TeX\ parser library performs
+complicated for simple \idxpl!{regex}. The \texparserlib\ performs
better than a simple pattern match, and that's the purpose of
\file{texparserlib.jar} and why it's used by \bibgls\ (and by
\idx!{convertgls2bib}). When the \longarg{debug} mode is on, any
@@ -3120,17 +3254,6 @@ Display the help message and quit.
Display the version information and quit. As from v2.5, this now
includes the version number of the \file{texparserlib.jar} library.
-\argsection{debug}
-
-Switch on debugging mode. If \meta{n} is present, it must be a
-non-negative integer indicating the debugging level. If omitted 1 is
-assumed. This option also switches on the verbose mode. A value of 0
-is equivalent to \longargfmt{no-debug}.
-
-\argsection{no-debug}
-
-Switches off the debugging mode.
-
\argsection{verbose}
Switches on the verbose mode. This writes extra information to the
@@ -3388,6 +3511,100 @@ Don't automatically set the \field{group} field with
group style, such as \glostyle{indexgroup}, is used (unless the
\field{group} field is set to a custom value).
+\argsection{debug}
+
+Sometimes when things go wrong it can be hard to diagnose the problem
+from the normal messages. If you report an issue, you may be asked
+to switch on debugging mode to help identify a non-reproducible
+error and provide the transcript file.
+
+The \longargfmt{debug} option can be used to switch on debugging mode.
+If \meta{n} is present, it must be a non-negative integer indicating
+the debugging mode. If omitted, 1 is assumed. This option also
+switches on the verbose mode. A value of 0 is equivalent to
+\longargfmt{no-debug}.
+
+The value of \meta{n} determines how much extra information is
+provided. If \meta{n} is greater than 0 then all \bibgls\ debugging
+information is written. The amount of debugging information provided
+by the \texparserlib\ is determined by a bitwise operation on
+\meta{n}. For example, if \meta{n} is 1 then I/O information is
+included. If \meta{n} is 2 then information is included when an
+object is popped off a stack. If \meta{n} is 3 then both I/O and
+popped information is provided.
+
+Note that messages such as \qt{Can't find language resource} or
+about a failed \idx{kpsewhich} call are informational and don't
+necessarily mean an error has occurred. Error messages will always
+be written to the transcript regardless of the debug or verbose
+setting. An error message will start with \qt{Error:~} and a warning
+message will start with \qt{Warning:~}. Unknown commands will throw
+an exception with a stack trace in debug mode.
+
+\argsection{debug-mode}
+
+This option is an alternative to \longargfmt{debug} where the value
+of \meta{n} needs to be calculated. The \meta{setting} is
+required and should be a comma-separated list of any of the
+following keywords.
+
+\begin{itemize}
+\item\optfmt{all}: enable all debugging information
+(likely to result in a very large transcript file).
+
+\item\optfmt{catcode}: \texparserlib\ category code changes.
+
+\item\optfmt{cs}: \texparserlib\ command definitions.
+
+\item\optfmt{decl}: information about declarations.
+
+\item\optfmt{expansion}: \texparserlib\ expansions
+(may result in a large transcript file).
+
+\item\optfmt{expansion-list}: \texparserlib\ stack expansions
+(may result in a large transcript file).
+
+\item\optfmt{expansion-once}: \texparserlib\ one-level expansions
+(may result in a large transcript file).
+
+\item\optfmt{expansion-once-list}: \texparserlib\ one-level list expansions
+(may result in a large transcript file).
+
+\item\optfmt{io}: I/O information, such as opening or closing files
+and fetching tokens.
+
+\item\optfmt{popped}: information about objects popped from stacks.
+
+\item\optfmt{process}: \texparserlib\ macro process
+(may result in a large transcript file).
+
+\item\optfmt{process-generic-cs}: \texparserlib\ generic command process.
+
+\item\optfmt{process-stack}: \texparserlib\ stack process
+(may result in a large transcript file).
+
+\item\optfmt{process-stack-list}: \texparserlib\ stack process with
+list detail (may result in a large transcript file).
+
+\item\optfmt{read}: \texparserlib\ file codepoint read
+(likely to result in a very large transcript file).
+
+\item\optfmt{sty-data}: data associated with packages used to store
+information that may not exactly correspond to the way the
+information is stored in \LaTeX. In the case of \bibgls, this will
+typically just be data read from recognised \iext{aux} commands.
+
+\end{itemize}
+
+For example:
+\begin{alltt}
+bib2gls \longargfmt{debug-mode} catcode,sty-data \meta{filename}
+\end{alltt}
+
+\argsection{no-debug}
+
+Switches off the debugging mode. Equivalent to \longarg{debug}~0.
+
\section{File Options}
\argsection{dir}
@@ -3445,48 +3662,51 @@ bib2gls -d tmp mydoc
\argsection{log-file}
-Sets the name of the transcript file. By default, the name is the
+Sets the name of the \bibgls\ transcript file. By default, the name is the
same as the \iext{aux} file but with a \iext{glg} extension. Note that
if you use \bibgls\ in combination with \idx{xindy} or
\idx{makeindex}, you will need to change the transcript file name to
prevent conflict.
-\argsection{tex-encoding}
+The transcript file encoding is governed by
+\longarg{log-encoding}.
-\bibgls\ tries to determine the character \igls{encoding} to use for the
-output files. If the document has loaded the \isty{inputenc} package then
-\bibgls\ can obtain the value of the \gls{encoding} from the
-\iext{aux} file. This is then converted to a name
-recognised by Java. For example, \code{utf8} will be mapped to
-\code{UTF-8}. If the \isty{fontspec} package has been loaded,
-\styfmt{glossaries-extra} will assume the \gls{encoding} is \code{utf8} and
-write that value to the \ext{aux} file.
-
-If neither package has been loaded, \bibgls\ will assume the \idx{JVM}['s]
-default \gls{encoding} (identified by the \code{file.encoding} property). If this is
-incorrect or if \bibgls\ can't work out the appropriate mapping then you can
-specify the correct \gls{encoding} using \longargfmt{tex-encoding} \meta{name} where
-\meta{name} is the \gls{encoding} name (such as \code{UTF-8}).
+\argsection{tex-encoding}
-If you have a problem with non-ASCII characters not displaying
-correctly in your document:
-\begin{itemize}
-\item Check that the file \gls{encoding} of your document \ext{tex} file (or files)
-has been correctly set by your text editor.
-\item Check that your document supports that \gls{encoding} (for example,
-through the \isty{inputenc} package).
-\item Check \bibgls's transcript file (\ext{glg}) for the line that
-starts
-\begin{verbatim}
-TeX character encoding:
-\end{verbatim}
-This should be followed by the \gls{encoding} used by \bibgls\ when
-creating the \ext{glstex} files. If this is incorrect use
-\longargfmt{tex-encoding}.
-\item Check that the \gls{encoding} of the \ext{bib} files (set by your
-text editor or bibliographic management system) matches the \gls{encoding}
-line in the \ext{bib} file or the \csopt{charset} resource option.
-\end{itemize}
+In general, it's best to have all your files (\ext{aux}, \ext{bib}
+and \iext{glstex}) in the same \igls{encoding} that matches your
+default encoding (see \sectionref{sec:defencoding}). However, if
+your \iext{aux} and \iext{glstex} files have a different encoding to
+your default, you can use \longarg{tex-encoding} to specify the
+\TeX\ encoding. If omitted the default encoding is used. See
+\sectionref{sec:defencoding}.
+
+Note that \bibgls\ will try to detect the document encoding from the
+\ext{aux} file to ensure that the \iext{glstex} files match it.
+However, at that point, it's too late to establish the encoding of
+the \ext{aux} file, which has already been opened. So if the
+\ext{aux} file encoding doesn't match the default encoding, you can
+specify the correct encoding to use with \longarg{tex-encoding}.
+
+If you are using \sty{fontspec}, \bibgls\ can detect this
+from the \ext{log} file instead and will assume UTF-8.
+
+\argsection{log-encoding}
+
+The \igls{encoding} of the \iext{log} file. If omitted, the default
+encoding will be used. See \sectionref{sec:defencoding}. (Note
+that the \ext{log} file may not have the same encoding as the
+\ext{tex} file~\cite{tex.sx.2013}.)
+
+\argsection{default-encoding}
+
+The default \igls{encoding} used by \bibgls\ to read and write files is
+governed by the \idx{JVM}. This typically matches your operating
+system's default encoding. If this is incorrect, you can either
+globally change the encoding for the \idx{JVM}, which will affect
+all Java applications installed on your device, or you can use
+\longarg{default-encoding} just to set the default for \bibgls.
+See \sectionref{sec:defencoding}.
\section{Interpreter Options}
@@ -3498,8 +3718,8 @@ space. Similarly \ics{nobreakspace} just produces a space.
\argsection{no-break-space}
The interpreter treats a tilde character \idx{nbspchar} as a non-breakable
-space (default). Similarly \ics{nobreakspace} produces a
-non-breakable space character (\hex{00A0}).
+space (default). Similarly the interpreter will define
+\ics{nobreakspace} to produce a non-breakable space character (\hex{00A0}).
\argsection{custom-packages}
@@ -3535,8 +3755,8 @@ for more details about the interpreter.
\argsection{list-known-packages}
-This option will list all the packages supported by the \TeX\ parser
-library and will then exit \bibgls. The results are divided into two
+This option will list all the packages supported by the \texparserlib\
+and will then exit \bibgls. The results are divided into two
sections: those packages that are searched for in the \iext{log}
file and those packages that aren't searched for in the \iext{log}
file but have some support available. Some of the support is very
@@ -3587,7 +3807,7 @@ This option has a cumulative action so \code{\longarg{packages}
\longarg{packages} pifont}.
Note that there's only a limited number of packages supported by the
-\TeX\ parser library. This option is provided for cases where you're
+\texparserlib. This option is provided for cases where you're
using a command from a package that the interpreter doesn't support
but it happens to have the same name and meaning as a command from
a package that the interpreter does support. You can also use it to
@@ -4342,10 +4562,12 @@ prefixed label.
\section{Encoding}
\label{sec:bibencoding}
-Avoid \idx{non-ASCII} characters in the \meta{id} if your document uses the
-\isty{inputenc} package.
-(This isn't a problem for \XeLaTeX\ or
-\LuaLaTeX, but you still need to avoid special characters.)
+If you are using \XeLaTeX\ or \LuaLaTeX\ (which are natively UTF-8)
+or if you are using a modern \TeX\ distribution \pdfLaTeX\ with
+UTF-8 support, then you can have UTF-8 characters in the \meta{id}
+of your entries. (Avoid \TeX\ special characters, active characters
+or characters that are part of the \ext{bib} syntax.)
+
You can set the character \igls{encoding} in the \ext{bib} file using:
\begin{codeenv}
\idx{commentchar} Encoding: \meta{encoding-name}
@@ -4363,12 +4585,15 @@ If you don't use either method \bibgls\ will
have to search the entire \ext{bib} file, which is inefficient and
you may end up with a mismatched \gls{encoding}.
-Note that recent changes to the \LaTeX\ kernel now allow
-\idx{non-ASCII} characters in labels when using commands such as
-\cs{label} (with \sty{inputenc}). The commands used by the
-\sty{glossaries} package are more complicated, but changes have been
-made in \sty{glossaries} v4.47 and \sty{glossaries-extra} v1.46 to
-help support this, however it hasn't been fully tested.
+\begin{important}
+The encoding comment line must come before any non-ASCII content
+otherwise a malformed input error may occur while parsing the file
+for the comment line.
+\end{important}
+
+If there is no encoding line in the \ext{bib} file and the
+\csopt{charset} option hasn't been used, then the default encoding
+will be assumed (see \sectionref{sec:defencoding}).
\section{Comments}
\label{sec:bibcomments}
@@ -4667,7 +4892,7 @@ definition within the document (if it's already been defined before
the resource file is input). In general, it's best to just use
\cs{providecommand}.
-The \TeX\ parser library used by \bibgls\ will parse the contents of
+The \texparserlib\ used by \bibgls\ will parse the contents of
\atentry{preamble} before trying to interpret the field value used
as a \hyperref[sec:fallbacks]{fallback} when \field{sort} is omitted (unless
\csopt[false]{interpret-preamble} is set in the resource options).
@@ -4691,7 +4916,7 @@ Neither entry has the \field{sort} field, so \bibgls\ has to fall
back on the \field{name} field and, since this contains the special
characters \idx{escchar} (backslash), \idx{mshiftchar} (maths
shift), \idx{bgroupchar} (begin group) and
-\idx{egroupchar} (end group), the \TeX\ parser library is used to interpret it.
+\idx{egroupchar} (end group), the \texparserlib\ is used to interpret it.
The definitions provided by \atentry{preamble} allow \bibgls\ to
deduce that the \field{sort} value of the \code{S} entry is just
\code{S} and the \field{sort} value of the \code{card} entry is
@@ -8169,7 +8394,8 @@ the \gls{encoding} in the \ext{bib} file where it can also be read by
a \ext{bib} managing systems, such as JabRef.
See \longarg{tex-encoding} for the \gls{encoding} used to write the \ext{glstex}
-file.
+file, and see \sectionref{sec:defencoding} for information about the
+default encoding.
\optsection{locale}
@@ -13047,7 +13273,7 @@ contains the required \cs{MFUnocap} commands (in a similar style to
The \bibgls\ word-boundary implementation is slightly different with
this setting than with the \cs{capitalisewords} command (implemented
-in \TeX\ or by the \TeX\ parser library when interpreting field
+in \TeX\ or by the \texparserlib\ when interpreting field
values). Only words in the exclusion list that start with an
alphabetical character can be matched. Punctuation following a
word-boundary is not considered part of the next word.
@@ -16798,7 +17024,9 @@ and \textsuperscript{2} (\hex{00B2}).
As with the letter sort methods, letters are compared using a
character code comparison not by a locale alphabet. The closest
locale-sensitive equivalent is to use \csopt{sort-number-pad} with a
-locale sort method.
+locale sort method. Alternatively, use \ics{IfTeXParserLib} and
+\ics{bibglspaddigits} to pad the number for the interpreter but
+not in the \TeX\ document.
\begin{figure}
\figcontents
@@ -18370,7 +18598,7 @@ digits that don't belong to the \qt{Number, Decimal Digit} category.
The plain \optfmt{space-zero} alternatives are more efficient as
they just perform a simple substitution.
-The \TeX\ parser library used by \bibgls\ recognises the standard
+The \texparserlib\ used by \bibgls\ recognises the standard
\LaTeX\ text-mode commands \ics{textsuperscript}\margm{text} and
\ics{textsubscript}\margm{text}
and will use the Unicode superscript or subscript characters if they cover every
@@ -22487,7 +22715,7 @@ If \csopt{save-definition-index} has been set this command expands to the
\gls{definitionindex} of the entry identified by \meta{label}. This
command will only be provided in the \ext{glstex} file if
\csopt{save-definition-index} has been set. However, the command is
-always defined by the \hyperref[sec:texparserlib]{\TeX\ parser library}
+always defined by the \texparserlib\
but will expand to empty if the associated resource option hasn't
been set.
@@ -22498,7 +22726,7 @@ If \csopt{save-use-index} has been set this command expands to the
\gls{orderofuseindex} of the entry identified by \meta{label}. This
command will only be provided in the \ext{glstex} file if
\csopt{save-use-index} has been set. However, the command is
-always defined by the \hyperref[sec:texparserlib]{\TeX\ parser library}
+always defined by the \texparserlib\
but will expand to empty if the associated resource option hasn't
been set.
@@ -22767,10 +22995,10 @@ Display version information and quit.
This application recognises the commands listed below as well as
some standard commands such as \ics{newcommand}. Avoid any overly
-complicated code within the \ext{tex} file. The
-\hyperref[sec:texparserlib]{\TeX\ parser library} isn't a \TeX\ engine! The
+complicated code within the \ext{tex} file. The \texparserlib\
+isn't a \TeX\ engine! The
\ext{tex} file doesn't need to be a complete document, but if you want certain
-commands recognised from packages that the \TeX\ parser library supports,
+commands recognised from packages that the \texparserlib\ supports,
you'll need to include \ics{usepackage} in the \ext{tex} file. If
you want to quit parsing the \ext{tex} file at the start of the
document, use the \convertglsbiblongarg{preamble-only} switch.
@@ -23644,7 +23872,7 @@ maths mode. These are all defined with \atentry{symbol}, which means
that by default the \field{sort} field will be obtained from the
label not from the \field{name} field. However, if you want to sort
by the \field{name} field (for example, with \csopt[name]{sort-field})
-the \TeX\ parser library recognises all the mathematical Greek letter commands
+the \texparserlib\ recognises all the mathematical Greek letter commands
provided in the \LaTeX\ kernel. Additionally it recognises
\ics{omicron} which isn't provided by \LaTeX\ (the symbol can be
reproduced with a \idx!{lowercase} Latin \qt{o}). Note that
@@ -23678,7 +23906,7 @@ but \LaTeX\ needs a definition for this, so it's provided in the
\atentry{preamble}\marg{\qtdelim{\cs{providecommand}\marg{\cs{omicron}}\marg{o}}}
\end{codeenv}
(With \sty{glossaries-extra} v1.27+, this is no longer needed.)
-The \TeX\ parser library and \sty{glossaries-extra-bib2gls}
+The \texparserlib\ and \sty{glossaries-extra-bib2gls}
similarly provide the missing \idx!{uppercase}
Greek letters, and these can be dealt with in the same way.
@@ -23700,7 +23928,7 @@ This file also has a preamble:
\end{codeenv}
The first command \inlinedef{bigoperatornamefmt}
is used in the \field{name} field to display both the in-line and display
-versions of the symbol. The \TeX\ parser library only has a limited ability to
+versions of the symbol. The \texparserlib\ only has a limited ability to
interpret this as not all the symbols have Unicode in-line and large versions.
In some cases, such as the integral symbol $\int$, there is only a small
version. (A large version would require construction from \hex{2320},
@@ -27219,7 +27447,7 @@ Note that this is a total of 15~glossaries (including the
require 16 write registers (including the write register used to
create the indexing style file), and a total of $15\times3 + 1 = 46$
associated files. (This doesn't include the standard \ext{aux} file
-and the \ext{out} file created by \sty{hyperref}.) With \bibgls, no
+or the \iext{out} file created by \sty{hyperref}.) With \bibgls, no
additional write registers are required and the number of associated
\bibgls\ files is equal to the number of resource commands plus the
transcript file (in this example, $9+1=10$).
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 1abc5748ce..da01fe6483 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -1,10 +1,6 @@
$mirrors = {
'Africa' => {
- 'Morocco' => {
- 'https://mirror.marwan.ma/ctan/' => 1,
- },
'South Africa' => {
- 'http://ftp.sun.ac.za/ftp/CTAN/' => 1,
'https://mirror.ufs.ac.za/ctan/' => 1,
},
},
@@ -18,11 +14,11 @@ $mirrors = {
'https://mirrors.cqu.edu.cn/CTAN/' => 1,
'https://mirrors.hit.edu.cn/CTAN/' => 1,
'https://mirrors.jlu.edu.cn/CTAN/' => 1,
- 'https://mirrors.nju.edu.cn/CTAN/' => 1,
'https://mirrors.pku.edu.cn/ctan/' => 1,
'https://mirrors.sjtug.sjtu.edu.cn/ctan/' => 1,
'https://mirrors.sustech.edu.cn/CTAN/' => 1,
'https://mirrors.tuna.tsinghua.edu.cn/CTAN/' => 1,
+ 'https://mirrors.ustc.edu.cn/CTAN/' => 1,
'https://mirrors.zju.edu.cn/CTAN/' => 1,
},
'India' => {
@@ -38,7 +34,6 @@ $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,
},
'Korea' => {
@@ -46,9 +41,6 @@ $mirrors = {
'https://lab.uklee.pe.kr/tex-archive/' => 1,
'https://mirror.navercorp.com/CTAN/' => 1,
},
- 'Taiwan' => {
- 'https://ctan.mirror.twds.com.tw/tex-archive/' => 1,
- },
'Thailand' => {
'https://mirror.kku.ac.th/CTAN/' => 1,
},
@@ -58,44 +50,25 @@ $mirrors = {
'https://mirror.easyname.at/ctan/' => 1,
'https://mirror.kumi.systems/ctan/' => 1,
},
- 'Belarus' => {
- 'https://mirror.datacenter.by/pub/mirrors/CTAN/' => 1,
- },
'Czech Republic' => {
'http://ftp.cvut.cz/tex-archive/' => 1,
- 'https://mirrors.nic.cz/tex-archive/' => 1,
- },
- 'Finland' => {
- 'https://www.nic.funet.fi/pub/TeX/CTAN/' => 1,
- 'https://www.texlive.info/CTAN/' => 1,
},
'France' => {
'https://ctan.gutenberg-asso.fr/' => 1,
'https://ctan.mines-albi.fr/' => 1,
'https://ctan.tetaneutral.net/' => 1,
'https://distrib-coffee.ipsl.jussieu.fr/pub/mirrors/ctan/' => 1,
- 'https://mirror.ibcp.fr/pub/CTAN/' => 1,
'https://mirrors.ircam.fr/pub/CTAN/' => 1,
- 'https://texlive.mycozy.space/' => 1,
},
'Germany' => {
'ftp://ftp.fu-berlin.de/tex/CTAN/' => 1,
- 'http://sendinnsky.selfhost.co/tex-archive/' => 1,
'http://vesta.informatik.rwth-aachen.de/ftp/pub/mirror/ctan/' => 1,
- 'https://ctan.ebinger.cc/tex-archive/' => 1,
'https://ctan.joethei.xyz/' => 1,
- 'https://ctan.mc1.root.project-creative.net/' => 1,
- 'https://ctan.mirror.norbert-ruehl.de/' => 1,
- 'https://ctan.net/' => 1,
- 'https://ctan.space-pro.be/tex-archive/' => 1,
'https://ftp.agdsn.de/pub/mirrors/latex/dante/' => 1,
'https://ftp.fau.de/ctan/' => 1,
'https://ftp.gwdg.de/pub/ctan/' => 1,
'https://ftp.rrze.uni-erlangen.de/ctan/' => 1,
'https://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/' => 1,
- 'https://ftp.tu-chemnitz.de/pub/tex/' => 1,
- 'https://markov.htwsaar.de/tex-archive/' => 1,
- 'https://mirror.clientvps.com/CTAN/' => 1,
'https://mirror.dogado.de/tex-archive/' => 1,
'https://mirror.funkfreundelandshut.de/latex/' => 1,
'https://mirror.physik.tu-berlin.de/pub/CTAN/' => 1,
@@ -103,7 +76,6 @@ $mirrors = {
},
'Greece' => {
'http://ftp.ntua.gr/mirror/ctan/' => 1,
- 'https://fosszone.csd.auth.gr/CTAN/' => 1,
'https://ftp.cc.uoc.gr/mirrors/CTAN/' => 1,
},
'Hungary' => {
@@ -114,7 +86,6 @@ $mirrors = {
},
'Netherlands' => {
'https://ftp.snt.utwente.nl/pub/software/tex/' => 1,
- 'https://mirror.koddos.net/CTAN/' => 1,
'https://mirror.lyrahosting.com/CTAN/' => 1,
},
'Norway' => {
@@ -136,19 +107,12 @@ $mirrors = {
'https://ctan.altspu.ru/' => 1,
'https://mirror.macomnet.net/pub/CTAN/' => 1,
'https://mirror.truenetwork.ru/CTAN/' => 1,
- 'https://mirrors.mi-ras.ru/CTAN/' => 1,
},
'Slovenia' => {
'https://ctan.ijs.si/tex-archive/' => 1,
},
- 'Spain' => {
- 'https://ctan.fisiquimicamente.com/' => 1,
- 'https://ctan.javinator9889.com/' => 1,
- 'https://osl.ugr.es/CTAN/' => 1,
- },
'Sweden' => {
'https://ftp.acc.umu.se/mirror/CTAN/' => 1,
- 'https://ftpmirror1.infania.net/mirror/CTAN/' => 1,
},
'Switzerland' => {
'https://mirror.foobar.to/CTAN/' => 1,
@@ -156,7 +120,6 @@ $mirrors = {
'https://mirror.metanet.ch/tex-archive/' => 1,
},
'United Kingdom' => {
- 'https://anorien.csc.warwick.ac.uk/mirrors/CTAN/' => 1,
'https://www-uxsup.csx.cam.ac.uk/pub/tex-archive/' => 1,
},
},
@@ -167,19 +130,15 @@ $mirrors = {
'https://mirror.csclub.uwaterloo.ca/CTAN/' => 1,
'https://muug.ca/mirror/ctan/' => 1,
},
- 'Costa Rica' => {
- 'https://mirrors.ucr.ac.cr/CTAN/' => 1,
- },
'USA' => {
'http://bay.uchicago.edu/CTAN/' => 1,
'https://ctan.math.illinois.edu/' => 1,
'https://ctan.math.utah.edu/ctan/tex-archive/' => 1,
'https://ctan.math.washington.edu/tex-archive/' => 1,
'https://ctan.mirrors.hoobly.com/' => 1,
+ 'https://mirror.las.iastate.edu/tex-archive/' => 1,
'https://mirror.math.princeton.edu/pub/CTAN/' => 1,
'https://mirror.mwt.me/ctan/' => 1,
- 'https://mirror2.sandyriver.net/pub/ctan/' => 1,
- 'https://mirrors.mit.edu/CTAN/' => 1,
'https://mirrors.rit.edu/CTAN/' => 1,
},
},
@@ -190,9 +149,6 @@ $mirrors = {
},
},
'South America' => {
- 'Brazil' => {
- 'https://linorg.usp.br/CTAN/' => 1,
- },
'Chile' => {
'https://ctan.dcc.uchile.cl/' => 1,
},
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 477f8d6912..02a963c583 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,11 +26,11 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2023
-depend revision/68050
+depend revision/68062
name 00texlive.image
category TLCore
-revision 68039
+revision 68054
shortdesc TeX Live files only in the source repository
longdesc The files here are not copied by the installer and containers
longdesc are not built for them; they exist only in the source
@@ -2750,7 +2750,6 @@ runfiles size=13070
tlpkg/tlpsrc/luaimageembed.tlpsrc
tlpkg/tlpsrc/luaindex.tlpsrc
tlpkg/tlpsrc/luainputenc.tlpsrc
- tlpkg/tlpsrc/luaintro.tlpsrc
tlpkg/tlpsrc/luajittex.tlpsrc
tlpkg/tlpsrc/luakeys.tlpsrc
tlpkg/tlpsrc/lualatex-doc-de.tlpsrc
@@ -3254,6 +3253,7 @@ runfiles size=13070
tlpkg/tlpsrc/parrun.tlpsrc
tlpkg/tlpsrc/parsa.tlpsrc
tlpkg/tlpsrc/parselines.tlpsrc
+ tlpkg/tlpsrc/parsianfonts.tlpsrc
tlpkg/tlpsrc/parskip.tlpsrc
tlpkg/tlpsrc/pas-cours.tlpsrc
tlpkg/tlpsrc/pas-crosswords.tlpsrc
@@ -4785,7 +4785,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 68041
+revision 68052
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
@@ -19304,7 +19304,7 @@ catalogue-version 001.003
name antique-spanish-units
category Package
-revision 68039
+revision 68055
shortdesc A short document about antique spanish units
relocated 1
longdesc This short document is about antique spanish units used in
@@ -19314,9 +19314,9 @@ longdesc similar to siunitx. The document could be interesting for
longdesc historians, economists, metrologists and others, as a reference
longdesc and detailed compendium about this old system of units.
containersize 560
-containerchecksum 556d61f193cbb83c401a2c7a38b74fe159d7f8ab04834ad567454238a3c47f252554563ff4ad2b9ef6e9a26959d8f6a9aa69ab340167caa43bac41026e759876
-doccontainersize 211248
-doccontainerchecksum 43cb93eb53cd0a47270673dc4cad8dcf82d68dceab12b3d6bd026a65df289331b7beca357ad5e6ba04890c6381b4551d18240c0e2ba074be5ebbba9837e3b30e
+containerchecksum be0ca5ebba9c8c4f0fee45f83577888599f9b49ef1091b4dc2af5635ec12c5f9d71c41e279adc34aa258c720be25487ef575ca62260ef4bd7259421bc5647bf8
+doccontainersize 211872
+doccontainerchecksum 4e19750704c57748b9767ce0564389459207c41f8029c7d401d36ab7aed954fa6155e61454fad6eb4fa4cf686e3421cbb02a9e7fbad1214b3fbee4d535de7a17
docfiles size=59
RELOC/doc/generic/antique-spanish-units/README details="Readme"
RELOC/doc/generic/antique-spanish-units/antique-spanish-units.pdf details="The document itself" language="es"
@@ -19324,7 +19324,7 @@ docfiles size=59
catalogue-ctan /info/spanish/antique-spanish-units
catalogue-license cc-by-4
catalogue-topics spanish-doc units
-catalogue-version 1.2
+catalogue-version 1.3
name antomega
category Package
@@ -36314,7 +36314,7 @@ catalogue-version 1.5
name bib2gls
category Package
-revision 67518
+revision 68060
shortdesc Command line application to convert .bib files to glossaries-extra.sty resource files
longdesc This Java command line application may be used to extract
longdesc glossary information stored in a .bib file and convert it into
@@ -36332,11 +36332,11 @@ longdesc containing definitions (\newglossaryentry etc.) to the .bib
longdesc format required by bib2gls.
depend bib2gls.ARCH
depend glossaries-extra
-containersize 1901688
-containerchecksum 3b568423b0b8b5f44361dbbc84fec68e08890a717cfd150f6361f60903387ef30ca347893274d13638121f230e83fe4e6371745788ceda5bf42ef4be8d90452d
-doccontainersize 5733260
-doccontainerchecksum eac40db0535c3095674ae7f0954603b5f7717d845628a0fcef59ade28696bc9ab5b648c851a034d862e71e186276802a811082e393baf00a2a20480fcf88f180
-docfiles size=2021
+containersize 1907100
+containerchecksum 50c75c616008c7c5e4b0d358af2ba923873ced0d1d26dde40c03e67fc1119154f787855133dca3a4f507c6ff2382b621ee911ea3e85510bbed5784c4ebb14bb9
+doccontainersize 5758284
+doccontainerchecksum 1969d0dda24db4a89d5dfef3d2f41e94dfc957a65262edd40373e99c3b92908e0a33b256384b2b4acf0e205f4efec2ba901337ce6e05f14c3d6fe48826cee5f1
+docfiles size=2027
texmf-dist/doc/man/man1/bib2gls.1
texmf-dist/doc/man/man1/bib2gls.man1.pdf
texmf-dist/doc/man/man1/convertgls2bib.1
@@ -36414,9 +36414,9 @@ docfiles size=2021
texmf-dist/doc/support/bib2gls/examples/unaryoperators.bib
texmf-dist/doc/support/bib2gls/examples/usergroups.bib
texmf-dist/doc/support/bib2gls/examples/vegetables.bib
-srccontainersize 1792860
-srccontainerchecksum 1799e21830fa0e1486788a4019228ae5e76233cf2d5f76660243817e733d00bc8a13777ee16634efe15ae37e1b5ad51c66e6228b72809abb14603ac6f8560f04
-srcfiles size=919
+srccontainersize 1799016
+srccontainerchecksum 8d5e7c4c52a1ff853eb02f0f061c88b1de3077a6eaac1d5e482ae2c9de15bb04ad49793fd5f7294729727fb7563058b7011892805bd7ba6de8d56cc36679029e
+srcfiles size=926
texmf-dist/source/support/bib2gls/src/bib2gls-begin.tex
texmf-dist/source/support/bib2gls/src/bib2gls-cite.bib
texmf-dist/source/support/bib2gls/src/bib2gls-src.zip
@@ -36427,7 +36427,7 @@ srcfiles size=919
texmf-dist/source/support/bib2gls/src/convertgls2bib.pod
texmf-dist/source/support/bib2gls/src/gls2bib-src.zip
texmf-dist/source/support/bib2gls/src/texparser-src.zip
-runfiles size=529
+runfiles size=531
texmf-dist/scripts/bib2gls/bib2gls.jar
texmf-dist/scripts/bib2gls/bib2gls.sh
texmf-dist/scripts/bib2gls/convertgls2bib.jar
@@ -36440,7 +36440,7 @@ catalogue-contact-repository https://github.com/nlct/bib2gls
catalogue-ctan /support/bib2gls
catalogue-license gpl3+
catalogue-topics bibtex-util glossary
-catalogue-version 3.4
+catalogue-version 3.5
name bib2gls.aarch64-linux
category Package
@@ -69846,7 +69846,7 @@ containerchecksum 4f0311e8e9c8dc9fcba918f175049279d4ed2342224af9807de04e44262f4a
name collection-langarabic
category Collection
-revision 59594
+revision 68054
shortdesc Arabic
relocated 1
longdesc Support for Arabic and Persian.
@@ -69871,6 +69871,7 @@ depend kurdishlipsum
depend lshort-persian
depend luabidi
depend na-box
+depend parsianfonts
depend persian-bib
depend quran
depend sexam
@@ -69880,8 +69881,8 @@ depend tram
depend xepersian
depend xepersian-hm
depend xindy-persian
-containersize 456
-containerchecksum 3fdcf41fafd94373254281f3f7ee9f2a2e136cfa1adc1dd38e4b5cd6f90d0364e6a20d3284fcf255f245158352421e28cfb794c673b8b96399a20343ed991fc2
+containersize 468
+containerchecksum dbda8ea4ce6b8a14e1f97e32dce9afaea40b9132bbfe49c24182b0c56e3ad847ff2cd12eab03c2a6f3fcc6550954404c95bcc8bf425e41174628f2fafbea2832
name collection-langchinese
category Collection
@@ -72281,7 +72282,7 @@ containerchecksum 952fe1be5136c0fded29381fe58935dedfe2c0f338f38d280c2a69bb718e2b
name collection-luatex
category Collection
-revision 68037
+revision 68053
shortdesc LuaTeX packages
relocated 1
longdesc Packages for LuaTeX, a TeX engine using Lua as an embedded
@@ -72333,7 +72334,6 @@ depend luahyphenrules
depend luaimageembed
depend luaindex
depend luainputenc
-depend luaintro
depend luakeys
depend lualatex-doc
depend lualatex-math
@@ -72391,8 +72391,8 @@ depend tsvtemplate
depend typewriter
depend uninormalize
depend yamlvars
-containersize 1012
-containerchecksum 932291bcf82ff190dbd72ae9ee995136147a96f6b7a0cbdda9865e6c2a593bbd757fc5dcd7624231c9bf82ce7631dae1a8972452d6f4c2f4fc1d5be10ec925d6
+containersize 1008
+containerchecksum 7a0cef206122cbaf92e76e3eb737866d69206e04479b0835508b68d8c7273af9a6d862622b09bcfe13bfb516add7cf814eea9ce7d4d5449cfaa2200b04de3157
name collection-mathscience
category Collection
@@ -116269,7 +116269,7 @@ runfiles size=40
name evangelion-jfm
category Package
-revision 67164
+revision 68059
shortdesc A Japanese font metric supporting many advanced features
relocated 1
longdesc This package provides a Japanese Font Metric supporting
@@ -116279,16 +116279,16 @@ longdesc using traditional ('tc') and simplified ('sc') Chinese or
longdesc Japanese fonts under LuaTeX-ja. It also makes full use of the
longdesc 'priority' feature, meeting the standards, and allows easy
longdesc customisation.
-containersize 3288
-containerchecksum bff224f515e358676ec14856a671a471b0664edb8513f0a6a33aa7bc88c2b9d9cf8f0ceca597ce69005133ba341657a02abf4ff8aa6af7acdfc693ee8ae17f79
-doccontainersize 582100
-doccontainerchecksum 03c3589c8915c7dea2d8322672254150f0308132718edf2c81f45887f22fabac0064dbde3756a62fc0757a22609e9c48f28bf288be058b7ba538cd9fef0e41ed
-docfiles size=200
- RELOC/doc/luatex/evangelion-jfm/Eva-JFM_doc-en.pdf details="Package documentation" language="en"
+containersize 3460
+containerchecksum 5839d7899e8dd8a5fcae792fe40e234fcfeeca9a19bec8d2e8ec7be0217a73fbd58066f6d094e37b36ab9501d53eafed7f3220ee1ebb37ce767c8dd3868708f8
+doccontainersize 582032
+doccontainerchecksum 65447d983cd4a2b112966f8bc9de7f9a7eb2c8f38a9266db5a416219ae8b817f82f62fdc79bddcb2bfe3a67c84c6097975f178bce664e7ac23e2f29363c3df7c
+docfiles size=201
+ RELOC/doc/luatex/evangelion-jfm/Eva-JFM_doc-en.pdf details="Package documentation (English)"
RELOC/doc/luatex/evangelion-jfm/Eva-JFM_doc-en.tex
- RELOC/doc/luatex/evangelion-jfm/Eva-JFM_doc-jp.pdf
+ RELOC/doc/luatex/evangelion-jfm/Eva-JFM_doc-jp.pdf details="Package documentation (Japanese)" language="ja"
RELOC/doc/luatex/evangelion-jfm/Eva-JFM_doc-jp.tex
- RELOC/doc/luatex/evangelion-jfm/Eva-JFM_doc-sc.pdf details="Package documentation" language="zh"
+ RELOC/doc/luatex/evangelion-jfm/Eva-JFM_doc-sc.pdf details="Package documentation (Chinese)" language="zh"
RELOC/doc/luatex/evangelion-jfm/Eva-JFM_doc-sc.tex
RELOC/doc/luatex/evangelion-jfm/LICENSE
RELOC/doc/luatex/evangelion-jfm/README.md details="Readme"
@@ -116296,11 +116296,12 @@ docfiles size=200
RELOC/doc/luatex/evangelion-jfm/figure/fig-tc.pdf
RELOC/doc/luatex/evangelion-jfm/figure/fig.tex
RELOC/doc/luatex/evangelion-jfm/make.sh
+ RELOC/doc/luatex/evangelion-jfm/makefile
srccontainersize 16632
-srccontainerchecksum 697a2d7f23aa556b47a92546d3f02b481f07300e1755240552d1051806f9e7e624ed15ab47147df00db52438cfcc310e5618d6c94f5cd0dc3e9cfb854bb6cab3
+srccontainerchecksum 8f31d019c8db0d9c817e5579ee9e3a31b936e91d0270eccb52ee6bfa544d5aedf8d0bb0d4af5a7aaaf3366d338ee0cc47647e211738d956857f57f28770e08bd
srcfiles size=12
RELOC/source/luatex/evangelion-jfm/Evangelion-JFM.dtx
-runfiles size=5
+runfiles size=6
RELOC/tex/luatex/evangelion-jfm/jfm-eva.lua
catalogue-contact-bugs https://github.com/RadioNoiseE/Evangelion-JFM/issues
catalogue-contact-development https://github.com/RadioNoiseE/Evangelion-JFM/pulls
@@ -116308,7 +116309,7 @@ catalogue-contact-repository https://github.com/RadioNoiseE/Evangelion-JFM
catalogue-ctan /macros/luatex/generic/evangelion-jfm
catalogue-license mit
catalogue-topics chinese japanese font-supp luatex
-catalogue-version 1.0.4 (e)
+catalogue-version 1.0.5 (b)
name everyhook
category Package
@@ -146186,7 +146187,7 @@ catalogue-version 0.02
name hvextern
category Package
-revision 68017
+revision 68056
shortdesc Write and execute external code, and insert the output
relocated 1
longdesc This package allows to write MetaPost, TeX, ConTeXt, LaTeX,
@@ -146194,24 +146195,24 @@ longdesc LuaTeX, LuaLaTeX, XeTeX, XeLaTeX, Lua, Perl, or Python source
longdesc code into an external file, run that file via shell-escape to
longdesc create PDF, PNG, or text output, and include that output
longdesc automatically into the main LaTeX document.
-containersize 8220
-containerchecksum 81fd2d47bbec966ea36e99d2c568fe26b3e639d086881e25f3ca2fba5a42686af05179b3ecf774fa10fbdfa29220c15e54814441ef0675dda105b4aea1aaa641
-doccontainersize 1134608
-doccontainerchecksum 99d04bb428e25b5920115a47847f8ca5c9272dcc2406c9d7e4dfd29fdfb2093e360add65835f6ca8f36bdec62d9c47a445327ea88ba59b13685fc24681146d2a
-docfiles size=384
+containersize 8312
+containerchecksum 6ec8236b9872802fc2d25844448125374544d2d73eb176e7f8b140623a81cf894004f0d5acf064112947c6cfadaa8ed707c2f1f3a4877eb030133996abd8b93a
+doccontainersize 1131856
+doccontainerchecksum 770df574f7e95b09060d99f010259c94c50c8b4ce516683d608d00a0cd03abcf40e9b82fd7d8c9c5a6798f0964cebd4a66b7b0e9a0fbaa712f658a069fa5ef73
+docfiles size=378
RELOC/doc/latex/hvextern/Changes
RELOC/doc/latex/hvextern/README details="Readme"
RELOC/doc/latex/hvextern/hvdoctools.sty
RELOC/doc/latex/hvextern/hvextern.pdf details="Package documentation"
RELOC/doc/latex/hvextern/hvextern.tex
-runfiles size=13
+runfiles size=14
RELOC/tex/latex/hvextern/hvextern-checkfile.lua
RELOC/tex/latex/hvextern/hvextern.lua
RELOC/tex/latex/hvextern/hvextern.sty
catalogue-ctan /macros/latex/contrib/hvextern
catalogue-license lppl1.3c
catalogue-topics ext-code comp-supp image-supp expl3
-catalogue-version 0.35
+catalogue-version 0.36
name hvfloat
category Package
@@ -196275,234 +196276,6 @@ catalogue-license pd
catalogue-topics inputenc luatex
catalogue-version 0.973
-name luaintro
-category Package
-revision 35490
-shortdesc Examples from the book "Einfuhrung in LuaTeX und LuaLaTeX"
-relocated 1
-longdesc The bundle provides source of all the examples published in the
-longdesc German book "Einfuhrung in LuaTeX und LuaLaTeX", published by
-longdesc Lehmans Media and DANTE, Berlin.
-containersize 468
-containerchecksum 2585639b6a7b93019f8fe4dd353332dabbbfb5663b84b1c92df397e940392a1b3bb2ddcec203bbb1b0f4244ac26b62f9745fdf50cb7512f96e5c12af8c08335b
-doccontainersize 30328
-doccontainerchecksum 47de79cdc637810757b7879956cf758a77cde95e77060ce74829b438d13b58e23cbc8e9b328d0850b44fd8de8da90fa9fda206ff0e206918f1bccdf5d71d2c38
-docfiles size=211
- RELOC/doc/luatex/luaintro/01-01-1.lua
- RELOC/doc/luatex/luaintro/01-02-1.lualtx
- RELOC/doc/luatex/luaintro/01-02-10.ltx2
- RELOC/doc/luatex/luaintro/01-02-11.ltx2
- RELOC/doc/luatex/luaintro/01-02-12.lualtx
- RELOC/doc/luatex/luaintro/01-02-13.lualtx3
- RELOC/doc/luatex/luaintro/01-02-14.lualtx3
- RELOC/doc/luatex/luaintro/01-02-15.lualtx3
- RELOC/doc/luatex/luaintro/01-02-16.lualtx3
- RELOC/doc/luatex/luaintro/01-02-17.lualtx3
- RELOC/doc/luatex/luaintro/01-02-18.lualtx3
- RELOC/doc/luatex/luaintro/01-02-19.lualtx
- RELOC/doc/luatex/luaintro/01-02-2.lualtx
- RELOC/doc/luatex/luaintro/01-02-20.lualtx
- RELOC/doc/luatex/luaintro/01-02-21.lualtx
- RELOC/doc/luatex/luaintro/01-02-22.lualtx
- RELOC/doc/luatex/luaintro/01-02-3.lualtx
- RELOC/doc/luatex/luaintro/01-02-4.lualtx
- RELOC/doc/luatex/luaintro/01-02-5.lualtx
- RELOC/doc/luatex/luaintro/01-02-6.lualtx
- RELOC/doc/luatex/luaintro/01-02-7.sh
- RELOC/doc/luatex/luaintro/01-02-8.lualtx3
- RELOC/doc/luatex/luaintro/01-02-9.lualtx3
- RELOC/doc/luatex/luaintro/01-03-1.lualtx3
- RELOC/doc/luatex/luaintro/01-03-2.lualtx3
- RELOC/doc/luatex/luaintro/01-03-3.lualtx3
- RELOC/doc/luatex/luaintro/01-03-4.lualtx3
- RELOC/doc/luatex/luaintro/01-03-5.lualtx3
- RELOC/doc/luatex/luaintro/01-03-6.lualtx3
- RELOC/doc/luatex/luaintro/01-04-1.lualtx
- RELOC/doc/luatex/luaintro/01-04-2.lualtx
- RELOC/doc/luatex/luaintro/01-04-3.lualtx
- RELOC/doc/luatex/luaintro/01-04-4.lualtx
- RELOC/doc/luatex/luaintro/01-04-5.ctx1crop
- RELOC/doc/luatex/luaintro/02-01-1.lualtx
- RELOC/doc/luatex/luaintro/02-01-2.lualtx
- RELOC/doc/luatex/luaintro/02-01-3.lualtx
- RELOC/doc/luatex/luaintro/02-01-4.sh
- RELOC/doc/luatex/luaintro/02-01-5.sh
- RELOC/doc/luatex/luaintro/02-02-1.lualtx
- RELOC/doc/luatex/luaintro/02-02-10.lualtx
- RELOC/doc/luatex/luaintro/02-02-11.lualtx2
- RELOC/doc/luatex/luaintro/02-02-12.lualtx3
- RELOC/doc/luatex/luaintro/02-02-13.lualtx3
- RELOC/doc/luatex/luaintro/02-02-14.lualtx3
- RELOC/doc/luatex/luaintro/02-02-15.lualtx3
- RELOC/doc/luatex/luaintro/02-02-16.lualtx3
- RELOC/doc/luatex/luaintro/02-02-2.lualtx
- RELOC/doc/luatex/luaintro/02-02-3.lualtx
- RELOC/doc/luatex/luaintro/02-02-4.lualtx
- RELOC/doc/luatex/luaintro/02-02-5.lualtx
- RELOC/doc/luatex/luaintro/02-02-6.sh
- RELOC/doc/luatex/luaintro/02-02-7.lualtx2
- RELOC/doc/luatex/luaintro/02-02-8.lualtx2
- RELOC/doc/luatex/luaintro/02-02-9.lualtx
- RELOC/doc/luatex/luaintro/03-01-1.lualtx
- RELOC/doc/luatex/luaintro/03-03-1.lualtx
- RELOC/doc/luatex/luaintro/03-04-1.lualtx3
- RELOC/doc/luatex/luaintro/03-06-1.lualtx3
- RELOC/doc/luatex/luaintro/03-06-2.lualtx3
- RELOC/doc/luatex/luaintro/03-06-3.lualtx3
- RELOC/doc/luatex/luaintro/03-07-1.lualtx
- RELOC/doc/luatex/luaintro/03-07-2.lualtx
- RELOC/doc/luatex/luaintro/03-08-1.lualtx
- RELOC/doc/luatex/luaintro/03-08-2.lualtx3
- RELOC/doc/luatex/luaintro/03-08-3.sh
- RELOC/doc/luatex/luaintro/03-10-1.lualtx
- RELOC/doc/luatex/luaintro/03-10-2.lualtx
- RELOC/doc/luatex/luaintro/03-10-3.lualtx
- RELOC/doc/luatex/luaintro/03-11-1.sh
- RELOC/doc/luatex/luaintro/03-11-1.tex
- RELOC/doc/luatex/luaintro/03-11-2.lualtx
- RELOC/doc/luatex/luaintro/03-11-3.lualtx
- RELOC/doc/luatex/luaintro/03-11-4.lualtx
- RELOC/doc/luatex/luaintro/03-11-5.lualtx
- RELOC/doc/luatex/luaintro/03-11-6.lualtx
- RELOC/doc/luatex/luaintro/03-11-7.lualtx
- RELOC/doc/luatex/luaintro/04-01-1.lualtx3
- RELOC/doc/luatex/luaintro/04-01-2.lualtx3
- RELOC/doc/luatex/luaintro/04-01-3.lualtx
- RELOC/doc/luatex/luaintro/04-04-1.lualtx
- RELOC/doc/luatex/luaintro/04-04-10.lualtx
- RELOC/doc/luatex/luaintro/04-04-11.lualtx
- RELOC/doc/luatex/luaintro/04-04-12.lualtx
- RELOC/doc/luatex/luaintro/04-04-13.lualtx
- RELOC/doc/luatex/luaintro/04-04-14.lualtx
- RELOC/doc/luatex/luaintro/04-04-15.lualtx
- RELOC/doc/luatex/luaintro/04-04-16.lualtx
- RELOC/doc/luatex/luaintro/04-04-17.lualtx
- RELOC/doc/luatex/luaintro/04-04-2.lualtx
- RELOC/doc/luatex/luaintro/04-04-3.lualtx
- RELOC/doc/luatex/luaintro/04-04-4.lualtx
- RELOC/doc/luatex/luaintro/04-04-5.lualtx2
- RELOC/doc/luatex/luaintro/04-04-6.lualtx
- RELOC/doc/luatex/luaintro/04-04-7.lualtx
- RELOC/doc/luatex/luaintro/04-04-8.lualtx
- RELOC/doc/luatex/luaintro/04-04-9.lualtx
- RELOC/doc/luatex/luaintro/05-01-1.lualtx
- RELOC/doc/luatex/luaintro/05-01-2.lualtx
- RELOC/doc/luatex/luaintro/05-02-1.lualtx3
- RELOC/doc/luatex/luaintro/06-02-1.lualtx
- RELOC/doc/luatex/luaintro/06-03-1.lualtx3
- RELOC/doc/luatex/luaintro/06-04-1.lualtx3
- RELOC/doc/luatex/luaintro/06-05-1.lualtx3
- RELOC/doc/luatex/luaintro/06-05-2.lualtx
- RELOC/doc/luatex/luaintro/06-06-1.lualtx
- RELOC/doc/luatex/luaintro/06-07-1.lualtx
- RELOC/doc/luatex/luaintro/06-07-2.lualtx
- RELOC/doc/luatex/luaintro/06-07-3.lualtx
- RELOC/doc/luatex/luaintro/06-07-4.lualtx
- RELOC/doc/luatex/luaintro/06-07-5.lualtx
- RELOC/doc/luatex/luaintro/06-09-1.lualtx
- RELOC/doc/luatex/luaintro/06-10-1.lualtx
- RELOC/doc/luatex/luaintro/06-11-1.sh
- RELOC/doc/luatex/luaintro/06-11-10.lualtx
- RELOC/doc/luatex/luaintro/06-11-11.lualtx
- RELOC/doc/luatex/luaintro/06-11-12.lualtx
- RELOC/doc/luatex/luaintro/06-11-13.lualtx
- RELOC/doc/luatex/luaintro/06-11-14.lualtx
- RELOC/doc/luatex/luaintro/06-11-15.lualtx
- RELOC/doc/luatex/luaintro/06-11-16.lualtx
- RELOC/doc/luatex/luaintro/06-11-17.lualtx
- RELOC/doc/luatex/luaintro/06-11-18.lualtx
- RELOC/doc/luatex/luaintro/06-11-2.sh
- RELOC/doc/luatex/luaintro/06-11-3.lualtx
- RELOC/doc/luatex/luaintro/06-11-4.lualtx
- RELOC/doc/luatex/luaintro/06-11-5.lualtx
- RELOC/doc/luatex/luaintro/06-11-6.lualtx
- RELOC/doc/luatex/luaintro/06-11-7.sh
- RELOC/doc/luatex/luaintro/06-11-8.sh
- RELOC/doc/luatex/luaintro/06-11-9.sh
- RELOC/doc/luatex/luaintro/06-12-1.lualtx
- RELOC/doc/luatex/luaintro/06-12-10.lualtx
- RELOC/doc/luatex/luaintro/06-12-11.lualtx
- RELOC/doc/luatex/luaintro/06-12-12.lualtx
- RELOC/doc/luatex/luaintro/06-12-13.lualtx
- RELOC/doc/luatex/luaintro/06-12-14.lualtx
- RELOC/doc/luatex/luaintro/06-12-2.lualtx
- RELOC/doc/luatex/luaintro/06-12-3.lualtx
- RELOC/doc/luatex/luaintro/06-12-4.lualtx
- RELOC/doc/luatex/luaintro/06-12-5.lualtx
- RELOC/doc/luatex/luaintro/06-12-6.lualtx
- RELOC/doc/luatex/luaintro/06-12-7.lualtx
- RELOC/doc/luatex/luaintro/06-12-8.lualtx
- RELOC/doc/luatex/luaintro/06-12-9.lualtx
- RELOC/doc/luatex/luaintro/06-13-1.lualtx
- RELOC/doc/luatex/luaintro/07-02-1.lualtx
- RELOC/doc/luatex/luaintro/07-02-2.lualtx
- RELOC/doc/luatex/luaintro/07-02-3.lualtx
- RELOC/doc/luatex/luaintro/08-01-1.lua
- RELOC/doc/luatex/luaintro/08-01-10.lua
- RELOC/doc/luatex/luaintro/08-01-11.lua
- RELOC/doc/luatex/luaintro/08-01-2.lua
- RELOC/doc/luatex/luaintro/08-01-3.lua
- RELOC/doc/luatex/luaintro/08-01-4.lua
- RELOC/doc/luatex/luaintro/08-01-5.lua
- RELOC/doc/luatex/luaintro/08-01-6.lua
- RELOC/doc/luatex/luaintro/08-01-7.lua
- RELOC/doc/luatex/luaintro/08-01-8.lua
- RELOC/doc/luatex/luaintro/08-01-9.lua
- RELOC/doc/luatex/luaintro/08-02-1.lua
- RELOC/doc/luatex/luaintro/09-01-1.lualtx
- RELOC/doc/luatex/luaintro/09-01-2.lualtx
- RELOC/doc/luatex/luaintro/09-01-3.lualtx3
- RELOC/doc/luatex/luaintro/09-01-4.lualtx
- RELOC/doc/luatex/luaintro/09-01-5.lualtx
- RELOC/doc/luatex/luaintro/09-01-6.lualtx
- RELOC/doc/luatex/luaintro/09-03-1.lualtx
- RELOC/doc/luatex/luaintro/09-03-2.lualtx
- RELOC/doc/luatex/luaintro/09-03-3.lualtx
- RELOC/doc/luatex/luaintro/09-03-4.lualtx
- RELOC/doc/luatex/luaintro/09-03-5.lualtx
- RELOC/doc/luatex/luaintro/09-03-6.lualtx
- RELOC/doc/luatex/luaintro/CTdefault.tex
- RELOC/doc/luatex/luaintro/DEexa.sty
- RELOC/doc/luatex/luaintro/DEoptions.sty
- RELOC/doc/luatex/luaintro/Letter.ist
- RELOC/doc/luatex/luaintro/LetterC.ist
- RELOC/doc/luatex/luaintro/LoadFonts.tex
- RELOC/doc/luatex/luaintro/README details="Readme"
- RELOC/doc/luatex/luaintro/beispiel.cls
- RELOC/doc/luatex/luaintro/bspcalweekly.cls
- RELOC/doc/luatex/luaintro/bspdvdcoll.cls
- RELOC/doc/luatex/luaintro/bspfont.cls
- RELOC/doc/luatex/luaintro/bsppstricks.cls
- RELOC/doc/luatex/luaintro/exa-fontconfig.tex
- RELOC/doc/luatex/luaintro/exaarticle.cls
- RELOC/doc/luatex/luaintro/exaarticle2.cls
- RELOC/doc/luatex/luaintro/exaartplain.cls
- RELOC/doc/luatex/luaintro/exabeamer.cls
- RELOC/doc/luatex/luaintro/exabook.cls
- RELOC/doc/luatex/luaintro/exabook2.cls
- RELOC/doc/luatex/luaintro/exadante.cls
- RELOC/doc/luatex/luaintro/exafoils.cls
- RELOC/doc/luatex/luaintro/exafubeamer.cls
- RELOC/doc/luatex/luaintro/exafupd.cls
- RELOC/doc/luatex/luaintro/examargin.cls
- RELOC/doc/luatex/luaintro/examemoir.cls
- RELOC/doc/luatex/luaintro/examinimal-mathsymbols.cls
- RELOC/doc/luatex/luaintro/examinimal.cls
- RELOC/doc/luatex/luaintro/exapd.cls
- RELOC/doc/luatex/luaintro/exaprosper.cls
- RELOC/doc/luatex/luaintro/exareport.cls
- RELOC/doc/luatex/luaintro/exaseminar.cls
- RELOC/doc/luatex/luaintro/exaslidenotes.cls
- RELOC/doc/luatex/luaintro/exasymbol.cls
- RELOC/doc/luatex/luaintro/exaxetex.cls
- RELOC/doc/luatex/luaintro/screxa.cls
- RELOC/doc/luatex/luaintro/screxabook.cls
- RELOC/doc/luatex/luaintro/screxareport.cls
-catalogue-ctan /info/examples/luaintro
-catalogue-license lppl1.3
-catalogue-topics book-ex
-catalogue-version 0.03
-
name luajittex
category TLCore
revision 66186
@@ -243738,6 +243511,72 @@ catalogue-license lppl1.3
catalogue-topics decoration macro-supp
catalogue-version 1.4
+name parsianfonts
+category Package
+revision 68054
+shortdesc Some of the most used fonts among Persian language users
+relocated 1
+longdesc This package contains seven Persian font families: Parsian:
+longdesc This font is based on the "Nazli" font, which itself is a free
+longdesc edition of the popular Nazanin font. Parsian Sans: A font based
+longdesc on the "Roya" font. The name of this font was chosen because of
+longdesc its similar structure to "Nazanin" font and its modern
+longdesc appearance. Parsian Mono: One of the best monospace fonts you
+longdesc can find that supports Persian language! Unlike other fonts
+longdesc that are based on other fonts, this one is designed by the
+longdesc author himself. Parsian TeX: Persian language support for TeX's
+longdesc default font, "Persian Modern". Parsian TeX Classic: One of the
+longdesc oldest Persian fonts used for typesetting scientific and
+longdesc academic texts is the default font of TeX-e-Parsi software.
+longdesc Some publishing houses still type their books with this font.
+longdesc The Parsian TeX Classic font allows you to use this old font in
+longdesc the latest versions of TeX and LaTeX. Parsian Title: Based on
+longdesc "Titr", which is a title font and is widely used in Persian
+longdesc printed texts. Parsian Naskh: The "Naskh" script provides good
+longdesc readability when used for official Persian texts. This font is
+longdesc based on "Yas" which is one of the most used fonts among
+longdesc TeX/LaTeX users.
+containersize 1670108
+containerchecksum 6f41ab918f7a76603a2de53c121f9412f49a96374b455afce80e0c9048a6d34e5afc9b197e5fed9f1eff70192d8dd054f3986057ee13dcec21e7d08a628f6c64
+doccontainersize 338904
+doccontainerchecksum afeb0ef100646c232ab9dc365419f5ecc0b5d67353f4edd543ebcaea38d29711e8dc6249b0104e3ac6ced7c3dd57824bfb53768302f0ebaab467617965742801
+docfiles size=87
+ RELOC/doc/fonts/parsianfonts/README.md details="Readme"
+ RELOC/doc/fonts/parsianfonts/parsianfonts-samples.pdf details="Package documentation"
+ RELOC/doc/fonts/parsianfonts/parsianfonts-samples.tex
+runfiles size=1599
+ RELOC/fonts/truetype/public/parsianfonts/Parsian-Bold.ttf
+ RELOC/fonts/truetype/public/parsianfonts/Parsian-BoldItalic.ttf
+ RELOC/fonts/truetype/public/parsianfonts/Parsian-Italic.ttf
+ RELOC/fonts/truetype/public/parsianfonts/Parsian-Regular.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianMono-Bold.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianMono-BoldItalic.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianMono-Italic.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianMono-Regular.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianNaskh-Bold.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianNaskh-BoldItalic.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianNaskh-Italic.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianNaskh-Regular.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianSans-Bold.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianSans-BoldItalic.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianSans-Italic.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianSans-Regular.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianTeX-Bold.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianTeX-BoldItalic.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianTeX-Italic.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianTeX-Regular.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianTeXClassic-Bold.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianTeXClassic-BoldItalic.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianTeXClassic-Italic.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianTeXClassic-Regular.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianTitle-Italic.ttf
+ RELOC/fonts/truetype/public/parsianfonts/ParsianTitle-Regular.ttf
+catalogue-contact-repository https://github.com/SajadKazemi
+catalogue-ctan /fonts/parsianfonts
+catalogue-license lppl1.3c
+catalogue-topics font font-ttf persian
+catalogue-version 1.0.1
+
name parskip
category Package
revision 58358
@@ -250691,7 +250530,7 @@ catalogue-topics float
name photobook
category Package
-revision 67484
+revision 68057
shortdesc A document class for typesetting photo books
relocated 1
longdesc The photobook LaTeX document class extends the book class
@@ -250725,10 +250564,10 @@ depend xargs
depend xcolor
depend xint
depend xkeyval
-containersize 33020
-containerchecksum 1480272258b96bc5a35f979e48250574ce904c802b5fec6c40508f43159a827300b73c3a2d085285e5f2495d601a34e7e02ce45ea165f12f0009f3a1b8ea2d6c
-doccontainersize 154984
-doccontainerchecksum 40549337e3fb7b78480601157ea8a49dd497de687a3a50fe153b42c44a3415efd7bb76b30406965bbd47d1ac14ac5921573227afe20db2963cf86e5c4376334b
+containersize 33028
+containerchecksum 82a672f148d53aa34838dd6f4f7b1054591d806fd4821ff75576d19362e50af1a661ddf711278e6a1e635c6fc5d65b40aa6fd416220be8d3dd4f703b9bbab9da
+doccontainersize 155292
+doccontainerchecksum efe84dfe7d21fac2e7316df9e353b7778bb93ca033f05ab1d19e1683ac074410017fa41246447deedb492f43529f00527c3fc62ef316df31f06bc9cefdd7d456
docfiles size=54
RELOC/doc/latex/photobook/DEPENDS.txt
RELOC/doc/latex/photobook/LICENSE
@@ -250745,7 +250584,7 @@ catalogue-contact-repository https://github.com/flynx/photobook
catalogue-ctan /macros/latex/contrib/photobook
catalogue-license bsd3
catalogue-topics class
-catalogue-version 0.1.23
+catalogue-version 0.1.25
name physconst
category Package
@@ -258666,7 +258505,7 @@ catalogue-version 1.0
name proflycee
category Package
-revision 67864
+revision 68058
shortdesc A LaTeX package for French maths teachers in high school
relocated 1
longdesc This package provides some commands to help French mathematics
@@ -258675,11 +258514,11 @@ longdesc create splines with "derivative control";
longdesc \CalculFormelParametres and \CalculFormelLigne in order to
longdesc create an xcas-windows-like; \CodePythonLstFichier to create
longdesc code presentation and code execution with pythontex.
-containersize 35900
-containerchecksum 7a069932cc5048ea2d652ccdda138c943a197d9e94a394e6eacdb0bb6ad5e594bcfa499d31ae8058423f7d45629306f3126f21b72290a981088109a22a0d127e
-doccontainersize 1333388
-doccontainerchecksum 6574c0e5077d5c12e539d334df10d8d0da329530206661dcfa2e18d39f18c03458ed6661aef161d9099e2ca328b2646fb56b08bb2e589c7600dfa3f3eff27e99
-docfiles size=415
+containersize 35956
+containerchecksum db7afae7d94329894650a33dfd548ce8bc61738415b690455bb9fbb6e2bea51ae9a4e9c5dbbf21287c4673cbf70c974e4693d36fcb5ef7a600d0414689c0d424
+doccontainersize 1336344
+doccontainerchecksum e06a4d18be6b657e4fc025a16d40a12c83445e9f15befd9d7c3584ff7b08f9385d8f12e85d058df019d9a8e4df79de0f7527e4b7c9ff125b57f96f5937d218dc
+docfiles size=416
RELOC/doc/latex/proflycee/ProfLycee-doc.pdf details="Package documentation" language="fr"
RELOC/doc/latex/proflycee/ProfLycee-doc.tex
RELOC/doc/latex/proflycee/ProfLycee-exemples-pyluatex.pdf details="Examples using pyluatex" language="fr"
@@ -258728,7 +258567,7 @@ catalogue-contact-repository https://github.com/cpierquet/ProfLycee
catalogue-ctan /macros/latex/contrib/proflycee
catalogue-license lppl1.3c
catalogue-topics maths french teaching expl3 pgf-tikz
-catalogue-version 2.7.1
+catalogue-version 2.7.2
name profmaquette
category Package
@@ -314899,7 +314738,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 68041
+revision 68052
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.
@@ -314907,10 +314746,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 114004
-containerchecksum e10f63b9d6da6aaa841f311238f9a1daf1ceef3e1fb6f12d86a5164fac90c2b8310dc39ed27eb187037d854fd99b9fdb55748453f1b140c69fa837327495b313
+containersize 113636
+containerchecksum b40d80f95027bfd2c79e44e129c298c44f5eb28fc88143888e02f09b7b5e48ab18e4af4b6136aa0d6a4edbe8ec2f396f8b3b94fe8a6c3abd88c096d8ac191ba8
doccontainersize 428696
-doccontainerchecksum 32bc2b19c880eb96af6abac37b6c806d6179d0400d960188519dd8079e3d52af6f1bcdf73eeacc266573d5f73b997a9697bf387ed6bd5b523a848fed837e2d44
+doccontainerchecksum d30b2dfe068a545f3e1e0d1148ee3488c10ad1b4d289fbd1b8c17b27decadbdb54b0d508d7f0c5469f5a10e165e7508a70bbde2c12135a210cf27cb05203a109
docfiles size=549
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 0f30fe2fff..0e1c673083 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-ee521141c27dfdbe4660042ac6301f7f texlive.tlpdb
+b384880d6fd6a589ee8576c719ff6e3a texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index c8ede3e472..1b40630de3 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-3d1bb24a35939a41181c81e39dec3f492aad1f28507f3b67ca9536c23306d6f77ca52b09608a5270add957e6dfb99568dfb014c9d8c1b33d62e5aeba29b3a0f5 texlive.tlpdb
+5a69b038fd29effc8d234dd284bdfa10a57c6ed082fcc32ee8ed7fb9b2df027cb2b52141e15efe56d9990834ef20d732a664568ff458e9e2570f14f124740889 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 43c2a2ceaf..9e41aabf81 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+QqiBBqTOGHfhlDjHAFAmTn66UACgkQTOGHfhlD
-jHDe7gf7Byy0d1WyOjP5e0Ktr/ncqJ1crRQJxvOWJS7fI2FXDZ+kaxj6/iLvUzbS
-vCz2Fu7VPBShVFCP0YJJaFILhEyA2n1bW6lXOyQo1ufJpxBAtMaROnsuRLbSI7b0
-c/n1CjqcBJQ1c4u71TQlJ+QqYRXhm1yFZKg9G2qEMGtp91hPlRRYtZvdWPOIrrRT
-Ohfblkw+t06UuT+1/2noTPLmE8Ao3kwDHhB6QwZCdVSm5VJ+WM904FpM8GIn6a3A
-G2Rc0TCLYcK4u9HAqK6Hqnz+AIiHBXydi3c3gw3S507c7YFjjChXvVC6jy0DSiqb
-1alaBBMJ7HRld27nE3wIuKuqiB74pg==
-=HtD+
+iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmTpPQ8ACgkQTOGHfhlD
+jHBk1QgAqXsBMaQhqbkHYKztOU1fbGJTv6m+79UKGpyYxhRjSlfpi+qUezte+RpN
+Kca1idrGtAPJcT4/6BKJUY8JI/DNhPDkEz5oAmz3Yt2r+A0WhEdhfzBRD8PKBZ39
+7fLZWpO2JFeQ0a59kllviI5XlBHiwM6MnNmGkBZBYW0iHPuuZTYTAe/oo0bEx3Ew
+4QrfzkUoER6kVkO0DTFgJ6xnY0Oqjk/pnIhQWxIqa0sQ2EOUIxMiocX0WPksZNzA
+LB3mDgC8RE57/gefx/a9jgcNjW5t9LDNVG6Vr7L28bILlKWIGRfG0LZl2PGP06X6
+8a3CU5sQ9qNCyYj3vva+BetXP3yBZw==
+=0Ec/
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 3bd9c283e8..b02b13d6c0 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 5f20d12e01..08dca9e63c 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:
-2023-08-25-02-02
+2023-08-26-02-02