summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FILES.byname650
-rw-r--r--FILES.byname.gzbin2519342 -> 2519181 bytes
-rw-r--r--FILES.last07days552
-rw-r--r--biblio/ctan-bibdata/ctan.bib44
-rw-r--r--biblio/ctan-bibdata/ctan.pdfbin3662090 -> 3662510 bytes
-rw-r--r--fonts/concmath-otf/Concrete-Math.otfbin227764 -> 241500 bytes
-rw-r--r--fonts/concmath-otf/README.md17
-rw-r--r--fonts/concmath-otf/concmath-otf.ltx54
-rw-r--r--fonts/concmath-otf/concmath-otf.pdfbin147636 -> 151587 bytes
-rw-r--r--fonts/concmath-otf/concmath-otf.sty10
-rw-r--r--fonts/concmath-otf/unimath-concrete.pdfbin1780617 -> 1783261 bytes
-rw-r--r--fonts/erewhon-math/Erewhon-Math-Bold.otfbin110460 -> 158388 bytes
-rw-r--r--fonts/erewhon-math/Erewhon-Math.ltx12
-rw-r--r--fonts/erewhon-math/Erewhon-Math.otfbin386464 -> 393756 bytes
-rw-r--r--fonts/erewhon-math/Erewhon-Math.pdfbin220585 -> 221401 bytes
-rw-r--r--fonts/erewhon-math/README.md9
-rw-r--r--fonts/erewhon-math/fourier-otf.sty4
-rw-r--r--fonts/erewhon-math/unimath-erewhon.pdfbin1847071 -> 1847674 bytes
-rw-r--r--fonts/euler-math/Euler-Math.ltx5
-rw-r--r--fonts/euler-math/Euler-Math.otfbin439748 -> 443768 bytes
-rw-r--r--fonts/euler-math/Euler-Math.pdfbin157628 -> 158318 bytes
-rw-r--r--fonts/euler-math/README.md8
-rw-r--r--fonts/euler-math/euler-math.sty4
-rw-r--r--fonts/euler-math/unimath-euler.pdfbin1451945 -> 1451716 bytes
-rw-r--r--fonts/kpfonts-otf/README.md18
-rw-r--r--fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.ltx5
-rw-r--r--fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.pdfbin221600 -> 222298 bytes
-rw-r--r--fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.ltx5
-rw-r--r--fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.pdfbin222999 -> 223740 bytes
-rw-r--r--fonts/kpfonts-otf/doc/unimath-kpfonts.ltx10
-rw-r--r--fonts/kpfonts-otf/doc/unimath-kpfonts.pdfbin1820789 -> 1835161 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpMath-Bold.otfbin199476 -> 203400 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpMath-Light.otfbin464132 -> 467916 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpMath-Regular.otfbin437732 -> 441588 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpMath-Sans.otfbin284292 -> 288264 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpMath-SansBold.otfbin168436 -> 172364 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpMath-Semibold.otfbin200136 -> 204112 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpMono-Bold.otfbin57976 -> 57976 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpMono-BoldItalic.otfbin65188 -> 65188 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpMono-Italic.otfbin66492 -> 66492 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpMono-Regular.otfbin59108 -> 59108 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpRoman-Bold.otfbin133408 -> 133408 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpRoman-BoldItalic.otfbin143656 -> 143656 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpRoman-Italic.otfbin134280 -> 134280 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpRoman-Light.otfbin131256 -> 131256 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpRoman-LightItalic.otfbin133760 -> 133760 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpRoman-Regular.otfbin131524 -> 131524 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpRoman-Semibold.otfbin130556 -> 130556 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpRoman-SemiboldItalic.otfbin141288 -> 141288 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpSans-Bold.otfbin103928 -> 103928 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpSans-BoldItalic.otfbin111928 -> 111928 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpSans-Italic.otfbin111888 -> 111888 bytes
-rw-r--r--fonts/kpfonts-otf/fonts/KpSans-Regular.otfbin102500 -> 102500 bytes
-rw-r--r--fonts/kpfonts-otf/tex/kpfonts-otf.sty4
-rw-r--r--fonts/xcharter-math/README.md8
-rw-r--r--fonts/xcharter-math/XCharter-Math-Bold.otfbin81616 -> 80224 bytes
-rw-r--r--fonts/xcharter-math/XCharter-Math.ltx54
-rw-r--r--fonts/xcharter-math/XCharter-Math.otfbin326420 -> 330580 bytes
-rw-r--r--fonts/xcharter-math/XCharter-Math.pdfbin197687 -> 200105 bytes
-rw-r--r--fonts/xcharter-math/unimath-xcharter.pdfbin1848017 -> 1848513 bytes
-rw-r--r--fonts/xcharter-math/xcharter-otf.sty4
-rw-r--r--graphics/pgf/contrib/structmech/README.md13
-rw-r--r--graphics/pgf/contrib/structmech/structmech.pdfbin142170 -> 157219 bytes
-rw-r--r--graphics/pgf/contrib/structmech/structmech.sty118
-rw-r--r--graphics/pgf/contrib/structmech/structmech.tex62
-rw-r--r--info/context-notes-zh-cn/LICENSE674
-rw-r--r--info/context-notes-zh-cn/README.md11
-rw-r--r--info/context-notes-zh-cn/ctxnotes.pdfbin2002991 -> 2035457 bytes
-rw-r--r--info/context-notes-zh-cn/src/01.tex30
-rw-r--r--info/context-notes-zh-cn/src/02.tex82
-rw-r--r--info/context-notes-zh-cn/src/03.tex100
-rw-r--r--info/context-notes-zh-cn/src/04.tex34
-rw-r--r--info/context-notes-zh-cn/src/05.tex48
-rw-r--r--info/context-notes-zh-cn/src/06.tex8
-rw-r--r--info/context-notes-zh-cn/src/08.tex53
-rw-r--r--info/context-notes-zh-cn/src/09.tex138
-rw-r--r--info/context-notes-zh-cn/src/10.tex353
-rw-r--r--info/context-notes-zh-cn/src/11.tex903
-rw-r--r--info/context-notes-zh-cn/src/12.tex806
-rw-r--r--info/context-notes-zh-cn/src/13.tex351
-rw-r--r--info/context-notes-zh-cn/src/14.tex271
-rw-r--r--info/context-notes-zh-cn/src/bib-style.tex18
-rw-r--r--info/context-notes-zh-cn/src/cover.tex2
-rw-r--r--info/context-notes-zh-cn/src/ctxnotes.bib21
-rw-r--r--info/context-notes-zh-cn/src/ctxnotes.tex15
-rw-r--r--info/context-notes-zh-cn/src/doc-env.tex67
-rw-r--r--info/context-notes-zh-cn/src/figures/01/cmd-window.png (renamed from info/context-notes-zh-cn/src/figures/cmd-window.png)bin23633 -> 23633 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/01/foo.pdf (renamed from info/context-notes-zh-cn/src/figures/foo.pdf)bin5906 -> 5906 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/01/win-r.jpg (renamed from info/context-notes-zh-cn/src/figures/win-r.jpg)bin150002 -> 150002 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/02/aligned-1.pdf (renamed from info/context-notes-zh-cn/src/figures/aligned-1.pdf)bin3333 -> 3333 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/02/aligned-2.pdf (renamed from info/context-notes-zh-cn/src/figures/aligned-2.pdf)bin7408 -> 7408 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/02/fakewords.pdf (renamed from info/context-notes-zh-cn/src/figures/fakewords.pdf)bin3506 -> 3506 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/02/letter.pdf (renamed from info/context-notes-zh-cn/src/figures/letter.pdf)bin11003 -> 11003 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/02/lines.pdf (renamed from info/context-notes-zh-cn/src/figures/lines.pdf)bin3941 -> 3941 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/02/parindentcolor.pdf (renamed from info/context-notes-zh-cn/src/figures/parindentcolor.pdf)bin4668 -> 4668 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/02/pars-2.pdf (renamed from info/context-notes-zh-cn/src/figures/pars-2.pdf)bin4612 -> 4612 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/02/pars-3.pdf (renamed from info/context-notes-zh-cn/src/figures/pars-3.pdf)bin4671 -> 4671 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/02/pars-4.pdf (renamed from info/context-notes-zh-cn/src/figures/pars-4.pdf)bin4656 -> 4656 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/02/pars-5.pdf (renamed from info/context-notes-zh-cn/src/figures/pars-5.pdf)bin4678 -> 4678 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/02/pars.pdf (renamed from info/context-notes-zh-cn/src/figures/pars.pdf)bin3506 -> 3506 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/02/starting-area.pdf (renamed from info/context-notes-zh-cn/src/figures/starting-area.pdf)bin5909 -> 5909 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/02/true-words.pdf (renamed from info/context-notes-zh-cn/src/figures/true-words.pdf)bin6128 -> 6128 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/03/bad-latin.pdf (renamed from info/context-notes-zh-cn/src/figures/bad-latin.pdf)bin8311 -> 8311 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/03/breakinglines-1.pdf (renamed from info/context-notes-zh-cn/src/figures/breakinglines-1.pdf)bin7736 -> 7736 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/03/breakinglines-2.pdf (renamed from info/context-notes-zh-cn/src/figures/breakinglines-2.pdf)bin7754 -> 7754 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/03/breakinglines-3.pdf (renamed from info/context-notes-zh-cn/src/figures/breakinglines-3.pdf)bin7793 -> 7793 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/03/breakinglines-4.pdf (renamed from info/context-notes-zh-cn/src/figures/breakinglines-4.pdf)bin7776 -> 7776 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/03/breakinglines-5.pdf (renamed from info/context-notes-zh-cn/src/figures/breakinglines-5.pdf)bin13115 -> 13115 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/03/defaultfonts.pdf (renamed from info/context-notes-zh-cn/src/figures/defaultfonts.pdf)bin31097 -> 31097 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/03/fallbacks.pdf (renamed from info/context-notes-zh-cn/src/figures/fallbacks.pdf)bin19558 -> 19558 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/03/fontsize-level.pdf (renamed from info/context-notes-zh-cn/src/figures/fontsize-level.pdf)bin5056 -> 5056 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/03/indenting-1.pdf (renamed from info/context-notes-zh-cn/src/figures/indenting-1.pdf)bin8168 -> 8168 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/03/indenting-2.pdf (renamed from info/context-notes-zh-cn/src/figures/indenting-2.pdf)bin8168 -> 8168 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/03/msfonts.png (renamed from info/context-notes-zh-cn/src/figures/msfonts.png)bin62524 -> 62524 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/03/qian.pdf (renamed from info/context-notes-zh-cn/src/figures/qian.pdf)bin11728 -> 11728 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/03/setupbodyfont.pdf (renamed from info/context-notes-zh-cn/src/figures/setupbodyfont.pdf)bin8166 -> 8166 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/03/tex-root.png (renamed from info/context-notes-zh-cn/src/figures/tex-root.png)bin30218 -> 30218 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/04/pagenumber.png (renamed from info/context-notes-zh-cn/src/figures/pagenumber.png)bin22295 -> 22295 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/04/style-file.png (renamed from info/context-notes-zh-cn/src/figures/style-file.png)bin114762 -> 114762 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/04/zaoshu-2.pdf (renamed from info/context-notes-zh-cn/src/figures/zaoshu-2.pdf)bin10503 -> 10503 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/04/zaoshu-3.pdf (renamed from info/context-notes-zh-cn/src/figures/zaoshu-3.pdf)bin10501 -> 10501 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/04/zaoshu-4.pdf (renamed from info/context-notes-zh-cn/src/figures/zaoshu-4.pdf)bin13028 -> 13028 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/04/zaoshu-5.pdf (renamed from info/context-notes-zh-cn/src/figures/zaoshu-5.pdf)bin13022 -> 13022 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/04/zaoshu.pdf (renamed from info/context-notes-zh-cn/src/figures/zaoshu.pdf)bin10127 -> 10127 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/05/todo-list-2.pdf (renamed from info/context-notes-zh-cn/src/figures/05-todo-list-2.pdf)bin10334 -> 10334 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/05/todo-list-3.pdf (renamed from info/context-notes-zh-cn/src/figures/05-todo-list-3.pdf)bin8986 -> 8986 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/05/todo-list-4.pdf (renamed from info/context-notes-zh-cn/src/figures/05-todo-list-4.pdf)bin9125 -> 9125 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/05/todo-list-5.pdf (renamed from info/context-notes-zh-cn/src/figures/05-todo-list-5.pdf)bin9096 -> 9096 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/05/todo-list-6.pdf (renamed from info/context-notes-zh-cn/src/figures/05-todo-list-6.pdf)bin9171 -> 9171 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/05/todo-list-7.pdf (renamed from info/context-notes-zh-cn/src/figures/05-todo-list-7.pdf)bin9535 -> 9535 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/05/todo-list-8.pdf (renamed from info/context-notes-zh-cn/src/figures/05-todo-list-8.pdf)bin9534 -> 9534 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/05/todo-list.pdf (renamed from info/context-notes-zh-cn/src/figures/05-todo-list.pdf)bin9536 -> 9536 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/06-05.pdfbin9205 -> 0 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/06/bibtex-example-01.pdf (renamed from info/context-notes-zh-cn/src/figures/10-bibtex-example-01.pdf)bin17332 -> 17332 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/06/bibtex-example-02.pdf (renamed from info/context-notes-zh-cn/src/figures/10-bibtex-example-02.pdf)bin18967 -> 18967 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/06/bibtex-example-03.pdf (renamed from info/context-notes-zh-cn/src/figures/10-bibtex-example-03.pdf)bin18945 -> 18945 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/06/bibtex-example-04.pdf (renamed from info/context-notes-zh-cn/src/figures/10-bibtex-example-04.pdf)bin11612 -> 11612 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/08/ctxnotes-2.png (renamed from info/context-notes-zh-cn/src/figures/ctxnotes-2.png)bin19843 -> 19843 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/08/ctxnotes.png (renamed from info/context-notes-zh-cn/src/figures/ctxnotes.png)bin32313 -> 32313 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/08/floatcomb-2.pdf (renamed from info/context-notes-zh-cn/src/figures/05-floatcomb-2.pdf)bin5697 -> 5697 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/08/floatcomb-3.pdf (renamed from info/context-notes-zh-cn/src/figures/05-floatcomb-3.pdf)bin7465 -> 7465 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/08/floatcomb-4.pdf (renamed from info/context-notes-zh-cn/src/figures/05-floatcomb-4.pdf)bin49791 -> 49791 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/08/floatcomb.pdf (renamed from info/context-notes-zh-cn/src/figures/05-floatcomb.pdf)bin5697 -> 5697 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/08/hibert-1.pdf (renamed from info/context-notes-zh-cn/src/figures/hibert-1.pdf)bin23993 -> 23993 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/08/hibert-2.pdf (renamed from info/context-notes-zh-cn/src/figures/hibert-2.pdf)bin23976 -> 23976 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/08/hibert-3.pdf (renamed from info/context-notes-zh-cn/src/figures/hibert-3.pdf)bin24494 -> 24494 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/08/hibert.pdf (renamed from info/context-notes-zh-cn/src/figures/hibert.pdf)bin26055 -> 26055 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/08/metapost.pdf (renamed from info/context-notes-zh-cn/src/figures/05-metapost.pdf)bin8520 -> 8520 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/09/01.pdf (renamed from info/context-notes-zh-cn/src/figures/06-01.pdf)bin49780 -> 49780 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/09/02.pdf (renamed from info/context-notes-zh-cn/src/figures/06-02.pdf)bin10311 -> 10311 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/09/03.pdf (renamed from info/context-notes-zh-cn/src/figures/06-03.pdf)bin8190 -> 8190 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/09/04.pdf (renamed from info/context-notes-zh-cn/src/figures/06-04.pdf)bin8569 -> 8569 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/09/three-line-table.pdf (renamed from info/context-notes-zh-cn/src/figures/06-three-line-table.pdf)bin9141 -> 9141 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/10/colors.pngbin0 -> 23373 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/11/vbox-and-hbox.pdf (renamed from info/context-notes-zh-cn/src/figures/08-vbox-and-hbox.pdf)bin7327 -> 7327 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/12/flowchart-1.pdf (renamed from info/context-notes-zh-cn/src/figures/11-flowchart-1.pdf)bin6085 -> 6085 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/12/flowchart-2.pdf (renamed from info/context-notes-zh-cn/src/figures/11-flowchart-2.pdf)bin6342 -> 6342 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/12/flowchart-3.pdf (renamed from info/context-notes-zh-cn/src/figures/11-flowchart-3.pdf)bin8381 -> 8381 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/12/flowchart-4.pdf (renamed from info/context-notes-zh-cn/src/figures/11-flowchart-4.pdf)bin5575 -> 5575 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/12/watermark.png (renamed from info/context-notes-zh-cn/src/figures/11-watermark.png)bin71998 -> 71998 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/13/ConTeXt-layout.svg (renamed from info/context-notes-zh-cn/src/figures/ConTeXt-layout.svg)0
-rw-r--r--info/context-notes-zh-cn/src/figures/13/layout-1.pdf (renamed from info/context-notes-zh-cn/src/figures/12-layout-1.pdf)bin9908 -> 9908 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/13/m_k_i_v_ConTeXt-layout_svg_c60ccda70ef92e32d7a6334f31c23259.pdf (renamed from info/context-notes-zh-cn/src/figures/m_k_i_v_ConTeXt-layout_svg_c60ccda70ef92e32d7a6334f31c23259.pdf)bin66096 -> 66096 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/13/slides-1.pdf (renamed from info/context-notes-zh-cn/src/figures/12-slides-1.pdf)bin9421 -> 9421 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/13/slides-2.pdf (renamed from info/context-notes-zh-cn/src/figures/12-slides-2.pdf)bin14431 -> 14431 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/13/slides-3.pdf (renamed from info/context-notes-zh-cn/src/figures/12-slides-3.pdf)bin12839 -> 12839 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/13/slides-4.pdf (renamed from info/context-notes-zh-cn/src/figures/12-slides-4.pdf)bin26414 -> 26414 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/13/slides-finished.pdf (renamed from info/context-notes-zh-cn/src/figures/slides-finished.pdf)bin35012 -> 35012 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/13/slides.pdf (renamed from info/context-notes-zh-cn/src/figures/slides.pdf)bin34689 -> 34689 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/14/bookmarks.png (renamed from info/context-notes-zh-cn/src/figures/13-bookmarks.png)bin91322 -> 91322 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/14/toc-2.pdf (renamed from info/context-notes-zh-cn/src/figures/13-toc-2.pdf)bin6105 -> 6105 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/14/toc.pdf (renamed from info/context-notes-zh-cn/src/figures/13-toc.pdf)bin6054 -> 6054 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/bookmark.pngbin33739 -> 0 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/cow.pdfbin5526 -> 0 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/gardeninglion.jpgbin59719 -> 0 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/header.pngbin30981 -> 0 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/hello.pngbin6557 -> 0 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/linux-terminal-icon.pngbin16045 -> 0 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/search.pngbin29154 -> 0 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/zhfonts/01.pdf (renamed from info/context-notes-zh-cn/src/figures/zhfonts-01.pdf)bin9993 -> 9993 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/zhfonts/02.pdf (renamed from info/context-notes-zh-cn/src/figures/zhfonts-02.pdf)bin9472 -> 9472 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/zhfonts/03.pdf (renamed from info/context-notes-zh-cn/src/figures/zhfonts-03.pdf)bin14420 -> 14420 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/zhfonts/none-zhfonts.pdf (renamed from info/context-notes-zh-cn/src/figures/none-zhfonts.pdf)bin28173 -> 28173 bytes
-rw-r--r--info/context-notes-zh-cn/src/figures/zhfonts/zhfonts.pdf (renamed from info/context-notes-zh-cn/src/figures/zhfonts.pdf)bin28688 -> 28688 bytes
-rw-r--r--info/context-notes-zh-cn/src/license.tex12
-rw-r--r--info/context-notes-zh-cn/src/postscript.tex2
-rw-r--r--info/context-notes-zh-cn/src/preface.tex14
-rw-r--r--info/context-notes-zh-cn/src/zhfonts.tex20
-rw-r--r--macros/latex/contrib/acmart/ACM-Reference-Format.bst2
-rw-r--r--macros/latex/contrib/acmart/README2
-rw-r--r--macros/latex/contrib/acmart/acmart.dtx5
-rw-r--r--macros/latex/contrib/acmart/acmart.pdfbin907878 -> 908440 bytes
-rw-r--r--macros/latex/contrib/acmart/acmguide.pdfbin433120 -> 433117 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-acmcp.pdfbin213990 -> 213983 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-acmengage.pdfbin395461 -> 395452 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-acmlarge.pdfbin605423 -> 605417 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdfbin627935 -> 627932 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdfbin1049483 -> 1049474 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdfbin617763 -> 617756 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-acmsmall.pdfbin615263 -> 615259 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-acmtog.pdfbin562647 -> 562640 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-authordraft.pdfbin1042626 -> 1042623 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-lualatex.pdfbin783630 -> 783621 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-manuscript.pdfbin617501 -> 617496 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdfbin615069 -> 615065 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdfbin1054905 -> 1054905 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-sigconf.pdfbin1038837 -> 1038829 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-sigplan.pdfbin1047507 -> 1047499 bytes
-rw-r--r--macros/latex/contrib/acmart/samples/sample-xelatex.pdfbin658514 -> 658503 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.pdfbin545421 -> 551953 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.tex317
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.dtx501
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.pdfbin1356332 -> 1364573 bytes
-rw-r--r--macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdfbin810431 -> 806464 bytes
-rw-r--r--macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex309
-rw-r--r--macros/latex/contrib/proflycee/tex/ProfLycee.sty103
-rw-r--r--macros/latex/contrib/univie-ling/README3
-rw-r--r--macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx2
-rw-r--r--macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx2
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdfbin132446 -> 130780 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdfbin127671 -> 126894 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdfbin200624 -> 200672 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdfbin200628 -> 200676 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdfbin172439 -> 158161 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdfbin167337 -> 154403 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-poster-deutsch.pdfbin227127 -> 227166 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-poster-english.pdfbin224933 -> 224973 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdfbin189875 -> 171777 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdfbin186020 -> 168772 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdfbin372221 -> 372040 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-wlg-review.pdfbin372011 -> 371831 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdfbin457771 -> 457978 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex6
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdfbin447918 -> 448122 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex6
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdfbin453820 -> 454263 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex8
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-poster.pdfbin450466 -> 450725 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-poster.tex6
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdfbin458808 -> 458988 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex2
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdfbin345535 -> 345784 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex6
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling.pdfbin365342 -> 365425 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling.tex2
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls2
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls2
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls4
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-poster.cls2
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls2
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls2
-rw-r--r--systems/doc/luatex/luatex-backend.tex7
-rw-r--r--systems/doc/luatex/luatex-graphics.tex2
-rw-r--r--systems/doc/luatex/luatex-nodes.tex16
-rw-r--r--systems/doc/luatex/luatex.pdfbin1788486 -> 1775317 bytes
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl3
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb170
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.md52
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha5122
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc14
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2433680 -> 2433604 bytes
-rw-r--r--timestamp2
262 files changed, 3645 insertions, 3572 deletions
diff --git a/FILES.byname b/FILES.byname
index eb44d9f907..b3dc6b85e4 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -2047,12 +2047,12 @@
2022/12/25 | 1673 | biblio/citation-style-language/README.md
2022/12/25 | 11958 | biblio/citation-style-language/vancouver.csl
2022/12/25 | 604004 | biblio/citation-style-language.zip
-2023/03/30 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/03/31 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx
-2023/03/30 | 2773331 | biblio/ctan-bibdata/ctan.bib
-2023/03/30 | 3662535 | biblio/ctan-bibdata/ctan.pdf
+2023/03/31 | 2774813 | biblio/ctan-bibdata/ctan.bib
+2023/03/31 | 3662090 | biblio/ctan-bibdata/ctan.pdf
2023/01/16 | 1489 | biblio/ctan-bibdata/README
-2023/03/30 | 4059623 | biblio/ctan-bibdata.zip
+2023/03/31 | 4058524 | 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
@@ -5408,7 +5408,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/03/30 | 505492 | FILES.last07days
+2023/03/31 | 506026 | 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
@@ -27093,14 +27093,14 @@
1999/03/18 | 4749 | fonts/concmath/mf/xccsy7.mf
1999/03/18 | 4732 | fonts/concmath/mf/xccsy8.mf
1999/03/18 | 4765 | fonts/concmath/mf/xccsy9.mf
-2023/01/30 | 18751 | fonts/concmath-otf/concmath-otf.ltx
-2023/01/30 | 147636 | fonts/concmath-otf/concmath-otf.pdf
-2023/01/30 | 5429 | fonts/concmath-otf/concmath-otf.sty
-2023/01/30 | 227764 | fonts/concmath-otf/Concrete-Math.otf
-2023/01/30 | 2902 | fonts/concmath-otf/README.md
-2023/01/30 | 16886 | fonts/concmath-otf/unimath-concrete.ltx
-2023/01/30 | 1780617 | fonts/concmath-otf/unimath-concrete.pdf
-2023/01/30 | 2015377 | fonts/concmath-otf.zip
+2023/03/28 | 21001 | fonts/concmath-otf/concmath-otf.ltx
+2023/03/28 | 151587 | fonts/concmath-otf/concmath-otf.pdf
+2023/03/28 | 5539 | fonts/concmath-otf/concmath-otf.sty
+2023/03/28 | 241500 | fonts/concmath-otf/Concrete-Math.otf
+2023/03/31 | 3600 | fonts/concmath-otf/README.md
+2023/03/28 | 16886 | fonts/concmath-otf/unimath-concrete.ltx
+2023/03/28 | 1783261 | fonts/concmath-otf/unimath-concrete.pdf
+2023/03/31 | 2030628 | fonts/concmath-otf.zip
1999/03/18 | 2379 | fonts/concmath/README
1999/03/18 | 916 | fonts/concmath/tfm/xccam10.tfm
1999/03/18 | 928 | fonts/concmath/tfm/xccam5.tfm
@@ -39064,15 +39064,15 @@
2022/05/16 | 3439 | fonts/erewhon/enc/zut1_zt54pz.enc
2022/05/16 | 3900 | fonts/erewhon/enc/zut1_zx32l7.enc
2022/05/16 | 63740 | fonts/erewhon/map/erewhon.map
-2023/01/30 | 110460 | fonts/erewhon-math/Erewhon-Math-Bold.otf
-2023/01/30 | 30891 | fonts/erewhon-math/Erewhon-Math.ltx
-2023/01/30 | 386464 | fonts/erewhon-math/Erewhon-Math.otf
-2023/01/30 | 220585 | fonts/erewhon-math/Erewhon-Math.pdf
-2023/01/30 | 8715 | fonts/erewhon-math/fourier-otf.sty
-2023/01/30 | 6816 | fonts/erewhon-math/README.md
-2023/01/30 | 16947 | fonts/erewhon-math/unimath-erewhon.ltx
-2023/01/30 | 1847071 | fonts/erewhon-math/unimath-erewhon.pdf
-2023/01/30 | 2354279 | fonts/erewhon-math.zip
+2023/03/30 | 158388 | fonts/erewhon-math/Erewhon-Math-Bold.otf
+2023/03/30 | 30663 | fonts/erewhon-math/Erewhon-Math.ltx
+2023/03/30 | 393756 | fonts/erewhon-math/Erewhon-Math.otf
+2023/03/30 | 221401 | fonts/erewhon-math/Erewhon-Math.pdf
+2023/03/30 | 8715 | fonts/erewhon-math/fourier-otf.sty
+2023/03/31 | 6950 | fonts/erewhon-math/README.md
+2023/03/30 | 16947 | fonts/erewhon-math/unimath-erewhon.ltx
+2023/03/30 | 1847674 | fonts/erewhon-math/unimath-erewhon.pdf
+2023/03/31 | 2387188 | fonts/erewhon-math.zip
2022/05/16 | 227320 | fonts/erewhon/opentype/Erewhon-BoldItalic.otf
2022/05/16 | 246284 | fonts/erewhon/opentype/Erewhon-Bold.otf
2022/05/16 | 238332 | fonts/erewhon/opentype/Erewhon-BoldSlanted.otf
@@ -41022,15 +41022,15 @@
2022/02/04 | 1720 | fonts/etbb/vf/ETbb-Regular-tosf-t1.vf
2022/02/04 | 732 | fonts/etbb/vf/ETbb-Regular-tosf-ts1.vf
2022/02/04 | 3340640 | fonts/etbb.zip
-2023/01/30 | 18064 | fonts/euler-math/Euler-Math.ltx
-2023/01/30 | 439748 | fonts/euler-math/Euler-Math.otf
-2023/01/30 | 157628 | fonts/euler-math/Euler-Math.pdf
-2023/01/30 | 4750 | fonts/euler-math/euler-math.sty
-2023/01/30 | 410 | fonts/euler-math/neo-euler.sty
-2023/01/30 | 2779 | fonts/euler-math/README.md
-2023/01/30 | 16834 | fonts/euler-math/unimath-euler.ltx
-2023/01/30 | 1451945 | fonts/euler-math/unimath-euler.pdf
-2023/01/30 | 1883691 | fonts/euler-math.zip
+2023/03/30 | 18016 | fonts/euler-math/Euler-Math.ltx
+2023/03/30 | 443768 | fonts/euler-math/Euler-Math.otf
+2023/03/30 | 158318 | fonts/euler-math/Euler-Math.pdf
+2023/03/30 | 4750 | fonts/euler-math/euler-math.sty
+2023/03/30 | 410 | fonts/euler-math/neo-euler.sty
+2023/03/31 | 2972 | fonts/euler-math/README.md
+2023/03/30 | 16834 | fonts/euler-math/unimath-euler.ltx
+2023/03/30 | 1451716 | fonts/euler-math/unimath-euler.pdf
+2023/03/31 | 1884924 | fonts/euler-math.zip
2022/07/14 | 363770 | fonts/eulerpx/doc/eulerpxdoc.pdf
2022/07/14 | 5872 | fonts/eulerpx/doc/eulerpxdoc.tex
2022/07/11 | 4519 | fonts/eulerpx/doc/sample.tex
@@ -61959,41 +61959,41 @@
2006/08/15 | 320 | fonts/kpfonts/latex/ujkpsyc.fd
2006/09/05 | 335 | fonts/kpfonts/latex/ujkpsyd.fd
2008/11/11 | 345 | fonts/kpfonts/latex/ujkpsydw.fd
-2023/01/16 | 33338 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.ltx
-2023/01/16 | 221600 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.pdf
-2023/01/16 | 35706 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.ltx
-2023/01/16 | 222999 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.pdf
-2023/01/16 | 16827 | fonts/kpfonts-otf/doc/unimath-kpfonts.ltx
-2023/01/16 | 1820789 | fonts/kpfonts-otf/doc/unimath-kpfonts.pdf
-2023/01/16 | 199476 | fonts/kpfonts-otf/fonts/KpMath-Bold.otf
-2023/01/16 | 464132 | fonts/kpfonts-otf/fonts/KpMath-Light.otf
-2023/01/16 | 437732 | fonts/kpfonts-otf/fonts/KpMath-Regular.otf
-2023/01/16 | 168436 | fonts/kpfonts-otf/fonts/KpMath-SansBold.otf
-2023/01/16 | 284292 | fonts/kpfonts-otf/fonts/KpMath-Sans.otf
-2023/01/16 | 200136 | fonts/kpfonts-otf/fonts/KpMath-Semibold.otf
-2023/01/16 | 65188 | fonts/kpfonts-otf/fonts/KpMono-BoldItalic.otf
-2023/01/16 | 57976 | fonts/kpfonts-otf/fonts/KpMono-Bold.otf
-2023/01/16 | 66492 | fonts/kpfonts-otf/fonts/KpMono-Italic.otf
-2023/01/16 | 59108 | fonts/kpfonts-otf/fonts/KpMono-Regular.otf
-2023/01/16 | 143656 | fonts/kpfonts-otf/fonts/KpRoman-BoldItalic.otf
-2023/01/16 | 133408 | fonts/kpfonts-otf/fonts/KpRoman-Bold.otf
-2023/01/16 | 134280 | fonts/kpfonts-otf/fonts/KpRoman-Italic.otf
-2023/01/16 | 133760 | fonts/kpfonts-otf/fonts/KpRoman-LightItalic.otf
-2023/01/16 | 131256 | fonts/kpfonts-otf/fonts/KpRoman-Light.otf
-2023/01/16 | 131524 | fonts/kpfonts-otf/fonts/KpRoman-Regular.otf
-2023/01/16 | 141288 | fonts/kpfonts-otf/fonts/KpRoman-SemiboldItalic.otf
-2023/01/16 | 130556 | fonts/kpfonts-otf/fonts/KpRoman-Semibold.otf
-2023/01/16 | 111928 | fonts/kpfonts-otf/fonts/KpSans-BoldItalic.otf
-2023/01/16 | 103928 | fonts/kpfonts-otf/fonts/KpSans-Bold.otf
-2023/01/16 | 111888 | fonts/kpfonts-otf/fonts/KpSans-Italic.otf
-2023/01/16 | 102500 | fonts/kpfonts-otf/fonts/KpSans-Regular.otf
-2023/01/16 | 8796 | fonts/kpfonts-otf/README.md
-2023/01/16 | 19065 | fonts/kpfonts-otf/tex/kpfonts-otf.sty
-2023/01/16 | 480 | fonts/kpfonts-otf/tex/KpLight.fontspec
-2023/01/16 | 185 | fonts/kpfonts-otf/tex/KpMono.fontspec
-2023/01/16 | 469 | fonts/kpfonts-otf/tex/KpRoman.fontspec
-2023/01/16 | 231 | fonts/kpfonts-otf/tex/KpSans.fontspec
-2023/01/16 | 4441836 | fonts/kpfonts-otf.zip
+2023/03/30 | 33290 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.ltx
+2023/03/30 | 222298 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.pdf
+2023/03/30 | 35658 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.ltx
+2023/03/30 | 223740 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.pdf
+2023/03/30 | 16806 | fonts/kpfonts-otf/doc/unimath-kpfonts.ltx
+2023/03/30 | 1835161 | fonts/kpfonts-otf/doc/unimath-kpfonts.pdf
+2023/03/30 | 203400 | fonts/kpfonts-otf/fonts/KpMath-Bold.otf
+2023/03/30 | 467916 | fonts/kpfonts-otf/fonts/KpMath-Light.otf
+2023/03/30 | 441588 | fonts/kpfonts-otf/fonts/KpMath-Regular.otf
+2023/03/30 | 172364 | fonts/kpfonts-otf/fonts/KpMath-SansBold.otf
+2023/03/30 | 288264 | fonts/kpfonts-otf/fonts/KpMath-Sans.otf
+2023/03/30 | 204112 | fonts/kpfonts-otf/fonts/KpMath-Semibold.otf
+2023/03/30 | 65188 | fonts/kpfonts-otf/fonts/KpMono-BoldItalic.otf
+2023/03/30 | 57976 | fonts/kpfonts-otf/fonts/KpMono-Bold.otf
+2023/03/30 | 66492 | fonts/kpfonts-otf/fonts/KpMono-Italic.otf
+2023/03/30 | 59108 | fonts/kpfonts-otf/fonts/KpMono-Regular.otf
+2023/03/30 | 143656 | fonts/kpfonts-otf/fonts/KpRoman-BoldItalic.otf
+2023/03/30 | 133408 | fonts/kpfonts-otf/fonts/KpRoman-Bold.otf
+2023/03/30 | 134280 | fonts/kpfonts-otf/fonts/KpRoman-Italic.otf
+2023/03/30 | 133760 | fonts/kpfonts-otf/fonts/KpRoman-LightItalic.otf
+2023/03/30 | 131256 | fonts/kpfonts-otf/fonts/KpRoman-Light.otf
+2023/03/30 | 131524 | fonts/kpfonts-otf/fonts/KpRoman-Regular.otf
+2023/03/30 | 141288 | fonts/kpfonts-otf/fonts/KpRoman-SemiboldItalic.otf
+2023/03/30 | 130556 | fonts/kpfonts-otf/fonts/KpRoman-Semibold.otf
+2023/03/30 | 111928 | fonts/kpfonts-otf/fonts/KpSans-BoldItalic.otf
+2023/03/30 | 103928 | fonts/kpfonts-otf/fonts/KpSans-Bold.otf
+2023/03/30 | 111888 | fonts/kpfonts-otf/fonts/KpSans-Italic.otf
+2023/03/30 | 102500 | fonts/kpfonts-otf/fonts/KpSans-Regular.otf
+2023/03/31 | 9056 | fonts/kpfonts-otf/README.md
+2023/03/30 | 19065 | fonts/kpfonts-otf/tex/kpfonts-otf.sty
+2023/03/30 | 480 | fonts/kpfonts-otf/tex/KpLight.fontspec
+2023/03/30 | 185 | fonts/kpfonts-otf/tex/KpMono.fontspec
+2023/03/30 | 469 | fonts/kpfonts-otf/tex/KpRoman.fontspec
+2023/03/30 | 231 | fonts/kpfonts-otf/tex/KpSans.fontspec
+2023/03/31 | 4467344 | fonts/kpfonts-otf.zip
2023/01/18 | 828 | fonts/kpfonts/README.txt
2023/01/19 | 7354832 | fonts/kpfonts.zip
2010/08/03 | 3884 | fonts/kurier/doc/fonts/kurier/00readme.eng
@@ -148867,15 +148867,15 @@
2022/02/23 | 3517 | fonts/xcharter/enc/xch_z3wvjz.enc
2022/02/23 | 3704 | fonts/xcharter/enc/xch_zqx27h.enc
2022/02/23 | 66515 | fonts/xcharter/map/XCharter.map
-2023/01/30 | 2811 | fonts/xcharter-math/README.md
-2023/01/30 | 17127 | fonts/xcharter-math/unimath-xcharter.ltx
-2023/01/30 | 1848017 | fonts/xcharter-math/unimath-xcharter.pdf
-2023/01/30 | 81616 | fonts/xcharter-math/XCharter-Math-Bold.otf
-2023/01/30 | 24841 | fonts/xcharter-math/XCharter-Math.ltx
-2023/01/30 | 326420 | fonts/xcharter-math/XCharter-Math.otf
-2023/01/30 | 197687 | fonts/xcharter-math/XCharter-Math.pdf
-2023/01/30 | 6792 | fonts/xcharter-math/xcharter-otf.sty
-2023/01/30 | 2271189 | fonts/xcharter-math.zip
+2023/03/31 | 2998 | fonts/xcharter-math/README.md
+2023/03/30 | 17127 | fonts/xcharter-math/unimath-xcharter.ltx
+2023/03/30 | 1848513 | fonts/xcharter-math/unimath-xcharter.pdf
+2023/03/30 | 80224 | fonts/xcharter-math/XCharter-Math-Bold.otf
+2023/03/30 | 26592 | fonts/xcharter-math/XCharter-Math.ltx
+2023/03/30 | 330580 | fonts/xcharter-math/XCharter-Math.otf
+2023/03/30 | 200105 | fonts/xcharter-math/XCharter-Math.pdf
+2023/03/30 | 6792 | fonts/xcharter-math/xcharter-otf.sty
+2023/03/31 | 2274085 | fonts/xcharter-math.zip
2022/02/19 | 115708 | fonts/xcharter/opentype/XCharter-BoldItalic.otf
2022/02/19 | 134920 | fonts/xcharter/opentype/XCharter-Bold.otf
2022/02/19 | 136468 | fonts/xcharter/opentype/XCharter-BoldSlanted.otf
@@ -160108,12 +160108,12 @@
2021/07/11 | 2267 | graphics/pgf/contrib/strands/strands.ins
2021/07/11 | 144626 | graphics/pgf/contrib/strands/strands.pdf
2021/07/12 | 151555 | graphics/pgf/contrib/strands.zip
-2021/04/25 | 35126 | graphics/pgf/contrib/structmech/LICENSE
-2021/04/25 | 1113 | graphics/pgf/contrib/structmech/README.md
-2021/04/25 | 142170 | graphics/pgf/contrib/structmech/structmech.pdf
-2021/04/25 | 23187 | graphics/pgf/contrib/structmech/structmech.sty
-2021/04/25 | 20880 | graphics/pgf/contrib/structmech/structmech.tex
-2021/04/25 | 149089 | graphics/pgf/contrib/structmech.zip
+2023/03/31 | 35126 | graphics/pgf/contrib/structmech/LICENSE
+2023/03/31 | 1018 | graphics/pgf/contrib/structmech/README.md
+2023/03/31 | 157219 | graphics/pgf/contrib/structmech/structmech.pdf
+2023/03/31 | 23691 | graphics/pgf/contrib/structmech/structmech.sty
+2023/03/31 | 22317 | graphics/pgf/contrib/structmech/structmech.tex
+2023/03/31 | 160731 | graphics/pgf/contrib/structmech.zip
2020/10/16 | 187370 | graphics/pgf/contrib/syntaxdi/doc/syntaxdi.pdf
2020/10/16 | 3561 | graphics/pgf/contrib/syntaxdi/doc/syntaxdi.tex
2020/10/16 | 2741 | graphics/pgf/contrib/syntaxdi/latex/syntaxdi.sty
@@ -166835,131 +166835,125 @@
1992/09/27 | 927 | info/components-of-TeX/README
1992/09/27 | 2102 | info/components-of-TeX/texrep.sty
2006/10/23 | 108528 | info/components-of-TeX.zip
-2023/03/29 | 2002991 | info/context-notes-zh-cn/ctxnotes.pdf
-2023/03/28 | 35149 | info/context-notes-zh-cn/LICENSE
-2023/03/29 | 434 | info/context-notes-zh-cn/README.md
-2023/03/28 | 14640 | info/context-notes-zh-cn/src/01.tex
-2023/03/28 | 10923 | info/context-notes-zh-cn/src/02.tex
-2023/03/29 | 21406 | info/context-notes-zh-cn/src/03.tex
-2023/03/28 | 10446 | info/context-notes-zh-cn/src/04.tex
-2023/03/28 | 5761 | info/context-notes-zh-cn/src/05.tex
-2023/03/28 | 7211 | info/context-notes-zh-cn/src/06.tex
-2023/03/28 | 5908 | info/context-notes-zh-cn/src/07.tex
-2023/03/28 | 13523 | info/context-notes-zh-cn/src/08.tex
-2023/03/28 | 10785 | info/context-notes-zh-cn/src/09.tex
-2023/03/28 | 12750 | info/context-notes-zh-cn/src/10.tex
-2023/03/28 | 32305 | info/context-notes-zh-cn/src/11.tex
-2023/03/28 | 13190 | info/context-notes-zh-cn/src/12.tex
-2023/03/29 | 10094 | info/context-notes-zh-cn/src/13.tex
-2023/03/28 | 171 | info/context-notes-zh-cn/src/basis.tex
-2023/03/28 | 1870 | info/context-notes-zh-cn/src/bib-style.tex
-2023/03/29 | 2241 | info/context-notes-zh-cn/src/cover.tex
-2023/03/29 | 2241 | info/context-notes-zh-cn/src/ctxnotes.bib
-2023/03/29 | 774 | info/context-notes-zh-cn/src/ctxnotes.tex
-2023/03/29 | 5737 | info/context-notes-zh-cn/src/doc-env.tex
+2023/03/31 | 2035457 | info/context-notes-zh-cn/ctxnotes.pdf
+2023/03/31 | 945 | info/context-notes-zh-cn/README.md
+2023/03/31 | 14288 | info/context-notes-zh-cn/src/01.tex
+2023/03/31 | 10908 | info/context-notes-zh-cn/src/02.tex
+2023/03/31 | 21369 | info/context-notes-zh-cn/src/03.tex
+2023/03/31 | 10387 | info/context-notes-zh-cn/src/04.tex
+2023/03/31 | 5633 | info/context-notes-zh-cn/src/05.tex
+2023/03/31 | 7211 | info/context-notes-zh-cn/src/06.tex
+2023/03/31 | 5908 | info/context-notes-zh-cn/src/07.tex
+2023/03/31 | 13561 | info/context-notes-zh-cn/src/08.tex
+2023/03/31 | 9919 | info/context-notes-zh-cn/src/09.tex
+2023/03/31 | 6948 | info/context-notes-zh-cn/src/10.tex
+2023/03/31 | 12216 | info/context-notes-zh-cn/src/11.tex
+2023/03/31 | 28570 | info/context-notes-zh-cn/src/12.tex
+2023/03/31 | 13202 | info/context-notes-zh-cn/src/13.tex
+2023/03/31 | 10094 | info/context-notes-zh-cn/src/14.tex
+2023/03/31 | 171 | info/context-notes-zh-cn/src/basis.tex
+2023/03/31 | 2067 | info/context-notes-zh-cn/src/bib-style.tex
+2023/03/31 | 2241 | info/context-notes-zh-cn/src/cover.tex
+2023/03/31 | 2317 | info/context-notes-zh-cn/src/ctxnotes.bib
+2023/03/31 | 718 | info/context-notes-zh-cn/src/ctxnotes.tex
+2023/03/31 | 6593 | info/context-notes-zh-cn/src/doc-env.tex
2023/03/28 | 813 | info/context-notes-zh-cn/src/example/slides.tex
2023/03/28 | 1919 | info/context-notes-zh-cn/src/example/style.tex
-2023/03/28 | 5697 | info/context-notes-zh-cn/src/figures/05-floatcomb-2.pdf
-2023/03/28 | 7465 | info/context-notes-zh-cn/src/figures/05-floatcomb-3.pdf
-2023/03/28 | 49791 | info/context-notes-zh-cn/src/figures/05-floatcomb-4.pdf
-2023/03/28 | 5697 | info/context-notes-zh-cn/src/figures/05-floatcomb.pdf
-2023/03/28 | 8520 | info/context-notes-zh-cn/src/figures/05-metapost.pdf
-2023/03/28 | 10334 | info/context-notes-zh-cn/src/figures/05-todo-list-2.pdf
-2023/03/28 | 8986 | info/context-notes-zh-cn/src/figures/05-todo-list-3.pdf
-2023/03/28 | 9125 | info/context-notes-zh-cn/src/figures/05-todo-list-4.pdf
-2023/03/28 | 9096 | info/context-notes-zh-cn/src/figures/05-todo-list-5.pdf
-2023/03/28 | 9171 | info/context-notes-zh-cn/src/figures/05-todo-list-6.pdf
-2023/03/28 | 9535 | info/context-notes-zh-cn/src/figures/05-todo-list-7.pdf
-2023/03/28 | 9534 | info/context-notes-zh-cn/src/figures/05-todo-list-8.pdf
-2023/03/28 | 9536 | info/context-notes-zh-cn/src/figures/05-todo-list.pdf
-2023/03/28 | 49780 | info/context-notes-zh-cn/src/figures/06-01.pdf
-2023/03/28 | 10311 | info/context-notes-zh-cn/src/figures/06-02.pdf
-2023/03/28 | 8190 | info/context-notes-zh-cn/src/figures/06-03.pdf
-2023/03/28 | 8569 | info/context-notes-zh-cn/src/figures/06-04.pdf
-2023/03/28 | 9205 | info/context-notes-zh-cn/src/figures/06-05.pdf
-2023/03/28 | 9141 | info/context-notes-zh-cn/src/figures/06-three-line-table.pdf
-2023/03/28 | 7327 | info/context-notes-zh-cn/src/figures/08-vbox-and-hbox.pdf
-2023/03/28 | 17332 | info/context-notes-zh-cn/src/figures/10-bibtex-example-01.pdf
-2023/03/28 | 18967 | info/context-notes-zh-cn/src/figures/10-bibtex-example-02.pdf
-2023/03/28 | 18945 | info/context-notes-zh-cn/src/figures/10-bibtex-example-03.pdf
-2023/03/28 | 11612 | info/context-notes-zh-cn/src/figures/10-bibtex-example-04.pdf
-2023/03/28 | 6085 | info/context-notes-zh-cn/src/figures/11-flowchart-1.pdf
-2023/03/28 | 6342 | info/context-notes-zh-cn/src/figures/11-flowchart-2.pdf
-2023/03/28 | 8381 | info/context-notes-zh-cn/src/figures/11-flowchart-3.pdf
-2023/03/28 | 5575 | info/context-notes-zh-cn/src/figures/11-flowchart-4.pdf
-2023/03/28 | 71998 | info/context-notes-zh-cn/src/figures/11-watermark.png
-2023/03/28 | 9908 | info/context-notes-zh-cn/src/figures/12-layout-1.pdf
-2023/03/28 | 9421 | info/context-notes-zh-cn/src/figures/12-slides-1.pdf
-2023/03/28 | 14431 | info/context-notes-zh-cn/src/figures/12-slides-2.pdf
-2023/03/28 | 12839 | info/context-notes-zh-cn/src/figures/12-slides-3.pdf
-2023/03/28 | 26414 | info/context-notes-zh-cn/src/figures/12-slides-4.pdf
-2023/03/28 | 91322 | info/context-notes-zh-cn/src/figures/13-bookmarks.png
-2023/03/28 | 6105 | info/context-notes-zh-cn/src/figures/13-toc-2.pdf
-2023/03/28 | 6054 | info/context-notes-zh-cn/src/figures/13-toc.pdf
-2023/03/28 | 3333 | info/context-notes-zh-cn/src/figures/aligned-1.pdf
-2023/03/28 | 7408 | info/context-notes-zh-cn/src/figures/aligned-2.pdf
-2023/03/28 | 8311 | info/context-notes-zh-cn/src/figures/bad-latin.pdf
-2023/03/24 | 33739 | info/context-notes-zh-cn/src/figures/bookmark.png
-2023/03/28 | 7736 | info/context-notes-zh-cn/src/figures/breakinglines-1.pdf
-2023/03/28 | 7754 | info/context-notes-zh-cn/src/figures/breakinglines-2.pdf
-2023/03/28 | 7793 | info/context-notes-zh-cn/src/figures/breakinglines-3.pdf
-2023/03/28 | 7776 | info/context-notes-zh-cn/src/figures/breakinglines-4.pdf
-2023/03/28 | 13115 | info/context-notes-zh-cn/src/figures/breakinglines-5.pdf
-2023/03/28 | 23633 | info/context-notes-zh-cn/src/figures/cmd-window.png
-2023/03/28 | 210831 | info/context-notes-zh-cn/src/figures/ConTeXt-layout.svg
-2023/03/24 | 5526 | info/context-notes-zh-cn/src/figures/cow.pdf
-2023/03/28 | 19843 | info/context-notes-zh-cn/src/figures/ctxnotes-2.png
-2023/03/28 | 32313 | info/context-notes-zh-cn/src/figures/ctxnotes.png
-2023/03/28 | 31097 | info/context-notes-zh-cn/src/figures/defaultfonts.pdf
-2023/03/28 | 3506 | info/context-notes-zh-cn/src/figures/fakewords.pdf
-2023/03/28 | 19558 | info/context-notes-zh-cn/src/figures/fallbacks.pdf
-2023/03/28 | 5056 | info/context-notes-zh-cn/src/figures/fontsize-level.pdf
-2023/03/28 | 5906 | info/context-notes-zh-cn/src/figures/foo.pdf
-2023/03/24 | 59719 | info/context-notes-zh-cn/src/figures/gardeninglion.jpg
-2023/03/24 | 30981 | info/context-notes-zh-cn/src/figures/header.png
-2023/03/28 | 6557 | info/context-notes-zh-cn/src/figures/hello.png
-2023/03/28 | 23993 | info/context-notes-zh-cn/src/figures/hibert-1.pdf
-2023/03/28 | 23976 | info/context-notes-zh-cn/src/figures/hibert-2.pdf
-2023/03/28 | 24494 | info/context-notes-zh-cn/src/figures/hibert-3.pdf
-2023/03/28 | 26055 | info/context-notes-zh-cn/src/figures/hibert.pdf
-2023/03/28 | 8168 | info/context-notes-zh-cn/src/figures/indenting-1.pdf
-2023/03/28 | 8168 | info/context-notes-zh-cn/src/figures/indenting-2.pdf
-2023/03/28 | 11003 | info/context-notes-zh-cn/src/figures/letter.pdf
-2023/03/28 | 3941 | info/context-notes-zh-cn/src/figures/lines.pdf
-2023/03/24 | 16045 | info/context-notes-zh-cn/src/figures/linux-terminal-icon.png
-2023/03/28 | 66096 | info/context-notes-zh-cn/src/figures/m_k_i_v_ConTeXt-layout_svg_c60ccda70ef92e32d7a6334f31c23259.pdf
-2023/03/28 | 62524 | info/context-notes-zh-cn/src/figures/msfonts.png
-2023/03/29 | 28173 | info/context-notes-zh-cn/src/figures/none-zhfonts.pdf
-2023/03/28 | 22295 | info/context-notes-zh-cn/src/figures/pagenumber.png
-2023/03/28 | 4668 | info/context-notes-zh-cn/src/figures/parindentcolor.pdf
-2023/03/28 | 4612 | info/context-notes-zh-cn/src/figures/pars-2.pdf
-2023/03/28 | 4671 | info/context-notes-zh-cn/src/figures/pars-3.pdf
-2023/03/28 | 4656 | info/context-notes-zh-cn/src/figures/pars-4.pdf
-2023/03/28 | 4678 | info/context-notes-zh-cn/src/figures/pars-5.pdf
-2023/03/28 | 3506 | info/context-notes-zh-cn/src/figures/pars.pdf
-2023/03/28 | 11728 | info/context-notes-zh-cn/src/figures/qian.pdf
-2023/03/24 | 29154 | info/context-notes-zh-cn/src/figures/search.png
-2023/03/28 | 8166 | info/context-notes-zh-cn/src/figures/setupbodyfont.pdf
-2023/03/28 | 35012 | info/context-notes-zh-cn/src/figures/slides-finished.pdf
-2023/03/28 | 34689 | info/context-notes-zh-cn/src/figures/slides.pdf
-2023/03/28 | 5909 | info/context-notes-zh-cn/src/figures/starting-area.pdf
-2023/03/28 | 114762 | info/context-notes-zh-cn/src/figures/style-file.png
-2023/03/28 | 30218 | info/context-notes-zh-cn/src/figures/tex-root.png
-2023/03/28 | 6128 | info/context-notes-zh-cn/src/figures/true-words.pdf
-2023/03/28 | 150002 | info/context-notes-zh-cn/src/figures/win-r.jpg
-2023/03/28 | 10503 | info/context-notes-zh-cn/src/figures/zaoshu-2.pdf
-2023/03/28 | 10501 | info/context-notes-zh-cn/src/figures/zaoshu-3.pdf
-2023/03/28 | 13028 | info/context-notes-zh-cn/src/figures/zaoshu-4.pdf
-2023/03/28 | 13022 | info/context-notes-zh-cn/src/figures/zaoshu-5.pdf
-2023/03/28 | 10127 | info/context-notes-zh-cn/src/figures/zaoshu.pdf
-2023/03/29 | 9993 | info/context-notes-zh-cn/src/figures/zhfonts-01.pdf
-2023/03/29 | 9472 | info/context-notes-zh-cn/src/figures/zhfonts-02.pdf
-2023/03/29 | 14420 | info/context-notes-zh-cn/src/figures/zhfonts-03.pdf
-2023/03/29 | 28688 | info/context-notes-zh-cn/src/figures/zhfonts.pdf
-2023/03/29 | 420 | info/context-notes-zh-cn/src/postscript.tex
-2023/03/28 | 3806 | info/context-notes-zh-cn/src/preface.tex
-2023/03/29 | 6718 | info/context-notes-zh-cn/src/zhfonts.tex
-2023/03/29 | 3475127 | info/context-notes-zh-cn.zip
+2023/03/28 | 23633 | info/context-notes-zh-cn/src/figures/01/cmd-window.png
+2023/03/28 | 5906 | info/context-notes-zh-cn/src/figures/01/foo.pdf
+2023/03/28 | 150002 | info/context-notes-zh-cn/src/figures/01/win-r.jpg
+2023/03/28 | 3333 | info/context-notes-zh-cn/src/figures/02/aligned-1.pdf
+2023/03/28 | 7408 | info/context-notes-zh-cn/src/figures/02/aligned-2.pdf
+2023/03/28 | 3506 | info/context-notes-zh-cn/src/figures/02/fakewords.pdf
+2023/03/28 | 11003 | info/context-notes-zh-cn/src/figures/02/letter.pdf
+2023/03/28 | 3941 | info/context-notes-zh-cn/src/figures/02/lines.pdf
+2023/03/28 | 4668 | info/context-notes-zh-cn/src/figures/02/parindentcolor.pdf
+2023/03/28 | 4612 | info/context-notes-zh-cn/src/figures/02/pars-2.pdf
+2023/03/28 | 4671 | info/context-notes-zh-cn/src/figures/02/pars-3.pdf
+2023/03/28 | 4656 | info/context-notes-zh-cn/src/figures/02/pars-4.pdf
+2023/03/28 | 4678 | info/context-notes-zh-cn/src/figures/02/pars-5.pdf
+2023/03/28 | 3506 | info/context-notes-zh-cn/src/figures/02/pars.pdf
+2023/03/28 | 5909 | info/context-notes-zh-cn/src/figures/02/starting-area.pdf
+2023/03/28 | 6128 | info/context-notes-zh-cn/src/figures/02/true-words.pdf
+2023/03/28 | 8311 | info/context-notes-zh-cn/src/figures/03/bad-latin.pdf
+2023/03/28 | 7736 | info/context-notes-zh-cn/src/figures/03/breakinglines-1.pdf
+2023/03/28 | 7754 | info/context-notes-zh-cn/src/figures/03/breakinglines-2.pdf
+2023/03/28 | 7793 | info/context-notes-zh-cn/src/figures/03/breakinglines-3.pdf
+2023/03/28 | 7776 | info/context-notes-zh-cn/src/figures/03/breakinglines-4.pdf
+2023/03/28 | 13115 | info/context-notes-zh-cn/src/figures/03/breakinglines-5.pdf
+2023/03/28 | 31097 | info/context-notes-zh-cn/src/figures/03/defaultfonts.pdf
+2023/03/28 | 19558 | info/context-notes-zh-cn/src/figures/03/fallbacks.pdf
+2023/03/28 | 5056 | info/context-notes-zh-cn/src/figures/03/fontsize-level.pdf
+2023/03/28 | 8168 | info/context-notes-zh-cn/src/figures/03/indenting-1.pdf
+2023/03/28 | 8168 | info/context-notes-zh-cn/src/figures/03/indenting-2.pdf
+2023/03/28 | 62524 | info/context-notes-zh-cn/src/figures/03/msfonts.png
+2023/03/28 | 11728 | info/context-notes-zh-cn/src/figures/03/qian.pdf
+2023/03/28 | 8166 | info/context-notes-zh-cn/src/figures/03/setupbodyfont.pdf
+2023/03/28 | 30218 | info/context-notes-zh-cn/src/figures/03/tex-root.png
+2023/03/28 | 22295 | info/context-notes-zh-cn/src/figures/04/pagenumber.png
+2023/03/28 | 114762 | info/context-notes-zh-cn/src/figures/04/style-file.png
+2023/03/28 | 10503 | info/context-notes-zh-cn/src/figures/04/zaoshu-2.pdf
+2023/03/28 | 10501 | info/context-notes-zh-cn/src/figures/04/zaoshu-3.pdf
+2023/03/28 | 13028 | info/context-notes-zh-cn/src/figures/04/zaoshu-4.pdf
+2023/03/28 | 13022 | info/context-notes-zh-cn/src/figures/04/zaoshu-5.pdf
+2023/03/28 | 10127 | info/context-notes-zh-cn/src/figures/04/zaoshu.pdf
+2023/03/28 | 10334 | info/context-notes-zh-cn/src/figures/05/todo-list-2.pdf
+2023/03/28 | 8986 | info/context-notes-zh-cn/src/figures/05/todo-list-3.pdf
+2023/03/28 | 9125 | info/context-notes-zh-cn/src/figures/05/todo-list-4.pdf
+2023/03/28 | 9096 | info/context-notes-zh-cn/src/figures/05/todo-list-5.pdf
+2023/03/28 | 9171 | info/context-notes-zh-cn/src/figures/05/todo-list-6.pdf
+2023/03/28 | 9535 | info/context-notes-zh-cn/src/figures/05/todo-list-7.pdf
+2023/03/28 | 9534 | info/context-notes-zh-cn/src/figures/05/todo-list-8.pdf
+2023/03/28 | 9536 | info/context-notes-zh-cn/src/figures/05/todo-list.pdf
+2023/03/28 | 17332 | info/context-notes-zh-cn/src/figures/06/bibtex-example-01.pdf
+2023/03/28 | 18967 | info/context-notes-zh-cn/src/figures/06/bibtex-example-02.pdf
+2023/03/28 | 18945 | info/context-notes-zh-cn/src/figures/06/bibtex-example-03.pdf
+2023/03/28 | 11612 | info/context-notes-zh-cn/src/figures/06/bibtex-example-04.pdf
+2023/03/28 | 19843 | info/context-notes-zh-cn/src/figures/08/ctxnotes-2.png
+2023/03/28 | 32313 | info/context-notes-zh-cn/src/figures/08/ctxnotes.png
+2023/03/28 | 5697 | info/context-notes-zh-cn/src/figures/08/floatcomb-2.pdf
+2023/03/28 | 7465 | info/context-notes-zh-cn/src/figures/08/floatcomb-3.pdf
+2023/03/28 | 49791 | info/context-notes-zh-cn/src/figures/08/floatcomb-4.pdf
+2023/03/28 | 5697 | info/context-notes-zh-cn/src/figures/08/floatcomb.pdf
+2023/03/28 | 23993 | info/context-notes-zh-cn/src/figures/08/hibert-1.pdf
+2023/03/28 | 23976 | info/context-notes-zh-cn/src/figures/08/hibert-2.pdf
+2023/03/28 | 24494 | info/context-notes-zh-cn/src/figures/08/hibert-3.pdf
+2023/03/28 | 26055 | info/context-notes-zh-cn/src/figures/08/hibert.pdf
+2023/03/28 | 8520 | info/context-notes-zh-cn/src/figures/08/metapost.pdf
+2023/03/28 | 49780 | info/context-notes-zh-cn/src/figures/09/01.pdf
+2023/03/28 | 10311 | info/context-notes-zh-cn/src/figures/09/02.pdf
+2023/03/28 | 8190 | info/context-notes-zh-cn/src/figures/09/03.pdf
+2023/03/28 | 8569 | info/context-notes-zh-cn/src/figures/09/04.pdf
+2023/03/28 | 9141 | info/context-notes-zh-cn/src/figures/09/three-line-table.pdf
+2023/03/31 | 23373 | info/context-notes-zh-cn/src/figures/10/colors.png
+2023/03/28 | 7327 | info/context-notes-zh-cn/src/figures/11/vbox-and-hbox.pdf
+2023/03/28 | 6085 | info/context-notes-zh-cn/src/figures/12/flowchart-1.pdf
+2023/03/28 | 6342 | info/context-notes-zh-cn/src/figures/12/flowchart-2.pdf
+2023/03/28 | 8381 | info/context-notes-zh-cn/src/figures/12/flowchart-3.pdf
+2023/03/28 | 5575 | info/context-notes-zh-cn/src/figures/12/flowchart-4.pdf
+2023/03/28 | 71998 | info/context-notes-zh-cn/src/figures/12/watermark.png
+2023/03/28 | 210831 | info/context-notes-zh-cn/src/figures/13/ConTeXt-layout.svg
+2023/03/28 | 9908 | info/context-notes-zh-cn/src/figures/13/layout-1.pdf
+2023/03/29 | 66096 | info/context-notes-zh-cn/src/figures/13/m_k_i_v_ConTeXt-layout_svg_c60ccda70ef92e32d7a6334f31c23259.pdf
+2023/03/28 | 9421 | info/context-notes-zh-cn/src/figures/13/slides-1.pdf
+2023/03/28 | 14431 | info/context-notes-zh-cn/src/figures/13/slides-2.pdf
+2023/03/28 | 12839 | info/context-notes-zh-cn/src/figures/13/slides-3.pdf
+2023/03/28 | 26414 | info/context-notes-zh-cn/src/figures/13/slides-4.pdf
+2023/03/28 | 35012 | info/context-notes-zh-cn/src/figures/13/slides-finished.pdf
+2023/03/28 | 34689 | info/context-notes-zh-cn/src/figures/13/slides.pdf
+2023/03/28 | 91322 | info/context-notes-zh-cn/src/figures/14/bookmarks.png
+2023/03/28 | 6105 | info/context-notes-zh-cn/src/figures/14/toc-2.pdf
+2023/03/28 | 6054 | info/context-notes-zh-cn/src/figures/14/toc.pdf
+2023/03/29 | 9993 | info/context-notes-zh-cn/src/figures/zhfonts/01.pdf
+2023/03/29 | 9472 | info/context-notes-zh-cn/src/figures/zhfonts/02.pdf
+2023/03/29 | 14420 | info/context-notes-zh-cn/src/figures/zhfonts/03.pdf
+2023/03/29 | 28173 | info/context-notes-zh-cn/src/figures/zhfonts/none-zhfonts.pdf
+2023/03/29 | 28688 | info/context-notes-zh-cn/src/figures/zhfonts/zhfonts.pdf
+2023/03/31 | 498 | info/context-notes-zh-cn/src/license.tex
+2023/03/31 | 420 | info/context-notes-zh-cn/src/postscript.tex
+2023/03/31 | 3803 | info/context-notes-zh-cn/src/preface.tex
+2023/03/31 | 6801 | info/context-notes-zh-cn/src/zhfonts.tex
+2023/03/31 | 3358931 | info/context-notes-zh-cn.zip
2009/07/09 | 338395 | info/context-top-ten/cmds.pdf
2009/07/12 | 1023 | info/context-top-ten/README
2008/04/28 | 1411 | info/context-top-ten/src/apple.pdf
@@ -210329,43 +210323,43 @@
2022/11/25 | 1333 | macros/latex/contrib/achemso/README.md
2022/11/25 | 917174 | macros/latex/contrib/achemso.zip
2023/03/26 | 2773 | macros/latex/contrib/acmart/acmart.bib
-2023/03/27 | 287415 | macros/latex/contrib/acmart/acmart.dtx
+2023/03/31 | 287471 | macros/latex/contrib/acmart/acmart.dtx
2023/03/26 | 1016 | macros/latex/contrib/acmart/acmart.ins
-2023/03/27 | 907878 | macros/latex/contrib/acmart/acmart.pdf
+2023/03/31 | 908440 | macros/latex/contrib/acmart/acmart.pdf
2023/03/26 | 20721 | macros/latex/contrib/acmart/acmauthoryear.bbx
2023/03/26 | 6245 | macros/latex/contrib/acmart/acmauthoryear.cbx
2023/03/26 | 1093 | macros/latex/contrib/acmart/acmdatamodel.dbx
-2023/03/27 | 433120 | macros/latex/contrib/acmart/acmguide.pdf
+2023/03/31 | 433117 | macros/latex/contrib/acmart/acmguide.pdf
2023/03/26 | 19718 | macros/latex/contrib/acmart/acm-jdslogo.png
2023/03/26 | 19840 | macros/latex/contrib/acmart/acmnumeric.bbx
2023/03/26 | 90 | macros/latex/contrib/acmart/acmnumeric.cbx
-2023/03/27 | 90333 | macros/latex/contrib/acmart/ACM-Reference-Format.bst
+2023/03/31 | 90332 | macros/latex/contrib/acmart/ACM-Reference-Format.bst
2023/03/26 | 4923 | macros/latex/contrib/acmart/Makefile
-2023/03/27 | 12547 | macros/latex/contrib/acmart/README
+2023/03/31 | 12584 | macros/latex/contrib/acmart/README
2023/03/26 | 4825 | macros/latex/contrib/acmart/samples/abbrev.bib
-2023/03/27 | 213990 | macros/latex/contrib/acmart/samples/sample-acmcp.pdf
-2023/03/27 | 395461 | macros/latex/contrib/acmart/samples/sample-acmengage.pdf
-2023/03/27 | 605423 | macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
-2023/03/27 | 627935 | macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf
-2023/03/27 | 1049483 | macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf
-2023/03/27 | 615263 | macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
-2023/03/27 | 617763 | macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf
-2023/03/27 | 562647 | macros/latex/contrib/acmart/samples/sample-acmtog.pdf
-2023/03/27 | 1042626 | macros/latex/contrib/acmart/samples/sample-authordraft.pdf
+2023/03/31 | 213983 | macros/latex/contrib/acmart/samples/sample-acmcp.pdf
+2023/03/31 | 395452 | macros/latex/contrib/acmart/samples/sample-acmengage.pdf
+2023/03/31 | 605417 | macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
+2023/03/31 | 627932 | macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf
+2023/03/31 | 1049474 | macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf
+2023/03/31 | 615259 | macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
+2023/03/31 | 617756 | macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf
+2023/03/31 | 562640 | macros/latex/contrib/acmart/samples/sample-acmtog.pdf
+2023/03/31 | 1042623 | macros/latex/contrib/acmart/samples/sample-authordraft.pdf
2023/03/26 | 53502 | macros/latex/contrib/acmart/samples/sample-base.bib
2023/03/26 | 95030 | macros/latex/contrib/acmart/samples/sample-franklin.png
-2023/03/27 | 783630 | macros/latex/contrib/acmart/samples/sample-lualatex.pdf
-2023/03/27 | 617501 | macros/latex/contrib/acmart/samples/sample-manuscript.pdf
+2023/03/31 | 783621 | macros/latex/contrib/acmart/samples/sample-lualatex.pdf
+2023/03/31 | 617496 | macros/latex/contrib/acmart/samples/sample-manuscript.pdf
2023/03/26 | 54741 | macros/latex/contrib/acmart/samples/samples.dtx
-2023/03/27 | 615069 | macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf
-2023/03/27 | 1054905 | macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf
-2023/03/27 | 1038837 | macros/latex/contrib/acmart/samples/sample-sigconf.pdf
-2023/03/27 | 1047507 | macros/latex/contrib/acmart/samples/sample-sigplan.pdf
+2023/03/31 | 615065 | macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf
+2023/03/31 | 1054905 | macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf
+2023/03/31 | 1038829 | macros/latex/contrib/acmart/samples/sample-sigconf.pdf
+2023/03/31 | 1047499 | macros/latex/contrib/acmart/samples/sample-sigplan.pdf
2023/03/26 | 1138 | macros/latex/contrib/acmart/samples/samples.ins
2023/03/26 | 439021 | macros/latex/contrib/acmart/samples/sampleteaser.pdf
-2023/03/27 | 658514 | macros/latex/contrib/acmart/samples/sample-xelatex.pdf
+2023/03/31 | 658503 | macros/latex/contrib/acmart/samples/sample-xelatex.pdf
2023/03/26 | 5221 | macros/latex/contrib/acmart/samples/software.bib
-2023/03/27 | 13007567 | macros/latex/contrib/acmart.zip
+2023/03/31 | 13007985 | macros/latex/contrib/acmart.zip
2000/05/18 | 66049 | macros/latex/contrib/acmconf/acmconf.dtx
2000/05/18 | 4408 | macros/latex/contrib/acmconf/acmconf.ins
2008/05/14 | 96012 | macros/latex/contrib/acmconf/acmconf.pdf
@@ -229765,13 +229759,13 @@
1996/03/22 | 18862 | macros/latex/contrib/niceframe/umrandb.mf
2015/01/17 | 1370 | macros/latex/contrib/niceframe/umrand.mf
2015/01/17 | 287910 | macros/latex/contrib/niceframe.zip
-2023/03/06 | 776178 | macros/latex/contrib/nicematrix/nicematrix.dtx
-2023/03/07 | 545421 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
-2023/03/06 | 213551 | macros/latex/contrib/nicematrix/nicematrix-french.tex
+2023/03/31 | 782267 | macros/latex/contrib/nicematrix/nicematrix.dtx
+2023/03/31 | 551953 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2023/03/31 | 217101 | macros/latex/contrib/nicematrix/nicematrix-french.tex
2022/12/21 | 1423 | macros/latex/contrib/nicematrix/nicematrix.ins
-2023/03/07 | 1356332 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2023/03/31 | 1364573 | macros/latex/contrib/nicematrix/nicematrix.pdf
2021/11/10 | 1023 | macros/latex/contrib/nicematrix/README.md
-2023/03/07 | 2067290 | macros/latex/contrib/nicematrix.zip
+2023/03/31 | 2084150 | macros/latex/contrib/nicematrix.zip
2015/11/21 | 217 | macros/latex/contrib/nicetext/ANNOUNCE.txt
2012/03/18 | 254582 | macros/latex/contrib/nicetext/demo/arseneau.pdf
2011/09/14 | 10 | macros/latex/contrib/nicetext/demo/iso.txt
@@ -232705,18 +232699,18 @@
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/03/12 | 810431 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
-2023/03/12 | 237961 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
+2023/03/31 | 806464 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
+2023/03/31 | 239576 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
2022/11/06 | 712614 | macros/latex/contrib/proflycee/doc/ProfLycee-old-doc.pdf
2022/11/06 | 192682 | macros/latex/contrib/proflycee/doc/ProfLycee-old-doc.tex
-2023/03/12 | 529 | macros/latex/contrib/proflycee/doc/testscript.py
+2023/03/31 | 529 | macros/latex/contrib/proflycee/doc/testscript.py
2022/08/10 | 439 | macros/latex/contrib/proflycee/README.md
2022/11/06 | 112967 | macros/latex/contrib/proflycee/tex/ProfLycee-old.sty
-2023/03/12 | 123804 | macros/latex/contrib/proflycee/tex/ProfLycee.sty
+2023/03/31 | 125241 | macros/latex/contrib/proflycee/tex/ProfLycee.sty
2023/02/08 | 1766 | macros/latex/contrib/proflycee/tex/proflycee-tools-minted.tex
2023/02/08 | 1976 | macros/latex/contrib/proflycee/tex/proflycee-tools-piton.tex
2023/02/08 | 4147 | macros/latex/contrib/proflycee/tex/proflycee-tools-pythontex.tex
-2023/03/12 | 1766046 | macros/latex/contrib/proflycee.zip
+2023/03/31 | 1762964 | macros/latex/contrib/proflycee.zip
1996/02/05 | 1760 | macros/latex/contrib/progkeys/demo/demo.tex
1996/02/05 | 459 | macros/latex/contrib/progkeys/demo/prog1.tex
1996/02/05 | 347 | macros/latex/contrib/progkeys/demo/prog2.tex
@@ -240403,60 +240397,60 @@
1998/08/05 | 1143 | macros/latex/contrib/units/units.ins
2005/07/30 | 220961 | macros/latex/contrib/units/units.pdf
2005/07/30 | 216905 | macros/latex/contrib/units.zip
-2023/01/26 | 24425 | macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
-2023/01/26 | 3661 | macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
-2023/01/26 | 132446 | macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf
-2023/01/26 | 5231 | macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.tex
-2023/01/26 | 127671 | macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf
-2023/01/26 | 4737 | macros/latex/contrib/univie-ling/doc/templates/template-expose-english.tex
-2023/01/26 | 200624 | macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf
-2023/01/26 | 553 | macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.tex
-2023/01/26 | 200628 | macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf
-2023/01/26 | 531 | macros/latex/contrib/univie-ling/doc/templates/template-handout-english.tex
-2023/01/26 | 172439 | macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf
-2023/01/26 | 4367 | macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.tex
-2023/01/26 | 167337 | macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf
-2023/01/26 | 3965 | macros/latex/contrib/univie-ling/doc/templates/template-paper-english.tex
-2023/01/26 | 227127 | macros/latex/contrib/univie-ling/doc/templates/template-poster-deutsch.pdf
-2023/01/26 | 3800 | macros/latex/contrib/univie-ling/doc/templates/template-poster-deutsch.tex
-2023/01/26 | 224933 | macros/latex/contrib/univie-ling/doc/templates/template-poster-english.pdf
-2023/01/26 | 3666 | macros/latex/contrib/univie-ling/doc/templates/template-poster-english.tex
-2023/01/26 | 189875 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
-2023/01/26 | 4727 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.tex
-2018/09/06 | 2940 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.xmpdata
-2023/01/26 | 186020 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf
-2023/01/26 | 4268 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.tex
-2018/09/06 | 2942 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.xmpdata
-2023/01/26 | 372221 | macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
-2023/01/26 | 2258 | macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.tex
-2023/01/26 | 372011 | macros/latex/contrib/univie-ling/doc/templates/template-wlg-review.pdf
-2023/01/26 | 2218 | macros/latex/contrib/univie-ling/doc/templates/template-wlg-review.tex
-2023/01/26 | 457771 | macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
-2023/01/26 | 26893 | macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
-2023/01/26 | 447918 | macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf
-2023/01/26 | 26431 | macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex
-2023/01/26 | 453820 | macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
-2023/01/26 | 29630 | macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
-2023/01/26 | 365342 | macros/latex/contrib/univie-ling/doc/univie-ling.pdf
-2023/01/26 | 450466 | macros/latex/contrib/univie-ling/doc/univie-ling-poster.pdf
-2023/01/26 | 31033 | macros/latex/contrib/univie-ling/doc/univie-ling-poster.tex
-2023/01/26 | 4649 | macros/latex/contrib/univie-ling/doc/univie-ling.tex
-2023/01/26 | 458808 | macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
-2023/01/26 | 32899 | macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
-2023/01/26 | 345535 | macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
-2023/01/26 | 14368 | macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
-2023/01/26 | 10664 | macros/latex/contrib/univie-ling/README
-2023/01/26 | 21672 | macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
-2023/01/26 | 28767 | macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls
-2023/01/26 | 24987 | macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
-2023/01/26 | 28440 | macros/latex/contrib/univie-ling/tex/univie-ling-poster.cls
-2023/01/26 | 26873 | macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
-2022/05/18 | 304 | macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg
-2023/01/26 | 34892 | macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
-2022/10/06 | 93497 | macros/latex/contrib/univie-ling/tex/univie-ling-wlg-logo.pdf
-2018/09/06 | 25574 | macros/latex/contrib/univie-ling/tex/univielogo.pdf
-2018/09/06 | 25365 | macros/latex/contrib/univie-ling/tex/univielogo-sw.pdf
-2023/01/26 | 5730352 | macros/latex/contrib/univie-ling.zip
+2023/03/31 | 24425 | macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
+2023/03/31 | 3661 | macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
+2023/03/31 | 130780 | macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf
+2023/03/31 | 5231 | macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.tex
+2023/03/31 | 126894 | macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf
+2023/03/31 | 4737 | macros/latex/contrib/univie-ling/doc/templates/template-expose-english.tex
+2023/03/31 | 200672 | macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf
+2023/03/31 | 553 | macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.tex
+2023/03/31 | 200676 | macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf
+2023/03/31 | 531 | macros/latex/contrib/univie-ling/doc/templates/template-handout-english.tex
+2023/03/31 | 158161 | macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf
+2023/03/31 | 4367 | macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.tex
+2023/03/31 | 154403 | macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf
+2023/03/31 | 3965 | macros/latex/contrib/univie-ling/doc/templates/template-paper-english.tex
+2023/03/31 | 227166 | macros/latex/contrib/univie-ling/doc/templates/template-poster-deutsch.pdf
+2023/03/31 | 3800 | macros/latex/contrib/univie-ling/doc/templates/template-poster-deutsch.tex
+2023/03/31 | 224973 | macros/latex/contrib/univie-ling/doc/templates/template-poster-english.pdf
+2023/03/31 | 3666 | macros/latex/contrib/univie-ling/doc/templates/template-poster-english.tex
+2023/03/31 | 171777 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
+2023/03/31 | 4727 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.tex
+2021/12/30 | 2940 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.xmpdata
+2023/03/31 | 168772 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf
+2023/03/31 | 4268 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.tex
+2021/12/30 | 2942 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.xmpdata
+2023/03/31 | 372040 | macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
+2023/03/31 | 2258 | macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.tex
+2023/03/31 | 371831 | macros/latex/contrib/univie-ling/doc/templates/template-wlg-review.pdf
+2023/03/31 | 2218 | macros/latex/contrib/univie-ling/doc/templates/template-wlg-review.tex
+2023/03/31 | 457978 | macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
+2023/03/31 | 26987 | macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
+2023/03/31 | 448122 | macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf
+2023/03/31 | 26525 | macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex
+2023/03/31 | 454263 | macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
+2023/03/31 | 29767 | macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
+2023/03/31 | 365425 | macros/latex/contrib/univie-ling/doc/univie-ling.pdf
+2023/03/31 | 450725 | macros/latex/contrib/univie-ling/doc/univie-ling-poster.pdf
+2023/03/31 | 31127 | macros/latex/contrib/univie-ling/doc/univie-ling-poster.tex
+2023/03/31 | 4649 | macros/latex/contrib/univie-ling/doc/univie-ling.tex
+2023/03/31 | 458988 | macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
+2023/03/31 | 32899 | macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
+2023/03/31 | 345784 | macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
+2023/03/31 | 14462 | macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
+2023/03/31 | 10744 | macros/latex/contrib/univie-ling/README
+2023/03/31 | 21672 | macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
+2023/03/31 | 28767 | macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls
+2023/03/31 | 24987 | macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
+2023/03/31 | 28440 | macros/latex/contrib/univie-ling/tex/univie-ling-poster.cls
+2023/03/31 | 26873 | macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
+2022/09/11 | 304 | macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg
+2023/03/31 | 34892 | macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
+2022/09/29 | 93497 | macros/latex/contrib/univie-ling/tex/univie-ling-wlg-logo.pdf
+2022/09/11 | 25574 | macros/latex/contrib/univie-ling/tex/univielogo.pdf
+2022/09/11 | 25365 | macros/latex/contrib/univie-ling/tex/univielogo-sw.pdf
+2023/03/31 | 5670692 | macros/latex/contrib/univie-ling.zip
2019/07/14 | 30359 | macros/latex/contrib/unizgklasa/example.pdf
2019/07/14 | 4187 | macros/latex/contrib/unizgklasa/example.tex
2019/07/14 | 1729 | macros/latex/contrib/unizgklasa/README.md
@@ -290554,8 +290548,8 @@
2019/02/28 | 2520 | systems/texlive/tlnet/archive/context-lettrine.r47085.tar.xz
2019/02/28 | 399952 | systems/texlive/tlnet/archive/context-mathsets.doc.r47085.tar.xz
2019/02/28 | 4896 | systems/texlive/tlnet/archive/context-mathsets.r47085.tar.xz
-2023/03/30 | 2199704 | systems/texlive/tlnet/archive/context-notes-zh-cn.doc.r66706.tar.xz
-2023/03/30 | 508 | systems/texlive/tlnet/archive/context-notes-zh-cn.r66706.tar.xz
+2023/03/31 | 2199936 | systems/texlive/tlnet/archive/context-notes-zh-cn.doc.r66714.tar.xz
+2023/03/31 | 508 | systems/texlive/tlnet/archive/context-notes-zh-cn.r66714.tar.xz
2023/03/28 | 9982588 | systems/texlive/tlnet/archive/context.r66691.tar.xz
2019/02/28 | 126944 | systems/texlive/tlnet/archive/context-rst.doc.r47085.tar.xz
2019/02/28 | 31068 | systems/texlive/tlnet/archive/context-rst.r47085.tar.xz
@@ -294295,9 +294289,9 @@
2022/06/24 | 480 | systems/texlive/tlnet/archive/l2tabu.r63708.tar.xz
2019/02/28 | 227412 | systems/texlive/tlnet/archive/l2tabu-spanish.doc.r15878.tar.xz
2019/02/28 | 448 | systems/texlive/tlnet/archive/l2tabu-spanish.r15878.tar.xz
-2023/01/18 | 889272 | systems/texlive/tlnet/archive/l3backend.doc.r65573.tar.xz
-2023/01/18 | 15464 | systems/texlive/tlnet/archive/l3backend.r65573.tar.xz
-2023/01/18 | 33064 | systems/texlive/tlnet/archive/l3backend.source.r65573.tar.xz
+2023/03/31 | 888076 | systems/texlive/tlnet/archive/l3backend.doc.r66710.tar.xz
+2023/03/31 | 16200 | systems/texlive/tlnet/archive/l3backend.r66710.tar.xz
+2023/03/31 | 33844 | systems/texlive/tlnet/archive/l3backend.source.r66710.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/l3build.aarch64-linux.r46894.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/l3build.amd64-freebsd.r46894.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/l3build.amd64-netbsd.r46894.tar.xz
@@ -294316,12 +294310,12 @@
2019/02/28 | 344 | systems/texlive/tlnet/archive/l3build.x86_64-linuxmusl.r46894.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/l3build.x86_64-linux.r46894.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/l3build.x86_64-solaris.r46894.tar.xz
-2023/01/26 | 3496232 | systems/texlive/tlnet/archive/l3experimental.doc.r65621.tar.xz
-2023/01/26 | 23640 | systems/texlive/tlnet/archive/l3experimental.r65621.tar.xz
-2023/01/26 | 80096 | systems/texlive/tlnet/archive/l3experimental.source.r65621.tar.xz
-2023/02/24 | 11984952 | systems/texlive/tlnet/archive/l3kernel.doc.r66094.tar.xz
-2023/02/24 | 174616 | systems/texlive/tlnet/archive/l3kernel.r66094.tar.xz
-2023/02/24 | 599532 | systems/texlive/tlnet/archive/l3kernel.source.r66094.tar.xz
+2023/03/31 | 3496112 | systems/texlive/tlnet/archive/l3experimental.doc.r66710.tar.xz
+2023/03/31 | 23656 | systems/texlive/tlnet/archive/l3experimental.r66710.tar.xz
+2023/03/31 | 80088 | systems/texlive/tlnet/archive/l3experimental.source.r66710.tar.xz
+2023/03/31 | 11993992 | systems/texlive/tlnet/archive/l3kernel.doc.r66710.tar.xz
+2023/03/31 | 175004 | systems/texlive/tlnet/archive/l3kernel.r66710.tar.xz
+2023/03/31 | 599948 | systems/texlive/tlnet/archive/l3kernel.source.r66710.tar.xz
2023/02/04 | 1831688 | systems/texlive/tlnet/archive/l3packages.doc.r65722.tar.xz
2023/02/04 | 21928 | systems/texlive/tlnet/archive/l3packages.r65722.tar.xz
2023/02/04 | 45696 | systems/texlive/tlnet/archive/l3packages.source.r65722.tar.xz
@@ -296116,8 +296110,8 @@
2019/02/28 | 1348 | systems/texlive/tlnet/archive/mparrows.r39729.tar.xz
2019/02/28 | 11328 | systems/texlive/tlnet/archive/mpattern.doc.r15878.tar.xz
2019/02/28 | 2752 | systems/texlive/tlnet/archive/mpattern.r15878.tar.xz
-2023/03/30 | 1752620 | systems/texlive/tlnet/archive/mpchess.doc.r66703.tar.xz
-2023/03/30 | 19120 | systems/texlive/tlnet/archive/mpchess.r66703.tar.xz
+2023/03/31 | 1378264 | systems/texlive/tlnet/archive/mpchess.doc.r66709.tar.xz
+2023/03/31 | 19160 | systems/texlive/tlnet/archive/mpchess.r66709.tar.xz
2019/02/28 | 108768 | systems/texlive/tlnet/archive/mpcolornames.doc.r23252.tar.xz
2019/02/28 | 6792 | systems/texlive/tlnet/archive/mpcolornames.r23252.tar.xz
2019/02/28 | 3364 | systems/texlive/tlnet/archive/mpcolornames.source.r23252.tar.xz
@@ -297337,8 +297331,8 @@
2021/04/05 | 209684 | systems/texlive/tlnet/archive/physconst.doc.r58727.tar.xz
2021/04/05 | 6016 | systems/texlive/tlnet/archive/physconst.r58727.tar.xz
2021/04/05 | 18756 | systems/texlive/tlnet/archive/physconst.source.r58727.tar.xz
-2023/02/24 | 191756 | systems/texlive/tlnet/archive/physics2.doc.r66115.tar.xz
-2023/02/24 | 7616 | systems/texlive/tlnet/archive/physics2.r66115.tar.xz
+2023/03/31 | 178240 | systems/texlive/tlnet/archive/physics2.doc.r66711.tar.xz
+2023/03/31 | 7740 | systems/texlive/tlnet/archive/physics2.r66711.tar.xz
2019/02/28 | 232876 | systems/texlive/tlnet/archive/physics.doc.r28590.tar.xz
2019/02/28 | 5912 | systems/texlive/tlnet/archive/physics.r28590.tar.xz
2021/04/05 | 104792 | systems/texlive/tlnet/archive/physunits.doc.r58728.tar.xz
@@ -299761,7 +299755,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/03/30 | 422704 | systems/texlive/tlnet/archive/texlive-scripts.doc.r66701.tar.xz
+2023/03/31 | 423448 | systems/texlive/tlnet/archive/texlive-scripts.doc.r66708.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
@@ -299783,7 +299777,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/03/30 | 114036 | systems/texlive/tlnet/archive/texlive-scripts.r66701.tar.xz
+2023/03/31 | 114028 | systems/texlive/tlnet/archive/texlive-scripts.r66708.tar.xz
2022/09/13 | 580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz
2023/03/08 | 60300 | systems/texlive/tlnet/archive/texlive-scripts.windows.r66427.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz
@@ -300894,8 +300888,8 @@
2023/02/10 | 134036 | systems/texlive/tlnet/archive/ut-thesis.doc.r65767.tar.xz
2023/02/10 | 2632 | systems/texlive/tlnet/archive/ut-thesis.r65767.tar.xz
2023/02/10 | 6868 | systems/texlive/tlnet/archive/ut-thesis.source.r65767.tar.xz
-2023/03/04 | 122460 | systems/texlive/tlnet/archive/uvaletter.doc.r66330.tar.xz
-2023/03/04 | 1464 | systems/texlive/tlnet/archive/uvaletter.r66330.tar.xz
+2023/03/31 | 39744 | systems/texlive/tlnet/archive/uvaletter.doc.r66712.tar.xz
+2023/03/31 | 1480 | systems/texlive/tlnet/archive/uvaletter.r66712.tar.xz
2021/09/07 | 127872 | systems/texlive/tlnet/archive/uwa-colours.doc.r60443.tar.xz
2021/09/07 | 1228 | systems/texlive/tlnet/archive/uwa-colours.r60443.tar.xz
2021/09/07 | 3016 | systems/texlive/tlnet/archive/uwa-colours.source.r60443.tar.xz
@@ -301061,9 +301055,9 @@
2019/02/28 | 26448 | systems/texlive/tlnet/archive/wallcalendar.r45568.tar.xz
2019/02/28 | 1277340 | systems/texlive/tlnet/archive/wallpaper.doc.r15878.tar.xz
2019/02/28 | 1576 | systems/texlive/tlnet/archive/wallpaper.r15878.tar.xz
-2022/10/24 | 2352976 | systems/texlive/tlnet/archive/wargame.doc.r64797.tar.xz
-2022/10/24 | 194220 | systems/texlive/tlnet/archive/wargame.r64797.tar.xz
-2022/10/24 | 153572 | systems/texlive/tlnet/archive/wargame.source.r64797.tar.xz
+2023/03/31 | 2483140 | systems/texlive/tlnet/archive/wargame.doc.r66713.tar.xz
+2023/03/31 | 235988 | systems/texlive/tlnet/archive/wargame.r66713.tar.xz
+2023/03/31 | 200984 | systems/texlive/tlnet/archive/wargame.source.r66713.tar.xz
2023/03/22 | 285264 | systems/texlive/tlnet/archive/warning.doc.r66616.tar.xz
2023/03/22 | 1672 | systems/texlive/tlnet/archive/warning.r66616.tar.xz
2019/02/28 | 85512 | systems/texlive/tlnet/archive/warpcol.doc.r15878.tar.xz
@@ -301639,16 +301633,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/03/12 | 125532 | systems/texlive/tlnet/install-tl
-2023/03/30 | 5737435 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2023/03/30 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2023/03/30 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/03/31 | 5737434 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/03/31 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/03/31 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2023/02/19 | 5098 | systems/texlive/tlnet/install-tl-windows.bat
-2023/03/30 | 21035872 | systems/texlive/tlnet/install-tl-windows.exe
-2023/03/30 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/03/30 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/03/30 | 26024778 | systems/texlive/tlnet/install-tl.zip
-2023/03/30 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2023/03/30 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/03/31 | 21036798 | systems/texlive/tlnet/install-tl-windows.exe
+2023/03/31 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/03/31 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/03/31 | 26024760 | systems/texlive/tlnet/install-tl.zip
+2023/03/31 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/03/31 | 455 | 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
@@ -301658,7 +301652,7 @@
2023/01/17 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2023/01/17 | 49938 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2023/03/29 | 7246 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2023/03/30 | 7169 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/01/11 | 216583 | 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
@@ -301700,12 +301694,12 @@
2023/02/21 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2021/12/21 | 27582 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2023/03/30 | 17998394 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2023/03/30 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/03/31 | 17999151 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/03/31 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2023/02/20 | 86803 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2023/03/30 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2023/03/30 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/03/30 | 2433680 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/03/31 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/03/31 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/03/31 | 2433604 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2023/02/20 | 58928 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2023/02/26 | 42350 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2023/02/21 | 16138 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -312092,7 +312086,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/03/31 | 186 | timestamp
+2023/04/01 | 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 567a58f94f..b848a06aae 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index edf254f7fb..00fbae772b 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,3 +1,167 @@
+2023/03/31 | 9919 | info/context-notes-zh-cn/src/09.tex
+2023/03/31 | 945 | info/context-notes-zh-cn/README.md
+2023/03/31 | 908440 | macros/latex/contrib/acmart/acmart.pdf
+2023/03/31 | 9056 | fonts/kpfonts-otf/README.md
+2023/03/31 | 90332 | macros/latex/contrib/acmart/ACM-Reference-Format.bst
+2023/03/31 | 888076 | systems/texlive/tlnet/archive/l3backend.doc.r66710.tar.xz
+2023/03/31 | 806464 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
+2023/03/31 | 80088 | systems/texlive/tlnet/archive/l3experimental.source.r66710.tar.xz
+2023/03/31 | 783621 | macros/latex/contrib/acmart/samples/sample-lualatex.pdf
+2023/03/31 | 782267 | macros/latex/contrib/nicematrix/nicematrix.dtx
+2023/03/31 | 7740 | systems/texlive/tlnet/archive/physics2.r66711.tar.xz
+2023/03/31 | 7211 | info/context-notes-zh-cn/src/06.tex
+2023/03/31 | 718 | info/context-notes-zh-cn/src/ctxnotes.tex
+2023/03/31 | 6950 | fonts/erewhon-math/README.md
+2023/03/31 | 6948 | info/context-notes-zh-cn/src/10.tex
+2023/03/31 | 6801 | info/context-notes-zh-cn/src/zhfonts.tex
+2023/03/31 | 6593 | info/context-notes-zh-cn/src/doc-env.tex
+2023/03/31 | 658503 | macros/latex/contrib/acmart/samples/sample-xelatex.pdf
+2023/03/31 | 627932 | macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf
+2023/03/31 | 617756 | macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf
+2023/03/31 | 617496 | macros/latex/contrib/acmart/samples/sample-manuscript.pdf
+2023/03/31 | 615259 | macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
+2023/03/31 | 615065 | macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf
+2023/03/31 | 605417 | macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
+2023/03/31 | 599948 | systems/texlive/tlnet/archive/l3kernel.source.r66710.tar.xz
+2023/03/31 | 5908 | info/context-notes-zh-cn/src/07.tex
+2023/03/31 | 5737434 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/03/31 | 5670692 | macros/latex/contrib/univie-ling.zip
+2023/03/31 | 5633 | info/context-notes-zh-cn/src/05.tex
+2023/03/31 | 562640 | macros/latex/contrib/acmart/samples/sample-acmtog.pdf
+2023/03/31 | 553 | macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.tex
+2023/03/31 | 551953 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2023/03/31 | 531 | macros/latex/contrib/univie-ling/doc/templates/template-handout-english.tex
+2023/03/31 | 529 | macros/latex/contrib/proflycee/doc/testscript.py
+2023/03/31 | 5231 | macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.tex
+2023/03/31 | 508 | systems/texlive/tlnet/archive/context-notes-zh-cn.r66714.tar.xz
+2023/03/31 | 498 | info/context-notes-zh-cn/src/license.tex
+2023/03/31 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/03/31 | 4737 | macros/latex/contrib/univie-ling/doc/templates/template-expose-english.tex
+2023/03/31 | 4727 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.tex
+2023/03/31 | 4649 | macros/latex/contrib/univie-ling/doc/univie-ling.tex
+2023/03/31 | 458988 | macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
+2023/03/31 | 457978 | macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
+2023/03/31 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/03/31 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/03/31 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/03/31 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/03/31 | 454263 | macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
+2023/03/31 | 450725 | macros/latex/contrib/univie-ling/doc/univie-ling-poster.pdf
+2023/03/31 | 448122 | macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf
+2023/03/31 | 4467344 | fonts/kpfonts-otf.zip
+2023/03/31 | 4367 | macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.tex
+2023/03/31 | 433117 | macros/latex/contrib/acmart/acmguide.pdf
+2023/03/31 | 4268 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.tex
+2023/03/31 | 423448 | systems/texlive/tlnet/archive/texlive-scripts.doc.r66708.tar.xz
+2023/03/31 | 420 | info/context-notes-zh-cn/src/postscript.tex
+2023/03/31 | 4058524 | biblio/ctan-bibdata.zip
+2023/03/31 | 39744 | systems/texlive/tlnet/archive/uvaletter.doc.r66712.tar.xz
+2023/03/31 | 3965 | macros/latex/contrib/univie-ling/doc/templates/template-paper-english.tex
+2023/03/31 | 395452 | macros/latex/contrib/acmart/samples/sample-acmengage.pdf
+2023/03/31 | 3803 | info/context-notes-zh-cn/src/preface.tex
+2023/03/31 | 3800 | macros/latex/contrib/univie-ling/doc/templates/template-poster-deutsch.tex
+2023/03/31 | 372040 | macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
+2023/03/31 | 371831 | macros/latex/contrib/univie-ling/doc/templates/template-wlg-review.pdf
+2023/03/31 | 3666 | macros/latex/contrib/univie-ling/doc/templates/template-poster-english.tex
+2023/03/31 | 3662090 | biblio/ctan-bibdata/ctan.pdf
+2023/03/31 | 3661 | macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
+2023/03/31 | 365425 | macros/latex/contrib/univie-ling/doc/univie-ling.pdf
+2023/03/31 | 3600 | fonts/concmath-otf/README.md
+2023/03/31 | 35126 | graphics/pgf/contrib/structmech/LICENSE
+2023/03/31 | 3496112 | systems/texlive/tlnet/archive/l3experimental.doc.r66710.tar.xz
+2023/03/31 | 34892 | macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
+2023/03/31 | 345784 | macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
+2023/03/31 | 33844 | systems/texlive/tlnet/archive/l3backend.source.r66710.tar.xz
+2023/03/31 | 3358931 | info/context-notes-zh-cn.zip
+2023/03/31 | 32899 | macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
+2023/03/31 | 31127 | macros/latex/contrib/univie-ling/doc/univie-ling-poster.tex
+2023/03/31 | 2998 | fonts/xcharter-math/README.md
+2023/03/31 | 29767 | macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
+2023/03/31 | 2972 | fonts/euler-math/README.md
+2023/03/31 | 28767 | macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls
+2023/03/31 | 287471 | macros/latex/contrib/acmart/acmart.dtx
+2023/03/31 | 28570 | info/context-notes-zh-cn/src/12.tex
+2023/03/31 | 28440 | macros/latex/contrib/univie-ling/tex/univie-ling-poster.cls
+2023/03/31 | 2774813 | biblio/ctan-bibdata/ctan.bib
+2023/03/31 | 26987 | macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
+2023/03/31 | 26873 | macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
+2023/03/31 | 26525 | macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex
+2023/03/31 | 26024760 | systems/texlive/tlnet/install-tl.zip
+2023/03/31 | 24987 | macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
+2023/03/31 | 2483140 | systems/texlive/tlnet/archive/wargame.doc.r66713.tar.xz
+2023/03/31 | 24425 | macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
+2023/03/31 | 2433604 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/03/31 | 239576 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
+2023/03/31 | 2387188 | fonts/erewhon-math.zip
+2023/03/31 | 23691 | graphics/pgf/contrib/structmech/structmech.sty
+2023/03/31 | 23656 | systems/texlive/tlnet/archive/l3experimental.r66710.tar.xz
+2023/03/31 | 235988 | systems/texlive/tlnet/archive/wargame.r66713.tar.xz
+2023/03/31 | 23373 | info/context-notes-zh-cn/src/figures/10/colors.png
+2023/03/31 | 2317 | info/context-notes-zh-cn/src/ctxnotes.bib
+2023/03/31 | 2274085 | fonts/xcharter-math.zip
+2023/03/31 | 227166 | macros/latex/contrib/univie-ling/doc/templates/template-poster-deutsch.pdf
+2023/03/31 | 2258 | macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.tex
+2023/03/31 | 224973 | macros/latex/contrib/univie-ling/doc/templates/template-poster-english.pdf
+2023/03/31 | 2241 | info/context-notes-zh-cn/src/cover.tex
+2023/03/31 | 22317 | graphics/pgf/contrib/structmech/structmech.tex
+2023/03/31 | 2218 | macros/latex/contrib/univie-ling/doc/templates/template-wlg-review.tex
+2023/03/31 | 2199936 | systems/texlive/tlnet/archive/context-notes-zh-cn.doc.r66714.tar.xz
+2023/03/31 | 217101 | macros/latex/contrib/nicematrix/nicematrix-french.tex
+2023/03/31 | 21672 | macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
+2023/03/31 | 213983 | macros/latex/contrib/acmart/samples/sample-acmcp.pdf
+2023/03/31 | 21369 | info/context-notes-zh-cn/src/03.tex
+2023/03/31 | 21036798 | systems/texlive/tlnet/install-tl-windows.exe
+2023/03/31 | 2084150 | macros/latex/contrib/nicematrix.zip
+2023/03/31 | 2067 | info/context-notes-zh-cn/src/bib-style.tex
+2023/03/31 | 2035457 | info/context-notes-zh-cn/ctxnotes.pdf
+2023/03/31 | 2030628 | fonts/concmath-otf.zip
+2023/03/31 | 200984 | systems/texlive/tlnet/archive/wargame.source.r66713.tar.xz
+2023/03/31 | 200676 | macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf
+2023/03/31 | 200672 | macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf
+2023/03/31 | 19160 | systems/texlive/tlnet/archive/mpchess.r66709.tar.xz
+2023/03/31 | 1884924 | fonts/euler-math.zip
+2023/03/31 | 17999151 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/03/31 | 178240 | systems/texlive/tlnet/archive/physics2.doc.r66711.tar.xz
+2023/03/31 | 1762964 | macros/latex/contrib/proflycee.zip
+2023/03/31 | 175004 | systems/texlive/tlnet/archive/l3kernel.r66710.tar.xz
+2023/03/31 | 171 | info/context-notes-zh-cn/src/basis.tex
+2023/03/31 | 171777 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
+2023/03/31 | 168772 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf
+2023/03/31 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/03/31 | 16200 | systems/texlive/tlnet/archive/l3backend.r66710.tar.xz
+2023/03/31 | 160731 | graphics/pgf/contrib/structmech.zip
+2023/03/31 | 158161 | macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf
+2023/03/31 | 157219 | graphics/pgf/contrib/structmech/structmech.pdf
+2023/03/31 | 154403 | macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf
+2023/03/31 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/03/31 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/03/31 | 1480 | systems/texlive/tlnet/archive/uvaletter.r66712.tar.xz
+2023/03/31 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/03/31 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/03/31 | 14462 | macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
+2023/03/31 | 14288 | info/context-notes-zh-cn/src/01.tex
+2023/03/31 | 1378264 | systems/texlive/tlnet/archive/mpchess.doc.r66709.tar.xz
+2023/03/31 | 1364573 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2023/03/31 | 13561 | info/context-notes-zh-cn/src/08.tex
+2023/03/31 | 13202 | info/context-notes-zh-cn/src/13.tex
+2023/03/31 | 130780 | macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf
+2023/03/31 | 13007985 | macros/latex/contrib/acmart.zip
+2023/03/31 | 126894 | macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf
+2023/03/31 | 12584 | macros/latex/contrib/acmart/README
+2023/03/31 | 125241 | macros/latex/contrib/proflycee/tex/ProfLycee.sty
+2023/03/31 | 12216 | info/context-notes-zh-cn/src/11.tex
+2023/03/31 | 11993992 | systems/texlive/tlnet/archive/l3kernel.doc.r66710.tar.xz
+2023/03/31 | 114028 | systems/texlive/tlnet/archive/texlive-scripts.r66708.tar.xz
+2023/03/31 | 10908 | info/context-notes-zh-cn/src/02.tex
+2023/03/31 | 10744 | macros/latex/contrib/univie-ling/README
+2023/03/31 | 1054905 | macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf
+2023/03/31 | 1049474 | macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf
+2023/03/31 | 1047499 | macros/latex/contrib/acmart/samples/sample-sigplan.pdf
+2023/03/31 | 1042623 | macros/latex/contrib/acmart/samples/sample-authordraft.pdf
+2023/03/31 | 1038829 | macros/latex/contrib/acmart/samples/sample-sigconf.pdf
+2023/03/31 | 10387 | info/context-notes-zh-cn/src/04.tex
+2023/03/31 | 1018 | graphics/pgf/contrib/structmech/README.md
+2023/03/31 | 10094 | info/context-notes-zh-cn/src/14.tex
2023/03/30 | 9999 | macros/latex/contrib/l3kernel/l3news10.tex
2023/03/30 | 9916 | macros/latex/contrib/l3backend/l3backend-opacity.dtx
2023/03/30 | 97360 | systems/texlive/tlnet/archive/texinfo.r66701.tar.xz
@@ -15,12 +179,14 @@
2023/03/30 | 90470 | macros/latex/contrib/l3kernel/l3seq.dtx
2023/03/30 | 87997 | macros/latex/contrib/physics2/doc/physics2.pdf
2023/03/30 | 87463 | macros/latex/contrib/l3kernel/l3coffins.dtx
+2023/03/30 | 8715 | fonts/erewhon-math/fourier-otf.sty
2023/03/30 | 8481 | macros/latex/contrib/l3kernel/l3news11.tex
2023/03/30 | 84785 | macros/latex/contrib/l3kernel/l3fp-basics.dtx
2023/03/30 | 82826 | macros/latex/contrib/physics2/doc/physics2-legacy.pdf
2023/03/30 | 82667 | macros/latex/contrib/l3kernel/l3clist.dtx
2023/03/30 | 82260 | macros/latex/contrib/l3kernel/l3names.dtx
2023/03/30 | 81640 | macros/latex/contrib/l3kernel/l3prefixes.pdf
+2023/03/30 | 80224 | fonts/xcharter-math/XCharter-Math-Bold.otf
2023/03/30 | 79698 | macros/latex/contrib/l3kernel/l3box.dtx
2023/03/30 | 7907 | macros/latex/contrib/l3experimental/CHANGELOG.md
2023/03/30 | 78692 | macros/latex/contrib/l3kernel/l3str.dtx
@@ -29,13 +195,17 @@
2023/03/30 | 74250 | macros/latex/contrib/l3kernel/l3msg.dtx
2023/03/30 | 73835 | macros/latex/contrib/l3kernel/l3fp-trig.dtx
2023/03/30 | 7339540 | macros/latex/contrib/l3kernel/source3.pdf
+2023/03/30 | 7169 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/03/30 | 70859 | macros/latex/contrib/l3kernel/expl3.dtx
2023/03/30 | 70279 | macros/latex/contrib/l3kernel/l3fp.dtx
2023/03/30 | 68365 | macros/latex/contrib/l3kernel/l3candidates.dtx
2023/03/30 | 679499 | macros/latex/contrib/l3experimental/l3draw-code.pdf
+2023/03/30 | 6792 | fonts/xcharter-math/xcharter-otf.sty
2023/03/30 | 6677 | macros/latex/contrib/l3kernel/l3news02.tex
2023/03/30 | 66654 | macros/latex/contrib/l3kernel/l3prg.dtx
+2023/03/30 | 66492 | fonts/kpfonts-otf/fonts/KpMono-Italic.otf
2023/03/30 | 66037 | macros/latex/contrib/l3kernel/l3text-case.dtx
+2023/03/30 | 65188 | fonts/kpfonts-otf/fonts/KpMono-BoldItalic.otf
2023/03/30 | 6482 | macros/latex/contrib/l3kernel/l3news03.tex
2023/03/30 | 6433 | macros/latex/contrib/l3kernel/l3news06.tex
2023/03/30 | 62840 | macros/latex/contrib/l3kernel/l3tl-analysis.dtx
@@ -43,10 +213,11 @@
2023/03/30 | 622894 | macros/latex/contrib/l3kernel/expl3.pdf
2023/03/30 | 6224 | macros/latex/contrib/l3kernel/l3.ins
2023/03/30 | 6169 | macros/latex/contrib/l3kernel/l3term-glossary.tex
+2023/03/30 | 59108 | fonts/kpfonts-otf/fonts/KpMono-Regular.otf
2023/03/30 | 584 | systems/texlive/tlnet/archive/collection-context.r66706.tar.xz
2023/03/30 | 58083 | macros/latex/contrib/l3experimental/xgalley.dtx
+2023/03/30 | 57976 | fonts/kpfonts-otf/fonts/KpMono-Bold.otf
2023/03/30 | 57974 | macros/latex/contrib/l3kernel/l3prop.dtx
-2023/03/30 | 5737435 | systems/texlive/tlnet/install-tl-unx.tar.gz
2023/03/30 | 5653 | macros/latex/contrib/l3experimental/l3draw-layers.dtx
2023/03/30 | 557821 | macros/latex/contrib/l3kernel/l3doc.pdf
2023/03/30 | 549 | macros/latex/contrib/l3backend/README.md
@@ -54,47 +225,47 @@
2023/03/30 | 517668 | macros/latex/contrib/l3experimental/l3draw.pdf
2023/03/30 | 51059 | macros/latex/contrib/l3kernel/l3fp-extended.dtx
2023/03/30 | 50921 | macros/latex/contrib/l3kernel/l3text.dtx
-2023/03/30 | 508 | systems/texlive/tlnet/archive/context-notes-zh-cn.r66706.tar.xz
2023/03/30 | 50809 | macros/latex/contrib/l3backend/l3backend-pdf.dtx
2023/03/30 | 4977 | macros/latex/contrib/l3kernel/l3news07.tex
2023/03/30 | 4937 | macros/latex/contrib/l3kernel/l3news01.tex
2023/03/30 | 49311 | macros/latex/contrib/l3kernel/l3fp-expo.dtx
2023/03/30 | 4922 | macros/latex/contrib/l3backend/l3backend.ins
-2023/03/30 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2023/03/30 | 4890 | macros/latex/contrib/l3kernel/l3news.tex
+2023/03/30 | 480 | fonts/kpfonts-otf/tex/KpLight.fontspec
+2023/03/30 | 4750 | fonts/euler-math/euler-math.sty
2023/03/30 | 47216 | macros/latex/contrib/l3kernel/l3fp-aux.dtx
2023/03/30 | 4716 | macros/latex/contrib/l3kernel/l3news05.tex
-2023/03/30 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/03/30 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2023/03/30 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/03/30 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/03/30 | 469 | fonts/kpfonts-otf/tex/KpRoman.fontspec
+2023/03/30 | 467916 | fonts/kpfonts-otf/fonts/KpMath-Light.otf
2023/03/30 | 45418 | macros/latex/contrib/l3kernel/l3prefixes.csv
2023/03/30 | 4538 | macros/latex/contrib/l3kernel/l3legacy.dtx
2023/03/30 | 44988 | macros/latex/contrib/l3kernel/CHANGELOG.md
2023/03/30 | 4453546 | install/macros/latex/contrib/l3experimental.tds.zip
2023/03/30 | 4448 | macros/latex/contrib/l3experimental/l3draw-state.dtx
+2023/03/30 | 443768 | fonts/euler-math/Euler-Math.otf
+2023/03/30 | 441588 | fonts/kpfonts-otf/fonts/KpMath-Regular.otf
2023/03/30 | 4415461 | macros/latex/contrib/l3experimental.zip
2023/03/30 | 4323 | macros/latex/contrib/l3experimental/l3draw-boxes.dtx
2023/03/30 | 43212 | macros/latex/contrib/l3kernel/l3debug.dtx
2023/03/30 | 4284 | macros/latex/contrib/l3experimental/README.md
2023/03/30 | 42558 | macros/latex/contrib/l3experimental/l3draw.dtx
-2023/03/30 | 422704 | systems/texlive/tlnet/archive/texlive-scripts.doc.r66701.tar.xz
2023/03/30 | 41332 | macros/latex/contrib/l3backend/l3backend-color.dtx
2023/03/30 | 41146 | macros/latex/contrib/uvaletter.zip
+2023/03/30 | 410 | fonts/euler-math/neo-euler.sty
2023/03/30 | 408782 | macros/latex/contrib/l3experimental/l3galley.pdf
2023/03/30 | 40704 | macros/latex/contrib/l3kernel/l3sort.dtx
-2023/03/30 | 4059623 | biblio/ctan-bibdata.zip
2023/03/30 | 404278 | macros/latex/contrib/l3experimental/l3bitset.pdf
2023/03/30 | 4011 | macros/latex/contrib/l3experimental/l3opacity.dtx
2023/03/30 | 395876 | macros/latex/contrib/l3kernel/l3news.pdf
2023/03/30 | 3944 | systems/texlive/tlnet/archive/songproj.r66704.tar.xz
2023/03/30 | 394348 | macros/latex/contrib/l3experimental/xcoffins.pdf
+2023/03/30 | 393756 | fonts/erewhon-math/Erewhon-Math.otf
2023/03/30 | 3929 | macros/latex/contrib/l3kernel/README.md
2023/03/30 | 382031 | macros/latex/contrib/l3experimental/l3graphics.pdf
2023/03/30 | 37118 | macros/latex/contrib/uvaletter/demo/uvaletter-demo.pdf
2023/03/30 | 367903 | macros/latex/contrib/l3experimental/l3str-format.pdf
-2023/03/30 | 3662535 | biblio/ctan-bibdata/ctan.pdf
2023/03/30 | 36026 | macros/latex/contrib/l3experimental/l3draw-points.dtx
+2023/03/30 | 35658 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.ltx
2023/03/30 | 35441 | macros/latex/contrib/l3kernel/l3quark.dtx
2023/03/30 | 35092 | macros/latex/contrib/l3experimental/xcoffins.dtx
2023/03/30 | 347924 | macros/latex/contrib/l3experimental/l3sys-shell.pdf
@@ -102,59 +273,75 @@
2023/03/30 | 34288 | macros/latex/contrib/l3backend/l3backend-draw.dtx
2023/03/30 | 34167 | macros/latex/contrib/l3kernel/l3intarray.dtx
2023/03/30 | 33656 | macros/latex/contrib/l3kernel/l3sys.dtx
+2023/03/30 | 33290 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.ltx
+2023/03/30 | 330580 | fonts/xcharter-math/XCharter-Math.otf
2023/03/30 | 32935 | macros/latex/contrib/l3kernel/l3unicode.dtx
2023/03/30 | 32508 | macros/latex/contrib/l3experimental/l3draw-paths.dtx
2023/03/30 | 32409 | macros/latex/contrib/l3kernel/l3cctab.dtx
2023/03/30 | 31827 | macros/latex/contrib/l3experimental/l3str-format.dtx
2023/03/30 | 313467 | macros/latex/contrib/l3experimental/l3opacity.pdf
2023/03/30 | 308403 | macros/latex/contrib/l3experimental/l3benchmark.pdf
+2023/03/30 | 30663 | fonts/erewhon-math/Erewhon-Math.ltx
2023/03/30 | 304752 | macros/latex/contrib/l3kernel/l3regex.dtx
2023/03/30 | 299507 | macros/latex/contrib/l3experimental/xgalley.pdf
2023/03/30 | 2961 | macros/latex/contrib/physics2/doc/phy2docdef.tex
2023/03/30 | 296152 | macros/latex/contrib/l3kernel/l3styleguide.pdf
2023/03/30 | 2947 | macros/latex/contrib/physics2/tex/phy-common.sty
2023/03/30 | 29448 | macros/latex/contrib/l3backend/l3backend-graphics.dtx
+2023/03/30 | 288264 | fonts/kpfonts-otf/fonts/KpMath-Sans.otf
2023/03/30 | 2821 | macros/latex/contrib/l3kernel/l3prefixes.tex
-2023/03/30 | 2773331 | biblio/ctan-bibdata/ctan.bib
2023/03/30 | 26736 | macros/latex/contrib/l3kernel/l3kernel-functions.dtx
-2023/03/30 | 26024778 | systems/texlive/tlnet/install-tl.zip
+2023/03/30 | 26592 | fonts/xcharter-math/XCharter-Math.ltx
2023/03/30 | 2596 | macros/latex/contrib/uvaletter/demo/uvaletter-demo.tex
2023/03/30 | 25753 | macros/latex/contrib/l3experimental/l3graphics.dtx
2023/03/30 | 25650 | macros/latex/contrib/l3kernel/l3fp-random.dtx
2023/03/30 | 250136 | macros/latex/contrib/l3kernel/l3news09.pdf
2023/03/30 | 24841 | macros/latex/contrib/l3kernel/source3body.tex
-2023/03/30 | 2433680 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2023/03/30 | 242796 | macros/latex/contrib/l3kernel/l3syntax-changes.pdf
2023/03/30 | 2390 | macros/latex/contrib/l3kernel/l3docstrip.dtx
2023/03/30 | 23866 | macros/latex/contrib/l3kernel/l3luatex.dtx
2023/03/30 | 23530 | macros/latex/contrib/l3kernel/l3deprecation.dtx
+2023/03/30 | 231 | fonts/kpfonts-otf/tex/KpSans.fontspec
2023/03/30 | 23011 | macros/latex/contrib/l3kernel/l3fp-logic.dtx
+2023/03/30 | 223740 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.pdf
2023/03/30 | 2229 | macros/latex/contrib/l3kernel/source3.tex
-2023/03/30 | 2199704 | systems/texlive/tlnet/archive/context-notes-zh-cn.doc.r66706.tar.xz
+2023/03/30 | 222298 | fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.pdf
+2023/03/30 | 221401 | fonts/erewhon-math/Erewhon-Math.pdf
2023/03/30 | 215323 | macros/latex/contrib/l3kernel/l3term-glossary.pdf
-2023/03/30 | 21035872 | systems/texlive/tlnet/install-tl-windows.exe
2023/03/30 | 2059 | macros/latex/contrib/uvaletter/README.md
2023/03/30 | 204992 | macros/latex/contrib/l3kernel/l3news12.pdf
2023/03/30 | 20451 | macros/latex/contrib/l3experimental/l3draw-softpath.dtx
+2023/03/30 | 204112 | fonts/kpfonts-otf/fonts/KpMath-Semibold.otf
2023/03/30 | 2038 | macros/latex/contrib/l3kernel/interface3.tex
2023/03/30 | 20359 | macros/latex/contrib/l3kernel/l3text-purify.dtx
+2023/03/30 | 203400 | fonts/kpfonts-otf/fonts/KpMath-Bold.otf
+2023/03/30 | 200105 | fonts/xcharter-math/XCharter-Math.pdf
2023/03/30 | 196926 | macros/latex/contrib/physics2.zip
2023/03/30 | 19641 | macros/latex/contrib/l3kernel/l3fp-convert.dtx
2023/03/30 | 19161 | macros/latex/contrib/l3kernel/l3pdf.dtx
-2023/03/30 | 19120 | systems/texlive/tlnet/archive/mpchess.r66703.tar.xz
2023/03/30 | 1906 | macros/latex/contrib/l3experimental/l3draw.ins
+2023/03/30 | 19065 | fonts/kpfonts-otf/tex/kpfonts-otf.sty
2023/03/30 | 18694 | macros/latex/contrib/l3experimental/l3bitset.dtx
+2023/03/30 | 185 | fonts/kpfonts-otf/tex/KpMono.fontspec
2023/03/30 | 18532 | macros/latex/contrib/l3kernel/l3fp-round.dtx
-2023/03/30 | 17998394 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2023/03/30 | 1752620 | systems/texlive/tlnet/archive/mpchess.doc.r66703.tar.xz
+2023/03/30 | 1848513 | fonts/xcharter-math/unimath-xcharter.pdf
+2023/03/30 | 1847674 | fonts/erewhon-math/unimath-erewhon.pdf
+2023/03/30 | 1835161 | fonts/kpfonts-otf/doc/unimath-kpfonts.pdf
+2023/03/30 | 18016 | fonts/euler-math/Euler-Math.ltx
2023/03/30 | 1741657 | macros/latex/contrib/l3kernel/interface3.pdf
+2023/03/30 | 172364 | fonts/kpfonts-otf/fonts/KpMath-SansBold.otf
+2023/03/30 | 17127 | fonts/xcharter-math/unimath-xcharter.ltx
2023/03/30 | 170076 | macros/latex/contrib/l3kernel/l3news11.pdf
-2023/03/30 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/03/30 | 16947 | fonts/erewhon-math/unimath-erewhon.ltx
+2023/03/30 | 16834 | fonts/euler-math/unimath-euler.ltx
+2023/03/30 | 16806 | fonts/kpfonts-otf/doc/unimath-kpfonts.ltx
2023/03/30 | 16633 | macros/latex/contrib/l3kernel/l3text-map.dtx
2023/03/30 | 16508 | macros/latex/contrib/l3experimental/l3benchmark.dtx
2023/03/30 | 163456 | macros/latex/contrib/l3kernel/l3news08.pdf
2023/03/30 | 1624 | macros/latex/contrib/l3experimental/xgalley.ins
2023/03/30 | 16092 | macros/latex/contrib/l3backend/l3backend-basics.dtx
+2023/03/30 | 158388 | fonts/erewhon-math/Erewhon-Math-Bold.otf
+2023/03/30 | 158318 | fonts/euler-math/Euler-Math.pdf
2023/03/30 | 1569 | macros/latex/contrib/l3experimental/xcoffins.ins
2023/03/30 | 1565 | macros/latex/contrib/l3experimental/l3sys-shell.ins
2023/03/30 | 1565 | macros/latex/contrib/l3experimental/l3bitset.ins
@@ -163,8 +350,6 @@
2023/03/30 | 155616 | macros/latex/contrib/l3kernel/l3doc.dtx
2023/03/30 | 1553 | macros/latex/contrib/l3experimental/l3graphics.ins
2023/03/30 | 1547 | macros/latex/contrib/l3experimental/l3opacity.ins
-2023/03/30 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/03/30 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
2023/03/30 | 151614 | macros/latex/contrib/l3kernel/l3docstrip.pdf
2023/03/30 | 151569 | macros/latex/contrib/l3kernel/l3news06.pdf
2023/03/30 | 150674 | macros/latex/contrib/l3kernel/l3news02.pdf
@@ -173,15 +358,22 @@
2023/03/30 | 14913 | macros/latex/contrib/l3kernel/l3news12.tex
2023/03/30 | 148706 | macros/latex/contrib/l3kernel/l3news03.pdf
2023/03/30 | 14669 | macros/latex/contrib/l3backend/l3backend-header.dtx
-2023/03/30 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
2023/03/30 | 145318 | macros/latex/contrib/l3kernel/l3tl.dtx
-2023/03/30 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/03/30 | 1451716 | fonts/euler-math/unimath-euler.pdf
2023/03/30 | 14431 | macros/latex/contrib/l3backend/l3backend-box.dtx
+2023/03/30 | 143656 | fonts/kpfonts-otf/fonts/KpRoman-BoldItalic.otf
+2023/03/30 | 141288 | fonts/kpfonts-otf/fonts/KpRoman-SemiboldItalic.otf
2023/03/30 | 14001400 | install/macros/latex/contrib/l3kernel.tds.zip
2023/03/30 | 13739132 | macros/latex/contrib/l3kernel.zip
2023/03/30 | 136651 | macros/latex/contrib/l3kernel/l3file.dtx
2023/03/30 | 1360 | macros/latex/contrib/l3experimental/l3draw-code.tex
+2023/03/30 | 134280 | fonts/kpfonts-otf/fonts/KpRoman-Italic.otf
+2023/03/30 | 133760 | fonts/kpfonts-otf/fonts/KpRoman-LightItalic.otf
+2023/03/30 | 133408 | fonts/kpfonts-otf/fonts/KpRoman-Bold.otf
2023/03/30 | 1331 | macros/latex/contrib/l3backend/l3backend-code.tex
+2023/03/30 | 131524 | fonts/kpfonts-otf/fonts/KpRoman-Regular.otf
+2023/03/30 | 131256 | fonts/kpfonts-otf/fonts/KpRoman-Light.otf
+2023/03/30 | 130556 | fonts/kpfonts-otf/fonts/KpRoman-Semibold.otf
2023/03/30 | 129596 | systems/texlive/tlnet/archive/songproj.doc.r66704.tar.xz
2023/03/30 | 129545 | macros/latex/contrib/l3kernel/l3basics.dtx
2023/03/30 | 128316 | macros/latex/contrib/l3kernel/l3news07.pdf
@@ -193,22 +385,25 @@
2023/03/30 | 118796 | macros/latex/contrib/l3kernel/l3token.dtx
2023/03/30 | 11781 | macros/latex/contrib/l3kernel/l3fparray.dtx
2023/03/30 | 114586 | macros/latex/contrib/l3kernel/l3news04.pdf
-2023/03/30 | 114036 | systems/texlive/tlnet/archive/texlive-scripts.r66701.tar.xz
2023/03/30 | 113427 | macros/latex/contrib/l3kernel/l3str-convert.dtx
2023/03/30 | 112485 | macros/latex/contrib/l3kernel/l3news05.pdf
2023/03/30 | 112270 | macros/latex/contrib/l3kernel/l3color.dtx
+2023/03/30 | 111928 | fonts/kpfonts-otf/fonts/KpSans-BoldItalic.otf
+2023/03/30 | 111888 | fonts/kpfonts-otf/fonts/KpSans-Italic.otf
2023/03/30 | 107383 | macros/latex/contrib/l3kernel/l3news09.tex
2023/03/30 | 1072 | macros/latex/contrib/uvaletter/LICENSE
2023/03/30 | 106443 | macros/latex/contrib/l3kernel/l3expan.dtx
2023/03/30 | 105012 | macros/latex/contrib/l3kernel/l3fp-parse.dtx
+2023/03/30 | 103928 | fonts/kpfonts-otf/fonts/KpSans-Bold.otf
+2023/03/30 | 102500 | fonts/kpfonts-otf/fonts/KpSans-Regular.otf
2023/03/30 | 10136 | macros/latex/contrib/l3experimental/l3draw-transforms.dtx
2023/03/30 | 10018 | macros/latex/contrib/l3experimental/l3draw-scopes.dtx
-2023/03/29 | 9993 | info/context-notes-zh-cn/src/figures/zhfonts-01.pdf
+2023/03/29 | 9993 | info/context-notes-zh-cn/src/figures/zhfonts/01.pdf
2023/03/29 | 9929 | macros/latex/contrib/wargame/source/hex/terrain/swamp.dtx
2023/03/29 | 9746 | graphics/metapost/contrib/macros/mpchess/metapost/mpchess-pgn.mp
2023/03/29 | 9661 | macros/luatex/generic/luavlna/luavlna-doc.tex
2023/03/29 | 94846 | macros/latex/contrib/wargame/source/wargame.dtx
-2023/03/29 | 9472 | info/context-notes-zh-cn/src/figures/zhfonts-02.pdf
+2023/03/29 | 9472 | info/context-notes-zh-cn/src/figures/zhfonts/02.pdf
2023/03/29 | 932 | macros/latex/contrib/wargame/source/package.dtx
2023/03/29 | 9268 | macros/latex/contrib/wargame/source/chit/dice.dtx
2023/03/29 | 92324 | macros/luatex/generic/luavlna/luavlna-doc.pdf
@@ -217,16 +412,14 @@
2023/03/29 | 8906 | macros/latex/contrib/wargame/source/Makefile
2023/03/29 | 8470 | macros/latex/contrib/wargame/source/hex/terrain.dtx
2023/03/29 | 8374 | macros/latex/contrib/wargame/source/hex/terrain/village.dtx
-2023/03/29 | 774 | info/context-notes-zh-cn/src/ctxnotes.tex
2023/03/29 | 755 | macros/latex/contrib/wargame/doc/tutorial/patch.py
2023/03/29 | 7527 | macros/latex/contrib/wargame/source/wargame.ins
2023/03/29 | 742 | macros/latex/contrib/wargame/source/natoapp6c/compat/seamine.dtx
2023/03/29 | 726800 | systems/texlive/tlnet/archive/babel.source.r66698.tar.xz
-2023/03/29 | 7246 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/03/29 | 705 | macros/luatex/generic/luavlna/luavlna-predegrees.lua
2023/03/29 | 703260 | support/TeX4ht/source/tex4ht-fonts-modern.tex
-2023/03/29 | 6718 | info/context-notes-zh-cn/src/zhfonts.tex
2023/03/29 | 66427 | macros/latex/contrib/wargame/doc/tutorial/game.sty
+2023/03/29 | 66096 | info/context-notes-zh-cn/src/figures/13/m_k_i_v_ConTeXt-layout_svg_c60ccda70ef92e32d7a6334f31c23259.pdf
2023/03/29 | 6573 | macros/latex/contrib/wargame/source/natoapp6c/core.dtx
2023/03/29 | 642 | macros/latex/contrib/wargame/source/hex/terrain/tree.dtx
2023/03/29 | 6425 | macros/latex/contrib/wargame/source/util/bb.dtx
@@ -236,7 +429,6 @@
2023/03/29 | 588181 | macros/latex/contrib/wargame/doc/tutorial/game.pdf
2023/03/29 | 5787 | macros/latex/contrib/wargame/source/util/compound.dtx
2023/03/29 | 5775 | macros/latex/contrib/wargame/doc/tutorial/game.tex
-2023/03/29 | 5737 | info/context-notes-zh-cn/src/doc-env.tex
2023/03/29 | 5617 | graphics/metapost/contrib/macros/mpchess/doc/mpchess-preamble.tex
2023/03/29 | 5370 | macros/latex/contrib/wargame/source/chit/oob.dtx
2023/03/29 | 5249 | macros/latex/contrib/wargame/source/util/tikz.dtx
@@ -257,11 +449,9 @@
2023/03/29 | 4467 | macros/latex/contrib/wargame/source/util/misc.dtx
2023/03/29 | 441253 | macros/latex/contrib/wargame/source/utils/wgexport.py
2023/03/29 | 4405 | macros/latex/contrib/wargame/source/tests/test.tex
-2023/03/29 | 434 | info/context-notes-zh-cn/README.md
2023/03/29 | 432819 | macros/latex/contrib/wargame/doc/compat.pdf
2023/03/29 | 42 | graphics/metapost/contrib/macros/mpchess/doc/test.pgn
2023/03/29 | 4248 | macros/luatex/generic/luavlna/luavlna.tex
-2023/03/29 | 420 | info/context-notes-zh-cn/src/postscript.tex
2023/03/29 | 41667 | graphics/metapost/contrib/macros/mpchess/metapost/mpchess-cburnett.mp
2023/03/29 | 415 | graphics/metapost/contrib/macros/mpchess/LICENSE
2023/03/29 | 413 | macros/latex/contrib/wargame/source/natoapp6c/compat/missile.dtx
@@ -273,7 +463,6 @@
2023/03/29 | 37420 | macros/latex/contrib/wargame/source/hex/terrain/mountains.dtx
2023/03/29 | 37337 | macros/latex/contrib/songproj/songproj.dtx
2023/03/29 | 3568 | macros/latex/contrib/wargame/source/chit/elements.dtx
-2023/03/29 | 3475127 | info/context-notes-zh-cn.zip
2023/03/29 | 33813 | graphics/metapost/contrib/macros/mpchess/metapost/mpchess.mp
2023/03/29 | 3320 | macros/luatex/generic/luavlna/README.md
2023/03/29 | 3210 | macros/latex/contrib/wargame/source/natoapp6c/weaponry.dtx
@@ -286,10 +475,10 @@
2023/03/29 | 3043 | graphics/metapost/contrib/macros/mpchess/doc/ctan.bib
2023/03/29 | 289 | macros/luatex/generic/luavlna/luavlna-si.lua
2023/03/29 | 2888 | macros/latex/contrib/wargame/source/natoapp6c/compat/subsurface.dtx
-2023/03/29 | 28688 | info/context-notes-zh-cn/src/figures/zhfonts.pdf
+2023/03/29 | 28688 | info/context-notes-zh-cn/src/figures/zhfonts/zhfonts.pdf
2023/03/29 | 2846 | macros/latex/contrib/wargame/source/natoapp6c/echelon.dtx
2023/03/29 | 2846109 | macros/latex/contrib/wargame.zip
-2023/03/29 | 28173 | info/context-notes-zh-cn/src/figures/none-zhfonts.pdf
+2023/03/29 | 28173 | info/context-notes-zh-cn/src/figures/zhfonts/none-zhfonts.pdf
2023/03/29 | 27197 | macros/latex/contrib/wargame/source/util/export.dtx
2023/03/29 | 2527 | macros/latex/contrib/wargame/source/chit/misc.dtx
2023/03/29 | 2502 | macros/latex/contrib/wargame/source/hex/towns.dtx
@@ -300,19 +489,15 @@
2023/03/29 | 2274 | macros/latex/contrib/wargame/source/natoapp6c/compat/space.dtx
2023/03/29 | 2267 | macros/latex/contrib/wargame/source/natoapp6c/frames/base.dtx
2023/03/29 | 2264 | graphics/metapost/contrib/macros/mpchess/metapost/mpchess-fen.mp
-2023/03/29 | 2241 | info/context-notes-zh-cn/src/ctxnotes.bib
-2023/03/29 | 2241 | info/context-notes-zh-cn/src/cover.tex
2023/03/29 | 22212 | systems/texlive/tlnet/archive/milsymb.r66697.tar.xz
2023/03/29 | 22071 | graphics/metapost/contrib/macros/mpchess/metapost/mpchess-pieces.mp
2023/03/29 | 220416 | support/TeX4ht/source/ChangeLog
2023/03/29 | 217 | macros/luatex/generic/luavlna/luavlna-presi.lua
2023/03/29 | 21686 | macros/latex/contrib/physics2/doc/physics2.tex
-2023/03/29 | 21406 | info/context-notes-zh-cn/src/03.tex
2023/03/29 | 21092 | macros/latex/contrib/wargame/source/natoapp6c/shape.dtx
2023/03/29 | 21078 | macros/latex/contrib/physics2/doc/physics2-legacy.tex
2023/03/29 | 204 | macros/luatex/generic/luavlna/luavlna-sufdegrees.lua
2023/03/29 | 2009 | macros/latex/contrib/wargame/source/tests/chits.dtx
-2023/03/29 | 2002991 | info/context-notes-zh-cn/ctxnotes.pdf
2023/03/29 | 197416 | systems/texlive/tlnet/archive/babel.r66698.tar.xz
2023/03/29 | 1944 | macros/latex/contrib/wargame/source/tests/map.dtx
2023/03/29 | 1929 | macros/latex/contrib/wargame/source/chit/battle.dtx
@@ -337,7 +522,7 @@
2023/03/29 | 1487 | macros/latex/contrib/physics2/tex/phy-ab.legacy.sty
2023/03/29 | 1447296 | systems/texlive/tlnet/archive/tex4ht.source.r66699.tar.xz
2023/03/29 | 1444437 | macros/latex/contrib/wargame/doc/wargame.pdf
-2023/03/29 | 14420 | info/context-notes-zh-cn/src/figures/zhfonts-03.pdf
+2023/03/29 | 14420 | info/context-notes-zh-cn/src/figures/zhfonts/03.pdf
2023/03/29 | 140470 | macros/latex/contrib/songproj.zip
2023/03/29 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r66699.tar.xz
2023/03/29 | 1359 | macros/latex/contrib/wargame/source/natoapp6c/compat/activity.dtx
@@ -357,144 +542,129 @@
2023/03/29 | 1091 | macros/latex/contrib/wargame/doc/tutorial/Makefile
2023/03/29 | 106731 | macros/luatex/generic/luavlna.zip
2023/03/29 | 10305 | macros/latex/contrib/wargame/source/utils/wgsvg2tikz.py
-2023/03/29 | 10094 | info/context-notes-zh-cn/src/13.tex
2023/03/29 | 10066 | macros/latex/contrib/wargame/source/hex/board.dtx
2023/03/29 | 1004454 | graphics/metapost/contrib/macros/mpchess/doc/mpchess-doc-fr.pdf
2023/03/29 | 1001080 | graphics/metapost/contrib/macros/mpchess/doc/mpchess-doc-en.pdf
2023/03/28 | 9982588 | systems/texlive/tlnet/archive/context.r66691.tar.xz
-2023/03/28 | 9908 | info/context-notes-zh-cn/src/figures/12-layout-1.pdf
-2023/03/28 | 9536 | info/context-notes-zh-cn/src/figures/05-todo-list.pdf
-2023/03/28 | 9535 | info/context-notes-zh-cn/src/figures/05-todo-list-7.pdf
-2023/03/28 | 9534 | info/context-notes-zh-cn/src/figures/05-todo-list-8.pdf
-2023/03/28 | 9421 | info/context-notes-zh-cn/src/figures/12-slides-1.pdf
-2023/03/28 | 9205 | info/context-notes-zh-cn/src/figures/06-05.pdf
-2023/03/28 | 9171 | info/context-notes-zh-cn/src/figures/05-todo-list-6.pdf
-2023/03/28 | 9141 | info/context-notes-zh-cn/src/figures/06-three-line-table.pdf
-2023/03/28 | 91322 | info/context-notes-zh-cn/src/figures/13-bookmarks.png
-2023/03/28 | 9125 | info/context-notes-zh-cn/src/figures/05-todo-list-4.pdf
+2023/03/28 | 9908 | info/context-notes-zh-cn/src/figures/13/layout-1.pdf
+2023/03/28 | 9536 | info/context-notes-zh-cn/src/figures/05/todo-list.pdf
+2023/03/28 | 9535 | info/context-notes-zh-cn/src/figures/05/todo-list-7.pdf
+2023/03/28 | 9534 | info/context-notes-zh-cn/src/figures/05/todo-list-8.pdf
+2023/03/28 | 9421 | info/context-notes-zh-cn/src/figures/13/slides-1.pdf
+2023/03/28 | 9171 | info/context-notes-zh-cn/src/figures/05/todo-list-6.pdf
+2023/03/28 | 9141 | info/context-notes-zh-cn/src/figures/09/three-line-table.pdf
+2023/03/28 | 91322 | info/context-notes-zh-cn/src/figures/14/bookmarks.png
+2023/03/28 | 9125 | info/context-notes-zh-cn/src/figures/05/todo-list-4.pdf
2023/03/28 | 911845 | macros/latex/required/babel/base/babel.pdf
-2023/03/28 | 9096 | info/context-notes-zh-cn/src/figures/05-todo-list-5.pdf
-2023/03/28 | 8986 | info/context-notes-zh-cn/src/figures/05-todo-list-3.pdf
+2023/03/28 | 9096 | info/context-notes-zh-cn/src/figures/05/todo-list-5.pdf
+2023/03/28 | 8986 | info/context-notes-zh-cn/src/figures/05/todo-list-3.pdf
2023/03/28 | 8898320 | systems/texlive/tlnet/archive/tlgs.windows.r66689.tar.xz
-2023/03/28 | 8569 | info/context-notes-zh-cn/src/figures/06-04.pdf
-2023/03/28 | 8520 | info/context-notes-zh-cn/src/figures/05-metapost.pdf
+2023/03/28 | 8569 | info/context-notes-zh-cn/src/figures/09/04.pdf
+2023/03/28 | 8520 | info/context-notes-zh-cn/src/figures/08/metapost.pdf
2023/03/28 | 849307 | macros/latex/required/babel/base/locale.zip
2023/03/28 | 84245980 | systems/texlive/tlnet/archive/context.doc.r66691.tar.xz
-2023/03/28 | 8381 | info/context-notes-zh-cn/src/figures/11-flowchart-3.pdf
-2023/03/28 | 8311 | info/context-notes-zh-cn/src/figures/bad-latin.pdf
-2023/03/28 | 8190 | info/context-notes-zh-cn/src/figures/06-03.pdf
-2023/03/28 | 8168 | info/context-notes-zh-cn/src/figures/indenting-2.pdf
-2023/03/28 | 8168 | info/context-notes-zh-cn/src/figures/indenting-1.pdf
-2023/03/28 | 8166 | info/context-notes-zh-cn/src/figures/setupbodyfont.pdf
+2023/03/28 | 8381 | info/context-notes-zh-cn/src/figures/12/flowchart-3.pdf
+2023/03/28 | 8311 | info/context-notes-zh-cn/src/figures/03/bad-latin.pdf
+2023/03/28 | 8190 | info/context-notes-zh-cn/src/figures/09/03.pdf
+2023/03/28 | 8168 | info/context-notes-zh-cn/src/figures/03/indenting-2.pdf
+2023/03/28 | 8168 | info/context-notes-zh-cn/src/figures/03/indenting-1.pdf
+2023/03/28 | 8166 | info/context-notes-zh-cn/src/figures/03/setupbodyfont.pdf
2023/03/28 | 813 | info/context-notes-zh-cn/src/example/slides.tex
2023/03/28 | 7869 | macros/latex/required/babel/base/babel.ins
2023/03/28 | 780 | systems/texlive/tlnet/archive/latex-context-ppchtex.doc.r66687.tar.xz
-2023/03/28 | 7793 | info/context-notes-zh-cn/src/figures/breakinglines-3.pdf
-2023/03/28 | 7776 | info/context-notes-zh-cn/src/figures/breakinglines-4.pdf
-2023/03/28 | 7754 | info/context-notes-zh-cn/src/figures/breakinglines-2.pdf
-2023/03/28 | 7736 | info/context-notes-zh-cn/src/figures/breakinglines-1.pdf
+2023/03/28 | 7793 | info/context-notes-zh-cn/src/figures/03/breakinglines-3.pdf
+2023/03/28 | 7776 | info/context-notes-zh-cn/src/figures/03/breakinglines-4.pdf
+2023/03/28 | 7754 | info/context-notes-zh-cn/src/figures/03/breakinglines-2.pdf
+2023/03/28 | 7736 | info/context-notes-zh-cn/src/figures/03/breakinglines-1.pdf
2023/03/28 | 768 | systems/texlive/tlnet/archive/latex-context-ppchtex.r66687.tar.xz
2023/03/28 | 763161 | macros/latex/required/babel/base/babel.dtx
-2023/03/28 | 7465 | info/context-notes-zh-cn/src/figures/05-floatcomb-3.pdf
+2023/03/28 | 7465 | info/context-notes-zh-cn/src/figures/08/floatcomb-3.pdf
2023/03/28 | 744840 | systems/texlive/tlnet/archive/l3build.doc.r66686.tar.xz
-2023/03/28 | 7408 | info/context-notes-zh-cn/src/figures/aligned-2.pdf
-2023/03/28 | 7327 | info/context-notes-zh-cn/src/figures/08-vbox-and-hbox.pdf
-2023/03/28 | 7211 | info/context-notes-zh-cn/src/06.tex
-2023/03/28 | 71998 | info/context-notes-zh-cn/src/figures/11-watermark.png
+2023/03/28 | 7408 | info/context-notes-zh-cn/src/figures/02/aligned-2.pdf
+2023/03/28 | 7327 | info/context-notes-zh-cn/src/figures/11/vbox-and-hbox.pdf
+2023/03/28 | 71998 | info/context-notes-zh-cn/src/figures/12/watermark.png
2023/03/28 | 70520117 | systems/win32/TLW64/gs10011w64full-gpl.exe
2023/03/28 | 6836 | systems/texlive/tlnet/archive/collection-latexextra.r66687.tar.xz
-2023/03/28 | 66096 | info/context-notes-zh-cn/src/figures/m_k_i_v_ConTeXt-layout_svg_c60ccda70ef92e32d7a6334f31c23259.pdf
-2023/03/28 | 6557 | info/context-notes-zh-cn/src/figures/hello.png
-2023/03/28 | 6342 | info/context-notes-zh-cn/src/figures/11-flowchart-2.pdf
-2023/03/28 | 62524 | info/context-notes-zh-cn/src/figures/msfonts.png
+2023/03/28 | 6342 | info/context-notes-zh-cn/src/figures/12/flowchart-2.pdf
+2023/03/28 | 62524 | info/context-notes-zh-cn/src/figures/03/msfonts.png
2023/03/28 | 62036 | systems/texlive/tlnet/archive/acmart.source.r66685.tar.xz
-2023/03/28 | 6128 | info/context-notes-zh-cn/src/figures/true-words.pdf
-2023/03/28 | 6105 | info/context-notes-zh-cn/src/figures/13-toc-2.pdf
-2023/03/28 | 6085 | info/context-notes-zh-cn/src/figures/11-flowchart-1.pdf
-2023/03/28 | 6054 | info/context-notes-zh-cn/src/figures/13-toc.pdf
-2023/03/28 | 5909 | info/context-notes-zh-cn/src/figures/starting-area.pdf
-2023/03/28 | 5908 | info/context-notes-zh-cn/src/07.tex
-2023/03/28 | 5906 | info/context-notes-zh-cn/src/figures/foo.pdf
-2023/03/28 | 5761 | info/context-notes-zh-cn/src/05.tex
-2023/03/28 | 5697 | info/context-notes-zh-cn/src/figures/05-floatcomb.pdf
-2023/03/28 | 5697 | info/context-notes-zh-cn/src/figures/05-floatcomb-2.pdf
-2023/03/28 | 5575 | info/context-notes-zh-cn/src/figures/11-flowchart-4.pdf
-2023/03/28 | 5056 | info/context-notes-zh-cn/src/figures/fontsize-level.pdf
-2023/03/28 | 49791 | info/context-notes-zh-cn/src/figures/05-floatcomb-4.pdf
-2023/03/28 | 49780 | info/context-notes-zh-cn/src/figures/06-01.pdf
+2023/03/28 | 6128 | info/context-notes-zh-cn/src/figures/02/true-words.pdf
+2023/03/28 | 6105 | info/context-notes-zh-cn/src/figures/14/toc-2.pdf
+2023/03/28 | 6085 | info/context-notes-zh-cn/src/figures/12/flowchart-1.pdf
+2023/03/28 | 6054 | info/context-notes-zh-cn/src/figures/14/toc.pdf
+2023/03/28 | 5909 | info/context-notes-zh-cn/src/figures/02/starting-area.pdf
+2023/03/28 | 5906 | info/context-notes-zh-cn/src/figures/01/foo.pdf
+2023/03/28 | 5697 | info/context-notes-zh-cn/src/figures/08/floatcomb.pdf
+2023/03/28 | 5697 | info/context-notes-zh-cn/src/figures/08/floatcomb-2.pdf
+2023/03/28 | 5575 | info/context-notes-zh-cn/src/figures/12/flowchart-4.pdf
+2023/03/28 | 5539 | fonts/concmath-otf/concmath-otf.sty
+2023/03/28 | 5056 | info/context-notes-zh-cn/src/figures/03/fontsize-level.pdf
+2023/03/28 | 49791 | info/context-notes-zh-cn/src/figures/08/floatcomb-4.pdf
+2023/03/28 | 49780 | info/context-notes-zh-cn/src/figures/09/01.pdf
2023/03/28 | 4855972 | systems/texlive/tlnet/archive/acmart.doc.r66685.tar.xz
-2023/03/28 | 4678 | info/context-notes-zh-cn/src/figures/pars-5.pdf
-2023/03/28 | 4671 | info/context-notes-zh-cn/src/figures/pars-3.pdf
-2023/03/28 | 4668 | info/context-notes-zh-cn/src/figures/parindentcolor.pdf
-2023/03/28 | 4656 | info/context-notes-zh-cn/src/figures/pars-4.pdf
-2023/03/28 | 4612 | info/context-notes-zh-cn/src/figures/pars-2.pdf
+2023/03/28 | 4678 | info/context-notes-zh-cn/src/figures/02/pars-5.pdf
+2023/03/28 | 4671 | info/context-notes-zh-cn/src/figures/02/pars-3.pdf
+2023/03/28 | 4668 | info/context-notes-zh-cn/src/figures/02/parindentcolor.pdf
+2023/03/28 | 4656 | info/context-notes-zh-cn/src/figures/02/pars-4.pdf
+2023/03/28 | 4612 | info/context-notes-zh-cn/src/figures/02/pars-2.pdf
2023/03/28 | 43060 | systems/texlive/tlnet/archive/acmart.r66685.tar.xz
-2023/03/28 | 3941 | info/context-notes-zh-cn/src/figures/lines.pdf
-2023/03/28 | 3806 | info/context-notes-zh-cn/src/preface.tex
+2023/03/28 | 3941 | info/context-notes-zh-cn/src/figures/02/lines.pdf
2023/03/28 | 36244 | systems/texlive/tlnet/archive/l3build.r66686.tar.xz
2023/03/28 | 3526 | macros/latex/required/babel/base/bbidxglo.dtx
-2023/03/28 | 35149 | info/context-notes-zh-cn/LICENSE
-2023/03/28 | 3506 | info/context-notes-zh-cn/src/figures/pars.pdf
-2023/03/28 | 3506 | info/context-notes-zh-cn/src/figures/fakewords.pdf
-2023/03/28 | 35012 | info/context-notes-zh-cn/src/figures/slides-finished.pdf
-2023/03/28 | 34689 | info/context-notes-zh-cn/src/figures/slides.pdf
-2023/03/28 | 3333 | info/context-notes-zh-cn/src/figures/aligned-1.pdf
-2023/03/28 | 32313 | info/context-notes-zh-cn/src/figures/ctxnotes.png
-2023/03/28 | 32305 | info/context-notes-zh-cn/src/11.tex
+2023/03/28 | 3506 | info/context-notes-zh-cn/src/figures/02/pars.pdf
+2023/03/28 | 3506 | info/context-notes-zh-cn/src/figures/02/fakewords.pdf
+2023/03/28 | 35012 | info/context-notes-zh-cn/src/figures/13/slides-finished.pdf
+2023/03/28 | 34689 | info/context-notes-zh-cn/src/figures/13/slides.pdf
+2023/03/28 | 3333 | info/context-notes-zh-cn/src/figures/02/aligned-1.pdf
+2023/03/28 | 32313 | info/context-notes-zh-cn/src/figures/08/ctxnotes.png
2023/03/28 | 31276 | systems/texlive/tlnet/archive/l3build.source.r66686.tar.xz
-2023/03/28 | 31097 | info/context-notes-zh-cn/src/figures/defaultfonts.pdf
+2023/03/28 | 31097 | info/context-notes-zh-cn/src/figures/03/defaultfonts.pdf
2023/03/28 | 3071338 | install/macros/latex/required/babel-base.tds.zip
-2023/03/28 | 30218 | info/context-notes-zh-cn/src/figures/tex-root.png
-2023/03/28 | 26414 | info/context-notes-zh-cn/src/figures/12-slides-4.pdf
+2023/03/28 | 30218 | info/context-notes-zh-cn/src/figures/03/tex-root.png
+2023/03/28 | 26414 | info/context-notes-zh-cn/src/figures/13/slides-4.pdf
2023/03/28 | 260908 | systems/texlive/tlnet/archive/tikz-nfold.doc.r66684.tar.xz
-2023/03/28 | 26055 | info/context-notes-zh-cn/src/figures/hibert.pdf
-2023/03/28 | 24494 | info/context-notes-zh-cn/src/figures/hibert-3.pdf
-2023/03/28 | 23993 | info/context-notes-zh-cn/src/figures/hibert-1.pdf
-2023/03/28 | 23976 | info/context-notes-zh-cn/src/figures/hibert-2.pdf
+2023/03/28 | 26055 | info/context-notes-zh-cn/src/figures/08/hibert.pdf
+2023/03/28 | 24494 | info/context-notes-zh-cn/src/figures/08/hibert-3.pdf
+2023/03/28 | 241500 | fonts/concmath-otf/Concrete-Math.otf
+2023/03/28 | 23993 | info/context-notes-zh-cn/src/figures/08/hibert-1.pdf
+2023/03/28 | 23976 | info/context-notes-zh-cn/src/figures/08/hibert-2.pdf
2023/03/28 | 2387 | macros/latex/required/babel/base/README.md
-2023/03/28 | 23633 | info/context-notes-zh-cn/src/figures/cmd-window.png
-2023/03/28 | 22295 | info/context-notes-zh-cn/src/figures/pagenumber.png
+2023/03/28 | 23633 | info/context-notes-zh-cn/src/figures/01/cmd-window.png
+2023/03/28 | 22295 | info/context-notes-zh-cn/src/figures/04/pagenumber.png
2023/03/28 | 21890 | macros/latex/required/babel/base/bbcompat.dtx
-2023/03/28 | 210831 | info/context-notes-zh-cn/src/figures/ConTeXt-layout.svg
-2023/03/28 | 19843 | info/context-notes-zh-cn/src/figures/ctxnotes-2.png
+2023/03/28 | 210831 | info/context-notes-zh-cn/src/figures/13/ConTeXt-layout.svg
+2023/03/28 | 21001 | fonts/concmath-otf/concmath-otf.ltx
+2023/03/28 | 19843 | info/context-notes-zh-cn/src/figures/08/ctxnotes-2.png
2023/03/28 | 1962549 | macros/latex/required/babel/base.zip
-2023/03/28 | 19558 | info/context-notes-zh-cn/src/figures/fallbacks.pdf
+2023/03/28 | 19558 | info/context-notes-zh-cn/src/figures/03/fallbacks.pdf
2023/03/28 | 1919 | info/context-notes-zh-cn/src/example/style.tex
-2023/03/28 | 18967 | info/context-notes-zh-cn/src/figures/10-bibtex-example-02.pdf
-2023/03/28 | 18945 | info/context-notes-zh-cn/src/figures/10-bibtex-example-03.pdf
-2023/03/28 | 1870 | info/context-notes-zh-cn/src/bib-style.tex
-2023/03/28 | 17332 | info/context-notes-zh-cn/src/figures/10-bibtex-example-01.pdf
-2023/03/28 | 171 | info/context-notes-zh-cn/src/basis.tex
+2023/03/28 | 18967 | info/context-notes-zh-cn/src/figures/06/bibtex-example-02.pdf
+2023/03/28 | 18945 | info/context-notes-zh-cn/src/figures/06/bibtex-example-03.pdf
+2023/03/28 | 1783261 | fonts/concmath-otf/unimath-concrete.pdf
+2023/03/28 | 17332 | info/context-notes-zh-cn/src/figures/06/bibtex-example-01.pdf
+2023/03/28 | 16886 | fonts/concmath-otf/unimath-concrete.ltx
2023/03/28 | 1588 | systems/texlive/tlnet/archive/collection-pictures.r66684.tar.xz
-2023/03/28 | 150002 | info/context-notes-zh-cn/src/figures/win-r.jpg
+2023/03/28 | 151587 | fonts/concmath-otf/concmath-otf.pdf
+2023/03/28 | 150002 | info/context-notes-zh-cn/src/figures/01/win-r.jpg
2023/03/28 | 14766978 | macros/texinfo/texinfo.zip
-2023/03/28 | 14640 | info/context-notes-zh-cn/src/01.tex
-2023/03/28 | 14431 | info/context-notes-zh-cn/src/figures/12-slides-2.pdf
-2023/03/28 | 13523 | info/context-notes-zh-cn/src/08.tex
-2023/03/28 | 13190 | info/context-notes-zh-cn/src/12.tex
-2023/03/28 | 13115 | info/context-notes-zh-cn/src/figures/breakinglines-5.pdf
-2023/03/28 | 13028 | info/context-notes-zh-cn/src/figures/zaoshu-4.pdf
-2023/03/28 | 13022 | info/context-notes-zh-cn/src/figures/zaoshu-5.pdf
-2023/03/28 | 12839 | info/context-notes-zh-cn/src/figures/12-slides-3.pdf
-2023/03/28 | 12750 | info/context-notes-zh-cn/src/10.tex
-2023/03/28 | 11728 | info/context-notes-zh-cn/src/figures/qian.pdf
-2023/03/28 | 11612 | info/context-notes-zh-cn/src/figures/10-bibtex-example-04.pdf
-2023/03/28 | 114762 | info/context-notes-zh-cn/src/figures/style-file.png
+2023/03/28 | 14431 | info/context-notes-zh-cn/src/figures/13/slides-2.pdf
+2023/03/28 | 13115 | info/context-notes-zh-cn/src/figures/03/breakinglines-5.pdf
+2023/03/28 | 13028 | info/context-notes-zh-cn/src/figures/04/zaoshu-4.pdf
+2023/03/28 | 13022 | info/context-notes-zh-cn/src/figures/04/zaoshu-5.pdf
+2023/03/28 | 12839 | info/context-notes-zh-cn/src/figures/13/slides-3.pdf
+2023/03/28 | 11728 | info/context-notes-zh-cn/src/figures/03/qian.pdf
+2023/03/28 | 11612 | info/context-notes-zh-cn/src/figures/06/bibtex-example-04.pdf
+2023/03/28 | 114762 | info/context-notes-zh-cn/src/figures/04/style-file.png
2023/03/28 | 11112 | systems/texlive/tlnet/archive/tikz-nfold.r66684.tar.xz
-2023/03/28 | 11003 | info/context-notes-zh-cn/src/figures/letter.pdf
-2023/03/28 | 10923 | info/context-notes-zh-cn/src/02.tex
-2023/03/28 | 10785 | info/context-notes-zh-cn/src/09.tex
-2023/03/28 | 10503 | info/context-notes-zh-cn/src/figures/zaoshu-2.pdf
-2023/03/28 | 10501 | info/context-notes-zh-cn/src/figures/zaoshu-3.pdf
-2023/03/28 | 10446 | info/context-notes-zh-cn/src/04.tex
-2023/03/28 | 10334 | info/context-notes-zh-cn/src/figures/05-todo-list-2.pdf
-2023/03/28 | 10311 | info/context-notes-zh-cn/src/figures/06-02.pdf
-2023/03/28 | 10127 | info/context-notes-zh-cn/src/figures/zaoshu.pdf
+2023/03/28 | 11003 | info/context-notes-zh-cn/src/figures/02/letter.pdf
+2023/03/28 | 10503 | info/context-notes-zh-cn/src/figures/04/zaoshu-2.pdf
+2023/03/28 | 10501 | info/context-notes-zh-cn/src/figures/04/zaoshu-3.pdf
+2023/03/28 | 10334 | info/context-notes-zh-cn/src/figures/05/todo-list-2.pdf
+2023/03/28 | 10311 | info/context-notes-zh-cn/src/figures/09/02.pdf
+2023/03/28 | 10127 | info/context-notes-zh-cn/src/figures/04/zaoshu.pdf
2023/03/27 | 966525 | systems/win32/miktex/tm/packages/pseudo__doc.tar.lzma
2023/03/27 | 922 | systems/win32/miktex/tm/packages/pr.ini
2023/03/27 | 9123 | systems/win32/miktex/tm/packages/greek-inputenc__source.tar.lzma
-2023/03/27 | 907878 | macros/latex/contrib/acmart/acmart.pdf
-2023/03/27 | 90333 | macros/latex/contrib/acmart/ACM-Reference-Format.bst
2023/03/27 | 88436 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
2023/03/27 | 8821 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
2023/03/27 | 8505427 | systems/win32/miktex/tm/packages/profcollege__doc.tar.lzma
@@ -508,7 +678,6 @@
2023/03/27 | 79695 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
2023/03/27 | 7945 | macros/latex/contrib/l3build/l3build-variables.lua
2023/03/27 | 79407 | systems/win32/miktex/tm/packages/auto-pst-pdf-lua__doc.tar.lzma
-2023/03/27 | 783630 | macros/latex/contrib/acmart/samples/sample-lualatex.pdf
2023/03/27 | 7796 | macros/latex/contrib/l3build/l3build-arguments.lua
2023/03/27 | 77625 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
2023/03/27 | 77220 | systems/texlive/tlnet/archive/match_parens.doc.r66681.tar.xz
@@ -536,30 +705,22 @@
2023/03/27 | 6739 | macros/latex/contrib/l3build/l3build-typesetting.lua
2023/03/27 | 661282 | systems/win32/miktex/tm/packages/beamertheme-arguelles__doc.tar.lzma
2023/03/27 | 65860 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2023/03/27 | 658514 | macros/latex/contrib/acmart/samples/sample-xelatex.pdf
2023/03/27 | 656536 | systems/win32/miktex/tm/packages/greek-inputenc__doc.tar.lzma
2023/03/27 | 6538 | systems/win32/miktex/tm/packages/linebreaker.tar.lzma
2023/03/27 | 64332 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
2023/03/27 | 64321 | systems/win32/miktex/tm/packages/pseudo__source.tar.lzma
2023/03/27 | 637196 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
2023/03/27 | 63016 | systems/win32/miktex/tm/packages/acmart__source.tar.lzma
-2023/03/27 | 627935 | macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf
2023/03/27 | 62764 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
2023/03/27 | 6260776 | systems/win32/miktex/tm/packages/acmart__doc.tar.lzma
2023/03/27 | 6220391 | systems/win32/miktex/tm/packages/stex__doc.tar.lzma
-2023/03/27 | 617763 | macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf
-2023/03/27 | 617501 | macros/latex/contrib/acmart/samples/sample-manuscript.pdf
2023/03/27 | 61622 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2023/03/27 | 615263 | macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
-2023/03/27 | 615069 | macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf
-2023/03/27 | 605423 | macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
2023/03/27 | 600884 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
2023/03/27 | 58443 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
2023/03/27 | 57942 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
2023/03/27 | 57460 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
2023/03/27 | 572369 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
2023/03/27 | 57169 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2023/03/27 | 562647 | macros/latex/contrib/acmart/samples/sample-acmtog.pdf
2023/03/27 | 55759 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
2023/03/27 | 5397 | macros/latex/contrib/l3build/l3build-aux.lua
2023/03/27 | 529974 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
@@ -587,7 +748,6 @@
2023/03/27 | 43882 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
2023/03/27 | 43704 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
2023/03/27 | 4338 | macros/latex/contrib/l3build/l3build-stdmain.lua
-2023/03/27 | 433120 | macros/latex/contrib/acmart/acmguide.pdf
2023/03/27 | 43266 | systems/win32/miktex/tm/packages/acmart.tar.lzma
2023/03/27 | 42485 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
2023/03/27 | 41738 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
@@ -597,7 +757,6 @@
2023/03/27 | 39878 | systems/win32/miktex/tm/packages/schule__source.tar.lzma
2023/03/27 | 39779 | systems/win32/miktex/tm/packages/biblatex-apa__source.tar.lzma
2023/03/27 | 3970 | systems/win32/miktex/tm/packages/tikzviolinplots.tar.lzma
-2023/03/27 | 395461 | macros/latex/contrib/acmart/samples/sample-acmengage.pdf
2023/03/27 | 395089 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
2023/03/27 | 389961 | systems/win32/miktex/tm/packages/mpchess__source.tar.lzma
2023/03/27 | 3819606 | systems/win32/miktex/tm/packages/schule__doc.tar.lzma
@@ -638,7 +797,6 @@
2023/03/27 | 289815 | graphics/pgf/contrib/tikz-nfold/tikz-nfold-doc.pdf
2023/03/27 | 288786 | systems/win32/miktex/tm/packages/biblatex-apa__doc.tar.lzma
2023/03/27 | 28769 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2023/03/27 | 287415 | macros/latex/contrib/acmart/acmart.dtx
2023/03/27 | 287090 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
2023/03/27 | 2831643 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
2023/03/27 | 2774 | systems/win32/miktex/tm/packages/auto-pst-pdf-lua.tar.lzma
@@ -664,7 +822,6 @@
2023/03/27 | 2198 | systems/win32/miktex/tm/packages/fixdif.tar.lzma
2023/03/27 | 21549 | systems/win32/miktex/tm/packages/mpchess.tar.lzma
2023/03/27 | 2149 | macros/latex/contrib/l3build/l3build-clean.lua
-2023/03/27 | 213990 | macros/latex/contrib/acmart/samples/sample-acmcp.pdf
2023/03/27 | 213863 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
2023/03/27 | 208987 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
2023/03/27 | 20784 | systems/win32/miktex/tm/packages/egpeirce.tar.lzma
@@ -700,10 +857,8 @@
2023/03/27 | 136048 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
2023/03/27 | 1336339 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
2023/03/27 | 13211 | macros/latex/contrib/l3build/l3build-upload.lua
-2023/03/27 | 13007567 | macros/latex/contrib/acmart.zip
2023/03/27 | 1288384 | systems/win32/miktex/tm/packages/profcollege.tar.lzma
2023/03/27 | 12633 | macros/latex/contrib/l3build/l3build-file-functions.lua
-2023/03/27 | 12547 | macros/latex/contrib/acmart/README
2023/03/27 | 122888 | systems/win32/miktex/tm/packages/korigamik__doc.tar.lzma
2023/03/27 | 122504 | systems/texlive/tlnet/archive/korigamik.doc.r66680.tar.xz
2023/03/27 | 121179 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
@@ -723,12 +878,7 @@
2023/03/27 | 109298 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
2023/03/27 | 108924 | systems/texlive/tlnet/archive/tex-vpat.doc.r66678.tar.xz
2023/03/27 | 10786 | macros/latex/contrib/l3build/l3build-manifest-setup.lua
-2023/03/27 | 1054905 | macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf
2023/03/27 | 105443 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2023/03/27 | 1049483 | macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf
-2023/03/27 | 1047507 | macros/latex/contrib/acmart/samples/sample-sigplan.pdf
-2023/03/27 | 1042626 | macros/latex/contrib/acmart/samples/sample-authordraft.pdf
-2023/03/27 | 1038837 | macros/latex/contrib/acmart/samples/sample-sigconf.pdf
2023/03/27 | 103768 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
2023/03/27 | 103622 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
2023/03/27 | 103572 | systems/win32/miktex/tm/packages/emo.tar.lzma
@@ -4861,77 +5011,3 @@
2023/03/25 | 0 | macros/texinfo/texinfo/tp/tests/formatting/res_parser/documentlanguage_cmdline/documentlanguage.2
2023/03/25 | 0 | macros/texinfo/texinfo/tp/tests/formatting/res_parser/documentlanguage_cmdline/documentlanguage.1
2023/03/25 | 0 | macros/texinfo/texinfo/tp/tests/formatting/res_parser/cpp_lines/cpp_lines.1
-2023/03/24 | 9444 | systems/texlive/tlnet/archive/autoaligne.r66655.tar.xz
-2023/03/24 | 881135 | macros/xetex/latex/xduts/xdulogo.pdf
-2023/03/24 | 85044 | systems/texlive/tlnet/archive/systeme.doc.r66655.tar.xz
-2023/03/24 | 8380 | systems/texlive/tlnet/archive/listofitems.r66655.tar.xz
-2023/03/24 | 8344 | systems/texlive/tlnet/archive/scratch.r66655.tar.xz
-2023/03/24 | 802536 | systems/texlive/tlnet/archive/install-latex-guide-zh-cn.doc.r66655.tar.xz
-2023/03/24 | 802140 | systems/texlive/tlnet/archive/listofitems.doc.r66655.tar.xz
-2023/03/24 | 752 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsOneZero.tfm
-2023/03/24 | 7348 | systems/texlive/tlnet/archive/systeme.r66655.tar.xz
-2023/03/24 | 665 | fonts/simpleicons/README.md
-2023/03/24 | 6492 | systems/texlive/tlnet/archive/eso-pic.source.r66655.tar.xz
-2023/03/24 | 59719 | info/context-notes-zh-cn/src/figures/gardeninglion.jpg
-2023/03/24 | 568 | systems/texlive/tlnet/archive/install-latex-guide-zh-cn.r66655.tar.xz
-2023/03/24 | 5526 | info/context-notes-zh-cn/src/figures/cow.pdf
-2023/03/24 | 506808 | systems/texlive/tlnet/archive/scratch.doc.r66655.tar.xz
-2023/03/24 | 5000428 | fonts/simpleicons.zip
-2023/03/24 | 3840 | systems/texlive/tlnet/archive/eso-pic.r66655.tar.xz
-2023/03/24 | 3780 | macros/xetex/latex/xduts/README.md
-2023/03/24 | 356128 | systems/texlive/tlnet/archive/autoaligne.doc.r66655.tar.xz
-2023/03/24 | 33739 | info/context-notes-zh-cn/src/figures/bookmark.png
-2023/03/24 | 334977 | macros/xetex/latex/xduts/xduts.pdf
-2023/03/24 | 30981 | info/context-notes-zh-cn/src/figures/header.png
-2023/03/24 | 29154 | info/context-notes-zh-cn/src/figures/search.png
-2023/03/24 | 290941 | macros/xetex/latex/xduts/xduts.dtx
-2023/03/24 | 290156 | systems/texlive/tlnet/archive/eso-pic.doc.r66655.tar.xz
-2023/03/24 | 2864 | systems/texlive/tlnet/archive/simplekv.r66655.tar.xz
-2023/03/24 | 2839 | fonts/simpleicons/enc/simpleiconsOne.enc
-2023/03/24 | 274 | fonts/simpleicons/tex/usimpleiconsOneZero.fd
-2023/03/24 | 2749 | fonts/simpleicons/enc/simpleiconsFour.enc
-2023/03/24 | 2735736 | systems/texlive/tlnet/archive/dviout.windows.r66655.tar.xz
-2023/03/24 | 2719 | fonts/simpleicons/enc/simpleiconsEight.enc
-2023/03/24 | 26804 | systems/texlive/tlnet/archive/chemfig.r66655.tar.xz
-2023/03/24 | 2673 | fonts/simpleicons/enc/simpleiconsTwo.enc
-2023/03/24 | 2652 | fonts/simpleicons/enc/simpleiconsSix.enc
-2023/03/24 | 264 | fonts/simpleicons/tex/usimpleiconsThree.fd
-2023/03/24 | 264 | fonts/simpleicons/tex/usimpleiconsSeven.fd
-2023/03/24 | 264 | fonts/simpleicons/tex/usimpleiconsEight.fd
-2023/03/24 | 259 | fonts/simpleicons/tex/usimpleiconsNine.fd
-2023/03/24 | 259 | fonts/simpleicons/tex/usimpleiconsFour.fd
-2023/03/24 | 259 | fonts/simpleicons/tex/usimpleiconsFive.fd
-2023/03/24 | 2593 | fonts/simpleicons/enc/simpleiconsSeven.enc
-2023/03/24 | 254 | fonts/simpleicons/tex/usimpleiconsTwo.fd
-2023/03/24 | 254 | fonts/simpleicons/tex/usimpleiconsSix.fd
-2023/03/24 | 254 | fonts/simpleicons/tex/usimpleiconsOne.fd
-2023/03/24 | 2505 | fonts/simpleicons/enc/simpleiconsNine.enc
-2023/03/24 | 2470 | fonts/simpleicons/enc/simpleiconsFive.enc
-2023/03/24 | 2457 | fonts/simpleicons/enc/simpleiconsThree.enc
-2023/03/24 | 2408 | fonts/simpleicons/enc/simpleiconsOneZero.enc
-2023/03/24 | 219240 | fonts/simpleicons/tex/simpleiconsglyphs-pdftex.tex
-2023/03/24 | 21892 | systems/texlive/tlnet/archive/spreadtab.r66655.tar.xz
-2023/03/24 | 215052 | fonts/simpleicons/tex/simpleiconsglyphs-xeluatex.tex
-2023/03/24 | 2002238 | fonts/simpleicons/doc/simpleicons.pdf
-2023/03/24 | 1900460 | fonts/simpleicons/opentype/SimpleIcons.otf
-2023/03/24 | 1844 | fonts/simpleicons/doc/simpleicons.tex
-2023/03/24 | 18207 | CTAN.sites
-2023/03/24 | 1770571 | fonts/simpleicons/type1/SimpleIcons.pfb
-2023/03/24 | 16045 | info/context-notes-zh-cn/src/figures/linux-terminal-icon.png
-2023/03/24 | 1557 | fonts/simpleicons/tex/simpleicons.sty
-2023/03/24 | 1385644 | systems/texlive/tlnet/archive/chemfig.doc.r66655.tar.xz
-2023/03/24 | 130936 | systems/texlive/tlnet/archive/simplekv.doc.r66655.tar.xz
-2023/03/24 | 130014 | fonts/simpleicons/doc/bindings.tex
-2023/03/24 | 1268233 | macros/xetex/latex/xduts.zip
-2023/03/24 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsTwo.tfm
-2023/03/24 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsThree.tfm
-2023/03/24 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsSix.tfm
-2023/03/24 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsSeven.tfm
-2023/03/24 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsNine.tfm
-2023/03/24 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsFour.tfm
-2023/03/24 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsFive.tfm
-2023/03/24 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsEight.tfm
-2023/03/24 | 1228 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsOne.tfm
-2023/03/24 | 1188 | macros/xetex/latex/xduts/xduts.ins
-2023/03/24 | 1119 | fonts/simpleicons/map/simpleicons.map
-2023/03/24 | 1089924 | systems/texlive/tlnet/archive/spreadtab.doc.r66655.tar.xz
diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib
index 1b76a95d8f..4a41c56057 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 31-03-2023, 02:00:11
+%% created at 01-04-2023, 02:00:12
%%
%% This file is provided under the terms of the LPPL v1.3 or
@@ -479,8 +479,8 @@
title = {The \texttt{acmart} package},
subtitle = {Class for typesetting publications of ACM},
author = {Boris Veytsman},
- date = {2023-03-27},
- version = {1.89a},
+ date = {2023-03-31},
+ version = {1.90},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/acmart},
url = {https://ctan.org/pkg/acmart},
@@ -14422,8 +14422,8 @@
title = {The \texttt{concmath-otf} package},
subtitle = {Concrete based OpenType Math font},
author = {Daniel Flipo},
- date = {2023-01-30},
- version = {0.25},
+ date = {2023-03-31},
+ version = {0.40},
license = {ofl,lppl1.3},
mirror = {https://mirror.ctan.org/fonts/concmath-otf},
url = {https://ctan.org/pkg/concmath-otf},
@@ -14884,7 +14884,7 @@
title = {The \texttt{context-notes-zh-cn} package},
subtitle = {Notes on using ConTeXt MkIV},
author = {Yanrui Li},
- date = {2023-03-30},
+ date = {2023-03-31},
version = {},
license = {gpl3},
mirror = {https://mirror.ctan.org/info/context-notes-zh-cn},
@@ -22553,8 +22553,8 @@
title = {The \texttt{erewhon-math} package},
subtitle = {Utopia based OpenType Math font},
author = {Daniel Flipo},
- date = {2023-01-30},
- version = {0.56},
+ date = {2023-03-31},
+ version = {0.60},
license = {ofl,lppl1.3},
mirror = {https://mirror.ctan.org/fonts/erewhon-math},
url = {https://ctan.org/pkg/erewhon-math},
@@ -23080,8 +23080,8 @@
title = {The \texttt{euler-math} package},
subtitle = {OpenType version of Hermann Zapf’s Euler maths font},
author = {Daniel Flipo},
- date = {2023-01-30},
- version = {0.31},
+ date = {2023-03-31},
+ version = {0.40},
license = {ofl,lppl1.3},
mirror = {https://mirror.ctan.org/fonts/euler-math},
url = {https://ctan.org/pkg/euler-math},
@@ -36074,8 +36074,8 @@
title = {The \texttt{kpfonts-otf} package},
subtitle = {OTF version of the Kp-fonts},
author = {Daniel Flipo},
- date = {2023-01-16},
- version = {0.48},
+ date = {2023-03-31},
+ version = {0.51},
license = {ofl,lppl1.3},
mirror = {https://mirror.ctan.org/fonts/kpfonts-otf},
url = {https://ctan.org/pkg/kpfonts-otf},
@@ -47917,8 +47917,8 @@
title = {The \texttt{nicematrix} package},
subtitle = {Improve the typesetting of mathematical matrices with PGF},
author = {François Pantigny},
- date = {2023-03-07},
- version = {6.16},
+ date = {2023-03-31},
+ version = {6.17},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/nicematrix},
url = {https://ctan.org/pkg/nicematrix},
@@ -54165,8 +54165,8 @@
title = {The \texttt{ProfLycee} package},
subtitle = {A \LaTeX{} package for French maths teachers in high school},
author = {Cédric Pierquet},
- date = {2023-03-12},
- version = {2.5.4},
+ date = {2023-03-31},
+ version = {2.5.6},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/proflycee},
url = {https://ctan.org/pkg/proflycee},
@@ -64125,8 +64125,8 @@
title = {The \texttt{structmech} package},
subtitle = {A TikZ command set for structural mechanics drawings},
author = {Theodore Chang},
- date = {2021-04-25},
- version = {1.1},
+ date = {2023-03-31},
+ version = {1.2},
license = {gpl3+},
mirror = {https://mirror.ctan.org/graphics/pgf/contrib/structmech},
url = {https://ctan.org/pkg/structmech},
@@ -72782,8 +72782,8 @@
title = {The \texttt{univie-ling} package},
subtitle = {Papers, theses and research proposals in (Applied) Linguistics at Vienna University},
author = {Jürgen Spitzmüller},
- date = {2023-01-26},
- version = {2.3},
+ date = {2023-03-31},
+ version = {2.4},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/univie-ling},
url = {https://ctan.org/pkg/univie-ling},
@@ -75617,8 +75617,8 @@
title = {The \texttt{xcharter-math} package},
subtitle = {XCharter-based OpenType Math font for LuaTeX and XeTeX},
author = {Daniel Flipo},
- date = {2023-01-30},
- version = {0.36},
+ date = {2023-03-31},
+ version = {0.40},
license = {ofl,lppl1.3},
mirror = {https://mirror.ctan.org/fonts/xcharter-math},
url = {https://ctan.org/pkg/xcharter-math},
diff --git a/biblio/ctan-bibdata/ctan.pdf b/biblio/ctan-bibdata/ctan.pdf
index 6b49b50eeb..896770b5a5 100644
--- a/biblio/ctan-bibdata/ctan.pdf
+++ b/biblio/ctan-bibdata/ctan.pdf
Binary files differ
diff --git a/fonts/concmath-otf/Concrete-Math.otf b/fonts/concmath-otf/Concrete-Math.otf
index 9f22af9fbb..81b5d49460 100644
--- a/fonts/concmath-otf/Concrete-Math.otf
+++ b/fonts/concmath-otf/Concrete-Math.otf
Binary files differ
diff --git a/fonts/concmath-otf/README.md b/fonts/concmath-otf/README.md
index f277c18f24..066cffa65f 100644
--- a/fonts/concmath-otf/README.md
+++ b/fonts/concmath-otf/README.md
@@ -63,11 +63,24 @@ Either version 1.3 or, at your option, any later version.
* v. 0.24
- Fixed \wideoverbar (U+0305) which failed with XeTeX.
- Corrected negative right bearings of some display integrals.
- - Added extensible integral for U+222B (usable with luametatex).
+ - Added stretchable integral for U+222B (usable with luametatex).
* v. 0.25
- - Package now compatible with mathtools’ extensible arrows.
+ - Package now compatible with mathtools’ stretchable arrows.
- Corrected some glyphs’ inconsistencies (maths axis, etc.).
- \diagup and \diagdown moved from private area to U+27CB, U+27CD.
+* v. 0.40
+ - Added missing stretchable glyhs: \wideoverbar, \widecheck, \widebreve,
+ \overrightharpoon, \overleftharpoon, \overleftrightharpoon,
+ \underrightharpoon, \underleftharpoon, \underleftrightharpoon,
+ \underrightarrow, \underleftarrow, \underleftrightarrow,
+ \mathunderbar, \underbracket, \wideutilde.
+ - \overbrace, \underbrace redrawn (all sizes).
+ - Metrics corrected: \overparen, \overrightarrow, \overleftarrow,
+ \overleftrightarrow.
+ - Many glyphs have been emboldened (suggested by Mikael Sundqvist and
+ Hans Hagen).
+ - Most horizontal arrows and harpoons are now stretchable (dito).
+ - Glyphs \leqqslant, \geqqslant, \nleqqslant, \ngeqqslant added.
---
Copyright 2022-2023 Daniel Flipo
diff --git a/fonts/concmath-otf/concmath-otf.ltx b/fonts/concmath-otf/concmath-otf.ltx
index b70a710c1e..752319b5c5 100644
--- a/fonts/concmath-otf/concmath-otf.ltx
+++ b/fonts/concmath-otf/concmath-otf.ltx
@@ -1,5 +1,4 @@
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{pdfstandard=A-2b, lang=en-GB}
+\DocumentMetadata{pdfstandard=A-2b, lang=en-GB}
\documentclass[a4paper,12pt]{scrartcl}
\usepackage{amsmath, array, varioref}
@@ -28,7 +27,7 @@
\title{Concrete Math font, OTF version}
\author{Daniel Flipo \\ \texttt{daniel.flipo@free.fr}}
-\newcommand*{\version}{0.25}
+\newcommand*{\version}{0.40}
\begin{document}
\maketitle
@@ -274,6 +273,10 @@ their smaller variants as shown by table~\vref{ss05}.
\cmd{geq} & $\geq$ & $\geqslant$ \\
\cmd{nleq} & $\nleq$ & $\nleqslant$ \\
\cmd{ngeq} & $\ngeq$ & $\ngeqslant$ \\
+ \cmd{leqq} & $\leqq$ & $\leqqslant$ \\
+ \cmd{geqq} & $\geqq$ & $\geqqslant$ \\
+ \cmd{nleqq} & $\nleqq$ & $\nleqqslant$ \\
+ \cmd{ngeqq} & $\ngeqq$ & $\ngeqqslant$ \\
\cmd{eqless} & $\eqless$ & $\eqslantless$ \\
\cmd{eqgtr} & $\eqgtr$ & $\eqslantgtr$ \\
\cmd{lesseqgtr} & $\lesseqgtr$ & $\lesseqslantgtr$ \\
@@ -349,12 +352,15 @@ Various wide accents are also supported:
\widetilde{xxx} \;\widetilde{xxxx} \;\widetilde{xxxxx}\;
\widetilde{xxxxxx}\]
+\item \cmd{widecheck} and \cmd{widebreve}
+ \[\widecheck{x}\quad \widecheck{xxxx}\quad \widecheck{xxxxxx}\quad
+ \widebreve{x}\quad \widebreve{xxxx}\quad \widebreve{xxxxxx}\]
+
\item \cmd{overparen} and \cmd{underparen}
\[\overparen{x}\quad \overparen{xy}\quad \overparen{xyz}\quad
\mathring{\overparen{A\cup B}}\quad
\overparen{A\cup (B\cap C)\cup D}^{\smwhtcircle}\quad
\overparen{x+y}^{2}\quad \overparen{a+b+...+z}^{26}\]
-
\[\underparen{x}\quad \underparen{xz} \quad \underparen{xyz}
\quad \underparen{x+z}_{2}\quad \underparen{a+b+...+z}_{26}\]
@@ -362,21 +368,57 @@ Various wide accents are also supported:
\[\overbrace{a}\quad \overbrace{ab}\quad \overbrace{abc}\quad
\overbrace{abcd}\quad \overbrace{abcde}\quad
\overbrace{a+b+c}^{3}\quad \overbrace{ a+b+. . . +z }^{26}\]
-
\[\underbrace{a}\quad\underbrace{ab}\quad\underbrace{abc}\quad
\underbrace{abcd}\quad \underbrace{abcde}\quad
\underbrace{a+b+c}_{3} \quad \underbrace{ a+b+...+z }_{26}\]
+\item \cmd{overbracket} and \cmd{underbracket}
+ \[\overbracket{a}\quad \overbracket{ab}\quad \overbracket{abc}\quad
+ \overbracket{abcd}\quad \overbracket{abcde}\quad
+ \overbracket{a+b+c}^{3}\quad \overbracket{ a+b+. . . +z }^{26}\]
+\[\underbracket{a}\quad\underbracket{ab}\quad\underbracket{abc}\quad
+ \underbracket{abcd}\quad \underbracket{abcde}\quad
+ \underbracket{a+b+c}_{3} \quad \underbracket{ a+b+...+z }_{26}\]
+
\item \cmd{overrightarrow} and \cmd{overleftarrow}
\[\overrightarrow{v}\quad \overrightarrow{M}\quad \overrightarrow{vv}
\quad \overrightarrow{AB}\quad \overrightarrow{ABC}
\quad \overrightarrow{ABCD} \quad \overrightarrow{ABCDEFGH}.
\]
-
\[\overleftarrow{v}\quad \overleftarrow{M}\quad \overleftarrow{vv}
\quad \overleftarrow{AB}\quad \overleftarrow{ABC}
\quad \overleftarrow{ABCD} \quad \overleftarrow{ABCDEFGH}\]
+\item \cmd{overrightharpoon} and \cmd{overleftharpoon}
+ \[\overrightharpoon{v}\quad \overrightharpoon{M}\quad \overrightharpoon{vv}
+ \quad \overrightharpoon{AB}\quad \overrightharpoon{ABC}
+ \quad \overrightharpoon{ABCD} \quad \overrightharpoon{ABCDEFGH}.
+ \]
+ \[\overleftharpoon{v}\quad \overleftharpoon{M}\quad \overleftharpoon{vv}
+ \quad \overleftharpoon{AB}\quad \overleftharpoon{ABC}
+ \quad \overleftharpoon{ABCD} \quad \overleftharpoon{ABCDEFGH}\]
+
+\item \cmd{underrightarrow} and \cmd{underleftarrow}
+ \[\underrightarrow{v}\quad \underrightarrow{M}\quad \underrightarrow{vv}
+ \quad \underrightarrow{AB}\quad \underrightarrow{ABC}
+ \quad \underrightarrow{ABCD} \quad \underrightarrow{ABCDEFGH}.
+ \]
+ \[\underleftarrow{v}\quad \underleftarrow{M}\quad \underleftarrow{vv}
+ \quad \underleftarrow{AB}\quad \underleftarrow{ABC}
+ \quad \underleftarrow{ABCD} \quad \underleftarrow{ABCDEFGH}\]
+
+\item \cmd{underrightharpoon} and \cmd{underleftharpoondown}
+ \[\underrightharpoondown{v}\quad \underrightharpoondown{M}\quad
+ \underrightharpoondown{vv}\quad \underrightharpoondown{AB}\quad
+ \underrightharpoondown{ABC}\quad \underrightharpoondown{ABCD}\quad
+ \underrightharpoondown{ABCDEFGH}.
+ \]
+ \[\underleftharpoondown{v}\quad \underleftharpoondown{M}\quad
+ \underleftharpoondown{vv}\quad \underleftharpoondown{AB}\quad
+ \underleftharpoondown{ABC}\quad \underleftharpoondown{ABCD}
+ \quad \underleftharpoondown{ABCDEFGH}.
+ \]
+
\item Finally \cmd{widearc} and \cmd{overrightarc} (loading
\pkg{concmath-otf.sty} is required)
\[\widearc{AMB}\quad \overrightarc{AMB}\]
diff --git a/fonts/concmath-otf/concmath-otf.pdf b/fonts/concmath-otf/concmath-otf.pdf
index 6235d29907..eb57fcf64e 100644
--- a/fonts/concmath-otf/concmath-otf.pdf
+++ b/fonts/concmath-otf/concmath-otf.pdf
Binary files differ
diff --git a/fonts/concmath-otf/concmath-otf.sty b/fonts/concmath-otf/concmath-otf.sty
index f75b380a22..27eb39c983 100644
--- a/fonts/concmath-otf/concmath-otf.sty
+++ b/fonts/concmath-otf/concmath-otf.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}[2018/01/01]
-\def\fileversion{0.25}
-\def\filedate{2023-01-30}
+\def\fileversion{0.40}
+\def\filedate{2023-03-28}
\ProvidesPackage{concmath-otf}[\filedate\space\fileversion]
% Ensure luatex or xetex engine
@@ -77,6 +77,8 @@
\Umathchardef\gtreqslantless = 3 0 "E095 \relax
\Umathchardef\lesseqqslantgtr = 3 0 "E096 \relax
\Umathchardef\gtreqqslantless = 3 0 "E097 \relax
+ \Umathchardef\nleqqslant = 3 0 "E098 \relax
+ \Umathchardef\ngeqqslant = 3 0 "E099 \relax
\Umathchardef\nsubseteqq = 3 0 "E0AE \relax
\Umathchardef\nsupseteqq = 3 0 "E0AF \relax
% \widearc and\overrightarc
@@ -110,8 +112,8 @@
\Umathchardef\ngeqslant = 3 0 "E0A9 \relax
\Umathchardef\nleqq = 3 0 "E0AA \relax
\Umathchardef\ngeqq = 3 0 "E0AB \relax
- \Umathchardef\npreceq = 3 0 "E098 \relax
- \Umathchardef\nsucceq = 3 0 "E099 \relax
+ \Umathchardef\npreceq = 3 0 "E09E \relax
+ \Umathchardef\nsucceq = 3 0 "E09F \relax
\let\centerdot\cdotp
\let\restriction\upharpoonright
\let\doteqdot\Doteq
diff --git a/fonts/concmath-otf/unimath-concrete.pdf b/fonts/concmath-otf/unimath-concrete.pdf
index 00d2d3ad38..c88d328f1a 100644
--- a/fonts/concmath-otf/unimath-concrete.pdf
+++ b/fonts/concmath-otf/unimath-concrete.pdf
Binary files differ
diff --git a/fonts/erewhon-math/Erewhon-Math-Bold.otf b/fonts/erewhon-math/Erewhon-Math-Bold.otf
index 2fc842134c..1e6154289f 100644
--- a/fonts/erewhon-math/Erewhon-Math-Bold.otf
+++ b/fonts/erewhon-math/Erewhon-Math-Bold.otf
Binary files differ
diff --git a/fonts/erewhon-math/Erewhon-Math.ltx b/fonts/erewhon-math/Erewhon-Math.ltx
index 3e0b800dcd..c6d6b55c9d 100644
--- a/fonts/erewhon-math/Erewhon-Math.ltx
+++ b/fonts/erewhon-math/Erewhon-Math.ltx
@@ -1,5 +1,4 @@
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{pdfstandard=A-2b, lang=en-GB}
+\DocumentMetadata{pdfstandard=A-2b, lang=en-GB}
\documentclass[a4paper,12pt]{scrartcl}
\usepackage{amsmath, array, varioref}
@@ -34,7 +33,7 @@
\title{\decofourleft\,\FOTF\,\decofourright}
\author{Daniel Flipo \\ \texttt{daniel.flipo@free.fr}}
-\newcommand*{\version}{0.56}
+\newcommand*{\version}{0.60}
\begin{document}
\maketitle
@@ -487,7 +486,6 @@ Various wide accents are also supported:
\mathring{\overparen{A\cup B}}\quad
\overparen{A\cup (B\cap C)\cup D}^{\smwhtcircle}\quad
\overparen{x+y}^{2}\quad \overparen{a+b+...+z}^{26}\]
-\vspace{-\baselineskip}
\[\underparen{x}\quad \underparen{xz} \quad \underparen{xyz}
\quad \underparen{x+z}_{2}\quad \underparen{a+b+...+z}_{26}\]
@@ -495,7 +493,6 @@ Various wide accents are also supported:
\[\overbrace{a}\quad \overbrace{ab}\quad \overbrace{abc}\quad
\overbrace{abcd}\quad \overbrace{abcde}\quad
\overbrace{a+b+c}^{3}\quad \overbrace{ a+b+. . . +z }^{26}\]
- \vspace{-\baselineskip}
\[\underbrace{a}\quad\underbrace{ab}\quad\underbrace{abc}\quad
\underbrace{abcd}\quad \underbrace{abcde}\quad
\underbrace{a+b+c}_{3} \quad \underbrace{ a+b+...+z }_{26}\]
@@ -504,7 +501,6 @@ Various wide accents are also supported:
\[\overbracket{a}\quad \overbracket{ab}\quad \overbracket{abc}\quad
\overbracket{abcd}\quad \overbracket{abcde}\quad
\overbracket{a+b+c}^{3}\quad \overbracket{ a+b+. . . +z }^{26}\]
- \vspace{-\baselineskip}
\[\underbracket{a}\quad\underbracket{ab}\quad\underbracket{abc}\quad
\underbracket{abcd}\quad \underbracket{abcde}\quad
\underbracket{a+b+c}_{3} \quad \underbracket{ a+b+...+z }_{26}\]
@@ -514,7 +510,6 @@ Various wide accents are also supported:
\quad \overrightarrow{AB}\quad \overrightarrow{ABC}
\quad \overrightarrow{ABCD} \quad \overrightarrow{ABCDEFGH}.
\]
- \vspace{-\baselineskip}
\[\overleftarrow{v}\quad \overleftarrow{M}\quad \overleftarrow{vv}
\quad \overleftarrow{AB}\quad \overleftarrow{ABC}
\quad \overleftarrow{ABCD} \quad \overleftarrow{ABCDEFGH}\]
@@ -524,7 +519,6 @@ Various wide accents are also supported:
\quad \overrightharpoon{AB}\quad \overrightharpoon{ABC}
\quad \overrightharpoon{ABCD} \quad \overrightharpoon{ABCDEFGH}.
\]
- \vspace{-\baselineskip}
\[\overleftharpoon{v}\quad \overleftharpoon{M}\quad \overleftharpoon{vv}
\quad \overleftharpoon{AB}\quad \overleftharpoon{ABC}
\quad \overleftharpoon{ABCD} \quad \overleftharpoon{ABCDEFGH}\]
@@ -534,7 +528,6 @@ Various wide accents are also supported:
\quad \underrightarrow{AB}\quad \underrightarrow{ABC}
\quad \underrightarrow{ABCD} \quad \underrightarrow{ABCDEFGH}.
\]
- \vspace{-\baselineskip}
\[\underleftarrow{v}\quad \underleftarrow{M}\quad \underleftarrow{vv}
\quad \underleftarrow{AB}\quad \underleftarrow{ABC}
\quad \underleftarrow{ABCD} \quad \underleftarrow{ABCDEFGH}\]
@@ -545,7 +538,6 @@ Various wide accents are also supported:
\underrightharpoondown{ABC}\quad \underrightharpoondown{ABCD}\quad
\underrightharpoondown{ABCDEFGH}.
\]
- \vspace{-\baselineskip}
\[\underleftharpoondown{v}\quad \underleftharpoondown{M}\quad
\underleftharpoondown{vv}\quad \underleftharpoondown{AB}\quad
\underleftharpoondown{ABC}\quad \underleftharpoondown{ABCD}
diff --git a/fonts/erewhon-math/Erewhon-Math.otf b/fonts/erewhon-math/Erewhon-Math.otf
index e943b7b08e..f179c88b6d 100644
--- a/fonts/erewhon-math/Erewhon-Math.otf
+++ b/fonts/erewhon-math/Erewhon-Math.otf
Binary files differ
diff --git a/fonts/erewhon-math/Erewhon-Math.pdf b/fonts/erewhon-math/Erewhon-Math.pdf
index be9d157d55..5baa86eba8 100644
--- a/fonts/erewhon-math/Erewhon-Math.pdf
+++ b/fonts/erewhon-math/Erewhon-Math.pdf
Binary files differ
diff --git a/fonts/erewhon-math/README.md b/fonts/erewhon-math/README.md
index c3008a9111..8fb717d3af 100644
--- a/fonts/erewhon-math/README.md
+++ b/fonts/erewhon-math/README.md
@@ -73,7 +73,7 @@ Either version 1.3 or, at your option, any later version.
* v0.45
- Added stretchy accents \wideoverbar, \widebreve, \widecheck.
* v0.46
- - Extensible \langle, \rangle, \lAngle and \rangle delimiters
+ - Stretchable \langle, \rangle, \lAngle and \rangle delimiters
are now available in eight sizes (three bigger sizes added).
- Sub- and superscripts reshaped: boldness slightly reduced.
* v0.47
@@ -136,10 +136,13 @@ Either version 1.3 or, at your option, any later version.
- Metrics of some italic capitals (H,M,N,U) corrected.
* v0.55
- Fixed vertical variants of \Vert and \Vvert.
- - Added extensible integral for U+222B (usable with luametatex).
+ - Added stretchable integral for U+222B (usable with luametatex).
* v0.56
- - Package now compatible with mathtools’ extensible arrows.
+ - Package now compatible with mathtools’ stretchable arrows.
- \diagup and \diagdown moved from private area to U+27CB, U+27CD.
+* v0.60
+ - Metrics of all "under" arrows and harpoons corrected.
+ - Most horizontal arrows and harpoons are now stretchable.
---
Copyright 2019-2023 Michel Bovani, Daniel Flipo
diff --git a/fonts/erewhon-math/fourier-otf.sty b/fonts/erewhon-math/fourier-otf.sty
index d2dc966069..08b5daa413 100644
--- a/fonts/erewhon-math/fourier-otf.sty
+++ b/fonts/erewhon-math/fourier-otf.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}[2018/01/01]
-\def\fileversion{0.56}
-\def\filedate{2023-01-30}
+\def\fileversion{0.60}
+\def\filedate{2023-03-28}
\ProvidesPackage{fourier-otf}[\filedate\space\fileversion]
% Ensure luatex or xetex engine
diff --git a/fonts/erewhon-math/unimath-erewhon.pdf b/fonts/erewhon-math/unimath-erewhon.pdf
index 4d390a73e5..ec607c8e3e 100644
--- a/fonts/erewhon-math/unimath-erewhon.pdf
+++ b/fonts/erewhon-math/unimath-erewhon.pdf
Binary files differ
diff --git a/fonts/euler-math/Euler-Math.ltx b/fonts/euler-math/Euler-Math.ltx
index ff98ffbd81..a5146ac36d 100644
--- a/fonts/euler-math/Euler-Math.ltx
+++ b/fonts/euler-math/Euler-Math.ltx
@@ -1,5 +1,4 @@
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{pdfstandard=A-2b, lang=en-GB}
+\DocumentMetadata{pdfstandard=A-2b, lang=en-GB}
\documentclass[a4paper,12pt]{scrartcl}
\usepackage{amsmath, array, varioref}
@@ -38,7 +37,7 @@
\title{Euler Math font, OTF version}
\author{Daniel Flipo \\ \texttt{daniel.flipo@free.fr}}
-\newcommand*{\version}{0.31}
+\newcommand*{\version}{0.40}
\begin{document}
\maketitle
diff --git a/fonts/euler-math/Euler-Math.otf b/fonts/euler-math/Euler-Math.otf
index d6e74e136c..b475b11ac0 100644
--- a/fonts/euler-math/Euler-Math.otf
+++ b/fonts/euler-math/Euler-Math.otf
Binary files differ
diff --git a/fonts/euler-math/Euler-Math.pdf b/fonts/euler-math/Euler-Math.pdf
index 286280cbf5..b26eab0251 100644
--- a/fonts/euler-math/Euler-Math.pdf
+++ b/fonts/euler-math/Euler-Math.pdf
Binary files differ
diff --git a/fonts/euler-math/README.md b/fonts/euler-math/README.md
index 271d7a175c..97dd20a39d 100644
--- a/fonts/euler-math/README.md
+++ b/fonts/euler-math/README.md
@@ -56,14 +56,18 @@ Either version 1.3 or, at your option, any later version.
* v0.22:
- Sizes of vertical variants of \lAngle, \rAngle, \langle and
\rangle corrected.
- - Added extensible integral for U+222B (usable with luametatex).
+ - Added stretchable integral for U+222B (usable with luametatex).
* v0.30:
- *Name of the package changed from Neo-Euler to Euler-Math*;
the former 'neo-euler.sty' style file has been kept for compatibility,
it now loads 'euler-math.sty' and warns about the change.
* v0.31:
- - Package now compatible with mathtools’ extensible arrows.
+ - Package now compatible with mathtools’ stretchable arrows.
- \diagup and \diagdown moved from private area to U+27CB, U+27CD.
+* v0.40:
+ - Metrics of all "over" arrows and harpoons corrected.
+ - Metrics of all "under" arrows and harpoons corrected.
+ - Most horizontal arrows and harpoons are now stretchable.
---
Copyright 2009-2016 Khaled Hosny
diff --git a/fonts/euler-math/euler-math.sty b/fonts/euler-math/euler-math.sty
index 393a691af8..860f76f016 100644
--- a/fonts/euler-math/euler-math.sty
+++ b/fonts/euler-math/euler-math.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}[2018/01/01]
-\def\fileversion{0.31}
-\def\filedate{2023-01-30}
+\def\fileversion{0.40}
+\def\filedate{2023-03-28}
\ProvidesPackage{euler-math}[\filedate\space\fileversion]
% Ensure luatex or xetex engine
diff --git a/fonts/euler-math/unimath-euler.pdf b/fonts/euler-math/unimath-euler.pdf
index 99af68f201..725c1ab650 100644
--- a/fonts/euler-math/unimath-euler.pdf
+++ b/fonts/euler-math/unimath-euler.pdf
Binary files differ
diff --git a/fonts/kpfonts-otf/README.md b/fonts/kpfonts-otf/README.md
index a8c11f71a9..304537de0c 100644
--- a/fonts/kpfonts-otf/README.md
+++ b/fonts/kpfonts-otf/README.md
@@ -105,7 +105,7 @@ Either version 1.3 or, at your option, any later version.
- HarfBuzz renderer no longer loaded for HBLuaTeX engine, new option
"harfbuzz" to force loading it (`kpfonts-otf.sty`).
2. Maths fonts:
- - Extensible delimiters corrected in KpMath-Sans.
+ - Stretchable delimiters corrected in KpMath-Sans.
- Options `frenchstyle`, `partialup` and `fancyReIm` now work as intended.
* v. 0.36:
@@ -113,10 +113,10 @@ Either version 1.3 or, at your option, any later version.
- `kpfonts-otf.sty`: Option mathcal deleted, \mathcal{} and \mathscr{}
now print different glyphs.
- mathcal substitutions corrected for `KpMath-Regular` and `KpMath-Sans`.
- - Extensible \langle, \rangle, \lAngle and \rangle delimiters are now
+ - Stretchable \langle, \rangle, \lAngle and \rangle delimiters are now
available in eight sizes (three bigger sizes added).
- - All vertical arrows are now extensible.
- - Bug fix: extensible right paren was broken in `KpMath-Sans`, thanks
+ - All vertical arrows are now stretchable.
+ - Bug fix: stretchable right paren was broken in `KpMath-Sans`, thanks
to Tom Stotko for pointed it out!
* v. 0.37:
@@ -186,7 +186,7 @@ Either version 1.3 or, at your option, any later version.
2. Maths fonts:
- Added a smaller variant for \widehat, \widetilde, \widecheck.
- Vertical variants added for \vert, \Vert, \Vvert.
- - Added extensible integral for U+222B (usable with luametatex).
+ - Added stretchable integral for U+222B (usable with luametatex).
* v. 0.47:
Text fonts: moved the s= ligature from liga to hlig as it only makes
@@ -195,10 +195,16 @@ Either version 1.3 or, at your option, any later version.
* v. 0.48:
1. Text fonts: oldstyle digits added to lookups "sups" and "subs" for
\textsuperscript{} and \textsubscript{} (`realscripts` package).
- 2. Maths fonts: package now compatible with mathtools’ extensible arrows.
+ 2. Maths fonts: package now compatible with mathtools’ stretchable arrows.
New Bold Sans variant: KpMath-SansBold.otf.
\diagup and \diagdown moved from private area to U+27CB, U+27CD.
+* v. 0.51:
+ - Math fonts: \overleftrightarrow is now stretchable.
+ Metrics of all "over" arrows and harpoons corrected.
+ Metrics of all "under" arrows and harpoons corrected.
+ Most horizontal arrows and harpoons are now stretchable.
+
---
Copyright 2020-2023 Daniel Flipo
E-mail: daniel (dot) flipo (at) free (dot) fr
diff --git a/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.ltx b/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.ltx
index 0c8aa1ba04..6f92caab88 100644
--- a/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.ltx
+++ b/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.ltx
@@ -1,5 +1,4 @@
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{pdfstandard=A-2b, lang=en-GB}
+\DocumentMetadata{pdfstandard=A-2b, lang=en-GB}
\documentclass[paper=a4]{scrartcl}
% Packages
\usepackage{graphics, array}
@@ -41,7 +40,7 @@
\title{Kp-fonts: OpenType version}
\author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}}
-\newcommand*{\version}{0.48}
+\newcommand*{\version}{0.51}
\begin{document}
\selectlanguage{british}
diff --git a/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.pdf b/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.pdf
index 7226627735..df7d666062 100644
--- a/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.pdf
+++ b/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-English.pdf
Binary files differ
diff --git a/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.ltx b/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.ltx
index 924777eca2..97b8cdf357 100644
--- a/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.ltx
+++ b/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.ltx
@@ -1,5 +1,4 @@
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{pdfstandard=A-2b, lang=fr-FR}
+\DocumentMetadata{pdfstandard=A-2b, lang=fr-FR}
\documentclass[paper=a4,french]{scrartcl}
% Packages
\usepackage{graphics, array, varioref}
@@ -40,7 +39,7 @@
\title{Kp-fonts version OpenType}
\author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}}
-\newcommand*{\version}{0.48}
+\newcommand*{\version}{0.51}
\begin{document}
\maketitle
diff --git a/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.pdf b/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.pdf
index 1badd9ea9d..0da52f3ff9 100644
--- a/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.pdf
+++ b/fonts/kpfonts-otf/doc/Kpfonts-OTF-Doc-French.pdf
Binary files differ
diff --git a/fonts/kpfonts-otf/doc/unimath-kpfonts.ltx b/fonts/kpfonts-otf/doc/unimath-kpfonts.ltx
index cc08939821..49ff051da8 100644
--- a/fonts/kpfonts-otf/doc/unimath-kpfonts.ltx
+++ b/fonts/kpfonts-otf/doc/unimath-kpfonts.ltx
@@ -4,7 +4,7 @@
% !TEX TS-program = LuaLaTeX
%% Changes (df): XITS replaced by Kpfonts, Fira replaced by Libertinus,
-%% Palatino replaced by Termes, Erewhon and Garamond added.
+%% Erewhon and Garamond added.
%% Changes by David Carlisle: https://github.com/wspr/unicode-math/issues/570
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -62,7 +62,7 @@
\defmathfont{erewhon}{Erewhon-Math.otf}{brown5}{E}
\defmathfont{kpfonts}{KpMath-Regular.otf}{cyan5}{K}
%\defmathfont{kpfonts}{KpMath-Light.otf}{cyan5}{K}
-\defmathfont{termes}{texgyretermes-math.otf}{violet5}{T}
+\defmathfont{pagella}{texgyrepagella-math.otf}{violet5}{P}
\defmathfont{libertinus}{LibertinusMath-Regular.otf}{yellow5}{L}
\defmathfont{garamond}{Garamond-Math.otf}{magenta5}{G}
@@ -72,7 +72,7 @@
\setlength\tabcolsep{5pt}%
\begin{longtable}[l]{@{}l *{\Nfonts}{c} lp{100pt}@{}}
\toprule
- \textsc{usv} & \Llm & \Lstix & \Lerewhon & \Lkpfonts & \Ltermes & \Llibertinus
+ \textsc{usv} & \Llm & \Lstix & \Lerewhon & \Lkpfonts & \Lpagella & \Llibertinus
& \Lgaramond & Macro & Description \\
\midrule \endhead
\INPUT\\
@@ -105,7 +105,7 @@
\SYMB{#2}{stix}{#1} &
\SYMB{#2}{erewhon}{#1} &
\SYMB{#2}{kpfonts}{#1} &
- \SYMB{#2}{termes}{#1} &
+ \SYMB{#2}{pagella}{#1} &
\SYMB{#2}{libertinus}{#1} &
\SYMB{#2}{garamond}{#1} &
\CMD{#2}
@@ -185,7 +185,7 @@ The following fonts are shown: (with approximate symbol counts)
\item[\Lstix] \mathversion{stix} $\mathup{STIX\ Two\ Math}$ (\ref{count:stix})
\item[\Lerewhon] \mathversion{erewhon} $\mathup{Erewhon\ Math}$ (\ref{count:erewhon})
\item[\Lkpfonts] \mathversion{kpfonts} $\mathup{KpMath\ Regular}$ (\ref{count:kpfonts})
-\item[\Ltermes] \mathversion{termes} $\mathup{TeX\ Gyre\ Termes\ Math}$ (\ref{count:termes})
+\item[\Lpagella] \mathversion{pagella} $\mathup{TeX\ Gyre\ Pagella\ Math}$ (\ref{count:pagella})
\item[\Llibertinus] \mathversion{libertinus} $\mathup{Libertinus\ Math}$ (\ref{count:libertinus})
\item[\Lgaramond] \mathversion{garamond} $\mathup{Garamond\ Math}$ (\ref{count:garamond})
\end{itemize}
diff --git a/fonts/kpfonts-otf/doc/unimath-kpfonts.pdf b/fonts/kpfonts-otf/doc/unimath-kpfonts.pdf
index 06d3d3d419..25365ab2e9 100644
--- a/fonts/kpfonts-otf/doc/unimath-kpfonts.pdf
+++ b/fonts/kpfonts-otf/doc/unimath-kpfonts.pdf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpMath-Bold.otf b/fonts/kpfonts-otf/fonts/KpMath-Bold.otf
index 93d084ff61..3b3ae1f512 100644
--- a/fonts/kpfonts-otf/fonts/KpMath-Bold.otf
+++ b/fonts/kpfonts-otf/fonts/KpMath-Bold.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpMath-Light.otf b/fonts/kpfonts-otf/fonts/KpMath-Light.otf
index eda288d30d..58355ab17e 100644
--- a/fonts/kpfonts-otf/fonts/KpMath-Light.otf
+++ b/fonts/kpfonts-otf/fonts/KpMath-Light.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpMath-Regular.otf b/fonts/kpfonts-otf/fonts/KpMath-Regular.otf
index 93aa49c631..81b06cb928 100644
--- a/fonts/kpfonts-otf/fonts/KpMath-Regular.otf
+++ b/fonts/kpfonts-otf/fonts/KpMath-Regular.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpMath-Sans.otf b/fonts/kpfonts-otf/fonts/KpMath-Sans.otf
index 0aa129e0b3..77e7e34502 100644
--- a/fonts/kpfonts-otf/fonts/KpMath-Sans.otf
+++ b/fonts/kpfonts-otf/fonts/KpMath-Sans.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpMath-SansBold.otf b/fonts/kpfonts-otf/fonts/KpMath-SansBold.otf
index d1ec2cde14..a6c684a6a2 100644
--- a/fonts/kpfonts-otf/fonts/KpMath-SansBold.otf
+++ b/fonts/kpfonts-otf/fonts/KpMath-SansBold.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpMath-Semibold.otf b/fonts/kpfonts-otf/fonts/KpMath-Semibold.otf
index 8b5c327075..79eeefde18 100644
--- a/fonts/kpfonts-otf/fonts/KpMath-Semibold.otf
+++ b/fonts/kpfonts-otf/fonts/KpMath-Semibold.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpMono-Bold.otf b/fonts/kpfonts-otf/fonts/KpMono-Bold.otf
index 8920e914ae..cce44a86b5 100644
--- a/fonts/kpfonts-otf/fonts/KpMono-Bold.otf
+++ b/fonts/kpfonts-otf/fonts/KpMono-Bold.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpMono-BoldItalic.otf b/fonts/kpfonts-otf/fonts/KpMono-BoldItalic.otf
index 2c7ad4281a..c2ad021101 100644
--- a/fonts/kpfonts-otf/fonts/KpMono-BoldItalic.otf
+++ b/fonts/kpfonts-otf/fonts/KpMono-BoldItalic.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpMono-Italic.otf b/fonts/kpfonts-otf/fonts/KpMono-Italic.otf
index 28feb13372..58637aefd1 100644
--- a/fonts/kpfonts-otf/fonts/KpMono-Italic.otf
+++ b/fonts/kpfonts-otf/fonts/KpMono-Italic.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpMono-Regular.otf b/fonts/kpfonts-otf/fonts/KpMono-Regular.otf
index 4467d06b01..67030fbd10 100644
--- a/fonts/kpfonts-otf/fonts/KpMono-Regular.otf
+++ b/fonts/kpfonts-otf/fonts/KpMono-Regular.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpRoman-Bold.otf b/fonts/kpfonts-otf/fonts/KpRoman-Bold.otf
index 1b1f2947f9..b51f0efa56 100644
--- a/fonts/kpfonts-otf/fonts/KpRoman-Bold.otf
+++ b/fonts/kpfonts-otf/fonts/KpRoman-Bold.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpRoman-BoldItalic.otf b/fonts/kpfonts-otf/fonts/KpRoman-BoldItalic.otf
index 8a93f6381a..fcf33a5f3d 100644
--- a/fonts/kpfonts-otf/fonts/KpRoman-BoldItalic.otf
+++ b/fonts/kpfonts-otf/fonts/KpRoman-BoldItalic.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpRoman-Italic.otf b/fonts/kpfonts-otf/fonts/KpRoman-Italic.otf
index 08a3257775..9f8885cdc7 100644
--- a/fonts/kpfonts-otf/fonts/KpRoman-Italic.otf
+++ b/fonts/kpfonts-otf/fonts/KpRoman-Italic.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpRoman-Light.otf b/fonts/kpfonts-otf/fonts/KpRoman-Light.otf
index 56591f4ab2..cd4e5a74aa 100644
--- a/fonts/kpfonts-otf/fonts/KpRoman-Light.otf
+++ b/fonts/kpfonts-otf/fonts/KpRoman-Light.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpRoman-LightItalic.otf b/fonts/kpfonts-otf/fonts/KpRoman-LightItalic.otf
index 92479f6dfd..ac8cf283be 100644
--- a/fonts/kpfonts-otf/fonts/KpRoman-LightItalic.otf
+++ b/fonts/kpfonts-otf/fonts/KpRoman-LightItalic.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpRoman-Regular.otf b/fonts/kpfonts-otf/fonts/KpRoman-Regular.otf
index e2b97c275b..ea30d2bb01 100644
--- a/fonts/kpfonts-otf/fonts/KpRoman-Regular.otf
+++ b/fonts/kpfonts-otf/fonts/KpRoman-Regular.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpRoman-Semibold.otf b/fonts/kpfonts-otf/fonts/KpRoman-Semibold.otf
index bbe25cfea6..492574ba46 100644
--- a/fonts/kpfonts-otf/fonts/KpRoman-Semibold.otf
+++ b/fonts/kpfonts-otf/fonts/KpRoman-Semibold.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpRoman-SemiboldItalic.otf b/fonts/kpfonts-otf/fonts/KpRoman-SemiboldItalic.otf
index db0cbcaec8..724f07b4fe 100644
--- a/fonts/kpfonts-otf/fonts/KpRoman-SemiboldItalic.otf
+++ b/fonts/kpfonts-otf/fonts/KpRoman-SemiboldItalic.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpSans-Bold.otf b/fonts/kpfonts-otf/fonts/KpSans-Bold.otf
index 565b9fe6ef..008b20a811 100644
--- a/fonts/kpfonts-otf/fonts/KpSans-Bold.otf
+++ b/fonts/kpfonts-otf/fonts/KpSans-Bold.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpSans-BoldItalic.otf b/fonts/kpfonts-otf/fonts/KpSans-BoldItalic.otf
index 68d22836bf..4e06f4e959 100644
--- a/fonts/kpfonts-otf/fonts/KpSans-BoldItalic.otf
+++ b/fonts/kpfonts-otf/fonts/KpSans-BoldItalic.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpSans-Italic.otf b/fonts/kpfonts-otf/fonts/KpSans-Italic.otf
index 3170821b3f..12ccb496c2 100644
--- a/fonts/kpfonts-otf/fonts/KpSans-Italic.otf
+++ b/fonts/kpfonts-otf/fonts/KpSans-Italic.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/fonts/KpSans-Regular.otf b/fonts/kpfonts-otf/fonts/KpSans-Regular.otf
index e61ac93a6b..071c881e05 100644
--- a/fonts/kpfonts-otf/fonts/KpSans-Regular.otf
+++ b/fonts/kpfonts-otf/fonts/KpSans-Regular.otf
Binary files differ
diff --git a/fonts/kpfonts-otf/tex/kpfonts-otf.sty b/fonts/kpfonts-otf/tex/kpfonts-otf.sty
index fa949428c7..fe09cc9f57 100644
--- a/fonts/kpfonts-otf/tex/kpfonts-otf.sty
+++ b/fonts/kpfonts-otf/tex/kpfonts-otf.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}[2019-01-01]
-\def\fileversion{0.48}
-\def\filedate{2023-01-16}
+\def\fileversion{0.51}
+\def\filedate{2023-03-30}
\ProvidesPackage{kpfonts-otf}[\filedate\space\fileversion]
% Ensure luatex or xetex engine
diff --git a/fonts/xcharter-math/README.md b/fonts/xcharter-math/README.md
index 1b28c7d69c..842c473609 100644
--- a/fonts/xcharter-math/README.md
+++ b/fonts/xcharter-math/README.md
@@ -63,10 +63,14 @@ Either version 1.3 or, at your option, any later version.
- Experimental Bold variant added.
- Fixed \wideoverbar (U+0305) which failed with XeTeX.
- Corrected negative right bearings of some display integrals.
- - Added extensible integral for U+222B (usable with luametatex).
+ - Added stretchable integral for U+222B (usable with luametatex).
* v0.36:
- - package now compatible with mathtools’ extensible arrows.
+ - package now compatible with mathtools’ stretchable arrows.
- \diagup and \diagdown moved from private area to U+27CB, U+27CD.
+* v0.40:
+ - Metrics of all "over" arrows and harpoons corrected.
+ - Metrics of all "under" arrows and harpoons corrected.
+ - Most horizontal arrows and harpoons are now stretchable.
---
Copyright 2022-2023 Daniel Flipo
diff --git a/fonts/xcharter-math/XCharter-Math-Bold.otf b/fonts/xcharter-math/XCharter-Math-Bold.otf
index 3a0ec7208b..8be3f3fcac 100644
--- a/fonts/xcharter-math/XCharter-Math-Bold.otf
+++ b/fonts/xcharter-math/XCharter-Math-Bold.otf
Binary files differ
diff --git a/fonts/xcharter-math/XCharter-Math.ltx b/fonts/xcharter-math/XCharter-Math.ltx
index 30b8c2ab40..9e2bea6ded 100644
--- a/fonts/xcharter-math/XCharter-Math.ltx
+++ b/fonts/xcharter-math/XCharter-Math.ltx
@@ -1,5 +1,4 @@
-\RequirePackage{pdfmanagement-testphase}
-\DeclareDocumentMetadata{pdfstandard=A-2b, lang=en-GB}
+\DocumentMetadata{pdfstandard=A-2b, lang=en-GB}
\documentclass[a4paper,12pt]{scrartcl}
\usepackage{amsmath, array, varioref}
@@ -35,7 +34,7 @@
\title{\decofourleft\,\XCotf\,\decofourright}
\author{Daniel Flipo \\ \texttt{daniel.flipo@free.fr}}
-\newcommand*{\version}{0.36}
+\newcommand*{\version}{0.40}
\begin{document}
\maketitle
@@ -452,7 +451,6 @@ Various wide accents are also supported:
\mathring{\overparen{A\cup B}}\quad
\overparen{A\cup (B\cap C)\cup D}^{\smwhtcircle}\quad
\overparen{x+y}^{2}\quad \overparen{a+b+...+z}^{26}\]
-
\[\underparen{x}\quad \underparen{xz} \quad \underparen{xyz}
\quad \underparen{x+z}_{2}\quad \underparen{a+b+...+z}_{26}\]
@@ -460,7 +458,6 @@ Various wide accents are also supported:
\[\overbrace{a}\quad \overbrace{ab}\quad \overbrace{abc}\quad
\overbrace{abcd}\quad \overbrace{abcde}\quad
\overbrace{a+b+c}^{3}\quad \overbrace{ a+b+. . . +z }^{26}\]
-
\[\underbrace{a}\quad\underbrace{ab}\quad\underbrace{abc}\quad
\underbrace{abcd}\quad \underbrace{abcde}\quad
\underbrace{a+b+c}_{3} \quad \underbrace{ a+b+...+z }_{26}\]
@@ -469,7 +466,6 @@ Various wide accents are also supported:
\[\overbracket{a}\quad \overbracket{ab}\quad \overbracket{abc}\quad
\overbracket{abcd}\quad \overbracket{abcde}\quad
\overbracket{a+b+c}^{3}\quad \overbracket{ a+b+. . . +z }^{26}\]
-
\[\underbracket{a}\quad\underbracket{ab}\quad\underbracket{abc}\quad
\underbracket{abcd}\quad \underbracket{abcde}\quad
\underbracket{a+b+c}_{3} \quad \underbracket{ a+b+...+z }_{26}\]
@@ -479,11 +475,40 @@ Various wide accents are also supported:
\quad \overrightarrow{AB}\quad \overrightarrow{ABC}
\quad \overrightarrow{ABCD} \quad \overrightarrow{ABCDEFGH}.
\]
-
\[\overleftarrow{v}\quad \overleftarrow{M}\quad \overleftarrow{vv}
\quad \overleftarrow{AB}\quad \overleftarrow{ABC}
\quad \overleftarrow{ABCD} \quad \overleftarrow{ABCDEFGH}\]
+\item \cmd{overrightharpoon} and \cmd{overleftharpoon}
+ \[\overrightharpoon{v}\quad \overrightharpoon{M}\quad \overrightharpoon{vv}
+ \quad \overrightharpoon{AB}\quad \overrightharpoon{ABC}
+ \quad \overrightharpoon{ABCD} \quad \overrightharpoon{ABCDEFGH}.
+ \]
+ \[\overleftharpoon{v}\quad \overleftharpoon{M}\quad \overleftharpoon{vv}
+ \quad \overleftharpoon{AB}\quad \overleftharpoon{ABC}
+ \quad \overleftharpoon{ABCD} \quad \overleftharpoon{ABCDEFGH}\]
+
+\item \cmd{underrightarrow} and \cmd{underleftarrow}
+ \[\underrightarrow{v}\quad \underrightarrow{M}\quad \underrightarrow{vv}
+ \quad \underrightarrow{AB}\quad \underrightarrow{ABC}
+ \quad \underrightarrow{ABCD} \quad \underrightarrow{ABCDEFGH}.
+ \]
+ \[\underleftarrow{v}\quad \underleftarrow{M}\quad \underleftarrow{vv}
+ \quad \underleftarrow{AB}\quad \underleftarrow{ABC}
+ \quad \underleftarrow{ABCD} \quad \underleftarrow{ABCDEFGH}\]
+
+\item \cmd{underrightharpoon} and \cmd{underleftharpoondown}
+ \[\underrightharpoondown{v}\quad \underrightharpoondown{M}\quad
+ \underrightharpoondown{vv}\quad \underrightharpoondown{AB}\quad
+ \underrightharpoondown{ABC}\quad \underrightharpoondown{ABCD}\quad
+ \underrightharpoondown{ABCDEFGH}.
+ \]
+ \[\underleftharpoondown{v}\quad \underleftharpoondown{M}\quad
+ \underleftharpoondown{vv}\quad \underleftharpoondown{AB}\quad
+ \underleftharpoondown{ABC}\quad \underleftharpoondown{ABCD}
+ \quad \underleftharpoondown{ABCDEFGH}.
+ \]
+
\item Finally \cmd{widearc} and \cmd{overrightarc} (loading
\pkg{xcharter-otf.sty} is required)
\[\widearc{AMB}\quad \overrightarc{AMB}\]
@@ -498,18 +523,23 @@ Various wide accents are also supported:
and \verb+\symbfit{}+ commands.
\item Calligraphic alphabet (\cmd{symscr} or \cmd{symcal} or
- \cmd{mathcal} command), uppercase:
-
- $\symscr{ABCDEFGHIJKLMNOPQRSTUVWXYZ}$
+ \cmd{mathcal} command), uppercase:\\
+ $\symscr{ABCDEFGHIJKLMNOPQRSTUVWXYZ}$\\
+ also in boldface (\cmd{symbfscr},\cmd{symbfcal} or \cmd{mathbfcal} command):\\
+ $\symbfscr{ABCDEFGHIJKLMNOPQRSTUVWXYZ}$
\item Blackboard-bold alphabet (\cmd{symbb} or \cmd{mathbb} command)
uppercase only, plus \verb+\Bbbone+ and \verb+\Bbbk+:
$\symbb{ABCDEFGHIJKLMNOPQRSTUVWXYZ}, \Bbbone, \Bbbk$
-\item Fraktur alphabet is borrowed from Latin Modern,
+\item Fraktur alphabet is borrowed from Latin Modern, medium and bold
+ (\cmd{symfrak}, or \cmd{symbffrak} commands):
- $\symfrak{ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz}$
+ $\symfrak{ABCDEFGHIJKLMNOPQRSTUVWXYZ\quad abcdefghijklmnopqrstuvwxyz}$\\
+ $\symbffrak{ABCDEFGHIJKLMNOPQRSTUVWXYZ}$\\
+ \hphantom{$\symfrak{ABCDEFGHIJKLMNOPQRSTUVWXYZ\quad}$}%
+ $\symbffrak{abcdefghijklmnopqrstuvwxyz}$
but this can overwritten, i.e.
\begin{verbatim}
diff --git a/fonts/xcharter-math/XCharter-Math.otf b/fonts/xcharter-math/XCharter-Math.otf
index bdad1309d2..a51237b1b7 100644
--- a/fonts/xcharter-math/XCharter-Math.otf
+++ b/fonts/xcharter-math/XCharter-Math.otf
Binary files differ
diff --git a/fonts/xcharter-math/XCharter-Math.pdf b/fonts/xcharter-math/XCharter-Math.pdf
index c19fdf1808..f54289c14e 100644
--- a/fonts/xcharter-math/XCharter-Math.pdf
+++ b/fonts/xcharter-math/XCharter-Math.pdf
Binary files differ
diff --git a/fonts/xcharter-math/unimath-xcharter.pdf b/fonts/xcharter-math/unimath-xcharter.pdf
index 69b3ff54c6..afef60d889 100644
--- a/fonts/xcharter-math/unimath-xcharter.pdf
+++ b/fonts/xcharter-math/unimath-xcharter.pdf
Binary files differ
diff --git a/fonts/xcharter-math/xcharter-otf.sty b/fonts/xcharter-math/xcharter-otf.sty
index 5fbd6c228f..e156e3b860 100644
--- a/fonts/xcharter-math/xcharter-otf.sty
+++ b/fonts/xcharter-math/xcharter-otf.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}[2018/01/01]
-\def\fileversion{0.36}
-\def\filedate{2023-01-30}
+\def\fileversion{0.40}
+\def\filedate{2023-03-29}
\ProvidesPackage{xcharter-otf}[\filedate\space\fileversion]
% Ensure luatex or xetex engine
diff --git a/graphics/pgf/contrib/structmech/README.md b/graphics/pgf/contrib/structmech/README.md
index ac4fe338dd..057be4bc3c 100644
--- a/graphics/pgf/contrib/structmech/README.md
+++ b/graphics/pgf/contrib/structmech/README.md
@@ -17,15 +17,6 @@ along with this program. If not, see http://www.gnu.org/licenses/.
------
-**structmech** is a collection of several TikZ commands that allows users to draw basic elements in material/structural mechanics. With one single command, it is capable of drawing member forces, nodal forces/displacements, various boundary conditions, internal force distributions, etc.
-
-Please feel free to redistribute and/or expand the functionality. Please contact me at:
-
-[tlcfem@gmail.com](mailto:tlcfem@gmail.com)
-
-tlc
-
-04/25/2021
-
-
+**structmech** is a collection of TikZ commands that allows users to draw basic elements in material/structural mechanics. With one single command, it is capable of drawing member forces, nodal forces/displacements, various boundary conditions, internal force distributions, etc.
+Please feel free to redistribute and/or extend the functionality.
diff --git a/graphics/pgf/contrib/structmech/structmech.pdf b/graphics/pgf/contrib/structmech/structmech.pdf
index fea6da781a..60feba2d2e 100644
--- a/graphics/pgf/contrib/structmech/structmech.pdf
+++ b/graphics/pgf/contrib/structmech/structmech.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/structmech/structmech.sty b/graphics/pgf/contrib/structmech/structmech.sty
index 21735ed2c2..d07e68a5c6 100644
--- a/graphics/pgf/contrib/structmech/structmech.sty
+++ b/graphics/pgf/contrib/structmech/structmech.sty
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Copyright (C) 2018-2021 Theodore Chang
+%% Copyright (C) 2018-2023 Theodore Chang
%%
%% This program is free software: you can redistribute it and/or modify
%% it under the terms of the GNU General Public License as published by
@@ -15,17 +15,17 @@
%% along with this program. If not, see <http://www.gnu.org/licenses/>.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% structmech: A TikZ command set for structural mechanics drawings
-% v1.1 by tlc
+% v1.2 by tlc
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{structmech}[2021/04/25 v1.1 structmech: A TikZ command set for structural mechanics drawings]
+\ProvidesPackage{structmech}[2023/04/01 v1.2 structmech: A TikZ command set for structural mechanics drawings]
\RequirePackage{ifthen}
\RequirePackage{kvoptions}
\RequirePackage{tikz}
\RequirePackage{xkeyval}
\RequirePackage{xparse}
\RequirePackage{xstring}
-\usetikzlibrary{calc,decorations.pathreplacing,positioning}
+\usetikzlibrary{calc,decorations.pathreplacing,positioning,decorations.pathmorphing}
\DeclareOptionX<structmech>{fill}[black]{\def\fillColor{#1}}
\DeclareOptionX<structmech>{line}[black]{\def\lineColor{#1}}
\DeclareOptionX<structmech>{node}[black]{\def\nodeColor{#1}}
@@ -382,66 +382,37 @@ EndRotD/.style={start angle=\Angle+90,end angle=\Angle-90,radius=3mm},
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NewDocumentCommand{\IForceB}{O{\fillColor} m m m m m G{1}}{
\coordinate(A)at(#2);\coordinate(B)at(#3);
+\pgfmathsetmacro\height{#6*#7};
+\pgfmathsetmacro\lvla{#4*#7};
+\pgfmathsetmacro\lvlb{#5*#7};
% original cord
\pgfmathanglebetweenpoints{\pgfpointanchor{A}{center}}{\pgfpointanchor{B}{center}}
\let\Angle\pgfmathresult
-\coordinate(C)at($(A)+(\Angle+90:#4*#7)$);
-\coordinate(D)at($(B)+(\Angle-90:#5*#7)$);
-% inclined cord
-\pgfmathanglebetweenpoints{\pgfpointanchor{C}{center}}{\pgfpointanchor{D}{center}}
-\let\AngleB\pgfmathresult
+\coordinate(C)at($(A)+(\Angle+90:\lvla)$);
+\coordinate(D)at($(B)+(\Angle-90:\lvlb)$);
% original length
\pgfpointdiff{\pgfpointanchor{A}{center}}{\pgfpointanchor{B}{center}}
\pgfmathparse{veclen(\pgf@x,\pgf@y)/28.45274}
\let\Length\pgfmathresult
-% inclined length
-\pgfpointdiff{\pgfpointanchor{C}{center}}{\pgfpointanchor{D}{center}}
-\pgfmathparse{veclen(\pgf@x,\pgf@y)/28.45274}
-\let\LengthB\pgfmathresult
-% center of inclined cord
-\coordinate(G)at($(C)+(\AngleB:\LengthB/2)$);
-\pgfmathsetmacro\height{#6*#7};
-\begin{scope}[rotate around={\AngleB:(G)},shift={(G)}]
-\draw[#1,fill=#1,fill opacity=\fillOpacity](-.5*\LengthB,0)parabola bend(0,\height)(.5*\LengthB,0)--++(\Angle-\AngleB+90:#5*#7)--($(-.5*\LengthB,0)+(\Angle-\AngleB-90:#4*#7)$)--cycle;
+\coordinate(G)at($(A)+(\Angle:\Length/2)$);
+\begin{scope}[rotate around={\Angle:(G)},shift={(G)}]
+\draw[#1,fill=#1,fill opacity=\fillOpacity]plot[domain=-.5*\Length:.5*\Length,samples=100](\x,{\height-4./\Length/\Length*\height*\x*\x-\lvla/\Length*\x-\lvlb/\Length*\x+\lvla/2-\lvlb/2})--(B)--(A)--cycle;
\end{scope}
\IfStrEq{\showvalue}{on}{
\StrLeft{#4}{1}[\SA]
-% \IfStrEq{\SA}{-}
-% {\IfStrEq{\absvalue}{on}
-% {\node[NOFILL]at($(C)+(\Angle-90:\Length/8)$)[rotate=\Angle]{$\StrDel[1]{#4}{-}$};}
-% {\node[NOFILL]at($(C)+(\Angle-90:\Length/8)$)[rotate=\Angle]{$#4$};}
-% }
-% {\node[NOFILL]at($(C)+(\Angle+90:\Length/8)$)[rotate=\Angle]{$#4$};}
-% \StrLeft{#5}{1}[\SB]
-% \IfStrEq{\SB}{-}
-% {\IfStrEq{\absvalue}{on}
-% {\node[NOFILL]at($(D)+(\Angle+90:\Length/8)$)[rotate=\Angle]{$\StrDel[1]{#5}{-}$};}
-% {\node[NOFILL]at($(D)+(\Angle+90:\Length/8)$)[rotate=\Angle]{$#5$};}
-% }
-% {\node[NOFILL]at($(D)+(\Angle-90:\Length/8)$)[rotate=\Angle]{$#5$};}
\IfStrEq{\SA}{-}
- {\node[NOFILL,\lineColor]at($(C)+(\Angle-90:\Length/8)$)[rotate=\Angle]{$#4$};}
+ {\IfStrEq{\absvalue}{on}
+ {\node[NOFILL,\lineColor]at($(C)+(\Angle-90:\Length/8)$)[rotate=\Angle]{$\StrDel[1]{#4}{-}$};}
+ {\node[NOFILL,\lineColor]at($(C)+(\Angle-90:\Length/8)$)[rotate=\Angle]{$#4$};}
+ }
{\node[NOFILL,\lineColor]at($(C)+(\Angle+90:\Length/8)$)[rotate=\Angle]{$#4$};}
-\IfStrEq{#5}{0}{
- \node[NOFILL,\lineColor]at($(D)+(\Angle+90:\Length/8)$)[rotate=\Angle]{$#5$};
-}{
- \StrLeft{#5}{1}[\SB]
- \IfStrEq{\SB}{-}
- {\IfStrEq{\absvalue}{on}
- {\IfStrEq{\SA}{-}
- {\node[NOFILL,\lineColor]at($(D)+(\Angle+90:\Length/8)$)[rotate=\Angle]{$#5$};}
- {\node[NOFILL,\lineColor]at($(D)+(\Angle+90:\Length/8)$)[rotate=\Angle]{$\StrDel[1]{#5}{-}$};}
- }
- {\node[NOFILL,\lineColor]at($(D)+(\Angle+90:\Length/8)$)[rotate=\Angle]{$#5$};}
- }
- {\IfStrEq{\absvalue}{on}
- {\IfStrEq{\SA}{-}
- {\node[NOFILL,\lineColor]at($(D)+(\Angle-90:\Length/8)$)[rotate=\Angle]{$-#5$};}
- {\node[NOFILL,\lineColor]at($(D)+(\Angle-90:\Length/8)$)[rotate=\Angle]{$#5$};}
- }
- {\node[NOFILL,\lineColor]at($(D)+(\Angle-90:\Length/8)$)[rotate=\Angle]{$#5$};}
- }
-}
+\StrLeft{#5}{1}[\SB]
+\IfStrEq{\SB}{-}
+ {\IfStrEq{\absvalue}{on}
+ {\node[NOFILL,\lineColor]at($(D)+(\Angle+90:\Length/8)$)[rotate=\Angle]{$\StrDel[1]{#5}{-}$};}
+ {\node[NOFILL,\lineColor]at($(D)+(\Angle+90:\Length/8)$)[rotate=\Angle]{$#5$};}
+ }
+ {\node[NOFILL,\lineColor]at($(D)+(\Angle-90:\Length/8)$)[rotate=\Angle]{$#5$};}
}{}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -470,4 +441,47 @@ EndRotD/.style={start angle=\Angle+90,end angle=\Angle-90,radius=3mm},
\let\Angle\pgfmathresult
\draw[#1,line width=\lineWidth](A)to[out=\Angle+#4*#6,in=180+\Angle+#5*#6](B);
}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Command 14: Dashpot
+% \Dashpot[1]{2}{3}{4}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\NewDocumentCommand{\Dashpot}{O{\fillColor} m m G{1}}{
+\coordinate(A)at(#2);\coordinate(B)at(#3);
+% original cord
+\pgfmathanglebetweenpoints{\pgfpointanchor{A}{center}}{\pgfpointanchor{B}{center}}
+\let\Angle\pgfmathresult
+\pgfpointdiff{\pgfpointanchor{A}{center}}{\pgfpointanchor{B}{center}}
+\pgfmathparse{veclen(\pgf@x,\pgf@y)/28.45274}
+\let\Length\pgfmathresult
+\pgfmathsetmacro\unitL{#4*\Length/10};
+\coordinate(G)at($(A)+(\Angle:\Length/2)$);
+\begin{scope}[rotate around={\Angle:(G)},shift={(G)}]
+\draw[#1,line width=\lineWidth]
+(-\Length/2,0)--(-.5*\unitL,0)
+(0,0)--(\Length/2,0)
+(0,-.5*\unitL)--++(0,\unitL)
+(.5*\unitL,\unitL)--++(-\unitL,0)--++(0,-2*\unitL)--++(\unitL,0);
+\end{scope}
+}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Command 15: Spring
+% \Spring[1]{2}{3}{4}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\NewDocumentCommand{\Spring}{O{\fillColor} m m G{1}}{
+\coordinate(A)at(#2);\coordinate(B)at(#3);
+% original cord
+\pgfmathanglebetweenpoints{\pgfpointanchor{A}{center}}{\pgfpointanchor{B}{center}}
+\let\Angle\pgfmathresult
+\pgfpointdiff{\pgfpointanchor{A}{center}}{\pgfpointanchor{B}{center}}
+\pgfmathparse{veclen(\pgf@x,\pgf@y)/28.45274}
+\let\Length\pgfmathresult
+\pgfmathsetmacro\unitL{#4*\Length/10};
+\coordinate(G)at($(A)+(\Angle:\Length/2)$);
+\begin{scope}[rotate around={\Angle:(G)},shift={(G)}]
+\draw[#1,line width=\lineWidth]
+(-\Length/2,0)--(-2*\unitL,0)
+(2*\unitL,0)--(\Length/2,0);
+\draw[#1,line width=\lineWidth,decorate,decoration={zigzag,segment length=3mm, amplitude=1mm}](-2*\unitL,0)--(2*\unitL,0);
+\end{scope}
+}
\makeatother \ No newline at end of file
diff --git a/graphics/pgf/contrib/structmech/structmech.tex b/graphics/pgf/contrib/structmech/structmech.tex
index 96b01541c6..f47f3162ee 100644
--- a/graphics/pgf/contrib/structmech/structmech.tex
+++ b/graphics/pgf/contrib/structmech/structmech.tex
@@ -3,13 +3,13 @@
\usepackage{amsmath,fancyvrb,float,hyperref,structmech}
\usepackage{mathpazo}
\title{structmech\\\large{}A TikZ command set for structural mechanics drawings}
-\author{Theodore Chang\footnote{E-mail: \href{tlcfem@gmail.com}{tlcfem@gmail.com}}\\[2mm]\normalsize{}University of Canterbury, Christchurch, NZ}
-\date{\normalsize{}v1.1 released on \today}
+\author{Theodore Chang\footnote{E-mail: \href{tlcfem@gmail.com}{tlcfem@gmail.com}}\\[2mm]\normalsize{}Humboldt-Universität zu Berlin, Berlin, Germany}
+\date{\normalsize{}v1.2 released on \today}
\newcommand*{\Highlight}[1]{\colorbox{cyan}{\color{red}\texttt{#1}}}
\begin{document}
\maketitle
\section{Introduction}
-This package is under GPL v3 license and/or later version. Please feel free to redistribute, expand or rewrite the functionality.
+This package is under GPL v3 license and/or later versions. Please feel free to redistribute, extend or rewrite the functionality.
\section{Options}
To load the package, please use the following command in the preamble.
\begin{Verbatim}[frame=single,label=Syntax]
@@ -120,7 +120,7 @@ Here are some examples that use the basic force command to show how the user can
\item[][7] --- label for the second force drew, available for \Highlight{\#1=2}, leave blank if not required.
\item[][8] --- label for the third force drew, available for \Highlight{\#1=3}, leave blank if not required.
\end{enumerate}
-The colours of three components can be configured using global options. Here are a few examples, please find out the order and the difference in the following fourteen examples.
+The colours of the three components can be configured using global options. Here are a few examples, please find out the order and the difference in the following fourteen examples.
\begin{Verbatim}[frame=single,label=Example]
\BasicForce{0,0}{3,0}{}
\BasicForce[1]{5,0}{8,0}{a}[U_1]
@@ -413,7 +413,7 @@ It should be noted that parameter \Highlight{\#6} defines the difference of the
\setstructmech{absvalue=on}
\IForceB[purple]{4,4}{4,0}{3}{-1}{2}{0.5}
\setstructmech{showvalue=off,opacity=.8}
-\IForceB[cyan]{4,0}{0,0}{1.5}{0}{2}{0.5}
+\IForceB[cyan]{4,0}{0,0}{1.5}{1}{2}{0.5}
\end{Verbatim}
\begin{figure}[H]
\centering
@@ -424,7 +424,7 @@ It should be noted that parameter \Highlight{\#6} defines the difference of the
\setstructmech{absvalue=on}
\IForceB[purple]{4,4}{4,0}{3}{-1}{2}{0.5}
\setstructmech{showvalue=off,opacity=1}
-\IForceB[cyan]{4,0}{0,0}{1.5}{0}{2}{0.5}
+\IForceB[cyan]{4,0}{0,0}{1.5}{1}{2}{0.5}
\end{tikzpicture}
\end{figure}
\section{Beam Deformation (Perpendicular)}
@@ -483,4 +483,54 @@ Caveat: If the nodal translations are expressed as global values, they can be re
\BeamDeformR[blue]{0,4}{4,4}[20][30]{2}
\end{tikzpicture}
\end{figure}
+\section{Dashpot}
+\begin{Verbatim}[frame=single,label=Syntax]
+\Dashpot[1]{2}{3}{4}
+\end{Verbatim}
+\begin{enumerate}
+\item[][1] --- optional, line colour.
+\item[]\{2\} --- node coordinates of the lower end in form of \Highlight{$x,y$}.
+\item[]\{3\} --- node coordinates of the higher end in form of \Highlight{$x,y$}.
+\item[]\{4\} --- optional, scale.
+\end{enumerate}
+\begin{Verbatim}[frame=single,label=Example]
+\Dashpot{0,0}{0,3}
+\Dashpot[blue]{2,0}{5,4}{2}
+\setstructmech{linewidth=1mm}
+\Dashpot[purple]{5,0}{10,2}
+\end{Verbatim}
+\begin{figure}[H]
+\centering
+\begin{tikzpicture}
+\Dashpot{0,0}{0,3}
+\Dashpot[blue]{2,0}{5,4}{2}
+\setstructmech{linewidth=1mm}
+\Dashpot[purple]{5,0}{10,2}
+\end{tikzpicture}
+\end{figure}
+\section{Spring}
+\begin{Verbatim}[frame=single,label=Syntax]
+\Spring[1]{2}{3}{4}
+\end{Verbatim}
+\begin{enumerate}
+\item[][1] --- optional, line colour.
+\item[]\{2\} --- node coordinates of the lower end in form of \Highlight{$x,y$}.
+\item[]\{3\} --- node coordinates of the higher end in form of \Highlight{$x,y$}.
+\item[]\{4\} --- optional, scale.
+\end{enumerate}
+\begin{Verbatim}[frame=single,label=Example]
+\Spring{0,0}{0,3}
+\Spring[blue]{2,0}{5,4}{2}
+\setstructmech{linewidth=1mm}
+\Spring[purple]{5,0}{10,2}
+\end{Verbatim}
+\begin{figure}[H]
+\centering
+\begin{tikzpicture}
+\Spring{0,0}{0,3}
+\Spring[blue]{2,0}{5,4}{2}
+\setstructmech{linewidth=1mm}
+\Spring[purple]{5,0}{10,2}
+\end{tikzpicture}
+\end{figure}
\end{document} \ No newline at end of file
diff --git a/info/context-notes-zh-cn/LICENSE b/info/context-notes-zh-cn/LICENSE
deleted file mode 100644
index f288702d2f..0000000000
--- a/info/context-notes-zh-cn/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/info/context-notes-zh-cn/README.md b/info/context-notes-zh-cn/README.md
index 19e4d1d000..da1e5cb92a 100644
--- a/info/context-notes-zh-cn/README.md
+++ b/info/context-notes-zh-cn/README.md
@@ -1 +1,10 @@
-This tutorial is completely rewritten. It comprehensively introduces how to use ConTeXt (>= MkIV) to typeset Simplified Chinese documents, mainly including the installation of ConTeXt LMTX, how to use Chinese fonts, and how to typeset lists, references, illustrations, tables, and framed texts. Furthermore, it is described how to use the MetaPost language for drawing in ConTeXt. Finally, how to make slides and books is introduced.
+This is an introductory tutorial on ConTeXt in Chinese written by Li Yanrui.
+
+This tutorial is completely rewritten fourteen years later after its predecessor was released. Now it comprehensively introduces how to use ConTeXt (>= MkIV) to typeset Simplified Chinese documents, mainly including the installation of ConTeXt LMTX, how to use Chinese fonts, and how to typeset lists, references, figures, tables, verbatim text and framed text. Furthermore, it is described how to use the MetaPost language for drawing in ConTeXt. Finally, how to make slides and books is introduced.
+
+This package is licensed in GPL v3 (The GNU General Public License v3.0). The document ctxnotes.pdf is licensed in GFDL (The GNU Free Documentation License).
+
+If you are interested in the process of development you may observe https://github.com/liyanrui/ConTeXt-notes
+
+Report or give feedback to https://github.com/liyanrui/ConTeXt-notes/issues or lyr.m2@live.cn
+
diff --git a/info/context-notes-zh-cn/ctxnotes.pdf b/info/context-notes-zh-cn/ctxnotes.pdf
index 7fde3eef9e..6f1ce04d64 100644
--- a/info/context-notes-zh-cn/ctxnotes.pdf
+++ b/info/context-notes-zh-cn/ctxnotes.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/01.tex b/info/context-notes-zh-cn/src/01.tex
index 4086af389e..178be4c6fe 100644
--- a/info/context-notes-zh-cn/src/01.tex
+++ b/info/context-notes-zh-cn/src/01.tex
@@ -1,6 +1,6 @@
\chapter[Installation]{ä¸æ€•å‘½ä»¤è¡Œ }
-无论是安装还是使用 \ConTeXt,皆需è¦å¯¹å‘½ä»¤è¡ŒçŽ¯å¢ƒæœ‰æ‰€äº†è§£ã€‚原本未有介ç»è¿™æ–¹é¢çŸ¥è¯†çš„计划,但是考虑到我正在写一份世上最好的 \ConTeXt\ å…¥é—¨æ–‡æ¡£ï¼Œä¾¿æœ‰äº†äº›è®¸åŠ¨åŠ›ã€‚æœ¬ç« å…ˆåˆ†åˆ«ä»‹ç» Windowsã€Linux å’Œ macOS 系统的命令行环境的基本用法,以刚好满足安装和è¿è¡Œ \ConTeXt\ 的需求为è¦ã€‚倘若对命令行环境已颇为熟悉,å¯ç›´æŽ¥é˜…读 \in[installation] å’Œ \in[quick-installation] 节。
+无论是安装还是使用 \ConTeXt,皆需è¦å¯¹å‘½ä»¤è¡ŒçŽ¯å¢ƒæœ‰æ‰€äº†è§£ã€‚原本未有介ç»è¿™æ–¹é¢çŸ¥è¯†çš„计划,但是考虑到我正在写一份世上最好的 \ConTeXt\ å…¥é—¨æ–‡æ¡£ï¼Œä¾¿æœ‰äº†äº›è®¸åŠ¨åŠ›ã€‚æœ¬ç« å…ˆåˆ†åˆ«ä»‹ç» Windowsã€Linux å’Œ macOS 系统的命令行环境的基本用法,以刚好满足安装和è¿è¡Œ \ConTeXt\ 的需求为è¦ã€‚倘若对命令行环境已颇为熟悉,å¯ç›´æŽ¥é˜…读 \in[installation] å’Œ \in[ctx-in-texlive] 节。
\section{任务}
@@ -15,10 +15,10 @@ Windows 用户似乎ç•æƒ§ç”šè‡³åŽŒæ†Žå‘½ä»¤è¡ŒçŽ¯å¢ƒï¼Œç”šè‡³å¾ˆå¤šäººè®¤ä¸ºå‘½
\startplacefigure[location=none]
\startfloatcombination[nx=2,ny=1]
\startplacefigure[title={「\type{Win + R}〠组åˆé”®},reference=win-r]
-\externalfigure[win-r.jpg][height=6cm]
+\externalfigure[01/win-r.jpg][height=6cm]
\stopplacefigure
\startplacefigure[title={Windows 命令行窗å£},reference=cmd-window]
-\externalfigure[cmd-window.png][height=6cm]
+\externalfigure[01/cmd-window.png][height=6cm]
\stopplacefigure
\stopfloatcombination
\stopplacefigure
@@ -166,10 +166,12 @@ $ echo 'export PATH=$HOME/foo:$PATH' >> .zshrc
$ source .zshrc
\stoptyping
-\section[installation]{安装 \ConTeXt\ LMTX}
+\section[installation]{安装 \ConTeXt\ LMTX 最新版本}
+
+安装 \CONTEXT\ LMTX 有两ç§æ–¹å¼ï¼Œä¸€ç§æ˜¯å®‰è£… \CONTEXT\ å¼€å‘者æ供的 \CONTEXT\ åŒ…ï¼Œè¯¥åŒ…ä»…åŒ…å« \CONTEXT\ 环境;å¦ä¸€ç§æ˜¯å®‰è£… \TEX\ Live 中的 \CONTEXT\ 包。本节介ç»å‰è€…,下一节介ç»åŽè€…。
\useURL[installation][https://wiki.contextgarden.net/Installation]
-\ConTeXt\ 的最新版本是 \ConTeXt\ LMTX,目å‰å°šåœ¨å¼€å‘和试验阶段,功能虽ä¸ç¨³å®šï¼Œä½†å¯¹äºŽå…¥é—¨è€Œè¨€å¹¶æ— å¦¨ç¢ã€‚从 \bluebox{\from[installation]} 下载对应æ“作系统类型的 \ConTeXt\ LMTX 安装包,按照该网å€çš„相关介ç»è¿›è¡Œå®‰è£…å³å¯ã€‚授人以鱼,ä¸å¦‚授人以渔,安装过程所需è¦çš„全部知识皆已在上文介ç»å®Œæ¯•ã€‚ä¸è¿‡ï¼Œæˆ‘总担心 Windows 用户无法安装æˆåŠŸï¼Œä¸‹æ–‡ä»¥ Windows 64 ä½ç³»ç»Ÿä¸ºä¾‹ï¼Œç»™å‡ºå®Œæ•´çš„安装过程。
+\ConTeXt\ 的最新版本是 \ConTeXt\ LMTX,目å‰å°šåœ¨å¼€å‘和试验阶段,功能虽ä¸ç¨³å®šï¼Œä½†å¯¹äºŽå…¥é—¨è€Œè¨€å¹¶æ— å¦¨ç¢ã€‚从 \bluebox{\from[installation]} 下载对应æ“作系统类型的 \ConTeXt\ LMTX 安装包,按照该网å€çš„相关介ç»è¿›è¡Œå®‰è£…å³å¯ï¼Œå®‰è£…过程所需è¦çš„全部知识皆已在上文介ç»å®Œæ¯•ã€‚下文以 Windows 64 ä½ç³»ç»Ÿä¸ºä¾‹ï¼Œç»™å‡ºè¯¦ç»†çš„的安装过程。
\useURL[win-64-version][http://lmtx.pragma-ade.com/install-lmtx/context-win64.zip]
首先,从链接 \bluebox{\from[win-64-version]} 获得é¢å‘ Windows 64 ä½ç³»ç»Ÿçš„安装包 \type{context-win64.zip} 并å‡è®¾å°†å…¶æ”¾åœ¨ \type{D:\} 解开,所得目录为 \type{context-win64},其结构如下:
@@ -207,29 +209,19 @@ D:\context-win64
> context foo.tex
\stoptyping
-\noindent 倘若在 \type{D:\context\test} 目录下能够得到 \type{foo.pdf} 文件,且其内容为 \lower.3em\hbox{\externalfigure[foo.pdf]},则æ„味ç€å·²æˆåŠŸå®‰è£… \ConTeXt\ LMTX。
+\noindent 倘若在 \type{D:\context\test} 目录下能够得到 \type{foo.pdf} 文件,且其内容为 \lower.3em\hbox{\externalfigure[01/foo.pdf]},则æ„味ç€å·²æˆåŠŸå®‰è£… \ConTeXt\ LMTX。
最åŽï¼Œå°† \type{D:\context\tex\texmf-win64\bin} 添加到系统 \type{PATH} å˜é‡ï¼Œä¾¿å¯åœ¨ä»»ä¸€ç›®å½•ä½¿ç”¨ \type{context} 命令将扩展å为 \type{.tex} çš„æ–‡æœ¬æ–‡ä»¶ç¼–è¯‘æˆ PDF 文件了。
-\section[quick-installation]{投机å–å·§}
-
-倘若因为网络ä¸ç•…甚至ä¸é€šç­‰é—®é¢˜æ— æ³•æˆåŠŸå®‰è£… \ConTeXt\ LMTX,å¯ä»¥è€ƒè™‘下载我打包的整个 \ConTeXt\ LMTX 环境,目å‰ä»…有 Windows 64 ä½å’Œ Linux 64 ä½ç‰ˆæœ¬ï¼Œä¸‹è½½åœ°å€ä¸ºï¼š
-
-\useURL[win64v][https://pan.baidu.com/s/1r5gMqsk-peGQhOmcp_dNlw?pwd=eejf]
-\useURL[linux64v][https://pan.baidu.com/s/1iBHN-8Zroyd9rGOjRpQrYg?pwd=r2hp]
-\startitemize[packed]
-\item Windows amd64 版本:\bluebox{\from[win64v]}
-\item Linux amd64 版本:\bluebox{\from[linux64v]}
-\stopitemize
+\section[ctx-in-texlive]{\TEX\ Live 中的 \CONTEXT}
-\useURL[quick-installation][https://www.bilibili.com/video/BV1q84y1c7Je/]
-以 Windows 系统为例,从上述链接获得压缩包,以 \type{D:\} 作为解压缩目录,解压åŽå¯å¾— \type{D:\context} 目录,然åŽæŒ‰ç…§ä¸Šä¸€èŠ‚所述方å¼ä¿®æ”¹ç³»ç»Ÿ \type{PATH} å˜é‡å³å¯å¾—到完整的 \ConTeXt\ LMTX 环境,日åŽä¾ç„¶å¯æ‰§è¡Œ \type{D:\context\install.bat} 对其进行更新。我已将该过程录制为视频,网络链接为 \bluebox{\from[quick-installation]}。
+若你熟悉 \TEX\ Live\cite[texlive],推è使用它æ供的 \CONTEXT\ 版本,其功能较为稳定,且国内有镜åƒç½‘站,在线安装更为便æ·ã€‚若是新安装 \TEX\ Live,在安装时å¯ç›´æŽ¥é€‰æ‹© \type{ConTeXt scheme} 或在 \type{collections} 列表中选择 \type{ConTeXt and packages}。若你的系统中已安装 \TEX\ Live,åªæ˜¯æ—  \CONTEXT,å¯ä½¿ç”¨ TeXLive 包管ç†å™¨ \type{tlmgr} 安装 \type{collection-context} å³å¯ã€‚
\section{å°ç»“}
在一个桌é¢æ“作系统中,命令行环境能完æˆçš„工作,图形界é¢é€šå¸¸ä¹Ÿèƒ½å®Œæˆï¼Œä½†å¯¹äºŽæœ‰äº›ä»»åŠ¡ï¼Œå‘½ä»¤è¡ŒçŽ¯å¢ƒæ¯”图形界é¢æ›´ä¸ºé«˜æ•ˆï¼Œå之亦然,原本无需厚此薄彼,但尺有所短,寸有所长,Windows,Linux å’Œ macOS 也是如此。
-\startitemize
+\startitemize[packed]
\item Windows 系统的命令行环境,å‰èº«æ˜¯ MS DOS 系统,长期未得进化,现在用起æ¥ï¼Œæ‰è¥Ÿè§è‚˜ã€‚现代的 PowerShell 更为适用,但因 \ConTeXt\ ç›®å‰ä¸èƒ½ç›´æŽ¥åœ¨ PowerShell 环境里完æˆå®‰è£…,故而上文未曾言åŠã€‚
\item macOS 无论图形界é¢è¿˜æ˜¯å‘½ä»¤è¡ŒçŽ¯å¢ƒçš†èƒœäºŽ Windows å’Œ Linux,但其缺点是在ä¸è¿æ³•çš„情况下,它åªèƒ½è¿è¡ŒäºŽè‹¹æžœå…¬å¸çš„计算机,费用ä¸è²ã€‚
\item Linux 系统的图形界é¢ä¸åŠ Windows å’Œ macOS,但命令行环境优于 Windows\footnote{自 Windows 10 开始,微软在 Windows 系统中构建了 Linux å­ç³»ç»Ÿï¼ˆWSL),å…许用户在 Windows 系统中使用 Linux 命令行环境,但是该环境无法利用 Windows å’Œ Linux 的图形界é¢åŠŸèƒ½ã€‚},与 macOS 相当,但 Linux 最显著的特点是,它能帮助æ¯ä¸€ä¸ªä½¿ç”¨è®¡ç®—机的人,让他深刻觉察自己以往所宣称的那样热爱自由是å¦çœŸå®žã€‚
diff --git a/info/context-notes-zh-cn/src/02.tex b/info/context-notes-zh-cn/src/02.tex
index fe7e6ed58e..4f59ab58a9 100644
--- a/info/context-notes-zh-cn/src/02.tex
+++ b/info/context-notes-zh-cn/src/02.tex
@@ -28,12 +28,12 @@ $ context foo.tex
排版命令 \type{\startTEXpage...\stopTEXpage} 称为 \type{TEXpage} 环境,我将其称为新手æ‘。这一对排版命令所包å«çš„内容,例如「\type{Hello \ConTeXt!}ã€ä¼šè¢«æŽ’版于一个æ°å¥½èƒ½åŒ…å«å®ƒçš„矩形排版空间。\type{frame} å‚数用于控制边框是å¦å¼€å¯ï¼Œå…¶å€¼ä¸º \type{off} 或çœç•¥å¯¹å®ƒçš„设定时,关闭边框。\type{offset} å‚æ•°å¯ç”¨äºŽå¯¹æŽ’版空间进行扩大或缩å°ï¼Œå¦‚示例 \in[starting-area] 所示,排版空间从中心å‘四周被扩大 2.5 mm。
-\startsamplecode\startnarrowtyping
+\startsample
\startTEXpage[frame=on,offset=2.5mm]
Hello \ConTeXt!
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[starting-area]{新手æ‘}{starting-area.pdf}
+\stopsample
+\sample[option=TEX][starting-area]{新手æ‘}{\externalfigure[02/starting-area.pdf]}
之所以称 \type{TEXpage} 环境为新手æ‘,是因它足够简å•ï¼Œå°†å…¶ç”¨äºŽè§‚察大多数排版命令的效果时无需关心版é¢çš„天头ã€åœ°è„šã€è®¢å£ã€ç¿»å£ã€ç‰ˆå¿ƒã€é¡µç ç­‰å…ƒç´ çš„设定。
@@ -43,23 +43,23 @@ Hello \ConTeXt!
如示例 \in[true-words] 所示,排版两行文字,æ¯è¡Œç”± 5 个å•è¯ç»„æˆã€‚示例 \in[true-words] 给出了伪文字的效果。åŒæ ·æ˜¯ä¸¤è¡Œæ–‡å­—,æ¯ä¸€è¡Œç”± 3~5 个å•è¯æž„æˆã€‚
-\startsamplecode\startnarrowtyping
+\startsample
\usemodule[visual] % 加载å¯è§†åŒ–模å—
\startTEXpage[frame=on,offset=2.5mm]
This is the first line.\\ % 强制æ¢è¡Œ
This is the second line.
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[true-words]{两行真实文字}{true-words.pdf}
+\stopsample
+\sample[option=TEX][true-words]{两行真实文字}{\externalfigure[02/true-words.pdf]}
-\startsamplecode\startnarrowtyping
+\startsample
\usemodule[visual]
\startTEXpage[frame=on,offset=2.5mm]
\fakewords{3}{5}\\
\fakewords{3}{5}
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[fakewords]{两行伪文字}{fakewords.pdf}
+\stopsample
+\sample[option=TEX][fakewords]{两行伪文字}{\externalfigure[02/fakewords.pdf]}
\section{注释}
@@ -86,7 +86,7 @@ This is the first line.\\ This is the second line.
\type{\crlf} 也能用于对文字强制进行断行。倘若ä¸å¸Œæœ›å¯¹æ¯ä¸€è¡Œéƒ½è¾“入断行命令,也å¯ä»¥è€ƒè™‘使用 \type{lines} 环境,请å‚考示例 \in[lines]。
-\startsamplecode\startnarrowtyping
+\startsample
\usemodule[visual]
\startTEXpage[frame=on,offset=2.5mm]
\startlines
@@ -95,14 +95,14 @@ This is the first line.\\ This is the second line.
\fakewords{5}{9}
\stoplines
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[lines]{排版多行文本}{lines.pdf}
+\stopsample
+\sample[option=TEX][lines]{排版多行文本}{\externalfigure[02/lines.pdf]}
\section{分段}
观察示例 \in[pars],虽然排版结果ä¾ç„¶æ˜¯ä¸¤è¡Œï¼Œä½†å®žé™…上它是两段。\type{\par} 是分段命令。
-\startsamplecode\startnarrowtyping
+\startsample
\usemodule[visual]
\startTEXpage[frame=on,offset=2.5mm]
\startlines
@@ -110,24 +110,24 @@ This is the first line.\\ This is the second line.
\fakewords{3}{5}
\stoplines
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[pars]{分段}{pars.pdf}
+\stopsample
+\sample[option=TEX][pars]{分段}{\externalfigure[02/pars.pdf]}
通常很少使用分段符对文本进行分段,因为在 \ConTeXt\ æºæ–‡æ¡£ä¸­ï¼Œåªéœ€åœ¨ä¸¤æ®µæ–‡å­—之间空一行便å¯å®žçŽ°åˆ†æ®µã€‚示例 \in[pars-2] 使用空行进行分段,并通过é™å®šã€Œæ–°æ‰‹æ‘ã€çš„宽度为 6 cm,从而在促狭的空间里展示了多行伪文字构æˆçš„段è½ã€‚
-\startsamplecode\startnarrowtyping
+\startsample
\usemodule[visual]
\startTEXpage[frame=on,offset=2.5mm,width=6cm]
\fakewords{9}{15}
\fakewords{9}{15}
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[pars-2]{多行文本构æˆçš„段è½}{pars-2.pdf}
+\stopsample
+\sample[option=TEX][pars-2]{多行文本构æˆçš„段è½}{\externalfigure[02/pars-2.pdf]}
段è½å¯ä»¥è®¾ç½®é¦–行缩进。中文排版的惯例是,段è½é¦–行需缩进 2 个汉字的宽度,示例 \in[pars-3] 实现了该需求,排版结果中段è½å¼€å¤´çš„è“色矩形区域表示文字缩进åŽäº§ç”Ÿçš„空白区域。尺寸 2em å³è‹±æ–‡å­—æ¯ \type{M} 的宽度的 2 å€ï¼Œåˆšå¥½ä¸Žä¸¤ä¸ªæ±‰å­—的宽度相åŒã€‚还有一个常用的尺寸å•ä½ exï¼Œå®ƒæ˜¯è‹±æ–‡å­—æ¯ \type{x} 的高度。
-\startsamplecode\startnarrowtyping
+\startsample
\usemodule[visual]
\startTEXpage[frame=on,offset=2.5mm,width=6cm]
\setupindenting[first,always,2em]
@@ -135,12 +135,12 @@ This is the first line.\\ This is the second line.
\fakewords{9}{15}
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[pars-3]{设置段è½é¦–行缩进}{pars-3.pdf}
+\stopsample
+\sample[option=TEX][pars-3]{设置段è½é¦–行缩进}{\externalfigure[02/pars-3.pdf]}
æ ¹æ®æ–‡æ¡£ã€ŒFaking text and moreã€\cite[faking-text]çš„æ示,å¯å°†æ®µè½ç¼©è¿›åŒºåŸŸçš„颜色定义为白色,从而å¯é¿å…è“色矩形å—对视觉的干扰,è§ç¤ºä¾‹ \in[parindentcolor]。
-\startsamplecode\startnarrowtyping
+\startsample
\usemodule[visual]
\startTEXpage[frame=on,offset=2.5mm,width=6cm]
\setupindenting[first,always,2em]
@@ -150,12 +150,12 @@ This is the first line.\\ This is the second line.
\fakewords{9}{15}
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[parindentcolor]{消除段è½ç¼©è¿›è‰²å—}{parindentcolor.pdf}
+\stopsample
+\sample[option=TEX][parindentcolor]{消除段è½ç¼©è¿›è‰²å—}{\externalfigure[02/parindentcolor.pdf]}
在设定段è½é¦–行缩进åŽï¼Œè‹¥ä¸å¸Œæœ›æŸä¸ªæ®µè½çš„首行被缩进,å¯åœ¨æ®µè½å¼€å¤´æ”¾ç½®å‘½ä»¤ \type{\noindent}。示例 \in[noindent],第二段消除了第二段文字的首行缩进。
-\startsamplecode\startnarrowtyping
+\startsample
\usemodule[visual]
\startTEXpage[frame=on,offset=2.5mm,width=6cm]
\setupindenting[first,always,2em]
@@ -164,14 +164,14 @@ This is the first line.\\ This is the second line.
\noindent\fakewords{9}{15}
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[noindent]{消除第二段的首行缩进}{pars-4.pdf}
+\stopsample
+\sample[option=TEX][noindent]{消除第二段的首行缩进}{\externalfigure[02/pars-4.pdf]}
\section[interlinespace]{行间è·}
\ConTeXt\ 默认的段è½å†…å„行文字的间è·æ˜¯ 2.8 ex,约等于 \ConTeXt\ é»˜è®¤çš„æ­£æ–‡å­—ä½“å¤§å° 12 pt。å¯ä½¿ç”¨ \type{\setupinterlinespace} 对行间è·è¿›è¡Œè°ƒæ•´ã€‚如示例 \in[pars-5] 将行间è·è®¾ä¸º 1.75 å€é»˜è®¤è¡Œè·ã€‚
-\startsamplecode\startnarrowtyping
+\startsample
\usemodule[visual]
\startTEXpage[frame=on,offset=2.5mm,width=6cm]
\setupindenting[first,always,2em]
@@ -181,24 +181,24 @@ This is the first line.\\ This is the second line.
\fakewords{9}{15}
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[pars-5]{多行文本构æˆçš„段è½}{pars-5.pdf}
+\stopsample
+\sample[option=TEX][pars-5]{多行文本构æˆçš„段è½}{\externalfigure[02/pars-5.pdf]}
ä¸è¿‡ï¼Œæˆ‘å‘现示例 \in[pars-5] 的行间è·è®¾å®šè¯­å¥è‹¥æ”¾åœ¨ \type{\startTEXpage} 语å¥ä¹‹å‰åˆ™æ— æ•ˆ\footnote{在 \in[context-world] èŠ‚ä¸­ä¼šä»‹ç» \type{\starttext ... \stoptext},直接以默认行è·å€æ•°çš„æ–¹å¼è®¾ç½®è¡Œé—´è·ï¼Œè‹¥è®¾å®šè¯­å¥ä½äºŽ \type{\starttext} 之å‰åˆ™åŒæ ·æ— æ•ˆã€‚},也许是当å‰çš„ \ConTeXt\ LMTX 版本存在 bug。
-ä¸è¿‡ï¼Œè¿˜æœ‰ä¸€ç§æ®µè½å†…行间è·è®¾å®šæ–¹æ³•ã€‚等到掌æ¡ç¬¬ \in[chinese-fonts] 章中讲述的设定 \ConTeXt\ 字体的方法,在你已ç»æ¸…楚正文字体的大å°æ—¶ï¼Œä¾‹å¦‚ 11 pt,å¯é‡‡å–以下方å¼è®¾å®š 1.75 å€è¡Œè·ï¼š
+还有一ç§è¡Œé—´è·è®¾å®šæ–¹æ³•ã€‚待你掌æ¡ç¬¬ \in[chinese-fonts] 章中讲述的 \ConTeXt\ 字体设定方法,并清楚正文字体的大å°æ—¶ï¼Œå¯ä½¿ç”¨ \type{line} å‚数设定最大行高。例如,若正文字体大å°ä¸º 11 pt,以下代ç å¯è®¾å®šè¡Œé—´è·ä¸º 1.75 å€ï¼š
\starttyping[option=TEX]
\setupinterlinespace[line=19.25pt]
\stoptyping
-\noindent 之所以是 19.25 pt,是因它等于 $1.75\times 11$ pt。上述代ç è®¾å®šçš„是一行文字的最大高度。在åŽæ–‡ä¸­ï¼Œæœ¬æ–‡æ¡£çš†ä½¿ç”¨è¿™ç§æ–¹å¼è®¾å®šæ®µè½å†…行间è·ã€‚
+\noindent 之所以是 19.25 pt,是因它等于 $1.75\times 11$ pt。最大行高å³è¡Œé—´è·ï¼Œå› ä¸ºåœ¨ \CONTEXT\ 中,行间è·æ˜¯ç›¸é‚»ä¸¤è¡Œæ–‡å­—的基线è·ç¦»ï¼Œæ°å¥½ç­‰äºŽä¸€è¡Œæ–‡å­—的最大高度。本文档在åŽæ–‡ç¤ºä¸­çš†ä½¿ç”¨è¯¥æ–¹å¼è®¾å®šæ®µè½å†…行间è·ã€‚
\section{对é½}
有时,希望将一行文字居左ã€å±…中或居å³æ”¾ç½®ï¼Œå¯åˆ†åˆ«ä½¿ç”¨ \type{\leftaligned},\type{\midaligned} å’Œ\type{\rightaligned} 进行排版,请å‚考示例 \in[aligned-1]。
-\startsamplecode\startnarrowtyping
+\startsample
\usemodule[visual]
\startTEXpage
[frame=on,offset=2.5mm,width=6cm]
@@ -206,12 +206,12 @@ This is the first line.\\ This is the second line.
\midaligned{\fakewords{1}{2}}
\rightaligned{\fakewords{1}{2}}
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[aligned-1]{多行文本构æˆçš„段è½}{aligned-1.pdf}
+\stopsample
+\sample[option=TEX][aligned-1]{多行文本构æˆçš„段è½}{\externalfigure[02/aligned-1.pdf]}
如果是一段文字需è¦å±…å·¦ã€å±…中或居å³æŽ’版,å¯ä½¿ç”¨ \type{alignment} 环境,通过该环境的å‚数控制对é½å½¢å¼ã€‚示例 \in[aligned-2] 展示了段è½çš„三ç§å¯¹é½å½¢å¼ã€‚
-\startsamplecode\startnarrowtyping
+\startsample
\usemodule[visual]
\startTEXpage[frame=on,offset=2.5mm,width=6cm]
\startalignment[flushleft] % 左对é½
@@ -224,14 +224,14 @@ This is the first line.\\ This is the second line.
3. \fakewords{5}{15}
\stopalignment
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[aligned-2]{段è½å¯¹é½}{aligned-2.pdf}
+\stopsample
+\sample[option=TEX][aligned-2]{段è½å¯¹é½}{\externalfigure[02/aligned-2.pdf]}
\section{写一å°è°ä¹Ÿçœ‹ä¸æ‡‚çš„ä¿¡}
现在,我们已ç»æœ‰èƒ½åŠ›ç”¨ä¼ªæ–‡å­—排版一å°è°ä¹Ÿçœ‹ä¸æ‡‚内容的书信了,è§ç¤ºä¾‹ \in[letter]。也许现在你很想用汉字给朋å‹å†™å°ä¿¡ï¼Œå¹¶å‘Šè¯‰ä»–,这å°ä¿¡çš„排版是你亲手用 \ConTeXt\ 制作的。我åŠä½ æš‚时最好放弃这个想法,写英文书信是完全å¯ä»¥çš„。
-\startsamplecode\startnarrowtyping
+\startsample
\usemodule[visual]
\startTEXpage
[frame=on,offset=1cm,width=10cm]
@@ -247,8 +247,8 @@ This is the first line.\\ This is the second line.
\rightaligned{\fakewords{1}{1}}\par
\rightaligned{\fakewords{1}{1}}
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[letter]{一å°è°ä¹Ÿçœ‹ä¸æ‡‚çš„ä¿¡}{letter.pdf}
+\stopsample
+\sample[option=TEX][letter]{一å°è°ä¹Ÿçœ‹ä¸æ‡‚çš„ä¿¡}{\externalfigure[02/letter.pdf][width=.425\textwidth]}
\section{å°ç»“}
diff --git a/info/context-notes-zh-cn/src/03.tex b/info/context-notes-zh-cn/src/03.tex
index 34688f0564..70881df836 100644
--- a/info/context-notes-zh-cn/src/03.tex
+++ b/info/context-notes-zh-cn/src/03.tex
@@ -10,7 +10,7 @@
[here,force]
[msfonts]
{\type{C:\Windows\Fonts}}
- {\externalfigure[msfonts.png][width=.6\textwidth]}
+ {\externalfigure[03/msfonts.png][width=.6\textwidth]}
在开始安装字体之å‰ï¼Œéœ€è¦ç»™å‡ºä¸€ä¸ªæœ¯è¯­ï¼Œ\TeX\ 根目录。以 Windows 系统为例,若 \ConTeXt\ 安装在 \type{D:\context} 目录,则该目录中的å­ç›®å½•å’Œæ–‡ä»¶å½“如图 \in[tex-root] 所示。在这ç§æƒ…况下,\type{D:\context\tex} 目录å³ä¸º \TeX\ 根目录。åŒç†ï¼Œå¯¹äºŽ Linux å’Œ macOS 系统,若 \ConTeXt\ 安装在 \type{$HOME/context} 目录,则 \type{$HOME/context/tex} 为 \TeX\ 根目录。
@@ -18,11 +18,13 @@
[here,force]
[tex-root]
{\TeX\ 根目录}
- {\externalfigure[tex-root.png][width=.6\textwidth]}
+ {\externalfigure[03/tex-root.png][width=.6\textwidth]}
为了便于æ述,从现在开始,以虚构的类 Unix 环境å˜é‡é£Žæ ¼çš„ \type{$TEXROOT} 指代 \TeX\ 根目录,ä¸å†ä½¿ç”¨å…·ä½“路径,因为åŽè€…严é‡ä¾èµ–于æ“作系统和用户å好而缺ä¹ä¸€è‡´æ€§ã€‚此外,路径中的目录间隔符也统一使用类 Unix 风格进行表示,å³ä½¿ç”¨ã€Œ\type{/}ã€è€Œéž Windows 风格的「\type{\}ã€ï¼Œä¾‹å¦‚ \type{$TEXROOT/texmf} 表示 \TeX\ 根目录的å­ç›®å½• \type{texmf}。
-å‘ \ConTeXt\ 安装宋体(simsun.ttc)ã€é»‘体(simhei.ttf)和楷体(simkai.ttf)的具体过程如下:
+以上关于 \TEX\ 根目录的讨论,仅针对 \CONTEXT\ å¼€å‘者æ供的 \CONTEXT\ 包。对于 \TEX\ Live 而言,å¯å°† \type{texmf-local} 目录的上级目录作为 \type{$TEXROOT}。
+
+为 \ConTeXt\ 安装宋体(simsun.ttc)ã€é»‘体(simhei.ttf)和楷体(simkai.ttf)的具体过程如下:
\startitemize[n,packed][stopper=,left=(,right=)]
\item 将上述字体文件å¤åˆ¶åˆ° \type{$TEXROOT/texmf-local/fonts/truetype/msfonts} 目录,若该目录ä¸å­˜åœ¨ï¼Œåˆ™è‡ªè¡Œåˆ›å»ºï¼›
@@ -32,11 +34,9 @@
字体安装完毕åŽï¼Œå¯ä»¥é€šè¿‡æŸ¥è¯¢å­—体文件å确认字体是å¦å®‰è£…æˆåŠŸï¼Œä¾‹å¦‚查询 simhei.ttf:
-
\starttyping
$ mtxrun --script fonts --list --file simhei.ttf
familyname weight style width variant fontname filename ...
-
simhei normal normal normal normal simhei simhei.ttf
\stoptyping
@@ -47,7 +47,6 @@ simhei normal normal normal normal simhei simhei.ttf
\starttyping
$ mtxrun --script fonts --list --all simsun
identifier familyname fontname filename subfont instances
-
nsimsunnormal nsimsun nsimsun simsun.ttc 2
nsimsunregular nsimsun nsimsun simsun.ttc 2
simsun simsun simsun simsun.ttc 1
@@ -63,7 +62,7 @@ simsunregular simsun simsun simsun.ttc 1
示例 \in[hello-hanzi] 演示了如何在新手æ‘里为 \ConTeXt\ 定义大å°ä¸º 12 pt 的宋体,黑体和楷体等字体切æ¢å‘½ä»¤ï¼Œå¹¶ä½¿ç”¨å®ƒä»¬å„排版一行文字。
-\startsamplecode\startnarrowtyping
+\startsample
\startTEXpage[frame=on,offset=4pt]
\definefont[songti][name:simsun at 12pt]
\definefont[heiti][name:simhei at 12pt]
@@ -72,8 +71,8 @@ simsunregular simsun simsun simsun.ttc 1
\heiti è§é¾™åœ¨ç”°ï¼Œåˆ©è§å¤§äººã€‚\\
\kaiti å›å­ç»ˆæ—¥ä¹¾ä¹¾ï¼Œå¤•æƒ•è‹¥åŽ‰ï¼Œæ— å’Žã€‚
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[hello-hanzi]{三ç§æ±‰å­—字体}{qian.pdf}
+\stopsample
+\sample[option=TEX][hello-hanzi]{三ç§æ±‰å­—字体}{\externalfigure[03/qian.pdf]}
需è¦æ³¨æ„的是,第一次在 \ConTeXt\ 中使用新安装的汉字字体,æºæ–‡ä»¶ç¼–译过程会较为缓慢,因为 \ConTeXt\ 需è¦è§£æžå­—体文件中的一些编ç ä¿¡æ¯å¹¶å°†è§£æžç»“果存到它的字体缓存目录。待下一次使用ç»è¿‡ç¼“å­˜åŽå­—体时,编译速度便会正常,因此ä¸åº”急切宣判 \ConTeXt\ ä¸é€‚åˆå¤„ç†ä¸­æ–‡æ–‡æ¡£ã€‚我的计算机 CPU 是 \type{Intel i5-4300U @ 1.90GHz}。这份文档写至此处,已有 20 页内容,其æºæ–‡ä»¶å•æ¬¡ç¼–译时间ä¸åˆ° 3 秒。我感觉 \ConTeXt\ 处ç†ä¸­æ–‡æ–‡æ¡£ï¼Œå¹¶ä¸æ˜¯å¾ˆæ…¢ï¼Œä½†æ˜¯åº”当承认,肯定是比基于 \pdfTeX 或 \XeTeX 等引擎的 \TeX\ è¦æ…¢ä¸€äº›ã€‚
@@ -81,39 +80,39 @@ simsunregular simsun simsun simsun.ttc 1
现在å°è¯•ç”¨å®‹ä½“字排版一段中文,è§ç¤ºä¾‹ \in[无法断行]。结果表明,仅仅能在 \ConTeXt\ 中使用汉字字体是ä¸å¤Ÿçš„,因为 \ConTeXt\ 此刻尚ä¸çŸ¥åœ¨é™å®šå®½åº¦çš„版é¢å†…如何对汉字进行断行,以致文字超出版é¢ã€‚究其原因,是汉字之间ä¸åƒè¥¿æ–‡å•è¯ä»¥ç©ºæ ¼ä½œä¸ºé—´éš”,因此在 \ConTeXt\ 看æ¥ï¼Œä¸€æ®µæ±‰å­—文字等åŒäºŽä¸€ä¸ªå¾ˆé•¿çš„西文å•è¯ï¼Œæ˜¯ä¸€ä¸ªæ— æ³•åˆ†éš”çš„å•å…ƒã€‚
-\startsamplecode\startnarrowtyping
+\startsample
\startTEXpage[frame=on,width=5cm,offset=4pt]
\definefont[songti][name:simsun at 12pt]
\songti
潜龙勿用。è§é¾™åœ¨ç”°ï¼Œåˆ©è§å¤§äººã€‚%
å›å­ç»ˆæ—¥ä¹¾ä¹¾ï¼Œå¤•æƒ•è‹¥åŽ‰ï¼Œæ— å’Žã€‚
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[无法断行]{中文段è½æ— æ³•æ–­è¡Œ}{breakinglines-1.pdf}
+\stopsample
+\sample[option=TEX][无法断行]{中文段è½æ— æ³•æ–­è¡Œ}{\externalfigure[03/breakinglines-1.pdf]}
需è¦æ³¨æ„示例 \in[无法断行] 中的注释符的用法。虽然注释内容为空,但注释符å¯ä»¤ \TeX\ 引擎忽略其åŽçš„所有空白字符(包括æ¢è¡Œç¬¦ï¼‰ã€‚倘若将该示例中的注释符去掉,第一行汉字和第二行汉字之间的æ¢è¡Œç¬¦ä¼šè¢« \TeX\ 引擎视为空白字符,从而让 \ConTeXt\ 觉得,它é¢å¯¹çš„是两个较长的å•è¯ï¼Œå®ƒä»¬ä¹‹é—´å¯ä»¥æ–­è¡Œï¼Œç»“æžœè§ç¤ºä¾‹ \in[将错就错],å¯ä»¥æ–­è¡Œï¼Œä½†å±žäºŽè¯¯æ‰“误撞。
-\startsamplecode\startnarrowtyping
+\startsample
\startTEXpage[frame=on,width=5cm,offset=4pt]
\definefont[songti][name:simsun at 12pt]
\songti
潜龙勿用。è§é¾™åœ¨ç”°ï¼Œåˆ©è§å¤§äººã€‚
å›å­ç»ˆæ—¥ä¹¾ä¹¾ï¼Œå¤•æƒ•è‹¥åŽ‰ï¼Œæ— å’Žã€‚
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[将错就错]{中文段è½æ— æ³•æ–­è¡Œ}{breakinglines-2.pdf}
+\stopsample
+\sample[option=TEX][将错就错]{中文段è½æ— æ³•æ–­è¡Œ}{\externalfigure[03/breakinglines-2.pdf]}
现在,我们å¯ä»¥çµæœºä¸€åŠ¨ï¼Œæ—¢ç„¶æ¢è¡Œç¬¦è¢« \TeX\ 引擎视为空白字符从而使得 \ConTeXt\ 误打误撞对汉字进行了一次断行,那么倘若在汉字之间手工æ’入空格字符,\ConTeXt\ 能å¦å®žçŽ°æ±‰å­—断行呢?答案是,å¯è¡Œï¼Œè§æºæ–‡æ¡£æ˜¾çŽ°äº†ç©ºæ ¼å­—符(以 \type[space=on]{ } 表示)的示例 \in[手工断行],åªæ˜¯ç©ºæ ¼çš„存在,导致排版结果中的汉字分布较为蓬æ¾ã€‚
-\startsamplecode\startnarrowtyping[space=on]
+\startsample
\startTEXpage[frame=on,width=5cm,offset=4pt]
\definefont[songti][name:simsun at 12pt]
\songti
潜 é¾™ å‹¿ 用。 è§ é¾™ 在 田, 利 è§ å¤§ 人。
å› å­ ç»ˆ æ—¥ ä¹¾ 乾, 夕 惕 è‹¥ 厉, æ—  咎。
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[手工断行]{中文段è½æ‰‹å·¥æ’入空格进行断行}{breakinglines-3.pdf}
+\stopsample
+\sample[option=TEX,space=on][手工断行]{中文段è½æ‰‹å·¥æ’入空格进行断行}{\externalfigure[03/breakinglines-3.pdf]}
ä½äºŽ \ConTeXt\ 底层的 \TeX\ 系统æ供了粘连(Glue)机制,我们å¯ä»¥ç”¨å®ƒå®šä¹‰ç»™å®šå®½åº¦ä¸”有些许弹性的空格。例如,定义一个宽度为 0,最大å¯ä¼¸å±• 2 pt 且ä¸å¯æ”¶ç¼©çš„粘连:
@@ -123,7 +122,7 @@ simsunregular simsun simsun simsun.ttc 1
\noindent 然åŽç”¨è¯¥ç²˜è¿žä»£æ›¿ç©ºæ ¼ï¼Œæ’入到汉字之间,便基本å¯å®žçŽ°æ±‰å­—断行,结果è§ç¤ºä¾‹ \in[手工æ’入粘连断行],需è¦æ³¨æ„的是,\TeX\ 会自动忽略排版命令之åŽå°¾éšçš„空格,因此 \type{\foo} 之åŽè™½ç„¶æœ‰ä¸€ä¸ªç©ºæ ¼ï¼Œä½†è¯¥ç©ºæ ¼ä¸ä¼šåœ¨æŽ’版结果里出现。
-\startsamplecode\startnarrowtyping[space=on]
+\startsample
\startTEXpage[frame=on,width=5cm,offset=4pt]
\definefont[songti][name:simsun at 12pt]
\def\foo{\hskip 0pt plus 2pt minus 0pt}
@@ -134,8 +133,8 @@ simsunregular simsun simsun simsun.ttc 1
\foo å›\foo å­\foo 终\foo æ—¥\foo ä¹¾\foo 乾,%
\foo 夕\foo 惕\foo 若\foo 厉,\foo 无\foo 咎。
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[手工æ’入粘连断行]{中文段è½æ‰‹å·¥æ’入粘连进行断行}{breakinglines-4.pdf}
+\stopsample
+\sample[option=TEX,space=on][手工æ’入粘连断行]{中文段è½æ‰‹å·¥æ’入粘连进行断行}{\externalfigure[03/breakinglines-4.pdf]}
由于没有人愿æ„åƒç¤ºä¾‹ \in[手工æ’入粘连断行] 那样排版汉字,因此 \ConTeXt\ æ供了一个å¯ä»¥è‡ªåŠ¨åœ¨æ±‰å­—之间æ’入粘连的命令,å³
@@ -153,7 +152,7 @@ simsunregular simsun simsun simsun.ttc 1
\section{写一å°çœŸæ­£çš„ä¿¡}
-\startsamplecode\startnarrowtyping
+\startsample
\startTEXpage[frame=on,width=6cm,offset=6pt]
\definefont[songti][name:simsun at 10.5pt]
\setscript[hanzi] % 中文断行支æŒ
@@ -171,8 +170,8 @@ simsunregular simsun simsun simsun.ttc 1
\rightaligned{孙悟空}
\rightaligned{2035.10.1}
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[孙悟空的信]{孙悟空的信}{breakinglines-5.pdf}
+\stopsample
+\sample[option=TEX][孙悟空的信]{孙悟空的信}{\externalfigure[03/breakinglines-5.pdf]}
从现在开始,在æ供示例时,为了节çœç¯‡å¹…,我有时会çœç•¥ä¸€éƒ¨åˆ†ç»å¸¸é‡å¤ä½¿ç”¨çš„代ç ï¼Œä»…给出关键代ç ä»¥çªå‡ºé‡ç‚¹ï¼Œåœ¨æœ‰å…´è‡´åŠ¨æ‰‹è¯•éªŒè¿™äº›ä»£ç æ—¶ï¼Œéœ€è¦ä½ è‡ªå·±åŠ¨æ‰‹æ·»åŠ è¢«çœç•¥çš„代ç ã€‚
@@ -184,7 +183,7 @@ simsunregular simsun simsun simsun.ttc 1
\ConTeXt\ 默认å¯ç”¨çš„正文字体是衬线字æ—中的正体。\type{\rm},\type{\ss} å’Œ \type{\tt} å¯åˆ†åˆ«ç”¨äºŽå°†å­—体切æ¢ä¸ºè¡¬çº¿ã€æ— è¡¬çº¿å’Œç­‰å®½å­—æ—的正体。\type{\tf},\type{\bf},\type{\it} å’Œ {\type{\bi}} å¯åˆ†åˆ«ç”¨äºŽåˆ‡æ¢æ¯ä¸ªå­—æ—中的正体ã€ç²—体ã€æ–œä½“和粗斜体等字体。示例 \in[默认字体] 演示了如何切æ¢å„ç§å­—ä½“ä»¥åŠ \type{{...}} 的用法。在默认情况下,\TeX\ 引擎将一对花括å·æ‰€åŒ…å«çš„内容视为一个整体,\TeX\ 术语称之为编组(Group)。编组内部的排版命令ä¸ä¼šå¯¹ç¼–组外部产生任何影å“,但编组外部的排版命令会影å“编组内部。
-\startsamplecode\startnarrowtyping
+\startsample
% 衬线字体
Hello. {\bf Hello.}
{\it Hello.} {\bi Hello.}\\
@@ -202,44 +201,44 @@ Math in display mode:
\startformula
\int_a^b f(x)dx
\stopformula
-\stopnarrowtyping\stopsamplecode
-\mysample[默认字体]{\ConTeXt\ 默认字体}{defaultfonts.pdf}
+\stopsample
+\sample[option=TEX][默认字体]{\ConTeXt\ 默认字体}{\externalfigure[03/defaultfonts.pdf]}
\ConTeXt\ 默认正文字体的大å°ä¸º 12 pt,并以该尺寸为基准,定义了 6 ç§ä¸åŒçº§åˆ«çš„字体尺寸,从å°åˆ°å¤§ä¾åºä¸ºï¼š\type{xx},\type{x},\type{a},\type{b},\type{c},\type{d}。\type{x} 级比正文字体å°ï¼Œ\type{a} 级比正文字体大。示例 \in[fontsize-level] 演示了无衬线字æ—的正体字体 7 ç§å¤§å°çº§åˆ«çš„切æ¢ã€‚
-\startsamplecode\startnarrowtyping
+\startsample
\ss {\tfxx A} {\tfx A} A or {\tf A}
{\tfa A} {\tfb A} {\tfc A} {\tfd A}
-\stopnarrowtyping\stopsamplecode
-\mysample[fontsize-level]{字体大å°çš„ 7 ç§çº§åˆ«}{fontsize-level.pdf}
+\stopsample
+\sample[option=TEX][fontsize-level]{字体大å°çš„ 7 ç§çº§åˆ«}{\externalfigure[03/fontsize-level.pdf]}
此外,还需è¦æ³¨æ„的是,尺寸å•ä½ em çš„å«ä¹‰ã€‚之å‰æˆ‘å¯¹å®ƒç»™å‡ºè§£é‡Šæ˜¯å­—æ¯ \type{M} 宽度,æ°å¥½ç­‰äºŽ 1 个汉字的宽度,这是针对当å‰æ‰€çš„字体环境而言的。例如,在示例 \in[em-1] å’Œ \in[em-2] 中,段è½é¦–行缩进设定命令出现的ä½ç½®ä¸åŒï¼Œå¯¼è‡´æ®µè½ç¼©è¿›è·ç¦»äº§ç”Ÿäº†å·®å¼‚。这是因为,在示例 \in[em-1] 中,设定段è½é¦–行缩进时,em 的值是基于 \ConTeXt\ 默认的正文字体尺寸确定的,其值为 12 pt,而在 示例 \in[em-1] 中,em 的值是基于我们自定义的字体 \type{\songti} 的尺寸确定的,其值为 9 pt。
-\startsamplecode\startnarrowtyping
+\startsample
\setscript[hanzi]
\definefont[songti][name:simsun at 9pt]
\setupindenting[always,first,2em]
\songti
我现在五指山挺好的。
虽然我很少写信,其实我很怀念花果山。
-\stopnarrowtyping\stopsamplecode
-\mysample[em-1]{段è½ç¼©è¿›è·ç¦»æ˜¯ 24 pt}{indenting-1.pdf}
+\stopsample
+\sample[option=TEX][em-1]{段è½ç¼©è¿›è·ç¦»æ˜¯ 24 pt}{\externalfigure[03/indenting-1.pdf]}
-\startsamplecode\startnarrowtyping
+\startsample
\setscript[hanzi]
\definefont[songti][name:simsun at 9pt]
\songti
\setupindenting[always,first,2em]
我现在五指山挺好的。
虽然我很少写信,其实我很怀念花果山。
-\stopnarrowtyping\stopsamplecode
-\mysample[em-2]{段è½ç¼©è¿›è·ç¦»æ˜¯ 18 pt}{indenting-2.pdf}
+\stopsample
+\sample[option=TEX][em-2]{段è½ç¼©è¿›è·ç¦»æ˜¯ 18 pt}{\externalfigure[03/indenting-2.pdf]}
\section[define-family]{定义汉字字æ—}
使用 \type{\definefontfamily} å¯å°†ä½ å–œæ¬¢çš„一些汉字字体定义为字æ—,用以代替 \ConTeXt\ 的默认字æ—,然åŽä½¿ç”¨ \type{\setupbodyfont} å¯ç”¨ä½ å®šä¹‰çš„å­—æ—。示例 \in[setupbodyfont] å°† 10.5 pt 的宋体作为正文默认字体\footnote{10.5 pt å¯å¯¹åº” MicroSoft Word 中的五å·å­—。}。注æ„,字æ—的定义和å¯ç”¨ï¼Œéœ€åœ¨æ–°æ‰‹æ‘之外进行,å¦åˆ™æ— æ•ˆã€‚ä¸è¿‡ï¼Œ\type{\setupindenting} å´åªèƒ½åœ¨æ–°æ‰‹æ‘之内起效,这让我有些ä¸è§£ï¼Œä½†æ˜¯è¿™å°±æ˜¯æ–°æ‰‹æ‘的规矩,åªèƒ½æŽ¥å—。
-\startsamplecode\startnarrowtyping
+\startsample
\definefontfamily[myfonts][rm][nsimsun]
\setupbodyfont[myfonts,10.5pt]
\setscript[hanzi]
@@ -248,8 +247,8 @@ Math in display mode:
我现在五指山挺好的。
虽然我很少写信,其实我很怀念花果山。
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[setupbodyfont]{定义正文字体并å¯ç”¨}{setupbodyfont.pdf}
+\stopsample
+\sample[option=TEX][setupbodyfont]{定义正文字体并å¯ç”¨}{\externalfigure[03/setupbodyfont.pdf]}
示例 \in[setupbodyfont] 仅定义了 \type{myfonts} 的衬线字æ—(\type{rm})为 \type{nsimsun},且需è¦æ³¨æ„的是,此处的 \type{nsimsun} 并éžå­—体å,而是字æ—å。在 \in[fonts-installation] 节中,将 simsun.ttc 安装至 \ConTeXt\ 环境之åŽï¼Œæˆ‘们曾查询过它的相关信æ¯ï¼Œå…¶ä¸­æœ‰ä¸€æ ä¿¡æ¯æ˜¯ \type{familyname},其中罗列的便是字体所属的字æ—å。\ConTeXt\ 会根æ®å­—æ—å自动æœç´¢å­—体的 \type{identifier} ä¿¡æ¯ï¼Œè‹¥æŸå­—体,其 identifier 的末尾是 \type{regular} 或 \type{normal}\footnote{identifier å的末尾为 regular å’Œ normal 的字体通常是åŒä¸€ä¸ªå­—体。},则该字体会被 \ConTeXt\ 自动作为该字体所属字æ—的正体。åŒç†ï¼Œè‹¥æŸå­—体的 identifier 的末尾是 \type{bold},\type{italic} 或 \type{bolditalic},则该字体会被 \ConTeXt\ 自动作为该字体所属字æ—的粗体ã€æ–œä½“或粗斜体。
@@ -284,19 +283,18 @@ Math in display mode:
\placefigure
[here,force][bad-latin]
{英文字形比较}
- {\externalfigure[bad-latin.pdf][width=.4\textwidth]}
+ {\externalfigure[03/bad-latin.pdf][width=.4\textwidth]}
-\type{\definefallbackfamily} å¯ç”¨ä¸€ç§å­—体中的部分字形替æ¢å¦ä¸€ç§å­—体的相应字形,其用法与 \type{\definefontfamily} 类似,åªæ˜¯éœ€è¦åœ¨å‚数中指定字形覆盖范围。示例 \in[fallbacks] 使用 latinmodernroman å­—æ—里的æ¯ç§å­—体的 Unicode ç ä½åŒºé—´ $[0\mathrm{x}0000, 0\mathrm{x}0400]$ ä¸­çš„æ‰€æœ‰å­—å½¢å¼ºè¡Œæ›¿æ¢ nsimsun å­—æ—中æ¯ç§å­—体(包括替补字体)的相应字形。也å¯ä»¥ä½¿ç”¨ \ConTeXt\ å·²ç»å®šä¹‰äº†åå­—çš„ Unicode ç ä½åŒºé—´ä»£æ›¿ 16 进制数字形å¼çš„区间。例如,
+\type{\definefallbackfamily} å¯ç”¨ä¸€ç§å­—体中的部分字形替æ¢å¦ä¸€ç§å­—体的相应字形。示例 \in[fallbacks] 使用 latinmodernroman å­—æ—里的æ¯ç§å­—体的 Unicode ç ä½åŒºé—´ $[0\mathrm{x}0000, 0\mathrm{x}0400]$ ä¸­çš„æ‰€æœ‰å­—å½¢å¼ºè¡Œæ›¿æ¢ nsimsun å­—æ—中æ¯ç§å­—体(包括替补字体)的相应字形。也å¯ä»¥ä½¿ç”¨ \ConTeXt\ å·²ç»å®šä¹‰äº†åå­—çš„ Unicode ç ä½åŒºé—´ä»£æ›¿ 16 进制数字形å¼çš„区间。例如,
\starttyping[option=TEX]
-\definefallbackfamily
- [myfonts][rm][latinmodernroman]
- [range={basiclatin,latinsupplement},force=yes]
+\definefallbackfamily[myfonts][rm][latinmodernroman]
+ [range={basiclatin,latinsupplement},force=yes]
\stoptyping
\noindent 指定了 Unicode ç ä½åŒºé—´ $\mathrm{[0x0000, 0x00FF]}$ 中的字形作为替æ¢å­—形。Unicode ç ä½åŒºé—´çš„åå­—è§æ–‡æ¡£ã€ŒList of Unicode blocksã€\cite[unicode-blocks]。
-\startsamplecode\startnarrowtyping
+\startsample
\definefallbackfamily
[myfonts][rm][latinmodernroman]
[range={0x0000-0x0400},force=yes]
@@ -306,13 +304,11 @@ Math in display mode:
\setupbodyfont[myfonts,16pt]
\setscript[hanzi]
\startTEXpage[frame=on,offset=4pt]
-çˆ±å› æ–¯å¦ Einstein\\
-\bf çˆ±å› æ–¯å¦ Einstein\\
-\it çˆ±å› æ–¯å¦ Einstein\\
-\bi çˆ±å› æ–¯å¦ Einstein
+çˆ±å› æ–¯å¦ Einstein\\ \bf çˆ±å› æ–¯å¦ Einstein\\
+\it çˆ±å› æ–¯å¦ Einstein\\ \bi çˆ±å› æ–¯å¦ Einstein
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[fallbacks]{字形替æ¢}{fallbacks.pdf}
+\stopsample
+\sample[option=TEX][fallbacks]{字形替æ¢}{\externalfigure[03/fallbacks.pdf]}
\section{å°ç»“}
@@ -324,4 +320,4 @@ Math in display mode:
$ mtxrun --script base --find-file fonts-mkiv.pdf
\stoptyping
-\noindent 请顺便æµè§ˆä¸€ç•ªè¿™ä»½æ‰‹å†Œæ‰€åœ¨çš„目录里的其他 PDF 文件å§ã€‚ \ No newline at end of file
+\noindent 请顺便æµè§ˆä¸€ç•ªè¿™ä»½æ‰‹å†Œæ‰€åœ¨çš„目录里的其他 PDF 文件å§ã€‚
diff --git a/info/context-notes-zh-cn/src/04.tex b/info/context-notes-zh-cn/src/04.tex
index e8c0d0dcfa..769e21e803 100644
--- a/info/context-notes-zh-cn/src/04.tex
+++ b/info/context-notes-zh-cn/src/04.tex
@@ -34,7 +34,7 @@
\setupheads[indentnext=yes]
\stoptyping
-\startsamplecode\startnarrowtyping
+\startsample
\setupindenting[first,always,2em]
\title{é²è¿…家的åŽå›­}
@@ -44,29 +44,29 @@
这上é¢çš„夜的天空,奇怪而高,é²è¿…生平
没有è§è¿‡è¿™æ ·å¥‡æ€ªè€Œé«˜çš„天空。
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[zaoshu]{散文示例 1}{zaoshu.pdf}
+\stopsample
+\sample[option=TEX][zaoshu]{散文示例 1}{\externalfigure[04/zaoshu.pdf]}
现在å¯ä»¥ä¸ºæ–‡ç« å¢žåŠ ä½œè€…ä¿¡æ¯äº†ï¼Œè™½ç„¶ä»–å«æ— åæ°ï¼Œè§ç¤ºä¾‹ \in[zaoshu-2],åªæ˜¯ä½œè€…è·ç¦»æ­£æ–‡å¤ªè¿‘了。ä¸è¦å°è¯•ä½¿ç”¨ä¸€äº›ç©ºè¡ŒåŽ»å¢žå¤§è¯¥è·ç¦»ï¼Œå› ä¸º \TeX\ 引擎在é‡åˆ°å¤šä¸ªç©ºè¡Œæ—¶ï¼Œå®ƒä¹Ÿåªæ˜¯æŠŠå®ƒä»¬å½“æˆä¸€ä¸ªç©ºè¡Œï¼Œå¹¶å°†å…¶è§†ä¸º \type{\par}。
-\startsamplecode\startnarrowtyping
+\startsample
\setupheads[indentnext=yes]
\setupindenting[first,always,2em]
\title{é²è¿…家的åŽå›­}
\midaligned{æ— åæ°}
% çœç•¥äº†æ­£æ–‡å†…容
\stopTEXpage
-\stopnarrowtyping\stopsamplecode
-\mysample[zaoshu-2]{散文示例 2}{zaoshu-2.pdf}
+\stopsample
+\sample[option=TEX][zaoshu-2]{散文示例 2}{\externalfigure[04/zaoshu-2.pdf]}
在版é¢çš„ç«–ç›´æ–¹å‘,段è½ä¹‹é—´ï¼Œæˆ–标题与段è½ä¹‹é—´ï¼Œæˆ–标题与标题之间……增加空白,通常å¯ä»¥ä½¿ç”¨ \type{\blank} 命令。例如,在作者和正文之间增加一个空行的è·ç¦»ï¼Œåªéœ€ \type{\blank[line]}ï¼›è¦å¢žåŠ  $n$ 个空行的è·ç¦»ï¼Œåªéœ€ \type{\blank[n*line]}。
-\startsamplecode\startnarrowtyping
+\startsample
\midaligned{æ— åæ°}
\blank[line]
% çœç•¥äº†æ­£æ–‡å†…容
-\stopnarrowtyping\stopsamplecode
-\mysample[zaoshu-3]{散文示例 3}{zaoshu-3.pdf}
+\stopsample
+\sample[option=TEX][zaoshu-3]{散文示例 3}{\externalfigure[04/zaoshu-3.pdf]}
倘若需è¦å°†æ ‡é¢˜å±…中,而éžé»˜è®¤çš„居左,åªéœ€ä½¿ç”¨ \type{\setuphead}å•ç‹¬ä¸º \type{\title} 设定样å¼ï¼š
@@ -82,7 +82,7 @@
示例 \in[zaoshu-4] 将上述设定综åˆèµ·æ¥ï¼ŒæŽ’版结果已ç»ä¸­è§„中矩了,åªæ˜¯æ ‡é¢˜é‡Œçš„汉字的分布有些ç–æ¾ï¼Œè¿™æ˜¯ \type{\setscript[hanzi]} 命令在汉字之间æ’入的粘连的伸长特性被 \ConTeXt\ 激活导致的,而它们之所以被激活,大概是 \ConTeXt\ 过于追求精确文字居中对é½è€Œå¯¼è‡´çš„,令 \type{\setuphead} çš„å‚æ•° \type{align} 的值为 \type{{middle,broad}} å¯ä»¥è®© \ConTeXt\ 在文字居中对é½æ–¹é¢å®½æ¾ä¸€äº›\cite[contextref](p86),结果å¯è®©æ±‰å­—的分布å˜ä¸ºç´§å¯†ï¼Œè§ç¤ºä¾‹ \in[zaoshu-5]。
-\startsamplecode\startnarrowtyping
+\startsample
\setupheads[indentnext=yes]
\setuphead[title][style=\bfc,align=middle]
\setupindenting[first,always,2em]
@@ -90,12 +90,12 @@
\title{é²è¿…家的åŽå›­}
\midaligned{æ— åæ°}
% çœç•¥äº†æ­£æ–‡å†…容
-\stopnarrowtyping\stopsamplecode
-\mysample[zaoshu-4]{散文示例 4}{zaoshu-4.pdf}
+\stopsample
+\sample[option=TEX][zaoshu-4]{散文示例 4}{\externalfigure[04/zaoshu-4.pdf]}
ä¸çŸ¥ \ConTeXt\ 从哪个版本起,有了一个新的对é½æ–¹å¼ \type{center},它与 \type{{middle,broad}} 等价。请记ä½è¿™ä¸ªçŸ¥è¯†ï¼Œå› ä¸ºä»¥åŽå¯èƒ½ä¼šç»å¸¸éœ€è¦è®¾å®šå±…中对é½ã€‚
-\startsamplecode\startnarrowtyping
+\startsample
\setupheads[indentnext=yes]
\setuphead
[title][style=\bfc,align=center]
@@ -104,8 +104,8 @@
\title{é²è¿…家的åŽå›­}
\midaligned{æ— åæ°}
% çœç•¥äº†æ­£æ–‡å†…容
-\stopnarrowtyping\stopsamplecode
-\mysample[zaoshu-5]{散文示例 5}{zaoshu-5.pdf}
+\stopsample
+\sample[option=TEX][zaoshu-5]{散文示例 5}{\externalfigure[04/zaoshu-5.pdf]}
\section[context-world]{æ­£å¼è¸å…¥ \ConTeXt\ 世界}
@@ -150,7 +150,7 @@
\placefigure
[here,force][style-file]
- {内容与样å¼åˆ†ç¦»}{\blueframed{\externalfigure[style-file.png][width=.8\textwidth]}}
+ {内容与样å¼åˆ†ç¦»}{\blueframed{\externalfigure[04/style-file.png][width=.8\textwidth]}}
一旦熟悉了如何实现排版内容与样å¼çš„分离,在使用 \ConTeXt\ 排版愈å‘å¤æ‚的内容时,你的样å¼æ–‡ä»¶ foo-env.tex 的内容便会日益丰富。长此以往,你总是能攒出一些样å¼æ–‡ä»¶ï¼Œä¾›ä¸åŒçš„文档形å¼ä½¿ç”¨ã€‚排版内容总是åƒå˜ä¸‡åŒ–,但样å¼å´æ€»æ˜¯å¯¥å¯¥æ•°ç§ä¸”æžæ˜“与他人分享,这便是 \TeX\ 的优点,但å‰æ是,你需è¦æ¸…晰地ç†è§£ä½ æ‰€è®¾å®šçš„任何一个排版样å¼ã€‚äº‹å®žä¸Šï¼Œè¿™ä¹Ÿæ­£æ˜¯å­¦ä¹ ä»»ä½•ä¸€ç§ \TeX\ 系统的ä¹è¶£æ‰€åœ¨ã€‚
@@ -160,7 +160,7 @@
\placefigure
[here,force][pagenumber]
- {页ç }{\blueframed{\externalfigure[pagenumber.png][width=.8\textwidth]}}
+ {页ç }{\blueframed{\externalfigure[04/pagenumber.png][width=.8\textwidth]}}
首先,文章标题所在页é¢ï¼Œé€šå¸¸ä¸éœ€è¦é¡µç ã€‚该è¦æ±‚,åªéœ€åœ¨æ ‡é¢˜æ ·å¼å°†é¡µçœ‰å’Œé¡µè„šç½®ç©ºï¼Œå³
diff --git a/info/context-notes-zh-cn/src/05.tex b/info/context-notes-zh-cn/src/05.tex
index 3a1a3cdc0b..0ec86709d6 100644
--- a/info/context-notes-zh-cn/src/05.tex
+++ b/info/context-notes-zh-cn/src/05.tex
@@ -6,14 +6,14 @@
在å·å·ä½¿ç”¨ ChatGPT 给领导起è‰è®²ç¨¿ä¹‹å‰ï¼Œå…ˆç”¨ \ConTeXt\ 列表安排一下今日待办事项:
-\startsamplecode\startnarrowtyping
+\startsample
2023 年 3 月 22 日
\startitemize
\item 中åˆï¼Œæ™’å五分钟太阳
\item 晚上,看æµæµªåœ°çƒ \Romannumerals[2]
\stopitemize
-\stopnarrowtyping\stopsamplecode
-\mysample[todo-list]{待办事项}{05-todo-list.pdf}
+\stopsample
+\sample[option=TEX][todo-list]{待办事项}{\externalfigure[05/todo-list.pdf]}
现在你已ç»å­¦ä¼šäº†åˆ—表的用法了,剩下的,仅仅是设定它的样å¼ã€‚此外,你也学到了如何写大写的罗马数字,至于å°å†™çš„,将 \type{\Romannumerals} æ¢æˆ \type{\romannumerals} å³å¯ã€‚
@@ -30,35 +30,35 @@
将上述代ç ä¸­çš„æ•°å­— 1 æ¢æˆ 2~9 的任何一个数字,å¯æ›´æ¢å¦ä¸€ç§åˆ—表项符å·ã€‚例如
-\startsamplecode\startnarrowtyping
+\startsample
\startitemize[8]
\item 中åˆï¼Œæ™’å五分钟太阳
\item 晚上,看æµæµªåœ°çƒ \Romannumerals[2]
\stopitemize
-\stopnarrowtyping\stopsamplecode
-\mysample[]{改å˜åˆ—表项符å·}{05-todo-list-2.pdf}
+\stopsample
+\sample[option=TEX][]{改å˜åˆ—表项符å·}{\externalfigure[05/todo-list-2.pdf]}
\section{有åºå·åˆ—表}
将无åºå·åˆ—表的数字å‚æ•°æ¢ä¸º n,便å¯å¾—到有åºå·åˆ—表。例如
-\startsamplecode\startnarrowtyping
+\startsample
\startitemize[n]
\item 中åˆï¼Œæ™’å五分钟太阳
\item 晚上,看æµæµªåœ°çƒ \Romannumerals[2]
\stopitemize
-\stopnarrowtyping\stopsamplecode
-\mysample[]{有åºå·åˆ—表}{05-todo-list-3.pdf}
+\stopsample
+\sample[option=TEX][]{有åºå·åˆ—表}{\externalfigure[05/todo-list-3.pdf]}
有时,需è¦åºå·å½¢å¼æ˜¯å¸¦æ‹¬å·çš„数字,å¯ä½œä»¥ä¸‹è®¾å®šï¼š
-\startsamplecode\startnarrowtyping
+\startsample
\startitemize[n][left=(,right=),stopper=]
\item 中åˆï¼Œæ™’å五分钟太阳
\item 晚上,看æµæµªåœ°çƒ \Romannumerals[2]
\stopitemize
-\stopnarrowtyping\stopsamplecode
-\mysample[]{数字带括å·çš„有åºå·åˆ—表}{05-todo-list-4.pdf}
+\stopsample
+\sample[option=TEX][]{数字带括å·çš„有åºå·åˆ—表}{\externalfigure[05/todo-list-4.pdf]}
\noindent 其中「\type{stopper=}ã€æ˜¯å°†å‚æ•° \type{stopper} 置空,达到的效果是消除列表项åºå·çš„西文å¥å·åŽç¼€ã€Œ\type{.}ã€ã€‚
@@ -68,7 +68,7 @@
ä½ å¯èƒ½ä¼šè§‰å¾— \ConTeXt\ 为无åºå·åˆ—表æ供的列表项符å·æ— æ³•ä½“现你的气质,\ConTeXt\ 说,Do it yourself! 下é¢æˆ‘用 \METAPOST\ 代ç ç»˜åˆ¶äº†ä¸€ä¸ªå°æ­£æ–¹å½¢ï¼Œå¹¶ä»¤å…¶è¾¹çº¿ç•¥å¾®å—到éšæœºæ‰°åŠ¨ï¼Œç„¶åŽå°†è¯¥å›¾å½¢å®šä¹‰ä¸ºåˆ—表项符å·ï¼š
-\startsamplecode\startnarrowtyping
+\startsample
\startuseMPgraphic{foo}
path p;
p := fullsquare scaled 8pt randomized 1pt;
@@ -82,8 +82,8 @@
\item 中åˆï¼Œæ™’å五分钟太阳
\item 晚上,看æµæµªåœ°çƒ \Romannumerals{2}
\stopitemize
-\stopnarrowtyping\stopsamplecode
-\mysample[rsquare]{自定义符å·çš„æ— åºå·åˆ—表}{05-todo-list-5.pdf}
+\stopsample
+\sample[option=TEX][rsquare]{自定义符å·çš„æ— åºå·åˆ—表}{\externalfigure[05/todo-list-5.pdf]}
\noindent 现在你ä¸æ‡‚上述代ç çš„具体细节也无妨,观其大略å³å¯ï¼ŒçŸ¥é“有一ç§å¯ä»¥ç”»ç”»çš„è¯­è¨€ï¼Œå« \METAPOST,它的代ç å¯åµŒå…¥ \ConTeXt\ 环境作为æ’图使用,便已足够。
@@ -95,7 +95,7 @@
\noindent 但是这些带圈数字都是文字,并éžæ•°å­—。带圈的数字,无éžæ˜¯æ•°å­—外é¢ç”»ä¸ªåœ†åœˆã€‚画圆圈,用 \METAPOST\ åšæ­¤äº‹ï¼Œå®Œå…¨æ˜¯ä¸è´¹å¹ç°ä¹‹åŠ›ï¼Œç„¶åŽå€ŸåŠ© \ConTeXt\ çš„ overlay 机制\cite[overlay],将圆圈作为 inframed\cite[framed] 的背景,å†ç”¨ inframed 套ä½åˆ—表项åºå·å³å¯ï¼Œè¯¦è§
-\startsamplecode\startnarrowtyping
+\startsample
\startuseMPgraphic{foo}
path p;
p := fullcircle scaled 12pt;
@@ -112,8 +112,8 @@
\item 中åˆï¼Œæ™’å五分钟太阳
\item 晚上,看æµæµªåœ°çƒ \Romannumerals{2}
\stopitemize
-\stopnarrowtyping\stopsamplecode
-\mysample[number-in-circle]{数字带圆圈的有åºå·åˆ—表}{05-todo-list-6.pdf}
+\stopsample
+\sample[option=TEX][number-in-circle]{数字带圆圈的有åºå·åˆ—表}{\externalfigure[05/todo-list-6.pdf]}
\noindent ä½ å¯èƒ½ä¾ç„¶ä¸çŸ¥é“上述代ç å…·ä½“细节,ä¸å¿…ç€æ€¥ï¼Œä»¥åŽä¼šç»å¸¸å’Œå®ƒä»¬æ‰“交é“,é€æ¸ä¾¿å¯ç†Ÿæ‚‰ã€‚
@@ -121,25 +121,25 @@
消除列表项之间的空白,åªéœ€
-\startsamplecode\startnarrowtyping
+\startsample
2023 年 3 月 22 日
\startitemize[1,packed]
\item 中åˆï¼Œæ™’å五分钟太阳
\item 晚上,看æµæµªåœ°çƒ \Romannumerals{2}
\stopitemize
-\stopnarrowtyping\stopsamplecode
-\mysample[]{消除列表项之间的空白}{05-todo-list-7.pdf}
+\stopsample
+\sample[option=TEX][]{消除列表项之间的空白}{\externalfigure[05/todo-list-7.pdf]}
消除列表å‰åŽä»¥åŠåˆ—表项之间的空白,åªéœ€
-\startsamplecode\startnarrowtyping
+\startsample
2023 年 3 月 22 日
\startitemize[1,nowhite]
\item 中åˆï¼Œæ™’å五分钟太阳
\item 晚上,看æµæµªåœ°çƒ \Romannumerals{2}
\stopitemize
-\stopnarrowtyping\stopsamplecode
-\mysample[]{消除列表项之间的空白}{05-todo-list-8.pdf}
+\stopsample
+\sample[option=TEX][]{消除列表项之间的空白}{\externalfigure[05/todo-list-8.pdf]}
\section{å°ç»“}
diff --git a/info/context-notes-zh-cn/src/06.tex b/info/context-notes-zh-cn/src/06.tex
index e37f533934..6c29501149 100644
--- a/info/context-notes-zh-cn/src/06.tex
+++ b/info/context-notes-zh-cn/src/06.tex
@@ -48,7 +48,7 @@ Knuth 基于文学编程\cite[knuth-1984-literate]技术开å‘了
\stoptyping
\noindent 编译 foo.tex,å¯å¾—以下结果:
\blank[line]
-\midaligned{\externalfigure[10-bibtex-example-01.pdf]}
+\midaligned{\externalfigure[06/bibtex-example-01.pdf]}
\blank[line]
\section{文献列表样å¼}
@@ -61,7 +61,7 @@ Knuth 基于文学编程\cite[knuth-1984-literate]技术开å‘了
\placelistofpublications
\stoptyping
\blank[line]
-\midaligned{\externalfigure[10-bibtex-example-02.pdf]}
+\midaligned{\externalfigure[06/bibtex-example-02.pdf]}
\blank[line]
对于预定义样å¼ï¼Œå¯ä»¥è¿›è¡Œè°ƒæ•´ã€‚例如,缩å°æ–‡çŒ®åºå·åŽçš„空白间è·ï¼Œ
@@ -70,7 +70,7 @@ Knuth 基于文学编程\cite[knuth-1984-literate]技术开å‘了
\setupbtxlist[apa][distance=.5em,width=fit]
\stoptyping
\blank[line]
-\midaligned{\externalfigure[10-bibtex-example-03.pdf]}
+\midaligned{\externalfigure[06/bibtex-example-03.pdf]}
\section{自定义文献列表样å¼}
@@ -172,7 +172,7 @@ Knuth å‘明了文学编程语言 WEB\cite[knuth-1984-literate]。
用于验è¯ä¸Šè¿°å®šä¹‰å‚è€ƒæ–‡çŒ®ç±»è¡¨æ ·å¼ foo 是å¦å¯ç”¨ã€‚结果为
\blank[line]
-\midaligned{\externalfigure[10-bibtex-example-04.pdf]}
+\midaligned{\externalfigure[06/bibtex-example-04.pdf]}
\section{å°ç»“}
diff --git a/info/context-notes-zh-cn/src/08.tex b/info/context-notes-zh-cn/src/08.tex
index 052ef77ea6..c0bfd87783 100644
--- a/info/context-notes-zh-cn/src/08.tex
+++ b/info/context-notes-zh-cn/src/08.tex
@@ -13,13 +13,13 @@
\stoptyping
-\noindent 便å¯å°† ctxnotes.png 作为æ’å›¾ï¼Œå³ \externalfigure[ctxnotes.png]。显然,这是æ’图,但很å¯èƒ½å¹¶éžæ˜¯æˆ‘们想è¦çš„æ’图形å¼ã€‚我们想è¦çš„是,独å ä¸€è¡Œä¸”居中放置的æ’图,这个è¦æ±‚这并ä¸éš¾å®žçŽ°ï¼š
+\noindent 便å¯å°† ctxnotes.png 作为æ’å›¾ï¼Œå³ \externalfigure[08/ctxnotes.png]。显然,这是æ’图,但很å¯èƒ½å¹¶éžæ˜¯æˆ‘们想è¦çš„æ’图形å¼ã€‚我们想è¦çš„是,独å ä¸€è¡Œä¸”居中放置的æ’图,这个è¦æ±‚这并ä¸éš¾å®žçŽ°ï¼š
\starttyping[option=TEX]
\midaligned{\externalfigure[ctxnotes.png]}
\stoptyping
-\midaligned{\externalfigure[ctxnotes.png]}
+\midaligned{\externalfigure[08/ctxnotes.png]}
如果需è¦è®©æ’图更大一些,例如宽度为 8 cm,高度按图片原有比例自动放大,åªéœ€
@@ -30,29 +30,29 @@
\noindent 通常更建议使用相对尺寸,例如 0.3 å€çš„版心宽度(满行文字的最大宽度):
\starttyping[option=TEX]
-\midaligned{\externalfigure[ctxnotes.png][width=.4\textwidth]}
+\midaligned{\externalfigure[ctxnotes.png][width=.375\textwidth]}
\stoptyping
-\midaligned{\externalfigure[ctxnotes.png][width=.4\textwidth]}
+\midaligned{\externalfigure[08/ctxnotes.png][width=.375\textwidth]}
如法炮制,给图片加上标题也很容易:
\starttyping[option=TEX]
-\midaligned{\externalfigure[ctxnotes.png][width=.4\textwidth]}
+\midaligned{\externalfigure[ctxnotes.png][width=.375\textwidth]}
\midaligned{\tfx \ConTeXt\ 学习笔记å°é¢æˆªå›¾}
\stoptyping
-\midaligned{\externalfigure[ctxnotes.png][width=.4\textwidth]}
+\midaligned{\externalfigure[08/ctxnotes.png][width=.375\textwidth]}
\midaligned{\tfx\ConTeXt\ 学习笔记å°é¢æˆªå›¾}
\indentation 如果你还希望æ’图能有编å·ï¼Œå¯¹äºŽç¯‡å¹…较å°çš„文章,手工输入å³å¯ï¼Œå»ºè®®åœ¨ç¼–å·åŽï¼Œä½¿ç”¨ \type{\quad} æ’入一个字宽的空白作为间隔,因为普通的空格åªæœ‰åŠä¸ªå­—宽。例如
\starttyping[option=TEX]
-\midaligned{\externalfigure[ctxnotes.png][width=.4\textwidth]}
+\midaligned{\externalfigure[ctxnotes.png][width=.375\textwidth]}
\midaligned{\tfx 图 1\quad\ConTeXt\ 学习笔记å°é¢æˆªå›¾}
\stoptyping
-\midaligned{\externalfigure[ctxnotes.png][width=.4\textwidth]}
+\midaligned{\externalfigure[08/ctxnotes.png][width=.375\textwidth]}
\midaligned{\tfx 图 1\quad\ConTeXt\ 学习笔记å°é¢æˆªå›¾}
如果你担心,æ’图太多,手工输入图片编å·éš¾å…会出错,å¯ä»¥ä½¿ç”¨ \ConTeXt\ 的计数器功能,让 \ConTeXt\ 为你自动递增图片åºå·ã€‚首先,定义一个计数器:
@@ -64,20 +64,20 @@
\noindent 然åŽï¼Œæ¯æ¬¡åœ¨ç»™æ’图添加加标题时,将该计数器增 1,并获å–它的当å‰çš„值:
\starttyping[option=TEX]
-\midaligned{\externalfigure[ctxnotes.png][width=.4\textwidth]}
+\midaligned{\externalfigure[ctxnotes.png][width=.375\textwidth]}
\incrementnumber[myfig]
\midaligned{\tfx 图 \getnumber[myfig]\quad\ConTeXt\ 学习笔记å°é¢æˆªå›¾}
\blank[line]
-\midaligned{\externalfigure[ctxnotes-2.png][width=.4\textwidth]}
+\midaligned{\externalfigure[ctxnotes-2.png][width=.375\textwidth]}
\incrementnumber[myfig]
\midaligned{\tfx 图 \getnumber[myfig]\quad 涂鸦版 Hilbert 曲线}
\stoptyping
\definenumber[myfig][prefix=no]
-\midaligned{\externalfigure[ctxnotes.png][width=.4\textwidth]}
+\midaligned{\externalfigure[08/ctxnotes.png][width=.375\textwidth]}
\incrementnumber[myfig]
\midaligned{\tfx 图 \getnumber[myfig]\quad\ConTeXt\ 学习笔记å°é¢æˆªå›¾}
-\midaligned{\externalfigure[ctxnotes-2.png][width=.4\textwidth]}
+\midaligned{\externalfigure[08/ctxnotes-2.png][width=.375\textwidth]}
\incrementnumber[myfig]
\midaligned{\tfx 图 \getnumber[myfig]\quad 涂鸦版 Hilbert 曲线}
@@ -116,7 +116,7 @@
\starttyping[option=TEX]
\placemyfigure
{涂鸦版 Hilbert 曲线}
- {\externalfigure[ctxnotes-2.png][width=.4\textwidth]}
+ {\externalfigure[ctxnotes-2.png][width=.375\textwidth]}
\stoptyping
ä½ å¯èƒ½å¹¶ä¸èƒ½å®Œå…¨ç†è§£ \type{\palcemyfigure} 的定义,但是基于上一节的一些示例,应该能猜出其è¦ä¹‰ã€‚这已ç»è¶³å¤Ÿäº†ï¼Œæ—¥åŽå€˜è‹¥ä½ è§‰å¾—有些ç»å¸¸é‡å¤ä½¿ç”¨çš„排版代ç ï¼Œå®ƒä»¬åªå­˜åœ¨å°‘许差异,便å¯å°è¯•ä¸ºå®ƒä»¬å®šä¹‰ä¸€ä¸ªå®ï¼Œç”¨å®çš„å‚数代替差异。现在也许你已ç»éšéšæ„Ÿè§‰åˆ°äº†ï¼Œ\ConTeXt\ 的排版命令也是 \TeX\ å®ã€‚
@@ -137,24 +137,24 @@
{涂鸦版 Hilbert 曲线}
{\externalfigure[ctxnotes-2.png][width=.3\textwidth]}
\stoptyping
-\midaligned{\externalfigure[hibert.pdf]}
+\midaligned{\externalfigure[08/hibert.pdf]}
\subsection{æ’图标题样å¼}
对于 \type{\placefigure} 的结果,å¯èƒ½ä½ å·²ç»è§‰å¾—有些ä¸æ»¡æ„了。在中文排版中,图片的编å·å‰ç¼€ä¸åº”该是 Figure,而应该是「图ã€ï¼Œæ­¤å¤–,编å·ä¹Ÿæ²¡å¿…è¦ç²—体,而且标题字å·åº”当比正文字体å°ä¸€çº§ã€‚没有办法,\ConTeXt\ 一切默认的样å¼ï¼Œçš†é’ˆå¯¹è¥¿æ–‡æŽ’版。ä¸è¿‡ï¼Œæˆ‘们å¯ä»¥é€šè¿‡ä»¥ä¸‹å‘½ä»¤ï¼Œå°†æ’图标题样å¼è®¾ç½®æˆæˆ‘们所期望的样å¼ï¼š
-\starttyping[option=TEX][space=on]
+\starttyping[option=TEX,space=on]
\setupcaption[figure][style=\tfx,headstyle=\rm]
\setuplabeltext[en][figure={图 }]
\stoptyping
-\midaligned{\externalfigure[hibert-1.pdf]}
+\midaligned{\externalfigure[08/hibert-1.pdf]}
上述设定的样å¼ï¼Œå·²åŸºæœ¬ç¬¦åˆæˆ‘们的è¦æ±‚。根æ®æŽ’版结果,很容易能猜出æ¥ï¼Œ\type{\setupcaption} çš„ \type{style} å‚数用于设定æ’图字体样å¼ï¼Œ\type{headstyle} 则用于设定æ’图编å·æ ·å¼ã€‚至于 \type{\setuplabeltext},与 \ConTeXt\ 的语言界é¢æœ‰å…³ï¼Œä½†çŽ°åœ¨ä¸å¿…涉åŠå¤ªå¤šç»†èŠ‚,仅需知é“,它å¯å°†æ’图标题的å‰ç¼€ã€Œ\type{Figure}ã€æ›¿æ¢ä¸ºã€Œ\type[space=on]{图 }ã€ã€‚ä¸è¿‡ï¼Œä¾ç„¶å­˜åœ¨ä¸€ä¸ªç»†å¾®çš„问题,标题里的汉字之间的粘连的伸长特性åˆè¢« \ConTeXt\ 触å‘了,导致汉字分布有些ç–æ¾ã€‚该问题的解决方法与第 \in[post] 章的示例 \in[zaoshu-5] 相似,用将对é½å‚数设为 \type{center},å³
\starttyping[option=TEX]
\setupcaption[figure][style=\tfx,headstyle=\normal,align=center]
\stoptyping
-\midaligned{\externalfigure[hibert-2.pdf]}
+\midaligned{\externalfigure[08/hibert-2.pdf]}
\subsection{æ’图ä½ç½®}
@@ -190,7 +190,7 @@
[][Hilbert 曲线]
{涂鸦版 Hilbert 曲线}{\externalfigure[ctxnotes-2.png][width=.3\textwidth]}
\stoptyping
-\midaligned{\blueframed{\externalfigure[hibert-3.pdf]}}
+\midaligned{\blueframed{\externalfigure[08/hibert-3.pdf]}}
\section[figure-matrix]{阵列}
@@ -202,7 +202,7 @@
\placefigure{}{}
\stopfloatcombination
\stoptyping
-\leftaligned{\externalfigure[05-floatcomb.pdf]}
+\leftaligned{\externalfigure[08/floatcomb.pdf]}
\noindent 然åŽå°†æ‰€å¾—阵列作为æ’图,便å¯å¾—到居中放置的æ’图阵列:
@@ -214,7 +214,7 @@
\stopfloatcombination
}
\stoptyping
-\midaligned{\externalfigure[05-floatcomb-2.pdf]}
+\midaligned{\externalfigure[08/floatcomb-2.pdf]}
上述示例用了 \type{\placefigure} 一个å°æŠ€å·§ï¼šå½“ \type{\placefigure} 的第一个å‚æ•°å«æœ‰ \type{none} 时,å¯ä»¥æ¶ˆé™¤æ’图编å·å’Œæ ‡é¢˜ã€‚此外,你应该å‘现了,\type{\placefigure} çš„å‚数为空时,\ConTeXt\ 会以一个矩形框表示æ’图,还应当注æ„到,方括å·å½¢å¼çš„å‚数,通常是å¯ä»¥çœç•¥çš„。
@@ -228,7 +228,7 @@
\stopfloatcombination
}
\stoptyping
-\midaligned{\externalfigure[05-floatcomb-3.pdf]}
+\midaligned{\externalfigure[08/floatcomb-3.pdf]}
基于 \type{combination} 环境å¯å®žçŽ°ä¸Žä¸Šä¾‹ç­‰æ•ˆçš„æ’图阵列,åªæ˜¯æ‰€ç”¨ä»£ç ç•¥å¤šä¸€äº›ï¼Œä½†å½¢å¼ä¸Šæ›´ä¸ºç»“构化且应用范围更广。例如
@@ -242,7 +242,7 @@
\stopcombination
}
\stoptyping
-\midaligned{\externalfigure[05-floatcomb-4.pdf]}
+\midaligned{\externalfigure[08/floatcomb-4.pdf]}
\section{图片目录}
@@ -264,15 +264,12 @@
\starttyping[option=TEX]
\startuseMPgraphic{metapost 图形}
-path p;
-u := 7cm; v := 3cm;
-p := fullsquare xyscaled (u, v) randomized 0.07u;
-drawpath p;
-drawpoints p;
+path p; p := fullsquare xyscaled (7cm, 3cm) randomized 0.07u;
+drawpath p; drawpoints p;
\stopuseMPgraphic
\placefigure{\MetaFun\ example}{\useMPgraphic{metapost 图形}}
\stoptyping
-\midaligned{\externalfigure[05-metapost.pdf]}
+\midaligned{\externalfigure[08/metapost.pdf]}
上述示例在排版æ’å›¾æ ‡é¢˜æ—¶ï¼Œæ¶‰åŠ \TeX\ å®åœ¨ä½¿ç”¨æ—¶å³å®è°ƒç”¨æ—¶çš„一个细节。例如,\type{\TeX} 之åŽè·Ÿéšä¸€ä¸ªæˆ–å¤šä¸ªç©ºæ ¼ï¼Œå³ \type[space=on]{\TeX },这些空格会被 \TeX\ 引擎åžæŽ‰ï¼Œä¸ä¼šæ˜¾ç¤ºåœ¨æŽ’版结果中,原因是默认情况下,空格是 \TeX\ 引擎需è¦çŸ¥é“å®çš„å字的结æŸç¬¦ã€‚如果需è¦åœ¨ä¸€ä¸ªå®è°ƒç”¨ä¹‹åŽæ’入空格,需è¦å¯¹ç©ºæ ¼è¿›è¡Œè½¬ä¹‰ï¼Œå³ \type[space=on]{\ },亦å³å斜线åŽè·Ÿéšä¸€ä¸ªç©ºæ ¼ã€‚
diff --git a/info/context-notes-zh-cn/src/09.tex b/info/context-notes-zh-cn/src/09.tex
index 587dd248b5..23356c2466 100644
--- a/info/context-notes-zh-cn/src/09.tex
+++ b/info/context-notes-zh-cn/src/09.tex
@@ -6,59 +6,41 @@
首先,构造一个 2 è¡Œ 3 列的表格,第 1 行的内容是 \type{1 2 3},第二行的内容是 \type{4 5 6},排版代ç å’Œç»“果如下:
-\starttyping[option=TEX]
-\starttabulate
-\NC 1 \NC 2 \NC 3\NC\NR
-\NC 4 \NC 5 \NC 6\NC\NR
-\stoptabulate
-\stoptyping
+\startsample
\starttabulate
\NC 1 \NC 2 \NC 3\NC\NR
\NC 4 \NC 5 \NC 6\NC\NR
\stoptabulate
+\stopsample
+\simplesample[option=TEX]{\null}
+\getsample
-结果第 3 列跑到版é¢æœ€å³ä¾§äº†ã€‚这是因为我们尚未定义表格å„列的对é½æ–¹å¼ã€‚对é½æ–¹å¼ä¸å¤–乎三ç§ï¼Œå·¦ã€ä¸­ã€å³ï¼ŒTabulate 分别使用缩写 \type{l},\type{c} å’Œ \type{r} 指代它们。例如,若令表格第 1 列居左,第 2 列居中,第 3 列居å³ï¼Œåªéœ€
+\noindent 结果第 3 列跑到版é¢æœ€å³ä¾§äº†ã€‚这是因为我们尚未定义表格å„列的对é½æ–¹å¼ã€‚对é½æ–¹å¼ä¸å¤–乎三ç§ï¼Œå·¦ã€ä¸­ã€å³ï¼ŒTabulate 分别使用缩写 \type{l},\type{c} å’Œ \type{r} 指代它们。例如,若令表格第 1 列居左,第 2 列居中,第 3 列居å³ï¼Œåªéœ€
-\starttyping[option=TEX]
-\starttabulate[|l|c|r|]
-\NC 1 \NC 2 \NC 3\NC\NR
-\NC 4 \NC 5 \NC 6\NC\NR
-\stoptabulate
-\stoptyping
+\startsample
\starttabulate[|l|c|r|]
\NC 1 \NC 2 \NC 3\NC\NR
\NC 4 \NC 5 \NC 6\NC\NR
\stoptabulate
-
-现在看上去åƒè¡¨æ ¼äº†ï¼Œä½†æ˜¯ç”±äºŽè¡¨æ ¼å°šæ— è¾¹æ¡†çº¿ï¼Œæ— æ³•çœ‹å‡ºè¡¨æ ¼å„列内容的对é½çŠ¶æ€ã€‚
+\stopsample
+\simplesample[option=TEX]{\getsample}
+\noindent 现在看上去åƒè¡¨æ ¼äº†ï¼Œä½†æ˜¯ç”±äºŽè¡¨æ ¼å°šæ— è¾¹æ¡†çº¿ï¼Œæ— æ³•çœ‹å‡ºè¡¨æ ¼å„列内容的对é½çŠ¶æ€ã€‚
想必你已ç»çŒœæµ‹å‡ºäº†ï¼Œ\type{\NC} 用于在表格的æŸä¸€è¡Œæž„造一个å•å…ƒæ ¼ï¼Œä¸Šè¿°ç¤ºä¾‹ä¸­ï¼Œè¡¨æ ¼å†…容的æ¯ä¸€è¡Œæœ€åŽä¸€ä¸ª \type{\NC} 实际上是多余的,\ConTeXt\ 会忽略它,但是你å¯ä»¥å°†å®ƒç†è§£ä¸ºè¡¨æ ¼çš„å•å…ƒæ ¼çš„边界。\type{\NR} 用于构造一个新行,å³ä¸‹ä¸€è¡Œã€‚上述示例里,表格åªæœ‰ä¸¤è¡Œï¼Œå®žé™…上第 2 个 \type{\NR} 也是多余的,åªæ˜¯ä¸ºäº†å½¢å¼ä¸Šæ›´æ•´é½è€Œä¿ç•™ï¼Œ\ConTeXt\ 会忽略它,你å¯ä»¥å°†å®ƒç†è§£ä¸ºè¡¨æ ¼ä¸€è¡Œçš„结æŸã€‚
现在,将 \type{\NC} 替æ¢ä¸º \type{\VL},便å¯ç”»å‡ºå•å…ƒæ ¼çš„å·¦å³è¾¹ç•Œçº¿ï¼Œå³
-\starttyping[option=TEX]
-\starttabulate[|l|c|r|]
-\VL 1 \VL 2 \VL 3\VL\NR
-\VL 4 \VL 5 \VL 6\VL\NR
-\stoptabulate
-\stoptyping
-
+\startsample
\starttabulate[|l|c|r|]
\VL 1 \VL 2 \VL 3\VL\NR
\VL 4 \VL 5 \VL 6\VL\NR
\stoptabulate
+\stopsample
+\simplesample[option=TEX]{\getsample}
-如果在表格æ¯ä¸€è¡Œçš„开始放上 \type{\HL},å¯ç”»å‡ºè¡¨æ ¼å„行横线,å³
+\noindent 在表格æ¯ä¸€è¡Œçš„开始放上 \type{\HL},å¯ç”»å‡ºè¡¨æ ¼å„行横线,å³
-\starttyping[option=TEX]
-\starttabulate[|l|c|r|]
-\HL
-\VL 1 \VL 2 \VL 3\VL\NR
-\HL
-\VL 4 \VL 5 \VL 6\VL\NR
-\HL
-\stoptabulate
-\stoptyping
+\startsample
\starttabulate[|l|c|r|]
\HL
\VL 1 \VL 2 \VL 3\VL\NR
@@ -66,22 +48,16 @@
\VL 4 \VL 5 \VL 6\VL\NR
\HL
\stoptabulate
+\stopsample
+\simplesample[option=TEX]{\getsample}
-å¯èƒ½ä½ å·²ç»å‘现了,表格的竖线将被横线截断了。ä¸å¿…担心是你的问题,而是 Tabulate 主è¦ç”¨äºŽæŽ’版横线表,例如图 \in[three-line table] 所示的在科技论文中常用的三线表。
+\noindent å¯èƒ½ä½ å·²ç»å‘现了,表格的竖线将被横线截断了。ä¸å¿…担心是你的问题,而是 Tabulate 主è¦ç”¨äºŽæŽ’版横线表,例如图 \in[three-line table] 所示的在科技论文中常用的三线表。
-\placefigure[here][three-line table]{三线表}{\externalfigure[06-three-line-table.pdf]}
+\placefigure[force][three-line table]{三线表}{\externalfigure[09/three-line-table.pdf]}
-ä¸è¿‡ï¼Œè¦è®©è¡¨æ ¼çš„横线和竖线完全相交并ä¸å›°éš¾ï¼Œåªéœ€å°†å•å…ƒæ ¼ä¹‹é—´çš„纵å‘é—´è·å‚æ•° \type{distance} 设为 \type{0pt} 或 \type{none}:
+让表格的横线和竖线完全相交并ä¸å›°éš¾ï¼Œåªéœ€å°†å•å…ƒæ ¼ä¹‹é—´çš„纵å‘é—´è·å‚æ•° \type{distance} 设为 \type{0pt} 或 \type{none}:
-\starttyping[option=TEX]
-\starttabulate[|l|c|r|][distance=none]
-\HL
-\VL 1 \VL 2 \VL 3\VL\NR
-\HL
-\VL 4 \VL 5 \VL 6\VL\NR
-\HL
-\stoptabulate
-\stoptyping
+\startsample
\starttabulate[|l|c|r|][distance=none]
\HL
\VL 1 \VL 2 \VL 3\VL\NR
@@ -89,20 +65,14 @@
\VL 4 \VL 5 \VL 6\VL\NR
\HL
\stoptabulate
+\stopsample
+\simplesample[option=TEX]{\getsample}
\section{é—´è·è°ƒæ•´}
若希望å•å…ƒæ ¼çš„宽度更宽一些,需è¦åœ¨åˆ—æ ¼å¼ä¸­è®¾å®š \type{w} å‚数,例如令å•å…ƒæ ¼å®½åº¦ä¸º 1 cm,åªéœ€ \type{w(1cm)} å³å¯ã€‚例如
-\starttyping[option=TEX]
-\starttabulate[|lw(1cm)|cw(1cm)|rw(1cm)|][distance=none]
-\HL
-\VL 1 \VL 2 \VL 3\VL\NR
-\HL
-\VL 4 \VL 5 \VL 6\VL\NR
-\HL
-\stoptabulate
-\stoptyping
+\startsample
\starttabulate[|lw(1cm)|cw(1cm)|rw(1cm)|][distance=none]
\HL
\VL 1 \VL 2 \VL 3\VL\NR
@@ -110,16 +80,18 @@
\VL 4 \VL 5 \VL 6\VL\NR
\HL
\stoptabulate
+\stopsample
+\simplesample[option=TEX]{\getsample}
-如果希望所有的 Tablutate 实例的 \type{distance} å‚数皆为 \type{none},å¯ä½¿ç”¨ \type{\setuptabulate} 进行设定:
+若希望文档中所有表格实例的 \type{distance} å‚数皆为 \type{none},å¯ç”¨ \type{\setuptabulate} 进行设定:
\starttyping[option=TEX]
\setuptabulate[distance=none]
\stoptyping
-若希望å•å…ƒæ ¼çš„ç«–å‘é—´è·å¤§ä¸€äº›ï¼Œå¯ä½¿ç”¨ \type{\TB} 命令æ’入空行进行调整。例如æ’å…¥ 2mm 高的空格:
+若想加大å•å…ƒæ ¼çš„ç«–å‘é—´è·ï¼Œå¯ç”¨ \type{\TB} 命令æ’入空行予以调整。例如æ’å…¥ 2mm 高的空格,
-\starttyping[option=TEX]
+\startsample
\starttabulate[|lw(1cm)|cw(1cm)|rw(1cm)|][distance=none]
\HL
\VL 1 \VL 2 \VL 3\VL\NR
@@ -129,16 +101,8 @@
\VL 4 \VL 5 \VL 6\VL\NR
\HL
\stoptabulate
-\stoptyping
-\starttabulate[|lw(1cm)|cw(1cm)|rw(1cm)|][distance=none]
-\HL
-\VL 1 \VL 2 \VL 3\VL\NR
-\HL
-\TB[line]
-\HL
-\VL 4 \VL 5 \VL 6\VL\NR
-\HL
-\stoptabulate
+\stopsample
+\simplesample[option=TEX]{\getsample}
\noindent \type{\TB} 也å¯ä»¥ä½¿ç”¨ç›¸å¯¹å°ºå¯¸ï¼Œä¾‹å¦‚ \type{2*line},\type{line},\type{halfline} å’Œ \type{quarterline} 分别为一行文字的高度的 2 å€ï¼Œ1 å€ï¼Œ1/2 å€å’Œ 1/4 å€ã€‚
@@ -154,7 +118,7 @@
\stoptabulate
}
\stoptyping
-\midaligned{\externalfigure[06-01.pdf]}
+\midaligned{\externalfigure[09/01.pdf]}
\section{\type{\placetable}}
@@ -171,15 +135,15 @@
\stoptabulate
}
\stoptyping
-\midaligned{\externalfigure[06-02.pdf]}
+\midaligned{\externalfigure[09/02.pdf]}
-对于中文排版,表格的标题,也需è¦è‡ªå·±å®šåˆ¶ï¼Œé»˜è®¤çš„设置并ä¸ç¬¦åˆæˆ‘们的习惯。首先,将表格编å·å‰ç¼€è®¾å®šä¸º
+对于中文排版,表格的标题,默认的设置并ä¸ç¬¦åˆæˆ‘们的习惯,需è¦ä½œä¸€äº›å®šåˆ¶ã€‚首先,将表格编å·å‰ç¼€è®¾å®šä¸º
-\starttyping[option=TEX][space=on]
+\starttyping[option=TEX,space=on]
\setuplabeltext[en][table={表 }]
\stoptyping
-\noindent 然åŽå°†è¡¨æ ¼æ ‡é¢˜ç¼–å·è®¾ä¸ºæ­£ä½“,字å·æ¯”正文字å·å°ä¸€çº§ï¼Œæ”¾ç½®äºŽè¡¨æ ¼ä¸Šæ–¹ï¼Œå¹¶å±…中对é½ï¼š
+\noindent 然åŽï¼Œå°†è¡¨æ ¼æ ‡é¢˜ç¼–å·è®¾ä¸ºæ­£ä½“,字å·æ¯”正文字å·å°ä¸€çº§ï¼Œæ”¾ç½®äºŽè¡¨æ ¼ä¸Šæ–¹ï¼Œå¹¶å±…中对é½ï¼š
\starttyping[option=TEX]
\setupcaption
@@ -187,13 +151,13 @@
[headstyle=\tf,style=\tfx,location=top,align=center]
\stoptyping
\blank[line]
-\midaligned{\externalfigure[06-03.pdf]}
+\midaligned{\externalfigure[09/03.pdf]}
\section{ä¸ä¼ ä¹‹ç§˜}
在绘制表格的横线和竖线时,线æ¡ç²—度å¯é€šè¿‡å‚æ•° \type{rulethickness} 进行设定。例如,将线æ¡ç²—度设为 2 pt:
-\starttyping[option=TEX]
+\startsample
\starttabulate[|c|c|c|c|c|][rulethickness=2pt]
\HL
\NC 一 \NC 二 \NC 三 \NC 四 \NC 五 \NC\NR
@@ -202,8 +166,8 @@
\NC 1 \NC 2 \NC 3 \NC 4 \NC 5 \NC\NR
\HL
\stoptabulate
-\stoptyping
-\midaligned{\externalfigure[06-04.pdf]}
+\stopsample
+\simplesample[option=TEX]{\externalfigure[09/04.pdf]}
\noindent 但是,如果我们åªæƒ³è®©è¡¨æ ¼çš„顶线和底线是粗度 2 pt,中间那æ¡æ¨ªçº¿è®©å®ƒæ˜¯ Tabulate 的默认粗度,该如何实现呢?
@@ -222,7 +186,7 @@ $ mtxrun --script base --search tabl-tbl.mkxl
\item \type{\HL}\footnote{包括 \type{\TL},\type{\FL},……,\type{\BL}。}å’Œ \type{\VL} å¯ä»¥æŽ¥å—两个å‚数,一个是表格线既定粗度的å€æ•°ï¼Œå¦ä¸€ä¸ªæ˜¯è¡¨æ ¼çº¿é¢œè‰²ã€‚
\stopitemize
-解决方法是,首先将上述示例修改为
+\noindent 然åŽï¼Œå°†ä¸Šè¿°ç¤ºä¾‹ä¿®æ”¹ä¸º
\starttyping[option=TEX]
\starttabulate[|c|c|c|c|c|][rulethickness=2pt]
@@ -251,13 +215,13 @@ $ mtxrun --script base --search tabl-tbl.mkxl
\stoptabulate
\stoptyping
-现在è¦ä¿æŒ \type{\TL} å’Œ \type{\BL} 为既定粗度 2 pt,将 \type{\FL},\type{\ML} å’Œ \type{\LL} 的粗度设置为 0.2 å€çš„æ—¢å®šç²—åº¦ï¼ŒåŠ 0.4 pt,顺便试验一下颜色是å¦çœŸçš„å¯ç”¨ï¼Œè§è¡¨ \in[HL example] 对应的代ç ï¼Œç»“æžœåªæœ‰ \type{\ML} å˜æˆäº†åŒçº¿ï¼Œå…¶ä»–皆符åˆé¢„期。
+现在è¦ä¿æŒ \type{\TL} å’Œ \type{\BL} 为既定粗度 2 pt,将 \type{\FL},\type{\ML} å’Œ \type{\LL} 的粗度设置为 0.2 å€çš„æ—¢å®šç²—åº¦ï¼ŒåŠ 0.4 pt,顺便试验一下颜色是å¦çœŸçš„å¯ç”¨ï¼Œè§ç¤ºä¾‹ \in[HL example] 对应的代ç ï¼Œç»“æžœåªæœ‰ \type{\ML} å˜æˆäº†åŒçº¿ï¼Œå…¶ä»–皆符åˆé¢„期。
-为何 \type{\ML} 如此ä¸é…åˆå‘¢ï¼Ÿæˆ‘猜也许它本æ¥å°±æ˜¯åœ¨ç»˜åˆ¶åŒçº¿ï¼Œå› ä¸º Tabulate 支æŒè¡¨æ ¼åˆ†é¡µæ–­å¼€ï¼Œå³ä¸€ä¸ªè¡¨æ ¼è‹¥å¤„于页é¢åº•éƒ¨ä¸”ä¸èƒ½å®Œå…¨è¢«å½“å‰é¡µé¢å®¹çº³æ—¶ï¼Œ\ConTeXt\ å¯å°†å…¶æ–­å¼€ï¼Œä¸€éƒ¨åˆ†åœ¨å½“å‰é¡µé¢ï¼Œå¦ä¸€éƒ¨åˆ†åœ¨ä¸‹ä¸€é¡µé¢ã€‚为了让断开åŽçš„表格完整,\type{\ML} 必须是åŒçº¿ã€‚若将表 \in[HL example] 对应代ç ä¸­çš„ \type{\ML} æ¢æˆ \type{\HL},结果åŒæ ·æ˜¯åŒçº¿ã€‚è‹¥ä¸éœ€è¦åŒçº¿ï¼Œå¯å°† \type{\ML} 皆æ¢ä¸º \type{\FL} 或 \type{\LL}。
+为何 \type{\ML} 如此ä¸é…åˆå‘¢ï¼Ÿæˆ‘猜也许它本æ¥å°±æ˜¯åœ¨ç»˜åˆ¶åŒçº¿ï¼Œå› ä¸º Tabulate 支æŒè¡¨æ ¼åˆ†é¡µæ–­å¼€ï¼Œå³ä¸€ä¸ªè¡¨æ ¼è‹¥å¤„于页é¢åº•éƒ¨ä¸”ä¸èƒ½å®Œå…¨è¢«å½“å‰é¡µé¢å®¹çº³æ—¶ï¼Œ\ConTeXt\ å¯å°†å…¶æ–­å¼€ï¼Œä¸€éƒ¨åˆ†åœ¨å½“å‰é¡µé¢ï¼Œå¦ä¸€éƒ¨åˆ†åœ¨ä¸‹ä¸€é¡µé¢ã€‚为了让断开åŽçš„表格完整,\type{\ML} 必须是åŒçº¿ã€‚若将示例 \in[HL example] 中的 \type{\ML} æ¢æˆ \type{\HL},结果åŒæ ·æ˜¯åŒçº¿ã€‚è‹¥ä¸éœ€è¦åŒçº¿ï¼Œå¯å°† \type{\ML} 皆æ¢ä¸º \type{\FL} 或 \type{\LL}。
为了é¿å…上述莫å其妙的问题,若åªæ˜¯ä»¤è¡¨æ ¼é¡¶çº¿å’Œåº•çº¿å˜ç²—,ä¸å¿…设定 \type{rulethickness} å‚数,而是修改顶线和底线的粗度,令其他表格线的粗度皆为默认值。
-\starttyping[option=TEX]
+\startsample
\starttabulate[|c|c|c|c|c|][rulethickness=2pt]
\TL
\NC 一 \NC 二 \NC 三 \NC 四 \NC 五 \NC\NR
@@ -269,20 +233,8 @@ $ mtxrun --script base --search tabl-tbl.mkxl
\NC 1 \NC 2 \NC 3 \NC 4 \NC 5 \NC\NR
\BL
\stoptabulate
-\stoptyping
-\placetable[here][HL example]{修改表格线粗度和颜色}{
- \starttabulate[|c|c|c|c|c|][rulethickness=2pt]
- \TL
- \NC 一 \NC 二 \NC 三 \NC 四 \NC 五 \NC\NR
- \FL[0.2,red]
- \NC 甲 \NC ä¹™ \NC 丙 \NC ä¸ \NC 戊 \NC\NR
- \ML[0.2,blue]
- \NC one \NC two \NC three \NC four \NC five \NC\NR
- \LL[0.2,magenta]
- \NC 1 \NC 2 \NC 3 \NC 4 \NC 5 \NC\NR
- \BL
- \stoptabulate
-}
+\stopsample
+\sample[option=TEX][HL example]{修改表格线粗度和颜色}{\getsample}
\section{å°ç»“}
diff --git a/info/context-notes-zh-cn/src/10.tex b/info/context-notes-zh-cn/src/10.tex
index 7616361d01..15d402e1b8 100644
--- a/info/context-notes-zh-cn/src/10.tex
+++ b/info/context-notes-zh-cn/src/10.tex
@@ -1,276 +1,207 @@
-\chapter{ç›’å­}
+\chapter{一字ä¸å·®}
-在 \in[item-sym-diy] 节中,你已ç»è§è¿‡ç›’å­äº†ï¼Œåªæ˜¯é‚£æ—¶å¯èƒ½ä½ è¿˜ä¸çŸ¥å…¶ç©¶ç«Ÿï¼Œæœ¬ç« å°†æ­å¼€å®ƒä»¬çš„一些端倪。也有å¯èƒ½ä½ æ—©å·²é’»ç ”过 Knuth 的《The \TeX\ book》,对盒å­çš„研究之深已ç»è®©æˆ‘望风而拜,但是未必熟悉 \ConTeXt\ çš„ç›’å­ï¼Œæ•…而本章ä»æœ‰éƒ¨åˆ†å†…容值得一ç¹ã€‚
+在这个信æ¯æ—¶ä»£ï¼Œæ–‡æ¡£å‡ºçŽ°ä¸€äº›è®¡ç®—机程åºæºç ç‰‡æ®µï¼Œæ˜¯å¾ˆå¸¸è§çš„事。这些代ç éœ€è¦ä»¥ç­‰å®½å­—体原样显示,åƒæ˜¯è¿‡åŽ»çš„打字机的输出,故而å曰文本抄录(Verbatim text)。为了让代ç æ›´ä¸ºæ˜“读,通常需è¦æ ¹æ®ç›¸åº”语法对其进行ç€è‰²æ¸²æŸ“。有时,还需è¦åœ¨ä»£ç ä¸­æ’入一些其他排版元素。
-\section{\TeX\ ç›’å­}
+\section{抄录}
-å‰é¢å·²ç»å¤šæ¬¡æš—示和明示,\TeX\ 系统是 \ConTeXt\ 的底层,二者的关系犹如引擎(å‘动机)和汽车的关系。对 \TeX\ 引擎ä¸æ¯«ä¸æ‡‚,并ä¸å½±å“你学习和使用 \ConTeXt\ 排版一份精致的文档,但是懂一些引擎层é¢å·¥ä½œåŽŸç†ï¼Œæœªå¿…会有用处,但是你现在也并ä¸èƒ½ç¡®å®šå°†æ¥ä¼šä¸ä¼šæˆä¸ºä¸€å \TeX\ 黑客,如åŒä½ ä»Žå‰ä¹Ÿä»Žæœªæƒ³è¿‡æœ‰ä¸€å¤©ä¼šå­¦ä¹  \ConTeXt。
+抄录有两ç§å½¢å¼ï¼Œä¸€ç§æ˜¯ä½äºŽä¸€è¡Œæ–‡å­—之内,用 \type{\type{...}} 排版,å¦ä¸€ç§æ˜¯ä½äºŽæ®µè½ä¹‹é—´ï¼Œç”¨ \type{\starttyping ... \stoptyping} 排版。例如
-在 \TeX\ 系统中,盒å­æ˜¯å¾ˆé‡è¦çš„部件。例如,在 \ConTeXt\ 的排版的æ¯ä¸€ä¸ªæ®µè½ï¼Œæ˜¯ä¸€ä¸ªç«–å‘ç›’å­ï¼Œå³ \type{\vbox},该盒å­ä¹‹å†…åˆæœ‰ä¸€äº›æ¨ªå‘ç›’å­ï¼Œå³ \type{\hbox},它们是段è½çš„æ¯ä¸€è¡Œã€‚我们å¯ä»¥ç›´æŽ¥ç”¨è¿™ä¸¤ç§ç›’å­æž„造一个ä¸ç”šè§„整的段è½ï¼š
-
-\startsamplecode\startnarrowtyping
-\vbox{
- \hbox{离离原上è‰}\hbox{一å²ä¸€æž¯è£}\hbox{野ç«çƒ§ä¸å°½}\hbox{春风å¹åˆç”Ÿ}
-}
-\stopnarrowtyping\stopsamplecode
-\mysample[todo-list]{ç«–å‘ç›’å­å’Œæ¨ªå‘ç›’å­}{08-vbox-and-hbox.pdf}
-
-横å‘ç›’å­å¯ä»¥æŒ‡å®šå®ƒçš„长度,竖å‘ç›’å­å¯ä»¥æŒ‡å®šå®ƒçš„高度。例如,
-
-\starttyping[option=TEX]
-\hbox to 5cm {赋得å¤åŽŸè‰é€åˆ«}
-\vbox to 3cm {
- \hbox{离离原上è‰}\hbox{一å²ä¸€æž¯è£}\hbox{野ç«çƒ§ä¸å°½}\hbox{春风å¹åˆç”Ÿ}
+\startsample
+\startframedtext[width=\textwidth]
+用 C 语言写一个程åºï¼Œè®©å®ƒåœ¨å±å¹•ä¸Šæ˜¾ç¤ºã€Œ\type{Hello world!}ã€ï¼Œä»£ç å¦‚下
+\starttyping
+#include <stdio.h>
+int main(void)
+{
+ printf("Hello world!\n");
+ return 0;
}
\stoptyping
+\stopframedtext
+\stopsample
+\typesample
-在示例 \in[rsquare] 中,\type{\hbox} 用于包å«ä¸€å‰¯ä½¿ç”¨ \METAPOST\ 语言绘制的矢é‡æ’图,关键代ç å¦‚下:
+\noindent 结果为
-\starttyping[option=TEX]
-\startuseMPgraphic{foo}
-... ... ...
-\stopuseMPgraphic
-\lower.2ex\hbox{\useMPgraphic{foo}}
-\stoptyping
+\start
+\setuptyping[before={\blank[line]},after={\blank[line]}]
+\getsample
+\stop
-\noindent 其中 \type{useMPgraphic} 环境中的 \METAPOST\ 代ç ä¼šè¢« \type{\useMPgraphic{foo}} æ交给 \TeX\ 引擎。\TeX\ 引擎会调用 metapost 程åºå°† \METAPOST\ 代ç ç¼–è¯‘æˆ PDF æ ¼å¼çš„图片,然åŽäº¤ç»™ \ConTeXt。最åŽç”± \ConTeXt\ 将图片æ’入到 \type{\useMPgraphic{foo}} 所在的横å‘ç›’å­é‡Œã€‚\type{\lower .2ex} å¯ä»¤ä½äºŽå…¶åŽçš„横å‘ç›’å­ä¸‹æ²‰ 0.2 ex。长度å•ä½ ex 类似于 em,也是一个相对尺寸,它是当å‰æ‰€ç”¨å­—ä½“ä¸­çš„å­—æ¯ x 对应的字形的高度。从现在开始è¦è®°ä½ï¼Œæ¨ªå‘è·ç¦»ç”¨ em,竖å‘è·ç¦»ç”¨ ex,ä¸è¿‡è¿™åªæ˜¯å»ºè®®ï¼Œå¹¶éž \TeX\ 世界的法律。
+上述示例,ä¸ä»…演示了抄录命令的基本用法,你应该也学会了如何使用 \type{framedtext} 环境给一些内容添加朴素的边框。
-还有一ç§æ¨ªå‘ç›’å­ \type{\line},它的宽度是当å‰æ®µè½çš„宽度,å¯è®©å…¶ä¸­çš„文字å‘两边伸展并与边界对é½ï¼Œä¾‹å¦‚
+\section{外框}
-\starttyping[option=TEX]
-\line{\darkred\bf 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。}
-\stoptyping
-\line{\darkred\bf 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。}
-
-看到上述示例,想必你想起了之å‰æˆ‘们曾在文章标题的样å¼è®¾å®šæ—¶ï¼Œç”¨ \type{{middle,broad}} 抑制的 \ConTeXt\ 触å‘汉字间隙的伸长特性,该特性与\type{\line} 的效果éžå¸¸ç›¸ä¼¼ã€‚
+也许你也想è¦ä¸€ä¸ªåƒæœ¬æ–‡æ¡£ä¸­æœ‰ç€å·¨å¤§çš„æ·¡è“色方括å·çš„ \type{typing} 环境,但是需è¦äº‹å…ˆå¯¹ç¬¬ \in[metapost] 章中介ç»çš„ \METAPOST\ 语言的基本用法有所了解方å¯ã€‚ç»™ \type{typing} 环境添加朴素的外框很容易åšåˆ°ï¼Œè€Œä¸”它也是实现巨大淡è“色方括å·çš„基础,方法是
-使用 \type{\hfill} 或 \type{\hss} å¯å¯¹æ¨ªå‘ç›’å­é‡Œçš„内容进行挤压。例如
+\startsample
+\setuptyping
+ [before={\startframedtext[width=\textwidth]},
+ after={\stopframedtext}]
-\starttyping[option=TEX]
-\line{\hfill 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。}
-\line{我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。\hfill}
-\line{\hfill 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。\hfill}
-\line{\hss 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。}
-\line{我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。\hss}
-\line{\hss 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。\hss}
+\starttyping
+带外框的 \starttyping ... \stoptyping
\stoptyping
+\stopsample
+\typesample
+\start
+\getsample
+\stop
-\blueframed{
- \vbox{
- \line{\hfill 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。}
- \line{我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。\hfill}
- \line{\hfill 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。\hfill}
- \line{\hss 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。}
- \line{我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。\hss}
- \line{\hss 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。\hss}
- }
-}
-
-\type{\hfill} å’Œ \type{\hss},都是å¯æ— é™ä¼¸ç¼©çš„粘连,还有一个伸缩能力弱于 \type{\hfill} çš„ \type{\hfil}。竖å‘çš„å¯æ— é™ä¼¸ç¼©çš„粘连有 \type{\vfil},\type{\vfill} å’Œ \type{\vss}。
+在 \type{\setuptyping} çš„ \type{before} å’Œ \type{after} å‚数中,也å¯ä»¥æ ¹æ®è‡ªå·±çš„需求,添加其他排版命令或你自己定义的å®ã€‚\CONTEXT\ 很多命令带有 \type{before} å’Œ \type{after} å‚数。
-\section{\ConTeXt\ ç›’å­}
+\section{è¡Œå·}
-在 \ConTeXt\ 层é¢ï¼Œé€šå¸¸å¾ˆå°‘使用 \TeX\ ç›’å­ï¼Œè€Œæ˜¯ä½¿ç”¨ \type{\inframed} å’Œ \type{\framed}——å‰è€…是åŽè€…的特例。与 \TeX\ ç›’å­ç›¸æ¯”,\ConTeXt\ 层é¢çš„ç›’å­å¯ä»¥æ˜¾ç¤ºè¾¹æ¡†ï¼Œä¸”有éžå¸¸å¤šçš„å‚æ•°å¯ä»¥å®šåˆ¶å®ƒä»¬çš„外观。
+\type{\setuptyping} çš„ \type{line} å‚æ•°å¯ç”¨äºŽè®¾å®šä»£ç è¡Œå·ã€‚通过 \type{\setuplinenumbering} å¯è°ƒæ•´è¡Œå·æ ·å¼ã€‚以下示例开å¯ä»£ç è¡Œå·ï¼Œå¹¶å°†è¡Œå·åˆ° \type{typing} 环境的è·ç¦»è®¾ä¸º 0.5 em:
-\type{\inframed} 用于正文,å¯ç”¨äºŽç»™ä¸€è¡Œæ–‡å­—增加边框,例如
+\startsample
+\setuplinenumbering[typing][distance=.5em]
+\setuptyping
+ [numbering=line,
+ before={\startframedtext[width=\textwidth]},
+ after={\stopframedtext}]
-\starttyping[option=TEX]
-\type{\inframed{\type{\inframed{...}}}}
+\starttyping
+#include <stdio.h>
+int main(void)
+{
+ printf("Hello world!\n");
+ return 0;
+}
\stoptyping
+\stopsample
+\typesample
+\start
+\getsample
+\stop
-\noindent 结果为 \inframed{\type{\inframed{...}}}。倘若使用 \type{\framed},例如
-
-\starttyping[option=TEX]
-\type{\framed{\type{\framed{...}}}}
-\stoptyping
+\section{ç€è‰²}
-\noindent 结果为 \framed{\type{\framed{...}}}。å¯ä»¥å‘现,\type{\inframed} 更适åˆåœ¨æ­£æ–‡ä¸­ä½¿ç”¨ï¼Œå› ä¸ºå®ƒèƒ½ä¸Žæ–‡å­—基线对é½ã€‚事实上,\type{\inframed} 与 \type{\framed[location=low]} 等效,故而å‰è€…是åŽè€…的特例。例如
+\CONTEXT\ æ供了代ç è¯­æ³•ç€è‰²åŠŸèƒ½ï¼Œä¾‹å¦‚对 \TEX\ 代ç è¿›è¡Œç€è‰²ï¼Œ
+\startsample
\starttyping[option=TEX]
-\framed[location=low]{\type{\framed[location=low]{...}}}
+\starttext
+Hello \CONTEXT!
+\stoptext
\stoptyping
+\stopsample
+\typesample
+\start
+\setuplinenumbering[typing][distance=.5em]
+\setuptyping
+ [numbering=line,
+ before={\startframedtext[width=\textwidth]},
+ after={\stopframedtext}]
+\getsample
+\stop
-\noindent 结果为 \framed[location=low]{\type{\framed[location=low]{...}}}。上述示例中的 \type{\type} 用于排版代ç ï¼Œå®ƒä¼šè‡ªåŠ¨å°†å­—体切æ¢ä¸ºç­‰å®½å­—体(\type{\tt})原样显示它所接å—的文字。顺便多言,若是排版一段代ç ï¼Œå¯ä½¿ç”¨ \type{\starttyping[option=TEX] ... \stoptyping}。
+ä¸å¹¸çš„æ˜¯ï¼Œç›®å‰ \CONTEXT\ 仅实现了 \TEX,\METAPOST,Lua,XML 等代ç çš„ç€è‰²ã€‚ä¸è¿‡ï¼Œå¯¹äºŽ \CONTEXT\ å°šä¸æ”¯æŒçš„语言,\CONTEXT\ æ供了扩展机制,若你对 Lua 语言åŠå…¶ Lpeg 库有所了解,å¯è‡ªå·±åŠ¨æ‰‹ï¼Œä¸°è¡£è¶³é£Ÿ\cite[code-render]。
-如果ä¸å¸Œæœ› \type{\framed} 显示边框,åªéœ€ \type{\framed[frame=off]{...}},也å¯ä»¥å•ç‹¬æ˜¾ç¤ºæŸæ¡è¾¹çº¿ï¼Œå¹¶è®¾å®šè¾¹çº¿ç²—度和颜色:
+\section{逃逸}
-\starttyping[option=TEX]
-\line{
- \framed[frame=off,leftframe=on,rulethickness=4pt,framecolor=red]{foo}
- \framed[frame=off,topframe=on,rulethickness=4pt,framecolor=green]{foo}
- \framed[frame=off,rightframe=on,rulethickness=4pt,framecolor=blue]{foo}
- \framed[frame=off,bottomframe=on,rulethickness=4pt,framecolor=magenta]{foo}
+å³ä½¿ä¸æ‡‚ Lua å’Œ Lpeg,倘若你ä¸å«Œéº»çƒ¦ï¼Œåˆ©ç”¨ \type{\type} å’Œ \type{typing} 环境的逃逸(Escape)机制,也能实现代ç ç€è‰²ã€‚例如
+
+\starttyping[escape=no,option=TEX]
+\starttyping[escape=yes]
+/BTEX\darkgreen \#include/ETEX <stdio.h>
+/BTEX\darkblue int/ETEX main(/BTEX\darkblue void/ETEX)
+{
+ printf("/BTEX\darkred Hello world!\n/ETEX");
+ /BTEX\darkblue return/ETEX 0;
}
\stoptyping
-\line{
- \framed[frame=off,leftframe=on,rulethickness=4pt,framecolor=red]{foo}
- \framed[frame=off,topframe=on,rulethickness=4pt,framecolor=green]{foo}
- \framed[frame=off,rightframe=on,rulethickness=4pt,framecolor=blue]{foo}
- \framed[frame=off,bottomframe=on,rulethickness=4pt,framecolor=magenta]{foo}
-}
-
-\blank
-
-å¯ä»¥è®¾å®šç›’å­çš„宽度和高度,例如宽 10cm,高 2 cm çš„ç›’å­ï¼š
-
-\starttyping[option=TEX]
-\hbox to \textwidth{\hfill\framed[width=10cm,height=2cm]{foo}\hfill}
\stoptyping
-\hbox to \textwidth{\hfill\framed[width=10cm,height=2cm]{foo}\hfill}
-\section{对é½}
+\noindent 结果为
-\ConTeXt\ ç›’å­çš„å†…å®¹é»˜è®¤å±…ä¸­ï¼Œå³ \type{align=center},此外还有 8 ç§å¯¹é½æ–¹å¼ï¼š
-
-\starttyping[option=TEX]
-\line{
- \setupframed[width=1.95cm,height=1.95cm]
- \framed[align={flushleft,high}]{A}
- \framed[align={middle,high}]{A}
- \framed[align={flushright,high}]{A}
- \framed[align={flushright,lohi}]{A}
- \framed[align={flushright,low}]{A}
- \framed[align={middle,low}]{A}
- \framed[align={flushleft,low}]{A}
- \framed[align={flushleft,lohi}]{A}
+\start
+\setuptyping
+ [before={\startframedtext[width=\textwidth]},
+ after={\stopframedtext}]
+\starttyping[escape=yes]
+/BTEX\darkgreen \#include/ETEX <stdio.h>
+/BTEX\darkblue int/ETEX main(/BTEX\darkblue void/ETEX)
+{
+ printf("/BTEX\darkred Hello world!\n/ETEX");
+ /BTEX\darkblue return/ETEX 0;
}
\stoptyping
-\line{
- \setupframed[width=1.95cm,height=1.95cm]
- \framed[align={flushleft,high}]{A}
- \framed[align={middle,high}]{A}
- \framed[align={flushright,high}]{A}
- \framed[align={flushright,lohi}]{A}
- \framed[align={flushright,low}]{A}
- \framed[align={middle,low}]{A}
- \framed[align={flushleft,low}]{A}
- \framed[align={flushleft,lohi}]{A}
-}
+\stop
-\type{\setupframed} 所作的设定会影å“到其åŽçš„所有 \type{\framed},但是ä¸ä¼šå½±å“到其所处编组\footnote{还记得 \TeX\ 编组å—ï¼Ÿå³ \type[escape=no]{{...}}。}之外的 \type{\framed}。
-
-\section{背景}
-
-å¯å°†é¢œè‰²ä½œä¸º \type{\framed} 的背景。例如
+我应该一直都没有告诉你,\CONTEXT\ 该如何给文字ç€è‰²ã€‚\CONTEXT\ 预定义了一些标准颜色,å¯ç›´æŽ¥ä½¿ç”¨è¿™äº›é¢œè‰²çš„å字对文字进行ç€è‰²ï¼Œä¾‹å¦‚「\type{{\magenta 紫色}}ã€ï¼Œç»“果为「{\magenta 紫色}ã€ï¼Œä¹Ÿå¯ä»¥ä½¿ç”¨ \type{\color} 命令,例如「\type{\color[lightmagenta]{浅紫色}}ã€ï¼Œç»“果为「\color[lightmagenta]{浅紫色}ã€ã€‚以下代ç å¯ç”¨äºŽæŸ¥çœ‹ \CONTEXT\ 预定义颜色,
\starttyping[option=TEX]
-\inframed
- [background=color,
- backgroundcolor=lightgray,
- width=2cm,
- frame=off]{\bf foo}
+\startTEXpage[offset=4pt]
+\showcolor[rgb]
+\stopTEXpage
\stoptyping
-\noindent 结果为 \inframed[background=color,backgroundcolor=lightgray,width=2cm,frame=off]{\bf foo}。
+使用 \type{\definecolor} å¯ä»¥é€šè¿‡è®¾å®šçº¢ï¼ˆr)ã€ç»¿ï¼ˆg)ã€è“(b)分é‡å®šä¹‰é¢œè‰²ã€‚例如
-通过 overlay,å¯å°†ä¸€äº›ä»£ç ç‰‡æ®µçš„排版结果作为 \type{\framed} 的背景。例如
+\startsample
+\definecolor[myred][r=.8,g=.2,b=.2]
+\framed{\myred 给你点 color see seeï¼}
+\stopsample
+\simplesample[option=TEX]{\getsample}
-\starttyping[option=TEX]
-\defineoverlay
- [foo]
- [{\framed[width=3cm,frame=off,bottomframe=on]{}}]
-\midaligned{\inframed[background=foo,frame=off]{你好啊ï¼}}
-\stoptyping
+\noindent 上述代ç ä¸­å¯ä»¥è®©ä½ ä½ é¡ºä¾¿åˆå­¦ä¼šäº†å¦ä¸€ç§ç»™æ–‡å­—增加外框的方法。
-\defineoverlay
- [foo]
- [{\framed[width=3cm,frame=off,bottomframe=on]{}}]
-\midaligned{\inframed[background=foo,frame=off]{你好啊ï¼}}
-\blank
+亦å¯ä½¿ç”¨ \type{\colored} 直接设定 rgb 颜色对文字ç€è‰²ï¼Œä»¥ä¸‹ä»£ç ä¸Žä¸Šä¾‹ç­‰æ•ˆï¼š
-通过上述示例,现在你应该能有有七八分明白 \in[item-sym-diy] 节中带圈数字是如何实现的了,其关键代ç å¦‚下:
+\startsample
+\framed{\colored[r=.8,g=.2,b=.2]{给你点 color see seeï¼}}
+\stopsample
+\typesample[option=TEX]
-\starttyping[option=TEX]
-\startuseMPgraphic{foo}
- path p;
- p := fullcircle scaled 12pt;
- draw p withpen pencircle scaled .4pt
- withcolor darkred;
-\stopuseMPgraphic
-\defineoverlay[rsquare][\useMPgraphic{foo}]
-\def\fooframe#1{%
- \inframed[frame=off,background=rsquare]{#1}%
-}
-\stoptyping
-\startuseMPgraphic{foo}
- path p;
- p := fullcircle scaled 12pt;
- draw p withpen pencircle scaled .4pt
- withcolor darkred;
-\stopuseMPgraphic
-\defineoverlay[rsquare][\useMPgraphic{foo}]
-\def\fooframe#1{%
- \inframed[frame=off,background=rsquare]{#1}%
-}
-\noindent æ— éžæ˜¯å°†ä¸€ä¸ªåœ†åœˆå›¾å½¢ä½œä¸º \type{\inframed} 的背景罢了,而且对圈内的文字的长度有é™åˆ¶ï¼Œå­—数略多一些,便出圈了,例如 \type{\fooframe{123}},结果为 \fooframe{123}。ä¸è¿‡ï¼Œåªéœ€å¯¹ä¸Šè¿°ä»£ç ç•¥åŠ ä¿®æ”¹ï¼Œ
+\section{显示空格}
-\starttyping[option=TEX]
- p := fullcircle scaled \overlaywidth;
+\starttyping[escape=no,option=TEX]
+\starttyping[space=on]
+H E L L L O
\stoptyping
-\startuseMPgraphic{foo}
- path p;
- p := fullcircle scaled \overlaywidth;
- draw p withpen pencircle scaled .4pt
- withcolor darkred;
-\stopuseMPgraphic
-\defineoverlay[rsquare][\useMPgraphic{foo}]
-\def\fooframe#1{%
- \inframed[frame=off,background=rsquare]{#1}%
-}
-
-\noindent 便å¯è§£é™¤è¯¥é™åˆ¶ã€‚技巧是,用 overlay 的实际宽度作为å•ä½åœ†çš„放大å€æ•°ï¼Œæ•…而å¯ä¿è¯åœ†åœˆçš„直径å³åœˆå†…文字的长度,例如 \type{\fooframe{我有一个大房å­}},结果为 \fooframe{我有一个大房å­}。
+\stoptyping
+\start
+\setuptyping
+ [before={\startframedtext[width=\textwidth]},
+ after={\stopframedtext}]
+\starttyping[space=on]
+H E L L L O
+\stoptyping
+\stop
-\section{ç›’å­çš„深度}
+注æ„,\CONTEXT\ ä¸­æ–‡æ–­è¡Œéœ€è¦ \type{\setscript[hanzi]},但该命令会åžå™¬æ±‰å­—之间的空白字符,从而导致一个问题,在 \type{\type} å’Œ \type{typing} 环境中,汉字之间若存在空白字符,它们ä¸ä¼šè¢«è¾“出到排版结果,此时,åªæœ‰ \type{space=on} å¯ä»¥æ•‘急。
-如果你仔细观察,\ConTeXt\ ç›’å­é‡Œçš„内容在水平方å‘是精确居中的,但是在并éžå¦‚此。例如
+例如,以下 \type{typing} 环境未开å¯ç©ºæ ¼æ˜¾ç¤ºï¼š
-\starttyping[option=TEX]
-\inframed{ajk\framed{我看到一棵樱桃树}}。
+\starttyping
+本 è¡Œ æ¯ ä¸ª 汉 å­— 之 åŽ éƒ½ 有 空 格, 但 是 ä½  看 ä¸ è§ å®ƒï¼Œ 除 éž space=on ï¼
+\stoptyping
+\noindent 以下 \type{typing} 环境开å¯äº†ç©ºæ ¼æ˜¾ç¤ºï¼š
+\starttyping[space=on]
+本 è¡Œ æ¯ ä¸ª 汉 å­— 之 åŽ éƒ½ 有 空 格, 但 是 ä½  看 ä¸ è§ å®ƒï¼Œ 除 éž space=on ï¼
\stoptyping
-\noindent 结果为 \inframed{\framed{我看到一棵樱桃树}}。å¯è§ \type{\inframed} 内部的 \type{\framed} 的底部有ç€çœ‹ä¼¼å¤šä½™çš„空白。使用盒å­çš„å‚æ•° \type{depth} å¯ä»¥æ¶ˆé™¤è¿™äº›ç©ºç™½ï¼Œä½†é—®é¢˜åœ¨äºŽè¿™å¤„空白从何而æ¥åŠå…¶é«˜åº¦æ˜¯å¤šå°‘。该问题与底层 \TeX\ 的西文排版机制有关。
-
-首先,我们需è¦æ˜Žç™½ï¼Œè¥¿æ–‡æŽ’版,一行文字是有基线的,但基线并éžä½äºŽè¯¥è¡Œæ–‡å­—的最底端,而是è·æœ€åº•ç«¯æœ‰ä¸€æ®µè¾ƒå°çš„è·ç¦»ï¼Œå¦åˆ™æ‰€æœ‰è¥¿æ–‡å­—æ¯éƒ½åœ¨åŒä¸€æ¡çº¿ä¸Šäº†ã€‚在上述示例中,\type{\framed} 的底线便是其外围的 \type{\inframed} 所在行的基线。西文字体在设计时,æ¯ä¸ªå­—形(Glyph)是有基线ä½ç½®ï¼Œå› æ­¤åœ¨æŽ’版时å¯æ ¹æ®å®žé™…的基线ä½ç½®å¯¹å­—形进行对é½ã€‚一行文字的基线到该行的最底端的这段è·ç¦»ç§°ä¸ºæ·±åº¦ã€‚一行文字的基线到该行最顶端的这段è·ç¦»ç§°ä¸ºé«˜åº¦ã€‚因此,一行文字的真正高度等于深度 + 高度;在 \ConTeXt\ 中,它等于我们使用 \type{\setupinterlinespace} 设定的尺寸。
+\section{定义}
-无论是 \TeX\ 还是 \ConTeXt\ ç›’å­ï¼Œå®ƒä»¬æœ¬èº«æ˜¯æ²¡æœ‰æ·±åº¦çš„,但是当它们里é¢çš„文字或盒å­æœ‰æ·±åº¦æ—¶ï¼Œå®ƒä»¬ä¾¿æœ‰äº†æ·±åº¦ã€‚至于深度值具体是多大,å¯ä»¥å€ŸåŠ© \TeX\ çš„ç›’å­å¯„存器进行测é‡ã€‚例如,定义一个盒å­å¯„存器 box0:
+使用 \type{\definetype} å’Œ \type{\definetyping} å¯å®šä¹‰ä¸“用的抄录环境。例如
\starttyping[option=TEX]
-\setbox0\hbox{\inframed{\framed{我看到一棵樱桃树}}}
+\starttyping[escape=yes,space=on,option=TEX]
+Hello /BTEX\darkred\CONTEXT/ETEX!
\stoptyping
-
-\noindent 现在我们有了一个 0 å·ç›’å­ï¼Œä½¿ç”¨ \type{\wd},\type{\ht} å’Œ \type{\dp} å¯åˆ†åˆ«æµ‹é‡è¯¥ç›’å­çš„宽度ã€é«˜åº¦å’Œæ·±åº¦â€¦â€¦é¡ºä¾¿å¤ä¹ ä¸€ä¸‹è¡¨æ ¼çš„用法:
-
-\starttyping[option=TEX]
-\placetable[force]{box0 的几何信æ¯}{\tfx
- \starttabulate[|c|c|c|]
- \HL
- \NC 宽度 \NC 高度 \NC 深度 \NC\NR
- \HL
- \NC \the\wd0 \NC \the\ht0 \NC \the\dp0 \NC\NR
- \HL
- \stoptabulate
-}
\stoptyping
-\setbox0\hbox{\inframed{\framed{我看到一棵樱桃树}}}
-\setupcaption[table][location=top]
-\placetable[force]{box0 的几何信æ¯}{\tfx
- \starttabulate[|c|c|c|]
- \HL
- \NC 宽度 \NC 高度 \NC 深度 \NC\NR
- \HL
- \NC \the\wd0 \NC \the\ht0 \NC \the\dp0 \NC\NR
- \HL
- \stoptabulate
-}
-将上述所得深度信æ¯å–负作为 \type{\inframed} çš„å‚æ•° \type{depth} 的值,å³
+\noindent 倘若æ¯æ¬¡ä½¿ç”¨è¯¥ \type{typing} 环境,å¯èƒ½ä¼šè®©ä½ è§‰å¾—ç¹ç,且增加了输入出错的风险,采用以下方法å¯äºˆä»¥ç®€åŒ–:
\starttyping[option=TEX]
-\inframed[depth=-\dp0]{\framed{我看到一棵樱桃树}}
+\definetyping[foo][escape=yes,space=on,option=TEX]
+\startfoo
+Hello /BTEX\darkred\CONTEXT/ETEX!
+\stopfoo
\stoptyping
-\noindent 便å¯æ¶ˆé™¤æ·±åº¦ï¼Œç»“果为 \inframed[depth=-\dp0]{\framed{我看到一棵樱桃树}}。
\section{å°ç»“}
-\TeX\ ç›’å­æ˜¯æ— å½¢çš„。\ConTeXt\ ç›’å­æ˜¯æœ‰å½¢çš„。è€å­æ›¾è¯´è¿‡ï¼Œæ’无欲,以观其妙;æ’有欲,以观其所徼。故而,\TeX\ è¦æ‡‚一些,\ConTeXt\ 也è¦æ‡‚一些。
+五色使人目盲。å³ä½¿ \CONTEXT\ 的代ç ç€è‰²åŠŸèƒ½æœªèƒ½æ”¯æŒä½ çš„程åºä»£ç ï¼Œä¹Ÿè®¸å¹¶ä¸å€¼å¾—é—憾。也许真正值得é—憾的是,它未能激å‘你对 Lua 语言和 Lpeg 库的兴趣,而这正是 \CONTEXT\ 的代ç ç€è‰²åŠŸèƒ½æ”¯æŒçš„编程语言过少最é‡è¦çš„原因。 \ No newline at end of file
diff --git a/info/context-notes-zh-cn/src/11.tex b/info/context-notes-zh-cn/src/11.tex
index 7b5d538b3e..a98affcde7 100644
--- a/info/context-notes-zh-cn/src/11.tex
+++ b/info/context-notes-zh-cn/src/11.tex
@@ -1,810 +1,265 @@
-\chapter{学一点 \METAPOST}
+\chapter{ç›’å­}
-想必你已迫ä¸åŠå¾…想学习 \METAPOST\ 了。这大概是æ¥è‡ªäººç±»ä¸Šå¤åŸºå› çš„冲动。人类先学会的是绘画,而åŽæ‰æ˜¯æ–‡å­—。åªæ˜¯ä¸è¦å¦„å›¾é€šè¿‡è¿™åŒºåŒºä¸€ç« å†…å®¹æŽŒæ¡ \METAPOST,因为关于它的全部内容,足够写一本至少三百多页的书ç±äº†ã€‚ä¸è¿‡ï¼Œæœ¬ç« å†…容足以给你打开一扇窗户,让 \METAPOST\ 的优雅气æ¯æ‹‚过时常过于严肃的 \ConTeXt\ 世界。
+在 \in[item-sym-diy] 节中,你已ç»è§è¿‡ç›’å­äº†ï¼Œåªæ˜¯é‚£æ—¶å¯èƒ½ä½ è¿˜ä¸çŸ¥å…¶ç©¶ç«Ÿï¼Œæœ¬ç« å°†æ­å¼€å®ƒä»¬çš„一些端倪。也有å¯èƒ½ä½ æ—©å·²é’»ç ”过 Knuth 的《The \TeX\ Book》,对盒å­çš„研究之深已ç»è®©æˆ‘望风而拜,但是未必熟悉 \ConTeXt\ çš„ç›’å­ï¼Œæ•…而本章ä»æœ‰éƒ¨åˆ†å†…容值得一ç¹ã€‚
-\section{作图环境}
+\section{\TeX\ ç›’å­}
-\METAPOST\ 是一ç§è®¡ç®—机作图语言,与 \TeX\ 一样,皆为å®ç¼–程语言。使用 \METAPOST\ 语言编写的代ç å¯è¢« mpost 程åºç¼–è¯‘æˆ PS æ ¼å¼çš„图形文件。自 \LuaTeX\ 开始,mpost 的核心功能集æˆåˆ°äº† \LuaTeX\ 中,从此以åŽï¼Œåœ¨ \TeX\ 环境中使用 \METAPOST\ 语言作图便ä¸éœ€ä¾èµ–外部程åºäº†ã€‚
+å‰é¢å·²ç»å¤šæ¬¡æš—示和明示,\TeX\ 系统是 \ConTeXt\ 的底层,二者的关系犹如引擎(å‘动机)和汽车的关系。对 \TeX\ 引擎ä¸æ¯«ä¸æ‡‚,并ä¸å½±å“你学习和使用 \ConTeXt\ 排版一份精致的文档,但是懂一些引擎层é¢å·¥ä½œåŽŸç†ï¼Œæœªå¿…会有用处,但是你现在也并ä¸èƒ½ç¡®å®šå°†æ¥ä¼šä¸ä¼šæˆä¸ºä¸€å \TeX\ 黑客,如åŒä½ ä»Žå‰ä¹Ÿä»Žæœªæƒ³è¿‡æœ‰ä¸€å¤©ä¼šå­¦ä¹  \ConTeXt。
-\ConTeXt\ 为 \METAPOST\ 代ç æ供了五ç§çŽ¯å¢ƒï¼š
+在 \TeX\ 系统中,盒å­æ˜¯å¾ˆé‡è¦çš„部件。例如,在 \ConTeXt\ 的排版的æ¯ä¸€ä¸ªæ®µè½ï¼Œæ˜¯ä¸€ä¸ªç«–å‘ç›’å­ï¼Œå³ \type{\vbox},该盒å­ä¹‹å†…åˆæœ‰ä¸€äº›æ¨ªå‘ç›’å­ï¼Œå³ \type{\hbox},它们是段è½çš„æ¯ä¸€è¡Œã€‚我们å¯ä»¥ç›´æŽ¥ç”¨è¿™ä¸¤ç§ç›’å­æž„造一个ä¸ç”šè§„整的段è½ï¼š
-\starttyping
-\startMPcode ... \stopMPcode
-\startMPpage ... \stopMPpage
-\startuseMPgraphic{name} ... \stopuseMPgraphic
-\startuniqueMPgraphic{name} ... \stopuniqueMPgraphic
-\startreusableMPgraphic{name} ... \stopreusableMPgraphic
-\stoptyping
-
-\noindent 第一ç§çŽ¯å¢ƒç”¨äºŽä¸´æ—¶ä½œå›¾ï¼Œç”Ÿæˆçš„图形会被æ’入到代ç æ‰€åœ¨ä½ç½®ã€‚第二ç§çŽ¯å¢ƒæ˜¯ç”Ÿæˆå•ç‹¬çš„图形文件,以作其他用途。åŽé¢ä¸‰ç§çŽ¯å¢ƒï¼Œç”Ÿæˆçš„图形å¯æ ¹æ®çŽ¯å¢ƒçš„å称作为文章æ’图éšå¤„使用,但它们åˆæœ‰ä¸‰ç§ä¸åŒç”¨é€”:
-
-\startitemize[nowhite]
-\item useMPgraphic:æ¯è¢«ä½¿ç”¨ä¸€æ¬¡ï¼Œå¯¹åº”çš„ \METAPOST\ 代ç ä¾¿ä¼šè¢«é‡æ–°ç¼–译一次。
-\item uniqueMPgraphic:åªè¦å›¾å½¢æ‰€å¤„环境ä¸å˜ï¼Œ\METAPOST\ 代ç åªä¼šè¢«ç¼–译一次。
-\item reusableMPgraphic:无论如何使用,其 \METAPOST\ åªä¼šè¢«ç¼–译一次。
-\stopitemize
-
-\noindent 大多数情况下,建议选用 uniqueMPgraphic,但若图形中存在一些需è¦æ¯æ¬¡ä½¿ç”¨æ—¶éƒ½è¦æœ‰æ‰€å˜åŒ–的内容,å¯é€‰ç”¨ useMPgraphic。
-
-å¦å¤–需è¦æ³¨æ„,在 \ConTeXt\ 中使用 \METAPOST\ 时,通常会使用 \ConTeXt\ 定义的一些 \METAPOST\ å®ï¼Œè¿™äº›å®æž„æˆçš„集åˆï¼Œåæ›° \MetaFun。
-
-\section{画一个盒å­}
-
-\METAPOST\ 作图语å¥éµå®ˆåŸºæœ¬çš„英文语法,ç†è§£èµ·æ¥é¢‡ä¸ºç®€å•ã€‚例如,用粗度为 2 pt 的圆头笔用暗红色绘制一æ¡ç»è¿‡ $(0, 0)$,$(3\,{\rm cm}, 0)$,$(3\,{\rm cm}, 1\,{\rm cm})$,$(0, 1\,{\rm cm})$ çš„å°é—­è·¯å¾„,
-
-\starttyping[option=MP]
-\startMPcode
-pickup pencircle scaled 2pt;
-draw (0, 0) -- (3cm, 0) -- (3cm, 1cm) -- (0, 1cm) -- cycle withcolor darkred;
-\stopMPcode
-\stoptyping
-\startMPcode
-pickup pencircle scaled 2pt;
-draw (0, 0) -- (3cm, 0) -- (3cm, 1cm) -- (0, 1cm) -- cycle withcolor darkred;
-\stopMPcode
-
-上述代ç ä¸­ï¼Œ\type{(0, 0) -- ... -- cycle} 构造的是一æ¡å°é—­è·¯å¾„,å¯å°†å…¶ä¿å­˜äºŽè·¯å¾„å˜é‡ï¼š
-
-\starttyping[option=MP]
-path p;
-p := (0, 0) -- (3cm, 0) -- (3cm, 1cm) -- (0, 1cm) -- cycle;
-pickup pencircle scaled 2pt;
-draw p withcolor darkred;
-\stoptyping
-
-将路径ä¿å­˜åœ¨å˜é‡ä¸­ï¼Œæ˜¯ä¸ºäº†æ›´ä¾¿äºŽå¯¹è·¯å¾„进行一些è¿ç®—,例如
-
-\starttyping[option=MP]
-path p;
-p := (0, 0) -- (3cm, 0) -- (3cm, 1cm) -- (0, 1cm) -- cycle;
-pickup pencircle scaled 2pt;
-draw p withcolor darkred;
-draw p shifted (2cm, .5cm) withcolor darkblue;
-\stoptyping
-\startMPcode
-path p;
-p := (0, 0) -- (3cm, 0) -- (3cm, 1cm) -- (0, 1cm) -- cycle;
-pickup pencircle scaled 2pt;
-draw p withcolor darkred;
-draw p shifted (2cm, .5cm) withcolor darkblue;
-\stopMPcode
-\noindent 路径 \type{p} 被å‘å³å¹³ç§»äº† 2 cm,继而被å‘上平移动了 0.5 cm。
-
-还有一ç§æž„造矩形路径的方法:先构造一个å•ä½æ­£æ–¹å½¢ï¼Œç„¶åŽå¯¹å…¶ç¼©æ”¾ã€‚例如
-
-\starttyping[option=MP]
-pickup pencircle scaled 2pt;
-draw fullsquare xscaled 3cm yscaled 1cm withcolor darkred;
-\stoptyping
-\startMPcode
-pickup pencircle scaled 2pt;
-draw fullsquare xscaled 3cm yscaled 1cm withcolor darkred;
-\stopMPcode
-
-å¯ä»¥ä½¿ç”¨ \MetaFun\ å® \type{randomized} 对路径进行éšæœºæ‰°åŠ¨ã€‚例如,对一个宽为 3 cm,高为 1cm 的矩形路径以幅度 2mm 的程度予以扰动:
-
-\starttyping[option=MP]
-\startuseMPgraphic{éšæœºæ™ƒåŠ¨çš„矩形}
-pickup pencircle scaled 2pt;
-draw (fullsquare xscaled 3cm yscaled 1cm) randomized 2mm withcolor darkred;
-\stopuseMPgraphic
-\useMPgraphic{éšæœºæ™ƒåŠ¨çš„矩形}
-\stoptyping
-\startuseMPgraphic{éšæœºæ™ƒåŠ¨çš„矩形}
-pickup pencircle scaled 2pt;
-draw (fullsquare xscaled 3cm yscaled 1cm) randomized 2mm withcolor darkred;
-\stopuseMPgraphic
-\useMPgraphic{éšæœºæ™ƒåŠ¨çš„矩形}
+\startsample
+\vbox{
+ \hbox{离离原上è‰}\hbox{一å²ä¸€æž¯è£}\hbox{野ç«çƒ§ä¸å°½}\hbox{春风å¹åˆç”Ÿ}
+}
+\stopsample
+\sample[option=TEX][todo-list]{ç«–å‘ç›’å­å’Œæ¨ªå‘ç›’å­}{\externalfigure[11/vbox-and-hbox.pdf]}
-还记得 overlay å—?åªè¦å°†ä¸Šè¿° useMPgraphic 环境构造的图形制作为 overlay,便å¯å°†å…¶ä½œä¸º \type{\framed} 的背景,从而å¯ä»¥å¾—到一ç§å¤–观颇为别致的盒å­ã€‚
+横å‘ç›’å­å¯ä»¥æŒ‡å®šå®ƒçš„长度,竖å‘ç›’å­å¯ä»¥æŒ‡å®šå®ƒçš„高度。例如,
-\starttyping
-\defineoverlay[晃晃][\useMPgraphic{éšæœºæ™ƒåŠ¨çš„矩形}]
-\framed[frame=off,background=晃晃]{光辉å²æœˆ}
+\starttyping[option=TEX]
+\hbox to 5cm {赋得å¤åŽŸè‰é€åˆ«}
+\vbox to 3cm {
+ \hbox{离离原上è‰}\hbox{一å²ä¸€æž¯è£}\hbox{野ç«çƒ§ä¸å°½}\hbox{春风å¹åˆç”Ÿ}
+}
\stoptyping
-\defineoverlay[晃晃][\useMPgraphic{éšæœºæ™ƒåŠ¨çš„矩形}]
-\dontleavehmode\kern .25em\framed[frame=off,background=晃晃]{光辉å²æœˆ}
-在 \ConTeXt\ 为 \METAPOST\ æ供的作图环境里,å¯åˆ†åˆ«é€šè¿‡ \type{\overlaywidth} å’Œ \type{\overlayheight} 获得 overlay 的宽度和高度。在将 overlay 作为 \type{\framed} 的背景时,\type{\framed} 的宽度和高度便是 overlay 的宽度和高度。基于这一特性,便å¯å®žçŽ° \METAPOST\ 绘制的图形能够自动适应 \type{\framed} 的宽度和高度的å˜åŒ–。例如
+在示例 \in[rsquare] 中,\type{\hbox} 用于包å«ä¸€å‰¯ä½¿ç”¨ \METAPOST\ 语言绘制的矢é‡æ’图,关键代ç å¦‚下:
-\starttyping[option=MP]
-\startuseMPgraphic{æ–°çš„éšæœºæ™ƒåŠ¨çš„矩形}
-path p;
-p := fullsquare xscaled \overlaywidth yscaled \overlayheight;
-pickup pencircle scaled 2pt;
-draw p randomized 2mm withcolor darkred;
+\starttyping[option=TEX]
+\startuseMPgraphic{foo}
+... ... ...
\stopuseMPgraphic
-
-\defineoverlay[新的晃晃][\useMPgraphic{æ–°çš„éšæœºæ™ƒåŠ¨çš„矩形}]
-\framed
- [frame=off,background=新的晃晃]
- {今天åªæœ‰æ®‹ç•™çš„躯壳,迎接光辉å²æœˆï¼Œé£Žé›¨ä¸­æŠ±ç´§è‡ªç”±ã€‚}
+\lower.2ex\hbox{\useMPgraphic{foo}}
\stoptyping
-\startuseMPgraphic{æ–°çš„éšæœºæ™ƒåŠ¨çš„矩形}
-path p;
-p := fullsquare xscaled \overlaywidth yscaled \overlayheight;
-pickup pencircle scaled 2pt;
-draw p randomized 2mm withcolor darkred;
-\stopuseMPgraphic
-
-\defineoverlay[新的晃晃][\useMPgraphic{æ–°çš„éšæœºæ™ƒåŠ¨çš„矩形}]
-\framed[frame=off,background=新的晃晃]{今天åªæœ‰æ®‹ç•™çš„躯壳,迎接光辉å²æœˆï¼Œé£Žé›¨ä¸­æŠ±ç´§è‡ªç”±ã€‚}
+\noindent 其中 \type{useMPgraphic} 环境中的 \METAPOST\ 代ç ä¼šè¢« \type{\useMPgraphic{foo}} æ交给 \TeX\ 引擎。\TeX\ 引擎会调用 metapost 程åºå°† \METAPOST\ 代ç ç¼–è¯‘æˆ PDF æ ¼å¼çš„图片,然åŽäº¤ç»™ \ConTeXt。最åŽç”± \ConTeXt\ 将图片æ’入到 \type{\useMPgraphic{foo}} 所在的横å‘ç›’å­é‡Œã€‚\type{\lower .2ex} å¯ä»¤ä½äºŽå…¶åŽçš„横å‘ç›’å­ä¸‹æ²‰ 0.2 ex。长度å•ä½ ex 类似于 em,也是一个相对尺寸,它是当å‰æ‰€ç”¨å­—ä½“ä¸­çš„å­—æ¯ x 对应的字形的高度。从现在开始è¦è®°ä½ï¼Œæ¨ªå‘è·ç¦»ç”¨ em,竖å‘è·ç¦»ç”¨ ex,ä¸è¿‡è¿™åªæ˜¯å»ºè®®ï¼Œå¹¶éž \TeX\ 世界的法律。
-对于需è¦é‡å¤ä½¿ç”¨çš„ç›’å­ï¼Œä¸ºäº†é¿å…æ¯æ¬¡é‡å¤è®¾ç½®å…¶æ ·å¼ï¼Œå¯ä»¥å°†å®ƒå®šä¹‰ä¸ºä¸“用盒å­ã€‚例如
+还有一ç§æ¨ªå‘ç›’å­ \type{\line},它的宽度是当å‰æ®µè½çš„宽度,å¯è®©å…¶ä¸­çš„文字å‘两边伸展并与边界对é½ï¼Œä¾‹å¦‚
\starttyping[option=TEX]
-\defineframed[funnybox][frame=off,background=新的晃晃]
-\funnybox{今天åªæœ‰æ®‹ç•™çš„躯壳,迎接光辉å²æœˆï¼Œé£Žé›¨ä¸­æŠ±ç´§è‡ªç”±ã€‚}
-\stoptyping
-
-\METAPOST\ å¯ä»¥ä¸ºä¸€æ¡å°é—­è·¯å¾„填充颜色。在此需è¦æ˜Žç¡®ï¼Œä½•ä¸ºå°é—­è·¯å¾„。例如
-
-\starttyping[option=MP]
-path p, q, r;
-p := (0, 0) -- (1, 0) -- (1, 1) -- (0, 0) -- (0, 0);
-q := (0, 0) -- (1, 0) -- (1, 1) -- (0, 0) -- cycle;
-r := fullsquare;
-\stoptyping
-
-\noindent 其中路径 \type{p} 的终点的åæ ‡æ°å¥½æ˜¯å…¶èµ·ç‚¹ï¼Œä½†å®ƒå¹¶éžå°é—­è·¯å¾„,而路径 \type{q} å’Œ \type{r} 皆为å°é—­è·¯å¾„。下é¢ç¤ºä¾‹ï¼Œä¸ºå°é—­è·¯å¾„填充颜色:
-
-\starttyping[option=MP]
-path p;
-p := (fullsquare xscaled 3cm yscaled 1cm) randomized 2mm;
-pickup pencircle scaled 2pt;
-fill p withcolor gray;
-draw p withcolor darkred;
+\line{\darkred\bf 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。}
\stoptyping
-\startMPcode
-path p;
-p := (fullsquare xscaled 3cm yscaled 1cm) randomized 2mm;
-pickup pencircle scaled 2pt;
-fill p withcolor darkgray;
-draw p withcolor darkred;
-\stopMPcode
-\noindent 注æ„,对于å°é—­è·¯å¾„,应当先填充颜色,å†ç»˜åˆ¶è·¯å¾„,å¦åˆ™æ‰€å¡«å……的颜色会覆盖一部分路径线æ¡ã€‚
-
-\section{颜色}
-
-\METAPOST\ 以å«æœ‰ä¸‰ä¸ªåˆ†é‡çš„å‘é‡è¡¨ç¤ºé¢œè‰²ã€‚å‘é‡çš„三个分é‡åˆ†åˆ«è¡¨ç¤ºçº¢è‰²ã€ç»¿è‰²å’Œè“色,å–值范围为 [0, 1],例如 \type{(0.4, 0.5, 0.6)}。å¯å°†é¢œè‰²ä¿å­˜åˆ° color 类型的å˜é‡ä¸­ï¼Œä»¥å¤‡ç»˜å›¾ä¸­é‡å¤ä½¿ç”¨ã€‚例如定义一个值为暗红色的颜色å˜é‡ï¼š
-
-\starttyping[option=MP]
-color foo;
-foo := (0.3, 0, 0);
-\stoptyping
-
-由于 METAPOST 内部已ç»å®šä¹‰äº†ç”¨äºŽè¡¨ç¤ºçº¢è‰²çš„å˜é‡ \type{red},因此 \type{foo} 的定义也å¯å†™ä¸º
+\line{\darkred\bf 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。}
-\starttyping[option=MP]
-color foo;
-foo := 0.3 * red;
-\stoptyping
+看到上述示例,想必你想起了之å‰æˆ‘们曾在文章标题的样å¼è®¾å®šæ—¶ï¼Œç”¨ \type{{middle,broad}} 抑制的 \ConTeXt\ 触å‘汉字间隙的伸长特性,该特性与\type{\line} 的效果éžå¸¸ç›¸ä¼¼ã€‚
-\noindent å°äºŽ 1 çš„å€æ•°ï¼Œå¯ä»¥å¿½ç•¥å‰ç¼€ 0,且å¯ä»¥ç›´æŽ¥ä½œç”¨äºŽé¢œè‰²ï¼š
+使用 \type{\hfill} 或 \type{\hss} å¯å¯¹æ¨ªå‘ç›’å­é‡Œçš„内容进行挤压。例如
-\starttyping[option=MP]
-foo := .3red;
-\stoptyping
+\starttyping[option=TEX]
+\line{\hfill 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。}
+\line{我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。\hfill}
+\line{\hfill 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。\hfill}
+\line{\hss 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。}
+\line{我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。\hss}
+\line{\hss 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。\hss}
+\stoptyping
+
+\blueframed{
+ \vbox{
+ \line{\hfill 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。}
+ \line{我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。\hfill}
+ \line{\hfill 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。\hfill}
+ \line{\hss 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。}
+ \line{我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。\hss}
+ \line{\hss 我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。\hss}
+ }
+}
-使用 \type{transparent} å®å¯ç”¨äºŽæž„造带有é€æ˜Žåº¦çš„颜色值。例如
+\type{\hfill} å’Œ \type{\hss},都是å¯æ— é™ä¼¸ç¼©çš„粘连,还有一个伸缩能力弱于 \type{\hfill} çš„ \type{\hfil}。竖å‘çš„å¯æ— é™ä¼¸ç¼©çš„粘连有 \type{\vfil},\type{\vfill} å’Œ \type{\vss}。
-\starttyping[option=MP]
-path p; p := fullsquare scaled 1cm;
-color foo; foo := .3red;
-pickup pencircle scaled 4pt;
-draw p withcolor transparent (1, 0.3, foo);
-draw p shifted (.5cm, .5cm) withcolor transparent (1, 0.25, blue);
-\stoptyping
-\startMPcode
-path p; p := fullsquare scaled 1cm;
-color foo; foo := .3red;
-pickup pencircle scaled 4pt;
-draw p withcolor transparent (1, 0.3, foo);
-draw p shifted (.5cm, .5cm) withcolor transparent (1, 0.25, blue);
-\stopMPcode
-\noindent \type{transparent} 的第一个å‚数表示选用的颜色é€æ˜Žæ–¹æ³•ï¼Œå…±æœ‰ 12 ç§æ–¹æ³•å¯é€‰ï¼š
-
-\startitemize[n,packed,columns,four]
-\item normal
-\item multiply
-\item screen
-\item overlay
-\item softlight
-\item hardlight
-\item colordodge
-\item colorburn
-\item darken
-\item lighten
-\item difference
-\item exclusion
-\stopitemize
-\noindent 第二个å‚数表示é€æ˜Žåº¦ï¼Œå–值范围 [0, 1],其值越大,é€æ˜Žç¨‹åº¦è¶Šä½Žã€‚第三个å‚数为颜色值。需è¦æ³¨æ„的是,\METAPOST\ 并ä¸æ”¯æŒä»¥ \type{color} 类型的å˜é‡ä¿å­˜å¸¦é€æ˜Žåº¦çš„颜色值,而且 \METAPOST\ 里也没有与之对应的å˜é‡ç±»åž‹ã€‚
-
-\section{文字}
-
-使用 \MetaFun\ å® \type{textext} å¯åœ¨ \METAPOST\ 图形中æ’入文字,且基于 \METAPOST\ 图形å˜æ¢å‘½ä»¤å¯å¯¹æ–‡å­—进行定ä½ã€ç¼©æ”¾ã€æ—‹è½¬ã€‚例如
-
-\starttyping[option=MP]
-string s; % 字符串类型å˜é‡
-s = "\color[darkred]{\bf 江山如此多娇}";
-draw textext(s);
-draw textext(s) shifted (4cm, 0);
-draw textext(s) scaled 1.5 shifted (8cm, 0) ;
-draw textext(s) scaled 1.5 rotated 45 shifted (12cm, 0);
-\stoptyping
-\startMPcode
-string s; s = "\color[darkred]{\bf 江山如此多娇}";
-draw textext(s);
-draw thetextext(s, (4cm, 0));
-draw textext(s) scaled 1.5 shifted (8cm, 0) ;
-draw textext(s) scaled 1.5 rotated 45 shifted (12cm, 0);
-\stopMPcode
-
-也å¯ä½¿ç”¨ \type{\thetextext} å®ç›´æŽ¥å¯¹æ–‡å­—进行定ä½ï¼Œä»Žè€Œå¯çœåŽ» \type{shifted} å˜æ¢ã€‚例如
-
-\starttyping
-string s; s = "{\bf 江山如此多娇}";
-draw (0, 0) withpen pensquare scaled 11pt withcolor darkred;
-draw textext(s, (4cm, 0)) withcolor darkred;
-\stoptyping
-\startMPcode
-string s; s = "{\bf 江山如此多娇}";
-draw (0, 0) withpen pensquare scaled 12pt withcolor darkred;
-draw thetextext(s, (4cm, 0)) withcolor darkred;
-\stopMPcode
+\section{\ConTeXt\ ç›’å­}
-\section{æ–¹å‘路径}
+在 \ConTeXt\ 层é¢ï¼Œé€šå¸¸å¾ˆå°‘使用 \TeX\ ç›’å­ï¼Œè€Œæ˜¯ä½¿ç”¨ \type{\inframed} å’Œ \type{\framed}——å‰è€…是åŽè€…的特例。与 \TeX\ ç›’å­ç›¸æ¯”,\ConTeXt\ 层é¢çš„ç›’å­å¯ä»¥æ˜¾ç¤ºè¾¹æ¡†ï¼Œä¸”有éžå¸¸å¤šçš„å‚æ•°å¯ä»¥å®šåˆ¶å®ƒä»¬çš„外观。
-\METAPOST\ å® \type{drawarrow} å¯ç»˜åˆ¶å¸¦ç®­å¤´çš„路径。例如
+\type{\inframed} 用于正文,å¯ç”¨äºŽç»™ä¸€è¡Œæ–‡å­—增加边框,例如
-\starttyping[option=MP]
-path p; p := (0, 0) -- (4cm, 0) -- (4cm, 2cm) -- (0, 2cm) -- (0, 1cm);
-pickup pencircle scaled 2pt;
-drawarrow p withcolor darkred;
-drawarrow p shifted (6cm, 0) dashed (evenly scaled .5mm) withcolor darkred;
-\stoptyping
-\startMPcode
-path p; p := (0, 0) -- (4cm, 0) -- (4cm, 2cm) -- (0, 2cm) -- (0, 1cm);
-pickup pencircle scaled 2pt;
-drawarrow p withcolor darkred;
-drawarrow p shifted (6cm, 0) dashed (evenly scaled .5mm) withcolor darkred;
-\stopMPcode
-
-\noindent 上述代ç ä¹Ÿç»™å‡ºäº†è™šçº¿è·¯å¾„的画法。
-
-\METAPOST\ 的任何一æ¡è·¯å¾„,从起点到终点å¯åŸºäºŽå–值范围为 [0, 1] çš„å‚数选择该路径上的æŸä¸€ç‚¹ã€‚基于该功能å¯å®žçŽ°è·¯å¾„标注。例如选择路径å‚æ•° 0.5 对应的点,在该点å³ä¾§æ”¾ç½® \ConTeXt\ 旋转 90 度的文字:
-
-\starttyping[option=MP]
-path p; p := (0, 0) -- (4cm, 0) -- (4cm, 2cm) -- (0, 2cm) -- (0, 1cm);
-pair pos; pos := point .5 along p;
-pickup pencircle scaled 2pt;
-drawarrow p withcolor darkred;
-draw pos withpen pensquare scaled 4pt withcolor darkgreen;
-draw thetextext.rt("\rotate[rotation=-90]{路过}", pos shifted (1mm, 0));
-\stoptyping
-\startMPcode
-path p; p := (0, 0) -- (4cm, 0) -- (4cm, 2cm) -- (0, 2cm) -- (0, 1cm);
-pair pos; pos := point .5 along p;
-pickup pencircle scaled 2pt;
-drawarrow p withcolor darkred;
-draw pos withpen pensquare scaled 4pt withcolor darkgreen;
-draw thetextext.rt("\rotate[rotation=-90]{路过}", pos shifted (1mm, 0));
-\stopMPcode
-
-\noindent 上述代ç ä¸­å‡ºçŽ°äº† \type{thetextext} çš„åŽç¼€å½¢å¼ã€‚除了默认形å¼ï¼Œ\type{thetextext} 还有 4 ç§åŽç¼€å½¢å¼ï¼ŒåŽç¼€å为 \inframed{\type{.lft}},\inframed{\type{.top}},\inframed{\type{.rt}} å’Œ \inframed{\type{.bot}},分别表示将文字放在指定ä½ç½®çš„左侧ã€ä¸Šæ–¹ã€å³ä¾§å’Œä¸‹æ–¹ã€‚
-
-\section{ç”»é¢}
-
-\METAPOST\ 有一ç§å˜é‡ç±»åž‹ \type{picture},å¯å°†å…¶ç”¨äºŽå°†ä¸€ç»„绘图语å¥åˆå¹¶ä¸ºä¸€ä¸ªå›¾å½¢ï¼Œç„¶åŽäºˆä»¥ç»˜åˆ¶ã€‚使用 \METAPOST\ å® \type{image} å¯æž„造 \type{picture} 实例。例如
-
-\starttyping[option=MP]
-path a; a := fullsquare xscaled 4cm yscaled 1cm;
-picture p; p := image(fill a withcolor darkgray;
- draw a withpen pencircle scaled 2pt withcolor darkblue;);
-draw p;
-\stoptyping
-\startMPcode
-path a; a := fullsquare xscaled 4cm yscaled 1cm;
-picture p; p := image(fill a withcolor darkgray;
- draw a withpen pencircle scaled 2pt withcolor darkblue;);
-draw p;
-\stopMPcode
-
-使用 \METAPOST\ å® \type{center} å¯ä»¥èŽ·å¾— \type{picture} 实例的中心å标,结果å¯ä¿å­˜äºŽä¸€ä¸ª \type{pair} 类型的å˜é‡ã€‚例如
-
-\starttyping[option=MP]
-picture p; p := image(draw textext("密云ä¸é›¨ï¼Œè‡ªæˆ‘西郊"););
-pair c; c := center p;
-draw c withpen pensquare scaled 4pt withcolor darkred;
-draw p withcolor darkblue;
-\stoptyping
-\startMPcode
-picture p; p := image(draw textext("密云ä¸é›¨ï¼Œè‡ªæˆ‘西郊"););
-pair c; c := center p;
-draw c withpen pensquare scaled 4pt withcolor darkred;
-draw p withcolor darkblue;
-\stopMPcode
-
-使用 \MetaFun\ å® \type{bbwidth} å’Œ \type{bbheight} å¯ä»¥èŽ·å¾— \type{picture} 实例的宽度和高度。使用这两个å®ï¼Œå¯ä¸ºä»»ä½•å›¾å½¢å’Œæ–‡å­—构造边框。例如
-
-\starttyping[option=MP]
-picture p; p := image(draw textext("归妹愆期,迟归有时"));
-numeric w, h; w := bbwidth(p); h := bbheight(p);
-path q; q := fullsquare xscaled w yscaled h;
-\stoptyping
-\starttyping[option=MP]
-fill q withcolor darkgray;
-draw q withpen pencircle scaled 2pt withcolor darkred;
-draw p;
-\stoptyping
-\startMPcode
-picture p; p := image(draw textext("归妹愆期,迟归有时"));
-numeric w, h; w := bbwidth(p); h := bbheight(p);
-path q; q := fullsquare xscaled w yscaled h;
-fill q withcolor darkgray;
-draw q withpen pencircle scaled 2pt withcolor darkred;
-draw p;
-\stopMPcode
-
-上述实例为文字构造的边框太紧了,综åˆåˆ©ç”¨çŽ°æœ‰æ‰€å­¦ï¼Œè®©å®ƒå®½æ¾ä¸€äº›å¹¶ä¸å›°éš¾ï¼š
-
-\starttyping[option=MP]
-picture p; p := image(draw textext("归妹愆期,迟归有时"));
-numeric w, h; w := bbwidth(p); h := bbheight(p);
-numeric offset; offset := 5mm;
-path q;
-q := fullsquare xscaled (w + offset) yscaled (h + offset) shifted center p;
-
-fill q withcolor darkgray;
-draw q withpen pencircle scaled 2pt withcolor darkred;
-draw p;
-\stoptyping
-\startMPcode
-picture p; p := image(draw textext("归妹愆期,迟归有时"));
-numeric w, h; w := bbwidth(p); h := bbheight(p);
-numeric offset; offset := 5mm;
-path q; q := fullsquare xscaled (w + offset) yscaled (h + offset) shifted center p;
-fill q withcolor darkgray;
-draw q withpen pencircle scaled 2pt withcolor darkred;
-draw p;
-\stopMPcode
-
-\section[macro]{å®}
-
-定义一个å®ï¼Œä»¤å…¶æŽ¥å—一个字符串类型的å‚数,返回一个矩形框,并令文字居于矩形框中心:
-
-\starttyping[option=MP]
-vardef framed (expr text, offset) =
- picture p; p := image(draw textext(text));
- numeric w, h; w := bbwidth(p); h := bbheight(p);
- path q;
- q := fullsquare xscaled (w + offset) yscaled (h + offset) shifted center p;
- image(fill q withcolor lightgray;
- draw q withpen pencircle scaled 2pt withcolor darkred;
- draw p;)
-enddef;
+\starttyping[option=TEX]
+\type{\inframed{\type{\inframed{...}}}}
\stoptyping
-\noindent 使用上述定义的å®ï¼š
+\noindent 结果为 \inframed{\type{\inframed{...}}}。倘若使用 \type{\framed},例如
-\starttyping[option=MP]
-draw framed("{\bf 亢龙有悔}", 5mm);
-\stoptyping
-\startMPcode
-vardef framed (expr text, offset) =
- picture p; p := image(draw textext(text));
- numeric w, h; w := bbwidth(p); h := bbheight(p);
- path q;
- q := fullsquare xscaled (w + offset) yscaled (h + offset) shifted center p;
- image(fill q withcolor lightgray;
- draw q withpen pencircle scaled 2pt withcolor darkred;
- draw p;)
-enddef;
-draw framed("{\bf 亢龙有悔}", 5mm);
-\stopMPcode
-
-\METAPOST\ çš„ \type{vardef} 用于定义一个有返回值的å®ï¼Œå®å®šä¹‰çš„最åŽä¸€æ¡è¯­å¥å³è¿”回值,该æ¡è¯­å¥ä¸å¯ä»¥åˆ†å·ä½œä¸ºç»“尾。\METAPOST\ 还有其他几ç§å®å®šä¹‰å½¢å¼ï¼Œä½†æ˜¯å¯¹äºŽå¤§å¤šæ•°ä½œå›¾ä»»åŠ¡è€Œè¨€ï¼Œ\type{vardef} 已足够应付。
-
-\section[sec:flow-chart]{画一幅简å•çš„æµç¨‹å›¾}
-
-现在,请跟éšæˆ‘敲击键盘的手指,é€æ­¥ç”»ä¸€å¹…æ述数字求和过程的æµç¨‹å›¾ï¼Œå¸Œæœ›è¿™æ¬¡æ—…程能让你对 \METAPOST\ 的基本语法有一些全é¢çš„认识。
-
-首先,构造一个结点,表示数æ®è¾“入“â€
-
-\starttyping[option=MP]
-string f; f := "\framed[frame=off,align=center]";
-picture a;
-a := image(
- % ç¬¦å· & 用于拼接两个字符串
- draw textext(f & "{$i\leftarrow 1$\\$s\leftarrow 0$}");
-);
+\starttyping[option=TEX]
+\type{\framed{\type{\framed{...}}}}
\stoptyping
-然åŽï¼Œç”¨ \in[macro] 节定义的 \type{framed} å®æž„造两个è¿ç®—过程结点:
-
-\starttyping[option=MP]
-numeric offset; offset := 5mm;
-picture b; b := framed(f & "{$s\leftarrow s + i$}", offset);
-picture c; c := framed(f & "{$i\leftarrow i + 1$}", offset);
-\stoptyping
+\noindent 结果为 \framed{\type{\framed{...}}}。å¯ä»¥å‘现,\type{\inframed} 更适åˆåœ¨æ­£æ–‡ä¸­ä½¿ç”¨ï¼Œå› ä¸ºå®ƒèƒ½ä¸Žæ–‡å­—基线对é½ã€‚事实上,\type{\inframed} 与 \type{\framed[location=low]} 等效,故而å‰è€…是åŽè€…的特例。例如
-还需è¦å®šä¹‰ä¸€ä¸ªå®ï¼Œç”¨å®ƒæž„造è±å½¢çš„æ¡ä»¶åˆ¤æ–­ç»“点:
-
-\starttyping[option=MP]
-vardef diamond (expr text, offset) =
- picture p; p := image(draw textext(text));
- numeric w, h; w := bbwidth(p); h := bbheight(p);
- path q;
- q := fulldiamond xscaled (w + offset) yscaled (h + offset) shifted center p;
- image(fill q withcolor darkgray;
- draw q withpen pencircle scaled 2pt withcolor darkred;
- draw p withcolor white;)
-enddef;
-picture d; d := diamond(f & "{$i > 100$}", 3 * offset);
+\starttyping[option=TEX]
+\framed[location=low]{\type{\framed[location=low]{...}}}
\stoptyping
-最åŽï¼Œå†æž„造一个结点表示程åºè¾“出:
-
-\starttyping[option=MP]
-picture e;
-e := image(draw textext(f & "{$s$}"););
-\stoptyping
+\noindent 结果为 \framed[location=low]{\type{\framed[location=low]{...}}}。
-ä¿æŒç»“点 \type{a} ä¸åŠ¨ï¼Œå¯¹ \type{b},\type{c},\type{d} å’Œ \type{e} 进行定ä½ï¼š
+如果ä¸å¸Œæœ› \type{\framed} 显示边框,åªéœ€ \type{\framed[frame=off]{...}},也å¯ä»¥å•ç‹¬æ˜¾ç¤ºæŸæ¡è¾¹çº¿ï¼Œå¹¶è®¾å®šè¾¹çº¿ç²—度和颜色:
-\starttyping[option=MP]
-b := b shifted (0, -2cm);
-c := c shifted (4cm, -4.5cm);
-d := d shifted (0, -4.5cm);
-e := e shifted (0, -7cm);
+\starttyping[option=TEX]
+\line{
+ \framed[frame=off,leftframe=on,rulethickness=4pt,framecolor=red]{foo}
+ \framed[frame=off,topframe=on,rulethickness=4pt,framecolor=green]{foo}
+ \framed[frame=off,rightframe=on,rulethickness=4pt,framecolor=blue]{foo}
+ \framed[frame=off,bottomframe=on,rulethickness=4pt,framecolor=magenta]{foo}
+}
\stoptyping
+\line{
+ \framed[frame=off,leftframe=on,rulethickness=4pt,framecolor=red]{foo}
+ \framed[frame=off,topframe=on,rulethickness=4pt,framecolor=green]{foo}
+ \framed[frame=off,rightframe=on,rulethickness=4pt,framecolor=blue]{foo}
+ \framed[frame=off,bottomframe=on,rulethickness=4pt,framecolor=magenta]{foo}
+}
-现在å¯ä»¥ç”»å‡ºæ‰€æœ‰ç»“点了,å³
-
-\starttyping[option=MP]
-draw a; draw b; draw c; draw d; draw e;
-\stoptyping
-\midaligned{\externalfigure[11-flowchart-1.pdf]}
\blank
-现在开始构造连接å„结点的路径。首先构造结点 \type{a} 的底部中点到 \type{b} 的顶部中点的路径:
-
-\starttyping[option=MP]
-path ab;
-ab := .5[llcorner a, lrcorner a] -- .5[ulcorner b, urcorner b];
-\stoptyping
-
-\noindent 其中 \type{llcorner} 用于获å–路径或画é¢å®žä¾‹çš„最å°åŒ…围盒的左下角顶点å标。åŒç†ï¼Œ\type{ulcorner},\type{urcorner} å’Œ \type{lrcorner} 分别获å–包围盒的左上角ã€å³ä¸Šè§’å’Œå³ä¸‹è§’顶点å标。\type{.5[..., ...]} 用于计算两个点连线的中点。
+å¯ä»¥è®¾å®šç›’å­çš„宽度和高度,例如宽 10cm,高 2 cm çš„ç›’å­ï¼š
-用类似的方法å¯ä»¥æž„造其他连接å„结点的路径:
-
-\starttyping[option=MP]
-path bd;
-bd := .5[llcorner b, lrcorner b] -- .5[ulcorner d, urcorner d];
-path dc;
-dc := .5[lrcorner d, urcorner d] -- .5[ulcorner c, llcorner c];
-path cb;
-cb := .5[ulcorner c, urcorner c] -- (4cm, -2cm) -- .5[urcorner b, lrcorner b];
-path de;
-de := .5[llcorner d, lrcorner d] -- .5[ulcorner e, urcorner e];
+\starttyping[option=TEX]
+\hbox to \textwidth{\hfill\framed[width=10cm,height=2cm]{foo}\hfill}
\stoptyping
+\hbox to \textwidth{\hfill\framed[width=10cm,height=2cm]{foo}\hfill}
-画出所有路径:
-
-\starttyping[option=MP]
-drawarrow ab withcolor darkred; drawarrow bd withcolor darkred;
-drawarrow cb withcolor darkred; drawarrow dc withcolor darkred;
-drawarrow de withcolor darkred;
-\stoptyping
-\midaligned{\externalfigure[11-flowchart-2.pdf]}
-\blank
+\section{对é½}
-最åŽä¸€æ­¥ï¼Œè·¯å¾„标注:
+\ConTeXt\ ç›’å­çš„å†…å®¹é»˜è®¤å±…ä¸­ï¼Œå³ \type{align=center},此外还有 8 ç§å¯¹é½æ–¹å¼ï¼š
-\starttyping[option=MP]
-pair no; no := point .4 along dc;
-pair yes; yes := point .5 along de;
-draw thetextext.top("å¦", no);
-draw thetextext.rt("是", yes);
-\stoptyping
-\midaligned{\externalfigure[11-flowchart-3.pdf]}
-
-\section{代ç ç®€åŒ–}
-
-\in[sec:flow-chart] 节中用于绘制程åºæµç¨‹å›¾çš„代ç å­˜åœ¨è®¸å¤šé‡å¤ã€‚我们å¯ä»¥å°è¯•ä½¿ç”¨æ¡ä»¶ã€å¾ªçŽ¯ï¼Œå®ç­‰å½¢å¼å¯¹ä»£ç è¿›è¡Œç®€åŒ–,但我对它们给出的讲解并ä¸ä¼šç»†è‡´ï¼Œä¸ºçš„正是走马观花,观其大略。
-
-é¦–å…ˆï¼Œè§‚å¯Ÿå® \type{framed} å’Œ \type{diamond} 的定义,å‘现二者仅有的ä¸åŒæ˜¯å‰è€…用 \type{fullsquare} 绘制盒å­ï¼ŒåŽè€…用 \type{fulldiamond}。因此,å¯ä»¥é‡æ–°å®šä¹‰ä¸€ä¸ªæ›´ä¸ºçµæ´»çš„å®ï¼Œç”¨äºŽåˆ¶ä½œç»“点:
-
-\starttyping[option=MP]
-vardef make_node(expr text, shape, offset) =
- picture p; p := image(draw textext(text));
- numeric w, h; w := bbwidth(p); h := bbheight(p);
- if path shape:
- path q;
- q := shape xysized (w + offset, h + offset) shifted center p;
- image(fill q withcolor lightgray;
- draw q withpen pencircle scaled 2pt withcolor darkred;
- draw p;)
- else:
- image(draw p;)
- fi
-enddef;
+\starttyping[option=TEX]
+\line{
+ \setupframed[width=1.95cm,height=1.95cm]
+ \framed[align={flushleft,high}]{A}
+ \framed[align={middle,high}]{A}
+ \framed[align={flushright,high}]{A}
+ \framed[align={flushright,lohi}]{A}
+ \framed[align={flushright,low}]{A}
+ \framed[align={middle,low}]{A}
+ \framed[align={flushleft,low}]{A}
+ \framed[align={flushleft,lohi}]{A}
+}
\stoptyping
+\line{
+ \setupframed[width=1.95cm,height=1.95cm]
+ \framed[align={flushleft,high}]{A}
+ \framed[align={middle,high}]{A}
+ \framed[align={flushright,high}]{A}
+ \framed[align={flushright,lohi}]{A}
+ \framed[align={flushright,low}]{A}
+ \framed[align={middle,low}]{A}
+ \framed[align={flushleft,low}]{A}
+ \framed[align={flushleft,lohi}]{A}
+}
-\noindent 由于上述代ç ä½¿ç”¨äº† \METAPOST\ çš„æ¡ä»¶åˆ¤æ–­è¯­æ³•ï¼Œä»¥ \type{path shape} 判断 \type{shape} 是å¦ä¸ºè·¯å¾„å˜é‡ï¼Œä»Žè€Œä½¿å¾— \type{make_node} 能构用于构造有无边框和有边框的结点:
-
-\starttyping[option=MP]
-numeric offset; offset := 5mm;
-string f; f := "\framed[frame=off,align=center]";
-picture a, b, c, d, e;
-a := make_node(f & "{$i\leftarrow 1$\\$s\leftarrow 0$}", none, 0);
-b := make_node(f & "{$s\leftarrow s + i$}", fullsquare, offset);
-c := make_node(f & "{$i\leftarrow i + 1$}", fullsquare, offset);
-d := make_node(f & "{$i > 100$}", fulldiamond, offset);
-e := make_node(f & "{$s$}", none, 0);
-\stoptyping
+\type{\setupframed} 所作的设定会影å“到其åŽçš„所有 \type{\framed},但是ä¸ä¼šå½±å“到其所处编组\footnote{还记得 \TeX\ 编组å—ï¼Ÿå³ \type[escape=no]{{...}}。}之外的 \type{\framed}。
-在 \type{vardef} å®ä¸­ä½¿ç”¨æ¡ä»¶è¯­å¥æ—¶éœ€è¦æ³¨æ„,通常情况下ä¸è¦æ¡ä»¶ç»“æŸè¯­å¥ \type{fi} åŽé¢æ·»åŠ åˆ†å·ï¼Œå¦åˆ™ \type{vardef} å®çš„返回值会带上这个分å·ã€‚在其他情境下,通常需è¦åœ¨ \type{fi} 加分å·ã€‚还è¦æ³¨æ„,我在 \type{make_node} å®ä¸­ä½¿ç”¨ \type{xysized} å–代了之å‰çš„ \type{xscale} å’Œ \type{yscale},å¯ç›´æŽ¥æŒ‡å®šè·¯å¾„或画é¢çš„尺寸。之所以如此,是因为我们无法确定 \type{make_node} å®çš„第 2 个å‚数对应的路径是å¦ä¸ºæ ‡å‡†å›¾å½¢ã€‚
+\section{背景}
-在绘制结点和路径时,存在é‡å¤ä½¿ç”¨ \type{draw} 语å¥çš„情况,例如
+å¯å°†é¢œè‰²ä½œä¸º \type{\framed} 的背景。例如
-\starttyping[option=MP]
-drawarrow ab withcolor darkred;
-drawarrow bd withcolor darkred;
-drawarrow cb withcolor darkred;
-drawarrow dc withcolor darkred;
-drawarrow de withcolor darkred;
+\starttyping[option=TEX]
+\inframed
+ [background=color,
+ backgroundcolor=lightgray,
+ width=2cm,
+ frame=off]{\bf foo}
\stoptyping
-\noindent å¯ä½¿ç”¨å¾ªçŽ¯è¯­å¥äºˆä»¥ç®€åŒ–:
-
-\starttyping[option=MP]
-for i = ab, bd, cb, dc, de:
- draw i withcolor darkred;
-endfor;
-\stoptyping
+\noindent 结果为 \inframed[background=color,backgroundcolor=lightgray,width=2cm,frame=off]{\bf foo}。
-为了便于获得路径或画é¢çš„包围盒的四边中点,定义以下å®ï¼š
+通过 overlay,å¯å°†ä¸€äº›ä»£ç ç‰‡æ®µçš„排版结果作为 \type{\framed} 的背景。例如
-\starttyping[option=MP]
-vardef left(expr p) = .5[llcorner p, ulcorner p] enddef;
-vardef top(expr p) = .5[ulcorner p, urcorner p] enddef;
-vardef right(expr p) = .5[lrcorner p, urcorner p] enddef;
-vardef bottom(expr p) = .5[llcorner p, lrcorner p] enddef;
+\starttyping[option=TEX]
+\defineoverlay
+ [foo]
+ [{\framed[width=3cm,frame=off,bottomframe=on]{}}]
+\midaligned{\inframed[background=foo,frame=off]{你好啊ï¼}}
\stoptyping
-\noindent 以绘制结点 \type{b} 的四边中点为测试用例
-
-\starttyping[option=MP]
-for i = left(b), top(b), right(b), bottom(b):
- draw i withpen pensquare scaled 4pt withcolor darkblue;
-endfor;
-\stoptyping
-\leftaligned{\externalfigure[11-flowchart-4.pdf]}
+\defineoverlay
+ [foo]
+ [{\framed[width=3cm,frame=off,bottomframe=on]{}}]
+\midaligned{\inframed[background=foo,frame=off]{你好啊ï¼}}
\blank
-基于上述å®ï¼Œå¯ä»¥æ›´ä¸ºç®€æ´åœ°æž„造连接å„结点的路径:
-
-\starttyping[option=MP]
-path ab; ab := bottom(a) -- top(b);
-path bd; bd := bottom(b) -- top(d);
-path dc; dc := right(d) -- left(c);
-path cb; cb := top(c) -- (xpart center c, ypart center b) -- right(b);
-path de; de := bottom(d) -- top(e);
-\stoptyping
-
-\noindent \type{center} 是 \METAPOST\ å®ï¼Œå¯ç”¨äºŽèŽ·å–路径或画é¢çš„包围盒中心点å标。\type{xpart} å’Œ \type{ypart} 也皆为 \METAPOST\ å®ï¼Œç”¨äºŽèŽ·å–点的å标分é‡ã€‚
-
-路径标注也å¯ä»¥é€šè¿‡å®šä¹‰ä¸€ä¸ªå®äºˆä»¥ç®€åŒ–:
-
-\starttyping[option=MP]
-vardef tag(expr p, text, pos, loc) =
- if loc = "left":
- thetextext.lft(text, point pos along p)
- elseif loc = "right":
- thetextext.rt(text, point pos along p)
- elseif loc = "top":
- thetextext.top(text, point pos along p)
- elseif loc = "bottom":
- thetextext.bot(text, point pos along p)
- else
- thetextext(text, point pos along p)
- fi
-enddef;
-\stoptyping
-
-\noindent 其用法为
-
-\starttyping[option=MP]
-draw tag(dc, "å¦", .5, "top");
-draw tag(de, "是", .5, "right");
-\stoptyping
-
-
-\section{层层å å }
-
-\ConTeXt\ 有一个以 overlay 为基础的层(Layer)机制。利用层机制,我们å¯å°† \METAPOST\ 图形绘制在页é¢ä¸Šçš„任何一个ä½ç½®ã€‚在学习层之å‰ï¼Œæˆ‘们需è¦å¯¹ overlay 的认识å†åŠ æ·±ä¸€äº›ã€‚
-
-\subsection{overlay}
-
-实际上 overlay 环境是一个图形「栈ã€ã€‚通过它,å¯å®žçŽ°å›¾å½¢ï¼ˆåŒ…括文字)的å åŠ ã€‚例如,对于以下 \METAPOST\ 图形:
-
-\starttyping[option=MP]
-\startuseMPgraphic{一个矩形}
-path p; p := fullsquare xscaled 4cm yscaled 1cm;
-draw p randomized 3mm
- withcolor transparent (1, .5 randomized .3, red)
- withpen pencircle scaled 2pt;
-\stopuseMPgraphic
-\stoptyping
-
-\noindent 上述代ç ä¸­ï¼Œ\type{transparent (1, .5 randomized .3, red)} 用于构造在一定程度上ä¸ç¡®å®šé€æ˜Žåº¦çš„红色,é€æ˜Žåº¦åœ¨ [0.2, 0.8] ä¹‹é—´ï¼Œäº¦å³ \type{randomized} ä¸ä»…å¯ä½œç”¨äºŽè·¯å¾„,也å¯ä½œç”¨äºŽæ•°å­—或颜色值。由于上述 \METAPOST\ 图形环境包å«ç€éšæœºå†…容,将其作为æ’图,在一个 overlay 中多次使用,æ¯æ¬¡ä½¿ç”¨éƒ½ä¼šäº§ç”Ÿä¸åŒçš„结果,在 overlay 中它们会被å åŠ åˆ°ä¸€èµ·ï¼š
+通过上述示例,现在你应该能有有七八分明白 \in[item-sym-diy] 节中带圈数字是如何实现的了,其关键代ç å¦‚下:
\starttyping[option=TEX]
-\startoverlay
- {\useMPgraphic{一个矩形}}
- {\useMPgraphic{一个矩形}}
- {\useMPgraphic{一个矩形}}
-\stopoverlay
+\startuseMPgraphic{foo}
+ path p;
+ p := fullcircle scaled 12pt;
+ draw p withpen pencircle scaled .4pt
+ withcolor darkred;
+\stopuseMPgraphic
+\defineoverlay[rsquare][\useMPgraphic{foo}]
+\def\fooframe#1{%
+ \inframed[frame=off,background=rsquare]{#1}%
+}
\stoptyping
-\startuseMPgraphic{一个矩形}
-path p; p := fullsquare xscaled 4cm yscaled 1cm;
-draw p randomized 3mm
- withcolor transparent (0, .5 randomized .25, red)
- withpen pencircle scaled 2pt;
+\startuseMPgraphic{foo}
+ path p;
+ p := fullcircle scaled 12pt;
+ draw p withpen pencircle scaled .4pt
+ withcolor darkred;
\stopuseMPgraphic
-\startoverlay
- {\useMPgraphic{一个矩形}}
- {\useMPgraphic{一个矩形}}
- {\useMPgraphic{一个矩形}}
-\stopoverlay
-
-之å‰åœ¨ä¸º \type{\framed} 定义 overlay 时,overlay 中åªæœ‰å•ä¸ªå›¾å½¢ï¼Œäº¦å³æˆ‘们并未充分利用 overlay 的特性。以下代ç å®šä¹‰çš„ \type{\framed} 的背景便包å«äº†ä¸‰ä¸ªå åŠ çš„ overlay:
+\defineoverlay[rsquare][\useMPgraphic{foo}]
+\def\fooframe#1{%
+ \inframed[frame=off,background=rsquare]{#1}%
+}
+\noindent æ— éžæ˜¯å°†ä¸€ä¸ªåœ†åœˆå›¾å½¢ä½œä¸º \type{\inframed} 的背景罢了,而且对圈内的文字的长度有é™åˆ¶ï¼Œå­—数略多一些,便出圈了,例如 \type{\fooframe{123}},结果为 \fooframe{123}。ä¸è¿‡ï¼Œåªéœ€å¯¹ä¸Šè¿°ä»£ç ç•¥åŠ ä¿®æ”¹ï¼Œ
\starttyping[option=TEX]
-\defineoverlay
- [å å ]
- [\startoverlay
- {\useMPgraphic{一个矩形}} {\useMPgraphic{一个矩形}} {\useMPgraphic{一个矩形}}
- \stopoverlay]
-\stoptyping
-\starttyping[option=TEX]
-\defineframed[foo][frame=off,background={å å }]
-\foo{迎接光辉å²æœˆ}
+ p := fullcircle scaled \overlaywidth;
\stoptyping
-\defineoverlay
- [å å ]
- [\startoverlay
- {\useMPgraphic{一个矩形}}
- {\useMPgraphic{一个矩形}}
- {\useMPgraphic{一个矩形}}
- \stopoverlay]
-\defineframed[foo][frame=off,background={å å }]
-\dontleavehmode\kern .25em\foo{迎接光辉å²æœˆ}
-
-\type{\framed} 的也å¯ä»¥å°†å¤šä¸ª overlay 作为背景,以下代ç ä¸Žä¸Šä¾‹ç­‰æ•ˆï¼š
+\startuseMPgraphic{foo}
+ path p;
+ p := fullcircle scaled \overlaywidth;
+ draw p withpen pencircle scaled .4pt
+ withcolor darkred;
+\stopuseMPgraphic
+\defineoverlay[rsquare][\useMPgraphic{foo}]
+\def\fooframe#1{%
+ \inframed[frame=off,background=rsquare]{#1}%
+}
-\starttyping[option=TEX]
-\defineoverlay[å å -1]{\useMPgraphic{一个矩形}}
-\defineoverlay[å å -2]{\useMPgraphic{一个矩形}}
-\defineoverlay[å å -3]{\useMPgraphic{一个矩形}}
-\defineframed[foo][frame=off,background={å å -1,é‡å -2,é‡å -3}]
-\foo{迎接光辉å²æœˆ}
-\stoptyping
+\noindent 便å¯è§£é™¤è¯¥é™åˆ¶ã€‚技巧是,用 overlay 的实际宽度作为å•ä½åœ†çš„放大å€æ•°ï¼Œæ•…而å¯ä¿è¯åœ†åœˆçš„直径å³åœˆå†…文字的长度,例如 \type{\fooframe{我有一个大房å­}},结果为 \fooframe{我有一个大房å­}。
-\noindent è¿™æ„味ç€ï¼Œ\type{\framed} 的背景,本质上也是一个 overlay。
+\section{ç›’å­çš„深度}
-基于 overlay,也å¯ä¸ºæ–‡æ¡£è®¾ç½®æ°´å°ã€‚例如,若在 \type{\starttext} 之å‰æ·»åŠ ä»¥ä¸‹ä»£ç ï¼š
+如果你仔细观察,\ConTeXt\ ç›’å­é‡Œçš„内容在水平方å‘是精确居中的,但是在并éžå¦‚此。例如
\starttyping[option=TEX]
-\startuseMPgraphic{square}
-path p; p := fullsquare xscaled 4cm yscaled 1cm;
-draw p randomized 3mm
- withcolor transparent (1, .5 randomized .3, red)
- withpen pencircle scaled 2pt;
-\stopuseMPgraphic
-\defineoverlay[watermark][\useMPgraphic{square}]
-\setupbackgrounds[page][background=watermark]
+\inframed{ajk\framed{我看到一棵樱桃树}}。
\stoptyping
-\midaligned{\externalfigure[11-watermark.png][width=.6\textwidth]}
-\subsection[layer]{层}
+\noindent 结果为 \inframed{\framed{我看到一棵樱桃树}}。å¯è§ \type{\inframed} 内部的 \type{\framed} 的底部有ç€çœ‹ä¼¼å¤šä½™çš„空白。使用盒å­çš„å‚æ•° \type{depth} å¯ä»¥æ¶ˆé™¤è¿™äº›ç©ºç™½ï¼Œä½†é—®é¢˜åœ¨äºŽè¿™å¤„空白从何而æ¥åŠå…¶é«˜åº¦æ˜¯å¤šå°‘。该问题与底层 \TeX\ 的西文排版机制有关。
-\ConTeXt\ 的层,本质上是一个å¯ä½œä¸ºå…¨é¡µèƒŒæ™¯çš„ overlay,å¯ä½¿ç”¨ç»å¯¹å标或相对å标对排版元素在页é¢ä¸Šå®šä½æ”¾ç½®ã€‚例如,定义一个层 foo,在三个ä¸åŒä½ç½®åˆ†åˆ«æ”¾ç½®ä¸€å¹… \METAPOST\ 图形,并将其作用于当å‰é¡µé¢ï¼š
+首先,我们需è¦æ˜Žç™½ï¼Œè¥¿æ–‡æŽ’版,一行文字是有基线的,但基线并éžä½äºŽè¯¥è¡Œæ–‡å­—的最底端,而是è·æœ€åº•ç«¯æœ‰ä¸€æ®µè¾ƒå°çš„è·ç¦»ï¼Œå¦åˆ™æ‰€æœ‰è¥¿æ–‡å­—æ¯éƒ½åœ¨åŒä¸€æ¡çº¿ä¸Šäº†ã€‚在上述示例中,\type{\framed} 的底线便是其外围的 \type{\inframed} 所在行的基线。西文字体在设计时,æ¯ä¸ªå­—形(Glyph)是有基线ä½ç½®ï¼Œå› æ­¤åœ¨æŽ’版时å¯æ ¹æ®å®žé™…的基线ä½ç½®å¯¹å­—形进行对é½ã€‚一行文字的基线到该行的最底端的这段è·ç¦»ç§°ä¸ºæ·±åº¦ã€‚一行文字的基线到该行最顶端的这段è·ç¦»ç§°ä¸ºé«˜åº¦ã€‚因此,一行文字的真正高度等于深度 + 高度;在 \ConTeXt\ 中,它等于我们使用 \type{\setupinterlinespace} 设定的尺寸。
-\starttyping[option=TEX]
-\definelayer[foo]
-\setlayer[foo][x=0cm,y=0cm]{\useMPgraphic{一个矩形}}
-\setlayer[foo][x=6cm,y=1cm]{\useMPgraphic{一个矩形}}
-\stoptyping
-\starttyping[option=TEX]
-\setlayer
- [foo]
- [x=\textwidth,y=2cm,hoffset=-4cm,vhoffset=-.5cm]{\useMPgraphic{一个矩形}}
-\flushlayer[foo]
-\stoptyping
-\definelayer[test]
-\setlayer[test][x=0cm,y=0cm]{\useMPgraphic{一个矩形}}
-\setlayer[test][x=6cm,y=1cm]{\useMPgraphic{一个矩形}}
-\setlayer
- [test]
- [x=\textwidth,y=2cm,hoffset=-4cm,voffset=-3cm]{\useMPgraphic{一个矩形}}
-\flushlayer[test]
-\noindent 上述代ç å®šä¹‰çš„层 foo,其å标原点是层被投放的ä½ç½®ï¼Œäº¦å³åœ¨æœ¬è¡Œæ–‡å­—的左上角。$x$ åæ ‡å‘å³é€’增,$y$ åæ ‡å‘下递增。
-\definelayer[foo]
-\setlayer[foo][x=0cm,y=0cm]{\useMPgraphic{circle}}
-\setlayer[foo][preset=rightbottom]{\useMPgraphic{circle}}
-\setupbackgrounds[page][background=foo]
-
-如果将层的宽度和高度分别设为页é¢çš„宽度和高度,并将其设为页é¢èƒŒæ™¯ï¼Œåˆ™å标原点在页é¢çš„左上角,且å¯ä½¿ç”¨ä¸€äº›é¢„定义ä½ç½®æŠ•æ”¾å†…容。例如以下代ç å¯åœ¨å½“å‰é¡µé¢çš„左上角和å³ä¸‹è§’ä½ç½®å„放一个圆圈:
+无论是 \TeX\ 还是 \ConTeXt\ ç›’å­ï¼Œå®ƒä»¬æœ¬èº«æ˜¯æ²¡æœ‰æ·±åº¦çš„,但是当它们里é¢çš„文字或盒å­æœ‰æ·±åº¦æ—¶ï¼Œå®ƒä»¬ä¾¿æœ‰äº†æ·±åº¦ã€‚至于深度值具体是多大,å¯ä»¥å€ŸåŠ© \TeX\ çš„ç›’å­å¯„存器进行测é‡ã€‚例如,定义一个盒å­å¯„存器 box0:
\starttyping[option=TEX]
-\startuniqueMPgraphic{circle}
-draw fullcircle scaled 2cm withpen pencircle scaled 2pt withcolor darkgreen;
-\stopuniqueMPgraphic
-\definelayer[foo][width=\paperwidth,height=\paperheight]
-\setlayer[foo][x=0cm,y=0cm]{\uniqueMPgraphic{circle}}
-\setlayer[foo][preset=rightbottom]{\uniqueMPgraphic{circle}}
-\setupbackgrounds[page][background=foo]
+\setbox0\hbox{\inframed{\framed{我看到一棵樱桃树}}}
\stoptyping
-\startuniqueMPgraphic{circle}
-draw fullcircle scaled 2cm withpen pencircle scaled 2pt withcolor darkgreen;
-\stopuniqueMPgraphic
-\definelayer[foo][width=\paperwidth,height=\paperheight]
-\setlayer[foo][x=0cm,y=0cm]{\uniqueMPgraphic{circle}}
-\setlayer[foo][preset=rightbottom]{\uniqueMPgraphic{circle}}
-\setupbackgrounds[page][background=foo]
-
-\noindent 需è¦æ³¨æ„的是,层被使用一次åŽï¼Œä¾¿ä¼šè¢«æ¸…空,因而将其作为页é¢èƒŒæ™¯ï¼Œä»…对当å‰é¡µæœ‰æ•ˆã€‚
+\setbox0\hbox{\inframed{\framed{我看到一棵樱桃树}}}
-通过 \type{preset} å‚æ•°å¯è°ƒæ•´å±‚çš„å标原点和å标方å‘。在上述代ç ä¸­ï¼Œ\type{rightbottom} å¯å°†å±‚çš„å标原点定ä½äºŽå±‚çš„å³ä¸‹è§’,åŒæ—¶ $x$ å标方å‘å˜ä¸ºå‘左递增,$y$ å标方å‘å˜ä¸ºå‘上递增。
+\noindent 现在我们有了一个 0 å·ç›’å­ï¼Œä½¿ç”¨ \type{\wd},\type{\ht} å’Œ \type{\dp} å¯åˆ†åˆ«æµ‹é‡è¯¥ç›’å­çš„宽度ã€é«˜åº¦å’Œæ·±åº¦â€¦â€¦é¡ºä¾¿å¤ä¹ ä¸€ä¸‹è¡¨æ ¼çš„用法:
-\ConTeXt\ 预定义的 \type{preset} å‚数值有
+\startsample
+\starttabulate[|c|c|c|]
+\HL
+\NC 宽度 \NC 高度 \NC 深度 \NC\NR
+\HL
+\NC \the\wd0 \NC \the\ht0 \NC \the\dp0 \NC\NR
+\HL
+\stoptabulate
+\stopsample
+\simplesample[option=TEX]{\getsample}
-\startitemize[packed,columns,five]
-\item lefttop\item righttop\item leftbottom\item rightbottom\item middle\item middletop
-\item middlebottom\item middleleft\item middleright\item lefttopleft\item lefttopright
-\stopitemize
+将上述所得深度信æ¯å–负作为 \type{\inframed} çš„å‚æ•° \type{depth} 的值,å³
-\noindent 使用这些å‚数值时,è¦æ³¨æ„å标方å‘。例如,若 \type{preset=middleright},其 $x$ å标方å‘å˜ä¸ºå‘左递增,而 $y$ å标方å‘ä¾ç„¶ä¿æŒå‘上递增,以下代ç å¯äºˆä»¥éªŒè¯ï¼š
-
-\starttyping[option=TEX]
-\definelayer[bar][width=\paperwidth,height=\paperheight]
-\setlayer[bar][preset=middleright]{
- \startMPcode
- draw (0, 0) withpen pensquare scaled 12pt withcolor darkred;
- \stopMPcode
-}
-\stoptyping
\starttyping[option=TEX]
-\setlayer[bar][preset=middleright,x=2cm,y=2cm]{
- \startMPcode
- draw (0, 0) withpen pensquare scaled 12pt
- withcolor transparent (1, .3, darkred);
- \stopMPcode
-}
-\setupbackgrounds[page][background=bar]
+\inframed[depth=-\dp0]{\framed{我看到一棵樱桃树}}
\stoptyping
-\definelayer[bar][width=\paperwidth,height=\paperheight]
-\setlayer[bar][preset=middleright]{
- \startMPcode
- draw (0, 0) withpen pensquare scaled 12pt withcolor darkred;
- \stopMPcode
-}
-\setlayer[bar][preset=middleright,x=2cm,y=2cm]{
- \startMPcode
- draw (0, 0) withpen pensquare scaled 12pt
- withcolor transparent (1, .3, darkred);
- \stopMPcode
-}
-\setupbackgrounds[page][background=bar]
+\noindent 便å¯æ¶ˆé™¤æ·±åº¦ï¼Œç»“果为 \inframed[depth=-\dp0]{\framed{我看到一棵樱桃树}}。
\section{å°ç»“}
-也许你æ„犹未尽,甚至觉得我语焉ä¸è¯¦ã€‚切莫怪我,我原本仅仅是介ç»å¦‚何使用 \METAPOST\ 绘制一个边框å—éšæœºæ‰°åŠ¨çš„ç›’å­ã€‚ä¸è¿‡ï¼Œåœ¨å¤§è‡´æŽŒæ¡äº†æœ¬ç« æ‰€è¿°çš„内容的基础上,关于 \METAPOST\ 更多的知识,特别本章所有你觉得语焉ä¸è¯¦ä¹‹å¤„,皆å¯é˜…读它的手册\cite[mpman]以增进认识。此外,\ConTeXt\ å¼€å‘者 Hans Hagen 所写的 \MetaFun\ 手册除了讲述 \MetaFun\ 之外也大é‡ä»‹ç»äº† \METAPOST\ 的基本知识和技巧,该手册在你的 \ConTeXt\ 系统中,使用以下命令查找:
-
-\starttyping
-$ mtxrun --script base --search metafun-s.pdf
-\stoptyping \ No newline at end of file
+\TeX\ ç›’å­æ˜¯æ— å½¢çš„。\ConTeXt\ ç›’å­æ˜¯æœ‰å½¢çš„。è€å­æ›¾è¯´è¿‡ï¼Œæ’无欲,以观其妙;æ’有欲,以观其所徼。故而,\TeX\ è¦æ‡‚一些,\ConTeXt\ 也è¦æ‡‚一些。
diff --git a/info/context-notes-zh-cn/src/12.tex b/info/context-notes-zh-cn/src/12.tex
index cbbc82666f..4ea4987933 100644
--- a/info/context-notes-zh-cn/src/12.tex
+++ b/info/context-notes-zh-cn/src/12.tex
@@ -1,280 +1,724 @@
-\chapter{å¹»ç¯ç‰‡}
+\chapter{学一点 \METAPOST}
-现在你已ç»é¢†ç•¥ç”šè‡³å¯èƒ½å…¨éƒ¨æŽŒæ¡äº† \ConTeXt\ 常用的的排版元素,若ä¸ä½¿ç”¨å®ƒä»¬è€Œæ˜¯ä¾ç„¶ä½¿ç”¨ Microsoft PowerPoint 制作幻ç¯ç‰‡ç”šä¸ºå¯æƒœã€‚如果你已决æ„使用 \ConTeXt\ 制作幻ç¯ç‰‡ï¼Œä½ ä¼šå‘现,你几乎ä¸éœ€è¦å†å­¦ä¹ å¤šå°‘æ–°çš„ \ConTeXt\ 命令便å¯éšå¿ƒæ‰€æ¬²åœ°åˆ¶ä½œæ¸…新质朴的幻ç¯ç‰‡äº†ã€‚
+想必你已迫ä¸åŠå¾…想学习 \METAPOST\ 了。这大概是æ¥è‡ªäººç±»ä¸Šå¤åŸºå› çš„冲动。人类先学会的是绘画,而åŽæ‰æ˜¯æ–‡å­—。åªæ˜¯ä¸è¦å¦„å›¾é€šè¿‡è¿™åŒºåŒºä¸€ç« å†…å®¹æŽŒæ¡ \METAPOST,因为关于它的全部内容,足够写一本至少三百多页的书ç±äº†ã€‚ä¸è¿‡ï¼Œæœ¬ç« å†…容足以给你打开一扇窗户,让 \METAPOST\ 的优雅气æ¯æ‹‚过时常过于严肃的 \ConTeXt\ 世界。
-\section{纸é¢å°ºå¯¸}
+\section{作图环境}
-纸é¢å°ºå¯¸æ˜¯æ¯ä¸€é¡µçš„打å°å°ºå¯¸ã€‚至此为止,本文档之å‰æ‰€æœ‰çš„示例,在 \type{TEXpage} 环境里的,纸é¢å°ºå¯¸å–决于文档内容的多少,而在 \type{text} 环境里的,纸é¢å°ºå¯¸é»˜è®¤æ˜¯ A4ï¼Œå³ $21\,{\rm cm}\times 29.7\,{\rm cm}$,如果你需è¦å°†è¯¥å°ºå¯¸æ¢æˆ A5,åªéœ€åœ¨æ ·å¼æ–‡ä»¶ä¸­ä½œä»¥ä¸‹è®¾å®š
+\METAPOST\ 是一ç§è®¡ç®—机作图语言,与 \TeX\ 一样,皆为å®ç¼–程语言。使用 \METAPOST\ 语言编写的代ç å¯è¢« mpost 程åºç¼–è¯‘æˆ PS æ ¼å¼çš„图形文件。自 \LuaTeX\ 开始,mpost 的核心功能集æˆåˆ°äº† \LuaTeX\ 中,从此以åŽï¼Œåœ¨ \TeX\ 环境中使用 \METAPOST\ 语言作图便ä¸éœ€ä¾èµ–外部程åºäº†ã€‚
-\starttyping[option=TEX]
-\setuppapersize[A5]
+\ConTeXt\ 为 \METAPOST\ 代ç æ供了五ç§çŽ¯å¢ƒï¼š
+
+\starttyping
+\startMPcode ... \stopMPcode
+\startMPpage ... \stopMPpage
+\startuseMPgraphic{name} ... \stopuseMPgraphic
+\startuniqueMPgraphic{name} ... \stopuniqueMPgraphic
+\startreusableMPgraphic{name} ... \stopreusableMPgraphic
\stoptyping
-制作幻ç¯ç‰‡é€šå¸¸ä¸éœ€è¦å¤ªå¤§çš„纸é¢å°ºå¯¸ã€‚\ConTeXt\ æ供了 S4 尺寸($400\,{\rm pt}\times 300\,{\rm pt}$),å¯å°†å…¶ä½œä¸ºå¹»ç¯ç‰‡çš„纸é¢å°ºå¯¸ã€‚也å¯ä»¥è‡ªå·±å®šä¹‰çº¸é¢å°ºå¯¸å¹¶ä½¿ç”¨ï¼Œä¾‹å¦‚
+\noindent 第一ç§çŽ¯å¢ƒç”¨äºŽä¸´æ—¶ä½œå›¾ï¼Œç”Ÿæˆçš„图形会被æ’入到代ç æ‰€åœ¨ä½ç½®ã€‚第二ç§çŽ¯å¢ƒæ˜¯ç”Ÿæˆå•ç‹¬çš„图形文件,以作其他用途。åŽé¢ä¸‰ç§çŽ¯å¢ƒï¼Œç”Ÿæˆçš„图形å¯æ ¹æ®çŽ¯å¢ƒçš„å称作为文章æ’图éšå¤„使用,但它们åˆæœ‰ä¸‰ç§ä¸åŒç”¨é€”:
-\starttyping[option=TEX]
-\definepapersize[foo][width=640pt,height=480pt]
-\setuppapersize[foo]
+\startitemize[nowhite]
+\item useMPgraphic:æ¯è¢«ä½¿ç”¨ä¸€æ¬¡ï¼Œå¯¹åº”çš„ \METAPOST\ 代ç ä¾¿ä¼šè¢«é‡æ–°ç¼–译一次。
+\item uniqueMPgraphic:åªè¦å›¾å½¢æ‰€å¤„环境ä¸å˜ï¼Œ\METAPOST\ 代ç åªä¼šè¢«ç¼–译一次。
+\item reusableMPgraphic:无论如何使用,其 \METAPOST\ åªä¼šè¢«ç¼–译一次。
+\stopitemize
+
+\noindent 大多数情况下,建议选用 uniqueMPgraphic,但若图形中存在一些需è¦æ¯æ¬¡ä½¿ç”¨æ—¶éƒ½è¦æœ‰æ‰€å˜åŒ–的内容,å¯é€‰ç”¨ useMPgraphic。
+
+å¦å¤–需è¦æ³¨æ„,在 \ConTeXt\ 中使用 \METAPOST\ 时,通常会使用 \ConTeXt\ 定义的一些 \METAPOST\ å®ï¼Œè¿™äº›å®æž„æˆçš„集åˆï¼Œåæ›° \MetaFun。
+
+\section{画一个盒å­}
+
+\METAPOST\ 作图语å¥éµå®ˆåŸºæœ¬çš„英文语法,ç†è§£èµ·æ¥é¢‡ä¸ºç®€å•ã€‚例如,用粗度为 2 pt 的圆头笔用暗红色绘制一æ¡ç»è¿‡ $(0, 0)$,$(3\,{\rm cm}, 0)$,$(3\,{\rm cm}, 1\,{\rm cm})$,$(0, 1\,{\rm cm})$ çš„å°é—­è·¯å¾„,
+
+\startsample
+\startMPcode
+pickup pencircle scaled 2pt;
+draw (0, 0) -- (3cm, 0) -- (3cm, 1cm)
+ -- (0, 1cm) -- cycle withcolor darkred;
+\stopMPcode
+\stopsample
+\simplesample[option=MP]{\getsample}
+
+\noindent 上述代ç ä¸­ï¼Œ\type{(0, 0) -- ... -- cycle} 构造的是一æ¡å°é—­è·¯å¾„,å¯å°†å…¶ä¿å­˜äºŽè·¯å¾„å˜é‡ï¼š
+
+\starttyping[option=MP]
+path p;
+p := (0, 0) -- (3cm, 0) -- (3cm, 1cm) -- (0, 1cm) -- cycle;
+pickup pencircle scaled 2pt;
+draw p withcolor darkred;
\stoptyping
-实际上,纸é¢å°ºå¯¸ä»…对排版结果的打å°å¾ˆé‡è¦ï¼Œå€˜è‹¥åªæ˜¯åœ¨è®¡ç®—机(或投影仪)å±å¹•ä¸Šè§‚看排版结果,我们总是å¯ä»¥é€šè¿‡è°ƒæ•´æ­£æ–‡å­—体大å°åŽ»åº”对过大或过å°çš„纸é¢å°ºå¯¸ï¼Œä½†æ˜¯çº¸é¢å°ºå¯¸çš„宽高比例,对于å±å¹•éžå¸¸é‡è¦ã€‚通常,幻ç¯ç‰‡çš„宽高比应当与å±å¹•çš„分辨率相适应为最佳。例如,我的å±å¹•åˆ†è¾¨çŽ‡æ˜¯ $1600\times 900$,那么我è¦åˆ¶ä½œçš„å¹»ç¯ç‰‡é¡µé¢çš„宽高比也应当是 $16:9$,故而纸é¢å°ºå¯¸å¯è®¾å®šä¸º
+\noindent 将路径ä¿å­˜åœ¨å˜é‡ä¸­ï¼Œæ˜¯ä¸ºäº†æ›´ä¾¿äºŽå¯¹è·¯å¾„进行一些è¿ç®—,例如
+
+\startsample
+\startMPcode
+path p;
+p := (0, 0) -- (3cm, 0)
+ -- (3cm, 1cm) -- (0, 1cm) -- cycle;
+pickup pencircle scaled 2pt;
+draw p withcolor darkred;
+draw p shifted (2cm, .5cm) withcolor darkblue;
+\stopMPcode
+\stopsample
+\simplesample[option=MP]{\getsample}
+
+\noindent 路径 \type{p} 被å‘å³å¹³ç§»äº† 2 cm,继而被å‘上平移动了 0.5 cm。
+
+还有一ç§æž„造矩形路径的方法:先构造一个å•ä½æ­£æ–¹å½¢ï¼Œç„¶åŽå¯¹å…¶ç¼©æ”¾ã€‚例如
+
+\startsample
+\startMPcode
+pickup pencircle scaled 2pt;
+draw fullsquare xscaled 3cm yscaled 1cm
+ withcolor darkred;
+\stopMPcode
+\stopsample
+\simplesample[option=MP]{\getsample}
+
+\MetaFun\ å® \type{randomized} å¯ç”¨äºŽå¯¹è·¯å¾„éšæœºæ‰°åŠ¨ã€‚例如,对一个宽为 3 cm,高为 1cm 的矩形路径以幅度 2mm 的程度予以扰动:
+
+\startsample
+\startuseMPgraphic{éšæœºæ™ƒåŠ¨çš„矩形}
+pickup pencircle scaled 2pt;
+draw (fullsquare xscaled 3cm yscaled 1cm)
+ randomized 2mm withcolor darkred;
+\stopuseMPgraphic
+\useMPgraphic{éšæœºæ™ƒåŠ¨çš„矩形}
+\stopsample
+\simplesample[option=MP]{\getsample}
+
+还记得 overlay å—?åªè¦å°†ä¸Šè¿° useMPgraphic 环境构造的图形制作为 overlay,便å¯å°†å…¶ä½œä¸º \type{\framed} 的背景,从而å¯ä»¥å¾—到一ç§å¤–观颇为别致的盒å­ã€‚
+
+\startsample
+\defineoverlay[晃晃][\useMPgraphic{éšæœºæ™ƒåŠ¨çš„矩形}]
+\framed[frame=off,background=晃晃,width=3cm]{光辉å²æœˆ}
+\stopsample
+\simplesample[option=TEX]{\getsample}
+
+在 \ConTeXt\ 为 \METAPOST\ æ供的作图环境里,å¯åˆ†åˆ«é€šè¿‡ \type{\overlaywidth} å’Œ \type{\overlayheight} 获得 overlay 的宽度和高度。在将 overlay 作为 \type{\framed} 的背景时,\type{\framed} 的宽度和高度便是 overlay 的宽度和高度。基于这一特性,便å¯å®žçŽ° \METAPOST\ 绘制的图形能够自动适应 \type{\framed} 的宽度和高度的å˜åŒ–。例如
+
+\startsample
+\startuseMPgraphic{æ–°çš„éšæœºæ™ƒåŠ¨çš„矩形}
+path p;
+p := fullsquare xscaled \overlaywidth yscaled \overlayheight;
+pickup pencircle scaled 2pt;
+draw p randomized 2mm withcolor darkred;
+\stopuseMPgraphic
+
+\defineoverlay[新的晃晃][\useMPgraphic{æ–°çš„éšæœºæ™ƒåŠ¨çš„矩形}]
+\framed
+ [frame=off,background=新的晃晃]
+ {今天åªæœ‰æ®‹ç•™çš„躯壳,迎接光辉å²æœˆï¼Œé£Žé›¨ä¸­æŠ±ç´§è‡ªç”±ã€‚}
+\stopsample
+\typesample[option=MP]
+\midaligned{\getsample}
+
+对于需è¦é‡å¤ä½¿ç”¨çš„ç›’å­ï¼Œä¸ºäº†é¿å…æ¯æ¬¡é‡å¤è®¾ç½®å…¶æ ·å¼ï¼Œå¯ä»¥å°†å®ƒå®šä¹‰ä¸ºä¸“用盒å­ã€‚例如
\starttyping[option=TEX]
-\definepapersize[foo][width=640pt,height=360pt]
-\setuppapersize[foo]
+\defineframed[funnybox][frame=off,background=新的晃晃]
+\funnybox{今天åªæœ‰æ®‹ç•™çš„躯壳,迎接光辉å²æœˆï¼Œé£Žé›¨ä¸­æŠ±ç´§è‡ªç”±ã€‚}
\stoptyping
-现在,我们å¯ä»¥åˆ¶ä½œå¹»ç¯ç‰‡çš„最原始的形å¼ï¼š
+\METAPOST\ å¯ä»¥ä¸ºä¸€æ¡å°é—­è·¯å¾„填充颜色。在此需è¦æ˜Žç¡®ï¼Œä½•ä¸ºå°é—­è·¯å¾„。例如
-\starttyping[option=TEX]
-\usemodule[visual]
-\definepapersize[foo][width=640pt,height=360pt]
-\setuppapersize[foo]
-\starttext
-\title{\fakewords{3}{5}}
-\fakewords{50}{100}
-\stoptext
+\starttyping[option=MP]
+path p, q, r;
+p := (0, 0) -- (1, 0) -- (1, 1) -- (0, 0) -- (0, 0);
+q := (0, 0) -- (1, 0) -- (1, 1) -- (0, 0) -- cycle;
+r := fullsquare;
\stoptyping
-\midaligned{\externalfigure[12-slides-1.pdf][width=.6\textwidth,frame=on]}
-\section{页é¢å¸ƒå±€}
+\noindent 其中路径 \type{p} 的终点的åæ ‡æ°å¥½æ˜¯å…¶èµ·ç‚¹ï¼Œä½†å®ƒå¹¶éžå°é—­è·¯å¾„,而路径 \type{q} å’Œ \type{r} 皆为å°é—­è·¯å¾„。下é¢ç¤ºä¾‹ï¼Œä¸ºå°é—­è·¯å¾„填充颜色:
-在 \type{text} 环境之å‰æ·»åŠ ä»¥ä¸‹ä»£ç 
+\startsample
+\startMPcode
+path p;
+p := (fullsquare xscaled 3cm yscaled 1cm) randomized 2mm;
+pickup pencircle scaled 2pt;
+fill p withcolor darkgray;
+draw p withcolor darkred;
+\stopMPcode
+\stopsample
+\simplesample[option=MP]{\getsample}
-\starttyping[option=TEX]
-\showframe
-\stoptyping
+\noindent 注æ„,对于å°é—­è·¯å¾„,应当先填充颜色,å†ç»˜åˆ¶è·¯å¾„,å¦åˆ™æ‰€å¡«å……的颜色会覆盖一部分路径线æ¡ã€‚
-\noindent å¯åœ¨é¡µé¢ä¸Šæ˜¾ç¤ºå½“å‰çš„页é¢å¸ƒå±€ï¼Œç»“果如图 \in[12-layout-1] 所示。å¯æ ¹æ®å›¾ \in[ConTeXt-layout] ç†è§£é¡µé¢å¸ƒå±€ä¸­å„区域å称和尺寸å‚æ•°å称。
+\section{颜色}
-\placefigure[here][12-layout-1]{\ConTeXt\ 默认的页é¢å¸ƒå±€}{\externalfigure[12-layout-1.pdf][width=.6\textwidth]}
+\METAPOST\ 以å«æœ‰ä¸‰ä¸ªåˆ†é‡çš„å‘é‡è¡¨ç¤ºé¢œè‰²ã€‚å‘é‡çš„三个分é‡åˆ†åˆ«è¡¨ç¤ºçº¢è‰²ã€ç»¿è‰²å’Œè“色,å–值范围为 [0, 1],例如 \type{(0.4, 0.5, 0.6)}。å¯å°†é¢œè‰²ä¿å­˜åˆ° color 类型的å˜é‡ä¸­ï¼Œä»¥å¤‡ç»˜å›¾ä¸­é‡å¤ä½¿ç”¨ã€‚例如定义一个值为暗红色的颜色å˜é‡ï¼š
-\placefigure[here][ConTeXt-layout]{页é¢å¸ƒå±€æ³¨è§£}{\externalfigure[ConTeXt-layout.svg][width=.8\textwidth]}
+\starttyping[option=MP]
+color foo;
+foo := (0.3, 0, 0);
+\stoptyping
-使用 \type{\setlayout} å¯å¯¹å„区域尺寸进行调整,例如让版心居中,å³å›¾ \in[ConTeXt-layout] 所示的 \type{width} å’Œ \type{textheight} 确定的区域居中,因为在默认情况下,它有些å左。我们已ç»çŸ¥é“,页é¢çš„横å‘尺寸是 640 pt,按照以下设定便å¯å°†é—®é¢˜è§£å†³ï¼š
+由于 METAPOST 内部已ç»å®šä¹‰äº†ç”¨äºŽè¡¨ç¤ºçº¢è‰²çš„å˜é‡ \type{red},因此 \type{foo} 的定义也å¯å†™ä¸º
-\starttyping[option=TEX]
-\setuplayout
- [leftedge=0pt,leftedgedistance=0pt,
- leftmargin=80pt,leftmargindistance=10pt,
- backspace=90pt,
- rightedge=0pt,rightedgedistance=0pt,
- rightmargin=80pt,rightmargindistance=10pt,
- width=460pt]
+\starttyping[option=MP]
+color foo;
+foo := 0.3 * red;
\stoptyping
-\noindent 上述设定,实现了页é¢å¸ƒå±€ä¸­é¡µé¢æ€»å®½åº¦å€¼ 640 pt 的分é…,但是è¦æ³¨æ„一点,\type{backspace} 的值等于 4 个以 \type{left} 为å‰ç¼€çš„å‚数值之和,虽然在设定了它的å„个分é‡åŽï¼Œä½† \ConTeXt\ 在é‡åˆ°é»˜è®¤çš„ \type{backspace} 值与实际的 \type{left...} å‚数值之和ä¸ç¬¦æ—¶ï¼Œä¼šæ ¹æ® \type{backspace} 值进行页é¢å¸ƒå±€ã€‚倘若我们ä¸å…³å¿ƒ \type{left...} å‚æ•°ï¼Œå³ \ConTeXt\ 默认对页é¢å·¦ä¾§ç•™ç™½åŒºåŸŸé»˜è®¤å¦‚何分é…,仅需è¦è®© \ConTeXt\ çŸ¥é“ \type{backspace=90pt},则上述代ç å¯ç®€åŒ–为
+\noindent å°äºŽ 1 çš„å€æ•°ï¼Œå¯ä»¥å¿½ç•¥å‰ç¼€ 0,且å¯ä»¥ç›´æŽ¥ä½œç”¨äºŽé¢œè‰²ï¼š
-\starttyping[option=TEX]
-\setuplayout
- [backspace=90pt,
- rightedge=0pt,rightedgedistance=0pt,
- rightmargin=80pt,rightmargindistance=10pt,
- width=460pt]
+\starttyping[option=MP]
+foo := .3red;
\stoptyping
-\noindent 还å¯ä»¥è¿›ä¸€æ­¥ç®€åŒ–,因为 \ConTeXt\ 对 \type{rightedge} å’Œ \type{rightedgedistance} 赋予的默认值原本就是 0,因此有
+使用 \type{transparent} å®å¯ç”¨äºŽæž„造带有é€æ˜Žåº¦çš„颜色值。例如
+
+\startsample
+\startMPcode
+path p; p := fullsquare scaled 1cm;
+color foo; foo := .3red;
+pickup pencircle scaled 4pt;
+draw p withcolor transparent (1, 0.3, foo);
+draw p shifted (.5cm, .5cm) withcolor transparent (1, 0.25, blue);
+\stopMPcode
+\stopsample
+\simplesample[option=MP]{\getsample}
+
+\noindent \type{transparent} 的第一个å‚数表示选用的颜色é€æ˜Žæ–¹æ³•ï¼Œå…±æœ‰ 12 ç§æ–¹æ³•å¯é€‰ï¼š
+
+\startitemize[n,packed,columns,four]
+\item normal
+\item multiply
+\item screen
+\item overlay
+\item softlight
+\item hardlight
+\item colordodge
+\item colorburn
+\item darken
+\item lighten
+\item difference
+\item exclusion
+\stopitemize
+\noindent 第二个å‚数表示é€æ˜Žåº¦ï¼Œå–值范围 [0, 1],其值越大,é€æ˜Žç¨‹åº¦è¶Šä½Žã€‚第三个å‚数为颜色值。需è¦æ³¨æ„的是,\METAPOST\ 并ä¸æ”¯æŒä»¥ \type{color} 类型的å˜é‡ä¿å­˜å¸¦é€æ˜Žåº¦çš„颜色值,而且 \METAPOST\ 里也没有与之对应的å˜é‡ç±»åž‹ã€‚
+
+\section{文字}
+
+使用 \MetaFun\ å® \type{textext} å¯åœ¨ \METAPOST\ 图形中æ’入文字,且基于 \METAPOST\ 图形å˜æ¢å‘½ä»¤å¯å¯¹æ–‡å­—进行定ä½ã€ç¼©æ”¾ã€æ—‹è½¬ã€‚例如
+
+\startsample
+\startMPcode
+string s; % 字符串类型å˜é‡
+s = "\color[darkred]{\bf 江山如此多娇}";
+draw textext(s);
+draw textext(s) shifted (4cm, 0);
+draw textext(s) scaled 1.5 shifted (8cm, 0) ;
+draw textext(s) scaled 1.5 rotated 45 shifted (12cm, 0);
+\stopMPcode
+\stopsample
+\typesample[option=MP]
+\midaligned{\getsample}
+
+也å¯ä½¿ç”¨ \type{\thetextext} å®ç›´æŽ¥å¯¹æ–‡å­—进行定ä½ï¼Œä»Žè€Œå¯çœåŽ» \type{shifted} å˜æ¢ã€‚例如
+
+\startsample
+\startMPcode
+string s; s = "{\bf 江山如此多娇}";
+draw (0, 0) withpen pensquare scaled 11pt withcolor darkred;
+draw thetextext(s, (4cm, 0)) withcolor darkred;
+\stopMPcode
+\stopsample
+\typesample[option=MP]
+\getsample
+
+\section{æ–¹å‘路径}
+
+\METAPOST\ å® \type{drawarrow} å¯ç»˜åˆ¶å¸¦ç®­å¤´çš„路径。例如
+
+\startsample
+\startMPcode
+path p; p := (0, 0) -- (4cm, 0) -- (4cm, 2cm) -- (0, 2cm) -- (0, 1cm);
+pickup pencircle scaled 2pt;
+drawarrow p withcolor darkred;
+drawarrow p shifted (6cm, 0) dashed (evenly scaled .5mm) withcolor darkred;
+\stopMPcode
+\stopsample
+\typesample[option=MP]
+\midaligned{\getsample}
+
+\noindent 上述代ç ä¹Ÿç»™å‡ºäº†è™šçº¿è·¯å¾„的画法。
+
+\METAPOST\ 的任何一æ¡è·¯å¾„,从起点到终点å¯åŸºäºŽå–值范围为 [0, 1] çš„å‚数选择该路径上的æŸä¸€ç‚¹ã€‚基于该功能å¯å®žçŽ°è·¯å¾„标注。例如选择路径å‚æ•° 0.5 对应的点,在该点å³ä¾§æ”¾ç½® \ConTeXt\ 旋转 90 度的文字:
+
+\startsample
+\startMPcode
+path p; p := (0, 0) -- (4cm, 0)
+ -- (4cm, 2cm) -- (0, 2cm) -- (0, 1cm);
+pair pos; pos := point .5 along p;
+pickup pencircle scaled 2pt;
+drawarrow p withcolor darkred;
+draw pos withpen pensquare scaled 4pt
+ withcolor darkgreen;
+draw thetextext.rt("\rotate[rotation=-90]{路过}",
+ pos shifted (1mm, 0));
+\stopMPcode
+\stopsample
+\simplesample[option=MP]{\getsample}
+
+\noindent 上述代ç ä¸­å‡ºçŽ°äº† \type{thetextext} çš„åŽç¼€å½¢å¼ã€‚除了默认形å¼ï¼Œ\type{thetextext} 还有 4 ç§åŽç¼€å½¢å¼ï¼ŒåŽç¼€å为 \inframed{\type{.lft}},\inframed{\type{.top}},\inframed{\type{.rt}} å’Œ \inframed{\type{.bot}},分别表示将文字放在指定ä½ç½®çš„左侧ã€ä¸Šæ–¹ã€å³ä¾§å’Œä¸‹æ–¹ã€‚
+
+\section{ç”»é¢}
+
+\METAPOST\ 有一ç§å˜é‡ç±»åž‹ \type{picture},å¯å°†å…¶ç”¨äºŽå°†ä¸€ç»„绘图语å¥åˆå¹¶ä¸ºä¸€ä¸ªå›¾å½¢ï¼Œç„¶åŽäºˆä»¥ç»˜åˆ¶ã€‚使用 \METAPOST\ å® \type{image} å¯æž„造 \type{picture} 实例。例如
+
+\startsample
+\startMPcode
+path a; a := fullsquare xscaled 4cm yscaled 1cm;
+picture p; p := image(
+ fill a withcolor darkgray;
+ draw a withpen pencircle scaled 2pt withcolor darkblue;
+);
+draw p;
+\stopMPcode
+\stopsample
+\simplesample[option=MP]{\getsample}
+
+使用 \METAPOST\ å® \type{center} å¯ä»¥èŽ·å¾— \type{picture} 实例的中心å标,结果å¯ä¿å­˜äºŽä¸€ä¸ª \type{pair} 类型的å˜é‡ã€‚例如
+
+\startsample
+\startMPcode
+picture p; p := image(draw textext("密云ä¸é›¨ï¼Œè‡ªæˆ‘西郊"););
+pair c; c := center p;
+draw c withpen pensquare scaled 4pt withcolor darkred;
+draw p withcolor darkblue;
+\stopMPcode
+\stopsample
+\simplesample[option=MP]{\getsample}
+
+使用 \MetaFun\ å® \type{bbwidth} å’Œ \type{bbheight} å¯ä»¥èŽ·å¾— \type{picture} 实例的宽度和高度。使用这两个å®ï¼Œå¯ä¸ºä»»ä½•å›¾å½¢å’Œæ–‡å­—构造边框。例如
+
+\startsample
+\startMPcode
+picture p; p := image(draw textext("归妹愆期,迟归有时"));
+numeric w, h; w := bbwidth(p); h := bbheight(p);
+path q; q := fullsquare xscaled w yscaled h;
+fill q withcolor darkgray;
+draw q withpen pencircle scaled 2pt withcolor darkred;
+draw p;
+\stopMPcode
+\stopsample
+\simplesample[option=MP]{\getsample}
+
+\noindent 上述实例为文字构造的边框太紧了,利用现有所学,让它宽æ¾ä¸€äº›å¹¶ä¸å›°éš¾ï¼š
+
+\startsample
+\startMPcode
+picture p; p := image(draw textext("归妹愆期,迟归有时"));
+numeric w, h; w := bbwidth(p); h := bbheight(p);
+numeric offset; offset := 5mm;
+path q;
+q := fullsquare xscaled (w + offset)
+ yscaled (h + offset)
+ shifted center p;
+fill q withcolor darkgray;
+draw q withpen pencircle scaled 2pt withcolor darkred;
+draw p;
+\stopMPcode
+\stopsample
+\simplesample[option=MP]{\getsample}
+
+\section[macro]{å®}
+
+定义一个å®ï¼Œä»¤å…¶æŽ¥å—一个字符串类型的å‚数,返回一个矩形框,并令文字居于矩形框中心:
+
+\startsample
+\startMPcode
+vardef framed (expr text, offset) =
+ picture p; p := image(draw textext(text));
+ numeric w, h; w := bbwidth(p); h := bbheight(p);
+ path q;
+ q := fullsquare xscaled (w + offset) yscaled (h + offset) shifted center p;
+ image(fill q withcolor lightgray;
+ draw q withpen pencircle scaled 2pt withcolor darkred;
+ draw p;)
+enddef;
+draw framed("{\bf 亢龙有悔}", 5mm);
+\stopMPcode
+\stopsample
+\simplesample[option=MP]{\getsample}
+
+\METAPOST\ çš„ \type{vardef} 用于定义一个有返回值的å®ï¼Œå®å®šä¹‰çš„最åŽä¸€æ¡è¯­å¥å³è¿”回值,该æ¡è¯­å¥ä¸å¯ä»¥åˆ†å·ä½œä¸ºç»“尾。\METAPOST\ 还有其他几ç§å®å®šä¹‰å½¢å¼ï¼Œä½†æ˜¯å¯¹äºŽå¤§å¤šæ•°ä½œå›¾ä»»åŠ¡è€Œè¨€ï¼Œ\type{vardef} 已足够应付。
+
+\section[sec:flow-chart]{画一幅简å•çš„æµç¨‹å›¾}
+
+现在,请跟éšæˆ‘敲击键盘的手指,é€æ­¥ç”»ä¸€å¹…æ述数字求和过程的æµç¨‹å›¾ï¼Œå¸Œæœ›è¿™æ¬¡æ—…程能让你对 \METAPOST\ 的基本语法有一些全é¢çš„认识。
+
+首先,构造一个结点,表示数æ®è¾“入“â€
-\starttyping[option=TEX]
-\setuplayout
- [backspace=90pt,
- rightmargin=80pt,rightmargindistance=10pt,
- width=460pt]
+\starttyping[option=MP]
+string f; f := "\framed[frame=off,align=center]";
+picture a;
+a := image(
+ % ç¬¦å· & 用于拼接两个字符串
+ draw textext(f & "{$i\leftarrow 1$\\$s\leftarrow 0$}");
+);
\stoptyping
-如果我们åªå…³å¿ƒç‰ˆå¿ƒçš„横å‘居中问题,并ä¸å…³å¿ƒå·¦å³ç•™ç™½åŒºåŸŸçš„尺寸,最为简å•çš„布局方å¼æ˜¯
+然åŽï¼Œç”¨ \in[macro] 节定义的 \type{framed} å®æž„造两个è¿ç®—过程结点:
-\starttyping[option=TEX]
-\setuplayout[width=middle]
+\starttyping[option=MP]
+numeric offset; offset := 5mm;
+picture b; b := framed(f & "{$s\leftarrow s + i$}", offset);
+picture c; c := framed(f & "{$i\leftarrow i + 1$}", offset);
\stoptyping
-以上设置的是页é¢æ¨ªå‘布局。对于纵å‘布局,存在与 \type{backspace} ç±»ä¼¼çš„é—®é¢˜ï¼Œå³ \type{topspace} 的设定。\type{tospace} 的值是 \type{top} + \type{topdistance},但是在 \type{\setuplayout} 中åªå¯¹åŽè€…进行设定是无效的,必须先设定 \type{tospace},然åŽå†å°†å…¶å€¼åˆ†é…ç»™ \type{top} å’Œ \type{topdistance},或让 \ConTeXt\ 自动分é…。
+还需è¦å®šä¹‰ä¸€ä¸ªå®ï¼Œç”¨å®ƒæž„造è±å½¢çš„æ¡ä»¶åˆ¤æ–­ç»“点:
-对于页é¢çºµå‘布局å‚数,我è¦åŽ»æŽ‰é¡µé¢é¡¶éƒ¨å’Œåº•éƒ¨ç•™ç™½ï¼Œåªéœ€ä½œä»¥ä¸‹è®¾å®š
+\starttyping[option=MP]
+vardef diamond (expr text, offset) =
+ picture p; p := image(draw textext(text));
+ numeric w, h; w := bbwidth(p); h := bbheight(p);
+ path q;
+ q := fulldiamond xscaled (w + offset) yscaled (h + offset) shifted center p;
+ image(fill q withcolor darkgray;
+ draw q withpen pencircle scaled 2pt withcolor darkred;
+ draw p withcolor white;)
+enddef;
+picture d; d := diamond(f & "{$i > 100$}", 3 * offset);
+\stoptyping
-\starttyping[option=TEX]
-topspace=0pt,height=middle,bottom=0pt
+最åŽï¼Œå†æž„造一个结点表示程åºè¾“出:
+
+\starttyping[option=MP]
+picture e;
+e := image(draw textext(f & "{$s$}"););
\stoptyping
-\noindent 现在全部的页é¢å¸ƒå±€è®¾å®šå¦‚下:
+ä¿æŒç»“点 \type{a} ä¸åŠ¨ï¼Œå¯¹ \type{b},\type{c},\type{d} å’Œ \type{e} 进行定ä½ï¼š
-\starttyping[option=TEX]
-\setuplayout[width=middle,topspace=0pt,height=middle,footer=40pt]
+\starttyping[option=MP]
+b := b shifted (0, -2cm);
+c := c shifted (4cm, -4.5cm);
+d := d shifted (0, -4.5cm);
+e := e shifted (0, -7cm);
\stoptyping
-完æˆé¡µé¢å¸ƒå±€è®¾å®šåŽï¼Œåˆ«å¿˜è®°åŽ»æŽ‰ \type{text} 环境之å‰çš„ \type{\showframe} 语å¥ã€‚此外,我建议你在 \type{text} 环境里动手试验一番 \type{\showlayout}。
+现在å¯ä»¥ç”»å‡ºæ‰€æœ‰ç»“点了,å³
-\section[slide-fonts]{字体}
+\starttyping[option=MP]
+draw a; draw b; draw c; draw d; draw e;
+\stoptyping
+\midaligned{\externalfigure[12/flowchart-1.pdf][frame=on]}
+\blank
-在 \ConTeXt\ 使用汉字字体,对此估计你已ç»é¢‡ä¸ºç†Ÿæ‚‰äº†ã€‚在幻ç¯ç‰‡ä¸­ï¼Œæˆ‘使用以下字体:
+现在开始构造连接å„结点的路径。首先构造结点 \type{a} 的底部中点到 \type{b} 的顶部中点的路径:
-\starttyping[option=TEX]
-\definefallbackfamily
- [myfonts][ss][latinmodernsans][range={0x0000-0x0400},force=yes]
-\definefontfamily[myfonts][ss][simhei][bf=simhei,it=kaiti,bi=simhei]
-\setscript[hanzi]
-\setupbodyfont[myfonts,ss,16pt]
+\starttyping[option=MP]
+path ab;
+ab := .5[llcorner a, lrcorner a] -- .5[ulcorner b, urcorner b];
\stoptyping
-\noindent 上述字体设定并ä¸å®Œæ•´ï¼Œå°šæœªè®¾å®šè¡¬çº¿å­—æ—和等宽字æ—,这些待需è¦æ—¶å†äºˆä»¥è®¾å®šã€‚
+\noindent 其中 \type{llcorner} 用于获å–路径或画é¢å®žä¾‹çš„最å°åŒ…围盒的左下角顶点å标。åŒç†ï¼Œ\type{ulcorner},\type{urcorner} å’Œ \type{lrcorner} 分别获å–包围盒的左上角ã€å³ä¸Šè§’å’Œå³ä¸‹è§’顶点å标。\type{.5[..., ...]} 用于计算两个点连线的中点。
-\section[regular-style]{常规样å¼}
+用类似的方法å¯ä»¥æž„造其他连接å„结点的路径:
+
+\starttyping[option=MP]
+path bd;
+bd := .5[llcorner b, lrcorner b] -- .5[ulcorner d, urcorner d];
+path dc;
+dc := .5[lrcorner d, urcorner d] -- .5[ulcorner c, llcorner c];
+path cb;
+cb := .5[ulcorner c, urcorner c] -- (4cm, -2cm) -- .5[urcorner b, lrcorner b];
+path de;
+de := .5[llcorner d, lrcorner d] -- .5[ulcorner e, urcorner e];
+\stoptyping
-首先,消除 \ConTeXt\ 默认在页é¢é¡¶éƒ¨è®¾ç½®çš„页ç ï¼š
+画出所有路径:
-\starttyping[option=TEX]
-\setuppagenumbering[location=]
+\starttyping[option=MP]
+drawarrow ab withcolor darkred; drawarrow bd withcolor darkred;
+drawarrow cb withcolor darkred; drawarrow dc withcolor darkred;
+drawarrow de withcolor darkred;
\stoptyping
+\midaligned{\externalfigure[12/flowchart-2.pdf][frame=on]}
+\blank
-\noindent å¹»ç¯ç‰‡é€šå¸¸ä¸éœ€è¦é¡µç ï¼Œå³ä½¿éœ€è¦é¡µç ï¼Œé»˜è®¤çš„页ç å‡ºçŽ°çš„ä½ç½®å’Œå­—å·çš†ä¸åˆé€‚。
+最åŽä¸€æ­¥ï¼Œè·¯å¾„标注:
-设置行间è·ä¸º 1.75 å€ï¼Œå³ $1.75\times 16\,{\rm pt}$:
+\starttyping[option=MP]
+pair no; no := point .4 along dc;
+pair yes; yes := point .5 along de;
+draw thetextext.top("å¦", no);
+draw thetextext.rt("是", yes);
+\stoptyping
+\midaligned{\externalfigure[12/flowchart-3.pdf][frame=on]}
-\starttyping[option=TEX]
-\setupinterlinespace[line=28pt]
+\section{代ç ç®€åŒ–}
+
+\in[sec:flow-chart] 节中用于绘制程åºæµç¨‹å›¾çš„代ç å­˜åœ¨è®¸å¤šé‡å¤ã€‚我们å¯ä»¥å°è¯•ä½¿ç”¨æ¡ä»¶ã€å¾ªçŽ¯ï¼Œå®ç­‰å½¢å¼å¯¹ä»£ç è¿›è¡Œç®€åŒ–,但我对它们给出的讲解并ä¸ä¼šç»†è‡´ï¼Œä¸ºçš„正是走马观花,观其大略。
+
+é¦–å…ˆï¼Œè§‚å¯Ÿå® \type{framed} å’Œ \type{diamond} 的定义,å‘现二者仅有的ä¸åŒæ˜¯å‰è€…用 \type{fullsquare} 绘制盒å­ï¼ŒåŽè€…用 \type{fulldiamond}。因此,å¯ä»¥é‡æ–°å®šä¹‰ä¸€ä¸ªæ›´ä¸ºçµæ´»çš„å®ï¼Œç”¨äºŽåˆ¶ä½œç»“点:
+
+\starttyping[option=MP]
+vardef make_node(expr text, shape, offset) =
+ picture p; p := image(draw textext(text));
+ numeric w, h; w := bbwidth(p); h := bbheight(p);
+ if path shape:
+ path q;
+ q := shape xysized (w + offset, h + offset) shifted center p;
+ image(fill q withcolor lightgray;
+ draw q withpen pencircle scaled 2pt withcolor darkred;
+ draw p;)
+ else:
+ image(draw p;)
+ fi
+enddef;
\stoptyping
-以下代ç è®¾ç½®äº†äº†ç¬¬ 1 级列表样å¼ï¼Œï¼ˆ1)定义一个新的列表项符å·ï¼Œå°†å…¶è®¾ç½®åˆ—表项默认符å·ï¼›ï¼ˆ2)消除列表项之间的é¢å¤–é—´è·ï¼›ï¼ˆ3)列表项的符å·å’Œå†…容之间æ’å…¥ .5em çš„é—´è·ï¼›ï¼ˆ4)列表å‰åŽå„空 1/4 行,因为在幻ç¯ç‰‡ä¸­ï¼Œçºµå‘空间颇为ç贵。
+\noindent 由于上述代ç ä½¿ç”¨äº† \METAPOST\ çš„æ¡ä»¶åˆ¤æ–­è¯­æ³•ï¼Œä»¥ \type{path shape} 判断 \type{shape} 是å¦ä¸ºè·¯å¾„å˜é‡ï¼Œä»Žè€Œä½¿å¾— \type{make_node} 能构用于构造有无边框和有边框的结点:
\starttyping[option=MP]
-\startuseMPgraphic{square}
- path a, b;
- a := (-.5, 0) -- (-.5, .5) -- (.5, .5);
- b := (-.5, -.5) -- (.5, -.5) -- (.5, 0);
- for i = a, b:
- draw i scaled 10pt withpen pencircle scaled 2pt withcolor darkred;
- endfor;
- draw (0, 0) withpen pensquare scaled 4pt withcolor darkred;
-\stopuseMPgraphic
+numeric offset; offset := 5mm;
+string f; f := "\framed[frame=off,align=center]";
+picture a, b, c, d, e;
+a := make_node(f & "{$i\leftarrow 1$\\$s\leftarrow 0$}", none, 0);
+b := make_node(f & "{$s\leftarrow s + i$}", fullsquare, offset);
+c := make_node(f & "{$i\leftarrow i + 1$}", fullsquare, offset);
+d := make_node(f & "{$i > 100$}", fulldiamond, offset);
+e := make_node(f & "{$s$}", none, 0);
\stoptyping
-\starttyping[option=TEX]
-\definesymbol[10][{\lower.15ex\hbox{\useMPgraphic{square}}}]
-\setupitemize
- [1][10,packed]
- [distance=0.4em,
- before={\blank[quarterline]},after={\blank[quarterline]}]
+
+在 \type{vardef} å®ä¸­ä½¿ç”¨æ¡ä»¶è¯­å¥æ—¶éœ€è¦æ³¨æ„,通常情况下ä¸è¦æ¡ä»¶ç»“æŸè¯­å¥ \type{fi} åŽé¢æ·»åŠ åˆ†å·ï¼Œå¦åˆ™ \type{vardef} å®çš„返回值会带上这个分å·ã€‚在其他情境下,通常需è¦åœ¨ \type{fi} 加分å·ã€‚还è¦æ³¨æ„,我在 \type{make_node} å®ä¸­ä½¿ç”¨ \type{xysized} å–代了之å‰çš„ \type{xscale} å’Œ \type{yscale},å¯ç›´æŽ¥æŒ‡å®šè·¯å¾„或画é¢çš„尺寸。之所以如此,是因为我们无法确定 \type{make_node} å®çš„第 2 个å‚数对应的路径是å¦ä¸ºæ ‡å‡†å›¾å½¢ã€‚
+
+在绘制结点和路径时,存在é‡å¤ä½¿ç”¨ \type{draw} 语å¥çš„情况,例如
+
+\starttyping[option=MP]
+drawarrow ab withcolor darkred;
+drawarrow bd withcolor darkred;
+drawarrow cb withcolor darkred;
+drawarrow dc withcolor darkred;
+drawarrow de withcolor darkred;
\stoptyping
-\noindent 如果你还需è¦äºŒçº§ã€ä¸‰çº§åˆ—表,å¯å‚照上述设定制作适åˆçš„æ ·å¼ã€‚
-将幻ç¯ç‰‡ä¸€çº§æ— ç¼–å·æ ‡é¢˜å’Œæœ‰ç¼–å·æ ‡é¢˜å‡è®¾ç½®ä¸ºå±…中对é½ï¼Œå­—å·çº§åˆ«ä¸º \type{b},颜色为 \type{darkred},å‰åŽå„空åŠè¡Œï¼š
+\noindent å¯ä½¿ç”¨å¾ªçŽ¯è¯­å¥äºˆä»¥ç®€åŒ–:
-\starttyping[option=TEX]
-\setuphead
- [title,chapter]
- [align=center,style=\ssb,color=darkred,
- before={\blank[halfline]},after={\blank[halfline]}]
+\starttyping[option=MP]
+for i = ab, bd, cb, dc, de:
+ draw i withcolor darkred;
+endfor;
\stoptyping
-现在,在 \type{text} 环境中éšä¾¿å†™ç‚¹ä»€ä¹ˆï¼Œå¯ŸéªŒä¸Šè¿°è®¾å®šæ˜¯å¦èµ·æ•ˆã€‚
+为了便于获得路径或画é¢çš„包围盒的四边中点,定义以下å®ï¼š
-\starttyping[option=TEX]
-\starttext
-\startbuffer[foo]
-\chapter{è’™}
-亨。匪我求童蒙,童蒙求我;åˆç­®å‘Šï¼Œå†ä¸‰æ¸Žï¼Œæ¸Žåˆ™ä¸å‘Šã€‚利贞。
-\startitemize
-\item åˆå…­ï¼Œå‘蒙,利用刑人,用说桎æ¢ï¼›ä»¥å¾€å。
-\item ä¹äºŒï¼ŒåŒ…蒙,å‰ã€‚纳妇,å‰ï¼›å­å…‹å®¶ã€‚
-\item 六三,勿用å–女,è§é‡‘夫,ä¸æœ‰èº¬ï¼Œæ— æ”¸åˆ©ã€‚
-\item 六四,困蒙,å。
-\item 六五,童蒙,å‰ã€‚
-\item 上ä¹ï¼Œå‡»è’™ï¼Œä¸åˆ©ä¸ºå¯‡ï¼Œåˆ©å¾¡å¯‡ã€‚
-\stopitemize
-\stopbuffer
-\dorecurse{10}{\getbuffer[foo]}
-\stoptext
+\starttyping[option=MP]
+vardef left(expr p) = .5[llcorner p, ulcorner p] enddef;
+vardef top(expr p) = .5[ulcorner p, urcorner p] enddef;
+vardef right(expr p) = .5[lrcorner p, urcorner p] enddef;
+vardef bottom(expr p) = .5[llcorner p, lrcorner p] enddef;
\stoptyping
-\midaligned{\externalfigure[12-slides-2.pdf][width=.6\textwidth,frame=on]}
-\noindent 上述代ç ä½¿ç”¨äº† \ConTeXt\ çš„ \type{buffer} çŽ¯å¢ƒå’Œå¾ªçŽ¯å® \type{\dorecurse}。所谓 \type{buff},是一个å¯ä»¥è®¾å®šå字的缓存,它å¯ä»¥åŒ…å« \ConTeXt\ 排版代ç ã€‚\type{\getbuffer} å¯èŽ·å¾—指定å字的缓存中所包å«çš„全部代ç ã€‚\type{\dorecurse} å¯ä»¥å°†å…¶æ‰€å«å†…容é‡å¤æŒ‡å®šæ¬¡æ•°ã€‚上述代ç æ‰€äº§ç”Ÿçš„效果是生æˆå页内容相åŒçš„å¹»ç¯ç‰‡ã€‚
+\noindent 以绘制结点 \type{b} 的四边中点为测试用例
-截止至此,我们第一次在示例中使用有编å·æ ‡é¢˜ã€‚对于 \type{\chapter} 建议在幻ç¯ç‰‡æ ·å¼ä¸­å¢žåŠ ä»¥ä¸‹è®¾å®šï¼Œå°†å…¶æ•°å­—ç¼–å·æ›´æ”¹ä¸ºä¸­æ–‡ç¼–å·ï¼Œå¦å¤–设置编å·ä¸å‚与对é½ï¼Œäº¦å³åªæœ‰æ ‡é¢˜å†…容å‚与对é½ï¼š
+\starttyping[option=MP]
+for i = left(b), top(b), right(b), bottom(b):
+ draw i withpen pensquare scaled 4pt withcolor darkblue;
+endfor;
+\stoptyping
+\midaligned{\externalfigure[12/flowchart-4.pdf]}
-\starttyping[option=TEX]
-\setuphead[chapter][conversion=chinesenumerals,alternative=inmargin]
+基于上述å®ï¼Œå¯ä»¥æ›´ä¸ºç®€æ´åœ°æž„造连接å„结点的路径:
+
+\starttyping[option=MP]
+path ab; ab := bottom(a) -- top(b);
+path bd; bd := bottom(b) -- top(d);
+path dc; dc := right(d) -- left(c);
+path cb; cb := top(c) -- (xpart center c, ypart center b) -- right(b);
+path de; de := bottom(d) -- top(e);
\stoptyping
-\midaligned{\externalfigure[12-slides-3.pdf][width=.6\textwidth,frame=on]}
-\blank
-\noindent 如果你还需è¦äºŒçº§ã€ä¸‰çº§æ ‡é¢˜ï¼Œå¯å‚照上述设定制作适åˆçš„æ ·å¼ã€‚
+\noindent \type{center} 是 \METAPOST\ å®ï¼Œå¯ç”¨äºŽèŽ·å–路径或画é¢çš„包围盒中心点å标。\type{xpart} å’Œ \type{ypart} 也皆为 \METAPOST\ å®ï¼Œç”¨äºŽèŽ·å–点的å标分é‡ã€‚
-\section{页脚}
+路径标注也å¯ä»¥é€šè¿‡å®šä¹‰ä¸€ä¸ªå®äºˆä»¥ç®€åŒ–:
-在 \in[regular-style] 节中,我关闭了 \ConTeXt\ 好æ„æ供的页ç ã€‚因为我希望页ç å‡ºçŽ°åœ¨é¡µé¢çš„å³ä¸‹è§’,且除以总页数,以便清楚幻ç¯ç‰‡çš„进度。
+\starttyping[option=MP]
+vardef tag(expr p, text, pos, loc) =
+ if loc = "left": thetextext.lft(text, point pos along p)
+ elseif loc = "right": thetextext.rt(text, point pos along p)
+ elseif loc = "top": thetextext.top(text, point pos along p)
+ elseif loc = "bottom": thetextext.bot(text, point pos along p)
+ else thetextext(text, point pos along p)
+ fi
+enddef;
+\stoptyping
-\ConTeXt\ æ供了 \type{\setupfootertexts} 命令,å¯ä»¥åœ¨é¡µè„šå·¦ã€å³åŒºåŸŸæ”¾å…¥æ–‡å­—ã€ç›’å­æˆ–图形等内容,åŒæ—¶æ供了 \type{\setupfooter} 用于设定页脚区域的文字样å¼ã€‚å¦å¤–,\type{\userpagenumber} å’Œ \type{\lastuserpage} å¯åˆ†åˆ«ç”¨äºŽèŽ·å–当å‰é¡µçš„页ç å’Œæœ€åŽä¸€é¡µçš„页ç ã€‚基于这些命令,便å¯å®žçŽ°èƒ½å¤Ÿè¡¨ç¤ºè¿›åº¦çš„页ç ã€‚例如
+\noindent 其用法为
-\starttyping[option=TEX]
-\showframe
-\setupfooter[style=small,color=darkred]
-% 页脚左侧区域为空,å³ä¾§åŒºåŸŸæ”¾ç½®ç”¨äºŽè¡¨ç¤ºè¿›åº¦çš„页ç 
-\setupfootertexts[margin][][\hss\userpagenumber/\lastuserpage]
+\starttyping[option=MP]
+draw tag(dc, "å¦", .5, "top"); draw tag(de, "是", .5, "right");
\stoptyping
-\noindent 结果如图 \in[页ç è¿›åº¦] 所示。
-\placefigure[here][页ç è¿›åº¦]{第 4 页幻ç¯ç‰‡}{\externalfigure[12-slides-4.pdf][page=4,width=.6\textwidth,frame=on]}
-现在,我们已ç»æœ‰äº†ä¸€ä¸ªåŸºæœ¬å¯ç”¨çš„å¹»ç¯ç‰‡æ ·å¼äº†ã€‚倘若使用刚学过的 \METAPOST\ 语言,ç¢ç£¨ä¸€ä¸‹ï¼Œç»™å¹»ç¯ç‰‡å¢žåŠ äº›è®¸ä¸åº¸ä¿—åˆå®žç”¨çš„装饰,也许会让人觉得你的幻ç¯ç‰‡é¢‡ä¸ºç”¨å¿ƒã€‚
-\section{进度æ¡}
+\section{层层å å }
-现在,我们放弃使用当å‰é¡µç é™¤ä»¥æ€»é¡µæ•°çš„æ–¹å¼è¡¨ç¤ºè¿›åº¦ï¼Œè€Œæ˜¯é¢‡ä¸ºç”¨å¿ƒåœ°ç”¨ \METAPOST\ 在页é¢åº•éƒ¨ç»˜åˆ¶ä¸€ä¸ªè¿›åº¦æ¡ã€‚实际上,用ä¸äº†å‡ è¡Œä»£ç ä¾¿å¯å®žçŽ°ï¼š
+\ConTeXt\ 有一个以 overlay 为基础的层(Layer)机制。利用层机制,我们å¯å°† \METAPOST\ 图形绘制在页é¢ä¸Šçš„任何一个ä½ç½®ã€‚在学习层之å‰ï¼Œæˆ‘们需è¦å¯¹ overlay 的认识å†åŠ æ·±ä¸€äº›ã€‚
-\starttyping[option=MP]
-\startuseMPgraphic{processbar}
-numeric w, n, s, t;
-w := \overlaywidth; n := \lastuserpage;
-s := .5w / (n + 2); t := \userpagenumber - 1;
-path p; p := (fullsquare scaled \overlayheight);
-pickup pencircle scaled 2pt;
-picture q;
-q := image(for i = 0 upto n - 1:
- p := (p shifted (2s, 0)) randomized .5pt;
- if t = i: fill p withcolor darkgreen; fi;
- draw p withcolor transparent(1, 0.5, darkgray);
- endfor;);
-draw q xsized w;
+\subsection{overlay}
+
+实际上 overlay 环境是一个图形「栈ã€ã€‚通过它,å¯å®žçŽ°å›¾å½¢ï¼ˆåŒ…括文字)的å åŠ ã€‚例如,对于以下 \METAPOST\ 图形:
+
+\startsample
+\startuseMPgraphic{一个矩形}
+path p; p := fullsquare xscaled 4cm yscaled 1cm;
+draw p randomized 3mm
+ withcolor transparent (1, .5 randomized .25, red)
+ withpen pencircle scaled 2pt;
\stopuseMPgraphic
-\stoptyping
+\startoverlay
+ {\useMPgraphic{一个矩形}}
+ {\useMPgraphic{一个矩形}}
+ {\useMPgraphic{一个矩形}}
+\stopoverlay
+\stopsample
+\simplesample[option=MP]{\getsample}
+
+\noindent 上述代ç ä¸­ï¼Œ\type{transparent (1, .5 randomized .3, red)} 用于构造在一定程度上ä¸ç¡®å®šé€æ˜Žåº¦çš„红色,é€æ˜Žåº¦åœ¨ [0.2, 0.8] ä¹‹é—´ï¼Œäº¦å³ \type{randomized} ä¸ä»…å¯ä½œç”¨äºŽè·¯å¾„,也å¯ä½œç”¨äºŽæ•°å­—或颜色值。由于上述 \METAPOST\ 图形环境包å«ç€éšæœºå†…容,将其作为æ’图,在一个 overlay 中多次使用,æ¯æ¬¡ä½¿ç”¨éƒ½ä¼šäº§ç”Ÿä¸åŒçš„结果,在 overlay 中它们会被å åŠ åˆ°ä¸€èµ·ã€‚
+
+之å‰åœ¨ä¸º \type{\framed} 定义 overlay 时,overlay 中åªæœ‰å•ä¸ªå›¾å½¢ï¼Œäº¦å³æˆ‘们并未充分利用 overlay 的特性。以下代ç å®šä¹‰çš„ \type{\framed} 的背景便包å«äº†ä¸‰ä¸ªå åŠ çš„ overlay:
+
+\startsample
+\defineoverlay
+ [å å ]
+ [\startoverlay
+ {\useMPgraphic{一个矩形}}
+ {\useMPgraphic{一个矩形}}
+ {\useMPgraphic{一个矩形}}
+ \stopoverlay]
+\defineframed
+ [foo]
+ [frame=off,background={å å },width=4cm]
+\foo{迎接光辉å²æœˆ}
+\stopsample
+\simplesample[option=TEX]{\getsample}
+
+\noindent \type{\framed} 的背景支æŒå¤šä¸ª overlay å åŠ ï¼Œä»¥ä¸‹ä»£ç ä¸Žä¸Šä¾‹ç­‰æ•ˆï¼š
\starttyping[option=TEX]
-\defineoverlay[process][\useMPgraphic{processbar}]
-\setupfootertexts[{\framed[frame=off,offset=0pt,
- width=\makeupwidth,height=.8em,
- background=process,empty=yes]{}}]
+\defineoverlay[å å -1]{\useMPgraphic{一个矩形}}
+\defineoverlay[å å -2]{\useMPgraphic{一个矩形}}
+\defineoverlay[å å -3]{\useMPgraphic{一个矩形}}
+\defineframed[foo][frame=off,background={å å -1,é‡å -2,é‡å -3}]
+\foo{迎接光辉å²æœˆ}
\stoptyping
-\noindent 上述代ç å”¯ä¸€éœ€è¦è§£é‡Šä¹‹å¤„是,当 \type{\setupfootertexts} åªæœ‰ä¸€ä¸ªå‚数时,该å‚数的值会被安置在页脚的中间区域。所构造的进度æ¡æ•ˆæžœå¦‚图 \in[processbar] 所示。
+\noindent è¿™æ„味ç€ï¼Œ\type{\framed} 的背景,本质上也是一个 overlay。
-\placefigure[here][processbar]{第 3 页幻ç¯ç‰‡}{\externalfigure[slides.pdf][width=.6\textwidth,page=4,frame=on]}
+基于 overlay,也å¯ä¸ºæ–‡æ¡£è®¾ç½®æ°´å°ã€‚例如,若在 \type{\starttext} 之å‰æ·»åŠ ä»¥ä¸‹ä»£ç ï¼š
-\section{å°é¢å’Œè‡´è°¢}
+\starttyping[option=TEX]
+\startuseMPgraphic{square}
+path p; p := fullsquare xscaled 4cm yscaled 1cm;
+draw p randomized 3mm
+ withcolor transparent (1, .5 randomized .3, red)
+ withpen pencircle scaled 2pt;
+\stopuseMPgraphic
+\defineoverlay[watermark][\useMPgraphic{square}]
+\setupbackgrounds[page][background=watermark]
+\stoptyping
+\midaligned{\externalfigure[12/watermark.png][width=.6\textwidth]}
+
+\subsection[layer]{层}
-å¹»ç¯ç‰‡çš„å°é¢å’Œæœ€åŽçš„致谢页皆å¯ä½¿ç”¨ \type{sandardmakeup} 环境制作。例如
+\ConTeXt\ 的层,本质上是一个å¯ä½œä¸ºå…¨é¡µèƒŒæ™¯çš„ overlay,å¯ä½¿ç”¨ç»å¯¹å标或相对å标对排版元素在页é¢ä¸Šå®šä½æ”¾ç½®ã€‚例如,定义一个层 foo,在三个ä¸åŒä½ç½®åˆ†åˆ«æ”¾ç½®ä¸€å¹… \METAPOST\ 图形,并将其作用于当å‰é¡µé¢ï¼š
+
+\starttyping[option=TEX]
+\definelayer[foo]
+\setlayer[foo][x=0cm,y=0cm]{\useMPgraphic{一个矩形}}
+\setlayer[foo][x=6cm,y=1cm]{\useMPgraphic{一个矩形}}
+\stoptyping
+\starttyping[option=TEX]
+\setlayer
+ [foo]
+ [x=\textwidth,y=2cm,hoffset=-4cm,vhoffset=-.5cm]{\useMPgraphic{一个矩形}}
+\flushlayer[foo]
+\stoptyping
+\definelayer[test]
+\setlayer[test][x=0cm,y=0cm]{\useMPgraphic{一个矩形}}
+\setlayer[test][x=6cm,y=1cm]{\useMPgraphic{一个矩形}}
+\setlayer
+ [test]
+ [x=\textwidth,y=2cm,hoffset=-4cm,voffset=-3cm]{\useMPgraphic{一个矩形}}
+\flushlayer[test]
+\noindent 上述代ç å®šä¹‰çš„层 foo,其å标原点是层被投放的ä½ç½®ï¼Œäº¦å³åœ¨æœ¬è¡Œæ–‡å­—的左上角。$x$ åæ ‡å‘å³é€’增,$y$ åæ ‡å‘下递增。
+\definelayer[foo]
+\setlayer[foo][x=0cm,y=0cm]{\useMPgraphic{circle}}
+\setlayer[foo][preset=rightbottom]{\useMPgraphic{circle}}
+\setupbackgrounds[page][background=foo]
+
+如果将层的宽度和高度分别设为页é¢çš„宽度和高度,并将其设为页é¢èƒŒæ™¯ï¼Œåˆ™å标原点在页é¢çš„左上角,且å¯ä½¿ç”¨ä¸€äº›é¢„定义ä½ç½®æŠ•æ”¾å†…容。例如以下代ç å¯åœ¨å½“å‰é¡µé¢çš„左上角和å³ä¸‹è§’ä½ç½®å„放一个圆圈:
\starttyping[option=TEX]
-\startstandardmakeup[align=center]
-\ssd \color[darkred]{如何用 \ConTeXt\ 制作幻ç¯ç‰‡}
-\blank[2*line]
-\ssb æŽæŸäºº
-\blank[line]
-2023 年 3 月 28 日
-\stopstandardmakeup
+\startuniqueMPgraphic{circle}
+draw fullcircle scaled 2cm withpen pencircle scaled 2pt withcolor darkgreen;
+\stopuniqueMPgraphic
+\definelayer[foo][width=\paperwidth,height=\paperheight]
+\setlayer[foo][x=0cm,y=0cm]{\uniqueMPgraphic{circle}}
+\setlayer[foo][preset=rightbottom]{\uniqueMPgraphic{circle}}
+\setupbackgrounds[page][background=foo]
\stoptyping
-\noindent 结果如图 \in[cover] 所示。
+\startuniqueMPgraphic{circle}
+draw fullcircle scaled 2cm withpen pencircle scaled 2pt withcolor darkgreen;
+\stopuniqueMPgraphic
+\definelayer[foo][width=\paperwidth,height=\paperheight]
+\setlayer[foo][x=0cm,y=0cm]{\uniqueMPgraphic{circle}}
+\setlayer[foo][preset=rightbottom]{\uniqueMPgraphic{circle}}
+\setupbackgrounds[page][background=foo]
-之所以使用 \type{standardmakeup} 环境,是因为它是完全的空白页,且ä¸ä¼šå‚与页ç è®¡æ•°ã€‚
-\placefigure[here][cover]{å°é¢}{\externalfigure[slides.pdf][width=.6\textwidth,page=1,frame=on]}
+\noindent 需è¦æ³¨æ„的是,层被使用一次åŽï¼Œä¾¿ä¼šè¢«æ¸…空,因而将其作为页é¢èƒŒæ™¯ï¼Œä»…对当å‰é¡µæœ‰æ•ˆã€‚
-\section{ä¸è¦å¤ªåˆºçœ¼}
+通过 \type{preset} å‚æ•°å¯è°ƒæ•´å±‚çš„å标原点和å标方å‘。在上述代ç ä¸­ï¼Œ\type{rightbottom} å¯å°†å±‚çš„å标原点定ä½äºŽå±‚çš„å³ä¸‹è§’,åŒæ—¶ $x$ å标方å‘å˜ä¸ºå‘左递增,$y$ å标方å‘å˜ä¸ºå‘上递增。
-白色背景,往往过于刺眼。我们å¯å°†å¹»ç¯ç‰‡èƒŒæ™¯è‰²è®¾ç½®ä¸ºæµ…ç°è‰²ï¼š
+\ConTeXt\ 预定义的 \type{preset} å‚数值有
+
+\startitemize[packed,columns,five]
+\item lefttop\item righttop\item leftbottom\item rightbottom\item middle\item middletop
+\item middlebottom\item middleleft\item middleright\item lefttopleft\item lefttopright
+\stopitemize
+
+\noindent 使用这些å‚数值时,è¦æ³¨æ„å标方å‘。例如,若 \type{preset=middleright},其 $x$ å标方å‘å˜ä¸ºå‘左递增,而 $y$ å标方å‘ä¾ç„¶ä¿æŒå‘上递增,以下代ç å¯äºˆä»¥éªŒè¯ï¼š
\starttyping[option=TEX]
-\setupbackgrounds[page][backgroundcolor=lightgray,background=color]
+\definelayer[bar][width=\paperwidth,height=\paperheight]
+\setlayer[bar][preset=middleright]{
+ \startMPcode
+ draw (0, 0) withpen pensquare scaled 12pt withcolor darkred;
+ \stopMPcode
+}
\stoptyping
-\noindent 结果如图 \in[slide-background] 所示。
-\placefigure[here][slide-background]{æµ…ç°è‰²èƒŒæ™¯}{\externalfigure[slides-finished.pdf][width=.6\textwidth,page=1,frame=on]}
+\starttyping[option=TEX]
+\setlayer[bar][preset=middleright,x=2cm,y=2cm]{
+ \startMPcode
+ draw (0, 0) withpen pensquare scaled 12pt
+ withcolor transparent (1, .3, darkred);
+ \stopMPcode
+}
+\setupbackgrounds[page][background=bar]
+\stoptyping
+
+\definelayer[bar][width=\paperwidth,height=\paperheight]
+\setlayer[bar][preset=middleright]{
+ \startMPcode
+ draw (0, 0) withpen pensquare scaled 12pt withcolor darkred;
+ \stopMPcode
+}
+\setlayer[bar][preset=middleright,x=2cm,y=2cm]{
+ \startMPcode
+ draw (0, 0) withpen pensquare scaled 12pt
+ withcolor transparent (1, .3, darkred);
+ \stopMPcode
+}
+\setupbackgrounds[page][background=bar]
\section{å°ç»“}
-本章仅介ç»äº†éžå¸¸åŸºæœ¬çš„å¹»ç¯ç‰‡åˆ¶ä½œè¿‡ç¨‹ã€‚一份精致的幻ç¯ç‰‡æ ·å¼ï¼Œå€¼å¾—你用心设计,但是切记,ä¸è¦å–§å®¾å¤ºä¸»ã€‚质胜文则野,文胜质则å²ã€‚å­”å­è¯´ï¼Œå¥½çš„å¹»ç¯ç‰‡æ ·å¼ï¼Œæ€»æ˜¯æ˜¯æ–‡è´¨å½¬å½¬çš„。本文制作的幻ç¯ç‰‡ç¤ºä¾‹ï¼Œè·¯æ•°å野。
+也许你æ„犹未尽,甚至觉得我语焉ä¸è¯¦ã€‚切莫怪我,我原本仅仅是介ç»å¦‚何使用 \METAPOST\ 绘制一个边框å—éšæœºæ‰°åŠ¨çš„ç›’å­ã€‚ä¸è¿‡ï¼Œåœ¨å¤§è‡´æŽŒæ¡äº†æœ¬ç« æ‰€è¿°çš„内容的基础上,关于 \METAPOST\ 更多的知识,特别本章所有你觉得语焉ä¸è¯¦ä¹‹å¤„,皆å¯é˜…读它的手册\cite[mpman]以增进认识。此外,\ConTeXt\ å¼€å‘者 Hans Hagen 所写的 \MetaFun\ 手册除了讲述 \MetaFun\ 之外也大é‡ä»‹ç»äº† \METAPOST\ 的基本知识和技巧,该手册在你的 \ConTeXt\ 系统中,使用以下命令查找:
+
+\starttyping
+$ mtxrun --script base --search metafun-s.pdf
+\stoptyping \ No newline at end of file
diff --git a/info/context-notes-zh-cn/src/13.tex b/info/context-notes-zh-cn/src/13.tex
index 9e620179a3..2135246791 100644
--- a/info/context-notes-zh-cn/src/13.tex
+++ b/info/context-notes-zh-cn/src/13.tex
@@ -1,271 +1,280 @@
-\chapter{写一本书?}
+\chapter{å¹»ç¯ç‰‡}
-至此,你所掌æ¡çš„关于 \CONTEXT\ 的所有知识,无论是用于撰写书信,éšç¬”,论文,还是制作幻ç¯ç‰‡ï¼Œçš†å·²æ¸¸åˆƒæœ‰ä½™ã€‚现在å†æŽŒæ¡ \ConTeXt\ 对文档逻辑结构的划分以åŠä¸ºæ–‡æ¡£æ·»åŠ ç›®å½•ç­‰åŠŸèƒ½ï¼Œä¾¿å¯å†™ä¹¦äº†ï¼Œè¿™æ˜¯ \TEX\ 系统一直以æ¥æœ€ä¸ºæ“…长的事情,也是 \TEX\ 系统为何å¤æ‚到令很多人ç•æƒ§çš„原因,他们从未想过自己有一天会写一本书。
+现在你已ç»é¢†ç•¥ç”šè‡³å¯èƒ½å…¨éƒ¨æŽŒæ¡äº† \ConTeXt\ 常用的的排版元素,若ä¸ä½¿ç”¨å®ƒä»¬è€Œæ˜¯ä¾ç„¶ä½¿ç”¨ Microsoft PowerPoint 制作幻ç¯ç‰‡ç”šä¸ºå¯æƒœã€‚如果你已决æ„使用 \ConTeXt\ 制作幻ç¯ç‰‡ï¼Œä½ ä¼šå‘现,你几乎ä¸éœ€è¦å†å­¦ä¹ å¤šå°‘æ–°çš„ \ConTeXt\ 命令便å¯éšå¿ƒæ‰€æ¬²åœ°åˆ¶ä½œæ¸…新质朴的幻ç¯ç‰‡äº†ã€‚
-\section{书的内容结构}
+\section{纸é¢å°ºå¯¸}
-一本书,通常是由一组文章构æˆçš„,å¯åˆ†ä¸ºåºã€å‰è¨€ã€ç›®å½•ã€æ­£æ–‡ç¯‡ç« ã€è·‹ã€å‚考文献ã€ç´¢å¼•ã€é™„录等内容,å†åŠ ä¸Šå°é¢ï¼Œè¡¬é¡µã€æ‰‰é¡µç­‰é¡µé¢ã€‚对于书ç±åˆ¶ä½œï¼Œ\CONTEXT\ 对 \type{text} 环境进行了更为细致的划分:
+纸é¢å°ºå¯¸æ˜¯æ¯ä¸€é¡µçš„打å°å°ºå¯¸ã€‚至此为止,本文档之å‰æ‰€æœ‰çš„示例,在 \type{TEXpage} 环境里的,纸é¢å°ºå¯¸å–决于文档内容的多少,而在 \type{text} 环境里的,纸é¢å°ºå¯¸é»˜è®¤æ˜¯ A4ï¼Œå³ $21\,{\rm cm}\times 29.7\,{\rm cm}$,如果你需è¦å°†è¯¥å°ºå¯¸æ¢æˆ A5,åªéœ€åœ¨æ ·å¼æ–‡ä»¶ä¸­ä½œä»¥ä¸‹è®¾å®š
\starttyping[option=TEX]
-\starttext
-\startfrontmatter
-% å°é¢ã€æ‰‰é¡µã€åºã€å‰è¨€ã€ç›®å½•ç­‰å†…容
-\stopfrontmatter
-\startbodymatter
-% 正文篇章
-\stopbodymatter
-\startbackmatter
-% 跋,å‚考文献列表ã€ç´¢å¼•ç­‰å†…容
-\stopbackmatter
-\startappendices
-% 附录
-\stopappendices
-\stoptext
+\setuppapersize[A5]
\stoptyping
-\section{文件结构}
+制作幻ç¯ç‰‡é€šå¸¸ä¸éœ€è¦å¤ªå¤§çš„纸é¢å°ºå¯¸ã€‚\ConTeXt\ æ供了 S4 尺寸($400\,{\rm pt}\times 300\,{\rm pt}$),å¯å°†å…¶ä½œä¸ºå¹»ç¯ç‰‡çš„纸é¢å°ºå¯¸ã€‚也å¯ä»¥è‡ªå·±å®šä¹‰çº¸é¢å°ºå¯¸å¹¶ä½¿ç”¨ï¼Œä¾‹å¦‚
-将一本书的内容全部放在一份 \CONTEXT\ æºæ–‡ä»¶ä¸­å¹¶ä¸è¿æ³•ï¼Œä½†æ˜¯æ•°å万甚至上百万字的内容,无论是撰写还是修改必定æžä¸ºä¸ä¾¿ã€‚通常是将按照内容结构,将æ¯éƒ¨åˆ†å†…容制作为å•ç‹¬çš„ \type{.tex} æºæ–‡ä»¶ï¼Œç„¶åŽä½¿ç”¨ \type{\input} 载入到主文件中。例如,主文档的主文件内容如下:
-
-\starttyping[option=TEX]
-\starttext
-\startfrontmatter
-\input cover % cover.tex:å°é¢
-\input preface % preface.tex:åº
-\stopfrontmatter
-\stoptyping
\starttyping[option=TEX]
-\startbodymatter
-\input 01 % 01.tex:第一章
-\input 02 % 02.tex:第二章
-% ... ...
-\stopbodymatter
-\startbackmatter
-\title{å‚考文献}
-\placelistofpublications % å‚考文献列表
-\stopbackmatter
-\startappendices
-\null % 暂时为空
-\stopappendices
-\stoptext
+\definepapersize[foo][width=640pt,height=480pt]
+\setuppapersize[foo]
\stoptyping
-\noindent 主文件 \type{\input} 的所有文件皆与主文件在åŒä¸€ç›®å½•ã€‚
-
-\section{æ ·å¼}
-
-原则上,书ç±çš„所有排版样å¼çš†åº”在å•ç‹¬çš„文件中设定,然åŽä½¿ç”¨ \type{\input} 或 \type{\environment} 命令在 \type{text} 环境之å‰å°†å…¶è½½å…¥ã€‚例如
+实际上,纸é¢å°ºå¯¸ä»…对排版结果的打å°å¾ˆé‡è¦ï¼Œå€˜è‹¥åªæ˜¯åœ¨è®¡ç®—机(或投影仪)å±å¹•ä¸Šè§‚看排版结果,我们总是å¯ä»¥é€šè¿‡è°ƒæ•´æ­£æ–‡å­—体大å°åŽ»åº”对过大或过å°çš„纸é¢å°ºå¯¸ï¼Œä½†æ˜¯çº¸é¢å°ºå¯¸çš„宽高比例,对于å±å¹•éžå¸¸é‡è¦ã€‚通常,幻ç¯ç‰‡çš„宽高比应当与å±å¹•çš„分辨率相适应为最佳。例如,我的å±å¹•åˆ†è¾¨çŽ‡æ˜¯ $1600\times 900$,那么我è¦åˆ¶ä½œçš„å¹»ç¯ç‰‡é¡µé¢çš„宽高比也应当是 $16:9$,故而纸é¢å°ºå¯¸å¯è®¾å®šä¸º
\starttyping[option=TEX]
-\environment book-style % 载入book-style.tex
-\starttext
-% ... ... ...
-\stoptext
+\definepapersize[foo][width=640pt,height=360pt]
+\setuppapersize[foo]
\stoptyping
-\section{目录}
-
-\type{\placecontent} å¯å°†å…¨æ–‡ç« èŠ‚标题åŠå…¶æ‰€åœ¨é¡µç ç­‰ä¿¡æ¯æ±‡æ€»ä¸ºä¸€ä¸ªåˆ—表,以方便读者查阅。例如
+现在,我们å¯ä»¥åˆ¶ä½œå¹»ç¯ç‰‡çš„最原始的形å¼ï¼š
\starttyping[option=TEX]
\usemodule[visual]
+\definepapersize[foo][width=640pt,height=360pt]
+\setuppapersize[foo]
\starttext
\title{\fakewords{3}{5}}
-\placecontent
-\section{\fakewords{3}{5}}
-... ... ...
-\section{\fakewords{3}{5}}
-... ... ...
+\fakewords{50}{100}
\stoptext
\stoptyping
-\midaligned{%
- \clip[width=\textwidth,height=6cm,voffset=3cm]{%
- \externalfigure[13-toc.pdf][width=\textwidth,frame=on]%
- }%
-}
+\midaligned{\externalfigure[13/slides-1.pdf][width=.6\textwidth,frame=on]}
-使用 \type{\setupcombinedlist} å¯è®¾å®šç›®å½•æ ·å¼ï¼Œä¾‹å¦‚设定å¯åœ¨ç›®å½•ä¸­å‡ºçŽ°çš„标题级别以åŠåˆ—表样å¼ã€‚若得到常è§çš„目录样å¼ï¼Œåªéœ€ä½œä»¥ä¸‹è®¾å®šï¼š
+\section{页é¢å¸ƒå±€}
-\starttyping[option=TEX]
-\setupcombinedlist[content][alternative=c]
-\stoptyping
-\midaligned{%
- \clip[width=\textwidth,height=6cm,voffset=3cm]{%
- \externalfigure[13-toc-2.pdf][width=\textwidth,frame=on]%
- }%
-}
-\blank
-\noindent 目录列表样å¼å‚æ•° \type{alternative} 有 \type{a},\type{b},\type{c},\type{d} 四个值å¯é€‰ï¼Œé»˜è®¤æ˜¯ \type{b}。本文档目录使用的是 \type{d}。
-
-\type{\setupcombinedlist} 亦å¯ç”¨äºŽæŒ‡å®šå¯å‡ºçŽ°åœ¨ç›®å½•åˆ—表中的标题级别,例如
+在 \type{text} 环境之å‰æ·»åŠ ä»¥ä¸‹ä»£ç 
\starttyping[option=TEX]
-\setupcombinedlist[content][list={chapter,section}]
+\showframe
\stoptyping
-注æ„,当 \type{\placecontent} 出现在 \type{\chapter} 之åŽæ—¶ï¼Œç”Ÿæˆçš„目录仅针对该章之内的å„节。若是写书,需将 \type{\placecontent} 放在 \type{frontmatter} 环境,例如:
+\noindent å¯åœ¨é¡µé¢ä¸Šæ˜¾ç¤ºå½“å‰çš„页é¢å¸ƒå±€ï¼Œç»“果如图 \in[12-layout-1] 所示。å¯æ ¹æ®å›¾ \in[ConTeXt-layout] ç†è§£é¡µé¢å¸ƒå±€ä¸­å„区域å称和尺寸å‚æ•°å称。
-\starttyping[option=TEX]
-\startfrontmatter
-\title{目录}
-\placecontent
-\stopfrontmatter
-\stoptyping
+\placefigure[here][12-layout-1]{\ConTeXt\ 默认的页é¢å¸ƒå±€}{\externalfigure[13/layout-1.pdf][width=.6\textwidth]}
-\noindent å¯å¯¹å…¨ç¯‡è¢«åˆ—入目录列表的章节生æˆç›®å½•ã€‚
+\placefigure[here][ConTeXt-layout]{页é¢å¸ƒå±€æ³¨è§£}{\externalfigure[13/ConTeXt-layout.svg][width=.8\textwidth]}
-使用 \type{\setuplist} å¯å¯¹å‡ºçŽ°åœ¨ç›®å½•åˆ—表中相应级别的标题样å¼åˆ†åˆ«äºˆä»¥è®¾å®šï¼Œä¾‹å¦‚
+使用 \type{\setlayout} å¯å¯¹å„区域尺寸进行调整,例如让版心居中,å³å›¾ \in[ConTeXt-layout] 所示的 \type{width} å’Œ \type{textheight} 确定的区域居中,因为在默认情况下,它有些å左。我们已ç»çŸ¥é“,页é¢çš„横å‘尺寸是 640 pt,按照以下设定便å¯å°†é—®é¢˜è§£å†³ï¼š
\starttyping[option=TEX]
-\setuplist[chapter]
- [alternative=a,
- before={\blank[halfline]},after={\blank[halfline]},style=bold]
-\setuplist[section]
- [alternative=d,style=normal,pagestyle=smallbold]
+\setuplayout
+ [leftedge=0pt,leftedgedistance=0pt,
+ leftmargin=80pt,leftmargindistance=10pt,
+ backspace=90pt,
+ rightedge=0pt,rightedgedistance=0pt,
+ rightmargin=80pt,rightmargindistance=10pt,
+ width=460pt]
\stoptyping
-\section{让无编å·æ ‡é¢˜è¿›å…¥ç›®å½•}
-
-\CONTEXT\ 默认ä¸å…许无编å·æ ‡é¢˜å‡ºçŽ°åœ¨ç›®å½•ä¸­ï¼Œä½†æ˜¯å€˜è‹¥å¯¹æ— ç¼–å·æ ‡é¢˜ï¼Œä¾‹å¦‚ \type{\title} 作以下设定
+\noindent 上述设定,实现了页é¢å¸ƒå±€ä¸­é¡µé¢æ€»å®½åº¦å€¼ 640 pt 的分é…,但是è¦æ³¨æ„一点,\type{backspace} 的值等于 4 个以 \type{left} 为å‰ç¼€çš„å‚数值之和,虽然在设定了它的å„个分é‡åŽï¼Œä½† \ConTeXt\ 在é‡åˆ°é»˜è®¤çš„ \type{backspace} 值与实际的 \type{left...} å‚数值之和ä¸ç¬¦æ—¶ï¼Œä¼šæ ¹æ® \type{backspace} 值进行页é¢å¸ƒå±€ã€‚倘若我们ä¸å…³å¿ƒ \type{left...} å‚æ•°ï¼Œå³ \ConTeXt\ 默认对页é¢å·¦ä¾§ç•™ç™½åŒºåŸŸé»˜è®¤å¦‚何分é…,仅需è¦è®© \ConTeXt\ çŸ¥é“ \type{backspace=90pt},则上述代ç å¯ç®€åŒ–为
\starttyping[option=TEX]
-\setuphead[title][incrementnumber=list]
+\setuplayout
+ [backspace=90pt,
+ rightedge=0pt,rightedgedistance=0pt,
+ rightmargin=80pt,rightmargindistance=10pt,
+ width=460pt]
\stoptyping
-\noindent 之åŽä¾¿å¯å°† \type{\title} 添加到目录列表,å³
+\noindent 还å¯ä»¥è¿›ä¸€æ­¥ç®€åŒ–,因为 \ConTeXt\ 对 \type{rightedge} å’Œ \type{rightedgedistance} 赋予的默认值原本就是 0,因此有
\starttyping[option=TEX]
-\setupcombinedlist[content][list={title,chapter,section}]
+\setuplayout
+ [backspace=90pt,
+ rightmargin=80pt,rightmargindistance=10pt,
+ width=460pt]
\stoptyping
-需è¦æ³¨æ„的是,在 \type{frontmatter} 环境中放置目录列表时,若使用以下代ç 
+如果我们åªå…³å¿ƒç‰ˆå¿ƒçš„横å‘居中问题,并ä¸å…³å¿ƒå·¦å³ç•™ç™½åŒºåŸŸçš„尺寸,最为简å•çš„布局方å¼æ˜¯
\starttyping[option=TEX]
-\startfrontmatter
-\title{目录}
-\placecontent
-\stopfrontmatter
+\setuplayout[width=middle]
\stoptyping
-\noindent 由于此时 \type{\title} 已被列入目录列表,因此 \type{\title{目录}} 本身会出现在目录列表中。为é¿å…这一问题,需è¦ä¸ºç›®å½•é¡µå•ç‹¬å®šä¹‰ä¸€ä¸ªæ ‡é¢˜ã€‚\CONTEXT\ 支æŒæˆ‘们定义自己的标题,例如
+以上设置的是页é¢æ¨ªå‘布局。对于纵å‘布局,存在与 \type{backspace} ç±»ä¼¼çš„é—®é¢˜ï¼Œå³ \type{topspace} 的设定。\type{tospace} 的值是 \type{top} + \type{topdistance},但是在 \type{\setuplayout} 中åªå¯¹åŽè€…进行设定是无效的,必须先设定 \type{tospace},然åŽå†å°†å…¶å€¼åˆ†é…ç»™ \type{top} å’Œ \type{topdistance},或让 \ConTeXt\ 自动分é…。
+
+对于页é¢çºµå‘布局å‚数,我è¦åŽ»æŽ‰é¡µé¢é¡¶éƒ¨å’Œåº•éƒ¨ç•™ç™½ï¼Œåªéœ€ä½œä»¥ä¸‹è®¾å®š
\starttyping[option=TEX]
-\definehead[TOC][title]
+topspace=0pt,height=middle,bottom=0pt
\stoptyping
-\noindent 定义了一个新的标题 \type{\TOC},它与 \type{\title} çš„æ ·å¼ç›¸åŒã€‚在 \type{frontmatter} 环境中使用 \type{\TOC}:
+\noindent 现在全部的页é¢å¸ƒå±€è®¾å®šå¦‚下:
\starttyping[option=TEX]
-\startfrontmatter
-\TOC{目录}
-\placecontent
-\stopfrontmatter
+\setuplayout[width=middle,topspace=0pt,height=middle,footer=40pt]
\stoptyping
-\noindent 由于我们并未将 \type{\TOC} 列入目录列表,因此上述问题得以解决。
-
-\section{书签}
-
-对于内容较多的 PDF 文档,æ供书签(Bookmark)å¯æ›´åŠ ä¾¿äºŽä»–人阅读。书签通常显示于 PDF 阅读器的侧æ ï¼Œå¦‚图 \in[13-bookmarks] 所示,点击æŸä¸ªä¹¦ç­¾ä¾¿å¯è·³è½¬è‡³å…¶å…³è”的页é¢ã€‚
+完æˆé¡µé¢å¸ƒå±€è®¾å®šåŽï¼Œåˆ«å¿˜è®°åŽ»æŽ‰ \type{text} 环境之å‰çš„ \type{\showframe} 语å¥ã€‚此外,我建议你在 \type{text} 环境里动手试验一番 \type{\showlayout}。
-\placefigure[here][13-bookmarks]{PDF 书签}{\externalfigure[13-bookmarks.png][width=.6\textwidth]}
+\section[slide-fonts]{字体}
-为 \ConTeXt\ 生æˆçš„ PDF 文件制作书签,éžå¸¸ç®€å•ï¼Œåªéœ€åœ¨æ ·å¼æ–‡ä»¶ä¸­æ·»åŠ ä»¥ä¸‹è¯­å¥ï¼Œ
+在 \ConTeXt\ 使用汉字字体,对此估计你已ç»é¢‡ä¸ºç†Ÿæ‚‰äº†ã€‚在幻ç¯ç‰‡ä¸­ï¼Œæˆ‘使用以下字体:
\starttyping[option=TEX]
-\setupinteraction[state=start,focus=standard]
-\setupinteractionscreen[option=bookmark]
-\placebookmarks[title,chapter,section][title,chapter]
+\definefallbackfamily
+ [myfonts][ss][latinmodernsans][range={0x0000-0x0400},force=yes]
+\definefontfamily[myfonts][ss][simhei][bf=simhei,it=kaiti,bi=simhei]
+\setscript[hanzi]
+\setupbodyfont[myfonts,ss,16pt]
\stoptyping
-\noindent 其中,\type{\setupinteraction} ç”¨äºŽå¼€å¯ PDF 的用户交互特性。\type{\setupinteractionscreen} 用于设定 PDF 文件被阅读器打开åŽï¼Œä»¥ä½•ç§å½¢å¼å¦‚何呈现在å±å¹•ä¸Šï¼Œè‹¥å…¶ \type{option} 值为 \type{bookmark},则文件打开åŽï¼Œä¼šè‡ªåŠ¨å¼€å¯é˜…读器的侧边æ å¹¶æ˜¾ç¤ºä¹¦ç­¾ï¼›è‹¥è®¾ç½® \type{option} 为 \type{max},则文件在被打开åŽä¼šå…¨å±æ˜¾ç¤ºã€‚上述 \type{\placebookmarks} 语å¥çš„用途是设置å¯å‡ºçŽ°åœ¨ä¹¦ç­¾æ çš„标题级别,且仅å…许 \type{\title} å’Œ \type{\chapter} 级别的标题,其å­æ ‡é¢˜åˆ—表å¯è¢«å±•å¼€ã€‚
+\noindent 上述字体设定并ä¸å®Œæ•´ï¼Œå°šæœªè®¾å®šè¡¬çº¿å­—æ—和等宽字æ—,这些待需è¦æ—¶å†äºˆä»¥è®¾å®šã€‚
-需è¦æ³¨æ„的是,\CONTEXT\ åŒæ ·é»˜è®¤æ— ç¼–å·æ ‡é¢˜ä¸è¢«åˆ—入书签,但是倘若åšä»¥ä¸‹è®¾å®š
+\section[regular-style]{常规样å¼}
+
+首先,消除 \ConTeXt\ 默认在页é¢é¡¶éƒ¨è®¾ç½®çš„页ç ï¼š
\starttyping[option=TEX]
-\setuphead[title][incrementnumber=list]
+\setuppagenumbering[location=]
\stoptyping
-\noindent 则 \type{\title} 亦å¯å‡ºçŽ°åœ¨ä¹¦ç­¾åˆ—表中。
-
-还需è¦æ³¨æ„一点, 书签功能å–决于你所用的 PDF 阅读器是å¦æ”¯æŒã€‚此外,你的 PDF 阅读器å¯èƒ½ä¼šå°† \ConTeXt\ 生æˆçš„书签视为索引(Index),而其本身则æ供了å¦ä¸€ä¸ªå«ä½œä¹¦ç­¾çš„功能,å…许用户手动在侧边æ ä¸ºæ–‡æ¡£çš„æŸä¸€é¡µå»ºç«‹é“¾æŽ¥ï¼Œä¸Ž \CONTEXT\ 的书签原ç†ç›¸åŒã€‚
+\noindent å¹»ç¯ç‰‡é€šå¸¸ä¸éœ€è¦é¡µç ï¼Œå³ä½¿éœ€è¦é¡µç ï¼Œé»˜è®¤çš„页ç å‡ºçŽ°çš„ä½ç½®å’Œå­—å·çš†ä¸åˆé€‚。
-\section[reference]{引用}
+设置行间è·ä¸º 1.75 å€ï¼Œå³ $1.75\times 16\,{\rm pt}$:
-在本文档的æ’图ã€è¡¨æ ¼ã€æ•°å­¦å…¬å¼ç­‰ç« èŠ‚中,已简略介ç»äº† \CONTEXT\ 引用的用法。\CONTEXT\ 的标题和列表也支æŒå¼•ç”¨ã€‚例如,本节的标题对应的排版命令是
+\starttyping[option=TEX]
+\setupinterlinespace[line=28pt]
+\stoptyping
+以下代ç è®¾ç½®äº†äº†ç¬¬ 1 级列表样å¼ï¼Œï¼ˆ1)定义一个新的列表项符å·ï¼Œå°†å…¶è®¾ç½®åˆ—表项默认符å·ï¼›ï¼ˆ2)消除列表项之间的é¢å¤–é—´è·ï¼›ï¼ˆ3)列表项的符å·å’Œå†…容之间æ’å…¥ .5em çš„é—´è·ï¼›ï¼ˆ4)列表å‰åŽå„空 1/4 行,因为在幻ç¯ç‰‡ä¸­ï¼Œçºµå‘空间颇为ç贵。
+
+\starttyping[option=MP]
+\startuseMPgraphic{square}
+ path a, b;
+ a := (-.5, 0) -- (-.5, .5) -- (.5, .5);
+ b := (-.5, -.5) -- (.5, -.5) -- (.5, 0);
+ for i = a, b:
+ draw i scaled 10pt withpen pencircle scaled 2pt withcolor darkred;
+ endfor;
+ draw (0, 0) withpen pensquare scaled 4pt withcolor darkred;
+\stopuseMPgraphic
+\stoptyping
\starttyping[option=TEX]
-\section[reference]{引用}
+\definesymbol[10][{\lower.15ex\hbox{\useMPgraphic{square}}}]
+\setupitemize
+ [1][10,packed]
+ [distance=0.4em,
+ before={\blank[quarterline]},after={\blank[quarterline]}]
\stoptyping
+\noindent 如果你还需è¦äºŒçº§ã€ä¸‰çº§åˆ—表,å¯å‚照上述设定制作适åˆçš„æ ·å¼ã€‚
-å¯ä»¥åœ¨æ–‡ç« å‡ ä¹Žä»»ä½•ä¸€ä¸ªä½ç½®ï¼Œåƒä¸‹é¢è¿™æ ·å¼•ç”¨æœ¬èŠ‚:
+将幻ç¯ç‰‡ä¸€çº§æ— ç¼–å·æ ‡é¢˜å’Œæœ‰ç¼–å·æ ‡é¢˜å‡è®¾ç½®ä¸ºå±…中对é½ï¼Œå­—å·çº§åˆ«ä¸º \type{b},颜色为 \type{darkred},å‰åŽå„空åŠè¡Œï¼š
\starttyping[option=TEX]
-我在 \at[reference] 页 \in[reference] 节\about[reference]中的一些内容。
+\setuphead
+ [title,chapter]
+ [align=center,style=\ssb,color=darkred,
+ before={\blank[halfline]},after={\blank[halfline]}]
\stoptyping
-\noindent 结果为
-\blank[line]
-\blueframed{我引用了本文档 \at[reference] 页 \in[reference] 节\about[reference]中的一些内容。}
-\blank[line]
-
-使用 \type{\textreference} å¯åœ¨æ–‡æ¡£å‡ ä¹Žä»»ä½•ä½ç½®æ’入引用。例如
+现在,在 \type{text} 环境中éšä¾¿å†™ç‚¹ä»€ä¹ˆï¼Œå¯ŸéªŒä¸Šè¿°è®¾å®šæ˜¯å¦èµ·æ•ˆã€‚
\starttyping[option=TEX]
-我在此处放置了一个引用\textreference[myref]{一个引用}。
+\starttext
+\startbuffer[foo]
+\chapter{è’™}
+亨。匪我求童蒙,童蒙求我;åˆç­®å‘Šï¼Œå†ä¸‰æ¸Žï¼Œæ¸Žåˆ™ä¸å‘Šã€‚利贞。
+\startitemize
+\item åˆå…­ï¼Œå‘蒙,利用刑人,用说桎æ¢ï¼›ä»¥å¾€å。
+\item ä¹äºŒï¼ŒåŒ…蒙,å‰ã€‚纳妇,å‰ï¼›å­å…‹å®¶ã€‚
+\item 六三,勿用å–女,è§é‡‘夫,ä¸æœ‰èº¬ï¼Œæ— æ”¸åˆ©ã€‚
+\item 六四,困蒙,å。
+\item 六五,童蒙,å‰ã€‚
+\item 上ä¹ï¼Œå‡»è’™ï¼Œä¸åˆ©ä¸ºå¯‡ï¼Œåˆ©å¾¡å¯‡ã€‚
+\stopitemize
+\stopbuffer
+\dorecurse{10}{\getbuffer[foo]}
+\stoptext
\stoptyping
-\blank[line]
-\blueframed{我在此处放置了一个引用\textreference[myref]{一个引用}。}
-\blank[line]
-\noindent 注æ„,一个引用,其内容是ä¸ä¼šæ˜¾ç¤ºåœ¨æŽ’版结果中的。然åŽåœ¨æ–‡æ¡£æŸå¤„使用该引用,
+\midaligned{\externalfigure[13/slides-2.pdf][width=.6\textwidth,frame=on]}
+
+\noindent 上述代ç ä½¿ç”¨äº† \ConTeXt\ çš„ \type{buffer} çŽ¯å¢ƒå’Œå¾ªçŽ¯å® \type{\dorecurse}。所谓 \type{buff},是一个å¯ä»¥è®¾å®šå字的缓存,它å¯ä»¥åŒ…å« \ConTeXt\ 排版代ç ã€‚\type{\getbuffer} å¯èŽ·å¾—指定å字的缓存中所包å«çš„全部代ç ã€‚\type{\dorecurse} å¯ä»¥å°†å…¶æ‰€å«å†…容é‡å¤æŒ‡å®šæ¬¡æ•°ã€‚上述代ç æ‰€äº§ç”Ÿçš„效果是生æˆå页内容相åŒçš„å¹»ç¯ç‰‡ã€‚
+
+截止至此,我们第一次在示例中使用有编å·æ ‡é¢˜ã€‚对于 \type{\chapter} 建议在幻ç¯ç‰‡æ ·å¼ä¸­å¢žåŠ ä»¥ä¸‹è®¾å®šï¼Œå°†å…¶æ•°å­—ç¼–å·æ›´æ”¹ä¸ºä¸­æ–‡ç¼–å·ï¼Œå¦å¤–设置编å·ä¸å‚与对é½ï¼Œäº¦å³åªæœ‰æ ‡é¢˜å†…容å‚与对é½ï¼š
\starttyping[option=TEX]
-我在此处使用一个引用,它是 \at[myref] 的「\in[myref]ã€ã€‚
+\setuphead[chapter][conversion=chinesenumerals,alternative=inmargin]
\stoptyping
-\blank[line]
-\blueframed{我在此处使用一个引用,它是第 \at[myref] 页的「\in[myref]ã€ã€‚}
-\blank[line]
+\midaligned{\externalfigure[13/slides-3.pdf][width=.6\textwidth,frame=on]}
+\blank
+
+\noindent 如果你还需è¦äºŒçº§ã€ä¸‰çº§æ ‡é¢˜ï¼Œå¯å‚照上述设定制作适åˆçš„æ ·å¼ã€‚
-如果你希望一个引用,其内容ä¸ä»…出现在排版结果中,且想给他加个外框,åªéœ€å®šä¹‰ä¸€ä¸ªå®æ¥å¸®åŠ©ä½ å®žçŽ°è¿™ä¸€éœ€æ±‚。例如
+\section{页脚}
+
+在 \in[regular-style] 节中,我关闭了 \ConTeXt\ 好æ„æ供的页ç ã€‚因为我希望页ç å‡ºçŽ°åœ¨é¡µé¢çš„å³ä¸‹è§’,且除以总页数,以便清楚幻ç¯ç‰‡çš„进度。
+
+\ConTeXt\ æ供了 \type{\setupfootertexts} 命令,å¯ä»¥åœ¨é¡µè„šå·¦ã€å³åŒºåŸŸæ”¾å…¥æ–‡å­—ã€ç›’å­æˆ–图形等内容,åŒæ—¶æ供了 \type{\setupfooter} 用于设定页脚区域的文字样å¼ã€‚å¦å¤–,\type{\userpagenumber} å’Œ \type{\lastuserpage} å¯åˆ†åˆ«ç”¨äºŽèŽ·å–当å‰é¡µçš„页ç å’Œæœ€åŽä¸€é¡µçš„页ç ã€‚基于这些命令,便å¯å®žçŽ°èƒ½å¤Ÿè¡¨ç¤ºè¿›åº¦çš„页ç ã€‚例如
\starttyping[option=TEX]
-\def\framedref[#1]#2{\inframed{#2}\textreference[#1]{#2}}
+\showframe
+\setupfooter[style=small,color=darkred]
+% 页脚左侧区域为空,å³ä¾§åŒºåŸŸæ”¾ç½®ç”¨äºŽè¡¨ç¤ºè¿›åº¦çš„页ç 
+\setupfootertexts[margin][][\hss\userpagenumber/\lastuserpage]
+\stoptyping
+\noindent 结果如图 \in[页ç è¿›åº¦] 所示。
+\placefigure[here][页ç è¿›åº¦]{第 4 页幻ç¯ç‰‡}{\externalfigure[13/slides-4.pdf][page=4,width=.6\textwidth,frame=on]}
+
+现在,我们已ç»æœ‰äº†ä¸€ä¸ªåŸºæœ¬å¯ç”¨çš„å¹»ç¯ç‰‡æ ·å¼äº†ã€‚倘若使用刚学过的 \METAPOST\ 语言,ç¢ç£¨ä¸€ä¸‹ï¼Œç»™å¹»ç¯ç‰‡å¢žåŠ äº›è®¸ä¸åº¸ä¿—åˆå®žç”¨çš„装饰,也许会让人觉得你的幻ç¯ç‰‡é¢‡ä¸ºç”¨å¿ƒã€‚
+
+\section{进度æ¡}
+
+现在,我们放弃使用当å‰é¡µç é™¤ä»¥æ€»é¡µæ•°çš„æ–¹å¼è¡¨ç¤ºè¿›åº¦ï¼Œè€Œæ˜¯é¢‡ä¸ºç”¨å¿ƒåœ°ç”¨ \METAPOST\ 在页é¢åº•éƒ¨ç»˜åˆ¶ä¸€ä¸ªè¿›åº¦æ¡ã€‚实际上,用ä¸äº†å‡ è¡Œä»£ç ä¾¿å¯å®žçŽ°ï¼š
+
+\starttyping[option=MP]
+\startuseMPgraphic{processbar}
+numeric w, n, s, t;
+w := \overlaywidth; n := \lastuserpage;
+s := .5w / (n + 2); t := \userpagenumber - 1;
+path p; p := (fullsquare scaled \overlayheight);
+pickup pencircle scaled 2pt;
+picture q;
+q := image(for i = 0 upto n - 1:
+ p := (p shifted (2s, 0)) randomized .5pt;
+ if t = i: fill p withcolor darkgreen; fi;
+ draw p withcolor transparent(1, 0.5, darkgray);
+ endfor;);
+draw q xsized w;
+\stopuseMPgraphic
\stoptyping
+
\starttyping[option=TEX]
-我在此处放置了一个引用\textreference[myref]{一个引用}。
+\defineoverlay[process][\useMPgraphic{processbar}]
+\setupfootertexts[{\framed[frame=off,offset=0pt,
+ width=\makeupwidth,height=.8em,
+ background=process,empty=yes]{}}]
\stoptyping
-\blank[line]
-\def\framedref[#1]#2{\inframed{#2}\textreference[#1]{#2}}
-\blueframed{我在此处放置了\framedref[myref]{一个引用}。}
-\blank[line]
-\section{索引}
+\noindent 上述代ç å”¯ä¸€éœ€è¦è§£é‡Šä¹‹å¤„是,当 \type{\setupfootertexts} åªæœ‰ä¸€ä¸ªå‚数时,该å‚数的值会被安置在页脚的中间区域。所构造的进度æ¡æ•ˆæžœå¦‚图 \in[processbar] 所示。
-索引通常放在 \type{backmatter} 环境,å³é™„在书的正文之åŽï¼Œ
+\placefigure[here][processbar]{第 3 页幻ç¯ç‰‡}{\externalfigure[13/slides.pdf][width=.6\textwidth,page=4,frame=on]}
-\starttyping[option=TEX]
-\startbackmatter
-\title{索引}
-\placeindex
-\stopbackmatter
-\stoptyping
+\section{å°é¢å’Œè‡´è°¢}
-\noindent 以便检索在正文æŸé¡µæ£€ç´¢ä¸€äº›å…³é”®è¯è¿™äº›å…³é”®è¯åœ¨æ­£æ–‡ä¸­éœ€ç”± \type{\index} 给出。例如
+å¹»ç¯ç‰‡çš„å°é¢å’Œæœ€åŽçš„致谢页皆å¯ä½¿ç”¨ \type{sandardmakeup} 环境制作。例如
\starttyping[option=TEX]
-我在此演示 \type{\placeindex}\index[placeindex]{\type{\placeindex}}
-和 \type{\index}\index[index]{\type{\index}} 的用法。
-\stoptyping
-\blank[line]
-\blueframed{我在此演示 \type{\placeindex}\index[placeindex]{\type{\placeindex}} 和 \type{\index}\index[index]{\type{\index}} 的用法。}
+\startstandardmakeup[align=center]
+\ssd \color[darkred]{如何用 \ConTeXt\ 制作幻ç¯ç‰‡}
+\blank[2*line]
+\ssb æŽæŸäºº
\blank[line]
+2023 年 3 月 28 日
+\stopstandardmakeup
+\stoptyping
+\noindent 结果如图 \in[cover] 所示。
-\noindent \tex{placeindex} 产生的结果为
+之所以使用 \type{standardmakeup} 环境,是因为它是完全的空白页,且ä¸ä¼šå‚与页ç è®¡æ•°ã€‚
+\placefigure[here][cover]{å°é¢}{\externalfigure[13/slides.pdf][width=.6\textwidth,page=1,frame=on]}
-\blank[line]
-\blueframed{\placeindex}
-\blank[line]
+\section{ä¸è¦å¤ªåˆºçœ¼}
+
+白色背景,往往过于刺眼。我们å¯å°†å¹»ç¯ç‰‡èƒŒæ™¯è‰²è®¾ç½®ä¸ºæµ…ç°è‰²ï¼š
+
+\starttyping[option=TEX]
+\setupbackgrounds[page][backgroundcolor=lightgray,background=color]
+\stoptyping
+\noindent 结果如图 \in[slide-background] 所示。
+\placefigure[here][slide-background]{æµ…ç°è‰²èƒŒæ™¯}{\externalfigure[13/slides-finished.pdf][width=.6\textwidth,page=1,frame=on]}
\section{å°ç»“}
-用 \CONTEXT\ 排版一本书并ä¸éš¾ï¼Œéš¾çš„是书该如何写。 \ No newline at end of file
+本章仅介ç»äº†éžå¸¸åŸºæœ¬çš„å¹»ç¯ç‰‡åˆ¶ä½œè¿‡ç¨‹ã€‚一份精致的幻ç¯ç‰‡æ ·å¼ï¼Œå€¼å¾—你用心设计,但是切记,ä¸è¦å–§å®¾å¤ºä¸»ã€‚质胜文则野,文胜质则å²ã€‚å­”å­è¯´ï¼Œå¥½çš„å¹»ç¯ç‰‡æ ·å¼ï¼Œæ€»æ˜¯æ˜¯æ–‡è´¨å½¬å½¬çš„。本文制作的幻ç¯ç‰‡ç¤ºä¾‹ï¼Œè·¯æ•°å野。
diff --git a/info/context-notes-zh-cn/src/14.tex b/info/context-notes-zh-cn/src/14.tex
new file mode 100644
index 0000000000..7e8c20aebf
--- /dev/null
+++ b/info/context-notes-zh-cn/src/14.tex
@@ -0,0 +1,271 @@
+\chapter{写一本书?}
+
+至此,你所掌æ¡çš„关于 \CONTEXT\ 的所有知识,无论是用于撰写书信,éšç¬”,论文,还是制作幻ç¯ç‰‡ï¼Œçš†å·²æ¸¸åˆƒæœ‰ä½™ã€‚现在å†æŽŒæ¡ \ConTeXt\ 对文档逻辑结构的划分以åŠä¸ºæ–‡æ¡£æ·»åŠ ç›®å½•ç­‰åŠŸèƒ½ï¼Œä¾¿å¯å†™ä¹¦äº†ï¼Œè¿™æ˜¯ \TEX\ 系统一直以æ¥æœ€ä¸ºæ“…长的事情,也是 \TEX\ 系统为何å¤æ‚到令很多人ç•æƒ§çš„原因,他们从未想过自己有一天会写一本书。
+
+\section{书的内容结构}
+
+一本书,通常是由一组文章构æˆçš„,å¯åˆ†ä¸ºåºã€å‰è¨€ã€ç›®å½•ã€æ­£æ–‡ç¯‡ç« ã€è·‹ã€å‚考文献ã€ç´¢å¼•ã€é™„录等内容,å†åŠ ä¸Šå°é¢ï¼Œè¡¬é¡µã€æ‰‰é¡µç­‰é¡µé¢ã€‚对于书ç±åˆ¶ä½œï¼Œ\CONTEXT\ 对 \type{text} 环境进行了更为细致的划分:
+
+\starttyping[option=TEX]
+\starttext
+\startfrontmatter
+% å°é¢ã€æ‰‰é¡µã€åºã€å‰è¨€ã€ç›®å½•ç­‰å†…容
+\stopfrontmatter
+\startbodymatter
+% 正文篇章
+\stopbodymatter
+\startbackmatter
+% 跋,å‚考文献列表ã€ç´¢å¼•ç­‰å†…容
+\stopbackmatter
+\startappendices
+% 附录
+\stopappendices
+\stoptext
+\stoptyping
+
+\section{文件结构}
+
+将一本书的内容全部放在一份 \CONTEXT\ æºæ–‡ä»¶ä¸­å¹¶ä¸è¿æ³•ï¼Œä½†æ˜¯æ•°å万甚至上百万字的内容,无论是撰写还是修改必定æžä¸ºä¸ä¾¿ã€‚通常是将按照内容结构,将æ¯éƒ¨åˆ†å†…容制作为å•ç‹¬çš„ \type{.tex} æºæ–‡ä»¶ï¼Œç„¶åŽä½¿ç”¨ \type{\input} 载入到主文件中。例如,主文档的主文件内容如下:
+
+\starttyping[option=TEX]
+\starttext
+\startfrontmatter
+\input cover % cover.tex:å°é¢
+\input preface % preface.tex:åº
+\stopfrontmatter
+\stoptyping
+\starttyping[option=TEX]
+\startbodymatter
+\input 01 % 01.tex:第一章
+\input 02 % 02.tex:第二章
+% ... ...
+\stopbodymatter
+\startbackmatter
+\title{å‚考文献}
+\placelistofpublications % å‚考文献列表
+\stopbackmatter
+\startappendices
+\null % 暂时为空
+\stopappendices
+\stoptext
+\stoptyping
+
+\noindent 主文件 \type{\input} 的所有文件皆与主文件在åŒä¸€ç›®å½•ã€‚
+
+\section{æ ·å¼}
+
+原则上,书ç±çš„所有排版样å¼çš†åº”在å•ç‹¬çš„文件中设定,然åŽä½¿ç”¨ \type{\input} 或 \type{\environment} 命令在 \type{text} 环境之å‰å°†å…¶è½½å…¥ã€‚例如
+
+\starttyping[option=TEX]
+\environment book-style % 载入book-style.tex
+\starttext
+% ... ... ...
+\stoptext
+\stoptyping
+
+\section{目录}
+
+\type{\placecontent} å¯å°†å…¨æ–‡ç« èŠ‚标题åŠå…¶æ‰€åœ¨é¡µç ç­‰ä¿¡æ¯æ±‡æ€»ä¸ºä¸€ä¸ªåˆ—表,以方便读者查阅。例如
+
+\starttyping[option=TEX]
+\usemodule[visual]
+\starttext
+\title{\fakewords{3}{5}}
+\placecontent
+\section{\fakewords{3}{5}}
+... ... ...
+\section{\fakewords{3}{5}}
+... ... ...
+\stoptext
+\stoptyping
+\midaligned{%
+ \clip[width=\textwidth,height=6cm,voffset=3cm]{%
+ \externalfigure[14/toc.pdf][width=\textwidth,frame=on]%
+ }%
+}
+
+使用 \type{\setupcombinedlist} å¯è®¾å®šç›®å½•æ ·å¼ï¼Œä¾‹å¦‚设定å¯åœ¨ç›®å½•ä¸­å‡ºçŽ°çš„标题级别以åŠåˆ—表样å¼ã€‚若得到常è§çš„目录样å¼ï¼Œåªéœ€ä½œä»¥ä¸‹è®¾å®šï¼š
+
+\starttyping[option=TEX]
+\setupcombinedlist[content][alternative=c]
+\stoptyping
+\midaligned{%
+ \clip[width=\textwidth,height=6cm,voffset=3cm]{%
+ \externalfigure[14/toc-2.pdf][width=\textwidth,frame=on]%
+ }%
+}
+\blank
+\noindent 目录列表样å¼å‚æ•° \type{alternative} 有 \type{a},\type{b},\type{c},\type{d} 四个值å¯é€‰ï¼Œé»˜è®¤æ˜¯ \type{b}。本文档目录使用的是 \type{d}。
+
+\type{\setupcombinedlist} 亦å¯ç”¨äºŽæŒ‡å®šå¯å‡ºçŽ°åœ¨ç›®å½•åˆ—表中的标题级别,例如
+
+\starttyping[option=TEX]
+\setupcombinedlist[content][list={chapter,section}]
+\stoptyping
+
+注æ„,当 \type{\placecontent} 出现在 \type{\chapter} 之åŽæ—¶ï¼Œç”Ÿæˆçš„目录仅针对该章之内的å„节。若是写书,需将 \type{\placecontent} 放在 \type{frontmatter} 环境,例如:
+
+\starttyping[option=TEX]
+\startfrontmatter
+\title{目录}
+\placecontent
+\stopfrontmatter
+\stoptyping
+
+\noindent å¯å¯¹å…¨ç¯‡è¢«åˆ—入目录列表的章节生æˆç›®å½•ã€‚
+
+使用 \type{\setuplist} å¯å¯¹å‡ºçŽ°åœ¨ç›®å½•åˆ—表中相应级别的标题样å¼åˆ†åˆ«äºˆä»¥è®¾å®šï¼Œä¾‹å¦‚
+
+\starttyping[option=TEX]
+\setuplist[chapter]
+ [alternative=a,
+ before={\blank[halfline]},after={\blank[halfline]},style=bold]
+\setuplist[section]
+ [alternative=d,style=normal,pagestyle=smallbold]
+\stoptyping
+
+\section{让无编å·æ ‡é¢˜è¿›å…¥ç›®å½•}
+
+\CONTEXT\ 默认ä¸å…许无编å·æ ‡é¢˜å‡ºçŽ°åœ¨ç›®å½•ä¸­ï¼Œä½†æ˜¯å€˜è‹¥å¯¹æ— ç¼–å·æ ‡é¢˜ï¼Œä¾‹å¦‚ \type{\title} 作以下设定
+
+\starttyping[option=TEX]
+\setuphead[title][incrementnumber=list]
+\stoptyping
+
+\noindent 之åŽä¾¿å¯å°† \type{\title} 添加到目录列表,å³
+
+\starttyping[option=TEX]
+\setupcombinedlist[content][list={title,chapter,section}]
+\stoptyping
+
+需è¦æ³¨æ„的是,在 \type{frontmatter} 环境中放置目录列表时,若使用以下代ç 
+
+\starttyping[option=TEX]
+\startfrontmatter
+\title{目录}
+\placecontent
+\stopfrontmatter
+\stoptyping
+
+\noindent 由于此时 \type{\title} 已被列入目录列表,因此 \type{\title{目录}} 本身会出现在目录列表中。为é¿å…这一问题,需è¦ä¸ºç›®å½•é¡µå•ç‹¬å®šä¹‰ä¸€ä¸ªæ ‡é¢˜ã€‚\CONTEXT\ 支æŒæˆ‘们定义自己的标题,例如
+
+\starttyping[option=TEX]
+\definehead[TOC][title]
+\stoptyping
+
+\noindent 定义了一个新的标题 \type{\TOC},它与 \type{\title} çš„æ ·å¼ç›¸åŒã€‚在 \type{frontmatter} 环境中使用 \type{\TOC}:
+
+\starttyping[option=TEX]
+\startfrontmatter
+\TOC{目录}
+\placecontent
+\stopfrontmatter
+\stoptyping
+
+\noindent 由于我们并未将 \type{\TOC} 列入目录列表,因此上述问题得以解决。
+
+\section{书签}
+
+对于内容较多的 PDF 文档,æ供书签(Bookmark)å¯æ›´åŠ ä¾¿äºŽä»–人阅读。书签通常显示于 PDF 阅读器的侧æ ï¼Œå¦‚图 \in[13-bookmarks] 所示,点击æŸä¸ªä¹¦ç­¾ä¾¿å¯è·³è½¬è‡³å…¶å…³è”的页é¢ã€‚
+
+\placefigure[here][13-bookmarks]{PDF 书签}{\externalfigure[14/bookmarks.png][width=.6\textwidth]}
+
+为 \ConTeXt\ 生æˆçš„ PDF 文件制作书签,éžå¸¸ç®€å•ï¼Œåªéœ€åœ¨æ ·å¼æ–‡ä»¶ä¸­æ·»åŠ ä»¥ä¸‹è¯­å¥ï¼Œ
+
+\starttyping[option=TEX]
+\setupinteraction[state=start,focus=standard]
+\setupinteractionscreen[option=bookmark]
+\placebookmarks[title,chapter,section][title,chapter]
+\stoptyping
+
+\noindent 其中,\type{\setupinteraction} ç”¨äºŽå¼€å¯ PDF 的用户交互特性。\type{\setupinteractionscreen} 用于设定 PDF 文件被阅读器打开åŽï¼Œä»¥ä½•ç§å½¢å¼å¦‚何呈现在å±å¹•ä¸Šï¼Œè‹¥å…¶ \type{option} 值为 \type{bookmark},则文件打开åŽï¼Œä¼šè‡ªåŠ¨å¼€å¯é˜…读器的侧边æ å¹¶æ˜¾ç¤ºä¹¦ç­¾ï¼›è‹¥è®¾ç½® \type{option} 为 \type{max},则文件在被打开åŽä¼šå…¨å±æ˜¾ç¤ºã€‚上述 \type{\placebookmarks} 语å¥çš„用途是设置å¯å‡ºçŽ°åœ¨ä¹¦ç­¾æ çš„标题级别,且仅å…许 \type{\title} å’Œ \type{\chapter} 级别的标题,其å­æ ‡é¢˜åˆ—表å¯è¢«å±•å¼€ã€‚
+
+需è¦æ³¨æ„的是,\CONTEXT\ åŒæ ·é»˜è®¤æ— ç¼–å·æ ‡é¢˜ä¸è¢«åˆ—入书签,但是倘若åšä»¥ä¸‹è®¾å®š
+
+\starttyping[option=TEX]
+\setuphead[title][incrementnumber=list]
+\stoptyping
+
+\noindent 则 \type{\title} 亦å¯å‡ºçŽ°åœ¨ä¹¦ç­¾åˆ—表中。
+
+还需è¦æ³¨æ„一点, 书签功能å–决于你所用的 PDF 阅读器是å¦æ”¯æŒã€‚此外,你的 PDF 阅读器å¯èƒ½ä¼šå°† \ConTeXt\ 生æˆçš„书签视为索引(Index),而其本身则æ供了å¦ä¸€ä¸ªå«ä½œä¹¦ç­¾çš„功能,å…许用户手动在侧边æ ä¸ºæ–‡æ¡£çš„æŸä¸€é¡µå»ºç«‹é“¾æŽ¥ï¼Œä¸Ž \CONTEXT\ 的书签原ç†ç›¸åŒã€‚
+
+\section[reference]{引用}
+
+在本文档的æ’图ã€è¡¨æ ¼ã€æ•°å­¦å…¬å¼ç­‰ç« èŠ‚中,已简略介ç»äº† \CONTEXT\ 引用的用法。\CONTEXT\ 的标题和列表也支æŒå¼•ç”¨ã€‚例如,本节的标题对应的排版命令是
+
+\starttyping[option=TEX]
+\section[reference]{引用}
+\stoptyping
+
+å¯ä»¥åœ¨æ–‡ç« å‡ ä¹Žä»»ä½•ä¸€ä¸ªä½ç½®ï¼Œåƒä¸‹é¢è¿™æ ·å¼•ç”¨æœ¬èŠ‚:
+
+\starttyping[option=TEX]
+我在 \at[reference] 页 \in[reference] 节\about[reference]中的一些内容。
+\stoptyping
+
+\noindent 结果为
+\blank[line]
+\blueframed{我引用了本文档 \at[reference] 页 \in[reference] 节\about[reference]中的一些内容。}
+\blank[line]
+
+使用 \type{\textreference} å¯åœ¨æ–‡æ¡£å‡ ä¹Žä»»ä½•ä½ç½®æ’入引用。例如
+
+\starttyping[option=TEX]
+我在此处放置了一个引用\textreference[myref]{一个引用}。
+\stoptyping
+\blank[line]
+\blueframed{我在此处放置了一个引用\textreference[myref]{一个引用}。}
+\blank[line]
+\noindent 注æ„,一个引用,其内容是ä¸ä¼šæ˜¾ç¤ºåœ¨æŽ’版结果中的。然åŽåœ¨æ–‡æ¡£æŸå¤„使用该引用,
+
+\starttyping[option=TEX]
+我在此处使用一个引用,它是 \at[myref] 的「\in[myref]ã€ã€‚
+\stoptyping
+\blank[line]
+\blueframed{我在此处使用一个引用,它是第 \at[myref] 页的「\in[myref]ã€ã€‚}
+\blank[line]
+
+如果你希望一个引用,其内容ä¸ä»…出现在排版结果中,且想给他加个外框,åªéœ€å®šä¹‰ä¸€ä¸ªå®æ¥å¸®åŠ©ä½ å®žçŽ°è¿™ä¸€éœ€æ±‚。例如
+
+\starttyping[option=TEX]
+\def\framedref[#1]#2{\inframed{#2}\textreference[#1]{#2}}
+\stoptyping
+\starttyping[option=TEX]
+我在此处放置了一个引用\textreference[myref]{一个引用}。
+\stoptyping
+\blank[line]
+\def\framedref[#1]#2{\inframed{#2}\textreference[#1]{#2}}
+\blueframed{我在此处放置了\framedref[myref]{一个引用}。}
+\blank[line]
+
+\section{索引}
+
+索引通常放在 \type{backmatter} 环境,å³é™„在书的正文之åŽï¼Œ
+
+\starttyping[option=TEX]
+\startbackmatter
+\title{索引}
+\placeindex
+\stopbackmatter
+\stoptyping
+
+\noindent 以便检索在正文æŸé¡µæ£€ç´¢ä¸€äº›å…³é”®è¯è¿™äº›å…³é”®è¯åœ¨æ­£æ–‡ä¸­éœ€ç”± \type{\index} 给出。例如
+
+\starttyping[option=TEX]
+我在此演示 \type{\placeindex}\index[placeindex]{\type{\placeindex}}
+和 \type{\index}\index[index]{\type{\index}} 的用法。
+\stoptyping
+\blank[line]
+\blueframed{我在此演示 \type{\placeindex}\index[placeindex]{\type{\placeindex}} 和 \type{\index}\index[index]{\type{\index}} 的用法。}
+\blank[line]
+
+\noindent \tex{placeindex} 产生的结果为
+
+\blank[line]
+\blueframed{\placeindex}
+\blank[line]
+
+\section{å°ç»“}
+
+用 \CONTEXT\ 排版一本书并ä¸éš¾ï¼Œéš¾çš„是书该如何写。 \ No newline at end of file
diff --git a/info/context-notes-zh-cn/src/bib-style.tex b/info/context-notes-zh-cn/src/bib-style.tex
index 3aac77b6dc..e02c8a9691 100644
--- a/info/context-notes-zh-cn/src/bib-style.tex
+++ b/info/context-notes-zh-cn/src/bib-style.tex
@@ -1,10 +1,14 @@
\setupbtxlist
[default]
- [starter={[},stopper={]},
- width=fit,
- distance=.5em,
- before={\blank[.25em]},
- after={\blank[.25em]},]
+ [align={normal,verytolerant,stretch},
+ before={\blank[quarterline]},after={\blank[quarterline]},
+ numberalign=middle,
+ width=2.5em] % width 居然列表编å·å®½åº¦ï¼Œè‹¥è®¾ä¸º fit,则列表内容左侧ä¸é½
+
+\definebtx
+ [default:list:numbering]
+ [default:list]
+ [left={[},right={]}]
\setupbtx
[default:list:author]
@@ -35,8 +39,8 @@
\stopsetups
\starttexdefinition btx:default:url
- \goto{\hyphenatedurl{\btxflush{url}}}
- [url(\btxflush{url})]
+ 「\underbar{\goto{\hyphenatedurl{\btxflush{url}}}
+ [url(\btxflush{url})]}ã€
\stoptexdefinition
\starttexdefinition btx:default:author
diff --git a/info/context-notes-zh-cn/src/cover.tex b/info/context-notes-zh-cn/src/cover.tex
index 57c033c631..e266595d81 100644
--- a/info/context-notes-zh-cn/src/cover.tex
+++ b/info/context-notes-zh-cn/src/cover.tex
@@ -70,7 +70,7 @@ draw p withcolor \MPcolor{lightsteelblue};
\blank[1cm]
\hfil\bfa æŽå»¶ç‘ž\hfil
\blank[.25cm]
- \hfil\bf 2023 年 3 月 29 日\hfil
+ \hfil\bf 2023 年 3 月 31 日\hfil
\stopcoverbox
\stopcolor
\blank[14cm]
diff --git a/info/context-notes-zh-cn/src/ctxnotes.bib b/info/context-notes-zh-cn/src/ctxnotes.bib
index 5ce2928904..66a643b58c 100644
--- a/info/context-notes-zh-cn/src/ctxnotes.bib
+++ b/info/context-notes-zh-cn/src/ctxnotes.bib
@@ -16,13 +16,6 @@
year = {2017}
}
-@online{ctxnotes,
- author = {æŽå»¶ç‘ž},
- title = {\ConTeXt\ 学习笔记:Using MkIV},
- url = {http://mirrors.ctan.org/info/context-notes-zh-cn/ctxnotes.pdf},
- year = {2009}
-}
-
@online{bash-tutor,
author = {æŽå»¶ç‘ž},
title = {写给高年级å°å­¦ç”Ÿçš„《Bash》指å—},
@@ -30,6 +23,13 @@
year = {2018}
}
+@online{texlive,
+ author = {TUG},
+ title = {\TEX\ Live},
+ url = {https://tug.org/texlive/},
+ year = {2023}
+}
+
@online{faking-text,
author = {Hans Hagen},
title = {Faking text and more},
@@ -98,4 +98,11 @@
title = {Math fonts},
url = {https://wiki.contextgarden.net/Math_fonts},
year = {2020}
+}
+
+@online{code-render,
+ author = {æŽå»¶ç‘ž},
+ title = {æºç å‡¸æ˜¾},
+ url = {https://segmentfault.com/a/1190000043405105},
+ year = {2023}
} \ No newline at end of file
diff --git a/info/context-notes-zh-cn/src/ctxnotes.tex b/info/context-notes-zh-cn/src/ctxnotes.tex
index 7b4847b28c..e1991b11e8 100644
--- a/info/context-notes-zh-cn/src/ctxnotes.tex
+++ b/info/context-notes-zh-cn/src/ctxnotes.tex
@@ -3,14 +3,15 @@
\starttext
\startfrontmatter
\input cover
+\input license
\setuppagenumber[number=1]
\setupuserpagenumber[numberconversion=romannumerals]
\setups{FrontHeaderFooter}
\input preface % 自åº
\TOC{目录}
-\definelistextra[page][before=\page]
-\placecontent[extras={page=10}] % 强行在第 10 章之å‰åˆ†é¡µ
+\placecontent
\stopfrontmatter
+
\startbodymatter
\setuppagenumber[number=1]
\setupuserpagenumber[numberconversion=number]
@@ -28,13 +29,17 @@
\input 11
\input 12
\input 13
+\input 14
+\input zhfonts
\stopbodymatter
+
\startbackmatter
\input postscript
-\stopbackmatter
-\startappendices
-\input zhfonts
\title{å‚考文献}
\placelistofpublications
+\stopbackmatter
+
+\startappendices
+\null
\stopappendices
\stoptext
diff --git a/info/context-notes-zh-cn/src/doc-env.tex b/info/context-notes-zh-cn/src/doc-env.tex
index c6fe8890fa..66dba8f8bf 100644
--- a/info/context-notes-zh-cn/src/doc-env.tex
+++ b/info/context-notes-zh-cn/src/doc-env.tex
@@ -8,8 +8,8 @@
focus=standard,
color=darkblue,
title={ConTeXt 蹊径},
- author={æŽå»¶ç‘ž},
- keyword={TeX, ConTeXt, LMTX, MkIV, LuaTeX, LuaMetaTeX}]
+ author={æŽå»¶ç‘ž (lyr.m2@live.cn)},
+ keyword={TeX, ConTeXt MkIV, ConTeXt LMTX, LuaTeX, LuaMetaTeX}]
% 书签
\setupinteractionscreen[option=bookmark]
\placebookmarks[title,chapter,section][chapter]
@@ -66,8 +66,9 @@
[section]
[alternative=d,
style=normal,
+ numberstyle=bold,
pagecommand=\PageNumber,
- pagestyle=smallbold]
+ pagestyle=smallitalic]
% 页眉:通用
\startsetups HeaderFooter
@@ -96,9 +97,9 @@
\setupnotation[footnote][way=bypage] % æ¥è‡ª wolfgang çš„ tip
% 汉化
-\setuplabeltext[en][chapter={第\;,\;章\kern.5em}]
-\setuplabeltext[en][figure=图\;]
-\setuplabeltext[en][table=表\;]
+\setuplabeltext[en][chapter={第 , 章\kern.5em}]
+\setuplabeltext[en][figure={图 }]
+\setuplabeltext[en][table={表 }]
\setupheadtext[en][pubs={\bfc å‚考文献}]
\setupheadtext[en][content={\bfc 目录}]
%---- 列表 ----
@@ -110,7 +111,10 @@
\definedescription
[definition]
[location=top,hang=20,width=broad,indenting=always,style=\ss,headstyle=\bf]
-
+% 表格标题
+\setupcaption
+ [table]
+ [headstyle=normal,style=small,location=top]
% 抄录
\setuplinenumbering[style=small]
@@ -132,11 +136,7 @@ draw q withcolor \MPcolor{lightsteelblue};
[frame=off,background={blue box},
offset=0pt,loffset=.5em,roffset=.5em,before={\blank},after={\blank[.95em]}]
\setuptyping
- [before={\startblueframe[width=\textwidth]},
- after={\stopblueframe},escape=yes]
-\definetyping
- [narrowtyping]
- [option=TEX,before={\startblueframe[width=fit]},after={\stopblueframe},escape=yes]
+ [before={\startblueframe[width=\textwidth]},after={\stopblueframe},escape=yes]
\startuniqueMPgraphic{blue box2}
path p;
@@ -168,17 +168,44 @@ draw p randomized s withcolor \MPcolor{lightsteelblue};
\inframed[frame=off,background=color,backgroundcolor=indianred,offset=4pt]{#1}%
}
-% sample
+% ---------- sample ----------------------
+\definebuffer[sample]
\definefloat[Sample][Samples]
-\setuplabeltext[en][Sample={示例\;}]
-\definebuffer[samplecode]
-\def\mysample[#1]#2#3{%
- \placeSample[force][#1]{#2}{%
+\setuplabeltext[en][Sample={示例 }]
+
+% å‚数为一个放在页é¢å³ä¾§çš„ç›’å­ï¼ŒåŸºäºŽè¯¥ç›’å­çš„宽度,计算其左侧空间宽度
+\def\defineLeftWidth#1{%
+ \newdimen\LeftWidth
+ \LeftWidth=\textwidth
+ \newdimen\RightObjectWidth
+ \RightObjectWidth=\wd#1
+ \ifdim\RightObjectWidth>0pt
+ \advance\LeftWidth by -\RightObjectWidth
+ \advance\LeftWidth by -1em
+ \fi
+}
+\def\sample[#1][#2]#3#4{%
+ \setbox\scratchbox\hbox{#4}%
+ \defineLeftWidth{\scratchbox}%
+ \placeSample[here][#2]{#3}{%
\hbox to \textwidth{%
- \hbox to .45\textwidth{\getsamplecode}\hfill\externalfigure[#3][maxwidth=.45\textwidth]%
- }%
+ \hbox{\typesample[#1,
+ before={\startblueframe[width=\LeftWidth]},
+ after={\stopblueframe}]}\hss\unhbox\scratchbox}%
}%
}
+\def\simplesample[#1]#2{%
+ \setbox\scratchbox\hbox{#2}%
+ \defineLeftWidth{\scratchbox}%
+ \placeSample[here,none][]{}{%
+ \hbox to \textwidth{%
+ \hbox{\typesample[#1,
+ before={\startblueframe[width=\LeftWidth]},
+ after={\stopblueframe}]}\hss\unhbox\scratchbox}%
+ }%
+ \blank[back]
+}
+
% 修改 MPcode 代ç éƒ¨åˆ†é«˜äº®é¢œè‰²
\definestartstop
[MetapostSnippetName]
@@ -193,4 +220,4 @@ draw p randomized s withcolor \MPcolor{lightsteelblue};
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% å‚考文献 GB
\input bib-style
-\stopenvironment \ No newline at end of file
+\stopenvironment
diff --git a/info/context-notes-zh-cn/src/figures/cmd-window.png b/info/context-notes-zh-cn/src/figures/01/cmd-window.png
index 81629fcb6e..81629fcb6e 100644
--- a/info/context-notes-zh-cn/src/figures/cmd-window.png
+++ b/info/context-notes-zh-cn/src/figures/01/cmd-window.png
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/foo.pdf b/info/context-notes-zh-cn/src/figures/01/foo.pdf
index 0da6514b9f..0da6514b9f 100644
--- a/info/context-notes-zh-cn/src/figures/foo.pdf
+++ b/info/context-notes-zh-cn/src/figures/01/foo.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/win-r.jpg b/info/context-notes-zh-cn/src/figures/01/win-r.jpg
index b33d05417a..b33d05417a 100644
--- a/info/context-notes-zh-cn/src/figures/win-r.jpg
+++ b/info/context-notes-zh-cn/src/figures/01/win-r.jpg
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/aligned-1.pdf b/info/context-notes-zh-cn/src/figures/02/aligned-1.pdf
index e7c5b46d7c..e7c5b46d7c 100644
--- a/info/context-notes-zh-cn/src/figures/aligned-1.pdf
+++ b/info/context-notes-zh-cn/src/figures/02/aligned-1.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/aligned-2.pdf b/info/context-notes-zh-cn/src/figures/02/aligned-2.pdf
index 8f52afbeee..8f52afbeee 100644
--- a/info/context-notes-zh-cn/src/figures/aligned-2.pdf
+++ b/info/context-notes-zh-cn/src/figures/02/aligned-2.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/fakewords.pdf b/info/context-notes-zh-cn/src/figures/02/fakewords.pdf
index 8170c00d84..8170c00d84 100644
--- a/info/context-notes-zh-cn/src/figures/fakewords.pdf
+++ b/info/context-notes-zh-cn/src/figures/02/fakewords.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/letter.pdf b/info/context-notes-zh-cn/src/figures/02/letter.pdf
index 9a2aa7345d..9a2aa7345d 100644
--- a/info/context-notes-zh-cn/src/figures/letter.pdf
+++ b/info/context-notes-zh-cn/src/figures/02/letter.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/lines.pdf b/info/context-notes-zh-cn/src/figures/02/lines.pdf
index b5445178d1..b5445178d1 100644
--- a/info/context-notes-zh-cn/src/figures/lines.pdf
+++ b/info/context-notes-zh-cn/src/figures/02/lines.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/parindentcolor.pdf b/info/context-notes-zh-cn/src/figures/02/parindentcolor.pdf
index 36f765a403..36f765a403 100644
--- a/info/context-notes-zh-cn/src/figures/parindentcolor.pdf
+++ b/info/context-notes-zh-cn/src/figures/02/parindentcolor.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/pars-2.pdf b/info/context-notes-zh-cn/src/figures/02/pars-2.pdf
index 3651200580..3651200580 100644
--- a/info/context-notes-zh-cn/src/figures/pars-2.pdf
+++ b/info/context-notes-zh-cn/src/figures/02/pars-2.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/pars-3.pdf b/info/context-notes-zh-cn/src/figures/02/pars-3.pdf
index efb7228ddb..efb7228ddb 100644
--- a/info/context-notes-zh-cn/src/figures/pars-3.pdf
+++ b/info/context-notes-zh-cn/src/figures/02/pars-3.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/pars-4.pdf b/info/context-notes-zh-cn/src/figures/02/pars-4.pdf
index 795bd8b5b4..795bd8b5b4 100644
--- a/info/context-notes-zh-cn/src/figures/pars-4.pdf
+++ b/info/context-notes-zh-cn/src/figures/02/pars-4.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/pars-5.pdf b/info/context-notes-zh-cn/src/figures/02/pars-5.pdf
index 45ed389aeb..45ed389aeb 100644
--- a/info/context-notes-zh-cn/src/figures/pars-5.pdf
+++ b/info/context-notes-zh-cn/src/figures/02/pars-5.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/pars.pdf b/info/context-notes-zh-cn/src/figures/02/pars.pdf
index 1db6965752..1db6965752 100644
--- a/info/context-notes-zh-cn/src/figures/pars.pdf
+++ b/info/context-notes-zh-cn/src/figures/02/pars.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/starting-area.pdf b/info/context-notes-zh-cn/src/figures/02/starting-area.pdf
index 40598ce3da..40598ce3da 100644
--- a/info/context-notes-zh-cn/src/figures/starting-area.pdf
+++ b/info/context-notes-zh-cn/src/figures/02/starting-area.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/true-words.pdf b/info/context-notes-zh-cn/src/figures/02/true-words.pdf
index 0faf5af1e3..0faf5af1e3 100644
--- a/info/context-notes-zh-cn/src/figures/true-words.pdf
+++ b/info/context-notes-zh-cn/src/figures/02/true-words.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/bad-latin.pdf b/info/context-notes-zh-cn/src/figures/03/bad-latin.pdf
index 34bf4d40d7..34bf4d40d7 100644
--- a/info/context-notes-zh-cn/src/figures/bad-latin.pdf
+++ b/info/context-notes-zh-cn/src/figures/03/bad-latin.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/breakinglines-1.pdf b/info/context-notes-zh-cn/src/figures/03/breakinglines-1.pdf
index 00d0481dcd..00d0481dcd 100644
--- a/info/context-notes-zh-cn/src/figures/breakinglines-1.pdf
+++ b/info/context-notes-zh-cn/src/figures/03/breakinglines-1.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/breakinglines-2.pdf b/info/context-notes-zh-cn/src/figures/03/breakinglines-2.pdf
index 0c53fb84bd..0c53fb84bd 100644
--- a/info/context-notes-zh-cn/src/figures/breakinglines-2.pdf
+++ b/info/context-notes-zh-cn/src/figures/03/breakinglines-2.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/breakinglines-3.pdf b/info/context-notes-zh-cn/src/figures/03/breakinglines-3.pdf
index 5c09f0bd80..5c09f0bd80 100644
--- a/info/context-notes-zh-cn/src/figures/breakinglines-3.pdf
+++ b/info/context-notes-zh-cn/src/figures/03/breakinglines-3.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/breakinglines-4.pdf b/info/context-notes-zh-cn/src/figures/03/breakinglines-4.pdf
index c79c91dd5e..c79c91dd5e 100644
--- a/info/context-notes-zh-cn/src/figures/breakinglines-4.pdf
+++ b/info/context-notes-zh-cn/src/figures/03/breakinglines-4.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/breakinglines-5.pdf b/info/context-notes-zh-cn/src/figures/03/breakinglines-5.pdf
index d7c29695f3..d7c29695f3 100644
--- a/info/context-notes-zh-cn/src/figures/breakinglines-5.pdf
+++ b/info/context-notes-zh-cn/src/figures/03/breakinglines-5.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/defaultfonts.pdf b/info/context-notes-zh-cn/src/figures/03/defaultfonts.pdf
index 0a2af2b0ca..0a2af2b0ca 100644
--- a/info/context-notes-zh-cn/src/figures/defaultfonts.pdf
+++ b/info/context-notes-zh-cn/src/figures/03/defaultfonts.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/fallbacks.pdf b/info/context-notes-zh-cn/src/figures/03/fallbacks.pdf
index 599fe4e088..599fe4e088 100644
--- a/info/context-notes-zh-cn/src/figures/fallbacks.pdf
+++ b/info/context-notes-zh-cn/src/figures/03/fallbacks.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/fontsize-level.pdf b/info/context-notes-zh-cn/src/figures/03/fontsize-level.pdf
index 91c34eab9b..91c34eab9b 100644
--- a/info/context-notes-zh-cn/src/figures/fontsize-level.pdf
+++ b/info/context-notes-zh-cn/src/figures/03/fontsize-level.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/indenting-1.pdf b/info/context-notes-zh-cn/src/figures/03/indenting-1.pdf
index 52333e11b7..52333e11b7 100644
--- a/info/context-notes-zh-cn/src/figures/indenting-1.pdf
+++ b/info/context-notes-zh-cn/src/figures/03/indenting-1.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/indenting-2.pdf b/info/context-notes-zh-cn/src/figures/03/indenting-2.pdf
index be10c57825..be10c57825 100644
--- a/info/context-notes-zh-cn/src/figures/indenting-2.pdf
+++ b/info/context-notes-zh-cn/src/figures/03/indenting-2.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/msfonts.png b/info/context-notes-zh-cn/src/figures/03/msfonts.png
index a1e05840f5..a1e05840f5 100644
--- a/info/context-notes-zh-cn/src/figures/msfonts.png
+++ b/info/context-notes-zh-cn/src/figures/03/msfonts.png
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/qian.pdf b/info/context-notes-zh-cn/src/figures/03/qian.pdf
index 461e463a48..461e463a48 100644
--- a/info/context-notes-zh-cn/src/figures/qian.pdf
+++ b/info/context-notes-zh-cn/src/figures/03/qian.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/setupbodyfont.pdf b/info/context-notes-zh-cn/src/figures/03/setupbodyfont.pdf
index 9086488f21..9086488f21 100644
--- a/info/context-notes-zh-cn/src/figures/setupbodyfont.pdf
+++ b/info/context-notes-zh-cn/src/figures/03/setupbodyfont.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/tex-root.png b/info/context-notes-zh-cn/src/figures/03/tex-root.png
index 0a7d60fbd1..0a7d60fbd1 100644
--- a/info/context-notes-zh-cn/src/figures/tex-root.png
+++ b/info/context-notes-zh-cn/src/figures/03/tex-root.png
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/pagenumber.png b/info/context-notes-zh-cn/src/figures/04/pagenumber.png
index 16906a2736..16906a2736 100644
--- a/info/context-notes-zh-cn/src/figures/pagenumber.png
+++ b/info/context-notes-zh-cn/src/figures/04/pagenumber.png
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/style-file.png b/info/context-notes-zh-cn/src/figures/04/style-file.png
index 1612428c77..1612428c77 100644
--- a/info/context-notes-zh-cn/src/figures/style-file.png
+++ b/info/context-notes-zh-cn/src/figures/04/style-file.png
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/zaoshu-2.pdf b/info/context-notes-zh-cn/src/figures/04/zaoshu-2.pdf
index dafa5e5f8b..dafa5e5f8b 100644
--- a/info/context-notes-zh-cn/src/figures/zaoshu-2.pdf
+++ b/info/context-notes-zh-cn/src/figures/04/zaoshu-2.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/zaoshu-3.pdf b/info/context-notes-zh-cn/src/figures/04/zaoshu-3.pdf
index ede9539c35..ede9539c35 100644
--- a/info/context-notes-zh-cn/src/figures/zaoshu-3.pdf
+++ b/info/context-notes-zh-cn/src/figures/04/zaoshu-3.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/zaoshu-4.pdf b/info/context-notes-zh-cn/src/figures/04/zaoshu-4.pdf
index 595fad74e9..595fad74e9 100644
--- a/info/context-notes-zh-cn/src/figures/zaoshu-4.pdf
+++ b/info/context-notes-zh-cn/src/figures/04/zaoshu-4.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/zaoshu-5.pdf b/info/context-notes-zh-cn/src/figures/04/zaoshu-5.pdf
index 5dec6e3ec1..5dec6e3ec1 100644
--- a/info/context-notes-zh-cn/src/figures/zaoshu-5.pdf
+++ b/info/context-notes-zh-cn/src/figures/04/zaoshu-5.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/zaoshu.pdf b/info/context-notes-zh-cn/src/figures/04/zaoshu.pdf
index b40135449a..b40135449a 100644
--- a/info/context-notes-zh-cn/src/figures/zaoshu.pdf
+++ b/info/context-notes-zh-cn/src/figures/04/zaoshu.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/05-todo-list-2.pdf b/info/context-notes-zh-cn/src/figures/05/todo-list-2.pdf
index 355e2722a7..355e2722a7 100644
--- a/info/context-notes-zh-cn/src/figures/05-todo-list-2.pdf
+++ b/info/context-notes-zh-cn/src/figures/05/todo-list-2.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/05-todo-list-3.pdf b/info/context-notes-zh-cn/src/figures/05/todo-list-3.pdf
index 8476132bf8..8476132bf8 100644
--- a/info/context-notes-zh-cn/src/figures/05-todo-list-3.pdf
+++ b/info/context-notes-zh-cn/src/figures/05/todo-list-3.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/05-todo-list-4.pdf b/info/context-notes-zh-cn/src/figures/05/todo-list-4.pdf
index 2c8ecf2d79..2c8ecf2d79 100644
--- a/info/context-notes-zh-cn/src/figures/05-todo-list-4.pdf
+++ b/info/context-notes-zh-cn/src/figures/05/todo-list-4.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/05-todo-list-5.pdf b/info/context-notes-zh-cn/src/figures/05/todo-list-5.pdf
index 4633d66ca4..4633d66ca4 100644
--- a/info/context-notes-zh-cn/src/figures/05-todo-list-5.pdf
+++ b/info/context-notes-zh-cn/src/figures/05/todo-list-5.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/05-todo-list-6.pdf b/info/context-notes-zh-cn/src/figures/05/todo-list-6.pdf
index 162f257cb5..162f257cb5 100644
--- a/info/context-notes-zh-cn/src/figures/05-todo-list-6.pdf
+++ b/info/context-notes-zh-cn/src/figures/05/todo-list-6.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/05-todo-list-7.pdf b/info/context-notes-zh-cn/src/figures/05/todo-list-7.pdf
index 7bce0357e2..7bce0357e2 100644
--- a/info/context-notes-zh-cn/src/figures/05-todo-list-7.pdf
+++ b/info/context-notes-zh-cn/src/figures/05/todo-list-7.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/05-todo-list-8.pdf b/info/context-notes-zh-cn/src/figures/05/todo-list-8.pdf
index 12cabf988f..12cabf988f 100644
--- a/info/context-notes-zh-cn/src/figures/05-todo-list-8.pdf
+++ b/info/context-notes-zh-cn/src/figures/05/todo-list-8.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/05-todo-list.pdf b/info/context-notes-zh-cn/src/figures/05/todo-list.pdf
index 40a311e607..40a311e607 100644
--- a/info/context-notes-zh-cn/src/figures/05-todo-list.pdf
+++ b/info/context-notes-zh-cn/src/figures/05/todo-list.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/06-05.pdf b/info/context-notes-zh-cn/src/figures/06-05.pdf
deleted file mode 100644
index f622fb5a85..0000000000
--- a/info/context-notes-zh-cn/src/figures/06-05.pdf
+++ /dev/null
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/10-bibtex-example-01.pdf b/info/context-notes-zh-cn/src/figures/06/bibtex-example-01.pdf
index b58373132e..b58373132e 100644
--- a/info/context-notes-zh-cn/src/figures/10-bibtex-example-01.pdf
+++ b/info/context-notes-zh-cn/src/figures/06/bibtex-example-01.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/10-bibtex-example-02.pdf b/info/context-notes-zh-cn/src/figures/06/bibtex-example-02.pdf
index 43adbf2577..43adbf2577 100644
--- a/info/context-notes-zh-cn/src/figures/10-bibtex-example-02.pdf
+++ b/info/context-notes-zh-cn/src/figures/06/bibtex-example-02.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/10-bibtex-example-03.pdf b/info/context-notes-zh-cn/src/figures/06/bibtex-example-03.pdf
index 28e3443a8d..28e3443a8d 100644
--- a/info/context-notes-zh-cn/src/figures/10-bibtex-example-03.pdf
+++ b/info/context-notes-zh-cn/src/figures/06/bibtex-example-03.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/10-bibtex-example-04.pdf b/info/context-notes-zh-cn/src/figures/06/bibtex-example-04.pdf
index 279e7212f0..279e7212f0 100644
--- a/info/context-notes-zh-cn/src/figures/10-bibtex-example-04.pdf
+++ b/info/context-notes-zh-cn/src/figures/06/bibtex-example-04.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/ctxnotes-2.png b/info/context-notes-zh-cn/src/figures/08/ctxnotes-2.png
index 11190a179d..11190a179d 100644
--- a/info/context-notes-zh-cn/src/figures/ctxnotes-2.png
+++ b/info/context-notes-zh-cn/src/figures/08/ctxnotes-2.png
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/ctxnotes.png b/info/context-notes-zh-cn/src/figures/08/ctxnotes.png
index faaf563432..faaf563432 100644
--- a/info/context-notes-zh-cn/src/figures/ctxnotes.png
+++ b/info/context-notes-zh-cn/src/figures/08/ctxnotes.png
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/05-floatcomb-2.pdf b/info/context-notes-zh-cn/src/figures/08/floatcomb-2.pdf
index 801ec7b83d..801ec7b83d 100644
--- a/info/context-notes-zh-cn/src/figures/05-floatcomb-2.pdf
+++ b/info/context-notes-zh-cn/src/figures/08/floatcomb-2.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/05-floatcomb-3.pdf b/info/context-notes-zh-cn/src/figures/08/floatcomb-3.pdf
index 5ba88c0db7..5ba88c0db7 100644
--- a/info/context-notes-zh-cn/src/figures/05-floatcomb-3.pdf
+++ b/info/context-notes-zh-cn/src/figures/08/floatcomb-3.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/05-floatcomb-4.pdf b/info/context-notes-zh-cn/src/figures/08/floatcomb-4.pdf
index 8a1efdd6ec..8a1efdd6ec 100644
--- a/info/context-notes-zh-cn/src/figures/05-floatcomb-4.pdf
+++ b/info/context-notes-zh-cn/src/figures/08/floatcomb-4.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/05-floatcomb.pdf b/info/context-notes-zh-cn/src/figures/08/floatcomb.pdf
index 60e2a8572f..60e2a8572f 100644
--- a/info/context-notes-zh-cn/src/figures/05-floatcomb.pdf
+++ b/info/context-notes-zh-cn/src/figures/08/floatcomb.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/hibert-1.pdf b/info/context-notes-zh-cn/src/figures/08/hibert-1.pdf
index 9f7ba941b7..9f7ba941b7 100644
--- a/info/context-notes-zh-cn/src/figures/hibert-1.pdf
+++ b/info/context-notes-zh-cn/src/figures/08/hibert-1.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/hibert-2.pdf b/info/context-notes-zh-cn/src/figures/08/hibert-2.pdf
index 47b7d5728e..47b7d5728e 100644
--- a/info/context-notes-zh-cn/src/figures/hibert-2.pdf
+++ b/info/context-notes-zh-cn/src/figures/08/hibert-2.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/hibert-3.pdf b/info/context-notes-zh-cn/src/figures/08/hibert-3.pdf
index 4a780c6814..4a780c6814 100644
--- a/info/context-notes-zh-cn/src/figures/hibert-3.pdf
+++ b/info/context-notes-zh-cn/src/figures/08/hibert-3.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/hibert.pdf b/info/context-notes-zh-cn/src/figures/08/hibert.pdf
index 627236d101..627236d101 100644
--- a/info/context-notes-zh-cn/src/figures/hibert.pdf
+++ b/info/context-notes-zh-cn/src/figures/08/hibert.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/05-metapost.pdf b/info/context-notes-zh-cn/src/figures/08/metapost.pdf
index 5b8683edee..5b8683edee 100644
--- a/info/context-notes-zh-cn/src/figures/05-metapost.pdf
+++ b/info/context-notes-zh-cn/src/figures/08/metapost.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/06-01.pdf b/info/context-notes-zh-cn/src/figures/09/01.pdf
index 334748a68d..334748a68d 100644
--- a/info/context-notes-zh-cn/src/figures/06-01.pdf
+++ b/info/context-notes-zh-cn/src/figures/09/01.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/06-02.pdf b/info/context-notes-zh-cn/src/figures/09/02.pdf
index b28053808f..b28053808f 100644
--- a/info/context-notes-zh-cn/src/figures/06-02.pdf
+++ b/info/context-notes-zh-cn/src/figures/09/02.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/06-03.pdf b/info/context-notes-zh-cn/src/figures/09/03.pdf
index 2b790a5def..2b790a5def 100644
--- a/info/context-notes-zh-cn/src/figures/06-03.pdf
+++ b/info/context-notes-zh-cn/src/figures/09/03.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/06-04.pdf b/info/context-notes-zh-cn/src/figures/09/04.pdf
index fec3105025..fec3105025 100644
--- a/info/context-notes-zh-cn/src/figures/06-04.pdf
+++ b/info/context-notes-zh-cn/src/figures/09/04.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/06-three-line-table.pdf b/info/context-notes-zh-cn/src/figures/09/three-line-table.pdf
index ac000edc79..ac000edc79 100644
--- a/info/context-notes-zh-cn/src/figures/06-three-line-table.pdf
+++ b/info/context-notes-zh-cn/src/figures/09/three-line-table.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/10/colors.png b/info/context-notes-zh-cn/src/figures/10/colors.png
new file mode 100644
index 0000000000..ee8a918292
--- /dev/null
+++ b/info/context-notes-zh-cn/src/figures/10/colors.png
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/08-vbox-and-hbox.pdf b/info/context-notes-zh-cn/src/figures/11/vbox-and-hbox.pdf
index 243b337735..243b337735 100644
--- a/info/context-notes-zh-cn/src/figures/08-vbox-and-hbox.pdf
+++ b/info/context-notes-zh-cn/src/figures/11/vbox-and-hbox.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/11-flowchart-1.pdf b/info/context-notes-zh-cn/src/figures/12/flowchart-1.pdf
index 54e71e8a71..54e71e8a71 100644
--- a/info/context-notes-zh-cn/src/figures/11-flowchart-1.pdf
+++ b/info/context-notes-zh-cn/src/figures/12/flowchart-1.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/11-flowchart-2.pdf b/info/context-notes-zh-cn/src/figures/12/flowchart-2.pdf
index 3567cae708..3567cae708 100644
--- a/info/context-notes-zh-cn/src/figures/11-flowchart-2.pdf
+++ b/info/context-notes-zh-cn/src/figures/12/flowchart-2.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/11-flowchart-3.pdf b/info/context-notes-zh-cn/src/figures/12/flowchart-3.pdf
index cf06b847eb..cf06b847eb 100644
--- a/info/context-notes-zh-cn/src/figures/11-flowchart-3.pdf
+++ b/info/context-notes-zh-cn/src/figures/12/flowchart-3.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/11-flowchart-4.pdf b/info/context-notes-zh-cn/src/figures/12/flowchart-4.pdf
index 5a1e6a2d8e..5a1e6a2d8e 100644
--- a/info/context-notes-zh-cn/src/figures/11-flowchart-4.pdf
+++ b/info/context-notes-zh-cn/src/figures/12/flowchart-4.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/11-watermark.png b/info/context-notes-zh-cn/src/figures/12/watermark.png
index 4e689c338c..4e689c338c 100644
--- a/info/context-notes-zh-cn/src/figures/11-watermark.png
+++ b/info/context-notes-zh-cn/src/figures/12/watermark.png
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/ConTeXt-layout.svg b/info/context-notes-zh-cn/src/figures/13/ConTeXt-layout.svg
index d50f52a056..d50f52a056 100644
--- a/info/context-notes-zh-cn/src/figures/ConTeXt-layout.svg
+++ b/info/context-notes-zh-cn/src/figures/13/ConTeXt-layout.svg
diff --git a/info/context-notes-zh-cn/src/figures/12-layout-1.pdf b/info/context-notes-zh-cn/src/figures/13/layout-1.pdf
index 9bc70bc4ca..9bc70bc4ca 100644
--- a/info/context-notes-zh-cn/src/figures/12-layout-1.pdf
+++ b/info/context-notes-zh-cn/src/figures/13/layout-1.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/m_k_i_v_ConTeXt-layout_svg_c60ccda70ef92e32d7a6334f31c23259.pdf b/info/context-notes-zh-cn/src/figures/13/m_k_i_v_ConTeXt-layout_svg_c60ccda70ef92e32d7a6334f31c23259.pdf
index 6b5a8ecb67..6ba65a0be2 100644
--- a/info/context-notes-zh-cn/src/figures/m_k_i_v_ConTeXt-layout_svg_c60ccda70ef92e32d7a6334f31c23259.pdf
+++ b/info/context-notes-zh-cn/src/figures/13/m_k_i_v_ConTeXt-layout_svg_c60ccda70ef92e32d7a6334f31c23259.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/12-slides-1.pdf b/info/context-notes-zh-cn/src/figures/13/slides-1.pdf
index 2485deadde..2485deadde 100644
--- a/info/context-notes-zh-cn/src/figures/12-slides-1.pdf
+++ b/info/context-notes-zh-cn/src/figures/13/slides-1.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/12-slides-2.pdf b/info/context-notes-zh-cn/src/figures/13/slides-2.pdf
index 4b26477642..4b26477642 100644
--- a/info/context-notes-zh-cn/src/figures/12-slides-2.pdf
+++ b/info/context-notes-zh-cn/src/figures/13/slides-2.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/12-slides-3.pdf b/info/context-notes-zh-cn/src/figures/13/slides-3.pdf
index 28f9344b4f..28f9344b4f 100644
--- a/info/context-notes-zh-cn/src/figures/12-slides-3.pdf
+++ b/info/context-notes-zh-cn/src/figures/13/slides-3.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/12-slides-4.pdf b/info/context-notes-zh-cn/src/figures/13/slides-4.pdf
index 8ceef2f8c9..8ceef2f8c9 100644
--- a/info/context-notes-zh-cn/src/figures/12-slides-4.pdf
+++ b/info/context-notes-zh-cn/src/figures/13/slides-4.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/slides-finished.pdf b/info/context-notes-zh-cn/src/figures/13/slides-finished.pdf
index b49b06afcb..b49b06afcb 100644
--- a/info/context-notes-zh-cn/src/figures/slides-finished.pdf
+++ b/info/context-notes-zh-cn/src/figures/13/slides-finished.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/slides.pdf b/info/context-notes-zh-cn/src/figures/13/slides.pdf
index 3d65bd5a28..3d65bd5a28 100644
--- a/info/context-notes-zh-cn/src/figures/slides.pdf
+++ b/info/context-notes-zh-cn/src/figures/13/slides.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/13-bookmarks.png b/info/context-notes-zh-cn/src/figures/14/bookmarks.png
index d11a152edc..d11a152edc 100644
--- a/info/context-notes-zh-cn/src/figures/13-bookmarks.png
+++ b/info/context-notes-zh-cn/src/figures/14/bookmarks.png
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/13-toc-2.pdf b/info/context-notes-zh-cn/src/figures/14/toc-2.pdf
index 1329c57d27..1329c57d27 100644
--- a/info/context-notes-zh-cn/src/figures/13-toc-2.pdf
+++ b/info/context-notes-zh-cn/src/figures/14/toc-2.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/13-toc.pdf b/info/context-notes-zh-cn/src/figures/14/toc.pdf
index 60c2b9fbdd..60c2b9fbdd 100644
--- a/info/context-notes-zh-cn/src/figures/13-toc.pdf
+++ b/info/context-notes-zh-cn/src/figures/14/toc.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/bookmark.png b/info/context-notes-zh-cn/src/figures/bookmark.png
deleted file mode 100644
index 7dc8c6f060..0000000000
--- a/info/context-notes-zh-cn/src/figures/bookmark.png
+++ /dev/null
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/cow.pdf b/info/context-notes-zh-cn/src/figures/cow.pdf
deleted file mode 100644
index 2441faf74e..0000000000
--- a/info/context-notes-zh-cn/src/figures/cow.pdf
+++ /dev/null
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/gardeninglion.jpg b/info/context-notes-zh-cn/src/figures/gardeninglion.jpg
deleted file mode 100644
index 262d8e4c7f..0000000000
--- a/info/context-notes-zh-cn/src/figures/gardeninglion.jpg
+++ /dev/null
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/header.png b/info/context-notes-zh-cn/src/figures/header.png
deleted file mode 100644
index 04cd4ec195..0000000000
--- a/info/context-notes-zh-cn/src/figures/header.png
+++ /dev/null
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/hello.png b/info/context-notes-zh-cn/src/figures/hello.png
deleted file mode 100644
index 01b096bd20..0000000000
--- a/info/context-notes-zh-cn/src/figures/hello.png
+++ /dev/null
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/linux-terminal-icon.png b/info/context-notes-zh-cn/src/figures/linux-terminal-icon.png
deleted file mode 100644
index 561da8dbb8..0000000000
--- a/info/context-notes-zh-cn/src/figures/linux-terminal-icon.png
+++ /dev/null
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/search.png b/info/context-notes-zh-cn/src/figures/search.png
deleted file mode 100644
index 74e12ca6a2..0000000000
--- a/info/context-notes-zh-cn/src/figures/search.png
+++ /dev/null
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/zhfonts-01.pdf b/info/context-notes-zh-cn/src/figures/zhfonts/01.pdf
index 12e3519ae6..12e3519ae6 100644
--- a/info/context-notes-zh-cn/src/figures/zhfonts-01.pdf
+++ b/info/context-notes-zh-cn/src/figures/zhfonts/01.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/zhfonts-02.pdf b/info/context-notes-zh-cn/src/figures/zhfonts/02.pdf
index f4795fec8c..f4795fec8c 100644
--- a/info/context-notes-zh-cn/src/figures/zhfonts-02.pdf
+++ b/info/context-notes-zh-cn/src/figures/zhfonts/02.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/zhfonts-03.pdf b/info/context-notes-zh-cn/src/figures/zhfonts/03.pdf
index c1ccc3fcfc..c1ccc3fcfc 100644
--- a/info/context-notes-zh-cn/src/figures/zhfonts-03.pdf
+++ b/info/context-notes-zh-cn/src/figures/zhfonts/03.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/none-zhfonts.pdf b/info/context-notes-zh-cn/src/figures/zhfonts/none-zhfonts.pdf
index 5064281d40..5064281d40 100644
--- a/info/context-notes-zh-cn/src/figures/none-zhfonts.pdf
+++ b/info/context-notes-zh-cn/src/figures/zhfonts/none-zhfonts.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/figures/zhfonts.pdf b/info/context-notes-zh-cn/src/figures/zhfonts/zhfonts.pdf
index 8958d73fc3..8958d73fc3 100644
--- a/info/context-notes-zh-cn/src/figures/zhfonts.pdf
+++ b/info/context-notes-zh-cn/src/figures/zhfonts/zhfonts.pdf
Binary files differ
diff --git a/info/context-notes-zh-cn/src/license.tex b/info/context-notes-zh-cn/src/license.tex
new file mode 100644
index 0000000000..a2c21c225e
--- /dev/null
+++ b/info/context-notes-zh-cn/src/license.tex
@@ -0,0 +1,12 @@
+\startstandardmakeup[align=center]
+{\tfd \CONTEXT\ 蹊径}
+\blank[2*line]
+{\tfa æŽå»¶ç‘žï¼ˆlyr.m2@live.cn)}
+\blank[line]
+\useURL[ctx-notes][https://github.com/liyanrui/ConTeXt-notes]
+{\tfa 项目主页:\from[ctx-notes]}
+\vfill
+Copyright \copyright\ 2023 æŽå»¶ç‘ž
+\blank
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation.
+\stopstandardmakeup \ No newline at end of file
diff --git a/info/context-notes-zh-cn/src/postscript.tex b/info/context-notes-zh-cn/src/postscript.tex
index da911d0668..815a3e71d8 100644
--- a/info/context-notes-zh-cn/src/postscript.tex
+++ b/info/context-notes-zh-cn/src/postscript.tex
@@ -6,7 +6,7 @@
我还没有学会。
-这份文档所介ç»çš„ \CONTEXT\ 知识或许尚ä¸åŠå®ƒå…¨éƒ¨åŠŸèƒ½çš„百分之一,且 \CONTEXT\ ä¾ç„¶åœ¨å‘展ç€ã€‚学无止境,以我生之有涯éšçŸ¥è¯†ä¹‹æ— æ¶¯ï¼Œè¿™æ ·ä¸å¥½ã€‚弱水三åƒï¼Œä»…å–一瓢饮,会好一些。
+这份文档所介ç»çš„ \CONTEXT\ 知识或许尚ä¸åŠå®ƒå…¨éƒ¨åŠŸèƒ½çš„百分之一,且 \CONTEXT\ ä¾ç„¶åœ¨å‘展ç€ã€‚学无止境,以生之有涯,éšçŸ¥è¯†ä¹‹æ— æ¶¯ï¼Œè¿™æ ·ä¸å¥½ã€‚弱水三åƒï¼Œä»…å–一瓢饮,会好一些。
我应该去外é¢èµ°èµ°äº†ï¼Œä¸ç„¶æ˜¥å¤©åˆæ‚„悄离去了。
diff --git a/info/context-notes-zh-cn/src/preface.tex b/info/context-notes-zh-cn/src/preface.tex
index bc545f60ab..efc4942676 100644
--- a/info/context-notes-zh-cn/src/preface.tex
+++ b/info/context-notes-zh-cn/src/preface.tex
@@ -2,22 +2,22 @@
\useURL[王垠][https://www.yinwang.org]%[][\hyphenatedurl{https://www.yinwang.org}]
-我最早å¬é—»å¹¶æŽ¥è§¦ \ConTeXt,大概是 2008 年在王垠\footnote{一个敢于自我å¦å®šçš„人,曾致力于在国内推广 GNU/Linux å’Œ \TEX,åŽæ¥ä»¥å…¶å¯¹è®¡ç®—机科学和编程语言设计的洞察而闻å,详è§å…¶ä¸ªäººä¸»é¡µ \bluebox{\from[王垠]}。}的个人主页上看到他对 \ConTeXt 的谥美之文。当时我猎奇心甚为严é‡ï¼Œåˆè§‰å¾—大家都在用的 \LaTeX\ 无法体现我的气质,便开始自学 \CONTEXT。或许这是年é’人的通病。
+我最早å¬é—»å¹¶æŽ¥è§¦ \CONTEXT,大概是 2008 年在王垠\footnote{一个敢于自我å¦å®šçš„人,曾致力于在国内推广 GNU/Linux å’Œ \TEX,åŽæ¥ä»¥å…¶å¯¹è®¡ç®—机科学和编程语言设计的洞察而闻å,详è§å…¶ä¸ªäººä¸»é¡µ \bluebox{\from[王垠]}。}的个人主页上看到他对 \CONTEXT 的谥美之文。当时我猎奇心甚为严é‡ï¼Œåˆè§‰å¾—大家都在用的 \LaTeX\ 无法体现我的气质,便开始自学 \CONTEXT。或许这是年é’人的通病。
-现在,我已ä¸å†å¹´é’,å´ä¾ç„¶å–œæ¬¢ \ConTeXt。曾ç»æ²§æµ·éš¾ä¸ºæ°´ï¼Œæˆ–许这是人è€äº†ä¹‹åŽçš„通病,而我觉得更å¯èƒ½æ˜¯å› ä¸º \CONTEXT\ ä¾ç„¶å¹´é’。2008 年,\CONTEXT\ 正处于从 Mk\Romannumerals{2} ç‰ˆæœ¬å‘ Mk\Romannumerals{4} 版本跃è¿æœŸé—´ã€‚å¾… 2019 å¹´ MK\Romannumerals{4} 版本尘埃è½å®šæ—¶ï¼Œ\CONTEXT\ çš„å¼€å‘者大刀阔斧,如ç«å¦‚è¼ï¼Œå¼€å¯äº†ä¸‹ä¸€ä¸ªç‰ˆæœ¬ \LMTX\cite[Hagen2019]çš„å¼€å‘工作,至今方兴未艾。
+现在,我已ä¸å†å¹´é’,å´ä¾ç„¶å–œæ¬¢ \CONTEXT。曾ç»æ²§æµ·éš¾ä¸ºæ°´ï¼Œæˆ–许这是人è€äº†ä¹‹åŽçš„通病,而我觉得更å¯èƒ½æ˜¯å› ä¸º \CONTEXT\ ä¾ç„¶å¹´é’。2008 年,\CONTEXT\ 正处于从 Mk\Romannumerals{2} ç‰ˆæœ¬å‘ Mk\Romannumerals{4} 版本跃è¿æœŸé—´ã€‚å¾… 2019 å¹´ MK\Romannumerals{4} 版本尘埃è½å®šæ—¶ï¼Œ\CONTEXT\ çš„å¼€å‘者大刀阔斧,如ç«å¦‚è¼ï¼Œå¼€å¯äº†ä¸‹ä¸€ä¸ªç‰ˆæœ¬ \LMTX\cite[Hagen2019]çš„å¼€å‘工作,至今方兴未艾。
-任何工具,åªè¦æœ‰äººé•¿æ—¶é—´ç»´æŒå’Œæ”¹è¿›ï¼Œä¾¿ä¼šè¶‹å‘于å¤æ‚而难以被他人驾驭,但是它能胜任å¤æ‚的任务。\TEX\ 是å¤æ‚的,以它为基础的 Plain \TeX,\LaTeX\ å’Œ \ConTeXt\ 则更为å¤æ‚。事实上,并éžå·¥å…·è¶‹å‘于å˜å¾—å¤æ‚,而是任务趋å‘于å˜å¾—å¤æ‚,更本质一些,是人心趋å‘于å˜å¾—å¤æ‚。例如,使用 Markdown 之类的标记语言写散文类的文章,轻æ¾æ„‰å¿«ï¼Œè¿™æ˜¯è¿‘å¹´æ¥ Markdown 广泛用于网文创作的主è¦åŽŸå› ã€‚倘若用 Markdown 写一本å«æœ‰è®¸å¤šæ’图ã€æ•°å­¦å…¬å¼ã€è¡¨æ ¼ã€å‚考文献等内容的书ç±ï¼Œä¾¿éœ€è¦ä¸ºå®ƒå¢žåŠ è®¸å¤šåŠŸèƒ½ï¼Œæœ€ç»ˆçš„结果相当于åˆé‡æ–°å‘明了一次 \TeX。
+任何工具,åªè¦æœ‰äººé•¿æ—¶é—´ç»´æŒå’Œæ”¹è¿›ï¼Œä¾¿ä¼šè¶‹å‘于å¤æ‚而难以被他人驾驭,但是它能胜任å¤æ‚的任务。\TEX\ 是å¤æ‚的,以它为基础的 Plain \TeX,\LaTeX\ å’Œ \CONTEXT\ 则更为å¤æ‚。事实上,并éžå·¥å…·è¶‹å‘于å˜å¾—å¤æ‚,而是任务趋å‘于å˜å¾—å¤æ‚,更本质一些,是人心趋å‘于å˜å¾—å¤æ‚。例如,使用 Markdown 之类的标记语言写散文类的文章,轻æ¾æ„‰å¿«ï¼Œè¿™æ˜¯è¿‘å¹´æ¥ Markdown 广泛用于网文创作的主è¦åŽŸå› ã€‚倘若用 Markdown 写一本å«æœ‰è®¸å¤šæ’图ã€æ•°å­¦å…¬å¼ã€è¡¨æ ¼ã€å‚考文献等内容的书ç±ï¼Œä¾¿éœ€è¦ä¸ºå®ƒå¢žåŠ è®¸å¤šåŠŸèƒ½ï¼Œæœ€ç»ˆçš„结果相当于åˆé‡æ–°å‘明了一次 \TeX。
-Plain \TeX,\LaTeX\ å’Œ \ConTeXt\ 虽然皆为构建在 \TeX\ 系统上的å®åŒ…,但是国内熟悉å‰ä¸¤è€…的人数远多于 \ConTeXt,究其原因,我觉得是因为 \ConTeXt\ 入门文档甚少,其中中文文档则更为罕è§ã€‚\ConTeXt\ 创始人兼主è¦å¼€å‘者 Hans Hagen 为 \ConTeXt\ 撰写了一份内容全é¢ã€æŽ’版精美的英文版入门文档\cite[ma-cb-en],对于具备一些英文阅读能力的人,原本å¯ä»Žè¯¥æ–‡æ¡£å…¥é—¨ï¼Œä½†é—憾的是,除éžè¯»è€…知é“如何在 \ConTeXt\ 中使用汉字(也包括日ã€éŸ©æ–‡å­—)字体,å¦åˆ™æ‰€å­¦çŸ¥è¯†ä»…能用于英文排版。
+Plain \TeX,\LaTeX\ å’Œ \CONTEXT\ 虽然皆为构建在 \TeX\ 系统上的å®åŒ…,但是国内熟悉å‰ä¸¤è€…的人数远多于 \CONTEXT,究其原因,我觉得是因为 \CONTEXT\ 入门文档甚少,其中中文文档则更为罕è§ã€‚\CONTEXT\ 创始人兼主è¦å¼€å‘者 Hans Hagen 为 \CONTEXT\ 撰写了一份内容全é¢ã€æŽ’版精美的英文版入门文档\cite[ma-cb-en],对于具备一些英文阅读能力的人,原本å¯ä»Žè¯¥æ–‡æ¡£å…¥é—¨ï¼Œä½†é—憾的是,除éžè¯»è€…知é“如何在 \CONTEXT\ 中使用汉字(也包括日ã€éŸ©æ–‡å­—)字体,å¦åˆ™æ‰€å­¦çŸ¥è¯†ä»…能用于英文排版。
\useURL[ctan][https://ctan.org]
-我曾于 2009 年写过一份 \ConTeXt 学习笔记\cite[ctxnotes],介ç»äº†åœ¨ \ConTeXt\ Mk\Romannumerals{4} 中如何加载汉字字体以åŠåŸºæœ¬çš„ \ConTeXt\ 排版命令的用法,内容颇为粗陋,由 CTeX 论å›é‡Œçš„朋å‹æ•´åˆè‡³ ctex-doc 项目并打包呈交 \bluebox{\from[ctan]} 网站。2011 å¹´å¤å¤©æ›¾è®¸è¯ºå°†æˆ‘å‘布于网络上的一些相关文章åˆå¹¶è‡³è¯¥ç¬”记,但因俗务缠身,åŽæ¥å…´è¶£åˆæœ‰æ¼‚移,便ä¸äº†äº†ä¹‹ã€‚
+我曾于 2009 年写过一份 \CONTEXT 学习笔记,介ç»äº†åœ¨ \CONTEXT\ Mk\Romannumerals{4} 中如何加载汉字字体以åŠåŸºæœ¬çš„ \CONTEXT\ 排版命令的用法,内容颇为粗陋,由 CTeX 论å›é‡Œçš„朋å‹æ•´åˆè‡³ ctex-doc 项目并打包呈交 \bluebox{\from[ctan]} 网站。2011 å¹´å¤å¤©æ›¾è®¸è¯ºå°†æˆ‘å‘布于网络上的一些相关文章åˆå¹¶è‡³è¯¥ç¬”记,但因俗务缠身,åŽæ¥å…´è¶£åˆæœ‰æ¼‚移,便ä¸äº†äº†ä¹‹ã€‚
-光阴è苒,时过境è¿ï¼Œå½“年曾在 CTeX 论å›ä¸€èµ·æŠ˜è…¾ \TeX\ 的朋å‹å¤§å¤šå·²ä¸çŸ¥æ‰€è¸ªâ€”—在他们看æ¥ï¼Œæˆ‘亦如是。2018 年,CTeX 论å›å› å›½å†…日益严厉的互è”网监管政策被迫无é™æœŸå…³é—­ï¼Œå¯¼è‡´å›½å†… \TeX\ 学习ã€ç ”究和使用热情似乎é­å—了æ¯ç­æ€§æ‰“击,爱好者们离散江湖,白头宫女在,闲å说玄宗。现在,若学习 \LaTeX\ 尚能找到一些讨论区,而 \ConTeXt\ 似乎å†ä¹Ÿæ— äººé—®æ´¥äº†ã€‚爱好终归属于自己。å³ä½¿çŽ°åœ¨å›½å†…åªæœ‰æˆ‘一个人还在喜欢 \ConTeXt,ä¾ç„¶åº”当为自己写一份新的 \ConTeXt\ 学习笔记,以å¿æ—§è¯ºã€‚
+光阴è苒,时过境è¿ï¼Œå½“年曾在 CTeX 论å›ä¸€èµ·æŠ˜è…¾ \TeX\ 的朋å‹å¤§å¤šå·²ä¸çŸ¥æ‰€è¸ªâ€”—在他们看æ¥ï¼Œæˆ‘亦如是。2018 年,CTeX 论å›å› å›½å†…日益严厉的互è”网监管政策被迫无é™æœŸå…³é—­ï¼Œå¯¼è‡´å›½å†… \TeX\ 学习ã€ç ”究和使用热情似乎é­å—了æ¯ç­æ€§æ‰“击,爱好者们离散江湖,白头宫女在,闲å说玄宗。现在,若学习 \LaTeX\ 尚能找到一些讨论区,而 \CONTEXT\ 似乎å†ä¹Ÿæ— äººé—®æ´¥äº†ã€‚爱好终归属于自己。å³ä½¿çŽ°åœ¨å›½å†…åªæœ‰æˆ‘一个人还在喜欢 \CONTEXT,ä¾ç„¶åº”当为自己写一份新的 \CONTEXT\ 学习笔记,以å¿æ—§è¯ºã€‚
值此情境,需篡改å¤è¯ä¸€é˜™ï¼Œæ­Œä»¥å’志:芦å¶æ»¡æ±€æ´²ï¼Œå¯’沙带浅æµï¼ŒäºŒåå¹´é‡è¿‡å—楼。欲买桂花åŒè½½é…’,终ä¸è´Ÿï¼Œå°‘年游。
\vfill
\startalignment[flushright,broad]
-2023 å¹´ 3 月写于乡下è€å®¶
+2023 å¹´ 3 月写于山东郯城乡下è€å®¶
\stopalignment \ No newline at end of file
diff --git a/info/context-notes-zh-cn/src/zhfonts.tex b/info/context-notes-zh-cn/src/zhfonts.tex
index b2fa8d7bb1..00ff1399b0 100644
--- a/info/context-notes-zh-cn/src/zhfonts.tex
+++ b/info/context-notes-zh-cn/src/zhfonts.tex
@@ -1,8 +1,8 @@
-\title{zhfonts 模å—}
+\chapter{éœ€è¦ zhfonts å—?}
-基于第 \in[chinese-fonts] 章介ç»çš„汉字字体的设定方法,使用 \CONTEXT\ 足以排版中文文档,但是存在汉字标点符å·çš„é—´è·è¿‡å¤§ä¸”无法与正文左å³è¾¹ç•Œå¯¹é½ç­‰é—®é¢˜ã€‚若你对此无法å¿å—,å¯ä»¥è€ƒè™‘使用我写的 zhfonts 模å—。
+基于第 \in[chinese-fonts] 章介ç»çš„汉字字体的设定方法,使用 \CONTEXT\ 足以排版中文文档,但是存在汉字标点符å·çš„é—´è·è¿‡å¤§ä¸”无法与正文左å³è¾¹ç•Œå¯¹é½ç­‰é—®é¢˜ã€‚若你对此无法å¿å—,å¯ä»¥è€ƒè™‘使用我写的 zhfonts 模å—,å¦å¤–该模å—显著简化了中文字体的设定。
-\section{标点间è·å¾®è°ƒ}
+\section{zhfonts åˆå°è±¡}
æ ¹æ®çŽ°åœ¨ä½ å·²ç»æŽŒæ¡çš„ \CONTEXT\ 知识,ç†è§£ä»¥ä¸‹ä»£ç ï¼Œæƒ³å¿…å·²ä¸åœ¨è¯ä¸‹ï¼š
@@ -37,11 +37,13 @@
若认真对比图 \in[none-zhfonts] 和图 \in[zhfonts] 中的标点符å·çš„排版结果,则ä¸éš¾å‘现 zhfonts 模å—解决的问题是标点间è·å¾®è°ƒã€‚
\placefigure[here][none-zhfonts]{未使用 zhfonts 的中文标点排版效果}{%
- \clip[width=\textwidth,height=5cm,voffset=1.8cm]{\externalfigure[none-zhfonts.pdf][width=\textwidth]}}
+ \clip[width=\textwidth,height=5cm,voffset=1.8cm]{%
+ \externalfigure[zhfonts/none-zhfonts.pdf][width=\textwidth]}}
\placefigure[here][zhfonts]{使用 zhfonts 的中文标点排版结果}{%
- \clip[width=\textwidth,height=4.25cm,voffset=1.8cm]{\externalfigure[zhfonts.pdf][width=\textwidth]}}
+ \clip[width=\textwidth,height=4.25cm,voffset=1.8cm]{%
+ \externalfigure[zhfonts/zhfonts.pdf][width=\textwidth]}}
-\section{安装 zhfonts 模å—}
+\section{安装 zhfonts}
\useURL[zhfonts][https://github.com/liyanrui/zhfonts/archive/refs/heads/master.zip]
下载 zhfonts-master.zip 包,网络链接为\\
@@ -72,7 +74,7 @@ zhfonts 默认使用 11 pt 正体字(宋体 + Latin Modern Serif)作为正æ–
我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。I can eat glass, it does not hurt me.
\stopTEXpage
\stoptyping
-\placefigure[none]{}{\externalfigure[zhfonts-01.pdf]}
+\placefigure[none]{}{\externalfigure[zhfonts/01.pdf]}
使用模å—å‚æ•° \type{style=ss} 或 \type{style=tt},å¯å°†æ­£æ–‡å­—体切æ¢ä¸ºæ¨¡å—å‚æ•° \type{size} 所设定大å°çš„无衬线字体或等宽字体。例如
@@ -83,7 +85,7 @@ zhfonts 默认使用 11 pt 正体字(宋体 + Latin Modern Serif)作为正æ–
我能åžä¸‹çŽ»ç’ƒè€Œä¸ä¼¤èº«ä½“。I can eat glass, it does not hurt me.
\stopTEXpage
\stoptyping
-\placefigure[none]{}{\externalfigure[zhfonts-02.pdf]}
+\placefigure[none]{}{\externalfigure[zhfonts/02.pdf]}
\section{\type{\setupzhfonts}}
@@ -139,7 +141,7 @@ zhfonts 并未使用汉字字体中的西文字形,而是是将汉字字体作
\bf 这是汉字,These are English characters.
\stopTEXpage
\stoptyping
-\placefigure[none]{}{\externalfigure[zhfonts-03.pdf]}
+\placefigure[none]{}{\externalfigure[zhfonts/03.pdf]}
\section{å°ç»“}
diff --git a/macros/latex/contrib/acmart/ACM-Reference-Format.bst b/macros/latex/contrib/acmart/ACM-Reference-Format.bst
index 9096b91ed1..c47cb4c0f0 100644
--- a/macros/latex/contrib/acmart/ACM-Reference-Format.bst
+++ b/macros/latex/contrib/acmart/ACM-Reference-Format.bst
@@ -3,7 +3,7 @@
%%% @BibTeX-style-file{
%%% author = "Nelson H. F. Beebe, Boris Veytsman and Gerald Murray",
%%% version = "2.1",
-%%% acmart-version = "1.89a",
+%%% acmart-version = "1.90",
%%% date = "Mar 26 2023",
%%% filename = "ACM-Reference-Format.bst",
%%% email = "borisv@lk.net, boris@varphi.com",
diff --git a/macros/latex/contrib/acmart/README b/macros/latex/contrib/acmart/README
index e4d9f52a94..eeff791cae 100644
--- a/macros/latex/contrib/acmart/README
+++ b/macros/latex/contrib/acmart/README
@@ -12,6 +12,8 @@ The production version is the one on CTAN and ACM sites.
Changes
+Version 1.90 Journal ISSN updated
+
Version 1.89a Added version info to .bst
Version 1.89 Bug fixes
diff --git a/macros/latex/contrib/acmart/acmart.dtx b/macros/latex/contrib/acmart/acmart.dtx
index 0ecf0d23e9..e0785f25e3 100644
--- a/macros/latex/contrib/acmart/acmart.dtx
+++ b/macros/latex/contrib/acmart/acmart.dtx
@@ -2269,7 +2269,7 @@
\ProvidesFile{acmart.dtx}
%</gobble>
%<class>\ProvidesClass{acmart}
-[2023/03/26 v1.89a Typesetting articles for the Association for Computing Machinery]
+[2023/03/30 v1.90 Typesetting articles for the Association for Computing Machinery]
% \end{macrocode}
%
% \changes{v1.00}{2016/04/14}{First released version}
@@ -4331,6 +4331,7 @@
% \changes{1.88}{2022/10/24}{Added PACMNET}
% \changes{1.89}{2023/03/25}{Added PACMMOD}
% \changes{1.89}{2023/03/25}{Added TOPML}
+% \changes{1.90}{2023/03/30}{Added TOPML eISSN}
%
% We use the |xkeyval| interface to define journal titles and the relevant
% information
@@ -4671,7 +4672,7 @@
\or % TOPML
\def\@journalName{ACM Transactions on Probabilistic Machine Learning}%
\def\@journalNameShort{ACM Trans. Probab. Mach. Learn.}%
- \def\@permissionCodeOne{}%
+ \def\@permissionCodeOne{2836-8924}%
\or % TORS
\def\@journalName{ACM Transactions on Recommender Systems}%
\def\@journalNameShort{ACM Trans. Recomm. Syst.}%
diff --git a/macros/latex/contrib/acmart/acmart.pdf b/macros/latex/contrib/acmart/acmart.pdf
index 06bdc1d9d2..98dc9ce130 100644
--- a/macros/latex/contrib/acmart/acmart.pdf
+++ b/macros/latex/contrib/acmart/acmart.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/acmguide.pdf b/macros/latex/contrib/acmart/acmguide.pdf
index 3a06bae3d3..9ea3331801 100644
--- a/macros/latex/contrib/acmart/acmguide.pdf
+++ b/macros/latex/contrib/acmart/acmguide.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-acmcp.pdf b/macros/latex/contrib/acmart/samples/sample-acmcp.pdf
index ec661481f5..1452670cff 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmcp.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmcp.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-acmengage.pdf b/macros/latex/contrib/acmart/samples/sample-acmengage.pdf
index 47697c40eb..f1038f193e 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmengage.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmengage.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
index 88e712f561..30fe2c052c 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf
index c1723409a0..7f14794779 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf
index e12ce0fa7c..deb759aa6c 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf
index df172f82ad..c5855e98f0 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
index 10e8a0545a..6c78efb700 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf
index c0c14f9ac1..84ef572d8c 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-authordraft.pdf b/macros/latex/contrib/acmart/samples/sample-authordraft.pdf
index 9b6bb87908..e0e41395d7 100644
--- a/macros/latex/contrib/acmart/samples/sample-authordraft.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-authordraft.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-lualatex.pdf b/macros/latex/contrib/acmart/samples/sample-lualatex.pdf
index d3a3628d78..160af90458 100644
--- a/macros/latex/contrib/acmart/samples/sample-lualatex.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-lualatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf
index e6d89edb71..bba208515d 100644
--- a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf
index eb87e03bba..e34c15f125 100644
--- a/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf
index 5579512c85..c232725b7d 100644
--- a/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf
index c6ff36932d..0acb701daa 100644
--- a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf
index 7b833ad678..71fd197a76 100644
--- a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf
Binary files differ
diff --git a/macros/latex/contrib/acmart/samples/sample-xelatex.pdf b/macros/latex/contrib/acmart/samples/sample-xelatex.pdf
index db66b4716f..dd64998d5f 100644
--- a/macros/latex/contrib/acmart/samples/sample-xelatex.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-xelatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
index 85ec3103b5..a054c4fadf 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.tex b/macros/latex/contrib/nicematrix/nicematrix-french.tex
index e9700dd86c..4ec05bce2c 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.tex
@@ -40,6 +40,7 @@
\usepackage{booktabs}
\usepackage{varwidth}
\usepackage{tcolorbox}
+\usepackage{adjustbox}
\usepackage[auto-lang=false]{lipsum}
\usepackage[hyperfootnotes = false]{hyperref}
@@ -556,11 +557,11 @@ expliqué plus loin.
\medskip
Dans l'exemple suivant, on a dû élargir à la main les colonnes 2 et 3 (avec la
-construction |wc{...}| de \pkg{array}).
+construction |w{c}{...}| de \pkg{array}).
\medskip
\begin{BVerbatim}
-\begin{NiceTabular}{cwc{2cm}wc{3cm}c}
+\begin{NiceTabular}{cw{c}{2cm}w{c}{3cm}c}
rose & tulipe & marguerite & dahlia \\
violette
& ~emphase#\Block[draw=red,fill=[RGB]{204,204,255},rounded-corners]{2-2}@
@@ -574,7 +575,7 @@ arum & iris & jacinthe & muguet
\medskip
\begin{center}
-\begin{NiceTabular}{cwc{2cm}wc{3cm}c}
+\begin{NiceTabular}{cw{c}{2cm}w{c}{3cm}c}
rose & tulipe & marguerite & dahlia \\
violette & \Block[draw=red,fill=[RGB]{204,204,255},rounded-corners]{2-2}
{\LARGE De très jolies fleurs} & & souci \\
@@ -591,9 +592,9 @@ Les blocs mono-colonne ont un comportement spécial.
\item La largeur naturelle du contenu de ces blocs est prise en compte pour la
largeur de la colonne courante.
-Dans les colonnes à largeur fixée (colonnes |w{...}{...}|, |p{...}|, |b{...}|,
-|m{...}| et |X|), le contenu du bloc est mis en forme comme un paragraphe de
-cette largeur.
+Dans les colonnes à largeur fixée (|p{...}|, |b{...}|, |m{...}|, |w{...}{...}|,
+|W{...}{...}|, |V| et |X|), le contenu du bloc est mis en forme comme un
+paragraphe de cette largeur.
\item La spécification d'alignement horizontal donnée par le type de
colonne (|c|, |r| ou |l|) est prise en compte pour le bloc (mais le bloc peut
@@ -2189,7 +2190,7 @@ de même nom (cf. p.~\pageref{cell-space}).
couleur du texte.\footnote{La clé |color| utilise la commande |\color| mais
insère aussi une instruction |\leavevmode| devant. Cela évite un espace
vertical parasite dans les cellules qui correspondent à des colonnes de type
- |p|, |b|, |m| et |X| (qui débutent en mode vertical).}
+ |p|, |b|, |m|, |X| et |V| (qui débutent en mode vertical).}
\item La clé |bold| impose des caractères gras aux éléments de la rangée, qu'ils
soient en mode texte ou bien en mode mathématique.
@@ -2355,6 +2356,63 @@ $\begin{array}{c}
\end{array}$
\end{NiceMatrixBlock}
+
+\subsection{Les colonnes X}
+
+
+\label{colonne-X}
+
+L'environnement |{NiceTabular}| propose aussi des colonnes |X| similaires à
+celles proposées par l'environnement |{tabularx}| de l'extension éponyme.
+
+La valeur requise par la largeur du tableau peut être passée en argument de la
+clé |width| (dans |{NiceTabular}| ou dans |\NiceMatrixOptions|). La valeur
+initiale de ce paramètre est |\linewidth| (et non |\textwidth|).
+
+Pour se rapprocher davantage de l'environnement |{tabularx}|, \pkg{nicematrix}
+propose aussi un environnement |{NiceTabularX}| avec une syntaxe similaire à
+celle de |{tabularx}|, c'est-à-dire que la largeur voulue pour le tableau est
+spécifiée en premier argument (obligatoire).\footnote{Si \pkg{tabularx} est
+ chargé, on doit obligatoirement utiliser |{NiceTabularX}| pour utiliser les
+ colonnes |X| (cela est dû à un problème de conflit de définition des
+ spécificateurs de colonne |X|).}
+
+
+Comme avec les extensions \pkg{tabu}\footnote{L'extension \pkg{tabu} est
+ maintenant considérée comme obsolète.} et \pkg{tabularray}, le spécificateur |X|
+accepte entre crochets un argument optionnel qui est une liste de clés.
+\begin{itemize}
+\item On peut spécifier un poids pour la colonne en mettant directement un
+entier positif comme argument du spécificateur |X|. Par exemple, une colonne
+|X[2]| aura une largeur double de celle d'une colonne |X| (qui a un poids de
+1).\footnote{Les valeurs négatives pour les poids, comme proposées par
+ \pkg{tabu} (maintenant obsolète), ne sont \emph{pas} prises en charge par
+ \pkg{nicematrix}. Si une telle valeur est utilisée, une erreur sera levée.}
+\item On peut spécifier l'alignement horizontal avec une des lettres |l|, |c| et
+|r| (qui insèrent respectivement |\raggedright|, |\centering| et |\raggedleft|
+suivi de |\arraybackslash|).
+\item On peut spécifier l'alignement vertical avec l'une des lettres |t| (alias
+|p|), |m| et |b| (qui construisent respectivement des colonnes de types |p|, |m|
+et |b|). La valeur par défaut est |t|.
+\end{itemize}
+
+\begin{Verbatim}
+\begin{NiceTabular}~emphase#[width=9cm]{X[2,l]X[l]}@[hvlines]
+Un texte relativement long qui tient sur plusieurs lignes. &
+Un texte relativement long qui tient sur plusieurs lignes. \\
+Un texte plus court. & Un texte plus court.
+\end{NiceTabular}
+\end{Verbatim}
+
+
+\begin{center}
+\begin{NiceTabular}[width=9cm]{X[2,l]X[l]}[hvlines]
+Un texte relativement long qui tient sur plusieurs lignes. &
+Un texte relativement long qui tient sur plusieurs lignes. \\
+Un texte plus court. & Un texte plus court.
+\end{NiceTabular}
+\end{center}
+
\subsection{Les colonnes V de varwidth}
\label{varwidth}
@@ -2437,66 +2495,17 @@ colonnes de type |p|, |m| ou |b| est que, pour les cases d'une telle colonne,
le nœud PGF-TikZ créé pour le contenu d'une telle case a une largeur ajustée
au contenu de la cellule en question : cf. p.~\pageref{node-V}.
+
+\medskip
+Les colonnes |V| de \pkg{nicematrix} acceptent les clés |t|, |p|, |m|, |b|, |l|,
+|c| et |r| proposées par les colonnes~|X|: voir leur description à la section~\ref{colonne-X},
+p.~\pageref{colonne-X}.
+
\medskip
Remarquons que l'extension \pkg{varwidth} a quelques problèmes (au moins dans sa
version 0.92). Par exemple, avec LuaLaTeX, elle ne fonctionne pas si le contenu
commence par une instruction |\color|.
-\subsection{Les colonnes X}
-
-
-\label{colonne-X}
-
-L'environnement |{NiceTabular}| propose aussi des colonnes |X| similaires à
-celles proposées par l'environnement |{tabularx}| de l'extension éponyme.
-
-La valeur requise par la largeur du tableau peut être passée en argument de la
-clé |width| (dans |{NiceTabular}| ou dans |\NiceMatrixOptions|). La valeur
-initiale de ce paramètre est |\linewidth| (et non |\textwidth|).
-
-Pour se rapprocher davantage de l'environnement |{tabularx}|, \pkg{nicematrix}
-propose aussi un environnement |{NiceTabularX}| avec une syntaxe similaire à
-celle de |{tabularx}|, c'est-à-dire que la largeur voulue pour le tableau est
-spécifiée en premier argument (obligatoire).\footnote{Si \pkg{tabularx} est
- chargé, on doit obligatoirement utiliser |{NiceTabularX}| pour utiliser les
- colonnes |X| (cela est dû à un problème de conflit de définition des
- spécificateurs de colonne |X|).}
-
-
-Comme avec les extensions \pkg{tabu}\footnote{L'extension \pkg{tabu} est
- maintenant considérée comme obsolète.} et \pkg{tabularray}, le spécificateur |X|
-accepte entre crochets un argument optionnel qui est une liste de clés.
-\begin{itemize}
-\item On peut spécifier un poids pour la colonne en mettant directement un
-entier positif comme argument du spécificateur |X|. Par exemple, une colonne
-|X[2]| aura une largeur double de celle d'une colonne |X| (qui a un poids de
-1).\footnote{Les valeurs négatives pour les poids, comme proposées par
- \pkg{tabu} (maintenant obsolète), ne sont \emph{pas} prises en charge par
- \pkg{nicematrix}. Si une telle valeur est utilisée, une erreur sera levée.}
-\item On peut spécifier l'alignement horizontal avec une des lettres |l|, |c| et
-|r| (qui insèrent respectivement |\raggedright|, |\centering| et |\raggedleft|
-suivi de |\arraybackslash|).
-\item On peut spécifier l'alignement vertical avec l'une des lettres |t| (alias
-|p|), |m| et |b| (qui construisent respectivement des colonnes de types |p|, |m|
-et |b|). La valeur par défaut est |t|.
-\end{itemize}
-
-\begin{Verbatim}
-\begin{NiceTabular}~emphase#[width=9cm]{X[2,l]X[l]}@[hvlines]
-Un texte relativement long qui tient sur plusieurs lignes. &
-Un texte relativement long qui tient sur plusieurs lignes. \\
-Un texte plus court. & Un texte plus court.
-\end{NiceTabular}
-\end{Verbatim}
-
-
-\begin{center}
-\begin{NiceTabular}[width=9cm]{X[2,l]X[l]}[hvlines]
-Un texte relativement long qui tient sur plusieurs lignes. &
-Un texte relativement long qui tient sur plusieurs lignes. \\
-Un texte plus court. & Un texte plus court.
-\end{NiceTabular}
-\end{center}
\medskip
\section{Les rangées et colonnes extérieures}
@@ -3346,7 +3355,7 @@ autres lignes diagonales (par défaut, les lignes tracées par |\Ddots| sont
\subsection{La commande \textbackslash SubMatrix dans le \textbackslash
- CodeAfter (et aussi le \textbackslash CodeBefore)}
+ CodeAfter (et le \textbackslash CodeBefore)}
\label{sub-matrix}
@@ -3456,25 +3465,25 @@ $\begin{bNiceMatrix}[right-margin=1em]
Les clés disponibles pour la commande |\SubMatrix| sont les suivantes :
%
\begin{itemize}
-\item |left-xshift| et |right-xshift| déplacent horizontalement les délimiteurs
-(il existe aussi la clé |xshift| qui permet de régler simultanément ces deux
-clés) ;
-\item |extra-height| ajoute une quantité à la hauteur totale des délimiteurs
-(hauteur~|\ht| + profondeur |\dp|) ;
-\item |delimiters/color| permet de fixer la couleur des délimiteurs (cette clé
+\item \Definition{left-xshift} et \Definition{right-xshift} déplacent
+horizontalement les délimiteurs (il existe aussi la clé \Definition{xshift} qui
+permet de régler simultanément ces deux clés) ;
+\item \Definition{extra-height} ajoute une quantité à la hauteur totale des
+délimiteurs (hauteur~|\ht| + profondeur |\dp|) ;
+\item \Definition{delimiters/color} permet de fixer la couleur des délimiteurs (cette clé
est également disponible dans |\NiceMatrixOptions| et au niveau des
environnements à délimiteurs ou comme option de |\CodeAfter|) ;
-\item |slim| qui est une clé booléenne : lorsqu'elle est utilisée la position
+\item \Definition{slim} qui est une clé booléenne : lorsqu'elle est utilisée la position
horizontale des délimiteurs est calculée uniquement sur le contenu des cases
de la sous-matrice alors, que, dans le cas général, elle est calculée sur le
contenu des cases des colonnes mises en jeu (voir exemple ci-dessous) ;
-\item |vlines| contient une liste de numéros de filets verticaux à tracer dans
+\item \Definition{vlines} contient une liste de numéros de filets verticaux à tracer dans
la sous-matrice (si cette clé est utilisée sans valeur, tous les filets
verticaux sont tracés) ;
-\item |hlines| est similaire à |vlines| mais pour les filets horizontaux ;
-\item |hvlines|, qui s'utilise sans valeur, trace tous les filets dans la
+\item \Definition{hlines} est similaire à |vlines| mais pour les filets horizontaux ;
+\item \Definition{hvlines}, qui s'utilise sans valeur, trace tous les filets dans la
sous-matrice ;
-\item |code| permet d'insérer du code, en particulier du code TikZ, après la
+\item \Definition{code} permet d'insérer du code, en particulier du code TikZ, après la
construction de la matrice. Cette clé est décrite en détail plus loin.
\end{itemize}
On remarquera que tous les filets sont dessinés après la construction du tableau
@@ -3598,7 +3607,8 @@ Part A & the first part \\
surtout pour vocation d'être utilisée pour insérer des instructions TikZ,
sachant que, dans les instructions TikZ insérées dans cette clé, les nœuds de la
forme |i-j| et \verb+i-|j+ sont interprétés avec |i| et |j| étant des numéros de
-ligne et colonne \emph{relatifs à la sous-matrice}.
+ligne et colonne \emph{relatifs à la sous-matrice}.\footnote{Attention : la
+ syntaxe \texttt{j\string|-i} n'est autorisée.}
\medskip
\begin{scope}
@@ -4169,7 +4179,7 @@ charge par \pkg{nicematrix}.
Les environnements sans préambule (|{NiceMatrix}|, |{pNiceMatrix}|, etc.) ainsi
que la commande |\pAutoNiceMatrix| et ses variantes, acceptent la clé
-|columns-type| qui indique le type des colonne qui sera utilisé.
+|columns-type| qui indique le type de colonne qui sera utilisé.
\medskip
Les clés |l| et |r| sont des raccourcis pour |columns-type=l| et |columns-type=r|.
@@ -4205,7 +4215,7 @@ Dans l'exemple suivant, on l'utilise dans le |code-for-first-row|.\footnote{On
\medskip
\begin{BVerbatim}[baseline=c,boxwidth=12cm]
-\NiceMatrixOptions%
+\NiceMatrixOptions
{code-for-first-row = \scriptstyle ~emphase#\rotate@ \text{image de },
code-for-last-col = \scriptstyle }
$A = \begin{pNiceMatrix}[first-row,last-col=4]
@@ -4216,7 +4226,7 @@ e_1 & e_2 & e_3 \\
\end{pNiceMatrix}$
\end{BVerbatim}
\begin{varwidth}{10cm}
-\NiceMatrixOptions%
+\NiceMatrixOptions
{code-for-first-row = \scriptstyle\rotate \text{image de },
code-for-last-col = \scriptstyle }
$ A = \begin{pNiceMatrix}[first-row,last-col=4]
@@ -4233,7 +4243,7 @@ matrice), les éléments qui subissent cette rotation sont alignés vers le haut
\medskip
\begin{BVerbatim}[baseline=c,boxwidth=12cm]
-\NiceMatrixOptions%
+\NiceMatrixOptions
{code-for-last-row = \scriptstyle ~emphase#\rotate@ ,
code-for-last-col = \scriptstyle }
$A = \begin{pNiceMatrix}[last-row,last-col=4]
@@ -4244,7 +4254,7 @@ $A = \begin{pNiceMatrix}[last-row,last-col=4]
\end{pNiceMatrix}$
\end{BVerbatim}
\begin{varwidth}{10cm}
-\NiceMatrixOptions%
+\NiceMatrixOptions
{code-for-last-row = \scriptstyle\rotate ,
code-for-last-col = \scriptstyle }%
$A = \begin{pNiceMatrix}[last-row,last-col=4]
@@ -4491,9 +4501,13 @@ Pour un exemple d'utilisation, voir \url{tex.stackexchange.com/questions/488566}
\subsection{Les nœuds correspondant aux contenus des cases}
-L'extension \pkg{nicematrix} crée un nœud PGF-TikZ pour chaque case non vide
-du tableau considéré. Ces nœuds sont utilisés, entre autres, pour tracer les
-lignes en pointillés entre les cases du tableau.
+L'extension \pkg{nicematrix} crée un nœud PGF-TikZ\footnote{On rappelle que TikZ
+ est une sur-couche de PGF. L'extension \pkg{nicematrix} charge PGF et ne
+ charge pas TikZ. On parle de «nœud PGF-TikZ» pour rappeler que, en fait, les
+ nœuds créés par \pkg{nicematrix} avec PGF sont en fait aussi utilisables avec
+ TikZ. L'utilisateur final préférera sans doute les utiliser avec TikZ qu'avec
+ PGF.} pour chaque case non vide du tableau considéré. Ces nœuds sont utilisés,
+entre autres, pour tracer les lignes en pointillés entre les cases du tableau.
\smallskip
\textbf{Attention} : Par défaut, aucun nœud n'est créé dans une case vide.
@@ -4576,38 +4590,67 @@ $\begin{pNiceMatrix}
\tikz \draw (2-2) circle (2mm) ;
\end{pNiceMatrix}$
+\medskip
+Les nœuds de la dernière colonne (hors éventuelle «colonne extérieure» spécifiée
+par |last-col|\footnote{Pour les colonnes extérieures, cf.
+ partie~\ref{exterior}, p.~\pageref{exterior}.}) peuvent aussi être désignés
+par $i$-|last|. De même, les nœuds de la dernière ligne peuvent être désignés
+par |last|-$j$.
\medskip
-Dans l'exemple suivant, nous avons surligné tous les nœuds de la matrice (on
-explique plus loin la technique utilisée : cf. p. \pageref{highlight}).
+Dans l'exemple suivant, nous avons surligné tous les nœuds de la matrice.
-\[\begin{pNiceMatrix}
-\CodeBefore [create-cell-nodes]
- \begin{tikzpicture}%
- [every node/.style = { inner sep = 0 pt , fill = red!15 }]
- \node [fit = (1-1)] {} ;
- \node [fit = (1-3)] {} ;
- \node [fit = (2-2)] {} ;
- \node [fit = (3-1)] {} ;
- \node [fit = (3-3)] {} ;
- \node [fit = (1-2)] {} ;
- \node [fit = (2-1)] {} ;
- \node [fit = (2-3)] {} ;
- \node [fit = (3-2)] {} ;
- \end{tikzpicture}
-\Body
+\[
+\NiceMatrixOptions
+ {
+ pgf-node-code =
+ {
+ \pgfsetfillcolor{red!15}%
+ \pgfusepathqfill
+ }
+ }
+\begin{pNiceMatrix}
a & a + b & a + b + c \\
a & a & a + b \\
a & a & a
\end{pNiceMatrix}\]
+\bigskip
+\colorbox{yellow!50}{\textbf{Nouveau 6.17}}\enskip Puisque ces nœuds sont des
+nœuds PGF, on ne sera pas étonné d'appendre qu'ils sont tracés en utilisant un
+style PGF spécifique. Ce style est nommé |nicematrix/cell-node| et sa définition
+dans le fichier source |nicematrix.sty| est la suivante :
-Les nœuds de la dernière colonne (hors éventuelle «colonne extérieure» spécifiée
-par |last-col|) peuvent aussi être désignés par $i$-|last|. De même, les nœuds
-de la dernière ligne peuvent être désignés par |last|-$j$.
+\begin{Verbatim}
+\pgfset
+ {
+ ~emphase#nicematrix / cell-node@ /.style =
+ {
+ inner sep = 0 pt ,
+ minimum width = 0 pt
+ }
+ }
+\end{Verbatim}
+
+L'utilisateur peut modifier ce style en changeant les valeurs des clés |text/rotate|,
+|inner xsep|, |inner ysep|, |inner sep|, |outer xsep|, |outer ysep|, |outer sep|,
+|minimum width|, |minimum height| et |minimum size|.
\medskip
+Pour un exemple d'utilisation, voir la partie \ref{triangular},
+p.~\pageref{triangular}.
+
+\subsubsection{La clé pgf-node-code}
+
+\colorbox{yellow!50}{\textbf{Nouveau 6.17}}\enskip \textbf{Pour les utilisateurs
+expérimentés}, \pkg{nicematrix} fournit la clé |pgf-node-code| qui correspond à
+du code PGF qui sera exécuté à la création, par PGF, des nœuds correspondants aux
+cases du tableau. Plus précisément, la valeur fournie à la clé |pgf-node-code|
+sera passée en cinquième argument de la commande |\pgfnode|. Cette valeur doit
+contenir au moins une instruction comme |\pgfusepath|, |\pgfusepathqstroke|,
+|\pgfusepathqfill|, etc.
+
\subsubsection{Les colonnes V de varwidth}
\label{node-V}
@@ -5154,7 +5197,7 @@ mante & raie & poule
\section{Remarques techniques}
Première remarque : l'extension \pkg{nicematrix} doit être chargée après
-l'extension \pkg{underscore}.
+l'extension \pkg{underscore}. Si elle est chargée après, une erreur sera levée.
\subsection{Lignes diagonales}
@@ -5265,7 +5308,7 @@ si) son contenu dans le codage TeX est vide (il n'y a que des espaces entre les
deux esperluettes |&|).
\medskip
-\item Pour les colonnes de typte |c|, |l|, |r| ou |w{...}{...}|, la case est
+\item Pour les colonnes de type |c|, |l|, |r| ou |w{...}{...}|, la case est
vide si (et seulement si) son rendu TeX est de largeur nulle.
\medskip
@@ -5288,7 +5331,7 @@ L'environnement |{array}| insère un espace horizontal égal à |\arraycolsep|
avant et après chaque colonne. En particulier, il y a un espace égal à
|\arraycolsep| avant et après le tableau. Cette caractéristique de
l'environnement |{array}| n'était probablement pas une bonne idée\footnote{Dans
- la documentation de |{amsmath}|, on peut lire : {\itshape The extra space of
+ la documentation de l'\pkg{amsmath}, on peut lire : {\itshape The extra space of
|\arraycolsep| that \pkg{array} adds on each side is a waste so we remove it
[in |{matrix}|] (perhaps we should instead remove it from array in general,
but that's a harder task).}}. L'environnement |{matrix}| et ses variantes
@@ -5319,7 +5362,7 @@ L'extension \pkg{nicematrix} n'est pas compatible avec la classe \cls{ieeeaccess
\medskip
Pour pouvoir utiliser \pkg{nicematrix} avec la classe \cls{aastex631} (de
-l'\emph{American Astronomical Society}, on doit ajouter dans le préambule du
+l'\emph{American Astronomical Society}), on doit ajouter dans le préambule du
fichier les lignes suivantes :
\begin{Verbatim}
@@ -6393,6 +6436,66 @@ de parenthèses ont été rajoutées avec |\SubMatrix| dans le |\CodeBefore|.
\end{Verbatim}
+\subsection{Un tableau triangulaire}
+
+\label{triangular}
+
+Dans l'exemple suivant, on utilise le style PGF/Tikz |nicematrix/cell-node| pour faire
+tourner le contenu des cellules (rotation que l'on compense ensuite en faisant
+tourner tout le tableau avec la commande |\adjustbox| de l'extension éponyme,
+qui doit donc être chargée préalablement).
+
+\medskip
+\begin{Verbatim}
+\pgfset
+ {
+ ~emphase#nicematrix/cell-node@/.append style =
+ { text/rotate = 45, minimum size = 6 mm }
+ }
+
+\setlength{\tabcolsep}{0pt}
+
+~emphase#\adjustbox@{rotate = -45, set depth = 6mm + 1.414 \arrayrulewidth}
+ {\begin{NiceTabular} [ hvlines, corners=SE, baseline = line-9 ] { cccccccc }
+ \CodeBefore
+ \chessboardcolors{red!15}{blue!15}
+ \Body
+ 1 & 1 & 1 & 1 & 1 & 1 & 1 & 1 \\
+ 1 & 2 & 3 & 4 & 5 & 6 & 7 \\
+ 1 & 3 & 6 & 10 & 15 & 21 \\
+ 1 & 4 & 10 & 20 & 35 \\
+ 1 & 5 & 15 & 35 \\
+ 1 & 6 & 21 \\
+ 1 & 7 \\
+ 1
+ \end{NiceTabular}}
+\end{Verbatim}
+
+
+\begin{center}
+\pgfset
+ {
+ nicematrix/cell-node/.append style =
+ { text/rotate = 45, minimum size = 6 mm }
+ }%
+\setlength{\tabcolsep}{0pt}%
+\adjustbox{rotate = -45, set depth = 6mm + 1.414 \arrayrulewidth}
+ {\begin{NiceTabular} [ hvlines, corners=SE, baseline = line-9 ] { cccccccc }
+ \CodeBefore
+ \chessboardcolors{red!15}{blue!15}
+ \Body
+ 1 & 1 & 1 & 1 & 1 & 1 & 1 & 1 \\
+ 1 & 2 & 3 & 4 & 5 & 6 & 7 \\
+ 1 & 3 & 6 & 10 & 15 & 21 \\
+ 1 & 4 & 10 & 20 & 35 \\
+ 1 & 5 & 15 & 35 \\
+ 1 & 6 & 21 \\
+ 1 & 7 \\
+ 1
+ \end{NiceTabular}}
+\end{center}
+
+
\section*{Autre documentation}
diff --git a/macros/latex/contrib/nicematrix/nicematrix.dtx b/macros/latex/contrib/nicematrix/nicematrix.dtx
index 6ef8d2a7f7..3620cc0f4b 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.dtx
+++ b/macros/latex/contrib/nicematrix/nicematrix.dtx
@@ -3,7 +3,7 @@
% This file should be compiled with $xelatex$.
%
% Copyright (C) 2018-2023 by F. Pantigny
-% -----------------------------------
+% ------------------------------------------
%
% This file may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -17,8 +17,8 @@
%
% \fi
% \iffalse
-\def\myfileversion{6.16}
-\def\myfiledate{2023/03/06}
+\def\myfileversion{6.17}
+\def\myfiledate{2023/03/31}
%
%
%<*batchfile>
@@ -61,6 +61,7 @@ version 2005/12/01 or later.
\usepackage{caption}
\usepackage{varwidth}
\usepackage{tcolorbox}
+\usepackage{adjustbox}
\usepackage[auto-lang=false]{lipsum}
\NewDocumentEnvironment {scope} {} {} {}
@@ -556,9 +557,8 @@ version 2005/12/01 or later.
% block;\footnote{However, the rules are not drawn in the sub-blocks of the
% block, as always with \pkg{nicematrix}: the rules are not drawn in the blocks
% (cf. section~\ref{rules} p.~\pageref{rules}).}
-% \item the key \Definition{line-width} is the width of the rules (this key
-% is meaningful only when one of the keys |draw|, |hvlines|, |vlines| and
-% |hlines| is used);
+% \item the key \Definition{line-width} is the width of the rules (is relevant
+% only when one of the keys |draw|, |hvlines|, |vlines| and |hlines| is used);
% \item the key \Definition{rounded-corners} requires rounded corners (for the
% frame drawn by |draw| and the shape drawn by |fill|) with a radius equal to
% the value of that key (the default value is 4~pt\footnote{This value is the
@@ -582,7 +582,7 @@ version 2005/12/01 or later.
% the form |tikz={|\textsl{list}|}| where \textsl{list} is a list of couples
% \textsl{key=value} of Tikz specifying the graphical characteristics of the
% lines that will be drawn (for an example, see p.~\pageref{dashed}).
-% \item \colorbox{yellow!50}{\textbf{Nouveau 6.15}}\par\nobreak
+% \item \colorbox{yellow!50}{\textbf{New 6.15}}\par\nobreak
% By default, the rules are not drawn in the blocks (see the section about the
% rules: section~\ref{rules} p.~\pageref{rules}). However, if the key
% \Definition{transparent} is used, the rules are drawn. For an example, see
@@ -590,7 +590,7 @@ version 2005/12/01 or later.
% \end{itemize}
%
% There is also keys for the horizontal and vertical positions of the content of
-% the block: cf.~\ref{horizontal-block} p.~\pageref{horizontal-block}).
+% the block: cf.~\ref{horizontal-block} p.~\pageref{horizontal-block}.
%
% \interitem
% {\bfseries One must remark that, by default, the commands |\Blocks| don't create space}.
@@ -599,11 +599,11 @@ version 2005/12/01 or later.
%
% \medskip
% In the following example, we have had to enlarge by hand the columns 2 and 3
-% (with the construction |wc{...}| of \pkg{array}).
+% (with the construction |w{c}{...}| of \pkg{array}).
%
% \bigskip
% \begin{BVerbatim}
-% \begin{NiceTabular}{cwc{2cm}wc{3cm}c}
+% \begin{NiceTabular}{cw{c}{2cm}w{c}{3cm}c}
% rose & tulip & daisy & dahlia \\
% violet
% & ~emphase#\Block[draw=red,fill=[RGB]{204,204,255},rounded-corners]{2-2}@
@@ -616,7 +616,7 @@ version 2005/12/01 or later.
%
% \medskip
% \begin{center}
-% \begin{NiceTabular}{cwc{2cm}wc{3cm}c}
+% \begin{NiceTabular}{cw{c}{2cm}w{c}{3cm}c}
% rose & tulip & daisy & dahlia \\
% violet & \Block[draw=red,fill=[RGB]{204,204,255},rounded-corners]{2-2}
% {\LARGE Some beautiful flowers} & & marigold \\
@@ -633,9 +633,9 @@ version 2005/12/01 or later.
% \item The natural width of the contents of these blocks is taken into account
% for the width of the current column.
%
-% In the columns with a fixed width (columns |w{...}{...}|, |p{...}|, |b{...}|,
-% |m{...}| and |X|), the content of the block is formatted as a paragraph of
-% that width.
+% In the columns with a fixed width (columns |w{...}{...}|, |W{...}{...}|,
+% |p{...}|, |b{...}|, |m{...}|, |V| and |X|), the content of the block is
+% formatted as a paragraph of that width.
%
% \item The specification of the horizontal position provided by the type of
% column (|c|, |r| or |l|) is taken into account for the blocks (but the
@@ -764,7 +764,7 @@ version 2005/12/01 or later.
% \end{bNiceArray}$
%
%
-%
+% \medskip
% By default, the horizontal position of the content of a block is computed
% by using the positions of the \emph{contents} of the columns implied in that
% block. That's why, in the following example, the header ``First group'' is
@@ -852,7 +852,7 @@ version 2005/12/01 or later.
%
% \colorbox{yellow!50}{\textbf{New 6.14}}
%
-% For the vertical position, the commands |\Blocks| accepts the keys
+% For the vertical position, the command |\Blocks| accepts the keys
% |v-center|\footnote{That key could not have been named |c| since the key |c|
% is used for the horizontal alignement.},
% |t|, |b|, |T| and |B|.
@@ -1389,7 +1389,7 @@ version 2005/12/01 or later.
% will be created by \pkg{nicematrix} and that will be available for the final
% user in order to draw horizontal rules (similarly to |\hline|);
%
-% \item the key |cccommand| is the name (without the backslash) of a command
+% \item the key |ccommand| is the name (without the backslash) of a command
% that will be created by \pkg{nicematrix} and that will be available for the
% final user to order to draw partial horizontal rules (similarly to |\cline|,
% hence the name |ccommand|): the argument of that command is a list of
@@ -2180,7 +2180,7 @@ version 2005/12/01 or later.
% color of the text.\footnote{The key |color| uses the command
% |\color| but inserts also an instruction |\leavevmode| before. This
% instruction prevents a extra vertical space in the cells which belong to
-% columns of type |p|, |b|, |m| and |X| (which start in
+% columns of type |p|, |b|, |m|, |X| and |V| (which start in
% vertical mode).}
% \item The key |bold| enforces
% bold characters for the cells of the row, both in math and text mode.
@@ -2220,13 +2220,13 @@ version 2005/12/01 or later.
%
% \medskip
% \begin{BVerbatim}[baseline=c,boxwidth=9cm]
-% \begin{NiceTabular}{~emphase#Wc{2cm}@cc}[hvlines]
+% \begin{NiceTabular}{~emphase#W{c}{2cm}@cc}[hvlines]
% Paris & New York & Madrid \\
% Berlin & London & Roma \\
% Rio & Tokyo & Oslo
% \end{NiceTabular}
% \end{BVerbatim}
-% \begin{NiceTabular}{Wc{2cm}cc}[hvlines]
+% \begin{NiceTabular}{W{c}{2cm}cc}[hvlines]
% Paris & New York & Madrid \\
% Berlin & London & Roma \\
% Rio & Tokyo & Oslo
@@ -2342,6 +2342,60 @@ version 2005/12/01 or later.
% \end{array}$
% \end{NiceMatrixBlock}
%
+% \subsection{The columns X}
+%
+% \label{X-columns}
+%
+% The environment |{NiceTabular}| provides |X| columns similar to those provided
+% by the environment |{tabularx}| of the eponymous package.
+%
+% The required width of the tabular may be specified with the key |width| (in
+% |{NiceTabular}| or in |\NiceMatrixOptions|). The initial value of this
+% parameter is |\linewidth| (and not |\textwidth|).
+%
+% For sake of similarity with the environment |{tabularx}|, \pkg{nicematrix}
+% also provides an environment |{NiceTabularX}| with a syntax similar to the
+% syntax of |{tabularx}|, that is to say with a first mandatory argument
+% which is the width of the tabular.\footnote{If \pkg{tabularx} is loaded, one
+% must use |{NiceTabularX}| (and not |{NiceTabular}|) in order to use the
+% columns |X| (this point comes from a conflict in the definitions of the
+% specifier |X|).}
+%
+% As with the packages \pkg{tabu}\footnote{The extension \pkg{tabu} is now
+% considered as deprecated.} and \pkg{tabularray}, the specifier |X| takes
+% in an optional argument (between square brackets) which is a list of keys.
+% \begin{itemize}
+% \item It's possible to give a weight for the column by providing a positive
+% integer directly as argument of the specifier |X|. For example, a column
+% |X[2]| will have a width double of the width of a column~|X| (which has a
+% weight equal to $1$).\footnote{The negative values of the weight, as provided
+% by \pkg{tabu} (which is now obsolete), are \emph{not} supported by \pkg{nicematrix}.
+% If such a value is used, an error will be raised.}
+% \item It's possible to specify an horizontal alignment with one of the
+% letters |l|, |c| and |r| (which insert respectively |\raggedright|,
+% |\centering| and |\raggedleft| followed by |\arraybackslash|).
+% \item It's possible to specify a vertical alignment with one of the keys
+% |t| (alias |p|), |m| and |b| (which construct respectively columns of type
+% |p|, |m| and |b|). The default value is |t|.
+% \end{itemize}
+%
+% \begin{Verbatim}
+% \begin{NiceTabular}~emphase#[width=9cm]{X[2,l]X[l]}@[hvlines]
+% a rather long text which fits on several lines
+% & a rather long text which fits on several lines \\
+% a shorter text & a shorter text
+% \end{NiceTabular}
+% \end{Verbatim}
+%
+% \begin{center}
+% \begin{NiceTabular}[width=9cm]{X[2,l]X[l]}[hvlines]
+% a rather long text which fits on several lines
+% & a rather long text which fits on several lines \\
+% a shorter text & a shorter text
+% \end{NiceTabular}
+% \end{center}
+%
+%
% \subsection{The columns V of varwidth}
%
% \label{varwidth}
@@ -2423,66 +2477,18 @@ version 2005/12/01 or later.
% interests of this type of columns is that, for a cell of a column of type~|V|,
% the PGF/Tikz node created by \pkg{nicematrix} for the content of that cell has
% a width adjusted to the content of the cell : cf. p.~\pageref{node-V}.
-
+%
+%
+% \bigskip
+% The columns |V| of \pkg{nicematrix} supports the keys |t|, |p|, |m|, |b|, |l|,
+% |c| and |r| also supported by the columns |X|: see their description in the
+% section~\ref{X-columns}, p.~\pageref{X-columns}.
+%
% \bigskip
% One should remark that the extension \pkg{varwidth} (at least in its version
% 0.92) has some problems: for instance, with LuaLaTeX, it does not work when
% the content begins with |\color|.
%
-%
-% \subsection{The columns X}
-%
-% \label{X-columns}
-%
-% The environment |{NiceTabular}| provides |X| columns similar to those provided
-% by the environment |{tabularx}| of the eponymous package.
-%
-% The required width of the tabular may be specified with the key |width| (in
-% |{NiceTabular}| or in |\NiceMatrixOptions|). The initial value of this
-% parameter is |\linewidth| (and not |\textwidth|).
-%
-% For sake of similarity with the environment |{tabularx}|, \pkg{nicematrix}
-% also provides an environment |{NiceTabularX}| with a syntax similar to the
-% syntax of |{tabularx}|, that is to say with a first mandatory argument
-% which is the width of the tabular.\footnote{If \pkg{tabularx} is loaded, one
-% must use |{NiceTabularX}| (and not |{NiceTabular}|) in order to use the
-% columns |X| (this point comes from a conflict in the definitions of the
-% specifier |X|).}
-%
-% As with the packages \pkg{tabu}\footnote{The extension \pkg{tabu} is now
-% considered as deprecated.} and \pkg{tabularray}, the specifier |X| takes
-% in an optional argument (between square brackets) which is a list of keys.
-% \begin{itemize}
-% \item It's possible to give a weight for the column by providing a positive
-% integer directly as argument of the specifier |X|. For example, a column
-% |X[2]| will have a width double of the width of a column~|X| (which has a
-% weight equal to $1$).\footnote{The negative values of the weight, as provided
-% by \pkg{tabu} (which is now obsolete), are \emph{not} supported by \pkg{nicematrix}.
-% If such a value is used, an error will be raised.}
-% \item It's possible to specify an horizontal alignment with one of the
-% letters |l|, |c| and |r| (which insert respectively |\raggedright|,
-% |\centering| and |\raggedleft| followed by |\arraybackslash|).
-% \item It's possible to specify a vertical alignment with one of the keys
-% |t| (alias |p|), |m| and |b| (which construct respectively columns of type
-% |p|, |m| and |b|). The default value is |t|.
-% \end{itemize}
-%
-% \begin{Verbatim}
-% \begin{NiceTabular}~emphase#[width=9cm]{X[2,l]X[l]}@[hvlines]
-% a rather long text which fits on several lines
-% & a rather long text which fits on several lines \\
-% a shorter text & a shorter text
-% \end{NiceTabular}
-% \end{Verbatim}
-%
-% \begin{center}
-% \begin{NiceTabular}[width=9cm]{X[2,l]X[l]}[hvlines]
-% a rather long text which fits on several lines
-% & a rather long text which fits on several lines \\
-% a shorter text & a shorter text
-% \end{NiceTabular}
-% \end{center}
-%
% \bigskip
% \section{The exterior rows and columns}
%
@@ -3313,7 +3319,7 @@ version 2005/12/01 or later.
%
%
% \subsection{The command \textbackslash SubMatrix in the \textbackslash
-% CodeAfter (and also the \textbackslash CodeBefore)}
+% CodeAfter (and the \textbackslash CodeBefore)}
%
% \label{sub-matrix}
%
@@ -3419,26 +3425,27 @@ version 2005/12/01 or later.
% \bigskip
% The options of the command |\SubMatrix| are as follows:
% \begin{itemize}
-% \item |left-xshift| and |right-xshift| shift horizontally the delimiters (there
-% exists also the key |xshift| which fixes both parameters);
-% \item |extra-height| adds a quantity to the total height of the delimiters
-% (height |\ht| + depth |\dp|);
-% \item |delimiters/color| fixes the color of the delimiters (also
+% \item \Definition{left-xshift} and \Definition{right-xshift} shift
+% horizontally the delimiters (there exists also the key \Definition{xshift}
+% which fixes both parameters);
+% \item \Definition{extra-height} adds a quantity to the total height of the
+% delimiters (height |\ht| + depth |\dp|);
+% \item \Definition{delimiters/color} fixes the color of the delimiters (also
% available in |\NiceMatrixOptions|, in the environments with delimiters and as
% option of the keyword |\CodeAfter|);
-% \item |slim| is a boolean key: when that key is in force, the horizontal
+% \item \Definition{slim} is a boolean key: when that key is in force, the horizontal
% position of the delimiters is computed by using only the contents of the cells
% of the submatrix whereas, in the general case, the position is computed by
% taking into account the cells of the whole columns implied in the submatrix
% (see example below). ;
-% \item |vlines| contents a list of numbers of vertical rules that will be drawn in
-% the sub-matrix (if this key is used without value, all the vertical rules of
-% the sub-matrix are drawn);
-% \item |hlines| is similar to |vlines| but for the horizontal rules;
-% \item |hvlines|, which must be used without value, draws all the vertical and
-% horizontal rules;
-% \item |code| insert code, especially TikZ code, after the construcion of the
-% submatrix. That key is detailed below.
+% \item \Definition{vlines} contents a list of numbers of vertical rules that
+% will be drawn in the sub-matrix (if this key is used without value, all the
+% vertical rules of the sub-matrix are drawn);
+% \item \Definition{hlines} is similar to |vlines| but for the horizontal rules;
+% \item \Definition{hvlines}, which must be used without value, draws all the
+% vertical and horizontal rules;
+% \item \Definition{code} insert code, especially TikZ code, after the
+% construcion of the submatrix. That key is detailed below.
% \end{itemize}
% One should remark that the keys add their rules after the construction of
% the main matrix: no space is added between the rows and the columns of the
@@ -3561,7 +3568,8 @@ version 2005/12/01 or later.
% submatrix. It's meant to be used to insert TikZ instructions because, in the
% TikZ instructions inserted by that code, the nodes of the form |i-j| and
% \verb+i-|j+ are interpreted with |i| and |j| as numbers of row and columns
-% \emph{relative to the submatrix}.
+% \emph{relative to the submatrix}.\footnote{Be careful: the syntax
+% \verb+j|-i+ is not allowed.}
%
% \medskip
% \begin{scope}
@@ -4433,7 +4441,11 @@ version 2005/12/01 or later.
%
% \subsection{The nodes corresponding to the contents of the cells}
%
-% The package \pkg{nicematrix} creates a PGF/Tikz node for each (non-empty) cell
+% The package \pkg{nicematrix} creates a PGF/Tikz node\footnote{We recall that Tikz
+% is a layer over PGF. The extension \pkg{nicematrix} loads PGF but does not
+% load Tikz. We speak of PGF/Tikz nodes to emphase the fact that the PGF nodes
+% created by \pkg{nicematrix} may be used with PGF but also with Tikz. The final
+% user will probably prefer to use Tikz rather than PGF.} for each (non-empty) cell
% of the considered array. These nodes are used to draw the dotted lines between
% the cells of the matrix (inter alia).
%
@@ -4518,36 +4530,65 @@ version 2005/12/01 or later.
% \tikz \draw (2-2) circle (2mm) ;
% \end{pNiceMatrix}$
%
+% \medskip
+% The nodes of the last column (excepted the potential «last column» specified
+% by |last-col|\footnote{For the exterior columns, cf. part~\ref{exterior},
+% p.~\pageref{exterior}.}) may also be indicated by $i$-|last|. Similarly, the
+% nodes of the last row may be indicated by |last|-$j$.
%
% \bigskip
-% In the following example, we have underlined all the nodes of the matrix (we
-% explain below the technic used : cf. p. \pageref{highlight}).
+% In the following example, we have underlined all the nodes of the matrix.
%
-%
-% \[\begin{pNiceMatrix}
-% \CodeBefore [create-cell-nodes]
-% \begin{tikzpicture}%
-% [every node/.style = { inner sep = 0 pt , fill = red!15 }]
-% \node [fit = (1-1)] {} ;
-% \node [fit = (1-3)] {} ;
-% \node [fit = (2-2)] {} ;
-% \node [fit = (3-1)] {} ;
-% \node [fit = (3-3)] {} ;
-% \node [fit = (1-2)] {} ;
-% \node [fit = (2-1)] {} ;
-% \node [fit = (2-3)] {} ;
-% \node [fit = (3-2)] {} ;
-% \end{tikzpicture}
-% \Body
+% \[
+% \NiceMatrixOptions
+% {
+% pgf-node-code =
+% {
+% \pgfsetfillcolor{red!15}%
+% \pgfusepathqfill
+% }
+% }
+% \begin{pNiceMatrix}
% a & a + b & a + b + c \\
% a & a & a + b \\
-% a & a & a
+% a & a & a
% \end{pNiceMatrix}\]
%
%
-% The nodes of the last column (excepted the potential «last column» specified
-% by |last-col|) may also be indicated by $i$-|last|. Similarly, the nodes of
-% the last row may be indicated by |last|-$j$.
+% \bigskip
+% \colorbox{yellow!50}{\textbf{New 6.17}}\enskip Since those nodes are PGF
+% nodes, one won't be surprised to learn that they are drawn by using a specific
+% PGF style. That style is called |nicematrix/cell-node| and its definition in
+% the source file |nicematrix.sty| is as follows:
+%
+% \begin{Verbatim}
+% \pgfset
+% {
+% ~emphase#nicematrix / cell-node@ /.style =
+% {
+% inner sep = 0 pt ,
+% minimum width = 0 pt
+% }
+% }
+% \end{Verbatim}
+%
+% The final user may modify that style by changing the values of the keys |text/rotate|,
+% |inner xsep|, |inner ysep|, |inner sep|, |outer xsep|, |outer ysep|, |outer sep|,
+% |minimum width|, |minimum height| and |minimum size|.
+%
+% \medskip
+% For an example of utilisation, see part~\ref{triangular}, p.~\pageref{triangular}.
+%
+%
+% \subsubsection{The key pgf-node-code}
+%
+% \colorbox{yellow!50}{\textbf{New 6.17}}\enskip \textbf{For the experienced
+% users}, \pkg{nicematrix} provides the key |pgf-node-code| which corresponds to
+% some PGF node that will be executed at the creation, by PGF, of the nodes
+% corresponding to the cells of the array. More pricisely, the value given to
+% the key |pgf-node-code| will be passed in the fifth argument of the command
+% |\pgfnode|. That value should contain at least an instruction such as
+% |\pgfusepath|, |\pgfusepathqstroke|, |\pgfusepathqfill|, etc.
%
% \subsubsection{The columns V of varwidth}
%
@@ -5086,7 +5127,8 @@ version 2005/12/01 or later.
%
% \section{Technical remarks}
%
-% First remark: the package \pkg{underscore} must be loaded before \pkg{nicematrix}.
+% First remark: the package \pkg{underscore} must be loaded before
+% \pkg{nicematrix}. If it is loaded after, an error will be raised.
%
% \subsection{Diagonal lines}
%
@@ -5215,7 +5257,7 @@ version 2005/12/01 or later.
% before and after each column. In particular, there is a space equal to
% |\arraycolsep| before and after the array. This feature of the environment
% |{array}| was probably not a good idea\footnote{In the documentation of
-% |{amsmath}|, we can read: {\itshape The extra space of |\arraycolsep| that
+% \pkg{amsmath}, we can read: {\itshape The extra space of |\arraycolsep| that
% \pkg{array} adds on each side is a waste so we remove it [in |{matrix}|]
% (perhaps we should instead remove it from array in general, but that's a
% harder task).}}. The environment |{matrix}| of
@@ -6219,7 +6261,9 @@ version 2005/12/01 or later.
% a & a & a & L_3
% \end{pNiceArray}\]
%
-%
+%
+
+%
% \subsection{Utilisation of \textbackslash SubMatrix in the \textbackslash CodeBefore}
%
% \label{submatrix-in-codebefore}
@@ -6299,6 +6343,69 @@ version 2005/12/01 or later.
% \end{NiceArray}\]
% \end{Verbatim}
%
+%
+%
+% \subsection{A triangular tabular}
+%
+% \label{triangular}
+%
+% In the following example, we use the style PGF/TikZ |nicematrix/cell-node|
+% to rotate the contents of the cells (and, then, we compensate that rotation by
+% a rotation of the whole tabular with the command |\adjustbox| of the eponymous
+% package, which must be loaded previously).
+%
+%
+% \medskip
+% \begin{Verbatim}
+% \pgfset
+% {
+% ~emphase#nicematrix/cell-node@/.append style =
+% { text/rotate = 45, minimum size = 6 mm }
+% }
+%
+% \setlength{\tabcolsep}{0pt}
+%
+% ~emphase#\adjustbox@{rotate = -45, set depth = 6mm + 1.414 \arrayrulewidth}
+% {\begin{NiceTabular} [ hvlines, corners=SE, baseline = line-9 ] { cccccccc }
+% \CodeBefore
+% \chessboardcolors{red!15}{blue!15}
+% \Body
+% 1 & 1 & 1 & 1 & 1 & 1 & 1 & 1 \\
+% 1 & 2 & 3 & 4 & 5 & 6 & 7 \\
+% 1 & 3 & 6 & 10 & 15 & 21 \\
+% 1 & 4 & 10 & 20 & 35 \\
+% 1 & 5 & 15 & 35 \\
+% 1 & 6 & 21 \\
+% 1 & 7 \\
+% 1
+% \end{NiceTabular}}
+% \end{Verbatim}
+%
+%
+% \begin{center}
+% \pgfset
+% {
+% nicematrix/cell-node/.append style =
+% { text/rotate = 45, minimum size = 6 mm }
+% }%
+% \setlength{\tabcolsep}{0pt}%
+% \adjustbox{rotate = -45, set depth = 6mm + 1.414 \arrayrulewidth}
+% {\begin{NiceTabular} [ hvlines, corners=SE, baseline = line-9 ] { cccccccc }
+% \CodeBefore
+% \chessboardcolors{red!15}{blue!15}
+% \Body
+% 1 & 1 & 1 & 1 & 1 & 1 & 1 & 1 \\
+% 1 & 2 & 3 & 4 & 5 & 6 & 7 \\
+% 1 & 3 & 6 & 10 & 15 & 21 \\
+% 1 & 4 & 10 & 20 & 35 \\
+% 1 & 5 & 15 & 35 \\
+% 1 & 6 & 21 \\
+% 1 & 7 \\
+% 1
+% \end{NiceTabular}}
+% \end{center}
+%
+%
%
% \section{Implementation}
%
@@ -6578,7 +6685,7 @@ version 2005/12/01 or later.
%
% We test whether the current class is \cls{revtex4-1} (deprecated) or
% \cls{revtex4-2} because these classes redefines |\array| (of \pkg{array}) in a
-% way incompatible with our programmation. At the date January 2022, the current
+% way incompatible with our programmation. At the date March 2023, the current
% version \cls{revtex4-2} is 4.2e (compatible with \pkg{booktabs}).
%
% \begin{macrocode}
@@ -7251,6 +7358,13 @@ version 2005/12/01 or later.
% \begin{macrocode}
\tl_new:N \l_@@_code_tl
% \end{macrocode}
+%
+% \bigskip
+% For the key |pgf-node-code|. That code will be used when the nodes of the
+% cells (that is to say the nodes of the form |i-j|) will be created.
+% \begin{macrocode}
+\tl_new:N \l_@@_pgf_node_code_tl
+% \end{macrocode}
%
% \bigskip
% The following token list has a function similar to
@@ -7313,10 +7427,6 @@ version 2005/12/01 or later.
\dim_new:N \l_@@_X_columns_dim
% \end{macrocode}
%
-% \medskip
-% \begin{macrocode}
-\bool_new:N \l_@@_X_V_bool
-% \end{macrocode}
%
% \bigskip
% This boolean will be used only to detect in an expandable way whether we are
@@ -7508,7 +7618,7 @@ version 2005/12/01 or later.
% The following sequence will be used when the command |\SubMatrix| is used in
% the |\CodeBefore| (and not in the |\CodeAfter|). It will contain the position of
% all the sub-matrices specified in the |\CodeBefore|. Each sub-matrix is
-% represented by an ``object'' of the forme |{|$i$|}{|$j$|}{|$k$|}{|$l$|}|
+% represented by an ``object'' of the form |{|$i$|}{|$j$|}{|$k$|}{|$l$|}|
% where $i$ and $j$ are the number of row and column of the upper-left cell and
% $k$ and $l$ the number of row and column of the lower-right cell.
% \begin{macrocode}
@@ -8064,7 +8174,7 @@ version 2005/12/01 or later.
\begin { pgfscope }
\pgfset
{
- outer~sep = \c_zero_dim ,
+ % outer~sep = \c_zero_dim ,
inner~sep = \c_zero_dim ,
minimum~size = \c_zero_dim
}
@@ -8096,7 +8206,7 @@ version 2005/12/01 or later.
\begin { pgfscope }
\pgfset
{
- outer~sep = \c_zero_dim ,
+ % outer~sep = \c_zero_dim ,
inner~sep = \c_zero_dim ,
minimum~size = \c_zero_dim
}
@@ -8545,7 +8655,9 @@ version 2005/12/01 or later.
{ extra-left-margin = #1 , extra-right-margin = #1 } ,
extra-margin .value_required:n = true ,
respect-arraystretch .bool_set:N = \l_@@_respect_arraystretch_bool ,
- respect-arraystretch .default:n = true
+ respect-arraystretch .default:n = true ,
+ pgf-node-code .tl_set:N = \l_@@_pgf_node_code_tl ,
+ pgf-node-code .value_required:n = true
}
% \end{macrocode}
%
@@ -9078,6 +9190,13 @@ version 2005/12/01 or later.
{
\@@_math_toggle_token:
\hbox_set_end:
+ \@@_cell_end_i:
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_cell_end_i:
+ {
% \end{macrocode}
% The token list |\g_@@_cell_after_hook_tl| is (potentially) set during the
% composition of the box |\l_@@_cell_box| and is used now \emph{after} the
@@ -9136,13 +9255,13 @@ version 2005/12/01 or later.
% \end{itemize}
% \begin{macrocode}
\bool_if:NTF \g_@@_empty_cell_bool
- { \box_use_drop:N \l_@@_cell_box }
+ { \box_use_drop:N \l_@@_cell_box }
{
\bool_lazy_or:nnTF
\g_@@_not_empty_cell_bool
{ \dim_compare_p:nNn { \box_wd:N \l_@@_cell_box } > \c_zero_dim }
\@@_node_for_cell:
- { \box_use_drop:N \l_@@_cell_box }
+ { \box_use_drop:N \l_@@_cell_box }
}
\int_gset:Nn \g_@@_col_total_int { \int_max:nn \g_@@_col_total_int \c@jCol }
\bool_gset_false:N \g_@@_empty_cell_bool
@@ -9150,20 +9269,46 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
-% \medskip
+% \bigskip
+% The following variant of |\@@_cell_end:| is only for the columns of type
+% |w{s}{...}| or |W{s}{...}| (which use the horizontal alignement key |s| of
+% |\makebox|).
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_cell_end_for_w_s:
+ {
+ \@@_math_toggle_token:
+ \hbox_set_end:
+ \bool_if:NF \g_@@_rotate_bool
+ {
+ \hbox_set:Nn \l_@@_cell_box
+ {
+ \makebox [ \l_@@_col_width_dim ] [ s ]
+ { \hbox_unpack_drop:N \l_@@_cell_box }
+ }
+ }
+ \@@_cell_end_i:
+ }
+% \end{macrocode}
+%
+%
+% \bigskip
% The following command creates the \textsc{pgf} name of the node with, of
% course, |\l_@@_cell_box| as the content.
% \begin{macrocode}
+\pgfset
+ {
+ nicematrix / cell-node /.style =
+ {
+ inner~sep = \c_zero_dim ,
+ minimum~width = \c_zero_dim
+ }
+ }
\cs_new_protected:Npn \@@_node_for_cell:
{
\pgfpicture
\pgfsetbaseline \c_zero_dim
\pgfrememberpicturepositiononpagetrue
- \pgfset
- {
- inner~sep = \c_zero_dim ,
- minimum~width = \c_zero_dim
- }
+ \pgfset { nicematrix / cell-node }
\pgfnode
{ rectangle }
{ base }
@@ -9176,7 +9321,7 @@ version 2005/12/01 or later.
\box_use_drop:N \l_@@_cell_box
}
{ \@@_env: - \int_use:N \c@iRow - \int_use:N \c@jCol }
- { }
+ { \l_@@_pgf_node_code_tl }
\str_if_empty:NF \l_@@_name_str
{
\pgfnodealias
@@ -11302,9 +11447,62 @@ version 2005/12/01 or later.
%
% \medskip
% For |w| and |W|
+%
+% |#1| is a special argument: empty for |w| and equal to |\@@_special_W:| for |W|;
+%
+% |#2| is the type of column (|w| or |W|);
+%
+% |#3| is the type of horizontal alignment (|c|, |l|, |r| or |s|);
+%
+% |#4| is the width of the column.
+%
% \begin{macrocode}
\cs_new_protected:Npn \@@_patch_preamble_vi:nnnn #1 #2 #3 #4
{
+ \str_if_eq:nnTF { #3 } { s }
+ { \@@_patch_preamble_vi_i:nnnn { #1 } { #4 } }
+ { \@@_patch_preamble_vi_ii:nnnn { #1 } { #2 } { #3 } { #4 } }
+ }
+% \end{macrocode}
+%
+% \bigskip
+% First, the case of an horizontal alignment equal to |s| (for \emph{stretch}).
+%
+% |#1| is a special argument: empty for |w| and equal to |\@@_special_W:| for
+% |W|;
+%
+% |#2| is the width of the column.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_patch_preamble_vi_i:nnnn #1 #2
+ {
+ \tl_gput_right:NV \g_@@_preamble_tl \g_@@_pre_cell_tl
+ \tl_gclear:N \g_@@_pre_cell_tl
+ \tl_gput_right:Nn \g_@@_preamble_tl
+ {
+ > {
+ \dim_set:Nn \l_@@_col_width_dim { #2 }
+ \@@_cell_begin:w
+ \str_set:Nn \l_@@_hpos_cell_str { c }
+ }
+ c
+ < {
+ \@@_cell_end_for_w_s:
+ #1
+ \@@_adjust_size_box:
+ \box_use_drop:N \l_@@_cell_box
+ }
+ }
+ \int_gincr:N \c@jCol
+ \@@_patch_preamble_xi:n
+ }
+% \end{macrocode}
+%
+% \bigskip
+% Then, the most important version, for the horizontal alignments types of |c|,
+% |l| and |r| (and not |s|).
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_patch_preamble_vi_ii:nnnn #1 #2 #3 #4
+ {
\tl_gput_right:NV \g_@@_preamble_tl \g_@@_pre_cell_tl
\tl_gclear:N \g_@@_pre_cell_tl
\tl_gput_right:Nn \g_@@_preamble_tl
@@ -11324,10 +11522,11 @@ version 2005/12/01 or later.
< {
\@@_cell_end:
\hbox_set_end:
- \bool_if:NT \g_@@_rotate_bool \@@_rotate_cell_box:
+ % The following line is probably pointless
+ % \bool_if:NT \g_@@_rotate_bool \@@_rotate_cell_box:
#1
\@@_adjust_size_box:
- \makebox [ #4 ] [ #3 ] { \box_use_drop:N \l_@@_cell_box }
+ \makebox [ #4 ] [ #3 ] { \box_use_drop:N \l_@@_cell_box }
}
}
% \end{macrocode}
@@ -11342,10 +11541,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_special_W:
{
- \dim_compare:nNnT
- { \box_wd:N \l_@@_cell_box }
- >
- \l_@@_col_width_dim
+ \dim_compare:nNnT { \box_wd:N \l_@@_cell_box } > \l_@@_col_width_dim
{ \@@_warning:n { W~warning } }
}
% \end{macrocode}
@@ -11537,10 +11733,7 @@ version 2005/12/01 or later.
% of keys will be used to retrieve that value (in the counter |\l_@@_weight_int|).
% \begin{macrocode}
\keys_define:nn { WithArrows / X-column }
- {
- v .bool_set:N = \l_@@_X_V_bool ,
- unknown .code:n = \int_set:Nn \l_@@_weight_int { \l_keys_key_str }
- }
+ { unknown .code:n = \int_set:Nn \l_@@_weight_int { \l_keys_key_str } }
% \end{macrocode}
%
%
@@ -11574,7 +11767,6 @@ version 2005/12/01 or later.
\tl_set:Nn \l_tmpa_tl { #1 }
\tl_replace_all:Nnn \l_tmpa_tl { \@@_S: } { S }
\@@_keys_p_column:V \l_tmpa_tl
- \bool_set_false:N \l_@@_X_V_bool
\keys_set:nV { WithArrows / X-column } \l_tmpa_tl
\int_compare:nNnT \l_@@_weight_int < 0
{
@@ -11593,11 +11785,7 @@ version 2005/12/01 or later.
\exp_args:Nnx
\@@_patch_preamble_iv_iv:nn
{ \l_@@_weight_int \l_@@_X_columns_dim }
- {
- \bool_if:NTF \l_@@_X_V_bool
- { varwidth }
- { minipage }
- }
+ { minipage }
}
{
\tl_gput_right:Nn \g_@@_preamble_tl
@@ -11931,7 +12119,7 @@ version 2005/12/01 or later.
\bool_if:NT \g_@@_rotate_bool \@@_rotate_cell_box:
#1
\@@_adjust_size_box:
- \makebox [ #4 ] [ #3 ] { \box_use_drop:N \l_@@_cell_box }
+ \makebox [ #4 ] [ #3 ] { \box_use_drop:N \l_@@_cell_box }
}
}
% \end{macrocode}
@@ -12887,7 +13075,7 @@ version 2005/12/01 or later.
{
\dim_compare:nNnTF { \box_wd:N \l_@@_cell_box } > \c_zero_dim
\@@_node_for_cell:
- { \box_use_drop:N \l_@@_cell_box }
+ { \box_use_drop:N \l_@@_cell_box }
\skip_horizontal:N \l_@@_left_delim_dim
\skip_horizontal:N \l_@@_left_margin_dim
\skip_horizontal:N \l_@@_extra_left_margin_dim
@@ -21688,6 +21876,7 @@ version 2005/12/01 or later.
matrix/columns-type,~
notes~(several~subkeys),~
nullify-dots,~
+ pgf-node-code,~
renew-dots,~
renew-matrix,~
respect-arraystretch,~
@@ -21743,13 +21932,13 @@ version 2005/12/01 or later.
light-syntax,~
name,~
nullify-dots,~
+ pgf-node-code,~
renew-dots,~
respect-arraystretch,~
right-margin,~
rules~(with~the~subkeys~'color'~and~'width'),~
small,~
t,~
- tabularnote,~
vlines,~
xdots/color,~
xdots/shorten-start,~
@@ -21806,6 +21995,7 @@ version 2005/12/01 or later.
light-syntax,~
name,~
nullify-dots,~
+ pgf-node-code,~
r,~
renew-dots,~
respect-arraystretch,~
@@ -21867,6 +22057,7 @@ version 2005/12/01 or later.
name,~
notes~(several~subkeys),~
nullify-dots,~
+ pgf-node-code,~
renew-dots,~
respect-arraystretch,~
right-margin,~
@@ -21928,7 +22119,7 @@ version 2005/12/01 or later.
% \subsection*{Changes between version 6.15 and 6.16}
%
% It's now possible to put any LaTeX extensible delimiter (|\lgroup|, |\langle|,
-% etc.) in the preamble of an environment with pramble (such as |{NiceArray}|)
+% etc.) in the preamble of an environment with preamble (such as |{NiceArray}|)
% by prefixing them by |\left| and |\right|.
%
% New key |code| for the command |\SubMatrix| in the |\CodeAfter|.
diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf
index f9c9e28bb7..3e990cb257 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix.pdf
Binary files differ
diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
index 8758178328..962b919ad3 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 28816bea95..a1d113a5fe 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.5.4}
-\def\PLdate{11 Mars 2023}
+\def\PLversion{2.5.6}
+\def\PLdate{31 Mars 2023}
\usepackage{ProfLycee}
\useproflyclib{piton,minted,pythontex}
%\usepackage{lualatex-math}
@@ -564,10 +564,6 @@ Elles sont présentées de manière \textit{succincte}, mais elles sont présent
\end{codetex}
\begin{codetex}[listing only]
-%présentation type calcul formel, dans un environnement tikz
-\CalculFormelParametres[options]
-\CalculFormelLigne[options]{commande}{résultat}
-
%présentation de code Python
\begin{CodePythonLst}(*)[largeur]{commandes tcbox}...\end{CodePythonLst}
%:=librairie piton
@@ -582,6 +578,8 @@ Elles sont présentées de manière \textit{succincte}, mais elles sont présent
\begin{PseudoCode}(*)[largeur][options]...\end{PseudoCode}
\end{codetex}
+\pagebreak
+
\begin{codetex}[listing only]
%terminal OS
\begin{TerminalWin}[largeur]{clés}[options]...\end{TerminalWin}
@@ -1193,7 +1191,15 @@ Ces commande permet de tracer les graduations des axes, avec des \Cle{clés} ide
\item \Cle{HautGrad} qui est la position des graduations (sous la forme \Cle{lgt} ou \Cle{lgta/lgtb}) ; \hfill~défaut \Cle{4pt}
\item le booléen \Cle{AffGrad} pour afficher les valeurs (formatés avec \ctex{num} donc dépendant de \ctex{sisetup}) des graduations ; \hfill~défaut \Cle{true}
\item le booléen \Cle{AffOrigine} pour afficher la graduation de l'origine ; \hfill~défaut \Cle{true}
- \item le booléen \Cle{Annee} qui permet de ne pas formater les valeurs des graduations (type \textsf{année}). \hfill~défaut \Cle{false}
+ \item le booléen \Cle{Annee} qui permet de ne pas formater les valeurs des graduations (type \textsf{année}) ;
+
+ \hfill~défaut \Cle{false}
+ \item \cmaj{2.5.6} le booléen \Cle{Trigo} (uniquement pour l'axe $(Ox)$) pour des graduations libres en radians ;
+
+ \hfill~défaut \Cle{false}
+ \item \cmaj{2.5.6} le booléen \Cle{Dfrac} (uniquement pour l'axe $(Ox)$ en \Cle{Trigo}) pour forcer les fractions en \textit{grand}.
+
+ \hfill~défaut \Cle{false}
\end{itemize}
\end{codecles}
@@ -1201,11 +1207,9 @@ Ces commande permet de tracer les graduations des axes, avec des \Cle{clés} ide
%code tikz
\AxexTikz[Police=\small]{0,5,...,55}
\AxeyTikz[Police=\small]{0,30,...,210}
-
%code tikz
\AxexTikz[Police=\small,HautGrad=0pt/4pt]{0,5,...,55}
\AxeyTikz[AffGrad=false,HautGrad=6pt]{0,30,...,210}
-
%des axes fictifs (en gris) sont rajoutés pour la lisibilité du code de sortie
\end{codetex}
@@ -1233,6 +1237,34 @@ Ces commande permet de tracer les graduations des axes, avec des \Cle{clés} ide
\hfill~
\end{codesortie}
+\begin{codetex}[listing only]
+\begin{tikzpicture}[x=2cm,y=1cm,xmin=0,xmax={2*pi},xgrille=0.5,xgrilles=0.25,
+ ymin=-1.15,ymax=1.15,ygrille=0.5,ygrilles=0.25]
+ \GrilleTikz \AxesTikz
+ \AxexTikz[Trigo]{{pi/6},{pi/4},{pi/3},{pi/2},{2*pi/3},{3*pi/4},{5*pi/6},pi,{7*pi/6},{5*pi/4}}
+ \CourbeTikz[thick,blue,samples=250]{cos(deg(\x))}{0:2*pi}
+\end{tikzpicture}
+\end{codetex}
+
+\begin{codesortie}
+\begin{tikzpicture}
+ [x=2cm,y=1cm,xmin=0,xmax={2*pi},xgrille=0.5,xgrilles=0.25,
+ ymin=-1.15,ymax=1.15,ygrille=0.5,ygrilles=0.25]
+ \GrilleTikz \AxesTikz
+ \AxexTikz[Trigo]{{pi/6},{pi/4},{pi/3},{pi/2},{2*pi/3},{3*pi/4},{5*pi/6},pi,{7*pi/6},{5*pi/4}}
+ \CourbeTikz[thick,blue,samples=250]{cos(deg(\x))}{0:2*pi}
+\end{tikzpicture}
+\end{codesortie}
+
+\begin{codeinfo}
+La clé \Cle{Trigo} utilise, en interne, une commande qui permet de \textit{transformer} les abscisses, données en langage \TikZ, en fraction en \LaTeX.
+\end{codeinfo}
+
+\begin{codetex}
+$\AffAngleRadian{0}$ \quad $\AffAngleRadian{pi}$ \quad $\AffAngleRadian{pi/4}$ \quad
+$\AffAngleRadian{2*pi/3}$ \quad $\AffAngleRadian{-2*pi/3}$ \quad $\AffAngleRadian*{-2*pi/3}$
+\end{codetex}
+
\subsection{Commandes annexes}
\begin{codeinfo}
@@ -1267,7 +1299,7 @@ Cette commande permet de rajouter une courbe sur le graphique (sans se soucier d
\begin{itemize}
\item \Cle{optionnels} qui sont - en \TikZ{} - les paramètres du tracé ;
\item le premier \textit{obligatoire}, est - en langage \TikZ{} - l'expression de la fonction à tracer, donc avec \ctex{\textbackslash{}x} comme variable ;
- \item le second \textit{obligatoire} est le domaine du tracé , sous la forme \ctex{valxmin:valxmax}.
+ \item le second \textit{obligatoire} est le domaine du tracé, sous la forme \ctex{valxmin:valxmax}.
\end{itemize}
\end{codecles}
@@ -1297,20 +1329,15 @@ Cette commande permet de rajouter une courbe sur le graphique (sans se soucier d
\subsection{Repère non centré en O}
\begin{codeidee}
-Parfois on est amené à travailler dans des repères qui n'ont pas forcément pour origine $(0\,;\,0)$. De ce fait - pour éviter des erreurs de \ctex{dimension too large} liées à \TikZ{} - il faut \textit{décaler les axes} pour se ramener à une origine en $O$.
-
-\smallskip
-
-L'idée est donc d'utiliser les commandes précédentes, sans se soucier des éventuelles translations à effectuer !
+Parfois on est amené à travailler dans des repères qui n'ont pas forcément pour origine $(0\,;\,0)$. De ce fait - pour éviter des erreurs de \ctex{dimension too large} liées à \TikZ{} - il faut \textit{décaler les axes} pour se ramener à une origine en $O$. L'idée est donc d'utiliser les commandes précédentes, sans se soucier des éventuelles transformations !
\end{codeidee}
\begin{codetex}[]
\begin{tikzpicture}[x=0.35cm,y=0.07cm,Ox=1992,xmin=1992,xmax=2010,%
xgrille=2,xgrilles=1,Oy=1640,ymin=1640,ymax=1710,ygrille=10,ygrilles=5]
- \FenetreSimpleTikz<Annee,Police=\small>{1992,1994,...,2008}{1640,1650,...,1700}
+ \FenetreSimpleTikz<Annee,Police=\scriptsize>{1992,1994,...,2008}{1640,1650,...,1700}
\FenetreTikz
- \CourbeTikz%
- [line width=1.25pt,orange,samples=500]{-(\x-2000)*(\x-2000)+1700}{\xmin:\xmax}
+ \CourbeTikz[line width=1.25pt,orange,samples=500]{-(\x-2000)*(\x-2000)+1700}{\xmin:\xmax}
\end{tikzpicture}
\end{codetex}
@@ -1986,128 +2013,128 @@ Peut-être que -- ultérieurement -- des options \textit{booléennes} seront dis
\part{Présentation de codes}
-\section{L'outil \og Calcul Formel \fg}
-
-\subsection{Introduction}
-
-\begin{codeidee}
-L'idée des commandes suivantes est de définir, dans un environnement \TikZ, une présentation proche de celle d'un logiciel de calcul formel comme \textsf{XCas} ou \textsf{Geogebra}.
-
-\smallskip
-
-Les sujets d'examens, depuis quelques années, peuvent comporter des \textit{captures d'écran} de logiciel de calcul formel, l'idée est ici de reproduire, de manière autonome, une telle présentation.
-
-\smallskip
-
-À la manière du {package} \ctex{tkz-tab}, l'environnement de référence est un environnement \TikZ, dans lequel les lignes sont créées petit à petit, à l'aide de nœuds qui peuvent être réutilisés à loisir ultérieurement.
-\end{codeidee}
-
-\subsection{La commande \og CalculFormelParametres \fg}
-
-\begin{codeinfo}
-La première chose à définir est l'ensemble des paramètres \textit{globaux} de la fenêtre de calcul formel, à l'aide de \Cle{Clés}.
-\end{codeinfo}
-
-\begin{codetex}[listing only]
-...
-\begin{tikzpicture}[...]
- \CalculFormelParametres[options]
- ...
-\end{tikzpicture}
-\end{codetex}
-
-\begin{codecles}
-Les \Cle{Clés} disponibles sont :
-\begin{itemize}
- \item \Cle{Largeur} : largeur de l'environnement ; \hfill{}défaut \Cle{16}
- \item \Cle{EspaceLg} : espacement vertical entre les lignes ;\hfill{}défaut \Cle{2pt}
- \item \Cle{PremCol} \& \Cle{HautPremCol} : largeur et hauteur de la case du \textit{petit numéro} ;\hfill{}défaut \Cle{0.3} \& \Cle{0.4}
- \item \Cle{Taille} : taille du texte ;\hfill{}défaut \Cle{\textbackslash normalsize}
- \item \Cle{Couleur} : couleur des traits de l'environnement ;\hfill{}défaut \Cle{darkgray}
- \item \Cle{Titre} : booléen pour l'affichage d'un bandeau de titre ;\hfill{}défaut \Cle{false}
- \item \Cle{TailleTitre} : taille du titre ;\hfill{}défaut \Cle{\textbackslash normalsize}
- \item \Cle{PosCmd} : position horizontale de la commande d'entrée ;\hfill{}défaut \Cle{gauche}
- \item \Cle{PosRes} : position horizontale de la commande de sortie ;\hfill{}défaut \Cle{centre}
- \item \Cle{CouleurCmd} : couleur de la commande d'entrée ;\hfill{}défaut \Cle{red}
- \item \Cle{CouleurRes} : couleur de la commande de sortie ;\hfill{}défaut \Cle{blue}
- \item \Cle{Sep} : booléen pour l'affichage du trait de séparation E/S ;\hfill{}défaut \Cle{true}
- \item \Cle{Menu} : booléen pour l'affichage du \textit{bouton} MENU ;\hfill{}défaut \Cle{true}
- \item \Cle{LabelTitre} : libellé du titre.\hfill{}défaut \Cle{Résultats obtenus avec un logiciel de Calcul Formel}
-\end{itemize}
-\end{codecles}
-
-\subsection{La commande \og CalculFormelLigne \fg}
-
-\begin{codeinfo}
-Une fois les paramètres déclarés, il faut créer les différentes lignes, grâce à la \ctex{CalculFormelLigne}.
-\end{codeinfo}
-
-\begin{codetex}[listing only]
-\begin{tikzpicture}[...]
- \CalculFormelParametres[options]
- \CalculFormelLigne[options]{commande}{résultat}
- ...
-\end{tikzpicture}
-\end{codetex}
-
-\begin{codecles}
-Les (quelques) \Cle{Clés} disponibles sont :
-
-\begin{itemize}
- \item \Cle{HautCmd} et \Cle{HautRes}: hauteur de la ligne de commande d'entrée et de sortie ;\hfill{}défaut \Cle{0.75}
- \item deux \textsf{arguments}, celui de la commande d'entrée et celui de la commande de sortie.
-\end{itemize}
+%\section{L'outil \og Calcul Formel \fg}
%
-Chaque argument \textsf{COMMANDE} \& \textsf{RÉSULTAT} peut être formaté (niveau police) de manière indépendante.
-\end{codecles}
-
-\begin{codetex}[tikz lower]
-%code tikz
-\CalculFormelParametres[Titre=true,CouleurCmd=olive,CouleurRes=orange]
-\CalculFormelLigne{COMMANDE 1}{RÉSULTAT 1}
-\CalculFormelLigne[HautCmd=0.75,HautRes=1]{\texttt{(x+1)\CFchap2}}{$\mathtt{x^2+2x+1}$}
-%\CFchap := ^ en mathtt
-\end{codetex}
-
-\subsection{Visualisation des paramètres}
-
-\begin{codeinfo}
-Pour \textit{illustrer} un peu les \Cle{clés}, un petit schéma, avec les différents nœuds crées par les \textsf{macros}.
-
-\begin{center}
- \begin{tikzpicture}[x=0.7cm,y=0.5cm,line width=1pt]
- \CalculFormelParametres[Largeur=12cm,Couleur=lightgray,EspaceLg=12pt,Menu=false]
- \CalculFormelLigne{}{}
- \CalculFormelLigne[HautCmd=1,HautRes=1.25]{}{}
- %explications
- \foreach \noeud in {01,11,21,31,41,51,02,12,22,32,42,52}
- \draw[blue] (A\noeud) node[font=\footnotesize\ttfamily] {A\noeud} ;
-\end{tikzpicture}
-\end{center}
-
-\begin{center}
- \begin{tikzpicture}[x=0.7cm,y=0.7cm,line width=1pt]
- \CalculFormelParametres[Titre,Largeur=12cm,EspaceLg=10pt,PremCol=0.5,HautPremCol=0.7,Couleur=lightgray]
- \CalculFormelLigne{COMMANDE 1}{RÉSULTAT 1}
- \CalculFormelLigne[HautCmd=0.85,HautRes=1.05]{COMMANDE 2}{RÉSULTAT 2}
- %explications
- \draw[CadetBlue,<->,>=latex] ($(A22) + (0,-12pt)$) -- ($(A52) + (0,-12pt)$) node[midway,below,font=\footnotesize\sffamily] {\Cle{Largeur}} ;
- \draw[CadetBlue,<->,>=latex] ($(A51) + (12pt,0)$) -- ($(A32) + (12pt,0)$) node[midway,right,font=\footnotesize\sffamily] {\Cle{EsapceLg}} ;
- \draw[CadetBlue,<->,>=latex] ($(A02) + (0,2pt)$) -- ($(A02) + (0,2pt) + ({-\CFpremcol},0) $) node[midway,above,font=\footnotesize\sffamily] {\Cle{PremCol}} ;
- \draw[CadetBlue,<->,>=latex] ($(A02) + ({-\CFpremcol},0) + (-2pt,0)$) -- ($(A02) + ({-\CFpremcol},{-\CFhpremcol}) +(-2pt,0)$) node[midway,left,font=\footnotesize\sffamily] {\Cle{HautPremCol}} ;
- \draw[CadetBlue,<->,>=latex] ($(A31) + (12pt,0)$) -- ($(A41) + (12pt,0)$) node[midway,right,font=\footnotesize\sffamily] {\Cle{HautCom}} ;
- \draw[CadetBlue,<->,>=latex] ($(A41) + (12pt,0)$) -- ($(A51) + (12pt,0)$) node[midway,right,font=\footnotesize\sffamily] {\Cle{HautRes}} ;
- \draw[CadetBlue,<->,>=latex] ($(A32) + (12pt,0)$) -- ($(A42) + (12pt,0)$) node[midway,right,font=\footnotesize\sffamily] {\Cle{HautCom}} ;
- \draw[CadetBlue,<->,>=latex] ($(A42) + (12pt,0)$) -- ($(A52) + (12pt,0)$) node[midway,right,font=\footnotesize\sffamily] {\Cle{HautRes}} ;
- \draw[CadetBlue,->,>=latex] ($(A12) + (0,-12pt)$) to[bend left=10] ($(A12) + (0,-12pt) + (-18pt,-12pt)$) node[below left,font=\footnotesize\sffamily] {\Cle{Couleur}} ;
- \draw[CadetBlue,->,>=latex] ($(A52) + (-0.65,0.25)$) to[bend left=10] ($(A52) + (-0.65,0.25) + (-18pt,12pt)$) node[inner sep=0pt,above left=1pt,font=\footnotesize\sffamily] {\Cle{Menu}} ;
- \draw[CadetBlue,->,>=latex] ($(A12) + (16pt,0)$) to[bend left=10] ($(A12) + (16pt,0) + (18pt,-12pt)$) node[inner sep=0pt,below right=1pt,font=\footnotesize\sffamily] {\Cle{Sep}} ;
- \draw[CadetBlue,->,>=latex] ($(A01) + (8pt,2pt) + (0,1em)$) to[bend left=10] ($(A01) + (8pt,2pt) + (0,1em) + (-18pt,12pt)$) node[inner sep=0pt,above=1pt,font=\footnotesize\sffamily] {\Cle{Titre} \& \Cle{TailleTitre} \& \Cle{LabelTitre}} ;
-\end{tikzpicture}
-\end{center}
-\end{codeinfo}
-
-\newpage
+%\subsection{Introduction}
+%
+%\begin{codeidee}
+%L'idée des commandes suivantes est de définir, dans un environnement \TikZ, une présentation proche de celle d'un logiciel de calcul formel comme \textsf{XCas} ou \textsf{Geogebra}.
+%
+%\smallskip
+%
+%Les sujets d'examens, depuis quelques années, peuvent comporter des \textit{captures d'écran} de logiciel de calcul formel, l'idée est ici de reproduire, de manière autonome, une telle présentation.
+%
+%\smallskip
+%
+%À la manière du {package} \ctex{tkz-tab}, l'environnement de référence est un environnement \TikZ, dans lequel les lignes sont créées petit à petit, à l'aide de nœuds qui peuvent être réutilisés à loisir ultérieurement.
+%\end{codeidee}
+%
+%\subsection{La commande \og CalculFormelParametres \fg}
+%
+%\begin{codeinfo}
+%La première chose à définir est l'ensemble des paramètres \textit{globaux} de la fenêtre de calcul formel, à l'aide de \Cle{Clés}.
+%\end{codeinfo}
+%
+%\begin{codetex}[listing only]
+%...
+%\begin{tikzpicture}[...]
+% \CalculFormelParametres[options]
+% ...
+%\end{tikzpicture}
+%\end{codetex}
+%
+%\begin{codecles}
+%Les \Cle{Clés} disponibles sont :
+%\begin{itemize}
+% \item \Cle{Largeur} : largeur de l'environnement ; \hfill{}défaut \Cle{16}
+% \item \Cle{EspaceLg} : espacement vertical entre les lignes ;\hfill{}défaut \Cle{2pt}
+% \item \Cle{PremCol} \& \Cle{HautPremCol} : largeur et hauteur de la case du \textit{petit numéro} ;\hfill{}défaut \Cle{0.3} \& \Cle{0.4}
+% \item \Cle{Taille} : taille du texte ;\hfill{}défaut \Cle{\textbackslash normalsize}
+% \item \Cle{Couleur} : couleur des traits de l'environnement ;\hfill{}défaut \Cle{darkgray}
+% \item \Cle{Titre} : booléen pour l'affichage d'un bandeau de titre ;\hfill{}défaut \Cle{false}
+% \item \Cle{TailleTitre} : taille du titre ;\hfill{}défaut \Cle{\textbackslash normalsize}
+% \item \Cle{PosCmd} : position horizontale de la commande d'entrée ;\hfill{}défaut \Cle{gauche}
+% \item \Cle{PosRes} : position horizontale de la commande de sortie ;\hfill{}défaut \Cle{centre}
+% \item \Cle{CouleurCmd} : couleur de la commande d'entrée ;\hfill{}défaut \Cle{red}
+% \item \Cle{CouleurRes} : couleur de la commande de sortie ;\hfill{}défaut \Cle{blue}
+% \item \Cle{Sep} : booléen pour l'affichage du trait de séparation E/S ;\hfill{}défaut \Cle{true}
+% \item \Cle{Menu} : booléen pour l'affichage du \textit{bouton} MENU ;\hfill{}défaut \Cle{true}
+% \item \Cle{LabelTitre} : libellé du titre.\hfill{}défaut \Cle{Résultats obtenus avec un logiciel de Calcul Formel}
+%\end{itemize}
+%\end{codecles}
+%
+%\subsection{La commande \og CalculFormelLigne \fg}
+%
+%\begin{codeinfo}
+%Une fois les paramètres déclarés, il faut créer les différentes lignes, grâce à la \ctex{CalculFormelLigne}.
+%\end{codeinfo}
+%
+%\begin{codetex}[listing only]
+%\begin{tikzpicture}[...]
+% \CalculFormelParametres[options]
+% \CalculFormelLigne[options]{commande}{résultat}
+% ...
+%\end{tikzpicture}
+%\end{codetex}
+%
+%\begin{codecles}
+%Les (quelques) \Cle{Clés} disponibles sont :
+%
+%\begin{itemize}
+% \item \Cle{HautCmd} et \Cle{HautRes}: hauteur de la ligne de commande d'entrée et de sortie ;\hfill{}défaut \Cle{0.75}
+% \item deux \textsf{arguments}, celui de la commande d'entrée et celui de la commande de sortie.
+%\end{itemize}
+%%
+%Chaque argument \textsf{COMMANDE} \& \textsf{RÉSULTAT} peut être formaté (niveau police) de manière indépendante.
+%\end{codecles}
+%
+%\begin{codetex}[tikz lower]
+%%code tikz
+%\CalculFormelParametres[Titre=true,CouleurCmd=olive,CouleurRes=orange]
+%\CalculFormelLigne{COMMANDE 1}{RÉSULTAT 1}
+%\CalculFormelLigne[HautCmd=0.75,HautRes=1]{\texttt{(x+1)\CFchap2}}{$\mathtt{x^2+2x+1}$}
+%%\CFchap := ^ en mathtt
+%\end{codetex}
+%
+%\subsection{Visualisation des paramètres}
+%
+%\begin{codeinfo}
+%Pour \textit{illustrer} un peu les \Cle{clés}, un petit schéma, avec les différents nœuds crées par les \textsf{macros}.
+%
+%\begin{center}
+% \begin{tikzpicture}[x=0.7cm,y=0.5cm,line width=1pt]
+% \CalculFormelParametres[Largeur=12cm,Couleur=lightgray,EspaceLg=12pt,Menu=false]
+% \CalculFormelLigne{}{}
+% \CalculFormelLigne[HautCmd=1,HautRes=1.25]{}{}
+% %explications
+% \foreach \noeud in {01,11,21,31,41,51,02,12,22,32,42,52}
+% \draw[blue] (A\noeud) node[font=\footnotesize\ttfamily] {A\noeud} ;
+%\end{tikzpicture}
+%\end{center}
+%
+%\begin{center}
+% \begin{tikzpicture}[x=0.7cm,y=0.7cm,line width=1pt]
+% \CalculFormelParametres[Titre,Largeur=12cm,EspaceLg=10pt,PremCol=0.5,HautPremCol=0.7,Couleur=lightgray]
+% \CalculFormelLigne{COMMANDE 1}{RÉSULTAT 1}
+% \CalculFormelLigne[HautCmd=0.85,HautRes=1.05]{COMMANDE 2}{RÉSULTAT 2}
+% %explications
+% \draw[CadetBlue,<->,>=latex] ($(A22) + (0,-12pt)$) -- ($(A52) + (0,-12pt)$) node[midway,below,font=\footnotesize\sffamily] {\Cle{Largeur}} ;
+% \draw[CadetBlue,<->,>=latex] ($(A51) + (12pt,0)$) -- ($(A32) + (12pt,0)$) node[midway,right,font=\footnotesize\sffamily] {\Cle{EsapceLg}} ;
+% \draw[CadetBlue,<->,>=latex] ($(A02) + (0,2pt)$) -- ($(A02) + (0,2pt) + ({-\CFpremcol},0) $) node[midway,above,font=\footnotesize\sffamily] {\Cle{PremCol}} ;
+% \draw[CadetBlue,<->,>=latex] ($(A02) + ({-\CFpremcol},0) + (-2pt,0)$) -- ($(A02) + ({-\CFpremcol},{-\CFhpremcol}) +(-2pt,0)$) node[midway,left,font=\footnotesize\sffamily] {\Cle{HautPremCol}} ;
+% \draw[CadetBlue,<->,>=latex] ($(A31) + (12pt,0)$) -- ($(A41) + (12pt,0)$) node[midway,right,font=\footnotesize\sffamily] {\Cle{HautCom}} ;
+% \draw[CadetBlue,<->,>=latex] ($(A41) + (12pt,0)$) -- ($(A51) + (12pt,0)$) node[midway,right,font=\footnotesize\sffamily] {\Cle{HautRes}} ;
+% \draw[CadetBlue,<->,>=latex] ($(A32) + (12pt,0)$) -- ($(A42) + (12pt,0)$) node[midway,right,font=\footnotesize\sffamily] {\Cle{HautCom}} ;
+% \draw[CadetBlue,<->,>=latex] ($(A42) + (12pt,0)$) -- ($(A52) + (12pt,0)$) node[midway,right,font=\footnotesize\sffamily] {\Cle{HautRes}} ;
+% \draw[CadetBlue,->,>=latex] ($(A12) + (0,-12pt)$) to[bend left=10] ($(A12) + (0,-12pt) + (-18pt,-12pt)$) node[below left,font=\footnotesize\sffamily] {\Cle{Couleur}} ;
+% \draw[CadetBlue,->,>=latex] ($(A52) + (-0.65,0.25)$) to[bend left=10] ($(A52) + (-0.65,0.25) + (-18pt,12pt)$) node[inner sep=0pt,above left=1pt,font=\footnotesize\sffamily] {\Cle{Menu}} ;
+% \draw[CadetBlue,->,>=latex] ($(A12) + (16pt,0)$) to[bend left=10] ($(A12) + (16pt,0) + (18pt,-12pt)$) node[inner sep=0pt,below right=1pt,font=\footnotesize\sffamily] {\Cle{Sep}} ;
+% \draw[CadetBlue,->,>=latex] ($(A01) + (8pt,2pt) + (0,1em)$) to[bend left=10] ($(A01) + (8pt,2pt) + (0,1em) + (-18pt,12pt)$) node[inner sep=0pt,above=1pt,font=\footnotesize\sffamily] {\Cle{Titre} \& \Cle{TailleTitre} \& \Cle{LabelTitre}} ;
+%\end{tikzpicture}
+%\end{center}
+%\end{codeinfo}
+%
+%\newpage
\section{Code Python \og simple \fg{} via le package listings}\label{pythonsimple}
@@ -6249,6 +6276,10 @@ La grille, créée en \TikZ, est portée par le rectangle de \og coins \fg{} $(0
\part{Historique}
+{\small \bverb|v 2.5.6|~:~~~~Ajout d'une clé \Cle{Trigo} pour l'axe $(Ox)$ (page \pageref{reperagetikz})
+
+{\small \bverb|v 2.5.5|~:~~~~Externalisation de la fenêtre XCas (dans la package \textsf{FentreCas})
+
{\small \bverb|v 2.5.4|~:~~~~Modification des calculs (via \textsf{xint}) en combinatoire (page \pageref{combinatoire})
{\small \bverb|v 2.5.3|~:~~~~Modification du traitement des tests dans les arbres de probas (page \pageref{arbresprobas})
diff --git a/macros/latex/contrib/proflycee/tex/ProfLycee.sty b/macros/latex/contrib/proflycee/tex/ProfLycee.sty
index 5dd1884d69..7726d26e15 100644
--- a/macros/latex/contrib/proflycee/tex/ProfLycee.sty
+++ b/macros/latex/contrib/proflycee/tex/ProfLycee.sty
@@ -3,7 +3,10 @@
% or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ProfLycee}[2023/03/11 2.5.4 Aide pour l'utilisation de LaTeX en lycee]
+\ProvidesPackage{ProfLycee}[2023/03/31 2.5.6 Aide pour l'utilisation de LaTeX en lycee]
+% 2.5.6 Ajout d'une clé [Trigo] pour \AxexTikz (avec graduations libres)
+% "Suppression" de la fenêtre XCas de la documentation
+% 2.5.5 Correction d'un bug avec la fenetre XCas
% 2.5.4 Amélioration des commandes de combinatoire avec calculs via xint (plus précis !)
% 2.5.3 Modification des tests d'arguments dans les probas (macros autorisées)
% 2.5.2 Correction d'un dysfonctionnement avec tcolorbox 6.0 :-(
@@ -53,6 +56,7 @@
\RequirePackage{simplekv}
\RequirePackage{listofitems}
\RequirePackage{tabularray}
+\RequirePackage{settobox}
\RequirePackage{hologo}
\RequirePackage{fancyvrb}
\RequirePackage{nicefrac}
@@ -279,7 +283,7 @@
\newcommand\CalculFormelLigne[3][]{%
\addtocounter{CFnum}{1}
- \def\CFL{\theCFnum}
+ \def\CFL{\theCFnum}%
\def\CFLA{\inteval{\CFL-1}}%
\useKVdefault[paramlgxcas]%
\setKV[paramlgxcas]{#1}% on paramètres les nouvelles clés et on les simplifie
@@ -313,9 +317,9 @@
{\draw (C3\CFL) node[left,\CFcoulcmd,font=\CFtaille] {#2} ;}
{}
%LA LIGNE DE SÉPARATION
- \ifboolKV[paramfenxcas]{Sep}%si sep=true
- {\draw[\CFcouleur] (A1\CFL) -- (A4\CFL);}
- {}
+ %\ifboolKV[paramfenxcas]{Sep}%si sep=true
+ % {\draw[\CFcouleur] (A1\CFL) -- (A4\CFL);}
+ % {}
%LE RÉSULTAT
\IfStrEq{\CFposres}{centre}%si posrep=center
{\draw (R2\CFL) node[\CFcoulres,font=\CFtaille] {#3} ;}
@@ -1568,6 +1572,36 @@
pics/PLdotcross/.default={4pt/0}
}
+%affichage d'un label en radians
+\NewDocumentCommand\AffAngleRadian{ s m }{%étoilée en dfrac
+ \IfStrEq{#2}{0}%cas où l'argument vaut 0
+ {\def\restmp{0}}%
+ {%
+ \StrDel{#2}{*}[\restmpsansmoins]%
+ \StrSubstitute{\restmpsansmoins}{pi}{\pi}[\restmppi]%
+ \IfSubStr{#2}{/}%
+ {%
+ \StrCut{\restmppi}{/}\tmpnum\tmpdenom%
+ \IfSubStr{\tmpnum}{-}
+ {%
+ \StrDel{\tmpnum}{-}[\restmppinum]%
+ \IfBooleanTF{#1}
+ {\def\restmp{-\dfrac{\restmppinum}{\tmpdenom}}}
+ {\def\restmp{-\frac{\restmppinum}{\tmpdenom}}}
+ }%
+ {%
+ \IfBooleanTF{#1}
+ {\def\restmp{\dfrac{\tmpnum}{\tmpdenom}}}
+ {\def\restmp{\frac{\tmpnum}{\tmpdenom}}}
+ }%
+ }%
+ {%
+ \def\restmp{\restmppi}%
+ }%
+ }%
+ \restmp%
+}
+
%axeOx
\defKV[PLaxextkz]{%
Epaisseur=\def\axexwidth{#1},%
@@ -1583,36 +1617,53 @@
HautGrad=4pt,%
AffGrad=true,%
AffOrigine=true,%
- Annee=false
+ Annee=false,%
+ Dfrac=false,%
+ Trigo=false
}
\DeclareDocumentCommand\AxexTikz{ O{} m }{%
\useKVdefault[PLaxextkz]
\setKV[PLaxextkz]{#1}% on paramètres les nouvelles clés et on les simplifie
- %formatage des années
+ %récupération des tickwidth H/B
\IfSubStr{\axextickwidth}{/}
- {\StrCut{\axextickwidth}{/}{\axextickwidthA}{\axextickwidthB}}
- {\def\axextickwidthA{\axextickwidth}\def\axextickwidthB{\axextickwidth}}
- \foreach \x in {#2}{%
- \draw[line width=\axexwidth] ({\x-\axexOx},{\axextickwidthA}) -- ({\x-\axexOx},{-\axextickwidthB})%
- \ifboolKV[PLaxextkz]{AffGrad}%on affiche les graduations
- {%
- \ifboolKV[PLaxextkz]{AffOrigine}%si on demande d'afficher l'origine
- {node[\axexposlabel,font=\axexfont]
- {\ifboolKV[PLaxextkz]{Annee}%
- {\num[group-digits=none]{\x}}%
- {\num[text-family-to-math=true,text-series-to-math=true]{\x}}%
- }
- }
- {\xintifboolexpr{\x==\axexOx}{}{node[\axexposlabel,font=\axexfont] {\ifboolKV[PLaxextkz]{Annee}%
- {\num[group-digits=none]{\x}}%
- {\num[text-family-to-math=true,text-series-to-math=true]{\x}}%
+ {\StrCut{\axextickwidth}{/}{\axextickwidthA}{\axextickwidthB}}
+ {\def\axextickwidthA{\axextickwidth}\def\axextickwidthB{\axextickwidth}}
+ %en fonction de Trigo ou non
+ \ifboolKV[PLaxextkz]{Trigo}
+ {
+ \foreach \x in {#2}{%
+ \draw[line width=\axexwidth] ({\x-\axexOx},{\axextickwidthA}) -- ({\x-\axexOx},{-\axextickwidthB})%
+ \ifboolKV[PLaxextkz]{AffGrad}%on affiche les graduations
+ {%
+ node[\axexposlabel,font=\axexfont] {\ifboolKV[PLaxextkz]{Dfrac}{$\AffAngleRadian*{\x}$}{$\AffAngleRadian{\x}$}}
+ }%
+ {}%
+ ;}
+ }
+ {
+ \foreach \x in {#2}{%
+ \draw[line width=\axexwidth] ({\x-\axexOx},{\axextickwidthA}) -- ({\x-\axexOx},{-\axextickwidthB})%
+ \ifboolKV[PLaxextkz]{AffGrad}%on affiche les graduations
+ {%
+ \ifboolKV[PLaxextkz]{AffOrigine}%si on demande d'afficher l'origine
+ {node[\axexposlabel,font=\axexfont]
+ {\ifboolKV[PLaxextkz]{Annee}%
+ {\num[group-digits=none]{\x}}%
+ {\num[text-family-to-math=true,text-series-to-math=true]{\x}}%
+ }
+ }
+ {\xintifboolexpr{\x==\axexOx}{}{node[\axexposlabel,font=\axexfont] {\ifboolKV[PLaxextkz]{Annee}%
+ {\num[group-digits=none]{\x}}%
+ {\num[text-family-to-math=true,text-series-to-math=true]{\x}}%
+ }
+ }
}
}
- }
+ {}
+ ;}
}
- {}
- ;}
+
}
%axeOy
diff --git a/macros/latex/contrib/univie-ling/README b/macros/latex/contrib/univie-ling/README
index b67e90aba9..57de3e566b 100644
--- a/macros/latex/contrib/univie-ling/README
+++ b/macros/latex/contrib/univie-ling/README
@@ -97,6 +97,9 @@ also have a look at the example files.
== CHANGES ==
+V. 2.4 (2023-03-31):
+ - univie-ling-paper: fix default ps and se text type.
+
V. 2.3 (2023-01-26):
- univie-ling-poster: new class for scientific posters.
- univie-ling-wlg: Add type option and allow for review articles.
diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
index bfeff29a08..9dffd636c5 100644
--- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
+++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
@@ -38,7 +38,7 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{univie-ling.bbx}[2023/01/26 v.2.3 biblatex bibliography style]
+\ProvidesFile{univie-ling.bbx}[2023/03/31 v.2.4 biblatex bibliography style]
% Load base style (authoryear-comp)
\RequireBibliographyStyle{authoryear-comp}
diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
index 7521c39930..a1617d71af 100644
--- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
+++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
@@ -36,7 +36,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{univie-ling.cbx}[2023/01/26 v.2.3 biblatex citation style]
+\ProvidesFile{univie-ling.cbx}[2023/03/31 v.2.4 biblatex citation style]
\RequireCitationStyle{authoryear-comp}
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf
index 793ba5ca29..16d3622e11 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf
index 8561dbb183..0fc933eab6 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf
index fa511f10df..51cdff71d1 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf
index cfb3212738..df801a2e82 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf
index 6073da646f..414979d08c 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf
index cf11061df7..029263939b 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-poster-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-poster-deutsch.pdf
index 952b6ab687..e0865ede5e 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-poster-deutsch.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-poster-deutsch.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-poster-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-poster-english.pdf
index 4f3244cbf7..2f58113d8b 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-poster-english.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-poster-english.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
index 9014f733e8..374070d7af 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf
index 98b71721ce..8d4b50cec6 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
index 9407ed4626..5e7c3de1a0 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-review.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-review.pdf
index db4a283f9d..e71523f535 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-review.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-review.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
index 2dd39fe11a..b3fd65afb9 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
index cf563d1db1..28c602cf3f 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
@@ -63,7 +63,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.3, 2023/01/26}
+\date{Version 2.4, 2023/03/31}
\maketitle
@@ -341,6 +341,10 @@ Templates are provided as well:
\section{Release History}
\begin{description}
+ \item 2023/03/31 (v.\,2.4)
+ \begin{itemize}
+ \item No change to this class.
+ \end{itemize}
\item 2023/01/26 (v.\,2.3)
\begin{itemize}
\item No change to this class.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf
index 20f17ea6a2..662260a499 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex
index 9dbf80ad39..c35b731e87 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex
@@ -63,7 +63,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.3, 2023/01/26}
+\date{Version 2.4, 2023/03/31}
\maketitle
@@ -385,6 +385,10 @@ Templates are provided as well:
\section{Release History}
\begin{description}
+ \item 2023/03/31 (v.\,2.4)
+ \begin{itemize}
+ \item No change to this class.
+ \end{itemize}
\item 2023/01/26 (v.\,2.3)
\begin{itemize}
\item No change to this class.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
index 56f96fde17..60aeed4510 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
index c932b039f2..7b78acec1b 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
@@ -63,7 +63,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.3, 2023/01/26}
+\date{Version 2.4, 2023/03/31}
\maketitle
@@ -374,6 +374,10 @@ Templates are provided as well:
\section{Release History}
\begin{itemize}
+ \item 2023/03/31 (v.\,2.4)
+ \begin{itemize}
+ \item Fix default \joption{ps} and \joption{se} text type.
+ \end{itemize}
\item 2023/01/26 (v.\,2.3)
\begin{itemize}
\item No change to this class.
@@ -395,7 +399,7 @@ Templates are provided as well:
\end{itemize}
\item 2022/09/08 (v.\,1.20)
\begin{itemize}
- \item Load \textsf{varioref} AtBeginDocument.
+ \item Load \textsf{varioref} \jfcsmacro{AtBeginDocument}.
\end{itemize}
\item 2022/06/18 (v.\,1.19)
\begin{itemize}
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-poster.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-poster.pdf
index 57c4501d12..fc8b6663e6 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-poster.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-poster.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-poster.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-poster.tex
index fd789e5e24..4c78545c2d 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-poster.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-poster.tex
@@ -65,7 +65,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.3, 2023/01/26}
+\date{Version 2.4, 2023/03/31}
\maketitle
@@ -498,6 +498,10 @@ Templates are provided as well:
\section{Release History}
\begin{description}
+ \item 2023/03/31 (v.\,2.4)
+ \begin{itemize}
+ \item No change to this class.
+ \end{itemize}
\item 2023/01/26 (v.\,2.3)
\begin{itemize}
\item Initial release.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
index bed1962efe..e91bb21ee7 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
index 994f351164..5680490e7e 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.3, 2023/01/26}
+\date{Version 2.4, 2023/03/31}
\maketitle
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
index fea6295a49..13c4c8e24d 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
index f0e54ecd0a..5dedae5b72 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.3, 2023/01/26}
+\date{Version 2.4, 2023/03/31}
\maketitle
@@ -247,6 +247,10 @@ A template is provided as well: \url{https://github.com/jspitz/univie-ling/raw/m
\raggedright
\begin{itemize}
+ \item 2023/03/31 (v.\,2.4)
+ \begin{itemize}
+ \item No change to this class.
+ \end{itemize}
\item 2023/01/26 (v.\,2.3)
\begin{itemize}
\item Add \joption{type} option and allow for review articles.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling.pdf
index 8817a4d6f0..2452df688b 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling.tex b/macros/latex/contrib/univie-ling/doc/univie-ling.tex
index 63340e482a..a3d9e05db9 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling.tex
@@ -42,7 +42,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.3, 2023/01/26}
+\date{Version 2.4, 2023/03/31}
\maketitle
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
index 32529980b2..c372c01a38 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
@@ -33,7 +33,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-expose}[2023/01/26 v.2.3 Univie Linguistic Exposes (JSp)]
+\ProvidesPackage{univie-ling-expose}[2023/03/31 v.2.4 Univie Linguistic Exposes (JSp)]
%% ============================================================
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls
index 5d801959b9..7c7a8ff1da 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls
@@ -35,7 +35,7 @@
\NeedsTeXFormat{LaTeX2e}[1997/06/01]
-\ProvidesClass{univie-ling-handout}[2023/01/26 v.2.3 Univie Ling handout class (JSp)]
+\ProvidesClass{univie-ling-handout}[2023/03/31 v.2.4 Univie Ling handout class (JSp)]
%% ============================================================
%% CLASS OPTIONS
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
index 536725e004..289315beb8 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
@@ -32,7 +32,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-paper}[2023/01/26 v.2.3 Univie Linguistic Papers (JSp)]
+\ProvidesPackage{univie-ling-paper}[2023/03/31 v.2.4 Univie Linguistic Papers (JSp)]
%% ============================================================
@@ -360,7 +360,7 @@ This includes all drawings, sketches, graphics and internet sources.}
% se
\def\lectypeverb@se{Seminar}
\def\lectype@se{SE}
-\def\texttype@ps{Seminararbeit}
+\def\texttype@se{Seminararbeit}
% ue
\def\lectypeverb@ue{\"Ubung}
\def\lectype@ue{UE}
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-poster.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-poster.cls
index 7a688b7f79..bb54e614ae 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-poster.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-poster.cls
@@ -34,7 +34,7 @@
\NeedsTeXFormat{LaTeX2e}[1997/06/01]
-\ProvidesClass{univie-ling-poster}[2023/01/26 v.2.3 Univie Ling poster class (JSp)]
+\ProvidesClass{univie-ling-poster}[2023/03/31 v.2.4 Univie Ling poster class (JSp)]
%% ============================================================
%% CLASS OPTIONS
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
index 527914a7de..87bd736880 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
@@ -33,7 +33,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-thesis}[2023/01/26 v.2.3 Univie Linguistic Theses (JSp)]
+\ProvidesPackage{univie-ling-thesis}[2023/03/31 v.2.4 Univie Linguistic Theses (JSp)]
%% ============================================================
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
index 3d1e9816e3..d5a399fec8 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
@@ -34,7 +34,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-wlg}[2023/01/26 v.2.3 Univie WLG journal layout (JSp)]
+\ProvidesPackage{univie-ling-wlg}[2023/03/31 v.2.4 Univie WLG journal layout (JSp)]
%% ============================================================
diff --git a/systems/doc/luatex/luatex-backend.tex b/systems/doc/luatex/luatex-backend.tex
index 49a18ddb40..afbaa84d0c 100644
--- a/systems/doc/luatex/luatex-backend.tex
+++ b/systems/doc/luatex/luatex-backend.tex
@@ -619,13 +619,14 @@ pdfe.getstatus(<pdfe document>)
The returned codes are:
+
\starttabulate[|c|l|]
\DB value \BC explanation \NC \NR
\TB
-\NC \type {-2} \NC the document failed to open \NC \NR
-\NC \type {-1} \NC the document is (still) protected \NC \NR
+\NC \type {-2} \NC the document is (still) protected \NC \NR
+\NC \type {-1} \NC the document failed to open \NC \NR
\NC \type {0} \NC the document is not encrypted \NC \NR
-\NC \type {2} \NC the document has been unencrypted \NC \NR
+\NC \type {1} \NC the document has been unencrypted \NC \NR
\LL
\stoptabulate
diff --git a/systems/doc/luatex/luatex-graphics.tex b/systems/doc/luatex/luatex-graphics.tex
index 0e34a65284..54eed17570 100644
--- a/systems/doc/luatex/luatex-graphics.tex
+++ b/systems/doc/luatex/luatex-graphics.tex
@@ -822,7 +822,7 @@ anonymous capsules like loop variables are not accessible).
<table> p = get_path (mp,<string> name)
\stopfunctioncall
-The path is returned a a table with subtables that have six numbers: the
+The path is returned as a table with subtables that have six numbers: the
coordinates of the point, pre- and postcontrol. A \type {cycle} fields indicates
if a path is cyclic.
diff --git a/systems/doc/luatex/luatex-nodes.tex b/systems/doc/luatex/luatex-nodes.tex
index 1367ea1fc6..1b7325ac55 100644
--- a/systems/doc/luatex/luatex-nodes.tex
+++ b/systems/doc/luatex/luatex-nodes.tex
@@ -1722,7 +1722,7 @@ The \type{traverse_char} iterator loops over the \nod {glyph} nodes in a list.
Only nodes with a subtype less than 256 are seen.
\startfunctioncall
-<node> n, font, char =
+<node> n, char, font =
node.traverse_char(<node> n)
\stopfunctioncall
@@ -1730,7 +1730,7 @@ The \type{traverse_glyph} iterator loops over a list and returns the list and
filters all glyphs:
\startfunctioncall
-<node> n, font, char =
+<node> n, char, font =
node.traverse_glyph(<node> n)
\stopfunctioncall
@@ -1877,7 +1877,7 @@ word boundaries are possible).
\startfunctioncall
node.unprotect_glyph(<node> n)
-node.unprotect_glyphs(<node> n,[<node> n])
+node.unprotect_glyphs(<node> n,[<node> ,m])
\stopfunctioncall
Subtracts 256 from all glyph node subtypes. This and the next function are
@@ -1891,7 +1891,7 @@ processing. The second argument is optional and indicates the end of a range.
\startfunctioncall
node.protect_glyph(<node> n)
-node.protect_glyphs(<node> n,[<node> n])
+node.protect_glyphs(<node> n,[<node> m])
\stopfunctioncall
Adds 256 to all glyph node subtypes in the node list starting at \type {n},
@@ -2195,8 +2195,8 @@ number often is reported when you print node related information. You go from
userdata nodes and there numeric references and back with:
\startfunctioncall
-<integer> d = node.todirect(<node> n))
-<node> n = node.tonode(<integer> d))
+<integer> d = node.direct.todirect(<node> n))
+<node> n = node.direct.tonode(<integer> d))
\stopfunctioncall
The userdata model is rather robust as it is a virtual interface with some
@@ -2437,8 +2437,8 @@ consistency. You can of course always define additional accessors using \type
\supported {subtypes} \yes \nop
\supported {subtype} \yes \nop
\supported {tail} \yes \yes
-\supported {todirect} \yes \yes
-\supported {tonode} \yes \yes
+\supported {todirect} \nop \yes
+\supported {tonode} \nop \yes
\supported {tostring} \yes \yes
\supported {traverse_char} \yes \yes
\supported {traverse_glyph} \yes \yes
diff --git a/systems/doc/luatex/luatex.pdf b/systems/doc/luatex/luatex.pdf
index 1525d22d43..7f14915811 100644
--- a/systems/doc/luatex/luatex.pdf
+++ b/systems/doc/luatex/luatex.pdf
Binary files differ
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index dd462e2c0f..8e2b53bfdd 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -21,9 +21,6 @@ $mirrors = {
'https://mirrors.ustc.edu.cn/CTAN/' => 1,
'https://mirrors.zju.edu.cn/CTAN/' => 1,
},
- 'Hong Kong' => {
- 'https://mirror-hk.koddos.net/CTAN/' => 1,
- },
'India' => {
'https://mirror.niser.ac.in/ctan/' => 1,
},
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 44a71a973c..a9dae26a80 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,7 +26,7 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2023
-depend revision/66706
+depend revision/66714
name 00texlive.image
category TLCore
@@ -4719,7 +4719,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 66701
+revision 66708
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
@@ -80010,7 +80010,7 @@ catalogue-topics maths
name context-notes-zh-cn
category Package
-revision 66706
+revision 66714
shortdesc Notes on using ConTeXt MkIV
relocated 1
longdesc An introductory tutorial on ConTeXt, in Chinese. The document
@@ -80019,10 +80019,10 @@ longdesc cross-reference, project structure, metafun and presentation
longdesc design.
depend context
containersize 508
-containerchecksum c329c69e8ddb44953ce71939a7d356f2a1548b730155b77f2dcb1aa5093719208b4fda5ba3885cf0dbebac63389e024f12ef1492bdf4a9bd69ca1e36b4e6bea2
-doccontainersize 2199704
-doccontainerchecksum dade1782d8e3c2aa8df8b341fcc8b68db418d7cd5e0e178c13ecb64a91d37d18d08987f4ca8da19184045aabf0e870861d6624410f7b67e08cabb29aaafa2c31
-docfiles size=1109
+containerchecksum 8e094cf79ec594f8253e2fbd95d351c9ab7850e9721faa5b26c5e31652e72fc4bed2e01eac71b88f6ea3fbbaf1a6392ffcb6350b51492e50ea302c43b3900cab
+doccontainersize 2199936
+doccontainerchecksum 1d61f366a0f1dde7afd7dc6129111344cdf6b311673153f99bf2d25f2c3d80bbf0bea5bc40150683df8ac9ebb7d3a7bb77c2fc31576853950715e6b55e2fc075
+docfiles size=1110
RELOC/doc/context/third/context-notes-zh-cn/LICENSE
RELOC/doc/context/third/context-notes-zh-cn/README.md details="Readme"
RELOC/doc/context/third/context-notes-zh-cn/ctxnotes.pdf details="The document itself"
@@ -80144,6 +80144,7 @@ docfiles size=1109
RELOC/doc/context/third/context-notes-zh-cn/src/figures/zhfonts-02.pdf
RELOC/doc/context/third/context-notes-zh-cn/src/figures/zhfonts-03.pdf
RELOC/doc/context/third/context-notes-zh-cn/src/figures/zhfonts.pdf
+ RELOC/doc/context/third/context-notes-zh-cn/src/postscript.tex
RELOC/doc/context/third/context-notes-zh-cn/src/preface.tex
RELOC/doc/context/third/context-notes-zh-cn/src/zhfonts.tex
catalogue-contact-repository https://github.com/liyanrui/ConTeXt-notes/issues
@@ -169703,7 +169704,7 @@ catalogue-version 1.1
name l3backend
category Package
-revision 65573
+revision 66710
shortdesc LaTeX3 backend drivers
relocated 1
longdesc This package forms parts of expl3, and contains the code used
@@ -169712,18 +169713,18 @@ longdesc The functions here are defined differently depending on the
longdesc engine in use. As such, these are distributed separately from
longdesc l3kernel to allow this code to be updated on an independent
longdesc schedule.
-containersize 15464
-containerchecksum adeed96dee5075c022752def063e1602dcc59d30ff032d3da5d51fdc57fd21c881eff95bfb9c027c8edd683a1e33030c72d3dac03fc62d7f2c32f782618ef6ba
-doccontainersize 889272
-doccontainerchecksum 9b2dbdd99c36f9003dca7d28d578fbdc12d40fdf861c04dc579f9b81ab3dba4c7ba05143ff0b024b422c4d70c068ebecbc76ce1e03edb233e248dae3d5962d74
+containersize 16200
+containerchecksum 98c018f90dcc0f3c82737e27cfbc47cc9aa7cef1d956d3722f4e251b4f5089a6dca9765bcd10ff8afdaa225ee1d2f90335fbe24d259b0ded49043a3ee3a47beb
+doccontainersize 888076
+doccontainerchecksum cab1765579b829ab44fde09d7f4f48c93349291215b4990ae3be288824e7dbb20cdc5eaffd730de0c89bb878c1284bbb7bb1101df7314aff257f666a4632aa5a
docfiles size=233
RELOC/doc/latex/l3backend/CHANGELOG.md
RELOC/doc/latex/l3backend/README.md details="Readme"
RELOC/doc/latex/l3backend/l3backend-code.pdf details="Package documentation"
RELOC/doc/latex/l3backend/l3backend-code.tex
-srccontainersize 33064
-srccontainerchecksum fcdc5cd944e68405fed8fcb4e97d5c855de67b00e352f99fe810e5bb61cda8ac0b1c25e7e07596ddc8528177b1277bbf1deecd370a31235edc94e8a0b2235ab8
-srcfiles size=57
+srccontainersize 33844
+srccontainerchecksum ae3bf877600a61ca6046510bb8e790eccca341f88f6fc8cbbbfdb020d65eaff09f83dc23eeb1f1564a926d450532575a009f389862f1cc04a7942927d76a3b59
+srcfiles size=58
RELOC/source/latex/l3backend/l3backend-basics.dtx
RELOC/source/latex/l3backend/l3backend-box.dtx
RELOC/source/latex/l3backend/l3backend-color.dtx
@@ -169733,12 +169734,13 @@ srcfiles size=57
RELOC/source/latex/l3backend/l3backend-opacity.dtx
RELOC/source/latex/l3backend/l3backend-pdf.dtx
RELOC/source/latex/l3backend/l3backend.ins
-runfiles size=50
+runfiles size=51
RELOC/dvips/l3backend/l3backend-dvips.pro
RELOC/tex/latex/l3backend/l3backend-dvipdfmx.def
RELOC/tex/latex/l3backend/l3backend-dvips.def
RELOC/tex/latex/l3backend/l3backend-dvisvgm.def
RELOC/tex/latex/l3backend/l3backend-luatex.def
+ RELOC/tex/latex/l3backend/l3backend-luatex.lua
RELOC/tex/latex/l3backend/l3backend-pdftex.def
RELOC/tex/latex/l3backend/l3backend-xetex.def
catalogue-contact-bugs https://github.com/latex3/latex3/issues
@@ -169941,7 +169943,7 @@ binfiles arch=x86_64-solaris size=1
name l3experimental
category Package
-revision 65621
+revision 66710
shortdesc Experimental LaTeX3 concepts
relocated 1
longdesc The l3experimental packages are a collection of experimental
@@ -169961,10 +169963,10 @@ longdesc series of 'handle' positions, supplementing the simple TeX
longdesc reference point; xgalley, which controls boxes receiving text
longdesc for typesetting.
depend l3kernel
-containersize 23640
-containerchecksum 1074091d77bc323d108e27cb08592c895fae20f4cb563734dd69701f1a4ac215575af9425db9eec98e420317325adad434c21dbed50063036715b95d67050c90
-doccontainersize 3496232
-doccontainerchecksum 8b954e90f323646a289de57aa6c1a01c25a948b42d70d439c9921437b01fa489a01c08e50bf0601ee4fa12b32f8b60c64af82cf6a4ac9cd8cefb6ef4b4a22c70
+containersize 23656
+containerchecksum 8f8481f370a1552413ba225b04a75ee11dc26c1994137a11886eac33291f5eb92a072e0ab0b4651fb7c69b52d0c5041aabbede7edae5f9790875fa4214cfd81a
+doccontainersize 3496112
+doccontainerchecksum 2626dcfd91c1bd3335746516c44f472a26775f3a2f2fc6f64e7b9774d3791c04cd2fa095b058a0c5a27b458c40459e34c6824f16d1614f66c93f7c8ce0099045
docfiles size=1090
RELOC/doc/latex/l3experimental/CHANGELOG.md
RELOC/doc/latex/l3experimental/README.md details="Readme"
@@ -169980,8 +169982,8 @@ docfiles size=1090
RELOC/doc/latex/l3experimental/xcoffins/xcoffins.pdf details="xcoffins documentation"
RELOC/doc/latex/l3experimental/xgalley/l3galley.pdf
RELOC/doc/latex/l3experimental/xgalley/xgalley.pdf details="xgalley documentation"
-srccontainersize 80096
-srccontainerchecksum aa5352e2c74e191baf954acdcbd22aef14a3c7aefef3acef6dbfabf206ed30d3102c29448f4401aa89c820172fb5b892a3af537f4ec605fb0b8e159b61131cbc
+srccontainersize 80088
+srccontainerchecksum 52f0ebc684303dc403038b9306359663f5710b869a71a1af6a36ac9ca032b01616ea5859d71e4b5375ea4f88937629c71b7e122f9b1abaf2d41d3d7b0b704ef3
srcfiles size=132
RELOC/source/latex/l3experimental/l3benchmark/l3benchmark.dtx
RELOC/source/latex/l3experimental/l3benchmark/l3benchmark.ins
@@ -170029,7 +170031,7 @@ catalogue-topics macro-supp layout latex3 pre-release
name l3kernel
category Package
-revision 66094
+revision 66710
shortdesc LaTeX3 programming conventions
relocated 1
longdesc The l3kernel bundle provides an implementation of the LaTeX3
@@ -170039,11 +170041,11 @@ longdesc LaTeX3 kernel and other future code are built: it is an API for
longdesc TeX programmers. The packages are set up so that the LaTeX3
longdesc conventions can be used with regular LaTeX2e packages.
depend l3backend
-containersize 174616
-containerchecksum a9329b7a66b3f201063f2568247d5cfcb49512195cae2b8ba8e1dbf4f5a0fbc14b36f5727b171136b371e94410092897881925d96ffe4a628afb441be130e32f
-doccontainersize 11984952
-doccontainerchecksum eb7ef32a4fd8226f032ebeb435244c7c92ba6264b0eaa03d73e208167b240644196f82e0ea57ac9665e372fd3c68ff030f0a26a8b68eee0a35d3b01f6c30fb8f
-docfiles size=3412
+containersize 175004
+containerchecksum 01da02e515ceabfd8fd30d1509f29be49bc3c92cc3a136470ece2c6f649778f0322292d9a6d543ece6b07ec273c639a1b8bc2c7751f2236cd1e64afcb1ce76aa
+doccontainersize 11993992
+doccontainerchecksum 0e3047e8efdc6c771d044265610741ef399a63ac410c205047e1c6ec76d0d46cb8d17aa991fe1b34170f764a47f46df070aaf560fd8952b21119159403d13d59
+docfiles size=3418
RELOC/doc/latex/l3kernel/CHANGELOG.md
RELOC/doc/latex/l3kernel/README.md details="Readme"
RELOC/doc/latex/l3kernel/expl3.pdf details="The LaTeX3 Programming Language"
@@ -170090,9 +170092,9 @@ docfiles size=3412
RELOC/doc/latex/l3kernel/source3.pdf
RELOC/doc/latex/l3kernel/source3.tex
RELOC/doc/latex/l3kernel/source3body.tex
-srccontainersize 599532
-srccontainerchecksum 50bb088f0176c31c0dc1bd54c92ab1a784827c00aceaeb5cf26b48f2c9e5c35951aabd36d5670b08a16b5a3306bfd40f0741a2a958c915ffed75c96425f6978e
-srcfiles size=924
+srccontainersize 599948
+srccontainerchecksum ee10f03209fa3b3c13a9612f7a9482e49da6532f5e44136c8b13818c6fe07fa147b7cc0e8d33e78f9c102cb6d7c7862a10a6e3f849d6e2a10c5c9d1baff1a372
+srcfiles size=925
RELOC/source/latex/l3kernel/expl3.dtx
RELOC/source/latex/l3kernel/l3.ins
RELOC/source/latex/l3kernel/l3basics.dtx
@@ -170151,7 +170153,7 @@ srcfiles size=924
RELOC/source/latex/l3kernel/l3tl.dtx
RELOC/source/latex/l3kernel/l3token.dtx
RELOC/source/latex/l3kernel/l3unicode.dtx
-runfiles size=356
+runfiles size=357
RELOC/tex/latex/l3kernel/expl3-code.tex
RELOC/tex/latex/l3kernel/expl3-generic.tex
RELOC/tex/latex/l3kernel/expl3.ltx
@@ -215924,7 +215926,7 @@ catalogue-topics graphics-use
name mpchess
category Package
-revision 66703
+revision 66709
shortdesc Drawing chess boards and positions with MetaPost
relocated 1
longdesc This package allows you to draw chess boards and positions. The
@@ -215934,11 +215936,11 @@ longdesc on MetaPost probably allows more graphic flexibility than the
longdesc excellent LaTeX packages. This package is in beta version, do
longdesc not hesitate to report bugs, as well as requests for
longdesc improvement
-containersize 19120
-containerchecksum 2a3c66ba59f0c3efe834f06eb7d64e304c56ee7e942ddcd31d906a714d0e0a6568a2fb3f232f721ed1a7cc1af2081fcf84cc819bff5dbc74f7f838499fb0851c
-doccontainersize 1752620
-doccontainerchecksum 9f1f065939cab5e6b67b71e6845fc304d5084467046567e32f0a4e82b75b36a3707ca0736f4fc05ba2eb1398e88d7ae15acd073d947c783dd3fb25eda9b71e63
-docfiles size=1196
+containersize 19160
+containerchecksum c04db06d686ff55f9ed4a44c41f5584bb06efb5d7adf6439623d478989a5bd6f0ce7c3c7fda625b8fd8b58450458b833b974c6cfe18ee539631d0f0cd980b289
+doccontainersize 1378264
+doccontainerchecksum 236e194105beca27efdedbe0e32d67131783c3359145d1c27fca12bc022cbcabe11af6b07dca0b0bab83323ca845fcf54daaaaa4c11c63ff546598c71565dae9
+docfiles size=520
RELOC/doc/metapost/mpchess/LICENSE
RELOC/doc/metapost/mpchess/README.md details="Readme"
RELOC/doc/metapost/mpchess/ctan.bib
@@ -215963,7 +215965,7 @@ catalogue-contact-repository https://plmlab.math.cnrs.fr/mchupin/mpchess
catalogue-ctan /graphics/metapost/contrib/macros/mpchess
catalogue-license lppl1.3c gpl2+
catalogue-topics graphics graphics-mpost mp-use games
-catalogue-version 0.2
+catalogue-version 0.3
name mpcolornames
category Package
@@ -247510,25 +247512,25 @@ catalogue-version 1.3
name physics2
category Package
-revision 66115
-shortdesc Macros for typesetting math faster and more simply
+revision 66711
+shortdesc Macros for typesetting maths faster and more simply
relocated 1
-longdesc The physics2 package defines commands for typesetting math
-longdesc formulae faster andmore simply. physics2 is a modularized
+longdesc The physics2 package defines commands for typesetting maths
+longdesc formulae faster and more simply. physics2 is a modularized
longdesc package, each module provides its own function. You can load
-longdesc modules separately after loading `physics2`. Modules of physics
-longdesc provide the following supports: Automatic braces; Dirac bra-ket
+longdesc modules separately after loading physics2. Modules of physics
+longdesc provide the following support: Automatic braces; Dirac bra-ket
longdesc notation; Easy way to typeset diagonal matrices and matrices
longdesc with similar entries; Double cross and double dot (binary)
longdesc operators for tensors.
-containersize 7616
-containerchecksum 5af5f5c7d3d0e783ddf3b9fce5a8a81c402ff92027e549559deed34e173ea441a368b7617928c0b04ce9ebe86feaae8e061f2963d4fa3bf3397e211855d79d87
-doccontainersize 191756
-doccontainerchecksum 28e9874864ad9f4444c5a6f30005ef6544cc5e5a2f6101b267a49a810e8aed0d0b3a4a562562d294966c60223ed684196823a4d0a44caac236e5936aa9a1c8ec
-docfiles size=60
+containersize 7740
+containerchecksum 76920551b5d21461efadb1d171f4c6c8538e42b73d6bb672b2937f002f557c0c13d756e42da0424c594c36d0a24c669b3dbb0cf7a733322f5bba2c416e70f3d6
+doccontainersize 178240
+doccontainerchecksum 82cd2666bbf4db21a51df967693d23394566a8f161132a4f2135fd472b609bf792fe967088637f3176d1c91b05693b149faadcf5c38eddc74c3d89859fb54bbd
+docfiles size=57
RELOC/doc/latex/physics2/README.md details="Readme"
RELOC/doc/latex/physics2/phy2docdef.tex
- RELOC/doc/latex/physics2/physics2-legacy.pdf
+ RELOC/doc/latex/physics2/physics2-legacy.pdf details="physics2 manual for physics users"
RELOC/doc/latex/physics2/physics2-legacy.tex
RELOC/doc/latex/physics2/physics2.pdf details="Package documentation"
RELOC/doc/latex/physics2/physics2.tex
@@ -247555,7 +247557,7 @@ catalogue-contact-support https://github.com/AlphaZTX/physics2/issues
catalogue-ctan /macros/latex/contrib/physics2
catalogue-license lppl1.3c
catalogue-topics physics maths
-catalogue-version 0.1.1
+catalogue-version 0.2.0
name physunits
category Package
@@ -310826,7 +310828,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 66701
+revision 66708
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.
@@ -310834,11 +310836,11 @@ 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 114036
-containerchecksum e91c5b603f12a3fe49fd063dd0b13d013e122fb4ba41bbaf11a09da5b99279d3ccf00c1ba8907652979b27af81aeade8cf97875d643965e1aeb4eebb4a2df0f3
-doccontainersize 422704
-doccontainerchecksum 5c747bad0b5a13220afe78c363671c2029681d176091b20e6bd4c61e22085d4abca885c125e9671645da4dd2b764a2330a48af237a04d0168b3bd2505c04fc73
-docfiles size=535
+containersize 114028
+containerchecksum 82cb60afaeb9eaa7b8945b6f6c43eb97b27fb2636c841120b2762dbe8e08cf86ac4857b4cb255612d817ed140445843c630baa89d8aed11fb62352f18712f325
+doccontainersize 423448
+doccontainerchecksum a3f3dd576b24cc554f458118e60339a6a4b07ed257d7d650e3654fe8a052e976b1675d907618ed7fcbea0bfb5aa0c5095de23f3223e96238882dcc3f88e0a6f2
+docfiles size=537
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf
@@ -340255,18 +340257,18 @@ catalogue-topics font font-type1
name uvaletter
category Package
-revision 66330
+revision 66712
shortdesc Unofficial letterhead template for the University of Amsterdam
relocated 1
longdesc This is an unofficial LaTeX package that provides a letterhead
longdesc template for the University of Amsterdam. The design mimics the
longdesc official Word template of the University and complies with the
longdesc University's house style.
-containersize 1464
-containerchecksum fe6bf723f33fdf8f98cad6c6d48697a0282ca30d9f1ffd578137d630445235af24b20bd0a39c179de6fd74405738756005c7aebc06c44294b93219f27b6a2d4c
-doccontainersize 122460
-doccontainerchecksum bd341c2d4e2b857dc349bb19b12931e1363670d7ca28d7fa16b94b4b1e93b65e5fc125e5b1b306a0618a7accab88a856f1cf833a9892a9bfeb8b86dc98de454e
-docfiles size=36
+containersize 1480
+containerchecksum df759bb1a8acc3a770d9c4f2753c7968ec2a4bcdb2f8d68cd97e25e36a1a72e4ff5d16da3ce69059679eecb10d5de56464297159c7d3b0b8e16684b5cb97108d
+doccontainersize 39744
+doccontainerchecksum d5e076da3feb4904b0af7b6be1db59c2454784f5d9679f6f6cbde3cabde6b70b075d83126313f5938dd9d153344986a6e8b574e540b39c4fba82d513e2d61b61
+docfiles size=13
RELOC/doc/latex/uvaletter/LICENSE
RELOC/doc/latex/uvaletter/README.md details="Readme"
RELOC/doc/latex/uvaletter/demo/uvaletter-demo.pdf details="Package documentation"
@@ -340278,7 +340280,7 @@ catalogue-contact-repository https://github.com/piazzai/uvaletter
catalogue-ctan /macros/latex/contrib/uvaletter
catalogue-license mit
catalogue-topics titlepage headings
-catalogue-version 1.1.0
+catalogue-version 1.1.1
name uwa-colours
category Package
@@ -345423,7 +345425,7 @@ catalogue-version 1.10
name wargame
category Package
-revision 64797
+revision 66713
shortdesc A LaTeX package to prepare hex'n'counter wargames
relocated 1
longdesc This package can help make classic Hex'n'Counter wargames using
@@ -345438,11 +345440,11 @@ longdesc for units. The package uses TikZ for most things. The package
longdesc support exporting the game to a VASSAL module See also the
longdesc README.md file for more, and of course the documentation
longdesc (including the tutorial in tutorial/game.pdf).
-containersize 194220
-containerchecksum b06a6c8099942833cf1df089a6f2dbbfa8416a6f3bf74ea5d5411c098f1256261eb9101f95d1a61937552fe5141ed7462e774e1ed9876b2c03330a92162b4c21
-doccontainersize 2352976
-doccontainerchecksum c75c95bc543167b74466eab3b0f9a030165bca914757a5c281ea44a4cf32d1eafa61f2e6d53e811d81dbdac36942f923fc8fd82e77e718b230cfa1a430bf77c3
-docfiles size=644
+containersize 235988
+containerchecksum fa9965a291573796cefa9c64d7c76894b29460287224699f6dfe708f218b293ab5c5daad19b70e949d1efff0db4f76cfe90606ae93fa508015114607338d8f66
+doccontainersize 2483140
+doccontainerchecksum 260474bd6f44ad52b56fb7ed2ef4e0de95ef455f12cc09e8fa6c70cacd7d0853d34fa5ac8fed34912241c9aaa38f079119683b1b5fd90e82d635238d20a940ab
+docfiles size=678
RELOC/doc/latex/wargame/README.md details="Readme"
RELOC/doc/latex/wargame/compat.pdf
RELOC/doc/latex/wargame/symbols.pdf
@@ -345454,14 +345456,20 @@ docfiles size=644
RELOC/doc/latex/wargame/tutorial/game.tex
RELOC/doc/latex/wargame/tutorial/patch.py
RELOC/doc/latex/wargame/wargame.pdf details="Package documentation"
-srccontainersize 153572
-srccontainerchecksum 16e6ef9e59d0469a037a14833e234ed46cf3e693d5f3468bde9519585f2e0ca659aa66717f5a07f506ceb3540079396fc397e75508ecf06470b20dfb39a970e4
-srcfiles size=281
+srccontainersize 200984
+srccontainerchecksum 17bb297856b2c483ff5d44851a2c59f445f35137f1d535330eaad161a0470df64e17634d945fb344f61f4aeadbe3068957d41dcf561c2997017f422f47cfa5d4
+srcfiles size=381
RELOC/source/latex/wargame/Makefile
+ RELOC/source/latex/wargame/chit/battle.dtx
RELOC/source/latex/wargame/chit/core.dtx
+ RELOC/source/latex/wargame/chit/dice.dtx
RELOC/source/latex/wargame/chit/elements.dtx
RELOC/source/latex/wargame/chit/misc.dtx
+ RELOC/source/latex/wargame/chit/modifiers.dtx
+ RELOC/source/latex/wargame/chit/oob.dtx
RELOC/source/latex/wargame/chit/shape.dtx
+ RELOC/source/latex/wargame/chit/stack.dtx
+ RELOC/source/latex/wargame/chit/table.dtx
RELOC/source/latex/wargame/hex/board.dtx
RELOC/source/latex/wargame/hex/coord.dtx
RELOC/source/latex/wargame/hex/core.dtx
@@ -345470,6 +345478,7 @@ srcfiles size=281
RELOC/source/latex/wargame/hex/paths.dtx
RELOC/source/latex/wargame/hex/ridges.dtx
RELOC/source/latex/wargame/hex/shape.dtx
+ RELOC/source/latex/wargame/hex/split.dtx
RELOC/source/latex/wargame/hex/terrain.dtx
RELOC/source/latex/wargame/hex/terrain/beach.dtx
RELOC/source/latex/wargame/hex/terrain/city.dtx
@@ -345511,12 +345520,19 @@ srcfiles size=281
RELOC/source/latex/wargame/tests/chits.dtx
RELOC/source/latex/wargame/tests/map.dtx
RELOC/source/latex/wargame/tests/test.tex
+ RELOC/source/latex/wargame/util/bb.dtx
+ RELOC/source/latex/wargame/util/compound.dtx
RELOC/source/latex/wargame/util/core.dtx
+ RELOC/source/latex/wargame/util/export.dtx
+ RELOC/source/latex/wargame/util/icons.dtx
+ RELOC/source/latex/wargame/util/misc.dtx
+ RELOC/source/latex/wargame/util/randomid.dtx
+ RELOC/source/latex/wargame/util/tikz.dtx
RELOC/source/latex/wargame/utils/wgexport.py
RELOC/source/latex/wargame/utils/wgsvg2tikz.py
RELOC/source/latex/wargame/wargame.dtx
RELOC/source/latex/wargame/wargame.ins
-runfiles size=215
+runfiles size=300
RELOC/tex/latex/wargame/tikzlibrarywargame.chit.code.tex
RELOC/tex/latex/wargame/tikzlibrarywargame.hex.code.tex
RELOC/tex/latex/wargame/tikzlibrarywargame.natoapp6c.code.tex
@@ -345540,7 +345556,7 @@ catalogue-contact-support https://gitlab.com/wargames_tex/wargame_tex
catalogue-ctan /macros/latex/contrib/wargame
catalogue-license cc-by-sa-4
catalogue-topics pgf-tikz games symbol-supp
-catalogue-version 0.3.2
+catalogue-version 0.5
name warning
category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 53137f6df0..d5c3a69069 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-bfb8f4c73aab3f9bb7f8a869af90af8b texlive.tlpdb
+4428ec59737d8e65cc08cfc52af9008a texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index f3b00b3a9c..3eb7441d75 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-474cb3d20be70eed86155b288e0b8484831f51986b0f87c15bc6f72d942ef73fa65bd826304c928210cdebc2fbfef84bc9774153c34050089e9fd193c8e61af5 texlive.tlpdb
+e3bce4964767d848bc22dc93c52ea4fcc01d614c7cec2272d76c5913ffb269c6f9abc82b7e48a1c3bd017a93367a7215d9e5e6ad0ff38ae23928f4d6736aa06a texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 5b587a578e..0f4e7bc0c4 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
@@ -1,10 +1,10 @@
-----BEGIN PGP SIGNATURE-----
-iQEcBAEBCgAGBQJkJM9SAAoJEEzhh34ZQ4xweQ0H+wQIi9ONbqpVHxhRhoDpayPa
-OYwuYB3Ll4oBtv5fKGB1xvEad/NZw/sHefm3w+V+zBK7rBDGnyO3lwYenGY3WNwk
-IVDmOaExZ7clmYXmuUu54hy0QKUnsv6e1aTu/2RaK+3/lsAaeQkPSg5gP5JZ4DvR
-t03ksQ+Aka/HtpiFtB2R0Zd9wqNralhXa5gbldhG2xqT6SgBFze/MzV3mHupBqc4
-5n+OFce3Pc8hCZWK0ZQpSo4hkhJQM4OZvKzFSeyAG3Te7muthseemF4EnnUpZd0N
-PY+3K/FTs7W4eQFxu33xEGxr9dPm7pf/sz+sYKLhKKwbIYwbqetPK7Ol0Q+jNGw=
-=PPF3
+iQEcBAEBCgAGBQJkJiFgAAoJEEzhh34ZQ4xwYscH/R6aFI+PdH6RAyT0WVydr4O3
+CKRthKDJoVeqiEUGCUCUkxycp7B3I9D9xUh8dQUj2A/FF/mmrYSwmyHDebEIvT/w
+yVQRsIE4L6XCXmpl3jVcxDMlYIqli5yBIGl3ewlAEF2nzxey4ZrcdLUJiX2USeJS
+YN358/ZahFOxrOlqjZhGp6YlLTrh+pPzFqBtUVTwMP15TnjvLu9P62OJZ4bCGr4E
+hum0LVPhYLPjsKqNVZUKf/QsTEMDRx6PN/Z7AYYvUa7gLFl5z6deGxzP7zEuGITW
+7HDQ4fzDh+2fht4ZOcg/viCXhlc3lH7q7kEZwRkiLg8W+KmVnkxip1pGAihfqO4=
+=lArL
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index ee1138faa0..e503322ae3 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 d14183bc3f..2b0e949583 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-03-31-02-02
+2023-04-01-02-02