diff options
Diffstat (limited to 'Master/texmf-dist/doc/generic')
199 files changed, 1772 insertions, 178 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf Binary files differindex 2eb2bb0a713..da0dc2cbdb4 100644 --- a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf +++ b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex index 701df1e8965..f3d21083b35 100644 --- a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex +++ b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex @@ -120,7 +120,7 @@ \title{Mode d’emploi du module \ext{babel-french}} \author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}} -\newcommand*{\latestversion}{3.6b} +\newcommand*{\latestversion}{3.6c} \date{Version {\latestversion} -- \today} \begin{document} diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf Binary files differindex 44cf3388f2e..7e4ce7735bf 100644 --- a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf +++ b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf diff --git a/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md b/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md index af748dc8961..d2b576a763f 100644 --- a/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md +++ b/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md @@ -1,6 +1,17 @@ <!--- CircuiTikz - Changelog ---> The major changes among the different CircuiTikZ versions are listed here. See <https://github.com/circuitikz/circuitikz/commits> for a full list of changes. +* Version 1.7.0 (2024-08-03) + + There are no big changes here, but the change to the resistor code (maybe one of the most used by the package) well deserves a minor version bump. A couple of new components, and several minor fixes. + + - New component: new kind of current tap (suggested by [EEpchi and Dr4UX on GitHub](https://github.com/circuitikz/circuitikz/issues/807)) + - New arrow tip `Jack Tap` to help drawing jack connectors (suggested by [Anisio Rogerio Braga](https://github.com/circuitikz/circuitikz/issues/806)) + - Change the drawing of the thermocouple (suggested by [Dr4UX on GitHub](https://github.com/circuitikz/circuitikz/issues/811)) + - Change and enhancement to the drawing of the American resistors (triggered by [Dr4UX on GitHub](https://github.com/circuitikz/circuitikz/issues/814)), fixing a long-standing small asymmetry that nobody noticed + - Minor adjustment for joins in `viscoe` component + - Minor additions (`rectjoinfill`) and fixes in documentation + * Version 1.6.9 (2024-05-25) Several new components and a bug fix for a nasty long-standing bug about switching diode types. diff --git a/Master/texmf-dist/doc/generic/knuth-hint/README.md b/Master/texmf-dist/doc/generic/knuth-hint/README.md index ee62dccaa2a..ae25729c4d0 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/README.md +++ b/Master/texmf-dist/doc/generic/knuth-hint/README.md @@ -10,8 +10,8 @@ sources and their changes in parallel. Also included is the collection of Although not all the texts here are written or maintained by Donald Knuth, it is more convenient for everything to be collected in one place for reading and searching. They all stem from the system that Knuth created. The central -entry point is the ‘index’ file, with links to the individual HINT documents, -either in HTML or in PDF format. +entry point is the ‘index’ file, with links to the individual documents, either +in HTML or in PDF format. If you believe to have found anything that remains technically, historically, typographically, or politically incorrect in any of these files, please feel @@ -21,4 +21,4 @@ The “License” of the `knuth-hint` package is “Public Domain” and it cove the contents of this package, _not_ the various (and varying) “free software” licenses of the presented software codes. -This is version “2.2” of the `knuth-hint` package — 2024-03-16, Andreas Scherer. +This is version “2.5” of the `knuth-hint` package — 2024-08-12, Andreas Scherer. diff --git a/Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex-changes.hnt Binary files differindex e5c76be4b78..bb7320d22b3 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex.hnt b/Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex.hnt Binary files differindex 2e69c2120ef..2e70fdd291b 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie-changes.hnt Binary files differindex 8a061693528..bff1a33ee24 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie.hnt b/Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie.hnt Binary files differindex dc2e6464874..dbe5f3f8000 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/common-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/common-changes.hnt Binary files differindex e12b8a33668..6ef86709576 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/common-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/common-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/common.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/common.hnt Binary files differindex 2d516e598c0..084fbabe825 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/common.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/common.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle-changes.hnt Binary files differindex 6048e785175..296bf59faa6 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle.hnt Binary files differindex 5e824be2670..79c6ac05531 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctwill.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctwill.hnt Binary files differindex 8f413813a2f..d623b5327a5 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctwill.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/ctwill.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave-changes.hnt Binary files differindex d6523093010..f50e1420b73 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave.hnt Binary files differindex 2461ca986bf..9ab844070ad 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/cwebman.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/cwebman.hnt Binary files differindex 53b2217e48e..2b1c8a8bf6e 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/cwebman.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/cwebman.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort-changes.hnt Binary files differindex b8cbae7dcae..18ba2292810 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort.hnt Binary files differindex aaf28e60e4c..1b1c06b6124 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx-changes.hnt Binary files differindex 42a979c0f34..8de68935e6a 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx.hnt b/Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx.hnt Binary files differindex b1def8c2be6..6b332e3b205 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eight.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eight.hnt Binary files differindex e854b5cac6c..e0fd74b0162 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eight.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eight.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eleven.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eleven.hnt Binary files differindex 6bea192135b..4011a1fc29e 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eleven.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eleven.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.five.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.five.hnt Binary files differindex 70bc65040c1..449a9f9a044 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.five.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.five.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.four.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.four.hnt Binary files differindex 4affc611d31..c03760085c9 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.four.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.four.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.hnt Binary files differindex 69b0a6190aa..8cc4f643bb2 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.nine.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.nine.hnt Binary files differindex 575b99bee2f..9c8d455e046 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.nine.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.nine.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.one.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.one.hnt Binary files differindex cb68aa0fd14..f33068e118c 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.one.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.one.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.seven.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.seven.hnt Binary files differindex 9fec56f15b8..3e54062604e 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.seven.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.seven.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.six.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.six.hnt Binary files differindex 2208a5908d8..a12093bbb64 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.six.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.six.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.ten.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.ten.hnt Binary files differindex 66a9491861f..53b21ae7d12 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.ten.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.ten.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.three.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.three.hnt Binary files differindex f0d476ae604..bb835f803a7 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.three.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.three.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.twelve.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.twelve.hnt Binary files differindex 2d23f2e6a60..01779a9cf33 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.twelve.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.twelve.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.two.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.two.hnt Binary files differindex 423b12ccc29..f53c7ea79a1 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.two.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errata.two.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/errata/errorlog.hnt b/Master/texmf-dist/doc/generic/knuth-hint/errata/errorlog.hnt Binary files differindex b1a301b57ce..494cc3da650 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/errata/errorlog.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/errata/errorlog.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp-changes.hnt Binary files differindex a873a4fd3f6..2f6382278d5 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp.hnt b/Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp.hnt Binary files differindex d4143c4281d..baccc773686 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf-changes.hnt Binary files differindex fcdf539b8b2..b974bda31d7 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf.hnt b/Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf.hnt Binary files differindex 5998ed5aef7..f92d6ca7172 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/hitex/hitex.hnt b/Master/texmf-dist/doc/generic/knuth-hint/hitex/hitex.hnt Binary files differindex 8a5cb8d4cc4..6e4a1732642 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/hitex/hitex.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/hitex/hitex.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/index.html b/Master/texmf-dist/doc/generic/knuth-hint/index.html index 78b58c2d120..93010187cda 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/index.html +++ b/Master/texmf-dist/doc/generic/knuth-hint/index.html @@ -178,9 +178,8 @@ <code>WEB</code> and <code>CWEB</code> programs in readable format. With the exception of <code>XeTeX</code>, all documents are in the <code>HINT</code> format and can be viewed with the -<code>hintview</code> program; see <a -href="https://github.com/ruckertm/HINT">the HINT homepage</a> for the -latest version.</p> +<code>hintview</code> program, available from <a +href="https://github.com/ruckertm/HINT">the HINT homepage</a>.</p> <p>The <code>NAMED</code> entries represent the unmodified base sources as written by their respective authors, the attached <code>chg</code> links point to only the changed sections (or modules) as applied for @@ -247,7 +246,9 @@ href="web/weave.hnt"><code>WEAVE</code></a>+<a href="web/weave-changes.hnt"><code>chg</code></a> <a href="web/tangle.hnt"><code>TANGLE</code></a>+<a href="web/tangle-changes.hnt"><code>chg</code></a> <a -href="web/twill.hnt"><code>TWILL</code></a> <span>]</span></p></li> +href="web/twill.hnt"><code>TWILL</code></a><a href="#fn1" +class="footnote-ref" id="fnref1" role="doc-noteref"><sup>1</sup></a> +<span>]</span></p></li> </ul> <h2 id="complementary-web-programs-by-other-authors">Complementary WEB programs by other authors</h2> @@ -286,7 +287,8 @@ href="cweb/ctangle.hnt"><code>CTANGLE</code></a>+<a href="cweb/ctangle-changes.hnt"><code>chg</code></a> <a href="cweb/cweave.hnt"><code>CWEAVE</code></a>+<a href="cweb/cweave-changes.hnt"><code>chg</code></a><br /> -<a href="cweb/ctwill.hnt"><code>CTWILL</code></a> <a +<a href="cweb/ctwill.hnt"><code>CTWILL</code></a><a href="#fn2" +class="footnote-ref" id="fnref2" role="doc-noteref"><sup>2</sup></a> <a href="cweb/refsort.hnt"><code>REFSORT</code></a>+<a href="cweb/refsort-changes.hnt"><code>chg</code></a> <a href="cweb/twinx.hnt"><code>TWINX</code></a>+<a @@ -301,6 +303,11 @@ href="tie/tie.hnt"><code>TIE</code></a>+<a href="tie/tie-changes.hnt"><code>chg</code></a> <span>]</span></p></li> <li><p><code>hitex/</code> <span>[</span> <a href="hitex/hitex.hnt"><code>HiTeX</code></a> <span>]</span></p></li> +<li><p><code>mp/</code> <span>[</span> <a +href="mp/mp.hnt"><code>MP</code></a> <a +href="mp/mpost.hnt"><code>MPOST</code></a> <span>]</span><a href="#fn3" +class="footnote-ref" id="fnref3" +role="doc-noteref"><sup>3</sup></a></p></li> </ul> <h2 id="errata-for-computers-typesetting-by-donald-e.-knuth">Errata for “Computers & Typesetting” by Donald E. Knuth</h2> @@ -337,6 +344,24 @@ early 2014</a></p></li> </ul></li> </ul> <h2 id="happy-cweb-programming">Happy C/WEB Programming!</h2> -<p>2024-03-16 Andreas Scherer</p> +<p>2024-08-11 Andreas Scherer</p> +<section id="footnotes" class="footnotes footnotes-end-of-document" +role="doc-endnotes"> +<hr /> +<ol> +<li id="fn1"><p><code>TWILL</code> is presented here as a changed +variant of <code>WEAVE</code>.<a href="#fnref1" class="footnote-back" +role="doc-backlink">↩︎</a></p></li> +<li id="fn2"><p><code>CTWILL</code> is presented here in its own format +with a “mini-index” for every single code section.<a href="#fnref2" +class="footnote-back" role="doc-backlink">↩︎</a></p></li> +<li id="fn3"><p><code>MP</code> and <code>MPOST</code> have received +quite a few changes “behind the scenes” in order to present them in this +collection; see project <a +href="https://github.com/ascherer/mplibdir"><code>mplibdir</code></a> +for details.<a href="#fnref3" class="footnote-back" +role="doc-backlink">↩︎</a></p></li> +</ol> +</section> </body> </html> diff --git a/Master/texmf-dist/doc/generic/knuth-hint/index.pdf b/Master/texmf-dist/doc/generic/knuth-hint/index.pdf Binary files differindex 63f7fe051d2..2a06e900da1 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/index.pdf +++ b/Master/texmf-dist/doc/generic/knuth-hint/index.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mf/mf-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mf/mf-changes.hnt Binary files differindex 4417e9901cb..bc1667bd456 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/mf/mf-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/mf/mf-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mf/mf.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mf/mf.hnt Binary files differindex 1afd231b71e..eb97bb443ca 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/mf/mf.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/mf/mf.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mf/trapman.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mf/trapman.hnt Binary files differindex ce8cf0e61ee..3fcd741974b 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/mf/trapman.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/mf/trapman.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi-changes.hnt Binary files differindex 9acebf05e58..f5c7cd74e59 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi.hnt Binary files differindex d7cf17f9d50..ef5608bc686 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk-changes.hnt Binary files differindex ea1defaf64d..ce113516ddf 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk.hnt Binary files differindex b6f60cbaa12..642a1d45693 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype-changes.hnt Binary files differindex 437ba9fe60f..fa571b7a072 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype.hnt Binary files differindex 1c2df72eec1..35f95eec400 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mfware/mft-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mfware/mft-changes.hnt Binary files differindex 6b76611ecaa..d7ebe9dcd55 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/mfware/mft-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/mfware/mft-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mfware/mft.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mfware/mft.hnt Binary files differindex fb513a2a133..227297db878 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/mfware/mft.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/mfware/mft.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mp/mp.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mp/mp.hnt Binary files differnew file mode 100644 index 00000000000..062debf19d9 --- /dev/null +++ b/Master/texmf-dist/doc/generic/knuth-hint/mp/mp.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/mp/mpost.hnt b/Master/texmf-dist/doc/generic/knuth-hint/mp/mpost.hnt Binary files differnew file mode 100644 index 00000000000..b36ab061084 --- /dev/null +++ b/Master/texmf-dist/doc/generic/knuth-hint/mp/mpost.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy-changes.hnt Binary files differindex 057ed90238f..da00d6b634d 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy.hnt b/Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy.hnt Binary files differindex d200c6c0738..f70873e733f 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/other/patgen-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/other/patgen-changes.hnt Binary files differindex 523add9b509..4e1b58399d0 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/other/patgen-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/other/patgen-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/other/patgen.hnt b/Master/texmf-dist/doc/generic/knuth-hint/other/patgen.hnt Binary files differindex a451e836d22..5bdcb12c11c 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/other/patgen.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/other/patgen.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/other/pktogf-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/other/pktogf-changes.hnt Binary files differindex 95cdb945b3c..24517a168ca 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/other/pktogf-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/other/pktogf-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/other/pktogf.hnt b/Master/texmf-dist/doc/generic/knuth-hint/other/pktogf.hnt Binary files differindex c4d4ba78908..213e4904024 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/other/pktogf.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/other/pktogf.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/other/pktype-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/other/pktype-changes.hnt Binary files differindex 382d09362d4..0ab71373a78 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/other/pktype-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/other/pktype-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/other/pktype.hnt b/Master/texmf-dist/doc/generic/knuth-hint/other/pktype.hnt Binary files differindex b1430e1d380..d7011f6ac5e 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/other/pktype.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/other/pktype.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex-changes.hnt Binary files differindex 3b43c58d951..9213de8719d 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex.hnt b/Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex.hnt Binary files differindex e29767f7be6..662676c11f2 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/tex/glue.hnt b/Master/texmf-dist/doc/generic/knuth-hint/tex/glue.hnt Binary files differindex 79b62fc2b78..7d11599b64f 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/tex/glue.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/tex/glue.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/tex/tex-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/tex/tex-changes.hnt Binary files differindex 14c5b76456f..fb47d0ed426 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/tex/tex-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/tex/tex-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/tex/tex.hnt b/Master/texmf-dist/doc/generic/knuth-hint/tex/tex.hnt Binary files differindex f95932650d4..76e090eadf0 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/tex/tex.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/tex/tex.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/tex/tripman.hnt b/Master/texmf-dist/doc/generic/knuth-hint/tex/tripman.hnt Binary files differindex 45a15b24350..e6bf47fd730 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/tex/tripman.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/tex/tripman.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype-changes.hnt Binary files differindex 7ca0d271c78..f2753579cf1 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype.hnt b/Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype.hnt Binary files differindex 9d0a2a13459..d74ee84d472 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf-changes.hnt Binary files differindex f8e3a2194f0..ffbaa0ac302 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf.hnt b/Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf.hnt Binary files differindex 8599fd7c236..dc2e9231eae 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype-changes.hnt Binary files differindex 1a71d835232..2553863e055 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype.hnt b/Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype.hnt Binary files differindex f4f59ab19f3..25d9f9dc21b 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl-changes.hnt Binary files differindex 6007c4f7592..6cdbb61794e 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl.hnt b/Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl.hnt Binary files differindex 24c22cd3110..d4fe6558ee6 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/tie/tie-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/tie/tie-changes.hnt Binary files differindex 2c5e9d43c88..7dfe63c503e 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/tie/tie-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/tie/tie-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/tie/tie.hnt b/Master/texmf-dist/doc/generic/knuth-hint/tie/tie.hnt Binary files differindex 3bdfa2d76a2..c47b75268e7 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/tie/tie.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/tie/tie.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/web/tangle-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/web/tangle-changes.hnt Binary files differindex 26ff176658a..d9650623209 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/web/tangle-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/web/tangle-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/web/tangle.hnt b/Master/texmf-dist/doc/generic/knuth-hint/web/tangle.hnt Binary files differindex dcbfa4d184c..cf2e7a47b45 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/web/tangle.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/web/tangle.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/web/twill.hnt b/Master/texmf-dist/doc/generic/knuth-hint/web/twill.hnt Binary files differindex b95532ae38d..80629d0591f 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/web/twill.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/web/twill.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/web/weave-changes.hnt b/Master/texmf-dist/doc/generic/knuth-hint/web/weave-changes.hnt Binary files differindex bd8987be5a3..30d2555d4da 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/web/weave-changes.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/web/weave-changes.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/web/weave.hnt b/Master/texmf-dist/doc/generic/knuth-hint/web/weave.hnt Binary files differindex 60273e2deca..0b0014bc93c 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/web/weave.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/web/weave.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/web/webman.hnt b/Master/texmf-dist/doc/generic/knuth-hint/web/webman.hnt Binary files differindex 02b010539a8..633381144bb 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/web/webman.hnt +++ b/Master/texmf-dist/doc/generic/knuth-hint/web/webman.hnt diff --git a/Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex-changes.pdf b/Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex-changes.pdf Binary files differindex addc6ca074b..3163e99dd84 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex.pdf b/Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex.pdf Binary files differindex 5c2a1baa052..ab14c6fd00c 100644 --- a/Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex.pdf +++ b/Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/README.md b/Master/texmf-dist/doc/generic/knuth-pdf/README.md index 05c4af5d83f..e33c69526e4 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/README.md +++ b/Master/texmf-dist/doc/generic/knuth-pdf/README.md @@ -23,4 +23,4 @@ licenses of the presented software codes. In part `knuth-pdf` is an update and replacement for the `latex-tds` package. -This is version “2.2” of the `knuth-pdf` package — 2024-03-16, Andreas Scherer. +This is version “2.5” of the `knuth-pdf` package — 2024-08-12, Andreas Scherer. diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex-changes.pdf Binary files differindex eb132c79697..92952fed924 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex.pdf Binary files differindex 8f7b06ef65b..d0399eac374 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie-changes.pdf Binary files differindex cd3043bcf09..760f704cf38 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie.pdf Binary files differindex 74d9de89210..4f77e166e89 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/common-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/common-changes.pdf Binary files differindex 4c8bab8fbef..0b47ef93dc3 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/common-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/common-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/common.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/common.pdf Binary files differindex 96d5beff59b..b583ecc93c9 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/common.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/common.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle-changes.pdf Binary files differindex 4fe552304b7..b5f56741fc9 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle.pdf Binary files differindex 5586b05baf9..1cf487ec200 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctwill.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctwill.pdf Binary files differindex 34333c5509c..cd414d58803 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctwill.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctwill.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave-changes.pdf Binary files differindex 1e5780a6244..824da6b9228 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave.pdf Binary files differindex 3fecb996d35..479d905a153 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cwebman.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cwebman.pdf Binary files differindex d4b27fda3cd..aec9fe18850 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cwebman.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/cwebman.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort-changes.pdf Binary files differindex 5d3578c3336..7e36960b392 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort.pdf Binary files differindex 06282bcbc04..547a208ba00 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx-changes.pdf Binary files differindex 919204b1483..cca5496f7cf 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx.pdf Binary files differindex 7f6fb035b79..2582ef3c2d8 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.eight.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.eight.pdf Binary files differindex daa449f4366..74dcf5653c5 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.eight.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.eight.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.eleven.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.eleven.pdf Binary files differindex 8706ec864ca..f053598ed5f 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.eleven.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.eleven.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.five.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.five.pdf Binary files differindex 1a879bd82a3..d855ebf9609 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.five.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.five.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.four.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.four.pdf Binary files differindex bf53a97e6a8..393192647fb 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.four.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.four.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.nine.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.nine.pdf Binary files differindex 107192205a7..3ea1a98947a 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.nine.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.nine.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.one.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.one.pdf Binary files differindex 8567ea2dea1..c8901565e11 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.one.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.one.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.pdf Binary files differindex fad47d4c428..61e80920c1c 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.seven.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.seven.pdf Binary files differindex 1c24b632d30..095acccec31 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.seven.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.seven.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.six.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.six.pdf Binary files differindex 0cbfd71d50f..8ceb1b7211a 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.six.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.six.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.ten.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.ten.pdf Binary files differindex e992c1533e6..d1e0e7942ed 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.ten.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.ten.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.three.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.three.pdf Binary files differindex 93f2d1db946..4d018dd326f 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.three.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.three.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.twelve.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.twelve.pdf Binary files differindex 36290940496..6bb21cda75f 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.twelve.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.twelve.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.two.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.two.pdf Binary files differindex 2fb55e82f9d..42757353ea2 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.two.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errata.two.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errorlog.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errorlog.pdf Binary files differindex 3d229cb1b86..2ed6afb5b7d 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/errata/errorlog.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/errata/errorlog.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp-changes.pdf Binary files differindex 9bcefb9f5d1..09b7d47904d 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp.pdf Binary files differindex 98b32e18215..f47c22f6b9f 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf-changes.pdf Binary files differindex 82a6ac09cbd..d1ce5d4ec20 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf.pdf Binary files differindex 81941dc1f68..8169f3d7abf 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/hitex/hitex.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/hitex/hitex.pdf Binary files differindex b3abb29f28a..b4aa53714d5 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/hitex/hitex.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/hitex/hitex.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/index.html b/Master/texmf-dist/doc/generic/knuth-pdf/index.html index 6670304e645..0e8abecfa77 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/index.html +++ b/Master/texmf-dist/doc/generic/knuth-pdf/index.html @@ -241,7 +241,9 @@ href="web/weave.pdf"><code>WEAVE</code></a>+<a href="web/weave-changes.pdf"><code>chg</code></a> <a href="web/tangle.pdf"><code>TANGLE</code></a>+<a href="web/tangle-changes.pdf"><code>chg</code></a> <a -href="web/twill.pdf"><code>TWILL</code></a> <span>]</span></p></li> +href="web/twill.pdf"><code>TWILL</code></a><a href="#fn1" +class="footnote-ref" id="fnref1" role="doc-noteref"><sup>1</sup></a> +<span>]</span></p></li> </ul> <h2 id="complementary-web-programs-by-other-authors">Complementary WEB programs by other authors</h2> @@ -280,7 +282,8 @@ href="cweb/ctangle.pdf"><code>CTANGLE</code></a>+<a href="cweb/ctangle-changes.pdf"><code>chg</code></a> <a href="cweb/cweave.pdf"><code>CWEAVE</code></a>+<a href="cweb/cweave-changes.pdf"><code>chg</code></a><br /> -<a href="cweb/ctwill.pdf"><code>CTWILL</code></a> <a +<a href="cweb/ctwill.pdf"><code>CTWILL</code></a><a href="#fn2" +class="footnote-ref" id="fnref2" role="doc-noteref"><sup>2</sup></a> <a href="cweb/refsort.pdf"><code>REFSORT</code></a>+<a href="cweb/refsort-changes.pdf"><code>chg</code></a> <a href="cweb/twinx.pdf"><code>TWINX</code></a>+<a @@ -295,6 +298,11 @@ href="tie/tie.pdf"><code>TIE</code></a>+<a href="tie/tie-changes.pdf"><code>chg</code></a> <span>]</span></p></li> <li><p><code>hitex/</code> <span>[</span> <a href="hitex/hitex.pdf"><code>HiTeX</code></a> <span>]</span></p></li> +<li><p><code>mp/</code> <span>[</span> <a +href="mp/mp.pdf"><code>MP</code></a> <a +href="mp/mpost.pdf"><code>MPOST</code></a> <span>]</span><a href="#fn3" +class="footnote-ref" id="fnref3" +role="doc-noteref"><sup>3</sup></a></p></li> </ul> <h2 id="errata-for-computers-typesetting-by-donald-e.-knuth">Errata for “Computers & Typesetting” by Donald E. Knuth</h2> @@ -331,6 +339,24 @@ early 2014</a></p></li> </ul></li> </ul> <h2 id="happy-cweb-programming">Happy C/WEB Programming!</h2> -<p>2024-03-16 Andreas Scherer</p> +<p>2024-08-11 Andreas Scherer</p> +<section id="footnotes" class="footnotes footnotes-end-of-document" +role="doc-endnotes"> +<hr /> +<ol> +<li id="fn1"><p><code>TWILL</code> is presented here as a changed +variant of <code>WEAVE</code>.<a href="#fnref1" class="footnote-back" +role="doc-backlink">↩︎</a></p></li> +<li id="fn2"><p><code>CTWILL</code> is presented here in its own format +with “mini-indexes” for every two consecutive pages.<a href="#fnref2" +class="footnote-back" role="doc-backlink">↩︎</a></p></li> +<li id="fn3"><p><code>MP</code> and <code>MPOST</code> have received +quite a few changes “behind the scenes” in order to present them in this +collection; see project <a +href="https://github.com/ascherer/mplibdir"><code>mplibdir</code></a> +for details.<a href="#fnref3" class="footnote-back" +role="doc-backlink">↩︎</a></p></li> +</ol> +</section> </body> </html> diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/index.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/index.pdf Binary files differindex 0debc240090..85f27f46d9b 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/index.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/index.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mf/mf-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mf/mf-changes.pdf Binary files differindex 980465451f8..36174d09165 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/mf/mf-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/mf/mf-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mf/mf.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mf/mf.pdf Binary files differindex a4981be56bb..bec4c04e240 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/mf/mf.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/mf/mf.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mf/trapman.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mf/trapman.pdf Binary files differindex d6fa8cde57e..33cfe054a45 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/mf/trapman.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/mf/trapman.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi-changes.pdf Binary files differindex a42e872a813..71c2389b79f 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi.pdf Binary files differindex 6ec2f1b39e5..6452ded33d4 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk-changes.pdf Binary files differindex d31608e082b..f218aa113ef 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk.pdf Binary files differindex 658de054d5c..b6844b30d2d 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype-changes.pdf Binary files differindex 3044a6dfd61..2be0eeb9829 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype.pdf Binary files differindex 946e7d93d32..f70f8ddd17e 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft-changes.pdf Binary files differindex 2787bde5edd..474c7e0c296 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft.pdf Binary files differindex bfb53791aee..e65b9090629 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mp/mp.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mp/mp.pdf Binary files differnew file mode 100644 index 00000000000..66ae7db9a19 --- /dev/null +++ b/Master/texmf-dist/doc/generic/knuth-pdf/mp/mp.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/mp/mpost.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/mp/mpost.pdf Binary files differnew file mode 100644 index 00000000000..d82fe9d9719 --- /dev/null +++ b/Master/texmf-dist/doc/generic/knuth-pdf/mp/mpost.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy-changes.pdf Binary files differindex 175b9d3825a..3594481d7d9 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy.pdf Binary files differindex cb23c2abdcf..e6be8cb07a0 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/other/patgen-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/other/patgen-changes.pdf Binary files differindex c0ac24a5bc7..3dfd77b5656 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/other/patgen-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/other/patgen-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/other/patgen.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/other/patgen.pdf Binary files differindex 32cdc74562a..9a0b4c723ef 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/other/patgen.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/other/patgen.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf-changes.pdf Binary files differindex fdd897165f8..465bcde1df0 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf.pdf Binary files differindex 7246a18bc2f..3d821be8361 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/other/pktype-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/other/pktype-changes.pdf Binary files differindex b7422ecf9ef..6f426f29833 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/other/pktype-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/other/pktype-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/other/pktype.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/other/pktype.pdf Binary files differindex fd70bc33c49..35ef09e74da 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/other/pktype.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/other/pktype.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex-changes.pdf Binary files differindex 941a3ff409c..13207db99f0 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex.pdf Binary files differindex a77fbf388b7..b1820df32ea 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/tex/glue.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/tex/glue.pdf Binary files differindex 742cd78b22f..e4302312ba1 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/tex/glue.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/tex/glue.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/tex/tex-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/tex/tex-changes.pdf Binary files differindex 5047b9f720c..5c546dcb5a8 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/tex/tex-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/tex/tex-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/tex/tex.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/tex/tex.pdf Binary files differindex e82e47aea10..c84fe305e5c 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/tex/tex.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/tex/tex.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/tex/tripman.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/tex/tripman.pdf Binary files differindex 70bd03683ed..fc89c3aa729 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/tex/tripman.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/tex/tripman.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype-changes.pdf Binary files differindex 0119a3b71b2..75131be4f37 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype.pdf Binary files differindex 610eb15cf62..53c934da8b0 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf-changes.pdf Binary files differindex 79b906d3bfe..43d1c93be83 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf.pdf Binary files differindex dfc083ae720..6b64c716a4c 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype-changes.pdf Binary files differindex 1a3c866638c..291d666c053 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype.pdf Binary files differindex 9c4e5df12ad..5de30fd5a11 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl-changes.pdf Binary files differindex d46b9521dc7..4bb30ac134b 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl.pdf Binary files differindex 067b684a1a8..6ff2fdd7efd 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/tie/tie-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/tie/tie-changes.pdf Binary files differindex 8e8b95ef63a..769336535a0 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/tie/tie-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/tie/tie-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/tie/tie.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/tie/tie.pdf Binary files differindex 641ee72547e..1b4062697fe 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/tie/tie.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/tie/tie.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/web/tangle-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/web/tangle-changes.pdf Binary files differindex dac870d44d5..d0d4031dd86 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/web/tangle-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/web/tangle-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/web/tangle.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/web/tangle.pdf Binary files differindex 27741dac9b1..0bf03bfcb3b 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/web/tangle.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/web/tangle.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/web/twill.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/web/twill.pdf Binary files differindex 80d61da453e..31fb7740ab1 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/web/twill.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/web/twill.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/web/weave-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/web/weave-changes.pdf Binary files differindex 3d97d108ffe..2ac1efac3e9 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/web/weave-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/web/weave-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/web/weave.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/web/weave.pdf Binary files differindex 3095ba9b798..d8253592804 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/web/weave.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/web/weave.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/web/webman.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/web/webman.pdf Binary files differindex de6d6c1ecb3..de9016752d5 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/web/webman.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/web/webman.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex-changes.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex-changes.pdf Binary files differindex 02504c7faa0..f7288a2c973 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex-changes.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex-changes.pdf diff --git a/Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex.pdf b/Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex.pdf Binary files differindex f351e2931de..932e5ca2eb5 100644 --- a/Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex.pdf +++ b/Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex.pdf diff --git a/Master/texmf-dist/doc/generic/lt3luabridge/CHANGES.md b/Master/texmf-dist/doc/generic/lt3luabridge/CHANGES.md new file mode 100644 index 00000000000..470ad7441dc --- /dev/null +++ b/Master/texmf-dist/doc/generic/lt3luabridge/CHANGES.md @@ -0,0 +1,74 @@ +# Changes + +## 2.2.0 (2024-07-03) + +Development: + +- Automatically determine value of `\c_luabridge_default_output_dirname_str` + based on the current output directory. + (witiko/markdown#457, #26, #27, reported by @hongy19) + +Continuous Integration: + +- Automatically test the library on both Linux and Windows. + +## 2.1.0 (2024-02-14) + +Development: + +- Define function `\luabridge_tl_set:Nn`. + +## 2.0.2 (2022-10-24) + +Fixes: + +- Fix tokenization in error-reporting code. (#17, #19) +- Catch compilation errors in TeX engines other than LuaTeX. (#18, #20) + +Refactoring: + +- Remove useless uses of `\l_tmpb_tl`. (24e116d) + +## 2.0.1 (2022-08-16) + +Fixes: + +- Apply proper error handling when executing Lua via shell escape. (#15) + +## 2.0.0 (2022-08-08) + +Breaking Changes: + +- Use `\sys_get_shell:nnNTF` from l3sys instead of `\immediate\write18` and + `os.execute()`. (#13) + - Merges `\c_luabridge_method_write_eighteen_int` and + `\c_luabridge_method_os_execute_int` into + `\c_luabridge_method_shell_int`. + - Removes `\g_luabridge_standard_output_filename_str` and + `\c_luabridge_default_standard_output_filename_str`. + +Fixes: + +- Execute chunks that end with `end` or a Lua comment. (#11, #14) +- Sandbox direct Lua access. (#11, #14) +- Make nested calls defined behavior. (#8, #13) + +Refactoring: + +- Remove needless whitespaces in Lua code. +- Replace (plain) TeX primitives with `\iow_*` l3file functions. (#1, #3, + latex3/latex3#1105, latex3/latex3#1114. latex3/latex3#1117) + - Many thanks to @josephwright, @u-fischer, and @FrankMittelbach at + latex3/latex3#1114, and Hans Hagen, @hmenke, and @mojca at + [dev-context][1] for helping to make l3file compatible with ConTeXt MkII. + + [1]: https://mailman.ntg.nl/pipermail/dev-context/2022/003912.html + (A robust way of detecting ConTeXt from LaTeX3) + +## 1.0.1 (2022-06-27) + +This release includes PDF documentation of lt3luabridge. + +## 1.0.0 (2022-06-26) + +Initial release diff --git a/Master/texmf-dist/doc/generic/lt3luabridge/README.md b/Master/texmf-dist/doc/generic/lt3luabridge/README.md index a9257f4e09d..2a8f4e5125f 100644 --- a/Master/texmf-dist/doc/generic/lt3luabridge/README.md +++ b/Master/texmf-dist/doc/generic/lt3luabridge/README.md @@ -23,3 +23,8 @@ available as a separate package. [2]: https://www.ctan.org/pkg/markdown [3]: https://github.com/witiko/markdown/pull/141 [4]: https://github.com/Witiko/lt3luabridge/actions + +## Additional information + +- Author: Vít Starý Novotný <witiko@mail.muni.cz> +- License: LaTeX Project Public License (LPPL) 1.3c diff --git a/Master/texmf-dist/doc/generic/lt3luabridge/docstrip.cfg b/Master/texmf-dist/doc/generic/lt3luabridge/docstrip.cfg index e562506f72c..7298ba5794e 100644 --- a/Master/texmf-dist/doc/generic/lt3luabridge/docstrip.cfg +++ b/Master/texmf-dist/doc/generic/lt3luabridge/docstrip.cfg @@ -1,6 +1,6 @@ \preamble -Copyright (C) 2016-2024 Vít Novotný +Copyright (C) 2016-2024 Vít Starý Novotný This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/doc/generic/lt3luabridge/lt3luabridge.pdf b/Master/texmf-dist/doc/generic/lt3luabridge/lt3luabridge.pdf Binary files differindex 2972fad79fa..6370f4dbccc 100644 --- a/Master/texmf-dist/doc/generic/lt3luabridge/lt3luabridge.pdf +++ b/Master/texmf-dist/doc/generic/lt3luabridge/lt3luabridge.pdf diff --git a/Master/texmf-dist/doc/generic/markdown/CHANGES.md b/Master/texmf-dist/doc/generic/markdown/CHANGES.md index 550989a936f..922aadff91c 100644 --- a/Master/texmf-dist/doc/generic/markdown/CHANGES.md +++ b/Master/texmf-dist/doc/generic/markdown/CHANGES.md @@ -1,5 +1,34 @@ # Changes +## 3.6.2 (2024-07-14) + +Fixes: + +- Fix the interplay between inline notes and square brackets. + (#453, #456, reported by @nopria, contributed by @lostenderman) +- Fix the interplay between lists and citations. + (witiko/expltools#3, #460, #461, contributed by @lostenderman) +- Do not override the `outputDir` option if if has been defined + before loading the package and pass it to lt3luabridge library. + (#457, #459) + +Documentation: + +- Fix various typos. (#454, contributed by @mbertucci47) +- Add file `DEPENDS.txt`. (#462, #463, 93bb7e18) + +Continuous Integration: + +- Only test latest TeX Live in pull requests. (81927ca1) + +Unit Tests: + +- Test the `outputDir` plain TeX option. (#457, #459) + +Libraries: + +- Update `tinyyaml` to v0.4.4-1-g197632c. (1e83ac94) + ## 3.6.1 (2024-06-20) Fixes: @@ -704,7 +733,7 @@ Development: - Add support for strike-throughs, fenced divs, subscripts, superscripts, and fancy lists. (#149, #160, #162, #168, #170) -- Add facade in front of expl3 inferface for YAML metadata. (#118, #175) +- Add facade in front of expl3 interface for YAML metadata. (#118, #175) - Add `\setupmarkdown` and `\inputmarkdown` commands to ConTeXt. (#17, #176) Fixes: @@ -784,7 +813,7 @@ Docker: Documentation: -- Remove disfunctional badges for Docker from `README.md`. (ad00b58, 707cad9) +- Remove dysfunctional badges for Docker from `README.md`. (ad00b58, 707cad9) - Link to TUG's version of the TUG 2021 video in `README.md`. (1462411) Miscellaneous: @@ -1045,7 +1074,7 @@ Fixes: Fixes: - String text and parenthetical citations. (e6026c1) -- Escape autolink labels even when hybrid mode is enabled. (repored by @iwelch, +- Escape autolink labels even when hybrid mode is enabled. (reported by @iwelch, 693e134) - Protect LaTeX strong emphasis renderer prototype and make it detect font. (reported by @iwelch, 89a031a) diff --git a/Master/texmf-dist/doc/generic/markdown/README.md b/Master/texmf-dist/doc/generic/markdown/README.md index 1aaa42ed9ee..2a02ee9736e 100644 --- a/Master/texmf-dist/doc/generic/markdown/README.md +++ b/Master/texmf-dist/doc/generic/markdown/README.md @@ -18,7 +18,7 @@ Markdown The Markdown package converts [CommonMark][] markup to TeX commands. The functionality is provided both as a Lua module, and as plain TeX, LaTeX, and ConTeXt macro packages that can be used to directly typeset TeX documents -containing markdown markup. Unlike other convertors, the Markdown package does +containing markdown markup. Unlike other converters, the Markdown package does not require any external programs, and makes it easy to redefine how each and every markdown element is rendered. Creative abuse of the markdown syntax is encouraged. 😉 diff --git a/Master/texmf-dist/doc/generic/markdown/VERSION b/Master/texmf-dist/doc/generic/markdown/VERSION index e15dd6a469c..c2b2c7e0ab9 100644 --- a/Master/texmf-dist/doc/generic/markdown/VERSION +++ b/Master/texmf-dist/doc/generic/markdown/VERSION @@ -1 +1 @@ -3.6.1-0-g5a45a922 (2024-06-20) +3.6.2-0-g6c30af7e (2024-07-14) diff --git a/Master/texmf-dist/doc/generic/markdown/markdown.html b/Master/texmf-dist/doc/generic/markdown/markdown.html index f16477d9488..81e62b20443 100644 --- a/Master/texmf-dist/doc/generic/markdown/markdown.html +++ b/Master/texmf-dist/doc/generic/markdown/markdown.html @@ -4,7 +4,7 @@ <meta charset="utf-8" /> <meta name="generator" content="pandoc" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> - <meta name="author" content="Vít Starý Novotný" /> + <meta name="author" content="Vít Starý Novotný, Andrej Genčur" /> <title>Markdown Package User Manual</title> <style> code{white-space: pre-wrap;} @@ -92,8 +92,8 @@ <body> <header id="title-block-header"> <h1 class="title">Markdown Package User Manual</h1> -<p class="author">Vít Starý Novotný</p> -<p class="date">3.6.1-0-g5a45a922 2024-06-20</p> +<p class="author">Vít Starý Novotný, Andrej Genčur</p> +<p class="date">3.6.2-0-g6c30af7e 2024-07-14</p> </header> <nav id="TOC" role="doc-toc"> <ul> @@ -191,7 +191,7 @@ class="tex">T<sub>e</sub>X</span>, <span class="latex">L<sup>a</sup>T<sub>e</sub>X</span>, and Con<span class="tex">T<sub>e</sub>X</span>t macro packages that can be used to directly typeset <span class="tex">T<sub>e</sub>X</span> documents -containing markdown markup. Unlike other convertors, the Markdown +containing markdown markup. Unlike other converters, the Markdown package does not require any external programs, and makes it easy to redefine how each and every markdown element is rendered. Creative abuse of the markdown syntax is encouraged. <i class="em em-wink"></i></p> @@ -227,10 +227,10 @@ class="tex">T<sub>e</sub>X</span> distribution, you will need to install it.</p> <p>From <a href="https://github.com/witiko/markdown/releases" title="Releases - witiko/markdown">Releases</a>, download <a -href="https://github.com/witiko/markdown/releases/download/3.6.1/markdown.zip" -title="Release 3.6.1 - witiko/markdown">an archive +href="https://github.com/witiko/markdown/releases/download/3.6.2/markdown.zip" +title="Release 3.6.2 - witiko/markdown">an archive <code>markdown.zip</code> for this version of the Markdown package -(3.6.1)</a> or a different version that you wish to install. Then, unzip +(3.6.2)</a> or a different version that you wish to install. Then, unzip the archive. If you downloaded an archive for a different version of the Markdown package, you should now locate a file named <code>markdown.html</code> with the user manual for that version, open @@ -4720,7 +4720,7 @@ markdown markup freely.</p> <dd> <p>Enable the escaping of special plain <span class="tex">T<sub>e</sub>X</span> characters outside verbatim -environments, so that they are not interpretted by <span +environments, so that they are not interpreted by <span class="tex">T<sub>e</sub>X</span>. This is encouraged when typesetting automatically generated content or markdown documents that were not prepared with this package in mind.</p> @@ -8288,7 +8288,7 @@ options directly from <span class="latex">L<sup>a</sup>T<sub>e</sub>X</span>. For example, to set the <code>\markdownOptionInputTempFileName</code> plain <span class="tex">T<sub>e</sub>X</span> option to -<code>helper-script.lua</code>, we would inclde the following code in +<code>helper-script.lua</code>, we would include the following code in our <span class="latex">L<sup>a</sup>T<sub>e</sub>X</span> document:</p> <div class="sourceCode" id="cb477"><pre class="sourceCode tex"><code class="sourceCode latex"><span id="cb477-1"><a href="#cb477-1" aria-hidden="true" tabindex="-1"></a><span class="fu">\markdownSetup</span>{</span> @@ -9077,12 +9077,12 @@ contain the following text:</p> class="header-section-number">2.3.1.6</span> Code Block Renderers</h4> <p>The <code>\markdownRendererInputVerbatim</code> macro represents a code block. The macro receives a single argument that corresponds to the -filename of a file contaning the code block contents.</p> +filename of a file containing the code block contents.</p> <p>The <code>\markdownRendererInputFencedCode</code> macro represents a fenced code block. This macro will only be produced, when the <strong><code>fencedCode</code></strong> option is enabled. The macro receives three arguments that correspond to the filename of a file -contaning the code block contents, the fully escaped code fence +containing the code block contents, the fully escaped code fence infostring that can be directly typeset, and the raw code fence infostring that can be used outside typesetting.</p> <h5 class="unnumbered" id="latex-example-62"><span @@ -9841,7 +9841,7 @@ nutrient-rich, and produced on an industrial scale.</p> <h4 data-number="2.3.1.11" id="ellipsis-renderer"><span class="header-section-number">2.3.1.11</span> Ellipsis Renderer</h4> <p>The <code>\markdownRendererEllipsis</code> macro replaces any -occurance of ASCII ellipses in the input text. This macro will only be +occurrence of ASCII ellipses in the input text. This macro will only be produced, when the <strong><code>smartEllipses</code></strong> option is enabled. The macro receives no arguments.</p> <h5 class="unnumbered" id="plain-tex-example-30">Plain <span @@ -11581,14 +11581,14 @@ item).</p> class="header-section-number">2.3.1.31</span> Raw Content Renderers</h4> <p>The <code>\markdownRendererInputRawInline</code> macro represents an inline raw span. The macro receives two arguments: the filename of a -file contaning the inline raw span contents and the raw attribute that +file containing the inline raw span contents and the raw attribute that designates the format of the inline raw span. This macro will only be produced, when the <strong><code>rawAttribute</code></strong> option is enabled.</p> <p>The <code>\markdownRendererInputRawBlock</code> macro represents a raw block. The macro receives two arguments: the filename of a file -contaning the raw block and the raw attribute that designates the format -of the raw block. This macro will only be produced, when the +containing the raw block and the raw attribute that designates the +format of the raw block. This macro will only be produced, when the <strong><code>rawAttribute</code></strong> and <strong><code>fencedCode</code></strong> options are enabled.</p> <h5 class="unnumbered" id="latex-example-89"><span @@ -12140,7 +12140,7 @@ class="sourceCode tex"><code class="sourceCode latex"><span id="cb646-1"><a href <span id="cb646-35"><a href="#cb646-35" aria-hidden="true" tabindex="-1"></a><span class="fu">\markdownSetup</span>{</span> <span id="cb646-36"><a href="#cb646-36" aria-hidden="true" tabindex="-1"></a> renderers = {</span> <span id="cb646-37"><a href="#cb646-37" aria-hidden="true" tabindex="-1"></a> table = {<span class="co">%</span></span> -<span id="cb646-38"><a href="#cb646-38" aria-hidden="true" tabindex="-1"></a> This is a table with caption <span class="fu">\emph</span>{#1} that is #3 colums wide</span> +<span id="cb646-38"><a href="#cb646-38" aria-hidden="true" tabindex="-1"></a> This is a table with caption <span class="fu">\emph</span>{#1} that is #3 columns wide</span> <span id="cb646-39"><a href="#cb646-39" aria-hidden="true" tabindex="-1"></a> and #2 rows long.</span> <span id="cb646-40"><a href="#cb646-40" aria-hidden="true" tabindex="-1"></a> <span class="fu">\rowCounter</span>=0<span class="co">%</span></span> <span id="cb646-41"><a href="#cb646-41" aria-hidden="true" tabindex="-1"></a> <span class="fu">\def\rowTotal</span>{#2}<span class="co">%</span></span> @@ -12167,18 +12167,19 @@ class="sourceCode sh"><code class="sourceCode bash"><span id="cb647-1"><a href=" contain the following text:</p> <blockquote> <p>This is a table with caption <em>Demonstration of pipe table -syntax</em> that is 4 colums wide and 4 rows long. As for the alignment, -column number 1 is right-aligned, column number 2 is left-aligned, -column number 3 has default alignment, and column number 4 is centered. -In row 1, column number 1 says <em>Right</em>, column number 2 says -<em>Left</em>, column number 3 says <em>Default</em>, and column number -4 says <em>Center</em>. In row 2, column number 1 says <em>12</em>, -column number 2 says <em>12</em>, column number 3 says <em>12</em>, and -column number 4 says <em>12</em>. In row 3, column number 1 says -<em>123</em>, column number 2 says <em>123</em>, column number 3 says -<em>123</em>, and column number 4 says <em>123</em>. In row 4, column -number 1 says <em>1</em>, column number 2 says <em>1</em>, column number -3 says <em>1</em>, and column number 4 says <em>1</em>.</p> +syntax</em> that is 4 columns wide and 4 rows long. As for the +alignment, column number 1 is right-aligned, column number 2 is +left-aligned, column number 3 has default alignment, and column number 4 +is centered. In row 1, column number 1 says <em>Right</em>, column +number 2 says <em>Left</em>, column number 3 says <em>Default</em>, and +column number 4 says <em>Center</em>. In row 2, column number 1 says +<em>12</em>, column number 2 says <em>12</em>, column number 3 says +<em>12</em>, and column number 4 says <em>12</em>. In row 3, column +number 1 says <em>123</em>, column number 2 says <em>123</em>, column +number 3 says <em>123</em>, and column number 4 says <em>123</em>. In +row 4, column number 1 says <em>1</em>, column number 2 says <em>1</em>, +column number 3 says <em>1</em>, and column number 4 says +<em>1</em>.</p> </blockquote> <h4 data-number="2.3.1.40" id="tex-math-renderers"><span class="header-section-number">2.3.1.40</span> <span diff --git a/Master/texmf-dist/doc/generic/markdown/markdown.pdf b/Master/texmf-dist/doc/generic/markdown/markdown.pdf Binary files differindex 40adf14658a..3787cdbe80a 100644 --- a/Master/texmf-dist/doc/generic/markdown/markdown.pdf +++ b/Master/texmf-dist/doc/generic/markdown/markdown.pdf diff --git a/Master/texmf-dist/doc/generic/pst-coil/Changes b/Master/texmf-dist/doc/generic/pst-coil/Changes index d9028ebf314..c9fa1b1daeb 100644 --- a/Master/texmf-dist/doc/generic/pst-coil/Changes +++ b/Master/texmf-dist/doc/generic/pst-coil/Changes @@ -2,6 +2,7 @@ pst-coil.sty -------- 2010-02-01 message for loading the pro file pst-coil.tex -------- +v. 1.08 2024-08-13 - added alternative macro \psAltCoil v. 1.07 2015-05-13 - modified psSin v. 1.06 2011-09-18 - fix bug with \pszigzag v. 1.05 2011-07-12 - added optional argument bow for circular diff --git a/Master/texmf-dist/doc/generic/pst-coil/README b/Master/texmf-dist/doc/generic/pst-coil/README index 8f8b07cfa0e..0484bb50781 100644 --- a/Master/texmf-dist/doc/generic/pst-coil/README +++ b/Master/texmf-dist/doc/generic/pst-coil/README @@ -9,4 +9,4 @@ pst-coil-doc.bib - The documentation, bibfile -- -Herbert Voss 2006-11-05 +hoss@tug.org 2024-08-13 diff --git a/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.bib b/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.bib index b29fe53b654..1281ed1318e 100644 --- a/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.bib +++ b/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.bib @@ -60,7 +60,7 @@ author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}}, title = {The {\LaTeX} {G}raphics {C}ompanion}, publisher = {{Addison-Wesley Publishing Company}}, - edition = second, + edition = 2, year = {2007}, address = {Reading, Mass.} } diff --git a/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.pdf b/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.pdf Binary files differindex 26f0e655ba3..13ae4342bbd 100644 --- a/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.pdf +++ b/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.pdf diff --git a/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.tex b/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.tex index 201f8298c06..ebcd0aa0519 100644 --- a/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.tex @@ -1,9 +1,13 @@ -%% $Id: pst-coil-doc.tex 539 2011-07-12 08:22:33Z herbert $ -\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings - headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc} +%% $Id: pst-coil-doc.tex 930 2024-08-13 18:19:44Z herbert $ +\errorcontextlines=100 +%\RequirePackage{pdfmanagement-testphase} +\DocumentMetadata{} +\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, + headinclude=false,footinclude=false,twoside,english]{pst-doc} \listfiles -\usepackage[utf8]{inputenc} +\addbibresource{\jobname.bib} +\usepackage{csquotes,animate} \usepackage{pst-plot,pst-node,pst-coil} \SpecialCoor \let\pstFV\fileversion @@ -25,7 +29,7 @@ \author{Timothy Van Zandt\\Herbert Vo\ss\\Michael Sharpe} \date{\today} -\maketitle +\settitle \begin{abstract} Coils, springs and zigzag curves @@ -42,7 +46,7 @@ elaborated on at the corresponding places. \vfill \noindent Thanks to: -Marco Daniel, Denis Girou, Uwe Siart. +Marco Daniel, Denis Girou, Manuel Luque, Uwe Siart. \end{abstract} \clearpage @@ -561,6 +565,146 @@ Th other connections behave completely analogue to those dealt with the package \LPack{pst-node} so that no further explanations are needed here. + +\section{Alternative macro} + +The macro \Lcs{psAltCoil} depends on the code from Manuel Luque. It uses a different way +to draw coils with a kind of perspective view. The possible optional parameter are: + +\begin{itemize} + \item \Lkeyword{N}\textsf{=10} : number of coils + \item \Lkeyword{l0}\texttt{=5} : initial length in cm + \item \Lkeyword{R}\texttt{=0.5} : initial radius in cm + \item \Lkeyword{arm}\texttt{=0} : arm length in cm + \item \Lkeyword{alpha}\texttt{=15} : projection angle + \item \Lkeyword{nS}\texttt{=25} : number of steps per coil +\end{itemize} + + +\begin{LTXexample}[pos=t] +\begin{pspicture}[showgrid,arrowsize=0.2,arrowinset=0.1](-2,-1.4)(14,2) +\psAltCoil[N=20,l0=10,alpha=20,arm=0.5,linewidth=0.05]{*-*}(0,0)(11,0) +\psline[linewidth=0.5\pslinewidth](0.5,0)(0.5,1.25) +\psline[linewidth=0.5\pslinewidth](10.5,0)(10.5,1.25) +\psline{<->}(0.5,1)(10.5,1) +\uput[u](5.5,1){l0=10 cm} +\psline[linewidth=0.5\pslinewidth](0,0)(0,1.25) +\psline{>-}(-0.22,1)(0.5,1) +\uput[u](0.25,1){dl} +\psline[linewidth=0.5\pslinewidth](11,0)(11,1.25) +\psline{-<}(10.5,1)(11.25,1) +\uput[u](10.75,1){dl} +\end{pspicture} +\end{LTXexample} + + +\begin{LTXexample}[pos=t] +\begin{pspicture}[showgrid,arrowsize=0.2,arrowinset=0.1](-2,-1.4)(14,2) +\psAltCoil[N=20,l0=10,R=0.5,alpha=20,arm=0.5,linewidth=0.05]{*-*}(-2,0)(14,0) +\psline[linewidth=0.5\pslinewidth](-1.5,0)(-1.5,1.25) +\psline[linewidth=0.5\pslinewidth](13.5,0)(13.5,1.25) +\psline{<->}(-1.5,1)(13.5,1) +\uput[u](5.5,1){L=15 cm} +\psline[linewidth=0.5\pslinewidth](-2,0)(-2,1.25) +\psline{>-}(-2.25,1)(-1.5,1) +\uput[u](-1.75,1){dl} +\psline[linewidth=0.5\pslinewidth](14,0)(14,1.25) +\psline{-<}(13.5,1)(14.25,1) +\uput[u](13.75,1){dl} +\end{pspicture} +\end{LTXexample} + + + +The next animation needs Adobe Acrobat to view: + +\begin{minipage}{4cm} +\psset{unit=0.5} +\def\nFrames{44}% 44 images +\def\calc{ + /Z0 -16 def + /OMEGA 20 0.1 div sqrt def % pulsation des oscillations + /Period TwoPi OMEGA div def % 0.4442883 + /ti \rt\space def + /ZR Z0 -5 OMEGA RadtoDeg ti mul cos mul add def } +\newcommand\bille{% + \psset{linewidth=0.02,fillstyle=solid,fillcolor=yellow!50} + \pscircle*[linecolor=yellow](0,0){0.5} + \psarc[linecolor=black](0,0){0.425}{-110}{90} + \psarc[linecolor=black](0,0){0.3}{-90}{70} + \psarc[linecolor=black](0,0){0.2}{-70}{60}} + +\begin{animateinline}[controls,loop,% + begin={\begin{pspicture}(-2,1)(2,-23)}, + end={\end{pspicture}}]{5}% 5 images/s +\multiframe{\nFrames}{rt=0+0.01}{% + \psframe*(-2,1)(2,-23) + \psframe[fillstyle=hlines,linestyle=none,hatchcolor=white](-1,0)(1,0.2) + \psline[linecolor=white](-1,0)(1,0) + \psdot[linecolor=white](0,0) + \psgrid[subgriddiv=0,gridcolor=white,griddots=10,gridlabels=0pt] + \psAltCoil[arm=0.5,alpha=25,N=20,l0=10,linecolor=white,linewidth=0.05](0,0)(! 0 \calc ZR) + \rput(! 0 \calc ZR 0.5 sub){\pscircle*[linecolor=yellow](0,0){0.5}} +} +\end{animateinline} +\end{minipage}% +\begin{minipage}{\dimexpr\linewidth-4cm} +\begin{verbatim} +\psset{unit=0.75} +\def\nFrames{44}% 44 images +\def\calc{ + /Z0 -16 def + /OMEGA 20 0.1 div sqrt def + /Period TwoPi OMEGA div def % 0.4442883 + /ti \rt\space def % rt variable from animate + /ZR Z0 -5 OMEGA RadtoDeg ti mul cos mul add def } +\begin{animateinline}[controls,loop,% + begin={\begin{pspicture}(-2,1)(2,-23)}, + end={\end{pspicture}}]{5}% 5 images/s +\multiframe{\nFrames}{rt=0+0.01}{% + \psframe*(-2,1)(2,-23) + \psframe[fillstyle=hlines,linestyle=none, + hatchcolor=white](-1,0)(1,0.2) + \psline[linecolor=white](-1,0)(1,0) + \psdot[linecolor=white](0,0) + \psgrid[subgriddiv=0,gridcolor=white,griddots=10,gridlabels=0pt] + \psAltCoil[arm=0.5,alpha=25,N=20,l0=10,linecolor=white, + linewidth=0.05](0,0)(! 0 \calc ZR) + \rput(! 0 \calc ZR 0.5 sub){\pscircle*[linecolor=yellow](0,0){0.5}} +} +\end{animateinline} +\end{verbatim} +\end{minipage} + + + +\begin{LTXexample}[pos=l] +\begin{pspicture}[showgrid](0,0)(6,11) +\psAltCoil[linecolor=blue,N=20,linewidth=0.1, + alpha=-20,arm=1,arrowinset=0.1]{<->}(1,2)(5,10) +\end{pspicture} +\end{LTXexample} + + +\begin{LTXexample}[pos=l] +\begin{pspicture}[showgrid](0,0)(4,6) +\psAltCoil[linecolor=red,N=20](1,5)(3,1) +\end{pspicture} +\end{LTXexample} + + +\begin{LTXexample}[pos=t] +\begin{pspicture}[showgrid](0,-5)(16,5) +\psAltCoil[linecolor=blue,N=25,R=1,l0=5,arm=0.5,alpha=-20, + doubleline=true](0,3)(16,3) +\psAltCoil[linecolor=red,N=8,alpha=25](0,0)(4,0) +\psAltCoil[linecolor=black,N=8,alpha=25](16,0) +\psAltCoil[linecolor=blue,N=15.5,l0=5,arm=0.5,alpha=0](0,-2)(16,-2) +\end{pspicture} +\end{LTXexample} + + + \clearpage \section{List of all optional arguments for \texttt{pst-coil}} @@ -570,8 +714,7 @@ no further explanations are needed here. \nocite{*} \bgroup \RaggedRight -\bibliographystyle{plain} -\bibliography{pst-coil-doc} +\printbibliography \egroup \printindex diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/Changes b/Master/texmf-dist/doc/generic/pst-diffraction/Changes index 9f4fe42b2ba..d40c814ac75 100644 --- a/Master/texmf-dist/doc/generic/pst-diffraction/Changes +++ b/Master/texmf-dist/doc/generic/pst-diffraction/Changes @@ -1,4 +1,7 @@ pst-diffraction.tex -------- +2.06a 2024-07-15 - small fix in the documentation +2.06 2024-07-10 - fix for missing contrast option for \psdiffractionCircular (Keno Wehr) +2.05 2024-07-10 - removed unused optional argument gamma 2.04a 2024-06-29 - bugfix for the documentation header - removed german and french docs 2.04 2010-01-05 - fix bug with missing \space for keywords diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/README b/Master/texmf-dist/doc/generic/pst-diffraction/README index 86d7c0bb597..3d95ca6feb4 100644 --- a/Master/texmf-dist/doc/generic/pst-diffraction/README +++ b/Master/texmf-dist/doc/generic/pst-diffraction/README @@ -1,7 +1,7 @@ %% Package `pst-diffraction.tex' %% -%% Manuel Luque (ml _at_ pstricks.de) (France) -%% Herbert Voss (hv _at_ pstricks.de) (Germany) +%% Manuel Luque (France) +%% Herbert Voss (hvoss _at_ tug.org) (Germany) %% %% 2024-06-29 %% @@ -19,24 +19,14 @@ Save the files pst-diffraction.sty pst-diffraction.tex -pst-diffraction.pro in any place, where latex or any other TeX program will find it. -The pro file should go into $TEXMF$/dvips/pstricks/. - -pst-diffraction uses the extended version of the keyval package. So -be sure that you -- have installed xkeyval with the special pst-xkey - (CTAN: tex-archive/macros/latex/contrib/xkeyval/) -- do not load another package after pst-diffraction, which loads - the old keyval.sty or pst-key.tex You can run the documentation with -make DE -make E -make FR -or for all make all ;-) this will take a lot of time, because +make + +or for all make all ;-) this may take some time, because the images are very big. If you like to get the documentation file in another format run @@ -50,8 +40,7 @@ to get a PostScript file. But pay attention, that the pst-diffraction files are saved in the above mentioned way, before you run latex on the documentation file. -The intermediate DVI file works only with viewers which can -interprete the embedded PostScript code. +Running the files with lualatex is possible, but may take a lot of +time in fact of the heavy calculations. -For another PDF output read the introduction from -the documentation. +hvoss@tug.org diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.bib b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.bib index 737b6dbba99..0d2ecefe777 100644 --- a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.bib +++ b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.bib @@ -1,45 +1,105 @@ -@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} } +@STRING{tugboat = {TUGboat} } +@STRING{dtk = {Die {\TeX}nische Komödie} } +@STRING{bretter = {Bretter, die die Welt bedeuten } } + +@Book{companion, + author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Voß}, + title = {The {\LaTeX} Graphics Companion}, + publisher = {Lehmanns Media}, + edition = {2}, + date = {2022}, + location = {Berlin}, + note={Preprint of the english version, 2nd edition} +} + +@Article{girou:01:, + author = {Denis Girou}, + title = {Présentation de PSTricks}, + journal = {Cahier {GUT}enberg}, + year = 1994, + volume = {16}, + month = apr, + pages = {21-70} +} + +@Article{girou:02:, + author = {Timothy Van Zandt and Denis Girou}, + title = {Inside {PST}ricks}, + journal = TUGboat, + year = 1994, + volume = {15}, + month = sep, + pages = {239-246} +} @Book{PostScript, Author = {Kollock, Nikolai G.}, - Title = {PostScript richtig eingesetzt: vom Konzept zum - praktischen Einsatz}, + Title = {PostScript richtig eingesetzt: vom Konzept zum praktischen Einsatz}, Publisher = {IWT}, Address = {Vaterstetten}, year = 1989, } -@Manual{pstricks, - Title = {PSTricks - {\PS} macros for Generic TeX}, - Author = {Timothy Van Zandt}, - Organization = {}, - Address = {\url{http://www.tug.org/application/PSTricks}}, - Note = {}, - year = 1993, +@ctan{multido, +title = {The Multido package}, +subtitle = {A loop facility for Generic TeX}, +author = {Van Zandt, Timothy and Voß, Herbert and Niepraschk, Rolf}, +url = {macros/latex/multido}, +urldate = {2018-09-01}, +version = {1.42} } -@Manual{pdftricks, - Title = {PSTricks Support for pdf}, - Author = {Herbert Voss}, - Organization = {}, - Address = {\url{http://PSTricks.de/pdf/pdfoutput.phtml}}, - Note = {}, - year = 2002, +@Book{PSTricks2, + author = {Herbert Voß}, + title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX}, + edition = {7}, + publisher = {DANTE {\eV} and Lehmanns Media}, + date = {2016}, + address = {Heidelberg and Hamburg} } -@Manual{miwi, - Title = {References for \TeX{} and Friends}, - Author = {Michael Wiedmann and Peter Karp}, - Organization = {}, - Address = {\url{http://www.miwie.org/tex-refs/}}, - Note = {}, - year = 2003, +@Book{PSTricksE, + author = {Herbert Voß}, + title = {\texttt{PSTricks} -- Graphics and PostScript for \LaTeX}, + edition = {1}, + publisher = {UIT}, + date = {2011}, + address = {Cambridge -- UK} +} + +@Book{LTXquick, + author = {Herbert Voß}, + title = {{\LaTeX} quick reference}, + edition = {1}, + publisher = {UIT}, + year = {2012}, + address = {Cambridge -- UK} +} + +@Book{presentations, + author = {Herbert Voß}, + title = {Presentations with \LaTeX}, + edition = {2}, + publisher = {DANTE {\eV} and Lehmanns Media}, + year = {2019}, + address = {Heidelberg and Berlin} } +@Book{tbt, + author = {Victor Eijkhout}, + title = {\TeX\ by Topic -- {A} \TeX{}nician Reference}, + edition = {1}, + publisher = {DANTE {\eV} and Lehmanns Media}, + year = {2014}, + address = {Heidelberg and Berlin} +} + + + @Article{dtk02.1:voss:mathematischen, - author = {Herbert Vo{\ss}}, + author = {Herbert Voß}, title = {Die mathematischen {F}unktionen von {P}ostscript}, journal = dtk, year = 2002, @@ -49,7 +109,6 @@ month = mar, pages = {40-47}, annote = bretter, - keywords = {}, abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es darum geht zu beurteilen, was es denn nun im eigentlichen @@ -61,31 +120,30 @@ gezeigt. } } -@Book{companion, - author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}}, - title = {The {\LaTeX} {G}raphics {C}ompanion}, - publisher = {{Addison-Wesley Publishing Company}}, - edition = 2, - year = {2007}, - address = {Reading, Mass.} + +@Book{PostScript, + Author = {Kollock, Nikolai G.}, + Title = {PostScript richtig eingesetzt: vom Konzept zum + praktischen Einsatz}, + Publisher = {IWT}, + Address = {Vaterstetten}, + year = 1989, } -@Book{PSTricks2, - author = {Herbert Vo\ss}, - title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX}, - edition = {4.}, - publisher = {DANTE -- Lehmanns}, - year = {2007}, - address = {Heidelberg/Hamburg} +@online{pstricks, + Title = {PSTricks - {\PS} macros for Generic TeX}, + Author = {Timothy Van Zandt}, + Organization = {}, + url = {http://www.tug.org/application/PSTricks}, + year = 1993, } -@Book{LaTeXRef, - author = {Herbert Vo\ss}, - title = {\LaTeX\ Referenz}, - edition = {1.}, - publisher = {DANTE -- Lehmanns}, - year = {2007}, - address = {Heidelberg/Hamburg} + +@online{pdftricks, + Title = {PSTricks Support for pdf}, + Author = {Herbert Voß}, + url = {http://PSTricks.de/pdf/pdfoutput.phtml}, + year = 2002, } @Book{diffraction, @@ -107,12 +165,11 @@ publisher = {Society of {P}hoto {O}ptical} } -@Manual{Fresnel, +@online{Fresnel, Title = {Augustin Fresnel}, Author = {Manuel Luque}, Organization = {}, - Address = {\url{http://melusine.eu.org/syracuse/mluque/fresnel/augustin/fresnel.html}}, - Note = {}, + url = {http://melusine.eu.org/syracuse/mluque/fresnel/augustin/fresnel.html}, year = 2004 } diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.pdf b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.pdf Binary files differindex 33256a5b76f..d6e0b803aca 100644 --- a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.pdf +++ b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.pdf diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.tex b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.tex index f38f06f02e3..382907d86cc 100644 --- a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.tex @@ -1,13 +1,16 @@ %% $Id: pst-diffraction-docE.tex 134 2009-09-27 12:28:50Z herbert $ -\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings, - headexclude,footexclude,oneside]{pst-doc} -\usepackage{pst-grad,pst-diffraction} -\let\pstDiffractionFV\fileversion +\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, + headinclude=false,footinclude=false,twoside,english]{pst-doc} -\usepackage{libertinus} +%\usepackage{libertinus} \usepackage{biblatex} \addbibresource{pst-diffraction-doc.bib} +\usepackage{xurl,pst-grad,pst-diffraction} +\let\pstDiffractionFV\fileversion + + + \lstset{pos=t,wide=true,language=PSTricks, morekeywords={psdiffractionRectangle,psdiffractionCircle,psdiffractionCircular},basicstyle=\footnotesize\ttfamily} \lstdefinestyle{syntax}{backgroundcolor=\color{blue!20},numbers=none,xleftmargin=0pt,xrightmargin=0pt, @@ -16,6 +19,15 @@ frame=single} \newcommand*\psp{\texttt{pspicture}\xspace} % + +\renewcommand\bgImage{% +\begin{pspicture}(-3.5,-3.5)(3.5,3.5) +\psdiffractionCircular[f=10,showFunc=true] +\end{pspicture} +} + +\def\eV{e.\kern-1pt{}V\kern-1pt} + \begin{document} \title{\texttt{pst-diffraction}} @@ -24,21 +36,18 @@ apertures; v.\pstDiffractionFV} \author{Manuel Luque \\ Herbert Vo\ss} \docauthor{Herbert Voß} \date{\today} -\maketitle +%\maketitle +\settitle \tableofcontents - -\clearpage - -\begin{abstract} -\noindent +\psset{unit=1cm} \vfill\noindent Thanks to: Julien Cubizolles, Doris Wagner, Timothy Van Zandt, Keno Wehr, Michael Zedler. -\end{abstract} + \section{Optical setup} @@ -136,7 +145,7 @@ By default the settings are as follows: \begin{tabular}{@{}lll@{}} \Lkeyword{a}=0.2e-3 in m; & \Lkeyword{k}=1; & \Lkeyword{f}=5 in m;\\ -\Lkeyword{lambda}=650 in nm; & \Lkeyword{pixel}=0.5; & \Lkeyword{contrast}=38, greates value;\\ +\Lkeyword{lambda}=650 in nm; & \Lkeyword{pixel}=0.5; & \Lkeyword{contrast}=38, greatest value;\\ \Lkeyword{colorMode}=3; & \Lkeyword{IIID}=\false. \end{tabular} @@ -156,7 +165,7 @@ By default the settings are as follows: \end{pspicture} \hfill \begin{pspicture}(-1.5,-2.5)(3.5,3.5) -\psdiffractionRectangle[IIID,Alpha=30,f=2.5] +\psdiffractionRectangle[IIID,Alpha=30,f=2.5]% for Alpha see package pst-3dplot \end{pspicture} \end{lstlisting} @@ -200,6 +209,7 @@ By default the settings are as follows: \hfill \begin{pspicture}(-1.5,-2)(3.5,3) \psdiffractionRectangle[IIID,Alpha=20,a=0.5e-3,k=2,f=10,lambda=515,colorMode=1] +% % for Alpha see package pst-3dplot \end{pspicture} \end{lstlisting} @@ -211,6 +221,7 @@ By default the settings are as follows: \hfill \begin{pspicture}(-3.5,-1)(3.5,4) \psdiffractionRectangle[IIID,Alpha=10,a=0.5e-3,k=20,f=10,pixel=0.5,lambda=450] +% % for Alpha see package pst-3dplot \end{pspicture} \begin{lstlisting}[style=example] @@ -220,6 +231,7 @@ By default the settings are as follows: \hfill \begin{pspicture}(-3.5,-1)(3.5,4) \psdiffractionRectangle[IIID,Alpha=10,a=0.5e-3,k=20,f=10,pixel=0.5,lambda=450] +% % for Alpha see package pst-3dplot \end{pspicture} \end{lstlisting} @@ -230,7 +242,7 @@ It is also possible to render the diffraction pattern of two congruent rectangle by using the option \Lkeyword{twoSlit}. By default this option is deactivated. The distance of the two rectangles is specified by the option $s$. -The default for $s$ is $12e^{-3}\,\mathrm{m}$. +The default for $s$ is $12\cdot10^{-3}\,\mathrm{m}$. \begin{center} @@ -249,12 +261,14 @@ The default for $s$ is $12e^{-3}\,\mathrm{m}$. \begin{center} \begin{pspicture}(-2,-1)(4,4) \psdiffractionRectangle[IIID,Alpha=20,a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3] +% % for Alpha see package pst-3dplot \end{pspicture} \end{center} \begin{lstlisting}[pos=t,style=example,wide=false] \begin{pspicture}(-2,-1)(4,4) \psdiffractionRectangle[IIID,Alpha=20,a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3] +% % for Alpha see package pst-3dplot \end{pspicture} \end{lstlisting} @@ -271,9 +285,9 @@ cropped if its height exceeds the margin of the environment \Lenv{pspicture*}). \hspace*{-1cm}% \begin{LTXexample}[pos=t,style=example,wide=false] -\begin{pspicture}(-3.5,-3.5)(3.5,3.5) +\begin{pspicture*}(-3.5,-3.5)(3.5,3.5) \psdiffractionCircular[r=0.5e-3,f=10,pixel=0.5,lambda=520] -\end{pspicture} +\end{pspicture*} % \begin{pspicture}(-3.5,-1.5)(3.5,3.5) \psdiffractionCircular[IIID,r=0.5e-3,f=10,pixel=0.5,lambda=520] @@ -281,6 +295,20 @@ cropped if its height exceeds the margin of the environment \Lenv{pspicture*}). \end{LTXexample} +\begin{LTXexample}[pos=t,style=example,wide=false] +\begin{pspicture}(-3.5,-3.5)(3.5,3.5) +\psdiffractionCircular[f=10] +\end{pspicture} +\hfill +\begin{pspicture}(-3.5,-3.5)(3.5,3.5) +\psdiffractionCircular[f=10,showFunc=true] +\end{pspicture} +\end{LTXexample} + + + + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \section{Diffraction from two circular apertures} Only the case of equal radii is provided, this common radius can be defined like in the @@ -291,7 +319,7 @@ Furthermore one has to give the half distance of the circles measured from their The rendering process could take some time in this case\dots -\begin{pspicture}(-3,-3.5)(3.5,3.5) +\begin{pspicture}(-3.5,-3.5)(4,3.5) \psdiffractionCircular[r=0.5e-3,f=10,d=3e-3,lambda=515,twoHole] \end{pspicture} % @@ -312,7 +340,7 @@ The rendering process could take some time in this case\dots \hspace*{-1cm}% -\begin{pspicture}(-3,-3)(3.5,4) +\begin{pspicture}(-4,-3)(4,4) \psdiffractionCircular[r=0.5e-3,f=10,d=2e-3,lambda=700,twoHole,colorMode=0] \end{pspicture} % @@ -336,21 +364,22 @@ or $d=\frac{2r}{1.22}$ (see \url{http://www.unice.fr/DeptPhys/optique/diff/trouscirc/diffrac.html}). \hspace*{-1cm}% -\begin{pspicture}(-3,-3.5)(3,3.5) +\begin{pspicture}(-4,-3.5)(3,4.5) \psdiffractionCircular[r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole] \end{pspicture} % -\begin{pspicture}(-3.5,-1.5)(3.5,3) +\begin{pspicture}(-5,-2)(3.5,3) \psdiffractionCircular[IIID,r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole] \end{pspicture} +\bigskip \begin{lstlisting}[style=example] \begin{pspicture}(-3,-3.5)(3,3.5) \psdiffractionCircular[r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole] \end{pspicture} % -\begin{pspicture}(-3.5,-1.5)(3.5,3) +\begin{pspicture}(-5,-1.5)(3.5,3) \psdiffractionCircular[IIID,r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole] \end{pspicture} \end{lstlisting} @@ -377,7 +406,7 @@ option \Lkeyword{colorMode}=0. \makebox[\linewidth]{% \begin{pspicture}(-3,-3)(3,2.5) -\psdiffractionTriangle[f=10,h=1e-3,lambda=515,contrast=38] +\psdiffractionTriangle[f=10,h=1e-3,lambda=515,contrast=18] \end{pspicture} \quad \begin{pspicture}(-3,-3)(3,2.5) @@ -391,7 +420,7 @@ option \Lkeyword{colorMode}=0. \begin{lstlisting}[style=example] \begin{pspicture}(-3,-3)(3,2.5) -\psdiffractionTriangle[f=10,h=1e-3,lambda=515,contrast=38] +\psdiffractionTriangle[f=10,h=1e-3,lambda=515,contrast=18] \end{pspicture} \quad \begin{pspicture}(-3,-3)(3,2.5) @@ -433,9 +462,8 @@ option \Lkeyword{colorMode}=0. -\clearpage -\section{List of all optional arguments for \texttt{pst-diff}} -\Loption{pst-diff} is the short form for the keywords in the package \LPack{pst-diffraction}. +\section{List of all optional arguments for \texttt{pst-diffraction}} +%\Loption{pst-diff} is the short form for the keywords in the package \LPack{pst-diffraction}. \xkvview{family=pst-diff,columns={key,type,default}} @@ -444,7 +472,6 @@ option \Lkeyword{colorMode}=0. \raggedright \nocite{*} \printbibliography -%\bibliography{pst-diffraction-doc} \printindex diff --git a/Master/texmf-dist/doc/generic/pst-node/Changes b/Master/texmf-dist/doc/generic/pst-node/Changes index cac34e69124..6ef6294b360 100644 --- a/Master/texmf-dist/doc/generic/pst-node/Changes +++ b/Master/texmf-dist/doc/generic/pst-node/Changes @@ -1,5 +1,7 @@ ----- pst-node.tex -1.43 2021-09-15 - fix for lualatex and empty value in \psk@nrot +1.45 2024-07-10 - fix \algparnode (Erich Schmidt) +1.44 2024-07-04 - modified \psparnode and \algparnode (Erich Schmidt) +1.43 2022-10-31 - fix for lualatex and empty value in \psk@nrot 1.42a 2020-04-01 - fix typo in the documentation 1.42 2019-03-03 - bugfix for \rnode inside \psframebox* 1.41 2017-12-30 - added \psnpolygon @@ -56,12 +58,14 @@ ----- pst-node.sty +1.02 2024-07-10 - update package versions (hv) 1.01 2012-09-18 - update package versions (hv) 1.00 2011-06-05 - make ancient variant 97 available (hv) 2008-12-12 first version (hv) ----- pst-node.pro +1.15a 2024-07-10 - typos 1.15 2014-01-27 - comment out empty lines 1.14 2012-09-18 - add subroutines for global dict 1.13 2011-11-21 - fix bug for xelatex and scaling diff --git a/Master/texmf-dist/doc/generic/pst-node/README b/Master/texmf-dist/doc/generic/pst-node/README index 3f4fd08e595..29b62ef30c4 100644 --- a/Master/texmf-dist/doc/generic/pst-node/README +++ b/Master/texmf-dist/doc/generic/pst-node/README @@ -1,13 +1,10 @@ -This version of pst-node uses the xkeyval package, the extended -version of keyval. - Save the files pst-node.sty|.tex|.pro in a directory, which is part of your local TeX node. Then do not forget to run texhash to update this node if these packages are new to your TeX distribution. For more information see the documentation of your LaTeX distribution on installing packages into your LaTeX distribution or the TeX Frequently Asked Questions: -(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages). +(https://texfaq.org/#installing). pst-node needs pstricks, which should be part of your local TeX installation, otherwise get it from a CTAN server, f.ex. diff --git a/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.bib b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.bib new file mode 100644 index 00000000000..f2a5d82e847 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.bib @@ -0,0 +1,35 @@ +@Manual{pstricks2007, + Title = {PSTricks - {\PS} macros for Generic TeX. Version 1.5}, + Author = {Timothy Van Zandt}, + Organization = {}, + Address = + {\url{http://www.tug.org/tex-archive/graphics/pstricks/base/doc/pst-user.pdf}}, + Note = {}, + year = 2007, +} + + +@Manual{siart, + Title = {Befehls\"ubersicht f\"ur \texttt{PSTricks} (Version + 0.93}, + Author = {Uwe Siart}, + Organization = {}, + Address = + {\url{http://www.siart.de/typografie/pstricks-referenz.pdf}}, + Note = {}, + year = 2009, +} + + + + +@Book{PSTricks2, + author = {Herbert Vo\ss}, + title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX}, + edition = {fünfte}, + publisher = {DANTE -- Lehmanns}, + year = {2008}, + address = {Heidelberg/Hamburg} +} + + diff --git a/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.pdf b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.pdf Binary files differnew file mode 100644 index 00000000000..cb72a62b43e --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.pdf diff --git a/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.tex b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.tex new file mode 100644 index 00000000000..8ca96eab4e7 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-node/psmatrix-docDE.tex @@ -0,0 +1,1155 @@ +%% $Id: psmatrix-docDE.tex 696 2017-12-30 19:01:07Z herbert $ +\listfiles +\documentclass[11pt,ngerman,a4paper,BCOR10mm,DIV12,bibliography=totoc,parskip,smallheadings, + headexclude,footexclude,oneside]{pst-doc} +\usepackage[utf8]{inputenc} +\usepackage{babel} + +%\setlength{\parindent}{0pt} +%\setlength{\parskip}{1ex plus 0.2ex minus 0.1ex} + +\usepackage{pst-node,pst-grad,pstricks-add,pst-blur,float} +\def\tab#1{\tabular{@{}l@{}}#1\endtabular} +\def\OptEinh{\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Einheit}}\kern1pt} + +\let\myFV\fileversion + +\usepackage{tabularx} +\usepackage{longtable} + +\addbibresource{\jobname.bib} + + +\lstset{explpreset={pos=l,rframe=},frame=,backgroundcolor=\color{white},literate={ä}{{\"a}}1 {ö}{{\"o}}1 {ü}{{\"u}}1 + {Ä}{{\"A}}1 {Ö}{{\"O}}1 {Ü}{{\"U}}1 + {ß}{\ss}1} + + +\usepackage{bibgerm} + +%\psset{subgriddiv=0,gridlabels=7pt,gridcolor=black!15} +%\hypersetup{pdfauthor={Christine Roemer},pdftitle={psmatrix}} +% +\def\bgImage{\hspace*{1cm}% +\begin{psmatrix}[colsep=0.8cm,rowsep=0.4cm,mcol=c,emnode=r] + & & semantische Ebene & & + \psshadowbox[framearc=0.25]{Bedeutung}\\ + & & morphologische Ebene & & \\ +[name=A]\tab{pragmatische\\Ebene} & [name=B]& & & \\ + & & syntaktische Ebene & & \\ + & & \tab{phonetisch-phonologische Ebene\\graphische Ebene} + & & \psshadowbox[framearc=0.25]{Formativ} +\end{psmatrix} +\psset{nodesep=3pt,arrowscale=1.5,arrows=->, + armA=6mm,angleB=180} +\ncline{A}{B} +\ncangles{A}{1,3} \ncangles{A}{2,3} +\ncangles{A}{4,3} \ncangles{A}{5,3} +\ncline{1,3}{1,5} \ncline{5,3}{5,5} +\ncline{<->}{1,5}{5,5}% +} + +\lstset{basicstyle=\ttfamily\footnotesize} + +\begin{document} +\author{Timothy van Zandt\\Herbert Vo\ss} +\docauthor{Christine R\"omer} +\date{\today} +\title{Schematische \"Ubersichten mit \texttt{psmatrix}} + +\maketitle% + +\tableofcontents + +\clearpage +\begin{abstract} +Mit der +\texttt{psmatrix}-Umgebung\index{psmatrix@\texttt{psmatrix}-Umgebung} k\"onnen au{\ss}erhalb +einer mathematischen +Umgebung vielfältige schematische \"Ubersichten gesetzt werden. Das Makro \texttt{psmatrix} +wird nicht extra geladen. Es ist in verschiedene Pakete des +PSTricks-Verbundes\index{PSTricks-Verbund} +(\texttt{pstricks,\\pst-node,pst-grad})\index{pstricks@\texttt{pstricks}} +\index{pst-node@\texttt{pst-node}} \index{pst-grad@\texttt{pst-grad}} integriert + und wird mit ihnen aufgerufen. + +\vfill\noindent +Danke f\"ur die Unterst\"utzung bei der Erstellung dieser Dokumentation an Herbert Vo\ss. +\end{abstract} + + +\section{Einf\"uhrung} + +Mit der +\texttt{psmatrix}-Umgebung\index{psmatrix@\texttt{psmatrix}-Umgebung} k\"onnen +au{\ss}erhalb einer mathematischen +Umgebung schematische \"Ubersichten gesetzt werden. Sie basiert auf dem +Tabellenmakro \texttt{array}\index{array@\texttt{array}} und gleicht ihm deshalb in der +Syntax. Es hat jedoch nicht dessen +Einschr\"ankungen bez\"uglich Verbindungen über die Zellen und Zeilen hinweg. Das Makro +\texttt{psmatrix} +wird nicht extra geladen. Es ist in verschiedene Pakete des +PSTricks-Verbundes\index{PSTricks-Verbund} +(\texttt{pstricks,\\pst-node,pst-grad})\index{pstricks@\texttt{pstricks}} +\index{pst-node@\texttt{pst-node}} \index{pst-grad@\texttt{pst-grad}} integriert und +wird mit ihnen aufgerufen. + +\section{Erstellen einer Matrix} +\subsection{Einordnung} + +Das Makro \bs{\texttt{psmatrix}} arbeitet sowohl in einer \TeX - als auch +\LaTeX-Umgebung: + +\begin{BDef} +\Lcs{psmatrix}\OptArgs \ldots\ \Lcs{endpsmatrix} & \% TeX-Version\\ +\LBEG{psmatrix}\OptArgs \ldots \ \LEND{psmatrix} & \% LaTeX-Version +\end{BDef} + +Da mit der \TeX-Version einige Einschr\"ankungen verbunden sind, wird nur auf +die \LaTeX-Variante eingegangen. Das Grundprinzip des Strukturaufbaus +stellt eine Knoten- und Knotenverbindungszuordnung dar. Diese kann mehrfach +geschachtelt und sowohl bei der Knotenbelegung als auch +Verbindungsdarstellung in verschiedener Weise ausgestalltet werden. Dazu +stellt der PSTricksverbund zahlreiche Makros bereit. + +\subsection{Matrixgrundstruktur}\index{Matrixgrundstruktur} + +Die Knoten werden in der Art einer Tabelle innerhalb der +\texttt{psmatrix}-Umgebung\index{psmatrix@\texttt{psmatrix}-Umgebung} angeordnet. + +\begin{LTXexample}[width=.3\linewidth] +\begin{psmatrix}[rowsep=0.2cm] +1 & 2 & 3 \\ +X & Y & Z +\end{psmatrix} +\end{LTXexample} + + +\section{Zuordnung Knoten zu Verbindungen} + +Die Matrix entsteht durch die Zuordnung von Knoten zu Verbindungen. Die +Knoten werden in die Zellen in der \texttt{psmatrix}-Umgebung eingetragen +(siehe obiges Beispiel). Nach \bs{\texttt{end}}\{\texttt{psmatrix}\} werden die gew\"unschten +Linien definiert. Grunds\"atzlich geschieht dies nach dem Schema + +\psframebox{\bs +nc\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Verbindung}} +[\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Optionen}}] +\{Koordinaten ZelleA\}\{Koordinaten ZelleB\}} + +Die Koordinaten\index{Zellen-Koordinaten} werden, wenn den Zellen keine +Namen gegeben werden (siehe +Parameter \texttt{name}), +durch abz\"ahlen gewonnen: jeweils erst die Zeile und danach durch Komma abgetrennt +die Zelle. + +\vspace{4mm} +\begin{LTXexample}[width=.3\linewidth] +\begin{psmatrix}[rowsep=0.2cm] +1 & 2 & 3 \\ +X & Y & Z +\end{psmatrix} +\ncline[linecolor=red]{1,1}{2,2} +\ncline[linecolor=green]{1,3}{2,2} +\ncline[linestyle=dotted]{<-}{1,2}{2,1} +\ncline[linestyle=dashed]{->}{1,2}{2,3} +\end{LTXexample} + + +\section{Knotenparameter} +\subsection{mnode}\index{mnode@\texttt{mnode}} + +Der Parameter \texttt{mnode=<Knotenart>} legt die Knotenart fest. Das kann lokal für +einzelne Knoten oder global für die ganze Matrix erfolgen (siehe folgende +Beispiele). Dazu muss neben +dem Paket \texttt{pstricks}\index{pstricks@\texttt{pstricks}} auch +\texttt{pst-node}\index{pst-node@\texttt{pst-node}} geladen werden. + +\begin{LTXexample}[width=.2\linewidth] +\begin{psmatrix}[mnode=circle,rowsep=0.2cm,colsep=1cm] +1 & 2 \\ +X & Y +\end{psmatrix} +\end{LTXexample} + +\begin{LTXexample}[width=.2\linewidth] +\begin{psmatrix}[mnode=circle,rowsep=0.2cm,colsep=1cm] +1 & 2 \\ +[mnode=dia] X & Y +\end{psmatrix} +\end{LTXexample} + +Folgende \textbf{Knotenarten}\index{Knotenarten} stehen zur Verf\"ugung. Ihr Aufruf erfolgt mit +\texttt{mnode=} über die in Klammern angegebenen K\"urzel. + +\begin{compactitem} + \item \texttt{Rnode} (R):\index{Rnode@\texttt{Rnode} (R)} + Es wird damit das Eingetragene zur Basislinie + positioniert. Mittels Optionen kann dies variiert werden. +\vspace{2mm} +\begin{LTXexample}[width=.2\linewidth] +\begin{psmatrix}[rowsep=0.2cm,linecolor=blue,radius=0.5] +X & [mnode=R,vref=0pt] Y +\end{psmatrix} +\ncline{1,1}{1,2} +\end{LTXexample} + +\item \texttt{Cnode} (C):\index{Cnode@\texttt{Cnode} (C)} Ungef\"ullte Kreise werden gesetzt. +Deren Radius mit dem Parameter \texttt{radius}\index{radius@\texttt{radius}} modifiziert +werden kann. Es muss irgendetwas eingetragen werden, was dann aber nicht erscheint. +\vspace{2mm} +\begin{LTXexample}[width=.3\linewidth] +\begin{psmatrix}[mnode=C,rowsep=0.2cm,linecolor=blue,radius=0.5] + X & Y +\end{psmatrix} +\end{LTXexample} +\vspace{2mm} + +\item \texttt{pnode} (p):\index{pnode@\texttt{pnode} (p)} Ein Knoten mit dem Radius Null, ein +leerer Knoten (siehe folgendes Beispiel, wo der Knoten 1 leer gesetzt wird). + +\item \texttt{Circlenode} +(Circle):\index{Circlenode@\texttt{Circlenode} (Circle)} Ein Knoten, der von einem Kreis +umschlossen +wird, dessen Umfang richtet sich nach dem Inhalt. Er kann mit der Option +\texttt{radius} modifiziert werden (siehe obiges Beispiel). + +\vspace{2mm} +\begin{LTXexample}[width=.42\linewidth] +\begin{psmatrix}[mnode=Circle,radius=1cm,rowsep=0.2cm] + X & Y \\ +[mnode=p] 1 & 2 +\end{psmatrix} +\end{LTXexample} +\vspace{2mm} + +\item \texttt{dianode} (dia):\index{dianode@\texttt{dianode} (dia)} Ein Knoten, der von +einer Raute umschlossen +wird, deren Umfang richtet sich nach dem Inhalt + +\vspace{2mm} +\begin{LTXexample}[width=.2\linewidth] +\begin{psmatrix}[mnode=dia,rowsep=0.2cm,colsep=0.7cm] + X & Y \\ + 1 & 2 +\end{psmatrix} +\end{LTXexample} +\vspace{2mm} + +\item \texttt{dotnode} (dot):\index{Rnode@\texttt{dotnode} (dot)} Es wird im unmarkierten +Fall ein gef\"ullter Kreisknoten gesetzt, der +u.\,a. \"uber den Parameter \texttt{dotscale} gesteuert +werden kann. + +\vspace{2mm} +\begin{LTXexample}[width=.2\linewidth] +\begin{psmatrix}[mnode=dot,rowsep=0.2cm] +[mnode=dot,dotscale=3] X & Y \\ +[mnode=dot,dotscale=2,dotstyle=triangle]1&2 +\end{psmatrix} +\end{LTXexample} +\vspace{2mm} + +\item \texttt{rnode} (r):\index{Rnode@\texttt{rnode} (r)} +Unterscheidet sich von \bs{rnode} (R) in der +Festlegung des Knotenzentrums, das ohne optionale Parameter das Zentrum +der umgebenden Box ist. Eingesetzter "`Text"' erscheint pur. + +\vspace{2mm} +\begin{LTXexample}[width=.2\linewidth] +\begin{psmatrix}[mnode=r,rowsep=0.2cm] + X & Y \\ + 1 & 2 +\end{psmatrix} +\end{LTXexample} +\vspace{2mm} + + + +\item \texttt{fnode} (f):\index{fnode@\texttt{fnode} (f)} Ein leerer +Rahmen, dessen Gr\"o{"s}e \"uber +\texttt{framesize=} und +Koordinatenfestlegungen beeinflusst werden kann.%\footnote{Diese Funktion +%ist bisher nur eingeschr\"ankt nutzbar, die K\"astchen einer Zeile werden nicht getrennt. +%Mit "`Text"' gef\"ullte K\"astchen k\"onnen einfach mit \bs{\texttt{fbox}\{ +%\}} oder \bs{\texttt{psframebox}\{ \}} gesetzt werden.} + +\vspace{2mm} +\begin{LTXexample}[width=.2\linewidth] +\begin{psmatrix}[mnode=f,rowsep=0.2cm] + X & Y \\ + 1 & 2 +\end{psmatrix} +\end{LTXexample} +\vspace{2mm} + + +\item \texttt{circlenode} +(circle):\index{circlenode@\texttt{circlenode} (circle)} Entspricht +weitgehend \texttt{Circlenode}. Es +kann aber nicht der Radius ge\"andert werden. + +\vspace{2mm} +\begin{LTXexample}[width=.2\linewidth] +\begin{psmatrix}[mnode=circle,rowsep=0.2cm,colsep=1cm] + X & Y \\ + 1 & 2 +\end{psmatrix} +\end{LTXexample} +\vspace{2mm} + +\item \texttt{ovalnode} (oval):\index{ovalnode@\texttt{ovalnode} (oval)} Ovaler Knoten, +dessen Gr\"o"se aus dem Inhalt resultiert. + +\vspace{2mm} +\begin{LTXexample}[width=.2\linewidth] +\begin{psmatrix}[mnode=oval,rowsep=0.2cm,colsep=0.7cm] + XX & YY \\ + 1 & 2 +\end{psmatrix} +\end{LTXexample} +\vspace{2mm} + + +\item \texttt{trinode} (tri):\index{trinode@\texttt{trinode} (tri)} +Dreieck, dessen Gr\"o"se aus dem Inhalt resultiert. + +\vspace{2mm} +\begin{LTXexample}[width=.2\linewidth] +\begin{psmatrix}[mnode=tri,rowsep=0.2cm,colsep=0.7cm] + X & Y \\ + 1 & 2 +\end{psmatrix} +\end{LTXexample} +\vspace{2mm} + +Mit der Option \texttt{trimode}\index{trimode@\texttt{trimode}} kann die Lage der Dreiecke verändert +werden. Die Sternversion verkleinert die Basis und erzeugt aus +stumpfwinkligen (Winkel zwischen 90 und 180 Grad) spitzwinkelige (kleiner +als 90 Grad) Dreiecke. +\vspace{2mm} +\begin{table}[H] +\centering +\caption{Ver\"anderung der Dreieckslage} +\begin{tabular}{@{}ll@{}} +Befehl & Lage des Dreiecks \\ \hline +\texttt{trimode=U} & Spitze oben \\ +\texttt{trimode=D} & Spitze unten \\ +\texttt{trimode=R} & Spitze rechts \\ +\texttt{trimode=L} & Spitze links +\end{tabular} +\end{table} + +\vspace{2mm} +\begin{LTXexample}[width=.25\linewidth] +\begin{pspicture}(0,-2)(3,2) +\begin{psmatrix}[mnode=tri,rowsep=0.2cm,colsep=0.7cm] + [trimode=U] Dreieck \\ + [trimode=*D]Dreieck +\end{psmatrix} +\end{pspicture} +\end{LTXexample} +\vspace{2mm} + + + \item \texttt{no node} (none):\index{no node@\texttt{no node} (none)} Ohne Knoten, was für das + Einf\"ugen von Verbindungslinien sinnvoll sein kann. + + +\end{compactitem} + + + +\subsection{emnode}\index{emnode@\texttt{emnode}} + +Mit \texttt{emnode} k\"onnen verschiedene Arten (Parameter wie bei +\texttt{mnode} von Knoten für "`leere"' Zellen gesetzt +werden. Es muss also nichts in die Zellen eingetragen werden. Wie +nachfolgendes Beispiel auch belegt, kann es dabei auf der rechten Seite zu +fehlerhaften Ausgaben kommen, weil +\bs{pst-node}\index{pst-node@\texttt{pst-node}} da noch nicht v\"ollig korrekt +arbeitet. + + +\vspace{2mm} +\begin{LTXexample}[width=.2\linewidth] +\begin{psmatrix}[emnode=circle,rowsep=0.2cm,colsep=2cm] + & \\ + & +\end{psmatrix} +\end{LTXexample} +\vspace{2mm} + +\subsection{nodealign}\index{nodealign@\texttt{nodealign}} + +Der Parameter \texttt{nodealign} kann in [\texttt{nodealign=true}] +abge\"andert werden, um das Zentrum des Knotens auf die Basisebene zu +verschieben (vgl. \cite[S.\,259]{PSTricks2}). + +\section{Parameter zu Zellen und Zeilen} + +\subsection{name}\index{name@\texttt{name}} + +Der Parameter \texttt{name} erm\"oglicht es, jeder Zelle einen +selbstgew\"ahlten Namen zu geben, der am Anfang einer Zelle eingef\"ugt werden +muss. Dies kann beim Setzen von Linien die +Arbeit erleichtern, man muss dann nicht die Positionen ausz\"ahlen. + +\vspace{2mm} +\begin{LTXexample}[width=.4\linewidth] +\begin{psmatrix}[emnode=r,colsep=0.4cm, + rowsep=0.4cm] + & [name=A] Buch & \\ +[name=B]Fachbuch & [name=C]Lehrbuch & [name=D]Roman +\end{psmatrix} +\psset{nodesep=3pt,arrows=->} +\ncline{A}{B} \ncline{A}{C} \ncline{A}{D} +\end{LTXexample} +\vspace{2mm} + + +Au"serdem ist es \"uber diese Zellenfestlegung m\"oglich, auch \Lcs{pcline} und +\Lcs{psline} in einer Matrixumgebung zu benutzen. Diese nehmen die +Koordinatenargumente (hier gleich Zellennamen) aber in runden Klammern, wie +in dem folgenden Beispiel zu sehen ist. + +\vspace{2mm} +\begin{LTXexample}[width=.45\linewidth] +\begin{psmatrix}[emnode=r,colsep=1cm, + rowsep=0.4cm] +[name=A]Buch \psspan{3} & \\[1cm] +[name=B]Fachbuch & [name=C]Lehrbuch & +[name=D]Roman +\end{psmatrix} +\psset{nodesep=3pt,arrows=->,linecolor=red} +\psline(A)(C) +\pcline(A)(B) +\nbput*[nrot=:D]{\footnotesize \texttt{pcline}} +\ncline{A}{D} +\naput*[nrot=:U]{\footnotesize \texttt{ncline}} +\end{LTXexample} + +\Lcs{pcline} geht immer vom Zentrum aus und kann nicht an einer +Umgebungsbox beginnen oder aufh\"oren. Sie kann deshalb von +\texttt{nodesep} nicht beeinflusst werden. Andere Parameter -- +beispielsweise \texttt{offset=},\index{offset@\texttt{offset}} der eine vertikale Verschiebung +erm\"oglicht, -- k\"onnen das aber schon. \Lcs{psline} +reagiert wiederum darauf nicht. + +\vspace{2mm} +\begin{LTXexample}[width=.3\linewidth] +\begin{psmatrix}[emnode=r,colsep=1cm,rowsep=0.4cm] +[name=A]Fachbuch & \\[1cm] + & [name=C]Roman +\end{psmatrix} +\psset{nodesep=3pt,arrows=<-,linecolor=red,offset=0.3cm} +\pcline(A)(C) +\pcline(C)(A) +\end{LTXexample} + +\begin{LTXexample}[width=.3\linewidth] +\begin{psmatrix}[emnode=r,colsep=1cm,rowsep=0.4cm] + [name=A] Fachbuch & \\[1cm] + & [name=C] Roman +\end{psmatrix} +\psset{nodesep=3pt,arrows=->,linecolor=red,offset=1cm} +\psline(A)(C) +\psline(C)(A) +\end{LTXexample} + + + +\subsection{mcol}\index{mcol@\texttt{mcol}} + +Mit \texttt{mcol} kann lokal und global der horizontale +Zellenabstand\index{Zellenabstand!horizontal} +mit den Optionen \texttt{l,r,c} modifiziert werden. + +\vspace{2mm} +\begin{LTXexample}[width=.4\linewidth] +\begin{psmatrix}[emnode=r,colsep=0.4cm, + rowsep=0.4cm,mcol=r] + & [name=A] Buch & \\ +[name=B]Fachbuch & [name=C]Lehrbuch & [name=D]Roman +\end{psmatrix} +\psset{nodesep=3pt,arrows=->} +\ncline{A}{B} \ncline{A}{C} \ncline{A}{D} +\end{LTXexample} +\vspace{2mm} + +\begin{LTXexample}[width=.4\linewidth] +\begin{psmatrix}[emnode=r,colsep=0.4cm, + rowsep=0.4cm,mcol=l] + & [name=A]Buch & \\ +[name=B]Fachbuch & [name=C]Lehrbuch & [name=D]Roman +\end{psmatrix} +\psset{nodesep=3pt,arrows=->} +\ncline{A}{B} \ncline{A}{C} \ncline{A}{D} +\end{LTXexample} + +\subsection{rowsep und colsep}\index{Abstand!Zellen und Zeilen} + +Mit \texttt{rowsep}\index{rowsep@\texttt{rowsep}} kann man den +vertikalen und mit \texttt{colsep}\index{colsep@\texttt{colsep}} +den horizontalen Abstand zwischen +den Zeilen bzw. Zellen regulieren; welchen hinzuf\"ugen oder mit einem +negativen Wert reduzieren (siehe Beispiele bei \texttt{name}). + +\subsection{mnodesize}\index{mnodesize@\texttt{mnodesize}} + +Im Defaultfall wird die Breite der Zellen\index{Zelle!Breite} von deren Inhalt bestimmt; +innerhalb einer Zellenspalte von der mit dem gr\"o"sten Umfang. Mit +\texttt{mnodesize=} kann allen Spalten dieselbe Breite gegeben werden. +Dabei ist zu beachten, dass kein automatischen +Zeilenumbruch\index{Zelle!Zeilenumbruch} in den Zellen +erfolgt. Man kann in eine Zelle jedoch mehrere Zeilen über eine Tabelle +einbringen. + +\begin{LTXexample}[width=.52\linewidth] +\begin{psmatrix}[emnode=r, +colsep=-0.4cm,rowsep=0.6cm, +mnodesize=3cm] +& [name=A] + \begin{tabular}{c}Grafische\\Grundelemente\end{tabular} & \\ +[name=B]Linien & [name=C]Polygone & +[name=D]Rahmen +\end{psmatrix} +\psset{nodesep=3pt,arrows=->} +\ncline{A}{B} \ncline{A}{C} +\ncline{A}{D} +\end{LTXexample} + +Wenn der von \texttt{mnodesize=} festgelegte Raum nicht ausreichend ist +erweitert sich einfach die Zelle. + +\subsection{psspan}\index{psspan@\texttt{psspan}} + +Mit \texttt{psspan\{n\}} k\"onnen Zellen analog zu +\bs{multicolumn}\index{multicolumn@\texttt{\textbackslash{multicolumn}}} mehrere +Zellen\index{Zellen!zusammenfassen} zusammengefasst werden. + +\begin{LTXexample}[width=.4\linewidth] +\begin{psmatrix}[emnode=r,colsep=0.4cm, +rowsep=0.4cm] +[name=A]Buch \psspan{3} & \\ +[name=B]Fachbuch & [name=C]Lehrbuch & [name=D]Roman +\end{psmatrix} +\psset{nodesep=3pt,arrows=->} +\ncline{A}{B} \ncline{A}{C} \ncline{A}{D} +\end{LTXexample} + + +\section{Knotenverbindungen}\index{Knotenverbindung} + +Die Knotenverbindungen beginnen in der Regel mit \texttt{nc} und haben die Syntax: + +\begin{BDef} +\bs{Knotenverbindung}\OptArgs\{Pfeile\}\{KnotenA\}\{KnotenB\} +\end{BDef} + +Sie gehen von einem Knoten zu einem anderen, wenn es nicht anders festgelegt +wurde, ist die Zielorientierung die Knotenmitte. + +Die Knotenverbindungen können über eine Reihe von Parametern geändert +werden (vgl. \cite[S.\,43\,f]{PSTricks2} und \cite{siart}). Einige, die für das Zeichnen von +Strukturen besonders relevant sind, werden in der nachfolgenden Tabelle +aufgelistet:\index{Knotenverbindung!Parameter} + +\begin{table}[H] +\centering +\caption{Parameter f\"ur Knotenverbindungen} +\begin{tabular}{@{}lll@{}} +Name & Werte & Vorgabe \\ \hline +\texttt{linewidth} & <Wert>\OptEinh\ & 0.8pt \\ +\texttt{linecolor} & <Farbe> & black \\ +\texttt{linestyle} & none|solid|dotted|dashed & solid \\ +\texttt{shadow} & <an (true)/aus (false)> & false \\ +\texttt{shadowsize} & <Wert>\OptEinh\ & 3pt \\ +\texttt{shadowangle} & <Winkel> & $-$45 \\ +\texttt{shadowcolor} & <Farbe> & darkgray \\ +\texttt{arrows} & <Pfeiltyp> & -- \\ +\texttt{doubleline} & <true/false> & false +\end{tabular} +\end{table} + +\subsection{ncline} + +Mit \Lcs{ncline} wird eine direkte Linie von einem Knoten zum anderen +gezogen\footnote{Wenn Sie das nächste Beispiel mit den +folgenden Beispielen vergleichen, können Sie auch sehen, dass eine bessere +Positionierung in einer einfachen Box über die Umgebung +\bs{\texttt{pspicture}} +m\"oglich ist. Zumal ohne diese Umgebung die Kurvenlinien \"uber die Box +hinausragen w\"urden, wie dies im ersten Beispiel zu \texttt{ncdiag} der +Fall ist.}. + +\begin{LTXexample}[width=.35\linewidth] +\begin{psmatrix}[emnode=r,colsep=2cm] + KnotenX & KnotenY +\end{psmatrix} +\ncline[linecolor=red]{1,1}{1,2} +\end{LTXexample} + + +\subsection{ncarc}\xLcs{ncarc} + +Eine Kurve verbindet die Knoten. + +\begin{LTXexample}[width=.35\linewidth] +\begin{pspicture}(0,-0.5)(4,1) +\begin{psmatrix}[emnode=r,colsep=2cm] + KnotenX & KnotenY +\end{psmatrix} +\ncarc[linecolor=red]{<->}{1,1}{1,2} +\end{pspicture} +\end{LTXexample} + +Mit der Option \texttt{arcangle=}\index{arcangle@\texttt{arcangle}} kann der +Steigungswinkel\index{Steigungswinkel} erh\"oht werden. + +\begin{LTXexample}[width=.35\linewidth] +\begin{pspicture}(0,-0.5)(4,1) +\begin{psmatrix}[emnode=r,colsep=2cm] + KnotenX & KnotenY +\end{psmatrix} +\ncarc[arcangle=60,linecolor=red]{<->}{1,1}{1,2} +\end{pspicture} +\end{LTXexample} + +In der Sternchenversion wird der von der Kurve eingeschlossenen Raum mit +der Linienfarbe ausgefüllt. + +\begin{LTXexample}[width=.4\linewidth] +\begin{pspicture}(0,-0.5)(4,1) +\begin{psmatrix}[emnode=r,colsep=2cm] + KnotenX & KnotenY +\end{psmatrix} +\ncarc*[arcangle=60,linecolor=red]{<->}{1,1}{1,2} +\end{pspicture} +\end{LTXexample} + + +\subsection{ncdiag} + +Mit \Lcs{ncdiag} wird eine Linie in drei Segmente "`zerlegt"'. Man kann +diese Zerlegung über die Winkelfestlegungen (siehe folgendes Beispiel) +steuern. + +\begin{LTXexample}[width=.4\linewidth] +\begin{psmatrix}[emnode=r,colsep=2cm] + KnotenX & KnotenY +\end{psmatrix} +\ncdiag[angleA=90,angleB=-90,linecolor=red]{<->}{1,1}{1,2} +\end{LTXexample} + +Die Angabe \texttt{arm=0}\index{arm@\texttt{arm}} erzwingt eine gerade Linie. + +\begin{LTXexample}[width=.4\linewidth] +\begin{psmatrix}[emnode=r,colsep=2cm] + KnotenX & KnotenY +\end{psmatrix} +\ncdiag[angleA=-90,angleB=90,arm=0,linecolor=red]{<->}{1,1}{1,2} +\end{LTXexample} + +\subsection{ncdiagg} + +\Lcs{ncdiagg} ist \Lcs{ncdiag} \"ahnlich. Für den Ausgangsknoten wird aber +nur eine Verbindung gezeichnet. + +\begin{LTXexample}[width=.3\linewidth] +\usepackage{pstricks-add} +\begin{pspicture}(-1,-1)(4,6) + \circlenode{A}{A}\quad\circlenode{C}{C} + \rput(0,4){\circlenode{B}{B}} + \rput(1,5){\circlenode{D}{D}} + {\psset{arrowscale=2,linearc=0.2, + linecolor=red,armA=0.5,angleA=90} + \ncdiagg[lineAngle=-160]{->}{A}{B} + \ncput*[nrot=:U]{Linie I} + \ncdiagg[lineAngle=-160]{->}{C}{D} + \ncput*[nrot=:U]{Linie II}} +\end{pspicture} +\end{LTXexample} + +\subsection{ncbar} + +\Lcs{ncbar} arbeitet ähnlich wie \Lcs{ncdiag}. Zwei Knoten werden +durch drei Linienteile verbunden. + +\begin{LTXexample}[width=.4\linewidth] +\begin{pspicture}(0,1)(4,-2) +\begin{psmatrix}[emnode=r] +\psset{arrowscale=2} +Verbinde {\rnode{A}{KnotenX}} mit +{\rnode{B}{KnotenY}}! +\end{psmatrix} +\ncbar[nodesep=3pt,angleA=-90,angleB=90,linecolor=red,arrows=<->,arrowscale=2, +arm=0.8]{A}{B} +\end{pspicture} +\end{LTXexample} + + +\subsection{ncbarr} + +\Lcs{ncbarr} verwendet f\"unf Liniensegmente und erstellt damit eine +S-f\"ormige Verbindung. + +\begin{LTXexample}[width=.3\linewidth] +\begin{psmatrix} + & \circlenode{X}{X}\\[1cm] + & \circlenode{Y}{Y} +\end{psmatrix} +\ncbarr[angleA=0,linecolor=red]{X}{Y} +\end{LTXexample} + + +\subsection{ncangle} + +\Lcs{ncangle} erm\"oglich genauer berechnete dreiteilige Linien. Es +arbeitet analog zu \Lcs{ncdiag}. + +\begin{LTXexample}[width=.37\linewidth] +\begin{pspicture}(0,1)(4,-1) +\begin{psmatrix}[emnode=r,colsep=2cm, + rowsep=0.5cm] +KnotenX & KnotenY \\ +\end{psmatrix} +\ncdiag[angleA=-90,angleB=135,armA=1cm,armB=1cm, +linearc=.5,linecolor=red]{->}{1,1}{1,2} +\end{pspicture} +\end{LTXexample} + +\subsection{ncangles} + +\Lcs{ncangles} produziert viergliedrige Linien. + +\begin{LTXexample}[width=.4\linewidth] +\begin{pspicture}(0,1)(4,-2.3) +\begin{psmatrix}[emnode=r,colsep=2cm, + rowsep=0.5cm] +\psframebox{\emph{KnotenX}} & +\psframebox{\emph{KnotenY}} +\end{psmatrix} +\ncangles[angleA=-90,angleB=135,armA=1cm, + armB=1cm, +linearc=.15,linecolor=red]{->}{1,1}{1,2} +\rput[bl](-5,-0.7){armA} +\rput[rB](-0.4,0.5){armB} +\end{pspicture} +\end{LTXexample} + +\subsection{ncloop} + +\Lcs{ncloop} setzt f\"unfgliedrige Linien. Gegenüber \Lcs{ncangles} +kommt noch die Option \texttt{loopsize}\index{loopsize@\texttt{loopsize}} hinzu, die die +H\"ohe für einen Loop (eine Schlinge) vorgibt. + + +\begin{LTXexample}[width=.45\linewidth] +\begin{pspicture}(-1.5,-1)(4,2) +\rnode[lB]{A}{\psframebox{Knoten mit Schlinge}} +\ncloop[angleB=180,loopsize=1,arm=.5, + linearc=.2,linecolor=red]{->}{A}{A} +\ncput[npos=3.5,nrot=:U]{\psline{|<->|}% + (0.5,-0.2)(-0.5,-0.2)} +\nbput[npos=3.5,nrot=:D,labelsep=.35cm]{% + {\small\texttt{loopsize}}} +\end{pspicture} +\end{LTXexample} + +\subsection{nccurve} + +\Lcs{nccurve} setzt eine B\`ezierkurve zwischen zwei Knoten, die über +die Winkel \texttt{angleA} und \texttt{angleB} sowie den +Kurvenparameter\index{Kurvenparameter} +\texttt{ncurv}\index{nccurv@\texttt{nccurv}} gesteuert werden kann. + +\begin{LTXexample}[width=.4\linewidth] +\begin{psmatrix}[emnode=r,colsep=2cm, +rowsep=0.5cm] +{\rnode{A}{\psframebox{KnotenX}}} & \\ +& {\rnode{B}{\psframebox{KnotenY}}} +\end{psmatrix} +\nccurve[angleB=180,ncurv=0.9, +linecolor=red]{A}{B} +\end{LTXexample} + +\subsection{nccircle} + +\Lcs{nccircle} erzeugt \"uber einem Knoten einen ungef\"ullten oder gef\"ullten +(Sternchenversion) Kreis. + +\vspace{2mm} +\begin{LTXexample}[width=.25\linewidth] +\begin{pspicture}(-1,-1)(3,2) +\begin{psmatrix}[emnode=r] +\rnode{A}{herum} +\end{psmatrix} +\nccircle[nodesep=3pt,linecolor=red]{->}{A}{.8cm} +\kern 5pt +\end{pspicture} +\end{LTXexample} + +\vspace{2mm} +\begin{LTXexample}[width=.25\linewidth] +\begin{pspicture}(-1,-1)(3,2) +\begin{psmatrix}[emnode=r] +\rnode{A}{dar\"uber} +\end{psmatrix} +\nccircle*[nodesep=3pt,linecolor=lightgray]{->}{A}{1cm} +\kern 5pt +\end{pspicture} +\end{LTXexample} + +\subsection{offset} + +Die Option \texttt{offset}\index{offset@\texttt{offset}} verschiebt, wie +schon bei den Erl\"auterungen zu dem Parameter \texttt{name} angesprochen, +die Verbindungslinie parallel zum eigentlich festgelegten Verlauf. Dies ist +besonders bei zwei Linien sinnvoll und effektiv. +Wenn man jede Linien einzeln modifizieren m\"ochte, kann dies mit +\texttt{offsetA}\index{offsetA@\texttt{offsetA}} und +\texttt{offsetB}\index{offsetB@\texttt{offsetB}} +geschehen. Beispielsweise, wenn von +einem Knoten zwei Verbindungen ausgehen sollen. + +\vspace{2mm} +\begin{LTXexample}[width=.2\linewidth] +\begin{psmatrix}[emnode=r,colsep=1cm,rowsep=0.4cm] +[name=A]Buch \\ +[name=B]Fachbuch \\ +[name=C]\LaTeX buch +\end{psmatrix} +\psset{nodesep=3pt,arrows=->,linecolor=red,offset=0.3cm} +\pcline[offsetA=0.3cm](A)(B) +\pcline[offsetB=-0.3cm](A)(C) +\end{LTXexample} + + +\section{Linien beschriften}\index{Linienbeschriftung} + +\subsection{Beschriftung einf\"ugen} + +\psframebox{\parbox{0.65\textwidth}{ +\bs ncput\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{*} +[\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Optionen}}] +\{Beschriftung auf der Linie\}\\ +\bs naput\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{*} +[\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Optionen}}] +\{Beschriftung \"uber der Linie\}\\ +\bs nbput\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{*} +[\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Optionen}}] +\{Beschriftung unter der Linie\} +}} + +\begin{LTXexample}[width=.4\linewidth] +\begin{pspicture}(0,1)(4,-2) +\begin{psmatrix}[emnode=r] +\psset{arrowscale=2} +Verbinde {\rnode{A}{KnotenX}} mit +{\rnode{B}{KnotenY}}! +\end{psmatrix} +\ncbar[nodesep=3pt,angleA=-90,angleB=90, +linecolor=red,arrows=<->,arrowscale=2,arm=0.8] +{A}{B} +\ncput*{auf} +\naput*{\"uber} +\nbput*{unter} +\end{pspicture} +\end{LTXexample} + +Die angegebene Sternchenversion ist besser geeignet, da sie die Linien +überschreibt und damit die Beschriftungen besser sichtbar sind (vgl. mit +der nachfolgenden Beispielversion ohne Sternchen). Das betrifft besonders +die \texttt{naput}-Version. + +\begin{LTXexample}[width=.4\linewidth] +\begin{pspicture}(0,1)(4,-2) +\begin{psmatrix}[emnode=r] +\psset{arrowscale=2} +Verbinde {\rnode{A}{KnotenX}} mit +{\rnode{B}{KnotenY}}! +\end{psmatrix} +\ncbar[nodesep=3pt,angleA=-90,angleB=90, +linecolor=red,arrows=<->,arrowscale=2,arm=0.8] +{A}{B} +\ncput{auf} +\naput{\"uber} +\nbput{unter} +\end{pspicture} +\end{LTXexample} + +Ohne die Angabe von Optionen wird die Beschriftung auf den sichtbaren +Linienteil geschrieben. Sie orientiert sich dabei an der Linienmitte. +Mit \texttt{npos=}\index{npos@\texttt{npos}} und +\text{nrot=}\index{nrot@\texttt{nrot}} kann diese Orientierung ge\"andert werden. + +Mit \Lcs{psset}\{labelset=\} kann der Abstand zwischen Label und Linie +reguliert werden. Wenn der Wert auf 0pt gesetzt wird (also direkt über oder +unter der Linie, sollte f\"ur \Lcs{naput} bzw. \Lcs{nbput} nicht die +Sternchenversion gew\"ahlt werden, die wahrscheinlich ohnehin nur f\"ur +\Lcs{ncput} sinnvoll scheint. Die Nullversion ist immer dann zu nehmen, +wenn es Probleme mit dem Sichtbarmachen des Labels gibt. + +\subsection{npos} + +\texttt{npos} ermöglicht die Platzierung der Beschriftung auf den +verschiedenen Segmenten des entsprechenden Linientyps. Die Zahl gibt vor +dem Punkt die Segmentnummer (0,1,2,\ldots) und nach dem Punkt den Abstand +zum Segmentanfang an. Im folgenden Beispiel bekommt die Beschriftung den +Wert 1.2 und steht damit auf dem zweiten Liniensegment 20\% vom +Segmentanfang. + +\begin{table}[H] +\centering +\caption{Zusammenstellung der Kurzformen für die Drehwinkel}\label{tab:wind} + \begin{tabular}{@{}l|*{8}{>{\ttfamily}c}@{}} + \emph{Buchstabe} & U & L & D & R & N & W & S & E \\\hline + \emph{Bedeutung} & Up& Left&Down&Right&North&West&South&East\\ + \emph{Enstprechung} &0&90&180&270&*0&*90&*180&*270 +% +% \begin{tabular}{@{}>{\ttfamily}llr@{}} +% \textrm{Buchstabe} & Bedeutung & Winkel\\\hline +% U & Up & 0\\ +% L & Left & 90\\ +% D & Down & 180\\ +% R & Right & 270\\ +% N & North & *0\\ +% W & West & *90\\ +% S & South & *180\\ +% E & East & *270 + \end{tabular} +\end{table} + +\begin{LTXexample}[width=.4\linewidth] +\begin{pspicture}(0,1)(4,-2) +\begin{psmatrix}[emnode=r] +\psset{arrowscale=2} +Verbinde {\rnode{A}{KnotenX}} mit +{\rnode{B}{KnotenY}}! +\end{psmatrix} +\ncbar[nodesep=3pt,angleA=-90,angleB=90, +linecolor=red,arrows=<->,arrowscale=2,arm=0.8] +{A}{B} +\ncput*[npos=1.2]{auf} +\end{pspicture} +\end{LTXexample} + + +\subsection{nrot} + +\texttt{nrot=:Winkel/K\"urzel} erm\"oglicht es die Beschriftung zu +drehen: + +\begin{table}[htb] +\centering\tabcolsep=3pt +\caption{Vergleich der verschiedenen Knotenverbindungen bez\"uglich ihrer +Segmentanzahl}\label{tab:segmente} +\hspace*{-1em} +\begin{tabular}{@{} lccc | lccc @{}} +\emph{Verbindung} & \emph{Segm.} & \emph{Bereich} & \emph{Vorgabe} & +\emph{Verbindung} & \emph{Segm.} & \emph{Bereich} & \emph{Vorgabe}\\\hline + \Lcs{ncline} & $1$ & $0\leq npos\leq 1$ & $0.5$ & + \Lcs{nccurve} & $1$ & $0\leq npos\leq 1$ & $0.5$\\ + \Lcs{ncarc} & $1$ & $0\leq npos\leq 1$ & $0.5$ & + \Lcs{ncbar} & $3$ & $0\leq npos\leq 3$ & $1.5$\\ + \Lcs{ncdiag} & $3$ & $0\leq npos\leq 3$ & $1.5$ & + \Lcs{ncdiagg} & $2$ & $0\leq npos\leq 2$ & $0.5$\\ + \Lcs{ncangle} & $3$ & $0\leq npos\leq 3$ & $1.5$ & + \Lcs{ncangles} & $4$ & $0\leq npos\leq 4$ & $1.5$\\ + \Lcs{ncloop} & $5$ & $0\leq npos\leq 5$ & $2.5$ & + \Lcs{nccircle} & $1$ & $0\leq npos\leq 1$ & $0.5$\\ +\end{tabular} +\end{table} + + +\begin{LTXexample}[width=.4\linewidth] +\begin{pspicture}(0,1)(4,-2) +\begin{psmatrix}[emnode=r] +\psset{arrowscale=2} +Verbinde {\rnode{A}{KnotenX}} mit +{\rnode{B}{KnotenY}}! +\end{psmatrix} +\ncbar[nodesep=3pt,angleA=-90,angleB=90, +linecolor=red,arrows=<->,arrowscale=2,arm=0.8] +{A}{B} +\ncput*[nrot=:L]{auf} +\end{pspicture} +\end{LTXexample} + +\section{Strukturbeispiele} + + + +Jetzt sollen noch einige wenige Beispiele von Struktur\"ubersichten +vorgestellt werden, die von mir in der \texttt{pstmatrix}-Umgebung gesetzt wurden. + +\begin{figure}[H]\centering +\begin{psmatrix}[colsep=0.8,rowsep=0.8] +\psframebox[fillcolor=red!40,fillstyle=solid,doubleline=true] +{$\left[\tabular{c}GF: /Pinguin/\\ WA: +N\endtabular\right]$} + & \psframebox[fillcolor=yellow!40,fillstyle=solid]{Vogel} \\ +\psframebox[fillcolor=blue!40,fillstyle=solid,doubleline=true]{\tabular{l}aufrecht\\ gehend\endtabular} + & \psshadowbox[fillcolor=red,fillstyle=solid,shadow=true,blur=true,shadowsize=5pt]{\textbf{Pinguin}} & + \psframebox[fillcolor=blue!40,fillstyle=solid,doubleline=true]{flugunfähig}\\ + & \psframebox[fillcolor=green!40,fillstyle=solid]{Felsenpinguin} +\end{psmatrix} +\ncline{1,1}{2,2} \naput{s} +\ncline{1,2}{2,2} \naput{ob} +\ncline{2,1}{2,2} \naput{a} +\ncline{2,2}{2,3} \naput{a} +\ncline{2,2}{3,2} \naput{ub} +\caption{Ein Frame} +\end{figure} + +\begin{lstlisting}[language={[LaTeX]TeX},basicstyle=\rmfamily\small,backgroundcolor={\color{yellow!20}},frame=single] +\usepackage{pst-node,pst-blur} +\begin{psmatrix}[colsep=0.8,rowsep=0.8] +\psframebox[fillcolor=red!40,fillstyle=solid,doubleline=true] +{$\left[\tabular{c}GF: /Pinguin/\\ WA: +N\endtabular\right]$} + & \psframebox[fillcolor=yellow!40,fillstyle=solid]{Vogel} \\ +\psframebox[fillcolor=blue!40,fillstyle=solid,doubleline=true]{\tabular{l}aufrecht\\ gehend\endtabular} + & \psshadowbox[fillcolor=red,fillstyle=solid,shadow=true,blur=true,shadowsize=5pt]{\textbf{Pinguin}} & + \psframebox[fillcolor=blue!40,fillstyle=solid,doubleline=true]{flugunfähig}\\ + & \psframebox[fillcolor=green!40,fillstyle=solid]{Felsenpinguin} +\end{psmatrix} +\ncline{1,1}{2,2} \naput{s} +\ncline{1,2}{2,2} \naput{ob} +\ncline{2,1}{2,2} \naput{a} +\ncline{2,2}{2,3} \naput{a} +\ncline{2,2}{3,2} \naput{ub} +\end{lstlisting} + + +\begin{figure}[H]\centering +\begin{psmatrix}[colsep=0.8,rowsep=0.8] +\psset{shortput=nab,framesep=10pt} + \psshadowbox[framearc=0.25,fillcolor=blue!20,fillstyle=solid,doubleline=true]{Lebewesen} & + \psframebox[fillcolor=yellow!40,fillstyle=solid]{allgemeine Kategorisierung}\\ + \psshadowbox[framearc=0.25,fillcolor=red!40,fillstyle=solid,doubleline=true]{\textbf{Löwe}} +& \psframebox[fillcolor=red!40,fillstyle=solid,doubleline=true]{Basisebene}\\ + \psshadowbox[framearc=0.25,fillcolor=blue!20,fillstyle=solid,doubleline=true]{Höhlenlöwe} +& \psframebox[fillcolor=green!30,fillstyle=solid]{spezielle Kategorisierung} +\end{psmatrix} +\psset{nodesep=2pt,arrows=->} +\ncline[arrowscale=2]{1,1}{2,1} +\ncline[arrowscale=2]{2,1}{3,1} +\caption{Eine konzeptuelle Kategorisierung} +\end{figure} + +\begin{lstlisting}[language={[LaTeX]TeX},basicstyle=\rmfamily\small,backgroundcolor={\color{yellow!20}},frame=single] +\begin{psmatrix}[colsep=0.8,rowsep=0.8] +\psset{shortput=nab,framesep=10pt} + \psshadowbox[framearc=0.25,fillcolor=blue!20,fillstyle=solid,doubleline=true]{Lebewesen} & + \psframebox[fillcolor=yellow!40,fillstyle=solid]{allgemeine Kategorisierung}\\ + \psshadowbox[framearc=0.25,fillcolor=red!40,fillstyle=solid,doubleline=true]{\textbf{Löwe}} +& \psframebox[fillcolor=red!40,fillstyle=solid,doubleline=true]{Basisebene}\\ + \psshadowbox[framearc=0.25,fillcolor=blue!20,fillstyle=solid,doubleline=true]{Höhlenlöwe} +& \psframebox[fillcolor=green!30,fillstyle=solid]{spezielle Kategorisierung} +\end{psmatrix} +\psset{nodesep=2pt,arrows=->} +\ncline[arrowscale=2]{1,1}{2,1} +\ncline[arrowscale=2]{2,1}{3,1} +\end{lstlisting} + +\begin{figure}[H]\centering +\psset{framearc=0.2,shadow=true,fillstyle=solid,shadowcolor=black!55} +\begin{psmatrix}[colsep=0,rowsep=0.9] + & & \psframebox[fillcolor=blue!30]{Synchronie}\\ + & \psframebox[fillcolor=red!30]{Sprache} & \\ + & & \psframebox[fillcolor=blue!30]{Diachronie} \\ +\psframebox[fillcolor=red!30]{Menschliche Rede} & & \\ + & \psframebox[fillcolor=red!30]{Sprechen} & + \end{psmatrix} + \psset{shadow=false} +\ncline[arrows=->,arrowscale=2]{2,2}{1,3} +\ncline[arrows=->,arrowscale=2]{2,2}{3,3} +\ncline[arrows=->,arrowscale=2]{4,1}{2,2} +\ncline[arrows=->,arrowscale=2]{4,1}{5,2} +\caption{F. de Saussure zu Sprache} +\end{figure} + +\begin{lstlisting}[language={[LaTeX]TeX},basicstyle=\rmfamily\small,backgroundcolor={\color{yellow!20}},frame=single] +\psset{framearc=0.2,shadow=true,fillstyle=solid,shadowcolor=black!55} +\begin{psmatrix}[colsep=0,rowsep=0.9] + & & \psframebox[fillcolor=blue!30]{Synchronie}\\ + & \psframebox[fillcolor=red!30]{Sprache} & \\ + & & \psframebox[fillcolor=blue!30]{Diachronie} \\ +\psframebox[fillcolor=red!30]{Menschliche Rede} & & \\ + & \psframebox[fillcolor=red!30]{Sprechen} & + \end{psmatrix} + \psset{shadow=false} +\ncline[arrows=->,arrowscale=2]{2,2}{1,3} +\ncline[arrows=->,arrowscale=2]{2,2}{3,3} +\ncline[arrows=->,arrowscale=2]{4,1}{2,2} +\ncline[arrows=->,arrowscale=2]{4,1}{5,2} +\end{lstlisting} + +\begin{figure}[H] \centering +\begin{psmatrix}[emnode=r,colsep=0.5cm,rowsep=0.5cm,mcol=c] + & & & & <Metall> & \\ + & & & [mnode=oval] 18 & &\\ + <WERKZEUG> & & & & & \\ + & & & &[mnode=tri] 12 &\\ + & & & & & <arbeiten> \\ + & & [mnode=C,linestyle=dashed,radius=0.5,mcol=l] & & &\\ + \fbox{12} & & & \fbox{51} & & \\ + & \fbox{36} & & & <Hammer> &\\ + <Feile> & & <Zange> & & & +\end{psmatrix} +\psset{arrowscale=2,labelsep=0pt} +\ncline{->}{1,5}{2,4} +\ncarc{->}{4,5}{2,4}\naput[npos=0.4]{OBJ} +\ncarc{->}{6,3}{4,5}\naput[npos=0.4]{INSTR} +\ncline{<->}{6,3}{3,1} +\ncarc{->}{6,3}{7,1}\naput[npos=0.4]{UB} +\ncarc{->}{6,3}{7,4}\naput[npos=0.4]{UB} +\ncarc{->}{6,3}{8,2}\naput[npos=0.4]{UB} +\ncarc{->}{9,1}{7,1} \ncarc{->}{9,3}{8,2} +\ncarc{->}{8,5}{7,4} \ncline{->}{5,6}{4,5} +\caption{Begriffliches Merkmalsnetz nach Hoffmann} +\end{figure} + +\begin{lstlisting}[language={[LaTeX]TeX},basicstyle=\rmfamily\small,backgroundcolor={\color{yellow!20}},frame=single] +\begin{psmatrix}[emnode=r,colsep=0.5cm,rowsep=0.5cm,mcol=c] + & & & & <Metall> & \\ + & & & [mnode=oval] 18 & &\\ + <WERKZEUG> & & & & & \\ + & & & &[mnode=tri] 12 &\\ + & & & & & <arbeiten> \\ + & & [mnode=C,linestyle=dashed,radius=0.5,mcol=l] & & &\\ + \fbox{12} & & & \fbox{51} & & \\ + & \fbox{36} & & & <Hammer> &\\ + <Feile> & & <Zange> & & & +\end{psmatrix} +\psset{arrowscale=2,labelsep=0pt} +\ncline{->}{1,5}{2,4} +\ncarc{->}{4,5}{2,4}\naput[npos=0.4]{OBJ} +\ncarc{->}{6,3}{4,5}\naput[npos=0.4]{INSTR} +\ncline{<->}{6,3}{3,1} +\ncarc{->}{6,3}{7,1}\naput[npos=0.4]{UB} +\ncarc{->}{6,3}{7,4}\naput[npos=0.4]{UB} +\ncarc{->}{6,3}{8,2}\naput[npos=0.4]{UB} +\ncarc{->}{9,1}{7,1} \ncarc{->}{9,3}{8,2} +\ncarc{->}{8,5}{7,4} \ncline{->}{5,6}{4,5} +\end{lstlisting} + +\newpage +\bgroup +\appendix + +%\addcontentsline{toc}{section}{Literaturverzeichnis} + +\nocite{*} +\raggedright + +\printbibliography +\egroup +\clearpage +\addcontentsline{toc}{section}{Index} +\printindex + + +\end{document} + + diff --git a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf Binary files differindex 8be7b3ec525..f8bebfdf1e0 100644 --- a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf +++ b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf diff --git a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex index 5ff16cb6cf5..a4d0faa9642 100644 --- a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex @@ -1,7 +1,8 @@ -\RequirePackage{pdfmanagement-testphase} -\DeclareDocumentMetadata{} -%% $Id: pst-node-doc.tex 438 2022-01-31 17:45:26Z herbert $ -\documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, +%\RequirePackage{pdfmanagement-testphase} +\DocumentMetadata{} +%% $Id: pst-node-doc.tex 920 2024-07-11 07:41:04Z herbert $ +\documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false, + headings=small, headinclude=false,footinclude=false,oneside]{pst-doc} \listfiles @@ -75,7 +76,8 @@ when also running the main package \LPack{pstricks} with this option. \vfill \noindent -Thanks to: Marco Daniel; Denis Girou; Thomas Iyer; Rolf Niepraschk; Sebastian Rahtz; Andi Setiawan; +Thanks to: Marco Daniel; Denis Girou; Thomas Iyer; Rolf Niepraschk; Sebastian Rahtz; +Erich Schmidt; Andi Setiawan; \end{abstract} \clearpage @@ -1356,7 +1358,7 @@ Here is how I used \Lcs{nput} to mark an angle in a previous example: \end{pspicture} \end{LTXexample} -\clearpage%%%%%%%%%%%%%%%%%%%%%%%%%% +%\clearpage%%%%%%%%%%%%%%%%%%%%%%%%%% For the put macros there are several possibilities: @@ -1411,7 +1413,7 @@ will produce the same effect as \end{LTXexample} -\clearpage%%%%%%%%%%%%%%%%%%%%%%%%% +%\clearpage%%%%%%%%%%%%%%%%%%%%%%%%% \subsection{Normal behavior with rotation} If there are a point $B$ of type node and a point $A$ of any type then @@ -1589,7 +1591,7 @@ connections: You can include the node connections inside the \Lcs{psmatrix}, in the last entry and right before \Lcs{endpsmatrix}. One advantage to doing this is that -\Lkeyset{shortput=tab} is the default within a \Lcs{psmatrix}. +\Lkeyset{shortput=tab} is the default within a \Lcs{psmatrix}.\label{tab} \begin{LTXexample} $ \begin{psmatrix} @@ -2489,13 +2491,12 @@ For example, \end{pspicture} \end{LTXexample} - \begin{BDef} \Lcs{fnpnode}\Largb{xval}\Largb{expression in x}\Largb{nodename} \end{BDef} - sets a single node on the graph. Eg, + sets a single node on the graph, eg: \begin{verbatim} \fnpnode{.5}{x x 1 add mul 2 div}{P} @@ -2507,7 +2508,12 @@ For example, \end{verbatim} If your expression in \texttt{t} is algebraic, you must specify the keyword \texttt{algebraic}, as in - \Lcs{fnpnode}\verb|[algebraic]{0.5}{x*(x+1)/2}{P}|. + + +\begin{verbatim} +\fnpnode[algebraic]{0.5}{x*(x+1)/2}{P} +\end{verbatim} + \begin{LTXexample}[width=.35\textwidth] \begin{pspicture}[showgrid](-.5,-.5)(2.5,3) @@ -2574,7 +2580,7 @@ turn a list of coordinates into a node sequence P0 P1 ... \begin{LTXexample}[width=.35\textwidth] \begin{pspicture}[showgrid,algebraic](-.5,-.5)(2.5,2) \pnodes{B}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4) -%definesuP0..P3--now join them +% defines P0..P3 -- now join them \psnline[arrowscale=2]{-D>}(0,3){B} \end{pspicture} \end{LTXexample} @@ -2635,7 +2641,7 @@ Conversion between any angle unit and radian unit \begin{LTXexample}[width=.35\textwidth] \begin{pspicture}[showgrid,algebraic](-.5,-.5)(2.5,2) \pnodes{P}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4) -%defines P0..P3--now join them +% defines P0..P3 -- now join them \psncurve[arrowscale=2]{-D>}(0,3){P} \end{pspicture} \end{LTXexample} @@ -2644,7 +2650,7 @@ Conversion between any angle unit and radian unit \begin{LTXexample}[width=.35\textwidth] \begin{pspicture}[showgrid,algebraic](-.5,-.5)(2.5,2) \pnodes{P}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4) -%defines P0..P3--now join them +% defines P0..P3 -- now join them \psnccurve[arrowscale=2]{-D>}(0,3){P} \end{pspicture} \end{LTXexample} @@ -2753,7 +2759,7 @@ line from \verb|<basept>+<nodexpr1>| to \verb|<basept>+<nodexpr2>|. \curvepnode{2}{\pfn}{P}% sets P, Ptang \normalvec(Ptang){Q}\uput[-45](P){P} \psxline[linecolor=red]{<->}(P){-(Ptang)}{1.5(Ptang)} -\psxline[linecolor=blue]{->}(P){}{.5(Q)}%can use } for {(0,0)} +\psxline[linecolor=blue]{->}(P){}{.5(Q)}% can use {} for {(0,0)} \end{pspicture} \end{LTXexample} \vspace{2pc} diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news24.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news24.pdf Binary files differindex bbc7bf404d2..e102b8a602a 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news24.pdf +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news24.pdf diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news24.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news24.tex index 3fb53580ab3..bf357b88d48 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news24.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news24.tex @@ -41,6 +41,12 @@ broken. Added a test for \verb|lualatex| before the default linewidth and color are set. See last line in \verb|pstricks.tex| +Moved macro \Lcs{clipbox} to \Lcs{psclipbox} to prevent a clash with package +\LPack{adjustbox} +from Martin Scharrer. + + + \section{\LuaLaTeX}\label{lua} This version has a stable basic support for the lua package \LPack{luapstricks.lua}, available from \url{https://github.com/zauguin/luapstricks}. diff --git a/Master/texmf-dist/doc/generic/pstricks/pstricks-bug.tex b/Master/texmf-dist/doc/generic/pstricks/pstricks-bug.tex index b5f9ba2c32c..d4e0329dd39 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pstricks-bug.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pstricks-bug.tex @@ -97,7 +97,7 @@ % 15. When lines are very short, linestyle=dash may cause an error. % PATCH: Input this file. % -% 16. \clipbox does not work. +% 16. \psclipbox does not work. % PATCH: Input this file. % % 17. Various nodes are missing \leavevmode, which can cause irregularities @@ -509,8 +509,8 @@ stroke> % 16. -\def\clipbox{\@ifnextchar[{\clipbox@}{\clipbox@[\z@]}} -\def\clipbox@[#1]{\pst@makebox\clipbox@@{#1}} +\def\psclipbox{\@ifnextchar[{\psclipbox@}{\psclipbox@[\z@]}} +\def\psclipbox@[#1]{\pst@makebox\psclipbox@@{#1}} % 20. \def\mixed@coor#1#2{% |