summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-04-23 03:00:42 +0000
committerNorbert Preining <norbert@preining.info>2022-04-23 03:00:42 +0000
commit4acee1a3ab0aae587d4f0a4327141056ee7e6081 (patch)
tree1cde72d1e942ae756d750c665cd346533074171b
parentc65c806536b3d6b228d5d71f0e0c835968a3733a (diff)
CTAN sync 202204230300
-rw-r--r--FILES.byname758
-rw-r--r--FILES.byname.gzbin2418035 -> 2418094 bytes
-rw-r--r--FILES.last07days738
-rw-r--r--graphics/pgf/contrib/circuitikz/doc/changelog.tex71
-rw-r--r--graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdfbin17674 -> 17645 bytes
-rw-r--r--graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdfbin1485592 -> 1518613 bytes
-rw-r--r--graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex301
-rw-r--r--graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty10
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty (renamed from graphics/pgf/contrib/circuitikz/tex/circutikz-0.9.6.sty)0
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/circuitikz.sty5
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex317
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex440
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex99
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex28
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex2
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex997
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex735
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex195
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex4
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex5
-rw-r--r--macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdfbin40811 -> 40812 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdfbin201045 -> 201047 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalnotes.pdfbin199196 -> 199198 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-sidenotes.pdfbin295847 -> 295846 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-tabular.pdfbin284803 -> 284805 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdfbin200373 -> 200374 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses.pdfbin200204 -> 200202 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-antilabe.pdfbin209856 -> 209856 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-cross_referencing.pdfbin199199 -> 199200 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdfbin202702 -> 202703 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-glossaries.pdfbin284462 -> 284461 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-indexing.pdfbin283598 -> 283595 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdfbin277764 -> 277763 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdfbin293260 -> 293260 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-linespacing.pdfbin288423 -> 288423 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdfbin290106 -> 290106 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-notes-width.pdfbin205925 -> 205926 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdfbin211562 -> 211560 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-performances.pdfbin286175 -> 286176 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdfbin31501 -> 31502 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdfbin309311 -> 309317 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdfbin287548 -> 287548 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdfbin199051 -> 199051 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdfbin23425 -> 23436 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdfbin174535 -> 174535 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdfbin32047 -> 32047 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdfbin288679 -> 288680 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdfbin199948 -> 199951 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdfbin199183 -> 199183 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdfbin177026 -> 177024 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdfbin199590 -> 199585 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdfbin198522 -> 198512 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdfbin198573 -> 198564 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdfbin198707 -> 198700 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdfbin213256 -> 213255 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdfbin211867 -> 211866 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdfbin204143 -> 204143 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdfbin297127 -> 297136 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdfbin203251 -> 203250 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdfbin224508 -> 224505 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdfbin249192 -> 249189 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdfbin203970 -> 203977 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdfbin199821 -> 199821 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdfbin301523 -> 301520 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdfbin206311 -> 206315 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdfbin195383 -> 195381 bytes
-rw-r--r--macros/latex/contrib/reledmac/migration.pdfbin368877 -> 367961 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledmac.dtx2
-rw-r--r--macros/latex/contrib/reledmac/reledmac.pdfbin2065249 -> 2046154 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledpar.dtx20
-rw-r--r--macros/latex/contrib/reledmac/reledpar.pdfbin1006705 -> 1006519 bytes
-rw-r--r--macros/latex/contrib/zref-check/CHANGELOG.md11
-rw-r--r--macros/latex/contrib/zref-check/MANIFEST.md284
-rw-r--r--macros/latex/contrib/zref-check/zref-check-code.pdfbin741661 -> 742306 bytes
-rw-r--r--macros/latex/contrib/zref-check/zref-check-code.tex2
-rw-r--r--macros/latex/contrib/zref-check/zref-check.dtx37
-rw-r--r--macros/latex/contrib/zref-check/zref-check.ins4
-rw-r--r--macros/latex/contrib/zref-check/zref-check.pdfbin451832 -> 452289 bytes
-rw-r--r--macros/latex/contrib/zref-check/zref-check.tex2
-rw-r--r--macros/latex/contrib/zref-clever/CHANGELOG.md23
-rw-r--r--macros/latex/contrib/zref-clever/MANIFEST.md522
-rw-r--r--macros/latex/contrib/zref-clever/zref-clever-code.pdfbin1255128 -> 1255628 bytes
-rw-r--r--macros/latex/contrib/zref-clever/zref-clever-code.tex7
-rw-r--r--macros/latex/contrib/zref-clever/zref-clever.dtx135
-rw-r--r--macros/latex/contrib/zref-clever/zref-clever.ins4
-rw-r--r--macros/latex/contrib/zref-clever/zref-clever.pdfbin312995 -> 311667 bytes
-rw-r--r--macros/latex/contrib/zref-clever/zref-clever.tex95
-rw-r--r--support/texlogsieve/README.md16
-rwxr-xr-xsupport/texlogsieve/texlogsieve128
-rw-r--r--support/texlogsieve/texlogsieve.12
-rw-r--r--support/texlogsieve/texlogsieve.pdfbin58593 -> 59004 bytes
-rw-r--r--support/texlogsieve/texlogsieve.tex19
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl3
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb63
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.md52
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha5122
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc14
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2368864 -> 2368304 bytes
-rw-r--r--systems/win32/miktex/tm/packages/next/pr.ini8
-rw-r--r--systems/win32/miktex/tm/packages/pr.ini8
-rw-r--r--timestamp2
101 files changed, 2777 insertions, 3343 deletions
diff --git a/FILES.byname b/FILES.byname
index af6f6cb111..ec31cd05b4 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5228,7 +5228,7 @@
1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp
1990/10/02 | 812 | dviware/vutex/vaxvms.ins
1990/10/02 | 127576 | dviware/vutex/vutex.web
-2022/04/21 | 87514 | FILES.last07days
+2022/04/22 | 92324 | FILES.last07days
2021/07/24 | 1139410 | fonts/aboensis/Aboensis.glyphs
2021/07/24 | 18907382 | fonts/aboensis/aboensis.pdf
2021/07/24 | 137860 | fonts/aboensis/Aboensis-Regular.otf
@@ -155259,60 +155259,60 @@
2019/04/14 | 24014 | graphics/pgf/contrib/chordbox/chordbox.tex
2019/04/14 | 1125 | graphics/pgf/contrib/chordbox/README.md
2019/04/15 | 567774 | graphics/pgf/contrib/chordbox.zip
-2022/02/04 | 40817 | graphics/pgf/contrib/circuitikz/doc/changelog.tex
-2022/02/04 | 17674 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
-2022/02/04 | 938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex
-2022/02/04 | 1485592 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
-2022/02/04 | 462556 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
-2022/02/04 | 418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex
-2022/02/04 | 8222 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
-2022/02/04 | 3802 | graphics/pgf/contrib/circuitikz/README.md
-2022/02/04 | 364117 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4-body.tex
-2022/02/04 | 728 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty
-2022/02/04 | 393884 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6-body.tex
-2022/02/04 | 635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty
-2022/02/04 | 403567 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7-body.tex
-2022/02/04 | 635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty
-2022/02/04 | 422295 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3-body.tex
-2022/02/04 | 641 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty
-2022/02/04 | 690729 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3-body.tex
-2022/02/04 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty
-2022/02/04 | 758991 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6-body.tex
-2022/02/04 | 841340 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0-body.tex
-2022/02/04 | 626 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty
-2022/02/04 | 937130 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2-body.tex
-2022/02/04 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty
-2022/02/04 | 1021798 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7-body.tex
-2022/02/04 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7.sty
-2022/02/04 | 1081680 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6-body.tex
-2022/02/04 | 631 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6.sty
-2022/02/04 | 13737 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
-2022/02/04 | 633 | graphics/pgf/contrib/circuitikz/tex/circutikz-0.9.6.sty
-2022/02/04 | 280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex
-2022/02/04 | 3150 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex
-2022/02/04 | 2188 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex
-2022/02/04 | 249923 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
-2022/02/04 | 9538 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex
-2022/02/04 | 31564 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
-2022/02/04 | 9804 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex
-2022/02/04 | 15442 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
-2022/02/04 | 53858 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
-2022/02/04 | 111942 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
-2022/02/04 | 16721 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
-2022/02/04 | 123018 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
-2022/02/04 | 31859 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex
-2022/02/04 | 364683 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
-2022/02/04 | 14441 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
-2022/02/04 | 35438 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex
-2022/02/04 | 416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex
-2022/02/04 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex
-2022/02/04 | 751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex
-2022/02/04 | 834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex
-2022/02/04 | 929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex
-2022/02/04 | 1014383 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.2.7.tex
-2022/02/04 | 1073051 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.4.6.tex
-2022/02/04 | 3590 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
-2022/02/04 | 3054113 | graphics/pgf/contrib/circuitikz.zip
+2022/04/22 | 42988 | graphics/pgf/contrib/circuitikz/doc/changelog.tex
+2022/04/22 | 17645 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
+2022/04/22 | 938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex
+2022/04/22 | 1518613 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
+2022/04/22 | 477907 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
+2022/04/22 | 418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex
+2022/04/22 | 8431 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
+2022/04/22 | 3802 | graphics/pgf/contrib/circuitikz/README.md
+2022/04/22 | 364117 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4-body.tex
+2022/04/22 | 728 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty
+2022/04/22 | 393884 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6-body.tex
+2022/04/22 | 635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty
+2022/04/22 | 403567 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7-body.tex
+2022/04/22 | 635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty
+2022/04/22 | 422295 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3-body.tex
+2022/04/22 | 641 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty
+2022/04/22 | 690729 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3-body.tex
+2022/04/22 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty
+2022/04/22 | 758991 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6-body.tex
+2022/04/22 | 633 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty
+2022/04/22 | 841340 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0-body.tex
+2022/04/22 | 626 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty
+2022/04/22 | 937130 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2-body.tex
+2022/04/22 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty
+2022/04/22 | 1021798 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7-body.tex
+2022/04/22 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7.sty
+2022/04/22 | 1081680 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6-body.tex
+2022/04/22 | 631 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6.sty
+2022/04/22 | 13780 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
+2022/04/22 | 280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex
+2022/04/22 | 3150 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex
+2022/04/22 | 2188 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex
+2022/04/22 | 254065 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
+2022/04/22 | 9538 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex
+2022/04/22 | 40016 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
+2022/04/22 | 9804 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex
+2022/04/22 | 15442 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
+2022/04/22 | 56233 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
+2022/04/22 | 112203 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
+2022/04/22 | 16722 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
+2022/04/22 | 107976 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
+2022/04/22 | 33313 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex
+2022/04/22 | 364777 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
+2022/04/22 | 14587 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
+2022/04/22 | 35438 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex
+2022/04/22 | 416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex
+2022/04/22 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex
+2022/04/22 | 751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex
+2022/04/22 | 834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex
+2022/04/22 | 929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex
+2022/04/22 | 1014383 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.2.7.tex
+2022/04/22 | 1073051 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.4.6.tex
+2022/04/22 | 3628 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
+2022/04/22 | 3095194 | graphics/pgf/contrib/circuitikz.zip
2019/07/12 | 14811 | graphics/pgf/contrib/codeanatomy/codeanatomy.dtx
2019/07/12 | 1475 | graphics/pgf/contrib/codeanatomy/codeanatomy.ins
2019/07/12 | 123921 | graphics/pgf/contrib/codeanatomy/codeanatomy.lstlisting.pdf
@@ -185769,7 +185769,7 @@
2021/05/15 | 12827514 | install/graphics/pgf/base/pgf.tds.zip
2013/02/23 | 92056 | install/graphics/pgf/contrib/battleship.tds.zip
2016/02/19 | 701759 | install/graphics/pgf/contrib/celtic.tds.zip
-2022/02/04 | 3072444 | install/graphics/pgf/contrib/circuitikz.tds.zip
+2022/04/22 | 3114052 | install/graphics/pgf/contrib/circuitikz.tds.zip
2020/06/12 | 573255 | install/graphics/pgf/contrib/commutative-diagrams.tds.zip
2017/06/01 | 1005947 | install/graphics/pgf/contrib/hobby.tds.zip
2014/06/15 | 843875 | install/graphics/pgf/contrib/logicpuzzle.tds.zip
@@ -186120,7 +186120,7 @@
2012/05/03 | 352839 | install/macros/latex/contrib/ydoc.tds.zip
2020/04/09 | 806385 | install/macros/latex/contrib/zhlipsum.tds.zip
2020/05/01 | 293478 | install/macros/latex/contrib/zhnumber.tds.zip
-2022/02/11 | 1622250 | install/macros/latex/contrib/zref-clever.tds.zip
+2022/04/22 | 1619864 | install/macros/latex/contrib/zref-clever.tds.zip
2022/03/15 | 36776752 | install/macros/latex-dev/latex-base-dev.tds.zip
2022/03/15 | 2793835 | install/macros/latex-dev/required/latex-amsmath-dev.tds.zip
2022/03/15 | 246503 | install/macros/latex-dev/required/latex-firstaid-dev.tds.zip
@@ -223835,97 +223835,97 @@
2021/09/27 | 5602 | macros/latex/contrib/reledmac/doc-include/migrate-par.dtx
2021/02/28 | 16 | macros/latex/contrib/reledmac/doc-more/latexmkrc
2021/02/28 | 243 | macros/latex/contrib/reledmac/doc-more/makefile
-2022/02/04 | 40811 | macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
+2022/04/22 | 40812 | macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
2021/02/28 | 4645 | macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.tex
-2022/02/04 | 201045 | macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
+2022/04/22 | 201047 | macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
2021/05/13 | 1979 | macros/latex/contrib/reledmac/examples/1-criticalendnotes.tex
-2022/02/04 | 199196 | macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
+2022/04/22 | 199198 | macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
2021/05/13 | 2161 | macros/latex/contrib/reledmac/examples/1-criticalnotes.tex
-2022/02/04 | 295847 | macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
+2022/04/22 | 295846 | macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
2021/05/13 | 9804 | macros/latex/contrib/reledmac/examples/1-sidenotes.tex
-2022/02/04 | 284803 | macros/latex/contrib/reledmac/examples/1-tabular.pdf
+2022/04/22 | 284805 | macros/latex/contrib/reledmac/examples/1-tabular.pdf
2021/05/13 | 2004 | macros/latex/contrib/reledmac/examples/1-tabular.tex
-2022/02/04 | 200373 | macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
+2022/04/22 | 200374 | macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
2021/05/13 | 2592 | macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.tex
-2022/02/04 | 200204 | macros/latex/contrib/reledmac/examples/1-verses.pdf
+2022/04/22 | 200202 | macros/latex/contrib/reledmac/examples/1-verses.pdf
2021/05/13 | 1902 | macros/latex/contrib/reledmac/examples/1-verses.tex
-2022/02/04 | 209856 | macros/latex/contrib/reledmac/examples/2-antilabe.pdf
+2022/04/22 | 209856 | macros/latex/contrib/reledmac/examples/2-antilabe.pdf
2021/05/13 | 1998 | macros/latex/contrib/reledmac/examples/2-antilabe.tex
-2022/02/04 | 199199 | macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
+2022/04/22 | 199200 | macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
2021/05/13 | 1857 | macros/latex/contrib/reledmac/examples/2-cross_referencing.tex
-2022/02/04 | 202702 | macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
+2022/04/22 | 202703 | macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
2021/05/13 | 6806 | macros/latex/contrib/reledmac/examples/2-footnote_spacing.tex
-2022/02/04 | 284462 | macros/latex/contrib/reledmac/examples/2-glossaries.pdf
+2022/04/22 | 284461 | macros/latex/contrib/reledmac/examples/2-glossaries.pdf
2021/09/27 | 1794 | macros/latex/contrib/reledmac/examples/2-glossaries.tex
-2022/02/04 | 283598 | macros/latex/contrib/reledmac/examples/2-indexing.pdf
+2022/04/22 | 283595 | macros/latex/contrib/reledmac/examples/2-indexing.pdf
2021/05/13 | 2761 | macros/latex/contrib/reledmac/examples/2-indexing.tex
-2022/02/04 | 277764 | macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
+2022/04/22 | 277763 | macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
2021/09/27 | 1140 | macros/latex/contrib/reledmac/examples/2-lemma_disambigution.tex
-2022/02/04 | 293260 | macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
+2022/04/22 | 293260 | macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
2021/05/13 | 11391 | macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.tex
-2022/02/04 | 288423 | macros/latex/contrib/reledmac/examples/2-linespacing.pdf
+2022/04/22 | 288423 | macros/latex/contrib/reledmac/examples/2-linespacing.pdf
2021/05/13 | 1488 | macros/latex/contrib/reledmac/examples/2-linespacing.tex
-2022/02/04 | 290106 | macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
+2022/04/22 | 290106 | macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
2021/05/13 | 21449 | macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.tex
-2022/02/04 | 205925 | macros/latex/contrib/reledmac/examples/2-notes-width.pdf
+2022/04/22 | 205926 | macros/latex/contrib/reledmac/examples/2-notes-width.pdf
2021/05/13 | 1528 | macros/latex/contrib/reledmac/examples/2-notes-width.tex
-2022/02/04 | 211562 | macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
+2022/04/22 | 211560 | macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
2021/05/13 | 5161 | macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.tex
-2022/02/04 | 286175 | macros/latex/contrib/reledmac/examples/2-performances.pdf
+2022/04/22 | 286176 | macros/latex/contrib/reledmac/examples/2-performances.pdf
2021/05/13 | 2710 | macros/latex/contrib/reledmac/examples/2-performances.tex
-2022/02/04 | 31501 | macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
+2022/04/22 | 31502 | macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
2021/02/28 | 3159 | macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.tex
-2022/02/04 | 309311 | macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
+2022/04/22 | 309317 | macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
2021/05/13 | 15949 | macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.tex
-2022/02/04 | 287548 | macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
+2022/04/22 | 287548 | macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
2021/05/13 | 3065 | macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.tex
-2022/02/04 | 199051 | macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
+2022/04/22 | 199051 | macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
2021/05/13 | 2006 | macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.tex
-2022/02/04 | 23425 | macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
+2022/04/22 | 23436 | macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
2021/02/28 | 2388 | macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.tex
-2022/02/04 | 174535 | macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
+2022/04/22 | 174535 | macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
2021/05/13 | 2912 | macros/latex/contrib/reledmac/examples/3-reledpar_mwe.tex
-2022/02/04 | 32047 | macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
+2022/04/22 | 32047 | macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
2021/02/28 | 2027 | macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.tex
-2022/02/04 | 288679 | macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
+2022/04/22 | 288680 | macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
2021/05/13 | 20137 | macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.tex
-2022/02/04 | 199948 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
+2022/04/22 | 199951 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
2021/05/13 | 1665 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.tex
-2022/02/04 | 199183 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
+2022/04/22 | 199183 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
2021/05/13 | 1627 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.tex
-2022/02/04 | 177026 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
+2022/04/22 | 177024 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
2021/05/13 | 1553 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.tex
-2022/02/04 | 198522 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
-2022/02/04 | 199590 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
+2022/04/22 | 198512 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
+2022/04/22 | 199585 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
2021/05/13 | 1644 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.tex
2021/05/13 | 1603 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.tex
-2022/02/04 | 198573 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
+2022/04/22 | 198564 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
2021/05/13 | 1609 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.tex
-2022/02/04 | 198707 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
+2022/04/22 | 198700 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
2021/05/13 | 1611 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.tex
-2022/02/04 | 213256 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
+2022/04/22 | 213255 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
2021/09/27 | 13653 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex
-2022/02/04 | 211867 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
+2022/04/22 | 211866 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
2021/09/27 | 12681 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.tex
-2022/02/04 | 204143 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
+2022/04/22 | 204143 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
2021/05/13 | 3005 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.tex
-2022/02/04 | 297127 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
+2022/04/22 | 297136 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
2021/05/13 | 5587 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.tex
-2022/02/04 | 203251 | macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
+2022/04/22 | 203250 | macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
2021/05/13 | 11558 | macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.tex
-2022/02/04 | 224508 | macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
+2022/04/22 | 224505 | macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
2021/05/13 | 10033 | macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.tex
-2022/02/04 | 249192 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
+2022/04/22 | 249189 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
2021/05/13 | 43045 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.tex
-2022/02/04 | 203970 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
+2022/04/22 | 203977 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
2021/05/13 | 6540 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.tex
-2022/02/04 | 199821 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
+2022/04/22 | 199821 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
2021/05/13 | 4504 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.tex
-2022/02/04 | 301523 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
+2022/04/22 | 301520 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
2021/05/13 | 9314 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.tex
-2022/02/04 | 206311 | macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
+2022/04/22 | 206315 | macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
2021/05/13 | 8510 | macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.tex
-2022/02/04 | 195383 | macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
+2022/04/22 | 195381 | macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
2021/05/13 | 2157 | macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.tex
2021/02/28 | 49 | macros/latex/contrib/reledmac/examples/latexmkrc
2021/05/13 | 816 | macros/latex/contrib/reledmac/examples/makefile
@@ -223933,15 +223933,15 @@
2021/11/01 | 16 | macros/latex/contrib/reledmac/latexmkrc
2021/11/03 | 1718 | macros/latex/contrib/reledmac/makefile
2021/02/28 | 3495 | macros/latex/contrib/reledmac/migration.dtx
-2022/02/04 | 368877 | macros/latex/contrib/reledmac/migration.pdf
+2022/04/22 | 367961 | macros/latex/contrib/reledmac/migration.pdf
2021/09/27 | 3962 | macros/latex/contrib/reledmac/README.md
-2022/02/04 | 898946 | macros/latex/contrib/reledmac/reledmac.dtx
+2022/02/07 | 898946 | macros/latex/contrib/reledmac/reledmac.dtx
2021/02/28 | 2691 | macros/latex/contrib/reledmac/reledmac.ins
-2022/02/04 | 2065249 | macros/latex/contrib/reledmac/reledmac.pdf
-2021/11/03 | 306199 | macros/latex/contrib/reledmac/reledpar.dtx
+2022/04/22 | 2046154 | macros/latex/contrib/reledmac/reledmac.pdf
+2022/04/22 | 306337 | macros/latex/contrib/reledmac/reledpar.dtx
2021/02/28 | 2638 | macros/latex/contrib/reledmac/reledpar.ins
-2022/02/04 | 1006705 | macros/latex/contrib/reledmac/reledpar.pdf
-2022/02/04 | 13511934 | macros/latex/contrib/reledmac.zip
+2022/04/22 | 1006519 | macros/latex/contrib/reledmac/reledpar.pdf
+2022/04/22 | 13494981 | macros/latex/contrib/reledmac.zip
1999/02/05 | 10370 | macros/latex/contrib/relenc/2sidedoc.sty
2011/04/06 | 6770 | macros/latex/contrib/relenc/README
1999/02/05 | 13969 | macros/latex/contrib/relenc/reldemo.tex
@@ -231917,28 +231917,26 @@
2013/11/26 | 524 | macros/latex/contrib/ziffer/README
2013/11/26 | 3959 | macros/latex/contrib/ziffer/ziffer.sty
2013/11/30 | 2049 | macros/latex/contrib/ziffer.zip
-2022/02/11 | 2761 | macros/latex/contrib/zref-check/CHANGELOG.md
-2022/02/11 | 38 | macros/latex/contrib/zref-check/DEPENDS.txt
-2022/02/11 | 7130 | macros/latex/contrib/zref-check/MANIFEST.md
-2022/02/11 | 1002 | macros/latex/contrib/zref-check/README.md
-2022/02/12 | 1182548 | macros/latex/contrib/zref-check.zip
-2022/02/11 | 741661 | macros/latex/contrib/zref-check/zref-check-code.pdf
-2022/02/11 | 2163 | macros/latex/contrib/zref-check/zref-check-code.tex
-2022/02/11 | 87804 | macros/latex/contrib/zref-check/zref-check.dtx
-2022/02/11 | 2583 | macros/latex/contrib/zref-check/zref-check.ins
-2022/02/11 | 451832 | macros/latex/contrib/zref-check/zref-check.pdf
-2022/02/11 | 2497 | macros/latex/contrib/zref-check/zref-check.tex
-2022/02/11 | 3044 | macros/latex/contrib/zref-clever/CHANGELOG.md
-2022/02/11 | 70 | macros/latex/contrib/zref-clever/DEPENDS.txt
-2022/02/11 | 15228 | macros/latex/contrib/zref-clever/MANIFEST.md
-2022/02/11 | 824 | macros/latex/contrib/zref-clever/README.md
-2022/02/12 | 1586903 | macros/latex/contrib/zref-clever.zip
-2022/02/11 | 1255128 | macros/latex/contrib/zref-clever/zref-clever-code.pdf
-2022/02/11 | 1486 | macros/latex/contrib/zref-clever/zref-clever-code.tex
-2022/02/11 | 336367 | macros/latex/contrib/zref-clever/zref-clever.dtx
-2022/02/11 | 3082 | macros/latex/contrib/zref-clever/zref-clever.ins
-2022/02/11 | 312995 | macros/latex/contrib/zref-clever/zref-clever.pdf
-2022/02/11 | 118158 | macros/latex/contrib/zref-clever/zref-clever.tex
+2022/04/22 | 3233 | macros/latex/contrib/zref-check/CHANGELOG.md
+2022/04/22 | 38 | macros/latex/contrib/zref-check/DEPENDS.txt
+2022/04/22 | 1002 | macros/latex/contrib/zref-check/README.md
+2022/04/22 | 1181886 | macros/latex/contrib/zref-check.zip
+2022/04/22 | 742306 | macros/latex/contrib/zref-check/zref-check-code.pdf
+2022/04/22 | 2171 | macros/latex/contrib/zref-check/zref-check-code.tex
+2022/04/22 | 88887 | macros/latex/contrib/zref-check/zref-check.dtx
+2022/04/22 | 2599 | macros/latex/contrib/zref-check/zref-check.ins
+2022/04/22 | 452289 | macros/latex/contrib/zref-check/zref-check.pdf
+2022/04/22 | 2505 | macros/latex/contrib/zref-check/zref-check.tex
+2022/04/22 | 4016 | macros/latex/contrib/zref-clever/CHANGELOG.md
+2022/04/22 | 70 | macros/latex/contrib/zref-clever/DEPENDS.txt
+2022/04/22 | 824 | macros/latex/contrib/zref-clever/README.md
+2022/04/22 | 1584609 | macros/latex/contrib/zref-clever.zip
+2022/04/22 | 1255628 | macros/latex/contrib/zref-clever/zref-clever-code.pdf
+2022/04/22 | 1539 | macros/latex/contrib/zref-clever/zref-clever-code.tex
+2022/04/22 | 336608 | macros/latex/contrib/zref-clever/zref-clever.dtx
+2022/04/22 | 3098 | macros/latex/contrib/zref-clever/zref-clever.ins
+2022/04/22 | 311667 | macros/latex/contrib/zref-clever/zref-clever.pdf
+2022/04/22 | 117383 | macros/latex/contrib/zref-clever/zref-clever.tex
2022/04/07 | 581 | macros/latex/contrib/zref/README.md
2022/02/11 | 874 | macros/latex/contrib/zref-vario/CHANGELOG.md
2022/02/11 | 31 | macros/latex/contrib/zref-vario/DEPENDS.txt
@@ -273363,13 +273361,13 @@
2022/03/18 | 11940 | support/texlogfilter/texlogfilter
2022/03/18 | 3846 | support/texlogfilter/texlogfilter.html
2022/03/18 | 13006 | support/texlogfilter.zip
-2022/03/14 | 35149 | support/texlogsieve/LICENCE.txt
-2022/03/14 | 2519 | support/texlogsieve/README.md
-2022/03/14 | 192650 | support/texlogsieve/texlogsieve
-2022/03/14 | 11542 | support/texlogsieve/texlogsieve.1
-2022/03/14 | 58593 | support/texlogsieve/texlogsieve.pdf
-2022/03/14 | 21639 | support/texlogsieve/texlogsieve.tex
-2022/03/14 | 131271 | support/texlogsieve.zip
+2022/04/22 | 35149 | support/texlogsieve/LICENCE.txt
+2022/04/22 | 2811 | support/texlogsieve/README.md
+2022/04/22 | 194223 | support/texlogsieve/texlogsieve
+2022/04/22 | 11542 | support/texlogsieve/texlogsieve.1
+2022/04/22 | 59004 | support/texlogsieve/texlogsieve.pdf
+2022/04/22 | 22009 | support/texlogsieve/texlogsieve.tex
+2022/04/22 | 132242 | support/texlogsieve.zip
2001/12/14 | 1585 | support/TeXmacs/README
2013/09/20 | 19826467 | support/TeXmacs/TeXmacs-1.0.7.20-1.i386.rpm
2013/09/24 | 29347074 | support/TeXmacs/TeXmacs-1.0.7.20.dmg
@@ -275239,10 +275237,10 @@
1993/07/19 | 61321 | systems/mac/macmakeindex.sit.hqx
2022/03/17 | 47 | systems/mac/mactex/BasicTeX.pkg.md5
2022/03/17 | 143 | systems/mac/mactex/BasicTeX.pkg.sha512
-2022/04/16 | 38160 | systems/mac/mactex/ExtrasFolder.pdf
+2022/04/22 | 38147 | systems/mac/mactex/ExtrasFolder.pdf
2022/03/17 | 50 | systems/mac/mactex/Ghostscript.pkg.md5
2022/03/17 | 146 | systems/mac/mactex/Ghostscript.pkg.sha512
-2022/04/16 | 1612 | systems/mac/mactex/Licenses.txt
+2022/04/22 | 1612 | systems/mac/mactex/Licenses.txt
2022/03/21 | 4961582623 | systems/mac/mactex/mactex-20220321.pkg
2022/03/21 | 54 | systems/mac/mactex/mactex-20220321.pkg.md5
2022/03/21 | 150 | systems/mac/mactex/mactex-20220321.pkg.sha512
@@ -275252,13 +275250,13 @@
2022/02/28 | 55345960 | systems/mac/mactex/mactex-ghostscript-9.55-20220208.pkg
2022/02/28 | 71 | systems/mac/mactex/mactex-ghostscript-9.55-20220208.pkg.md5
2022/03/17 | 167 | systems/mac/mactex/mactex-ghostscript-9.55-20220208.pkg.sha512
-2022/04/16 | 513548295 | systems/mac/mactex/mactex-MacTeXtras-20220416.zip
-2022/04/16 | 65 | systems/mac/mactex/mactex-MacTeXtras-20220416.zip.md5
-2022/04/16 | 161 | systems/mac/mactex/mactex-MacTeXtras-20220416.zip.sha512
+2022/04/22 | 514171236 | systems/mac/mactex/mactex-MacTeXtras-20220422.zip
+2022/04/22 | 65 | systems/mac/mactex/mactex-MacTeXtras-20220422.zip.md5
+2022/04/22 | 161 | systems/mac/mactex/mactex-MacTeXtras-20220422.zip.sha512
2022/03/21 | 45 | systems/mac/mactex/MacTeX.pkg.md5
2022/03/21 | 141 | systems/mac/mactex/MacTeX.pkg.sha512
-2022/04/16 | 49 | systems/mac/mactex/MacTeXtras.zip.md5
-2022/04/16 | 145 | systems/mac/mactex/MacTeXtras.zip.sha512
+2022/04/22 | 49 | systems/mac/mactex/MacTeXtras.zip.md5
+2022/04/22 | 145 | systems/mac/mactex/MacTeXtras.zip.sha512
2022/04/03 | 189 | systems/mac/mactex/README
1995/08/15 | 308344 | systems/mac/MakeIndex-Fat-1.0-sit.hqx
1994/04/20 | 2925109 | systems/mac/metafont/bluesky/MAC_MF_0.66.sit.hqx
@@ -277627,8 +277625,8 @@
2020/04/22 | 787504 | systems/texlive/tlnet/archive/bearwear.doc.r54826.tar.xz
2020/04/22 | 2376 | systems/texlive/tlnet/archive/bearwear.r54826.tar.xz
2020/04/22 | 5992 | systems/texlive/tlnet/archive/bearwear.source.r54826.tar.xz
-2022/04/05 | 663672 | systems/texlive/tlnet/archive/beaulivre.doc.r62900.tar.xz
-2022/04/05 | 4248 | systems/texlive/tlnet/archive/beaulivre.r62900.tar.xz
+2022/04/22 | 663752 | systems/texlive/tlnet/archive/beaulivre.doc.r63098.tar.xz
+2022/04/22 | 4232 | systems/texlive/tlnet/archive/beaulivre.r63098.tar.xz
2022/03/05 | 889508 | systems/texlive/tlnet/archive/beebe.r62423.tar.xz
2019/02/28 | 709916 | systems/texlive/tlnet/archive/begingreek.doc.r36294.tar.xz
2019/02/28 | 1664 | systems/texlive/tlnet/archive/begingreek.r36294.tar.xz
@@ -278867,7 +278865,7 @@
2020/03/04 | 408 | systems/texlive/tlnet/archive/collection-langpolish.r54074.tar.xz
2020/03/04 | 392 | systems/texlive/tlnet/archive/collection-langportuguese.r54074.tar.xz
2020/03/07 | 380 | systems/texlive/tlnet/archive/collection-langspanish.r54141.tar.xz
-2022/04/05 | 6628 | systems/texlive/tlnet/archive/collection-latexextra.r62901.tar.xz
+2022/04/22 | 6628 | systems/texlive/tlnet/archive/collection-latexextra.r63101.tar.xz
2020/12/03 | 696 | systems/texlive/tlnet/archive/collection-latex.r57048.tar.xz
2021/02/24 | 772 | systems/texlive/tlnet/archive/collection-latexrecommended.r57862.tar.xz
2022/04/20 | 804 | systems/texlive/tlnet/archive/collection-luatex.r63081.tar.xz
@@ -278897,8 +278895,8 @@
2019/02/28 | 2020 | systems/texlive/tlnet/archive/colorinfo.r15878.tar.xz
2019/02/28 | 25984 | systems/texlive/tlnet/archive/coloring.doc.r41042.tar.xz
2019/02/28 | 1480 | systems/texlive/tlnet/archive/coloring.r41042.tar.xz
-2022/04/05 | 111760 | systems/texlive/tlnet/archive/colorist.doc.r62900.tar.xz
-2022/04/05 | 10028 | systems/texlive/tlnet/archive/colorist.r62900.tar.xz
+2022/04/22 | 111880 | systems/texlive/tlnet/archive/colorist.doc.r63098.tar.xz
+2022/04/22 | 9836 | systems/texlive/tlnet/archive/colorist.r63098.tar.xz
2019/02/28 | 27632 | systems/texlive/tlnet/archive/colorprofiles.doc.r49086.tar.xz
2019/02/28 | 87972 | systems/texlive/tlnet/archive/colorprofiles.r49086.tar.xz
2019/02/28 | 1884 | systems/texlive/tlnet/archive/colorsep.r13293.tar.xz
@@ -278966,8 +278964,8 @@
2019/02/28 | 266164 | systems/texlive/tlnet/archive/concmath.doc.r17219.tar.xz
2019/02/28 | 2640 | systems/texlive/tlnet/archive/concmath-fonts.doc.r17218.tar.xz
2019/02/28 | 15176 | systems/texlive/tlnet/archive/concmath-fonts.r17218.tar.xz
-2022/01/16 | 1854880 | systems/texlive/tlnet/archive/concmath-otf.doc.r61613.tar.xz
-2022/01/16 | 130408 | systems/texlive/tlnet/archive/concmath-otf.r61613.tar.xz
+2022/04/22 | 1855428 | systems/texlive/tlnet/archive/concmath-otf.doc.r63096.tar.xz
+2022/04/22 | 134264 | systems/texlive/tlnet/archive/concmath-otf.r63096.tar.xz
2019/02/28 | 2176 | systems/texlive/tlnet/archive/concmath.r17219.tar.xz
2019/02/28 | 9604 | systems/texlive/tlnet/archive/concmath.source.r17219.tar.xz
2019/02/28 | 1064 | systems/texlive/tlnet/archive/concprog.doc.r18791.tar.xz
@@ -279521,7 +279519,7 @@
2019/02/28 | 83108 | systems/texlive/tlnet/archive/datetime2-danish.doc.r47034.tar.xz
2019/02/28 | 2536 | systems/texlive/tlnet/archive/datetime2-danish.r47034.tar.xz
2019/02/28 | 4804 | systems/texlive/tlnet/archive/datetime2-danish.source.r47034.tar.xz
-2021/03/22 | 1017512 | systems/texlive/tlnet/archive/datetime2.doc.r58590.tar.xz
+2022/04/22 | 1017512 | systems/texlive/tlnet/archive/datetime2.doc.r63102.tar.xz
2019/02/28 | 278696 | systems/texlive/tlnet/archive/datetime2-dutch.doc.r47355.tar.xz
2019/02/28 | 2396 | systems/texlive/tlnet/archive/datetime2-dutch.r47355.tar.xz
2019/02/28 | 4352 | systems/texlive/tlnet/archive/datetime2-dutch.source.r47355.tar.xz
@@ -279585,7 +279583,7 @@
2019/02/28 | 286568 | systems/texlive/tlnet/archive/datetime2-portuges.doc.r48457.tar.xz
2019/02/28 | 2516 | systems/texlive/tlnet/archive/datetime2-portuges.r48457.tar.xz
2019/02/28 | 4772 | systems/texlive/tlnet/archive/datetime2-portuges.source.r48457.tar.xz
-2021/03/22 | 8832 | systems/texlive/tlnet/archive/datetime2.r58590.tar.xz
+2022/04/22 | 8852 | systems/texlive/tlnet/archive/datetime2.r63102.tar.xz
2020/09/22 | 142384 | systems/texlive/tlnet/archive/datetime2-romanian.doc.r56394.tar.xz
2020/09/22 | 2856 | systems/texlive/tlnet/archive/datetime2-romanian.r56394.tar.xz
2020/09/22 | 4880 | systems/texlive/tlnet/archive/datetime2-romanian.source.r56394.tar.xz
@@ -279607,7 +279605,7 @@
2019/10/05 | 72192 | systems/texlive/tlnet/archive/datetime2-slovene.doc.r52282.tar.xz
2019/10/05 | 2480 | systems/texlive/tlnet/archive/datetime2-slovene.r52282.tar.xz
2019/10/05 | 4720 | systems/texlive/tlnet/archive/datetime2-slovene.source.r52282.tar.xz
-2021/03/22 | 51628 | systems/texlive/tlnet/archive/datetime2.source.r58590.tar.xz
+2022/04/22 | 51632 | systems/texlive/tlnet/archive/datetime2.source.r63102.tar.xz
2019/02/28 | 287836 | systems/texlive/tlnet/archive/datetime2-spanish.doc.r45785.tar.xz
2019/02/28 | 2568 | systems/texlive/tlnet/archive/datetime2-spanish.r45785.tar.xz
2019/02/28 | 4824 | systems/texlive/tlnet/archive/datetime2-spanish.source.r45785.tar.xz
@@ -280344,8 +280342,8 @@
2019/02/28 | 4224 | systems/texlive/tlnet/archive/eiad-ltx.source.r15878.tar.xz
2019/02/28 | 25636 | systems/texlive/tlnet/archive/eiad.r15878.tar.xz
2019/02/28 | 6960 | systems/texlive/tlnet/archive/eijkhout.r15878.tar.xz
-2022/04/05 | 557156 | systems/texlive/tlnet/archive/einfart.doc.r62900.tar.xz
-2022/04/05 | 4376 | systems/texlive/tlnet/archive/einfart.r62900.tar.xz
+2022/04/22 | 555964 | systems/texlive/tlnet/archive/einfart.doc.r63098.tar.xz
+2022/04/22 | 4364 | systems/texlive/tlnet/archive/einfart.r63098.tar.xz
2021/11/05 | 284620 | systems/texlive/tlnet/archive/ejpecp.doc.r60950.tar.xz
2021/11/05 | 5704 | systems/texlive/tlnet/archive/ejpecp.r60950.tar.xz
2021/11/05 | 7428 | systems/texlive/tlnet/archive/ejpecp.source.r60950.tar.xz
@@ -283136,8 +283134,8 @@
2020/11/08 | 344060 | systems/texlive/tlnet/archive/leaflet.doc.r56878.tar.xz
2020/11/08 | 5652 | systems/texlive/tlnet/archive/leaflet.r56878.tar.xz
2020/11/08 | 13844 | systems/texlive/tlnet/archive/leaflet.source.r56878.tar.xz
-2022/04/05 | 559924 | systems/texlive/tlnet/archive/lebhart.doc.r62900.tar.xz
-2022/04/05 | 4260 | systems/texlive/tlnet/archive/lebhart.r62900.tar.xz
+2022/04/22 | 561152 | systems/texlive/tlnet/archive/lebhart.doc.r63098.tar.xz
+2022/04/22 | 4244 | systems/texlive/tlnet/archive/lebhart.r63098.tar.xz
2019/02/28 | 1126000 | systems/texlive/tlnet/archive/lecturer.doc.r23916.tar.xz
2019/02/28 | 18668 | systems/texlive/tlnet/archive/lecturer.r23916.tar.xz
2020/02/03 | 2080 | systems/texlive/tlnet/archive/lectures.doc.r53642.tar.xz
@@ -284322,8 +284320,8 @@
2019/02/28 | 435560 | systems/texlive/tlnet/archive/minifp.doc.r32559.tar.xz
2019/02/28 | 10000 | systems/texlive/tlnet/archive/minifp.r32559.tar.xz
2019/02/28 | 43836 | systems/texlive/tlnet/archive/minifp.source.r32559.tar.xz
-2022/04/05 | 113144 | systems/texlive/tlnet/archive/minimalist.doc.r62900.tar.xz
-2022/04/05 | 9164 | systems/texlive/tlnet/archive/minimalist.r62900.tar.xz
+2022/04/22 | 113032 | systems/texlive/tlnet/archive/minimalist.doc.r63098.tar.xz
+2022/04/22 | 9592 | systems/texlive/tlnet/archive/minimalist.r63098.tar.xz
2022/03/05 | 296672 | systems/texlive/tlnet/archive/minim.doc.r62419.tar.xz
2022/03/05 | 26048 | systems/texlive/tlnet/archive/minim-hatching.doc.r62395.tar.xz
2022/03/05 | 2232 | systems/texlive/tlnet/archive/minim-hatching.r62395.tar.xz
@@ -285958,6 +285956,9 @@
2019/02/28 | 1860 | systems/texlive/tlnet/archive/postcards.r21641.tar.xz
2019/02/28 | 93292 | systems/texlive/tlnet/archive/poster-mac.doc.r18305.tar.xz
2019/02/28 | 3152 | systems/texlive/tlnet/archive/poster-mac.r18305.tar.xz
+2022/04/22 | 960480 | systems/texlive/tlnet/archive/postnotes.doc.r63099.tar.xz
+2022/04/22 | 7304 | systems/texlive/tlnet/archive/postnotes.r63099.tar.xz
+2022/04/22 | 20716 | systems/texlive/tlnet/archive/postnotes.source.r63099.tar.xz
2021/05/20 | 948160 | systems/texlive/tlnet/archive/powerdot.doc.r59272.tar.xz
2019/11/26 | 280080 | systems/texlive/tlnet/archive/powerdot-fuberlin.doc.r52922.tar.xz
2019/11/26 | 2704 | systems/texlive/tlnet/archive/powerdot-fuberlin.r52922.tar.xz
@@ -286021,9 +286022,9 @@
2019/02/28 | 2324 | systems/texlive/tlnet/archive/progressbar.r33822.tar.xz
2019/02/28 | 80808 | systems/texlive/tlnet/archive/progress.doc.r19519.tar.xz
2019/02/28 | 4192 | systems/texlive/tlnet/archive/progress.r19519.tar.xz
-2022/04/05 | 679948 | systems/texlive/tlnet/archive/projlib.doc.r62900.tar.xz
-2022/04/05 | 23552 | systems/texlive/tlnet/archive/projlib.r62900.tar.xz
-2022/04/05 | 44948 | systems/texlive/tlnet/archive/projlib.source.r62900.tar.xz
+2022/04/22 | 679984 | systems/texlive/tlnet/archive/projlib.doc.r63098.tar.xz
+2022/04/22 | 23996 | systems/texlive/tlnet/archive/projlib.r63098.tar.xz
+2022/04/22 | 45440 | systems/texlive/tlnet/archive/projlib.source.r63098.tar.xz
2022/02/08 | 446708 | systems/texlive/tlnet/archive/proof-at-the-end.doc.r61933.tar.xz
2022/02/08 | 6944 | systems/texlive/tlnet/archive/proof-at-the-end.r61933.tar.xz
2022/02/08 | 20480 | systems/texlive/tlnet/archive/proof-at-the-end.source.r61933.tar.xz
@@ -287206,8 +287207,8 @@
2019/02/28 | 4412 | systems/texlive/tlnet/archive/simplewick.source.r15878.tar.xz
2019/02/28 | 942836 | systems/texlive/tlnet/archive/simplified-latex.doc.r20620.tar.xz
2019/02/28 | 380 | systems/texlive/tlnet/archive/simplified-latex.r20620.tar.xz
-2022/04/05 | 711804 | systems/texlive/tlnet/archive/simplivre.doc.r62900.tar.xz
-2022/04/05 | 4352 | systems/texlive/tlnet/archive/simplivre.r62900.tar.xz
+2022/04/22 | 711284 | systems/texlive/tlnet/archive/simplivre.doc.r63098.tar.xz
+2022/04/22 | 4336 | systems/texlive/tlnet/archive/simplivre.r63098.tar.xz
2019/02/28 | 136908 | systems/texlive/tlnet/archive/simurgh.doc.r31719.tar.xz
2019/02/28 | 246476 | systems/texlive/tlnet/archive/simurgh.r31719.tar.xz
2021/06/24 | 323456 | systems/texlive/tlnet/archive/sistyle.doc.r59682.tar.xz
@@ -287315,8 +287316,8 @@
2021/02/23 | 1371428 | systems/texlive/tlnet/archive/spath3.doc.r57842.tar.xz
2021/02/23 | 21472 | systems/texlive/tlnet/archive/spath3.r57842.tar.xz
2021/02/23 | 31740 | systems/texlive/tlnet/archive/spath3.source.r57842.tar.xz
-2022/03/06 | 88440 | systems/texlive/tlnet/archive/spbmark.doc.r62447.tar.xz
-2022/03/06 | 3424 | systems/texlive/tlnet/archive/spbmark.r62447.tar.xz
+2022/04/22 | 88332 | systems/texlive/tlnet/archive/spbmark.doc.r63100.tar.xz
+2022/04/22 | 3420 | systems/texlive/tlnet/archive/spbmark.r63100.tar.xz
2021/01/03 | 80960 | systems/texlive/tlnet/archive/spectral.doc.r57296.tar.xz
2021/01/03 | 3545232 | systems/texlive/tlnet/archive/spectral.r57296.tar.xz
2022/02/28 | 1595632 | systems/texlive/tlnet/archive/spectralsequences.doc.r62261.tar.xz
@@ -288098,7 +288099,7 @@
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r55172.tar.xz
-2022/04/21 | 406064 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63085.tar.xz
+2022/04/22 | 406120 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63095.tar.xz
2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.aarch64-linux.r53577.tar.xz
2020/01/27 | 924 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-freebsd.r53577.tar.xz
2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-netbsd.r53577.tar.xz
@@ -288122,7 +288123,7 @@
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r55172.tar.xz
-2022/04/21 | 109720 | systems/texlive/tlnet/archive/texlive-scripts.r63085.tar.xz
+2022/04/22 | 109704 | systems/texlive/tlnet/archive/texlive-scripts.r63095.tar.xz
2021/02/25 | 572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz
2022/04/19 | 36296 | systems/texlive/tlnet/archive/texlive-scripts.win32.r63068.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
@@ -288490,8 +288491,8 @@
2020/05/27 | 4320 | systems/texlive/tlnet/archive/tikz-lake-fig.r55288.tar.xz
2019/02/28 | 960 | systems/texlive/tlnet/archive/tikz-layers.doc.r46660.tar.xz
2019/02/28 | 1084 | systems/texlive/tlnet/archive/tikz-layers.r46660.tar.xz
-2021/08/08 | 666240 | systems/texlive/tlnet/archive/tikzlings.doc.r60181.tar.xz
-2021/08/08 | 32936 | systems/texlive/tlnet/archive/tikzlings.r60181.tar.xz
+2022/04/22 | 682752 | systems/texlive/tlnet/archive/tikzlings.doc.r63097.tar.xz
+2022/04/22 | 33740 | systems/texlive/tlnet/archive/tikzlings.r63097.tar.xz
2021/02/23 | 418444 | systems/texlive/tlnet/archive/tikzmark.doc.r57843.tar.xz
2021/02/23 | 5684 | systems/texlive/tlnet/archive/tikzmark.r57843.tar.xz
2021/02/23 | 18632 | systems/texlive/tlnet/archive/tikzmark.source.r57843.tar.xz
@@ -289043,6 +289044,9 @@
2019/12/18 | 291268 | systems/texlive/tlnet/archive/uniquecounter.doc.r53162.tar.xz
2019/12/18 | 2272 | systems/texlive/tlnet/archive/uniquecounter.r53162.tar.xz
2019/12/18 | 5320 | systems/texlive/tlnet/archive/uniquecounter.source.r53162.tar.xz
+2022/04/22 | 128844 | systems/texlive/tlnet/archive/unisc.doc.r63101.tar.xz
+2022/04/22 | 2564 | systems/texlive/tlnet/archive/unisc.r63101.tar.xz
+2022/04/22 | 4536 | systems/texlive/tlnet/archive/unisc.source.r63101.tar.xz
2019/02/28 | 456508 | systems/texlive/tlnet/archive/unisugar.doc.r22357.tar.xz
2019/02/28 | 2468 | systems/texlive/tlnet/archive/unisugar.r22357.tar.xz
2020/05/08 | 69364 | systems/texlive/tlnet/archive/unitconv.doc.r55060.tar.xz
@@ -289929,16 +289933,16 @@
2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
2022/04/18 | 108451 | systems/texlive/tlnet/install-tl
-2022/04/21 | 5798200 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/04/21 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/04/21 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/04/22 | 5798459 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/04/22 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/04/22 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2022/04/21 | 20460100 | systems/texlive/tlnet/install-tl-windows.exe
-2022/04/21 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/04/21 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/04/21 | 25481708 | systems/texlive/tlnet/install-tl.zip
-2022/04/21 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/04/21 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/04/22 | 20463676 | systems/texlive/tlnet/install-tl-windows.exe
+2022/04/22 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/04/22 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/04/22 | 25481700 | systems/texlive/tlnet/install-tl.zip
+2022/04/22 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/04/22 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2022/04/03 | 1229 | systems/texlive/tlnet/README.md
2022/04/03 | 0 | systems/texlive/tlnet/TEXLIVE_2022
2022/02/28 | 7791 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -289948,7 +289952,7 @@
2022/02/28 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2022/01/12 | 49482 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2022/04/20 | 7298 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2022/04/21 | 7264 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/04/05 | 211170 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt
2020/04/15 | 2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe
2017/04/16 | 2629 | systems/texlive/tlnet/tlpkg/installer/installer-options.txt
@@ -289990,12 +289994,12 @@
2021/05/16 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2021/12/21 | 27582 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2022/04/21 | 17262019 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/04/21 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/04/22 | 17266238 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/04/22 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2022/04/18 | 86658 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2022/04/21 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/04/21 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/04/21 | 2366996 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/04/22 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/04/22 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/04/22 | 2368864 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/12/21 | 58848 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2022/04/18 | 42116 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2021/12/21 | 16130 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -295183,7 +295187,7 @@
2020/10/03 | 318630 | systems/win32/miktex/tm/packages/filehook.tar.lzma
2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2022/04/21 | 646648 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/04/22 | 646648 | systems/win32/miktex/tm/packages/files.csv.lzma
2001/05/14 | 5617 | systems/win32/miktex/tm/packages/finbib.tar.lzma
2015/10/20 | 44379 | systems/win32/miktex/tm/packages/findhyph.tar.lzma
2011/10/21 | 89323 | systems/win32/miktex/tm/packages/fink.tar.lzma
@@ -296766,9 +296770,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2022/03/12 | 39680 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2022/03/29 | 43240 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/04/21 | 274807 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/04/21 | 1440968 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/04/21 | 1330441 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/04/22 | 274864 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/04/22 | 1440794 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/04/22 | 1330475 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2022/03/12 | 13516 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2022/03/29 | 14391 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma
2016/07/15 | 35914 | systems/win32/miktex/tm/packages/mil3.tar.lzma
@@ -296992,191 +296996,191 @@
2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
2021/03/17 | 232249 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2022/04/21 | 646139 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/04/21 | 51558 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2022/04/21 | 57330 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/04/21 | 1021846 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2022/04/21 | 1156465 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/04/21 | 28795 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2022/04/21 | 31521 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/04/21 | 30146 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2022/04/21 | 35243 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/04/21 | 56618 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2022/04/21 | 65055 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/04/21 | 86760 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2022/04/21 | 95286 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/04/21 | 68873 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2022/04/21 | 77067 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/04/21 | 27249 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2022/04/21 | 31344 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/04/21 | 332414 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2022/04/21 | 394371 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/04/21 | 32954 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2022/04/21 | 37081 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/04/21 | 51486 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2022/04/21 | 57270 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/04/21 | 244963 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2022/04/21 | 270299 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/04/21 | 179879 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2022/04/21 | 196116 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2022/04/21 | 92919 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2022/04/21 | 103093 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/04/21 | 21315 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2022/04/21 | 24120 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/04/21 | 481496 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/04/21 | 46067 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2022/04/21 | 52094 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/04/21 | 285716 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2022/04/21 | 326662 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/04/21 | 41306 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2022/04/21 | 45823 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/04/21 | 120616 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2022/04/21 | 135377 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/04/21 | 1302481 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2022/04/21 | 1454765 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/04/21 | 99817 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2022/04/21 | 113052 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/04/21 | 43644 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2022/04/21 | 48826 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/04/21 | 25106 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2022/04/21 | 28569 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/04/21 | 56994 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2022/04/21 | 63311 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/04/21 | 135949 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2022/04/21 | 155497 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/04/21 | 73478 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2022/04/21 | 78974 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/04/21 | 72013 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2022/04/21 | 81461 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/04/21 | 259257 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2022/04/21 | 296037 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/04/21 | 22147 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2022/04/21 | 25059 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/04/21 | 97201 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2022/04/21 | 112591 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/04/21 | 64544 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2022/04/21 | 73146 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/04/21 | 96633 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2022/04/21 | 115657 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/04/21 | 38426 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2022/04/21 | 43825 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/04/21 | 484371 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2022/04/21 | 565928 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/04/21 | 203835 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
-2022/04/21 | 247333 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/04/21 | 152029 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2022/04/21 | 168820 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/04/21 | 95433 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2022/04/21 | 109479 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/04/21 | 16503 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2022/04/21 | 18368 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/04/21 | 28423 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2022/04/21 | 30542 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/04/21 | 631279 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2022/04/21 | 681940 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/04/21 | 532457 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2022/04/21 | 598230 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/04/21 | 477846 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2022/04/21 | 528018 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/04/21 | 93957 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2022/04/21 | 103336 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/04/21 | 1752147 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2022/04/21 | 1982086 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/04/21 | 68010 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2022/04/21 | 74068 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/04/21 | 27592 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2022/04/21 | 32133 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/04/21 | 7753 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2022/04/21 | 8783 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/04/21 | 190506 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2022/04/21 | 208807 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/04/21 | 251130 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2022/04/21 | 286412 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/04/21 | 99258 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2022/04/21 | 104556 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/04/21 | 126536 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2022/04/21 | 139101 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/04/21 | 288200 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2022/04/21 | 325268 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/04/21 | 199832 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2022/04/21 | 181515 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/04/21 | 49770 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2022/04/21 | 55568 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/04/21 | 31413 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2022/04/21 | 35168 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2022/04/21 | 38560 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2022/04/21 | 43916 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/04/21 | 43361 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2022/04/21 | 47923 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/04/21 | 45742 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2022/04/21 | 52326 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/04/21 | 197036 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2022/04/21 | 213279 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/04/21 | 36049 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2022/04/21 | 41182 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/04/21 | 755742 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2022/04/21 | 824371 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/04/21 | 200399 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2022/04/21 | 202835 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/04/21 | 210278 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2022/04/21 | 245097 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/04/21 | 79025 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2022/04/21 | 88152 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/04/21 | 1181126 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2022/04/21 | 1322742 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/04/21 | 20184 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2022/04/21 | 23945 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/04/21 | 31588 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2022/04/21 | 37375 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/04/21 | 64710 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2022/04/21 | 72885 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/04/21 | 50799 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2022/04/21 | 58664 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/04/21 | 693069 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
-2022/04/21 | 758954 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/04/21 | 1357073 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2022/04/21 | 1501237 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2022/04/21 | 42818 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2022/04/21 | 52479 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/04/21 | 57617 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2022/04/21 | 63739 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/04/21 | 25551 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2022/04/21 | 27636 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/04/21 | 16561 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2022/04/21 | 18492 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/04/21 | 64489 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2022/04/21 | 71004 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/04/21 | 156965 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2022/04/21 | 173008 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/04/21 | 58666 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2022/04/21 | 67254 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2022/04/21 | 100488 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2022/04/21 | 107706 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/04/21 | 2694879 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2022/04/21 | 2820688 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/04/21 | 55284 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2022/04/21 | 62382 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2022/04/21 | 37116 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2022/04/21 | 41204 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/04/21 | 28690 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2022/04/21 | 34051 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/04/21 | 67704 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2022/04/21 | 73528 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/04/21 | 316242 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2022/04/21 | 351697 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/04/21 | 55757 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2022/04/21 | 57527 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/04/21 | 591571 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2022/04/21 | 629430 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/04/21 | 39728 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2022/04/21 | 43226 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/04/21 | 274905 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/04/21 | 1440362 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/04/21 | 1329309 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/04/21 | 13514 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2022/04/21 | 14411 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/04/22 | 646139 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/04/22 | 51557 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2022/04/22 | 57330 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/04/22 | 1021847 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2022/04/22 | 1156464 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/04/22 | 28797 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2022/04/22 | 31520 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/04/22 | 30147 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2022/04/22 | 35242 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/04/22 | 56619 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2022/04/22 | 65056 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/04/22 | 86760 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2022/04/22 | 95285 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/04/22 | 68874 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2022/04/22 | 77066 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/04/22 | 27249 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2022/04/22 | 31343 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/04/22 | 332414 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2022/04/22 | 394370 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/04/22 | 32955 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2022/04/22 | 37081 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/04/22 | 51486 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2022/04/22 | 57270 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/04/22 | 244960 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2022/04/22 | 270300 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/04/22 | 179878 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2022/04/22 | 196117 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/04/22 | 92918 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2022/04/22 | 103094 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/04/22 | 21315 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2022/04/22 | 24121 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/04/22 | 481497 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/04/22 | 46067 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2022/04/22 | 52093 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/04/22 | 285714 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2022/04/22 | 326660 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/04/22 | 41305 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2022/04/22 | 45826 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/04/22 | 120615 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2022/04/22 | 135376 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/04/22 | 1302484 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2022/04/22 | 1454764 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/04/22 | 99817 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2022/04/22 | 113051 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/04/22 | 43646 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2022/04/22 | 48826 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/04/22 | 25106 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2022/04/22 | 28569 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/04/22 | 56993 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2022/04/22 | 63311 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/04/22 | 135949 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2022/04/22 | 155499 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/04/22 | 73478 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2022/04/22 | 78974 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/04/22 | 72014 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2022/04/22 | 81459 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/04/22 | 259257 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2022/04/22 | 296038 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/04/22 | 22147 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2022/04/22 | 25060 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/04/22 | 97200 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2022/04/22 | 112589 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/04/22 | 64542 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2022/04/22 | 73147 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/04/22 | 96632 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2022/04/22 | 115656 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/04/22 | 38424 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2022/04/22 | 43825 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/04/22 | 484370 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2022/04/22 | 565929 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/04/22 | 203837 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
+2022/04/22 | 247334 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/04/22 | 152032 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2022/04/22 | 168820 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/04/22 | 95434 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2022/04/22 | 109478 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/04/22 | 16503 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2022/04/22 | 18367 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/04/22 | 28421 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2022/04/22 | 30542 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/04/22 | 631278 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2022/04/22 | 681941 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/04/22 | 532454 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2022/04/22 | 598230 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/04/22 | 477849 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2022/04/22 | 528018 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/04/22 | 93960 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2022/04/22 | 103337 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/04/22 | 1752147 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2022/04/22 | 1982084 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/04/22 | 68010 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2022/04/22 | 74069 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/04/22 | 27590 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2022/04/22 | 32135 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/04/22 | 7753 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2022/04/22 | 8783 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/04/22 | 190504 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2022/04/22 | 208808 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/04/22 | 251131 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2022/04/22 | 286412 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/04/22 | 99258 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2022/04/22 | 104557 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/04/22 | 126536 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2022/04/22 | 139103 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/04/22 | 288199 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2022/04/22 | 325270 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/04/22 | 199832 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2022/04/22 | 181515 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/04/22 | 49770 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2022/04/22 | 55568 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/04/22 | 31412 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2022/04/22 | 35169 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/04/22 | 38561 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2022/04/22 | 43916 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/04/22 | 43361 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2022/04/22 | 47923 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/04/22 | 45741 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2022/04/22 | 52326 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/04/22 | 197038 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2022/04/22 | 213277 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/04/22 | 36049 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2022/04/22 | 41182 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/04/22 | 755742 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2022/04/22 | 824370 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/04/22 | 200397 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2022/04/22 | 202836 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/04/22 | 210271 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2022/04/22 | 245096 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/04/22 | 79025 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2022/04/22 | 88151 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/04/22 | 1181125 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2022/04/22 | 1322742 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/04/22 | 20184 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2022/04/22 | 23944 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/04/22 | 31588 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2022/04/22 | 37375 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/04/22 | 64709 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2022/04/22 | 72886 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/04/22 | 50799 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2022/04/22 | 58664 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/04/22 | 693068 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
+2022/04/22 | 758956 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/04/22 | 1357071 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2022/04/22 | 1501234 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/04/22 | 42817 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2022/04/22 | 52479 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/04/22 | 57619 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2022/04/22 | 63740 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/04/22 | 25552 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2022/04/22 | 27636 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/04/22 | 16561 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2022/04/22 | 18492 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/04/22 | 64490 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2022/04/22 | 71007 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/04/22 | 156964 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2022/04/22 | 173007 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/04/22 | 58665 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2022/04/22 | 67254 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/04/22 | 100487 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2022/04/22 | 107707 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/04/22 | 2694877 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2022/04/22 | 2820687 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/04/22 | 55285 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2022/04/22 | 62382 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/04/22 | 37117 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2022/04/22 | 41201 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/04/22 | 28688 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2022/04/22 | 34052 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/04/22 | 67705 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2022/04/22 | 73531 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/04/22 | 316242 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2022/04/22 | 351697 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/04/22 | 55758 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2022/04/22 | 57525 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/04/22 | 591573 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2022/04/22 | 629428 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/04/22 | 39728 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2022/04/22 | 43226 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/04/22 | 274888 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/04/22 | 1441249 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/04/22 | 1330159 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/04/22 | 13514 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2022/04/22 | 14412 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2022/04/21 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/04/22 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
2018/07/06 | 145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma
2017/03/30 | 191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma
2012/12/20 | 612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma
@@ -297642,7 +297646,7 @@
2022/02/22 | 6917 | systems/win32/miktex/tm/packages/preview.tar.lzma
2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
2021/04/23 | 274028 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2022/04/21 | 938 | systems/win32/miktex/tm/packages/pr.ini
+2022/04/22 | 938 | systems/win32/miktex/tm/packages/pr.ini
2010/09/27 | 248469 | systems/win32/miktex/tm/packages/printlen.tar.lzma
2008/06/17 | 77313 | systems/win32/miktex/tm/packages/proba.tar.lzma
2017/07/12 | 988486 | systems/win32/miktex/tm/packages/probsoln.tar.lzma
@@ -299471,7 +299475,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2022/04/22 | 186 | timestamp
+2022/04/23 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2021/11/11 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 8a6fa7218d..fced916a60 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index 2924d2b2d1..109df99f5b 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,73 +1,418 @@
-2022/04/21 | 99817 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2022/04/21 | 99258 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2022/04/22 | 99817 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2022/04/22 | 99258 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2022/04/22 | 9836 | systems/texlive/tlnet/archive/colorist.r63098.tar.xz
+2022/04/22 | 9804 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex
+2022/04/22 | 97200 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2022/04/22 | 96632 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2022/04/22 | 960480 | systems/texlive/tlnet/archive/postnotes.doc.r63099.tar.xz
+2022/04/22 | 9592 | systems/texlive/tlnet/archive/minimalist.r63098.tar.xz
+2022/04/22 | 95434 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2022/04/22 | 9538 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex
+2022/04/22 | 95285 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/04/22 | 93960 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2022/04/22 | 938 | systems/win32/miktex/tm/packages/pr.ini
+2022/04/22 | 938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex
+2022/04/22 | 937130 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2-body.tex
+2022/04/22 | 929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex
+2022/04/22 | 92918 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2022/04/22 | 88887 | macros/latex/contrib/zref-check/zref-check.dtx
+2022/04/22 | 8852 | systems/texlive/tlnet/archive/datetime2.r63102.tar.xz
+2022/04/22 | 88332 | systems/texlive/tlnet/archive/spbmark.doc.r63100.tar.xz
+2022/04/22 | 88151 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/04/22 | 8783 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/04/22 | 86760 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2022/04/22 | 8431 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
+2022/04/22 | 841340 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0-body.tex
+2022/04/22 | 834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex
+2022/04/22 | 824 | macros/latex/contrib/zref-clever/README.md
+2022/04/22 | 824370 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/04/22 | 81459 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/04/22 | 79025 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2022/04/22 | 78974 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/04/22 | 7753 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2022/04/22 | 77066 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/04/22 | 758991 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6-body.tex
+2022/04/22 | 758956 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/04/22 | 755742 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2022/04/22 | 751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex
+2022/04/22 | 742306 | macros/latex/contrib/zref-check/zref-check-code.pdf
+2022/04/22 | 74069 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/04/22 | 73531 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/04/22 | 73478 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2022/04/22 | 73147 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/04/22 | 7304 | systems/texlive/tlnet/archive/postnotes.r63099.tar.xz
+2022/04/22 | 728 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty
+2022/04/22 | 72886 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/04/22 | 72014 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2022/04/22 | 711284 | systems/texlive/tlnet/archive/simplivre.doc.r63098.tar.xz
+2022/04/22 | 71007 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/04/22 | 70 | macros/latex/contrib/zref-clever/DEPENDS.txt
+2022/04/22 | 693068 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
+2022/04/22 | 690729 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3-body.tex
+2022/04/22 | 68874 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2022/04/22 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex
+2022/04/22 | 682752 | systems/texlive/tlnet/archive/tikzlings.doc.r63097.tar.xz
+2022/04/22 | 681941 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/04/22 | 68010 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2022/04/22 | 679984 | systems/texlive/tlnet/archive/projlib.doc.r63098.tar.xz
+2022/04/22 | 67705 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2022/04/22 | 67254 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/04/22 | 663752 | systems/texlive/tlnet/archive/beaulivre.doc.r63098.tar.xz
+2022/04/22 | 6628 | systems/texlive/tlnet/archive/collection-latexextra.r63101.tar.xz
+2022/04/22 | 65 | systems/mac/mactex/mactex-MacTeXtras-20220422.zip.md5
+2022/04/22 | 65056 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/04/22 | 64709 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2022/04/22 | 646648 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/04/22 | 646139 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/04/22 | 64542 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2022/04/22 | 64490 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2022/04/22 | 641 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty
+2022/04/22 | 63740 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/04/22 | 635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty
+2022/04/22 | 635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty
+2022/04/22 | 633 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty
+2022/04/22 | 63311 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/04/22 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7.sty
+2022/04/22 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty
+2022/04/22 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty
+2022/04/22 | 631 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6.sty
+2022/04/22 | 631278 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2022/04/22 | 629428 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/04/22 | 626 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty
+2022/04/22 | 62382 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/04/22 | 598230 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/04/22 | 591573 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2022/04/22 | 59004 | support/texlogsieve/texlogsieve.pdf
+2022/04/22 | 58665 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2022/04/22 | 58664 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/04/22 | 5798459 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/04/22 | 57619 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2022/04/22 | 57525 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/04/22 | 57330 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/04/22 | 57270 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/04/22 | 56993 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2022/04/22 | 56619 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2022/04/22 | 565929 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/04/22 | 56233 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
+2022/04/22 | 561152 | systems/texlive/tlnet/archive/lebhart.doc.r63098.tar.xz
+2022/04/22 | 55758 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2022/04/22 | 555964 | systems/texlive/tlnet/archive/einfart.doc.r63098.tar.xz
+2022/04/22 | 55568 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/04/22 | 55285 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2022/04/22 | 532454 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2022/04/22 | 528018 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/04/22 | 52479 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/04/22 | 52326 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/04/22 | 52093 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/04/22 | 51632 | systems/texlive/tlnet/archive/datetime2.source.r63102.tar.xz
+2022/04/22 | 51557 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2022/04/22 | 51486 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2022/04/22 | 514171236 | systems/mac/mactex/mactex-MacTeXtras-20220422.zip
+2022/04/22 | 50799 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2022/04/22 | 49 | systems/mac/mactex/MacTeXtras.zip.md5
+2022/04/22 | 49770 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2022/04/22 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/04/22 | 48826 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/04/22 | 484370 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2022/04/22 | 481497 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/04/22 | 47923 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/04/22 | 477907 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
+2022/04/22 | 477849 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2022/04/22 | 46067 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2022/04/22 | 45826 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/04/22 | 45741 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2022/04/22 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/04/22 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/04/22 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/04/22 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/04/22 | 45440 | systems/texlive/tlnet/archive/projlib.source.r63098.tar.xz
+2022/04/22 | 4536 | systems/texlive/tlnet/archive/unisc.source.r63101.tar.xz
+2022/04/22 | 452289 | macros/latex/contrib/zref-check/zref-check.pdf
+2022/04/22 | 43916 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/04/22 | 43825 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/04/22 | 4364 | systems/texlive/tlnet/archive/einfart.r63098.tar.xz
+2022/04/22 | 43646 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2022/04/22 | 4336 | systems/texlive/tlnet/archive/simplivre.r63098.tar.xz
+2022/04/22 | 43361 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2022/04/22 | 43226 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/04/22 | 42988 | graphics/pgf/contrib/circuitikz/doc/changelog.tex
+2022/04/22 | 42817 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2022/04/22 | 4244 | systems/texlive/tlnet/archive/lebhart.r63098.tar.xz
+2022/04/22 | 4232 | systems/texlive/tlnet/archive/beaulivre.r63098.tar.xz
+2022/04/22 | 422295 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3-body.tex
+2022/04/22 | 418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex
+2022/04/22 | 416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex
+2022/04/22 | 41305 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2022/04/22 | 41201 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/04/22 | 41182 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/04/22 | 40812 | macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
+2022/04/22 | 406120 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63095.tar.xz
+2022/04/22 | 403567 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7-body.tex
+2022/04/22 | 4016 | macros/latex/contrib/zref-clever/CHANGELOG.md
+2022/04/22 | 40016 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
+2022/04/22 | 39728 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2022/04/22 | 394370 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/04/22 | 393884 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6-body.tex
+2022/04/22 | 38 | macros/latex/contrib/zref-check/DEPENDS.txt
+2022/04/22 | 38561 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2022/04/22 | 38424 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2022/04/22 | 38147 | systems/mac/mactex/ExtrasFolder.pdf
+2022/04/22 | 3802 | graphics/pgf/contrib/circuitikz/README.md
+2022/04/22 | 37375 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/04/22 | 37117 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2022/04/22 | 37081 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/04/22 | 367961 | macros/latex/contrib/reledmac/migration.pdf
+2022/04/22 | 364777 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
+2022/04/22 | 364117 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4-body.tex
+2022/04/22 | 3628 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
+2022/04/22 | 36049 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2022/04/22 | 35438 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex
+2022/04/22 | 35242 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/04/22 | 35169 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/04/22 | 351697 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/04/22 | 35149 | support/texlogsieve/LICENCE.txt
+2022/04/22 | 3420 | systems/texlive/tlnet/archive/spbmark.r63100.tar.xz
+2022/04/22 | 34052 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/04/22 | 33740 | systems/texlive/tlnet/archive/tikzlings.r63097.tar.xz
+2022/04/22 | 336608 | macros/latex/contrib/zref-clever/zref-clever.dtx
+2022/04/22 | 33313 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex
+2022/04/22 | 332414 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2022/04/22 | 32955 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2022/04/22 | 326660 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/04/22 | 325270 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/04/22 | 3233 | macros/latex/contrib/zref-check/CHANGELOG.md
+2022/04/22 | 32135 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/04/22 | 32047 | macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
+2022/04/22 | 316242 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2022/04/22 | 31588 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2022/04/22 | 31520 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/04/22 | 3150 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex
+2022/04/22 | 31502 | macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
+2022/04/22 | 31412 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2022/04/22 | 31343 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/04/22 | 311667 | macros/latex/contrib/zref-clever/zref-clever.pdf
+2022/04/22 | 3114052 | install/graphics/pgf/contrib/circuitikz.tds.zip
+2022/04/22 | 3098 | macros/latex/contrib/zref-clever/zref-clever.ins
+2022/04/22 | 3095194 | graphics/pgf/contrib/circuitikz.zip
+2022/04/22 | 309317 | macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
+2022/04/22 | 306337 | macros/latex/contrib/reledmac/reledpar.dtx
+2022/04/22 | 30542 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/04/22 | 301520 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
+2022/04/22 | 30147 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2022/04/22 | 297136 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
+2022/04/22 | 296038 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/04/22 | 295846 | macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
+2022/04/22 | 293260 | macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
+2022/04/22 | 290106 | macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
+2022/04/22 | 288680 | macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
+2022/04/22 | 288423 | macros/latex/contrib/reledmac/examples/2-linespacing.pdf
+2022/04/22 | 288199 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2022/04/22 | 28797 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2022/04/22 | 287548 | macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
+2022/04/22 | 28688 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2022/04/22 | 286412 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/04/22 | 286176 | macros/latex/contrib/reledmac/examples/2-performances.pdf
+2022/04/22 | 285714 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2022/04/22 | 28569 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/04/22 | 284805 | macros/latex/contrib/reledmac/examples/1-tabular.pdf
+2022/04/22 | 284461 | macros/latex/contrib/reledmac/examples/2-glossaries.pdf
+2022/04/22 | 28421 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2022/04/22 | 283595 | macros/latex/contrib/reledmac/examples/2-indexing.pdf
+2022/04/22 | 2820687 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/04/22 | 2811 | support/texlogsieve/README.md
+2022/04/22 | 280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex
+2022/04/22 | 277763 | macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
+2022/04/22 | 27636 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/04/22 | 27590 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2022/04/22 | 274888 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/04/22 | 274864 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/04/22 | 27249 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2022/04/22 | 270300 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/04/22 | 2694877 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2022/04/22 | 2599 | macros/latex/contrib/zref-check/zref-check.ins
+2022/04/22 | 259257 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2022/04/22 | 2564 | systems/texlive/tlnet/archive/unisc.r63101.tar.xz
+2022/04/22 | 25552 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2022/04/22 | 25481700 | systems/texlive/tlnet/install-tl.zip
+2022/04/22 | 254065 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
+2022/04/22 | 251131 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2022/04/22 | 25106 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2022/04/22 | 25060 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/04/22 | 2505 | macros/latex/contrib/zref-check/zref-check.tex
+2022/04/22 | 249189 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
+2022/04/22 | 247334 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/04/22 | 245096 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/04/22 | 244960 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2022/04/22 | 24121 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/04/22 | 23996 | systems/texlive/tlnet/archive/projlib.r63098.tar.xz
+2022/04/22 | 23944 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/04/22 | 2368864 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/04/22 | 23436 | macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
+2022/04/22 | 224505 | macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
+2022/04/22 | 22147 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2022/04/22 | 22009 | support/texlogsieve/texlogsieve.tex
+2022/04/22 | 2188 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex
+2022/04/22 | 2171 | macros/latex/contrib/zref-check/zref-check-code.tex
+2022/04/22 | 213277 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/04/22 | 213255 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
+2022/04/22 | 21315 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2022/04/22 | 211866 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
+2022/04/22 | 211560 | macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
+2022/04/22 | 210271 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2022/04/22 | 209856 | macros/latex/contrib/reledmac/examples/2-antilabe.pdf
+2022/04/22 | 208808 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/04/22 | 20716 | systems/texlive/tlnet/archive/postnotes.source.r63099.tar.xz
+2022/04/22 | 206315 | macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
+2022/04/22 | 205926 | macros/latex/contrib/reledmac/examples/2-notes-width.pdf
+2022/04/22 | 20463676 | systems/texlive/tlnet/install-tl-windows.exe
+2022/04/22 | 2046154 | macros/latex/contrib/reledmac/reledmac.pdf
+2022/04/22 | 204143 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
+2022/04/22 | 203977 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
+2022/04/22 | 203837 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
+2022/04/22 | 203250 | macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
+2022/04/22 | 202836 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/04/22 | 202703 | macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
+2022/04/22 | 20184 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2022/04/22 | 201047 | macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
+2022/04/22 | 200397 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2022/04/22 | 200374 | macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
+2022/04/22 | 200202 | macros/latex/contrib/reledmac/examples/1-verses.pdf
+2022/04/22 | 199951 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
+2022/04/22 | 199832 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2022/04/22 | 199821 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
+2022/04/22 | 199585 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
+2022/04/22 | 199200 | macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
+2022/04/22 | 199198 | macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
+2022/04/22 | 199183 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
+2022/04/22 | 199051 | macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
+2022/04/22 | 198700 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
+2022/04/22 | 198564 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
+2022/04/22 | 198512 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
+2022/04/22 | 1982084 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/04/22 | 197038 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2022/04/22 | 196117 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/04/22 | 195381 | macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
+2022/04/22 | 194223 | support/texlogsieve/texlogsieve
+2022/04/22 | 190504 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2022/04/22 | 1855428 | systems/texlive/tlnet/archive/concmath-otf.doc.r63096.tar.xz
+2022/04/22 | 18492 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/04/22 | 18367 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/04/22 | 181515 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/04/22 | 179878 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2022/04/22 | 177024 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
+2022/04/22 | 17645 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
+2022/04/22 | 1752147 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2022/04/22 | 174535 | macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
+2022/04/22 | 173007 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/04/22 | 17266238 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/04/22 | 168820 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/04/22 | 16722 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
+2022/04/22 | 16561 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2022/04/22 | 16503 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2022/04/22 | 161 | systems/mac/mactex/mactex-MacTeXtras-20220422.zip.sha512
+2022/04/22 | 1619864 | install/macros/latex/contrib/zref-clever.tds.zip
+2022/04/22 | 1612 | systems/mac/mactex/Licenses.txt
+2022/04/22 | 1584609 | macros/latex/contrib/zref-clever.zip
+2022/04/22 | 156964 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2022/04/22 | 155499 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/04/22 | 15442 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
+2022/04/22 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/04/22 | 1539 | macros/latex/contrib/zref-clever/zref-clever-code.tex
+2022/04/22 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/04/22 | 152032 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2022/04/22 | 1518613 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
+2022/04/22 | 1501234 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/04/22 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/04/22 | 145 | systems/mac/mactex/MacTeXtras.zip.sha512
+2022/04/22 | 14587 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
+2022/04/22 | 1454764 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/04/22 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/04/22 | 14412 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/04/22 | 1441249 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/04/22 | 1440794 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/04/22 | 139103 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/04/22 | 13780 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
+2022/04/22 | 135949 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2022/04/22 | 1357071 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2022/04/22 | 135376 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/04/22 | 13514 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2022/04/22 | 13494981 | macros/latex/contrib/reledmac.zip
+2022/04/22 | 134264 | systems/texlive/tlnet/archive/concmath-otf.r63096.tar.xz
+2022/04/22 | 1330475 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/04/22 | 1330159 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/04/22 | 1322742 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/04/22 | 132242 | support/texlogsieve.zip
+2022/04/22 | 1302484 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2022/04/22 | 128844 | systems/texlive/tlnet/archive/unisc.doc.r63101.tar.xz
+2022/04/22 | 126536 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2022/04/22 | 1255628 | macros/latex/contrib/zref-clever/zref-clever-code.pdf
+2022/04/22 | 120615 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2022/04/22 | 1181886 | macros/latex/contrib/zref-check.zip
+2022/04/22 | 1181125 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2022/04/22 | 117383 | macros/latex/contrib/zref-clever/zref-clever.tex
+2022/04/22 | 115656 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/04/22 | 1156464 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/04/22 | 11542 | support/texlogsieve/texlogsieve.1
+2022/04/22 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/04/22 | 113051 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/04/22 | 113032 | systems/texlive/tlnet/archive/minimalist.doc.r63098.tar.xz
+2022/04/22 | 112589 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/04/22 | 112203 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
+2022/04/22 | 111880 | systems/texlive/tlnet/archive/colorist.doc.r63098.tar.xz
+2022/04/22 | 109704 | systems/texlive/tlnet/archive/texlive-scripts.r63095.tar.xz
+2022/04/22 | 109478 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/04/22 | 1081680 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6-body.tex
+2022/04/22 | 107976 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
+2022/04/22 | 107707 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/04/22 | 1073051 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.4.6.tex
+2022/04/22 | 104557 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/04/22 | 103337 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/04/22 | 103094 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/04/22 | 1021847 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2022/04/22 | 1021798 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7-body.tex
+2022/04/22 | 1017512 | systems/texlive/tlnet/archive/datetime2.doc.r63102.tar.xz
+2022/04/22 | 1014383 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.2.7.tex
+2022/04/22 | 1006519 | macros/latex/contrib/reledmac/reledpar.pdf
+2022/04/22 | 100487 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2022/04/22 | 1002 | macros/latex/contrib/zref-check/README.md
2022/04/21 | 9840 | macros/latex/contrib/censor/censor.sty
2022/04/21 | 983380 | macros/latex/contrib/postnotes.zip
2022/04/21 | 9824 | graphics/pgf/contrib/tikzlings/tikzlings-hippos.sty
2022/04/21 | 98208 | macros/latex/contrib/projlib/ProjLib-doc.dtx
-2022/04/21 | 97201 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2022/04/21 | 96633 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
2022/04/21 | 9583 | graphics/pgf/contrib/tikzlings/tikzlings-bees.sty
-2022/04/21 | 95433 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2022/04/21 | 95286 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
2022/04/21 | 952260 | systems/texlive/tlnet/archive/witharrows.doc.r63087.tar.xz
2022/04/21 | 9467 | graphics/pgf/contrib/tikzlings/tikzlings-elephants.sty
-2022/04/21 | 93957 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
2022/04/21 | 93949 | macros/latex/contrib/postnotes/postnotes.dtx
-2022/04/21 | 938 | systems/win32/miktex/tm/packages/pr.ini
-2022/04/21 | 92919 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
2022/04/21 | 9215 | graphics/pgf/contrib/tikzlings/tikzlings-owls.sty
2022/04/21 | 91204 | systems/texlive/tlnet/archive/mfware.armhf-linux.r63092.tar.xz
2022/04/21 | 91130 | macros/latex/contrib/spbmark.zip
2022/04/21 | 881 | macros/latex/contrib/postnotes/README.md
-2022/04/21 | 88152 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/04/21 | 8783 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/04/21 | 86760 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
2022/04/21 | 866124 | systems/texlive/tlnet/archive/l3backend.doc.r63089.tar.xz
2022/04/21 | 8582 | graphics/pgf/contrib/tikzlings/tikzlings-bears.sty
2022/04/21 | 857 | macros/latex/contrib/projlib/ProjLib-doc.ins
2022/04/21 | 8561 | graphics/pgf/contrib/tikzlings/tikzlings-pandas.sty
2022/04/21 | 84970 | macros/latex/contrib/spbmark/spbmark.pdf
2022/04/21 | 83443 | macros/latex/contrib/easybook/easybook.tex
-2022/04/21 | 824371 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/04/21 | 81461 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
2022/04/21 | 804363 | macros/latex/contrib/postnotes/postnotes-code.pdf
2022/04/21 | 803210 | macros/unicodetex/latex/simplivre.zip
2022/04/21 | 80180 | systems/texlive/tlnet/archive/l3experimental.source.r63089.tar.xz
2022/04/21 | 80100 | systems/texlive/tlnet/archive/fontware.armhf-linux.r63092.tar.xz
-2022/04/21 | 79025 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2022/04/21 | 78974 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
2022/04/21 | 777071 | macros/latex/contrib/projlib.zip
-2022/04/21 | 7753 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2022/04/21 | 77067 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
2022/04/21 | 7596 | systems/texlive/tlnet/archive/dvidvi.armhf-linux.r63092.tar.xz
-2022/04/21 | 758954 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
2022/04/21 | 758826 | graphics/pgf/contrib/tikzlings.zip
-2022/04/21 | 755742 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
2022/04/21 | 75139 | macros/latex/contrib/easybook/easybook.dtx
2022/04/21 | 749716 | macros/unicodetex/latex/beaulivre.zip
-2022/04/21 | 74068 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/04/21 | 73528 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/04/21 | 73478 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2022/04/21 | 73146 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
2022/04/21 | 729 | support/texlive/texlive-dummy/openSUSE/README.md
2022/04/21 | 729840 | systems/texlive/tlnet/archive/metapost.armhf-linux.r63092.tar.xz
-2022/04/21 | 72885 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/04/21 | 7264 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/04/21 | 72496 | support/texlive/texlive-dummy/openSUSE/texlive-dummy-2022.9999-1.src.rpm
-2022/04/21 | 72013 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2022/04/21 | 71004 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
2022/04/21 | 70764 | systems/texlive/tlnet/archive/ps2pk.armhf-linux.r63092.tar.xz
2022/04/21 | 703870 | graphics/pgf/contrib/tikzlings/tikzlings-doc.pdf
2022/04/21 | 7030004 | systems/texlive/tlnet/archive/xetex.armhf-linux.r63092.tar.xz
2022/04/21 | 7008224 | systems/texlive/tlnet/archive/uptex.armhf-linux.r63092.tar.xz
2022/04/21 | 69948 | systems/texlive/tlnet/archive/tex4ht.armhf-linux.r63092.tar.xz
-2022/04/21 | 693069 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
-2022/04/21 | 68873 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
2022/04/21 | 682932 | systems/texlive/tlnet/archive/pdftex.armhf-linux.r63092.tar.xz
-2022/04/21 | 681940 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
2022/04/21 | 6801 | fonts/concmath-otf/concmath-otf.sty
-2022/04/21 | 68010 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2022/04/21 | 67704 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2022/04/21 | 67254 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
2022/04/21 | 668 | graphics/pgf/contrib/tikzlings/tikzlings-list.sty
2022/04/21 | 668984 | systems/texlive/tlnet/archive/mflua.armhf-linux.r63092.tar.xz
2022/04/21 | 66864 | systems/texlive/tlnet/archive/bibtex8.armhf-linux.r63092.tar.xz
@@ -75,195 +420,85 @@
2022/04/21 | 6600 | macros/latex/contrib/minimalist/minimart.cls
2022/04/21 | 6597 | macros/latex/contrib/minimalist/minimbook.cls
2022/04/21 | 653080 | systems/texlive/tlnet/archive/polyglossia.doc.r63091.tar.xz
-2022/04/21 | 65055 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/04/21 | 64710 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2022/04/21 | 646648 | systems/win32/miktex/tm/packages/files.csv.lzma
-2022/04/21 | 646139 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/04/21 | 64544 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2022/04/21 | 64489 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
2022/04/21 | 64212 | systems/texlive/tlnet/archive/dviljk.armhf-linux.r63092.tar.xz
-2022/04/21 | 63739 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/04/21 | 63311 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
2022/04/21 | 632810 | macros/latex/contrib/easybook.zip
2022/04/21 | 63152 | systems/texlive/tlnet/archive/web.armhf-linux.r63092.tar.xz
-2022/04/21 | 631279 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2022/04/21 | 629430 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/04/21 | 62382 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
2022/04/21 | 61644 | systems/texlive/tlnet/archive/synctex.armhf-linux.r63092.tar.xz
2022/04/21 | 60748 | systems/texlive/tlnet/archive/dviout-util.armhf-linux.r63092.tar.xz
2022/04/21 | 60232 | systems/texlive/tlnet/archive/bibtex.armhf-linux.r63092.tar.xz
-2022/04/21 | 598230 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/04/21 | 591571 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
2022/04/21 | 591552 | macros/latex/contrib/easybook/easybook.pdf
2022/04/21 | 59120 | systems/texlive/tlnet/archive/dvi2tty.armhf-linux.r63092.tar.xz
2022/04/21 | 588912 | systems/texlive/tlnet/archive/l3kernel.source.r63089.tar.xz
-2022/04/21 | 58666 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2022/04/21 | 58664 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
2022/04/21 | 586566 | macros/unicodetex/latex/lebhart.zip
2022/04/21 | 5842 | macros/latex/contrib/colorist/colorart.cls
2022/04/21 | 5839 | macros/latex/contrib/colorist/colorbook.cls
2022/04/21 | 583355 | macros/unicodetex/latex/einfart.zip
-2022/04/21 | 5798200 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/04/21 | 57617 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2022/04/21 | 57527 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/04/21 | 57330 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/04/21 | 57270 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/04/21 | 56994 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2022/04/21 | 56618 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
2022/04/21 | 5660784 | systems/texlive/tlnet/archive/bibtexu.armhf-linux.r63092.tar.xz
-2022/04/21 | 565928 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
2022/04/21 | 55900 | systems/texlive/tlnet/archive/babel-french.source.r63088.tar.xz
-2022/04/21 | 55757 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2022/04/21 | 55568 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
2022/04/21 | 5552 | systems/texlive/tlnet/archive/vlna.armhf-linux.r63092.tar.xz
-2022/04/21 | 55284 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2022/04/21 | 532457 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
2022/04/21 | 52884 | systems/texlive/tlnet/archive/witharrows.source.r63087.tar.xz
-2022/04/21 | 528018 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/04/21 | 52479 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/04/21 | 52326 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/04/21 | 52094 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/04/21 | 51558 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2022/04/21 | 51486 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
2022/04/21 | 508004 | systems/texlive/tlnet/archive/babel-french.doc.r63088.tar.xz
-2022/04/21 | 50799 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
2022/04/21 | 498056 | systems/texlive/tlnet/archive/lcdftypetools.armhf-linux.r63092.tar.xz
-2022/04/21 | 49770 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
2022/04/21 | 49072 | systems/texlive/tlnet/archive/psutils.armhf-linux.r63092.tar.xz
2022/04/21 | 4904 | systems/texlive/tlnet/archive/musixtnt.armhf-linux.r63092.tar.xz
-2022/04/21 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2022/04/21 | 4893 | macros/latex/contrib/minimalist/minimalist.sty
-2022/04/21 | 48826 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
2022/04/21 | 4880 | macros/latex/contrib/projlib/README.md
-2022/04/21 | 484371 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2022/04/21 | 481496 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/04/21 | 47923 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/04/21 | 477846 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2022/04/21 | 46067 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2022/04/21 | 45823 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/04/21 | 45742 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2022/04/21 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/04/21 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2022/04/21 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/04/21 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2022/04/21 | 44968 | systems/texlive/tlnet/archive/xml2pmx.armhf-linux.r63092.tar.xz
2022/04/21 | 446916 | systems/texlive/tlnet/archive/xdvi.armhf-linux.r63092.tar.xz
-2022/04/21 | 43916 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/04/21 | 43825 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
2022/04/21 | 43760 | systems/texlive/tlnet/archive/dvicopy.armhf-linux.r63092.tar.xz
-2022/04/21 | 43644 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
2022/04/21 | 43392 | systems/texlive/tlnet/archive/tuda-ci.r63090.tar.xz
-2022/04/21 | 43361 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2022/04/21 | 43226 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
2022/04/21 | 43222 | graphics/pgf/contrib/tikzlings/tikzlings-addons.sty
2022/04/21 | 43196 | systems/texlive/tlnet/archive/chktex.armhf-linux.r63092.tar.xz
-2022/04/21 | 42818 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2022/04/21 | 41306 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2022/04/21 | 41204 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/04/21 | 41182 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
2022/04/21 | 41108 | systems/texlive/tlnet/archive/texware.armhf-linux.r63092.tar.xz
-2022/04/21 | 406064 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63085.tar.xz
2022/04/21 | 40208 | systems/texlive/tlnet/archive/detex.armhf-linux.r63092.tar.xz
2022/04/21 | 40188 | systems/texlive/tlnet/archive/cjkutils.armhf-linux.r63092.tar.xz
2022/04/21 | 40180 | systems/texlive/tlnet/archive/makeindex.armhf-linux.r63092.tar.xz
2022/04/21 | 4009 | macros/latex/contrib/colorist/colorist.sty
-2022/04/21 | 39728 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2022/04/21 | 394371 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
2022/04/21 | 392880 | systems/texlive/tlnet/archive/dvipng.armhf-linux.r63092.tar.xz
2022/04/21 | 3904 | systems/texlive/tlnet/archive/ps2eps.armhf-linux.r63092.tar.xz
2022/04/21 | 38756 | macros/latex/contrib/postnotes/postnotes.tex
-2022/04/21 | 38560 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2022/04/21 | 38426 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
2022/04/21 | 38231 | macros/latex/contrib/minimalist/minimalist-classical.sty
-2022/04/21 | 37375 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
2022/04/21 | 37148 | systems/texlive/tlnet/archive/dvipos.armhf-linux.r63092.tar.xz
-2022/04/21 | 37116 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2022/04/21 | 37081 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
2022/04/21 | 36207 | macros/latex/contrib/colorist/colorist-fancy.sty
-2022/04/21 | 36049 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
2022/04/21 | 36043 | macros/latex/contrib/minimalist/minimalist-plain.sty
2022/04/21 | 35460 | systems/texlive/tlnet/archive/m-tx.armhf-linux.r63092.tar.xz
-2022/04/21 | 35243 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/04/21 | 351697 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/04/21 | 35168 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
2022/04/21 | 3505696 | systems/texlive/tlnet/archive/l3experimental.doc.r63089.tar.xz
2022/04/21 | 347096 | systems/texlive/tlnet/archive/dvipdfmx.armhf-linux.r63092.tar.xz
2022/04/21 | 341 | macros/latex/contrib/postnotes/CHANGELOG.md
2022/04/21 | 34160 | systems/texlive/tlnet/archive/afm2pl.armhf-linux.r63092.tar.xz
2022/04/21 | 341044 | systems/texlive/tlnet/archive/ttfutils.armhf-linux.r63092.tar.xz
2022/04/21 | 340 | graphics/pgf/contrib/tikzlings/README.md
-2022/04/21 | 34051 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
2022/04/21 | 3383 | graphics/pgf/contrib/tikzlings/tikzlings.sty
2022/04/21 | 336 | macros/unicodetex/latex/unisc/README.txt
2022/04/21 | 336536 | support/texlive/texlive-dummy/openSUSE/texlive-dummy-2022.9999-1.noarch.rpm
2022/04/21 | 33576 | systems/texlive/tlnet/archive/gsftopk.armhf-linux.r63092.tar.xz
2022/04/21 | 335280 | macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf
-2022/04/21 | 332414 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2022/04/21 | 32954 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
2022/04/21 | 32940 | systems/texlive/tlnet/archive/l3backend.source.r63089.tar.xz
-2022/04/21 | 326662 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/04/21 | 325268 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
2022/04/21 | 32388 | systems/texlive/tlnet/archive/kpathsea.armhf-linux.r63092.tar.xz
2022/04/21 | 3229 | macros/latex/contrib/projlib/ProjLib.ins
2022/04/21 | 322407 | macros/latex/contrib/projlib/ProjLib-doc-cn.pdf
2022/04/21 | 32220 | systems/texlive/tlnet/archive/t1utils.armhf-linux.r63092.tar.xz
-2022/04/21 | 32133 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
2022/04/21 | 320007 | macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf
-2022/04/21 | 316242 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2022/04/21 | 31588 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2022/04/21 | 31521 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/04/21 | 31413 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2022/04/21 | 31344 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/04/21 | 30542 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
2022/04/21 | 304424 | systems/texlive/tlnet/archive/pdftosrc.armhf-linux.r63092.tar.xz
-2022/04/21 | 30146 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2022/04/21 | 296037 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
2022/04/21 | 29232 | macros/latex/contrib/censor/censor.tex
2022/04/21 | 29113 | macros/unicodetex/latex/simplivre/simplivre.cls
2022/04/21 | 29109 | macros/unicodetex/latex/einfart/einfart.cls
-2022/04/21 | 288200 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2022/04/21 | 28795 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
2022/04/21 | 28704 | systems/texlive/tlnet/archive/ctie.armhf-linux.r63092.tar.xz
-2022/04/21 | 28690 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2022/04/21 | 286412 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/04/21 | 285716 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2022/04/21 | 28569 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/04/21 | 28423 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
2022/04/21 | 28249 | macros/unicodetex/latex/beaulivre/beaulivre.cls
2022/04/21 | 28245 | macros/unicodetex/latex/lebhart/lebhart.cls
-2022/04/21 | 2820688 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/04/21 | 27636 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/04/21 | 27592 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2022/04/21 | 274905 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/04/21 | 274807 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
2022/04/21 | 27340 | systems/texlive/tlnet/archive/tie.armhf-linux.r63092.tar.xz
2022/04/21 | 27268 | systems/texlive/tlnet/archive/luapstricks.r63086.tar.xz
-2022/04/21 | 27249 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2022/04/21 | 270299 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/04/21 | 2694879 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
2022/04/21 | 266891 | macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf
-2022/04/21 | 259257 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
2022/04/21 | 2574 | macros/latex/contrib/postnotes/postnotes.ins
-2022/04/21 | 25551 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2022/04/21 | 25481708 | systems/texlive/tlnet/install-tl.zip
2022/04/21 | 2537 | macros/latex/contrib/minimalist/README.md
-2022/04/21 | 251130 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2022/04/21 | 25106 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2022/04/21 | 25059 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
2022/04/21 | 249232 | macros/unicodetex/latex/einfart/einfart-doc-cn.pdf
-2022/04/21 | 247333 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
2022/04/21 | 24686 | macros/latex/contrib/minimalist/minimalist-doc.tex
2022/04/21 | 246320 | macros/latex/contrib/censor/censor.pdf
-2022/04/21 | 245097 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/04/21 | 244963 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
2022/04/21 | 24343 | macros/latex/contrib/colorist/colorist-doc.tex
2022/04/21 | 2422 | macros/latex/contrib/colorist/README.md
2022/04/21 | 24178 | macros/unicodetex/latex/einfart/einfart-doc-fr.tex
-2022/04/21 | 24120 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/04/21 | 23945 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
2022/04/21 | 23898 | macros/unicodetex/latex/lebhart/lebhart-doc-fr.tex
2022/04/21 | 238816 | macros/latex/contrib/censor.zip
-2022/04/21 | 2366996 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2022/04/21 | 23644 | systems/texlive/tlnet/archive/l3experimental.r63089.tar.xz
2022/04/21 | 235244 | systems/texlive/tlnet/archive/hitex.armhf-linux.r63092.tar.xz
2022/04/21 | 230162 | macros/unicodetex/latex/simplivre/simplivre-doc-fr.pdf
@@ -272,40 +507,26 @@
2022/04/21 | 224808 | fonts/concmath-otf/Concrete-Math.otf
2022/04/21 | 22292 | macros/unicodetex/latex/einfart/einfart-doc-en.tex
2022/04/21 | 22200 | macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.tex
-2022/04/21 | 22147 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
2022/04/21 | 22018 | macros/unicodetex/latex/lebhart/lebhart-doc-en.tex
2022/04/21 | 2162308 | systems/texlive/tlnet/archive/luajittex.armhf-linux.r63092.tar.xz
2022/04/21 | 214660 | systems/texlive/tlnet/archive/pmx.armhf-linux.r63092.tar.xz
2022/04/21 | 213449 | macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.pdf
-2022/04/21 | 213279 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
2022/04/21 | 2131 | fonts/concmath-otf/README.md
-2022/04/21 | 21315 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
2022/04/21 | 21244 | systems/texlive/tlnet/archive/seetexk.armhf-linux.r63092.tar.xz
2022/04/21 | 21225 | macros/unicodetex/latex/einfart/einfart-doc-cn.tex
-2022/04/21 | 210278 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
2022/04/21 | 20973 | macros/unicodetex/latex/simplivre/simplivre-doc-en.tex
-2022/04/21 | 208807 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
2022/04/21 | 208615 | macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf
2022/04/21 | 2081 | macros/latex/contrib/easybook/easybook.ins
2022/04/21 | 20769 | graphics/pgf/contrib/tikzlings/tikzlings-doc.tex
2022/04/21 | 20571 | macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex
2022/04/21 | 205532 | systems/texlive/tlnet/archive/aleph.armhf-linux.r63092.tar.xz
2022/04/21 | 20474 | macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex
-2022/04/21 | 20460100 | systems/texlive/tlnet/install-tl-windows.exe
-2022/04/21 | 203835 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
-2022/04/21 | 202835 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/04/21 | 20184 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
2022/04/21 | 201834 | macros/latex/contrib/projlib/ProjLib-doc-fr.pdf
2022/04/21 | 2009138 | fonts/concmath-otf.zip
-2022/04/21 | 200399 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
2022/04/21 | 200297 | macros/latex/contrib/projlib/ProjLib-doc-en.pdf
-2022/04/21 | 199832 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
2022/04/21 | 19929 | macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex
2022/04/21 | 198884 | systems/texlive/tlnet/archive/omegaware.armhf-linux.r63092.tar.xz
-2022/04/21 | 1982086 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/04/21 | 197036 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
2022/04/21 | 196422 | macros/latex/contrib/projlib/ProjLib.dtx
-2022/04/21 | 196116 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
2022/04/21 | 19106 | macros/unicodetex/latex/simplivre/LICENSE
2022/04/21 | 19106 | macros/unicodetex/latex/lebhart/LICENSE
2022/04/21 | 19106 | macros/unicodetex/latex/einfart/LICENSE
@@ -313,30 +534,19 @@
2022/04/21 | 19106 | macros/latex/contrib/projlib/LICENSE
2022/04/21 | 19106 | macros/latex/contrib/minimalist/LICENSE
2022/04/21 | 19106 | macros/latex/contrib/colorist/LICENSE
-2022/04/21 | 190506 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
2022/04/21 | 19024 | macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex
2022/04/21 | 18804 | systems/texlive/tlnet/archive/lacheck.armhf-linux.r63092.tar.xz
2022/04/21 | 1879784 | systems/texlive/tlnet/archive/luahbtex.armhf-linux.r63092.tar.xz
2022/04/21 | 18582 | fonts/concmath-otf/concmath-otf.ltx
-2022/04/21 | 18492 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/04/21 | 18368 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
2022/04/21 | 18244 | systems/texlive/tlnet/archive/autosp.armhf-linux.r63092.tar.xz
-2022/04/21 | 181515 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/04/21 | 179879 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
2022/04/21 | 17893 | graphics/pgf/contrib/tikzlings/tikzlings-chickens.sty
2022/04/21 | 1779962 | fonts/concmath-otf/unimath-concrete.pdf
2022/04/21 | 17684 | systems/texlive/tlnet/archive/axodraw2.armhf-linux.r63092.tar.xz
2022/04/21 | 176458 | macros/latex/contrib/postnotes/postnotes.pdf
-2022/04/21 | 1752147 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
2022/04/21 | 17503 | graphics/pgf/contrib/tikzlings/tikzlings-sloths.sty
-2022/04/21 | 173008 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
2022/04/21 | 17294 | graphics/pgf/contrib/tikzlings/tikzlings-cats.sty
-2022/04/21 | 17262019 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
2022/04/21 | 171396 | systems/texlive/tlnet/archive/l3kernel.r63089.tar.xz
2022/04/21 | 16886 | fonts/concmath-otf/unimath-concrete.ltx
-2022/04/21 | 168820 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/04/21 | 16561 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2022/04/21 | 16503 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
2022/04/21 | 159934 | macros/unicodetex/latex/einfart/einfart-doc-fr.pdf
2022/04/21 | 15992 | systems/texlive/tlnet/archive/dtl.armhf-linux.r63092.tar.xz
2022/04/21 | 15948 | macros/unicodetex/latex/unisc/unisc.dtx
@@ -345,18 +555,12 @@
2022/04/21 | 15764 | systems/texlive/tlnet/archive/patgen.armhf-linux.r63092.tar.xz
2022/04/21 | 15747 | graphics/pgf/contrib/tikzlings/tikzlings-coatis.sty
2022/04/21 | 157344 | systems/texlive/tlnet/archive/polyglossia.source.r63091.tar.xz
-2022/04/21 | 156965 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2022/04/21 | 155497 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
2022/04/21 | 154559 | macros/unicodetex/latex/einfart/einfart-doc-en.pdf
2022/04/21 | 15400 | systems/texlive/tlnet/archive/l3backend.r63089.tar.xz
-2022/04/21 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
2022/04/21 | 1532360 | systems/texlive/tlnet/archive/dvisvgm.armhf-linux.r63092.tar.xz
-2022/04/21 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
2022/04/21 | 1520 | systems/texlive/tlnet/archive/luapstricks.doc.r63086.tar.xz
-2022/04/21 | 152029 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
2022/04/21 | 15136 | macros/latex/contrib/spbmark/spbmark.tex
2022/04/21 | 150838 | macros/unicodetex/latex/lebhart/lebhart-doc-fr.pdf
-2022/04/21 | 1501237 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
2022/04/21 | 14 | macros/latex/contrib/postnotes/DEPENDS.txt
2022/04/21 | 14933 | macros/latex/contrib/spbmark/spbmark.sty
2022/04/21 | 149216 | systems/texlive/tlnet/archive/tex.armhf-linux.r63092.tar.xz
@@ -367,69 +571,38 @@
2022/04/21 | 14712 | systems/texlive/tlnet/archive/witharrows.r63087.tar.xz
2022/04/21 | 146772 | systems/texlive/tlnet/archive/metafont.armhf-linux.r63092.tar.xz
2022/04/21 | 1460 | macros/unicodetex/latex/lebhart/README.md
-2022/04/21 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
2022/04/21 | 1458 | macros/unicodetex/latex/beaulivre/README.md
-2022/04/21 | 1454765 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/04/21 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/04/21 | 14411 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2022/04/21 | 1440968 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/04/21 | 1440362 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
2022/04/21 | 1434 | macros/latex/contrib/postnotes/postnotes-code.tex
2022/04/21 | 14308 | graphics/pgf/contrib/tikzlings/tikzlings-marmots.sty
-2022/04/21 | 139101 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/04/21 | 135949 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2022/04/21 | 1357073 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2022/04/21 | 135377 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/04/21 | 13514 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
2022/04/21 | 133592 | macros/unicodetex/latex/unisc/unisc.pdf
2022/04/21 | 133200 | macros/latex/contrib/minimalist.zip
2022/04/21 | 133161 | macros/unicodetex/latex/unisc.zip
-2022/04/21 | 1330441 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2022/04/21 | 1329309 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/04/21 | 1322742 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
2022/04/21 | 13134 | graphics/pgf/contrib/tikzlings/tikzlings-bugs.sty
2022/04/21 | 13115 | graphics/pgf/contrib/tikzlings/tikzlings-sheep.sty
-2022/04/21 | 1302481 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2022/04/21 | 126536 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
2022/04/21 | 125689 | macros/latex/contrib/colorist.zip
2022/04/21 | 12562 | graphics/pgf/contrib/tikzlings/tikzlings-anteaters.sty
2022/04/21 | 123533 | fonts/concmath-otf/concmath-otf.pdf
2022/04/21 | 12219 | graphics/pgf/contrib/tikzlings/tikzlings-wolves.sty
-2022/04/21 | 120616 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
2022/04/21 | 120072 | systems/texlive/tlnet/archive/dvips.armhf-linux.r63092.tar.xz
2022/04/21 | 119024 | systems/texlive/tlnet/archive/polyglossia.r63091.tar.xz
2022/04/21 | 118504 | systems/texlive/tlnet/archive/cweb.armhf-linux.r63092.tar.xz
-2022/04/21 | 1181126 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
2022/04/21 | 11767 | graphics/pgf/contrib/tikzlings/tikzlings-koalas.sty
2022/04/21 | 116847 | support/texlive/texlive-dummy/openSUSE.zip
2022/04/21 | 11595188 | systems/texlive/tlnet/archive/l3kernel.doc.r63089.tar.xz
2022/04/21 | 1157844 | systems/texlive/tlnet/archive/ptex.armhf-linux.r63092.tar.xz
-2022/04/21 | 115657 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/04/21 | 1156465 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/04/21 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
2022/04/21 | 11531 | graphics/pgf/contrib/tikzlings/tikzlings-mice.sty
2022/04/21 | 1131820 | systems/texlive/tlnet/archive/tuda-ci.doc.r63090.tar.xz
-2022/04/21 | 113052 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/04/21 | 112591 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
2022/04/21 | 11184 | graphics/pgf/contrib/tikzlings/tikzlings-squirrels.sty
2022/04/21 | 11060 | graphics/pgf/contrib/tikzlings/tikzlings-pigs.sty
-2022/04/21 | 109720 | systems/texlive/tlnet/archive/texlive-scripts.r63085.tar.xz
-2022/04/21 | 109479 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
2022/04/21 | 10926 | graphics/pgf/contrib/tikzlings/tikzlings-moles.sty
2022/04/21 | 10824 | systems/texlive/tlnet/archive/velthuis.armhf-linux.r63092.tar.xz
2022/04/21 | 10794 | graphics/pgf/contrib/tikzlings/tikzlings-bats.sty
-2022/04/21 | 107706 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
2022/04/21 | 10722 | graphics/pgf/contrib/tikzlings/tikzlings-penguins.sty
2022/04/21 | 10506 | graphics/pgf/contrib/tikzlings/tikzlings-rhinos.sty
-2022/04/21 | 104556 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
2022/04/21 | 104016 | systems/texlive/tlnet/archive/gregoriotex.armhf-linux.r63092.tar.xz
2022/04/21 | 103724 | macros/latex/contrib/minimalist/minimalist-doc.pdf
-2022/04/21 | 103336 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/04/21 | 103093 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/04/21 | 1021846 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
2022/04/21 | 102113 | macros/latex/contrib/colorist/colorist-doc.pdf
2022/04/21 | 10086 | graphics/pgf/contrib/tikzlings/tikzlings-snowmen.sty
-2022/04/21 | 100488 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
2022/04/20 | 9999 | macros/latex/contrib/l3kernel/l3news10.tex
2022/04/20 | 966307 | macros/unicodetex/latex/polyglossia/polyglossia.dtx
2022/04/20 | 9622 | macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg
@@ -467,7 +640,6 @@
2022/04/20 | 74225 | macros/latex/contrib/l3kernel/l3msg.dtx
2022/04/20 | 73835 | macros/latex/contrib/l3kernel/l3fp-trig.dtx
2022/04/20 | 7336 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex
-2022/04/20 | 7298 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/04/20 | 70685 | macros/latex/contrib/l3kernel/expl3.dtx
2022/04/20 | 70578 | macros/latex/contrib/l3kernel/l3fp.dtx
2022/04/20 | 6953226 | macros/latex/contrib/l3kernel/source3.pdf
@@ -868,7 +1040,6 @@
2022/04/16 | 7353 | support/arara/doc/chapters/yaml.tex
2022/04/16 | 682 | support/arara/scripts/rules/arara-rule-sketch.yaml
2022/04/16 | 676 | macros/latex/contrib/create-theorem/README.md
-2022/04/16 | 65 | systems/mac/mactex/mactex-MacTeXtras-20220416.zip.md5
2022/04/16 | 651 | support/arara/scripts/rules/arara-rule-spix.yaml
2022/04/16 | 647 | support/arara/scripts/rules/arara-rule-makeglossarieslite.yaml
2022/04/16 | 647 | support/arara/scripts/rules/arara-rule-convert.yaml
@@ -893,9 +1064,7 @@
2022/04/16 | 54949 | support/arara/doc/figures/messagebox1.pdf
2022/04/16 | 546 | support/arara/scripts/rules/arara-rule-qpdf.yaml
2022/04/16 | 53224 | support/arara/doc/figures/messagebox2.pdf
-2022/04/16 | 513548295 | systems/mac/mactex/mactex-MacTeXtras-20220416.zip
2022/04/16 | 50764 | systems/texlive/tlnet/archive/pdfmanagement-testphase.r63035.tar.xz
-2022/04/16 | 49 | systems/mac/mactex/MacTeXtras.zip.md5
2022/04/16 | 489 | macros/latex/contrib/graphics-def/README.md
2022/04/16 | 48496 | language/japanese/pxjahyper/pxjahyper.sty
2022/04/16 | 4722 | support/arara/README.md
@@ -908,7 +1077,6 @@
2022/04/16 | 40086 | support/arara/doc/arara-quickstart.tex
2022/04/16 | 39 | support/arara/doc/arararc.yaml
2022/04/16 | 38483 | macros/luatex/generic/penlight/penlight.pdf
-2022/04/16 | 38160 | systems/mac/mactex/ExtrasFolder.pdf
2022/04/16 | 37238 | support/arara/doc/chapters/concepts.tex
2022/04/16 | 3485 | macros/luatex/latex/yamlvars/yamlvars.sty
2022/04/16 | 3470 | macros/luatex/latex/autopuncitems/autopuncitems.sty
@@ -961,8 +1129,6 @@
2022/04/16 | 1625 | support/arara/scripts/rules/arara-rule-pdflatex.yaml
2022/04/16 | 1625 | support/arara/scripts/rules/arara-rule-lualatex.yaml
2022/04/16 | 162436 | macros/luatex/generic/penlight.zip
-2022/04/16 | 161 | systems/mac/mactex/mactex-MacTeXtras-20220416.zip.sha512
-2022/04/16 | 1612 | systems/mac/mactex/Licenses.txt
2022/04/16 | 1610 | support/arara/scripts/rules/arara-rule-latex.yaml
2022/04/16 | 1571 | support/arara/scripts/rules/arara-rule-xelatex.yaml
2022/04/16 | 1571 | macros/luatex/generic/lutabulartools/README.md
@@ -974,7 +1140,6 @@
2022/04/16 | 1470 | support/arara/scripts/rules/arara-rule-knitr.yaml
2022/04/16 | 14640 | macros/luatex/latex/yamlvars/yamlvars.tex
2022/04/16 | 14613 | support/arara/doc/chapters/deploying.tex
-2022/04/16 | 145 | systems/mac/mactex/MacTeXtras.zip.sha512
2022/04/16 | 1448 | support/arara/scripts/rules/arara-rule-dvisvgm.yaml
2022/04/16 | 144466 | language/japanese/pxjahyper/pxjahyper.pdf
2022/04/16 | 14373 | macros/latex/contrib/graphics-def/xetex.def
@@ -1023,150 +1188,3 @@
2022/04/16 | 1050 | support/arara/scripts/rules/arara-rule-tex.yaml
2022/04/16 | 1046 | support/arara/doc/rules/quickstart.yaml
2022/04/16 | 1032 | support/arara/doc/rules/manual.yaml
-2022/04/15 | 9878 | usergrps/usergrps/de.html
-2022/04/15 | 9837 | usergrps/usergrps/labels.pdf
-2022/04/15 | 9816 | usergrps/usergrps/pl.html
-2022/04/15 | 9811 | usergrps/usergrps/hu.html
-2022/04/15 | 9798 | systems/win32/miktex/tm/packages/srdp-mathematik__source.tar.lzma
-2022/04/15 | 9744 | usergrps/usergrps/cz.html
-2022/04/15 | 9651 | usergrps/usergrps/kr.html
-2022/04/15 | 9632 | usergrps/usergrps/fr.html
-2022/04/15 | 9628 | usergrps/usergrps/bg.html
-2022/04/15 | 9590 | usergrps/usergrps/cn.html
-2022/04/15 | 9580 | usergrps/usergrps/nl.html
-2022/04/15 | 9534 | usergrps/usergrps/it.html
-2022/04/15 | 9531 | usergrps/usergrps/es.html
-2022/04/15 | 944285 | systems/win32/miktex/tm/packages/pbibtex-manual.tar.lzma
-2022/04/15 | 9422 | usergrps/usergrps/us.html
-2022/04/15 | 9407 | usergrps/usergrps/gr.html
-2022/04/15 | 9386 | usergrps/usergrps/esc.html
-2022/04/15 | 9382 | usergrps/usergrps/dk.html
-2022/04/15 | 9380 | usergrps/usergrps/pt.html
-2022/04/15 | 9362 | usergrps/usergrps/vn.html
-2022/04/15 | 9352 | usergrps/usergrps/no.html
-2022/04/15 | 9307 | usergrps/usergrps/ie.html
-2022/04/15 | 9301 | usergrps/usergrps/za.html
-2022/04/15 | 9298 | usergrps/usergrps/lt.html
-2022/04/15 | 9297 | usergrps/usergrps/br.html
-2022/04/15 | 9291 | usergrps/usergrps/uy.html
-2022/04/15 | 9282 | usergrps/usergrps/is.html
-2022/04/15 | 9251 | usergrps/usergrps/kh.html
-2022/04/15 | 9241 | usergrps/usergrps/mx.html
-2022/04/15 | 92229 | systems/win32/miktex/tm/packages/elegantpaper__source.tar.lzma
-2022/04/15 | 9161 | usergrps/usergrps/ee.html
-2022/04/15 | 89542 | systems/win32/miktex/tm/packages/ieeetran.tar.lzma
-2022/04/15 | 867172 | systems/win32/miktex/tm/packages/l3backend__doc.tar.lzma
-2022/04/15 | 829683 | systems/win32/miktex/tm/packages/xduts__doc.tar.lzma
-2022/04/15 | 8083 | systems/win32/miktex/tm/packages/titlecaps__source.tar.lzma
-2022/04/15 | 80617 | systems/win32/miktex/tm/packages/l3experimental__source.tar.lzma
-2022/04/15 | 795323 | systems/win32/miktex/tm/packages/ieeetran__doc.tar.lzma
-2022/04/15 | 735051 | systems/win32/miktex/tm/packages/l3build__doc.tar.lzma
-2022/04/15 | 7084 | systems/win32/miktex/tm/packages/xduts.tar.lzma
-2022/04/15 | 69452 | systems/texlive/tlnet/archive/latexindent.r63027.tar.xz
-2022/04/15 | 68951 | systems/win32/miktex/tm/packages/latexindent.tar.lzma
-2022/04/15 | 674332 | systems/win32/miktex/tm/packages/elegantbook__source.tar.lzma
-2022/04/15 | 674319 | systems/win32/miktex/tm/packages/tikz-trackschematic__doc.tar.lzma
-2022/04/15 | 6736 | systems/win32/miktex/tm/packages/proflycee.tar.lzma
-2022/04/15 | 668022 | systems/win32/miktex/tm/packages/zref__doc.tar.lzma
-2022/04/15 | 665915 | macros/latex/contrib/functional/functional.pdf
-2022/04/15 | 653253 | systems/win32/miktex/tm/packages/polyglossia__doc.tar.lzma
-2022/04/15 | 6525 | systems/win32/miktex/tm/packages/liftarm__source.tar.lzma
-2022/04/15 | 64881 | macros/latex/contrib/functional/functional.sty
-2022/04/15 | 6366 | usergrps/usergrps/index.html
-2022/04/15 | 634137 | systems/win32/miktex/tm/packages/elegantnote__doc.tar.lzma
-2022/04/15 | 60219251 | systems/win32/TLW64/gs9561w64full-gpl.exe
-2022/04/15 | 586310 | systems/win32/miktex/tm/packages/l3kernel__source.tar.lzma
-2022/04/15 | 58525 | systems/win32/miktex/tm/packages/acmart__source.tar.lzma
-2022/04/15 | 578851 | macros/latex/contrib/functional.zip
-2022/04/15 | 531399 | systems/win32/miktex/tm/packages/ieeetran__source.tar.lzma
-2022/04/15 | 52280 | systems/win32/miktex/tm/packages/njuthesis__source.tar.lzma
-2022/04/15 | 521435 | systems/win32/miktex/tm/packages/jlreq__doc.tar.lzma
-2022/04/15 | 5086 | systems/win32/miktex/tm/packages/tikz-ladder.tar.lzma
-2022/04/15 | 5068 | systems/win32/miktex/tm/packages/elegantnote.tar.lzma
-2022/04/15 | 505014 | systems/win32/miktex/tm/packages/kotex-oblivoir__doc.tar.lzma
-2022/04/15 | 48795 | usergrps/usergrps/lugs.pdf
-2022/04/15 | 474649 | systems/win32/miktex/tm/packages/proflycee__doc.tar.lzma
-2022/04/15 | 468797 | systems/win32/miktex/tm/packages/elegantpaper__doc.tar.lzma
-2022/04/15 | 4484 | systems/win32/miktex/tm/packages/titlecaps.tar.lzma
-2022/04/15 | 43749 | systems/win32/miktex/tm/packages/kotex-oblivoir.tar.lzma
-2022/04/15 | 4304 | systems/win32/miktex/tm/packages/elegantpaper.tar.lzma
-2022/04/15 | 4260 | systems/win32/miktex/tm/packages/ifptex.tar.lzma
-2022/04/15 | 4244771 | systems/win32/miktex/tm/packages/acmart__doc.tar.lzma
-2022/04/15 | 41523 | systems/win32/miktex/tm/packages/acmart.tar.lzma
-2022/04/15 | 4066876 | systems/texlive/tlnet/archive/latexindent.win32.r63027.tar.xz
-2022/04/15 | 3958 | systems/win32/miktex/tm/packages/ifptex__doc.tar.lzma
-2022/04/15 | 37823 | systems/win32/miktex/tm/packages/zref__source.tar.lzma
-2022/04/15 | 37207 | systems/win32/miktex/tm/packages/pbibtex-manual__source.tar.lzma
-2022/04/15 | 3659 | systems/win32/miktex/tm/packages/liftarm.tar.lzma
-2022/04/15 | 35879 | systems/win32/miktex/tm/packages/l3build.tar.lzma
-2022/04/15 | 353359 | systems/win32/miktex/tm/packages/lua-widow-control__doc.tar.lzma
-2022/04/15 | 352680 | systems/texlive/tlnet/archive/lua-widow-control.doc.r63026.tar.xz
-2022/04/15 | 3507752 | systems/win32/miktex/tm/packages/l3experimental__doc.tar.lzma
-2022/04/15 | 34147 | systems/win32/miktex/tm/packages/bxjscls.tar.lzma
-2022/04/15 | 340376 | systems/texlive/tlnet/archive/bithesis.doc.r63024.tar.xz
-2022/04/15 | 338136 | systems/win32/miktex/tm/packages/bithesis__doc.tar.lzma
-2022/04/15 | 33053 | systems/win32/miktex/tm/packages/l3backend__source.tar.lzma
-2022/04/15 | 32859 | usergrps/usergrps/lugs.html
-2022/04/15 | 31279 | systems/win32/miktex/tm/packages/l3build__source.tar.lzma
-2022/04/15 | 3106378 | systems/win32/miktex/tm/packages/luatexja__doc.tar.lzma
-2022/04/15 | 29788 | systems/win32/miktex/tm/packages/srdp-mathematik.tar.lzma
-2022/04/15 | 2813304 | systems/win32/miktex/tm/packages/ptex-manual.tar.lzma
-2022/04/15 | 277744 | systems/win32/miktex/tm/packages/tikz-ladder__doc.tar.lzma
-2022/04/15 | 265542 | systems/win32/miktex/tm/packages/titlecaps__doc.tar.lzma
-2022/04/15 | 264266 | systems/win32/miktex/tm/packages/elegantnote__source.tar.lzma
-2022/04/15 | 23988 | systems/win32/miktex/tm/packages/l3experimental.tar.lzma
-2022/04/15 | 235094 | systems/win32/miktex/tm/packages/erewhon-math.tar.lzma
-2022/04/15 | 234896 | systems/texlive/tlnet/archive/citation-style-language.doc.r63023.tar.xz
-2022/04/15 | 230812 | systems/win32/miktex/tm/packages/mendex-doc.tar.lzma
-2022/04/15 | 225096 | macros/latex/contrib/functional/functional.tex
-2022/04/15 | 2202 | usergrps/usergrps/labels.tex
-2022/04/15 | 219743 | systems/win32/miktex/tm/packages/luatexja__source.tar.lzma
-2022/04/15 | 21531 | macros/latex/contrib/jacow/jacow.cls
-2022/04/15 | 20952 | usergrps/usergrps/lugs.tex
-2022/04/15 | 202293 | systems/win32/miktex/tm/packages/xcharter-math.tar.lzma
-2022/04/15 | 1967330 | systems/win32/miktex/tm/packages/erewhon-math__doc.tar.lzma
-2022/04/15 | 1940557 | systems/win32/miktex/tm/packages/xcharter-math__doc.tar.lzma
-2022/04/15 | 191438 | systems/win32/miktex/tm/packages/luatexja.tar.lzma
-2022/04/15 | 19000 | systems/win32/miktex/tm/packages/bithesis__source.tar.lzma
-2022/04/15 | 1857631 | systems/win32/miktex/tm/packages/liftarm__doc.tar.lzma
-2022/04/15 | 17844 | systems/win32/miktex/tm/packages/xduts__source.tar.lzma
-2022/04/15 | 170744 | systems/win32/miktex/tm/packages/l3kernel.tar.lzma
-2022/04/15 | 16804 | systems/texlive/tlnet/archive/bithesis.source.r63024.tar.xz
-2022/04/15 | 16312 | systems/win32/miktex/tm/packages/tikz-ladder__source.tar.lzma
-2022/04/15 | 157251 | systems/win32/miktex/tm/packages/polyglossia__source.tar.lzma
-2022/04/15 | 15507 | systems/win32/miktex/tm/packages/l3backend.tar.lzma
-2022/04/15 | 15496 | systems/win32/miktex/tm/packages/tikz-trackschematic.tar.lzma
-2022/04/15 | 14729 | systems/win32/miktex/tm/packages/njuthesis.tar.lzma
-2022/04/15 | 14659 | systems/win32/miktex/tm/packages/tikz-trackschematic__source.tar.lzma
-2022/04/15 | 14656 | systems/win32/miktex/tm/packages/zref.tar.lzma
-2022/04/15 | 14400 | systems/win32/miktex/tm/packages/lua-widow-control__source.tar.lzma
-2022/04/15 | 140085 | systems/win32/miktex/tm/packages/fancyvrb__doc.tar.lzma
-2022/04/15 | 138184 | systems/win32/miktex/tm/packages/srdp-mathematik__doc.tar.lzma
-2022/04/15 | 13788 | systems/texlive/tlnet/archive/lua-widow-control.source.r63026.tar.xz
-2022/04/15 | 136423 | systems/win32/miktex/tm/packages/jlreq.tar.lzma
-2022/04/15 | 13190 | systems/win32/miktex/tm/packages/erewhon-math__source.tar.lzma
-2022/04/15 | 12611 | systems/win32/miktex/tm/packages/bithesis.tar.lzma
-2022/04/15 | 12511 | systems/win32/miktex/tm/packages/proflycee__source.tar.lzma
-2022/04/15 | 12501 | systems/win32/miktex/tm/packages/xcharter-math__source.tar.lzma
-2022/04/15 | 123667 | systems/win32/miktex/tm/packages/latexindent__source.tar.lzma
-2022/04/15 | 1226201 | systems/win32/miktex/tm/packages/njuthesis__doc.tar.lzma
-2022/04/15 | 12147 | systems/win32/miktex/tm/packages/fancyvrb.tar.lzma
-2022/04/15 | 120975 | systems/win32/miktex/tm/packages/ptex-manual__source.tar.lzma
-2022/04/15 | 1187529 | systems/win32/miktex/tm/packages/bxjscls__doc.tar.lzma
-2022/04/15 | 118395 | systems/win32/miktex/tm/packages/polyglossia.tar.lzma
-2022/04/15 | 11760 | systems/win32/miktex/tm/packages/mendex-doc__source.tar.lzma
-2022/04/15 | 1168756 | systems/texlive/tlnet/archive/latexindent.doc.r63027.tar.xz
-2022/04/15 | 11422042 | systems/win32/miktex/tm/packages/l3kernel__doc.tar.lzma
-2022/04/15 | 1132 | systems/texlive/tlnet/archive/citation-style-language.source.r63023.tar.xz
-2022/04/15 | 11280 | systems/win32/miktex/tm/packages/lua-widow-control.tar.lzma
-2022/04/15 | 1118765 | systems/win32/miktex/tm/packages/elegantbook__doc.tar.lzma
-2022/04/15 | 11144029 | macros/latex/contrib/pdfmanagement-testphase.zip
-2022/04/15 | 11016 | systems/texlive/tlnet/archive/lua-widow-control.r63026.tar.xz
-2022/04/15 | 10980 | systems/win32/miktex/tm/packages/elegantbook.tar.lzma
-2022/04/15 | 10956 | systems/win32/miktex/tm/packages/fancyvrb__source.tar.lzma
-2022/04/15 | 10865 | systems/win32/miktex/tm/packages/graphics-def.tar.lzma
-2022/04/15 | 108620 | systems/texlive/tlnet/archive/citation-style-language.r63023.tar.xz
-2022/04/15 | 1058 | systems/win32/miktex/tm/packages/graphics-def__doc.tar.lzma
-2022/04/15 | 10568 | systems/texlive/tlnet/archive/bithesis.r63024.tar.xz
-2022/04/15 | 1046579 | systems/win32/miktex/tm/packages/latexindent__doc.tar.lzma
-2022/04/15 | 104208 | systems/win32/miktex/tm/packages/bxjscls__source.tar.lzma
diff --git a/graphics/pgf/contrib/circuitikz/doc/changelog.tex b/graphics/pgf/contrib/circuitikz/doc/changelog.tex
index a1599a272c..f4200948a6 100644
--- a/graphics/pgf/contrib/circuitikz/doc/changelog.tex
+++ b/graphics/pgf/contrib/circuitikz/doc/changelog.tex
@@ -5,6 +5,67 @@ full list of changes.
\begin{itemize}
\item
+ Version 1.5.0 (2022-04-22)
+
+ In this version, several internal changes have been included in order
+ to streamline and organize better the components and to change the
+ management of color. The changes are pretty deep and subtle, so a bug
+ or unexpected behaviour is always possible. You can use the 1.4.6
+ rollback point in case of trouble, but be sure to report any bug.
+
+ \begin{itemize}
+ \tightlist
+ \item
+ Added connectors shapes, and included the BNC into that class;
+ thanks to
+ \href{https://github.com/circuitikz/circuitikz/issues/611}{Alexander
+ Sauter for suggesting them and helping in the design}
+ \item
+ Added nullator and norator shapes, suggested by
+ \href{https://github.com/circuitikz/circuitikz/issues/615}{user
+ atticus-sullivan on GitHub}
+ \item
+ Added buzzer and reversed buzzer bipoles, suggested by
+ \href{https://tex.stackexchange.com/q/640501/38080}{user Michael.H}
+ \item
+ Added ``dot'' anchors to inductances
+ \item
+ Added ``boxed only'' option for some circular blocks, suggested by
+ \href{https://github.com/circuitikz/circuitikz/issues/621}{user
+ myzinsky}
+ \item
+ Added DIN antenna shape, suggested by
+ \href{https://github.com/circuitikz/circuitikz/issues/620}{user
+ myzinsky}
+ \item
+ Fixed block/input arrow connection, thanks to
+ \href{https://github.com/circuitikz/circuitikz/issues/613}{Laurenz
+ Preindl for reporting}
+ \item
+ Fixed a problem with generic tunable arrows, noticed thanks to
+ \href{https://tex.stackexchange.com/q/637182/38080}{this question on
+ TeX.SX}
+ \end{itemize}
+
+ Internal changes:
+
+ \begin{itemize}
+ \tightlist
+ \item
+ Added a generic drawing function for shapes, which are now drawn
+ always in background
+ \item
+ Added a hook system to be able to change component drawing settings
+ per-shape, per-class or globally
+ \item
+ All the 250+ shapes are now ``protected'' by possible external arrow
+ and arced corners parameters
+ \item
+ Completely changed the management of the shapes' color, thanks to
+ \href{https://github.com/circuitikz/circuitikz/issues/605}{GitHub
+ user muzimuzhi}
+ \end{itemize}
+\item
Version 1.4.6 (2022-02-04)
A nasty bug fix and some hack to avoid that some global Ti\emph{k}Z
@@ -509,7 +570,7 @@ full list of changes.
Rewrite of the path generation macros
\item
Several small bugs fixed (no one ever used some
- ``f\^{}\textgreater{}'' options\ldots{})
+ ``f\^{}\textgreater{}'' options\ldots)
\end{itemize}
\item
Version 1.2.0 (2020-06-21)
@@ -871,7 +932,7 @@ A detailed list of changes can be seen below.
\item
Fixed a (puzzling) problem with coupler2
\item
- Fixed a compatibility problem with newer PGF (\textgreater{}3.0.1a)
+ Fixed a compatibility problem with newer PGF (\textgreater3.0.1a)
\end{itemize}
\item
Version 0.9.2 (2019-06-21)
@@ -1021,7 +1082,7 @@ A detailed list of changes can be seen below.
\item
Fixed direction of controlled american voltage source
\item
- ``v\textless{}='' and ``i\textless{}='' do not rotate the sources
+ ``v\textless='' and ``i\textless='' do not rotate the sources
anymore(see them as ``counting direction indication'', this can be
different then the shape orientation); Use the option ``invert'' to
change the direction of the source/apperance of the shape.
@@ -1057,7 +1118,7 @@ A detailed list of changes can be seen below.
\item
Allow use of voltage label at a {[}short{]}
\item
- Correct line joins between path components (to{[}\ldots{}{]})
+ Correct line joins between path components (to{[}\ldots{]})
\item
New Pole-shape .-. to fill perpendicular joins
\item
@@ -1086,7 +1147,7 @@ A detailed list of changes can be seen below.
\item
Fixed varcap symbol at small scalings
\item
- New packet-option "straightvoltages, to draw straight(no curved)
+ New packet-option ``straightvoltages, to draw straight(no curved)
voltage arrows
\item
New option ``invert'' to revert the node direction at paths
diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
index 3bce331cd0..7f8ee18f84 100644
--- a/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
+++ b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
index 5372b62034..98f4c5b3a2 100644
--- a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
+++ b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
index f299603351..37e8bffc10 100644
--- a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
+++ b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
@@ -198,13 +198,13 @@ Correcting this will need a big rewrite of the path routines, and although the a
This same issue create a lot of problem of compatibility between \Circuitikz{} and the new \texttt{pic} Ti\emph{k}Z feature, so basically don't put components into \texttt{pic}s.
-Also, notice that most components will interact in a funny way with global path options, like \texttt{rounded corners} or the arrow options (like \texttt{->} or \texttt{shorten <} and so on). Depending on the specific component, some parameter is inherited by the internal shape, and some other is reset,\footnote{This is not easy to fix. We want some option to go through --- fill color, dashed pattern for example --- and some other to stay only in the outer path; and if the background shape need some option for drawing the internal shape, like for example a rounded corner, it \emph{must} reset the external option. So there is no perfect solution.} so basically it's better not to use them.
+Also, notice that several components will interact in a funny way with global path options. Depending on the specific component, some parameter is inherited by the internal shape, and some other is reset. This is not easy to fix in general. We want some option to go through --- fill color, dashed pattern for example --- and some other to stay only in the outer path; and if the background shape need some option for drawing the internal shape, like for example a rounded corner, it \emph{must} reset the external option. So there is no perfect solution, although since \texttt{v1.5.0} the shapes have been ``robustified'', so that by default arced corners and arrows parameters will \emph{not} be propagated into the shape.
Arrows with \texttt{to[]} components don't work, anyway, so basically avoid this situation.
\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
\begin{circuitikz}[]
\draw (0,3) to[R] ++(3,0) node[npn, anchor=B]{};
- % arrows will not work and give bad results
+ % arrows will not work and give strange results
% so basically do not use them!
\draw[<->] (0,1.5) to[R] ++(3,0) node[npn, anchor=B]{};
\draw[shorten <=10pt] (0,0) to[R] ++(3,0)
@@ -2286,6 +2286,32 @@ Inductors have additional anchors to add core lines (for historical reasons, the
Notice that the core lines will \textbf{not} change the position of labels. You have to move them by hand if needed (or position them on the other side); see~\ref{sec:adjust-label-position}.
+\paragraph{Dot anchors.}
+Inductances have also ``dot'' anchors\footnote{proposed by Romano in a discussion by \href{https://github.com/circuitikz/circuitikz/issues/618}{GitHub user AndreaDiPietro92}},
+to help positioning dots when specifying mutual inductance signs. The anchors are name \texttt{lr dot} (for lower right dot), \texttt{ur dot} (upper right) and so on:
+\begin{quote}
+ \showanchors{cuteinductorshape}{}(lr dot/-45/0.2, ur dot/45/0.2, ll dot/-135/0.2, ul dot/135/0.2)
+ \quad
+ \showanchors{cuteinductorshape}{}(ur dot/-60/0.3, ul dot/-120/0.3, core west/135/0.2, core east/45/0.2)
+\end{quote}
+and as you can see, you have to be careful if you use dot anchors and core anchors together.
+You can change the position of the dots by changing the keys \texttt{bipoles/inductors/dot x distance} (default \texttt{4pt}), which represent how much the dot extends outside the component width, and the corresponding \texttt{dot y distance} (default \texttt{1pt}), which serves the same scope in the height direction.
+
+\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
+\begin{circuitikz}[]
+ \ctikzset{bipoles/inductors/.cd, dot x distance=3pt,
+ dot y distance=0pt}
+ \draw (0,2) to[L=$L_1$, name=l1] ++(3,0);
+ \draw (0,0) to[L, l_=$L_2$, name=l2, inductors/width=1.4,
+ inductors/coils=11] ++(3,0);
+ \path (l1.ur dot) node[circ]{} (l2.ul dot) node[circ]{};
+ \draw ([yshift=-0.2cm]l1.south)
+ to[out=-45, in=45] node[right]{$M$}
+ ([yshift=0.2cm]l2.north);
+\end{circuitikz}
+\end{LTXexample}
+
+Notice that the position of the dot anchors does not coincide with the position of the dots in the transformers (see section~\ref{sec:transformers}), because there they depend on the size of the complete double-bipole more that on the size of the inductances.
\subsection{Diodes and such}
@@ -2590,6 +2616,42 @@ The transformer shapes vector group options can be specified for the primary (\t
\end{circuitikz}
\end{LTXexample}
+\subsubsection{Nullator and norator}
+
+These are special elements used in some approaches to model ideal amplifiers\footnote{See \href{https://en.m.wikipedia.org/wiki/Nullor}{the Wikipedia article}; suggested by \href{https://github.com/circuitikz/circuitikz/issues/615}{user atticus-sullivan on GitHub}.}.
+
+\begin{groupdesc}
+\circuitdescbip*{nullator}{Nullator element (virtual short circuit; forces V and I to zero)}{}
+\circuitdescbip*{norator}{Norator element (admits any combination of V and I)}{}
+\end{groupdesc}
+
+They are in the \texttt{sources} class, but they are not treated like sources in the labelling sense (they have both \texttt{bipoles/is voltage=false} and \texttt{bipoles/is current=false}, see~\ref{sec:source-vif}).
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american]
+ \draw (0,0) node[ground](GND){}
+ to [I,l=$i_s$,invert]
+ ++(0,2.5) -- ++(1.5,0) coordinate(up)
+ to[nullator, v=0, i=0, name=A]
+ (up|-GND) node[ground]{};
+ \draw (up) to[R, *-*] ++(2,0) coordinate(out)
+ to[norator, v^=$v_o$]
+ (out|-GND) node[ground]{};
+\end{circuitikz}
+\end{LTXexample}
+
+The symbol shapes used here seems to be the most common in publications; if you prefer the shapes from the Wikipedia article, you can use the following definitions:
+
+\begin{LTXexample}[varwidth=true]
+\tikzset{noratorW/.style={voosource,
+ bipoles/oosource/circlesize=0.5,
+ bipoles/oosource/circleoffset=0.5},
+ nullatorW/.style={esource, sources/scale=0.5}}
+\begin{tikzpicture}
+ \draw (0,0) to[nullatorW] ++(2,0) to[noratorW] ++(0, -2);
+\end{tikzpicture}
+\end{LTXexample}
+
\subsubsection{DC sources}
\begin{groupdesc}
\circuitdescbip*{dcvsource}{DC voltage source}{}
@@ -2966,13 +3028,14 @@ If (default behaviour) \texttt{europeangfsurgearrester} option is active (or the
If otherwise \texttt{americangfsurgearrester} option is active (or the style \texttt{[american gas filled surge arrester]} is used), the shorthands the shorthands \texttt{gas filled surge arrester} and \texttt{gf surge arrester} are equivalent to the american version of the component.
\end{framed}
-
-
\begin{groupdesc}
\circuitdescbip*{lamp}{Lamp}{}
\circuitdescbip*{bulb}{Bulb}{}
\circuitdescbip*{loudspeaker}{loudspeaker}{}( north/90/0.4, north east/45/0.4, east/0/0.4, south east/-45/0.4, south/-90/0.4, south west/-135/0.4, west/180/0.4, north west/135/0.4, left/135/0.2, right/45/0.2, center/-135/0.2)
\circuitdescbip*{mic}{mic}{}( north/90/0.4, north east/45/0.4, east/0/0.4, south east/-45/0.4, south/-90/0.4, south west/-135/0.4, west/180/0.4, north west/135/0.4, left/135/0.2, right/45/0.2, center/-135/0.2)
+ \circuitdescbip*{buzzer}{Buzzer\footnotemark}{}(left/135/0.6, right/45/0.6)
+ \circuitdescbip*{rbuzzer}{Reversed buzzer}{}(left/135/0.6, right/45/0.6)
+ \footnotetext{Buzzers were suggested by \href{https://tex.stackexchange.com/questions/640501/buzzer-symbol-in-circuitikz}{user Michael.H on TeX.SX}}
\end{groupdesc}
You can use microphones and loudspeakers with \texttt{waves} (see section~\ref{sec:RF}) too:
@@ -3129,6 +3192,7 @@ The arrows are the ones set with the keys \texttt{tunable start arrow} and \text
\end{LTXexample}
Notice also the need to force a transparency group if you want a semitransparent arrow.
+
\subsection{Terminal shapes}\label{sec:terminals}
These are the so-called ``bipole nodes'' shapes, or poles (see section~\ref{sec:bipole-nodes}). These nodes are always filled; the ``open'' versions (starting with an \texttt{o}) are by default filled with the color specified by the key \texttt{open nodes fill} (by default \texttt{white}), but you can override locally it with the \texttt{fill} parameter.
@@ -3154,11 +3218,14 @@ Since version 0.9.0, ``bipole nodes'' shapes have all the standard geographical
The size of the poles is controlled by the key \texttt{nodes width} (default \texttt{0.04}, relative to the basic length).
Be sure to see section~\ref{sec:bipole-nodes} for more usage and configurability.
+\subsection{Connectors}\label{sec:connectors}
+
+Connectors have a class by themselves (\texttt{connectors}), so you can use the \texttt{scale}, \texttt{fill} and \texttt{thickness} properties as usual.
\subsubsection{BNC connector/terminal}
\begin{groupdesc}
- \circuitdesc*{bnc}{BNC connector}{}(left/135/0.6, right/45/0.6, center/-90/0.6, hot/0/0.6, zero/-135/0.6)
+ \circuitdesc*{bnc}{BNC connector}{}(left/135/0.6, right/45/0.6, center/-45/0.6, hot/0/0.6, zero/-135/0.6, shield/-90/0.4)
\end{groupdesc}
The BNC connector is defined so that you can easily connect it as input or output (but remember that you need to flip the text if you flip the component):
@@ -3183,14 +3250,88 @@ It also has a \texttt{zero} anchor if you need to rotate it about its real cente
\end{circuitikz}
\end{LTXexample}
+\subsubsection{IEC 60617 socket-plug connectors}
+
+Plug and socket connectors (modeled on the IEC60617 standard) are available\footnote{Since \texttt{v1.5.0}; thanks to Alexander Sauter for suggesting them and \href{https://github.com/circuitikz/circuitikz/issues/611}{helping in the design}.} both in path-style form and, with separated but matching shapes for plug and socket, in node-style. There are two differently oriented shapes for each type to ease the construction of ``split'' connections (see the examples below). \textbf{Notice} that the elements in the following table are scaled by a factor 1.5, to better show the position of the anchors.
+
+\begin{groupdesc}
+ \ctikzset{connectors/scale=1.5}
+ \circuitdescbip[iecconn]{iec connector}{IEC 60617 connector}{iecconn}(left/145/0.3, right/45/0.3, center/-90/0.4, plug center/90/0.4, socket center/-135/0.3)
+ \circuitdesc{iecconnshape}{IEC 60617 connector}{\tiny text}(left/145/0.3, right/45/0.3, center/-90/0.2)
+ \circuitdesc{iecsocketL}{IEC 60617 female socket, left side}{\tiny text}(left/145/0.3, right/45/0.3, center/-90/0.2, socket center/0/0.2)
+ \circuitdesc{iecplugR}{IEC 60617 male plug, right side}{\tiny text}(left/145/0.3, right/45/0.3, center/-90/0.2, plug center/90/0.4)
+ \circuitdesc{iecplugL}{IEC 60617 male plug, left side}{\tiny text}(left/145/0.3, right/45/0.3, center/-90/0.2, plug center/90/0.4)
+ \circuitdesc{iecsocketR}{IEC 60617 female socket, right side}{\tiny text}(left/145/0.3, right/45/0.3, center/-90/0.4, socket center/-135/0.3)
+\end{groupdesc}
+
+The \texttt{center} anchors (as well as the text position) of the split elements of the connectors are on the side of the component (similar to what happens with grounds and supply voltage arrows) to ease the most common use.
+
+Also, the text for the plug nodes is raised to the same level of the text in the sockets, and it will ignore descendants, so that the two text lines up when the two components are put side by side.
+
+The \texttt{plug center} anchor always point to the center of the rectangular plug shape, and the \texttt{socket center} to the center of the semicircle in the sockets.
+
+\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
+\begin{circuitikz}
+ \draw (0,1) node[bnc]{} to[R] ++(2,0)
+ to[iec connector] ++(1,0);
+ \draw (0,0) node[bnc]{} to[R] ++(2,0)
+ to[iec connector, invert] ++(1,0);
+\end{circuitikz}
+\end{LTXexample}
+
+Aligning ``disconnected'' plugs and sockets is reasonably easy:
+
+\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
+\begin{circuitikz}
+ \draw (0,2) to[iec connector, name=C1] ++(2,0) coordinate(stop)
+ (C1.nw) node[above left, inner xsep=0pt]{s1}
+ (C1.ne) node[above right, inner xsep=0pt]{p1};
+ \draw (0,1) coordinate(tmp) -- (tmp-|C1.left)
+ node[iecsocketL](S2){s2};
+ \draw (0,0) coordinate(tmp) (tmp-|C1.socket center)
+ node[iecplugR](P3){p3} (P3.right) -- (tmp-|stop);
+ \draw[red, dashed] ([yshift=1cm]C1.socket center) -- ++(0,-4);
+\end{circuitikz}
+\end{LTXexample}
+
+You can choose the best shape when rotating them, to simplify the positioning (shape rotates around the \texttt{center} anchor).
+
+\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
+\begin{circuitikz}
+ \draw (0,0) -| ++(1,-1) node[iecsocketL, rotate=-90]{}
+ (2,-1) -| ++(1,1) node[iecplugR, rotate=90]{};
+\end{circuitikz}
+\end{LTXexample}
+
+Choosing the proper left/right shape results in easily build ``mixed'' connectors; you can use the node text position properties to have lined-up labels, but remember that the text is outside the bounding box:
+
+\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
+\begin{circuitikz}[]
+ \path (0,2); % for the bounding box, text is not accounted for
+ \draw (0,1) -- ++(1,0) node[iecsocketL](s1){S1};
+ \draw [red] (s1.e) node[iecplugR](p1){P1} (p1.e) -- ++(1,0);
+ \draw (0,0) -- ++(1,0) node[iecplugL](p2){P2};
+ \draw[blue] (p2.e) node[iecsocketR](s2){S2} (s2.e) -- ++(1,0);
+\end{circuitikz}
+\end{LTXexample}
+
+You can use the \texttt{plug center} anchor to add the IEC ``multiplier'':
+
+\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
+\begin{circuitikz}[]
+ \draw (0,0) to[iec connector, connectors/scale=2, name=A,
+ a={\small\ttfamily output bus}] ++(3,0);
+ \draw (A.plug center) ++(-.2,-.4) -- ++(.4,.8) node[above]{8};
+\end{circuitikz}
+\end{LTXexample}
\subsection{Block diagram components}
\noindent Contributed by Stefan Erhardt.
\begin{groupdesc}
- \circuitdesc*{mixer}{mixer}{}( w/180/0.1,s/-90/0.1,e/0/0.1,n/90/0.1 )
+ \circuitdesc*{mixer}{mixer}{}( w/180/0.1,s/-90/0.1,e/0/0.1,n/90/0.1, center/-120/0.3, geocenter/-60/.3 )
\circuitdesc*{adder}{adder}{}( west/180/0.1,south/-90/0.1,east/0/0.1,north/90/0.1 )
- \circuitdesc*{oscillator}{oscillator}{}( w/180/0.1,s/-90/0.1,e/0/0.1,n/90/0.1 )
+ \circuitdesc*{oscillator}{oscillator}{}( w/180/0.1,s/-90/0.1,e/0/0.1,n/90/0.1, center/45/0.2, geocenter/-45/.3 )
\circuitdesc*{circulator}{circulator}{}( left/180/0.1,down/-90/0.1,right/0/0.1, up/90/0.1 )
\circuitdesc*{wilkinson}{wilkinson divider}{}( in/180/0.1, out2/45/0.1, out1/-45/0.1 )
\circuitdesc*{splitter}{resistive splitter\footnotemark}{}( in/180/0.1, out2/45/0.1, out1/-45/0.1 )
@@ -3253,7 +3394,16 @@ The ports of the \texttt{mixer}, \texttt{adder}, \texttt{oscillator} and \texttt
;\end{circuitikz}
\end{LTXexample}
-Moreover, the have proper border anchors since version \texttt{1.2.3}, so you can do things like this:
+The \texttt{oscillator} has a displaced \texttt{center} anchor, to simplify the task of putting it at the left side of a circuit; it also as a special position for the node text. The four round elements (mixer, circulator, adder, and the oscillator) have a \texttt{geocenter} anchor which corresponds always to the center of the circle.
+\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
+\begin{tikzpicture}[>=Stealth]
+ \draw (0,0)node[oscillator](O){$f_0$} -- ++(1,0);
+ \draw[blue, ->] (1,1) -- (O.center);
+ \draw[red, ->] (1,1) -- (O.geocenter);
+\end{tikzpicture}
+\end{LTXexample}
+
+Moreover, the have proper border anchors since version \texttt{1.2.3} (and fixed for boxed elements in \texttt{1.5.0}), so you can do things like this:
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
@@ -3394,15 +3544,16 @@ Some two-ports have the option to place a normal label (\texttt{l=}) and a inner
\end{circuitikz}
\end{LTXexample}
+
\paragraph{Box option}
-Some devices have the possibility to add a box around them. The inner symbol scales down to fit inside the box.
+Several devices have the possibility to add a box around them with the \texttt{box} or \texttt{boxed} option. The inner symbol scales down to fit inside the box. For the ``circled'' devices (mixer, adder, oscillator and circulator) the inner circle is normally drawn, unless you use the \texttt{box only} or \texttt{boxed only} option.\footnote{Since 1.5.0, suggested by \href{https://github.com/circuitikz/circuitikz/issues/621}{GitHUb user myzinsky}}
\begin{LTXexample}[varwidth=true]
\begin{circuitikz} \draw
- (0,0) node[mixer,box,anchor=east] (m) {}
- to[amp,box,>,-o] ++(2.5,0)
- (m.west) node[inputarrow] {} to[short,-o] ++(-0.8,0)
- (m.south) node[inputarrow,rotate=90] {} --
- ++(0,-0.7) node[oscillator,box,anchor=north] {};
+ (0,0) node[mixer, box only, anchor=east](m){}
+ to[amp, boxed, >, -o] ++(2.5,0)
+ (m.west) node[inputarrow]{} to[short,-o] ++(-0.8,0)
+ (m.south) node[inputarrow,rotate=90]{} --
+ ++(0,-0.7) node[oscillator, box, anchor=north]{};
\end{circuitikz}
\end{LTXexample}
@@ -4244,6 +4395,8 @@ Notes that in the transmission and receiving antennas, the ``waves'' are outside
\begin{groupdesc}
\circuitdesc*{bareantenna}{Bare Antenna}{A}( top/90/0.1, bottom/180/0.3, left/180/0.3, right/45/0.3, center/0/0.3 )
+ \circuitdesc*{dinantenna}{DIN antenna\footnotemark}{A}(left/135/0.6, right/45/0.6, center/-45/0.6)
+ \footnotetext{Since 1.5.0, suggested by \href{https://github.com/circuitikz/circuitikz/issues/621}{GitHUb user myzinsky}}
\circuitdesc*{bareTXantenna}{Bare TX Antenna}{Tx}( top/90/0.1, center/180/0.3, waves/90/0.3 )
\circuitdesc*{bareRXantenna}{Bare RX Antenna}{Rx}( top/90/0.1, center/0/0.3, waves/90/0.3 )
\circuitdesc{waves}{Waves}{}( north/90/0.4, north east/45/0.4, east/-45/0.4, south east/-45/0.4,
@@ -4341,7 +4494,7 @@ The symbols can also be used along a path, using the transistor-path-syntax(\tex
-\subsection{Double bipoles (transformers)}
+\subsection{Double bipoles (transformers)}\label{sec:transformers}
Transformers automatically use the inductor shape currently selected. These are the three possibilities:
\begin{groupdesc}
@@ -8240,10 +8393,45 @@ To correct the line ending, there are support shapes to fill the missing rectang
\section{Colors}
-Color support in \Circuitikz{} is quite limited. You will have no problem if:
+
+Color support in \Circuitikz{} has been quite limited since version 1.5.0; form that one onward there has been an effort to make component's behavior more intuitive.
+
+Part of the problem is how colors in paths are treated by \TikZ{} itself; you can see part of the discussion \href{https://github.com/circuitikz/circuitikz/issues/605}{this issue} and in \href{https://tex.stackexchange.com/questions/634987/pgf-basic-layer-struggling-again-with-colors}{this question on TeX.SX} --- many thanks to \texttt{@muzimuzhi} for helping there. Basically, nodes are drawn \emph{after} the path is completed, and color is applied to the path at the end. Look at this code (pure \TikZ, no \Circuitikz{} here):
+
+\begin{LTXexample}[varwidth=true]
+\tikz \draw[thick] (0,0) -- (1,0) {[color=red] -- (2,0) node[draw]{}} --(3,0);
+
+\tikz \draw[thick] (0,0) -- (1,0) [color=red] -- (2,0) node[draw]{} --(3,0);
+\end{LTXexample}
+
+So the path is drawn with the last ``effective'' (in current group) color. The deferred behavior of the color properties is very difficult to track for \Circuitikz, especially when the shorthand \texttt{color-name} (e.g., \texttt{red} instead of \texttt{color=red}) is used. \Circuitikz{} will try to patch the default commands to keep track of the ``current color''; if it fails will give a warning like \texttt{patch failed, use only explicit color=...}.
+
+Before 1.5.0, \Circuitikz{} used black as the default color. Now it tries to follow the current color, as \TikZ does normally; but notice that there is a difference with the fill strategy:
+
+\begin{LTXexample}[pos=t]
+\color{red}
+Red text
+\tikz \draw (0,0) -- node[draw] {x} (1,0) -- node[draw=cyan] {y} (2,0);
+\tikz \draw (0,0) to[R] (2,0) to[R,color=cyan] (4,0) to [generic] (6,0) to [fullgeneric] (8,0);
+
+\color{blue}
+Blue text
+\tikz \draw (0,0) -- node[draw] {x} (1,0) -- node[draw=cyan] {y} (2,0);
+\tikz \draw (0,0) to[R] (2,0) to[R,color=cyan] (4,0) to [generic] (6,0) to [fullgeneric] (8,0);
+
+\color{black}
+Black text
+\tikz \draw[fill=yellow] (0,0) -- node[draw, fill] {x} (1,0) -- node[draw=cyan] {y} (2,0);
+\tikz \draw[fill=yellow] (0,0) to[R] (2,0) to[R,color=cyan] (4,0) to [generic] (6,0) to [fullgeneric] (8,0);
+\end{LTXexample}
+
+\Circuitikz{} components that are fillable will inherit the \texttt{fill} property of the path (it is almost impossible to do otherwise) as if the \texttt{fill} flag was present. ``Full''-type elements (for example, full diodes or similar) are filled with the draw color; elements with intrinsic labels (i.e., labels that are part of the shape, like signs on amplifiers and pin numbers in chip) are drawn with the ``draw'' colors.
+
+Basically, you should have no problem if:
\begin{enumerate}
- \item You stick to use styles (see~\ref{sec:styling-fillcolor}) for filling your components, or using a direct \texttt{fill=...} option directly;
- \item when coloring whole circuits, use the option \texttt{color=...} in your global picture options or in the \verb|\draw| command (not just the color name as a shorthand);
+ \item You stick to use styles (see~\ref{sec:styling-fillcolor}) for filling your components, or using a direct \texttt{fill=...} option in the component node or \texttt{to} option;
+ \item do not try to change the color mid-path; sometimes it works (see the examples below), but it's better to avoid it (using different paths is better);
+ \item when coloring whole circuits, it's better to use the option \texttt{color=...} in your global picture options or in the \verb|\draw| command (not just the color name as a shorthand);
\item forget about transparency.
\end{enumerate}
@@ -8251,9 +8439,8 @@ Nevertheless, if you really need to do strange things with colors you can read o
\subsection{Shape colors}
-The color of the components is stored in the key \verb!\circuitikzbasekey/color!. Circui\TikZ\ tries to follow the color set in \TikZ, although sometimes it fails. If you change color in the picture, please do not use just the color name as a style, like \verb![red]!, but rather assign the style \verb![color=red]!.
+The color of the components is stored in the key \verb!\circuitikzbasekey/color!. Circui\TikZ\ tries to follow the color set in \TikZ, although sometimes it fails. The following circuit will fail to draw the circuit in red if the patching of the inner commands of \TikZ{} fails, like for example in \ConTeXt{}.
-Compare for instance
\begin{LTXexample}[varwidth=true]
\begin{circuitikz} \draw[red]
(0,2) node[and port](myand1){1}
@@ -8264,7 +8451,7 @@ Compare for instance
;\end{circuitikz}
\end{LTXexample}
-and
+If you see this problem, please do not use just the color name as a style, like \verb![red]!, but rather assign the style \verb![color=red]!.
\begin{LTXexample}[varwidth=true]
\begin{circuitikz} \draw[color=red]
@@ -8276,7 +8463,7 @@ and
;\end{circuitikz}
\end{LTXexample}
-One can of course change the color \emph{in medias res}:
+One can of course change the color directly in the component:
\begin{LTXexample}[pos=t, varwidth=true]
\begin{circuitikz} \draw
(0,0) node[pnp, color=blue](pnp2){q1}
@@ -8288,7 +8475,8 @@ One can of course change the color \emph{in medias res}:
;\end{circuitikz}
\end{LTXexample}
-The all-in-one stream of bipoles poses some challanges, as only the actual body of the bipole, and not the connecting lines, will be rendered in the specified color.
+The all-in-one stream of bipoles poses some challenges, as only the actual body of the bipole, and not the connecting lines, will be rendered in the specified color (Notice that the following example uses the special \texttt{siunitx} shorthand; you can use it only in simple cases like here, in general using the full \verb|\SI{}| or \verb|\qty{}| commands).
+
\begin{LTXexample}[varwidth=true]
\begin{circuitikz} \draw
(0,0) to[V=1<\volt>] (0,2)
@@ -8297,16 +8485,28 @@ The all-in-one stream of bipoles poses some challanges, as only the actual body
;\end{circuitikz}
\end{LTXexample}
-Which, for some bipoles, can be frustrating:
+The postponed application of colors creates problem if you want to use arrows for voltages, because the ``arrows'' are partially part of the path, partially nodes:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+ (0,0){[red] to[V=1<\volt>] (0,2) }
+ to[R=1<\ohm>] (2,2)
+ to[C=1<\farad>] (2,0) -- (0,0)
+;\end{circuitikz}
+\end{LTXexample}
+
+...and that can become quite frustrating:
+
\begin{LTXexample}[varwidth=true]
\begin{circuitikz} \draw
- (0,0){to[V=1<\volt>, color=red] (0,2) }
+ (0,0) to[V=1<\volt>, color=red] (0,2)
to[R=1<\ohm>] (2,2)
to[C=1<\farad>] (2,0) -- (0,0)
;\end{circuitikz}
\end{LTXexample}
-The only way out is to specify different paths:
+In those cases, the only way out is to specify different paths (and/or using advanced voltages, see~\ref{sec:vif-anchors})
+
\begin{LTXexample}[varwidth=true]
\begin{circuitikz} \draw[color=red]
(0,0) to[V=1<\volt>, color=red] (0,2);
@@ -8315,8 +8515,6 @@ The only way out is to specify different paths:
;\end{circuitikz}
\end{LTXexample}
-And yes: this is a bug and \emph{not} a feature\ldots
-
\subsection{Fill colors}
Since version 0.9.0, you can also fill most shapes with a color (the manual specifies which ones are fillable or not). The syntax is quite intuitive:
@@ -8332,7 +8530,7 @@ Since version 0.9.0, you can also fill most shapes with a color (the manual spec
\end{LTXexample}
-This fill color will override any color defined by the style (see section~\ref{sec:styling-fillcolor}). If you want to override a style fill color with no-fill for a specific component, you need to override the style --- it's a bit unfortunate but it should be an exceptional thing anyway:
+This fill color will override any color defined by the style (see section~\ref{sec:styling-fillcolor}). If you want to override a style fill color with no-fill for a specific component, you need to override the style --- it's a bit unfortunate, but should be an exceptional thing anyway. Notice that in simple case \texttt{fill opacity} works, but don't count too much on it.
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
@@ -8341,13 +8539,14 @@ This fill color will override any color defined by the style (see section~\ref{s
\draw[red] (1.5,3) -- (1.5, -1);
\draw
(0,2) node[and port](myand1){1}
- (0,0) node[and port, fill=cyan](myand2){2}
+ (0,0) node[and port, fill=cyan, fill opacity=0.7](myand2){2}
(2,1) node[xnor port, circuitikz/logic ports/fill=none
](myxnor){3}
(myand1.out) -| (myxnor.in 1)
(myand2.out) -| (myxnor.in 2)
;\end{circuitikz}
\end{LTXexample}
+
You can combine shape colors with fill colors, too, but you should use the \texttt{draw} color option style for this:
\begin{LTXexample}[varwidth=true]
@@ -8360,14 +8559,11 @@ You can combine shape colors with fill colors, too, but you should use the \text
;\end{circuitikz}
\end{LTXexample}
-This is because, as you can see from the following example in port \texttt{2}, you can't specify both a fill and a color in the node (yes, it's a bug too, but it's quite complex to solve given the current circuit\TikZ{} architecture).
-A workaround is shown in port \texttt{3}:
-
\begin{LTXexample}[varwidth=true]
\begin{circuitikz} \draw
(0,2) node[and port, color=black](myand1){1}
(0,0) node[and port, color=blue, fill=cyan](myand2){2}
- (2,1) {[color=blue] node[xnor port, fill=cyan](myxnor){3}}
+ (2,1) node[xnor port, color=red, fill=cyan](myxnor){3}
(myand1.out) -| (myxnor.in 1)
(myand2.out) -| (myxnor.in 2)
;\end{circuitikz}
@@ -8375,7 +8571,7 @@ A workaround is shown in port \texttt{3}:
\subsubsection{Background colors different from white}
-Notice also that the connection point are always filled, although the color \emph{tries} to follow the color of the filling of the component (but look at section~\ref{sec:transparent-poles}). Moreover, if you want to pass fill transparency down to path-style components, you \emph{have} to put it into the options of the \verb|\draw| command.
+Notice also that the connection point are always filled, and the color \emph{tries} to follow the color of the filling of the component (but look at section~\ref{sec:transparent-poles}). Moreover, if you want to pass fill transparency down to path-style components, you \emph{have} to put it into the options of the \verb|\draw| command.
\begin{LTXexample}[varwidth=true, pos=t]
\begin{circuitikz}
@@ -8886,11 +9082,37 @@ at the start of anchors and macros definition, and use (for example, the exact c
\end{lstlisting}
in all the \texttt{savedanchors}.
-Then, in the drawing part, you should start with:
+Then, to draw your component, you should start with\footnote{Since \texttt{v1.5.0}; component defined with this mechanism will not be compatible with older \Circuitikz{}.}:
\begin{lstlisting}
- \pgf@circ@scaled@Rlen=\scaledRlen
+ \pgf@circ@draw@component{%
+ \pgf@circ@scaled@Rlen=\scaledRlen
+ ...
+ }
\end{lstlisting}
-and then use \verb|\pgf@circ@scaled@Rlen| (or the anchors) as default lengths while you draw it.
+and then use \verb|\pgf@circ@scaled@Rlen| (or the anchors) as the default length while you draw it.
+
+The special command \verb|\pgf@circ@draw@component| will issue a \texttt{\textbackslash behindforegroundpath} command, and take care of calling the start and end hooks for the component. Notice that, given the use of \texttt{\textbackslash behindforegroundpath}, you must take care to use the path you define here! The path itself is protected bu a \texttt{pgfscope} (and so also by a \TeX{} group), so local definitions will be reset after exiting.
+
+\subsubsection{The internal hook system}\label{sec:drawing-hooks}
+
+Since version \texttt{v1.5.0}, before starting the drawing of any component, \Circuitikz{} will check for the existence of three different hooks, in the following order (suppose that the shape name is \texttt{\emph{myname}}, and it has a class \texttt{\emph{myclass}}:
+\begin{itemize}
+ \item \texttt{\textbackslash ctikz@hook@start@draw@component@\emph{myname}}
+ \item \texttt{\textbackslash ctikz@hook@start@draw@class@\emph{myclass}}
+ \item \texttt{\textbackslash ctikz@hook@start@draw@default}
+\end{itemize}
+The first one that is defined in the current (or outer) scope is used, and the following ones are not used. This hooks can be used to set drawing parameters, or to reset them to a known state: \TikZ{} normally inherit most of the drawing option, but that can lead to surprises (like unexpected arrows, etc.).
+
+In the same way, before leaving \verb|\pgf@circ@draw@component|, a set of similar hooks (with \texttt{end} instead of \texttt{start}) is tried, with the same logic.
+
+The only predefined hook is \texttt{\textbackslash ctikz@hook@start@draw@default}, which is set to the equivalent of:
+\begin{lstlisting}
+ \pgfsetshortenstart{+0pt}\pgfsetshortenend{+0pt}\pgfsetarrows{-}%
+ \def\pgf@circ@reset@rounded{\pgfsetcornersarced{\pgfpointorigin}}%
+\end{lstlisting}
+which mean that, by default, arrows parameters are reset to the default (no shorten, no arrows) and that corners are not rounded. If you want to override them, just define the appropriate hook for you component/class and the generic one will not be called.
+
+No \texttt{...@end@draw@...} hook is defined by default.
\subsubsection{Finishing your work}
@@ -9147,8 +9369,7 @@ Here a series of example, contributed by several people, is shown with their cod
\subsection{An example with the \texttt{compatibility} option}
\label{ex:compatibility}
-\IfFileExists{compatibility.pdf}
-{\fbox{\includegraphics{compatibility.pdf}}}
+\IfFileExists{compatibility.pdf}{\fbox{\includegraphics{compatibility.pdf}}}{}%
\begin{lstlisting}
\documentclass{standalone}
diff --git a/graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty b/graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
index 25a5b5f9e8..8ed0088ca2 100644
--- a/graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
+++ b/graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
@@ -133,7 +133,10 @@
\IfBooleanTF{#1}{%
\draw (0,0) node[#3,scale=#2, fill=fillcol](N){#5};
}{
- \draw (0,0) node[#3,scale=#2](N){#5};
+ % if it's non-fillable, red should not go through
+ \draw (0,0) node[#3,scale=#2,
+ % fill=red
+ ](N){#5};
}
\IfValueT{#6}{%
\foreach \n/\a/\d in {#6} \path(N.\n) \showcoord(\n)<\a:\d>;
@@ -164,7 +167,10 @@
\IfBooleanTF{#1}{%
\draw (0,0) to[#3, name=B, fill=fillcol] (2,0);
}{
- \draw (0,0) to[#3, name=B] (2,0);
+ % if it's non-fillable, red should not go through
+ \draw (0,0) to[#3, name=B,
+ %fill=red
+ ] (2,0);
}
\IfValueT{#7}{%
\foreach \n/\a/\d in {#7} \path(B.\n) \showcoord(\n)<\a:\d>;
diff --git a/graphics/pgf/contrib/circuitikz/tex/circutikz-0.9.6.sty b/graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty
index 8605170b48..8605170b48 100644
--- a/graphics/pgf/contrib/circuitikz/tex/circutikz-0.9.6.sty
+++ b/graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty
diff --git a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
index b5fb2aeff7..c66633e787 100644
--- a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
+++ b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
@@ -16,8 +16,8 @@
\providecommand\DeclareRelease[3]{}
\providecommand\DeclareCurrentRelease[2]{}
-\def\pgfcircversion{1.4.6}
-\def\pgfcircversiondate{2022/02/04}
+\def\pgfcircversion{1.5.0}
+\def\pgfcircversiondate{2022/02/22}
\DeclareRelease{0.4}{2012/12/20}{circuitikz-0.4-body.tex}
\DeclareRelease{v0.4}{2012/12/20}{circuitikz-0.4-body.tex}
@@ -46,6 +46,7 @@
%% Version 3.0 of pgf/TikZ is required
\RequirePackage{tikz}
+\RequirePackage{regexpatch}%for color hack
\usetikzlibrary{calc}
%
% "arrows" library is deprecated, and behave badly with
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
index 9cc0b56eaf..a5075f08f6 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
@@ -67,7 +67,195 @@
\newdimen \pgfstartlinewidth
%%>>>
-% arrow tips macros and utilities %<<<1
+%% Colors%<<<
+
+% The following code is by @muzimuzhi --- see comment in
+% https://github.com/circuitikz/circuitikz/issues/605#issuecomment-1030745366
+\newif\ifpgf@circ@setcolor
+
+% similar to how `/tikz/draw` and `/tikz/fill` are defined
+%
+% - `color=none`, \pgfusecolor is not executed at the beginning of node path(s)
+% - `color` or `color=` (no or empty value), ignored
+% - `color=<color name>`, \pgfusecolor{<color name>} will be executed
+\ctikzset{
+ color/.code={%
+ \edef\pgf@circ@temp{#1}%
+ \ifx\pgf@circ@temp\pgf@nonetext
+ \pgf@circ@setcolorfalse
+ \else
+ \ifx\pgf@circ@temp\pgfutil@empty
+ \else
+ \pgf@circ@setcolortrue
+ \pgfkeyssetvalue{\circuitikzbasekey/color}{#1}%
+ \edef\ctikz@strokecolor{\ctikzvalof{color}}%
+ \fi
+ \fi
+ },
+ % init
+ color=none
+}
+
+\let\ctikz@strokecolor\pgfutil@empty
+\let\ctikz@fillcolor\pgfutil@empty
+% do our tracking of color
+\pgfkeys{/tikz/color/.add code={}{%
+ \edef\ctikz@strokecolor{#1}\ctikzset{color={#1}}}}
+% do our tracking of fill
+\pgfkeys{/tikz/fill/.add code={}{%
+ \edef\ctikz@fillcolor{#1}}}
+%
+% I do not know how to do the xpatchcmd in ConTeXt...
+%
+\ifpgfutil@format@is@latex
+ \pgfkeysgetvalue{/tikz/.unknown/.@cmd}{\my@temp}
+ \xpatchcmd*\my@temp % use starred-form to replace all (two places actually)
+ {\expandafter\tikz@addoption\expandafter}
+ {\edef\ctikz@strokecolor{\tikz@key}%
+ \expandafter\tikz@addoption\expandafter}
+ {}{%
+ \pgfutil@packagewarning{circuitikz}{%
+ Color patch failed, use only explicit color=... (see manual)}}
+ \pgfkeyslet{/tikz/.unknown/.@cmd}{\my@temp}
+\else
+ \pgfutil@packagewarning{circuitikz}{%
+ Not on LaTeX: patch failed, use only explicit color=...(see manual)}
+\fi
+%
+\def\pgf@circ@setcolor{%
+ \ifpgf@circ@setcolor
+ \pgfsetcolor{\ctikzvalof{color}}%
+ \fi
+}%
+%
+% Try our best to set the fill color the same as the draw
+% color. This needs the patch above
+%
+\def\pgf@circ@setfillcolorasdraw{%
+ \ifx\tikz@strokecolor\pgfutil@empty
+ % we do not have the stroke color. Resort to the
+ % last explicit color command; this will fail if
+ % the color is changed mid-draw.
+ % "Doctor, it hurts if I touch here..."
+ \ifx\ctikz@strokecolor\pgfutil@empty
+ % no info here. Try to use the current color.
+ \pgfsetfillcolor{.}%
+ \else
+ % Try with the last seen change-color command
+ \pgfsetfillcolor{\ctikz@strokecolor}
+ \fi
+ \else
+ % we have strokecolor, yay!
+ \pgfsetfillcolor{\tikz@strokecolor}
+ \fi
+}
+% we call this when we want to fill of the "draw"
+% color. So if we have no explicit color, use ".".
+\def\pgf@circ@fill@strokecolor{%
+ \pgf@circ@setfillcolorasdraw
+}
+% this is to select the \pgftext color; set it as
+% the stroke color (\pgftext uses the fill color)
+\def\pgf@circ@text@strokecolor{%
+ \pgf@circ@setfillcolorasdraw
+}
+% debug text
+\def\pgf@circ@debug@colors{%
+ \pgfscope
+ \pgfsetcolor{black}%
+ \pgftext[y=10pt]{\tiny S:\tikz@strokecolor~T:\tikz@textcolor~F:\tikz@fillcolor}%
+ \pgftext[y=16pt]{\tiny CS:\ctikz@strokecolor~CF:\ctikz@fillcolor}%
+ \endpgfscope
+}
+%>>>
+
+
+%% Macros for basic drawing%<<<
+%
+\long\gdef\pgf@circ@draw@component#1{%
+ \behindbackgroundpath{%
+ \pgf@circ@start@draw@hooks
+ #1%
+ \pgf@circ@end@draw@hooks
+ }%
+}%
+%
+% auxiliary macros to reset some thing in paths, for background images.
+% use with care and ALWAYS inside a \pgfscope, see here:
+% https://matrix.to/#/!NuxCISwYQJuyWwNsEI:matrix.org/$vQO6luq1F66LJ79dERmaqKI46qMBcjStqYCPi725uZE?via=matrix.org&via=2krueger.de&via=im.f3l.de
+% Thanks to @muzimuzhi
+%
+\def\pgf@circ@reset@arrows{%
+ \pgfsetshortenstart{+0pt}\pgfsetshortenend{+0pt}\pgfsetarrows{-}%
+}
+\def\pgf@circ@reset@rounded{%
+ \pgfsetcornersarced{\pgfpointorigin}%
+}
+\def\pgf@circ@reset@arrows@rounded{%
+ \pgf@circ@reset@arrows\pgf@circ@reset@rounded
+}
+\def\pgf@circ@adjustfill{%
+ \ifx\ctikz@fillcolor\pgfutil@empty
+ % do nothing
+ \else
+ \ifx\ctikz@fillcolor\pgf@nonetext
+ % do nothing
+ \else
+ \pgfsetfillcolor{\ctikz@fillcolor}%
+ \fi
+ \fi
+}
+%% Hook macros for the start and end of component drawing. The idea is that
+%% specific macros overrides class macro that overrides generic macro
+%% the generic macro is the one that resets arrows and curved path parameters
+%% but let the path inherits the rest (dashed, etc.)
+
+\def\pgf@circ@start@draw@hooks{%
+ % \typeout{SHAPE: \pgf@sm@shape@name}
+ \ifcsname ctikz@hook@start@draw@component@\pgf@sm@shape@name\endcsname
+ \csname ctikz@hook@start@draw@component@\pgf@sm@shape@name\endcsname
+ \else
+ \ifcsname ctikzclass\endcsname
+ \ifcsname ctikz@hook@start@draw@class@\ctikzclass\endcsname
+ \csname ctikz@hook@start@draw@class@\ctikzclass\endcsname
+ % class defined, but no hook, run generic hook
+ \else
+ \csname ctikz@hook@start@draw@default\endcsname
+ \fi
+ % we have no class, we did not run specific hook:run generic hook
+ \else
+ \csname ctikz@hook@start@draw@default\endcsname
+ \fi
+ \fi
+}
+\def\pgf@circ@end@draw@hooks{%
+ % \typeout{SHAPE: \pgf@sm@shape@name}
+ \ifcsname ctikz@hook@end@draw@component@\pgf@sm@shape@name\endcsname
+ \csname ctikz@hook@end@draw@component@\pgf@sm@shape@name\endcsname
+ \else
+ \ifcsname ctikzclass\endcsname
+ \ifcsname ctikz@hook@end@draw@class@\ctikzclass\endcsname
+ \csname ctikz@hook@end@draw@class@\ctikzclass\endcsname
+ % class defined, but no hook, run generic hook
+ \else
+ \csname ctikz@hook@end@draw@default\endcsname
+ \fi
+ % we have no class, we did not run specific hook:run generic hook
+ \else
+ \csname ctikz@hook@end@draw@default\endcsname
+ \fi
+ \fi
+}
+%
+%% default hook is to stop the propagation of arrows parameters and
+%% arced corners.
+%
+\def\ctikz@hook@start@draw@default{\pgf@circ@reset@arrows@rounded}
+%
+%
+%>>>
+
+%% arrow tips macros and utilities %<<<1
% the default arrow is latexslim, which has been ported over old arrows library (deprecated)
% see https://tex.stackexchange.com/questions/234084/latex-arrow-tip-with-arrows-meta-library
@@ -138,6 +326,7 @@
\def\pgf@circ@setifdefinedfill#1#2{%
% if \ctikzclass is defined and \ctikzclass/fill is defined and is not none:
% set the fill color and execute \pgfusepath{#1}, else execute \pgfusepath{#2}
+ % \typeout{SETIFDEF:#1\space#2:}
\ifdefined\ctikzclass
\pgfkeysifdefined{\circuitikzbasekey/\ctikzclass/fill}%
{% yes, it's defined
@@ -160,7 +349,16 @@
\def\pgf@circ@draworfill{%
\ifx\tikz@fillcolor\pgfutil@empty
- \pgf@circ@setifdefinedfill{draw,fill}{draw}
+ \ifx\ctikz@fillcolor\pgfutil@empty
+ \pgf@circ@setifdefinedfill{draw,fill}{draw}
+ \else
+ \ifx\ctikz@fillcolor\pgf@nonetext
+ \pgf@circ@setifdefinedfill{draw,fill}{draw}
+ \else
+ \pgfsetfillcolor{\ctikz@fillcolor}
+ \pgfusepath{draw, fill}
+ \fi
+ \fi
\else
\pgfsetfillcolor{\tikz@fillcolor}
\pgfusepath{draw, fill}
@@ -169,8 +367,18 @@
\def\pgf@circ@draworfillandclip{%
\ifx\tikz@fillcolor\pgfutil@empty
- \pgf@circ@setifdefinedfill{draw, clip, fill}{draw, clip}
- \pgfusepath{draw, clip}
+ \ifx\ctikz@fillcolor\pgfutil@empty
+ \pgf@circ@setifdefinedfill{draw, clip, fill}{draw, clip}
+ \pgfusepath{draw, clip}
+ \else
+ \ifx\ctikz@fillcolor\pgf@nonetext
+ \pgf@circ@setifdefinedfill{draw, clip, fill}{draw, clip}
+ \pgfusepath{draw, clip}
+ \else
+ \pgfsetfillcolor{\ctikz@fillcolor}
+ \pgfusepath{draw, clip, fill}
+ \fi
+ \fi
\else
\pgfsetfillcolor{\tikz@fillcolor}
\pgfusepath{draw, clip, fill}
@@ -178,8 +386,18 @@
}
\def\pgf@circ@maybefill{%
+ % \typeout{MAYBEFILL\tikz@fillcolor}%
\ifx\tikz@fillcolor\pgfutil@empty
- \pgf@circ@setifdefinedfill{fill}{discard}
+ \ifx\ctikz@fillcolor\pgfutil@empty
+ \pgf@circ@setifdefinedfill{fill}{discard}
+ \else
+ \ifx\ctikz@fillcolor\pgf@nonetext
+ \pgf@circ@setifdefinedfill{fill}{discard}
+ \else
+ \pgfsetfillcolor{\ctikz@fillcolor}
+ \pgfusepath{fill}
+ \fi
+ \fi
\else
\pgfsetfillcolor{\tikz@fillcolor}
\pgfusepath{fill}
@@ -219,20 +437,6 @@
\fi
}
-% auxiliary macro to reset some thing in paths, for background images.
-% use with care and ALWAYS inside a \pgfscope, see here:
-% https://matrix.to/#/!NuxCISwYQJuyWwNsEI:matrix.org/$vQO6luq1F66LJ79dERmaqKI46qMBcjStqYCPi725uZE?via=matrix.org&via=2krueger.de&via=im.f3l.de
-% Thanks to @muzimuzhi
-%
-\def\pgf@circ@reset@arrows{%
- \pgfsetshortenstart{+0pt}\pgfsetshortenend{+0pt}\pgfsetarrows{-}%
-}
-\def\pgf@circ@reset@rounded{%
- \pgfsetcornersarced{\pgfpointorigin}%
-}
-\def\pgf@circ@reset@arrows@rounded{%
- \pgf@circ@reset@arrows\pgf@circ@reset@rounded
-}
%%>>>
@@ -462,11 +666,9 @@
\pgfpointborderrectangle{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{-\pgf@x}{-\pgf@y}}
\fi
}
-
- #2
-
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ #2%
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\northeast
\pgf@circ@res@up = \pgf@y
@@ -477,10 +679,8 @@
\pgf@circ@res@down = \pgf@y
\pgf@circ@scaled@Rlen=\scaledRlen
\pgfstartlinewidth=\pgflinewidth
- % no rounded corners nor default arrows on bipole's bodies
- \pgf@circ@reset@arrows@rounded
- #7
-
+ % we used to reset arced corners here --- now it's in the hooks. I hope.
+ #7%
\pgfsetlinewidth{\pgfstartlinewidth}
}
}
@@ -511,9 +711,54 @@
}
% Just up and down (very common)
-\def\pgfcirc@border@extend@updown#1#2{\pgfcirc@border@extend@full{1}{#1}{1}{#2}}% %>>>
+\def\pgfcirc@border@extend@updown#1#2{\pgfcirc@border@extend@full{1}{#1}{1}{#2}}%
+
+
+% set of symmetrical, geographical anchors when a \northwest saved anchor is available
+\long\def\pgfcirc@northwest@symmetric@geoanchors{%
+ \anchor{right}{\northwest\pgf@y=0pt\pgf@x=-\pgf@x}
+ \anchor{east}{\northwest\pgf@y=0pt\pgf@x=-\pgf@x}
+ \anchor{e}{\northwest\pgf@y=0pt\pgf@x=-\pgf@x}
+ \anchor{left}{\northwest\pgf@y=0pt}
+ \anchor{west}{\northwest\pgf@y=0pt}
+ \anchor{w}{\northwest\pgf@y=0pt}
+ \anchor{south}{\northwest\pgf@x=0pt\pgf@y=-\pgf@y}
+ \anchor{s}{\northwest\pgf@x=0pt\pgf@y=-\pgf@y}
+ \anchor{north}{\northwest\pgf@x=0pt}
+ \anchor{n}{\northwest\pgf@x=0pt}
+ \anchor{south west}{\northwest\pgf@y=-\pgf@y}
+ \anchor{sw}{\northwest\pgf@y=-\pgf@y}
+ \anchor{north east}{\northwest\pgf@x=-\pgf@x}
+ \anchor{ne}{\northwest\pgf@x=-\pgf@x}
+ \anchor{north west}{\northwest}
+ \anchor{nw}{\northwest}
+ \anchor{south east}{\northwest\pgf@x=-\pgf@x\pgf@y=-\pgf@y}
+ \anchor{se}{\northwest\pgf@x=-\pgf@x\pgf@y=-\pgf@y}
+}
+% the same, when we have \northeast (I know...)
+\long\def\pgfcirc@northeast@symmetric@geoanchors{%
+ \anchor{north}{\northeast\pgf@x=0cm\relax}
+ \anchor{n}{\northeast\pgf@x=0cm\relax}
+ \anchor{east}{\northeast\pgf@y=0cm\relax}
+ \anchor{e}{\northeast\pgf@y=0cm\relax}
+ \anchor{right}{\northeast\pgf@y=0cm\relax}
+ \anchor{south}{\northeast\pgf@y=-\pgf@y \pgf@x=0cm\relax}
+ \anchor{s}{\northeast\pgf@y=-\pgf@y \pgf@x=0cm\relax}
+ \anchor{west}{\northeast\pgf@y=0cm\pgf@x=-\pgf@x}
+ \anchor{w}{\northeast\pgf@y=0cm\pgf@x=-\pgf@x}
+ \anchor{left}{\northeast\pgf@y=0cm\pgf@x=-\pgf@x}
+ \anchor{north east}{\northeast}
+ \anchor{ne}{\northeast}
+ \anchor{north west}{\northeast\pgf@x=-\pgf@x}
+ \anchor{nw}{\northeast\pgf@x=-\pgf@x}
+ \anchor{south east}{\northeast\pgf@y=-\pgf@y}
+ \anchor{se}{\northeast\pgf@y=-\pgf@y}
+ \anchor{south west}{\northeast\pgf@y=-\pgf@y\pgf@x=-\pgf@x}
+ \anchor{sw}{\northeast\pgf@y=-\pgf@y\pgf@x=-\pgf@x}
+}
+%>>>
-% text position in some component.%<<<1
+%% text position in some component.%<<<1
% (added with ieeestd logic ports. Maybe to be extended to other components,
% like amplifiers)
%
@@ -527,7 +772,7 @@
\ctikzset{left text distance/.initial=0.3em}%
%>>>
-% voltage direction options%<<<1
+%% voltage direction options%<<<1
\newif\ifpgf@circ@oldvoltagedirection % default false
\newif\ifpgf@circ@explicitvdir
@@ -541,7 +786,7 @@
\tikzset{voltage dir/.style={circuitikz/voltage dir=#1}}%
%>>>
-% bipole definitions for path component and text decorations%%<<<1
+%% bipole definitions for path component and text decorations%%<<<1
%
% Option "t=*" for nodes
\pgfkeys{/tikz/t/.add code={}{\ctikzset{text=#1}}}
@@ -623,11 +868,9 @@
\ctikzset{label/align/smart/.code={\ctikzsetvalof{label/align}{smart}}}
%%>>>
-% traditional styles %<<<1
+%% traditional styles %<<<1
%
\ctikzset{thickness/.initial=2}
-\ctikzset{color/.initial=black}
-\pgfkeys{/tikz/color/.add code={}{\ctikzset{color={#1}}}}
\ctikzset{bipoles/border margin/.initial=1.1}
\ctikzset{bipoles/thickness/.initial=2}
\ctikzset{tripoles/thickness/.initial=2}
@@ -635,7 +878,7 @@
\ctikzset{nodes width/.initial=.04}
%%>>>
-% Styles definitions and macros%<<<1
+%% Styles definitions and macros%<<<1
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% main style definitions
@@ -771,7 +1014,7 @@
\tikzset{cute/.style = {european currents, european voltages, american resistors, cute inductors, american ports}}
%%>>>
-% voltage and current options%<<<1
+%% voltage and current options%<<<1
%
\ctikzset{current arrow scale/.initial=16}
\ctikzset{current/distance/.initial = .5}
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
index d41ba541b3..94212962fb 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
@@ -246,6 +246,7 @@
{\ctikzvalof{bipoles/generic/height}}
{\ctikzvalof{bipoles/generic/width}}
{
+ % \pgf@circ@debug@colors
\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
\pgf@circ@draworfill
@@ -420,7 +421,6 @@
\endpgfscope
\pgfsetlinewidth{\pgfstartlinewidth}
- \pgftext[top,x=.85\pgf@circ@res@left,y=.75\pgf@circ@res@down]{\pgf@circ@font@tiny$\vartheta$}
\pgfsetarrowsend{latexslim}
\pgfpathmoveto{\pgfpoint{.62\pgf@circ@res@left}{\pgf@circ@res@down}}
\pgfpathlineto{\pgfpoint{.62\pgf@circ@res@left}{.7\pgf@circ@res@down}}
@@ -428,6 +428,8 @@
\pgfpathmoveto{\pgfpoint{.45\pgf@circ@res@left}{\pgf@circ@res@down}}
\pgfpathlineto{\pgfpoint{.45\pgf@circ@res@left}{.7\pgf@circ@res@down}}
\pgfusepath{draw}
+ \pgf@circ@text@strokecolor
+ \pgftext[top,x=.85\pgf@circ@res@left,y=.75\pgf@circ@res@down]{\pgf@circ@font@tiny$\vartheta$}
}
%% Thermistor NTC
@@ -450,7 +452,6 @@
\endpgfscope
\pgfsetlinewidth{\pgfstartlinewidth}
- \pgftext[top,x=.85\pgf@circ@res@left,y=.75\pgf@circ@res@down]{\pgf@circ@font@tiny$\vartheta$}
\pgfsetarrowsend{latexslim}
\pgfpathmoveto{\pgfpoint{.62\pgf@circ@res@left}{\pgf@circ@res@down}}
\pgfpathlineto{\pgfpoint{.62\pgf@circ@res@left}{.7\pgf@circ@res@down}}
@@ -458,6 +459,8 @@
\pgfpathmoveto{\pgfpoint{.45\pgf@circ@res@left}{.7\pgf@circ@res@down}}
\pgfpathlineto{\pgfpoint{.45\pgf@circ@res@left}{\pgf@circ@res@down}}
\pgfusepath{draw}
+ \pgf@circ@text@strokecolor
+ \pgftext[top,x=.85\pgf@circ@res@left,y=.75\pgf@circ@res@down]{\pgf@circ@font@tiny$\vartheta$}
}
%% Varistor
@@ -480,7 +483,7 @@
\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
\pgfusepath{draw}
\endpgfscope
-
+ \pgf@circ@text@strokecolor
\pgftext[top,x=.65\pgf@circ@res@left,y=1.2\pgf@circ@res@down]{{\pgf@circ@font@tiny\textsf{U}}}
}
@@ -896,25 +899,28 @@
{\ctikzvalof{bipoles/ecapacitor/height}}
{\ctikzvalof{bipoles/ecapacitor/width}}
{
- \pgfsetrectcap
- % % % Draw plus pole
- \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
- \pgf@circ@draworfill
- % % Draw minus pole
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@right}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@right}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
- \pgfsetfillcolor{\ctikzvalof{color}}
- \pgfusepath{draw,fill}
- \pgfsetfillcolor{\ctikzvalof{color}}
+ \pgfscope
+ \pgfsetrectcap
+ % % % Draw plus pole
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \pgf@circ@draworfill
+ % % Draw minus pole
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@right}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@right}{\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+ \pgf@circ@setcolor
+ \pgf@circ@fill@strokecolor
+ \pgfusepath{draw,fill}
+ \endpgfscope
% % plus pole annotation
+ \pgf@circ@text@strokecolor
\pgftext[right,at=\pgfpoint{1.2\pgf@circ@res@left}{.6\pgf@circ@res@up}]
{\ctikzvalof{bipoles/ecapacitor/font} $+$}
}
@@ -1125,14 +1131,38 @@
%
% generic core anchor settings
\ctikzset{bipoles/inductors/core distance/.initial={2pt}}
+\ctikzset{bipoles/inductors/dot x distance/.initial={4pt}}
+\ctikzset{bipoles/inductors/dot y distance/.initial={1pt}}
\def\pgfcir@basic@core@anchors{%
\saveddimen{\coredistance}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{bipoles/inductors/core distance}}}
+ \saveddimen{\dotXdistance}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{bipoles/inductors/dot x distance}}}
+ \saveddimen{\dotYdistance}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{bipoles/inductors/dot y distance}}}
\anchor{core east}{%
\northeast\advance\pgf@y by\coredistance
}
\anchor{core west}{%
\northeast\advance\pgf@y by\coredistance\pgf@x=-\pgf@x
}
+ \anchor{ll dot}{%
+ \southwestborder
+ \advance\pgf@x by -\dotXdistance
+ \advance\pgf@y by -\dotYdistance
+ }
+ \anchor{ul dot}{%
+ \northeastborder
+ \advance\pgf@x by \dotXdistance\pgf@x=-\pgf@x
+ \advance\pgf@y by \dotYdistance
+ }
+ \anchor{lr dot}{%
+ \southwestborder
+ \advance\pgf@x by -\dotXdistance\pgf@x=-\pgf@x
+ \advance\pgf@y by -\dotYdistance
+ }
+ \anchor{ur dot}{%
+ \northeastborder
+ \advance\pgf@x by \dotXdistance
+ \advance\pgf@y by \dotYdistance
+ }
}
%
\ctikzset{bipoles/americaninductor/height/.initial=.3}
@@ -1524,6 +1554,7 @@
\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgf@circ@fill@strokecolor
\pgfusepath{draw,fill}
}
@@ -1543,6 +1574,7 @@
\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgf@circ@fill@strokecolor
\pgfusepath{draw,fill}
\pgfscope
\pgf@circ@set@relative@thickness{modifier thickness}
@@ -1575,6 +1607,7 @@
\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{.4\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{.4\pgf@circ@res@down}}
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgf@circ@fill@strokecolor
\pgfusepath{draw,fill}
\pgfscope
@@ -1772,6 +1805,12 @@
\pgfkeys{tikz/tert/wye/.add code={}{\pgf@circ@tert@wyetrue}}
\pgfkeys{tikz/tert/zig/.add code={}{\pgf@circ@tert@zigtrue}}%
+% nullator and norator
+\ctikzset{bipoles/nullator/height/.initial=.30}
+\ctikzset{bipoles/nullator/width/.initial=.60}
+\ctikzset{bipoles/norator/height/.initial=.25}
+\ctikzset{bipoles/norator/width/.initial=.60}%must be greater than 2*height
+
%%>>>
%% Nodes definitions for sources%<<<
@@ -1929,12 +1968,14 @@
{\ctikzvalof{bipoles/vsourceam/width}}
{
- \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
- \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
- \pgf@circ@draworfill
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgfscope
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+ \pgf@circ@draworfill
+ \endpgfscope
+ \pgf@circ@text@strokecolor
\ifpgf@circ@oldvoltagedirection
- \pgftext[bottom,rotate=90,y=\ctikzvalof{bipoles/vsourceam/margin}\pgf@circ@res@down]{\ctikzvalof{bipoles/vsourceam/inner plus}}
+ \pgftext[bottom,rotate=90,y=\ctikzvalof{bipoles/vsourceam/margin}\pgf@circ@res@down]{\ctikzvalof{bipoles/vsourceam/inner plus}}
\pgftext[top,rotate=90,y=\ctikzvalof{bipoles/vsourceam/margin}\pgf@circ@res@up]{\ctikzvalof{bipoles/vsourceam/inner minus}}
\else
\pgftext[bottom,rotate=90,y=\ctikzvalof{bipoles/vsourceam/margin}\pgf@circ@res@down]{\ctikzvalof{bipoles/vsourceam/inner minus}}
@@ -2075,14 +2116,13 @@
\pgf@circ@draworfill
% Draw triangle
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@right}{0}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@right}{0}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
\pgf@circ@draworfill
-
- \pgfusepath{draw}
+ \pgfusepath{draw}
}
%% Empty Source
@@ -2109,8 +2149,10 @@
{
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
\pgfpathmoveto{\pgfpointorigin}
- \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
- \pgf@circ@maybefill
+ \pgfscope
+ \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+ \pgf@circ@maybefill
+ \endpgfscope
\edef\@@angle{\ctikzvalof{bipoles/dcisource/angle}}
\pgfpathmoveto{\pgfpointpolar{\@@angle}{\pgf@circ@res@up}}
\pgfpatharc{\@@angle}{-\@@angle}{\pgf@circ@res@up}
@@ -2636,15 +2678,16 @@
{\ctikzvalof{bipoles/cvsourceam/height}}
{\ctikzvalof{bipoles/cvsourceam/width}}
{
- \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
- \pgfpathclose
- \pgf@circ@draworfill
-
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgfscope
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
+ \pgfpathclose
+ \pgf@circ@draworfill
+ \endpgfscope
+ \pgf@circ@text@strokecolor
\ifpgf@circ@oldvoltagedirection
\pgftext[bottom,rotate=90,y=\ctikzvalof{bipoles/cvsourceam/margin}\pgf@circ@res@left]{\ctikzvalof{bipoles/cvsourceam/inner plus}}
\pgftext[top,rotate=90,y=\ctikzvalof{bipoles/cvsourceam/margin}\pgf@circ@res@right]{\ctikzvalof{bipoles/cvsourceam/inner minus}}
@@ -2957,6 +3000,49 @@
\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{.6\pgf@circ@res@down}}
\pgfsetroundcap\pgfusepath{draw}
}
+
+% nullator
+\pgfcircdeclarebipolescaled{sources}
+{}
+{\ctikzvalof{bipoles/nullator/height}}
+{nullator}
+{\ctikzvalof{bipoles/nullator/height}}
+{\ctikzvalof{bipoles/nullator/width}}
+{
+ \pgfpointorigin
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+ \pgf@circ@draworfill
+}
+% norator
+\pgfcircdeclarebipolescaled{sources}
+{}
+{\ctikzvalof{bipoles/norator/height}}
+{norator}
+{\ctikzvalof{bipoles/norator/height}}
+{\ctikzvalof{bipoles/norator/width}}
+{
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgf@circ@res@other=\dimexpr\pgf@circ@res@right-\pgf@circ@res@up\relax
+ \pgfmathsetmacro{\@@angle}{atan2(\pgf@circ@res@other,\pgf@circ@res@up)}
+ % \typeout{ANGLE\space\@@angle}
+ \pgfmathsetlength{\pgf@circ@res@step}{\pgf@circ@res@up*cos(\@@angle)}
+ \pgfmathsetlength{\pgf@circ@res@temp}{\pgf@circ@res@up*sin(\@@angle)}
+ % right semicircle
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@other-\pgf@circ@res@step}{\pgf@circ@res@temp}}
+ \pgfpatharc{180-\@@angle}{-180+\@@angle}{\pgf@circ@res@up}
+ % connect to left semicircle
+ \pgfpathlineto
+ {\pgfpoint{-\pgf@circ@res@other+\pgf@circ@res@step}{\pgf@circ@res@temp}}
+ % left semicircle
+ \pgfpatharc{\@@angle}{360-\@@angle}{\pgf@circ@res@up}
+ % connect to right semicircle
+ \pgfpathlineto
+ {\pgfpoint{\pgf@circ@res@other-\pgf@circ@res@step}{\pgf@circ@res@temp}}
+ \pgfpathclose
+ \pgf@circ@draworfill
+}
+
% %>>>
%% Paths definitions for Sources%<<<
@@ -3119,6 +3205,10 @@
\pgfcirc@style@to@style{noise current source}{isourceN}
\pgfcirc@style@to@style{noise current source}{nI}
+% norator, nullator
+\pgfcirc@activate@bipole@simple{l}{nullator}
+\pgfcirc@activate@bipole@simple{l}{norator}
+
% build alias with voltage and current directions (legacy)
\def\pgf@temp#1{
@@ -3140,6 +3230,7 @@
\pgf@temp{>} \pgf@temp{<} \pgf@temp{^} \pgf@temp{_}
% %>>>
+
%%%%%%%%%%%%%%
%% Diodes
%%%%%%%%%%%%%%
@@ -3239,6 +3330,18 @@
%% Node components for diodes %<<<1
+% beware, this shift to the left the coordinates
+\def\pgf@circ@fulldiode@triangle@shift{%
+ \pgftransformxshift{\pgf@circ@res@left}
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
+ \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
+ \pgf@circ@fill@strokecolor
+ \pgfusepath{draw,fill}
+ % \pgf@circ@debug@colors
+}
+
%% Black generic diode
\pgfcircdeclarebipolescaled{diodes}
{}
@@ -3249,14 +3352,8 @@
{
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
-
\pgfscope
- \pgftransformxshift{\pgf@circ@res@left}
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
- \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
- \pgfusepath{draw,fill}
+ \pgf@circ@fulldiode@triangle@shift
\endpgfscope
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
@@ -3271,21 +3368,12 @@
{\ctikzvalof{bipoles/diode/height}}
{\ctikzvalof{bipoles/diode/width}}
{
-
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
-
- \pgfscope
- \pgftransformxshift{\pgf@circ@res@left}
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
- \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
- \pgfusepath{draw,fill}
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@up}}
- \pgfusepath{draw}
- \endpgfscope
+ \pgf@circ@fulldiode@triangle@shift
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \pgfusepath{draw}
}
%% Black alternative zigzag Zener diode
@@ -3298,22 +3386,13 @@
{\ctikzvalof{bipoles/diode/height}}
{\ctikzvalof{bipoles/diode/width}}
{
-
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
-
- \pgfscope
- \pgftransformxshift{\pgf@circ@res@left}
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
- \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
- \pgfusepath{draw,fill}
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-1.8\pgf@circ@res@left}{\pgf@circ@res@down-0.5\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-0.2\pgf@circ@res@left}{\pgf@circ@res@up-0.5\pgf@circ@res@down}}
- \pgfusepath{draw}
- \endpgfscope
+ \pgf@circ@fulldiode@triangle@shift
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-1.8\pgf@circ@res@left}{\pgf@circ@res@down-0.5\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-0.2\pgf@circ@res@left}{\pgf@circ@res@up-0.5\pgf@circ@res@down}}
+ \pgfusepath{draw}
}
%% Black Schottky diode
@@ -3324,26 +3403,16 @@
{\ctikzvalof{bipoles/diode/height}}
{\ctikzvalof{bipoles/diode/width}}
{
-
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
- \pgfscope
- \pgftransformxshift{\pgf@circ@res@left}
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
- \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
- \pgfusepath{draw,fill}
-
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{.6\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-1.4\pgf@circ@res@left}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-1.4\pgf@circ@res@left}{.6\pgf@circ@res@up}}
- \pgfusepath{draw}
- \endpgfscope
-
+ \pgf@circ@fulldiode@triangle@shift
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{.6\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-1.4\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-1.4\pgf@circ@res@left}{.6\pgf@circ@res@up}}
+ \pgfusepath{draw}
}
%% Black tunnel diode
@@ -3354,22 +3423,13 @@
{\ctikzvalof{bipoles/diode/height}}
{\ctikzvalof{bipoles/diode/width}}
{
-
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
- \pgfscope
- \pgftransformxshift{\pgf@circ@res@left}
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
- \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
- \pgfusepath{draw,fill}
-
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@up}}
- \pgfusepath{draw}
- \endpgfscope
+ \pgf@circ@fulldiode@triangle@shift
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \pgfusepath{draw}
}
%
@@ -3377,6 +3437,7 @@
%
\def\pgf@circ@draw@ledarrows{%
\pgfsetlinewidth{\pgfstartlinewidth}
+ \pgf@circ@fill@strokecolor
\pgfsetarrowsend{latexslim}
\ifpgf@led@fliparrows
\pgfpathmoveto{\pgfpoint{0pt}{0.8\pgf@circ@res@up}}
@@ -3399,6 +3460,7 @@
%
\def\pgf@circ@draw@pdarrows{%
\pgfsetlinewidth{\pgfstartlinewidth}
+ \pgf@circ@fill@strokecolor
\pgfsetarrowsstart{latexslim}
\ifpgf@pd@fliparrows
\pgfpathmoveto{\pgfpoint{0pt}{0.8\pgf@circ@res@up}}
@@ -3421,6 +3483,7 @@
%
\def\pgf@circ@draw@laserarrows{%
\pgfsetlinewidth{\pgfstartlinewidth}
+ \pgf@circ@fill@strokecolor
\pgfsetarrowsend{latexslim}
\pgfpathmoveto{\pgfpoint{-0.4\pgf@circ@res@right}{1.1\pgf@circ@res@up}}
\pgfpathlineto{\pgfpoint{-0.4\pgf@circ@res@right}{2.1\pgf@circ@res@up}}
@@ -3439,20 +3502,13 @@
{\ctikzvalof{bipoles/diode/height}}
{\ctikzvalof{bipoles/diode/width}}
{
-
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
\pgfscope
- \pgftransformxshift{\pgf@circ@res@left}
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
- \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
- \pgfusepath{draw,fill}
+ \pgf@circ@fulldiode@triangle@shift
\endpgfscope
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
\pgfusepath{draw}
-
\pgf@circ@draw@ledarrows
}
@@ -3466,22 +3522,15 @@
{\ctikzvalof{bipoles/diode/height}}
{\ctikzvalof{bipoles/diode/width}}
{
-
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
\pgfscope
- \pgftransformxshift{\pgf@circ@res@left}
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
- \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
- \pgfusepath{draw,fill}
+ \pgf@circ@fulldiode@triangle@shift
\endpgfscope
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right+\pgf@circ@res@left}{\pgf@circ@res@up}}
\pgfpathlineto{\pgfpoint{\pgf@circ@res@right+\pgf@circ@res@left}{\pgf@circ@res@down}}
\pgfusepath{draw}
-
\pgf@circ@draw@laserarrows
}
@@ -3495,20 +3544,13 @@
{\ctikzvalof{bipoles/diode/height}}
{\ctikzvalof{bipoles/diode/width}}
{
-
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
\pgfscope
- \pgftransformxshift{\pgf@circ@res@left}
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
- \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
- \pgfusepath{draw,fill}
+ \pgf@circ@fulldiode@triangle@shift
\endpgfscope
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
\pgfusepath{draw}
-
\pgf@circ@draw@pdarrows
}
@@ -3526,6 +3568,7 @@
\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{0pt}}
+ \pgf@circ@fill@strokecolor
\pgfusepath{draw,fill}
%
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{\pgf@circ@res@down}}
@@ -3821,6 +3864,7 @@
\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{-1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
+ \pgf@circ@fill@strokecolor
\pgfusepath{draw, fill}
\pgfsetlinewidth{\pgfstartlinewidth}
@@ -3865,6 +3909,7 @@
\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{0pt}}
\pgfpathclose
\ifnum#2=0\relax
+ \pgf@circ@fill@strokecolor
\pgfusepath{draw,fill}
\else
\pgf@circ@draworfill
@@ -3884,7 +3929,7 @@
\fi
% draw the gate thing;
- #4
+ #4%
% draw the leads in/out
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}
@@ -4076,7 +4121,8 @@
\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
\ifnum#2=0\relax
- \pgfusepath{draw,fill}
+ \pgf@circ@fill@strokecolor
+ \pgfusepath{draw,fill}
\else
\pgf@circ@draworfill
\fi
@@ -4520,7 +4566,7 @@
{\ctikzvalof{bipoles/cuteswitch/width}}{
\pgfscope
% This is the radius of the "ocirc" shape (see pgfcircshapes.tex)
- % If cnnecting nodes are scaled, we have to modify this
+ % If connecting nodes are scaled, we have to modify this
\pgf@circ@res@temp=\ctikzvalof{nodes width}\pgf@circ@Rlen
\pgf@circ@res@temp=\ctikzvalof{bipoles/cuteswitch/thickness}\pgf@circ@res@temp
\pgfsetlinewidth{2\pgf@circ@res@temp}
@@ -4529,7 +4575,8 @@
\pgfsetroundcap\pgfusepath{draw}
\endpgfscope
\pgfscope % arrow
- #3
+ \pgf@circ@fill@strokecolor
+ #3%
\endpgfscope
\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
\pgfnode{\cshape}{center}{}{\thisshape-in}{\pgfusepath{draw}}
@@ -4695,8 +4742,8 @@
\pgf@x=-\pgf@x
\pgf@y=-\pgf@y
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\northwest
\pgf@circ@res@up = \pgf@y
@@ -4798,8 +4845,8 @@
\anchor{north west}{ \northwest }
\anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\northwest
\pgf@circ@res@up = \pgf@y
\pgf@circ@res@down = -\pgf@y
@@ -4816,7 +4863,8 @@
\pgfsetroundcap\pgfusepath{draw}
\endpgfscope
\pgfscope % arrow
- #3
+ \pgf@circ@fill@strokecolor
+ #3%
\endpgfscope
% terminals
\pgfscope
@@ -5151,9 +5199,11 @@
{\ctikzvalof{bipoles/esource/width}}
{
\pgfpointorigin
- \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
- \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
- \pgf@circ@draworfill
+ \pgfscope
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+ \pgf@circ@draworfill
+ \endpgfscope
% draw the text label
% get the rotation
\ifpgf@circuit@straightinstruments
@@ -5164,7 +5214,7 @@
\fi
% and unrotate the scope
\pgfscope
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@text@strokecolor
\pgftransformrotate{\rot}
\pgftext[center,x=0,y=0]{\ctikzvalof{bipoles/twoport/text}}
\endpgfscope
@@ -5179,9 +5229,11 @@
{\ctikzvalof{bipoles/esource/width}}
{
\pgfpointorigin
- \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
- \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
- \pgf@circ@draworfill
+ \pgfscope
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+ \pgf@circ@draworfill
+ \endpgfscope
% draw the text label
% get the rotation
\ifpgf@circuit@straightinstruments
@@ -5193,7 +5245,7 @@
% and unrotate the scope
\pgfscope
\pgftransformrotate{\rot}
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
\pgfsetlinewidth{\pgfstartlinewidth}
% arrow: create a center hole to have better visual
\pgfscope
@@ -5212,6 +5264,7 @@
\pgfpathlineto{\pgfpoint{.8\pgf@circ@res@right}{1.2\pgf@circ@res@up}}
\pgfusepath{draw}
\endpgfscope
+ \pgf@circ@text@strokecolor
\pgftext[center]{\ctikzvalof{bipoles/twoport/text}}
\endpgfscope
}
@@ -5268,6 +5321,7 @@
\pgfpathlineto{\pgfpointpolar{80}{2.4\pgf@circ@res@up}}
\pgfusepath{draw}
\endpgfscope
+ \pgf@circ@text@strokecolor
\pgftext[center, y=0.5\pgf@circ@res@down]{\ctikzvalof{bipoles/twoport/text}}
\endpgfscope
}
@@ -5302,7 +5356,7 @@
\pgfscope
\pgfsetcornersarced{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@step}}
\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
- \pgf@circ@draworfill
+ \pgf@circ@draworfill
\endpgfscope
\def\@starta{103}\def\@stopa{77}
\pgfsetlinewidth{\pgfstartlinewidth}
@@ -5318,7 +5372,7 @@
\pgfusepath{draw}
\pgf@circ@draworfill
\endpgfscope
- #2
+ #2%
\endpgfscope
}
}
@@ -5401,7 +5455,7 @@
\pgf@circ@res@left=-\pgf@circ@res@right
\pgfscope
\pgfstartlinewidth=\pgflinewidth
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
% external ellipse
\pgfscope
\pgf@circ@setlinewidth{bipoles}{\pgflinewidth}
@@ -5476,7 +5530,7 @@
\def\@minus{\pgfpointpolar{75}{\pgf@circ@res@step and \pgf@circ@res@other}}
\pgfscope
\pgfstartlinewidth=\pgflinewidth
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
% external ellipse
\pgfscope
\pgf@circ@setlinewidth{bipoles}{\pgflinewidth}
@@ -5823,8 +5877,8 @@
\pgf@y=-\pgf@y
\pgf@x=0.5\pgf@x
}
- \behindbackgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\pgf@circ@scaled@Rlen=\scaledRlen
\pgf@circ@res@step=\ctikzvalof{tripoles/elmech/width}\pgf@circ@scaled@Rlen
\pgf@circ@res@up=\ctikzvalof{tripoles/elmech/height}\pgf@circ@scaled@Rlen
@@ -5837,7 +5891,7 @@
\pgfseteorule
\pgfusepath{clip}
\pgfpathrectangle{\pgfpoint{-.25\pgf@circ@res@step}{-.5\pgf@circ@res@up}}{\pgfpoint{.5\pgf@circ@res@step}{\pgf@circ@res@up}}
- \pgfsetfillcolor{\ctikzvalof{color}}
+ \pgf@circ@fill@strokecolor
\pgfusepath{fill, draw}
\endpgfscope
\pgfpathcircle{\pgfpoint{0}{0}} {0.5\pgf@circ@res@step}
@@ -6091,6 +6145,7 @@
\pgfusepath{draw}
\pgfpathrectanglecorners{\pgfpoint{.7\pgf@circ@res@right}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+ \pgf@circ@fill@strokecolor
\pgfusepath{stroke,fill}
}
@@ -6223,5 +6278,66 @@
\pgfcirc@activate@bipole@simple{l}{loudspeaker}
% %>>>
+%% Buzzer and reverse buzzer %<<<
+\ctikzset{bipoles/buzzer/height/.initial=0.6}
+\ctikzset{bipoles/buzzer/width/.initial=.4}%
+\ctikzset{bipoles/buzzer/span/.initial=.6}%
+
+\pgfcircdeclarebipolescaled{misc}
+{}
+{0}
+{buzzer}
+{\ctikzvalof{bipoles/buzzer/height}}
+{\ctikzvalof{bipoles/buzzer/width}}{
+ % this is the height of the semicircle
+ \pgf@circ@res@other=\dimexpr\pgf@circ@res@up-\pgf@circ@res@right\relax
+ \pgfscope
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@other}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@other}}
+ \pgfpatharc{0}{180}{\pgf@circ@res@right}
+ \pgfpathclose
+ \pgf@circ@draworfill
+ \endpgfscope
+ \pgfpathmoveto{\pgfpoint{\ctikzvalof{bipoles/buzzer/span}*\pgf@circ@res@left}{\pgf@circ@res@other}}
+ \pgfpathlineto{\pgfpoint{\ctikzvalof{bipoles/buzzer/span}*\pgf@circ@res@left}{0pt}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+ \pgfpathmoveto{\pgfpoint{\ctikzvalof{bipoles/buzzer/span}*\pgf@circ@res@right}{\pgf@circ@res@other}}
+ \pgfpathlineto{\pgfpoint{\ctikzvalof{bipoles/buzzer/span}*\pgf@circ@res@right}{0pt}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+ \pgfusepath{draw}
+}
+\pgfcirc@activate@bipole@simple{l}{buzzer}
+%
+\pgfcircdeclarebipolescaled{misc}
+{}
+{0}
+{rbuzzer}
+{\ctikzvalof{bipoles/buzzer/height}}
+{\ctikzvalof{bipoles/buzzer/width}}{
+ % this is the height of the semicircle
+ \pgf@circ@res@other=\dimexpr\pgf@circ@res@up-\pgf@circ@res@right\relax
+ % this is the height where the pins touch the semicircle
+ \pgfmathsetlength\pgf@circ@res@temp{\pgf@circ@res@up-
+ \pgf@circ@res@right*sqrt(1-\ctikzvalof{bipoles/buzzer/span}*\ctikzvalof{bipoles/buzzer/span})}
+ \pgfscope
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+ \pgfpatharc{0}{-180}{\pgf@circ@res@right}
+ \pgfpathclose
+ \pgf@circ@draworfill
+ \endpgfscope
+ \pgfpathmoveto{\pgfpoint{\ctikzvalof{bipoles/buzzer/span}*\pgf@circ@res@left}{\pgf@circ@res@temp}}
+ \pgfpathlineto{\pgfpoint{\ctikzvalof{bipoles/buzzer/span}*\pgf@circ@res@left}{0pt}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+ \pgfpathmoveto{\pgfpoint{\ctikzvalof{bipoles/buzzer/span}*\pgf@circ@res@right}{\pgf@circ@res@temp}}
+ \pgfpathlineto{\pgfpoint{\ctikzvalof{bipoles/buzzer/span}*\pgf@circ@res@right}{0pt}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+ \pgfusepath{draw}
+}
+\pgfcirc@activate@bipole@simple{l}{rbuzzer}
+% %>>>
+
% end of pgfcircbipoles.tex
% vim: set fdm=marker fmr=%<<<,%>>>:
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
index 69235549a7..4c267929b5 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
@@ -46,6 +46,8 @@
\ctikzset{monopoles/bareantenna/width/.initial=.25}
\ctikzset{monopoles/bareantenna/label/xanchor/.initial=1}
\ctikzset{monopoles/bareantenna/label/yanchor/.initial=0.5}
+\ctikzset{monopoles/dinantenna/width/.initial=.2}
+\ctikzset{monopoles/dinantenna/height/.initial=.6}
\ctikzset{monopoles/waves/width/.initial=0.5}%
%>>>
@@ -78,7 +80,7 @@
\anchor{left}{\pgfpointorigin}
\anchor{right}{\pgfpointorigin}
\anchor{center}{\pgfpointorigin}
- \behindforegroundpath{
+ \pgf@circ@draw@component{
\pgf@circ@scaled@Rlen=\scaledRlen
\pgf@circ@res@step=\ctikzvalof{monopoles/ground/width}\pgf@circ@scaled@Rlen
\pgfscope
@@ -299,7 +301,7 @@
\advance \pgf@y by 0.5\ht\pgfnodeparttextbox
\pgf@x=-.5\wd\pgfnodeparttextbox
}
- \behindforegroundpath{
+ \pgf@circ@draw@component{
\pgf@circ@scaled@Rlen=\scaledRlen
\pgf@circ@res@step=\ctikzvalof{monopoles/vcc/width}\pgf@circ@scaled@Rlen
\pgfscope
@@ -361,7 +363,7 @@
\pgf@x=-.5\wd\pgfnodeparttextbox
}
- \behindforegroundpath{
+ \pgf@circ@draw@component{
\pgf@circ@scaled@Rlen=\scaledRlen
\pgf@circ@res@step=\ctikzvalof{monopoles/vcc/width}\pgf@circ@scaled@Rlen
\pgfscope
@@ -483,7 +485,7 @@
\anchor{text}{\northeast\pgf@xa=\pgf@x\pgf@ya=\pgf@y
\pgfpoint{\dimexpr-.5\wd\pgfnodeparttextbox+.8\pgf@xa}
{\dimexpr-.5\dp\pgfnodeparttextbox+.5\ht\pgfnodeparttextbox+\pgf@ya}}
- \behindforegroundpath{
+ \pgf@circ@draw@component{
\pgfstartlinewidth=\pgflinewidth
\pgf@circ@scaled@Rlen=\scaledRlen
@@ -513,7 +515,7 @@
\def\pgf@circ@antennabody{%
\pgfstartlinewidth=\pgflinewidth
\pgf@circ@scaled@Rlen=\scaledRlen
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
\pgf@circ@res@step=\ctikzvalof{monopoles/bareantenna/width}\pgf@circ@scaled@Rlen
\pgfscope
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
@@ -577,11 +579,11 @@
\anchor{south west}{\northeast\pgf@y=-\pgf@y\pgf@x=-\pgf@x}
\anchor{west}{\northeast\pgf@x=-\pgf@x\pgf@y=0pt}
\anchor{north west}{\northeast\pgf@x=-\pgf@x}
- \behindforegroundpath{
+ \pgf@circ@draw@component{
\pgf@circ@scaled@Rlen=\scaledRlen
\pgf@circ@res@step=\ctikzvalof{monopoles/waves/width}\pgf@circ@scaled@Rlen
\pgf@circ@res@step=0.5\pgf@circ@res@step
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
\pgfscope
% define a triangle for clipping the waves
\pgfpathmoveto{\pgfpoint{-2\pgf@circ@res@step}{0pt}}
@@ -601,8 +603,8 @@
}
}
-% the three types of antennas: simple, TX, RX. Notice that you can flip them...
-
+% the four types of antennas: simple, din, TX, RX. Notice that you can flip them...
+%
\pgfdeclareshape{bareantenna}{
\savedmacro{\ctikzclass}{\edef\ctikzclass{RF}}
\saveddimen{\scaledRlen}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}}
@@ -631,10 +633,58 @@
\anchor{north west}{\northeast\pgf@x=-\pgf@x}
\anchor{south east}{\northeast\pgf@y=0pt\relax}
\anchor{south west}{\northeast\pgf@y=0pt\pgf@x=-\pgf@x}
- \behindforegroundpath{
+ \pgf@circ@draw@component{
\pgf@circ@antennabody
}
}
+%
+\pgfdeclareshape{dinantenna}{
+ \savedmacro{\ctikzclass}{\edef\ctikzclass{RF}}
+ \saveddimen{\scaledRlen}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}}
+ \anchor{center}{\pgfpointorigin}
+ \savedanchor{\northeast}{
+ \pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}
+ \pgf@circ@res@step=\ctikzvalof{monopoles/dinantenna/width}\pgf@circ@scaled@Rlen
+ \pgf@circ@res@other=\ctikzvalof{monopoles/dinantenna/height}\pgf@circ@scaled@Rlen
+ \pgf@x=\pgf@circ@res@step
+ \pgf@y=\pgf@circ@res@other
+ }
+ \anchor{text}{
+ \northeast
+ \pgf@y=\dimexpr.5\pgf@y+.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax
+ }
+ \anchor{top}{\northeast\pgf@x=0pt}
+ \anchor{right}{\northeast\pgf@y=0.5\pgf@y}
+ \anchor{left}{\northeast\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
+ \anchor{bottom}{\pgfpointorigin}
+ \anchor{north}{\northeast\pgf@x=0pt}
+ \anchor{east}{\northeast\pgf@y=0.5\pgf@y}
+ \anchor{west}{\northeast\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
+ \anchor{south}{\pgfpointorigin}
+ \anchor{north east}{\northeast}
+ \anchor{north west}{\northeast\pgf@x=-\pgf@x}
+ \anchor{south east}{\northeast\pgf@y=0pt\relax}
+ \anchor{south west}{\northeast\pgf@y=0pt\pgf@x=-\pgf@x}
+ \pgf@circ@draw@component{
+ \pgfstartlinewidth=\pgflinewidth
+ \pgf@circ@scaled@Rlen=\scaledRlen
+ \pgf@circ@setcolor
+ \pgf@circ@res@right=\ctikzvalof{monopoles/dinantenna/width}\pgf@circ@scaled@Rlen
+ \pgf@circ@res@up=\ctikzvalof{monopoles/dinantenna/height}\pgf@circ@scaled@Rlen
+ \pgfscope
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgfpathmoveto{\pgfpointorigin}
+ \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+ \pgfpathmoveto{\pgfpoint{0pt}{0.5\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{-\pgf@circ@res@right}{\pgf@circ@res@up}}
+ \pgfpathmoveto{\pgfpoint{0pt}{0.5\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+ \pgfpathmoveto{\pgfpoint{0pt}{0.5\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+ \pgfusepath{draw}
+ \endpgfscope
+ }
+}
\pgfdeclareshape{bareTXantenna}{
\savedmacro{\ctikzclass}{\edef\ctikzclass{RF}}
@@ -672,7 +722,7 @@
\anchor{north west}{\northeast\pgf@x=-\pgf@x}
\anchor{south east}{\northeast\pgf@y=0pt\relax}
\anchor{south west}{\northeast\pgf@y=0pt\pgf@x=-\pgf@x}
- \behindforegroundpath{
+ \pgf@circ@draw@component{
\pgf@circ@antennabody
\pgf@circ@antennawaves
}
@@ -713,7 +763,7 @@
\anchor{north west}{\northeast\pgf@x=-\pgf@x}
\anchor{south east}{\northeast\pgf@y=0pt\relax}
\anchor{south west}{\northeast\pgf@y=0pt\pgf@x=-\pgf@x}
- \behindforegroundpath{
+ \pgf@circ@draw@component{
\pgf@circ@antennabody
\pgftransformxshift{-5.2\pgf@circ@res@step}
\pgf@circ@antennawaves
@@ -770,10 +820,10 @@
\anchor{north west}{\northeast\pgf@x=-\pgf@x}
\anchor{south east}{\northeast\pgf@y=0pt\relax}
\anchor{south west}{\northeast\pgf@y=0pt\pgf@x=-\pgf@x}
- \behindforegroundpath{
+ \pgf@circ@draw@component{
\pgfstartlinewidth=\pgflinewidth
\pgf@circ@scaled@Rlen=\scaledRlen
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
\northeast
\pgf@circ@res@right=\pgf@x
\pgf@circ@res@up=\pgf@y
@@ -840,7 +890,7 @@
\dimexpr.5\dp\pgfnodeparttextbox+.5\ht\pgfnodeparttextbox+\pgf@circ@res@up\relax
}
}
- \behindbackgroundpath{
+ \pgf@circ@draw@component{
\pgfextracty{\pgf@circ@res@up}{\northwest}
\pgfextractx{\pgf@circ@res@right}{\southeast}
\pgfextractx{\pgf@circ@res@left}{\northwest}
@@ -889,7 +939,7 @@
\dimexpr.5\dp\pgfnodeparttextbox+.5\ht\pgfnodeparttextbox+\pgf@circ@res@up\relax
}
}
- \behindbackgroundpath{
+ \pgf@circ@draw@component{
\pgfextracty{\pgf@circ@res@up}{\northwest}
\pgfextractx{\pgf@circ@res@right}{\southeast}
\pgfextractx{\pgf@circ@res@left}{\northwest}
@@ -946,7 +996,7 @@
\dimexpr-.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax
}
}
- \behindbackgroundpath{
+ \pgf@circ@draw@component{
\pgfextracty{\pgf@circ@res@up}{\northwest}
\pgfextractx{\pgf@circ@res@right}{\southeast}
\pgfextractx{\pgf@circ@res@left}{\northwest}
@@ -996,7 +1046,7 @@
\pgf@x=\ctikzvalof{monopoles/antenna/label/xanchor}\pgf@x
\pgf@y=\ctikzvalof{monopoles/antenna/label/yanchor}\pgf@y
}
- \behindforegroundpath{
+ \pgf@circ@draw@component{
\pgfstartlinewidth=\pgflinewidth
\pgf@circ@scaled@Rlen=\scaledRlen
\pgf@circ@res@step=\ctikzvalof{monopoles/antenna/width}\pgf@circ@scaled@Rlen
@@ -1014,7 +1064,7 @@
\pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{4\pgf@circ@res@step}}
\pgfpathlineto{\pgfpoint{3\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
\pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
\pgfusepath{draw}
\endpgfscope
@@ -1047,7 +1097,7 @@
\pgf@x=\ctikzvalof{monopoles/txantenna/label/xanchor}\pgf@x
\pgf@y=\ctikzvalof{monopoles/txantenna/label/yanchor}\pgf@y
}
- \behindforegroundpath{
+ \pgf@circ@draw@component{
\pgfstartlinewidth=\pgflinewidth
\pgf@circ@scaled@Rlen=\scaledRlen
\pgf@circ@res@step=\ctikzvalof{monopoles/txantenna/width}\pgf@circ@scaled@Rlen
@@ -1065,7 +1115,7 @@
\pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{4\pgf@circ@res@step}}
\pgfpathlineto{\pgfpoint{3\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
\pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
\pgfusepath{draw}
\endpgfscope
@@ -1109,7 +1159,7 @@
\pgf@x=\ctikzvalof{monopoles/rxantenna/label/xanchor}\pgf@x
\pgf@y=\ctikzvalof{monopoles/rxantenna/label/yanchor}\pgf@y
}
- \behindforegroundpath{
+ \pgf@circ@draw@component{
\pgfstartlinewidth=\pgflinewidth
\pgf@circ@scaled@Rlen=\scaledRlen
\pgf@circ@res@step=\ctikzvalof{monopoles/rxantenna/width}\pgf@circ@scaled@Rlen
@@ -1127,7 +1177,7 @@
\pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{4\pgf@circ@res@step}}
\pgfpathlineto{\pgfpoint{3\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
\pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
\pgfusepath{draw}
\endpgfscope
@@ -1177,7 +1227,7 @@
\advance \pgf@x by -.5\wd\pgfnodeparttextbox
\pgf@y=-1.5\ht\pgfnodeparttextbox
}
- \behindforegroundpath{
+ \pgf@circ@draw@component{
\pgf@circ@scaled@Rlen=\scaledRlen
\pgf@circ@res@step=\ctikzvalof{monopoles/match/width}\pgf@circ@scaled@Rlen
@@ -1189,6 +1239,7 @@
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
\pgfpathlineto{\pgfpoint{2\pgf@circ@res@step}{0.5\pgf@circ@res@step}}
\pgfpathlineto{\pgfpoint{2\pgf@circ@res@step}{0}}
+ \pgf@circ@fill@strokecolor
\pgfusepath{fill}
\pgfsetlinewidth{\pgfstartlinewidth}
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
index a53bbe03f2..5ebf59cbde 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
@@ -205,7 +205,7 @@
\anchor{south}{\northwest\pgf@x=0pt\pgf@y=-\pgf@y}
\anchor{west}{\northwest\pgf@y=0pt }
% start drawing
- \backgroundpath{%
+ \pgf@circ@draw@component{%
\northwest
\pgf@circ@res@up = \pgf@y
\pgf@circ@res@down = -\pgf@y
@@ -224,7 +224,7 @@
\pgfpatharc{0}{180}{0.2*\pgf@circ@res@left}
\fi
\pgfusepath{stroke}%
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
% Adding the pin number
\ifpgf@circuit@chip@shownumbers
\pgf@circ@count@a=\numpins\relax
@@ -239,6 +239,7 @@
\pgfmathsetmacro{\quadrant}{0}
\fi
\def\pgf@circ@strut{\vrule width 0pt height 1em depth 0.4em\relax}
+ \pgfscope\pgf@circ@text@strokecolor
\def\mytext{\ctikzvalof{multipoles/font}\space\pgf@circ@strut\the\pgf@circ@count@c\space}
\pgfmathloop%
\ifnum\pgf@circ@count@a>0
@@ -289,6 +290,7 @@
\fi
\advance\pgf@circ@count@a-1\relax%
\repeatpgfmathloop
+ \endpgfscope % for color of text
\fi
\endpgfscope
% draw external pins or pads
@@ -438,7 +440,7 @@
\anchor{south}{\northwest\pgf@x=0pt\pgf@y=-\pgf@y}
\anchor{west}{\northwest\pgf@y=0pt }
% start drawing
- \backgroundpath{%
+ \pgf@circ@draw@component{%
\northwest
\pgf@circ@res@up = \pgf@y
\pgf@circ@res@down = -\pgf@y
@@ -463,7 +465,7 @@
\pgfpathclose
\pgf@circ@draworfill
% Adding the pin number
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
\ifpgf@circuit@chip@shownumbers
\pgf@circ@count@a=\numpins%
\divide\pgf@circ@count@a by 4 \pgf@circ@count@b=\pgf@circ@count@a
@@ -478,6 +480,7 @@
\fi
\def\pgf@circ@strut{\vrule width 0pt height 1em depth 0.4em\relax}
\def\mytext{\ctikzvalof{multipoles/font}\space\pgf@circ@strut\the\pgf@circ@count@c\space}
+ \pgfscope\pgf@circ@text@strokecolor
\pgfmathloop%
\ifnum\pgf@circ@count@a>0
\ifcase\quadrant % rotation 0
@@ -567,6 +570,7 @@
\fi
\advance\pgf@circ@count@a-1\relax%
\repeatpgfmathloop
+ \endpgfscope % for the text labels
\fi
\endpgfscope
\ifdim\pgf@circ@res@other>0pt
@@ -801,8 +805,8 @@
\anchor{ext north west}{ \extnorthwest \advance\pgf@x by -\width}
\anchor{ext south east}{ \extnorthwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y \advance\pgf@x by -\width}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\pgf@circ@res@right = \width
\pgf@circ@res@left = -\width
@@ -1045,7 +1049,7 @@
\anchor{f}{\topright\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
\anchor{g}{\pgfpointorigin}
\anchor{dot}{\topright\pgf@y=-\pgf@y\advance\pgf@x by \dotspace}
- \behindbackgroundpath{%
+ \pgf@circ@draw@component{%
\southwest % I do not want the dot here, it will stick out
\pgf@circ@res@up = -\pgf@y
\pgf@circ@res@down = \pgf@y
@@ -1053,7 +1057,7 @@
\pgf@circ@res@left = -\pgf@x
\pgfscope
\pgf@circ@setlinewidth{multipoles}{\pgflinewidth}
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
\pgfpathrectanglecorners%
{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
{\pgfpoint{\pgf@circ@res@left+\dotspace}{\pgf@circ@res@up}}
@@ -1313,7 +1317,7 @@
\anchor{bup}{\northwest\pgf@x=0pt }
\anchor{bdown}{\northwest\pgf@x=0pt\pgf@y=-\pgf@y}
% start drawing
- \backgroundpath{%
+ \pgf@circ@draw@component{%
\northwest
\pgf@circ@res@up = \pgf@y
\pgf@circ@res@down = -\pgf@y
@@ -1322,7 +1326,7 @@
\pgf@circ@scaled@Rlen=\scaledRlen
\pgf@circ@res@step = \ctikzvalof{multipoles/flipflop/pin spacing}\pgf@circ@scaled@Rlen
\pgf@circ@res@other = \ctikzvalof{multipoles/external pins width}\pgf@circ@scaled@Rlen
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
\pgfscope% (for the line width)
\pgf@circ@setlinewidth{multipoles}{\pgflinewidth}
\pgfpathrectanglecorners{\pgfpoint{-\width/2}{-\height/2}}{\pgfpoint{\width/2}{\height/2}}%
@@ -1342,6 +1346,7 @@
\pgfmathsetmacro{\quadrant}{0}
\fi
\def\pgf@circ@strut{\vrule width 0pt height 1em depth 0.4em\relax}
+ \pgfscope\pgf@circ@text@strokecolor
% text
\def\mytext{\ctikzvalof{multipoles/flipflop/font}\space
\ctikzvalof{multipoles/flipflop/t\the\pgf@circ@count@c}%
@@ -1448,6 +1453,7 @@
at=\pgfpoint{0pt}{\pgf@circ@res@down+\pgf@circ@res@temp},
rotate=\rot]{\mytext}
\fi
+ \endpgfscope % for text labels
% external pins
\ifdim\pgf@circ@res@other>0pt
\pgfscope
@@ -1788,7 +1794,7 @@
\pgf@y=-.5\ht\pgfnodeparttextbox%
\advance\pgf@y by+.5\dp\pgfnodeparttextbox%
}%
- \backgroundpath{%
+ \pgf@circ@draw@component{%
\topleft
\pgf@circ@res@up = \pgf@y
\pgf@circ@res@down = -\pgf@y
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
index 4518f16479..0cacd11fb4 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
@@ -263,7 +263,7 @@
\ctikzset{bipole/nodes/right/.initial=none}
\tikzset{bipole nodes/.style n args={2}{%
\circuitikzbasekey/bipole/nodes/left=#1,
- \circuitikzbasekey/bipole/nodes/right=#2
+ \circuitikzbasekey/bipole/nodes/right=#2%
}
}
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
index aa481caaf9..44816fafc4 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
@@ -184,16 +184,16 @@
\northwest
\pgf@x=0pt
}
- #3
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ #3%
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\northwest
\pgf@circ@res@up = \pgf@y
\pgf@circ@res@down = -\pgf@y
\pgf@circ@res@right = -\pgf@x
\pgf@circ@res@left = \pgf@x
- #2
+ #2%
}
}
}
@@ -457,10 +457,16 @@
% Option "boxed" for nodes and twoports
\newif\ifpgf@circuit@boxed
-\pgfkeys{/tikz/boxed/.add code={}{\pgf@circuit@boxedtrue}}
-\ctikzset{boxed/.add code={}{\pgf@circuit@boxedtrue}}
-\pgfkeys{/tikz/box/.add code={}{\pgf@circuit@boxedtrue}}
-\ctikzset{box/.add code={}{\pgf@circuit@boxedtrue}}
+\newif\ifpgf@circuit@boxedcircled\pgf@circuit@boxedcircledtrue
+\pgfkeys{/tikz/boxed/.add code={}{\pgf@circuit@boxedtrue\pgf@circuit@boxedcircledtrue}}
+\ctikzset{boxed/.add code={}{\pgf@circuit@boxedtrue\pgf@circuit@boxedcircledtrue}}
+\pgfkeys{/tikz/box/.add code={}{\pgf@circuit@boxedtrue\pgf@circuit@boxedcircledtrue}}
+\ctikzset{box/.add code={}{\pgf@circuit@boxedtrue\pgf@circuit@boxedcircledtrue}}
+% boxed, no circle
+\pgfkeys{/tikz/boxed only/.add code={}{\pgf@circuit@boxedtrue\pgf@circuit@boxedcircledfalse}}
+\ctikzset{boxed only/.add code={}{\pgf@circuit@boxedtrue\pgf@circuit@boxedcircledfalse}}
+\pgfkeys{/tikz/box only/.add code={}{\pgf@circuit@boxedtrue\pgf@circuit@boxedcircledfalse}}
+\ctikzset{box only/.add code={}{\pgf@circuit@boxedtrue\pgf@circuit@boxedcircledfalse}}
% Option "dashed" for nodes and twoports
\newif\ifpgf@circuit@dashed
@@ -480,14 +486,23 @@
%% Node shapes definition for path-style block diagrams%<<<
%% Draw the two-port fillable box
-\def\pgf@circ@twoportbox{
+\def\pgf@circ@twoportbox{%
\pgfscope
- \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
- \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}%
+ \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}%
\pgf@circ@draworfill
\endpgfscope
}
-
+\def\pgf@circ@inputarrow{%
+ \ifpgf@circuit@inputarrow
+ {%
+ % Remove this: the line will overrun the tip, resulting in bad look. See issue #613, thanks to Laurenz Preindl
+ % \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
+ \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}%
+ \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}%
+ }%
+ \fi
+}
%% Generic two port box
\pgfcircdeclarebipolescaled{blocks}
{}
@@ -507,14 +522,7 @@
\fi
% draw outer box
\pgf@circ@twoportbox
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -528,6 +536,7 @@
\fi\fi
% draw inner symbol
+ \pgf@circ@text@strokecolor
\pgftext[center,x=0,y=0]{\ctikzvalof{bipoles/twoport/text}}
}
@@ -553,15 +562,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
%get texts
\def\pgfcirc@tin{\ctikzvalof{bipoles/twoport/text in}}
\def\pgfcirc@tout{\ctikzvalof{bipoles/twoport/text out}}
@@ -594,6 +595,7 @@
\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
\pgfusepath{draw}
+ \pgf@circ@text@strokecolor
\pgftext[center,x=0.45\pgf@circ@res@left,y=0.45\pgf@circ@res@up]{\texti}
\pgftext[center,x=0.45\pgf@circ@res@right,y=0.45\pgf@circ@res@down]{\textii}
}
@@ -675,15 +677,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -749,15 +743,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -820,15 +806,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -894,15 +872,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -958,15 +928,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -1032,15 +994,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -1096,15 +1050,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -1164,15 +1110,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\texti{A}
\def\textii{D}
@@ -1201,6 +1139,7 @@
\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
\pgfusepath{draw}
+ \pgf@circ@text@strokecolor
\pgftext[center,x=0.45\pgf@circ@res@left,y=0.45\pgf@circ@res@up]{\textsf{\texti}}
\pgftext[center,x=0.45\pgf@circ@res@right,y=0.45\pgf@circ@res@down]{\textsf{\textii}}
}
@@ -1226,15 +1165,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\texti{D}
\def\textii{A}
@@ -1263,6 +1194,7 @@
\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
\pgfusepath{draw}
+ \pgf@circ@text@strokecolor
\pgftext[center,x=0.45\pgf@circ@res@left,y=0.45\pgf@circ@res@up]{\textsf{\texti}}
\pgftext[center,x=0.45\pgf@circ@res@right,y=0.45\pgf@circ@res@down]{\textsf{\textii}}
}
@@ -1288,15 +1220,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -1310,6 +1234,7 @@
\fi\fi
% draw inner symbol
+ \pgf@circ@text@strokecolor
\pgftext[center,x=0,y=0]{\textsf{DSP}}
}
@@ -1334,15 +1259,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -1356,6 +1273,7 @@
\fi\fi
% draw inner symbol
+ \pgf@circ@text@strokecolor
\pgftext[center,x=0,y=0]{\textsf{FFT}}
}
@@ -1425,6 +1343,7 @@
\pgf@circ@draworfill
% draw inner text
+ \pgf@circ@text@strokecolor
\pgftext[center,x=-0.12\pgf@circ@res@step,y=0]{\ctikzvalof{bipoles/twoport/text}}
}
@@ -1494,8 +1413,6 @@
\pgfpathclose
\pgf@circ@draworfill
- % draw inner text
- \pgftext[center,x=-0.12\pgf@circ@res@step,y=0]{\ctikzvalof{bipoles/twoport/text}}
% draw arrow
\pgfsetlinewidth{\pgfstartlinewidth}
@@ -1503,6 +1420,9 @@
\pgfpathmoveto{\pgfpoint{-0.8\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
\pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@step}{0.6\pgf@circ@res@step}}
\pgfusepath{draw}
+ % draw inner text
+ \pgf@circ@text@strokecolor
+ \pgftext[center,x=-0.12\pgf@circ@res@step,y=0]{\ctikzvalof{bipoles/twoport/text}}
}
%% pi attenuator
@@ -1526,15 +1446,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -1580,15 +1492,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -1639,15 +1543,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -1690,15 +1586,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -1746,15 +1634,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -1768,6 +1648,7 @@
\fi\fi
% inner symbol
+ \pgf@circ@text@strokecolor
\pgftext[center,x=0,y=0]{\Large$\varphi$}
}
@@ -1792,15 +1673,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -1813,15 +1686,16 @@
\pgftransformrotate{90}
\fi\fi
- % inner symbol
- \pgftext[center,x=0,y=0]{\Large$\varphi$}
-
\pgfsetdash{}{0pt} % always draw solid line for inner symbol
\pgfsetlinewidth{\pgfstartlinewidth}
\pgfsetarrowsend{latex}
\pgfpathmoveto{\pgfpoint{0.75\pgf@circ@res@left}{0.65\pgf@circ@res@down}}
\pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@right}{0.65\pgf@circ@res@up}}
\pgfusepath{draw}
+ % inner symbol
+ \pgf@circ@text@strokecolor
+ \pgftext[center,x=0,y=0]{\Large$\varphi$}
+
}
%% detector
@@ -1845,15 +1719,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% draw inner stuff
\pgfsetdash{}{0pt} % always draw solid line for inner symbol
\pgfsetarrows{-} %never draw arrows
@@ -1904,15 +1770,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -1983,15 +1841,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -2062,15 +1912,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -2154,15 +1996,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -2260,15 +2094,7 @@
% draw outer box
\pgf@circ@twoportbox
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
-
+ \pgf@circ@inputarrow
% rotate inner symbol
\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
@@ -2354,12 +2180,10 @@
\pgfcirc@activate@bipole@simple{l}{tdcac}
% %>>>
-%% Node shapes for Block elements%<<<
-
-\pgfdeclareshape{mixer}
-{
- \savedmacro{\ctikzclass}{\edef\ctikzclass{blocks}}
- \saveddimen{\scaledRlen}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}}
+%% Node shapes for Block elements %<<<
+%
+% utility macro for the anchors
+\def\pgf@circ@circular@rf@anchors#1{%
\savedanchor\northwest{
\pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}
\ifpgf@circuit@boxed
@@ -2368,165 +2192,75 @@
\pgf@x=-\ctikzvalof{bipoles/twoport/width}\pgf@circ@scaled@Rlen
\pgf@x=.5\pgf@x
\else
- \pgf@y=\ctikzvalof{tripoles/mixer/width}\pgf@circ@scaled@Rlen
+ \pgf@y=\ctikzvalof{tripoles/#1/width}\pgf@circ@scaled@Rlen
\pgf@y=.5\pgf@y
- \pgf@x=-\ctikzvalof{tripoles/mixer/width}\pgf@circ@scaled@Rlen
+ \pgf@x=-\ctikzvalof{tripoles/#1/width}\pgf@circ@scaled@Rlen
\pgf@x=.5\pgf@x
\fi
}
- \anchor{center}{
- \pgfpointorigin
- }
- \anchor{left}{%
- \northwest
- \pgf@y=0pt
- }
- \anchor{right}{
- \northwest
- \pgf@y=0pt
- \pgf@x=-\pgf@x
- }
- \anchor{1}{
- \northwest
- \pgf@y=0pt
- }
- \anchor{2}{
- \northwest
- \pgf@y=-\pgf@y
- \pgf@x=0pt
- }
- \anchor{3}{
- \northwest
- \pgf@y=0pt
- \pgf@x=-\pgf@x
- }
- \anchor{4}{
- \northwest
- \pgf@y=\pgf@y
- \pgf@x=0pt
- }
- \anchor{in 1}{
- \northwest
- \pgf@y=0pt
- }
- \anchor{in1}{
- \northwest
- \pgf@y=0pt
- }
- \anchor{in}{
- \northwest
- \pgf@y=0pt
- }
- \anchor{in 2}{
- \northwest
- \pgf@y=-\pgf@y
- \pgf@x=0pt
- }
- \anchor{in2}{
- \northwest
- \pgf@y=-\pgf@y
- \pgf@x=0pt
- }
- \anchor{out}{
- \northwest
- \pgf@y=0pt
- \pgf@x=-\pgf@x
- }
- \anchor{center}{
- \pgf@y=0pt
- \pgf@x=0pt
- }
- \anchor{east}{
- \northwest
- \pgf@y=0pt
- \pgf@x=-\pgf@x
- }
- \anchor{west}{
- \northwest
- \pgf@y=0pt
- }
- \anchor{south}{
- \northwest
- \pgf@x=0pt
- \pgf@y=-\pgf@y
- }
- \anchor{north}{
- \northwest
- \pgf@x=0pt
- }
- \anchor{e}{
- \northwest
- \pgf@y=0pt
- \pgf@x=-\pgf@x
- }
- \anchor{w}{
- \northwest
- \pgf@y=0pt
- }
- \anchor{s}{
- \northwest
- \pgf@x=0pt
- \pgf@y=-\pgf@y
- }
- \anchor{n}{
- \northwest
- \pgf@x=0pt
- }
- \anchor{down}{
- \northwest
- \pgf@x=0pt
- \pgf@y=-\pgf@y
- }
- \anchor{up}{
- \northwest
- \pgf@x=0pt
- }
- \anchor{south west}{
- \northwest
- \pgf@y=-\pgf@y
- }
- \anchor{north east}{
- \northwest
- \pgf@x=-\pgf@x
- }
- \anchor{north west}{
- \northwest
- }
- \anchor{south east}{
- \northwest
- \pgf@x=-\pgf@x
- \pgf@y=-\pgf@y
- }
+ % border anchors
\anchorborder{
\pgf@circ@res@left=\pgf@x
\pgf@circ@res@up=\pgf@y
- \pgfpointborderellipse{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}
- }{\pgfpoint{\ctikzvalof{tripoles/mixer/width}*\scaledRlen/2}{\ctikzvalof{tripoles/mixer/width}*\scaledRlen/2}}
+ \ifnum\componentisboxed=0
+ \pgfpointborderellipse{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}
+ }{\pgfpoint{\ctikzvalof{tripoles/#1/width}*\scaledRlen/2}{\ctikzvalof{tripoles/#1/width}*\scaledRlen/2}}
+ \else
+ \pgfpointborderrectangle{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}
+ }{\pgfpoint{\ctikzvalof{tripoles/#1/width}*\scaledRlen/2}{\ctikzvalof{tripoles/#1/width}*\scaledRlen/2}}
+ \fi
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgfcirc@northwest@symmetric@geoanchors
+ \anchor{geocenter}{\pgfpointorigin}
+ \anchor{up}{\northwest\pgf@x=0pt}
+ \anchor{down}{\northwest\pgf@x=0pt\pgf@y=-\pgf@y}
+ % Deprecated number anchors
+ \anchor{1}{\northwest\pgf@y=0pt}
+ \anchor{2}{\northwest\pgf@y=-\pgf@y\pgf@x=0pt}
+ \anchor{3}{\northwest\pgf@y=0pt\pgf@x=-\pgf@x}
+ \anchor{4}{\northwest\pgf@y=\pgf@y\pgf@x=0pt}
+ % input output anchors (also quite bad)
+ \anchor{in 1}{\northwest\pgf@y=0pt}
+ \anchor{in1}{\northwest\pgf@y=0pt}
+ \anchor{in}{\northwest\pgf@y=0pt}
+ \anchor{in 2}{\northwest\pgf@y=-\pgf@y\pgf@x=0pt}
+ \anchor{in2}{\northwest\pgf@y=-\pgf@y\pgf@x=0pt}
+ \anchor{out}{\northwest\pgf@y=0pt\pgf@x=-\pgf@x}
+}
+% draw the body rectangle and circle if and when needed
+\def\pgf@circ@circular@rf@box@circle{%
+ \pgfstartlinewidth=\pgflinewidth
+ % draw outer box
+ \ifpgf@circuit@boxed
+ \pgfnode{blockbox}{center}{}{pgf@box}{\pgfusepath{draw}}
+ \fi
+ % draw outer circle
+ \ifpgf@circuit@boxed
+ \pgf@circ@res@step=.7\pgf@circ@res@step
+ \pgfsetdash{}{0pt} % draw solid circle if boxed
+ \else
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \fi
+ \ifpgf@circuit@boxedcircled
+ \pgfpathcircle{\pgfpoint{0}{0}} {0.5\pgf@circ@res@step}
+ \fi
+ \pgf@circ@draworfill
+}
+%
+\pgfdeclareshape{mixer}
+{
+ \savedmacro{\ctikzclass}{\edef\ctikzclass{blocks}}
+ \saveddimen{\scaledRlen}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}}
+ \savedmacro{\componentisboxed}{\edef\componentisboxed{\ifpgf@circuit@boxed 1\else 0\fi}}
+ % build the anchor set
+ \anchor{center}{\pgfpointorigin}
+ \pgf@circ@circular@rf@anchors{mixer}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\pgf@circ@scaled@Rlen=\scaledRlen
-
\pgf@circ@res@step=\ctikzvalof{tripoles/mixer/width}\pgf@circ@scaled@Rlen
-
\pgfscope
- \pgfstartlinewidth=\pgflinewidth
-
- % draw outer box
- \ifpgf@circuit@boxed
- \pgfnode{blockbox}{center}{}{pgf@box}{\pgfusepath{draw}}
- \fi
-
- % draw outer circle
- \ifpgf@circuit@boxed
- \pgf@circ@res@step=.7\pgf@circ@res@step
- \pgfsetdash{}{0pt} % draw solid circle if boxed
- \else
- \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
- \fi
- \pgfpathcircle{\pgfpoint{0}{0}} {0.5\pgf@circ@res@step}
- \pgf@circ@draworfill
-
+ \pgf@circ@circular@rf@box@circle
% draw inner stuff
\pgfsetdash{}{0pt} % always draw solid line for inner symbol
\pgfsetlinewidth{\pgfstartlinewidth}
@@ -2537,7 +2271,6 @@
\pgfpathmoveto{\pgfpointpolar{45}{0.5\pgf@circ@res@step}}
\pgfpathlineto{\pgfpointpolar{-135}{0.5\pgf@circ@res@step}}
\pgfusepath{draw}
-
\endpgfscope
}
}
@@ -2546,177 +2279,19 @@
{
\savedmacro{\ctikzclass}{\edef\ctikzclass{blocks}}
\saveddimen{\scaledRlen}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}}
- \savedanchor\northwest{
- \pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}
- \ifpgf@circuit@boxed
- \pgf@y=\ctikzvalof{bipoles/twoport/width}\pgf@circ@scaled@Rlen
- \pgf@y=.5\pgf@y
- \pgf@x=-\ctikzvalof{bipoles/twoport/width}\pgf@circ@scaled@Rlen
- \pgf@x=.5\pgf@x
- \else
- \pgf@y=\ctikzvalof{tripoles/adder/width}\pgf@circ@scaled@Rlen
- \pgf@y=.5\pgf@y
- \pgf@x=-\ctikzvalof{tripoles/adder/width}\pgf@circ@scaled@Rlen
- \pgf@x=.5\pgf@x
- \fi
- }
- \anchor{center}{
- \pgfpointorigin
- }
- \anchor{left}{%
- \northwest
- \pgf@y=0pt
- }
- \anchor{right}{
- \northwest
- \pgf@y=0pt
- \pgf@x=-\pgf@x
- }
- \anchor{1}{
- \northwest
- \pgf@y=0pt
- }
- \anchor{2}{
- \northwest
- \pgf@y=-\pgf@y
- \pgf@x=0pt
- }
- \anchor{3}{
- \northwest
- \pgf@y=0pt
- \pgf@x=-\pgf@x
- }
- \anchor{4}{
- \northwest
- \pgf@y=\pgf@y
- \pgf@x=0pt
- }
- \anchor{in 1}{
- \northwest
- \pgf@y=0pt
- }
- \anchor{in1}{
- \northwest
- \pgf@y=0pt
- }
- \anchor{in}{
- \northwest
- \pgf@y=0pt
- }
- \anchor{in 2}{
- \northwest
- \pgf@y=-\pgf@y
- \pgf@x=0pt
- }
- \anchor{in2}{
- \northwest
- \pgf@y=-\pgf@y
- \pgf@x=0pt
- }
- \anchor{out}{
- \northwest
- \pgf@y=0pt
- \pgf@x=-\pgf@x
- }
- \anchor{center}{
- \pgf@y=0pt
- \pgf@x=0pt
- }
- \anchor{east}{
- \northwest
- \pgf@y=0pt
- \pgf@x=-\pgf@x
- }
- \anchor{west}{
- \northwest
- \pgf@y=0pt
- }
- \anchor{south}{
- \northwest
- \pgf@x=0pt
- \pgf@y=-\pgf@y
- }
- \anchor{north}{
- \northwest
- \pgf@x=0pt
- }
- \anchor{e}{
- \northwest
- \pgf@y=0pt
- \pgf@x=-\pgf@x
- }
- \anchor{w}{
- \northwest
- \pgf@y=0pt
- }
- \anchor{s}{
- \northwest
- \pgf@x=0pt
- \pgf@y=-\pgf@y
- }
- \anchor{n}{
- \northwest
- \pgf@x=0pt
- }
- \anchor{down}{
- \northwest
- \pgf@x=0pt
- \pgf@y=-\pgf@y
- }
- \anchor{up}{
- \northwest
- \pgf@x=0pt
- }
- \anchor{south west}{
- \northwest
- \pgf@y=-\pgf@y
- }
- \anchor{north east}{
- \northwest
- \pgf@x=-\pgf@x
- }
- \anchor{north west}{
- \northwest
- }
- \anchor{south east}{
- \northwest
- \pgf@x=-\pgf@x
- \pgf@y=-\pgf@y
- }
- \anchorborder{
- \pgf@circ@res@left=\pgf@x
- \pgf@circ@res@up=\pgf@y
- \pgfpointborderellipse{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}
- }{\pgfpoint{\ctikzvalof{tripoles/adder/width}*\scaledRlen/2}{\ctikzvalof{tripoles/adder/width}*\scaledRlen/2}}
- }
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \savedmacro{\componentisboxed}{\edef\componentisboxed{\ifpgf@circuit@boxed 1\else 0\fi}}
+ % build the anchor set
+ \anchor{center}{\pgfpointorigin}
+ \pgf@circ@circular@rf@anchors{adder}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\pgf@circ@scaled@Rlen=\scaledRlen
-
\pgf@circ@res@step=\ctikzvalof{tripoles/adder/width}\pgf@circ@scaled@Rlen
-
\pgfscope
- \pgfstartlinewidth=\pgflinewidth
-
- % draw outer box
- \ifpgf@circuit@boxed
- \pgfnode{blockbox}{center}{}{pgf@box}{\pgfusepath{draw}}
- \fi
-
- % draw outer circle
- \ifpgf@circuit@boxed
- \pgf@circ@res@step=.7\pgf@circ@res@step{}
- \pgfsetdash{}{0pt} % draw solid circle if boxed
- \else
- \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
- \fi
- \pgfpathcircle{\pgfpoint{0}{0}} {0.5\pgf@circ@res@step}
- \pgf@circ@draworfill
-
+ \pgf@circ@circular@rf@box@circle
% draw inner stuff
\pgfsetdash{}{0pt} % always draw solid line for inner symbol
\pgfsetlinewidth{\pgfstartlinewidth}
-
\pgfpathmoveto{\pgfpointorigin}
\pgfpathmoveto{\pgfpointpolar{0}{0.3\pgf@circ@res@step}}
\pgfpathlineto{\pgfpointpolar{180}{0.3\pgf@circ@res@step}}
@@ -2725,7 +2300,6 @@
\pgfpathlineto{\pgfpointpolar{270}{0.3\pgf@circ@res@step}}
\pgf@circ@setlinewidth{tripoles}{\pgflinewidth}
\pgfusepath{draw}
-
\endpgfscope
}
}
@@ -2734,126 +2308,22 @@
{
\savedmacro{\ctikzclass}{\edef\ctikzclass{blocks}}
\saveddimen{\scaledRlen}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}}
- \savedanchor\northwest{
- \pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}
- \ifpgf@circuit@boxed
- \pgf@y=\ctikzvalof{bipoles/twoport/width}\pgf@circ@scaled@Rlen
- \pgf@y=.5\pgf@y
- \pgf@x=-\ctikzvalof{bipoles/twoport/width}\pgf@circ@scaled@Rlen
- \else
- \pgf@y=\ctikzvalof{tripoles/oscillator/width}\pgf@circ@scaled@Rlen
- \pgf@y=.5\pgf@y
- \pgf@x=-\ctikzvalof{tripoles/oscillator/width}\pgf@circ@scaled@Rlen
- \fi
- }
- \anchor{center}{
- \pgfpointorigin
- }
- \anchor{north}{
- \northwest
- \pgf@x=.5\pgf@x
- }
- \anchor{south}{
- \northwest
- \pgf@x=.5\pgf@x
- \pgf@y=-\pgf@y
- }
- \anchor{east}{
- \northwest
- \pgf@y=0pt
- \pgf@x=0pt
- }
- \anchor{west}{
- \northwest
- \pgf@y=0pt
- }
- \anchor{up}{
- \northwest
- \pgf@x=.5\pgf@x
- }
- \anchor{down}{
- \northwest
- \pgf@x=.5\pgf@x
- \pgf@y=-\pgf@y
- }
- \anchor{n}{
- \northwest
- \pgf@x=.5\pgf@x
- }
- \anchor{s}{
- \northwest
- \pgf@x=.5\pgf@x
- \pgf@y=-\pgf@y
- }
- \anchor{e}{
- \northwest
- \pgf@y=0pt
- \pgf@x=0pt
- }
- \anchor{w}{
- \northwest
- \pgf@y=0pt
- }
- \anchor{up}{
- \northwest
- \pgf@x=.5\pgf@x
- }
- \anchor{down}{
- \northwest
- \pgf@x=.5\pgf@x
- \pgf@y=-\pgf@y
- }
- \anchor{right}{
- \northwest
- \pgf@y=0pt
- \pgf@x=0pt
- }
- \anchor{left}{
- \northwest
- \pgf@y=0pt
- }
- \anchor{south west}{ \northwest \pgf@y=-\pgf@y}
- \anchor{north east}{ \northwest \pgf@x=0pt\relax}
- \anchor{north west}{ \northwest }
- \anchor{south east}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
+ \savedmacro{\componentisboxed}{\edef\componentisboxed{\ifpgf@circuit@boxed 1\else 0\fi}}
+ % build the anchor set --- the center of an oscillator is on the right
+ \anchor{center}{\northwest\pgf@y=0pt\pgf@x=-\pgf@x}
+ \pgf@circ@circular@rf@anchors{oscillator}
+ % border anchors
\anchor{text}{
\pgf@x=-2\pgf@x
\advance \pgf@x by -.5\wd\pgfnodeparttextbox
\advance \pgf@y by -1.5\ht\pgfnodeparttextbox
}
- \anchorborder{
- \pgf@circ@res@left=\pgf@x
- \pgf@circ@res@up=\pgf@y
- \pgfpointborderellipse{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}
- }{\pgfpoint{\ctikzvalof{tripoles/oscillator/width}*\scaledRlen/2}{\ctikzvalof{tripoles/oscillator/width}*\scaledRlen/2}}
- \pgfmathsetlength{\pgf@x}{\pgf@x-\ctikzvalof{tripoles/oscillator/width}*\scaledRlen/2}
- }
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\pgf@circ@scaled@Rlen=\scaledRlen
-
\pgf@circ@res@step=\ctikzvalof{tripoles/oscillator/width}\pgf@circ@scaled@Rlen{}
-
\pgfscope
- \pgfstartlinewidth=\pgflinewidth
-
- \pgftransformxshift{-0.5\pgf@circ@res@step} % The oscillator is shifted to the left, so a connection comes out of the anchor "east"
-
- % draw outer box
- \ifpgf@circuit@boxed{}
- \pgfnode{blockbox}{center}{}{pgf@box}{\pgfusepath{draw}}
- \fi
-
- % draw outer circle
- \ifpgf@circuit@boxed
- \pgf@circ@res@step=.7\pgf@circ@res@step{}
- \pgfsetdash{}{0pt} % draw solid circle if boxed
- \else
- \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
- \fi
- \pgfpathcircle{\pgfpoint{0}{0}} {0.5\pgf@circ@res@step}
- \pgf@circ@draworfill
-
+ \pgf@circ@circular@rf@box@circle
% draw inner sine waves
\pgfsetdash{}{0pt} % always draw solid line for inner symbol
\pgfsetlinewidth{\pgfstartlinewidth}
@@ -2863,9 +2333,7 @@
\pgfpathcosine{\pgfpoint{.15\pgf@circ@res@step}{-.15\pgf@circ@res@step}}
\pgfpathsine{\pgfpoint{.15\pgf@circ@res@step}{-.15\pgf@circ@res@step}}
\pgfpathcosine{\pgfpoint{.15\pgf@circ@res@step}{.15\pgf@circ@res@step}}
-
\pgfusepath{draw}
-
\endpgfscope
}
}
@@ -2874,147 +2342,24 @@
{
\savedmacro{\ctikzclass}{\edef\ctikzclass{blocks}}
\saveddimen{\scaledRlen}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}}
- \savedanchor\northwest{
- \pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}
- \ifpgf@circuit@boxed
- \pgf@y=\ctikzvalof{bipoles/twoport/width}\pgf@circ@scaled@Rlen
- \pgf@y=.5\pgf@y
- \pgf@x=-\ctikzvalof{bipoles/twoport/width}\pgf@circ@scaled@Rlen
- \pgf@x=.5\pgf@x
- \else
- \pgf@y=\ctikzvalof{tripoles/circulator/width}\pgf@circ@scaled@Rlen
- \pgf@y=.5\pgf@y
- \pgf@x=-\ctikzvalof{tripoles/circulator/width}\pgf@circ@scaled@Rlen
- \pgf@x=.5\pgf@x
- \fi
- }
- \anchor{center}{
- \pgfpointorigin
- }
- \anchor{left}{%
- \northwest
- \pgf@y=0pt
- }
- \anchor{right}{
- \northwest
- \pgf@y=0pt
- \pgf@x=-\pgf@x
- }
- \anchor{1}{
- \northwest
- \pgf@y=0pt
- }
- \anchor{2}{
- \northwest
- \pgf@y=0pt
- \pgf@x=-\pgf@x
- }
- \anchor{3}{
- \northwest
- \pgf@y=-\pgf@y
- \pgf@x=0pt
- }
- \anchor{east}{
- \northwest
- \pgf@y=0pt
- \pgf@x=-\pgf@x
- }
- \anchor{west}{
- \northwest
- \pgf@y=0pt
- }
- \anchor{south}{
- \northwest
- \pgf@x=0pt
- \pgf@y=-\pgf@y
- }
- \anchor{north}{
- \northwest
- \pgf@x=0pt
- }
- \anchor{e}{
- \northwest
- \pgf@y=0pt
- \pgf@x=-\pgf@x
- }
- \anchor{w}{
- \northwest
- \pgf@y=0pt
- }
- \anchor{s}{
- \northwest
- \pgf@x=0pt
- \pgf@y=-\pgf@y
- }
- \anchor{n}{
- \northwest
- \pgf@x=0pt
- }
- \anchor{down}{
- \northwest
- \pgf@x=0pt
- \pgf@y=-\pgf@y
- }
- \anchor{up}{
- \northwest
- \pgf@x=0pt
- }
- \anchor{south west}{
- \northwest
- \pgf@y=-\pgf@y
- }
- \anchor{north east}{
- \northwest
- \pgf@x=-\pgf@x
- }
- \anchor{north west}{
- \northwest
- }
- \anchor{south east}{
- \northwest
- \pgf@x=-\pgf@x
- \pgf@y=-\pgf@y
- }
- \anchorborder{
- \pgf@circ@res@left=\pgf@x
- \pgf@circ@res@up=\pgf@y
- \pgfpointborderellipse{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}
- }{\pgfpoint{\ctikzvalof{tripoles/circulator/width}*\scaledRlen/2}{\ctikzvalof{tripoles/circulator/width}*\scaledRlen/2}}
- }
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \savedmacro{\componentisboxed}{\edef\componentisboxed{\ifpgf@circuit@boxed 1\else 0\fi}}
+ % build the anchor set
+ \anchor{center}{\pgfpointorigin}
+ \pgf@circ@circular@rf@anchors{circulator}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\pgf@circ@scaled@Rlen=\scaledRlen
-
\pgf@circ@res@step=\ctikzvalof{tripoles/circulator/width}\pgf@circ@scaled@Rlen
-
\pgfscope
- \pgfstartlinewidth=\pgflinewidth
-
- % draw outer box
- \ifpgf@circuit@boxed
- \pgfnode{blockbox}{center}{}{pgf@box}{\pgfusepath{draw}}
- \fi
-
- % draw outer circle
- \ifpgf@circuit@boxed{}
- \pgf@circ@res@step=.7\pgf@circ@res@step{}
- \pgfsetdash{}{0pt} % draw solid circle if boxed
- \else
- \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
- \fi
- \pgfpathcircle{\pgfpoint{0}{0}} {0.5\pgf@circ@res@step}
- \pgf@circ@draworfill
-
+ \pgf@circ@circular@rf@box@circle
% inner arrow
\pgfsetdash{}{0pt} % always draw solid line for inner symbol
\pgfsetlinewidth{\pgfstartlinewidth}
-
\pgfsetarrowsend{latex}
\pgfpathmoveto{\pgfpoint{-0.25\pgf@circ@res@step}{0}}
\pgfpatharc{180}{-90} {0.25\pgf@circ@res@step}
\pgfpathlineto{\pgfpoint{-5pt}{-0.2\pgf@circ@res@step}}
\pgfusepath{draw}
-
\endpgfscope
}
}
@@ -3093,8 +2438,8 @@
\advance \pgf@x by -.5\wd\pgfnodeparttextbox
\advance \pgf@y by -1.5\ht\pgfnodeparttextbox
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\pgf@circ@scaled@Rlen=\scaledRlen
\pgf@circ@res@step=\ctikzvalof{quadpoles/gridnode/width}\pgf@circ@scaled@Rlen
@@ -3118,15 +2463,7 @@
% draw outer box
\pgf@circ@twoportbox
-
-
- \ifpgf@circuit@inputarrow
- {
- \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
- \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
- }
- \fi
+ \pgf@circ@inputarrow
\pgfsetdash{}{0pt} % always draw solid line for inner symbol
\pgfsetarrows{-} %never draw arrows
@@ -3226,8 +2563,8 @@
\advance \pgf@y by 0.5\ht\pgfnodeparttextbox
\pgf@x=-.5\wd\pgfnodeparttextbox
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\pgf@circ@scaled@Rlen=\scaledRlen
\northwest
@@ -3240,6 +2577,8 @@
% draw outer box
\pgf@circ@twoportbox
+ \pgf@circ@inputarrow
+
% draw inner stuff
\pgfsetdash{}{0pt} % always draw solid line for inner symbol
@@ -3353,8 +2692,8 @@
\advance \pgf@y by 0.5\ht\pgfnodeparttextbox
\pgf@x=-.5\wd\pgfnodeparttextbox
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\pgf@circ@scaled@Rlen=\scaledRlen
\northwest
@@ -3367,7 +2706,7 @@
% draw outer box
\pgf@circ@twoportbox
-
+ \pgf@circ@inputarrow
% draw inner stuff
\pgfsetdash{}{0pt} % always draw solid line for inner symbol
\pgfsetarrows{-} %never draw arrows
@@ -3530,8 +2869,8 @@
\advance \pgf@y by 0.5\ht\pgfnodeparttextbox
\pgf@x=-.5\wd\pgfnodeparttextbox
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\northwest
\pgf@circ@res@up = \pgf@y
@@ -3546,11 +2885,10 @@
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
\pgf@circ@draworfill
-
% draw inner stuff
- #2
-
+ #2%
% draw inner text
+ \pgf@circ@text@strokecolor
\pgftext[center,x=-0.15\pgf@circ@res@step,y=0]{\ctikzvalof{bipoles/twoport/text}}
}
}
@@ -3682,8 +3020,8 @@
\advance \pgf@y by 0.5\ht\pgfnodeparttextbox
\pgf@x=-.5\wd\pgfnodeparttextbox
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\pgf@circ@scaled@Rlen=\scaledRlen
\northwest
@@ -3696,6 +3034,7 @@
% draw outer box
\pgf@circ@twoportbox
+ \pgf@circ@inputarrow
% draw inner stuff
% rotate inner symbol
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex
index f489ac58e6..ca5e2b00a8 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex
@@ -9,30 +9,30 @@
% 2. under the GNU Public License.
%
% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
+%
+% This file has folding marks for vim (See last line).
+%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Other shapes
-%% Nothing
+%% Nothing: empty shape%<<<
\pgfdeclareshape{emptyshape}{
\savedanchor{\northeast}{%
\pgf@x=.5\wd\pgfnodeparttextbox%
\pgf@y=.5\ht\pgfnodeparttextbox%
}
- \anchor{north}{\northeast\pgf@x=0cm\relax}
- \anchor{east}{\northeast\pgf@y=0cm\relax}
- \anchor{south}{\northeast\pgf@y=-\pgf@y \pgf@x=0cm\relax}
- \anchor{west}{\northeast\pgf@y=0cm\pgf@x=-\pgf@x}
- \anchor{north east}{\northeast}
- \anchor{north west}{\northeast\pgf@x=-\pgf@x}
- \anchor{south east}{\northeast\pgf@y=-\pgf@y}
- \anchor{south west}{\northeast\pgf@y=-\pgf@y\pgf@x=-\pgf@x}
+ % geo anchors based on north-east
+ \pgfcirc@northeast@symmetric@geoanchors
\anchor{text}{\pgfpoint{-.5\wd\pgfnodeparttextbox}{\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox}}
\anchor{center}{
\pgfpointorigin
}
-}
+}%
+%>>>
+
+%% Poles%<<<
%
% Provision for changing opacity. Only expert use, see the manual.
%
@@ -43,6 +43,7 @@
\ctikzset{poles/full fill opacity/.initial=1.0}% better not touch it
\tikzset{full poles opacity/.code={%
\ctikzset{poles/full fill opacity=#1}%
+
}}
%
@@ -62,31 +63,20 @@
\pgf@x=-\pgf@y
}
\anchor{center}{ \pgf@y=0pt \pgf@x=0pt }
- \anchor{east}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x }
- \anchor{e}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x }
- \anchor{west}{ \northwest \pgf@y=0pt }
- \anchor{w}{ \northwest \pgf@y=0pt }
- \anchor{south}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
- \anchor{s}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
- \anchor{north}{ \northwest \pgf@x=0pt }
- \anchor{n}{ \northwest \pgf@x=0pt }
- \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
- \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
- \anchor{north west}{ \northwest }
- \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+ % geo anchors based on north-west
+ \pgfcirc@northwest@symmetric@geoanchors
\anchorborder{
\pgf@circ@res@left=\pgf@x
\pgf@circ@res@up=\pgf@y
\pgfpointborderellipse{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}
}{\pgfpoint{\ctikzvalof{nodes width}*\pgf@circ@Rlen}{\ctikzvalof{nodes width}*\pgf@circ@Rlen}}
}
- \behindforegroundpath{
- \pgfscope
+ \pgf@circ@draw@component{
\pgfpathcircle{\pgfpointorigin}{\ctikzvalof{nodes width}*\pgf@circ@Rlen}
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
+ \pgf@circ@fill@strokecolor
\pgfsetfillopacity{\ctikzvalof{poles/full fill opacity}}% normally 1.0
\pgfusepath{draw,fill}
- \endpgfscope
}
}
@@ -101,41 +91,29 @@
\pgf@x=-\pgf@y
}
\anchor{center}{ \pgf@y=0pt \pgf@x=0pt }
- \anchor{east}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x }
- \anchor{e}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x }
- \anchor{west}{ \northwest \pgf@y=0pt }
- \anchor{w}{ \northwest \pgf@y=0pt }
- \anchor{south}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
- \anchor{s}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
- \anchor{north}{ \northwest \pgf@x=0pt }
- \anchor{n}{ \northwest \pgf@x=0pt }
- \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
- \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
- \anchor{north west}{ \northwest }
- \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+ % geo anchors based on north-west
+ \pgfcirc@northwest@symmetric@geoanchors
\anchorborder{
\pgf@circ@res@left=\pgf@x
\pgf@circ@res@up=\pgf@y
\pgfpointborderellipse{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}
}{\pgfpoint{\ctikzvalof{nodes width}*\pgf@circ@Rlen}{\ctikzvalof{nodes width}*\pgf@circ@Rlen}}
}
- \behindforegroundpath{
- \pgfscope
- \pgfpathcircle{\pgfpointorigin}{\ctikzvalof{nodes width}*\pgf@circ@Rlen}
- \pgfsetcolor{\ctikzvalof{color}}
- \pgfsetfillopacity{\ctikzvalof{poles/open fill opacity}}% normally 1.0
- \ifx\tikz@fillcolor\pgfutil@empty
- % set the default fill color to white
- \pgfsetfillcolor{\ctikzvalof{open poles fill}}
- % ...but override it if the class is defined!
- % note that this element has no class, but will inherit it when used
- % into another component
- \pgf@circ@setifdefinedfill{draw, fill}{draw, fill}
- \else
- \pgfsetfillcolor{\tikz@fillcolor}
- \fi
- \pgfusepath{draw,fill}
- \endpgfscope
+ \pgf@circ@draw@component{
+ \pgfpathcircle{\pgfpointorigin}{\ctikzvalof{nodes width}*\pgf@circ@Rlen}
+ \pgf@circ@setcolor
+ \pgfsetfillopacity{\ctikzvalof{poles/open fill opacity}}% normally 1.0
+ \ifx\tikz@fillcolor\pgfutil@empty
+ % set the default fill color to white
+ \pgfsetfillcolor{\ctikzvalof{open poles fill}}
+ % ...but override it if the class is defined!
+ % note that this element has no class, but will inherit it when used
+ % into another component
+ \pgf@circ@setifdefinedfill{draw, fill}{draw, fill}
+ \else
+ \pgfsetfillcolor{\tikz@fillcolor}
+ \fi
+ \pgfusepath{draw,fill}
}
}
@@ -150,18 +128,8 @@
\pgf@x=-\pgf@y
}
\anchor{center}{ \pgf@y=0pt \pgf@x=0pt }
- \anchor{east}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x }
- \anchor{e}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x }
- \anchor{west}{ \northwest \pgf@y=0pt }
- \anchor{w}{ \northwest \pgf@y=0pt }
- \anchor{south}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
- \anchor{s}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
- \anchor{north}{ \northwest \pgf@x=0pt }
- \anchor{n}{ \northwest \pgf@x=0pt }
- \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
- \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
- \anchor{north west}{ \northwest }
- \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+ % geo anchors based on north-west
+ \pgfcirc@northwest@symmetric@geoanchors
\anchorborder{
% \typeout{IN\space X:\the\pgf@x\space Y:\the\pgf@y}
\pgfmathsetmacro{\@@switchx}{ifthenelse(\pgf@x>0,1,-1)}
@@ -178,17 +146,16 @@
\pgf@x=\@@switchx\pgf@x
\pgf@y=\@@switchy\pgf@y
}
- \behindforegroundpath{
- \pgfscope
- \pgfmathsetlength{\pgf@circ@res@temp}{\ctikzvalof{nodes width}*\pgf@circ@Rlen}
- \pgftransformrotate{45}
- \pgfpathrectanglecorners
- {\pgfpoint{-\pgf@circ@res@temp}{-\pgf@circ@res@temp}}
- {\pgfpoint{\pgf@circ@res@temp}{\pgf@circ@res@temp}}
- \pgfsetcolor{\ctikzvalof{color}}
- \pgfsetfillopacity{\ctikzvalof{poles/full fill opacity}}% normally 1.0
- \pgfusepath{draw,fill}
- \endpgfscope
+ \pgf@circ@draw@component{
+ \pgfmathsetlength{\pgf@circ@res@temp}{\ctikzvalof{nodes width}*\pgf@circ@Rlen}
+ \pgftransformrotate{45}
+ \pgfpathrectanglecorners
+ {\pgfpoint{-\pgf@circ@res@temp}{-\pgf@circ@res@temp}}
+ {\pgfpoint{\pgf@circ@res@temp}{\pgf@circ@res@temp}}
+ \pgf@circ@setcolor
+ \pgf@circ@fill@strokecolor
+ \pgfsetfillopacity{\ctikzvalof{poles/full fill opacity}}% normally 1.0
+ \pgfusepath{draw,fill}
}
}
@@ -203,18 +170,8 @@
\pgf@x=-\pgf@y
}
\anchor{center}{ \pgf@y=0pt \pgf@x=0pt }
- \anchor{east}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x }
- \anchor{e}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x }
- \anchor{west}{ \northwest \pgf@y=0pt }
- \anchor{w}{ \northwest \pgf@y=0pt }
- \anchor{south}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
- \anchor{s}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
- \anchor{north}{ \northwest \pgf@x=0pt }
- \anchor{n}{ \northwest \pgf@x=0pt }
- \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
- \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
- \anchor{north west}{ \northwest }
- \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+ % geo anchors based on north-west
+ \pgfcirc@northwest@symmetric@geoanchors
\anchorborder{
% \typeout{IN\space X:\the\pgf@x\space Y:\the\pgf@y}
\pgfmathsetmacro{\@@switchx}{ifthenelse(\pgf@x>0,1,-1)}
@@ -231,27 +188,25 @@
\pgf@x=\@@switchx\pgf@x
\pgf@y=\@@switchy\pgf@y
}
- \behindforegroundpath{
- \pgfscope
- \pgfmathsetlength{\pgf@circ@res@temp}{\ctikzvalof{nodes width}*\pgf@circ@Rlen}
- \pgftransformrotate{45}
- \pgfpathrectanglecorners
- {\pgfpoint{-\pgf@circ@res@temp}{-\pgf@circ@res@temp}}
- {\pgfpoint{\pgf@circ@res@temp}{\pgf@circ@res@temp}}
- \pgfsetcolor{\ctikzvalof{color}}
- \pgfsetfillopacity{\ctikzvalof{poles/open fill opacity}}% normally 1.0
- \ifx\tikz@fillcolor\pgfutil@empty
- % set the default fill color to white
- \pgfsetfillcolor{\ctikzvalof{open poles fill}}
- % ...but override it if the class is defined!
- % note that this element has no class, but will inherit it when used
- % into another component
- \pgf@circ@setifdefinedfill{draw, fill}{draw, fill}
- \else
- \pgfsetfillcolor{\tikz@fillcolor}
- \fi
- \pgfusepath{draw,fill}
- \endpgfscope
+ \pgf@circ@draw@component{
+ \pgfmathsetlength{\pgf@circ@res@temp}{\ctikzvalof{nodes width}*\pgf@circ@Rlen}
+ \pgftransformrotate{45}
+ \pgfpathrectanglecorners
+ {\pgfpoint{-\pgf@circ@res@temp}{-\pgf@circ@res@temp}}
+ {\pgfpoint{\pgf@circ@res@temp}{\pgf@circ@res@temp}}
+ \pgf@circ@setcolor
+ \pgfsetfillopacity{\ctikzvalof{poles/open fill opacity}}% normally 1.0
+ \ifx\tikz@fillcolor\pgfutil@empty
+ % set the default fill color to white
+ \pgfsetfillcolor{\ctikzvalof{open poles fill}}
+ % ...but override it if the class is defined!
+ % note that this element has no class, but will inherit it when used
+ % into another component
+ \pgf@circ@setifdefinedfill{draw, fill}{draw, fill}
+ \else
+ \pgfsetfillcolor{\tikz@fillcolor}
+ \fi
+ \pgfusepath{draw,fill}
}
}
@@ -266,18 +221,8 @@
\pgf@x=-\pgf@y
}
\anchor{center}{ \pgf@y=0pt \pgf@x=0pt }
- \anchor{east}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x }
- \anchor{e}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x }
- \anchor{west}{ \northwest \pgf@y=0pt }
- \anchor{w}{ \northwest \pgf@y=0pt }
- \anchor{south}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
- \anchor{s}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
- \anchor{north}{ \northwest \pgf@x=0pt }
- \anchor{n}{ \northwest \pgf@x=0pt }
- \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
- \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
- \anchor{north west}{ \northwest }
- \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+ % geo anchors based on north-west
+ \pgfcirc@northwest@symmetric@geoanchors
\anchorborder{
\pgf@xa=\pgf@x
\pgf@ya=\pgf@y
@@ -286,16 +231,15 @@
{\pgfqpoint{\pgf@xa}{\pgf@ya}}
{\pgfqpoint{\pgf@circ@res@up}{\pgf@circ@res@up}}
}
- \behindforegroundpath{
- \pgfscope
- \pgfmathsetlength{\pgf@circ@res@temp}{\ctikzvalof{nodes width}*\pgf@circ@Rlen}
- \pgfpathrectanglecorners
- {\pgfpoint{-\pgf@circ@res@temp}{-\pgf@circ@res@temp}}
- {\pgfpoint{\pgf@circ@res@temp}{\pgf@circ@res@temp}}
- \pgfsetcolor{\ctikzvalof{color}}
- \pgfsetfillopacity{\ctikzvalof{poles/full fill opacity}}% normally 1.0
- \pgfusepath{draw,fill}
- \endpgfscope
+ \pgf@circ@draw@component{
+ \pgfmathsetlength{\pgf@circ@res@temp}{\ctikzvalof{nodes width}*\pgf@circ@Rlen}
+ \pgfpathrectanglecorners
+ {\pgfpoint{-\pgf@circ@res@temp}{-\pgf@circ@res@temp}}
+ {\pgfpoint{\pgf@circ@res@temp}{\pgf@circ@res@temp}}
+ \pgf@circ@setcolor
+ \pgf@circ@fill@strokecolor
+ \pgfsetfillopacity{\ctikzvalof{poles/full fill opacity}}% normally 1.0
+ \pgfusepath{draw,fill}
}
}
%% square terminal, unfilled
@@ -309,18 +253,8 @@
\pgf@x=-\pgf@y
}
\anchor{center}{ \pgf@y=0pt \pgf@x=0pt }
- \anchor{east}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x }
- \anchor{e}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x }
- \anchor{west}{ \northwest \pgf@y=0pt }
- \anchor{w}{ \northwest \pgf@y=0pt }
- \anchor{south}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
- \anchor{s}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
- \anchor{north}{ \northwest \pgf@x=0pt }
- \anchor{n}{ \northwest \pgf@x=0pt }
- \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
- \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
- \anchor{north west}{ \northwest }
- \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+ % geo anchors based on north-west
+ \pgfcirc@northwest@symmetric@geoanchors
\anchorborder{
\pgf@xa=\pgf@x
\pgf@ya=\pgf@y
@@ -329,99 +263,24 @@
{\pgfqpoint{\pgf@xa}{\pgf@ya}}
{\pgfqpoint{\pgf@circ@res@up}{\pgf@circ@res@up}}
}
- \behindforegroundpath{
- \pgfscope
- \pgfmathsetlength{\pgf@circ@res@temp}{\ctikzvalof{nodes width}*\pgf@circ@Rlen}
- \pgfpathrectanglecorners
- {\pgfpoint{-\pgf@circ@res@temp}{-\pgf@circ@res@temp}}
- {\pgfpoint{\pgf@circ@res@temp}{\pgf@circ@res@temp}}
- \pgfsetcolor{\ctikzvalof{color}}
- \pgfsetfillopacity{\ctikzvalof{poles/open fill opacity}}% normally 1.0
- \ifx\tikz@fillcolor\pgfutil@empty
- % set the default fill color to white
- \pgfsetfillcolor{\ctikzvalof{open poles fill}}
- % ...but override it if the class is defined!
- % note that this element has no class, but will inherit it when used
- % into another component
- \pgf@circ@setifdefinedfill{draw, fill}{draw, fill}
- \else
- \pgfsetfillcolor{\tikz@fillcolor}
- \fi
- \pgfusepath{draw,fill}
- \endpgfscope
- }
-}
-% BNC connector
-
-\pgfdeclareshape{bnc}{
- \anchor{center}{
- \pgfpointorigin
- }
- % BNC size is 2.5 times the size of the internal "ocirc"
- \savedanchor\northwest{%
- \pgf@y=\ctikzvalof{nodes width}\pgf@circ@Rlen
- \pgf@y=2.5\pgf@y
- \pgf@x=-\pgf@y
- }
- % center is on the opening
- \anchor{center}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x }
- \anchor{zero}{ \pgfpointorigin }
- \anchor{hot}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x }
- \anchor{shield}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
- % geo-anchors
- \anchor{east}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x }
- \anchor{right}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x }
- \anchor{west}{ \northwest \pgf@y=0pt }
- \anchor{left}{ \northwest \pgf@y=0pt }
- \anchor{south}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
- \anchor{north}{ \northwest \pgf@x=0pt }
- \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
- \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
- \anchor{north west}{ \northwest }
- \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
- % put the node text above and centered
- \anchor{text}{\pgfextracty{\pgf@circ@res@up}{\northwest}
- \pgfpoint{-.5\wd\pgfnodeparttextbox}{
- \dimexpr.5\dp\pgfnodeparttextbox+.5\ht\pgfnodeparttextbox+\pgf@circ@res@up\relax
- }
- }
- \anchorborder{
- \pgf@circ@res@left=\pgf@x
- \pgf@circ@res@up=\pgf@y
- \pgfpointborderellipse{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}
- }{\pgfpoint{2.5*\ctikzvalof{nodes width}*\pgf@circ@Rlen}{2.5*\ctikzvalof{nodes width}*\pgf@circ@Rlen}}
- }
- \behindforegroundpath{
- \pgfextracty{\pgf@circ@res@other}{\northwest}
- \pgf@circ@res@step=\ctikzvalof{nodes width}\pgf@circ@Rlen
- \pgfscope
- \pgfstartlinewidth=\pgflinewidth
- \pgf@circ@setlinewidth{bipoles}{\pgflinewidth}
- \pgfsetcolor{\ctikzvalof{color}}
- % external circle
- \pgfscope
- % clipping path: first a rectangle bigger then the shape
- % to avoid problems with the line thickness
- \pgfpathrectanglecorners{\pgfpoint{-2\pgf@circ@res@other}{-2\pgf@circ@res@other}}
- {\pgfpoint{2\pgf@circ@res@other}{2\pgf@circ@res@other}}
- % next the opening to the right
- \pgfpathrectanglecorners{\pgfpoint{-\pgf@circ@res@step}{-\pgf@circ@res@step}}
- {\pgfpoint{2\pgf@circ@res@other}{\pgf@circ@res@step}}
- % do the difference and clip before drawing
- \pgfseteorule
- \pgfusepath{clip}
- \pgfpathcircle{\pgfpointorigin}{\pgf@circ@res@other}
- \pgfusepath{draw}
- \endpgfscope
- % internal circle
- \pgfpathcircle{\pgfpointorigin}{\pgf@circ@res@step}
- \pgf@circ@draworfill
- % and the contact line to the right
- \pgfsetlinewidth{\pgfstartlinewidth}
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{0pt}}
- \pgfusepath{draw}
- \endpgfscope
+ \pgf@circ@draw@component{
+ \pgfmathsetlength{\pgf@circ@res@temp}{\ctikzvalof{nodes width}*\pgf@circ@Rlen}
+ \pgfpathrectanglecorners
+ {\pgfpoint{-\pgf@circ@res@temp}{-\pgf@circ@res@temp}}
+ {\pgfpoint{\pgf@circ@res@temp}{\pgf@circ@res@temp}}
+ \pgf@circ@setcolor
+ \pgfsetfillopacity{\ctikzvalof{poles/open fill opacity}}% normally 1.0
+ \ifx\tikz@fillcolor\pgfutil@empty
+ % set the default fill color to white
+ \pgfsetfillcolor{\ctikzvalof{open poles fill}}
+ % ...but override it if the class is defined!
+ % note that this element has no class, but will inherit it when used
+ % into another component
+ \pgf@circ@setifdefinedfill{draw, fill}{draw, fill}
+ \else
+ \pgfsetfillcolor{\tikz@fillcolor}
+ \fi
+ \pgfusepath{draw,fill}
}
}
@@ -432,14 +291,8 @@
\pgf@x=.5\pgflinewidth%
\pgf@y=.5\pgflinewidth%
}
- \anchor{north}{\northeast\pgf@x=0cm\relax}
- \anchor{east}{\northeast\pgf@y=0cm\relax}
- \anchor{south}{\northeast\pgf@y=-\pgf@y \pgf@x=0cm\relax}
- \anchor{west}{\northeast\pgf@y=0cm\pgf@x=-\pgf@x}
- \anchor{north east}{\northeast}
- \anchor{north west}{\northeast\pgf@x=-\pgf@x}
- \anchor{south east}{\northeast\pgf@y=-\pgf@y}
- \anchor{south west}{\northeast\pgf@y=-\pgf@y\pgf@x=-\pgf@x}
+ % geo anchors based on north-east
+ \pgfcirc@northeast@symmetric@geoanchors
\anchor{center}{
\pgfpointorigin
}
@@ -447,17 +300,18 @@
\pgf@circ@res@left=\pgf@x
\pgf@circ@res@up=\pgf@y
}
- \behindforegroundpath{
- \pgfscope
- \pgfpathrectanglecorners
- {\pgfpoint{0}{.5\pgflinewidth}}
- {\pgfpoint{0}{-.5\pgflinewidth}}
- \pgfsetcolor{\ctikzvalof{color}}
- \pgfusepath{draw,fill}
- \endpgfscope
+ \pgf@circ@draw@component{
+ \pgfpathrectanglecorners
+ {\pgfpoint{0}{.5\pgflinewidth}}
+ {\pgfpoint{0}{-.5\pgflinewidth}}
+ \pgf@circ@setcolor
+ \pgf@circ@fill@strokecolor
+ \pgfusepath{draw,fill}
}
}
+% %>>>
+%% Arrows%<<<
%% transistor arrow
\def\pgf@circ@find@linescale{
@@ -530,22 +384,20 @@
\pgf@circ@res@temp=\@@factor\pgflinewidth
\advance\pgf@x by -.5\pgf@circ@res@temp
}
- \behindforegroundpath{
- \pgfscope
- \northwest
- \pgf@circ@res@up=\pgf@y
- \pgf@circ@res@left=\pgf@x
- \tip
- \pgf@circ@res@step = \pgf@x
- %
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{1\pgf@circ@res@step}{0pt}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{-\pgf@circ@res@up}}
- \pgfpathclose
- \pgfsetcolor{\ctikzvalof{color}}
- \pgfusepath{fill} % just fill
- \endpgfscope
+ \pgf@circ@draw@component{
+ \northwest
+ \pgf@circ@res@up=\pgf@y
+ \pgf@circ@res@left=\pgf@x
+ \tip
+ \pgf@circ@res@step = \pgf@x
+ %
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{1\pgf@circ@res@step}{0pt}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{-\pgf@circ@res@up}}
+ \pgfpathclose
+ \pgf@circ@fill@strokecolor
+ \pgfusepath{fill} % just fill
}
}
@@ -581,22 +433,21 @@
\divide \pgf@circ@res@step by \ctikzvalof{current arrow scale}
\pgf@x =\pgf@circ@res@step
}
- \behindforegroundpath{
- \pgfscope
- \ifpgfcirc@really@draw@currarrow
- \pgf@circ@reset@arrows@rounded
- \pgf@circ@res@step = \pgf@circ@Rlen
- \divide \pgf@circ@res@step by \ctikzvalof{current arrow scale}
-
- \pgfpathmoveto{\pgfpoint{-.7\pgf@circ@res@step}{0pt}}
- \pgfpathlineto{\pgfpoint{-.7\pgf@circ@res@step}{-.8\pgf@circ@res@step}}
- \pgfpathlineto{\pgfpoint{1\pgf@circ@res@step}{0pt}}
- \pgfpathlineto{\pgfpoint{-.7\pgf@circ@res@step}{.8\pgf@circ@res@step}}
- \pgfpathclose
- \pgfsetcolor{\ctikzvalof{color}}
- \pgfusepath{draw,fill}
- \fi
- \endpgfscope
+ \pgf@circ@draw@component{
+ \ifpgfcirc@really@draw@currarrow
+ \pgf@circ@reset@arrows@rounded
+ \pgf@circ@res@step = \pgf@circ@Rlen
+ \divide \pgf@circ@res@step by \ctikzvalof{current arrow scale}
+
+ \pgfpathmoveto{\pgfpoint{-.7\pgf@circ@res@step}{0pt}}
+ \pgfpathlineto{\pgfpoint{-.7\pgf@circ@res@step}{-.8\pgf@circ@res@step}}
+ \pgfpathlineto{\pgfpoint{1\pgf@circ@res@step}{0pt}}
+ \pgfpathlineto{\pgfpoint{-.7\pgf@circ@res@step}{.8\pgf@circ@res@step}}
+ \pgfpathclose
+ \pgf@circ@setcolor
+ \pgf@circ@fill@strokecolor
+ \pgfusepath{draw,fill}
+ \fi
}
}
@@ -637,20 +488,19 @@
\divide \pgf@circ@res@step by \ctikzvalof{current arrow scale}
\pgf@x =\pgf@circ@res@step
}
- \behindforegroundpath{
- \pgfscope
- \ifpgfcirc@really@draw@flowarrow
- \pgf@circ@reset@arrows@rounded
- \pgf@circ@res@step = \pgf@circ@Rlen
- \divide \pgf@circ@res@step by 4
- \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@step}{0pt}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{0pt}}
- \pgfsetcolor{\ctikzvalof{color}}
- \pgfusepath{draw}
- \pgftransformshift{\pgfpoint{\pgf@circ@res@step}{0pt}}
- \pgfnode{currarrow}{tip}{}{}{\pgfusepath{fill}}
- \fi
- \endpgfscope
+ \pgf@circ@draw@component{
+ \ifpgfcirc@really@draw@flowarrow
+ \pgf@circ@reset@arrows@rounded
+ \pgf@circ@res@step = \pgf@circ@Rlen
+ \divide \pgf@circ@res@step by 4
+ \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@step}{0pt}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+ \pgf@circ@setcolor
+ \pgfusepath{draw}
+ \pgf@circ@fill@strokecolor
+ \pgftransformshift{\pgfpoint{\pgf@circ@res@step}{0pt}}
+ \pgfnode{currarrow}{tip}{}{}{\pgfusepath{fill}}
+ \fi
}
}
@@ -680,39 +530,35 @@
\anchor{tip}{
\tip
}
- \behindforegroundpath{
-
- \pgfscope
- \pgf@circ@reset@arrows@rounded
- \pgf@circ@res@step = \pgf@circ@Rlen
- \divide \pgf@circ@res@step by 16
- \pgfpathmoveto{\pgfpoint{-1.7\pgf@circ@res@step}{0pt}}
- \pgfpathlineto{\pgfpoint{-1.7\pgf@circ@res@step}{-.8\pgf@circ@res@step}}
- \pgfpathlineto{\pgfpoint{0pt}{0pt}}
- \pgfpathlineto{\pgfpoint{-1.7\pgf@circ@res@step}{.8\pgf@circ@res@step}}
- \pgfpathclose
- \pgfsetcolor{\ctikzvalof{color}}
- \pgfusepath{fill}
- \endpgfscope
+ \pgf@circ@draw@component{
+ \pgf@circ@reset@arrows@rounded
+ \pgf@circ@res@step = \pgf@circ@Rlen
+ \divide \pgf@circ@res@step by 16
+ \pgfpathmoveto{\pgfpoint{-1.7\pgf@circ@res@step}{0pt}}
+ \pgfpathlineto{\pgfpoint{-1.7\pgf@circ@res@step}{-.8\pgf@circ@res@step}}
+ \pgfpathlineto{\pgfpoint{0pt}{0pt}}
+ \pgfpathlineto{\pgfpoint{-1.7\pgf@circ@res@step}{.8\pgf@circ@res@step}}
+ \pgfpathclose
+ \pgf@circ@setcolor
+ \pgf@circ@fill@strokecolor
+ \pgfusepath{fill}
}
}
+% %>>>
-
+%% boxes%<<<
%% box
\pgfdeclareshape{box}{
\anchor{center}{
\pgfpointorigin
}
- \behindforegroundpath{
-
- \pgfscope
- \pgf@circ@res@step = \ctikzvalof{bipoles/twoport/width}\pgf@circ@Rlen
- \pgf@circ@res@step = 0.5\pgf@circ@res@step
- \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
- \pgfpathrectanglecorners{\pgfpoint{-\pgf@circ@res@step}{\pgf@circ@res@step}}{\pgfpoint{\pgf@circ@res@step}{-\pgf@circ@res@step}}
- \pgf@circ@draworfill
- \endpgfscope
+ \pgf@circ@draw@component{
+ \pgf@circ@res@step = \ctikzvalof{bipoles/twoport/width}\pgf@circ@Rlen
+ \pgf@circ@res@step = 0.5\pgf@circ@res@step
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgfpathrectanglecorners{\pgfpoint{-\pgf@circ@res@step}{\pgf@circ@res@step}}{\pgfpoint{\pgf@circ@res@step}{-\pgf@circ@res@step}}
+ \pgf@circ@draworfill
}
}
@@ -723,18 +569,18 @@
\anchor{center}{
\pgfpointorigin
}
- \behindforegroundpath{
+ \pgf@circ@draw@component{
\pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{blocks/scale}\pgf@circ@Rlen}
- \pgfscope
- \pgf@circ@res@step = \ctikzvalof{bipoles/twoport/width}\pgf@circ@scaled@Rlen
- \pgf@circ@res@step = 0.5\pgf@circ@res@step
- \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
- \pgfpathrectanglecorners{\pgfpoint{-\pgf@circ@res@step}{\pgf@circ@res@step}}{\pgfpoint{\pgf@circ@res@step}{-\pgf@circ@res@step}}
- \pgf@circ@draworfill
- \endpgfscope
+ \pgf@circ@res@step = \ctikzvalof{bipoles/twoport/width}\pgf@circ@scaled@Rlen
+ \pgf@circ@res@step = 0.5\pgf@circ@res@step
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgfpathrectanglecorners{\pgfpoint{-\pgf@circ@res@step}{\pgf@circ@res@step}}{\pgfpoint{\pgf@circ@res@step}{-\pgf@circ@res@step}}
+ \pgf@circ@draworfill
}
}
+% %>>>
+%% crossings%<<<
% full nodes for wire crossing
\pgfdeclareshape{jump crossing}
@@ -757,7 +603,7 @@
\anchor{north east}{ \northwest \pgf@x=-\pgf@x }
\anchor{north west}{ \northwest }
\anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
- \behindbackgroundpath{
+ \pgf@circ@draw@component{
\northwest
\pgf@circ@res@up = \pgf@y
\pgf@circ@res@down = -\pgf@y
@@ -798,7 +644,7 @@
\anchor{north east}{ \northwest \pgf@x=-\pgf@x }
\anchor{north west}{ \northwest }
\anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
- \behindbackgroundpath{
+ \pgf@circ@draw@component{
\northwest
\pgf@circ@res@up = \pgf@y
\pgf@circ@res@down = -\pgf@y
@@ -816,5 +662,226 @@
}
}
+% %>>>
+
+%% Connectors (BNC and IEC connectors; see https://github.com/circuitikz/circuitikz/issues/611)%<<<
+
+% define new class
+\ctikzset{connectors/scale/.initial=1.0}
+\ctikzset{connectors/fill/.initial=none}
+\ctikzset{connectors/thickness/.initial=none}
+% parameters. To have round sockets, 3*height==2*width
+\ctikzset{bipoles/iecconn/height/.initial=.2}
+\ctikzset{bipoles/iecconn/width/.initial=.3}
+% objects
+\pgfcircdeclarebipolescaled{connectors}
+{
+ \anchor{plug center}{\northeast\pgf@y=0pt\divide\pgf@x by 3 }
+ \anchor{socket center}{\northeast\pgf@y=0pt\pgf@x=-0.333333\pgf@x}
+ % put the node text above and centered
+ \anchor{text}{\pgfextracty{\pgf@circ@res@up}{\northeast}
+ \pgfpoint{-.5\wd\pgfnodeparttextbox}{
+ \dimexpr.5\ht\pgfnodeparttextbox+\pgf@circ@res@up\relax
+ }
+ }
+}
+{\ctikzvalof{bipoles/iecconn/height}}%symmetrical
+{iecconn}
+{\ctikzvalof{bipoles/iecconn/height}}
+{\ctikzvalof{bipoles/iecconn/width}}
+{
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left/3}{\pgf@circ@res@up}}
+ \pgfpatharc{90}{-90}{0.66666\pgf@circ@res@left and \pgf@circ@res@up}
+ \pgfusepath{draw}
+ \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left/3}{\pgf@circ@res@up/2}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down/2}}
+ \pgf@circ@fill@strokecolor
+ \pgfusepath{draw, fill}
+}
+\pgfcirc@activate@bipole@simple{l}{iecconn}
+\pgfcirc@style@to@style{iecconn}{iec connector}
+
+\long\def\pgfcirc@declare@iecsocket#1#2#3{% #1 name, #2 anchors, #3 drawing code
+ \pgfdeclareshape{#1}{%
+ \savedmacro{\ctikzclass}{\edef\ctikzclass{connectors}}
+ \saveddimen{\scaledRlen}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}}
+ \savedanchor\northwest{%
+ \pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}
+ \pgf@y=\ctikzvalof{bipoles/iecconn/height}\pgf@circ@scaled@Rlen
+ \pgf@y=.5\pgf@y
+ \pgf@x=-\ctikzvalof{bipoles/iecconn/width}\pgf@circ@scaled@Rlen
+ \divide\pgf@x by 6
+ }
+ \pgfcirc@northwest@symmetric@geoanchors
+ #2%
+ \pgf@circ@draw@component{%
+ \pgf@circ@scaled@Rlen=\scaledRlen
+ \pgfstartlinewidth=\pgflinewidth
+ \northwest
+ \pgf@circ@res@up=\pgf@y
+ \pgf@circ@res@left=\pgf@x
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ #3%
+ \pgfusepath{draw}
+ }
+ }
+}
+
+\long\def\pgfcirc@declare@iecplug#1#2{% #1 name, #2 anchors (drawing code is the same)
+ \pgfdeclareshape{#1}{%
+ \savedmacro{\ctikzclass}{\edef\ctikzclass{connectors}}
+ \saveddimen{\scaledRlen}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}}
+ \savedanchor\northwest{%
+ \pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}
+ \pgf@y=\ctikzvalof{bipoles/iecconn/height}\pgf@circ@scaled@Rlen
+ \pgf@y=.25\pgf@y
+ \pgf@x=-\ctikzvalof{bipoles/iecconn/width}\pgf@circ@scaled@Rlen
+ \divide\pgf@x by 3
+ }
+ \pgfcirc@northwest@symmetric@geoanchors
+ \anchor{plug center}{\pgfpointorigin}
+ #2%
+ \pgf@circ@draw@component{%
+ \pgf@circ@scaled@Rlen=\scaledRlen
+ \pgfstartlinewidth=\pgflinewidth
+ \northwest
+ \pgf@circ@res@up=\pgf@y
+ \pgf@circ@res@left=\pgf@x
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{-\pgf@circ@res@left}{-\pgf@circ@res@up}}
+ \pgf@circ@setcolor
+ \pgf@circ@fill@strokecolor
+ \pgfusepath{draw, fill}
+ }
+ }
+}
+
+\pgfcirc@declare@iecsocket{iecsocketR}{%
+ % notice: center is on the left side
+ \anchor{center}{\northwest\pgf@y=0pt}
+ \anchor{socket center}{\northwest\pgf@y=0pt}
+ % put the node text above and to the left, ignore depth
+ \anchor{text}{%
+ \pgfextractx{\pgf@circ@res@left}{\northwest}
+ \pgfextracty{\pgf@circ@res@up}{\northwest}
+ \pgfpoint{-\pgf@circ@res@left}{%
+ .5\ht\pgfnodeparttextbox+\pgf@circ@res@up
+ }%
+ }%
+}{% drawing
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \pgfpatharc{90}{270}{2\pgf@circ@res@left and \pgf@circ@res@up}
+}
+\pgfcirc@declare@iecsocket{iecsocketL}{%
+ % notice: center is on the left side
+ \anchor{center}{\northwest\pgf@y=0pt}
+ \anchor{socket center}{\northwest\pgf@y=0pt\pgf@x=-\pgf@x}
+ % put the node text above and to the left, ignore depth
+ \anchor{text}{%
+ \pgfextractx{\pgf@circ@res@left}{\northwest}
+ \pgfextracty{\pgf@circ@res@up}{\northwest}
+ \pgfpoint{-\wd\pgfnodeparttextbox+\pgf@circ@res@left}{%
+ .5\ht\pgfnodeparttextbox+\pgf@circ@res@up
+ }%
+ }%
+}{% drawing
+ \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \pgfpatharc{90}{-90}{2\pgf@circ@res@left and \pgf@circ@res@up}
+}
+
+\pgfcirc@declare@iecplug{iecplugL}{%
+ % notice: center is on the left side
+ \anchor{center}{\northwest\pgf@y=0pt}
+ % put the node text above and to the right, ignore depth
+ % the text is higher to match the iec socket position
+ \anchor{text}{%
+ \pgfextractx{\pgf@circ@res@left}{\northwest}
+ \pgfextracty{\pgf@circ@res@up}{\northwest}
+ \pgfpoint{-\wd\pgfnodeparttextbox+\pgf@circ@res@left}{
+ .5\ht\pgfnodeparttextbox+2\pgf@circ@res@up
+ }
+ }
+}
+\pgfcirc@declare@iecplug{iecplugR}{%
+ % notice: center is on the left side
+ \anchor{center}{\northwest\pgf@y=0pt}
+ % put the node text above and to the right, ignore depth
+ % the text is higher to match the iec socket position
+ \anchor{text}{%
+ \pgfextractx{\pgf@circ@res@left}{\northwest}
+ \pgfextracty{\pgf@circ@res@up}{\northwest}
+ \pgfpoint{-\pgf@circ@res@left}{
+ .5\ht\pgfnodeparttextbox+2\pgf@circ@res@up
+ }
+ }
+}
+% BNC connector
+
+\pgfdeclareshape{bnc}{
+ \savedmacro{\ctikzclass}{\edef\ctikzclass{connectors}}
+ \saveddimen{\scaledRlen}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}}
+ \anchor{center}{
+ \pgfpointorigin
+ }
+ % BNC size is 2.5 times the size of the internal "ocirc", when class scale is=1
+ \savedanchor\northwest{%
+ \pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}
+ \pgf@y=\ctikzvalof{nodes width}\pgf@circ@scaled@Rlen
+ \pgf@y=2.5\pgf@y
+ \pgf@x=-\pgf@y
+ }
+ % center is on the opening
+ \anchor{center}{\northwest\pgf@y=0pt\pgf@x=-\pgf@x}
+ \anchor{zero}{\pgfpointorigin}
+ \anchor{hot}{\northwest\pgf@y=0pt\pgf@x=-\pgf@x}
+ \anchor{shield}{\northwest\pgf@x=0pt\pgf@y=-\pgf@y}
+ % geo-anchors
+ \pgfcirc@northwest@symmetric@geoanchors
+ % put the node text above and centered
+ \anchor{text}{\pgfextracty{\pgf@circ@res@up}{\northwest}
+ \pgfpoint{-.5\wd\pgfnodeparttextbox}{
+ \dimexpr.5\dp\pgfnodeparttextbox+.5\ht\pgfnodeparttextbox+\pgf@circ@res@up\relax
+ }
+ }
+ \anchorborder{
+ \pgf@circ@res@left=\pgf@x
+ \pgf@circ@res@up=\pgf@y
+ \pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}
+ \pgfpointborderellipse{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}
+ }{\pgfpoint{2.5*\ctikzvalof{nodes width}*\pgf@circ@scaled@Rlen}{2.5*\ctikzvalof{nodes width}*\pgf@circ@scaled@Rlen}}
+ }
+ \pgf@circ@draw@component{
+ \pgfextracty{\pgf@circ@res@other}{\northwest}
+ \pgfmathsetlength{\pgf@circ@res@step}{\ctikzvalof{nodes width}*\scaledRlen}
+ \pgfstartlinewidth=\pgflinewidth
+ \pgf@circ@setlinewidth{bipoles}{\pgflinewidth}
+ \pgf@circ@setcolor
+ % external circle
+ \pgfscope
+ % clipping path: first a rectangle bigger then the shape
+ % to avoid problems with the line thickness
+ \pgfpathrectanglecorners{\pgfpoint{-2\pgf@circ@res@other}{-2\pgf@circ@res@other}}
+ {\pgfpoint{2\pgf@circ@res@other}{2\pgf@circ@res@other}}
+ % next the opening to the right
+ \pgfpathrectanglecorners{\pgfpoint{-\pgf@circ@res@step}{-\pgf@circ@res@step}}
+ {\pgfpoint{2\pgf@circ@res@other}{\pgf@circ@res@step}}
+ % do the difference and clip before drawing
+ \pgfseteorule
+ \pgfusepath{clip}
+ \pgfpathcircle{\pgfpointorigin}{\pgf@circ@res@other}
+ \pgfusepath{draw}
+ \endpgfscope
+ % internal circle
+ \pgfpathcircle{\pgfpointorigin}{\pgf@circ@res@step}
+ \pgf@circ@draworfill
+ % and the contact line to the right
+ \pgfsetlinewidth{\pgfstartlinewidth}
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{0pt}}
+ \pgfusepath{draw}
+ }
+}
+% %>>>
\endinput
+% vim: set fdm=marker fmr=%<<<,%>>>:
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
index d0cf0b295a..711276dd77 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
@@ -432,9 +432,10 @@
\anchor{east}{\pgfextractx{\pgf@circ@res@right}{\northeast}%
\pgfpoint{\pgf@circ@res@right}{0cm}}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
- #3
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
+ % \pgf@circ@debug@colors
+ #3%
}
}
}
@@ -867,8 +868,8 @@
\pgf@x=\dimexpr -.6\wd\pgfnodeparttextbox\relax
\pgf@y=\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\northwest
\pgf@circ@res@up = \pgf@y
@@ -1011,8 +1012,8 @@
\pgf@x=\dimexpr -.6\wd\pgfnodeparttextbox\relax
\pgf@y=\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\northwest
\pgf@circ@res@up = \pgf@y
@@ -1147,8 +1148,8 @@
\pgf@x=\dimexpr -.6\wd\pgfnodeparttextbox\relax
\pgf@y=\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\northwest
\pgf@circ@res@up = \pgf@y
@@ -1303,8 +1304,8 @@
\pgf@x=\dimexpr -.6\wd\pgfnodeparttextbox\relax
\pgf@y=\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\northwest
@@ -1445,7 +1446,7 @@
\else
\expandafter\pgfutil@g@addto@macro\csname pgf@sh@s@european #1 port\endcsname{%
\pgfmathloop%
- \ifnum\pgfmathcounter>#3%
+ \ifnum\pgfmathcounter>#3
\else%
%\pgfutil@ifundefined{pgf@anchor@european #1 port@in \pgfmathcounter}{% redundant
\expandafter\xdef\csname pgf@anchor@european #1 port@in \pgfmathcounter\endcsname{%
@@ -1489,8 +1490,8 @@
\pgfpointborderrectangle{\pgfpoint{\pgf@xa}{\pgf@ya}}
{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\pgfstartlinewidth=\pgflinewidth
\pgfscope
\pgf@circ@setlinewidth{tripoles}{\pgflinewidth}
@@ -1544,9 +1545,10 @@
\pgfusepath{draw}
\fi
\fi
- %
+ \pgf@circ@text@strokecolor
\pgfpathmoveto{\pgfpointorigin}
\pgftext{#2}
+ %
}
}
}
@@ -2031,10 +2033,10 @@
\anchor{south}{\southwest\pgf@x=0pt\relax}
\anchor{west}{\northwest\pgf@y=0pt\relax}
- \backgroundpath{
+ \pgf@circ@draw@component{
\pgfscope
- \pgfsetcolor{\ctikzvalof{color}}
- #4
+ \pgf@circ@setcolor
+ #4%
\endpgfscope
% output lead:
\pgfextractx{\pgf@circ@res@right}{\bottomright} %body+ball border
@@ -2128,7 +2130,7 @@
% \typeout{INNER\space\pgf@circ@count@a}
\pgfmathsetlength{\pgf@circ@res@right}{\pgf@circ@res@left-2*\stdH*(1-cos(atan(\pgf@circ@res@temp/(2*\stdH))))}
% hook for xor/xnor
- #1
+ #1%
\fi\fi
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@temp}}%
\pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pinlen}{\pgf@circ@res@temp}}%
@@ -2152,7 +2154,7 @@
\pgfpathclose
\pgf@circ@draworfill
% hook for xor/xnor
- #2
+ #2%
% rack now; skip if not needed.
% \typeout{WHAT\space \inputs\space \inners}
\ifnum\inputs>\inners
@@ -2369,10 +2371,10 @@
\anchor{south}{\southwest\pgf@x=0pt\relax}
\anchor{west}{\northwest\pgf@y=0pt\relax}
- \backgroundpath{
+ \pgf@circ@draw@component{
\pgfscope
- \pgfsetcolor{\ctikzvalof{color}}
- #3
+ \pgf@circ@setcolor
+ #3%
\endpgfscope
% output lead:
\pgfextractx{\pgf@circ@res@right}{\bottomright} %body+ball border
@@ -2470,9 +2472,9 @@
\anchor{north east}{\northwest\pgf@x=-\pgf@x}
\anchor{north west}{\northwest}
\anchor{south east}{\northwest\pgf@x=-\pgf@x\pgf@y=-\pgf@y}
- \backgroundpath{
+ \pgf@circ@draw@component{
\pgfscope
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
\pgfextractx{\pgf@circ@res@left}{\northwest}
\pgfextracty{\pgf@circ@res@up}{\northwest}
\pgf@circ@res@left=0.7\pgf@circ@res@left
@@ -2519,10 +2521,10 @@
\pgfpointborderellipse{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}%
{\pgfpoint{\pgf@circ@res@temp}{\pgf@circ@res@temp}}
}
- \behindforegroundpath{
+ \pgf@circ@draw@component{
\pgfscope
\northwest\pgf@circ@res@temp=\pgf@y
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
\pgf@circ@setlinewidth{tripoles}{\pgflinewidth}
\pgfpathcircle{\pgfpointorigin}{\pgf@circ@res@temp}
\ifx\tikz@fillcolor\pgfutil@empty
@@ -2715,9 +2717,9 @@
\anchor{south}{\southwest\pgf@x=0pt\relax}
\anchor{west}{\northwest\pgf@y=0pt\relax}
- \backgroundpath{
+ \pgf@circ@draw@component{
\pgfscope
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
\pgfextractx{\pgf@circ@res@left}{\bodyleft}
\pgfextracty{\pgf@circ@res@up}{\bodyleft}
\pgfextractx{\pgf@circ@res@right}{\bodyright}
@@ -2736,7 +2738,7 @@
\fi
\pgfusepath{draw}
\fi
- #3
+ #3%
\endpgfscope
% output lead:
\pgfextractx{\pgf@circ@res@right}{\bottomright} %body+ball border
@@ -3808,10 +3810,10 @@
\pgf@x=-\ctikzvalof{tripoles/#1/bodydiode distance}\pgf@x
\pgf@y=\pgf@ya
}
- #2
- \backgroundpath{
+ #2%
+ \pgf@circ@draw@component{
\pgftransformationadjustments
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
%
\ifnum \ctikzvalof{tripoles/#1/curr direction} > 0
\pgf@circuit@trans@ntypetrue
@@ -3826,7 +3828,7 @@
\pgf@circ@res@left = \pgf@x
\pgf@circ@scaled@Rlen=\scaledRlen
%
- #3
+ #3%
% BODY DIODE
\ifpgf@circuit@fet@bodydiode
\drawbodydiode{#1}
@@ -4013,6 +4015,7 @@
\ifpgf@circuit@bpt@drawphoto
\pgfscope
+ \pgf@circ@fill@strokecolor
\pgfsetarrowsstart{latexslim}
\pgfpathmoveto{\pgfpointadd{\pgfpoint
{\ctikzvalof{tripoles/#1/base width}\pgf@circ@res@left}
@@ -4182,9 +4185,9 @@
\anchor{C}{\ifnum\cdir<0\southeast\else\northeast\fi}
\anchor{collector}{\ifnum\cdir<0\southeast\else\northeast\fi}
- \backgroundpath{
+ \pgf@circ@draw@component{
\pgftransformationadjustments
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@setcolor
%
% set the type and up and down number of connections
%
@@ -4903,6 +4906,7 @@
\else
\edef\@@default{default}%
\ifx\@@tmp\@@default % fill with the pen color
+ \pgf@circ@fill@strokecolor
\pgfusepath{draw, fill}%
\else
\pgfsetfillcolor{\@@tmp}%
@@ -5316,8 +5320,8 @@
}
-\long\def\pgfdeclaretransistorwrapperaddbulk#1#2#3
-{\pgfcircdeclaretransistor{#1}{
+\long\def\pgfdeclaretransistorwrapperaddbulk#1#2#3{
+ \pgfcircdeclaretransistor{#1}{
\anchor{bulk}{\left\pgf@x=0pt}
\anchor{B}{\left\pgf@x=0pt}%override Base anchor from npn&igbt
\anchor{inner up}{
@@ -5328,7 +5332,7 @@
\northeast
\pgf@y=-\ctikzvalof{tripoles/#1/gate height}\pgf@y
}
- #2
+ #2%
}
{#3}
}
@@ -5475,7 +5479,7 @@
\pgf@x=\ctikzvalof{tripoles/#1/conn kink}\pgf@x
}
% extra anchors (or override)
- #2
+ #2%
}{%
% add the circle if requested (before everything else, so we can fill it)
\pgfcirc@transistorcircle
@@ -5574,7 +5578,7 @@
\endpgfscope
% extra drawings
- #3
+ #3%
}
}
@@ -6014,16 +6018,14 @@
\pgf@y=\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
-
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\northwest
\pgf@circ@res@up = \pgf@y
\pgf@circ@res@down = -\pgf@y
\pgf@circ@res@right = -\pgf@x
\pgf@circ@res@left = \pgf@x
\pgf@circ@scaled@Rlen=\scaledRlen
-
% Triangle
\pgfscope
\pgf@circ@setlinewidth{tripoles}{\pgflinewidth}
@@ -6031,14 +6033,12 @@
\pgf@circ@res@step=\pgf@circ@res@right
\advance\pgf@circ@res@step by -\pgf@circ@res@left
\pgf@circ@res@step=\ctikzvalof{tripoles/op amp/port width}\pgf@circ@res@step
-
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
\pgfpathclose
\pgf@circ@draworfill
\endpgfscope
-
% Negative input terminal
\pgfpathmoveto{\pgfpoint
{\pgf@circ@res@left}
@@ -6046,8 +6046,6 @@
\pgfpathlineto{\pgfpoint
{\ctikzvalof{tripoles/op amp/port width}\pgf@circ@res@left}
{\ctikzvalof{tripoles/op amp/input height}\pgf@circ@res@up}}
- \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/op amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/op amp/input height}\pgf@circ@res@up}]{\ctikzvalof{tripoles/op amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@plus\else\pgf@circ@ampli@minus\fi}
-
% Positive input terminal
\pgfpathmoveto{\pgfpoint
{\pgf@circ@res@left}
@@ -6055,13 +6053,14 @@
\pgfpathlineto{\pgfpoint
{\ctikzvalof{tripoles/op amp/port width}\pgf@circ@res@left}
{\ctikzvalof{tripoles/op amp/input height}\pgf@circ@res@down}}
- \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/op amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/op amp/input height}\pgf@circ@res@down}]{\ctikzvalof{tripoles/op amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@minus\else\pgf@circ@ampli@plus\fi}
-
% Output terminal
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
\pgfpathlineto{\pgfpoint{\ctikzvalof{tripoles/op amp/port width}\pgf@circ@res@right}{0pt}}
\pgfsetrectcap
\pgfusepath{draw}
+ \pgf@circ@text@strokecolor
+ \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/op amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/op amp/input height}\pgf@circ@res@up}]{\ctikzvalof{tripoles/op amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@plus\else\pgf@circ@ampli@minus\fi}
+ \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/op amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/op amp/input height}\pgf@circ@res@down}]{\ctikzvalof{tripoles/op amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@minus\else\pgf@circ@ampli@plus\fi}
}
}
@@ -6193,8 +6192,8 @@
\pgf@y=\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\northwest
\pgf@circ@res@up = \pgf@y
\pgf@circ@res@down = -\pgf@y
@@ -6218,7 +6217,6 @@
\pgfpathlineto{\pgfpoint
{\ctikzvalof{tripoles/en amp/port width}\pgf@circ@res@left}
{\ctikzvalof{tripoles/en amp/input height}\pgf@circ@res@up}}
- \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/en amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/en amp/input height}\pgf@circ@res@up}]{\ctikzvalof{tripoles/en amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@plus\else\pgf@circ@ampli@minus\fi}
\pgfpathmoveto{\pgfpoint
{\pgf@circ@res@left}
@@ -6226,16 +6224,15 @@
\pgfpathlineto{\pgfpoint
{\ctikzvalof{tripoles/en amp/port width}\pgf@circ@res@left}
{\ctikzvalof{tripoles/en amp/input height}\pgf@circ@res@down}}
- \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/en amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/en amp/input height}\pgf@circ@res@down}]{\ctikzvalof{tripoles/en amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@minus\else\pgf@circ@ampli@plus\fi}
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
\pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{0pt}}
\pgfsetrectcap
\pgfusepath{draw}
-
-
+ \pgf@circ@text@strokecolor
+ \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/en amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/en amp/input height}\pgf@circ@res@up}]{\ctikzvalof{tripoles/en amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@plus\else\pgf@circ@ampli@minus\fi}
+ \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/en amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/en amp/input height}\pgf@circ@res@down}]{\ctikzvalof{tripoles/en amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@minus\else\pgf@circ@ampli@plus\fi}
\pgftext[top, y=-.5ex, at=\pgfpoint{0pt}{\pgf@circ@res@up}]{\hbox{\ctikzvalof{tripoles/en amp/font2}\ctikzvalof{tripoles/en amp/text}}}
- % \pgftext[top, y=-.5ex, at=\pgfpoint{0pt}{\pgf@circ@res@up}]{\ctikzvalof{tripoles/en amp/font2}$\mathstrut{\triangleright}\,\mathrm{A}$}
}
}
@@ -6436,8 +6433,8 @@
\fi
\pgf@y=\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\northwest
\pgf@circ@res@up = \pgf@y
@@ -6508,7 +6505,6 @@
\pgfpathlineto{\pgfpoint
{\ctikzvalof{tripoles/fd op amp/port width}\pgf@circ@res@left}
{\ctikzvalof{tripoles/fd op amp/input height}\pgf@circ@res@up}}
- \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/fd op amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/fd op amp/input height}\pgf@circ@res@up}]{\ctikzvalof{tripoles/fd op amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@plus\else\pgf@circ@ampli@minus\fi}
% Positive input terminal
\pgfpathmoveto{\pgfpoint
@@ -6517,16 +6513,15 @@
\pgfpathlineto{\pgfpoint
{\ctikzvalof{tripoles/fd op amp/port width}\pgf@circ@res@left}
{\ctikzvalof{tripoles/fd op amp/input height}\pgf@circ@res@down}}
+ \pgfsetrectcap
+ \pgfusepath{draw}
+ \pgf@circ@text@strokecolor
+ \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/fd op amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/fd op amp/input height}\pgf@circ@res@up}]{\ctikzvalof{tripoles/fd op amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@plus\else\pgf@circ@ampli@minus\fi}
\pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/fd op amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/fd op amp/input height}\pgf@circ@res@down}]{\ctikzvalof{tripoles/fd op amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@minus\else\pgf@circ@ampli@plus\fi}
-
% Negative output terminal label
\pgftext[right, bottom, x=3pt, y=1pt, at=\pgfpoint{0pt}{0.425\pgf@circ@res@down}]{\ctikzvalof{tripoles/fd op amp/font} \ifpgf@circuit@oa@oplusup\pgf@circ@ampli@minus\else\pgf@circ@ampli@plus\fi}
-
% Positive output terminal label
\pgftext[right, top, x=3pt, y=-1pt, at=\pgfpoint{0pt}{0.425\pgf@circ@res@up}]{\ctikzvalof{tripoles/fd op amp/font} \ifpgf@circuit@oa@oplusup\pgf@circ@ampli@plus\else\pgf@circ@ampli@minus\fi}
-
- \pgfsetrectcap
- \pgfusepath{draw}
}
}
@@ -6756,8 +6751,8 @@
}
% let's start drawing the component
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
%
\northwest
\pgf@circ@res@up = \pgf@y
@@ -6797,7 +6792,6 @@
{\ctikzvalof{tripoles/fd inst amp/port width}\pgf@circ@res@left}
{\ctikzvalof{tripoles/fd inst amp/input height}\pgf@circ@res@up}}
%
- \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/fd inst amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/fd inst amp/input height}\pgf@circ@res@up}]{\ctikzvalof{tripoles/fd inst amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@plus\else\pgf@circ@ampli@minus\fi}
% input terminal down
\pgfpathmoveto{\pgfpoint
@@ -6807,19 +6801,21 @@
\pgfpathlineto{\pgfpoint
{\ctikzvalof{tripoles/fd inst amp/port width}\pgf@circ@res@left}
{\ctikzvalof{tripoles/fd inst amp/input height}\pgf@circ@res@down}}
- \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/fd inst amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/fd inst amp/input height}\pgf@circ@res@down}]{\ctikzvalof{tripoles/fd inst amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@minus\else\pgf@circ@ampli@plus\fi}
% output leads down and up
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\ctikzvalof{tripoles/fd inst amp/output height}\pgf@circ@res@down}}
\pgfpathlineto{\pgfpoint{\ctikzvalof{tripoles/fd inst amp/port width}\pgf@circ@res@right}{\ctikzvalof{tripoles/fd inst amp/output height}\pgf@circ@res@down}} %
- \pgftext[right, at=\pgfpoint{\ctikzvalof{tripoles/fd inst amp/port width}\pgf@circ@res@right}{\ctikzvalof{tripoles/fd inst amp/output height}\pgf@circ@res@down}]{\ctikzvalof{tripoles/fd inst amp/font}\ifpgf@circuit@oa@oplusup$-\;$\else$+\;$\fi}
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\ctikzvalof{tripoles/fd inst amp/output height}\pgf@circ@res@up}}
\pgfpathlineto{\pgfpoint{\ctikzvalof{tripoles/fd inst amp/port width}\pgf@circ@res@right}{\ctikzvalof{tripoles/fd inst amp/output height}\pgf@circ@res@up}} %
- \pgftext[right, at=\pgfpoint{\ctikzvalof{tripoles/fd inst amp/port width}\pgf@circ@res@right}{\ctikzvalof{tripoles/fd inst amp/output height}\pgf@circ@res@up}]{\ctikzvalof{tripoles/fd inst amp/font}\ifpgf@circuit@oa@oplusup$+\;$\else$-\;$\fi}
%
\pgfsetrectcap
\pgfusepath{draw}
+ \pgf@circ@text@strokecolor
+ \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/fd inst amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/fd inst amp/input height}\pgf@circ@res@up}]{\ctikzvalof{tripoles/fd inst amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@plus\else\pgf@circ@ampli@minus\fi}
+ \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/fd inst amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/fd inst amp/input height}\pgf@circ@res@down}]{\ctikzvalof{tripoles/fd inst amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@minus\else\pgf@circ@ampli@plus\fi}
+ \pgftext[right, at=\pgfpoint{\ctikzvalof{tripoles/fd inst amp/port width}\pgf@circ@res@right}{\ctikzvalof{tripoles/fd inst amp/output height}\pgf@circ@res@down}]{\ctikzvalof{tripoles/fd inst amp/font}\ifpgf@circuit@oa@oplusup$-\;$\else$+\;$\fi}
+ \pgftext[right, at=\pgfpoint{\ctikzvalof{tripoles/fd inst amp/port width}\pgf@circ@res@right}{\ctikzvalof{tripoles/fd inst amp/output height}\pgf@circ@res@up}]{\ctikzvalof{tripoles/fd inst amp/font}\ifpgf@circuit@oa@oplusup$+\;$\else$-\;$\fi}
}
}
@@ -6964,8 +6960,8 @@
\fi
\pgf@y=\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\northwest
\pgf@circ@res@up = \pgf@y
@@ -6999,22 +6995,19 @@
\pgfpathlineto{\pgfpoint
{\ctikzvalof{tripoles/gm amp/port width}\pgf@circ@res@left}
{\ctikzvalof{tripoles/gm amp/input height}\pgf@circ@res@up}}
- \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/gm amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/gm amp/input height}\pgf@circ@res@up}]{\ctikzvalof{tripoles/gm amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@plus\else\pgf@circ@ampli@minus\fi}
-
-
\pgfpathmoveto{\pgfpoint
{\pgf@circ@res@left}
{\ctikzvalof{tripoles/gm amp/input height}\pgf@circ@res@down}}
\pgfpathlineto{\pgfpoint
{\ctikzvalof{tripoles/gm amp/port width}\pgf@circ@res@left}
{\ctikzvalof{tripoles/gm amp/input height}\pgf@circ@res@down}}
- \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/gm amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/gm amp/input height}\pgf@circ@res@down}]{\ctikzvalof{tripoles/gm amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@minus\else\pgf@circ@ampli@plus\fi}
-
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
\pgfpathlineto{\pgfpoint{\ctikzvalof{tripoles/gm amp/port width}\pgf@circ@res@right}{0pt}} %
\pgfsetrectcap
\pgfusepath{draw}
-
+ \pgf@circ@text@strokecolor
+ \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/gm amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/gm amp/input height}\pgf@circ@res@up}]{\ctikzvalof{tripoles/gm amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@plus\else\pgf@circ@ampli@minus\fi}
+ \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/gm amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/gm amp/input height}\pgf@circ@res@down}]{\ctikzvalof{tripoles/gm amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@minus\else\pgf@circ@ampli@plus\fi}
}
}
@@ -7196,8 +7189,8 @@
}
% let's start drawing the component
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
%
\northwest
\pgf@circ@res@up = \pgf@y
@@ -7238,7 +7231,6 @@
{\ctikzvalof{tripoles/inst amp/port width}\pgf@circ@res@left}
{\ctikzvalof{tripoles/inst amp/input height}\pgf@circ@res@up}}
%
- \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/inst amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/inst amp/input height}\pgf@circ@res@up}]{\ctikzvalof{tripoles/inst amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@plus\else\pgf@circ@ampli@minus\fi}
% Positive input terminal
\pgfpathmoveto{\pgfpoint
@@ -7248,7 +7240,6 @@
\pgfpathlineto{\pgfpoint
{\ctikzvalof{tripoles/inst amp/port width}\pgf@circ@res@left}
{\ctikzvalof{tripoles/inst amp/input height}\pgf@circ@res@down}}
- \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/inst amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/inst amp/input height}\pgf@circ@res@down}]{\ctikzvalof{tripoles/inst amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@minus\else\pgf@circ@ampli@plus\fi}
% Output terminal
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
@@ -7256,6 +7247,9 @@
%
\pgfsetrectcap
\pgfusepath{draw}
+ \pgf@circ@text@strokecolor
+ \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/inst amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/inst amp/input height}\pgf@circ@res@up}]{\ctikzvalof{tripoles/inst amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@plus\else\pgf@circ@ampli@minus\fi}
+ \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/inst amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/inst amp/input height}\pgf@circ@res@down}]{\ctikzvalof{tripoles/inst amp/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@minus\else\pgf@circ@ampli@plus\fi}
}
}
@@ -7483,8 +7477,8 @@
}
% drawing of the component
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\northwest
\pgf@circ@res@up = \pgf@y
@@ -7542,7 +7536,6 @@
{\ctikzvalof{tripoles/inst amp ra/port width}\pgf@circ@res@left}
{\ctikzvalof{tripoles/inst amp ra/input height}\pgf@circ@res@up}}
%
- \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/inst amp ra/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/inst amp ra/input height}\pgf@circ@res@up}]{\ctikzvalof{tripoles/inst amp ra/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@plus\else\pgf@circ@ampli@minus\fi}
% Positive input terminal
\pgfpathmoveto{\pgfpoint
@@ -7552,7 +7545,6 @@
\pgfpathlineto{\pgfpoint
{\ctikzvalof{tripoles/inst amp ra/port width}\pgf@circ@res@left}
{\ctikzvalof{tripoles/inst amp ra/input height}\pgf@circ@res@down}}
- \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/inst amp ra/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/inst amp ra/input height}\pgf@circ@res@down}]{\ctikzvalof{tripoles/inst amp ra/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@minus\else\pgf@circ@ampli@plus\fi}
% Output terminal
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
@@ -7560,6 +7552,9 @@
%
\pgfsetrectcap
\pgfusepath{draw}
+ \pgf@circ@text@strokecolor
+ \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/inst amp ra/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/inst amp ra/input height}\pgf@circ@res@up}]{\ctikzvalof{tripoles/inst amp ra/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@plus\else\pgf@circ@ampli@minus\fi}
+ \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/inst amp ra/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/inst amp ra/input height}\pgf@circ@res@down}]{\ctikzvalof{tripoles/inst amp ra/font} \ifpgf@circuit@oa@iplusup\pgf@circ@ampli@minus\else\pgf@circ@ampli@plus\fi}
}
}
@@ -7618,8 +7613,8 @@
\pgf@y=\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\northwest
\pgf@circ@res@up = \pgf@y
@@ -7779,8 +7774,8 @@
\pgf@y=\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\northwest
\pgf@circ@res@up = \pgf@y
@@ -7914,8 +7909,8 @@
\fi
\pgf@y=\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax
}
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\northwest
\pgf@circ@res@up = \pgf@y
@@ -8087,8 +8082,8 @@
\anchor{north east}{ \northwest \pgf@x=-\pgf@x }
\anchor{north west}{ \northwest }
\anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
- \backgroundpath{
- \pgfsetcolor{\ctikzvalof{color}}
+ \pgf@circ@draw@component{
+ \pgf@circ@setcolor
\pgf@circ@scaled@Rlen=\scaledRlen
\pgf@circ@res@step=\ctikzvalof{tripoles/magnetron/width}\pgf@circ@scaled@Rlen
\northwest
@@ -8254,10 +8249,9 @@
}
% Extra anchors
- #2
+ #2%
- \backgroundpath{
- \pgfscope
+ \pgf@circ@draw@component{
% Line width for tripoles
\pgf@circ@setlinewidth{tripoles}{\pgflinewidth}
\pgf@circ@scaled@Rlen=\scaledRlen
@@ -8281,7 +8275,7 @@
\pgf@circ@draworfill
% Grid drawing
- #3
+ #3%
% Filament (is not drawn by default)
\ifpgf@circuit@tubes@filament
@@ -8324,7 +8318,6 @@
% Draw the background
\pgfusepath{draw}
- \endpgfscope
}
}
}
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
index d50d411165..f614b86f22 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
@@ -397,7 +397,9 @@
\n1 = {veclen(\x1,\y1)},
\n2 = {atan2(\y2,\x2)} in
% node[above]{\n1, \n2}
- (#5.center) ++({\n2+(#4)}:{-0.5*(\n1)*(#3)}) -- ++({\n2+(#4)}:{(\n1)*(#3)});
+ % notice that some node has the "center" on one side, so
+ % midway from east to west is a safer bet for the center
+ ($(#5.west)!0.5!(#5.east)$) ++({\n2+(#4)}:{-0.5*(\n1)*(#3)}) -- ++({\n2+(#4)}:{(\n1)*(#3)});
\endscope
}
\endinput
diff --git a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
index 00010903bf..5158fbb561 100644
--- a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
@@ -10,11 +10,12 @@
%
% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
-\def\pgfcircversion{1.4.6}
-\def\pgfcircversiondate{2022/02/04}
+\def\pgfcircversion{1.5.0}
+\def\pgfcircversiondate{2022/02/22}
\writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion}
\usemodule[tikz]
+\usemodule[regexpatch]%for color hack
\startmodule[circuitikz]
\usetikzlibrary[calc]
diff --git a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
index 52e0ee69b9..a2c8ba5bb6 100644
--- a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
+++ b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
index 0e13a6a783..6718d07e1c 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
index 0ca6fbf7b4..372a14dcd5 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
index dacdb815cc..4b412e8c94 100644
--- a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-tabular.pdf b/macros/latex/contrib/reledmac/examples/1-tabular.pdf
index 24f9234d3a..7481913d9e 100644
--- a/macros/latex/contrib/reledmac/examples/1-tabular.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-tabular.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
index 0dbfd26819..bf23212e5f 100644
--- a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-verses.pdf b/macros/latex/contrib/reledmac/examples/1-verses.pdf
index 4714d36aaa..d92d74d5e3 100644
--- a/macros/latex/contrib/reledmac/examples/1-verses.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-verses.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf
index b2f7d9dbd1..101950acdd 100644
--- a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
index f7fe778829..73961b2311 100644
--- a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
index a8b2878c6a..3132c5d3aa 100644
--- a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
index 4d774ab937..04ed547699 100644
--- a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-indexing.pdf b/macros/latex/contrib/reledmac/examples/2-indexing.pdf
index e6c2e394ad..0c0fbad885 100644
--- a/macros/latex/contrib/reledmac/examples/2-indexing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-indexing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
index 8910032e30..5d1594698e 100644
--- a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
index 71b8ef74fa..44c9ca68ae 100644
--- a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
index 4e3bb139ff..ce1e005316 100644
--- a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
index a1cae283ac..c3f10d9bab 100644
--- a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
index 9c6aac015c..2d2ddd6780 100644
--- a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
index de9737c957..fc5afbfa26 100644
--- a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-performances.pdf b/macros/latex/contrib/reledmac/examples/2-performances.pdf
index 5e5f81f926..48a9b6289d 100644
--- a/macros/latex/contrib/reledmac/examples/2-performances.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-performances.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
index 0c5923f736..dd00c33a60 100644
--- a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
index 6a5768b2c3..3963fa9cf0 100644
--- a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
index 890775aa8f..b1cce47306 100644
--- a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
index 4888687cb7..8fb7815549 100644
--- a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
index 77e54cad8e..cd60587a70 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
index aeff29034d..bd7d288890 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
index 9b784e226f..a036d76974 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
index 37a5e0cbfd..526eab6028 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
index 8b011435c7..2ea055f0e6 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
index 004d0254ba..84fa9f70ee 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
index 562dcc24e5..9074228adc 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
index c00cfc3dc3..47e23321e1 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
index 093826dca2..9615eca582 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
index 0cc644e116..c45fd43eda 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
index 3bcff728d7..4ee71747c2 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
index 5c93f1889e..d11ecdce7c 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
index 9567cce5d6..07b85c0036 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
index 6c1a1367f4..eb9a8e2aa3 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
index 0a591cbfa6..ea0ed3234b 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
index 360c29f86c..5a3661bc4e 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
index 29e9d5d4f9..f4978b8e85 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
index 646f208859..edda5a1570 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
index 5c849ca877..0a5a91ac26 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
index 6d2d332fec..0b67d713d5 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
index a8082e7469..20724af5b3 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
index d9a17ed624..8fb2a74cb2 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
index f3cd521397..972199e49d 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf
index ea2f620516..7bb32f83fa 100644
--- a/macros/latex/contrib/reledmac/migration.pdf
+++ b/macros/latex/contrib/reledmac/migration.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx
index 33fe898c87..a5b00a144a 100644
--- a/macros/latex/contrib/reledmac/reledmac.dtx
+++ b/macros/latex/contrib/reledmac/reledmac.dtx
@@ -14320,7 +14320,7 @@
{%
\global\skip\csuse{footins#1}=\csuse{beforenotesX@\firstseriesX@}%
\global\advance\skip\csname footins#1\endcsname by\csuse{afterruleX@#1}%
- \gdef\firstXseries@{#1}%
+ \gdef\firstseriesX@{#1}%
}%
{}%
}%
diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf
index 39b184defb..4bf3db4261 100644
--- a/macros/latex/contrib/reledmac/reledmac.pdf
+++ b/macros/latex/contrib/reledmac/reledmac.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/reledpar.dtx b/macros/latex/contrib/reledmac/reledpar.dtx
index 55d7ea094b..b2f8fb7d88 100644
--- a/macros/latex/contrib/reledmac/reledpar.dtx
+++ b/macros/latex/contrib/reledmac/reledpar.dtx
@@ -349,7 +349,8 @@
% \changes{v2.24.3}{2020/11/08}{Fix bug with hanging verse in parallel typesetting.}
% \changes{v2.25.0}{2020/11/29}{Add compatibility with \protect\cs{linenumannotationothersidetrue} of \protect\macpackage.}.
% \changes{v2.25.1}{2021/01/21}{\protect\cs{ifsublines@R} migrated to \protect\macpackage}
-% \changes{v2.25.2}{2021/09/27}{Fix incompatibility with \protect\package{babel} v.3.61}
+% \changes{v2.25.2}{2021/09/27}{Fix incompatibility with \protect\package{babel} v3.61}
+% \changes{v2.25.3}{2022/04/22}{Fix incompatibility with \protect\package{polyglossia} v1.55}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -1406,7 +1407,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2021/09/27 v2.25.2 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2022/04/22 v2.25.3 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -1586,7 +1587,7 @@
% \begin{macrocode}
\newcommand{\led@err@polyglossiaTooOld}{%
\reledpar@error{You use the polyglosia package.%
- \MessageBreak However, reledpar requires version 2020/04/08 v1.49 or later of the polyglossia package.%
+ \MessageBreak However, reledpar requires version 2022/04/10 v1.55 or later of the polyglossia package.%
\MessageBreak Please update your polyglossia version}{\@ehc}%
}%
% \end{macrocode}
@@ -5638,24 +5639,25 @@
% \changes{v2.23.0}{2020/03/08}{Restore compatibility with versions of polyglossia prior to v1.45.}
% \begin{macrocode}
{%
- \@ifpackagelater{polyglossia}{2020/04/08}{}{\led@err@polyglossiaTooOld}%
+ \@ifpackagelater{polyglossia}{2022/04/10}{}{\led@err@polyglossiaTooOld}%
\let\old@otherlanguage\otherlanguage%
\renewcommand{\otherlanguage}[2][]{%
- \xpg@set@group@aux%
\selectlanguage[#1]{#2}%
+ \xpg@set@language@only@aux[#1]{#2}%
\ifledRcol \gdef\theledlanguageR{#2}%
\else \gdef\theledlanguageL{#2}%
\fi}%
\renewcommand{\l@duselanguage}[1]{%
\csuse{no\languagename @numbers}%
- \@select@language{#1}%
+ \expandafter\@select@language\expandafter{#1}%
}%
- \gdef\theledlanguageL{\xpg@main@language}%
- \gdef\theledlanguageR{\xpg@main@language}%
+ \xdef\theledlanguageL{\xpg@main@language}%
+ \xdef\theledlanguageR{\xpg@main@language}%
% \end{macrocode}
% That is it.
% \begin{macrocode}
-}}
+ }%
+}%
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/macros/latex/contrib/reledmac/reledpar.pdf b/macros/latex/contrib/reledmac/reledpar.pdf
index 46cfe195bf..5749dd6b44 100644
--- a/macros/latex/contrib/reledmac/reledpar.pdf
+++ b/macros/latex/contrib/reledmac/reledpar.pdf
Binary files differ
diff --git a/macros/latex/contrib/zref-check/CHANGELOG.md b/macros/latex/contrib/zref-check/CHANGELOG.md
index 76f4d6b20b..d74dbe3dad 100644
--- a/macros/latex/contrib/zref-check/CHANGELOG.md
+++ b/macros/latex/contrib/zref-check/CHANGELOG.md
@@ -1,6 +1,15 @@
# Changelog
-## [Unreleased](https://github.com/gusbrs/zref-check/compare/v0.2.5...HEAD)
+## [Unreleased](https://github.com/gusbrs/zref-check/compare/v0.3.0...HEAD)
+
+## [v0.3.0](https://github.com/gusbrs/zref-check/compare/v0.2.5...v0.3.0) (2022-04-22)
+
+### Changed
+- `zref-check` no longer accepts package options to be set a load-time,
+ `\zrefchecksetup` must be used instead. The use of load-time options now
+ results in "Unknown option" LaTeX error. This change requires that users
+ adjust their documents, and a suitable package warning has been provided so
+ that affected users know of the change directly and how to adjust.
## [v0.2.5](https://github.com/gusbrs/zref-check/compare/v0.2.4...v0.2.5) (2022-02-11)
diff --git a/macros/latex/contrib/zref-check/MANIFEST.md b/macros/latex/contrib/zref-check/MANIFEST.md
deleted file mode 100644
index 7a204e9782..0000000000
--- a/macros/latex/contrib/zref-check/MANIFEST.md
+++ /dev/null
@@ -1,284 +0,0 @@
-# Manifest for zref-check
-
-This file is a listing of all files considered to be part of this package.
-It is automatically generated with `l3build manifest`.
-
-
-## Repository manifest
-
-The following groups list the files included in the development repository of the package.
-Files listed with a ‘†’ marker are included in the TDS but not CTAN files, and files listed
-with ‘‡’ are included in both.
-
-### Source files
-
-These are source files for a number of purposes, including the `unpack` process which
-generates the installation files of the package. Additional files included here will also
-be installed for processing such as testing.
-
-* zref-check.dtx ‡
-* zref-check.ins ‡
-
-### Typeset documentation source files
-
-These files are typeset using LaTeX to produce the PDF documentation for the package.
-
-* zref-check-code.tex ‡
-* zref-check.tex ‡
-
-### Text files
-
-Plain text files included as documentation or metadata.
-
-* CHANGELOG.md ‡
-* MANIFEST.md ‡
-* README.md ‡
-* readme-ctan.md
-* DEPENDS.txt ‡
-
-### Derived files
-
-The files created by ‘unpacking’ the package sources. This typically includes
-`.sty` and `.cls` files created from DocStrip `.dtx` files.
-
-* zref-check.sty †
-
-### Typeset documents
-
-The output files (PDF, essentially) from typesetting the various source, demo,
-etc., package files.
-
-* zref-check-code.pdf ‡
-* zref-check.pdf ‡
-
-### Test files
-
-These files form the test suite for the package. `.lvt` or `.lte` files are the individual
-unit tests, and `.tlg` are the stored output for ensuring changes to the package produce
-the same output. These output files are sometimes shared and sometime specific for
-different engines (pdfTeX, XeTeX, LuaTeX, etc.).
-
-* zc-babel01.lvt
-* zc-babel02.lvt
-* zc-babel03.lvt
-* zc-babel04.lvt
-* zc-check-above01.lvt
-* zc-check-after01.lvt
-* zc-check-before01.lvt
-* zc-check-below01.lvt
-* zc-check-chapsafter01.lvt
-* zc-check-chapsbefore01.lvt
-* zc-check-close01.lvt
-* zc-check-facing01.lvt
-* zc-check-facing02.lvt
-* zc-check-facing03.lvt
-* zc-check-far01.lvt
-* zc-check-multi01.lvt
-* zc-check-nextchap01.lvt
-* zc-check-nextpage01.lvt
-* zc-check-nextpage02.lvt
-* zc-check-nextsec01.lvt
-* zc-check-otherpage01.lvt
-* zc-check-otherpage02.lvt
-* zc-check-pagegap01.lvt
-* zc-check-pagesafter01.lvt
-* zc-check-pagesafter02.lvt
-* zc-check-pagesbefore01.lvt
-* zc-check-pagesbefore02.lvt
-* zc-check-ppafter01.lvt
-* zc-check-ppafter02.lvt
-* zc-check-ppbefore01.lvt
-* zc-check-ppbefore02.lvt
-* zc-check-prevchap01.lvt
-* zc-check-prevpage01.lvt
-* zc-check-prevpage02.lvt
-* zc-check-prevsec01.lvt
-* zc-check-secsafter01.lvt
-* zc-check-secsbefore01.lvt
-* zc-check-thischap01.lvt
-* zc-check-thispage01.lvt
-* zc-check-thispage02.lvt
-* zc-check-thissec01.lvt
-* zc-opt-closerange01.lvt
-* zc-opt-closerange02.lvt
-* zc-opt-hyperref01.lvt
-* zc-opt-hyperref02.lvt
-* zc-opt-hyperref03.lvt
-* zc-opt-hyperref04.lvt
-* zc-opt-hyperref05.lvt
-* zc-opt-ignore01.lvt
-* zc-opt-ignore02.lvt
-* zc-opt-msglevel01.lvt
-* zc-opt-msglevel02.lvt
-* zc-opt-msglevel03.lvt
-* zc-opt-msglevel04.lvt
-* zc-opt-msglevel05.lvt
-* zc-opt-msglevel06.lvt
-* zc-opt-msglevel07.lvt
-* zc-opt-msglevel08.lvt
-* zc-opt-msglevel09.lvt
-* zc-opt-msglevel10.lvt
-* zc-opt-onpage01.lvt
-* zc-opt-onpage02.lvt
-* zc-opt-onpage03.lvt
-* zc-opt-onpage04.lvt
-* zc-opt-onpage05.lvt
-* zc-opt-onpage06.lvt
-* zc-opt-onpage07.lvt
-* zc-opt-onpage08.lvt
-* zc-opt-onpage09.lvt
-* zc-babel01.luatex.tlg
-* zc-babel01.luatexdev.tlg
-* zc-babel01.tlg
-* zc-babel01.xetex.tlg
-* zc-babel01.xetexdev.tlg
-* zc-babel02.luatex.tlg
-* zc-babel02.luatexdev.tlg
-* zc-babel02.tlg
-* zc-babel02.xetex.tlg
-* zc-babel02.xetexdev.tlg
-* zc-babel03.luatex.tlg
-* zc-babel03.luatexdev.tlg
-* zc-babel03.tlg
-* zc-babel03.xetex.tlg
-* zc-babel03.xetexdev.tlg
-* zc-babel04.luatex.tlg
-* zc-babel04.luatexdev.tlg
-* zc-babel04.tlg
-* zc-babel04.xetex.tlg
-* zc-babel04.xetexdev.tlg
-* zc-check-above01.tlg
-* zc-check-after01.tlg
-* zc-check-before01.tlg
-* zc-check-below01.tlg
-* zc-check-chapsafter01.tlg
-* zc-check-chapsbefore01.tlg
-* zc-check-close01.tlg
-* zc-check-facing01.tlg
-* zc-check-facing02.tlg
-* zc-check-facing03.tlg
-* zc-check-far01.tlg
-* zc-check-multi01.tlg
-* zc-check-nextchap01.tlg
-* zc-check-nextpage01.tlg
-* zc-check-nextpage02.tlg
-* zc-check-nextsec01.tlg
-* zc-check-otherpage01.tlg
-* zc-check-otherpage02.tlg
-* zc-check-pagegap01.tlg
-* zc-check-pagesafter01.tlg
-* zc-check-pagesafter02.tlg
-* zc-check-pagesbefore01.tlg
-* zc-check-pagesbefore02.tlg
-* zc-check-ppafter01.tlg
-* zc-check-ppafter02.tlg
-* zc-check-ppbefore01.tlg
-* zc-check-ppbefore02.tlg
-* zc-check-prevchap01.tlg
-* zc-check-prevpage01.tlg
-* zc-check-prevpage02.tlg
-* zc-check-prevsec01.tlg
-* zc-check-secsafter01.tlg
-* zc-check-secsbefore01.tlg
-* zc-check-thischap01.tlg
-* zc-check-thispage01.tlg
-* zc-check-thispage02.tlg
-* zc-check-thissec01.tlg
-* zc-opt-closerange01.tlg
-* zc-opt-closerange02.tlg
-* zc-opt-hyperref01.luatex.tlg
-* zc-opt-hyperref01.luatexdev.tlg
-* zc-opt-hyperref01.tlg
-* zc-opt-hyperref01.xetex.tlg
-* zc-opt-hyperref01.xetexdev.tlg
-* zc-opt-hyperref02.luatex.tlg
-* zc-opt-hyperref02.luatexdev.tlg
-* zc-opt-hyperref02.tlg
-* zc-opt-hyperref02.xetex.tlg
-* zc-opt-hyperref02.xetexdev.tlg
-* zc-opt-hyperref03.luatex.tlg
-* zc-opt-hyperref03.luatexdev.tlg
-* zc-opt-hyperref03.tlg
-* zc-opt-hyperref03.xetex.tlg
-* zc-opt-hyperref03.xetexdev.tlg
-* zc-opt-hyperref04.luatex.tlg
-* zc-opt-hyperref04.luatexdev.tlg
-* zc-opt-hyperref04.tlg
-* zc-opt-hyperref04.xetex.tlg
-* zc-opt-hyperref04.xetexdev.tlg
-* zc-opt-hyperref05.luatex.tlg
-* zc-opt-hyperref05.luatexdev.tlg
-* zc-opt-hyperref05.tlg
-* zc-opt-hyperref05.xetex.tlg
-* zc-opt-hyperref05.xetexdev.tlg
-* zc-opt-ignore01.tlg
-* zc-opt-ignore02.tlg
-* zc-opt-msglevel01.tlg
-* zc-opt-msglevel02.tlg
-* zc-opt-msglevel03.tlg
-* zc-opt-msglevel04.tlg
-* zc-opt-msglevel05.tlg
-* zc-opt-msglevel06.tlg
-* zc-opt-msglevel07.tlg
-* zc-opt-msglevel08.tlg
-* zc-opt-msglevel09.tlg
-* zc-opt-msglevel10.tlg
-* zc-opt-onpage01.tlg
-* zc-opt-onpage02.tlg
-* zc-opt-onpage03.tlg
-* zc-opt-onpage04.tlg
-* zc-opt-onpage05.tlg
-* zc-opt-onpage06.tlg
-* zc-opt-onpage07.tlg
-* zc-opt-onpage08.tlg
-* zc-opt-onpage09.tlg
-
-
-## TDS manifest
-
-The following groups list the files included in the TeX Directory Structure used to install
-the package into a TeX distribution.
-
-### Source files (TDS)
-
-All files included in the `zref-check/source` directory.
-
-* zref-check.dtx
-* zref-check.ins
-
-### TeX files (TDS)
-
-All files included in the `zref-check/tex` directory.
-
-* zref-check.sty
-
-### Doc files (TDS)
-
-All files included in the `zref-check/doc` directory.
-
-* CHANGELOG.md
-* DEPENDS.txt
-* MANIFEST.md
-* README.md
-* zref-check-code.pdf
-* zref-check-code.tex
-* zref-check.pdf
-* zref-check.tex
-
-
-## CTAN manifest
-
-The following group lists the files included in the CTAN package.
-
-### CTAN files
-
-* CHANGELOG.md
-* DEPENDS.txt
-* MANIFEST.md
-* README.md
-* zref-check-code.pdf
-* zref-check-code.tex
-* zref-check.dtx
-* zref-check.ins
-* zref-check.pdf
-* zref-check.tex
diff --git a/macros/latex/contrib/zref-check/zref-check-code.pdf b/macros/latex/contrib/zref-check/zref-check-code.pdf
index 71e442e631..a1a9a62ba0 100644
--- a/macros/latex/contrib/zref-check/zref-check-code.pdf
+++ b/macros/latex/contrib/zref-check/zref-check-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/zref-check/zref-check-code.tex b/macros/latex/contrib/zref-check/zref-check-code.tex
index 81efd7f4ec..5645430295 100644
--- a/macros/latex/contrib/zref-check/zref-check-code.tex
+++ b/macros/latex/contrib/zref-check/zref-check-code.tex
@@ -24,7 +24,7 @@
% zref-check.ins,
% zref-check.tex,
% zref-check-code.tex,
-% and the files listed in MANIFEST.md.
+% and the files generated from them.
%
% The released version of this package is available from CTAN.
%
diff --git a/macros/latex/contrib/zref-check/zref-check.dtx b/macros/latex/contrib/zref-check/zref-check.dtx
index 186173b35c..9647be95fe 100644
--- a/macros/latex/contrib/zref-check/zref-check.dtx
+++ b/macros/latex/contrib/zref-check/zref-check.dtx
@@ -24,7 +24,7 @@
% zref-check.ins,
% zref-check.tex,
% zref-check-code.tex,
-% and the files listed in MANIFEST.md.
+% and the files generated from them.
%
% The released version of this package is available from CTAN.
%
@@ -124,12 +124,14 @@
% \section{Loading the package}
% \label{sec:loading-package}
%
-% As usual:
+% \pkg{zref-check} can be loaded with the usual:
%
% \begin{syntax}
-% \cs{usepackage}\oarg{options}|{zref-check}|
+% \cs{usepackage}|{zref-check}|
% \end{syntax}
%
+% The package does not accept load-time options, package options must be set
+% using \cs{zrefchecksetup} (see Section~\ref{sec:user-interface}).
%
%
% \section{Dependencies}
@@ -469,7 +471,11 @@
% A change log with relevant changes for each version, eventual upgrade
% instructions, and upcoming changes, is maintained in the package's
% repository, at
-% \url{https://github.com/gusbrs/zref-check/blob/main/CHANGELOG.md}.
+% \url{https://github.com/gusbrs/zref-check/blob/main/CHANGELOG.md}. The
+% change log is also distributed with the package's documentation through CTAN
+% upon release so, most likely, \texttt{texdoc zref-check/changelog} should
+% provide easy local access to it. An archive of historical versions of the
+% package is also kept at \url{https://github.com/gusbrs/zref-check/releases}.
%
%
%
@@ -510,7 +516,7 @@
%
% Identify the package.
% \begin{macrocode}
-\ProvidesExplPackage {zref-check} {2022-02-11} {0.2.5}
+\ProvidesExplPackage {zref-check} {2022-04-22} {0.3.0}
{Flexible cross-references with contextual checks based on zref}
% \end{macrocode}
%
@@ -660,6 +666,11 @@
}
\msg_new:nnn { zref-check } { option-deprecated }
{ Option~'#1'~has~been~deprecated~\msg_line_context:. }
+\msg_new:nnn { zref-check } { load-time-options }
+ {
+ 'zref-check'~does~not~accept~load-time~options.~
+ To~configure~package~options,~use~'\iow_char:N\\zrefchecksetup'.
+ }
% \end{macrocode}
%
%
@@ -918,11 +929,17 @@
%
% \subsubsection*{Package options}
%
-% Process load-time package options
-% (\url{https://tex.stackexchange.com/a/15840}).
-% \begin{macrocode}
-\RequirePackage { l3keys2e }
-\ProcessKeysOptions { zref-check }
+% \pkg{zref-check} does not accept load-time options. Despite the tradition
+% of so doing, Joseph Wright has a point in recommending otherwise at
+% \url{https://chat.stackexchange.com/transcript/message/60360822#60360822}:
+% separating ``loading the package'' from ``configuring the package'' grants
+% less trouble with ``option clashes'' and with expansion of options at
+% load-time.
+% \begin{macrocode}
+\bool_lazy_and:nnT
+ { \tl_if_exist_p:c { opt@ zref-check.sty } }
+ { ! \tl_if_empty_p:c { opt@ zref-check.sty } }
+ { \msg_warning:nn { zref-check } { load-time-options } }
% \end{macrocode}
%
%
diff --git a/macros/latex/contrib/zref-check/zref-check.ins b/macros/latex/contrib/zref-check/zref-check.ins
index 312a34c124..fe58b39e69 100644
--- a/macros/latex/contrib/zref-check/zref-check.ins
+++ b/macros/latex/contrib/zref-check/zref-check.ins
@@ -24,7 +24,7 @@
% zref-check.ins,
% zref-check.tex,
% zref-check-code.tex,
-% and the files listed in MANIFEST.md.
+% and the files generated from them.
%
% The released version of this package is available from CTAN.
%
@@ -70,7 +70,7 @@ This work consists of the files zref-check.dtx,
zref-check.ins,
zref-check.tex,
zref-check-code.tex,
- and the files listed in MANIFEST.md.
+ and the files generated from them.
The released version of this package is available from CTAN.
diff --git a/macros/latex/contrib/zref-check/zref-check.pdf b/macros/latex/contrib/zref-check/zref-check.pdf
index ecfd8ee3fa..fb0e239f4a 100644
--- a/macros/latex/contrib/zref-check/zref-check.pdf
+++ b/macros/latex/contrib/zref-check/zref-check.pdf
Binary files differ
diff --git a/macros/latex/contrib/zref-check/zref-check.tex b/macros/latex/contrib/zref-check/zref-check.tex
index 140d22bfd4..bed532befc 100644
--- a/macros/latex/contrib/zref-check/zref-check.tex
+++ b/macros/latex/contrib/zref-check/zref-check.tex
@@ -24,7 +24,7 @@
% zref-check.ins,
% zref-check.tex,
% zref-check-code.tex,
-% and the files listed in MANIFEST.md.
+% and the files generated from them.
%
% The released version of this package is available from CTAN.
%
diff --git a/macros/latex/contrib/zref-clever/CHANGELOG.md b/macros/latex/contrib/zref-clever/CHANGELOG.md
index 5023b04b7a..2a3f9bdbc4 100644
--- a/macros/latex/contrib/zref-clever/CHANGELOG.md
+++ b/macros/latex/contrib/zref-clever/CHANGELOG.md
@@ -1,6 +1,27 @@
# Changelog
-## [Unreleased](https://github.com/gusbrs/zref-clever/compare/v0.2.2-alpha...HEAD)
+## [Unreleased](https://github.com/gusbrs/zref-clever/compare/v0.3.0...HEAD)
+
+## [v0.3.0](https://github.com/gusbrs/zref-clever/compare/v0.2.2-alpha...v0.3.0) (2022-04-22)
+
+### Changed
+- `zref-clever` no longer accepts package options to be set a load-time,
+ `\zcsetup` must be used instead. The use of load-time options now results
+ in "Unknown option" LaTeX error. This change requires that users adjust
+ their documents, and a suitable package warning has been provided so that
+ affected users know of the change directly and how to adjust.
+- Option `check` has been made no-op in the preamble. To load the
+ corresponding package, just use the standard `\usepackage`.
+- (Internal) Use public hyperref's commands for building links instead of the
+ internal `\hyper@@link`.
+
+### Deprecated
+- Options `titleref` and `vario` have been deprecated. To load the
+ corresponding packages, just use the standard `\usepackage`.
+
+### Fixed
+- Bug which affected the typesetting with compression in case two ranges for
+ the same reference type occurred.
## [v0.2.2-alpha](https://github.com/gusbrs/zref-clever/compare/v0.2.1-alpha...v0.2.2-alpha) (2022-02-11)
diff --git a/macros/latex/contrib/zref-clever/MANIFEST.md b/macros/latex/contrib/zref-clever/MANIFEST.md
deleted file mode 100644
index 50b246d870..0000000000
--- a/macros/latex/contrib/zref-clever/MANIFEST.md
+++ /dev/null
@@ -1,522 +0,0 @@
-# Manifest for zref-clever
-
-This file is a listing of all files considered to be part of this package.
-It is automatically generated with `l3build manifest`.
-
-
-## Repository manifest
-
-The following groups list the files included in the development repository of the package.
-Files listed with a ‘†’ marker are included in the TDS but not CTAN files, and files listed
-with ‘‡’ are included in both.
-
-### Source files
-
-These are source files for a number of purposes, including the `unpack` process which
-generates the installation files of the package. Additional files included here will also
-be installed for processing such as testing.
-
-* zref-clever.dtx ‡
-* zref-clever.ins ‡
-
-### Typeset documentation source files
-
-These files are typeset using LaTeX to produce the PDF documentation for the package.
-
-* zref-clever-code.tex ‡
-* zref-clever.tex ‡
-
-### Text files
-
-Plain text files included as documentation or metadata.
-
-* CHANGELOG.md ‡
-* MANIFEST.md ‡
-* README.md ‡
-* readme-ctan.md
-* DEPENDS.txt ‡
-
-### Derived files
-
-The files created by ‘unpacking’ the package sources. This typically includes
-`.sty` and `.cls` files created from DocStrip `.dtx` files.
-
-* zref-clever.sty †
-* zref-clever-dutch.lang †
-* zref-clever-english.lang †
-* zref-clever-french.lang †
-* zref-clever-german.lang †
-* zref-clever-portuguese.lang †
-* zref-clever-spanish.lang †
-
-### Typeset documents
-
-The output files (PDF, essentially) from typesetting the various source, demo,
-etc., package files.
-
-* zref-clever-code.pdf ‡
-* zref-clever.pdf ‡
-
-### Test files
-
-These files form the test suite for the package. `.lvt` or `.lte` files are the individual
-unit tests, and `.tlg` are the stored output for ensuring changes to the package produce
-the same output. These output files are sometimes shared and sometime specific for
-different engines (pdfTeX, XeTeX, LuaTeX, etc.).
-
-* zc-LanguageSetup01.lvt
-* zc-LanguageSetup02.lvt
-* zc-LanguageSetup03.lvt
-* zc-RefTypeSetup01.lvt
-* zc-RefTypeSetup02.lvt
-* zc-RefTypeSetup03.lvt
-* zc-class-article01.lvt
-* zc-class-book01.lvt
-* zc-class-memoir01.lvt
-* zc-class-report01.lvt
-* zc-class-scrartcl01.lvt
-* zc-class-scrbook01.lvt
-* zc-class-scrreprt01.lvt
-* zc-compat-amsmath01.lvt
-* zc-compat-appendices01.lvt
-* zc-compat-appendix01.lvt
-* zc-compat-breqn01.lvt
-* zc-compat-enumitem01.lvt
-* zc-compat-koma-script01.lvt
-* zc-compat-listings01.lvt
-* zc-compat-memoir01.lvt
-* zc-compat-subcaption01.lvt
-* zc-compat-subfig01.lvt
-* zc-fallback01.lvt
-* zc-howto-amsmath01.lvt
-* zc-howto-enumitem01.lvt
-* zc-howto-listings01.lvt
-* zc-howto-newfloat01.lvt
-* zc-howto-newfloat02.lvt
-* zc-howto-newfloat03.lvt
-* zc-howto-newfloat04.lvt
-* zc-howto-newfloat05.lvt
-* zc-howto-newtheorem01.lvt
-* zc-howto-newtheorem02.lvt
-* zc-howto-newtheorem03.lvt
-* zc-howto-newtheorem04.lvt
-* zc-howto-zref-vario01.lvt
-* zc-howto-zref-xr01.lvt
-* zc-label-options01.lvt
-* zc-langfile-dutch01.lvt
-* zc-langfile-english01.lvt
-* zc-langfile-french01.lvt
-* zc-langfile-german01.lvt
-* zc-langfile-portuguese01.lvt
-* zc-langfile-spanish01.lvt
-* zc-languages01.lvt
-* zc-opt-check01.lvt
-* zc-opt-d01.lvt
-* zc-opt-g01.lvt
-* zc-opt-hyperref01.lvt
-* zc-opt-hyperref02.lvt
-* zc-opt-hyperref03.lvt
-* zc-opt-hyperref04.lvt
-* zc-opt-hyperref05.lvt
-* zc-opt-lang01.lvt
-* zc-opt-lang02.lvt
-* zc-opt-lang03.lvt
-* zc-opt-lang04.lvt
-* zc-opt-lang05.lvt
-* zc-opt-lang06.lvt
-* zc-opt-nocompat01.lvt
-* zc-opt-nocompat02.lvt
-* zc-opt-nocompat03.lvt
-* zc-opt-ref01.lvt
-* zc-opt-ref02.lvt
-* zc-opt-titleref01.lvt
-* zc-opt-vario01.lvt
-* zc-precedence-rules01.lvt
-* zc-sort01.lvt
-* zc-typeset01.lvt
-* zc-workaround-breqn01.lvt
-* zc-zcref-options01.lvt
-* zc-zcref-options02.lvt
-* zc-zcref-options03.lvt
-* zc-LanguageSetup01.luatex.tlg
-* zc-LanguageSetup01.luatexdev.tlg
-* zc-LanguageSetup01.tlg
-* zc-LanguageSetup01.xetex.tlg
-* zc-LanguageSetup01.xetexdev.tlg
-* zc-LanguageSetup02.luatex.tlg
-* zc-LanguageSetup02.luatexdev.tlg
-* zc-LanguageSetup02.tlg
-* zc-LanguageSetup02.xetex.tlg
-* zc-LanguageSetup02.xetexdev.tlg
-* zc-LanguageSetup03.luatex.tlg
-* zc-LanguageSetup03.luatexdev.tlg
-* zc-LanguageSetup03.tlg
-* zc-LanguageSetup03.xetex.tlg
-* zc-LanguageSetup03.xetexdev.tlg
-* zc-RefTypeSetup01.luatex.tlg
-* zc-RefTypeSetup01.luatexdev.tlg
-* zc-RefTypeSetup01.tlg
-* zc-RefTypeSetup01.xetex.tlg
-* zc-RefTypeSetup01.xetexdev.tlg
-* zc-RefTypeSetup02.luatex.tlg
-* zc-RefTypeSetup02.luatexdev.tlg
-* zc-RefTypeSetup02.tlg
-* zc-RefTypeSetup02.xetex.tlg
-* zc-RefTypeSetup02.xetexdev.tlg
-* zc-RefTypeSetup03.luatex.tlg
-* zc-RefTypeSetup03.luatexdev.tlg
-* zc-RefTypeSetup03.tlg
-* zc-RefTypeSetup03.xetex.tlg
-* zc-RefTypeSetup03.xetexdev.tlg
-* zc-class-article01.luatex.tlg
-* zc-class-article01.luatexdev.tlg
-* zc-class-article01.tlg
-* zc-class-article01.xetex.tlg
-* zc-class-article01.xetexdev.tlg
-* zc-class-book01.luatex.tlg
-* zc-class-book01.luatexdev.tlg
-* zc-class-book01.tlg
-* zc-class-book01.xetex.tlg
-* zc-class-book01.xetexdev.tlg
-* zc-class-memoir01.luatex.tlg
-* zc-class-memoir01.luatexdev.tlg
-* zc-class-memoir01.tlg
-* zc-class-memoir01.xetex.tlg
-* zc-class-memoir01.xetexdev.tlg
-* zc-class-report01.luatex.tlg
-* zc-class-report01.luatexdev.tlg
-* zc-class-report01.tlg
-* zc-class-report01.xetex.tlg
-* zc-class-report01.xetexdev.tlg
-* zc-class-scrartcl01.luatex.tlg
-* zc-class-scrartcl01.luatexdev.tlg
-* zc-class-scrartcl01.tlg
-* zc-class-scrartcl01.xetex.tlg
-* zc-class-scrartcl01.xetexdev.tlg
-* zc-class-scrbook01.luatex.tlg
-* zc-class-scrbook01.luatexdev.tlg
-* zc-class-scrbook01.tlg
-* zc-class-scrbook01.xetex.tlg
-* zc-class-scrbook01.xetexdev.tlg
-* zc-class-scrreprt01.luatex.tlg
-* zc-class-scrreprt01.luatexdev.tlg
-* zc-class-scrreprt01.tlg
-* zc-class-scrreprt01.xetex.tlg
-* zc-class-scrreprt01.xetexdev.tlg
-* zc-compat-amsmath01.luatex.tlg
-* zc-compat-amsmath01.luatexdev.tlg
-* zc-compat-amsmath01.tlg
-* zc-compat-amsmath01.xetex.tlg
-* zc-compat-amsmath01.xetexdev.tlg
-* zc-compat-appendices01.luatex.tlg
-* zc-compat-appendices01.luatexdev.tlg
-* zc-compat-appendices01.tlg
-* zc-compat-appendices01.xetex.tlg
-* zc-compat-appendices01.xetexdev.tlg
-* zc-compat-appendix01.luatex.tlg
-* zc-compat-appendix01.luatexdev.tlg
-* zc-compat-appendix01.tlg
-* zc-compat-appendix01.xetex.tlg
-* zc-compat-appendix01.xetexdev.tlg
-* zc-compat-breqn01.luatex.tlg
-* zc-compat-breqn01.luatexdev.tlg
-* zc-compat-breqn01.tlg
-* zc-compat-breqn01.xetex.tlg
-* zc-compat-breqn01.xetexdev.tlg
-* zc-compat-enumitem01.luatex.tlg
-* zc-compat-enumitem01.luatexdev.tlg
-* zc-compat-enumitem01.tlg
-* zc-compat-enumitem01.xetex.tlg
-* zc-compat-enumitem01.xetexdev.tlg
-* zc-compat-koma-script01.luatex.tlg
-* zc-compat-koma-script01.luatexdev.tlg
-* zc-compat-koma-script01.tlg
-* zc-compat-koma-script01.xetex.tlg
-* zc-compat-koma-script01.xetexdev.tlg
-* zc-compat-listings01.luatex.tlg
-* zc-compat-listings01.luatexdev.tlg
-* zc-compat-listings01.tlg
-* zc-compat-listings01.xetex.tlg
-* zc-compat-listings01.xetexdev.tlg
-* zc-compat-memoir01.luatex.tlg
-* zc-compat-memoir01.luatexdev.tlg
-* zc-compat-memoir01.tlg
-* zc-compat-memoir01.xetex.tlg
-* zc-compat-memoir01.xetexdev.tlg
-* zc-compat-subcaption01.luatex.tlg
-* zc-compat-subcaption01.luatexdev.tlg
-* zc-compat-subcaption01.tlg
-* zc-compat-subcaption01.xetex.tlg
-* zc-compat-subcaption01.xetexdev.tlg
-* zc-compat-subfig01.luatex.tlg
-* zc-compat-subfig01.luatexdev.tlg
-* zc-compat-subfig01.tlg
-* zc-compat-subfig01.xetex.tlg
-* zc-compat-subfig01.xetexdev.tlg
-* zc-fallback01.luatex.tlg
-* zc-fallback01.luatexdev.tlg
-* zc-fallback01.tlg
-* zc-fallback01.xetex.tlg
-* zc-fallback01.xetexdev.tlg
-* zc-howto-amsmath01.luatex.tlg
-* zc-howto-amsmath01.luatexdev.tlg
-* zc-howto-amsmath01.tlg
-* zc-howto-amsmath01.xetex.tlg
-* zc-howto-amsmath01.xetexdev.tlg
-* zc-howto-enumitem01.luatex.tlg
-* zc-howto-enumitem01.luatexdev.tlg
-* zc-howto-enumitem01.tlg
-* zc-howto-enumitem01.xetex.tlg
-* zc-howto-enumitem01.xetexdev.tlg
-* zc-howto-listings01.luatex.tlg
-* zc-howto-listings01.luatexdev.tlg
-* zc-howto-listings01.tlg
-* zc-howto-listings01.xetex.tlg
-* zc-howto-listings01.xetexdev.tlg
-* zc-howto-newfloat01.luatex.tlg
-* zc-howto-newfloat01.luatexdev.tlg
-* zc-howto-newfloat01.tlg
-* zc-howto-newfloat01.xetex.tlg
-* zc-howto-newfloat01.xetexdev.tlg
-* zc-howto-newfloat02.luatex.tlg
-* zc-howto-newfloat02.luatexdev.tlg
-* zc-howto-newfloat02.tlg
-* zc-howto-newfloat02.xetex.tlg
-* zc-howto-newfloat02.xetexdev.tlg
-* zc-howto-newfloat03.luatex.tlg
-* zc-howto-newfloat03.luatexdev.tlg
-* zc-howto-newfloat03.tlg
-* zc-howto-newfloat03.xetex.tlg
-* zc-howto-newfloat03.xetexdev.tlg
-* zc-howto-newfloat04.luatex.tlg
-* zc-howto-newfloat04.luatexdev.tlg
-* zc-howto-newfloat04.tlg
-* zc-howto-newfloat04.xetex.tlg
-* zc-howto-newfloat04.xetexdev.tlg
-* zc-howto-newfloat05.luatex.tlg
-* zc-howto-newfloat05.luatexdev.tlg
-* zc-howto-newfloat05.tlg
-* zc-howto-newfloat05.xetex.tlg
-* zc-howto-newfloat05.xetexdev.tlg
-* zc-howto-newtheorem01.luatex.tlg
-* zc-howto-newtheorem01.luatexdev.tlg
-* zc-howto-newtheorem01.tlg
-* zc-howto-newtheorem01.xetex.tlg
-* zc-howto-newtheorem01.xetexdev.tlg
-* zc-howto-newtheorem02.luatex.tlg
-* zc-howto-newtheorem02.luatexdev.tlg
-* zc-howto-newtheorem02.tlg
-* zc-howto-newtheorem02.xetex.tlg
-* zc-howto-newtheorem02.xetexdev.tlg
-* zc-howto-newtheorem03.luatex.tlg
-* zc-howto-newtheorem03.luatexdev.tlg
-* zc-howto-newtheorem03.tlg
-* zc-howto-newtheorem03.xetex.tlg
-* zc-howto-newtheorem03.xetexdev.tlg
-* zc-howto-newtheorem04.luatex.tlg
-* zc-howto-newtheorem04.luatexdev.tlg
-* zc-howto-newtheorem04.tlg
-* zc-howto-newtheorem04.xetex.tlg
-* zc-howto-newtheorem04.xetexdev.tlg
-* zc-howto-zref-vario01.luatex.tlg
-* zc-howto-zref-vario01.luatexdev.tlg
-* zc-howto-zref-vario01.tlg
-* zc-howto-zref-vario01.xetex.tlg
-* zc-howto-zref-vario01.xetexdev.tlg
-* zc-howto-zref-xr01.luatex.tlg
-* zc-howto-zref-xr01.luatexdev.tlg
-* zc-howto-zref-xr01.tlg
-* zc-howto-zref-xr01.xetex.tlg
-* zc-howto-zref-xr01.xetexdev.tlg
-* zc-label-options01.luatex.tlg
-* zc-label-options01.luatexdev.tlg
-* zc-label-options01.tlg
-* zc-langfile-dutch01.tlg
-* zc-langfile-english01.tlg
-* zc-langfile-french01.tlg
-* zc-langfile-german01.tlg
-* zc-langfile-portuguese01.luatex.tlg
-* zc-langfile-portuguese01.luatexdev.tlg
-* zc-langfile-portuguese01.tlg
-* zc-langfile-portuguese01.xetex.tlg
-* zc-langfile-portuguese01.xetexdev.tlg
-* zc-langfile-spanish01.tlg
-* zc-languages01.tlg
-* zc-opt-check01.luatex.tlg
-* zc-opt-check01.luatexdev.tlg
-* zc-opt-check01.tlg
-* zc-opt-d01.tlg
-* zc-opt-g01.tlg
-* zc-opt-hyperref01.luatex.tlg
-* zc-opt-hyperref01.luatexdev.tlg
-* zc-opt-hyperref01.tlg
-* zc-opt-hyperref01.xetex.tlg
-* zc-opt-hyperref01.xetexdev.tlg
-* zc-opt-hyperref02.luatex.tlg
-* zc-opt-hyperref02.luatexdev.tlg
-* zc-opt-hyperref02.tlg
-* zc-opt-hyperref02.xetex.tlg
-* zc-opt-hyperref02.xetexdev.tlg
-* zc-opt-hyperref03.luatex.tlg
-* zc-opt-hyperref03.luatexdev.tlg
-* zc-opt-hyperref03.tlg
-* zc-opt-hyperref03.xetex.tlg
-* zc-opt-hyperref03.xetexdev.tlg
-* zc-opt-hyperref04.luatex.tlg
-* zc-opt-hyperref04.luatexdev.tlg
-* zc-opt-hyperref04.tlg
-* zc-opt-hyperref04.xetex.tlg
-* zc-opt-hyperref04.xetexdev.tlg
-* zc-opt-hyperref05.luatex.tlg
-* zc-opt-hyperref05.luatexdev.tlg
-* zc-opt-hyperref05.tlg
-* zc-opt-hyperref05.xetex.tlg
-* zc-opt-hyperref05.xetexdev.tlg
-* zc-opt-lang01.luatex.tlg
-* zc-opt-lang01.luatexdev.tlg
-* zc-opt-lang01.tlg
-* zc-opt-lang01.xetex.tlg
-* zc-opt-lang01.xetexdev.tlg
-* zc-opt-lang02.luatex.tlg
-* zc-opt-lang02.luatexdev.tlg
-* zc-opt-lang02.tlg
-* zc-opt-lang02.xetex.tlg
-* zc-opt-lang02.xetexdev.tlg
-* zc-opt-lang03.luatex.tlg
-* zc-opt-lang03.luatexdev.tlg
-* zc-opt-lang03.tlg
-* zc-opt-lang03.xetex.tlg
-* zc-opt-lang03.xetexdev.tlg
-* zc-opt-lang04.luatex.tlg
-* zc-opt-lang04.luatexdev.tlg
-* zc-opt-lang04.tlg
-* zc-opt-lang04.xetex.tlg
-* zc-opt-lang04.xetexdev.tlg
-* zc-opt-lang05.luatex.tlg
-* zc-opt-lang05.luatexdev.tlg
-* zc-opt-lang05.tlg
-* zc-opt-lang05.xetex.tlg
-* zc-opt-lang05.xetexdev.tlg
-* zc-opt-lang06.luatex.tlg
-* zc-opt-lang06.luatexdev.tlg
-* zc-opt-lang06.tlg
-* zc-opt-lang06.xetex.tlg
-* zc-opt-lang06.xetexdev.tlg
-* zc-opt-nocompat01.luatex.tlg
-* zc-opt-nocompat01.luatexdev.tlg
-* zc-opt-nocompat01.tlg
-* zc-opt-nocompat01.xetex.tlg
-* zc-opt-nocompat01.xetexdev.tlg
-* zc-opt-nocompat02.luatex.tlg
-* zc-opt-nocompat02.luatexdev.tlg
-* zc-opt-nocompat02.tlg
-* zc-opt-nocompat02.xetex.tlg
-* zc-opt-nocompat02.xetexdev.tlg
-* zc-opt-nocompat03.luatex.tlg
-* zc-opt-nocompat03.luatexdev.tlg
-* zc-opt-nocompat03.tlg
-* zc-opt-nocompat03.xetex.tlg
-* zc-opt-nocompat03.xetexdev.tlg
-* zc-opt-ref01.tlg
-* zc-opt-ref02.luatex.tlg
-* zc-opt-ref02.luatexdev.tlg
-* zc-opt-ref02.tlg
-* zc-opt-ref02.xetex.tlg
-* zc-opt-ref02.xetexdev.tlg
-* zc-opt-titleref01.luatex.tlg
-* zc-opt-titleref01.luatexdev.tlg
-* zc-opt-titleref01.tlg
-* zc-opt-titleref01.xetex.tlg
-* zc-opt-titleref01.xetexdev.tlg
-* zc-opt-vario01.luatex.tlg
-* zc-opt-vario01.luatexdev.tlg
-* zc-opt-vario01.tlg
-* zc-opt-vario01.xetex.tlg
-* zc-opt-vario01.xetexdev.tlg
-* zc-precedence-rules01.luatex.tlg
-* zc-precedence-rules01.luatexdev.tlg
-* zc-precedence-rules01.tlg
-* zc-precedence-rules01.xetex.tlg
-* zc-precedence-rules01.xetexdev.tlg
-* zc-sort01.tlg
-* zc-typeset01.luatex.tlg
-* zc-typeset01.luatexdev.tlg
-* zc-typeset01.tlg
-* zc-typeset01.xetex.tlg
-* zc-typeset01.xetexdev.tlg
-* zc-workaround-breqn01.luatex.tlg
-* zc-workaround-breqn01.luatexdev.tlg
-* zc-workaround-breqn01.tlg
-* zc-workaround-breqn01.xetex.tlg
-* zc-workaround-breqn01.xetexdev.tlg
-* zc-zcref-options01.luatex.tlg
-* zc-zcref-options01.luatexdev.tlg
-* zc-zcref-options01.tlg
-* zc-zcref-options01.xetex.tlg
-* zc-zcref-options01.xetexdev.tlg
-* zc-zcref-options02.luatex.tlg
-* zc-zcref-options02.luatexdev.tlg
-* zc-zcref-options02.tlg
-* zc-zcref-options02.xetex.tlg
-* zc-zcref-options02.xetexdev.tlg
-* zc-zcref-options03.luatex.tlg
-* zc-zcref-options03.luatexdev.tlg
-* zc-zcref-options03.tlg
-* zc-zcref-options03.xetex.tlg
-* zc-zcref-options03.xetexdev.tlg
-
-
-## TDS manifest
-
-The following groups list the files included in the TeX Directory Structure used to install
-the package into a TeX distribution.
-
-### Source files (TDS)
-
-All files included in the `zref-clever/source` directory.
-
-* zref-clever.dtx
-* zref-clever.ins
-
-### TeX files (TDS)
-
-All files included in the `zref-clever/tex` directory.
-
-* zref-clever-dutch.lang
-* zref-clever-english.lang
-* zref-clever-french.lang
-* zref-clever-german.lang
-* zref-clever-portuguese.lang
-* zref-clever-spanish.lang
-* zref-clever.sty
-
-### Doc files (TDS)
-
-All files included in the `zref-clever/doc` directory.
-
-* CHANGELOG.md
-* DEPENDS.txt
-* MANIFEST.md
-* README.md
-* zref-clever-code.pdf
-* zref-clever-code.tex
-* zref-clever.pdf
-* zref-clever.tex
-
-
-## CTAN manifest
-
-The following group lists the files included in the CTAN package.
-
-### CTAN files
-
-* CHANGELOG.md
-* DEPENDS.txt
-* MANIFEST.md
-* README.md
-* zref-clever-code.pdf
-* zref-clever-code.tex
-* zref-clever.dtx
-* zref-clever.ins
-* zref-clever.pdf
-* zref-clever.tex
diff --git a/macros/latex/contrib/zref-clever/zref-clever-code.pdf b/macros/latex/contrib/zref-clever/zref-clever-code.pdf
index c77a6ef340..de4ac178cf 100644
--- a/macros/latex/contrib/zref-clever/zref-clever-code.pdf
+++ b/macros/latex/contrib/zref-clever/zref-clever-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/zref-clever/zref-clever-code.tex b/macros/latex/contrib/zref-clever/zref-clever-code.tex
index edc439e5c3..e1bc9d0289 100644
--- a/macros/latex/contrib/zref-clever/zref-clever-code.tex
+++ b/macros/latex/contrib/zref-clever/zref-clever-code.tex
@@ -24,7 +24,7 @@
% zref-clever.ins,
% zref-clever.tex,
% zref-clever-code.tex,
-% and the files listed in MANIFEST.md.
+% and the files generated from them.
%
% The released version of this package is available from CTAN.
%
@@ -44,7 +44,10 @@
% Have \GetFileInfo pick up date and version data and used in the
% documentation.
-\usepackage[cap,nameinlink=false,check,titleref]{zref-clever}
+\usepackage{zref-clever}
+\zcsetup{cap,nameinlink=false}
+\usepackage{zref-check}
+\usepackage{zref-titleref}
\begin{document}
diff --git a/macros/latex/contrib/zref-clever/zref-clever.dtx b/macros/latex/contrib/zref-clever/zref-clever.dtx
index 5464fb5575..79eb3dd285 100644
--- a/macros/latex/contrib/zref-clever/zref-clever.dtx
+++ b/macros/latex/contrib/zref-clever/zref-clever.dtx
@@ -24,7 +24,7 @@
% zref-clever.ins,
% zref-clever.tex,
% zref-clever-code.tex,
-% and the files listed in MANIFEST.md.
+% and the files generated from them.
%
% The released version of this package is available from CTAN.
%
@@ -46,7 +46,10 @@
% Have \GetFileInfo pick up date and version data and used in the
% documentation.
-\usepackage[cap,nameinlink=false,check,titleref]{zref-clever}
+\usepackage{zref-clever}
+\zcsetup{cap,nameinlink=false}
+\usepackage{zref-check}
+\usepackage{zref-titleref}
\begin{document}
@@ -162,7 +165,7 @@
%
% Identify the package.
% \begin{macrocode}
-\ProvidesExplPackage {zref-clever} {2022-02-11} {0.2.2-alpha}
+\ProvidesExplPackage {zref-clever} {2022-04-22} {0.3.0}
{Clever LaTeX cross-references based on zref}
% \end{macrocode}
%
@@ -176,7 +179,6 @@
\RequirePackage { zref-base }
\RequirePackage { zref-user }
\RequirePackage { zref-abspage }
-\RequirePackage { l3keys2e }
\RequirePackage { ifdraft }
% \end{macrocode}
%
@@ -453,20 +455,18 @@
% luckily however, we have \texttt{abspage} which solves this problem. But we
% can decide whether two labels can be compressed into a range or not based on
% this format: if they are identical, we can compress them, otherwise, we
-% can't. To do so, we locally redefine \cs{c@page} to return ``1'', thus
-% avoiding any global spillovers of this trick. Since this operation is not
-% expandable we cannot run it directly from the property definition. Hence,
-% we use a shipout hook, and set \cs{g_@@_page_format_tl}, which can then be
-% retrieved by the starred definition of
-% \texttt{\cs{zref@newprop}*\{zc@pgfmt\}}.
+% can't. To do so, we locally set \cs{c@page} to ``1'', thus avoiding any
+% global spillovers of this trick. Since this operation is not expandable we
+% cannot run it directly from the property definition. Hence, we use a
+% shipout hook, and set \cs{g_@@_page_format_tl}, which can then be retrieved
+% by the starred definition of \texttt{\cs{zref@newprop}*\{zc@pgfmt\}}.
%
% \begin{macrocode}
\tl_new:N \g_@@_page_format_tl
-\cs_new_protected:Npx \@@_page_format_aux: { \int_eval:n { 1 } }
\AddToHook { shipout / before }
{
\group_begin:
- \cs_set_eq:NN \c@page \@@_page_format_aux:
+ \int_set:Nn \c@page { 1 }
\tl_gset:Nx \g_@@_page_format_tl { \thepage }
\group_end:
}
@@ -620,11 +620,6 @@
}
\msg_new:nnn { zref-clever } { missing-hyperref }
{ Missing~'hyperref'~package.~Setting~'hyperref=false'. }
-\msg_new:nnn { zref-clever } { titleref-preamble-only }
- {
- Option~'titleref'~only~available~in~the~preamble~\msg_line_context:.~
- Did~you~mean~'ref=title'?.
- }
\msg_new:nnn { zref-clever } { option-preamble-only }
{ Option~'#1'~only~available~in~the~preamble~\msg_line_context:. }
\msg_new:nnn { zref-clever } { unknown-compat-module }
@@ -665,6 +660,11 @@
Option~'#1'~has~been~deprecated~\msg_line_context:.\iow_newline:
Use~'#2'~instead.
}
+\msg_new:nnn { zref-clever } { load-time-options }
+ {
+ 'zref-clever'~does~not~accept~load-time~options.~
+ To~configure~package~options,~use~'\iow_char:N\\zcsetup'.
+ }
% \end{macrocode}
%
%
@@ -3626,17 +3626,8 @@
% \end{macrocode}
%
%
-%
% \subsubsection*{\opt{font} option}
%
-% \opt{font} \emph{can't be used as a package option}, since the options get
-% expanded by \LaTeX{} before being passed to the package (see
-% \url{https://tex.stackexchange.com/a/489570}). It can be set in \cs{zcref}
-% and, for global settings, with \cs{zcsetup}. Note that, technically, the
-% ``raw'' options are already available as \cs{@raw@opt@\meta{package}.sty}
-% (helpful comment by \contributor{David Carlisle} at
-% \url{https://tex.stackexchange.com/a/618439}).
-%
% \begin{macrocode}
\tl_new:N \l_@@_ref_typeset_font_tl
\keys_define:nn { zref-clever/reference }
@@ -3644,22 +3635,17 @@
% \end{macrocode}
%
%
-%
% \subsubsection*{\opt{titleref} option}
%
% \begin{macrocode}
\keys_define:nn { zref-clever/reference }
{
- titleref .code:n = { \RequirePackage { zref-titleref } } ,
- titleref .value_forbidden:n = true ,
- }
-\AddToHook { begindocument }
- {
- \keys_define:nn { zref-clever/reference }
+ titleref .code:n =
{
- titleref .code:n =
- { \msg_warning:nn { zref-clever } { titleref-preamble-only } }
- }
+ % NOTE Option deprecated in 2022-04-22 for 0.3.0.
+ \msg_warning:nnxx { zref-clever }{ option-deprecated } { titleref }
+ { \iow_char:N\\usepackage\iow_char:N\{zref-titleref\iow_char:N\} }
+ } ,
}
% \end{macrocode}
%
@@ -3669,19 +3655,12 @@
% \begin{macrocode}
\keys_define:nn { zref-clever/reference }
{
- vario .code:n = { \RequirePackage { zref-vario } } ,
- vario .value_forbidden:n = true ,
- }
-\AddToHook { begindocument }
- {
- \keys_define:nn { zref-clever/reference }
+ vario .code:n =
{
- vario .code:n =
- {
- \msg_warning:nnn { zref-clever }
- { option-preamble-only } { vario }
- }
- }
+ % NOTE Option deprecated in 2022-04-22 for 0.3.0.
+ \msg_warning:nnxx { zref-clever }{ option-deprecated } { vario }
+ { \iow_char:N\\usepackage\iow_char:N\{zref-vario\iow_char:N\} }
+ } ,
}
% \end{macrocode}
%
@@ -3707,8 +3686,8 @@
\bool_new:N \l_@@_zcref_with_check_bool
\keys_define:nn { zref-clever/reference }
{
- check .code:n = { \RequirePackage { zref-check } } ,
- check .value_forbidden:n = true ,
+ check .code:n =
+ { \msg_warning:nnn { zref-clever } { option-document-only } { check } } ,
}
\AddToHook { begindocument }
{
@@ -4116,8 +4095,8 @@
% potentially apply them selectively to different contexts: \texttt{label} and
% \texttt{reference}. Currently, the only use of this selection is the
% ability to exclude label related options from \cs{zcref}'s options. Anyway,
-% for load-time package options and for \cs{zcsetup} we want the whole set, so
-% we aggregate the two into \texttt{zref-clever/zcsetup}, and use that here.
+% for package options (\cs{zcsetup}) we want the whole set, so we aggregate
+% the two into \texttt{zref-clever/zcsetup}, and use that here.
%
% \begin{macrocode}
\keys_define:nn { }
@@ -4131,14 +4110,20 @@
% \end{macrocode}
%
%
-% Process load-time package options
-% (\url{https://tex.stackexchange.com/a/15840}).
+% \pkg{zref-clever} does not accept load-time options. Despite the tradition
+% of so doing, Joseph Wright has a point in recommending otherwise at
+% \url{https://chat.stackexchange.com/transcript/message/60360822#60360822}:
+% separating ``loading the package'' from ``configuring the package'' grants
+% less trouble with ``option clashes'' and with expansion of options at
+% load-time.
% \begin{macrocode}
-\ProcessKeysOptions { zref-clever/zcsetup }
+\bool_lazy_and:nnT
+ { \tl_if_exist_p:c { opt@ zref-clever.sty } }
+ { ! \tl_if_empty_p:c { opt@ zref-clever.sty } }
+ { \msg_warning:nn { zref-clever } { load-time-options } }
% \end{macrocode}
%
%
-%
% \section{Configuration}
%
% \subsection{\cs{zcsetup}}
@@ -6461,8 +6446,7 @@
{
\exp_not:N \group_begin:
\exp_not:V \l_@@_namefont_tl
- % It's two `@s', but escaped for DocStrip.
- \exp_not:N \hyper@@@@link
+ \@@_hyperlink:nnn
{
\@@_extract_url_unexp:V
\l_@@_type_first_label_tl
@@ -6800,6 +6784,10 @@
}
}
}
+ % We just closed a range, reset `range_beg_is_first' in case a
+ % second range for the same type occurs, in which case its
+ % `range_beg' will no longer be `first'.
+ \bool_set_false:N \l_@@_range_beg_is_first_bool
% Reset counters.
\int_zero:N \l_@@_range_count_int
\int_zero:N \l_@@_range_same_count_int
@@ -6877,8 +6865,7 @@
\exp_not:N \group_begin:
\exp_not:V \l_@@_reffont_tl
\seq_item:Nn #2 { 1 }
- % It's two `@s', but escaped for DocStrip.
- \exp_not:N \hyper@@@@link
+ \@@_hyperlink:nnn
{ \@@_extract_url_unexp:n {#1} }
{ \@@_extract_unexp:nnn {#1} { anchor } { } }
{
@@ -6927,8 +6914,7 @@
\exp_not:N \group_begin:
\exp_not:V \l_@@_reffont_tl
\seq_item:Nn #3 { 1 }
- % It's two `@s', but escaped for DocStrip.
- \exp_not:N \hyper@@@@link
+ \@@_hyperlink:nnn
{ \@@_extract_url_unexp:n {#1} }
{ \@@_extract_unexp:nnn {#1} { anchor } { } }
{
@@ -6978,8 +6964,7 @@
{ \l_@@_ref_property_tl }
{
\exp_not:N \group_begin:
- % It's two `@s', but escaped for DocStrip.
- \exp_not:N \hyper@@@@link
+ \@@_hyperlink:nnn
{
\@@_extract_url_unexp:V
\l_@@_type_first_label_tl
@@ -7045,8 +7030,7 @@
\exp_not:V \l_@@_reffont_tl
\seq_item:Nn
\l_@@_type_first_refbounds_seq { 1 }
- % It's two `@s', but escaped for DocStrip.
- \exp_not:N \hyper@@@@link
+ \@@_hyperlink:nnn
{
\@@_extract_url_unexp:V
\l_@@_type_first_label_tl
@@ -7341,6 +7325,25 @@
% \end{macro}
%
%
+% \begin{macro}{\@@_hyperlink:nnn}
+% This avoids using the internal \cs[replace=false]{hyper@@link}, using only
+% public \pkg{hyperref} commands (see
+% \url{https://github.com/latex3/hyperref/issues/229#issuecomment-1093870142},
+% thanks \contributor{Ulrike Fisher}).
+% \begin{syntax}
+% \cs{@@_hyperlink:nnn} \Arg{url/file} \Arg{anchor} \Arg{text}
+% \end{syntax}
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_hyperlink:nnn #1#2#3
+ {
+ \tl_if_empty:nTF {#1}
+ { \hyperlink {#2} {#3} }
+ { \hyper@linkfile {#3} {#1} {#2} }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+%
% \begin{macro}{\@@_extract_url_unexp:n}
% A convenience auxiliary function for extraction of the \texttt{url} /
% \texttt{urluse} property, provided by the \pkg{zref-xr} module. Ensure
diff --git a/macros/latex/contrib/zref-clever/zref-clever.ins b/macros/latex/contrib/zref-clever/zref-clever.ins
index 69c052679e..bcad3db50a 100644
--- a/macros/latex/contrib/zref-clever/zref-clever.ins
+++ b/macros/latex/contrib/zref-clever/zref-clever.ins
@@ -24,7 +24,7 @@
% zref-clever.ins,
% zref-clever.tex,
% zref-clever-code.tex,
-% and the files listed in MANIFEST.md.
+% and the files generated from them.
%
% The released version of this package is available from CTAN.
%
@@ -70,7 +70,7 @@ This work consists of the files zref-clever.dtx,
zref-clever.ins,
zref-clever.tex,
zref-clever-code.tex,
- and the files listed in MANIFEST.md.
+ and the files generated from them.
The released version of this package is available from CTAN.
diff --git a/macros/latex/contrib/zref-clever/zref-clever.pdf b/macros/latex/contrib/zref-clever/zref-clever.pdf
index 2b439d1d54..213e51bf6b 100644
--- a/macros/latex/contrib/zref-clever/zref-clever.pdf
+++ b/macros/latex/contrib/zref-clever/zref-clever.pdf
Binary files differ
diff --git a/macros/latex/contrib/zref-clever/zref-clever.tex b/macros/latex/contrib/zref-clever/zref-clever.tex
index e26992005d..ee00821c16 100644
--- a/macros/latex/contrib/zref-clever/zref-clever.tex
+++ b/macros/latex/contrib/zref-clever/zref-clever.tex
@@ -24,7 +24,7 @@
% zref-clever.ins,
% zref-clever.tex,
% zref-clever-code.tex,
-% and the files listed in MANIFEST.md.
+% and the files generated from them.
%
% The released version of this package is available from CTAN.
%
@@ -44,7 +44,10 @@
% The package itself *must* be loaded so that \GetFileInfo can pick up date
% and version data. Naturally, we also use it.
-\usepackage[cap,check,titleref]{zref-clever}
+\usepackage{zref-clever}
+\zcsetup{cap}
+\usepackage{zref-check}
+\usepackage{zref-titleref}
\usepackage[T1]{fontenc}
@@ -300,21 +303,22 @@ you should be ready to accommodate to eventual upstream changes.
\section{Loading the package}
\zlabel{sec:loading-package}
-As usual:
+\pkg{zref-clever} can be loaded with the usual:
-\begin{zcexample}[escapeinside=`']
-\usepackage`\oarg{options}'{zref-clever}
+\begin{zcexample}
+\usepackage{zref-clever}
\end{zcexample}
+The package does not accept load-time options, package options must be set
+using \cs{zcsetup} (see \zcref{sec:user-interface}).
\section{Dependencies}
\pkg{zref-clever} requires \pkg{zref}, and \LaTeX{} kernel 2021-11-15, or
-newer. It also needs \pkg{l3keys2e} and \pkg{ifdraft}. Some packages are
-leveraged by \pkg{zref-clever} if they are present, but are not loaded by
-default or required by it, namely: \pkg{hyperref}, \pkg{zref-check}, and
-\pkg{zref}'s \pkg{zref-titleref}, \pkg{zref-hyperref}, and \pkg{zref-xr}
-modules.
+newer. It also needs \pkg{ifdraft}. Some packages are leveraged by
+\pkg{zref-clever} if they are present, but are not loaded by default or
+required by it, namely: \pkg{hyperref}, \pkg{zref-check}, and \pkg{zref}'s
+\pkg{zref-titleref}, \pkg{zref-hyperref}, and \pkg{zref-xr} modules.
\section{User interface}
@@ -402,14 +406,13 @@ as a whole; and ``reference format options'', which control the detail of
reference formatting, including type-specific and language-specific settings.
This section covers the first group (for the second one, see
-\zcref{sec:reference-format}). General options can be set globally either as
-package options at load-time (see \zcref{sec:loading-package}) or by means of
-\cs{zcsetup} in the preamble (see \zcref{sec:user-interface}). They can also
-be set locally with \cs{zcsetup} along the document or through the optional
-argument of \cs{zcref} (see \zcref{sec:user-interface}). Most general options
-can be used in any of these contexts, but that is not necessarily true for all
-cases, some restrictions may apply, as described in each option's
-documentation.
+\zcref{sec:reference-format}). General options can be set globally by means
+of \cs{zcsetup} in the preamble (see \zcref{sec:user-interface}). They can
+also be set locally with \cs{zcsetup} along the document or through the
+optional argument of \cs{zcref} (see \zcref{sec:user-interface}). Most
+general options can be used in any of these contexts, but that is not
+necessarily true for all cases, some restrictions may apply, as described in
+each option's documentation.
\bigskip{}
@@ -708,16 +711,6 @@ are handled by \LaTeX{}, the fact that this option receives commands as value
means this option \emph{can't} be set at load time, as a package option. If
you want to set it globally, use \cs{zcsetup} instead.
-\DescribeOption{titleref} %
-\DescribeOption{vario} %
-The \opt{titleref} option receives no value and, when given, loads
-\pkg{zref}'s \pkg{zref-titleref} module. Similarly, the \opt{vario} option
-loads the \pkg{zref-vario} package. These are a preamble only options. Note
-that \pkg{zref-vario} loads \pkg{varioref}, which has known load order
-interaction with other packages, prominently with \pkg{hyperref}. Hence,
-depending on your document, you may wish to load \pkg{zref-vario} separately,
-instead of through the option.
-
\DescribeOption{note} %
The \opt{note} option receives as value some text to be typeset at the end of
the whole reference list. It is separated from it by \opt{notesep} (see
@@ -725,15 +718,14 @@ the whole reference list. It is separated from it by \opt{notesep} (see
\DescribeOption{check} %
Provides integration of \pkg{zref-clever} with the \pkg{zref-check} package.
-In the preamble, the \opt{check} option receives no value and, when given,
-loads \pkg{zref-check}. In the document body, \opt{check} requires a value,
-which works exactly like the optional argument of \cs{zcheck}, and can receive
-both checks and \cs{zcheck}'s options. And the checks are performed for each
-label in \marg{labels} received as argument by \cs{zcref}. See the User
-manual of \pkg{zref-check} for details. The checks done by the \opt{check}
-option in \cs{zcref} comprise the complete reference, including the \opt{note}
-(see \zcref{sec:reference-format}). If \pkg{zref-check} was not loaded in the
-preamble, at begin document the option is made no-op and issues a warning.
+The option is only functional in the document body and if \pkg{zref-check} has
+been loaded. \opt{check} requires a value, which works exactly like the
+optional argument of \cs{zcheck}, and can receive both checks and
+\cs{zcheck}'s options. And the checks are performed for each label in
+\marg{labels} received as argument by \cs{zcref}. See the User manual of
+\pkg{zref-check} for details. The checks done by the \opt{check} option in
+\cs{zcref} comprise the complete reference, including the \opt{note} (see
+\zcref{sec:reference-format}).
\DescribeOption{countertype} %
The \opt{countertype} option allows to specify the ``reference type'' of each
@@ -934,14 +926,8 @@ formatting at low precedence levels, and the users can easily and conveniently
override them as desired.
``General'' options (i) can be given by the user in the optional argument of
-\cs{zcref}, but also set through \cs{zcsetup} or even, depending on the case,
-as package options at load-time (see \zcref{sec:options}).\footnote{The use of
- \cs{zcsetup} for global reference format settings is recommended though.
- Whether you can use load-time options or not depends on the values of the
- options: due to how \LaTeX{} handles package options, if the values of the
- options you are setting include \emph{commands} you can't set them at
- load-time, and rather \emph{must} use \cs{zcsetup}.} ``Type'' specific
-options (ii) are handled by \cs{zcRefTypeSetup} (see
+\cs{zcref}, but also set through \cs{zcsetup} (see \zcref{sec:options}).
+``Type'' specific options (ii) are handled by \cs{zcRefTypeSetup} (see
\zcref{sec:user-interface}). ``Language'' options, whether ``type'' specific
(iii) or ``default'' (iv) have their user interface in \cs{zcLanguageSetup},
and have their values populated by the package's built-in language files (see
@@ -1547,14 +1533,14 @@ set around a cross-reference ``task'' we'd like to perform with
position between the reference and the label being referred to using
\pkg{varioref}.}
-\pkg{zref-vario}, which can be enabled with package option \opt{vario}, offers
-a layer of compatibility with \pkg{varioref} and provides
-\texttt{\textbackslash{}z}\dots{} counterparts for the latter's main reference
-commands.
+The \pkg{zref-vario} package offers a layer of compatibility with
+\pkg{varioref} and provides \texttt{\textbackslash{}z}\dots{} counterparts for
+the latter's main reference commands.
\begin{zchowto}[caption={\pkg{zref-vario}}]
\documentclass{article}
-\usepackage[vario]{zref-clever}
+\usepackage{zref-clever}
+\usepackage{zref-vario}
\begin{document}
\section{Section 1}
\zlabel{sec:section-1}
@@ -2298,6 +2284,7 @@ were generously provided by (in chronological order):
% 2021-09-06: https://github.com/ho-tex/zref/issues/13
% 2021-10-26: https://github.com/latex3/latex2e/issues/687
% 2022-01-12: https://chat.stackexchange.com/transcript/message/60129233#60129233
+ % 2022-04-09: https://github.com/latex3/hyperref/issues/229#issuecomment-1093870142
Phelype Oleinik,
% 2021-08-20: https://tex.stackexchange.com/q/611370 (comments)
% 2021-09-09: https://tex.stackexchange.com/a/614704
@@ -2356,8 +2343,10 @@ Thank you all very much!
A change log with relevant changes for each version, eventual upgrade
instructions, and upcoming changes, is maintained in the package's repository,
-at \url{https://github.com/gusbrs/zref-clever/blob/main/CHANGELOG.md}. An
-archive of historical versions of the package is also kept at
-\url{https://github.com/gusbrs/zref-clever/releases}.
+at \url{https://github.com/gusbrs/zref-clever/blob/main/CHANGELOG.md}. The
+change log is also distributed with the package's documentation through CTAN
+upon release so, most likely, \texttt{texdoc zref-clever/changelog} should
+provide easy local access to it. An archive of historical versions of the
+package is also kept at \url{https://github.com/gusbrs/zref-clever/releases}.
\end{document}
diff --git a/support/texlogsieve/README.md b/support/texlogsieve/README.md
index e7e9233997..fd13e3de2b 100644
--- a/support/texlogsieve/README.md
+++ b/support/texlogsieve/README.md
@@ -3,8 +3,13 @@
`texlogsieve` reads a LaTeX log file (or the standard input if no file is
specified), filters out less relevant messages, and displays a summary
report. It is a `texlua` script, similar in spirit to tools such as
-`texfot`, `texloganalyser`, `rubber-info`, `textlog_extract`,
-`texlogparser`, and others. Highlights:
+[`texfot`](https://ctan.org/pkg/texfot),
+[`texloganalyser`](https://ctan.org/pkg/texloganalyser),
+[`rubber-info`](https://gitlab.com/latex-rubber/rubber),
+[`textlog_extract`](https://ctan.org/pkg/texlog-extract),
+[`texlogparser`](https://github.com/reitzig/texlogparser),
+[`texlogfilter`](https://gricad-gitlab.univ-grenoble-alpes.fr/labbeju/latex-packages),
+and others. Highlights:
* Two reports: the most important messages from the log file followed by
a summary of repeated messages, undefined references etc.;
@@ -16,9 +21,7 @@ report. It is a `texlua` script, similar in spirit to tools such as
* Several options to control which messages should be filtered out;
-* No messages are accidentally removed;
-
-* The summary report is currently simple, but useful.
+* No messages are accidentally removed.
`texlogsieve` **must** be run from the same directory as `[pdf|lua|xe]latex`,
because it searches for the files used during compilation (packages loaded
@@ -38,7 +41,8 @@ or
texlogsieve myfile.log
```
-and be satisfied with the result.
+and be satisfied with the result (still, you should check the "Tips"
+section of the documentation).
Since it needs to know what messages to expect, `texlogsieve` is
currently geared towards LaTeX; I have no idea how it would work with
diff --git a/support/texlogsieve/texlogsieve b/support/texlogsieve/texlogsieve
index d1917ff99e..b93431aa78 100755
--- a/support/texlogsieve/texlogsieve
+++ b/support/texlogsieve/texlogsieve
@@ -553,7 +553,7 @@ line as the under/overfull box message (both are \message's). The
offending text, if any, always starts at the beginning of a line and
ends at the end of a line.
-About the description: https://tex.stackexchange.com/a/367589/217608
+About the description: https://tex.stackexchange.com/a/367589
This all means that handling these messages from a pipe is different
than from the log file, because in the log file you know there will
@@ -1002,7 +1002,7 @@ Options:
--version
if vars.version then
- print("texlogsieve 1.1.2")
+ print("texlogsieve 1.1.3")
print("Copyright (C) 2021, 2022 Nelson Lago <lago@ime.usp.br>")
print("License GPLv3+: GNU GPL version 3 or later "
.. "<https://gnu.org/licenses/gpl.html>.")
@@ -1887,66 +1887,116 @@ errorHandler.patterns = {
'You already have nine',
}
+function errorHandler:isErrorLine(line)
+ local _, last = string.find(line, '^! ')
+ if not last then
+ _, last = string.find(line, '^' .. filepat .. ':%d+: ')
+ end
+
+ return last
+end
+
+function errorHandler:isRunawayLine(line)
+ local _, last = string.find(line, '^Runaway argument%?')
+ return last
+end
+
function errorHandler:canDoit(position)
if position == nil then position = 0 end
local line = Lines:get(position)
if line == nil then return false, {} end
-- This error does not start with "! " or "file:line: "
- local _, last = string.find(line, '^Runaway argument%?')
- if last then return true, {} end
+ local last = self:isRunawayLine(line)
+ if last then return true, {numLines = 1} end
- -- If the line does not start with "! " or "file:line: ", get out.
- _, last = string.find(line, '^! ')
- if not last then
- _, last = string.find(line, '^' .. filepat .. ':%d+: ')
- if not last then return false, {} end
- end
-
- -- OK, this might be an error, but we need to be sure;
- -- let's look for a known error message
- local candidateText = string.sub(line, last +1)
- for _, pat in ipairs(self.patterns) do
- _, last = string.find(candidateText, pat)
- if last ~= nil then break end
- end
- if last then return true, {} end
+ last = self:isErrorLine(line)
+ if not last then return false, {} end
- -- Not a known error message; let's look for a line number
- -- or "Type H <return> for immediate help"
+ -- Looks like an error; Let's look ahead to identify the other
+ -- lines that are part of the error message. We do not want to
+ -- look too much ahead, so we just scan the current buffer.
position = position +1
- local found = false
- while not found and position < Lines:numLines() do
- local first = string.find(Lines:get(position), '^l%.%d+ ')
- if first then found = true end
+ local lastline = nil
+ while position < Lines:numLines() do
+ -- if there is a second error, don't look further ahead
+ if self:isErrorLine(Lines:get(position))
+ or self:isRunawayLine(Lines:get(position))
+
+ then break end
+
+ if string.find(Lines:get(position), '^l%.%d+ ') then
+ local length = string.len(Lines:get(position))
+ if string.find(Lines:get(position +1),
+ "^" .. string.rep(" ", length))
+ then
+ lastline = position +1 -- the following line is the last
+ else
+ -- the following line is empty, so it was skipped
+ -- when reading the file
+ lastline = position
+ end
+ end
- first = string.find(Lines:get(position),
- '^Type%s+H %<return%>%s+for immediate help%.')
- if first then found = true end
+ if string.find(Lines:get(position),
+ '^Type%s+H %<return%>%s+for immediate help%.') then
+ lastline = position
+ end
position = position +1
end
- if found then
- return true, {}
+ if lastline then
+ -- position starts at zero, so numlines needs +1
+ return true, {numLines = lastline +1}
else
- return false, {}
+ -- This looks like an error, but there is no "l.NUM" line following
+ -- it, so it is probably a false positive. Still, let's check for
+ -- some known error messages.
+ local candidateText = string.sub(line, last +1)
+ for _, pat in ipairs(self.patterns) do
+ _, last = string.find(candidateText, pat)
+ if last ~= nil then return true, {numLines = 1} end
+ end
end
+
+ return false, {} -- this was really a false positive
end
-function errorHandler:doit()
+function errorHandler:handleFirstLine()
local myTurn, data = self:canDoit()
if not myTurn then return false end
flushUnrecognizedMessages()
- local msg = self:newMessage()
- msg.content = Lines.current
- msg.severity = UNKNOWN
- dispatch(msg)
+ ERRORS_DETECTED = true
+ self.message = self:newMessage()
+ self.message.severity = UNKNOWN
+ self.message.content = Lines.current
Lines:handledChars()
- ERRORS_DETECTED = true
+
+ self.processed = 1
+ self.numLines = data.numLines
+ self.doit = self.handleLines
+ nextHandler = self
+
+ return true
+end
+
+errorHandler.doit = errorHandler.handleFirstLine
+
+function errorHandler:handleLines()
+ if self.processed >= self.numLines then
+ self.doit = self.handleFirstLine
+ dispatch(self.message)
+ else
+ self.message.content = self.message.content .. '\n' .. Lines.current
+ Lines:handledChars()
+ self.processed = self.processed +1
+ nextHandler = self
+ end
+
return true
end
@@ -2687,6 +2737,10 @@ beginningOfLineDebugStringsHandler.patterns = {
'^%-%- Using %S+ output%.',
'^%-%- Verifying Times compatible math font%.',
'^%-%- %S+ loaded, OK%.',
+
+ -- From libertinust1math.sty
+ '^amsthm loaded',
+ '^amsthm NOT loaded',
}
diff --git a/support/texlogsieve/texlogsieve.1 b/support/texlogsieve/texlogsieve.1
index f6d47eef13..0e45920647 100644
--- a/support/texlogsieve/texlogsieve.1
+++ b/support/texlogsieve/texlogsieve.1
@@ -1,4 +1,4 @@
-.TH TEXLOGSIEVE "1" "March 2022" "texlogsieve 1.1.2" "User Commands"
+.TH TEXLOGSIEVE "1" "April 2022" "texlogsieve 1.1.3" "User Commands"
.SH NAME
diff --git a/support/texlogsieve/texlogsieve.pdf b/support/texlogsieve/texlogsieve.pdf
index b8fcee8d52..4bac5034a6 100644
--- a/support/texlogsieve/texlogsieve.pdf
+++ b/support/texlogsieve/texlogsieve.pdf
Binary files differ
diff --git a/support/texlogsieve/texlogsieve.tex b/support/texlogsieve/texlogsieve.tex
index 38e179285d..9d7d2d751b 100644
--- a/support/texlogsieve/texlogsieve.tex
+++ b/support/texlogsieve/texlogsieve.tex
@@ -75,12 +75,14 @@
\changes{1.1.0}{2022/03/04}{Do not lose messages if the file is truncated}
\changes{1.1.1}{2022/03/05}{Fix error in variable scope}
\changes{1.1.2}{2022/03/14}{Fix bug unwrapping lines starting with ``]''}
+\changes{1.1.3}{2022/04/22}{Be more careful with continuation lines in error
+ msgs}
\begin{document}
\title{\textsf{texlogsieve}:\thanks{This document
-corresponds to \textsf{texlogsieve}~1.1.2,
-dated~2022-03-14.}\\[.3\baselineskip]
+corresponds to \textsf{texlogsieve}~1.1.3,
+dated~2022-04-22.}\\[.3\baselineskip]
{\normalsize(yet another program to)\\[-.6\baselineskip]}
{\large filter and summarize \LaTeX\ log files}
}
@@ -108,8 +110,7 @@ a summary report. Highlights:
wrapping and does a much better job at that than existing tools;
\item Multiline messages are treated as a single entity;
\item Several options to control which messages should be filtered out;
- \item No messages are accidentally removed;
- \item The summary report is currently simple, but useful.
+ \item No messages are accidentally removed.
\end{itemize}
\end{abstract}
@@ -122,9 +123,13 @@ character'', ``undefined reference'', and others become buried among lots
of less relevant messages. This program filters out such less relevant
messages and outputs the rest, together with a final summary for the
specially important ones. It is a \texttt{texlua} script, similar in
-spirit to tools such as \texttt{texfot}, \texttt{texloganalyser},
-\texttt{rubber-info}, \texttt{textlog\_extract}, \texttt{texlogparser},
-and others.
+spirit to tools such as \href{https://ctan.org/pkg/texfot}{\texttt{texfot}},
+\href{https://ctan.org/pkg/texloganalyser}{\texttt{texloganalyser}},
+\href{https://gitlab.com/latex-rubber/rubber}{\texttt{rubber-info}},
+\href{https://ctan.org/pkg/texlog-extract}{\texttt{textlog\_extract}},
+\href{https://github.com/reitzig/texlogparser}{\texttt{texlogparser}},
+\href{https://gricad-gitlab.univ-grenoble-alpes.fr/labbeju/latex-packages}
+{\texttt{texlogfilter}}, and others.
Note that it does not try to do anything smart about error messages
(but it shows a warning in the summary if one is detected); if there
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index f61749ee1a..3aa54a997e 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -36,7 +36,9 @@ $mirrors = {
},
'Iran' => {
'http://ctan.yazd.ac.ir/' => 1,
+ 'https://ctan.asis.ai/' => 1,
'https://ctan.um.ac.ir/' => 1,
+ 'https://mirror.bardia.tech/ctan/' => 1,
},
'Japan' => {
'http://ring.airnet.ne.jp/archives/text/CTAN/' => 1,
@@ -46,6 +48,7 @@ $mirrors = {
},
'Korea' => {
'http://ftp.ktug.org/tex-archive/' => 1,
+ 'https://cran.asia/tex/' => 1,
'https://ftp.kaist.ac.kr/pub/tex-archive/' => 1,
'https://mirror.kakao.com/CTAN/' => 1,
'https://mirror.navercorp.com/CTAN/' => 1,
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index b2c9761858..dcd12738e1 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,11 +26,11 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2022
-depend revision/63102
+depend revision/63107
name 00texlive.image
category TLCore
-revision 63102
+revision 63107
shortdesc TeX Live files only in the source repository
longdesc The files here are not copied by the installer and containers
longdesc are not built for them; they exist only in the source
@@ -4560,7 +4560,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 63095
+revision 63104
shortdesc TeX Live standalone installer package
longdesc This package defines the files to go into the installer
longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built by the
@@ -96961,24 +96961,25 @@ catalogue-version 2.08l
name dtk-bibliography
category Package
-revision 62889
+revision 63107
shortdesc Bibliography of "Die TeXnische Komodie"
relocated 1
longdesc This package contains the bibliography for "Die TeXnische
longdesc Komodie", the journal of the German-speaking TeX User Group. It
longdesc is updated on a quarterly basis.
-containersize 516
-containerchecksum 98ca419fcf0ccdebe60f0de016ba447c38bce9fbc2f0e0e3fa4f14dfaa8f40a3dcc0d48f533de9ce35dce38c84918bd49101756c2fdc35c8f8c3b5a3c42255aa
-doccontainersize 428044
-doccontainerchecksum a8300671bfcca5f769d482c2977050eedb9eb9b9cc03902fb7dcbbbd5131c293badd328bae2a3ca908d81e12d19a1717c228ed27355aaeb4f2bee032472a66cf
-docfiles size=230
+containersize 2340
+containerchecksum f972c83103ea370ea4b41df0c29f073e84be38dc13e6ef340ba1335f318895a9508758e8540a95614a2a807e8d6aa169da240f800ab5da5281105b28fe2ed8aa
+doccontainersize 426416
+doccontainerchecksum 957334caf122e546208d28cc6496c7025e199fc90ee1104203dd79a96207e077223c848a55c76c386064dd78908d8606dd0bb39cda334bbd8b8f56e33ff28e88
+docfiles size=228
RELOC/doc/bibtex/dtk-bibliography/README.md details="Readme"
RELOC/doc/bibtex/dtk-bibliography/dtk-authoryear.bbx
RELOC/doc/bibtex/dtk-bibliography/dtk-authoryear.dbx
RELOC/doc/bibtex/dtk-bibliography/dtk-bibliography.bib
RELOC/doc/bibtex/dtk-bibliography/dtk-bibliography.pdf details="The document itself"
RELOC/doc/bibtex/dtk-bibliography/dtk-bibliography.tex
- RELOC/doc/bibtex/dtk-bibliography/dtk-logos.sty
+runfiles size=2
+ RELOC/tex/latex/dtk-bibliography/dtk-logos.sty
catalogue-contact-bugs https://github.com/dante-ev/dtk-bibliography/issues
catalogue-contact-repository https://github.com/dante-ev/dtk-bibliography
catalogue-contact-support https://github.com/dante-ev/dtk-bibliography/issues
@@ -189459,7 +189460,7 @@ binfiles arch=x86_64-linuxmusl size=3921
name luakeys
category Package
-revision 62904
+revision 63106
shortdesc A Lua module for parsing key-value options
relocated 1
longdesc This package provides a Lua module that can parse key-value
@@ -189469,17 +189470,17 @@ longdesc entirely by using the Lua language and does not rely on TeX.
longdesc Therefore this package can only be used with the TeX engine
longdesc LuaTeX. Since luakeys uses LPeg, the parsing mechanism should
longdesc be pretty robust.
-containersize 6180
-containerchecksum 114c4f93ad3b53ee439463505ca2a014f01360ac97046fe661dbc0cfa73f2e5cf54841126da04bb88afc59464ba7985374c3a9de724eb1e483d2f306b6ee45c9
-doccontainersize 170660
-doccontainerchecksum 243fcc1540b282f145f5fbf6f22459a6f007e288ee31bb56e0c396217c163d6eeeaa715bdf120f4bce6024b10a22e1276a82e2000f1d129dcfa57c0bbf27019b
-docfiles size=48
+containersize 6532
+containerchecksum 8a2db407ba31c23819a2f7f5dc03a575359a1a2802a3263292d86df173752848148d4676d56d1bf647118fa092517bb146aafcdd5a729600a073181101e0687c
+doccontainersize 170232
+doccontainerchecksum 3f115b27a0dadb1fcb5c26fb29d95c946541f2a13ee89e4ce0a0354f51621ecbaf208eff042421d93d89a8de7aad03fde61494d7b4aa23f001755ec543b57ff2
+docfiles size=47
RELOC/doc/luatex/luakeys/README.md details="Readme"
- RELOC/doc/luatex/luakeys/luakeys-debug.tex
RELOC/doc/luatex/luakeys/luakeys-doc.pdf details="Package documentation"
RELOC/doc/luatex/luakeys/luakeys-doc.tex
-runfiles size=8
+runfiles size=9
RELOC/tex/luatex/luakeys/luakeys-debug.sty
+ RELOC/tex/luatex/luakeys/luakeys-debug.tex
RELOC/tex/luatex/luakeys/luakeys.lua
RELOC/tex/luatex/luakeys/luakeys.sty
RELOC/tex/luatex/luakeys/luakeys.tex
@@ -262402,7 +262403,7 @@ catalogue-version 1.0h
name reledmac
category Package
-revision 61878
+revision 63105
shortdesc Typeset scholarly editions
relocated 1
longdesc A package for typesetting scholarly critical editions,
@@ -262411,11 +262412,11 @@ longdesc itself was a LaTeX port of the plain TeX EDMAC macros. The
longdesc package supports indexing by page and by line numbers, and
longdesc simple tabular- and array-style environments. The package is
longdesc distributed with the related reledpar package.
-containersize 55384
-containerchecksum 1e809fa7cb84813b022d74a1d6756958673b10938af3c6a9e6381ed52ed6451c1981a86e6777baccf6185374cb2f259236a78abdfe8f1defe665a62493f646c3
-doccontainersize 10279348
-doccontainerchecksum 3975b51c43aabc58a3746b2d6dc67f9ac606a02a605a3b21f3553e831664aad9f2ab9a03bd3663e44d72df01237c050262fd687f020a77beb9d483be43d046cf
-docfiles size=3383
+containersize 55372
+containerchecksum c7cabb0818baf51eafc4f4864019479925f2b1861435cb85f6a1d03a1ba542c565a25927a582dacf04508deb005ef40dd286126ae85cc918e7881d5aa589b0a6
+doccontainersize 10260936
+doccontainerchecksum 3cd4033ba53567e443c8b5f2b48ff11e63bcf21dd2c618c00e8cdc00004ba5806947e96cdc1c6f1125ca7eb28a505f18901311c3ae168f34abd1e4e7aa7bb96c
+docfiles size=3377
RELOC/doc/latex/reledmac/README.md details="Readme"
RELOC/doc/latex/reledmac/doc-include/migrate-mac.dtx
RELOC/doc/latex/reledmac/doc-include/migrate-par.dtx
@@ -262521,8 +262522,8 @@ docfiles size=3383
RELOC/doc/latex/reledmac/migration.pdf
RELOC/doc/latex/reledmac/reledmac.pdf details="Package documentation"
RELOC/doc/latex/reledmac/reledpar.pdf
-srccontainersize 208992
-srccontainerchecksum 0d9ed87212ae9ad724da0c2ea9799d0b9f11ff26804dd34cf02c28a980a43c6dadada5e2facfd3d0fb946c631af0e8f1291788a02f41647127cf64cb7941d005
+srccontainersize 208920
+srccontainerchecksum 96f3ca08dd9b0323b270a40dfcb63fff3b74a0c7c3dabb076c2a588b4041cb7052e4c84d2d4f04ab02f511e43db85dc39bbbd41faba78cf2553696fee9665553
srcfiles size=298
RELOC/source/latex/reledmac/migration.dtx
RELOC/source/latex/reledmac/reledmac.dtx
@@ -301299,7 +301300,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 63095
+revision 63104
shortdesc TeX Live infrastructure programs
longdesc Includes install-tl, tl-portable, rungs, etc.; not needed for
longdesc tlmgr to run but still ours. Not included in tlcritical.
@@ -301307,10 +301308,10 @@ depend texlive-scripts.ARCH
depend texlive.infra
execute addMap mathpple.map
postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat
-containersize 109704
-containerchecksum 83d3f6bbcafe1309b75abc82159058d840447cf4ca106bbbf7dc64e0c2a90782388081d120afbee651b446253c64d1fc55ef01b1c3993da1ed300fc97e79240c
-doccontainersize 406120
-doccontainerchecksum 07dd75dee94500c91c566287e9c234363cb307630f76d50d956686c02708d62e9e189b3eea6cbeb29ae91f308559cf36ea9508913f1e87b34117feab2dbb6bc0
+containersize 109728
+containerchecksum ac2bebb2c7d8a068486ada496cdc98689e186075e5cf0433b4db2a943e6a8b44e1641e228844e7ebe8249110671453e4e3288e0aa458789a2ac0e4ae218e0068
+doccontainersize 406212
+doccontainerchecksum 9efde3663b8e83ae6b9b4bf36f13e133292125283bb8d1ef33b786bca8ef8c5101105db2f34b2bd4318e8d72847f4cfc38bdaf1cb9b655737780f99748fe1a50
docfiles size=505
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 7575eafe7d..6f9f4e3c93 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-d7aa30139e68063838a7a2df2ff37e3e texlive.tlpdb
+4e548f6ff13a6a77231fb341281127f1 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 831c994050..496e0efba6 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-744b914734902745e93eace7096519f7ea07f93b8ea731dc7a65c939ea53a1ac360cd330d14fafa28054385245ec8797e222e578a421c2883ffff60a954a6383 texlive.tlpdb
+82e05500a5530f5f6fd8bd6d956538cc1a2ab42946fa5cd29344d5e01752bdd242433e5dacac67b486d0537ab466f27224a29bf0144a940003af1e73d5fa771e texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index c917f0aa85..1eab387269 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
@@ -1,10 +1,10 @@
-----BEGIN PGP SIGNATURE-----
-iQEcBAEBCgAGBQJiYe5KAAoJEEzhh34ZQ4xw9CoIAIqqZGIJknacQy8j9cafyv1L
-+8xUb62wogeTjDCZAKG7LNaB7kQC6jFWtOAC4woEqv4vtHC+fQS5dGv5SRikZms9
-8hUz5/pkU/68dtsjUJLCSjLFJLIKOSNmiHiS1hR1eztuanHTc7cwP80E64UHITOX
-Ay63vVuSvNBoTonQbr/z9nznVTBeZHLkUR23MwfzTexFlwBTFfM0h5v0xvsGqW9Q
-RAVYlt8chFjrWSofaUwFUtd1Lh5QOoKjbIfHhKeZQKsuqOKgmN74htpL4x7YyuE5
-utuyHvonNAt8DNnBLWgKyJOtVDFhKBpV0Qrn6mKpGbmwv2oWrAu+zO37N12n3EA=
-=YFw4
+iQEcBAEBCgAGBQJiYz+zAAoJEEzhh34ZQ4xwUO4H/1PYiLiXci9323p1aPafIUkA
+mf1w9nkQMpFcJBMRa91oktyGX+vefl128mRFW+A8K6ezSyEolzFkl8oVAxRCSwqj
+uORE5oPIoDulSp6hDLQiSIw5fJJYTnZmjBbHV4hh0Iv2zGHp/jopp/C0v4Q2i+hj
+NRsFzmHMYDEJdNOysUauTg3KIFnDPy/VOfQq3YkCZOo14o1QI7A5IykLpW6z7DCA
+3lqX9OXxMGiRjAuZEuvQyWZRz5jg6TRYzougQWdjlJLubm3c0jf/Kj3CKiF/C5Nf
+T+XCS432TsseErMfadDkaGEJ3bkjyi9NAkAfhse2Ir9ko7+rOTzDPUfWFdGRYTQ=
+=b3wW
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index c28f4fdb43..d8d718dcf0 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index 2fb1922839..b4b48fbb41 100644
--- a/systems/win32/miktex/tm/packages/next/pr.ini
+++ b/systems/win32/miktex/tm/packages/next/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1650572289
+date=1650658663
lastupd=miktex-arctrl-bin-2.9 miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-2.9 miktex-axohelp-bin-x64-2.9 miktex-bibarts-bin-2.9 miktex-bibarts-bin-x64-2.9 miktex-bibtex-bin-2.9 miktex-bibtex-bin-x64-2.9 miktex-bibtex8bit-bin-2.9 miktex-bibtex8bit-bin-x64-2.9 miktex-bzip2-bin-2.9 miktex-bzip2-bin-x64-2.9 miktex-cairo-bin-2.9 miktex-cairo-bin-x64-2.9 miktex-chktex-bin-2.9 miktex-chktex-bin-x64-2.9
-lstdigest=e9bb514c7c58ddff13f598016c3bebd2
+lstdigest=307d0bed96011e3a8a989da1c702379a
numpkg=5541
relstate=next
-version=8146
+version=8147
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: qLZAnjeYyMXVB+IbLiN1Hf+kgBFmnxGxuoKiWjaYFTIWvm90KUFbWbOfUH+S1nC13pDXxO1Fqk1VaCweX4I5erMFE8d7UE/QQBdV3SRcjMCFvO8vhiFJWcMZOEwHM/CAw8oQBCXODEGl95+k58HbUawdeiEJUX9/xnqwZG+D1o7kbr8ApHbbbh02xJ+1yRcY7NZON5tls/bCQkinrjTXNu4kbW2ka9nBiH+CTZEw5c6ZlnYlxZGpj0rYbvuTlib06WEv9lfw1n4Od08yIoGdjk4lXjNr5qxm+h6InIoE7Xgd9rufGW+fIC7dx1YdeRgVQqMx2N0bCt996fXNlETZGg==
+;;;; signature/miktex: OE2bsB2hJSWEl4s1OG4Wcg4a/56ji5CtPHsv2IFTVclLTX0ajGfMIVkjXTCSARH64QdKlwE1LwEeSFYc8YRIIiaEoE2v8e9S8hHAuX78sdEEEDbwU4bIF2PoGq5jzF8onYcojqY60pxsU4Pz/LFVnea5+z8o7NA0cvfGNBa4QKW4So8nzATMEmFs2N2GL2/LcXjZQ6NJntXaJe1JKIumi5qNpkE7XdFmkmRxaYgHGs9ejqF7PaqIa59Y71NrGLcFRcm6xtCvveYIalyVdY0BhJqxIOl/nI5AyyzeNPK6qA8CtuAfx9x+y2l78NqYnbf2u91EsoIVk0Pg3afi3eBy6A==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index f92b98261f..8168c128d4 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1650571898
+date=1650658292
lastupd=latexindent latexindent__doc latexindent__source xduts acmart acmart__doc acmart__source bithesis bithesis__doc bithesis__source bxjscls bxjscls__doc bxjscls__source elegantbook elegantbook__doc elegantbook__source elegantnote elegantnote__doc elegantnote__source elegantpaper
-lstdigest=b22d21d8dba20fdbf59de9d83dd3acfd
+lstdigest=ea23fd0da1df855811f788b09a2df9f9
numpkg=5541
relstate=stable
-version=8146
+version=8147
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: RNMstzs1AgTpTSD9UPFEms5TSzLF5FjN2WjAwn6jlL7hipwjfgjW7W4ZfZthLQcS5Nme7cDWpruli/xJU7H3LA5uPT5TNgjY+Srtrrv1Y94dLaCeZ4eu37GxI/rBfV3DdYioBrOu1eYVM0nYZVa+tm219P85HPbSm4qxJRlREa58QUwf2lrH9lhnzr4MaA8h422JQ20ky+LcAOs3O71sCfCSYqBSBLlBOWSqeYESnLfUxayVLl8SxOa42vDsAkLBUDfkwKqg4U4hJaMIZkjJV8x0Ike3tYxnl/nc4Lux4b6OTUXwoTAD/SgcuDCIrUk+KIXdmpVP5EDrfH8Fb0q3Qg==
+;;;; signature/miktex: Cc42CxfoQYRwOqKHoE3EF1EnBxblJ4KyUCeI5nbOxnmUIuDizNhIAHiuqGw9mgJSwhzsfIfy1CQI/Hiy0yRU4cyTxV4HiEdeXk5cPiT2jTjNl21xsgsILCQPYqx/7MrmakXxduEHd6/BTDOB+/KhgdfG04WX+u16jx/r0VrIqH23enE3dFRXIGOo7ACq8vwkSzBW05ZYpQdBHKkVaVOwDx3AqGgrqw4KqK1v8pxQsTQjs0FJNEO/kwMjz42IpqM54S9mtbDFW3QzoiT5bej1C9wAY9ymSiLrfNYnCL4NfVIqpPHcsT4NfRPL8VF+d1debHn/tYdRpdBy1WeBkNR+ew==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index 3c4eb36781..2aefa6fc8f 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2022-04-22-02-02
+2022-04-23-02-02