summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FILES.byname1021
-rw-r--r--FILES.byname.gzbin2304973 -> 2305034 bytes
-rw-r--r--FILES.last07days813
-rw-r--r--graphics/mcf2graph/CHANGELOG11
-rw-r--r--graphics/mcf2graph/README29
-rw-r--r--graphics/mcf2graph/mcf2graph.mf133
-rw-r--r--graphics/mcf2graph/mcf_data_base.mcf783
-rw-r--r--graphics/mcf2graph/mcf_exa_soc.mf934
-rw-r--r--graphics/mcf2graph/mcf_example.pdfbin324068 -> 319847 bytes
-rw-r--r--graphics/mcf2graph/mcf_example.tex19
-rw-r--r--graphics/mcf2graph/mcf_man_soc.mf13
-rw-r--r--graphics/mcf2graph/mcf_manual.pdfbin373233 -> 374447 bytes
-rw-r--r--graphics/mcf2graph/mcf_manual.tex168
-rw-r--r--graphics/mcf2graph/mcf_mplib_exa.pdfbin193908 -> 195848 bytes
-rw-r--r--graphics/mcf2graph/mcf_mplib_exa.tex171
-rw-r--r--graphics/mcf2graph/mcf_setup.sty7
-rw-r--r--graphics/pgf/contrib/circuitikz/doc/changelog.tex24
-rw-r--r--graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdfbin17743 -> 17743 bytes
-rw-r--r--graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdfbin1133938 -> 1159128 bytes
-rw-r--r--graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex275
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/circuitikz.sty4
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex34
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex123
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex11
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex20
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex4
-rw-r--r--graphics/pgf/contrib/dynkin-diagrams/README4
-rw-r--r--graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdfbin810526 -> 842401 bytes
-rw-r--r--graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty75
-rw-r--r--graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex135
-rw-r--r--graphics/pgf/contrib/figchild/README.md32
-rw-r--r--graphics/pgf/contrib/figchild/figchild.pdfbin0 -> 319139 bytes
-rw-r--r--graphics/pgf/contrib/figchild/figchild.sty5086
-rw-r--r--graphics/pgf/contrib/figchild/figchild.tex4749
-rw-r--r--graphics/pgf/contrib/figchild/latexmkrc1
-rw-r--r--language/marathi/LICENSE.md207
-rw-r--r--language/marathi/README.txt18
-rw-r--r--language/marathi/glossaries.gls2
-rw-r--r--language/marathi/marathi.dtx36
-rw-r--r--language/marathi/marathi.ins8
-rw-r--r--language/marathi/marathi.pdfbin175618 -> 176586 bytes
-rw-r--r--macros/latex/contrib/abraces/README.md16
-rw-r--r--macros/latex/contrib/abraces/abraces-doc.pdfbin196440 -> 231121 bytes
-rw-r--r--macros/latex/contrib/abraces/abraces-doc.tex311
-rw-r--r--macros/latex/contrib/abraces/abraces.sty460
-rw-r--r--macros/latex/contrib/easybook/doc/easybook-demo.pdfbin262400 -> 262396 bytes
-rw-r--r--macros/latex/contrib/easybook/doc/easybook-demo.tex2
-rw-r--r--macros/latex/contrib/easybook/doc/easybook.pdfbin420345 -> 421232 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx135
-rw-r--r--macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdfbin40840 -> 40812 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdfbin197373 -> 197491 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalnotes.pdfbin195586 -> 195653 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-sidenotes.pdfbin291128 -> 291188 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-tabular.pdfbin280887 -> 281031 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdfbin197414 -> 197564 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses.pdfbin197363 -> 197396 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-antilabe.pdfbin205371 -> 205373 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-cross_referencing.pdfbin196250 -> 196391 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdfbin199696 -> 199862 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-glossaries.pdfbin280642 -> 280691 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-indexing.pdfbin279716 -> 279825 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdfbin273887 -> 273987 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdfbin289371 -> 289480 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-linespacing.pdfbin284597 -> 284653 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdfbin285213 -> 285314 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-notes-width.pdfbin202991 -> 203109 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdfbin208585 -> 208756 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-performances.pdfbin281520 -> 281669 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdfbin31055 -> 31450 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdfbin304585 -> 304788 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdfbin283529 -> 283765 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdfbin196014 -> 196243 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdfbin23268 -> 23427 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdfbin172561 -> 172606 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdfbin32053 -> 32047 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdfbin284700 -> 284905 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdfbin190058 -> 190129 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdfbin189290 -> 189364 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdfbin168066 -> 168145 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdfbin189692 -> 189772 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdfbin188622 -> 188698 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdfbin188675 -> 188752 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdfbin188809 -> 188888 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdfbin209918 -> 210267 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdfbin208856 -> 209050 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdfbin201188 -> 201331 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdfbin293036 -> 293347 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdfbin200260 -> 200437 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdfbin221533 -> 221703 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdfbin246187 -> 246378 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdfbin200801 -> 201164 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdfbin196882 -> 197012 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdfbin297430 -> 297750 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdfbin203241 -> 203497 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdfbin192355 -> 192572 bytes
-rw-r--r--macros/latex/contrib/reledmac/migration.pdfbin357853 -> 358157 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledmac.dtx16
-rw-r--r--macros/latex/contrib/reledmac/reledmac.pdfbin2032328 -> 2034959 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledpar.pdfbin986633 -> 987750 bytes
-rw-r--r--support/arara/README.md2
-rw-r--r--support/arara/doc/arara-manual.pdfbin1962695 -> 1962631 bytes
-rw-r--r--support/arara/doc/arara-quickstart.pdfbin245763 -> 245754 bytes
-rw-r--r--support/arara/doc/arara.12
-rw-r--r--support/arara/doc/version.tex2
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb472
-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.xzbin2293152 -> 2296092 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
112 files changed, 13670 insertions, 2734 deletions
diff --git a/FILES.byname b/FILES.byname
index 1985651d34..db051076cf 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5087,7 +5087,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
-2021/04/03 | 115661 | FILES.last07days
+2021/04/04 | 119942 | FILES.last07days
2020/08/14 | 104065 | fonts/academicons/academicons.pdf
2020/08/14 | 17247 | fonts/academicons/academicons.sty
2020/08/14 | 6546 | fonts/academicons/academicons.tex
@@ -139335,19 +139335,20 @@
2011/05/31 | 231925 | graphics/mathspic/perl/sourcecode113.html
2011/05/31 | 183530 | graphics/mathspic/perl/sourcecode113.nw
2011/05/31 | 2864043 | graphics/mathspic/perl/sourcecode113.pdf
-2021/03/14 | 12154 | graphics/mcf2graph/CHANGELOG
-2021/03/20 | 99430 | graphics/mcf2graph/mcf2graph.mf
-2021/03/21 | 324068 | graphics/mcf2graph/mcf_example.pdf
-2021/03/21 | 2755 | graphics/mcf2graph/mcf_example.tex
-2021/03/20 | 46028 | graphics/mcf2graph/mcf_exa_soc.mf
-2021/03/21 | 44493 | graphics/mcf2graph/mcf_man_soc.mf
-2021/03/21 | 373233 | graphics/mcf2graph/mcf_manual.pdf
-2021/03/21 | 52479 | graphics/mcf2graph/mcf_manual.tex
-2021/03/21 | 193908 | graphics/mcf2graph/mcf_mplib_exa.pdf
-2021/03/21 | 18317 | graphics/mcf2graph/mcf_mplib_exa.tex
-2020/08/30 | 3638 | graphics/mcf2graph/mcf_setup.sty
-2021/03/20 | 4377 | graphics/mcf2graph/README
-2021/03/21 | 946355 | graphics/mcf2graph.zip
+2021/04/04 | 12406 | graphics/mcf2graph/CHANGELOG
+2021/04/04 | 102216 | graphics/mcf2graph/mcf2graph.mf
+2021/04/03 | 33612 | graphics/mcf2graph/mcf_data_base.mcf
+2021/04/04 | 319847 | graphics/mcf2graph/mcf_example.pdf
+2021/04/04 | 2309 | graphics/mcf2graph/mcf_example.tex
+2021/04/04 | 2950 | graphics/mcf2graph/mcf_exa_soc.mf
+2021/04/04 | 44379 | graphics/mcf2graph/mcf_man_soc.mf
+2021/04/04 | 374447 | graphics/mcf2graph/mcf_manual.pdf
+2021/04/04 | 54833 | graphics/mcf2graph/mcf_manual.tex
+2021/04/04 | 195848 | graphics/mcf2graph/mcf_mplib_exa.pdf
+2021/04/04 | 15795 | graphics/mcf2graph/mcf_mplib_exa.tex
+2021/04/03 | 3682 | graphics/mcf2graph/mcf_setup.sty
+2021/04/04 | 4318 | graphics/mcf2graph/README
+2021/04/04 | 946320 | graphics/mcf2graph.zip
2004/07/13 | 8567 | graphics/metaplot/axes.mp
2004/06/28 | 1122 | graphics/metaplot/examples/cap1.cc
2004/06/28 | 2178 | graphics/metaplot/examples/cap1.mp
@@ -142427,48 +142428,48 @@
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
-2021/03/14 | 30689 | graphics/pgf/contrib/circuitikz/doc/changelog.tex
-2021/03/14 | 17743 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
-2021/03/14 | 938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex
-2021/03/14 | 1133938 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
-2021/03/14 | 396132 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
-2021/03/14 | 418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex
-2021/03/14 | 6106 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
-2021/03/14 | 3277 | graphics/pgf/contrib/circuitikz/README.md
-2021/03/14 | 364086 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty
-2021/03/14 | 393856 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty
-2021/03/14 | 403539 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty
-2021/03/14 | 422268 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty
-2021/03/14 | 690730 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty
-2021/03/14 | 758990 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty
-2021/03/14 | 841461 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty
-2021/03/14 | 937253 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty
-2021/03/14 | 1021921 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7.sty
-2021/03/14 | 12348 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
-2021/03/14 | 280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex
-2021/03/14 | 3101 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex
-2021/03/14 | 1877 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex
-2021/03/14 | 226090 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
-2021/03/14 | 8757 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex
-2021/03/14 | 29007 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
-2021/03/14 | 9109 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex
-2021/03/14 | 14437 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
-2021/03/14 | 54038 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
-2021/03/14 | 105296 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
-2021/03/14 | 16580 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
-2021/03/14 | 120283 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
-2021/03/14 | 30990 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex
-2021/03/14 | 356340 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
-2021/03/14 | 2678 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
-2021/03/14 | 34691 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex
-2021/03/14 | 416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex
-2021/03/14 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex
-2021/03/14 | 751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex
-2021/03/14 | 834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex
-2021/03/14 | 929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex
-2021/03/14 | 1014383 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.2.7.tex
-2021/03/14 | 3590 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
-2021/03/14 | 2429879 | graphics/pgf/contrib/circuitikz.zip
+2021/04/04 | 31394 | graphics/pgf/contrib/circuitikz/doc/changelog.tex
+2021/04/04 | 17743 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
+2021/04/04 | 938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex
+2021/04/04 | 1159128 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
+2021/04/04 | 405932 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
+2021/04/04 | 418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex
+2021/04/04 | 6106 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
+2021/04/04 | 3277 | graphics/pgf/contrib/circuitikz/README.md
+2021/04/04 | 364086 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty
+2021/04/04 | 393856 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty
+2021/04/04 | 403539 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty
+2021/04/04 | 422268 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty
+2021/04/04 | 690730 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty
+2021/04/04 | 758990 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty
+2021/04/04 | 841461 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty
+2021/04/04 | 937253 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty
+2021/04/04 | 1021921 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7.sty
+2021/04/04 | 12348 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
+2021/04/04 | 280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex
+2021/04/04 | 3101 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex
+2021/04/04 | 1877 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex
+2021/04/04 | 229076 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
+2021/04/04 | 8757 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex
+2021/04/04 | 30229 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
+2021/04/04 | 9109 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex
+2021/04/04 | 14732 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
+2021/04/04 | 54038 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
+2021/04/04 | 105913 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
+2021/04/04 | 16580 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
+2021/04/04 | 120283 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
+2021/04/04 | 30990 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex
+2021/04/04 | 356340 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
+2021/04/04 | 2678 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
+2021/04/04 | 34691 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex
+2021/04/04 | 416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex
+2021/04/04 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex
+2021/04/04 | 751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex
+2021/04/04 | 834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex
+2021/04/04 | 929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex
+2021/04/04 | 1014383 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.2.7.tex
+2021/04/04 | 3590 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
+2021/04/04 | 2458423 | 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
@@ -142505,11 +142506,11 @@
2020/04/15 | 396 | graphics/pgf/contrib/dpcircling/README.md
2020/04/15 | 33206 | graphics/pgf/contrib/dpcircling.zip
2019/09/04 | 19329 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.bib
-2021/03/31 | 810526 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf
-2021/03/31 | 149371 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty
-2021/03/31 | 60598 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex
-2021/03/31 | 342 | graphics/pgf/contrib/dynkin-diagrams/README
-2021/03/31 | 841047 | graphics/pgf/contrib/dynkin-diagrams.zip
+2021/04/04 | 842401 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf
+2021/04/04 | 151737 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty
+2021/04/04 | 61228 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex
+2021/04/04 | 343 | graphics/pgf/contrib/dynkin-diagrams/README
+2021/04/04 | 873175 | graphics/pgf/contrib/dynkin-diagrams.zip
2013/02/27 | 17141 | graphics/pgf/contrib/fast-diagram/fast-diagram.sty
2013/02/27 | 1050633 | graphics/pgf/contrib/fast-diagram/help.pdf
2013/02/27 | 1437 | graphics/pgf/contrib/fast-diagram/help.tex
@@ -142532,6 +142533,12 @@
2013/02/27 | 1715 | graphics/pgf/contrib/fast-diagram/sources_help/reglages.tex
2013/02/27 | 7946 | graphics/pgf/contrib/fast-diagram/sources_help/tikz.tex
2013/02/27 | 1426766 | graphics/pgf/contrib/fast-diagram.zip
+2021/04/04 | 319139 | graphics/pgf/contrib/figchild/figchild.pdf
+2021/04/04 | 294669 | graphics/pgf/contrib/figchild/figchild.sty
+2021/04/04 | 51333 | graphics/pgf/contrib/figchild/figchild.tex
+2021/04/04 | 31 | graphics/pgf/contrib/figchild/latexmkrc
+2021/04/04 | 1443 | graphics/pgf/contrib/figchild/README.md
+2021/04/04 | 377674 | graphics/pgf/contrib/figchild.zip
2015/03/19 | 47091 | graphics/pgf/contrib/flowchart/flowchart.dtx
2013/02/04 | 2926 | graphics/pgf/contrib/flowchart/flowchart.ins
2015/03/19 | 434564 | graphics/pgf/contrib/flowchart/flowchart.pdf
@@ -172287,7 +172294,7 @@
2020/12/27 | 13202142 | 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
-2021/03/14 | 2444742 | install/graphics/pgf/contrib/circuitikz.tds.zip
+2021/04/04 | 2473469 | 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
@@ -172694,7 +172701,7 @@
2008/06/20 | 3954 | install/macros/xetex/plain/xetexfontinfo.tds.zip
2013/01/04 | 36361 | install/support/adhocfilelist.tds.zip
2021/01/13 | 2953315 | install/support/albatross.tds.zip
-2021/03/31 | 13515933 | install/support/arara.tds.zip
+2021/04/04 | 13516080 | install/support/arara.tds.zip
2019/11/05 | 310742 | install/support/chklref.tds.zip
2017/04/22 | 51557 | install/support/ctanify.tds.zip
2012/05/08 | 180596 | install/support/ctanupload.tds.zip
@@ -183150,19 +183157,20 @@
2005/04/24 | 364 | language/maltese/README.txt
2005/04/27 | 98071 | language/maltese.zip
2001/11/28 | 721 | language/manju/README
-2021/01/14 | 35149 | language/marathi/COPYING
-2021/01/14 | 2048 | language/marathi/glossaries.gls
-2021/01/15 | 67995 | language/marathi/marathi.dtx
-2021/01/15 | 4838 | language/marathi/marathi.ins
-2021/01/15 | 175618 | language/marathi/marathi.pdf
-2021/01/14 | 9539 | language/marathi/namuna-article.tex
-2021/01/14 | 1832 | language/marathi/namuna-beamer.tex
-2021/01/14 | 9610 | language/marathi/namuna-book.tex
-2021/01/14 | 2031 | language/marathi/namuna-letter.tex
-2021/01/14 | 1236 | language/marathi/namuna-para.tex
-2021/01/14 | 10827 | language/marathi/namuna-report.tex
-2021/01/15 | 3052 | language/marathi/README.txt
-2021/01/15 | 210053 | language/marathi.zip
+2021/04/03 | 35149 | language/marathi/COPYING
+2021/04/03 | 2047 | language/marathi/glossaries.gls
+2021/04/03 | 28918 | language/marathi/LICENSE.md
+2021/04/03 | 68289 | language/marathi/marathi.dtx
+2021/04/03 | 4814 | language/marathi/marathi.ins
+2021/04/03 | 176586 | language/marathi/marathi.pdf
+2021/04/03 | 9539 | language/marathi/namuna-article.tex
+2021/04/03 | 1832 | language/marathi/namuna-beamer.tex
+2021/04/03 | 9610 | language/marathi/namuna-book.tex
+2021/04/03 | 2031 | language/marathi/namuna-letter.tex
+2021/04/03 | 1236 | language/marathi/namuna-para.tex
+2021/04/03 | 10827 | language/marathi/namuna-report.tex
+2021/04/03 | 3431 | language/marathi/README.txt
+2021/04/04 | 216567 | language/marathi.zip
2007/03/22 | 3923 | language/mongolian/babel/mn.def
2008/03/30 | 39157 | language/mongolian/babel/mongolian.dtx
2008/03/23 | 5112 | language/mongolian/babel/mongolian.ins
@@ -189068,10 +189076,11 @@
2018/11/25 | 6520886 | macros/latex/contrib/abntex2.zip
2020/04/28 | 715 | macros/latex/contrib/abnt/README.md
2020/06/07 | 122436 | macros/latex/contrib/abnt.zip
-2012/08/30 | 196440 | macros/latex/contrib/abraces/abraces-doc.pdf
-2012/08/30 | 9257 | macros/latex/contrib/abraces/abraces-doc.tex
-2012/08/30 | 4691 | macros/latex/contrib/abraces/abraces.sty
-2012/08/31 | 199788 | macros/latex/contrib/abraces.zip
+2021/04/01 | 231121 | macros/latex/contrib/abraces/abraces-doc.pdf
+2021/04/01 | 16192 | macros/latex/contrib/abraces/abraces-doc.tex
+2021/04/01 | 11737 | macros/latex/contrib/abraces/abraces.sty
+2021/04/03 | 641 | macros/latex/contrib/abraces/README.md
+2021/04/04 | 238178 | macros/latex/contrib/abraces.zip
2009/09/02 | 26626 | macros/latex/contrib/abstract/abstract.dtx
2009/09/02 | 2373 | macros/latex/contrib/abstract/abstract.ins
2009/09/02 | 168527 | macros/latex/contrib/abstract/abstract.pdf
@@ -196873,16 +196882,16 @@
2021/01/24 | 422 | macros/latex/contrib/ean13isbn/README
2021/01/24 | 322624 | macros/latex/contrib/ean13isbn.zip
2021/03/15 | 99 | macros/latex/contrib/easybook/doc/appendix.tex
-2021/03/24 | 4150 | macros/latex/contrib/easybook/doc/chapter1.tex
-2021/03/25 | 3872 | macros/latex/contrib/easybook/doc/chapter2.tex
+2021/04/04 | 4150 | macros/latex/contrib/easybook/doc/chapter1.tex
+2021/04/04 | 3872 | macros/latex/contrib/easybook/doc/chapter2.tex
2021/04/03 | 2539 | macros/latex/contrib/easybook/doc/chapter3.tex
-2021/04/03 | 262400 | macros/latex/contrib/easybook/doc/easybook-demo.pdf
-2021/04/03 | 2587 | macros/latex/contrib/easybook/doc/easybook-demo.tex
-2021/04/03 | 420345 | macros/latex/contrib/easybook/doc/easybook.pdf
+2021/04/04 | 262396 | macros/latex/contrib/easybook/doc/easybook-demo.pdf
+2021/04/04 | 2587 | macros/latex/contrib/easybook/doc/easybook-demo.tex
+2021/04/04 | 421232 | macros/latex/contrib/easybook/doc/easybook.pdf
2021/02/23 | 830 | macros/latex/contrib/easybook/doc/refs.bib
-2021/04/03 | 89342 | macros/latex/contrib/easybook/easybook.dtx
+2021/04/04 | 89183 | macros/latex/contrib/easybook/easybook.dtx
2021/04/01 | 2497 | macros/latex/contrib/easybook/README.md
-2021/04/03 | 706549 | macros/latex/contrib/easybook.zip
+2021/04/04 | 707504 | macros/latex/contrib/easybook.zip
2009/06/17 | 82589 | macros/latex/contrib/easy/doc/docbib.pdf
2009/06/17 | 78378 | macros/latex/contrib/easy/doc/docbmat.pdf
2009/06/17 | 99132 | macros/latex/contrib/easy/doc/doceqn.pdf
@@ -209435,116 +209444,116 @@
2012/01/07 | 327688 | macros/latex/contrib/regstats/regstats.pdf
2012/01/08 | 409653 | macros/latex/contrib/regstats.zip
2021/02/28 | 24795 | macros/latex/contrib/reledmac/doc-include/migrate-mac.dtx
-2021/02/28 | 5602 | macros/latex/contrib/reledmac/doc-include/migrate-par.dtx
+2021/03/26 | 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
-2021/03/08 | 40840 | macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
+2021/04/04 | 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
-2021/03/08 | 197373 | macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
-2021/02/28 | 1979 | macros/latex/contrib/reledmac/examples/1-criticalendnotes.tex
-2021/03/08 | 195586 | macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
-2021/02/28 | 2161 | macros/latex/contrib/reledmac/examples/1-criticalnotes.tex
-2021/03/08 | 291128 | macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
-2021/02/28 | 9804 | macros/latex/contrib/reledmac/examples/1-sidenotes.tex
-2021/03/08 | 280887 | macros/latex/contrib/reledmac/examples/1-tabular.pdf
-2021/02/28 | 2004 | macros/latex/contrib/reledmac/examples/1-tabular.tex
-2021/03/08 | 197414 | macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
-2021/02/28 | 2592 | macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.tex
-2021/03/08 | 197363 | macros/latex/contrib/reledmac/examples/1-verses.pdf
-2021/02/28 | 1902 | macros/latex/contrib/reledmac/examples/1-verses.tex
-2021/03/08 | 205371 | macros/latex/contrib/reledmac/examples/2-antilabe.pdf
-2021/02/28 | 1998 | macros/latex/contrib/reledmac/examples/2-antilabe.tex
-2021/03/08 | 196250 | macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
-2021/02/28 | 1857 | macros/latex/contrib/reledmac/examples/2-cross_referencing.tex
-2021/03/08 | 199696 | macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
-2021/02/28 | 6806 | macros/latex/contrib/reledmac/examples/2-footnote_spacing.tex
-2021/03/08 | 280642 | macros/latex/contrib/reledmac/examples/2-glossaries.pdf
-2021/03/08 | 1794 | macros/latex/contrib/reledmac/examples/2-glossaries.tex
-2021/03/08 | 279716 | macros/latex/contrib/reledmac/examples/2-indexing.pdf
-2021/02/28 | 2761 | macros/latex/contrib/reledmac/examples/2-indexing.tex
-2021/03/08 | 273887 | macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
-2021/02/28 | 1140 | macros/latex/contrib/reledmac/examples/2-lemma_disambigution.tex
-2021/03/08 | 289371 | macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
-2021/02/28 | 11391 | macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.tex
-2021/03/08 | 284597 | macros/latex/contrib/reledmac/examples/2-linespacing.pdf
-2021/02/28 | 1488 | macros/latex/contrib/reledmac/examples/2-linespacing.tex
-2021/03/08 | 285213 | macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
-2021/02/28 | 21449 | macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.tex
-2021/03/08 | 202991 | macros/latex/contrib/reledmac/examples/2-notes-width.pdf
-2021/02/28 | 1528 | macros/latex/contrib/reledmac/examples/2-notes-width.tex
-2021/03/08 | 208585 | macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
-2021/02/28 | 5161 | macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.tex
-2021/03/08 | 281520 | macros/latex/contrib/reledmac/examples/2-performances.pdf
-2021/02/28 | 2710 | macros/latex/contrib/reledmac/examples/2-performances.tex
-2021/03/08 | 31055 | macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
+2021/04/04 | 197491 | macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
+2021/03/26 | 1979 | macros/latex/contrib/reledmac/examples/1-criticalendnotes.tex
+2021/04/04 | 195653 | macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
+2021/03/26 | 2161 | macros/latex/contrib/reledmac/examples/1-criticalnotes.tex
+2021/04/04 | 291188 | macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
+2021/03/26 | 9804 | macros/latex/contrib/reledmac/examples/1-sidenotes.tex
+2021/04/04 | 281031 | macros/latex/contrib/reledmac/examples/1-tabular.pdf
+2021/03/26 | 2004 | macros/latex/contrib/reledmac/examples/1-tabular.tex
+2021/04/04 | 197564 | macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
+2021/03/26 | 2592 | macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.tex
+2021/04/04 | 197396 | macros/latex/contrib/reledmac/examples/1-verses.pdf
+2021/03/26 | 1902 | macros/latex/contrib/reledmac/examples/1-verses.tex
+2021/04/04 | 205373 | macros/latex/contrib/reledmac/examples/2-antilabe.pdf
+2021/03/26 | 1998 | macros/latex/contrib/reledmac/examples/2-antilabe.tex
+2021/04/04 | 196391 | macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
+2021/03/26 | 1857 | macros/latex/contrib/reledmac/examples/2-cross_referencing.tex
+2021/04/04 | 199862 | macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
+2021/03/26 | 6806 | macros/latex/contrib/reledmac/examples/2-footnote_spacing.tex
+2021/04/04 | 280691 | macros/latex/contrib/reledmac/examples/2-glossaries.pdf
+2021/03/26 | 1794 | macros/latex/contrib/reledmac/examples/2-glossaries.tex
+2021/04/04 | 279825 | macros/latex/contrib/reledmac/examples/2-indexing.pdf
+2021/03/26 | 2761 | macros/latex/contrib/reledmac/examples/2-indexing.tex
+2021/04/04 | 273987 | macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
+2021/03/26 | 1140 | macros/latex/contrib/reledmac/examples/2-lemma_disambigution.tex
+2021/04/04 | 289480 | macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
+2021/03/26 | 11391 | macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.tex
+2021/04/04 | 284653 | macros/latex/contrib/reledmac/examples/2-linespacing.pdf
+2021/03/26 | 1488 | macros/latex/contrib/reledmac/examples/2-linespacing.tex
+2021/04/04 | 285314 | macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
+2021/03/26 | 21449 | macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.tex
+2021/04/04 | 203109 | macros/latex/contrib/reledmac/examples/2-notes-width.pdf
+2021/03/26 | 1528 | macros/latex/contrib/reledmac/examples/2-notes-width.tex
+2021/04/04 | 208756 | macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
+2021/03/26 | 5161 | macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.tex
+2021/04/04 | 281669 | macros/latex/contrib/reledmac/examples/2-performances.pdf
+2021/03/26 | 2710 | macros/latex/contrib/reledmac/examples/2-performances.tex
+2021/04/04 | 31450 | 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
-2021/03/08 | 304585 | macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
-2021/02/28 | 15949 | macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.tex
-2021/03/08 | 283529 | macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
-2021/02/28 | 3065 | macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.tex
-2021/03/08 | 196014 | macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
-2021/02/28 | 2006 | macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.tex
-2021/03/08 | 23268 | macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
+2021/04/04 | 304788 | macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
+2021/03/26 | 15949 | macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.tex
+2021/04/04 | 283765 | macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
+2021/03/26 | 3065 | macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.tex
+2021/04/04 | 196243 | macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
+2021/03/26 | 2006 | macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.tex
+2021/04/04 | 23427 | 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
-2021/03/08 | 172561 | macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
-2021/02/28 | 2912 | macros/latex/contrib/reledmac/examples/3-reledpar_mwe.tex
-2021/03/08 | 32053 | macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
+2021/04/04 | 172606 | macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
+2021/03/26 | 2912 | macros/latex/contrib/reledmac/examples/3-reledpar_mwe.tex
+2021/04/04 | 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
-2021/03/08 | 284700 | macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
-2021/02/28 | 20137 | macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.tex
-2021/03/08 | 190058 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
-2021/02/28 | 1665 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.tex
-2021/03/08 | 189290 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
-2021/02/28 | 1627 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.tex
-2021/03/08 | 168066 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
-2021/02/28 | 1553 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.tex
-2021/03/08 | 188622 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
-2021/03/08 | 189692 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
-2021/02/28 | 1644 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.tex
-2021/02/28 | 1603 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.tex
-2021/03/08 | 188675 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
-2021/02/28 | 1609 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.tex
-2021/03/08 | 188809 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
-2021/02/28 | 1611 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.tex
-2021/03/08 | 209918 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
-2021/02/28 | 13642 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex
-2021/03/08 | 208856 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
-2021/02/28 | 12681 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.tex
-2021/03/08 | 201188 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
-2021/02/28 | 3005 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.tex
-2021/03/08 | 293036 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
-2021/02/28 | 5587 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.tex
-2021/03/08 | 200260 | macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
-2021/02/28 | 11558 | macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.tex
-2021/03/08 | 221533 | macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
-2021/02/28 | 10033 | macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.tex
-2021/03/08 | 246187 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
-2021/02/28 | 43045 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.tex
-2021/03/08 | 200801 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
-2021/02/28 | 6540 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.tex
-2021/03/08 | 196882 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
-2021/02/28 | 4504 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.tex
-2021/03/08 | 297430 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
-2021/02/28 | 9314 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.tex
-2021/03/08 | 203241 | macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
-2021/02/28 | 8510 | macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.tex
-2021/03/08 | 192355 | macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
-2021/02/28 | 2157 | macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.tex
+2021/04/04 | 284905 | macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
+2021/03/26 | 20137 | macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.tex
+2021/04/04 | 190129 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
+2021/03/26 | 1665 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.tex
+2021/04/04 | 189364 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
+2021/03/26 | 1627 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.tex
+2021/04/04 | 168145 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
+2021/03/26 | 1553 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.tex
+2021/04/04 | 188698 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
+2021/04/04 | 189772 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
+2021/03/26 | 1644 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.tex
+2021/03/26 | 1603 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.tex
+2021/04/04 | 188752 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
+2021/03/26 | 1609 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.tex
+2021/04/04 | 188888 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
+2021/03/26 | 1611 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.tex
+2021/04/04 | 210267 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
+2021/03/26 | 13642 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex
+2021/04/04 | 209050 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
+2021/03/26 | 12681 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.tex
+2021/04/04 | 201331 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
+2021/03/26 | 3005 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.tex
+2021/04/04 | 293347 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
+2021/03/26 | 5587 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.tex
+2021/04/04 | 200437 | macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
+2021/03/26 | 11558 | macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.tex
+2021/04/04 | 221703 | macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
+2021/03/26 | 10033 | macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.tex
+2021/04/04 | 246378 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
+2021/03/26 | 43045 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.tex
+2021/04/04 | 201164 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
+2021/03/26 | 6540 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.tex
+2021/04/04 | 197012 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
+2021/03/26 | 4504 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.tex
+2021/04/04 | 297750 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
+2021/03/26 | 9314 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.tex
+2021/04/04 | 203497 | macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
+2021/03/26 | 8510 | macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.tex
+2021/04/04 | 192572 | macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
+2021/03/26 | 2157 | macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.tex
2021/02/28 | 49 | macros/latex/contrib/reledmac/examples/latexmkrc
-2021/02/28 | 816 | macros/latex/contrib/reledmac/examples/makefile
+2021/03/26 | 816 | macros/latex/contrib/reledmac/examples/makefile
2020/11/24 | 2269 | macros/latex/contrib/reledmac/examples/reledmac.xdy
2021/02/28 | 16 | macros/latex/contrib/reledmac/latexmkrc
-2021/03/08 | 1718 | macros/latex/contrib/reledmac/makefile
+2021/04/04 | 1718 | macros/latex/contrib/reledmac/makefile
2021/02/28 | 3495 | macros/latex/contrib/reledmac/migration.dtx
-2021/03/08 | 357853 | macros/latex/contrib/reledmac/migration.pdf
-2021/02/28 | 3962 | macros/latex/contrib/reledmac/README.md
-2021/03/08 | 892481 | macros/latex/contrib/reledmac/reledmac.dtx
+2021/04/04 | 358157 | macros/latex/contrib/reledmac/migration.pdf
+2021/03/26 | 3962 | macros/latex/contrib/reledmac/README.md
+2021/04/04 | 893001 | macros/latex/contrib/reledmac/reledmac.dtx
2021/02/28 | 2691 | macros/latex/contrib/reledmac/reledmac.ins
-2021/03/08 | 2032328 | macros/latex/contrib/reledmac/reledmac.pdf
-2021/03/08 | 305928 | macros/latex/contrib/reledmac/reledpar.dtx
+2021/04/04 | 2034959 | macros/latex/contrib/reledmac/reledmac.pdf
+2021/03/26 | 305928 | macros/latex/contrib/reledmac/reledpar.dtx
2021/02/28 | 2638 | macros/latex/contrib/reledmac/reledpar.ins
-2021/03/08 | 986633 | macros/latex/contrib/reledmac/reledpar.pdf
-2021/03/08 | 13297675 | macros/latex/contrib/reledmac.zip
+2021/04/04 | 987750 | macros/latex/contrib/reledmac/reledpar.pdf
+2021/04/04 | 13303305 | 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
@@ -254339,116 +254348,116 @@
2011/05/01 | 29792 | support/ant-worker-tasks/lib/worker-tools.jar
2011/05/01 | 1107 | support/ant-worker-tasks/README
2011/05/02 | 2079536 | support/ant-worker-tasks.zip
-2021/03/31 | 1724 | support/arara/doc/arara.1
-2021/03/31 | 1962695 | support/arara/doc/arara-manual.pdf
-2021/03/31 | 3362 | support/arara/doc/arara-manual.tex
-2021/03/31 | 245763 | support/arara/doc/arara-quickstart.pdf
-2021/03/31 | 40086 | support/arara/doc/arara-quickstart.tex
-2021/03/31 | 39 | support/arara/doc/arararc.yaml
-2021/03/31 | 33026 | support/arara/doc/arara.sty
-2021/03/31 | 12065 | support/arara/doc/chapters/building.tex
-2021/03/31 | 26880 | support/arara/doc/chapters/cli.tex
-2021/03/31 | 37238 | support/arara/doc/chapters/concepts.tex
-2021/03/31 | 20201 | support/arara/doc/chapters/configuration.tex
-2021/03/31 | 14613 | support/arara/doc/chapters/deploying.tex
-2021/03/31 | 12528 | support/arara/doc/chapters/introduction.tex
-2021/03/31 | 2108 | support/arara/doc/chapters/license.tex
-2021/03/31 | 11976 | support/arara/doc/chapters/logging.tex
-2021/03/31 | 81117 | support/arara/doc/chapters/methods.tex
-2021/03/31 | 13532 | support/arara/doc/chapters/mvel.tex
-2021/03/31 | 138139 | support/arara/doc/chapters/rules.tex
-2021/03/31 | 7353 | support/arara/doc/chapters/yaml.tex
-2021/03/31 | 140957 | support/arara/doc/figures/arara.png
-2021/03/31 | 60850 | support/arara/doc/figures/dropdown1.pdf
-2021/03/31 | 59101 | support/arara/doc/figures/dropdown2.pdf
-2021/03/31 | 1347 | support/arara/doc/figures/gl.pdf
-2021/03/31 | 59941 | support/arara/doc/figures/inputbox1.pdf
-2021/03/31 | 58249 | support/arara/doc/figures/inputbox2.pdf
-2021/03/31 | 54949 | support/arara/doc/figures/messagebox1.pdf
-2021/03/31 | 53224 | support/arara/doc/figures/messagebox2.pdf
-2021/03/31 | 61172 | support/arara/doc/figures/optionbox1.pdf
-2021/03/31 | 59540 | support/arara/doc/figures/optionbox2.pdf
-2021/03/31 | 3026 | support/arara/doc/logos/bird.pdf
-2021/03/31 | 14215 | support/arara/doc/logos/logo1.pdf
-2021/03/31 | 14166 | support/arara/doc/logos/logo2.pdf
-2021/03/31 | 1032 | support/arara/doc/rules/manual.yaml
-2021/03/31 | 1046 | support/arara/doc/rules/quickstart.yaml
-2021/03/31 | 5 | support/arara/doc/version.tex
-2021/03/31 | 4722 | support/arara/README.md
-2021/03/31 | 11618693 | support/arara/scripts/arara.jar
-2021/03/31 | 576 | support/arara/scripts/arara.sh
-2021/03/31 | 1107 | support/arara/scripts/rules/arara-rule-animate.yaml
-2021/03/31 | 1478 | support/arara/scripts/rules/arara-rule-asymptote.yaml
-2021/03/31 | 1105 | support/arara/scripts/rules/arara-rule-authorindex.yaml
-2021/03/31 | 5789 | support/arara/scripts/rules/arara-rule-bib2gls.yaml
-2021/03/31 | 839 | support/arara/scripts/rules/arara-rule-biber.yaml
-2021/03/31 | 621 | support/arara/scripts/rules/arara-rule-bibtex8.yaml
-2021/03/31 | 621 | support/arara/scripts/rules/arara-rule-bibtexu.yaml
-2021/03/31 | 592 | support/arara/scripts/rules/arara-rule-bibtex.yaml
-2021/03/31 | 1341 | support/arara/scripts/rules/arara-rule-clean.yaml
-2021/03/31 | 4254 | support/arara/scripts/rules/arara-rule-context.yaml
-2021/03/31 | 647 | support/arara/scripts/rules/arara-rule-convert.yaml
-2021/03/31 | 796 | support/arara/scripts/rules/arara-rule-copy.yaml
-2021/03/31 | 1272 | support/arara/scripts/rules/arara-rule-csplain.yaml
-2021/03/31 | 4074 | support/arara/scripts/rules/arara-rule-datatooltk.yaml
-2021/03/31 | 1837 | support/arara/scripts/rules/arara-rule-detex.yaml
-2021/03/31 | 812 | support/arara/scripts/rules/arara-rule-dvipdfmx.yaml
-2021/03/31 | 808 | support/arara/scripts/rules/arara-rule-dvipdfm.yaml
-2021/03/31 | 1278 | support/arara/scripts/rules/arara-rule-dvipspdf.yaml
-2021/03/31 | 799 | support/arara/scripts/rules/arara-rule-dvips.yaml
-2021/03/31 | 1448 | support/arara/scripts/rules/arara-rule-dvisvgm.yaml
-2021/03/31 | 1062 | support/arara/scripts/rules/arara-rule-etex.yaml
-2021/03/31 | 1672 | support/arara/scripts/rules/arara-rule-fig2dev.yaml
-2021/03/31 | 1989 | support/arara/scripts/rules/arara-rule-frontespizio.yaml
-2021/03/31 | 878 | support/arara/scripts/rules/arara-rule-ghostscript.yaml
-2021/03/31 | 950 | support/arara/scripts/rules/arara-rule-gnuplot.yaml
-2021/03/31 | 320 | support/arara/scripts/rules/arara-rule-halt.yaml
-2021/03/31 | 2608 | support/arara/scripts/rules/arara-rule-indent.yaml
-2021/03/31 | 1470 | support/arara/scripts/rules/arara-rule-knitr.yaml
-2021/03/31 | 1884 | support/arara/scripts/rules/arara-rule-latexmk.yaml
-2021/03/31 | 1610 | support/arara/scripts/rules/arara-rule-latex.yaml
-2021/03/31 | 1282 | support/arara/scripts/rules/arara-rule-llmk.yaml
-2021/03/31 | 2544 | support/arara/scripts/rules/arara-rule-ltx2any.yaml
-2021/03/31 | 1276 | support/arara/scripts/rules/arara-rule-luahbtex.yaml
-2021/03/31 | 1625 | support/arara/scripts/rules/arara-rule-lualatex.yaml
-2021/03/31 | 1268 | support/arara/scripts/rules/arara-rule-luatex.yaml
-2021/03/31 | 647 | support/arara/scripts/rules/arara-rule-makeglossarieslite.yaml
-2021/03/31 | 2435 | support/arara/scripts/rules/arara-rule-makeglossaries.yaml
-2021/03/31 | 1503 | support/arara/scripts/rules/arara-rule-makeindex.yaml
-2021/03/31 | 984 | support/arara/scripts/rules/arara-rule-make.yaml
-2021/03/31 | 1274 | support/arara/scripts/rules/arara-rule-metapost.yaml
-2021/03/31 | 923 | support/arara/scripts/rules/arara-rule-move.yaml
-2021/03/31 | 832 | support/arara/scripts/rules/arara-rule-nomencl.yaml
-2021/03/31 | 596 | support/arara/scripts/rules/arara-rule-pbibtex.yaml
-2021/03/31 | 3253 | support/arara/scripts/rules/arara-rule-pdfcrop.yaml
-2021/03/31 | 1284 | support/arara/scripts/rules/arara-rule-pdfcsplain.yaml
-2021/03/31 | 1625 | support/arara/scripts/rules/arara-rule-pdflatex.yaml
-2021/03/31 | 1268 | support/arara/scripts/rules/arara-rule-pdftex.yaml
-2021/03/31 | 588 | support/arara/scripts/rules/arara-rule-pdftk.yaml
-2021/03/31 | 2100 | support/arara/scripts/rules/arara-rule-perltex.yaml
-2021/03/31 | 1517 | support/arara/scripts/rules/arara-rule-platex.yaml
-2021/03/31 | 809 | support/arara/scripts/rules/arara-rule-ps2pdf.yaml
-2021/03/31 | 1162 | support/arara/scripts/rules/arara-rule-ptex.yaml
-2021/03/31 | 1722 | support/arara/scripts/rules/arara-rule-pythontex.yaml
-2021/03/31 | 546 | support/arara/scripts/rules/arara-rule-qpdf.yaml
-2021/03/31 | 1324 | support/arara/scripts/rules/arara-rule-sage.yaml
-2021/03/31 | 682 | support/arara/scripts/rules/arara-rule-sketch.yaml
-2021/03/31 | 812 | support/arara/scripts/rules/arara-rule-songidx.yaml
-2021/03/31 | 651 | support/arara/scripts/rules/arara-rule-spix.yaml
-2021/03/31 | 1709 | support/arara/scripts/rules/arara-rule-texcount.yaml
-2021/03/31 | 1974 | support/arara/scripts/rules/arara-rule-texindy.yaml
-2021/03/31 | 1050 | support/arara/scripts/rules/arara-rule-tex.yaml
-2021/03/31 | 842 | support/arara/scripts/rules/arara-rule-tikzmake.yaml
-2021/03/31 | 626 | support/arara/scripts/rules/arara-rule-upbibtex.yaml
-2021/03/31 | 1522 | support/arara/scripts/rules/arara-rule-uplatex.yaml
-2021/03/31 | 1166 | support/arara/scripts/rules/arara-rule-uptex.yaml
-2021/03/31 | 1111 | support/arara/scripts/rules/arara-rule-xdvipdfmx.yaml
-2021/03/31 | 1522 | support/arara/scripts/rules/arara-rule-xelatex.yaml
-2021/03/31 | 1166 | support/arara/scripts/rules/arara-rule-xetex.yaml
-2021/03/31 | 910 | support/arara/scripts/rules/arara-rule-xindex.yaml
-2021/03/31 | 1975 | support/arara/scripts/rules/arara-rule-xindy.yaml
-2021/03/31 | 131839 | support/arara/source/arara-6.0.2-src.zip
-2021/03/31 | 13529422 | support/arara.zip
+2021/04/04 | 1724 | support/arara/doc/arara.1
+2021/04/04 | 1962631 | support/arara/doc/arara-manual.pdf
+2021/04/04 | 3362 | support/arara/doc/arara-manual.tex
+2021/04/04 | 245754 | support/arara/doc/arara-quickstart.pdf
+2021/04/04 | 40086 | support/arara/doc/arara-quickstart.tex
+2021/04/04 | 39 | support/arara/doc/arararc.yaml
+2021/04/04 | 33026 | support/arara/doc/arara.sty
+2021/04/04 | 12065 | support/arara/doc/chapters/building.tex
+2021/04/04 | 26880 | support/arara/doc/chapters/cli.tex
+2021/04/04 | 37238 | support/arara/doc/chapters/concepts.tex
+2021/04/04 | 20201 | support/arara/doc/chapters/configuration.tex
+2021/04/04 | 14613 | support/arara/doc/chapters/deploying.tex
+2021/04/04 | 12528 | support/arara/doc/chapters/introduction.tex
+2021/04/04 | 2108 | support/arara/doc/chapters/license.tex
+2021/04/04 | 11976 | support/arara/doc/chapters/logging.tex
+2021/04/04 | 81117 | support/arara/doc/chapters/methods.tex
+2021/04/04 | 13532 | support/arara/doc/chapters/mvel.tex
+2021/04/04 | 138139 | support/arara/doc/chapters/rules.tex
+2021/04/04 | 7353 | support/arara/doc/chapters/yaml.tex
+2021/04/04 | 140957 | support/arara/doc/figures/arara.png
+2021/04/04 | 60850 | support/arara/doc/figures/dropdown1.pdf
+2021/04/04 | 59101 | support/arara/doc/figures/dropdown2.pdf
+2021/04/04 | 1347 | support/arara/doc/figures/gl.pdf
+2021/04/04 | 59941 | support/arara/doc/figures/inputbox1.pdf
+2021/04/04 | 58249 | support/arara/doc/figures/inputbox2.pdf
+2021/04/04 | 54949 | support/arara/doc/figures/messagebox1.pdf
+2021/04/04 | 53224 | support/arara/doc/figures/messagebox2.pdf
+2021/04/04 | 61172 | support/arara/doc/figures/optionbox1.pdf
+2021/04/04 | 59540 | support/arara/doc/figures/optionbox2.pdf
+2021/04/04 | 3026 | support/arara/doc/logos/bird.pdf
+2021/04/04 | 14215 | support/arara/doc/logos/logo1.pdf
+2021/04/04 | 14166 | support/arara/doc/logos/logo2.pdf
+2021/04/04 | 1032 | support/arara/doc/rules/manual.yaml
+2021/04/04 | 1046 | support/arara/doc/rules/quickstart.yaml
+2021/04/04 | 5 | support/arara/doc/version.tex
+2021/04/04 | 4722 | support/arara/README.md
+2021/04/04 | 11618864 | support/arara/scripts/arara.jar
+2021/04/04 | 576 | support/arara/scripts/arara.sh
+2021/04/04 | 1107 | support/arara/scripts/rules/arara-rule-animate.yaml
+2021/04/04 | 1478 | support/arara/scripts/rules/arara-rule-asymptote.yaml
+2021/04/04 | 1105 | support/arara/scripts/rules/arara-rule-authorindex.yaml
+2021/04/04 | 5789 | support/arara/scripts/rules/arara-rule-bib2gls.yaml
+2021/04/04 | 839 | support/arara/scripts/rules/arara-rule-biber.yaml
+2021/04/04 | 621 | support/arara/scripts/rules/arara-rule-bibtex8.yaml
+2021/04/04 | 621 | support/arara/scripts/rules/arara-rule-bibtexu.yaml
+2021/04/04 | 592 | support/arara/scripts/rules/arara-rule-bibtex.yaml
+2021/04/04 | 1341 | support/arara/scripts/rules/arara-rule-clean.yaml
+2021/04/04 | 4254 | support/arara/scripts/rules/arara-rule-context.yaml
+2021/04/04 | 647 | support/arara/scripts/rules/arara-rule-convert.yaml
+2021/04/04 | 796 | support/arara/scripts/rules/arara-rule-copy.yaml
+2021/04/04 | 1272 | support/arara/scripts/rules/arara-rule-csplain.yaml
+2021/04/04 | 4074 | support/arara/scripts/rules/arara-rule-datatooltk.yaml
+2021/04/04 | 1837 | support/arara/scripts/rules/arara-rule-detex.yaml
+2021/04/04 | 812 | support/arara/scripts/rules/arara-rule-dvipdfmx.yaml
+2021/04/04 | 808 | support/arara/scripts/rules/arara-rule-dvipdfm.yaml
+2021/04/04 | 1278 | support/arara/scripts/rules/arara-rule-dvipspdf.yaml
+2021/04/04 | 799 | support/arara/scripts/rules/arara-rule-dvips.yaml
+2021/04/04 | 1448 | support/arara/scripts/rules/arara-rule-dvisvgm.yaml
+2021/04/04 | 1062 | support/arara/scripts/rules/arara-rule-etex.yaml
+2021/04/04 | 1672 | support/arara/scripts/rules/arara-rule-fig2dev.yaml
+2021/04/04 | 1989 | support/arara/scripts/rules/arara-rule-frontespizio.yaml
+2021/04/04 | 878 | support/arara/scripts/rules/arara-rule-ghostscript.yaml
+2021/04/04 | 950 | support/arara/scripts/rules/arara-rule-gnuplot.yaml
+2021/04/04 | 320 | support/arara/scripts/rules/arara-rule-halt.yaml
+2021/04/04 | 2608 | support/arara/scripts/rules/arara-rule-indent.yaml
+2021/04/04 | 1470 | support/arara/scripts/rules/arara-rule-knitr.yaml
+2021/04/04 | 1884 | support/arara/scripts/rules/arara-rule-latexmk.yaml
+2021/04/04 | 1610 | support/arara/scripts/rules/arara-rule-latex.yaml
+2021/04/04 | 1282 | support/arara/scripts/rules/arara-rule-llmk.yaml
+2021/04/04 | 2544 | support/arara/scripts/rules/arara-rule-ltx2any.yaml
+2021/04/04 | 1276 | support/arara/scripts/rules/arara-rule-luahbtex.yaml
+2021/04/04 | 1625 | support/arara/scripts/rules/arara-rule-lualatex.yaml
+2021/04/04 | 1268 | support/arara/scripts/rules/arara-rule-luatex.yaml
+2021/04/04 | 647 | support/arara/scripts/rules/arara-rule-makeglossarieslite.yaml
+2021/04/04 | 2435 | support/arara/scripts/rules/arara-rule-makeglossaries.yaml
+2021/04/04 | 1503 | support/arara/scripts/rules/arara-rule-makeindex.yaml
+2021/04/04 | 984 | support/arara/scripts/rules/arara-rule-make.yaml
+2021/04/04 | 1274 | support/arara/scripts/rules/arara-rule-metapost.yaml
+2021/04/04 | 923 | support/arara/scripts/rules/arara-rule-move.yaml
+2021/04/04 | 832 | support/arara/scripts/rules/arara-rule-nomencl.yaml
+2021/04/04 | 596 | support/arara/scripts/rules/arara-rule-pbibtex.yaml
+2021/04/04 | 3253 | support/arara/scripts/rules/arara-rule-pdfcrop.yaml
+2021/04/04 | 1284 | support/arara/scripts/rules/arara-rule-pdfcsplain.yaml
+2021/04/04 | 1625 | support/arara/scripts/rules/arara-rule-pdflatex.yaml
+2021/04/04 | 1268 | support/arara/scripts/rules/arara-rule-pdftex.yaml
+2021/04/04 | 588 | support/arara/scripts/rules/arara-rule-pdftk.yaml
+2021/04/04 | 2100 | support/arara/scripts/rules/arara-rule-perltex.yaml
+2021/04/04 | 1517 | support/arara/scripts/rules/arara-rule-platex.yaml
+2021/04/04 | 809 | support/arara/scripts/rules/arara-rule-ps2pdf.yaml
+2021/04/04 | 1162 | support/arara/scripts/rules/arara-rule-ptex.yaml
+2021/04/04 | 1722 | support/arara/scripts/rules/arara-rule-pythontex.yaml
+2021/04/04 | 546 | support/arara/scripts/rules/arara-rule-qpdf.yaml
+2021/04/04 | 1324 | support/arara/scripts/rules/arara-rule-sage.yaml
+2021/04/04 | 682 | support/arara/scripts/rules/arara-rule-sketch.yaml
+2021/04/04 | 812 | support/arara/scripts/rules/arara-rule-songidx.yaml
+2021/04/04 | 651 | support/arara/scripts/rules/arara-rule-spix.yaml
+2021/04/04 | 1709 | support/arara/scripts/rules/arara-rule-texcount.yaml
+2021/04/04 | 1974 | support/arara/scripts/rules/arara-rule-texindy.yaml
+2021/04/04 | 1050 | support/arara/scripts/rules/arara-rule-tex.yaml
+2021/04/04 | 842 | support/arara/scripts/rules/arara-rule-tikzmake.yaml
+2021/04/04 | 626 | support/arara/scripts/rules/arara-rule-upbibtex.yaml
+2021/04/04 | 1522 | support/arara/scripts/rules/arara-rule-uplatex.yaml
+2021/04/04 | 1166 | support/arara/scripts/rules/arara-rule-uptex.yaml
+2021/04/04 | 1111 | support/arara/scripts/rules/arara-rule-xdvipdfmx.yaml
+2021/04/04 | 1522 | support/arara/scripts/rules/arara-rule-xelatex.yaml
+2021/04/04 | 1166 | support/arara/scripts/rules/arara-rule-xetex.yaml
+2021/04/04 | 910 | support/arara/scripts/rules/arara-rule-xindex.yaml
+2021/04/04 | 1975 | support/arara/scripts/rules/arara-rule-xindy.yaml
+2021/04/04 | 131928 | support/arara/source/arara-6.1.0-src.zip
+2021/04/04 | 13529557 | support/arara.zip
2001/08/10 | 19878 | support/arraymaker/arraymaker
2001/08/11 | 1352 | support/arraymaker/README
1995/02/22 | 13087 | support/artex/artex
@@ -273345,8 +273354,8 @@
2019/02/28 | 378272 | systems/texlive/tlnet/archive/productbox.doc.r20886.tar.xz
2019/02/28 | 4944 | systems/texlive/tlnet/archive/productbox.r20886.tar.xz
2019/02/28 | 15512 | systems/texlive/tlnet/archive/productbox.source.r20886.tar.xz
-2021/03/20 | 3718148 | systems/texlive/tlnet/archive/profcollege.doc.r58540.tar.xz
-2021/03/20 | 69432 | systems/texlive/tlnet/archive/profcollege.r58540.tar.xz
+2021/04/04 | 3732556 | systems/texlive/tlnet/archive/profcollege.doc.r58710.tar.xz
+2021/04/04 | 70872 | systems/texlive/tlnet/archive/profcollege.r58710.tar.xz
2019/02/28 | 49880 | systems/texlive/tlnet/archive/program.doc.r44214.tar.xz
2019/02/28 | 11780 | systems/texlive/tlnet/archive/program.r44214.tar.xz
2019/02/28 | 86236 | systems/texlive/tlnet/archive/progressbar.doc.r33822.tar.xz
@@ -275331,8 +275340,8 @@
2020/03/24 | 280 | systems/texlive/tlnet/archive/texlive-cz.r54496.tar.xz
2021/03/23 | 1554012 | systems/texlive/tlnet/archive/texlive-de.doc.r58648.tar.xz
2021/03/23 | 272 | systems/texlive/tlnet/archive/texlive-de.r58648.tar.xz
-2021/03/24 | 174212 | systems/texlive/tlnet/archive/texlive-docindex.doc.r58679.tar.xz
-2021/03/24 | 392 | systems/texlive/tlnet/archive/texlive-docindex.r58679.tar.xz
+2021/04/04 | 174164 | systems/texlive/tlnet/archive/texlive-docindex.doc.r58706.tar.xz
+2021/04/04 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r58706.tar.xz
2021/03/22 | 1937220 | systems/texlive/tlnet/archive/texlive-en.doc.r58572.tar.xz
2021/03/22 | 272 | systems/texlive/tlnet/archive/texlive-en.r58572.tar.xz
2021/03/09 | 3667820 | systems/texlive/tlnet/archive/texlive-es.doc.r58221.tar.xz
@@ -275388,7 +275397,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
-2021/03/24 | 211612 | systems/texlive/tlnet/archive/texlive-scripts.doc.r58690.tar.xz
+2021/04/04 | 211616 | systems/texlive/tlnet/archive/texlive-scripts.doc.r58706.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
@@ -275412,7 +275421,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
-2021/03/24 | 107056 | systems/texlive/tlnet/archive/texlive-scripts.r58690.tar.xz
+2021/04/04 | 107064 | systems/texlive/tlnet/archive/texlive-scripts.r58706.tar.xz
2021/02/25 | 572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz
2021/02/25 | 36372 | systems/texlive/tlnet/archive/texlive-scripts.win32.r57883.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
@@ -277101,16 +277110,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
2021/03/24 | 105293 | systems/texlive/tlnet/install-tl
-2021/04/03 | 6190174 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/04/03 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/04/03 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/04/04 | 6189730 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/04/04 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/04/04 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2020/08/23 | 4889 | systems/texlive/tlnet/install-tl-windows.bat
-2021/04/03 | 20130221 | systems/texlive/tlnet/install-tl-windows.exe
-2021/04/03 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/04/03 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/04/03 | 24961924 | systems/texlive/tlnet/install-tl.zip
-2021/04/03 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/04/03 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/04/04 | 20131460 | systems/texlive/tlnet/install-tl-windows.exe
+2021/04/04 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/04/04 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/04/04 | 24961933 | systems/texlive/tlnet/install-tl.zip
+2021/04/04 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/04/04 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2021/04/01 | 1229 | systems/texlive/tlnet/README.md
2021/04/01 | 0 | systems/texlive/tlnet/TEXLIVE_2021
2021/03/15 | 6571 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -277120,7 +277129,7 @@
2021/03/15 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2021/01/27 | 49446 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2021/03/23 | 6808 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2021/04/03 | 6794 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2020/04/15 | 223687 | 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
@@ -277160,15 +277169,15 @@
2020/03/16 | 10978 | systems/texlive/tlnet/tlpkg/TeXLive/TeXCatalogue.pm
2017/06/04 | 21326 | systems/texlive/tlnet/tlpkg/TeXLive/TLConfFile.pm
2021/02/24 | 11355 | systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm
-2020/05/17 | 20322 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
+2021/04/03 | 20365 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/02/20 | 5400 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2020/09/22 | 27563 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2021/04/03 | 17169686 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/04/03 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/04/04 | 17169686 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/04/04 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2020/05/13 | 86417 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2021/04/03 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/04/03 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/04/03 | 2293232 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/04/04 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/04/04 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/04/04 | 2293152 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/03/15 | 58775 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2021/03/17 | 42077 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2020/05/11 | 15010 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -281844,7 +281853,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
-2021/04/03 | 574351 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/04/04 | 574351 | 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
@@ -283040,9 +283049,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2021/03/15 | 39247 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2021/03/15 | 43386 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/04/03 | 208485 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/04/03 | 1265387 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/04/03 | 1181087 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/04/04 | 208466 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/04/04 | 1264152 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/04/04 | 1181422 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2021/03/15 | 13447 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2021/03/15 | 14320 | 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
@@ -283203,190 +283212,190 @@
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
-2021/04/03 | 574491 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/04/03 | 50848 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/04/03 | 56458 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/04/03 | 968696 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/04/03 | 1078878 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/04/03 | 29052 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/04/03 | 31344 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/04/03 | 29869 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/04/03 | 34634 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/04/03 | 49971 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/04/03 | 57598 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/04/03 | 84774 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/04/03 | 94737 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/04/03 | 67680 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/04/03 | 75418 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/04/03 | 27182 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/04/03 | 30886 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/04/03 | 330234 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/04/03 | 392597 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/04/03 | 32745 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/04/03 | 36680 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2021/04/03 | 51432 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/04/03 | 56718 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/04/03 | 4708 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
-2021/04/03 | 239477 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/04/03 | 261963 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/04/03 | 179379 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/04/03 | 195663 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/04/03 | 52475 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/04/03 | 59146 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/04/03 | 21131 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/04/03 | 23291 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/04/03 | 461400 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/04/03 | 45650 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/04/03 | 51160 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/04/03 | 282106 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/04/03 | 321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/04/03 | 41104 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2021/04/03 | 45278 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2021/04/03 | 116931 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/04/03 | 131490 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/04/03 | 1281103 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/04/03 | 1425980 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/04/03 | 87638 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2021/04/03 | 99605 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/04/03 | 43057 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/04/03 | 47878 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/04/03 | 25154 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/04/03 | 28009 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/04/03 | 55822 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/04/03 | 62802 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/04/03 | 135005 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/04/03 | 152762 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/04/03 | 73181 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/04/03 | 77859 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/04/03 | 71568 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/04/03 | 80661 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/04/03 | 258665 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/04/03 | 295554 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/04/03 | 22039 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2021/04/03 | 25001 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/04/03 | 97490 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/04/03 | 112253 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/04/03 | 63837 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/04/03 | 72861 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/04/03 | 96145 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2021/04/03 | 115470 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/04/03 | 38070 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/04/03 | 42627 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/04/03 | 484054 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/04/03 | 567625 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/04/03 | 147139 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/04/03 | 159968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/04/03 | 94802 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/04/03 | 109276 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/04/03 | 16328 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2021/04/03 | 17958 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/04/03 | 28121 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/04/03 | 30038 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/04/03 | 625282 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/04/03 | 680048 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/04/03 | 532037 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/04/03 | 594869 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/04/03 | 475935 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/04/03 | 511633 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/04/03 | 94268 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/04/03 | 103324 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/04/03 | 1725549 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/04/03 | 2009491 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/04/03 | 67652 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/04/03 | 74164 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/04/03 | 27363 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/04/03 | 31594 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/04/03 | 7746 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/04/03 | 8774 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/04/03 | 195566 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/04/03 | 214105 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/04/03 | 250211 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/04/03 | 283978 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/04/03 | 97135 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/04/03 | 101764 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/04/03 | 60551 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/04/03 | 67929 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/04/03 | 124972 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2021/04/03 | 136427 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/04/03 | 147151 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/04/03 | 163655 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/04/03 | 199702 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/04/03 | 180048 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/04/03 | 67451 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/04/03 | 77487 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/04/03 | 31192 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/04/03 | 35063 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/04/03 | 38064 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/04/03 | 42574 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/04/03 | 42923 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/04/03 | 47008 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/04/03 | 45938 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/04/03 | 52454 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/04/03 | 193717 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2021/04/03 | 211053 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/04/03 | 35462 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/04/03 | 39690 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/04/03 | 748364 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/04/03 | 816072 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/04/03 | 198131 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/04/03 | 202557 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/04/03 | 208182 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/04/03 | 243479 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/04/03 | 78745 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/04/03 | 87703 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/04/03 | 1171730 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/04/03 | 1307719 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/04/03 | 20122 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/04/03 | 23883 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/04/03 | 31544 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/04/03 | 37241 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/04/03 | 64018 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/04/03 | 72149 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/04/03 | 43678 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/04/03 | 51980 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/04/03 | 1295412 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/04/03 | 1424811 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/04/03 | 42389 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/04/03 | 51797 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/04/03 | 56223 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/04/03 | 59831 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/04/03 | 25341 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/04/03 | 27274 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/04/03 | 16111 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/04/03 | 18097 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/04/03 | 63675 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/04/03 | 70111 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2021/04/03 | 153890 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/04/03 | 167906 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2021/04/03 | 56909 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/04/03 | 65322 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/04/03 | 98516 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/04/03 | 104627 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/04/03 | 2499401 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/04/03 | 2616931 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/04/03 | 55217 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/04/03 | 62227 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/04/03 | 33440 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/04/03 | 37292 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/04/03 | 27197 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/04/03 | 33152 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/04/03 | 65733 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2021/04/03 | 70326 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/04/03 | 311191 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/04/03 | 345366 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/04/03 | 55564 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/04/03 | 57066 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/04/03 | 583626 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/04/03 | 618763 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/04/03 | 39564 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/04/03 | 43392 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/04/03 | 208404 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/04/03 | 1264301 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/04/03 | 1181170 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/04/03 | 13471 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/04/03 | 14354 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/04/04 | 574491 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/04/04 | 50847 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/04/04 | 56458 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/04/04 | 968698 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/04/04 | 1078878 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/04/04 | 29053 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/04/04 | 31344 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/04/04 | 29871 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/04/04 | 34635 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/04/04 | 49972 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/04/04 | 57598 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/04/04 | 84774 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/04/04 | 94738 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/04/04 | 67680 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/04/04 | 75418 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/04/04 | 27183 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/04/04 | 30886 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/04/04 | 330233 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/04/04 | 392599 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/04/04 | 32744 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/04/04 | 36680 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/04/04 | 51432 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/04/04 | 56717 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/04/04 | 4708 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
+2021/04/04 | 239477 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/04/04 | 261962 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/04/04 | 179380 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/04/04 | 195665 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/04/04 | 52477 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/04/04 | 59146 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/04/04 | 21128 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/04/04 | 23287 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/04/04 | 461400 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/04/04 | 45648 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/04/04 | 51160 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/04/04 | 282106 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/04/04 | 321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/04/04 | 41102 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/04/04 | 45276 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/04/04 | 116930 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/04/04 | 131490 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/04/04 | 1281102 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/04/04 | 1425980 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/04/04 | 87637 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/04/04 | 99605 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/04/04 | 43059 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/04/04 | 47878 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/04/04 | 25156 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/04/04 | 28010 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/04/04 | 55822 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/04/04 | 62801 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/04/04 | 135005 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/04/04 | 152762 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/04/04 | 73180 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/04/04 | 77858 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/04/04 | 71569 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/04/04 | 80661 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/04/04 | 258665 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/04/04 | 295555 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/04/04 | 22039 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/04/04 | 25002 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/04/04 | 97491 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/04/04 | 112252 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/04/04 | 63836 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/04/04 | 72860 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/04/04 | 96147 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/04/04 | 115470 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/04/04 | 38070 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/04/04 | 42627 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/04/04 | 484054 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/04/04 | 567627 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/04/04 | 147139 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/04/04 | 159969 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/04/04 | 94802 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/04/04 | 109276 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/04/04 | 16328 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/04/04 | 17958 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/04/04 | 28120 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/04/04 | 30038 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/04/04 | 625284 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/04/04 | 680051 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/04/04 | 532039 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/04/04 | 594870 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/04/04 | 475936 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/04/04 | 511634 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/04/04 | 94269 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/04/04 | 103324 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/04/04 | 1725547 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/04/04 | 2009493 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/04/04 | 67650 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/04/04 | 74164 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/04/04 | 27363 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/04/04 | 31594 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/04/04 | 7747 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/04/04 | 8776 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/04/04 | 195566 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/04/04 | 214105 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/04/04 | 250212 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/04/04 | 283978 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/04/04 | 97134 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/04/04 | 101764 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/04/04 | 60552 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/04/04 | 67930 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/04/04 | 124972 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/04/04 | 136427 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/04/04 | 147151 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/04/04 | 163656 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/04/04 | 199701 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/04/04 | 180047 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/04/04 | 67451 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/04/04 | 77487 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/04/04 | 31192 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/04/04 | 35062 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/04/04 | 38062 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/04/04 | 42574 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/04/04 | 42925 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/04/04 | 47008 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/04/04 | 45935 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/04/04 | 52453 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/04/04 | 193715 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/04/04 | 211056 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/04/04 | 35462 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/04/04 | 39690 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/04/04 | 748362 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/04/04 | 816072 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/04/04 | 198130 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/04/04 | 202557 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/04/04 | 208181 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/04/04 | 243479 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/04/04 | 78746 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/04/04 | 87705 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/04/04 | 1171727 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/04/04 | 1307722 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/04/04 | 20121 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/04/04 | 23882 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/04/04 | 31543 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/04/04 | 37245 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/04/04 | 64016 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/04/04 | 72151 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/04/04 | 43677 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/04/04 | 51978 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/04/04 | 1295414 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/04/04 | 1424813 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/04/04 | 42388 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/04/04 | 51797 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/04/04 | 56222 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/04/04 | 59831 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/04/04 | 25340 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/04/04 | 27275 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/04/04 | 16110 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/04/04 | 18097 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/04/04 | 63675 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/04/04 | 70109 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/04/04 | 153890 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/04/04 | 167906 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/04/04 | 56908 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/04/04 | 65322 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/04/04 | 98518 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/04/04 | 104625 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/04/04 | 2499401 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/04/04 | 2616930 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/04/04 | 55213 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/04/04 | 62227 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/04/04 | 33441 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/04/04 | 37293 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/04/04 | 27198 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/04/04 | 33153 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/04/04 | 65732 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/04/04 | 70325 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/04/04 | 311191 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/04/04 | 345367 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/04/04 | 55562 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/04/04 | 57067 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/04/04 | 583629 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/04/04 | 618763 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/04/04 | 39564 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/04/04 | 43392 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/04/04 | 208421 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/04/04 | 1263769 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/04/04 | 1181650 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/04/04 | 13470 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/04/04 | 14353 | 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
-2021/04/03 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/04/04 | 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
@@ -283719,7 +283728,7 @@
2020/10/20 | 342254 | systems/win32/miktex/tm/packages/preview.tar.lzma
2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
2021/03/03 | 372362 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2021/04/03 | 846 | systems/win32/miktex/tm/packages/pr.ini
+2021/04/04 | 846 | 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
@@ -285122,7 +285131,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2021/04/04 | 186 | timestamp
+2021/04/05 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2017/06/30 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 839bca6f70..3a3d7ad49a 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index 8b71231263..8c4dde78b4 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,202 +1,537 @@
+2021/04/04 | 99605 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/04/04 | 987750 | macros/latex/contrib/reledmac/reledpar.pdf
+2021/04/04 | 98518 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/04/04 | 984 | support/arara/scripts/rules/arara-rule-make.yaml
+2021/04/04 | 97491 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/04/04 | 97134 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/04/04 | 968698 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/04/04 | 96147 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/04/04 | 950 | support/arara/scripts/rules/arara-rule-gnuplot.yaml
+2021/04/04 | 94802 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/04/04 | 94738 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/04/04 | 946320 | graphics/mcf2graph.zip
+2021/04/04 | 94269 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/04/04 | 938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex
+2021/04/04 | 937253 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty
+2021/04/04 | 929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex
+2021/04/04 | 923 | support/arara/scripts/rules/arara-rule-move.yaml
+2021/04/04 | 910 | support/arara/scripts/rules/arara-rule-xindex.yaml
+2021/04/04 | 9109 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex
+2021/04/04 | 893001 | macros/latex/contrib/reledmac/reledmac.dtx
+2021/04/04 | 89183 | macros/latex/contrib/easybook/easybook.dtx
+2021/04/04 | 878 | support/arara/scripts/rules/arara-rule-ghostscript.yaml
+2021/04/04 | 8776 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/04/04 | 87705 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/04/04 | 87637 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/04/04 | 8757 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex
+2021/04/04 | 873175 | graphics/pgf/contrib/dynkin-diagrams.zip
+2021/04/04 | 84774 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/04/04 | 846 | systems/win32/miktex/tm/packages/pr.ini
+2021/04/04 | 842 | support/arara/scripts/rules/arara-rule-tikzmake.yaml
+2021/04/04 | 842401 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf
+2021/04/04 | 841461 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty
+2021/04/04 | 839 | support/arara/scripts/rules/arara-rule-biber.yaml
+2021/04/04 | 834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex
+2021/04/04 | 832 | support/arara/scripts/rules/arara-rule-nomencl.yaml
+2021/04/04 | 816072 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/04/04 | 812 | support/arara/scripts/rules/arara-rule-songidx.yaml
+2021/04/04 | 812 | support/arara/scripts/rules/arara-rule-dvipdfmx.yaml
+2021/04/04 | 81117 | support/arara/doc/chapters/methods.tex
+2021/04/04 | 809 | support/arara/scripts/rules/arara-rule-ps2pdf.yaml
+2021/04/04 | 808 | support/arara/scripts/rules/arara-rule-dvipdfm.yaml
+2021/04/04 | 80661 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/04/04 | 799 | support/arara/scripts/rules/arara-rule-dvips.yaml
+2021/04/04 | 796 | support/arara/scripts/rules/arara-rule-copy.yaml
+2021/04/04 | 78746 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/04/04 | 77858 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/04/04 | 77487 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/04/04 | 7747 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/04/04 | 758990 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty
+2021/04/04 | 75418 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/04/04 | 751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex
+2021/04/04 | 748362 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/04/04 | 74164 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/04/04 | 7353 | support/arara/doc/chapters/yaml.tex
+2021/04/04 | 73180 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/04/04 | 72860 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/04/04 | 72151 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/04/04 | 71569 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/04/04 | 70872 | systems/texlive/tlnet/archive/profcollege.r58710.tar.xz
+2021/04/04 | 707504 | macros/latex/contrib/easybook.zip
+2021/04/04 | 70325 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/04/04 | 70109 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/04/04 | 690730 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty
+2021/04/04 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex
+2021/04/04 | 682 | support/arara/scripts/rules/arara-rule-sketch.yaml
+2021/04/04 | 680051 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/04/04 | 67930 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/04/04 | 67680 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/04/04 | 67650 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/04/04 | 67451 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/04/04 | 65732 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/04/04 | 65322 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/04/04 | 651 | support/arara/scripts/rules/arara-rule-spix.yaml
+2021/04/04 | 647 | support/arara/scripts/rules/arara-rule-makeglossarieslite.yaml
+2021/04/04 | 647 | support/arara/scripts/rules/arara-rule-convert.yaml
+2021/04/04 | 64016 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/04/04 | 63836 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/04/04 | 63675 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/04/04 | 62801 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/04/04 | 626 | support/arara/scripts/rules/arara-rule-upbibtex.yaml
+2021/04/04 | 625284 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/04/04 | 62227 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/04/04 | 621 | support/arara/scripts/rules/arara-rule-bibtexu.yaml
+2021/04/04 | 621 | support/arara/scripts/rules/arara-rule-bibtex8.yaml
+2021/04/04 | 6189730 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/04/04 | 618763 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/04/04 | 61228 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex
+2021/04/04 | 61172 | support/arara/doc/figures/optionbox1.pdf
+2021/04/04 | 6106 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
+2021/04/04 | 60850 | support/arara/doc/figures/dropdown1.pdf
+2021/04/04 | 60552 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/04/04 | 5 | support/arara/doc/version.tex
+2021/04/04 | 59941 | support/arara/doc/figures/inputbox1.pdf
+2021/04/04 | 59831 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/04/04 | 596 | support/arara/scripts/rules/arara-rule-pbibtex.yaml
+2021/04/04 | 59540 | support/arara/doc/figures/optionbox2.pdf
+2021/04/04 | 594870 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/04/04 | 592 | support/arara/scripts/rules/arara-rule-bibtex.yaml
+2021/04/04 | 59146 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/04/04 | 59101 | support/arara/doc/figures/dropdown2.pdf
+2021/04/04 | 588 | support/arara/scripts/rules/arara-rule-pdftk.yaml
+2021/04/04 | 583629 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/04/04 | 58249 | support/arara/doc/figures/inputbox2.pdf
+2021/04/04 | 5789 | support/arara/scripts/rules/arara-rule-bib2gls.yaml
+2021/04/04 | 576 | support/arara/scripts/arara.sh
+2021/04/04 | 57598 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/04/04 | 574491 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/04/04 | 574351 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/04/04 | 57067 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/04/04 | 56908 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/04/04 | 567627 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/04/04 | 56717 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/04/04 | 56458 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/04/04 | 56222 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/04/04 | 55822 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/04/04 | 55562 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/04/04 | 55213 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/04/04 | 54949 | support/arara/doc/figures/messagebox1.pdf
+2021/04/04 | 54833 | graphics/mcf2graph/mcf_manual.tex
+2021/04/04 | 546 | support/arara/scripts/rules/arara-rule-qpdf.yaml
+2021/04/04 | 54038 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
+2021/04/04 | 53224 | support/arara/doc/figures/messagebox2.pdf
+2021/04/04 | 532039 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/04/04 | 52477 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/04/04 | 52453 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/04/04 | 51978 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/04/04 | 51797 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/04/04 | 51432 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/04/04 | 51333 | graphics/pgf/contrib/figchild/figchild.tex
+2021/04/04 | 511634 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/04/04 | 51160 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/04/04 | 50847 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/04/04 | 49972 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/04/04 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/04/04 | 484054 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/04/04 | 47878 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/04/04 | 475936 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/04/04 | 4722 | support/arara/README.md
+2021/04/04 | 4708 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
+2021/04/04 | 47008 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/04/04 | 461400 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/04/04 | 45935 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/04/04 | 45648 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/04/04 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/04/04 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/04/04 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/04/04 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/04/04 | 45276 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/04/04 | 44379 | graphics/mcf2graph/mcf_man_soc.mf
+2021/04/04 | 43677 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/04/04 | 43392 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/04/04 | 4318 | graphics/mcf2graph/README
+2021/04/04 | 43059 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/04/04 | 42925 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/04/04 | 42627 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/04/04 | 42574 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/04/04 | 4254 | support/arara/scripts/rules/arara-rule-context.yaml
+2021/04/04 | 42388 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/04/04 | 422268 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty
+2021/04/04 | 421232 | macros/latex/contrib/easybook/doc/easybook.pdf
+2021/04/04 | 418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex
+2021/04/04 | 416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex
+2021/04/04 | 4150 | macros/latex/contrib/easybook/doc/chapter1.tex
+2021/04/04 | 41102 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/04/04 | 40812 | macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
+2021/04/04 | 4074 | support/arara/scripts/rules/arara-rule-datatooltk.yaml
+2021/04/04 | 405932 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
+2021/04/04 | 403539 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty
+2021/04/04 | 40086 | support/arara/doc/arara-quickstart.tex
+2021/04/04 | 39 | support/arara/doc/arararc.yaml
+2021/04/04 | 39690 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/04/04 | 39564 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/04/04 | 393856 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty
+2021/04/04 | 392599 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/04/04 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r58706.tar.xz
+2021/04/04 | 3872 | macros/latex/contrib/easybook/doc/chapter2.tex
+2021/04/04 | 38070 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/04/04 | 38062 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/04/04 | 377674 | graphics/pgf/contrib/figchild.zip
+2021/04/04 | 374447 | graphics/mcf2graph/mcf_manual.pdf
+2021/04/04 | 3732556 | systems/texlive/tlnet/archive/profcollege.doc.r58710.tar.xz
+2021/04/04 | 37293 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/04/04 | 37245 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/04/04 | 37238 | support/arara/doc/chapters/concepts.tex
+2021/04/04 | 36680 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/04/04 | 364086 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty
+2021/04/04 | 3590 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
+2021/04/04 | 358157 | macros/latex/contrib/reledmac/migration.pdf
+2021/04/04 | 356340 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
+2021/04/04 | 35462 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/04/04 | 35062 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/04/04 | 34691 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex
+2021/04/04 | 34635 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/04/04 | 345367 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/04/04 | 343 | graphics/pgf/contrib/dynkin-diagrams/README
+2021/04/04 | 3362 | support/arara/doc/arara-manual.tex
+2021/04/04 | 33441 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/04/04 | 33153 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/04/04 | 33026 | support/arara/doc/arara.sty
+2021/04/04 | 330233 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/04/04 | 3277 | graphics/pgf/contrib/circuitikz/README.md
+2021/04/04 | 32744 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/04/04 | 3253 | support/arara/scripts/rules/arara-rule-pdfcrop.yaml
+2021/04/04 | 321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/04/04 | 320 | support/arara/scripts/rules/arara-rule-halt.yaml
+2021/04/04 | 32047 | macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
+2021/04/04 | 31 | graphics/pgf/contrib/figchild/latexmkrc
+2021/04/04 | 319847 | graphics/mcf2graph/mcf_example.pdf
+2021/04/04 | 319139 | graphics/pgf/contrib/figchild/figchild.pdf
+2021/04/04 | 31594 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/04/04 | 31543 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/04/04 | 31450 | macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
+2021/04/04 | 31394 | graphics/pgf/contrib/circuitikz/doc/changelog.tex
+2021/04/04 | 31344 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/04/04 | 31192 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/04/04 | 311191 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/04/04 | 3101 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex
+2021/04/04 | 30990 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex
+2021/04/04 | 30886 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/04/04 | 304788 | macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
+2021/04/04 | 3026 | support/arara/doc/logos/bird.pdf
+2021/04/04 | 30229 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
+2021/04/04 | 30038 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/04/04 | 29871 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/04/04 | 297750 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
+2021/04/04 | 295555 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/04/04 | 2950 | graphics/mcf2graph/mcf_exa_soc.mf
+2021/04/04 | 294669 | graphics/pgf/contrib/figchild/figchild.sty
+2021/04/04 | 293347 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
+2021/04/04 | 291188 | macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
+2021/04/04 | 29053 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/04/04 | 289480 | macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
+2021/04/04 | 285314 | macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
+2021/04/04 | 284905 | macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
+2021/04/04 | 284653 | macros/latex/contrib/reledmac/examples/2-linespacing.pdf
+2021/04/04 | 283978 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/04/04 | 283765 | macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
+2021/04/04 | 282106 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/04/04 | 281669 | macros/latex/contrib/reledmac/examples/2-performances.pdf
+2021/04/04 | 28120 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/04/04 | 281031 | macros/latex/contrib/reledmac/examples/1-tabular.pdf
+2021/04/04 | 280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex
+2021/04/04 | 280691 | macros/latex/contrib/reledmac/examples/2-glossaries.pdf
+2021/04/04 | 28010 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/04/04 | 279825 | macros/latex/contrib/reledmac/examples/2-indexing.pdf
+2021/04/04 | 273987 | macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
+2021/04/04 | 27363 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/04/04 | 27275 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/04/04 | 27198 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/04/04 | 27183 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/04/04 | 26880 | support/arara/doc/chapters/cli.tex
+2021/04/04 | 2678 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
+2021/04/04 | 262396 | macros/latex/contrib/easybook/doc/easybook-demo.pdf
+2021/04/04 | 261962 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/04/04 | 2616930 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/04/04 | 2608 | support/arara/scripts/rules/arara-rule-indent.yaml
+2021/04/04 | 2587 | macros/latex/contrib/easybook/doc/easybook-demo.tex
+2021/04/04 | 258665 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/04/04 | 2544 | support/arara/scripts/rules/arara-rule-ltx2any.yaml
+2021/04/04 | 25340 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/04/04 | 25156 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/04/04 | 250212 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/04/04 | 25002 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/04/04 | 2499401 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/04/04 | 24961933 | systems/texlive/tlnet/install-tl.zip
+2021/04/04 | 2473469 | install/graphics/pgf/contrib/circuitikz.tds.zip
+2021/04/04 | 246378 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
+2021/04/04 | 2458423 | graphics/pgf/contrib/circuitikz.zip
+2021/04/04 | 245754 | support/arara/doc/arara-quickstart.pdf
+2021/04/04 | 2435 | support/arara/scripts/rules/arara-rule-makeglossaries.yaml
+2021/04/04 | 243479 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/04/04 | 239477 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/04/04 | 23882 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/04/04 | 238178 | macros/latex/contrib/abraces.zip
+2021/04/04 | 23427 | macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
+2021/04/04 | 23287 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/04/04 | 2309 | graphics/mcf2graph/mcf_example.tex
+2021/04/04 | 2293152 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/04/04 | 229076 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
+2021/04/04 | 221703 | macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
+2021/04/04 | 22039 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/04/04 | 216567 | language/marathi.zip
+2021/04/04 | 214105 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/04/04 | 211616 | systems/texlive/tlnet/archive/texlive-scripts.doc.r58706.tar.xz
+2021/04/04 | 21128 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/04/04 | 211056 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/04/04 | 2108 | support/arara/doc/chapters/license.tex
+2021/04/04 | 210267 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
+2021/04/04 | 2100 | support/arara/scripts/rules/arara-rule-perltex.yaml
+2021/04/04 | 209050 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
+2021/04/04 | 208756 | macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
+2021/04/04 | 208466 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/04/04 | 208421 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/04/04 | 208181 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/04/04 | 205373 | macros/latex/contrib/reledmac/examples/2-antilabe.pdf
+2021/04/04 | 203497 | macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
+2021/04/04 | 2034959 | macros/latex/contrib/reledmac/reledmac.pdf
+2021/04/04 | 203109 | macros/latex/contrib/reledmac/examples/2-notes-width.pdf
+2021/04/04 | 202557 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/04/04 | 20201 | support/arara/doc/chapters/configuration.tex
+2021/04/04 | 201331 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
+2021/04/04 | 20131460 | systems/texlive/tlnet/install-tl-windows.exe
+2021/04/04 | 20121 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/04/04 | 201164 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
+2021/04/04 | 2009493 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/04/04 | 200437 | macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
+2021/04/04 | 199862 | macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
+2021/04/04 | 199701 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/04/04 | 1989 | support/arara/scripts/rules/arara-rule-frontespizio.yaml
+2021/04/04 | 198130 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/04/04 | 1975 | support/arara/scripts/rules/arara-rule-xindy.yaml
+2021/04/04 | 197564 | macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
+2021/04/04 | 1974 | support/arara/scripts/rules/arara-rule-texindy.yaml
+2021/04/04 | 197491 | macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
+2021/04/04 | 197396 | macros/latex/contrib/reledmac/examples/1-verses.pdf
+2021/04/04 | 197012 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
+2021/04/04 | 196391 | macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
+2021/04/04 | 1962631 | support/arara/doc/arara-manual.pdf
+2021/04/04 | 196243 | macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
+2021/04/04 | 195848 | graphics/mcf2graph/mcf_mplib_exa.pdf
+2021/04/04 | 195665 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/04/04 | 195653 | macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
+2021/04/04 | 195566 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/04/04 | 193715 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/04/04 | 192572 | macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
+2021/04/04 | 190129 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
+2021/04/04 | 189772 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
+2021/04/04 | 189364 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
+2021/04/04 | 188888 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
+2021/04/04 | 188752 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
+2021/04/04 | 188698 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
+2021/04/04 | 1884 | support/arara/scripts/rules/arara-rule-latexmk.yaml
+2021/04/04 | 1877 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex
+2021/04/04 | 1837 | support/arara/scripts/rules/arara-rule-detex.yaml
+2021/04/04 | 18097 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/04/04 | 180047 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/04/04 | 17958 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/04/04 | 179380 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/04/04 | 17743 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
+2021/04/04 | 174164 | systems/texlive/tlnet/archive/texlive-docindex.doc.r58706.tar.xz
+2021/04/04 | 172606 | macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
+2021/04/04 | 1725547 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/04/04 | 1724 | support/arara/doc/arara.1
+2021/04/04 | 1722 | support/arara/scripts/rules/arara-rule-pythontex.yaml
+2021/04/04 | 1718 | macros/latex/contrib/reledmac/makefile
+2021/04/04 | 17169686 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/04/04 | 1709 | support/arara/scripts/rules/arara-rule-texcount.yaml
+2021/04/04 | 168145 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
+2021/04/04 | 167906 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/04/04 | 1672 | support/arara/scripts/rules/arara-rule-fig2dev.yaml
+2021/04/04 | 16580 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
+2021/04/04 | 163656 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/04/04 | 16328 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/04/04 | 1625 | support/arara/scripts/rules/arara-rule-pdflatex.yaml
+2021/04/04 | 1625 | support/arara/scripts/rules/arara-rule-lualatex.yaml
+2021/04/04 | 16110 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/04/04 | 1610 | support/arara/scripts/rules/arara-rule-latex.yaml
+2021/04/04 | 159969 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/04/04 | 15795 | graphics/mcf2graph/mcf_mplib_exa.tex
+2021/04/04 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/04/04 | 153890 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/04/04 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/04/04 | 152762 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/04/04 | 1522 | support/arara/scripts/rules/arara-rule-xelatex.yaml
+2021/04/04 | 1522 | support/arara/scripts/rules/arara-rule-uplatex.yaml
+2021/04/04 | 1517 | support/arara/scripts/rules/arara-rule-platex.yaml
+2021/04/04 | 151737 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty
+2021/04/04 | 1503 | support/arara/scripts/rules/arara-rule-makeindex.yaml
+2021/04/04 | 1478 | support/arara/scripts/rules/arara-rule-asymptote.yaml
+2021/04/04 | 14732 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
+2021/04/04 | 147151 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/04/04 | 147139 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/04/04 | 1470 | support/arara/scripts/rules/arara-rule-knitr.yaml
+2021/04/04 | 14613 | support/arara/doc/chapters/deploying.tex
+2021/04/04 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/04/04 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/04/04 | 1448 | support/arara/scripts/rules/arara-rule-dvisvgm.yaml
+2021/04/04 | 1443 | graphics/pgf/contrib/figchild/README.md
+2021/04/04 | 14353 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/04/04 | 1425980 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/04/04 | 1424813 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/04/04 | 14215 | support/arara/doc/logos/logo1.pdf
+2021/04/04 | 14166 | support/arara/doc/logos/logo2.pdf
+2021/04/04 | 140957 | support/arara/doc/figures/arara.png
+2021/04/04 | 138139 | support/arara/doc/chapters/rules.tex
+2021/04/04 | 136427 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/04/04 | 13532 | support/arara/doc/chapters/mvel.tex
+2021/04/04 | 13529557 | support/arara.zip
+2021/04/04 | 13516080 | install/support/arara.tds.zip
+2021/04/04 | 135005 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/04/04 | 1347 | support/arara/doc/figures/gl.pdf
+2021/04/04 | 13470 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/04/04 | 1341 | support/arara/scripts/rules/arara-rule-clean.yaml
+2021/04/04 | 13303305 | macros/latex/contrib/reledmac.zip
+2021/04/04 | 1324 | support/arara/scripts/rules/arara-rule-sage.yaml
+2021/04/04 | 131928 | support/arara/source/arara-6.1.0-src.zip
+2021/04/04 | 131490 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/04/04 | 1307722 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/04/04 | 1295414 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/04/04 | 1284 | support/arara/scripts/rules/arara-rule-pdfcsplain.yaml
+2021/04/04 | 1282 | support/arara/scripts/rules/arara-rule-llmk.yaml
+2021/04/04 | 1281102 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/04/04 | 1278 | support/arara/scripts/rules/arara-rule-dvipspdf.yaml
+2021/04/04 | 1276 | support/arara/scripts/rules/arara-rule-luahbtex.yaml
+2021/04/04 | 1274 | support/arara/scripts/rules/arara-rule-metapost.yaml
+2021/04/04 | 1272 | support/arara/scripts/rules/arara-rule-csplain.yaml
+2021/04/04 | 1268 | support/arara/scripts/rules/arara-rule-pdftex.yaml
+2021/04/04 | 1268 | support/arara/scripts/rules/arara-rule-luatex.yaml
+2021/04/04 | 1264152 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/04/04 | 1263769 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/04/04 | 12528 | support/arara/doc/chapters/introduction.tex
+2021/04/04 | 124972 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/04/04 | 12406 | graphics/mcf2graph/CHANGELOG
+2021/04/04 | 12348 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
+2021/04/04 | 12065 | support/arara/doc/chapters/building.tex
+2021/04/04 | 120283 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
+2021/04/04 | 11976 | support/arara/doc/chapters/logging.tex
+2021/04/04 | 1181650 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/04/04 | 1181422 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/04/04 | 1171727 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/04/04 | 116930 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/04/04 | 1166 | support/arara/scripts/rules/arara-rule-xetex.yaml
+2021/04/04 | 1166 | support/arara/scripts/rules/arara-rule-uptex.yaml
+2021/04/04 | 1162 | support/arara/scripts/rules/arara-rule-ptex.yaml
+2021/04/04 | 11618864 | support/arara/scripts/arara.jar
+2021/04/04 | 1159128 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
+2021/04/04 | 115470 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/04/04 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/04/04 | 112252 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/04/04 | 1111 | support/arara/scripts/rules/arara-rule-xdvipdfmx.yaml
+2021/04/04 | 1107 | support/arara/scripts/rules/arara-rule-animate.yaml
+2021/04/04 | 1105 | support/arara/scripts/rules/arara-rule-authorindex.yaml
+2021/04/04 | 109276 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/04/04 | 1078878 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/04/04 | 107064 | systems/texlive/tlnet/archive/texlive-scripts.r58706.tar.xz
+2021/04/04 | 1062 | support/arara/scripts/rules/arara-rule-etex.yaml
+2021/04/04 | 105913 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
+2021/04/04 | 1050 | support/arara/scripts/rules/arara-rule-tex.yaml
+2021/04/04 | 1046 | support/arara/doc/rules/quickstart.yaml
+2021/04/04 | 104625 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/04/04 | 103324 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/04/04 | 1032 | support/arara/doc/rules/manual.yaml
+2021/04/04 | 102216 | graphics/mcf2graph/mcf2graph.mf
+2021/04/04 | 1021921 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7.sty
+2021/04/04 | 101764 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/04/04 | 1014383 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.2.7.tex
2021/04/03 | 9967 | macros/latex/contrib/thuthesis/ref/refs.bib
-2021/04/03 | 99605 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
2021/04/03 | 98 | indexing/upmendex/source/version.h
2021/04/03 | 986 | indexing/upmendex/doc/samples/alphabet/Makefile
-2021/04/03 | 98516 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
2021/04/03 | 97733 | macros/latex/contrib/conferences/sugconf.zip
-2021/04/03 | 97490 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/04/03 | 97135 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
2021/04/03 | 96 | indexing/upmendex/source/tests/pprecA-2.ind
2021/04/03 | 96 | indexing/upmendex/source/tests/pprecA-1.ind
2021/04/03 | 96 | indexing/upmendex/source/tests/pprecA-0.ind
-2021/04/03 | 968696 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/04/03 | 96145 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2021/04/03 | 94802 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/04/03 | 94737 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/04/03 | 9610 | language/marathi/namuna-book.tex
+2021/04/03 | 9539 | language/marathi/namuna-article.tex
2021/04/03 | 9434 | indexing/upmendex/source/convert.c
-2021/04/03 | 94268 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/04/03 | 89342 | macros/latex/contrib/easybook/easybook.dtx
-2021/04/03 | 8774 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/04/03 | 87703 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/04/03 | 87638 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
2021/04/03 | 875280 | systems/texlive/tlnet/archive/beebe.r58697.tar.xz
2021/04/03 | 872 | indexing/upmendex/doc/samples/option/japanese.idx
-2021/04/03 | 84774 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/04/03 | 846 | systems/win32/miktex/tm/packages/pr.ini
-2021/04/03 | 816072 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/04/03 | 80661 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
2021/04/03 | 802 | macros/latex/contrib/thuthesis/thuthesis-numeric.bbx
2021/04/03 | 79118 | language/japanese/gckanbun.zip
-2021/04/03 | 78745 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
2021/04/03 | 778 | macros/latex/contrib/thuthesis/thuthesis-bachelor.bbx
-2021/04/03 | 77859 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/04/03 | 77487 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/04/03 | 7746 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
2021/04/03 | 766 | indexing/upmendex/source/tests/uni.ind
2021/04/03 | 7596 | fonts/xcharter/tex/XCharter.sty
2021/04/03 | 7546 | indexing/upmendex/source/main.c
-2021/04/03 | 75418 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
2021/04/03 | 749 | indexing/upmendex/doc/samples/option/Makefile
-2021/04/03 | 748364 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/04/03 | 74164 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/04/03 | 73181 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
2021/04/03 | 729 | indexing/upmendex/source/exkana.h
-2021/04/03 | 72861 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/04/03 | 72149 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/04/03 | 71568 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/04/03 | 706549 | macros/latex/contrib/easybook.zip
-2021/04/03 | 70326 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/04/03 | 70111 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
2021/04/03 | 700201 | indexing/upmendex/source/configure
2021/04/03 | 6913 | macros/latex/contrib/thuthesis/README.md
2021/04/03 | 68 | indexing/upmendex/source/tests/foo.idx
2021/04/03 | 68662 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
-2021/04/03 | 680048 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/04/03 | 67929 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/04/03 | 67680 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/04/03 | 67652 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/04/03 | 67451 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/04/03 | 68289 | language/marathi/marathi.dtx
+2021/04/03 | 6794 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2021/04/03 | 6734 | indexing/xindy/contrib/xindy-persian/source/variant3-utf8.pl.in
2021/04/03 | 6720 | indexing/xindy/contrib/xindy-persian/source/variant2-utf8.pl.in
2021/04/03 | 6720 | indexing/xindy/contrib/xindy-persian/source/variant1-utf8.pl.in
-2021/04/03 | 65733 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2021/04/03 | 65322 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
2021/04/03 | 64 | indexing/upmendex/source/tests/uni.dict
-2021/04/03 | 64018 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/04/03 | 63837 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/04/03 | 63675 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/04/03 | 62802 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/04/03 | 625282 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/04/03 | 62227 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/04/03 | 6190174 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/04/03 | 618763 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/04/03 | 641 | macros/latex/contrib/abraces/README.md
2021/04/03 | 614 | indexing/upmendex/doc/samples/russian.idx
-2021/04/03 | 60551 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/04/03 | 59831 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/04/03 | 594869 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
2021/04/03 | 5946 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.cbx
-2021/04/03 | 59146 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
2021/04/03 | 58 | indexing/upmendex/source/tests/foo.ind
2021/04/03 | 5842 | indexing/upmendex/source/qsort.c
-2021/04/03 | 583626 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/04/03 | 57598 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/04/03 | 574491 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/04/03 | 574351 | systems/win32/miktex/tm/packages/files.csv.lzma
-2021/04/03 | 57066 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/04/03 | 56909 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/04/03 | 567625 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/04/03 | 56718 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/04/03 | 56458 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/04/03 | 56223 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/04/03 | 55822 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/04/03 | 55564 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
2021/04/03 | 5551 | macros/latex/contrib/thuthesis/data/chap02.tex
2021/04/03 | 552 | indexing/upmendex/doc/samples/mdxsty02.ist
-2021/04/03 | 55217 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
2021/04/03 | 548 | macros/latex/contrib/thuthesis/data/acknowledgements.tex
2021/04/03 | 5438 | macros/latex/contrib/thuthesis/data/denotation.tex
-2021/04/03 | 532037 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/04/03 | 52475 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/04/03 | 52454 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
2021/04/03 | 521 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh22.ist
-2021/04/03 | 51980 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/04/03 | 51797 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/04/03 | 51432 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
2021/04/03 | 511775 | indexing/upmendex.zip
-2021/04/03 | 511633 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/04/03 | 51160 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/04/03 | 50848 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
2021/04/03 | 5058 | indexing/upmendex/source/ChangeLog
-2021/04/03 | 49971 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
2021/04/03 | 490 | macros/latex/contrib/thuthesis/latexmkrc
2021/04/03 | 4908 | indexing/upmendex/source/c-auto.in
-2021/04/03 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2021/04/03 | 4852 | macros/latex/contrib/thuthesis/thusetup.tex
-2021/04/03 | 484054 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/04/03 | 4814 | language/marathi/marathi.ins
2021/04/03 | 479 | macros/latex/contrib/thuthesis/thuthesis-author-year.bbx
-2021/04/03 | 47878 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/04/03 | 475935 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
2021/04/03 | 47154 | macros/latex/contrib/thuthesis/thuthesis-author-year.bst
-2021/04/03 | 4708 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
-2021/04/03 | 47008 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
2021/04/03 | 46876 | indexing/upmendex/source/Makefile.in
2021/04/03 | 465796 | systems/texlive/tlnet/archive/xcharter.doc.r58704.tar.xz
2021/04/03 | 4656 | macros/latex/contrib/thuthesis/data/chap01.tex
2021/04/03 | 463 | indexing/upmendex/doc/samples/german.idx
2021/04/03 | 462 | macros/latex/contrib/thuthesis/data/resolution.tex
-2021/04/03 | 461400 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/04/03 | 45938 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/04/03 | 45650 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/04/03 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/04/03 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2021/04/03 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/04/03 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/03 | 4549171 | fonts/xcharter.zip
2021/04/03 | 452 | macros/luatex/latex/unitipa/README.txt
-2021/04/03 | 45278 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
2021/04/03 | 4485 | indexing/upmendex/doc/samples/alphabet/alpha_zhr.idx
2021/04/03 | 44309 | macros/latex/contrib/thuthesis/thuthesis-bachelor.bst
2021/04/03 | 44305 | macros/latex/contrib/thuthesis/thuthesis-numeric.bst
2021/04/03 | 44106 | indexing/upmendex/source/aclocal.m4
-2021/04/03 | 43678 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
2021/04/03 | 435 | indexing/upmendex/source/tests/uni.idx
2021/04/03 | 435 | indexing/upmendex/doc/samples/french.idx
-2021/04/03 | 43392 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/04/03 | 43057 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/04/03 | 42923 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
2021/04/03 | 428 | macros/latex/contrib/thuthesis/ref/appendix.bib
-2021/04/03 | 42627 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/04/03 | 42574 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/04/03 | 42389 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
2021/04/03 | 421 | macros/latex/contrib/thuthesis/thuthesis-inline.cbx
-2021/04/03 | 420345 | macros/latex/contrib/easybook/doc/easybook.pdf
2021/04/03 | 4158 | macros/latex/contrib/thuthesis/data/chap03.tex
2021/04/03 | 412 | indexing/upmendex/source/exhanzi.h
-2021/04/03 | 41104 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
2021/04/03 | 406 | indexing/upmendex/source/kp.h
2021/04/03 | 405628 | macros/latex/contrib/thuthesis/thuthesis-example.pdf
2021/04/03 | 4039 | indexing/upmendex/doc/samples/alphabet/alpha_zh.idx
2021/04/03 | 400 | indexing/upmendex/source/qsort.h
-2021/04/03 | 39690 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/04/03 | 39564 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/04/03 | 392597 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
2021/04/03 | 3891 | indexing/upmendex/source/kana.h
-2021/04/03 | 38070 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/04/03 | 38064 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/04/03 | 37292 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/04/03 | 37241 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
2021/04/03 | 371 | indexing/upmendex/doc/samples/Makefile
+2021/04/03 | 3682 | graphics/mcf2graph/mcf_setup.sty
2021/04/03 | 366 | macros/latex/contrib/thuthesis/thuthesis-bachelor.cbx
-2021/04/03 | 36680 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
2021/04/03 | 365 | macros/latex/contrib/thuthesis/thuthesis-numeric.cbx
-2021/04/03 | 35462 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/04/03 | 35063 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/04/03 | 34634 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/04/03 | 345366 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/04/03 | 35149 | language/marathi/COPYING
2021/04/03 | 34324 | macros/latex/contrib/thuthesis/CHANGELOG.md
+2021/04/03 | 3431 | language/marathi/README.txt
2021/04/03 | 340 | indexing/upmendex/doc/samples/greek.idx
2021/04/03 | 337 | indexing/upmendex/source/ac/withenable.ac
+2021/04/03 | 33612 | graphics/mcf2graph/mcf_data_base.mcf
2021/04/03 | 334 | indexing/upmendex/doc/samples/option/mdxsty_rule0.ist
-2021/04/03 | 33440 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
2021/04/03 | 333 | indexing/upmendex/source/indexsty
-2021/04/03 | 33152 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/04/03 | 330234 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/04/03 | 32745 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
2021/04/03 | 326 | indexing/upmendex/doc/samples/multi.idx
-2021/04/03 | 321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/04/03 | 31594 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/04/03 | 31544 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/04/03 | 31344 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/04/03 | 31192 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
2021/04/03 | 311434 | indexing/upmendex/man/upmendex.man1.pdf
-2021/04/03 | 311191 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/04/03 | 30886 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
2021/04/03 | 307 | macros/latex/contrib/thuthesis/spine.tex
2021/04/03 | 301 | indexing/upmendex/doc/samples/alphabet/mdxsty_es12.ist
2021/04/03 | 300 | indexing/upmendex/doc/samples/alphabet/mdxsty_es13.ist
2021/04/03 | 300 | indexing/upmendex/doc/samples/alphabet/mdxsty_es11.ist
-2021/04/03 | 30038 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/04/03 | 29869 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
2021/04/03 | 2977 | indexing/upmendex/README.md
2021/04/03 | 296 | indexing/upmendex/doc/samples/alphabet/mdxsty_es22.ist
2021/04/03 | 295 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh31.ist
@@ -204,77 +539,39 @@
2021/04/03 | 295 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh11.ist
2021/04/03 | 295 | indexing/upmendex/doc/samples/alphabet/mdxsty_es23.ist
2021/04/03 | 295 | indexing/upmendex/doc/samples/alphabet/mdxsty_es21.ist
-2021/04/03 | 295554 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
2021/04/03 | 2954 | macros/latex/contrib/thuthesis/data/chap04.tex
-2021/04/03 | 29052 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
2021/04/03 | 289 | indexing/upmendex/doc/samples/mdxsty01.ist
+2021/04/03 | 28918 | language/marathi/LICENSE.md
2021/04/03 | 285 | macros/latex/contrib/thuthesis/data/comments.tex
2021/04/03 | 285 | indexing/upmendex/doc/samples/option/mdxsty_j02.ist
-2021/04/03 | 283978 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/04/03 | 282106 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/04/03 | 28121 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/04/03 | 28009 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
2021/04/03 | 279 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh2.ist
2021/04/03 | 279 | indexing/upmendex/doc/samples/alphabet/mdxsty_es2.ist
2021/04/03 | 27948 | indexing/upmendex/source/fwrite.c
2021/04/03 | 278 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh1.ist
2021/04/03 | 278 | indexing/upmendex/doc/samples/alphabet/mdxsty_es1.ist
-2021/04/03 | 27363 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
2021/04/03 | 272 | indexing/upmendex/source/tests/uni.ist
-2021/04/03 | 27274 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
2021/04/03 | 271 | indexing/upmendex/doc/samples/option/mdxsty_j01.ist
2021/04/03 | 271 | indexing/upmendex/doc/samples/option/mdxsty_j00.ist
-2021/04/03 | 27197 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/04/03 | 27182 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/04/03 | 262400 | macros/latex/contrib/easybook/doc/easybook-demo.pdf
-2021/04/03 | 261963 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/04/03 | 2616931 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
2021/04/03 | 260 | indexing/upmendex/doc/samples/mdxsty00.ist
-2021/04/03 | 2587 | macros/latex/contrib/easybook/doc/easybook-demo.tex
-2021/04/03 | 258665 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
2021/04/03 | 2539 | macros/latex/contrib/easybook/doc/chapter3.tex
-2021/04/03 | 25341 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/04/03 | 25154 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/04/03 | 250211 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/04/03 | 25001 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/04/03 | 2499401 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/04/03 | 24961924 | systems/texlive/tlnet/install-tl.zip
-2021/04/03 | 243479 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/04/03 | 239477 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/04/03 | 23883 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
2021/04/03 | 23815 | macros/latex/contrib/thuthesis/spine.pdf
2021/04/03 | 23692 | indexing/xindy/contrib/xindy-persian.zip
2021/04/03 | 2355 | macros/latex/contrib/thuthesis/thuthesis-example.tex
2021/04/03 | 2329 | indexing/upmendex/source/mendex.h
-2021/04/03 | 23291 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
2021/04/03 | 2318 | indexing/upmendex/source/configure.ac
-2021/04/03 | 2293232 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/04/03 | 2286 | macros/latex/contrib/thuthesis/data/abstract.tex
-2021/04/03 | 22039 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
2021/04/03 | 2144 | indexing/upmendex/doc/samples/alphabet/alpha_zhz.idx
-2021/04/03 | 214105 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
2021/04/03 | 213 | indexing/upmendex/source/tests/pprecA.idx
-2021/04/03 | 21131 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/04/03 | 211053 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
2021/04/03 | 2105 | indexing/upmendex/source/var.h
-2021/04/03 | 208485 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/04/03 | 208404 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/04/03 | 208182 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
2021/04/03 | 2067796 | systems/texlive/tlnet/archive/xcharter.r58704.tar.xz
+2021/04/03 | 2047 | language/marathi/glossaries.gls
2021/04/03 | 2043421 | systems/doc/luatex.zip
-2021/04/03 | 202557 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/04/03 | 20365 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
+2021/04/03 | 2031 | language/marathi/namuna-letter.tex
2021/04/03 | 2024 | macros/latex/contrib/thuthesis/Makefile
-2021/04/03 | 20130221 | systems/texlive/tlnet/install-tl-windows.exe
-2021/04/03 | 20122 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
2021/04/03 | 201119 | macros/latex/contrib/thuthesis/thuthesis.dtx
-2021/04/03 | 2009491 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/04/03 | 199702 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
2021/04/03 | 1992 | indexing/upmendex/doc/samples/alphabet/alpha_es.idx
-2021/04/03 | 198131 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/04/03 | 195663 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/04/03 | 195566 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
2021/04/03 | 19515 | indexing/upmendex/source/hanzi.h
-2021/04/03 | 193717 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
2021/04/03 | 1929866 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015.zip
2021/04/03 | 191655 | macros/luatex/latex/unitipa/unitipa.pdf
2021/04/03 | 191222 | macros/luatex/latex/unitipa.zip
@@ -285,59 +582,36 @@
2021/04/03 | 18626 | indexing/xindy/contrib/xindy-persian/persian/variant3-utf8.xdy
2021/04/03 | 18618 | indexing/xindy/contrib/xindy-persian/persian/variant1-utf8.xdy
2021/04/03 | 1842 | indexing/upmendex/source/ktable.h
+2021/04/03 | 1832 | language/marathi/namuna-beamer.tex
2021/04/03 | 182 | indexing/upmendex/source/tests/pprec0.ist
-2021/04/03 | 18097 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
2021/04/03 | 1807 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh14.ist
2021/04/03 | 1807 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh13.ist
2021/04/03 | 1807 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh12.ist
-2021/04/03 | 180048 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
2021/04/03 | 179 | indexing/upmendex/source/tests/pprec2.ist
2021/04/03 | 179 | indexing/upmendex/source/tests/pprec1.ist
-2021/04/03 | 17958 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/04/03 | 179379 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
2021/04/03 | 1787 | macros/latex/contrib/thuthesis/data/appendix-translation.tex
-2021/04/03 | 1725549 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/04/03 | 176586 | language/marathi/marathi.pdf
2021/04/03 | 1719 | macros/latex/contrib/thuthesis/data/appendix-survey.tex
-2021/04/03 | 17169686 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
2021/04/03 | 1709687 | install/macros/latex/contrib/thuthesis.tds.zip
2021/04/03 | 17061 | macros/luatex/latex/unitipa/unitipa.dtx
2021/04/03 | 1684540 | macros/latex/contrib/thuthesis.zip
-2021/04/03 | 167906 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
2021/04/03 | 16668 | indexing/upmendex/doc/upmendex.ja.txt
2021/04/03 | 1664 | macros/latex/contrib/thuthesis/data/committee.tex
2021/04/03 | 164151 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
-2021/04/03 | 163655 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
2021/04/03 | 16358 | indexing/upmendex/man/upmendex.1
-2021/04/03 | 16328 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2021/04/03 | 16111 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/04/03 | 159968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
2021/04/03 | 159219 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
2021/04/03 | 15514 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.cbx
-2021/04/03 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/04/03 | 153890 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/04/03 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/04/03 | 152762 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
2021/04/03 | 1524 | indexing/xindy/contrib/xindy-persian/doc/variant3-utf8-doc.tex
2021/04/03 | 1522 | indexing/xindy/contrib/xindy-persian/doc/variant2-utf8-doc.tex
2021/04/03 | 1522 | indexing/xindy/contrib/xindy-persian/doc/variant1-utf8-doc.tex
2021/04/03 | 1479 | macros/latex/contrib/thuthesis/data/appendix.tex
2021/04/03 | 1477 | indexing/upmendex/doc/samples/korean.idx
-2021/04/03 | 147151 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/04/03 | 147139 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
2021/04/03 | 1464 | indexing/upmendex/COPYRIGHT
-2021/04/03 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
2021/04/03 | 1452 | macros/latex/contrib/thuthesis/data/resume.tex
-2021/04/03 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/04/03 | 14354 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2021/04/03 | 14286 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.cbx
-2021/04/03 | 1425980 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/04/03 | 1424811 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
2021/04/03 | 14186 | macros/latex/contrib/thuthesis/tsinghua-name-bachelor.pdf
2021/04/03 | 14176 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.cbx
2021/04/03 | 1387 | macros/latex/contrib/thuthesis/thuthesis.ins
-2021/04/03 | 136427 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/04/03 | 135005 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/04/03 | 13471 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
2021/04/03 | 1344 | indexing/xindy/contrib/xindy-persian/README
2021/04/03 | 133754 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
2021/04/03 | 13316 | indexing/upmendex/source/fread.c
@@ -345,35 +619,18 @@
2021/04/03 | 1328 | macros/luatex/latex/unitipa/unitipa.ins
2021/04/03 | 1326 | indexing/upmendex/source/Makefile.am
2021/04/03 | 1322 | indexing/upmendex/source/tests/upmendex.test
-2021/04/03 | 131490 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/04/03 | 1307719 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
2021/04/03 | 13004 | indexing/upmendex/source/sort.c
-2021/04/03 | 1295412 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
2021/04/03 | 1291 | indexing/upmendex/source/exvar.h
2021/04/03 | 12908 | systems/texlive/tlnet/archive/luatex.r58702.tar.xz
-2021/04/03 | 1281103 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/04/03 | 1265387 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/04/03 | 1264301 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
2021/04/03 | 12534 | fonts/xcharter/README
-2021/04/03 | 124972 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/04/03 | 1236 | language/marathi/namuna-para.tex
2021/04/03 | 1200 | indexing/upmendex/doc/samples/alphabet/alpha_zhs.idx
2021/04/03 | 1190 | indexing/upmendex/source/kp.c
-2021/04/03 | 1181170 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/04/03 | 1181087 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2021/04/03 | 1171730 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/04/03 | 116931 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/04/03 | 115470 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/04/03 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
2021/04/03 | 115105 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
2021/04/03 | 1144457 | macros/latex/contrib/thuthesis/thuthesis.pdf
-2021/04/03 | 112253 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
2021/04/03 | 1095 | indexing/upmendex/doc/samples/option/attri1.idx
-2021/04/03 | 109276 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/04/03 | 1078878 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/04/03 | 10827 | language/marathi/namuna-report.tex
2021/04/03 | 1052 | indexing/upmendex/source/pageread.c
-2021/04/03 | 104627 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/04/03 | 103324 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/04/03 | 101764 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
2021/04/03 | 10083 | indexing/upmendex/source/styfile.c
2021/04/02 | 907631 | fonts/stix2-otf/STIXTwoMath-Regular.pdf
2021/04/02 | 864 | macros/latex/contrib/suppose/README.md
@@ -787,6 +1044,7 @@
2021/04/01 | 23516 | fonts/xcharter/tfm/XCharter1-BoldSlanted-tosf-t1.tfm
2021/04/01 | 23360 | fonts/xcharter/tfm/XCharter-BoldSlanted-tosf-t1.tfm
2021/04/01 | 23328 | fonts/xcharter/tfm/XCharter-BoldSlanted-tlf-t1.tfm
+2021/04/01 | 231121 | macros/latex/contrib/abraces/abraces-doc.pdf
2021/04/01 | 2248 | fonts/utilities/fontools/share/fontools_oml.enc
2021/04/01 | 2207 | fonts/xcharter/tex/T2ASRBXCharter-Sup.fd
2021/04/01 | 2191 | macros/latex/contrib/dynbrackets/dynbrackets.ins
@@ -1150,6 +1408,7 @@
2021/04/01 | 1624 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-sc-t2a.vf
2021/04/01 | 1624 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-sc-t2asrb.vf
2021/04/01 | 1620 | fonts/xcharter/vf/XCharter1-BoldItalic-tosf-sc-t2a.vf
+2021/04/01 | 16192 | macros/latex/contrib/abraces/abraces-doc.tex
2021/04/01 | 1616 | fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-t2asrb.vf
2021/04/01 | 1612 | fonts/xcharter/vf/XCharter1-Slanted-tosf-sc-t2a.vf
2021/04/01 | 1612 | fonts/xcharter/vf/XCharter1-Roman-tosf-sc-t2asrb.vf
@@ -1257,6 +1516,7 @@
2021/04/01 | 1272 | fonts/xcharter/tfm/XCharter-Roman-tlf-sc-ot1--base.tfm
2021/04/01 | 1229 | systems/texlive/tlnet/README.md
2021/04/01 | 1173 | systems/texlive/Images/README.md
+2021/04/01 | 11737 | macros/latex/contrib/abraces/abraces.sty
2021/04/01 | 1032 | fonts/xcharter/vf/XCharter1-BoldSlanted-tosf-ot1.vf
2021/04/01 | 1020 | fonts/xcharter/vf/XCharter1-Slanted-tosf-ot1.vf
2021/04/01 | 1016 | fonts/xcharter/vf/XCharter1-Roman-tosf-ot1.vf
@@ -1264,191 +1524,75 @@
2021/04/01 | 1012 | fonts/xcharter/vf/XCharter1-Bold-tosf-ot1.vf
2021/04/01 | 1008 | fonts/xcharter/vf/XCharter1-Roman-ts1.vf
2021/04/01 | 0 | systems/texlive/tlnet/TEXLIVE_2021
-2021/03/31 | 984 | support/arara/scripts/rules/arara-rule-make.yaml
2021/03/31 | 9684 | macros/latex/contrib/tudscr/source/doc/tudscr-introduction.tex
-2021/03/31 | 950 | support/arara/scripts/rules/arara-rule-gnuplot.yaml
2021/03/31 | 93904 | macros/latex/contrib/tudscr/source/tudscr-area.dtx
-2021/03/31 | 923 | support/arara/scripts/rules/arara-rule-move.yaml
-2021/03/31 | 910 | support/arara/scripts/rules/arara-rule-xindex.yaml
-2021/03/31 | 878 | support/arara/scripts/rules/arara-rule-ghostscript.yaml
2021/03/31 | 8661 | macros/latex/contrib/tudscr/source/doc/tutorials/mathswap.tex
2021/03/31 | 857680 | macros/latex/contrib/tudscr/doc/tutorials/treatise.pdf
-2021/03/31 | 842 | support/arara/scripts/rules/arara-rule-tikzmake.yaml
-2021/03/31 | 841047 | graphics/pgf/contrib/dynkin-diagrams.zip
-2021/03/31 | 839 | support/arara/scripts/rules/arara-rule-biber.yaml
-2021/03/31 | 832 | support/arara/scripts/rules/arara-rule-nomencl.yaml
2021/03/31 | 824194 | macros/latex/contrib/knowledge.zip
-2021/03/31 | 812 | support/arara/scripts/rules/arara-rule-songidx.yaml
-2021/03/31 | 812 | support/arara/scripts/rules/arara-rule-dvipdfmx.yaml
-2021/03/31 | 81117 | support/arara/doc/chapters/methods.tex
-2021/03/31 | 810526 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf
-2021/03/31 | 809 | support/arara/scripts/rules/arara-rule-ps2pdf.yaml
-2021/03/31 | 808 | support/arara/scripts/rules/arara-rule-dvipdfm.yaml
2021/03/31 | 8082 | macros/latex/contrib/tudscr/source/tudscr-twocolfix.dtx
2021/03/31 | 807607 | systems/win32/w32tex/ChangeLog
-2021/03/31 | 799 | support/arara/scripts/rules/arara-rule-dvips.yaml
-2021/03/31 | 796 | support/arara/scripts/rules/arara-rule-copy.yaml
2021/03/31 | 7936 | macros/latex/contrib/knowledge/knowledge-configuration.dtx
2021/03/31 | 78352 | macros/latex/contrib/rec-thy/rec-thy.sty
2021/03/31 | 77792 | macros/latex/contrib/tudscr/source/tudscr-comp.dtx
-2021/03/31 | 7353 | support/arara/doc/chapters/yaml.tex
2021/03/31 | 734028 | macros/latex/contrib/knowledge/knowledge.pdf
2021/03/31 | 7090 | macros/latex/contrib/tudscr/source/doc/tutorials/mathtype.tex
-2021/03/31 | 682 | support/arara/scripts/rules/arara-rule-sketch.yaml
2021/03/31 | 67832 | macros/latex/contrib/tudscr/source/tudscr-layout.dtx
2021/03/31 | 6699 | macros/latex/contrib/knowledge/knowledge-example.tex
-2021/03/31 | 651 | support/arara/scripts/rules/arara-rule-spix.yaml
-2021/03/31 | 647 | support/arara/scripts/rules/arara-rule-makeglossarieslite.yaml
-2021/03/31 | 647 | support/arara/scripts/rules/arara-rule-convert.yaml
2021/03/31 | 631 | macros/latex/contrib/tudscr/source/doc/examples/mathswap-example.tex
-2021/03/31 | 626 | support/arara/scripts/rules/arara-rule-upbibtex.yaml
-2021/03/31 | 621 | support/arara/scripts/rules/arara-rule-bibtexu.yaml
-2021/03/31 | 621 | support/arara/scripts/rules/arara-rule-bibtex8.yaml
2021/03/31 | 6160 | macros/latex/contrib/tudscr/source/doc/tudscr-examples.tex
-2021/03/31 | 61172 | support/arara/doc/figures/optionbox1.pdf
-2021/03/31 | 60850 | support/arara/doc/figures/dropdown1.pdf
2021/03/31 | 60647 | macros/latex/contrib/rec-thy/rec-thy.tex
-2021/03/31 | 60598 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex
2021/03/31 | 60025 | macros/latex/contrib/tudscr/source/tudscr-title.dtx
-2021/03/31 | 5 | support/arara/doc/version.tex
-2021/03/31 | 59941 | support/arara/doc/figures/inputbox1.pdf
-2021/03/31 | 596 | support/arara/scripts/rules/arara-rule-pbibtex.yaml
-2021/03/31 | 59540 | support/arara/doc/figures/optionbox2.pdf
-2021/03/31 | 592 | support/arara/scripts/rules/arara-rule-bibtex.yaml
-2021/03/31 | 59101 | support/arara/doc/figures/dropdown2.pdf
-2021/03/31 | 588 | support/arara/scripts/rules/arara-rule-pdftk.yaml
2021/03/31 | 5862 | macros/latex/contrib/rec-thy/README
-2021/03/31 | 58249 | support/arara/doc/figures/inputbox2.pdf
-2021/03/31 | 5789 | support/arara/scripts/rules/arara-rule-bib2gls.yaml
-2021/03/31 | 576 | support/arara/scripts/arara.sh
2021/03/31 | 55629 | macros/latex/contrib/tudscr/source/tudscr-base.dtx
2021/03/31 | 55085 | macros/latex/contrib/tudscr/source/tudscr-doc.dtx
-2021/03/31 | 54949 | support/arara/doc/figures/messagebox1.pdf
-2021/03/31 | 546 | support/arara/scripts/rules/arara-rule-qpdf.yaml
2021/03/31 | 53767 | macros/latex/contrib/tudscr/source/doc/tudscr-packages.tex
-2021/03/31 | 53224 | support/arara/doc/figures/messagebox2.pdf
2021/03/31 | 5091 | macros/latex/contrib/tudscr/source/doc/tudscr.tex
2021/03/31 | 49292 | macros/latex/contrib/tudscr/source/tudscr-frontmatter.dtx
2021/03/31 | 4913858 | macros/latex/contrib/tudscr.zip
-2021/03/31 | 4722 | support/arara/README.md
2021/03/31 | 45105 | macros/latex/contrib/tudscr/source/tudscr-fields.dtx
2021/03/31 | 44697 | macros/latex/contrib/knowledge/knowledge-utils.dtx
-2021/03/31 | 4254 | support/arara/scripts/rules/arara-rule-context.yaml
2021/03/31 | 4110 | macros/latex/contrib/tudscr/source/doc/tudscr-index.tex
-2021/03/31 | 4074 | support/arara/scripts/rules/arara-rule-datatooltk.yaml
-2021/03/31 | 40086 | support/arara/doc/arara-quickstart.tex
-2021/03/31 | 39 | support/arara/doc/arararc.yaml
2021/03/31 | 39355 | macros/latex/contrib/tudscr/source/doc/tudscr-hints.tex
2021/03/31 | 38719 | macros/latex/contrib/tudscr/source/tudscr-localization.dtx
2021/03/31 | 38104 | macros/latex/contrib/tudscr/source/doc/tudscr-obsolete.tex
-2021/03/31 | 37238 | support/arara/doc/chapters/concepts.tex
2021/03/31 | 3487 | macros/latex/contrib/tudscr/source/doc/tudscr-preface.tex
-2021/03/31 | 342 | graphics/pgf/contrib/dynkin-diagrams/README
-2021/03/31 | 3362 | support/arara/doc/arara-manual.tex
-2021/03/31 | 33026 | support/arara/doc/arara.sty
-2021/03/31 | 3253 | support/arara/scripts/rules/arara-rule-pdfcrop.yaml
-2021/03/31 | 320 | support/arara/scripts/rules/arara-rule-halt.yaml
-2021/03/31 | 3026 | support/arara/doc/logos/bird.pdf
2021/03/31 | 2988 | macros/latex/contrib/tudscr/source/tudscrsource.tex
2021/03/31 | 28537 | macros/latex/contrib/tudscr/source/doc/tudscr-installation.tex
2021/03/31 | 274224548 | systems/win32/w32tex/pstricks.tar.xz
-2021/03/31 | 26880 | support/arara/doc/chapters/cli.tex
2021/03/31 | 2630 | macros/latex/contrib/tudscr/source/doc/tudscr-additional.tex
2021/03/31 | 2614 | macros/latex/contrib/knowledge/makefile
-2021/03/31 | 2608 | support/arara/scripts/rules/arara-rule-indent.yaml
-2021/03/31 | 2544 | support/arara/scripts/rules/arara-rule-ltx2any.yaml
-2021/03/31 | 245763 | support/arara/doc/arara-quickstart.pdf
-2021/03/31 | 2435 | support/arara/scripts/rules/arara-rule-makeglossaries.yaml
2021/03/31 | 242275 | macros/latex/contrib/tudscr/source/tudscr-manual.dtx
2021/03/31 | 23937 | macros/latex/contrib/tudscr/source/tudscr-misc.dtx
2021/03/31 | 22008 | macros/latex/contrib/tudscr/source/tudscr-supervisor.dtx
2021/03/31 | 21520 | macros/latex/contrib/tudscr/source/tudscr-texindy.dtx
-2021/03/31 | 2108 | support/arara/doc/chapters/license.tex
-2021/03/31 | 2100 | support/arara/scripts/rules/arara-rule-perltex.yaml
2021/03/31 | 2055 | macros/latex/contrib/knowledge/README.md
-2021/03/31 | 20201 | support/arara/doc/chapters/configuration.tex
-2021/03/31 | 1989 | support/arara/scripts/rules/arara-rule-frontespizio.yaml
-2021/03/31 | 1975 | support/arara/scripts/rules/arara-rule-xindy.yaml
-2021/03/31 | 1974 | support/arara/scripts/rules/arara-rule-texindy.yaml
-2021/03/31 | 1962695 | support/arara/doc/arara-manual.pdf
-2021/03/31 | 1884 | support/arara/scripts/rules/arara-rule-latexmk.yaml
-2021/03/31 | 1837 | support/arara/scripts/rules/arara-rule-detex.yaml
2021/03/31 | 1832 | macros/latex/contrib/tudscr/source/doc/examples/notice.tex
2021/03/31 | 18117 | macros/latex/contrib/tudscr/source/doc/tudscr-bundle.tex
2021/03/31 | 1759 | macros/latex/contrib/knowledge/knowledge.ins
2021/03/31 | 17472 | macros/latex/contrib/tudscr/source/doc/tudscr-supervisor.tex
2021/03/31 | 17370 | macros/latex/contrib/tudscr/source/doc/tudscr-poster.tex
-2021/03/31 | 1724 | support/arara/doc/arara.1
-2021/03/31 | 1722 | support/arara/scripts/rules/arara-rule-pythontex.yaml
-2021/03/31 | 1709 | support/arara/scripts/rules/arara-rule-texcount.yaml
-2021/03/31 | 1672 | support/arara/scripts/rules/arara-rule-fig2dev.yaml
2021/03/31 | 167066 | macros/latex/contrib/tudscr/source/doc/tudscr-mainclasses.tex
2021/03/31 | 164704 | macros/latex/contrib/knowledge/knowledge.tex
-2021/03/31 | 1625 | support/arara/scripts/rules/arara-rule-pdflatex.yaml
-2021/03/31 | 1625 | support/arara/scripts/rules/arara-rule-lualatex.yaml
2021/03/31 | 161986 | macros/latex/contrib/tudscr/source/tudscr-fonts.dtx
2021/03/31 | 16111 | macros/latex/contrib/tudscr/README.md
-2021/03/31 | 1610 | support/arara/scripts/rules/arara-rule-latex.yaml
2021/03/31 | 1607 | macros/latex/contrib/tudscr/source/doc/examples/mathtype-example.tex
2021/03/31 | 160490 | macros/latex/contrib/knowledge/knowledge-code.dtx
2021/03/31 | 15614 | macros/latex/contrib/tudscr/source/tudscr-color.dtx
-2021/03/31 | 1522 | support/arara/scripts/rules/arara-rule-xelatex.yaml
-2021/03/31 | 1522 | support/arara/scripts/rules/arara-rule-uplatex.yaml
-2021/03/31 | 1517 | support/arara/scripts/rules/arara-rule-platex.yaml
-2021/03/31 | 1503 | support/arara/scripts/rules/arara-rule-makeindex.yaml
-2021/03/31 | 149371 | graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty
2021/03/31 | 14917 | macros/latex/contrib/tudscr/source/doc/examples/treatise-example.tex
-2021/03/31 | 1478 | support/arara/scripts/rules/arara-rule-asymptote.yaml
-2021/03/31 | 1470 | support/arara/scripts/rules/arara-rule-knitr.yaml
-2021/03/31 | 14613 | support/arara/doc/chapters/deploying.tex
-2021/03/31 | 1448 | support/arara/scripts/rules/arara-rule-dvisvgm.yaml
-2021/03/31 | 14215 | support/arara/doc/logos/logo1.pdf
2021/03/31 | 141958 | macros/latex/contrib/tudscr/source/doc/tutorials/treatise.tex
2021/03/31 | 141823 | macros/latex/contrib/rec-thy.zip
-2021/03/31 | 14166 | support/arara/doc/logos/logo2.pdf
-2021/03/31 | 140957 | support/arara/doc/figures/arara.png
2021/03/31 | 1398 | macros/latex/contrib/tudscr/doc/LICENSE.md
2021/03/31 | 138619 | macros/latex/contrib/tudscr/doc/tutorials/mathtype.pdf
-2021/03/31 | 138139 | support/arara/doc/chapters/rules.tex
-2021/03/31 | 13532 | support/arara/doc/chapters/mvel.tex
-2021/03/31 | 13529422 | support/arara.zip
-2021/03/31 | 13515933 | install/support/arara.tds.zip
-2021/03/31 | 1347 | support/arara/doc/figures/gl.pdf
-2021/03/31 | 1341 | support/arara/scripts/rules/arara-rule-clean.yaml
-2021/03/31 | 1324 | support/arara/scripts/rules/arara-rule-sage.yaml
-2021/03/31 | 131839 | support/arara/source/arara-6.0.2-src.zip
-2021/03/31 | 1284 | support/arara/scripts/rules/arara-rule-pdfcsplain.yaml
-2021/03/31 | 1282 | support/arara/scripts/rules/arara-rule-llmk.yaml
-2021/03/31 | 1278 | support/arara/scripts/rules/arara-rule-dvipspdf.yaml
2021/03/31 | 127739 | macros/latex/contrib/rec-thy/rec-thy.pdf
-2021/03/31 | 1276 | support/arara/scripts/rules/arara-rule-luahbtex.yaml
-2021/03/31 | 1274 | support/arara/scripts/rules/arara-rule-metapost.yaml
-2021/03/31 | 1272 | support/arara/scripts/rules/arara-rule-csplain.yaml
-2021/03/31 | 1268 | support/arara/scripts/rules/arara-rule-pdftex.yaml
-2021/03/31 | 1268 | support/arara/scripts/rules/arara-rule-luatex.yaml
-2021/03/31 | 12528 | support/arara/doc/chapters/introduction.tex
2021/03/31 | 122794695 | macros/context/latest/cont-tmf.zip
2021/03/31 | 121768 | macros/latex/contrib/tudscr/doc/tutorials/mathswap.pdf
-2021/03/31 | 12065 | support/arara/doc/chapters/building.tex
-2021/03/31 | 11976 | support/arara/doc/chapters/logging.tex
-2021/03/31 | 1166 | support/arara/scripts/rules/arara-rule-xetex.yaml
-2021/03/31 | 1166 | support/arara/scripts/rules/arara-rule-uptex.yaml
-2021/03/31 | 1162 | support/arara/scripts/rules/arara-rule-ptex.yaml
-2021/03/31 | 11618693 | support/arara/scripts/arara.jar
2021/03/31 | 11462 | macros/latex/contrib/tudscr/source/tudscr-mathswap.dtx
2021/03/31 | 11350 | macros/latex/contrib/tudscr/source/tudscr.ins
2021/03/31 | 11341 | macros/latex/contrib/tudscr/source/tudscr-version.dtx
-2021/03/31 | 1111 | support/arara/scripts/rules/arara-rule-xdvipdfmx.yaml
-2021/03/31 | 1107 | support/arara/scripts/rules/arara-rule-animate.yaml
-2021/03/31 | 1105 | support/arara/scripts/rules/arara-rule-authorindex.yaml
2021/03/31 | 1099181 | macros/latex/contrib/tudscr/doc/tudscr.pdf
2021/03/31 | 108415 | macros/latex/contrib/tudscr/source/tudscr-pagestyle.dtx
2021/03/31 | 1083765 | macros/latex/contrib/tudscr/doc/tudscr_print.pdf
-2021/03/31 | 1062 | support/arara/scripts/rules/arara-rule-etex.yaml
2021/03/31 | 1055711 | macros/latex/contrib/tudscr/doc/tudscrsource.pdf
-2021/03/31 | 1050 | support/arara/scripts/rules/arara-rule-tex.yaml
-2021/03/31 | 1046 | support/arara/doc/rules/quickstart.yaml
-2021/03/31 | 1032 | support/arara/doc/rules/manual.yaml
2021/03/30 | 835 | support/tikztosvg/Makefile
2021/03/30 | 7965726 | graphics/pstricks/base.zip
2021/03/30 | 7723 | support/tikztosvg/example/example.svg
@@ -1477,7 +1621,6 @@
2021/03/30 | 1081 | macros/latex/contrib/scrlayer-fancyhdr/LICENSE.md
2021/03/29 | 9913 | macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch
2021/03/29 | 9811732 | systems/win32/w32tex/newtxpx-boondoxfonts.tar.xz
-2021/03/29 | 963 | info/patgen2-tutorial/patgen2-tutorial.bib
2021/03/29 | 95861 | macros/latex/contrib/pkuthss/doc/example.pdf
2021/03/29 | 92012 | macros/generic/polexpr.zip
2021/03/29 | 8123 | macros/latex/contrib/pkuthss/tex/pkuword.eps
@@ -1549,25 +1692,3 @@
2021/03/29 | 1143 | macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-concl.tex
2021/03/29 | 1031328 | macros/generic/xint/sourcexint.pdf
2021/03/29 | 1012827 | macros/generic/xint/xint.pdf
-2021/03/28 | 93277472 | systems/win32/w32tex/pgfcontrib.tar.xz
-2021/03/28 | 916400 | macros/latex/contrib/buctthesis.zip
-2021/03/28 | 8304354 | fonts/newtx.zip
-2021/03/28 | 63609996 | systems/win32/w32tex/biblatex-biber.tar.xz
-2021/03/28 | 5371984 | systems/win32/w32tex/manual.tar.xz
-2021/03/28 | 456864 | macros/latex/contrib/mathtools/mathtools.pdf
-2021/03/28 | 311677 | macros/latex/contrib/mathtools/empheq.pdf
-2021/03/28 | 2864 | macros/latex/contrib/mathtools/mathtools.ins
-2021/03/28 | 28222 | macros/latex/contrib/gridpapers/gridpapers.dtx
-2021/03/28 | 2795 | macros/latex/contrib/mathtools/empheq.ins
-2021/03/28 | 236759 | macros/latex/contrib/mathtools/mhsetup.pdf
-2021/03/28 | 236426 | macros/latex/contrib/gridpapers.zip
-2021/03/28 | 235683 | macros/latex/contrib/mathtools/mathtools.dtx
-2021/03/28 | 223890 | macros/latex/contrib/gridpapers/gridpapers.pdf
-2021/03/28 | 2213912 | systems/win32/w32tex/win64/context-w64.tar.xz
-2021/03/28 | 21783 | macros/latex/contrib/mathtools/mhsetup.dtx
-2021/03/28 | 1673 | macros/latex/contrib/mathtools/README.md
-2021/03/28 | 163886 | macros/latex/contrib/mathtools/empheq.dtx
-2021/03/28 | 15998 | macros/latex/contrib/buctthesis/doc/chapter/chapter1.tex
-2021/03/28 | 146162432 | systems/win32/w32tex/context.tar.xz
-2021/03/28 | 1130614 | install/macros/latex/contrib/mathtools.tds.zip
-2021/03/28 | 1106277 | macros/latex/contrib/mathtools.zip
diff --git a/graphics/mcf2graph/CHANGELOG b/graphics/mcf2graph/CHANGELOG
index 00fd0afbf1..a7aceeeb69 100644
--- a/graphics/mcf2graph/CHANGELOG
+++ b/graphics/mcf2graph/CHANGELOG
@@ -1,6 +1,15 @@
*******************************************************************************
- Changelog of mcf2graph software package by Akira Yamaji 2021-03-21
+ Changelog of mcf2graph software package by Akira Yamaji 2021-04-04
*******************************************************************************
+[ver. 4.62 / 2021-04-04]
+ -add molecular data base file
+ 'mcf_data_base.mcf'
+ -improve function beginfont()
+ able to use molecular data base file
+ -add option parameter sw_file_open
+ -improve function check()
+ -update MCF manual,example
+
[ver. 4.61 / 2021-03-21]
-change syntax
@.$n => @$n
diff --git a/graphics/mcf2graph/README b/graphics/mcf2graph/README
index e819003b60..16e950065f 100644
--- a/graphics/mcf2graph/README
+++ b/graphics/mcf2graph/README
@@ -1,7 +1,7 @@
********************************************************************************
mcf2graph : Convert Molecular Coding Format to graphics with METAFONT/METAPOST
Author : Akira Yamaji
- version : 4.61 2021-03-21
+ version : 4.62 2021-04-04
E-mail : mcf2graph@gmail.com
Located at : http://www.ctan.org/pkg/mcf2graph
********************************************************************************
@@ -17,26 +17,25 @@
2. The distribution of software
( 1) README This file
( 2) CHANGELOG Changelog file of mcf2graph
- ( 3) mcf2graph.mf Macro of Metafont / Metapost
- ( 4) mcf_setup.sty Style file for aux file input
- ( 5) mcf_manual.tex MCF syntax manual(LaTeX file)
+ ( 3) mcf2graph.mf Main macro of Metafont / Metapost
+ ( 4) mcf_data_base.mcf Molecular data base file
+ ( 5) mcf_setup.sty Style file for aux file input
+ ( 6) mcf_manual.tex MCF syntax manual(LaTeX file)
use pk font for proof print
use mps file for final print
make file 'mcf_man_soc-***.mps' before typeset
>mpost -s mcf_man_soc.mf
- ( 6) mcf_man_soc.mf Molecular difinition file for mcf_manual.tex
- ( 7) mcf_manual.pdf PDF of (4) (used pdftex(LaTeX),makeindex)
- ( 8) mcf_example.tex LaTeX example,
+ ( 7) mcf_man_soc.mf Molecular difinition file for mcf_manual.tex
+ ( 8) mcf_manual.pdf PDF of (4) (used pdftex(LaTeX),makeindex)
+ ( 9) mcf_example.tex LaTeX example,
make file 'mcf_exa_soc-info.aux' before typeset
>mpost -s ahlength=1 mcf_exa_soc.mf
- use pk font for proof print
- use mps file for final print
- make file 'mcf_exa_soc-***.mps' before typeset
- >mpost -s mcf_exa_soc.mf
- ( 9) mcf_exa_soc.mf Molecular difinition file for mcf_example.tex
- (10) mcf_example.pdf PDF of (8) typeset with pdftex(LaTeX)
- (11) mcf_mplib_exa.tex luamplib(LuaLaTeX) example
- (12) mcf_mplib_exa.pdf PDF of (11) typeset with LuaTeX(LaTeX)
+ make file 'mcf_exa_soc-***.mps' before typeset
+ >mpost -s mcf_exa_soc.mf
+ (10) mcf_exa_soc.mf Metafont/Metapost souce file for mcf_example.tex
+ (11) mcf_example.pdf PDF of (8) typeset with pdftex(LaTeX)
+ (12) mcf_mplib_exa.tex luamplib(LuaLaTeX) example
+ (13) mcf_mplib_exa.pdf PDF of (11) typeset with LuaTeX(LaTeX)
3. How to use mcf2graph with Metapost
Minimum requirement to run mcf2graph : mpost.exe,mpost.dll,mpost.mp,plain.mp
diff --git a/graphics/mcf2graph/mcf2graph.mf b/graphics/mcf2graph/mcf2graph.mf
index 350a3e973c..2388b2f278 100644
--- a/graphics/mcf2graph/mcf2graph.mf
+++ b/graphics/mcf2graph/mcf2graph.mf
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 4.61 Copyright (c) 2013-2021 Akira Yamaji
+% mcf2graph ver 4.62 Copyright (c) 2013-2021 Akira Yamaji
%
% Permission is hereby granted, free of charge, to any person obtaining a copy of this software
% and associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -33,11 +33,12 @@
% Set output report : mpost -s ahlength=3 FILENAME
% Set output MOL(V2000) : mpost -s ahlength=5 FILENAME
% Set output MOL(V3000) : mpost -s ahlength=6 FILENAME
+% Set output souce file for metafont : mpost -s ahlength=7 FILENAME
% Set to use plain.mp (label,arrow) : mpost -s labeloffset=1 FILENAME
% Set to use plain.mp (label,arrow,atom) : mpost -s labeloffset=2 FILENAME
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
tracingstats:=1;
-message "* This is mcf2graph ver 4.61 2021.03.21";
+message "* This is mcf2graph ver 4.62 2021.04.04";
%-------------------------------------------------------------------------------------------------
newinternal cntA,cntB,cntM,minX,minY,maxX,maxY,sftX,sftY,com,par,envT,envB,lenT,lineT,angT,rotT,
crR,nA,nB,nC,nD,nE,nF,nS,nL,nR,nU,nP,xpos,ypos,markA,markB,saveA,saveB,bondL;
@@ -46,16 +47,16 @@ numeric save_num[],comD[][],parD[][],adrD[][],cntD[],tbl_atom[],tbl_group[][],f_
com_group[][],par_group[][],cnt_group[],colorA[],colorB[],sumA[],bondC[],hideH[],
lineB[],sB[],eB[],angB[],angA[],lenB[],angX[],numS[],wdM[],htM[],wdA[],dxA[],
mc_indent[],cmm_adr[];
-string save_str[],tbl_atom_str[],strD[],tag[],out_file_name,out_file_aux,
+string save_str[],tbl_atom_str[],strD[],tag[],file_name_output,out_file_aux,blank_str,temp_str,
out_file_rep,out_file_mpc,aux_delimiter,atomfont,mpfont,s_tag,s_var,cal_FM,cal_MW,cal_MI,
- inf_NO,inf_EN,inf_JN,inf_FM,inf_CAS,inf_USE,inf_EXA,inf_EXB,inf_MW,blank_str;
+ inf_NO,inf_EN,inf_JN,inf_FM,inf_CAS,inf_USE,inf_EXA,inf_EXB,inf_MW;
pair save_pair[],posA[],posM[][],msize,mposition,fsize,fmargin,save_mposition,posBs,posBe,dum;
picture mol_stru[],atom_picture,save_picture,temp_picture;
path arrow_path,dottedline_path,line_path,arrow_head;
%-------------------------------------------------------------------------------------------------
char_num:=str_cnt:=tbl_cnt:=proc_end:=mangle:=sw_calc:=sw_ext_all:=0;
sw_numberA:=sw_numberB:=sw_aux_out:=sw_expand:=sw_fframe:=sw_mframe:=sw_aframe:=sw_trimming:=0;
-sw_rep_out:=sw_mol_out:=sw_group_off:=sw_single:=sw_arrow_emu:=0;
+sw_rep_out:=sw_mol_out:=sw_group_off:=sw_single:=sw_arrow_emu:=sw_file_open:=0;
numberA_start:=numberB_start:=1; numberA_end:=numberB_end:=4095;
%-------------------------------------------------------------------------------------------------
aux_max:=max_inf_num:=20;
@@ -102,7 +103,7 @@ if (known green)and(known ahlength):
out_file_aux:=jobname&"-info.aux";
out_file_mpc:=jobname&"-mpc.txt";
out_file_rep:=jobname&"-report.txt";
- def out_file_mol= jobname&"-"&fit_zero(char_num)&"-"&inf_EN&".mol" enddef;
+ def file_mol_output= jobname&"-"&fit_zero(char_num)&"-"&inf_EN&".mol" enddef;
%--default ahangle=45---------------------------------------------------------------------
if ahangle=0: outputformat:="eps"; % eps format(.mps)
elseif ahangle=11: outputformat:="png"; hppp:=vppp:=0.24; % png format(300dpi)
@@ -136,7 +137,7 @@ if (known green)and(known ahlength):
fi
%-----------------------------------------------------------------------------------------
def endchar = endfig enddef;
- def printf expr s= write s to out_file_name enddef;
+ def printf expr s= write s to file_name_output enddef;
def # = enddef;
vardef totalweight expr a= 0 enddef;
def Cp(expr s) = if known s: if s<>0: withcolor color_list[s] fi fi enddef;
@@ -221,7 +222,7 @@ def_com(-4090)(_com,_jp_atom,_jp_absA,_jp_bond,_cyc,_cyc_sB,_cyc_eB,_set_line,_t
%--------------------------------------------------------------------------------------------------
def parameter_list=
sw_rep_out,sw_numberA,sw_numberB,sw_mframe,sw_aux_out,sw_expand,sw_mol_out,sw_calc,
- sw_single,sw_ext_all,sw_aframe,sw_fframe,sw_group_off,sw_trimming,sw_arrow_emu,
+ sw_single,sw_ext_all,sw_aframe,sw_fframe,sw_group_off,sw_trimming,sw_arrow_emu,sw_file_open,
ratio_atom_bond,ratio_thickness_bond,ratio_char_bond,ratio_chain_ring,ratio_bondgap_bond,
ratio_hash_black,ratio_hashgap_bond,ratio_thickness_char,ratio_wedge_bond,ratio_atomgap_atom,
lonepairdiam,lonepairspace,blength,offset_atom,offset_wedge,max_blength,offset_hash_gap,
@@ -263,8 +264,10 @@ enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
def beginfont(text s)=
begingroup
- save ',f_beginchar,f_ext,blen,ext,add,ang_br,s_fw,s_bw,s_len,at_colon,info,mc;
- string info[],mc[],mc;
+ save ',f_beginchar,f_ext,blen,ext,add,ang_br,n_fw,n_bw,at_colon,at_semicol,info,mc,temps,
+ file_name_input,temps_a,t_tag;
+ numeric at_semicol[];
+ string info[],mc[],temps,temps_a,mc,file_name_input,t_tag;
%------------------------------------------------------------------------------------------------
def ext=ext_to_font enddef;
def add=add_to_molecule enddef;
@@ -282,20 +285,22 @@ def beginfont(text s)=
for list=s: inf_num:=inf_num+1; info[inf_num]:=list; mc[inf_num]:=""; endfor
%------------------------------------------------------------------------------------------------
for j=1 upto inf_num:
- at_colon:=0;
- for i=1 upto 9: if subc(i,info[j])=":": at_colon:=i; fi exitif at_colon>0; endfor
- s_len:=length(info[j]);
+ at_colon:=scan_char(":",info[j],0,1);
if at_colon=1:
- s_fw:=0; for k=2 upto s_len: if subc(k,info[j])<>" ": s_fw:=k; fi exitif s_fw>0; endfor
- s_bw:=0; for k=s_len downto 2: if subc(k,info[j])<>" ": s_bw:=k; fi exitif s_bw>0; endfor
+ n_fw:=scan_char(" ",info[j],1,2);
+ n_bw:=scan_char(" ",info[j],-1,2);
mc_row:=mc_row+1;
- mc_indent[mc_row]:=s_fw-2;
- mc[mc_row]:=substring (s_fw-1,s_bw) of info[j];
+ mc_indent[mc_row]:=n_fw-2;
+ mc[mc_row]:=substring (n_fw-1,n_bw) of info[j];
mc:=mc&mc[mc_row];
ef at_colon>=1:
- s_tag:=substring (0,at_colon-1) of info[j];
- s_var:=substring (at_colon,s_len) of info[j];
- if known scantokens("inf_"&s_tag): scantokens("inf_"&s_tag):=s_var; fi
+ s_tag:=substring (0,at_colon-1) of info[j];
+ s_var:=substring (at_colon,length(info[j])) of info[j];
+ if s_tag="f": if f_MP=1: file_name_input:=s_var&".mcf"; fi
+ ef s_tag="t": if f_MP=1: t_tag:=s_var; fi
+ ef s_tag="v": if f_MP=1: nA:=extract_data(t_tag,s_var); fi
+ else: if known scantokens("inf_"&s_tag): scantokens("inf_"&s_tag):=s_var; fi
+ fi
fi
endfor
%------------------------------------------------------------------------------------------------
@@ -355,6 +360,65 @@ def endfont=
%% message "* parts_int (0)="& decimal(parts_int) &" "& decimal(parts_int-parts_int_start);
%-----------------------------------------------------------------------------------------------
enddef;
+%-------------------------------------------------------------------------------------------------
+vardef extract_data(expr t,v)=
+ save data_cnt,f_end,semicol_cnt,cond,n_var;
+ f_end:=data_cnt:=semicol_cnt:=cond:=at_semicol[0]:=0;
+ if t="n": n_var:=scantokens(v); fi
+ forever:
+ temps:=readfrom file_name_input;
+ exitif temps=EOF;
+ if subc(1,temps)="%":
+ ef subc(1,temps)="*": f_end:=1;
+ ef subc(1,temps)="+":
+ data_cnt:=data_cnt+1;
+ if t="n": if n_var=0: cond:=1; else: if data_cnt=n_var: cond:=1; fi fi
+ else: if v=scantokens("inf_"&t): cond:=1; fi
+ fi
+ if cond=1:
+ forever:
+ temps:=readfrom file_name_input;
+ exitif subc(1,temps)="-";
+ mc_row:=mc_row+1;
+ n_fw:=scan_char(" ",temps,1,1);
+ mc_indent[mc_row]:=n_fw-1;
+ mc[mc_row]:=substring (n_fw-1,length(temps)) of temps;
+ mc:=mc&mc[mc_row];
+ endfor
+ f_end:=1;
+ else:
+ forever: temps:=readfrom file_name_input; exitif subc(1,temps)="-"; endfor
+ fi
+ else:
+ semicol_cnt:=0;
+ for i=1 upto length(temps):
+ if subc(i,temps)=";": semicol_cnt:=semicol_cnt+1; at_semicol[semicol_cnt]:=i; fi
+ endfor
+ for i=1 upto semicol_cnt+1:
+ if i<=semicol_cnt: temps_a:=substring (at_semicol[i-1],at_semicol[i]-1) of temps;
+ else: temps_a:=substring (at_semicol[semicol_cnt],length(temps)) of temps;
+ fi
+ at_colon:=scan_char(":",temps_a,0,1);
+ s_tag:=substring (0,at_colon-1) of temps_a;
+ s_var:=substring (at_colon,length(temps_a)) of temps_a;
+ if known scantokens("inf_"&s_tag): scantokens("inf_"&s_tag):=s_var; fi
+ endfor
+ fi
+ exitif f_end=1;
+ endfor
+ if sw_file_open=0: closefrom file_name_input; fi
+ data_cnt
+enddef;
+%--------------------------------------------------------------------------------------------------
+vardef scan_char(expr c,s,d,n)=
+ save k,n_s;
+ n_s:=0;
+ if d=0: for k=n upto length(s): if subc(k,s)=c: n_s:=k; fi exitif n_s>0; endfor
+ ef d=1: for k=n upto length(s): if subc(k,s)<>c: n_s:=k; fi exitif n_s>0; endfor
+ ef d=-1: for k=length(s) downto n: if subc(k,s)<>c: n_s:=k; fi exitif n_s>0; endfor
+ fi
+ n_s
+enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
def set_def_MC=
save /,//,/*,*/,**,*/*,~,^,',`,<,>,:,=,\,\\,*\,\*,*\*,@,@$,$,&,&$,#,##,{,},|,||,_,inside_def_MC;
@@ -1531,7 +1595,7 @@ enddef;
%=================================================================================================
def proc_auxfile_out=
message "["&decimal(char_num)&"]:"&inf_EN;
- out_file_name:=out_file_aux;
+ file_name_output:=out_file_aux;
%--------------------------------------------------------------------------------------
if (char_num=1)and(sw_aux_out=2):
printf tag[1] for i=2 upto aux_max: exitif tag[i]=""; &aux_delimiter&tag[i] endfor ;
@@ -1541,7 +1605,7 @@ def proc_auxfile_out=
if i=1: printf "" else: &aux_delimiter fi
if (sw_aux_out=1)or(sw_aux_out=3): &tag[i]&":" fi
%-------------------------------------------
- if tag[i]="F": & jobname
+ if tag[i]="J": & jobname
ef tag[i]="C": & decimal(char_num)
ef tag[i]="mw": & cal_MW
ef tag[i]="fm": & cal_FM
@@ -1576,7 +1640,7 @@ enddef;
%-------------------------------------------------------------------------------------------------
def proc_report_out=
message "["&decimal(char_num)&"]:"&inf_EN;
- out_file_name:=out_file_rep;
+ file_name_output:=out_file_rep;
printf "===========================================================================";
printf " No."&fdr(4)(char_num)&" / Name = "& inf_EN;
if mc_row>=1:
@@ -1640,7 +1704,7 @@ enddef;
%=================================================================================================
def proc_mol_out=
message "["&decimal(char_num)&"]:"&inf_EN;
- out_file_name:=out_file_mol;
+ file_name_output:=file_mol_output;
%-V2000---------------------------------------------------------------------------------------
if sw_mol_out=1:
printf ""; printf " -MCFtoMOL- "&fsl(20)(info[1]); printf "";
@@ -1818,13 +1882,13 @@ vardef check(expr s)=
if mc_row>=1:
%---------------------------------------------------------------------------------------------
for i=1 upto length(s):
- temp_c:=subc(i,s); if temp_c<>" ": char_cnt:=char_cnt+1; mc_char[char_cnt]:=ASCII(temp_c); fi
+ temp_c:=subc(i,s);
+ if temp_c<>" ": char_cnt:=char_cnt+1; mc_char[char_cnt]:=ASCII(temp_c); fi
endfor
mc_char[0]:=mc_char[char_cnt+1]:=mc_char[char_cnt+2]:=a_cmm;
%-- argument missing chkeck ----------------------------------------------------------------
cnt_prn_s:=cnt_prn_e:=cnt_brc_s:=cnt_brc_e:=cnt_brk_s:=cnt_brk_e:=cnt_inline_def:=cnt_at:=0;
- cnt_cmm:=cnt_and:=cnt_gtn:=cnt_gtn:=0;
- nA:=f_depth:=0;
+ cnt_cmm:=cnt_and:=cnt_gtn:=cnt_gtn:=nA:=f_depth:=0;
forever:
nA:=nA+1; nB:=mc_char[nA-1]; nC:=mc_char[nA]; nD:=mc_char[nA+1];
%-----------------------------------------------------------------------------------------
@@ -1869,16 +1933,21 @@ vardef check(expr s)=
if nB<>a_cmm: proc_err(8,nA) fi % a |
fi
%------------------------------------------------------------------------------------------
- ef nC=a_prn_s: cnt_prn_s:=cnt_prn_s+1; f_depth:=1;
+ ef nC=a_prn_s: if nD= a_cmm: proc_err(7,nA) fi % ( x
+ cnt_prn_s:=cnt_prn_s+1; f_depth:=1;
if nB=a_qut: cnt_inline_def:=cnt_inline_def+1; fi
ef nC=a_prn_e: cnt_prn_e:=cnt_prn_e+1; f_depth:=0;
- ef nC=a_brc_s: cnt_brc_s:=cnt_brc_s+1; f_depth:=1;
- ef nC=a_brc_e: cnt_brc_e:=cnt_brc_e+1; f_depth:=0;
+ ef nC=a_brc_s: if nD= a_cmm: proc_err(7,nA) fi % { x
+ cnt_brc_s:=cnt_brc_s+1; f_depth:=1;
+ ef nC=a_brc_e: if nD= a_cmm: proc_err(7,nA) fi % } x
+ cnt_brc_e:=cnt_brc_e+1; f_depth:=0;
if nD=a_cln: cnt_chg_atoms:=cnt_chg_atoms+1;
ef nD=a_equ: cnt_chg_bonds:=cnt_chg_bonds+1;
fi
- ef nC=a_brk_s: cnt_brk_s:=cnt_brk_s+1; f_depth:=1;
- ef nC=a_brk_e: cnt_brk_e:=cnt_brk_e+1; f_depth:=0;
+ ef nC=a_brk_s: if nD= a_cmm: proc_err(7,nA) fi % [ x
+ cnt_brk_s:=cnt_brk_s+1; f_depth:=1;
+ ef nC=a_brk_e: if nB= a_cmm: proc_err(7,nA) fi % x ]
+ cnt_brk_e:=cnt_brk_e+1; f_depth:=0;
%-------------------------------------------------------------------------------------------
fi
exitif nA>=char_cnt+1;
diff --git a/graphics/mcf2graph/mcf_data_base.mcf b/graphics/mcf2graph/mcf_data_base.mcf
new file mode 100644
index 0000000000..e10cf9c70d
--- /dev/null
+++ b/graphics/mcf2graph/mcf_data_base.mcf
@@ -0,0 +1,783 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% molecular data base file mcf_exa_data.mcf by Akira Yamaji 2021.04.04
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% tag1:var1;tag2:var2;tag3:var3 .....
+% first character of line '%' comment out
+% first character of line '+' begin MCF
+% first character of line '-' end MCF
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%==============================================================================
+% molecular data for mcf_example.tex No.1-155
+%==============================================================================
+EN:Adenine;MW:135.13
++
+<30,?6,3=?5,{1,3,5,9}=dl,{2,6,9}:N,5:/NH2,7:NH
+-------------------------------------------------------------------------------
+EN:Guanine;MW:151.13
++
+<30,?6,3=?5,{1,3,9}=dl,{2,9}:N,{6,7}:NH,5://O,1:/NH2
+-------------------------------------------------------------------------------
+EN:Cytosine;MW:111.10
++
+<30,?6,{4,6}=dl,4:N,3://O,2:NH,5:/NH2
+-------------------------------------------------------------------------------
+EN:Thymine;MW:126.11
++
+<30,?6,3=dl,{2,6}:NH,{1,5}://O,4:/_
+-------------------------------------------------------------------------------
+EN:Uracil;MW:112.09
++
+<30,?6,6=dl,{3,5}://O,{2,4}:NH
+-------------------------------------------------------------------------------
+EN:Geraniol;MW:154.25
++
+<30,!8,OH,{2,6}=dr,{2,6}:/_
+-------------------------------------------------------------------------------
+EN:Limonene;MW:136.24
++
+<30,?6,2=dl,2:/_,@5,*\,/_,!!
+-------------------------------------------------------------------------------
+EN:l-Menthol;MW:156.27
++
+<30,?6,2:/*?!,5:*/_,3:*/OH
+-------------------------------------------------------------------------------
+EN:Vanillin;MW:152.15
++
+<30,Ph,2:/OH,3:/O!,5:/CHO
+-------------------------------------------------------------------------------
+EN:Allicin;MW:162.28
++
+<-30,!!,!2,SO,!,S,!2,!!
+-------------------------------------------------------------------------------
+EN:Stearic acid;MW:284.48
++
+<30,!17,COOH
+-------------------------------------------------------------------------------
+EN:Linoleic acid;MW:280.45
++
+<30,!5,-30,-30,!,-30,-30,!7,COOH,{6,9}=dr
+-------------------------------------------------------------------------------
+EN:Sphingosine;MW:299.50
++
+<30,!18,OH,14=dr,-3:*/OH,-2:/*NH2
+-------------------------------------------------------------------------------
+EN:Tocopherol;MW:430.717
++
+<30,Ph,3=?6,7:O,{1,2,5}:/_,8:/*_^60,6:/OH,@8,\,|,!12,{4,8}:/*_,12:/_
+-------------------------------------------------------------------------------
+EN:Carotene;MW:536.8726
++
+<30,?6,4=dl,3:??,5:/_,
+ @4,\,|,!18,{1,3,5,7,9,11,13,15,17}=dr,{3,7,12,16}:/_,?6,-6=dl,-5:/_,-1:??
+-------------------------------------------------------------------------------
+EN:Adrenalin;MW:183.21
++
+<30,Ph,{1,6}:/OH,@4,\,*/OH,!2,NH,!
+-------------------------------------------------------------------------------
+EN:Caffeine;MW:194.194
++
+<30,?6,3=dl,{1,5}://O,-4=?5,-3=dl,7:N,{2,6,9}:N!
+-------------------------------------------------------------------------------
+EN:Nicotine;MW:162.23
++
+<30,Ph,2:N,@4,\,?5,8:N!
+-------------------------------------------------------------------------------
+EN:Capsaicin;MW:305.418
++
+<30,Ph,1:/OH,6:/O!,@4,\,!,NH,!,//O,!7,?!,-3=dl
+-------------------------------------------------------------------------------
+EN:Thiamine;MW:300.81
++
+<30,Ph,4:/NH2,@3,\`1,!,<-12,?5,{-1,-4}=dl,{1,5,8}:N,11:S,{6,9}:/_,
+ @-3,\,!2,OH,8:p_^72,@(6.7,1.5),Cl,n_^15
+-------------------------------------------------------------------------------
+EN:Gibberellin A3;MW:346.379
++
+<18,?5,3=?7,5=?6[12],@8,160`1.3,&3,13=dl,6=wf,8=wb,
+ @5,40~zf`1,O,50,//O^180,&14~zb,
+ 2:/COOH,7://_,13:*/OH,8:/*OH,14:*/_,{1,4}:*/H^60
+-------------------------------------------------------------------------------
+EN:Cholesterol;MW:386.664
++
+<30,?6,{-4,-2}=?6,-4=?5,7=dl,
+ 1:*/OH,{4,12}:*/_^60,10:/*H^180,{11,-1}:/*H^-60,9:*/H^60,@-1,17,/*_,!4,?!
+-------------------------------------------------------------------------------
+EN:Riboflavin;MW:376.37
++
+<30,Ph,3=?6,9=?6,{8,16}=dl,{7,10,14}:N,12:NH,{11,13}://O,{1,6}:/_,
+ @10,\`1.2,!,*/OH,!,/*OH,!,*/OH,!2,OH
+-------------------------------------------------------------------------------
+EN:Resveratrol;MW:228.24
++
+<30,Ph,@4,\,!!,!,Ph,{2,6,-3}:/OH
+-------------------------------------------------------------------------------
+EN:Glutathione;MW:307.33
++
+<-30,COOH,!,/*NH2,!3,//O,!,NH,!,*/!SH,!,//O,!,NH,!2,COOH
+-------------------------------------------------------------------------------
+EN:Hexaphenylbenzene;MW:534.6876
++
+<30,Ph,{1,2,3,4,5,6}:/Ph
+-------------------------------------------------------------------------------
+EN:Kekulene;MW:600.7
++
+<30,Ph,{3,-2,-3,-2,-3,-2,-3,-2,-3,-2}=?6,(-3,6)=?6[3],@-4,&6,
+{8,12,14,16,18,22,24,26,28,32,34,36,38,42,44,46,48,52,54,56,58}=dl
+-------------------------------------------------------------------------------
+EN:18-Crown-6;MW:264.32
++
+<-180,O,60,60,60,O,-60,60,60,O,-60,60,60,O,-60,60,60,O,-60,60,60,O,-60,60,&1
+-------------------------------------------------------------------------------
+EN:Porphyrin;MW:310.4
++
+<9,#1,?5,@3,\,54,?5,@-2,\,54,?5,@-2,\,54,?5,@-2,\,&5,##,
+{1,4,6,8,10,14,16,18,21,23,27}=dl,{4,17}:N,{11,23}:NH
+-------------------------------------------------------------------------------
+EN:Sulflower;MW:448.69
++
+<67.5,?8,{1,3,5,7}=?5,@11,30`1.15,&12,@14,30`1.15,&15,
+@17,30`1.15,&18,@20,30`1.15,&9,{9,12,13,16,17,20,21,24}=dl,
+{10,13,16,19,21,22,23,24}:S
+-------------------------------------------------------------------------------
+EN:Arsphenamine x5;MW:915.2
++
+<18,?5,{1,2,3,4,5}:As,{1,2,3,4,5}:/'(Ph,3:/NH2,4:/OH)
+-------------------------------------------------------------------------------
+EN:Melamine;MW:126.12
++
+<30,Ph,{2,4,6}:N,{1,3,5}:/NH2
+-------------------------------------------------------------------------------
+EN:Sudan red 1;MW:248.28
++
+<30,Ph,1=Ph,4:/OH,@3,\,N,!!,N,!,Ph
+-------------------------------------------------------------------------------
+EN:Basic blue 1;MW:319.86
++
+<30,Ph,3=Ph,6=Ph,2:S,5:N,{8,13}:/N?!,2:p_,@(4.2,1.5),Cl,n_^15
+-------------------------------------------------------------------------------
+EN:Disperse violet 1;MW:238.25
++
+<30,Ph,3=?6,-3=dr,9=Ph,{7,10}://O,{-1,-4}:/NH2
+-------------------------------------------------------------------------------
+EN:Vat blue 1;MW:262.27
++
+<30,Ph,3=?5,@8,\\,?5,-3=dr,-3=Ph,{7,14}:NH,{9,11}://O
+-------------------------------------------------------------------------------
+EN:Atrazine;MW:215.7
++
+<30,Ph,{2,4,6}:N,5:/Cl,1:/NH!2,3:/NH!?!
+-------------------------------------------------------------------------------
+EN:BHC;MW:290.83
++
+<30,?6`1.2,{1,3,4,6}:*/Cl,{2,5}:/*Cl
+-------------------------------------------------------------------------------
+EN:pp-DDT;MW:354.49
++
+<30,Ph,6:/Cl,@3,\,/CCl3,!,Ph,-3:/Cl
+-------------------------------------------------------------------------------
+EN:Endrin;MW:380.91
++
+<30,?6`1.3,3=?6,6=dl,9=?3,-1:O,
+ @2,210~wf`1.5,&5~wb,@7,210~zf`1.5,&10~zb,{1,2,5,6,12^-210,12^-150}:/Cl
+-------------------------------------------------------------------------------
+EN:Acrinathrin;MW:541.45
++
+<-30,?3,2^-35:*/_,2^35:/*_,
+ @1,\,!~dl,!,//O,!,O,!,/CF3,!,CF3,@3,\,//O,!,O,!,/CN,!,Ph,@-4,\,O,-60,Ph
+-------------------------------------------------------------------------------
+EN:Cafenstrole;MW:350.4
++
+<30,Ph,{2,4,6}:/_,@3,\,SOO,!,|,?5,{2,5}=dl,{2,4,5}:N,@-2,\,//O,!,N,/!,!2
+-------------------------------------------------------------------------------
+EN:Carfentrazone-ethyl;MW:412.19
++
+<30,Ph,4:/F,6:/Cl,@1,\,!,/Cl,!,//O,!,O,!2,
+ @3,\,|,?5,4=dl,{1,3,5}:N,-4://O,-3:/CF2,-2:/_
+-------------------------------------------------------------------------------
+EN:Carboxin;MW:235.301
++
+<30,?6,3=dl,2:S,5:O,4:/_,@3,\,//O,!,NH,!,Ph
+-------------------------------------------------------------------------------
+EN:Clomazone;MW:239.7
++
+<30,Ph,2:/Cl,@3,\,!,|,?5,1:N,2:O,-2^-35:/_,-2^35:/_,-1://O
+-------------------------------------------------------------------------------
+EN:Halfenprox;MW:477.4
++
+<30,Ph,@6,\,O,!,/F^35,/F^-35,!,Br,@3,\,!,??,!,O,!,!,Ph,@-2,\,O,60,Ph
+-------------------------------------------------------------------------------
+EN:Paraquat;MW:257.16
++
+Ph,@4,\,Ph,{1,10}:N!,1:p_^-90,10:p_^90,@(5,1),Cl,n_^15,@(-0.5,1),Cl,n_^15
+-------------------------------------------------------------------------------
+EN:Picolinafen;MW:376.331
++
+<30,Ph,5:/CF3,@3,\,O,!,|,Ph,2:N,@3,\,//O,!,NH,!,|,Ph,4:/F
+-------------------------------------------------------------------------------
+EN:Quinoxyfen;MW:308.13
++
+<30,Ph,4=Ph,10:N,{2,6}:/Cl,@7,\,O,!,|,Ph,4:/F
+-------------------------------------------------------------------------------
+EN:Quitozene;MW:295.3
++
+<30,Ph,{1,2,3,4,6}:/Cl,5:/NO2
+-------------------------------------------------------------------------------
+EN:Bitertanol;MW:337.4
++
+<30,Ph,@3,\,Ph,@-3,\,O,!2,/OH,!,??!,@14,\,|,?5,{2,4}=dl,{1,2,4}:N
+-------------------------------------------------------------------------------
+EN:Bifenox;MW:342.14
++
+<30,Ph,{4,6}:/Cl,@3,\,O,!,Ph,-4:/COO!,-3:/NO2
+-------------------------------------------------------------------------------
+EN:Simeconazole;MW:293.417
++
+<36,?5,{1,3,5}:N,{1,4}=dl,@3,30,!,/OH^30,!2,Si,/_,/_^60,!,@7,-30,Ph,-3:/F
+-------------------------------------------------------------------------------
+EN:Fenamidone;MW:311.403
++
+<18,?5,4=dl,{3,5}:N,2://O,@3,\,NH,!,Ph,4:/S!,1^52:*/_,1^-48~zf:/Ph
+-------------------------------------------------------------------------------
+EN:Fenpyroximate;MW:421.49
++
+<-6,?5,{3,5}=db,{1,2}:N,{2,5}:/Me,@3,\^-15,O,!,Ph,
+ @4,\,!~dr,N,!,O,!2,|,Ph,@4,\,//O,-60,O,!4
+-------------------------------------------------------------------------------
+EN:Chlorsulron;MW:380.648
++
+<30,Ph,6:/NH2,@1,\,SOO,!,NH2,@3,\,SOO,!,NH2,@4,\,/Cl,60~dl,/Cl,!,Cl
+-------------------------------------------------------------------------------
+EN:Enrofloxacin;MW:359.401
++
+<30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,@1,\,|,?6,1:N,4:N,4:/!
+-------------------------------------------------------------------------------
+EN:Fenitrothion;MW:277.23
++
+<-30,!,O,!,P,//S,/O!^160,!,O,!,|,Ph,3:/_,2:/NO2
+-------------------------------------------------------------------------------
+EN:Fipronil;MW:437.2
++
+<30,Ph,{2,4}:/Cl,6:/CF3,@3,\,|,?5,{2,4}=dl,{1,2}:N,3:/CN,5:/NH2,
+ @-2,\,S,//O,!,CF3
+-------------------------------------------------------------------------------
+EN:Flumequine;MW:261.225
++
+<30,Ph,3=?6,(2,7)=?6[4],9=dl,7:N,6:/F,9:/COOH,10://O,13:/_
+-------------------------------------------------------------------------------
+EN:Imazalil;MW:297.2
++
+<-30,!2,O,!2,!~dr,@1,60,|,?5,{2,4}=dl,{1,3}:N,@$2,\,|,Ph,{4,6}:/Cl
+-------------------------------------------------------------------------------
+EN:Imidacloprid;MW:255.662
++
+<30,Ph,1:N,6:/Cl,@3,\,!,|,?5,2=dl,1:N,3:N,2:/'(NH,!,NO2)
+-------------------------------------------------------------------------------
+EN:Kresoxim-Methyl;MW:313.348
++
+<30,Ph,@3,\,/COO!,!~dr,N,!,O,!,@4,\,!,O,!,Ph,-1:/_
+-------------------------------------------------------------------------------
+EN:Nalidixic acid;MW:232.239
++
+<30,Ph,3=?6,9=dl,5:N,6:/_,7://O,8:/COOH,10:N!2
+-------------------------------------------------------------------------------
+EN:Oryzalin;MW:346.4
++
+<30,Ph,{1,3}:/NO2,@5,\,SOO,!,NH2,@2,\,/!2,N,!3
+-------------------------------------------------------------------------------
+EN:Oxadiazon;MW:345.2
++
+<30,Ph,{4,6}:/Cl,1:/O!?!,@3,\,|,?5,2=dl,{1,2}:N,4:O,5://O,3:/??!
+-------------------------------------------------------------------------------
+EN:Oxadixyl;MW:278.3
++
+<30,Ph,{2,4}:/_,@3,\,N,!1,//O,!2,O,!,@7,\,|,?5,1:N,2:O,5://O
+-------------------------------------------------------------------------------
+EN:Oxyfluorfen;MW:361.701
++
+<30,Ph,6:/CF3,4:/Cl,@3,\,O,!,Ph,-3:/NO2,@-4,\,O,!2
+-------------------------------------------------------------------------------
+EN:Sulfadimidine;MW:278.33
++
+<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,4}:N,{3,5}:/_
+-------------------------------------------------------------------------------
+EN:Sulfamerazine;MW:264.303
++
+<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,6}:N,3:/_
+-------------------------------------------------------------------------------
+EN:Sulfadoxine;MW:310.328
++
+<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{4,6}:N,{2,3}:/O!
+-------------------------------------------------------------------------------
+EN:Sulfamethoxazole;MW:253.276
++
+<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,?5,{2,5}=dl,4:O,5:N,3:/_
+-------------------------------------------------------------------------------
+EN:Thiamethoxam;MW:291.71
++
+<30,?6,4:N,2:O,6:N!,5://'(N,!,NO2),@4,\,!,|,?5,{1,3}=dl,3:N,5:S,4:/Cl
+-------------------------------------------------------------------------------
+EN:Thiamphenicol;MW:355
++
+<30,Ph,@1,\,SOO,!,@4,\,/OH,!,/!OH,!`1.1,NH,!`1.1,//O,!,/Cl,!,Cl
+-------------------------------------------------------------------------------
+EN:Pyridaphenthion;MW:340.334
++
+<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,|,?6,{1,5}=dl,{2,3}:N,4://O,3:/Ph
+-------------------------------------------------------------------------------
+EN:Permethrin;MW:391.288
++
+<-30,?3,2^-35:*/_,2^35:/*_,1:/'(!!,/Cl,!,Cl),@3,\,//O,!,O,!2,|,Ph,@3,\,O,-60,Ph
+-------------------------------------------------------------------------------
+EN:Isoprothiolane;MW:290.392
++
+<-30,!,?!,O,!,//O,!,//'(?5,2:S,5:S),!,//O,!,O,!,?!
+-------------------------------------------------------------------------------
+EN:Oxine-Copper;MW:351.852
++
+Ph,4:N,5=Ph,@-4,\,O,-60,<90,Cu,-90,O,60,|,Ph,5=Ph,10:N,||,@4,&12~vf,@23,&12~vf
+-------------------------------------------------------------------------------
+EN:Tetraconazole;MW:372.145
++
+<-6,?5,{2,5}=dl,{1,2,4}:N,@4,\,!3,O,!,/F^35,/F^-35,!,CF2,@7,\,|,Ph,{4,6}:/Cl
+-------------------------------------------------------------------------------
+EN:Endosulfan;MW:406.904
++
+<26,?7,7=?6[13],@11,208~wf`1.45,&8~wb,10=dl,{3,5}:O,4:S,4://O,
+ {8,9,10,11,12^-210,12^-150}:/Cl
+-------------------------------------------------------------------------------
+EN:Uniconazole-P;MW:291.779
++
+<30,Ph,6:/Cl,@3,\,!~dl,!,/OH,!,??!,@8,\,|,?5,{2,4}=dl,{1,2,4}:N
+-------------------------------------------------------------------------------
+EN:Oxadiargyl;MW:341.19
++
+<30,Ph,{1,3}:/Cl,6:/'(O,!2,!!!),@4,\,|,?5,2=dl,{1,2}:N,4:O,5://O,3:/??!
+-------------------------------------------------------------------------------
+EN:Oxaziclomefone;MW:376.277
++
+<30,?6,6=dl,4:N,2:O,1:/_,5://O,6:/Ph,@4,\,??,!,|,Ph,{3,5}:/Cl
+-------------------------------------------------------------------------------
+EN:Trimetoprim;MW:290.323
++
+<30,Ph,{1,5}:N,{2,6}:/NH2,@3,\,!,|,Ph,{3,4,5}:/O!
+-------------------------------------------------------------------------------
+EN:Ciprofloxacin;MW:331.347
++
+<30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,@1,\,|,?6,1:N,4:NH
+-------------------------------------------------------------------------------
+EN:Danofloxacin;MW:357.385
++
+<30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,
+ @1,\,|,?6,@2,-200`1.1,&5,{1,4}:N,4:*/_
+-------------------------------------------------------------------------------
+EN:Marbofloxacin;MW:362.361
++
+<30,Ph,3=?6,9=dl,(2,7)=?6[4],6:/F,7:N,11:O,9:/COOH,10://O,13:N!,
+ @1,\,|,?6,1:N,4:N!
+-------------------------------------------------------------------------------
+EN:Ofloxacin;MW:361.373
++
+<30,Ph,3=?6,(2,7)=?6[4],9=dl,7:N,11:O,6:/F,9:/COOH,10://O,13:/_,
+ @1,\,|,?6,{1,4}:N,4:/_
+-------------------------------------------------------------------------------
+EN:Ormetoprim;MW:274.324
++
+<30,Ph,{1,5}:N,{2,6}:/NH2,@3,\,!,|,Ph,2:/_,{4,5}:/O!
+-------------------------------------------------------------------------------
+EN:Amoxicillin;MW:365.4042
++
+<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
+ @4,*\^15,NH,!,//O,!,*/NH2,!,Ph,-3:/OH
+-------------------------------------------------------------------------------
+EN:Ampicillin;MW:349.405
++
+<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
+ @4,*\^15,NH,!,//O,!,/*NH2,!,Ph
+-------------------------------------------------------------------------------
+EN:Benzyl-Penicillin;MW:334.4
++
+<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
+ @4,*\^15,NH,!,//O,!,!,Ph
+-------------------------------------------------------------------------------
+EN:Mecillinam;MW:325.4264
++
+<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
+ @4,*\^15,N,!!,!,?7,-7:N
+-------------------------------------------------------------------------------
+EN:Nafcillin;MW:414.4748
++
+<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
+ @4,*\^15,NH,!,//O,!,Ph,-2=Ph,-9:/O!2
+-------------------------------------------------------------------------------
+EN:Oxacillin;MW:401.4363
++
+<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
+ @4,*\^15,NH,!,//O,!,<-24,?5,{-2,-5}=dl,-2:N,-3:O,-4:/_,@-1,\^-24,Ph
+-------------------------------------------------------------------------------
+EN:Cloxacillin;MW:435.8813
++
+<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
+ @4,*\^15,NH,!,//O,!,<-24,?5,{-2,-5}=dl,-2:N,-3:O,-4:/_,@-1,\^-24,Ph,-5:/Cl
+-------------------------------------------------------------------------------
+EN:Dicloxacillin;MW:470.3264
++
+<45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??,
+ @4,*\^15,NH,!,//O,!,<-24,?5,{-2,-5}=dl,-2:N,-3:O,-4:/_,
+ @-1,\^-24,Ph,{-1,-5}:/Cl
+-------------------------------------------------------------------------------
+EN:Cefalexin;MW:347.3889
++
+<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,5:/*COOH,6:/_,
+ @4,*\^15,NH,!,//O,!,*/NH2,!,Ph
+-------------------------------------------------------------------------------
+EN:Cefalonium;MW:458.5107
++
+<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,@5,\*,//O,!,O,n_^40,
+ @4,*\^15,NH,!,//O,!2,?5,{-1,-3}=dl,-4:S,
+ @6,\,!,|,Ph,1:N,1:p_^180,@4,\,//O,!,NH2
+-------------------------------------------------------------------------------
+EN:Cefazorin;MW:454.51
++
+<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,5:/*COOH,
+ @4,*\^15,NH,!,//O,!2,?5,{-2,-4}=dl,{-1,-2,-3,-5}:N,
+ @6,\,!,S,!,?5,{-3,-5}=dl,-1:S,-2:/_,{-3,-4}:N
+-------------------------------------------------------------------------------
+EN:Cefquinome;MW:528.6
++
+<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,@5,\*,//O,!,O,n_^40,
+ @4,*\^15,NH,!,//O,!,//'(N,!,O,!),!,?5,{-2,-5}=dl,-3:S,-1:N,-2:/NH2,
+ @6,\,!,Ph,-2=?6,-10:N,-10:p_^180
+-------------------------------------------------------------------------------
+EN:Ceftiofur;MW:523.5626
++
+<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,5:/*COOH,
+ @4,*\^15,NH,!,//O,!,//'(N,!,O,!),!,?5,{-2,-5}=dl,-3:S,-1:N,-2:/NH2,
+ @6,\,!,S,!,//O,!,?5,{-1,-3}=dl,-4:O
+-------------------------------------------------------------------------------
+EN:Cefuroxime;MW:424.3852
++
+<45,?4,-3=?6,-4=dl,2:N,8:S,3^45:/*H,1://O^15,5:/*COOH,
+ @4,*\^15,NH,!,//O,!,//'(N,!,O,!),!,?5,{-1,-3}=dl,-4:O,@6,\,!,O,!,//O,!,NH2
+-------------------------------------------------------------------------------
+EN:Apramycin;MW:539.58
++
+<30,?6,-4=?6,{2,10}:O,@1,\*,O,60~zb,?6,@9,\*,O,-60~zb,?6,-5:O,
+ {7,13,-2}:*/OH,{14,-1}:/*OH,{15,17}:*/NH2,{6,-3}:/*NH2,8:*/NH!>vt,
+ -4:*/!OH,3:/*H^-60`.75,4:*/H^60`.75
+-------------------------------------------------------------------------------
+EN:Gentamycin;MW:477.596
++
+<-30,?6,@1,\*,O,0~zb,?6,-5:O,@5,\*,O,0~zb,?6,-5:O,{2,4}:*/NH2,20:/*NH2,6:*/OH,
+ 11:*/OH^-35,11:/*_^35,12:*/NH!,13:/*OH,17:/'(*/_,!NH!)
+-------------------------------------------------------------------------------
+EN:Kanamycin;MW:484.499
++
+<-30,?6,@1,\*,O,0~zb,?6,-5:O,@5,\,O,0,?6,-5:O,
+ {2,4,12}:*/NH2,{6,19}:*/OH,{11,13,18,20}:/*OH,10:*/!OH,17:*/!NH2
+-------------------------------------------------------------------------------
+EN:DihydroStreptmycin;MW:583.574
++
+<54,?5,3:O,4:/*_,5:/!OH^-48,5:/*OH^35,@1,\*,O,-24~wb,?6,-5:O,@2,*\,O,24~zb,?6,
+ {10,15}:*/OH,{11,16,18}:/*OH,9:/*!OH,12:*/NH!,
+ @17,*\^-18,NH,!,//NH,!,NH2,@19,*\,NH,!,//NH,!,NH2
+-------------------------------------------------------------------------------
+EN:Fradiomycin;MW:614.644
++
+<30,?6,3:O,2:/*!NH2,1:*/OH,6:/*OH,5:*/NH2,
+ @4,*\,O,!~wb,?6,{-3,-5^15}:/*NH2,-2:*/OH^-15,
+ @-1,\*,O,-72~wb,?5,-4:O,-1:/*OH>vt,-3:*/!OH>vt,
+ @-2,\*^-24,O,-60~zb,?6,-5:O,-1:/*NH2,-2:*/OH,-3:/*OH,-4:/*!NH2>60
+-------------------------------------------------------------------------------
+EN:Streptmycin;MW:581.574
++
+<54,?5,3:O,4:/*_,5:/OH^35,@1,\*,O,-24~wb,?6,-5:O,@2,*\,O,24~zb,?6,
+ @5,\^-48,!!,O,{10,15}:*/OH,{11,16,18}:/*OH,9:/*!OH,12:*/NH!,
+ @17,*\^-18,NH,!,//NH,!,NH2,@19,*\,NH,!,//NH,!,NH2
+-------------------------------------------------------------------------------
+EN:Neospiramycin;MW:698.9
++
+<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
+ {12,14}=dl,2:O,1:/*_,5:/*OH,3://O,10:/*_,6:/*O!>vt,
+ @-6,\*,O,!~wb,?6`.7,-5:O,-3:/*N?!,-4:*/_,
+ @7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!,-1:/*OH,-4:*/_,-3:/*OH,@8,\*,!,!!,O
+-------------------------------------------------------------------------------
+EN:Emamectine;MW:886.133
++
+<24,?6,6=?5,3=dl,9:O,2:*/OH,3:/_,6:/*OH^-60,
+ @5,#1.04,6,//O,-60,O,60~wb,60,-60,60~wf,60,-60,60,60,60,-60,60,##,&7,
+ {-1,-3,-7}=dl,(-11,-10)=?6[4],@-2,?6,-6=wf,-1=zb,-5=dl,
+ {-1,-6}:O,-3:*/_,@-2,\,*/_,!2,
+ 17:/_,19:/*_,@18,\,O,!,?6`.8,-1:O,-2:*/_,-4:*/O!,
+ @-3,\,O,60,?6`.8,-5:O,-4:*/_,-3:/*NH!,-2:*/O!
+-------------------------------------------------------------------------------
+EN:Spinosad;MW:731.968
++
+<30,#1,<-120,60,60,-60,60,60,60,-60,60,60,60,-60,&1,##,
+ 5=?5,-1=dl,{-2^60,-3^-35}:/*H,-3=?6,-4=dl,
+ {-1^35}:*/H,{-2^-60}:/*H,-2=?5,2:O,{3^25,7^-25}://O,1:/!,
+ @-2,\~zf,O,66,?6`.8,-1:O,-2:/_,{-3,-4,-5}:/O!,8~wf:/Me,5^-65~wf:/H,
+ @9,\~zf,O,!,|,?6`.8,2:O,3:/_,-3:/N?!
+-------------------------------------------------------------------------------
+EN:Spiramycin;MW:843.1
++
+<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
+ {12,14}=dl,2:O,{1,10^-30}:/*_,5:/*OH,3://O,6:/*O!>vt,
+ @-6,\*^-30,O,!~wb,?6`.7,-5:O,-3:/*N?!,-4:*/_,
+ @7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!,-1:/*OH,-4:*/_,
+ @-3,\*`1,O,60~wb`1.5,?6`.7,-5:O,{-2^35,-3}:*/OH,{-2^-35,-4}:/*_,
+ @8,\*,!,!!,O
+-------------------------------------------------------------------------------
+EN:Natamycin;MW:665.733
++
+<-90,#1,60,60,-60,60,-60,60,-60,60,-60,60,60,60,O,-60,
+ 60,60,-60,60,-60,60,-60,60,60,-60,&1,(12,13)=?6[4],##,
+ {2,4,6,8,20}=dl,11=zb,23:O,-2:/*OH,-3:*/COOH,
+ 18=?3,-1=wb,-2=wf,-1:O,22://O,24:*/_,{14^60,16}:*/OH,
+ @10,*\,O,90,?6`.8,-3:*/OH,-5:/*OH,-4:/*NH2,-1:O,-2:/*_
+-------------------------------------------------------------------------------
+EN:Tylocin;MW:916.10
++
+<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
+ {12,14}=dl,2:O,1:/*!,5:/*OH,3://O,10:/*_,6:/*_,-6://O,-3:/_,
+ @-1,*\,-60,O,0~wb,?6`.7,-5:O,-3:/*OH,-4:*/_,{-1,-2}:/*O!,
+ @7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!,-1:/*OH,-4:*/_,
+ @-3,\*`1,O,60~wb`1.5,?6`.7,-5:O,{-2^35,-3}:*/OH,{-2^-35,-4}:/*_,
+ @8,\*,!,!!,O
+-------------------------------------------------------------------------------
+EN:Tilmicosin;MW:869.133
++
+<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
+ {12,14}=dl,2:O,1:/*!,5:/*OH,{3,11}://O,{6,10}:/*_,14:/_,
+ @-1,*\,-60,O,0~zb,?6`.7,-5:O,{-1,-2}:*/O!,-3:*/OH,-4:/*_,
+ @7,\*,O,0,?6`.7,-5:O,-2:*/N?!,{-1,-3}:/*OH,-4:*/_,
+ @8,\*,!2,?6`.7,-6:N,{-2,-4}:*/_
+-------------------------------------------------------------------------------
+EN:Chlortetracyclin;MW:478.88
++
+<30,Ph,{-4,-3,-3}=?6,{16,19}=dl,{10,18}://O,7:*/_^-35,2:/Cl,
+ {5,7~zf^35,13~wf^60,14,16}:/OH,15:*/N?!,17:/CONH2
+-------------------------------------------------------------------------------
+EN:Oxytetracyclin;MW:460.434
++
+<30,Ph,{-4,-3,-3}=?6,{16,19}=dl,{10,18}://O,7:*/_^-35,11:*/OH,
+{5,7~zf^35,13~wf^60,14,16}:/OH,15:*/N?!,17:/CONH2
+-------------------------------------------------------------------------------
+EN:Tetracyclin;MW:444.435
++
+<30,Ph,{-4,-3,-3}=?6,{16,19}=dl,{10,18}://O,7:*/_^-35,
+ {5,7~zf^35,13~wf^60,14,16}:/OH,15:*/N?!,17:/CONH2
+-------------------------------------------------------------------------------
+EN:Doxycyclin;MW:444.43
++
+<30,Ph,{-4,-3,-3}=?6,{16,19}=dl,{10,18}://O,7:*/_,
+ {5,13~wf^60,11~wf,14,16}:/OH,15:*/N?!,@17,\,//O,!,NH2
+-------------------------------------------------------------------------------
+EN:Tiamulin;MW:493.74
++
+<-45.5,?8,-3=?5,@8,#.8,-210~zf,/_^60,45,56,##,&6~zb,
+ {3^-45,5,8}:*/_,@3,\*^30,!~dl,4:/*OH,11://O,7:*/H^60,
+ @1,\^15,O,!,//O,!2,S,60,60,-60,N!2,60,-60
+-------------------------------------------------------------------------------
+EN:Rifampicin;MW:822.94
++
+<30,Ph,6:/_^30,5:/OH,|,-6=?5,1:O,3://O,2:/*_^60,|,-8=?6,{2,4}=dl,{1,4}:/OH,
+ #1,@-2,\,NH,60,//O,-60,/_,60~dl,60,60~dl,-60,
+ */_,60,/*OH,-60,/*_,60,/*OH,60,*/_^30,-60,
+ 60,/*_^30,-53,66,-53~dl,66`1.2,O,##,&($8),
+ -4:/*O!,@-6,-30,O,!,//O,!,@$11,\,!!,N,!,|,?6,1:N,4:N!
+-------------------------------------------------------------------------------
+EN:Trenbolone;MW:270.37
++
+<30,?6,{3,10}=?6,13=?5,{2,11,15}=dl,1://O,12:*/_^60,-1:/*OH,9:*/H^60,11:/*H^-60
+-------------------------------------------------------------------------------
+EN:Luciferin;MW:280.33
++
+<30,Ph,3=?5,@8,\,?5,{9,16}=dl,{9,14}:N,{7,11}:S,1:/OH,-2:*/COOH
+-------------------------------------------------------------------------------
+EN:Chlorophyll a;MW:893.509
++
+<-36,#1,?5,@3,\,54,?5,@-2,\,54,?5,@-2,\,54,?5,@-2,\,&5,@6,22,70,&8,##,
+ {4,6,8,10,14,16,18,21,23,27}=dl,@4,\`1.48~vf,Mg,&17~vb,@11,&27,@27,&23,
+ {4,11,17,23}:N,{1~zf,9,15,21}:/_,14:/!,20:/!!,25:/*COO!,26://O,
+ @2,*\^-6,!2,//O,!,O,!2,!!,|,!13,{1,5,9,13}:/_
+-------------------------------------------------------------------------------
+EN:Quercetin;MW:302.24
++
+<30,Ph,3=?6,@9,\,Ph,9=dl,10:O,7://O,{2,6,8,13,14}:/OH
+-------------------------------------------------------------------------------
+EN:Limonin;MW:470.518
++
+<30,?6,{-3,-4}=?6,-5=?3,-2=wf,-1=wb,6=?5,-4=?6,-5=wf,{13,15,17,20}:O,
+ {3,12,21}://O,{4~wf^60,8~zf^60}:/_,18:??,{1^60,5^180,16^60}:/*H,
+ @14,\*,|,?5,{1,4}=dl,3:O
+-------------------------------------------------------------------------------
+EN:Cromolyn;MW:468.37
++
+<30,Ph,|,-1=?6,3=dl,1:O,4://O,2:/COOH,
+@$2,\,O,!2,/OH,!2,O,60,Ph,|,-5=?6,3=dl,4:O,1://O,3:/COOH
+-------------------------------------------------------------------------------
+EN:Emetine;MW:480.649
++
+<30,Ph,{-4,-4}=?6,8:N,{1,6}:/O!,-2:/*!,{7^-60,12^-60}:/*H,
+@-3,\,!~zb,<-60,|,?6,5=dl,2:NH,-6^-60:*/H,|,-2=?6,{2,4}=dl,{-2,-3}:/O!
+-------------------------------------------------------------------------------
+EN:Acronycine;MW:321.376
++
+<30,Ph,|,-4=?6,1:N!,4://O,-3=Ph2,-1:/O!,|,-4=?6,2=dl,4:O,3:??
+-------------------------------------------------------------------------------
+EN:Piperine;MW:285.343
++
+<30,Ph,|,-1=?5,{1,3}:O,@$4,\,!!,!,!!,!,//O,!,|,?6,1:N
+-------------------------------------------------------------------------------
+EN:Febrifugine;MW:301.346
++
+<30,Ph,|,-4=?6,2=dl,{1,3}:N,4://O,@$9,\,!,//O,!,!~zf,|,?6,2:NH,-1:*/OH
+-------------------------------------------------------------------------------
+EN:Mitomycine C;MW:334.332
++
+<30,?6,{3,6}=dl,{2,5}://O,1:/_,-4=?5,-3:N,
+6:/NH2,,-3=?5,-2=?3,-1=wb,-2=wf,-1:NH,8:/*O!^35,@$9,\,!,O,60,//O,!,NH2
+-------------------------------------------------------------------------------
+EN:Podophyllotoxin;MW:414.41
++
+<0,?5,{2,5}:O,-3=Ph2,-3=?6,-3=?5,-2:O,-1=wb,-3://O,
+@10,\*,Ph,{-2,-3,-4}:/O!,13:/*OH,{11~wf^-60,12~zf^60}:/H
+-------------------------------------------------------------------------------
+EN:Warfarin;MW:308.333
++
+<30,Ph,3=?6,8=dl,10:O,7:/OH,9://O,@8,\,/Ph`1,60,!,//O,!
+-------------------------------------------------------------------------------
+EN:Genistein;MW:270.24
++
+<30,Ph,3=?6,9=dl,10:O,{2,6}:/OH,7://O,@8,\,Ph,-3:/OH
+-------------------------------------------------------------------------------
+EN:Baicalein;MW:270.24
++
+<30,Ph,3=?6,9=dl,10:O,{1,2,6}:/OH,7://O,@8,\,Ph
+-------------------------------------------------------------------------------
+EN:Reserpine;MW:608.688
++
+<54,Ph,-4=?5,-2=?6,-4=?6,-3=?6,9=dl,11:N,7:NH,10:*/H^-60,{15^-60,16^60}:/*H,
+@20,*\,O,!,//O,!,Ph,{-2,-3,-4}:/O!,{1,19~zf>rl}:/O!,18:*/COO!>lr
+-------------------------------------------------------------------------------
+EN:Rotenone;MW:394.423
++
+<-60,?5,{-3,-2,-3,-4}=?6,{7,9,-2,-4}=dl,{3,17}=dr,
+{2,13,16}:O,10://O,{11^-60,12^60}:*/H,{-2,-3}:/O!,@1,*\,/_,!!
+-------------------------------------------------------------------------------
+EN:Pyrethrin I;MW:328.452
++
+<30,?3,{3^35~wf,3^-35~zf}:/_,@1,*\,!!,?!,
+@2,\*,//O,!,O,-36~zb,|,?5,-2=dl,-1:/_,-3://O,@-2,\,!4,{-1,-3}=dl
+-------------------------------------------------------------------------------
+EN:Oseltamivir;MW:312.40
++
+<30,?6,3=dl,6:*/NH2,@1,\*,NH,!,//O,!,@2,*\,O,!,/!,!2,@4,\,//O,!,O,!2
+-------------------------------------------------------------------------------
+EN:Paclitaxel;MW:853.918
++
+?6,5=dl,@3,#1,36,45,45,45,45,##,&5,-4=?6,-4=?4,-1=wb,-3=wf,-1:O,
+4:??,6:/_,{3^-60,15}:*/OH,8:/*H^-60,9:*/_^60,10://O,
+@1,\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph,
+@7,\*,O,-45,//O,60,Ph,11:*/OCO!>rl,12:/*OCO!^-15>lr
+-------------------------------------------------------------------------------
+EN:Mevastatin;MW:390.52
++
+<30,?6,2=dl,4:*/H^60,-4=?6,-4=dl,9:*/_,
+@10,*\,!,60~wb,?6,6:O,-2://O,-4:/*OH,@5,\*,O,60,//O,!,*/_,!2
+-------------------------------------------------------------------------------
+EN:Sesamine;MW:354.35
++
+<54,?5,1=?5,{4,7}:O,{1^-54,2^54}:*/H,{5,8}:*/'(Ph,4=?5,7:O,9:O)^-12
+-------------------------------------------------------------------------------
+EN:Morphine;MW:285.343
++
+<30,Ph,2=?6,-4=?6,(1,12)=?5[2],-1:O,-1=zb,
+ @7,60~wf`0.75,70~si_`1.3,45,N!,&9~wb,15=dl,6:/OH,8^180:*/H,12:/*OH
+-------------------------------------------------------------------------------
+EN:Quinine;MW:324.424
++
+<30,Ph,3=Ph,7:N,6:/O!,
+@10,\,*/OH,/H~zf^-60,!,|,?6,2:N,1:*/H^60,@4,*\,!!,@2,165~zf,60,&5~zb
+-------------------------------------------------------------------------------
+EN:Atoropin;MW:289.375
++
+<30,O,!,//O,!,!,Ph,@$1,\~zb^-60,|,?7`1.1,@6,*\^190`1.25,N!,&3~wb,$3:/!OH~wv
+-------------------------------------------------------------------------------
+EN:Colchicine;MW:399.443
++
+<30,Ph,{1,2,6}:/O!,-4=?7,-5=?7,{-1,-4,-6}=dl,-2://O,-3:/O!,9:/NHCO!
+-------------------------------------------------------------------------------
+EN:Lycorine;MW:287.315
++
+<30,Ph,-4=?6,-2=?6,6=?5,(9,12)=?5[3],13=dl,8:N,{15,17}:O,
+9:/*H^180,10:*/H^60,13:*/OH,14:/*OH
+-------------------------------------------------------------------------------
+EN:Ibotenic acid;MW:158.113
++
+<18,?5,4=dl,3:O,2:NH,1://O,@4,-24,/NH2,!,COOH
+-------------------------------------------------------------------------------
+EN:illudin S;MW:264.3
++
+<30,?6,3=?5,6:**?3,{4,7}=dl,2://O,5:/_,
+ {1^35,8^35}:*/_,1:/*OH^-35,9:*/OH,8:/*!OH^-35
+-------------------------------------------------------------------------------
+EN:Muscarine;MW:174.26
++
+<18,?5,2:O,1:*/_,5:/*OH,@3,*\,48,N,??,p_^180,!
+-------------------------------------------------------------------------------
+EN:Psilocybin;MW:284.248
++
+<30,Ph,3=?5,8=dl,9:NH,@2,\,O,-60,P,//O^-45,/OH^45,90,OH,@7,\,!,-60,N?!
+-------------------------------------------------------------------------------
+EN:Tetrodotoxine;MW:319.27
++
+#1,<60,-90,60,-30`1.15,150,60,&1,@3,-135,60,-30`1.15,150,&4,
+@10,\,O,60`1.33,60,&($3)~si_,@8,-15~si_,O,&12,##,
+@9,45,-60,OH,1^120://NH,{5~zf^-15,7,9^-75,12,13~zf}:/OH,{2,6^180}:NH
+-------------------------------------------------------------------------------
+EN:Aflatoxin B1;MW:312.27
++
+<30,Ph,6=?6,-2=?5,4=?5,-2=?5,{-2,10}=dl,{7,14,17}:O,
+ 2:/O!,{8,11}://O,{15^-54,16^54}:*/H
+-------------------------------------------------------------------------------
+%==============================================================================
+% other molecular data
+%==============================================================================
+EN:Vancomycin;MW:1449.25
++
+<-30,#1,!12,{1,3,12}=zf,7=wf,/H^-60,60,*/OH,60,
+ Ph,-4:/Cl,@-3,\,O,!,Ph,@-4,\,O,!,Ph,-1^15:/Cl,@-3,\,/*OH,*/H^-60,&1,
+ @7,&26,@$1,60,//O,60,NH,60,/*H,*/COOH^180,-60,
+ Ph,{-2,-4}:/OH,@-1,\,Ph,-5:/OH,@-2,&4,##,
+ {3^40,6,9,12}://O,{2,5,8,11}:NH,{1,4^180}:*/H,{7^-60,10^60,14^60}:/*H,
+ @10,*\^-60,60,//O,!,NH2,@13,*\,NH,!,//O,!,/??!,*/H^60,!~zf,NH,!,
+ @23,\,O,!,|,?6`.7,2:O,3^10:/!OH,{4,5}:/OH,
+ @-1,\,O,!,|,?6`.7,6:O,{3^35,5}:/_,3^-35:/NH2,4:/OH
+-------------------------------------------------------------------------------
+EN:Maitotoxin;MW:3425.86
++
+<55.8,?6,-4=?7 ,{-4,-3,-3,-3}=?6,@-3,\,!3,?6,{-4,-3,-3,-3}=?6,@-3,\,?6,-3=?6,
+ @-3,\,!3,60,<-30,?6,-3=?6,@-3,30,<30,?6,{-3,-3}=?6,-3=?7,{-4,-3,-3}=?6,
+ @-2,\,?6,-3=?6,-3=?7,{-3,-3}=?6,-3=?8,-3=dl,{-5,-3,-3,-3}=?6,
+ {5,7,15,16,23,24,32,40,41,48,49,58,59,72,73,82,83,90,91,99,
+ 100,107,113,114,122,123,130,131,140,141,148,149}:O,
+ {1^60,2,26,28,29,51,54,61,63,68,75^60,78,109}:*/OH,
+ {11,20,35,45,52,55,65,69,86}:/*OH,{47,57,71}:/*H^60,
+ {3,8,13,17,21,33,38,42,56,70,84,92,101,106,111,128,138,142,146,150}:/*H^-60,
+ {4,14,22,34,39,43,81,89,98,102,116,121,125,129,133}:*/H^60,
+ {6,46,50,53,60,67,74}:*/H^-60,
+ {9,18,85,93,112,139,143,147}:*/_`1^60,
+ {80,88,97,115,120,124}:/*_`1^-60,108:*/_`1^-60,
+ @$6,\,|,!11,60~dr,-60,60,OH,2:/*OH,{7,10}:*/OH,{1,3}:*/_,{8~zf,11~dm,12}:/_,
+ @6,\,O,30,SOO,30,"O{Na}",
+ @$36,-45~zf,O,30,SOO,30,"O{Na}",
+ @$150,\,|,!7,{1,2}:/*OH,4:*/_,5:/*_,7=dl
+-------------------------------------------------------------------------------
+EN:Okadaic acid;MW:805.00
++
+<30,?6,@4,?6,@-4,\,!3,<-12,?5,@-3,<-12,?6,-3=?6,@-3,*\,!3,
+ ?6,@-4,?6,@6,\,!,/*Me^-40,*/OH^20,!,//O,!1,OH,
+ 3=wb,11=dl,15=dr,17=wf,19=wf,38=wb,{5,7,16,24,25,33,42}:O,
+ 32:*/H^60,10:/Me,{12,31}:*/_,27://_,37:/*_,28:/OH,{3,29}:/*OH
+-------------------------------------------------------------------------------
diff --git a/graphics/mcf2graph/mcf_exa_soc.mf b/graphics/mcf2graph/mcf_exa_soc.mf
index 428c86c6ed..74676e16c8 100644
--- a/graphics/mcf2graph/mcf_exa_soc.mf
+++ b/graphics/mcf2graph/mcf_exa_soc.mf
@@ -1,8 +1,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2021.03.21
+% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2021.04.04
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %%% it must be version 4.61
-message "* mcf_exa_soc 2021.03.21";
+input mcf2graph.mf; %%% it must be version 4.62
+message "* mcf_exa_soc 2021.04.04";
message "";
%------------------------------------------------------------------------------
fsize:=(35mm,24mm);
@@ -13,7 +13,7 @@ max_blength:=4.5mm;
%%%%sw_aframe:=1;
%%%%sw_mframe:=1;
%%%%sw_expand:=1;
-tag1:="F"; tag2:="C"; tag3:="fm"; tag4:="mw"; tag5:="EN"; tag6:="MW";
+tag1:="J"; tag2:="C"; tag3:="fm"; tag4:="mw"; tag5:="EN"; tag6:="MW";
%%%%tag5:="mi";
%%%%tag6:="w1";
%%%%tag7:="h1";
@@ -29,936 +29,34 @@ tag1:="F"; tag2:="C"; tag3:="fm"; tag4:="mw"; tag5:="EN"; tag6:="MW";
%%%% for i=nA step nA until w: draw(i,0)--(i,h); endfor
%%%% for i=nA step nA until h: draw(0,i)--(w,i); endfor );
%------------------------------------------------------------------------------
-%%%% ext(defaultfont:="uhvr8r"; defaultscale:=.3; label.lrt(mc,(-2bp,1.5bp));)
+%%ext(defaultfont:="uhvr8r"; defaultscale:=.6; label.lrt(inf_EN,(-2bp,1.5bp));)
%******************************************************************************
-beginfont("EN:Adenine","MW:135.13","FM:C5H5N5",
- ": <30,?6,3=?5,{1,3,5,9}=dl,{2,6,9}:N,5:/NH2,7:NH")
+beginfont("f:mcf_data_base","t:EN","v:Adenine") % select EN=Adenine
if check(mc)=0: MC(scantokens(mc)) fi
endfont
%******************************************************************************
-beginfont("EN:Guanine","MW:151.13",
- ": <30,?6,3=?5,{1,3,9}=dl,{2,9}:N,{6,7}:NH,5://O,1:/NH2")
+beginfont("f:mcf_data_base","t:EN","v:Guanine") % select EN=Guanine
if check(mc)=0: MC(scantokens(mc)) fi
endfont
%******************************************************************************
-beginfont("EN:Cytosine","MW:111.10",
- ": <30,?6,{4,6}=dl,4:N,3://O,2:NH,5:/NH2")
+beginfont("f:mcf_data_base","t:EN","v:Cytosine") % select EN=Cytosine
if check(mc)=0: MC(scantokens(mc)) fi
endfont
%******************************************************************************
-beginfont("EN:Thymine","MW:126.11",
- ": <30,?6,3=dl,{2,6}:NH,{1,5}://O,4:/_")
+beginfont("f:mcf_data_base","t:EN","v:Thymine") % select EN=Thymine
if check(mc)=0: MC(scantokens(mc)) fi
endfont
%******************************************************************************
-beginfont("EN:Uracil","MW:112.09",
- ": <30,?6,6=dl,{3,5}://O,{2,4}:NH")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Geraniol","MW:154.25",
- ": <30,!8,OH,{2,6}=dr,{2,6}:/_")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Limonene","MW:136.24",
- ": <30,?6,2=dl,2:/_,@5,*\,/_,!!")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:l-Menthol","MW:156.27",
- ": <30,?6,2:/*?!,5:*/_,3:*/OH")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Vanillin","MW:152.15",
- ": <30,Ph,2:/OH,3:/O!,5:/CHO")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Allicin","MW:162.28",
- ": <-30,!!,!2,SO,!,S,!2,!!")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Stearic acid","MW:284.48",
- ": <30,!17,COOH")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Linoleic acid","MW:280.45",
- ": <30,!5,-30,-30,!,-30,-30,!7,COOH,{6,9}=dr")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Sphingosine","MW:299.50",
- ": <30,!18,OH,14=dr,-3:*/OH,-2:/*NH2")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Tocopherol","MW:430.717",
- ": <30,Ph,3=?6,7:O,{1,2,5}:/_,8:/*_^60,6:/OH,@8,\,|,!12,{4,8}:/*_,12:/_")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Carotene","MW:536.8726",
- ": <30,?6,4=dl,3:??,5:/_, ",
- ": @4,\,|,!18,{1,3,5,7,9,11,13,15,17}=dr,{3,7,12,16}:/_, ",
- ": ?6,-6=dl,-5:/_,-1:?? ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Adrenalin","MW:183.21",
- ": <30,Ph,{1,6}:/OH,@4,\,*/OH,!2,NH,!")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Caffeine","MW:194.194",
- ": <30,?6,3=dl,{1,5}://O,-4=?5,-3=dl,7:N,{2,6,9}:N!")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Nicotine","MW:162.23",
- ": <30,Ph,2:N,@4,\,?5,8:N!")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont;
-%******************************************************************************
-beginfont("EN:Capsaicin","MW:305.418",
- ": <30,Ph,1:/OH,6:/O!,@4,\,!,NH,!,//O,!7,?!,-3=dl")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Thiamine","MW:300.81",
- ": <30,Ph,4:/NH2,@3,\`1,!,<-12,?5,{-1,-4}=dl,{1,5,8}:N,11:S,{6,9}:/_, ",
- ": @-3,\,!2,OH,8:p_^72,@(6.7,1.5),Cl,n_^15 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Gibberellin A3","MW:346.379",
- ": <18,?5,3=?7,5=?6[12],@8,160`1.3,&3,13=dl,6=wf,8=wb, ",
- ": @5,40~zf`1,O,50,//O^180,&14~zb, ",
- ": 2:/COOH,7://_,13:*/OH,8:/*OH,14:*/_,{1,4}:*/H^60 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont;
-%******************************************************************************
-beginfont("EN:Cholesterol","MW:386.664",
- ": <30,?6,{-4,-2}=?6,-4=?5,7=dl, ",
- ": 1:*/OH,{4,12}:*/_^60, ",
- ": 10:/*H^180,{11,-1}:/*H^-60,9:*/H^60,@-1,17,/*_,!4,?! ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Riboflavin","MW:376.37",
- ": <30,Ph,3=?6,9=?6,{8,16}=dl,{7,10,14}:N,12:NH,{11,13}://O,{1,6}:/_, ",
- ": @10,\`1.2,!,*/OH,!,/*OH,!,*/OH,!2,OH ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Resveratrol","MW:228.24",
- ": <30,Ph,@4,\,!!,!,Ph,{2,6,-3}:/OH")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Glutathione","MW:307.33",
- ": <-30,COOH,!,/*NH2,!3,//O,!,NH,!,*/!SH,!,//O,!,NH,!2,COOH")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Hexaphenylbenzene","MW:534.6876",
- ": <30,Ph,{1,2,3,4,5,6}:/Ph")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Kekulene","MW:600.7",
- ": <30,Ph,{3,-2,-3,-2,-3,-2,-3,-2,-3,-2}=?6,(-3,6)=?6[3],@-4,&6, ",
- ": {8,12,14,16,18,22,24,26,28,32,34,36,38,42,44,46,48,52,54,56,58}=dl")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:18-Crown-6","MW:264.32",
- ": <-180,O,60,60,60,O,-60,60,60,O,-60,60,60, ",
- ": O,-60,60,60,O,-60,60,60,O,-60,60,&1 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Porphyrin","MW:310.4",
- ": <9,#1,?5,@3,\,54,?5,@-2,\,54,?5,@-2,\,54,?5,@-2,\,&5,##, ",
- ": {1,4,6,8,10,14,16,18,21,23,27}=dl,{4,17}:N,{11,23}:NH ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Sulflower","MW:448.69",
- ": <67.5,?8,{1,3,5,7}=?5,@11,30`1.15,&12,@14,30`1.15,&15, ",
- ": @17,30`1.15,&18,@20,30`1.15,&9,{9,12,13,16,17,20,21,24}=dl, ",
- ": {10,13,16,19,21,22,23,24}:S ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Arsphenamine x5","MW:915.2",
- ": <18,?5,{1,2,3,4,5}:As,{1,2,3,4,5}:/'(Ph,3:/NH2,4:/OH)")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Melamine","MW:126.12",
- ": <30,Ph,{2,4,6}:N,{1,3,5}:/NH2")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Sudan red 1","MW:248.28",
- ": <30,Ph,1=Ph,4:/OH,@3,\,N,!!,N,!,Ph")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Basic blue 1","MW:319.86",
- ": <30,Ph,3=Ph,6=Ph,2:S,5:N,{8,13}:/N?!,2:p_, ",
- ": @(4.2,1.5),Cl,n_^15 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Disperse violet 1","MW:238.25",
- ": <30,Ph,3=?6,-3=dr,9=Ph,{7,10}://O,{-1,-4}:/NH2")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Vat blue 1","MW:262.27",
- ": <30,Ph,3=?5,@8,\\,?5,-3=dr,-3=Ph,{7,14}:NH,{9,11}://O")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Atrazine","MW:215.7",
- ": <30,Ph,{2,4,6}:N,5:/Cl,1:/NH!2,3:/NH!?!")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:BHC","MW:290.83",
- ": <30,?6`1.2,{1,3,4,6}:*/Cl,{2,5}:/*Cl")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:pp-DDT","MW:354.49",
- ": <30,Ph,6:/Cl,@3,\,/CCl3,!,Ph,-3:/Cl")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Endrin","MW:380.91",
- ": <30,?6`1.3,3=?6,6=dl,9=?3,-1:O, ",
- ": @2,210~wf`1.5,&5~wb,@7,210~zf`1.5,&10~zb, ",
- ": {1,2,5,6,12^-210,12^-150}:/Cl ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Acrinathrin","MW:541.45",
- ": <-30,?3,2^-35:*/_,2^35:/*_, ",
- ": @1,\,!~dl,!,//O,!,O,!,/CF3,!,CF3,@3,\,//O,!,O,!,/CN,!,Ph, ",
- ": @-4,\,O,-60,Ph ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
+sw_file_open:=1; % keep file open
%******************************************************************************
-beginfont("EN:Cafenstrole","MW:350.4",
- ": <30,Ph,{2,4,6}:/_,@3,\,SOO,!,|,?5,{2,5}=dl,{2,4,5}:N,@-2,\,//O,!,N,/!,!2 ")
+beginfont("f:mcf_data_base","t:n","v:5") % v:5 select No.5
if check(mc)=0: MC(scantokens(mc)) fi
endfont
%******************************************************************************
-beginfont("EN:Carfentrazone-ethyl","MW:412.19",
- ": <30,Ph,4:/F,6:/Cl,@1,\,!,/Cl,!,//O,!,O,!2, ",
- ": @3,\,|,?5,4=dl,{1,3,5}:N,-4://O,-3:/CF2,-2:/_ ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Carboxin","MW:235.301",
- ": <30,?6,3=dl,2:S,5:O,4:/_,@3,\,//O,!,NH,!,Ph")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Clomazone","MW:239.7",
- ": <30,Ph,2:/Cl,@3,\,!,|,?5,1:N,2:O,-2^-35:/_,-2^35:/_,-1://O")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Halfenprox","MW:477.4",
- ": <30,Ph,@6,\,O,!,/F^35,/F^-35,!,Br,@3,\,!,??,!,O,!,!,Ph,@-2,\,O,60,Ph")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Paraquat","MW:257.16",
- ": Ph,@4,\,Ph,{1,10}:N!,1:p_^-90,10:p_^90, ",
- ": @(5,1),Cl,n_^15,@(-0.5,1),Cl,n_^15 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Picolinafen","MW:376.331",
- ": <30,Ph,5:/CF3,@3,\,O,!,|,Ph,2:N,@3,\,//O,!,NH,!,|,Ph,4:/F")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Quinoxyfen","MW:308.13",
- ": <30,Ph,4=Ph,10:N,{2,6}:/Cl,@7,\,O,!,|,Ph,4:/F")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Quitozene","MW:295.3",
- ": <30,Ph,{1,2,3,4,6}:/Cl,5:/NO2")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Bitertanol","MW:337.4",
- ": <30,Ph,@3,\,Ph,@-3,\,O,!2,/OH,!,??!,@14,\,|,?5,{2,4}=dl,{1,2,4}:N")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Bifenox","MW:342.14",
- ": <30,Ph,{4,6}:/Cl,@3,\,O,!,Ph,-4:/COO!,-3:/NO2")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Simeconazole","MW:293.417",
- ": <36,?5,{1,3,5}:N,{1,4}=dl, ",
- ": @3,30,!,/OH^30,!2,Si,/_,/_^60,!,@7,-30,Ph,-3:/F ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Fenamidone","MW:311.403",
- ": <18,?5,4=dl,{3,5}:N,2://O,@3,\,NH,!,Ph,4:/S!,1^52:*/_,1^-48~zf:/Ph")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Fenpyroximate","MW:421.49",
- ": <-6,?5,{3,5}=db,{1,2}:N,{2,5}:/Me,@3,\^-15,O,!,Ph, ",
- ": @4,\,!~dr,N,!,O,!2,|,Ph,@4,\,//O,-60,O,!4 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Chlorsulron","MW:380.648",
- ": <30,Ph,6:/NH2,@1,\,SOO,!,NH2,@3,\,SOO,!,NH2,@4,\,/Cl,60~dl,/Cl,!,Cl")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Enrofloxacin","MW:359.401",
- ": <30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,@1,\,|,?6,1:N,4:N,4:/!")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Fenitrothion","MW:277.23",
- ": <-30,!,O,!,P,//S,/O!^160,!,O,!,|,Ph,3:/_,2:/NO2")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Fipronil","MW:437.2",
- ": <30, Ph,{2,4}:/Cl,6:/CF3,@3,\,|,?5,{2,4}=dl,{1,2}:N,3:/CN,5:/NH2, ",
- ": @-2,\,S,//O,!,CF3 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Flumequine","MW:261.225",
- ": <30,Ph,3=?6,(2,7)=?6[4],9=dl,7:N,6:/F,9:/COOH,10://O,13:/_")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Imazalil","MW:297.2",
- ": <-30,!2,O,!2,!~dr,@1,60,|,?5,{2,4}=dl,{1,3}:N,@$2,\,|,Ph,{4,6}:/Cl")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Imidacloprid","MW:255.662",
- ": <30,Ph,1:N,6:/Cl,@3,\,!,|,?5,2=dl,1:N,3:N,2:/'(NH,!,NO2)")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Kresoxim-Methyl","MW:313.348",
- ": <30,Ph,@3,\,/COO!,!~dr,N,!,O,!,@4,\,!,O,!,Ph,-1:/_")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Nalidixic acid","MW:232.239",
- ": <30,Ph,3=?6,9=dl,5:N,6:/_,7://O,8:/COOH,10:N!2")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Oryzalin","MW:346.4",
- ": <30,Ph,{1,3}:/NO2,@5,\,SOO,!,NH2,@2,\,/!2,N,!3")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Oxadiazon","MW:345.2",
- ": <30,Ph,{4,6}:/Cl,1:/O!?!,@3,\,|,?5,2=dl,{1,2}:N,4:O,5://O,3:/??!")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Oxadixyl","MW:278.3",
- ": <30,Ph,{2,4}:/_,@3,\,N,!1,//O,!2,O,!,@7,\,|,?5,1:N,2:O,5://O")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Oxyfluorfen","MW:361.701",
- ": <30,Ph,6:/CF3,4:/Cl,@3,\,O,!,Ph,-3:/NO2,@-4,\,O,!2")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Sulfadimidine","MW:278.33",
- ": <30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,4}:N,{3,5}:/_")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Sulfamerazine","MW:264.303",
- ": <30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,6}:N,3:/_")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Sulfadoxine","MW:310.328",
- ": <30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{4,6}:N,{2,3}:/O!")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Sulfamethoxazole","MW:253.276",
- ": <30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,?5,{2,5}=dl,4:O,5:N,3:/_")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Thiamethoxam","MW:291.71",
- ": <30,?6,4:N,2:O,6:N!,5://'(N,!,NO2),@4,\,!,|,?5,{1,3}=dl,3:N,5:S,4:/Cl")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Thiamphenicol","MW:355",
- ": <30,Ph,@1,\,SOO,!,@4,\,/OH,!,/!OH,!`1.1,NH,!`1.1,//O,!,/Cl,!,Cl")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Pyridaphenthion","MW:340.334",
- ": <30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,|,?6,{1,5}=dl,{2,3}:N,4://O,3:/Ph")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Permethrin","MW:391.288",
- ": <-30,?3,2^-35:*/_,2^35:/*_,1:/'(!!,/Cl,!,Cl), ",
- ": @3,\,//O,!,O,!2,|,Ph,@3,\,O,-60,Ph ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Isoprothiolane","MW:290.392",
- ": <-30,!,?!,O,!,//O,!,//'(?5,2:S,5:S),!,//O,!,O,!,?!")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Oxine-Copper","MW:351.852",
- ": Ph,4:N,5=Ph,@-4,\,O,-60,<90,Cu,-90,O,60,|,Ph,5=Ph,10:N,||, ",
- ": @4,&12~vf,@23,&12~vf ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Tetraconazole","MW:372.145",
- ": <-6,?5,{2,5}=dl, ",
- ": {1,2,4}:N,@4,\,!3,O,!,/F^35,/F^-35,!,CF2,@7,\,|,Ph,{4,6}:/Cl ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Endosulfan","MW:406.904",
- ": <26,?7,7=?6[13],@11,208~wf`1.45,&8~wb,10=dl,{3,5}:O,4:S,4://O, ",
- ": {8,9,10,11,12^-210,12^-150}:/Cl ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont;
-%******************************************************************************
-beginfont("EN:Uniconazole-P","MW:291.779",
- ": <30,Ph,6:/Cl,@3,\,!~dl,!,/OH,!,??!,@8,\,|,?5,{2,4}=dl,{1,2,4}:N")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Oxadiargyl","MW:341.19",
- ": <30,Ph,{1,3}:/Cl,6:/'(O,!2,!!!),@4,\,|,?5,2=dl,{1,2}:N,4:O,5://O,3:/??!")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Oxaziclomefone","MW:376.277",
- ": <30,?6,6=dl,4:N,2:O,1:/_,5://O,6:/Ph,@4,\,??,!,|,Ph,{3,5}:/Cl")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Trimetoprim","MW:290.323",
- ": <30,Ph,{1,5}:N,{2,6}:/NH2,@3,\,!,|,Ph,{3,4,5}:/O!")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Ciprofloxacin","MW:331.347",
- ": <30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,@1,\,|,?6,1:N,4:NH")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Danofloxacin","MW:357.385",
- ": <30,Ph,-4=?6,9=dl,7:N, ",
- ": 6:/F,7:/?3,9:/COOH,10://O, ",
- ": @1,\,|,?6,@2,-200`1.1,&5,{1,4}:N,4:*/_ ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Marbofloxacin","MW:362.361",
- ": <30,Ph,3=?6,9=dl,(2,7)=?6[4],6:/F,7:N,11:O,9:/COOH,10://O,13:N!, ",
- ": @1,\,|,?6,1:N,4:N! ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Ofloxacin","MW:361.373",
- ": <30,Ph,3=?6,(2,7)=?6[4],9=dl,7:N,11:O,6:/F,9:/COOH,10://O,13:/_, ",
- ": @1,\,|,?6,{1,4}:N,4:/_ ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Ormetoprim","MW:274.324",
- ": <30,Ph,{1,5}:N,{2,6}:/NH2,@3,\,!,|,Ph,2:/_,{4,5}:/O!")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Amoxicillin","MW:365.4042",
- ": <45,?4,-3=?5,2:N,7:S, ",
- ": 3^45:/*H,1://O^15,5:/*COOH^-18,6:??, ",
- ": @4,*\^15,NH,!,//O,!,*/NH2,!,Ph,-3:/OH ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Ampicillin","MW:349.405",
- ": <45,?4,-3=?5,2:N,7:S, ",
- ": 3^45:/*H,1://O^15,5:/*COOH^-18,6:??, ",
- ": @4,*\^15,NH,!,//O,!,/*NH2,!,Ph ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Benzyl-Penicillin","MW:334.4",
- ": <45,?4,-3=?5,2:N,7:S, ",
- ": 3^45:/*H,1://O^15,5:/*COOH^-18,6:??, ",
- ": @4,*\^15,NH,!,//O,!,!,Ph ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Mecillinam","MW:325.4264",
- ": <45,?4,-3=?5,2:N,7:S, ",
- ": 3^45:/*H,1://O^15,5:/*COOH^-18,6:??, ",
- ": @4,*\^15,N,!!,!,?7,-7:N ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Nafcillin","MW:414.4748",
- ": <45,?4,-3=?5,2:N,7:S, ",
- ": 3^45:/*H,1://O^15,5:/*COOH^-18,6:??, ",
- ": @4,*\^15,NH,!,//O,!,Ph,-2=Ph,-9:/O!2 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Oxacillin","MW:401.4363",
- ": <45,?4,-3=?5,2:N,7:S, ",
- ": 3^45:/*H,1://O^15,5:/*COOH^-18,6:??, ",
- ": @4,*\^15,NH,!,//O,!,<-24,?5,{-2,-5}=dl,-2:N,-3:O,-4:/_, ",
- ": @-1,\^-24,Ph ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Cloxacillin","MW:435.8813",
- ": <45,?4,-3=?5,2:N,7:S, ",
- ": 3^45:/*H,1://O^15,5:/*COOH^-18,6:??, ",
- ": @4,*\^15,NH,!,//O,!,<-24,?5,{-2,-5}=dl,-2:N,-3:O,-4:/_, ",
- ": @-1,\^-24,Ph,-5:/Cl ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Dicloxacillin","MW:470.3264",
- ": <45,?4,-3=?5,2:N,7:S, ",
- ": 3^45:/*H,1://O^15,5:/*COOH^-18,6:??, ",
- ": @4,*\^15,NH,!,//O,!,<-24,?5,{-2,-5}=dl,-2:N,-3:O,-4:/_, ",
- ": @-1,\^-24,Ph,{-1,-5}:/Cl ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Cefalexin","MW:347.3889",
- ": <45,?4,-3=?6,-4=dl,2:N,8:S, ",
- ": 3^45:/*H,1://O^15,5:/*COOH,6:/_, ",
- ": @4,*\^15,NH,!,//O,!,*/NH2,!,Ph ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Cefalonium","MW:458.5107",
- ": <45,?4,-3=?6,-4=dl,2:N,8:S, ",
- ": 3^45:/*H,1://O^15,@5,\*,//O,!,O,n_^40, ",
- ": @4,*\^15,NH,!,//O,!2,?5,{-1,-3}=dl,-4:S, ",
- ": @6,\,!,|,Ph,1:N,1:p_^180,@4,\,//O,!,NH2 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Cefazorin","MW:454.51",
- ": <45,?4,-3=?6,-4=dl,2:N,8:S, ",
- ": 3^45:/*H,1://O^15,5:/*COOH, ",
- ": @4,*\^15,NH,!,//O,!2,?5,{-2,-4}=dl,{-1,-2,-3,-5}:N, ",
- ": @6,\,!,S,!,?5,{-3,-5}=dl,-1:S,-2:/_,{-3,-4}:N ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Cefquinome","MW:528.6",
- ": <45,?4,-3=?6,-4=dl,2:N,8:S, ",
- ": 3^45:/*H,1://O^15,@5,\*,//O,!,O,n_^40, ",
- ": @4,*\^15,NH,!,//O,!,//'(N,!,O,!),!,?5,{-2,-5}=dl,-3:S,-1:N,-2:/NH2, ",
- ": @6,\,!,Ph,-2=?6,-10:N,-10:p_^180 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Ceftiofur","MW:523.5626",
- ": <45,?4,-3=?6,-4=dl,2:N,8:S, ",
- ": 3^45:/*H,1://O^15,5:/*COOH, ",
- ": @4,*\^15,NH,!,//O,!,//'(N,!,O,!),!,?5,{-2,-5}=dl,-3:S,-1:N,-2:/NH2, ",
- ": @6,\,!,S,!,//O,!,?5,{-1,-3}=dl,-4:O ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Cefuroxime","MW:424.3852")
- MC(<45,?4,-3=?6,-4=dl,2:N,8:S,
- 3^45:/*H,1://O^15,5:/*COOH,
- @4,*\^15,NH,!,//O,!,//'(N,!,O,!),!,?5,{-1,-3}=dl,-4:O,
- @6,\,!,O,!,//O,!,NH2)
-endfont
-%******************************************************************************
-beginfont("EN:Apramycin","MW:539.58")
- MC(<30,?6,-4=?6,{2,10}:O,
- @1,\*,O,60~zb,?6,
- @9,\*,O,-60~zb,?6,-5:O,
- {7,13,-2}:*/OH,{14,-1}:/*OH,{15,17}:*/NH2,{6,-3}:/*NH2,8:*/NH!>vt,
- -4:*/!OH,3:/*H^-60`.75,4:*/H^60`.75)
-endfont
-%******************************************************************************
-beginfont("EN:Gentamycin","MW:477.596")
- MC(<-30,?6,
- @1,\*,O,0~zb,?6,-5:O,@5,\*,O,0~zb,?6,-5:O,
- {2,4}:*/NH2,20:/*NH2,6:*/OH,
- 11:*/OH^-35,11:/*_^35,12:*/NH!,13:/*OH,17:/'(*/_,!NH!))
-endfont
-%******************************************************************************
-beginfont("EN:Kanamycin","MW:484.499")
- MC(<-30,?6,
- @1,\*,O,0~zb,?6,-5:O,
- @5,\,O,0,?6,-5:O,
- {2,4,12}:*/NH2,{6,19}:*/OH,{11,13,18,20}:/*OH,10:*/!OH,17:*/!NH2)
-endfont
-%******************************************************************************
-beginfont("EN:DihydroStreptmycin","MW:583.574")
- MC(<54,?5,3:O,4:/*_,5:/!OH^-48,5:/*OH^35,
- @1,\*,O,-24~wb,?6,-5:O,
- @2,*\,O,24~zb,?6,
- {10,15}:*/OH,{11,16,18}:/*OH,9:/*!OH,12:*/NH!,
- @17,*\^-18,NH,!,//NH,!,NH2,
- @19,*\,NH,!,//NH,!,NH2)
-endfont
-%******************************************************************************
-beginfont("EN:Fradiomycin","MW:614.644")
- MC(<30,?6,3:O,2:/*!NH2,1:*/OH,6:/*OH,5:*/NH2,
- @4,*\,O,!~wb,?6,{-3,-5^15}:/*NH2,-2:*/OH^-15,
- @-1,\*,O,-72~wb,?5,-4:O,-1:/*OH>vt,-3:*/!OH>vt,
- @-2,\*^-24,O,-60~zb,?6,-5:O,-1:/*NH2,-2:*/OH,-3:/*OH,-4:/*!NH2>60)
-endfont
-%******************************************************************************
-beginfont("EN:Streptmycin","MW:581.574")
- MC(<54,?5,3:O,4:/*_,5:/OH^35,
- @1,\*,O,-24~wb,?6,-5:O,
- @2,*\,O,24~zb,?6,
- @5,\^-48,!!,O,{10,15}:*/OH,{11,16,18}:/*OH,9:/*!OH,12:*/NH!,
- @17,*\^-18,NH,!,//NH,!,NH2,
- @19,*\,NH,!,//NH,!,NH2)
-endfont
-%******************************************************************************
-beginfont("EN:Neospiramycin","MW:698.9")
- MC(<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
- {12,14}=dl,2:O,1:/*_,5:/*OH,3://O,10:/*_,6:/*O!>vt,
- @-6,\*,O,!~wb,?6`.7,-5:O,-3:/*N?!,-4:*/_,
- @7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!,-1:/*OH,-4:*/_,-3:/*OH,
- @8,\*,!,!!,O)
-endfont
-%******************************************************************************
-beginfont("EN:Emamectine","MW:886.133")
- MC(<24,?6,6=?5,3=dl,9:O,2:*/OH,3:/_,6:/*OH^-60,
- @5,#1.04,6,//O,-60,O,60~wb,60,-60,60~wf,60,-60,60,60,60,-60,60,##,&7,
- {-1,-3,-7}=dl,(-11,-10)=?6[4],@-2,?6,-6=wf,-1=zb,-5=dl,
- {-1,-6}:O,-3:*/_,@-2,\,*/_,!2,
- 17:/_,19:/*_,@18,\,O,!,?6`.8,-1:O,-2:*/_,-4:*/O!,
- @-3,\,O,60,?6`.8,-5:O,-4:*/_,-3:/*NH!,-2:*/O!)
-endfont
-%******************************************************************************
-beginfont("EN:Spinosad","MW:731.968",
- ": <30,#1,<-120,60,60,-60,60,60,60,-60,60,60,60,-60,&1,##, ",
- ": 5=?5,-1=dl,{-2^60,-3^-35}:/*H,-3=?6,-4=dl, ",
- ": {-1^35}:*/H,{-2^-60}:/*H,-2=?5, ",
- ": 2:O,{3^25,7^-25}://O,1:/!, ",
- ": @-2,\~zf,O,66,?6`.8,-1:O,-2:/_,{-3,-4,-5}:/O!, ",
- ": 8~wf:/Me,5^-65~wf:/H, ",
- ": @9,\~zf,O,!,|,?6`.8,2:O,3:/_,-3:/N?! ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Spiramycin","MW:843.1",
- ": <-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##, ",
- ": {12,14}=dl,2:O,{1,10^-30}:/*_,5:/*OH,3://O,6:/*O!>vt, ",
- ": @-6,\*^-30,O,!~wb,?6`.7,-5:O,-3:/*N?!,-4:*/_, ",
- ": @7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!,-1:/*OH,-4:*/_, ",
- ": @-3,\*`1,O,60~wb`1.5,?6`.7,-5:O,{-2^35,-3}:*/OH,{-2^-35,-4}:/*_, ",
- ": @8,\*,!,!!,O ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Natamycin","MW:665.733",
- ": <-90,#1,60,60,-60,60,-60,60,-60,60,-60,60,60,60,O,-60, ",
- ": 60,60,-60,60,-60,60,-60,60,60,-60,&1,(12,13)=?6[4],##, ",
- ": {2,4,6,8,20}=dl,11=zb,23:O,-2:/*OH,-3:*/COOH, ",
- ": 18=?3,-1=wb,-2=wf,-1:O,22://O,24:*/_,{14^60,16}:*/OH, ",
- ": @10,*\,O,90,?6`.8,-3:*/OH,-5:/*OH,-4:/*NH2,-1:O,-2:/*_ ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Tylocin","MW:916.10",
- ": <-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##, ",
- ": {12,14}=dl,2:O,1:/*!,5:/*OH,3://O,10:/*_,6:/*_,-6://O,-3:/_, ",
- ": @-1,*\,-60,O,0~wb,?6`.7,-5:O,-3:/*OH,-4:*/_,{-1,-2}:/*O!, ",
- ": @7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!,-1:/*OH,-4:*/_, ",
- ": @-3,\*`1,O,60~wb`1.5,?6`.7,-5:O,{-2^35,-3}:*/OH,{-2^-35,-4}:/*_, ",
- ": @8,\*,!,!!,O ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Tilmicosin","MW:869.133",
- ": <-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##, ",
- ": {12,14}=dl,2:O,1:/*!,5:/*OH,{3,11}://O,{6,10}:/*_,14:/_, ",
- ": @-1,*\,-60,O,0~zb,?6`.7,-5:O,{-1,-2}:*/O!,-3:*/OH,-4:/*_, ",
- ": @7,\*,O,0,?6`.7,-5:O,-2:*/N?!,{-1,-3}:/*OH,-4:*/_, ",
- ": @8,\*,!2,?6`.7,-6:N,{-2,-4}:*/_ ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Chlortetracyclin","MW:478.88",
- ": <30,Ph,{-4,-3,-3}=?6,{16,19}=dl,{10,18}://O,7:*/_^-35,2:/Cl, ",
- ": {5,7~zf^35,13~wf^60,14,16}:/OH,15:*/N?!,17:/CONH2 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Oxytetracyclin","MW:460.434",
- ": <30,Ph,{-4,-3,-3}=?6,{16,19}=dl,{10,18}://O,7:*/_^-35,11:*/OH, ",
- ": {5,7~zf^35,13~wf^60,14,16}:/OH,15:*/N?!,17:/CONH2 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Tetracyclin","MW:444.435",
- ": <30,Ph,{-4,-3,-3}=?6,{16,19}=dl,{10,18}://O,7:*/_^-35, ",
- ": {5,7~zf^35,13~wf^60,14,16}:/OH,15:*/N?!,17:/CONH2 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Doxycyclin","MW:444.43",
- ": <30,Ph,{-4,-3,-3}=?6,{16,19}=dl,{10,18}://O,7:*/_, ",
- ": {5,13~wf^60,11~wf,14,16}:/OH,15:*/N?!,@17,\,//O,!,NH2 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Tiamulin","MW:493.74",
- ": <-45.5,?8,-3=?5,@8,#.8,-210~zf,/_^60,45,56,##,&6~zb, ",
- ": {3^-45,5,8}:*/_,@3,\*^30,!~dl,4:/*OH,11://O,7:*/H^60, ",
- ": @1,\^15,O,!,//O,!2,S,60,60,-60,N!2,60,-60 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Rifampicin","MW:822.94",
- ": <30,Ph,6:/_^30,5:/OH,|,-6=?5,1:O,3://O,2:/*_^60, ",
- ": |,-8=?6,{2,4}=dl,{1,4}:/OH, ",
- ": #1,@-2,\,NH,60,//O,-60,/_,60~dl,60,60~dl,-60, ",
- ": */_,60,/*OH,-60,/*_,60,/*OH,60,*/_^30,-60, ",
- ": 60,/*_^30,-53,66,-53~dl,66`1.2,O,##,&($8), ",
- ": -4:/*O!,@-6,-30,O,!,//O,!,@$11,\,!!,N,!,|,?6,1:N,4:N! ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Trenbolone","MW:270.37",
- ": <30,?6,{3,10}=?6,13=?5,{2,11,15}=dl, ",
- ": 1://O,12:*/_^60,-1:/*OH,9:*/H^60,11:/*H^-60 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Luciferin","MW:280.33",
- ": <30,Ph,3=?5,@8,\,?5,{9,16}=dl,{9,14}:N,{7,11}:S,1:/OH,-2:*/COOH")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Chlorophyll a","MW:893.509",
- ": <-36,#1,?5,@3,\,54,?5,@-2,\,54,?5,@-2,\,54,?5,@-2,\,&5,@6,22,70,&8,##, ",
- ": {4,6,8,10,14,16,18,21,23,27}=dl,@4,\`1.48~vf,Mg,&17~vb,@11,&27,@27,&23, ",
- ": {4,11,17,23}:N,{1~zf,9,15,21}:/_,14:/!,20:/!!,25:/*COO!,26://O, ",
- ": @2,*\^-6,!2,//O,!,O,!2,!!,|,!13,{1,5,9,13}:/_ ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Quercetin","MW:302.24",
- ": <30,Ph,3=?6,@9,\,Ph,9=dl,10:O,7://O,{2,6,8,13,14}:/OH")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Limonin","MW:470.518",
- ": <30,?6,{-3,-4}=?6,-5=?3,-2=wf,-1=wb,6=?5,-4=?6,-5=wf, ",
- ": {13,15,17,20}:O,{3,12,21}://O, ",
- ": {4~wf^60,8~zf^60}:/_,18:??,{1^60,5^180,16^60}:/*H, ",
- ": @14,\*,|,?5,{1,4}=dl,3:O ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Cromolyn","MW:468.37",
- ": <30,Ph,|,-1=?6,3=dl,1:O,4://O,2:/COOH, ",
- ": @$2,\,O,!2,/OH,!2,O,60,Ph,|,-5=?6,3=dl,4:O,1://O,3:/COOH ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Emetine","MW:480.649",
- ": <30,Ph,{-4,-4}=?6,8:N,{1,6}:/O!,-2:/*!,{7^-60,12^-60}:/*H, ",
- ": @-3,\,!~zb,<-60,|,?6,5=dl,2:NH,-6^-60:*/H,|,-2=?6,{2,4}=dl,{-2,-3}:/O! ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Acronycine","MW:321.376",
- ": <30,Ph,|,-4=?6,1:N!,4://O,-3=Ph2,-1:/O!,|,-4=?6,2=dl,4:O,3:??")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Piperine","MW:285.343",
- ": <30,Ph,|,-1=?5,{1,3}:O,@$4,\,!!,!,!!,!,//O,!,|,?6,1:N")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Febrifugine","MW:301.346",
- ": <30,Ph,|,-4=?6,2=dl,{1,3}:N,4://O,@$9,\,!,//O,!,!~zf,|,?6,2:NH,-1:*/OH")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Mitomycine C","MW:334.332",
- ": <30,?6,{3,6}=dl,{2,5}://O,1:/_,-4=?5,-3:N, ",
- ": 6:/NH2,,-3=?5,-2=?3,-1=wb,-2=wf,-1:NH, ",
- ": 8:/*O!^35,@$9,\,!,O,60,//O,!,NH2 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Podophyllotoxin","MW:414.41",
- ": <0,?5,{2,5}:O,-3=Ph2,-3=?6,-3=?5,-2:O,-1=wb,-3://O, ",
- ": @10,\*,Ph,{-2,-3,-4}:/O!,13:/*OH,{11~wf^-60,12~zf^60}:/H ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont;
-%******************************************************************************
-beginfont("EN:Warfarin","MW:308.333",
- ": <30,Ph,3=?6,8=dl,10:O,7:/OH,9://O,@8,\,/Ph`1,60,!,//O,!")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont;
-%******************************************************************************
-beginfont("EN:Genistein","MW:270.24",
- ": <30,Ph,3=?6,9=dl,10:O,{2,6}:/OH,7://O,@8,\,Ph,-3:/OH")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont;
-%******************************************************************************
-beginfont("EN:Baicalein","MW:270.24",
- ": <30,Ph,3=?6,9=dl,10:O,{1,2,6}:/OH,7://O,@8,\,Ph")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont;
-%******************************************************************************
-beginfont("EN:Reserpine","MW:608.688",
- ": <54,Ph,-4=?5,-2=?6,-4=?6,-3=?6,9=dl,11:N,7:NH,10:*/H^-60, ",
- ": {15^-60,16^60}:/*H, ",
- ": @20,*\,O,!,//O,!,Ph,{-2,-3,-4}:/O!,{1,19~zf>rl}:/O!,18:*/COO!>lr ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont;
-%******************************************************************************
-beginfont("EN:Rotenone","MW:394.423",
- ": <-60,?5,{-3,-2,-3,-4}=?6,{7,9,-2,-4}=dl,{3,17}=dr, ",
- ": {2,13,16}:O,10://O,{11^-60,12^60}:*/H,{-2,-3}:/O!,@1,*\,/_,!! ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont;
-%******************************************************************************
-beginfont("EN:Pyrethrin I","MW:328.452",
- ": <30,?3,{3^35~wf,3^-35~zf}:/_,@1,*\,!!,?!, ",
- ": @2,\*,//O,!,O,-36~zb,|,?5,-2=dl,-1:/_,-3://O,@-2,\,!4,{-1,-3}=dl ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont;
-%******************************************************************************
-beginfont("EN:Oseltamivir","MW:312.40",
- ": <30,?6,3=dl,6:*/NH2,@1,\*,NH,!,//O,!,@2,*\,O,!,/!,!2,@4,\,//O,!,O,!2")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Paclitaxel","MW:853.918",
- ": ?6,5=dl,@3,#1,36,45,45,45,45,##,&5,-4=?6,-4=?4,-1=wb,-3=wf,-1:O, ",
- ": 4:??,6:/_,{3^-60,15}:*/OH,8:/*H^-60,9:*/_^60,10://O, ",
- ": @1,\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph, ",
- ": @7,\*,O,-45,//O,60,Ph,11:*/OCO!>rl,12:/*OCO!^-15>lr ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Mevastatin","MW:390.52",
- ": <30,?6,2=dl,4:*/H^60,-4=?6,-4=dl,9:*/_, ",
- ": @10,*\,!,60~wb,?6,6:O,-2://O,-4:/*OH,@5,\*,O,60,//O,!,*/_,!2 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Sesamine","MW:354.35",
- ": <54,?5,1=?5,{4,7}:O,{1^-54,2^54}:*/H,{5,8}:*/'(Ph,4=?5,7:O,9:O)^-12")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Morphine","MW:285.343",
- ": <30,Ph,2=?6,-4=?6,(1,12)=?5[2],-1:O,-1=zb, ",
- ": @7,60~wf`0.75,70~si_`1.3,45,N!,&9~wb, ",
- ": 15=dl,6:/OH,8^180:*/H,12:/*OH ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Quinine","MW:324.424",
- ": <30,Ph,3=Ph,7:N,6:/O!, ",
- ": @10,\,*/OH,/H~zf^-60,!,|,?6,2:N,1:*/H^60,@4,*\,!!,@2,165~zf,60,&5~zb ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Atoropin","MW:289.375",
- ": <30,O,!,//O,!,!,Ph, ",
- ": @$1,\~zb^-60,|,?7`1.1,@6,*\^190`1.25,N!,&3~wb,$3:/!OH~wv ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Colchicine","MW:399.443",
- ": <30,Ph,{1,2,6}:/O!,-4=?7,-5=?7,{-1,-4,-6}=dl,-2://O,-3:/O!,9:/NHCO!")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Lycorine","MW:287.315",
- ": <30,Ph,-4=?6,-2=?6,6=?5,(9,12)=?5[3],13=dl,8:N,{15,17}:O, ",
- ": 9:/*H^180,10:*/H^60,13:*/OH,14:/*OH ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Ibotenic acid","MW:158.113",
- ": <18,?5,4=dl,3:O,2:NH,1://O,@4,-24,/NH2,!,COOH")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:illudin S","MW:264.3",
- ": <30,?6,3=?5,6:**?3,{4,7}=dl,2://O,5:/_, ",
- ": {1^35,8^35}:*/_,1:/*OH^-35,9:*/OH,8:/*!OH^-35 ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Muscarine","MW:174.26",
- ": <18,?5,2:O,1:*/_,5:/*OH,@3,*\,48,N,??,p_^180,!")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Psilocybin","MW:284.248",
- ": <30,Ph,3=?5,8=dl,9:NH,@2,\,O,-60,P,//O^-45,/OH^45,90,OH,@7,\,!,-60,N?!")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Tetrodotoxine","MW:319.27",
- ": #1,<60,-90,60,-30`1.15,150,60,&1,@3,-135,60,-30`1.15,150,&4, ",
- ": @10,\,O,60`1.33,60,&($3)~si_,@8,-15~si_,O,&12,##, ",
- ": @9,45,-60,OH,1^120://NH, ",
- ": {5~zf^-15,7,9^-75,12,13~zf}:/OH,{2,6^180}:NH ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
-%******************************************************************************
-beginfont("EN:Aflatoxin B1","MW:312.27",
- ": <30,Ph,6=?6,-2=?5,4=?5,-2=?5,{-2,10}=dl,{7,14,17}:O, ",
- ": 2:/O!,{8,11}://O,{15^-54,16^54}:*/H ")
- if check(mc)=0: MC(scantokens(mc)) fi
-endfont
+for i=6 upto 155: % No.6 - No.155
+ beginfont("f:mcf_data_base","t:n","v:0") % v:0 no selection
+ if check(mc)=0: MC(scantokens(mc)) fi
+ endfont
+endfor
%******************************************************************************
bye
diff --git a/graphics/mcf2graph/mcf_example.pdf b/graphics/mcf2graph/mcf_example.pdf
index a0c768a271..9ea4f8d046 100644
--- a/graphics/mcf2graph/mcf_example.pdf
+++ b/graphics/mcf2graph/mcf_example.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_example.tex b/graphics/mcf2graph/mcf_example.tex
index bd8347527a..5d1dfa40e2 100644
--- a/graphics/mcf2graph/mcf_example.tex
+++ b/graphics/mcf2graph/mcf_example.tex
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2021.03.21
+% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2021.04.04
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage{graphicx}
@@ -8,14 +8,7 @@
\edef\jobname{mcf_exa_soc}%
\usepackage{mcf_setup}
%--------------------------------
-%%%%\pdfpkresolution=1200
-%--------------------------------
-\edef\f@ext{pk}% **** for proof print (fast)
-%%%%\edef\f@ext{mps}% **** for final print (it takes long time)
-%--------------------------------
-%%%%\edef\fext{png}%
-%%%%\edef\fext{svg}%
-%%%%\edef\fext{eps}%
+\edef\f@ext{mps}%
%--------------------------------
\pagestyle{empty}
\topmargin=-24mm
@@ -43,8 +36,8 @@
Author : Akira Yamaji \quad Date : \today \\
Located at : http://www.ctan.org/pkg/mcf2graph \vspace{3mm} \\
\end{center}
-{\small ** FM:Molecular formula calculated by mcf2graph \quad
- ** MW:Molecular weight calculated by mcf2graph} \vspace{3mm} \\
+{\small ** use molecular data base file 'mcf\_data\_base.mcf'
+ \vspace{3mm} \\
%------------------------------------------------------------------------
\noindent%
\openin\@auxf=\jobname-info.aux%
@@ -62,9 +55,7 @@
\ifx\f@ext\@pk{\font\@font=\jobname\@font\char\f@num}%
\else%
\edef\f@file{\jobname-\z@num\f@num.\f@ext}%
- \setbox\f@box=\hbox{\font\@font=\jobname\@font\char\f@num}%
- \includegraphics[width=\wd\f@box,height=\ht\f@box]{\f@file}%
-%%%% \includegraphics{\f@file}%
+ \includegraphics{\f@file}%
\fi%
}%
}%
diff --git a/graphics/mcf2graph/mcf_man_soc.mf b/graphics/mcf2graph/mcf_man_soc.mf
index 74652a2e7b..871a24aea1 100644
--- a/graphics/mcf2graph/mcf_man_soc.mf
+++ b/graphics/mcf2graph/mcf_man_soc.mf
@@ -1,8 +1,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2021.03.21
+% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2021.04.04
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %% it must be version 4.61
-message "mcf_man_soc 2021.03.21"; message "";
+input mcf2graph.mf; %% it must be version 4.62
+% ** use data base file 'mcf_data_base.mcf'
+message "mcf_man_soc 2021.04.04"; message "";
%------------------------------------------------------------------------
sw_mframe:=0;
sw_expand:=0;
@@ -1249,11 +1250,7 @@ beginfont("EN:?6")
endfont
defaultsize:=save_defaultsize;
%***************************************************************************
-beginfont("EN:Luciferin","MW:280.33",
- %---------------------------------------
- ": <30,Ph,3=?5,@8,\,?5,{9,16}=dl, ",
- ": {9,14}:N,{7,11}:S,1:/OH,-2:*/COOH ")
- %---------------------------------------
+beginfont("f:mcf_data_base","t:EN","v:Luciferin")
fsize:=(50mm,15mm);
if check(mc)=0: MC(scantokens(mc)) fi
endfont
diff --git a/graphics/mcf2graph/mcf_manual.pdf b/graphics/mcf2graph/mcf_manual.pdf
index d6af77d625..536e4cc0f4 100644
--- a/graphics/mcf2graph/mcf_manual.pdf
+++ b/graphics/mcf2graph/mcf_manual.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_manual.tex b/graphics/mcf2graph/mcf_manual.tex
index e41355ff48..6356d34094 100644
--- a/graphics/mcf2graph/mcf_manual.tex
+++ b/graphics/mcf2graph/mcf_manual.tex
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format manual by Akira Yamaji 2021.03.21
+% Molecular Coding Format manual by Akira Yamaji 2021.04.04
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage[pdftex]{graphicx}
@@ -12,8 +12,8 @@
%----------------------------------------------------------------------------
%%%%\pdfpkresolution=1200
%----------------------------------------------------------------------------
-%%%%\edef\fext{pk}% **** for proof print (fast)
-\edef\fext{mps}% **** for final print (it takes long time)
+\edef\fext{pk}% **** for proof print (fast)
+%%%%\edef\fext{mps}% **** for final print (it takes long time)
%----------------------------------------------------------------------------
%%%%\edef\fext{png}%
%%%%\edef\fext{svg}%
@@ -1374,12 +1374,10 @@ endfont
\subsection{Luciferin}
\index{check()}%
\begin{verbatim}
-beginfont("EN:Luciferin","MW:280.33",
- %-------------------------------------
- ": <30,Ph,3=?5,@8,\,?5,{9,16}=dl, ",
- ": {9,14}:N,{7,11}:S,1:/OH,-2:*/COOH ")
- %-------------------------------------
- fsize:=(50mm,20mm);
+(use data base file 'mcf_data_base')
+beginfont("f:mcf_data_base",
+ "t:EN","v:Luciferin")
+ fsize:=(50mm,15mm);
if check(mc)=0: MC(scantokens(mc)) fi
endfont
\end{verbatim}
@@ -1469,33 +1467,31 @@ endfont
%------------------------------------------------------------------------
\onecolumn
\section{Example to use mcf2graph}
-\subsection{Molecular definition file}
+\subsection{Metafont/Metapost souce file}
\index{mcf2graph.mf}%
\index{sw\_aux\_out}%
+\index{sw\_file\_open}%
\index{tag}%
\index{var}%
\begin{verbatim}
%-------------------------------------------------------------------------
-input mcf2graph.mf; % input macro
+input mcf2graph.mf; > input main macro
%-------------------------------------------------------------------------
-sw_aux_out:=1; % aux(information) file output on > Global setting
+sw_aux_out:=1; % aux(information) file output on > global setting
fsize:=(60mm,40mm); % (font width,font height) >
-tag1:="F"; > AUX file table
-tag2:="C"; >
-tag3:="mw"; >
-tag4:="fm"; >
-%%%% sw_rep_out:=1; > Report output
+tag1:="J"; > jobname
+tag2:="C"; > char No
+tag3:="mw"; % calculated molecular weight >
+tag4:="fm"; % calculated molecular formula >
+%%%% sw_rep_out:=1; > report output
%%%% sw_mol_out:=1; > MOL file output
outputformat:="png"; hppp:=vppp:=0.1; > PNG output
outputtemplate:="%j-%3c.png"; >
%-------------------------------------------------------------------------
-beginfont("EN:Ampicillin","MW:349.405", > information
- %---------------------------------------- >
- ": <45,?4,-3=?5,2:N,7:S, ", > mc1
- ": 3^45:/*H,1://O^15,5:/*COOH^-18,6:??, ", > mc2
- ": @4,*\^15,NH,!,//O,!,/*NH2,!,Ph ") > mc3
- %---------------------------------------- >
- if check(mc)=0: MC(scantokens(mc)) fi > mc=mc1&mc2&mc3
+beginfont("EN:Ampicillin","MW:349.405") > information
+ MC(<45,?4,-3=?5,2:N,7:S, > immediately compile
+ 3^45:/*H,1://O^15,5:/*COOH^-18,6:??, >
+ @4,*\^15,NH,!,//O,!,/*NH2,!,Ph) >
endfont > end font
%------------------------------------------------------------------------
beginfont("EN:Cholesterol","MW:386.65", >information
@@ -1507,37 +1503,101 @@ beginfont("EN:Cholesterol","MW:386.65", >information
%---------------------------------------- >
if check(mc)=0: MC(scantokens(mc)) fi > mc=mc1 - mc4
endfont > end font
-%------------------------------------------------------------------------
-beginfont("EN:Limonin", > information
- %----------------------------------------- >
- ": <30,?6,{-3,-4}=?6, ", > mc1
- ": -5=?3,-2=wf,-1=wb,6=?5,-4=?6,-5=wf, ", > mc2
- ": {13,15,17,20}:O,{3,12,21}://O, ", > mc3
- ": {4~wf^60,8~zf^60,18^35,18^-35}:/_, ", > mc4
- ": {1^60,5^180,16^60}:/*H, ", > mc5
- ": @14,\*,|,?5,{1,4}=dl,3:O) ") > mc6
- %----------------------------------------- >
- if check(mc)=0: MC(scantokens(mc)) fi > mc=mc1 - mc6
-endfont > end font
-%------------------------------------------------------------------------
-beginfont("EN:beta-carotene", > information
- %------------------------------------------ >
- ": <30,?6,3=dl,{3,5^35,5^-35}:/_, ", > mc1
- ": @4,\,|,!18,{1,3,5,7,9,11,13,15,17}=dr, ", > mc2
- ": {3,7,12,16}:/_, ", > mc3
- ": |,?6,6=dl,2:??,6:/_) ") > mc4
- %------------------------------------------ >
- if check(mc)=0: MC(scantokens(mc)) fi > mc=mc1 - mc4
-endfont > end font
-%------------------------------------------------------------------------
+%------------------------------------------------------------------------------
+beginfont("f:mcf_data_base","t:EN","v:Adenine") > from mcf_data_base.mcf
+ if check(mc)=0: MC(scantokens(mc)) fi > select EN="Adenine"
+endfont >
+%------------------------------------------------------------------------------
+beginfont("f:mcf_data_base","t:EN","v:Guanine") > from mcf_data_base.mcf
+ if check(mc)=0: MC(scantokens(mc)) fi > select EN="Guanine"
+endfont
+%------------------------------------------------------------------------------
+beginfont("f:mcf_data_base","t:EN","v:Cytosine") > from mcf_data_base.mcf
+ if check(mc)=0: MC(scantokens(mc)) fi > select EN="Cytosine"
+endfont >
+%------------------------------------------------------------------------------
+sw_file_open:=1; > keep file open **default sw_file_open=0
+%------------------------------------------------------------------------------
+beginfont("f:mcf_data_base","t:n","v:4") > from mcf_data_base.mcf
+ if check(mc)=0: MC(scantokens(mc)) fi > v:4 select No.4
+endfont >
+%------------------------------------------------------------------------------
+for i=5 upto 155: > from mcf_data_base.mcf
+ beginfont("f:mcf_data_base","t:n","v:0") > v:0 no selection
+ if check(mc)=0: MC(scantokens(mc)) fi > No.5 - No.155
+ endfont >
+endfor >
+%------------------------------------------------------------------------------
bye
\end{verbatim}
%------------------------------------------------------------------------
\noindent%
\newpage
+\subsection{Molecular data base file}
+\begin{verbatim}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% molecular data base file mcf_data_base.mcf by Akira Yamaji 2021.04.04
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% tag1:var1;tag2:var2;tag3:var3 ....
+% first character of line '%' comment out
+% first character of line '+' begin molecular definition
+% first character of line '-' end molecular definition
+%---------------------------------------------------------------------------
+EN:Cytosine;MW:111.10
++
+<30,?6,{4,6}=dl,4:N,3://O,2:NH,5:/NH2
+----------------------------------------------------------------------------
+EN:Thymine;MW:126.11
++
+<30,?6,3=dl,{2,6}:NH,{1,5}://O,4:/_
+----------------------------------------------------------------------------
+EN:Uracil;MW:112.09
++
+<30,?6,6=dl,{3,5}://O,{2,4}:NH
+----------------------------------------------------------------------------
+EN:Geraniol;MW:154.25
++
+<30,!8,OH,{2,6}=dr,{2,6}:/_
+----------------------------------------------------------------------------
+EN:Limonene;MW:136.24
++
+<30,?6,2=dl,2:/_,@5,*\,/_,!!
+----------------------------------------------------------------------------
+EN:l-Menthol;MW:156.27
++
+<30,?6,2:/*?!,5:*/_,3:*/OH
+----------------------------------------------------------------------------
+EN:Vanillin;MW:152.15
++
+<30,Ph,2:/OH,3:/O!,5:/CHO
++----------------------------------------------------------------------------
+EN:Allicin;MW:162.28
++
+<-30,!!,!2,SO,!,S,!2,!!
+----------------------------------------------------------------------------
+EN:Stearic acid;MW:284.48;
++
+<30,!17,COOH
+----------------------------------------------------------------------------
+EN:Linoleic acid;MW:280.45
++
+<30,!5,-30,-30,!,-30,-30,!7,COOH,{6,9}=dr
+----------------------------------------------------------------------------
+EN:Sphingosine;MW:299.50
++
+<30,!18,OH,14=dr,-3:*/OH,-2:/*NH2
+----------------------------------------------------------------------------
+EN:Tocopherol;MW:430.717
++
+<30,Ph,3=?6,7:O,{1,2,5}:/_,8:/*_^60,6:/OH,@8,\,|,!12,{4,8}:/*_,12:/_
+----------------------------------------------------------------------------
+\end{verbatim}
+%------------------------------------------------------------------------
+\noindent%
+\newpage
\subsection{Information auxfile output}
\paragraph{(Insert option parameter setting)}
-\index{F}%
+\index{J}%
\index{C}%
\index{NO}%
\index{MW}%
@@ -1570,7 +1630,7 @@ beginfont("EN:beta-Carotene") .... endfont
\end{verbatim}
\paragraph{(Setting)}
\begin{verbatim}
-tag1:="F"; tag2:="C"; tag3:="mw"; tag4:="fm"; tag5:="EN";
+tag1:="J"; tag2:="C"; tag3:="mw"; tag4:="fm"; tag5:="EN";
\end{verbatim}
\paragraph{(Output)}
\index{aux\_delimiter}%
@@ -1596,7 +1656,7 @@ F:mcf_exa_soc/C:4/mw:536.8722/fm:C40H56/EN:beta-Carotene
\end{verbatim}
\paragraph{(Tag)}
\begin{verbatim}
-F : filename
+J : jobname
C : char number
NO : serial number
EN : english name
@@ -1820,15 +1880,15 @@ endfont;
%--------------------------------------------------------------------
\begin{document}
\unitlength=1mm%
-\INFO{F:mcf_man_soc,C:141,NO:1,mw:349.40462,fm:C16H19N3O4S,EN:Ampicillin}%
-\INFO{F:mcf_man_soc,C:142,NO:2,mw:386.6532,fm:C27H46O,EN:Cholesterol}%
+\INFO{J:mcf_man_soc,C:141,NO:1,mw:349.40462,fm:C16H19N3O4S,EN:Ampicillin}%
+\INFO{J:mcf_man_soc,C:142,NO:2,mw:386.6532,fm:C27H46O,EN:Cholesterol}%
\end{document}
%--------------------------------------------------------------------
\end{verbatim}%
%############################################################################
%------------------------------------------------------------------------
-\INFO{F:mcf_man_soc,C:141,NO:1,mw:349.40462,fm:C16H19N3O4S,EN:Ampicillin}%
-\INFO{F:mcf_man_soc,C:142,NO:2,mw:386.6532,fm:C27H46O,EN:Cholesterol}%
+\INFO{J:mcf_man_soc,C:141,NO:1,mw:349.40462,fm:C16H19N3O4S,EN:Ampicillin}%
+\INFO{J:mcf_man_soc,C:142,NO:2,mw:386.6532,fm:C27H46O,EN:Cholesterol}%
%------------------------------------------------------------------------
\texttt{\printindex}
%------------------------------------------------------------------------
diff --git a/graphics/mcf2graph/mcf_mplib_exa.pdf b/graphics/mcf2graph/mcf_mplib_exa.pdf
index d0d5f833b6..15f27386b6 100644
--- a/graphics/mcf2graph/mcf_mplib_exa.pdf
+++ b/graphics/mcf2graph/mcf_mplib_exa.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_mplib_exa.tex b/graphics/mcf2graph/mcf_mplib_exa.tex
index 3d31e5f4ed..364d4b12f8 100644
--- a/graphics/mcf2graph/mcf_mplib_exa.tex
+++ b/graphics/mcf2graph/mcf_mplib_exa.tex
@@ -1,7 +1,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2021.03.21
+% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2021.04.04
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% mcf2graph.mf must be version 4.61
+% ** mcf2graph.mf must be version 4.62
+% ** use mcf_data_base.mcf
\documentclass{article}
%------------------------------------------------------------------------------
\usepackage{luamplib}%
@@ -37,6 +38,7 @@
\section{MCF example}
\noindent%
%------------------------------------------------------------------------------------
+ use molecular data base file 'mcf\_exa\_data.mcf'\\
{{\tt FM(C) :} molecular formula calculated by mcf2graph\\
{{\tt MW(C) :} molecular weight calculated by mcf2graph\\
{{\tt MW(D) :} molecular weight from literature data
@@ -44,31 +46,21 @@
\subsection{Chlorophyll a}
\noindent%
\begin{verbatim}
-beginfont("NO:1","EN:Chlorophyll a","MW:893.49",
- %-----------------------------------------------------------------------
- ": <54,#1,?5,{2,5}=dl,4:N,@3,\,54~dl,|,?5,{2,4}=dl,5:N, ",
- ": @-2,\,54~dl,|,?5,2=dl,5:N,@-2,\~dl,54,|,?5,5=dl,5:N,@-2,\~dl,&$5, ",
- ": @-1,24,/*COO!^15,72,//O,&$1,##,||, ",
- ": {2,9,15,20~zf}:/_,8:/!,14:/!!, ",
- ": @4,\`1.45,Mg,&17,@-1,&11~vb,@-1,&23~vb, ",
- ": @21,-6~wf,!2,//O,!,O,!2,!!,|,!13,{1,5,9,13}:/_ ")
- %-----------------------------------------------------------------------
- fsize:=(100mm,50mm);
+beginfont("f:mcf_data_base","t:EN","v:Chlorophyll a")
+ fsize:=(100mm,45mm);
if check(mc)=0: MC(scantokens(mc)) fi
+ ext(
+ defaultscale:=0.8;
+ label.lrt("FM(C): "&cal_FM,(0,h-5mm));
+ label.lrt("MW(C): "&cal_MW,(0,h-9mm));
+ label.lrt("MW(D): "&inf_MW,(0,h-13mm));
+ )
endfont
\end{verbatim}
%------------------------------------------------------------------------------------
\begin{mplibcode}
-beginfont("NO:1","EN:Chlorophyll a","MW:893.49",
- %-----------------------------------------------------------------------
- ": <54,#1,?5,{2,5}=dl,4:N,@3,\,54~dl,|,?5,{2,4}=dl,5:N, ",
- ": @-2,\,54~dl,|,?5,2=dl,5:N,@-2,\~dl,54,|,?5,5=dl,5:N,@-2,\~dl,&$5, ",
- ": @-1,24,/*COO!^15,72,//O,&$1,##,||, ",
- ": {2,9,15,20~zf}:/_,8:/!,14:/!!, ",
- ": @4,\`1.45,Mg,&17,@-1,&11~vb,@-1,&23~vb, ",
- ": @21,-6~wf,!2,//O,!,O,!2,!!,|,!13,{1,5,9,13}:/_ ")
- %-----------------------------------------------------------------------
- fsize:=(100mm,50mm);
+beginfont("f:mcf_data_base","t:EN","v:Chlorophyll a")
+ fsize:=(100mm,45mm);
if check(mc)=0: MC(scantokens(mc)) fi
ext(
defaultscale:=0.8;
@@ -79,28 +71,24 @@ beginfont("NO:1","EN:Chlorophyll a","MW:893.49",
endfont
\end{mplibcode}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\subsection{Gibberellin A3}
+\subsection{Okadaic acid}
\noindent%
\begin{verbatim}
-beginfont("NO:4","EN:Gibberellin A3","MW:346.37",
- %--------------------------------------------------------
- ": <18,?5,3=?7,5=?6[12],@8,160`1.3,&3,13=dl,6=wf,8=wb, ",
- ": @5,40~zf`1,O,60,//O^180,&14~zb, ",
- ": 2:/COOH,7://_,13:*/OH,8:/*OH,14:*/_,{1,4}:*/H^60 ")
- %--------------------------------------------------------
- fsize:=(120mm,30mm);
+beginfont("f:mcf_data_base","t:EN","v:Okadaic acid")
+ fsize:=(150mm,35mm);
if check(mc)=0: MC(scantokens(mc)) fi
+ ext(
+ defaultscale:=0.8;
+ label.lrt("FM(C): "&cal_FM,(0,h-5mm));
+ label.lrt("MW(C): "&cal_MW,(0,h-9mm));
+ label.lrt("MW(D): "&inf_MW,(0,h-13mm));
+ )
endfont;
\end{verbatim}
%----------------------------------------------------------------------------
\begin{mplibcode}
-beginfont("NO:4","EN:Gibberellin A3","MW:346.37",
- %--------------------------------------------------------
- ": <18,?5,3=?7,5=?6[12],@8,160`1.3,&3,13=dl,6=wf,8=wb, ",
- ": @5,40~zf`1,O,60,//O^180,&14~zb, ",
- ": 2:/COOH,7://_,13:*/OH,8:/*OH,14:*/_,{1,4}:*/H^60 ")
- %--------------------------------------------------------
- fsize:=(120mm,30mm);
+beginfont("f:mcf_data_base","t:EN","v:Okadaic acid")
+ fsize:=(150mm,35mm);
if check(mc)=0: MC(scantokens(mc)) fi
ext(
defaultscale:=0.8;
@@ -116,7 +104,7 @@ endfont;
\noindent%
%----------------------------------------------------------------------------
\begin{verbatim}
-beginfont("NO:5","EN:Erythromycin","MW:733.93",
+beginfont("EN:Erythromycin","MW:733.93",
%------------------------------------------------------------------
": <30,#1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,##,&1, ",
": 14:O,13:/*Et,{1,9}://O,{2,10}:*/_,{4,6^-35,8,12^35}:/*_, ",
@@ -124,13 +112,13 @@ beginfont("NO:5","EN:Erythromycin","MW:733.93",
": @$3,\*,O,30,|,?6`.7,2:O,{3,5^35}:/_,4:/OH,5^-35:/O!, ",
": @$5,\*^30`1.7,O,!,|,?6`.7,6:O,5:/_,2:/OH,3:/N?! ")
%------------------------------------------------------------------
- fsize:=(120mm,35mm);
+ fsize:=(120mm,30mm);
if check(mc)=0: MC(scantokens(mc)) fi
endfont;
\end{verbatim}
%----------------------------------------------------------------------------
\begin{mplibcode}
-beginfont("NO:5","EN:Erythromycin","MW:733.93",
+beginfont("EN:Erythromycin","MW:733.93",
%------------------------------------------------------------------
": <30,#1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,##,&1, ",
": 14:O,13:/*Et,{1,9}://O,{2,10}:*/_,{4,6^-35,8,12^35}:/*_, ",
@@ -138,7 +126,7 @@ beginfont("NO:5","EN:Erythromycin","MW:733.93",
": @$3,\*,O,30,|,?6`.7,2:O,{3,5^35}:/_,4:/OH,5^-35:/O!, ",
": @$5,\*^30`1.7,O,!,|,?6`.7,6:O,5:/_,2:/OH,3:/N?! ")
%------------------------------------------------------------------
- fsize:=(120mm,35mm);
+ fsize:=(120mm,30mm);
if check(mc)=0: MC(scantokens(mc)) fi
ext(
defaultscale:=0.8;
@@ -159,7 +147,7 @@ beginfont("EN:Paclitaxel","MW:853.918",
": @1,\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph, ",
": @7,\*,O,-45,//O,60,Ph,11:*/OCO!>rl,12:/*OCO!^-15>lr ")
%---------------------------------------------------------------------
- fsize:=(120mm,35mm);
+ fsize:=(120mm,30mm);
if check(mc)=0: MC(scantokens(mc)) fi
endfont
\end{verbatim}
@@ -172,7 +160,7 @@ beginfont("EN:Paclitaxel","MW:853.918",
": @1,\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph, ",
": @7,\*,O,-45,//O,60,Ph,11:*/OCO!>rl,12:/*OCO!^-15>lr ")
%---------------------------------------------------------------------
- fsize:=(120mm,35mm);
+ fsize:=(120mm,30mm);
if check(mc)=0: MC(scantokens(mc)) fi
ext(
defaultscale:=0.8;
@@ -217,30 +205,24 @@ endfont
\noindent%
%----------------------------------------------------------------------------
\begin{verbatim}
-beginfont("NO:6","EN:Vancomycin","MW:1449.25");
-fsize:=(150mm,50mm);
-MC(<-30,#1,!12,{1,3,12}=zf,7=wf,/H^-60,60,*/OH,60,
+% extract from molecular data base file 'mcf_data_base.mcf'
+EN:Vancomycin;MW:1449.25
++
+<-30,#1,!12,{1,3,12}=zf,7=wf,/H^-60,60,*/OH,60,
Ph,-4:/Cl,@-3,\,O,!,Ph,@-4,\,O,!,Ph,-1^15:/Cl,@-3,\,/*OH,*/H^-60,&1,
@7,&26,@$1,60,//O,60,NH,60,/*H,*/COOH^180,-60,
Ph,{-2,-4}:/OH,@-1,\,Ph,-5:/OH,@-2,&4,##,
{3^40,6,9,12}://O,{2,5,8,11}:NH,{1,4^180}:*/H,{7^-60,10^60,14^60}:/*H,
@10,*\^-60,60,//O,!,NH2,@13,*\,NH,!,//O,!,/??!,*/H^60,!~zf,NH,!,
@23,\,O,!,|,?6`.7,2:O,3^10:/!OH,{4,5}:/OH,
- @-1,\,O,!,|,?6`.7,6:O,{3^35,5}:/_,3^-35:/NH2,4:/OH)
-endfont;
+ @-1,\,O,!,|,?6`.7,6:O,{3^35,5}:/_,3^-35:/NH2,4:/OH
+-------------------------------------------------------------------------------
\end{verbatim}
%----------------------------------------------------------------------------
\begin{mplibcode}
-beginfont("NO:6","EN:Vancomycin","MW:1449.25");
-fsize:=(150mm,45mm);
-MC(<-30,#1,!12,{1,3,12}=zf,7=wf,/H^-60,60,*/OH,60,
- Ph,-4:/Cl,@-3,\,O,!,Ph,@-4,\,O,!,Ph,-1^15:/Cl,@-3,\,/*OH,*/H^-60,&1,
- @7,&26,@$1,60,//O,60,NH,60,/*H,*/COOH^180,-60,
- Ph,{-2,-4}:/OH,@-1,\,Ph,-5:/OH,@-2,&4,##,
- {3^40,6,9,12}://O,{2,5,8,11}:NH,{1,4^180}:*/H,{7^-60,10^60,14^60}:/*H,
- @10,*\^-60,60,//O,!,NH2,@13,*\,NH,!,//O,!,/??!,*/H^60,!~zf,NH,!,
- @23,\,O,!,|,?6`.7,2:O,3^10:/!OH,{4,5}:/OH,
- @-1,\,O,!,|,?6`.7,6:O,{3^35,5}:/_,3^-35:/NH2,4:/OH)
+beginfont("f:mcf_data_base","t:EN","v:Vancomycin")
+fsize:=(150mm,40mm);
+ if check(mc)=0: MC(scantokens(mc)) fi
ext(
defaultscale:=0.8;
label.lrt("FM(C): "&cal_FM,(0,h-4mm));
@@ -254,53 +236,38 @@ endfont;
\noindent%
%--------------------------------------------------------------------------------
\begin{verbatim}
-beginfont("NO:7","EN:Maitotoxin","MW:3425.86")
-fsize:=(170mm,70mm);
-MC(<55.8,?6,-4=?7 ,{-4,-3,-3,-3}=?6,@-3,\,!3,?6,{-4,-3,-3,-3}=?6,@-3,\,?6,-3=?6,
- @-3,\,!3,60,<-30,?6,-3=?6,@-3,30,<30,?6,{-3,-3}=?6,-3=?7,{-4,-3,-3}=?6,
- @-2,\,?6,-3=?6,-3=?7,{-3,-3}=?6,-3=?8,-3=dl,{-5,-3,-3,-3}=?6,
- {5,7,15,16,23,24,32,40,41,48,49,58,59,72,73,82,83,90,91,99,
- 100,107,113,114,122,123,130,131,140,141,148,149}:O,
- {1^60,2,26,28,29,51,54,61,63,68,75^60,78,109}:*/OH,
- {11,20,35,45,52,55,65,69,86}:/*OH,{47,57,71}:/*H^60,
- {3,8,13,17,21,33,38,42,56,70,84,92,101,106,111,128,138,142,146,150}:/*H^-60,
- {4,14,22,34,39,43,81,89,98,102,116,121,125,129,133}:*/H^60,
- {6,46,50,53,60,67,74}:*/H^-60,
- {9,18,85,93,112,139,143,147}:*/_`1^60,
- {80,88,97,115,120,124}:/*_`1^-60,108:*/_`1^-60,
- @6,\,|,!11,60~dr,-60,60,OH,2:/*OH,{7,10}:*/OH,{1,3}:*/_,{8~zf,11~dm,12}:/_,
- @6,\,O,30,SOO,30,"O{Na}",
- @36,-45~zf,O,30,SOO,30,"O{Na}",
- @150,\,|,!7,{1,2}:/*OH,4:*/_,5:/*_,7=dl)
-endfont
+% extract from molecular data base file 'mcf_data_base.mcf'
+EN:Maitotoxin;MW:3425.86
++
+<55.8,?6,-4=?7 ,{-4,-3,-3,-3}=?6,@-3,\,!3,?6,{-4,-3,-3,-3}=?6,@-3,\,?6,-3=?6,
+ @-3,\,!3,60,<-30,?6,-3=?6,@-3,30,<30,?6,{-3,-3}=?6,-3=?7,{-4,-3,-3}=?6,
+ @-2,\,?6,-3=?6,-3=?7,{-3,-3}=?6,-3=?8,-3=dl,{-5,-3,-3,-3}=?6,
+ {5,7,15,16,23,24,32,40,41,48,49,58,59,72,73,82,83,90,91,99,
+ 100,107,113,114,122,123,130,131,140,141,148,149}:O,
+ {1^60,2,26,28,29,51,54,61,63,68,75^60,78,109}:*/OH,
+ {11,20,35,45,52,55,65,69,86}:/*OH,{47,57,71}:/*H^60,
+ {3,8,13,17,21,33,38,42,56,70,84,92,101,106,111,128,138,142,146,150}:/*H^-60,
+ {4,14,22,34,39,43,81,89,98,102,116,121,125,129,133}:*/H^60,
+ {6,46,50,53,60,67,74}:*/H^-60,
+ {9,18,85,93,112,139,143,147}:*/_`1^60,
+ {80,88,97,115,120,124}:/*_`1^-60,108:*/_`1^-60,
+ @$6,\,|,!11,60~dr,-60,60,OH,2:/*OH,{7,10}:*/OH,{1,3}:*/_,{8~zf,11~dm,12}:/_,
+ @6,\,O,30,SOO,30,"O{Na}",
+ @$36,-45~zf,O,30,SOO,30,"O{Na}",
+ @$150,\,|,!7,{1,2}:/*OH,4:*/_,5:/*_,7=dl
+-------------------------------------------------------------------------------
\end{verbatim}
%--------------------------------------------------------------------------------
\begin{mplibcode}
-fsize:=(170mm,60mm);
-beginfont("NO:7","EN:Maitotoxin","MW:3425.86")
-MC(<55.8,?6,-4=?7 ,{-4,-3,-3,-3}=?6,@-3,\,!3,?6,{-4,-3,-3,-3}=?6,@-3,\,?6,-3=?6,
- @-3,\,!3,60,<-30,?6,-3=?6,@-3,30,<30,?6,{-3,-3}=?6,-3=?7,{-4,-3,-3}=?6,
- @-2,\,?6,-3=?6,-3=?7,{-3,-3}=?6,-3=?8,-3=dl,{-5,-3,-3,-3}=?6,
- {5,7,15,16,23,24,32,40,41,48,49,58,59,72,73,82,83,90,91,99,
- 100,107,113,114,122,123,130,131,140,141,148,149}:O,
- {1^60,2,26,28,29,51,54,61,63,68,75^60,78,109}:*/OH,
- {11,20,35,45,52,55,65,69,86}:/*OH,{47,57,71}:/*H^60,
- {3,8,13,17,21,33,38,42,56,70,84,92,101,106,111,128,138,142,146,150}:/*H^-60,
- {4,14,22,34,39,43,81,89,98,102,116,121,125,129,133}:*/H^60,
- {6,46,50,53,60,67,74}:*/H^-60,
- {9,18,85,93,112,139,143,147}:*/_`1^60,
- {80,88,97,115,120,124}:/*_`1^-60,108:*/_`1^-60,
- @$6,\,|,!11,60~dr,-60,60,OH,2:/*OH,{7,10}:*/OH,{1,3}:*/_,{8~zf,11~dm,12}:/_,
- @6,\,O,30,SOO,30,"O{Na}",
- @$36,-45~zf,O,30,SOO,30,"O{Na}",
- @$150,\,|,!7,{1,2}:/*OH,4:*/_,5:/*_,7=dl
- )
- ext(
- defaultscale:=0.8;
- label.lrt("FM(C): "&cal_FM,(0,.8h-5mm));
- label.lrt("MW(C): "&cal_MW,(0,.8h-9mm));
- label.lrt("MW(D): "&inf_MW,(0,.8h-13mm));
- )
+beginfont("f:mcf_data_base","t:EN","v:Maitotoxin")
+ fsize:=(170mm,55mm);
+ if check(mc)=0: MC(scantokens(mc)) fi
+ ext(
+ defaultscale:=0.8;
+ label.lrt("FM(C): "&cal_FM,(0,.8h-5mm));
+ label.lrt("MW(C): "&cal_MW,(0,.8h-9mm));
+ label.lrt("MW(D): "&inf_MW,(0,.8h-13mm));
+ )
endfont
\end{mplibcode}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/graphics/mcf2graph/mcf_setup.sty b/graphics/mcf2graph/mcf_setup.sty
index c308967b89..930a76e1fd 100644
--- a/graphics/mcf2graph/mcf_setup.sty
+++ b/graphics/mcf2graph/mcf_setup.sty
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf_setup.sty for input aux file by Akira Yamaji 2020.08.30
+% mcf_setup.sty for input aux file by Akira Yamaji 2020.04.04
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\edef\@F{F} \edef\File{}% 1
+\edef\@J{J} \edef\Job{}% 1
\edef\@C{C} \edef\Char{}% 2
%------------------------------------
\edef\@NO{NO} \edef\NO{}% 3
@@ -41,7 +41,8 @@
\edef\@tag{\expandafter\@tag@param#1;}%
\edef\@var{\expandafter\@var@param#1;}%
%----------------------------------------
- \ifx\@tag\@F\edef\File{\@var}\fi% 1
+ \ifx\@tag\@J\edef\Job{\@var}\fi% 1
+ %----------------------------------------
\ifx\@tag\@C\edef\Char{\@var}\fi% 2
%----------------------------------------
\ifx\@tag\@NO\edef\NO{\@var}\fi% 3
diff --git a/graphics/pgf/contrib/circuitikz/doc/changelog.tex b/graphics/pgf/contrib/circuitikz/doc/changelog.tex
index 5b4be6d089..88bbe4d435 100644
--- a/graphics/pgf/contrib/circuitikz/doc/changelog.tex
+++ b/graphics/pgf/contrib/circuitikz/doc/changelog.tex
@@ -1,10 +1,32 @@
%DO NOT EDIT THIS AUTOMATICALLY GENERATED FILE, run "make changelog" at toplevel!!!
-The major changes among the different circuitikz versions are listed
+The major changes among the different CircuiTikZ versions are listed
here. See \url{https://github.com/circuitikz/circuitikz/commits} for a
full list of changes.
\begin{itemize}
\item
+ Version 1.3.3 (2021-04-04)
+
+ Several usability additions in this version, and one small fix that
+ could change the look of your circuit (without affecting correctness).
+ Some of the arrow shapes are now configurable.
+
+ \begin{itemize}
+ \tightlist
+ \item
+ Added options to fine-tune the position of labels and annotations
+ \item
+ Added options to change arrow tips on variable resistors, inductors
+ and capacitors as well as in potentiometers
+ \item
+ Added options to change arrow tips on switches
+ \item
+ Added anchors to inductance to add core lines
+ \item
+ Fixed the default direction of tunable arrows (with an option to go
+ back to the old ones)
+ \end{itemize}
+\item
Version 1.3.2 (2021-03-14)
\begin{itemize}
diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
index f26913dd19..8af7545362 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 d0a6ea3ea3..3bf600da2f 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 1f3d694044..c7558aab60 100644
--- a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
+++ b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
@@ -186,10 +186,10 @@ The use of \Circuitikz\ is, of course, not limited to academic teaching. The pac
\subsection{License}
Copyright \copyright{}
-2007--2020 by Massimo Redaelli,
-2013-2020 by Stefan Erhardt,
-2015-2020 by Stefan Lindner,
-and 2018-2020 by Romano Giannetti.
+2007--2021 by Massimo Redaelli,
+2013--2021 by Stefan Erhardt,
+2015--2021 by Stefan Lindner,
+and 2018--2021 by Romano Giannetti.
This package is author-maintained. Permission is granted to copy, distribute and/or modify this software under the terms of the \LaTeX\ Project Public License, version 1.3.1, or the GNU Public License. This software is provided ‘as is’, without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose.
\subsection{Loading the package}
@@ -203,7 +203,7 @@ This package is author-maintained. Permission is granted to copy, distribute and
\end{table}
\footnotetext{\ConTeXt\ support was added mostly thanks to Mojca Miklavec and Aditya Mahajan.}
-\noindent \TikZ\ will be automatically loaded.
+\noindent \TikZ\ will be automatically loaded; additionally, the \TikZ{} libraries \texttt{calc}, \texttt{arrows.meta}, \texttt{bending}, and \texttt{fpu} are loaded (the last one is used only on demand).
\noindent Circui\TikZ\ commands are just \TikZ\ commands, so a minimum usage example would be:
@@ -215,7 +215,7 @@ This package is author-maintained. Permission is granted to copy, distribute and
The stable version of the package should come with your \LaTeX\ distribution. Downloading the files from CTAN and installing them locally is, unfortunately, a distribution-dependent task and sometime not so trivial. If you search for \texttt{local texmf tree} and the name of your distribution on \url{https://tex.stackexchange.com/} you will find a lot of hints.
-Anyway, the easiest way of using whichever version of \Circuitikz\ is to point to the github page \url{https://circuitikz.github.io/circuitikz/} of the project, and download the version you want. You will download a simple (biggish) file, called \texttt{circuitikz.sty}.
+Anyway, the easiest way of using whichever version of \Circuitikz\ is to point to the github page \url{https://circuitikz.github.io/circuitikz/} of the project, and download the version you want. You will download a simple (biggish) file, called \texttt{circuitikzgit.sty}.
Now you can just put this file in your local \texttt{texmf} tree, if you have one, or simply adding it into the same directory where your main file resides, and then use
@@ -223,7 +223,7 @@ Now you can just put this file in your local \texttt{texmf} tree, if you have on
\usepackage[...options...]{circuitikzgit}
\end{verbatim}
-instead of \texttt{circuitikz}. This is also advantageous for ``future resilience''; the authors try hard not to break backward compatibility with new versions, but sometime things happen.
+instead of \texttt{circuitikz}. This is also advantageous for ``future resilience''; the authors try hard not to break backward compatibility with new versions, but sometimes, things happen.
\subsection{Requirements}
\begin{itemize}
@@ -233,12 +233,16 @@ instead of \texttt{circuitikz}. This is also advantageous for ``future resilienc
\end{itemize}
\subsection{Incompatible packages}
-\TikZ's own \texttt{circuit} library, which is based on \Circuitikz, (re?)defines several styles used by this library. In order to have them work together you can use the \texttt{compatibility} package option, which basically prefixes the names of all \Circuitikz\ \texttt{to[]} styles with an asterisk.
+\TikZ's own \texttt{circuit} library, which was based on \Circuitikz, (re?)defines several styles used by this library. In order to have them work together you can use the \texttt{compatibility} package option, which basically prefixes the names of all \Circuitikz\ \texttt{to[]} styles with an asterisk.
So, if loaded with said option, one must write \verb!(0,0) to[*R] (2,0)! and, for transistors on a path, \verb!(0,0) to[*Tnmos] (2,0)!, and so on (but \verb!(0,0) node[nmos] {}!). See example at page~\pageref{ex:compatibility}.
+Anyway, the compatibility code is a \emph{best effort} task and only very lightly tested --- the authors advice is to choose one or the other, without mixing them.
+
Another thing to take into account is that any \TikZ{} figure (and \Circuitikz{} ones qualify) \textbf{will} have problems if you use the \texttt{babel} package with a language that changes active characters (most of them). The solution is normally to add the line \verb|\usetikzlibrary{babel}| in your preamble, after loading \TikZ{} or \Circuitikz. This will normally solve the problem; some language also requires using \verb|\deactivatequoting| or the option \texttt{shorthands=off} for \texttt{babel}. Please check the documentation of \TikZ{} or this question \href{https://tex.stackexchange.com/questions/166772/problem-with-babel-and-tikz-using-draw}{on \TeX{} stackexchange site}.
+Finally, the \TikZ{} library \texttt{bending} is loaded by the package, and its effects (the bending of the arrows on curved paths) will affect also the rest of your drawings.
+
\subsection{Known bugs and limitation}\label{sec:bugs}
\Circuitikz{} will \textbf{not work} correctly with global (in the main \texttt{circuitikz} environment, or in \texttt{scope} environments) \emph{negative} scale parameters (\texttt{scale}, \texttt{xscale} or \texttt{yscale}), unless \texttt{transform shape} is also used, and even in this cases the behavior is not guaranteed.
@@ -277,33 +281,34 @@ The \texttt{use fpu reciprocal} key seems to have no side effects, but given tha
\subsection{Incompabilities between version}\label{sec:incompatible-changes}
-Here, we will provide a list of incompabilitys between different version of circuitikz. We will try to hold this list short, but sometimes it is easier to break with old syntax than including a lot of switches and compatibility layers.
-You can check the used version at your local installation using the macro \verb!\pgfcircversion{}!.
+Here, we will provide a list of incompabilitys between different version of \Circuitikz. We will try to hold this list short, but sometimes it is easier to break with old syntax than including a lot of switches and compatibility layers. In general, changes that would invalidate a circuit (changes of polarity of components and so on) are almost always protected by a flag; the same is not true for purely aesthetic changes.
+If unsure, you can check the version at your local installation using the macro \verb!\pgfcircversion{}!.
\begin{itemize}
+ \item Version 1.3.3 fixes the direction of the arrows in tunable elements; before this version, they were more or less random, now the arrow goes from bottom left to top right. You have the option to go back to the old behavior with \texttt{\textbackslash ctikzset\{bipoles/fix tunable direction=false\}}. As a compensation for the fuss, now the arrows are configurable. To learn more, see the FAQ:~\ref{faq:tunable-arrow}.
\item Version 1.3.1 removes the warning if you do not specify a voltage direction.
- \item After 1.2.7 a big code reorganization (which by the way fixed some bug) has been made; no changes should be visible, but a fallback point at 1.2.7 has been added.
- \item You \textbf{must} upgrade to v1.2.7 or newer if you use a \TikZ{} 3.1.8 or 3.1.8a (but better upgrade both packages to the current version).
- \item After v1.2.1: \textbf{Important:} the routine that implement the \texttt{to[...]} component positioning has been rewritten. That should enhance the line joins in path, and it's safer, but it can potentially change behavior.
+ \item After 1.2.7 a big code reorganization (which had the collateral effect of fixing some bug) has been made; no changes should be visible, but a fallback point at 1.2.7 has been added.
+ \item You \textbf{must} upgrade to v1.2.7 or newer if you use a \TikZ{} 3.1.8 or 3.1.8a (but better upgrade both packages to the current version). You can check the \TikZ{} version installed using the macro \verb|\pgfversion|.
+ \item After v1.2.1: \textbf{Important:} the routine that implements the \texttt{to[...]} component positioning has been rewritten. That should enhance the line joins in paths, and it's safer, but it can potentially change some old behavior.
One of the changes is that the previous routine did the wrong thing if you used \texttt{(node) to[...]} (you should use an anchor or a coordinate, not a node there --- like \texttt{(node.anchor) to[...]}).
The other one was that in the structure \texttt{... to[...] node[pos=\emph{something}] (coord)} the value of \texttt{pos} was completely wrong (even if you don't use \texttt{pos} explicitly, remember it's \texttt{pos=0.5} by default).
- Additionally, the old code disrupted the \TikZ{} path-fill mechanism, so that you could get away with using the \texttt{fill} option on paths and having just the components to be filled, not the path. That was incorrect, although sometime it was handy.
+ Additionally, the old code disrupted the \TikZ{} path-fill mechanism, so that you could get away with using the \texttt{fill} option on paths and having just the components filled, not the path. That was incorrect, although sometime it was handy (sorry).
See the FAQ at section~\ref{faqs:nodes} for more information.
\item After v1.2.0: voltage arrows, symbols and label positions are calculated with a rewritten routine. There should be little change, \emph{unless} you touched internal values\dots
- \item After v1.1.3: during the 1.1.0 --- 1.1.2 version, the inverted Schmitt buffer in IEEE style ports was called \texttt{inv schmitt} (with an additional space). The correct name is \texttt{invschmitt port} (the same as the legacy american port).
- \item After v1.1.2: the position of \texttt{american} voltages for the \texttt{open} bipoles (you can revert to old behavior, see section~\ref{sec:sub-voltage-position}).
+ \item After v1.1.3: from version 1.1.0 to version 1.1.2, the inverted Schmitt buffer in IEEE style ports was called \texttt{inv schmitt} (with an additional space). The correct name is \texttt{invschmitt port} (the same as the legacy american port).
+ \item After v1.1.2: the position of \texttt{american} voltages for the \texttt{open} bipoles changed (you can revert to the old behavior, see section~\ref{sec:sub-voltage-position}).
\item After v0.9.7: the position of the text of transistor nodes has changed; see section~\ref{sec:transistors-labels}.
\item After v0.9.4: added the concept of styling of circuits. It should be backward compatible, but it's a big change, so be ready to use the \texttt{0.9.3} snapshot (see below for details).
- \item After v0.9.0: the parameters \texttt{tripoles/american or port/aaa}, \texttt{...bbb}, \texttt{...ccc} and \texttt{...ddd} are no longer used and are silently ignored; the same stands for \texttt{nor}, \texttt{xor}, and \texttt{xnor} ports.
- \item After v0.9.0: voltage and current directions/sign (plus and minus signs in case of \texttt{american voltages} and arrows in case of \texttt{european voltages} have been rationalized with a couple of new options (see details in section~\ref{curr-and-volt}. The default case is still the same as v0.8.3.
+ \item After v0.9.0: the parameters \texttt{tripoles/american or port/aaa}, \texttt{...bbb}, \texttt{...ccc} and \texttt{...ddd} are no longer used and are silently ignored; the same stands for the similarly named parameters in \texttt{nor}, \texttt{xor}, and \texttt{xnor} ports.
+ \item After v0.9.0: voltage and current directions/signs (plus and minus signs in case of \texttt{american voltages} and arrows in case of \texttt{european voltages}) have been rationalized with a couple of new options (see details in section~\ref{curr-and-volt}). The default case is still the same as v0.8.3, to avoid potentially wrong circuits, but you would be better off with one of the new voltage directions (\texttt{EFvoltages} or \texttt{RPvoltages}) for newer circuits.
\item Since v0.8.2: voltage and current label directions (\texttt{v<=} / \texttt{i<=}) do NOT change the orientation of the drawn source shape anymore. Use the \texttt{invert} option to rotate the shape of the source. Furthermore, from this version on, the current label (\texttt{i=}) at current sources can be used independent of the regular label (\texttt{l=}).
- \item Since v0.7?: The label behaviour at mirrored bipoles has changes, this fixes the voltage drawing, but perhaps you have to adjust your label positions.
- \item Since v0.5.1: The parts pfet, pigfete, pigfetebulk and pigfetd are now mirrored by default. Please adjust your yscale-option to correct this.
- \item Since v0.5: New voltage counting direction, there exists an option to use the old behaviour.
+ \item Since v0.7: The label behavior at mirrored bipoles has changed, this fixes the voltage drawing, but perhaps you have to adjust your label positions.
+ \item Since v0.5.1: The parts \texttt{pfet}, \texttt{pigfete}, \texttt{pigfetebulk}, and \texttt{pigfetd} are now mirrored by default. Please adjust your yscale-option to correct this.
+ \item Since v0.5: New voltage counting direction, there exists an option to use the old behavior.
\end{itemize}
If you have older projects that show compatibility problems, you have two options:
@@ -332,7 +337,7 @@ Circuit people are very opinionated about their symbols. In order to meet the in
There are arguably way too much options in \Circuitikz, as you can see in the following list. Since version \texttt{1.0}, it is recommended to just use the basic ones --- voltage directions (you \textbf{should} specify one of them), \texttt{siunitx}, the global style (\texttt{american} or \texttt{european}) and use styles (see~\ref{sec:styling}) for the remaining options.
-The standard options are what the authors like, for example you get this:
+The standard options are set by historical reason, and reflect the preferences of the author that introduced them. For example you get this:
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
@@ -352,8 +357,6 @@ Feel free to load the package with your own cultural options:
\end{tabular}
\end{center}
-\textbf{However}, most of the global package options are not available in \ConTeXt; in that case you can always use the appropriate \verb|\tikzset{}| or \verb|\ctikzset{}| command after loading the package.
-
\begin{LTXexample}[varwidth=true,linerange={1-1,3-6}]
\begin{circuitikz}
[circuitikz/voltage=american, circuitikz/resistor=american] % line not printed
@@ -363,6 +366,8 @@ Feel free to load the package with your own cultural options:
\end{circuitikz}
\end{LTXexample}
+\textbf{However}, most of the global package options are not available in \ConTeXt; in that case you can always use the appropriate \verb|\tikzset{}| or \verb|\ctikzset{}| command after loading the package.
+
\medskip{}
\noindent Here is the list of all the options:
@@ -462,7 +467,7 @@ Let's start with the first type of component, and build a basic mesh:
\end{circuitikz}
\end{LTXexample}
-The symbol for the current source can surprise somebody; this is actually the european-style symbol, and the type of symbol chosen reflects the default options of the package (see section~\ref{sec:package-options}). Let's change the style for now (the author of the tutorial, Romano, is European - but he has always used American-style circuits, so \dots); and while we're at it, let's add the other branch and some labels.
+The symbol for the current source can surprise somebody; this is actually the european-style symbol, and the type of symbol chosen reflects the default options of the package (see section~\ref{sec:package-options}). Let's change the style for now (the author of the tutorial, Romano, is European --- but he has always used American-style circuits, so\dots); and while we're at it, let's add the other branch and some labels.
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}[american]
@@ -473,7 +478,7 @@ The symbol for the current source can surprise somebody; this is actually the eu
\end{circuitikz}
\end{LTXexample}
-You can use a single path or multiple path when drawing your circuit, it's just a question of style (but be aware that closing path could be non-trivial, see section~\ref{sec:line-joins}), and you can use standard \TikZ\ lines (\verb|--|, \verb+|-+ or similar) for the wires. Nonetheless, sometime using the \Circuitikz\ specific \texttt{short} component for the wires can be useful, because then we can add labels and nodes at it, like for example in the following circuit, where we add a current (with the key \texttt{i=...}, see section~\ref{sec:currents}) and a connection dot (with the special shortcut \texttt{-*} which adds a \texttt{circ} node at the end of the connection, see sections~\ref{sec:terminals} and~\ref{sec:bipole-nodes}).
+You can use a single path or multiple paths when drawing your circuit, it's just a question of style (but be aware that closing paths perfectly could be non-trivial, see section~\ref{sec:line-joins}), and you can use standard \TikZ\ lines (\verb|--|, \verb+|-+ or similar) for the wires. Nonetheless, sometime using the \Circuitikz{} specific \texttt{short} component for the wires can be useful, because then we can add labels and poles at them, like for example in the following circuit, where we add a current (with the key \texttt{i=...}, see section~\ref{sec:currents}) and a connection dot (with the special shortcut \texttt{-*} which adds a \texttt{circ} node at the end of the connection, see sections~\ref{sec:terminals} and~\ref{sec:bipole-nodes}).
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}[american]
@@ -486,7 +491,7 @@ You can use a single path or multiple path when drawing your circuit, it's just
\end{circuitikz}
\end{LTXexample}
-One of the problems with this circuit is that we would like to have the current in a different position, such as for example on the upper side of the resistors, so that Kirchoff's Current Law at the node is better shown to students. No problem; as you can see in section~\ref{curr-and-volt} you can use the position specifier \verb|<>^_| after the key \texttt{i}:
+One of the problems with this circuit is that we would like to have the current labels in a different position, such as for example on the upper side of the resistors, so that Kirchoff's Current Law at the node is better shown to students. No problem; as you can see in section~\ref{curr-and-volt} you can use the position specifiers \verb|<>^_| after the key \texttt{i}:
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}[american]
@@ -501,9 +506,10 @@ One of the problems with this circuit is that we would like to have the current
Finally, we would like to add voltages indication for carrying out the current formulas; as the default position of the voltage signs seems a bit cramped to me, I am adding the \texttt{voltage shift} parameter to make a bit more space for it\dots
-\begin{LTXexample}[varwidth=true]
+\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
\begin{circuitikz}[american, voltage shift=0.5]
- \draw (0,0) to[isource, l=$I_0$, v=$V_0$] (0,3)
+ \draw (0,0)
+ to[isource, l=$I_0$, v=$V_0$] (0,3)
to[short, -*, i=$I_0$] (2,3)
to[R=$R_1$, i>_=$i_1$] (2,0) -- (0,0);
\draw (2,3) -- (4,3)
@@ -514,9 +520,10 @@ Finally, we would like to add voltages indication for carrying out the current f
\emph{Et voilá!}. Remember that this is still \LaTeX, which means that you have done a description of your circuit, which is, in a lot of way, independent of the visualization of it. If you ever have to adapt the circuit to, say, a journal that force European style and flows instead of currents, you just change a couple of things and you have what seems a completely different diagram:
-\begin{LTXexample}[varwidth=true]
+\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
\begin{circuitikz}[european, voltage shift=0.5]
- \draw (0,0) to[isourceC, l=$I_0$, v=$V_0$] (0,3)
+ \draw (0,0)
+ to[isourceC, l=$I_0$, v=$V_0$] (0,3)
to[short, -*, f=$I_0$] (2,3)
to[R=$R_1$, f>_=$i_1$] (2,0) -- (0,0);
\draw (2,3) -- (4,3)
@@ -527,9 +534,10 @@ Finally, we would like to add voltages indication for carrying out the current f
And finally, this is still \TikZ, so that you can freely mix other graphics element to the circuit.
-\begin{LTXexample}[varwidth=true]
+\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
\begin{circuitikz}[american, voltage shift=0.5]
- \draw (0,0) to[isource, l=$I_0$, v=$V_0$] (0,3)
+ \draw (0,0)
+ to[isource, l=$I_0$, v=$V_0$] (0,3)
to[short, -*, f=$I_0$] (2,3)
to[R=$R_1$, f>_=$i_1$] (2,0) -- (0,0);
\draw (2,3) -- (4,3)
@@ -546,24 +554,24 @@ And finally, this is still \TikZ, so that you can freely mix other graphics elem
The idea is to draw a two-stage amplifier for a lesson, or exercise, on the different qualities of BJT and MOSFET transistors.
-Please Notice that this section uses the ``new'' position for transistors labels, enabled since version \texttt{0.9.7}. You should refer to older manuals to see how to do the same with older versios; basically the transistor's names where put with a different \verb|node{}| command.
+Please Notice that this section uses the ``new'' position for transistors labels, enabled since version \texttt{0.9.7}. You should refer to older manuals to see how to do the same with older versions; basically the transistor's names where put with an additional \verb|node{}| command.
Also notice that this is a more ``personal'' tutorial, showing a way to draw circuits that is, in the author's opinion, highly reusable and easy to do.
-The idea is using relative coordinates and named nodes as much as possible, so that changes in the circuit are easily done by changing keys numbers of position, and crucially, each block is reusable in other diagrams.
+The idea is using relative coordinates and named nodes as much as possible, so that changes in the circuit are easily done by changing just a few numbers that select relative positions and using symmetries. Crucially, this kind of spproach make each block reusable in other diagrams bu just changing one coordinate.
First of all, let's define a handy function to show the position of nodes:
\def\normalcoord(#1){coordinate(#1)}
-\def\showcoord(#1){node[circle, red, draw, inner sep=1pt,
+\def\showcoord(#1){coordinate(#1) node[circle, red, draw, inner sep=1pt,
pin={[red, overlay, inner sep=0.5pt, font=\tiny, pin distance=0.1cm,
- pin edge={red, overlay}]45:#1}](#1){}}
+ pin edge={red, overlay}]45:#1}](#1-node){}}
\let\coord=\normalcoord
\let\coord=\showcoord
\begin{lstlisting}
\def\normalcoord(#1){coordinate(#1)}
-\def\showcoord(#1){node[circle, red, draw, inner sep=1pt,
+\def\showcoord(#1){coordinate(#1) node[circle, red, draw, inner sep=1pt,
pin={[red, overlay, inner sep=0.5pt, font=\tiny, pin distance=0.1cm,
- pin edge={red, overlay}]45:#1}](#1){}}
+ pin edge={red, overlay}]45:#1}](#1-node){}}
\let\coord=\normalcoord
\let\coord=\showcoord
\end{lstlisting}
@@ -664,7 +672,7 @@ This is the final circuit, with the nodes still marked:
}}
\def\killdepth#1{{\raisebox{0pt}[\height][0pt]{#1}}}
\def\coord(#1){coordinate(#1)}
-\def\coord(#1){node[circle, red, draw, inner sep=1pt,pin={[red, overlay, inner sep=0.5pt, font=\tiny, pin distance=0.1cm, pin edge={red, overlay,}]45:#1}](#1){}}
+\def\coord(#1){coordinate(#1) node[circle, red, draw, inner sep=1pt,pin={[red, overlay, inner sep=0.5pt, font=\tiny, pin distance=0.1cm, pin edge={red, overlay,}]45:#1}](#1-node){}}
\begin{circuitikz}[american, ]
\draw (0,0) node[nmos,](Q1){\killdepth{Q1}};
\draw (Q1.S) to[R, l2^=$R_S$ and \SI{5}{k\ohm}] ++(0,-3) node[vee](VEE){$V_{EE}=\SI{-10}{V}$}; %define VEE level
@@ -702,7 +710,7 @@ This is the final circuit, with the nodes still marked:
}}
\def\killdepth#1{{\raisebox{0pt}[\height][0pt]{#1}}}
\def\coord(#1){coordinate(#1)}
-\def\coord(#1){node[circle, red, draw, inner sep=1pt,pin={[red, overlay, inner sep=0.5pt, font=\tiny, pin distance=0.1cm, pin edge={red, overlay,}]45:#1}](#1){}}
+\def\coord(#1){coordinate(#1) node[circle, red, draw, inner sep=1pt,pin={[red, overlay, inner sep=0.5pt, font=\tiny, pin distance=0.1cm, pin edge={red, overlay,}]45:#1}](#1-node){}}
\begin{circuitikz}[american, ]
\draw (0,0) node[nmos,](Q1){\killdepth{Q1}};
\draw (Q1.S) to[R, l2^=$R_S$ and \SI{5}{k\ohm}] ++(0,-3) node[vee](VEE){$V_{EE}=\SI{-10}{V}$}; %define VEE level
@@ -873,17 +881,6 @@ I want a reusable block, so I will start from a coordinate and then use only rel
\end{circuitikz}
\end{minipage}
-\begin{minipage}{0.7\linewidth}
-
- If you look closer, you can notice that the new flip-flop has no lead in the bottom pin; this is due to the fact that there is no label here, and leads are drawn in flip-flops only if there is a label. This can be fixed by adding a blank label (like \verb|td=~|); otherwise you have to utilize the anchors on the internal ``not'' circle.
-
-\end{minipage}\hfill
-\begin{minipage}{0.2\linewidth}
- \begin{circuitikz}[scale=0.8, transform shape]
- \node[sr-ff]{};
- \end{circuitikz}
-\end{minipage}
-
Now we can add the ``and'' gates. For example, we can add the gates to the right like this:
\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
@@ -1719,7 +1716,7 @@ The anchor is positioned just on the corner of the segmented line crossing the c
\subsubsection{Resistive components customization}
-You can change the scale of these components (all the resistive bipoles together) by setting the key \texttt{resistors/scale} (default \texttt{1.0}). Similarly, you can change the widths by setting \texttt{resistors/width} (default \texttt{0.8}).
+\paragraph{Geometry.} You can change the scale of these components (all the resistive bipoles together) by setting the key \texttt{resistors/scale} (default \texttt{1.0}). Similarly, you can change the widths by setting \texttt{resistors/width} (default \texttt{0.8}).
You can change the width of these components (all the resistive bipoles together) by setting the key \texttt{resistors/width} to something different from the default \texttt{0.8}.
@@ -1737,6 +1734,24 @@ For the american style resistors, you can change the number of ``zig-zags'' by s
\end{circuitikz}
\end{LTXexample}
+\paragraph{Arrows.\label{sec:tunablearrows}} You can change the arrow tips used in tunable resistors (\texttt{vR}, \texttt{tgeneric}) with the key \texttt{tunable end arrow} and in potentiometers with the key \texttt{wiper end arrow} (by default the key is the word ``\texttt{default}'' to obtain the default arrow, which is \texttt{latexslim} for both).
+Also you can change the start arrow with the corresponding \texttt{tunable start arrow} or \texttt{wiper start arrow} (the default value ``\texttt{default}'' is equivalent to \texttt{\{\}} for both, which means no arrow).
+
+You can change that globally or locally, as ever. The tip specification is the one you can find in the \TikZ{} manual (``Arrow Tip Specifications'').
+
+\begin{LTXexample}[varwidth, basicstyle=\small\ttfamily]
+ \begin{circuitikz}[american]
+ % globally all the potentiometrs
+ \ctikzset{wiper end arrow={Kite[open]}}
+ \draw (0,0) to[tgeneric] ++(2,0)
+ % set locally on this variable resistor
+ to[vR, tunable end arrow={Stealth[red]},
+ tunable start arrow={Bar}, invert] ++(0,-2)
+ to[pR] ++(-2,0);
+ \end{circuitikz}
+\end{LTXexample}
+
+
\subsection{Capacitors and inductors: dynamical bipoles}
\subsubsection{Capacitors}
@@ -1764,22 +1779,23 @@ For capacitive sensors, see section~\ref{sec:sensors-anchors}.
You can change the scale of the capacitors by setting the key \texttt{capacitors/scale} to something different from the default \texttt{1.0}.
+Variable capacitors arrow tips follow the settings of resistors, see section~\ref{sec:tunablearrows}.
+
\subsubsection{Inductors}
If the \texttt{cuteinductors} option is active (default behaviour), or the style \texttt{[cute inductors]} is used, the inductors are displayed as follows:
\begin{groupdesc}
\ctikzset{inductor=cute}
\circuitdescbip[cuteinductor]{L}{Inductor}{cute inductor}(midtap/90/0.1)
- \circuitdescbip[cutechoke]{cute choke}{Choke}{}
- \circuitdescbip[vcuteinductor]{vL}{Variable inductor}{variable cute inductor}
- \circuitdescbip[scuteinductor]{sL}{Inductive sensor}{cute inductive sensor}( label/0/0.3 )
+ \circuitdescbip[vcuteinductor]{vL}{Variable inductor}{variable cute inductor}(core west/135/0.1, core east/45/0.1)
+ \circuitdescbip[scuteinductor]{sL}{Inductive sensor}{cute inductive sensor}(label/0/0.3)
\end{groupdesc}
If the \texttt{americaninductors} option is active (or the style \texttt{[american inductors]} is used), the inductors are displayed as follows:
\begin{groupdesc}
\ctikzset{inductor=american}
\circuitdescbip[americaninductor]{L}{Inductor}{american inductor}(midtap/90/0.3)
- \circuitdescbip[vamericaninductor]{vL}{Variable inductor}{variable american inductor}
+ \circuitdescbip[vamericaninductor]{vL}{Variable inductor}{variable american inductor}(core west/135/0.1, core east/45/0.1)
\circuitdescbip[samericaninductor]{sL}{Inductive sensor}{american inductive sensor}( label/0/0.3 )
\end{groupdesc}
@@ -1787,16 +1803,23 @@ Finally, if the \texttt{europeaninductors} option is active (or the style \textt
\begin{groupdesc}
\ctikzset{inductor=european}
\circuitdescbip[fullgeneric]{L}{Inductor}{european inductor}(midtap/90/0.1)
- \circuitdescbip[tfullgeneric]{vL}{Variable inductor}{variable european inductor}
+ \circuitdescbip[tfullgeneric]{vL}{Variable inductor}{variable european inductor}(core west/135/0.1, core east/45/0.1)
\circuitdescbip[sfullgeneric]{sL}{Inductive sensor}{european inductive sensor}( label/0/0.3 )
\ctikzset{inductor=cute} % back to default
\end{groupdesc}
+For historical reasons, \emph{chokes} comes only in the \texttt{cute}. You can use the \texttt{core west} and \texttt{core east} anchors (see~\ref{sec:inductors-core-anchors}) to build your own core lines for the other inductors.
+
+\begin{groupdesc}
+ \circuitdescbip[cutechoke]{cute choke}{Choke}{}
+\end{groupdesc}
\subsubsection{Inductors customizations}\label{sec:tweak-l}
You can change the scale of the inductors by setting the key \texttt{inductors/scale} to something different from the default \texttt{1.0}.
+Variable inductors arrow tips follow the settings of resistors, see section~\ref{sec:tunablearrows}.
+
You can change the width of these components (all the inductors together, unless you use style or scoping) by setting the key \texttt{inductors/width} to something different from the default, which is \texttt{0.8} for american and european inductors, and \texttt{0.6} for cute inductors.
Moreover, you can change the number of ``coils'' drawn by setting the key
@@ -1804,7 +1827,7 @@ Moreover, you can change the number of ``coils'' drawn by setting the key
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}[
- longL/.style = {cute choke, inductors/scale=0.75,
+ longL/.style = {cute inductor, inductors/scale=0.75,
inductors/width=1.6, inductors/coils=9}]
\draw (0,1.5) to[L, l=$L$] ++(4,0);
\draw (0,0) to[longL, l=$L$] ++(4,0);
@@ -1813,7 +1836,7 @@ Moreover, you can change the number of ``coils'' drawn by setting the key
\end{circuitikz}
\end{LTXexample}
-Chokes (which comes only in the \texttt{cute} style) can have single and double lines, and can have the line thickness adjust (the value is relative to the thickness of the inductor).
+\paragraph{Chokes} can have single and double lines, and can have the line thickness adjusted (the value is relative to the thickness of the inductor). In general, you should use the anchors (see~\ref{sec:inductors-core-anchors}) to add core lines to inductors.
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}[american]
@@ -1827,10 +1850,12 @@ Chokes (which comes only in the \texttt{cute} style) can have single and double
\end{circuitikz}
\end{LTXexample}
+
\subsubsection{Inductors anchors}
For inductive sensors, see section~\ref{sec:sensors-anchors}.
+\paragraph{Taps.}
Inductors have an additional anchor, called \texttt{midtap}, that connects to the center of the coil ``wire''. Notice that this anchor could be on one side or the other of the component, depending on the number of loops of the element; if you need a fixed position, you can use the geographical anchors.
\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
@@ -1847,6 +1872,26 @@ to[L, loops=6, name=D] ++(2,0);
\end{circuitikz}
\end{LTXexample}
+\paragraph{Core anchors.}\label{sec:inductors-core-anchors}
+Inductors have additional anchors to add core lines (for historical reasons, there is a \texttt{cute choke} component also, but to use inductors in the chosen style you better use these anchors). The anchors are called \texttt{core west} and \texttt{core east} and they are positioned at a distance that you can tweak with the \texttt{\textbackslash ctikzset} key \texttt{bipoles/inductors/core distance} (default \texttt{2pt}).
+
+\begin{LTXexample}[varwidth, basicstyle=\small\ttfamily]
+ \begin{circuitikz}[]
+ \ctikzset{american}
+ \draw (0,3) to[L=$L$, name=myL] ++(2,0);
+ \draw[thick] (myL.core west) -- (myL.core east);
+ \ctikzset{cute inductors}
+ \draw (0,1.5) to[L=$L$, name=myL] ++(2,0);
+ \draw[densely dashed] (myL.core west) -- (myL.core east);
+ \ctikzset{european, bipoles/inductors/core distance=4pt}
+ \draw (0,0) to[L=$L$, name=myL, label distance=2pt] ++(2,0);
+ \draw[thick, double] (myL.core west) -- (myL.core east);
+ \end{circuitikz}
+\end{LTXexample}
+
+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}.
+
+
\subsection{Diodes and such}
There are three basic styles for diodes: \texttt{empty} (fillable in color), \texttt{full} (completely filled with the draw color) and \texttt{stroke} (empty, but with a line across them).
@@ -4258,6 +4303,7 @@ while the node-style components are the single-pole, double-throw (\texttt{spdt}
\circuitdesc{cute spdt down arrow}{Cute spdt down with arrow}{}
\end{groupdesc}
+
\paragraph{Cute switches anchors}
The nodes-style switches have the following anchors:
@@ -4470,6 +4516,45 @@ Finally, the size can be changed using the parameter \texttt{tripoles/spdt/width
\end{circuitikz}
\end{LTXexample}
+\subsubsection{Switch arrows\label{sec:switcharrows}}
+
+You can change the arrow tips used in all switches (traditional and ``cute'') with the key \texttt{switch end arrow} (by default the key is the word ``\texttt{default}'' to obtain the default arrow, which is \texttt{latexslim}).
+Also you can change the start arrow with the corresponding \texttt{switchable start arrow} or \texttt{wiper start arrow} (the default value ``\texttt{default}'' is equivalent to \texttt{\{\}}, which means no arrow). They keys are settable with \verb|\ctikzset| as with \verb|\tikzset| (to ease their usage in nodes).
+
+You can change that globally or locally, as ever. The tip specification is the one you can find in the \TikZ{} manual (``Arrow Tip Specifications'').
+
+\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
+\begin{circuitikz}
+ \draw (0,2) to[cspst] ++(2,0)
+ node[cute spdt up arrow, anchor=in]{};
+ \draw (0,0) to[cspst] ++(2,0)
+ node[cute spdt up arrow, anchor=in,
+ switch start arrow={Bar[red]},
+ switch end arrow={Triangle[blue]}]{};
+\end{circuitikz}
+\end{LTXexample}
+
+
+\paragraph{Rotary switch arrows.} You can change the rotary switch arrow shape in the same way as you change the ones in regular switches. Notice however that if you set either \texttt{switch end arrow} or \texttt{switch start arrow} they will be followed only if you have set both arrows with \texttt{<->} or equivalent, otherwise just one will be used.
+
+\begin{LTXexample}[varwidth=true, pos=t, basicstyle=\small\ttfamily]
+\begin{circuitikz}
+\ctikzset{multipoles/rotary/arrow=both}
+\draw (0,0) -- ++(1,0) node[rotary switch <-=8 in 120 wiper 40, anchor=in](A){};
+\draw (3,0) -- ++(1,0) node[rotary switch, anchor=in](B){}; % default values
+\draw (B.out 3) -- ++(1,0) node[rotary switch -=5 in 90 wiper 15, anchor=in](C){};
+\draw (C.out 3) -- ++(1,0) node[rotary switch ->, xscale=-1, anchor=out 3](D){};
+\ctikzset{switch end arrow={Triangle[blue]}}
+\ctikzset{switch start arrow={Bar[red]}}
+\begin{scope}[yshift=-2cm]
+ \draw (0,0) -- ++(1,0) node[rotary switch <-=8 in 120 wiper 40, anchor=in](A){};
+ \draw (3,0) -- ++(1,0) node[rotary switch, anchor=in](B){}; % default values
+ \draw (B.out 3) -- ++(1,0) node[rotary switch -=5 in 90 wiper 15, anchor=in](C){};
+ \draw (C.out 3) -- ++(1,0) node[rotary switch ->, xscale=-1, anchor=out 3](D){};
+\end{scope}
+\end{circuitikz}
+\end{LTXexample}
+
\subsection{Logic gates}
@@ -5762,7 +5847,7 @@ A couple of examples are shown below.
-\section{Labels and similar annotations}
+\section{Labels, voltages and currents}
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
@@ -5813,7 +5898,8 @@ Long names/styles for the bipoles can be used:
\label{sec:labels-and-annotations}
Since Version 0.7, beside the original label (\texttt{l}) option, there is a new option to place a second label, called annotation (\texttt{a}) at each bipole.
-The position of annotations and labels can be adjusted with \verb|_| and \verb|^|.
+\subsubsection{Label and annotation position.}
+When drawing a component left-to-right, the label \texttt{l} is by default above the component, and the annotation \texttt{a} is by default below it. The position of annotations and labels can be adjusted adding the characters \verb|_| or \verb|^| to the key.
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
@@ -5827,7 +5913,39 @@ The position of annotations and labels can be adjusted with \verb|_| and \verb|
\end{circuitikz}
\end{LTXexample}
-\textbf{Caveat:} when \TikZ{} processes the options, there will be problems if the label (or annotation, voltage, or current) contains one of the characters $=$ (equal) or $,$ (comma) --- because the parser search for those two characters to delimit the arguments, giving unexpected errors and wrong output.
+For passive components, you can use \texttt{type=text} as a shortcut for \texttt{type, l=text}:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+ \draw (0,0) to[R=$R_1$,a=1<\kilo\ohm>] (2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+Notice though that in active component (sources of either voltage or current) the shortcut will set the voltage (\texttt{v}) or current (\texttt{i}) property.
+
+\paragraph{Adjust label and annotation position.}\label{sec:adjust-label-position}
+Normally the package will guess a good position for the label or annotation; if you do not like it,
+you can add\footnote{Since version \texttt{1.3.3}} (or remove, with negative values) distance using the keys \texttt{label position} and \texttt{annotation distance}.
+
+\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
+\begin{circuitikz}
+ \draw (0,0) to[sR, l=$R$, label distance=-4pt] (2,0)
+ to [sR, l=$R$] (4,0);
+\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
+\begin{circuitikz}[american]
+ \ctikzset{bipoles/inductors/core distance=4pt}
+ \draw (0,1) to[L=$L$, name=myL] ++(2,0);
+ \draw[thick, double] (myL.core west) -- (myL.core east);
+ \draw (0,0) to[L=$L$, name=myL, label distance=2pt] ++(2,0);
+ \draw[thick, double] (myL.core west) -- (myL.core east);
+\end{circuitikz}
+\end{LTXexample}
+
+\subsubsection{Special symbols in labels and annotations.}
+When \TikZ{} processes the options, there will be problems if the label (or annotation, voltage, or current) contains one of the characters $=$ (equal) or $,$ (comma) --- because the parser search for those two characters to delimit the arguments, giving unexpected errors and wrong output.
These two characters can be protected from the option parser using an extra set of braces.
\begin{LTXexample}[varwidth=true]
@@ -5842,7 +5960,7 @@ These two characters can be protected from the option parser using an extra set
\end{circuitikz}
\end{LTXexample}
-\textbf{(Even more) Caveat:} up to version \texttt{1.2.7}, due to the way in which \Circuitikz{} used to processes the options, even that was not sufficient, so you must protect that tokens even more, for example using an \verb|\mbox| command, or redefining the characters with a \TeX\ \verb|\def|:
+\textbf{Caveat:} up to version \texttt{1.2.7}, due to the way in which \Circuitikz{} used to processes the options, even that was not sufficient, so you must protect that tokens even more, for example using an \verb|\mbox| command, or redefining the characters with a \TeX\ \verb|\def|:
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
@@ -5858,7 +5976,8 @@ These two characters can be protected from the option parser using an extra set
\end{LTXexample}
-\noindent The default orientation of labels is controlled by the options \texttt{smartlabels}, \texttt{rotatelabels} and \texttt{straightlabels} (or the corresponding \texttt{label/align} keys). Here are examples to see the differences:
+\subsubsection{Labels and annotation orientation.}
+The default orientation of labels is controlled by the options \texttt{smartlabels}, \texttt{rotatelabels} and \texttt{straightlabels} (or the corresponding \texttt{label/align} keys). Here are examples to see the differences:
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
\ctikzset{label/align = straight}
@@ -7607,6 +7726,32 @@ In versions up to \texttt{1.2.7}, use for example \verb|\mbox{}| or define \verb
\faqA Yes, it's a known bug (or misfeature, or limitation, or a fact of life). See section~\ref{sec:bugs}. \Circuitikz{} is not compatible with \texttt{pic}s at this point.
+\subsection{Tunable components}\label{faq:tunable-arrow}
+
+\faqQ The direction of the arrows in variable resistors or capacitors changed!
+
+\faqA Yes, it changed in \texttt{v1.3.3}.
+
+Version 1.3.3 fixes the direction of the arrows in tunable elements; before this version, they were more or less random, now the arrow goes from bottom left to top right. You have the option to go back to the old behavior with \texttt{\textbackslash ctikzset\{bipoles/fix tunable direction=false\}}. As a compensation for the fuss, now the arrows are configurable.
+
+
+\begin{LTXexample}[pos=t, basicstyle=\small\ttfamily]
+\begin{circuitikz}[european]
+ \draw (1,0) node{new default} (4,0) node{old default} (7,0) node{new!};
+ \foreach [count=\i] \comp in
+ {variable american resistor, variable european resistor,
+ variable cute inductor, variable american inductor, tfullgeneric,
+ variable capacitor} {
+ \draw (0,-\i) node[left]{\texttt{\comp}} to[\comp, name=E] ++(2,0);
+ \ctikzset{bipoles/fix tunable direction=false}
+ \draw (3,-\i) to[\comp, name=E] ++(2,0);
+ \ctikzset{bipoles/fix tunable direction=true, tunable end arrow={Bar}}
+ \draw (6,-\i) to[\comp, name=E] ++(2,0);
+ }
+\end{circuitikz}
+\end{LTXexample}
+
+
\section{Defining new components}
\begin{quote}
diff --git a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
index 83ac0f569d..1caeedf93e 100644
--- a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
+++ b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
@@ -12,8 +12,8 @@
\NeedsTeXFormat{LaTeX2e}
-\def\pgfcircversion{1.3.2}
-\def\pgfcircversiondate{2021/03/14}
+\def\pgfcircversion{1.3.3}
+\def\pgfcircversiondate{2021/04/04}
\ProvidesPackage{circuitikz}%
[\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion]
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
index b22da300ef..218f377782 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
@@ -67,7 +67,9 @@
\newdimen \pgfstartlinewidth
%%>>>
-% arrow tips, ported over old arrows library (deprecated)%<<<1
+% 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
% this was the original definition of latex' tips, renamed to avoid clashes
%
@@ -99,6 +101,36 @@
}
\pgfarrowsdeclarereversed{latexslim reversed}{latexslim reversed}{latexslim}{latexslim}
+
+% select the arrows using available defaults.
+\def\pgfcirc@arrow@default{default}
+% choose the arrows to use. Use #2 and #3 if the key is equal to "default"
+% arguments: type, default start, default end
+\def\pgfcirc@set@arrows#1#2#3{%
+ \pgfkeysifdefined{\circuitikzbasekey/#1 start arrow}%
+ {\edef\@@start{\ctikzvalof{#1 start arrow}}}%
+ {\edef\@@start{\pgfcirc@arrow@default}}
+ \pgfkeysifdefined{\circuitikzbasekey/#1 end arrow}%
+ {\edef\@@end{\ctikzvalof{#1 end arrow}}}%
+ {\edef\@@end{\pgfcirc@arrow@default}}
+ \ifx\@@start\pgfcirc@arrow@default
+ \pgfsetarrowsstart{#2}%
+ \else
+ \pgfsetarrowsstart{\@@start}%
+ \fi
+ \ifx\@@end\pgfcirc@arrow@default
+ \pgfsetarrowsend{#3}%
+ \else
+ \pgfsetarrowsend{\@@end}%
+ \fi
+}
+
+\def\pgf@circ@declare@family@arrows#1{%
+ \ctikzset{#1 start arrow/.initial={default}}
+ \ctikzset{#1 end arrow/.initial={default}}
+ \tikzset{#1 start arrow/.style={\circuitikzbasekey/#1 start arrow={##1}}}
+ \tikzset{#1 end arrow/.style={\circuitikzbasekey/#1 end arrow={##1}}}
+}
%%>>>
%% Macros to do things depending on the class%<<<1
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
index 5a4d5b0d28..78dd1379fb 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
@@ -13,6 +13,18 @@
%% Standard bipole shapes declarations
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Generic macro and flags for bipoles %<<<
+% Fixing tunable directions
+\newif\ifpgf@circ@fixtunable@dir
+\ctikzset{bipoles/fix tunable direction/.is if=pgf@circ@fixtunable@dir}
+\ctikzset{bipoles/fix tunable direction=true}
+% choosing several arrows
+\pgf@circ@declare@family@arrows{tunable}
+\pgf@circ@declare@family@arrows{wiper}
+\pgf@circ@declare@family@arrows{switch}
+%>>>
+
+
%%%%%%%%%%%%%%%%%%%%%%%%
% Resistive components: generics, resistors, wires
%%%%%%%%%%%%%%%%%%%%%%%%
@@ -104,6 +116,7 @@
\ctikzset{bipoles/multiwire/spacing/.initial=0.05}
% crossing wires
\ctikzset{bipoles/crossing/size/.initial=.2}
+
%%>>>
%% Shapes for generic, resistives and wires components %<<<
@@ -269,9 +282,14 @@
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
\pgf@circ@draworfill
\pgfscope
- \pgfsetarrowsend{latexslim}
- \pgfpathmoveto{\pgfpoint{.5\pgf@circ@res@left}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{-.5\pgf@circ@res@left}{\pgf@circ@res@down}}
+ \pgfcirc@set@arrows{tunable}{}{latexslim}
+ \ifpgf@circ@fixtunable@dir
+ \pgfpathmoveto{\pgfpoint{.5\pgf@circ@res@left}{\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{-.5\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \else
+ \pgfpathmoveto{\pgfpoint{.5\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{-.5\pgf@circ@res@left}{\pgf@circ@res@down}}
+ \fi
\pgfusepath{draw}
\endpgfscope
}
@@ -493,7 +511,7 @@
\endpgfscope
\pgfscope
%\pgfsetlinewidth{\pgfstartlinewidth}
- \pgfsetarrowsend{latexslim}
+ \pgfcirc@set@arrows{wiper}{}{latexslim}
\pgfextractx{\pgf@circ@res@other}{\wiper}
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@up}}
\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{-\pgf@circ@res@down}}
@@ -501,7 +519,7 @@
\endpgfscope
}
-%% Zig zag resistores
+%% Zig-zag resistors
\def\pgf@circ@zigzag#1{%
\divide \pgf@circ@res@step by \numexpr4*\zigs\relax
@@ -561,9 +579,14 @@
\pgf@circ@zigzag{.5}
\pgfscope
- \pgfsetarrowsend{latexslim}
- \pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@other}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{-.4\pgf@circ@res@other}{\pgf@circ@res@down}}
+ \pgfcirc@set@arrows{tunable}{}{latexslim}
+ \ifpgf@circ@fixtunable@dir
+ \pgfpathmoveto{\pgfpoint{-.4\pgf@circ@res@other}{\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@other}{\pgf@circ@res@up}}
+ \else
+ \pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@other}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{-.4\pgf@circ@res@other}{\pgf@circ@res@down}}
+ \fi
\pgfusepath{draw}
\endpgfscope
}
@@ -594,7 +617,7 @@
\pgfscope
%\pgfsetlinewidth{\pgfstartlinewidth}
- \pgfsetarrowsend{latexslim}
+ \pgfcirc@set@arrows{wiper}{}{latexslim}
\pgfextractx{\pgf@circ@res@other}{\wiper}
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@up}}
\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{-\pgf@circ@res@down}}
@@ -857,9 +880,14 @@
\pgfusepath{draw}
\pgfscope
- \pgfsetarrowsend{latexslim}
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+ \pgfcirc@set@arrows{tunable}{}{latexslim}
+ \ifpgf@circ@fixtunable@dir
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+ \else
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+ \fi
\pgfusepath{draw}
\endpgfscope
@@ -967,6 +995,18 @@
\pgfkeys{/tikz/twolineschoke/.add code={}{\pgf@circuit@bipole@twolineschoketrue}}
\ctikzset{twolineschoke/.add code={}{\pgf@circuit@bipole@twolineschoketrue}}
%
+% generic core anchor settings
+\ctikzset{bipoles/inductors/core distance/.initial={2pt}}
+\def\pgfcir@basic@core@anchors{%
+ \saveddimen{\coredistance}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{bipoles/inductors/core distance}}}
+ \anchor{core east}{%
+ \northeast\advance\pgf@y by\coredistance
+ }
+ \anchor{core west}{%
+ \northeast\advance\pgf@y by\coredistance\pgf@x=-\pgf@x
+ }
+}
+%
\ctikzset{bipoles/americaninductor/height/.initial=.3}
\ctikzset{bipoles/americaninductor/height 2/.initial=.1}
\ctikzset{bipoles/americaninductor/width/.initial=.8}
@@ -1013,7 +1053,8 @@
}
}
\anchor{midtap}{\midtap}
-}
+ \pgfcir@basic@core@anchors
+ }
{\ctikzvalof{bipoles/cuteinductor/lower coil height}}
{cuteinductor}
{\ctikzvalof{bipoles/cuteinductor/height}}
@@ -1056,6 +1097,7 @@
}
\anchor{midtap}{\midtap}
\pgfcirc@border@extend@full{1}{2}{1.6}{2.6}
+ \pgfcir@basic@core@anchors
}
{\ctikzvalof{bipoles/cuteinductor/lower coil height}}
{scuteinductor}
@@ -1158,6 +1200,13 @@
}
}
\anchor{midtap}{\midtap}
+ \saveddimen{\coredistance}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{bipoles/inductors/core distance}}}
+ \anchor{core east}{%
+ \northeast\pgf@y=0.5\pgf@y\advance\pgf@y by\coredistance
+ }
+ \anchor{core west}{%
+ \northeast\pgf@y=0.5\pgf@y\advance\pgf@y by\coredistance\pgf@x=-\pgf@x
+ }
}
{\ctikzvalof{bipoles/vcuteinductor/lower coil height}}
{vcuteinductor}
@@ -1175,7 +1224,7 @@
{(\ctikzvalof{bipoles/vcuteinductor/width}*\scaledRlen+\pgfhorizontaltransformationadjustment\pgflinewidth+(\ctikzvalof{bipoles/vcuteinductor/coils}-1)*2*\pgf@circ@res@other)/\ctikzvalof{bipoles/vcuteinductor/coils}/2}
\pgfscope
- \pgfsetarrowsend{latexslim}
+ \pgfcirc@set@arrows{tunable}{}{latexslim}
\pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@left}{\pgf@circ@res@down}}
\pgfpathlineto{\pgfpoint{.4\pgf@circ@res@right}{\pgf@circ@res@up}}
\pgfusepath{draw}
@@ -1206,6 +1255,7 @@
}
}
\anchor{midtap}{\midtap}
+ \pgfcir@basic@core@anchors
}
{\ctikzvalof{bipoles/americaninductor/height 2}}
{americaninductor}
@@ -1246,6 +1296,7 @@
}
\anchor{midtap}{\midtap}
\pgfcirc@border@extend@full{1}{2}{1.6}{2.6}
+ \pgfcir@basic@core@anchors
}
{\ctikzvalof{bipoles/americaninductor/height 2}}
{samericaninductor}
@@ -1289,6 +1340,13 @@
}
}
\anchor{midtap}{\midtap}
+ \saveddimen{\coredistance}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{bipoles/inductors/core distance}}}
+ \anchor{core east}{%
+ \northeast\pgf@y=0.5\pgf@y\advance\pgf@y by\coredistance
+ }
+ \anchor{core west}{%
+ \northeast\pgf@y=0.5\pgf@y\advance\pgf@y by\coredistance\pgf@x=-\pgf@x
+ }
}
{\ctikzvalof{bipoles/vamericaninductor/height 2}}
{vamericaninductor}
@@ -1313,7 +1371,7 @@
\pgfusepath{stroke}
\pgfscope
- \pgfsetarrowsend{latexslim}
+ \pgfcirc@set@arrows{tunable}{}{latexslim}
\pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@left}{\pgf@circ@res@down}}
\pgfpathlineto{\pgfpoint{-.4\pgf@circ@res@left}{\pgf@circ@res@up}}
\pgfusepath{draw}
@@ -1324,6 +1382,7 @@
\pgfcircdeclarebipolescaled{inductors}
{
\anchor{midtap}{\northeast\pgf@x=0pt\relax}
+ \pgfcir@basic@core@anchors
}
{\ctikzvalof{bipoles/fullgeneric/height}}
{fullgeneric}
@@ -1342,6 +1401,7 @@
\anchor{label}{\southwest\pgf@x=0.4\pgf@x\pgf@y=2\pgf@y}%
\anchor{midtap}{\northeast\pgf@x=0pt\relax}
\pgfcirc@border@extend@full{1}{2}{1}{2}
+ \pgfcir@basic@core@anchors
}
{\ctikzvalof{bipoles/fullgeneric/height}}
{sfullgeneric}
@@ -1364,6 +1424,13 @@
\pgfcircdeclarebipolescaled{inductors}
{
\anchor{midtap}{\northeast\pgf@x=0pt\relax}
+ \saveddimen{\coredistance}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{bipoles/inductors/core distance}}}
+ \anchor{core east}{%
+ \northeast\pgf@y=0.4\pgf@y\advance\pgf@y by \coredistance
+ }
+ \anchor{core west}{%
+ \northeast\pgf@y=0.4\pgf@y\advance\pgf@y by \coredistance\pgf@x=-\pgf@x
+ }
}
{\ctikzvalof{bipoles/tfullgeneric/height}}
{tfullgeneric}
@@ -1378,9 +1445,14 @@
\pgfusepath{draw,fill}
\pgfscope
- \pgfsetarrowsend{latexslim}
- \pgfpathmoveto{\pgfpoint{.5\pgf@circ@res@left}{\pgf@circ@res@up}}
- \pgfpathlineto{\pgfpoint{-.5\pgf@circ@res@left}{\pgf@circ@res@down}}
+ \pgfcirc@set@arrows{tunable}{}{latexslim}
+ \ifpgf@circ@fixtunable@dir
+ \pgfpathmoveto{\pgfpoint{.5\pgf@circ@res@left}{\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{-.5\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \else
+ \pgfpathmoveto{\pgfpoint{.5\pgf@circ@res@left}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{-.5\pgf@circ@res@left}{\pgf@circ@res@down}}
+ \fi
\pgfusepath{draw}
\endpgfscope
}
@@ -3777,7 +3849,7 @@
\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
\pgfpathmoveto{\pgfpointpolar{90}{1.2\pgf@circ@res@right}}
\pgfpatharc{90}{-20}{1.2\pgf@circ@res@right}
- \pgfsetarrowsend{latexslim}
+ \pgfcirc@set@arrows{switch}{}{latexslim}
\pgfsetbeveljoin
\pgfusepath{draw}
\endpgfscope
@@ -3801,7 +3873,7 @@
\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
\pgfpathmoveto{\pgfpointpolar{-10}{1.2\pgf@circ@res@right}}
\pgfpatharc{-10}{90}{1.2\pgf@circ@res@right}
- \pgfsetarrowsend{latexslim}
+ \pgfcirc@set@arrows{switch}{}{latexslim}
\pgfsetbeveljoin
\pgfusepath{draw}
\endpgfscope
@@ -4059,7 +4131,7 @@
\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}} % in node
\pgfpathmoveto{\pgfpointpolar{70}{1.2\pgf@circ@res@right}}
\pgfpatharc{70}{-10}{1.2\pgf@circ@res@right}
- \pgfsetarrowsend{latexslim}
+ \pgfcirc@set@arrows{switch}{}{latexslim}
\pgfusepath{draw}
}
@@ -4071,7 +4143,7 @@
\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}} % in node
\pgfpathmoveto{\pgfpointpolar{-10}{1.2\pgf@circ@res@right}}
\pgfpatharc{-10}{60}{1.2\pgf@circ@res@right}
- \pgfsetarrowsend{latexslim}
+ \pgfcirc@set@arrows{switch}{}{latexslim}
\pgfusepath{draw}
}
@@ -4358,7 +4430,7 @@
\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}} % in node
\pgfpathmoveto{\pgfpointpolar{70}{1.5\pgf@circ@res@right}}
\pgfpatharc{70}{-50}{1.5\pgf@circ@res@right}
- \pgfsetarrowsend{latexslim}
+ \pgfcirc@set@arrows{switch}{}{latexslim}
\pgfusepath{draw}
}
@@ -4367,10 +4439,9 @@
{
\pgf@circ@setlinewidth{bipoles}{\pgflinewidth}
\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}} % in node
- \pgfsetarrowsstart{latexslim}
+ \pgfcirc@set@arrows{switch}{latexslim}{latexslim}
\pgfpathmoveto{\pgfpointpolar{-60}{1.5\pgf@circ@res@right}}
\pgfpatharc{-60}{60}{1.5\pgf@circ@res@right}
- \pgfsetarrowsend{latexslim}
\pgfusepath{draw}
}
@@ -4381,7 +4452,7 @@
\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}} % in node
\pgfpathmoveto{\pgfpointpolar{-50}{1.5\pgf@circ@res@right}}
\pgfpatharc{-50}{70}{1.5\pgf@circ@res@right}
- \pgfsetarrowsend{latexslim}
+ \pgfcirc@set@arrows{switch}{}{latexslim}
\pgfusepath{draw}
}
% %>>>
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
index 465f704ded..8e2b4372c6 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
@@ -30,6 +30,11 @@
\ctikzset{bipole annotation style/.append style={#1}}
}}
+\ctikzset{label distance/.initial={0pt}}
+\ctikzset{annotation distance/.initial={0pt}}
+\tikzset{label distance/.code={\ctikzset{label distance={#1}}}}
+\tikzset{annotation distance/.code={\ctikzset{annotation distance={#1}}}}
+
%% Options
\ctikzset{label/.style = { l={#1} } }
\ctikzset{l/.code = {
@@ -182,13 +187,13 @@
% scale the distances in function of zoom, so that they are not
% dependent on it but on font size. Thanks to @marmot
% https://tex.stackexchange.com/a/476018/38080
- % the coeffcient is adjusted so that the distance is more or less
+ % the coefficient is adjusted so that the distance is more or less
% the same for rotated labels and straight ones (although it will
% depend on the font, so it's not exact).
\pgfgettransformentries{\tmpa}{\tmpb}{\tmpc}{\tmpd}{\tmp}{\tmp}%
\pgfmathsetmacro{\myscale}{sqrt(abs(\tmpa*\tmpd-\tmpb*\tmpc))}% abs should not be needed
% \typeout{ROT\tmpa\space\tmpb\space\tmpc\space\tmpd\space\myscale}
- \pgfmathsetlength\pgf@circ@res@temp{1.5*\pgf@circ@ls/\myscale}
+ \pgfmathsetlength\pgf@circ@res@temp{1.5*\pgf@circ@ls/\myscale+\ctikzvalof{#1 distance}/\myscale}
\ifnum \ctikzvalof{bipole/#1/position}>0
%we need some more space for placement below, due to mid-anchor
\else % we do not have <= in \ifnum...
@@ -227,7 +232,7 @@
\pgfgettransformentries{\tmpa}{\tmpb}{\tmpc}{\tmpd}{\tmp}{\tmp}%
\pgfmathsetmacro{\myscale}{sqrt(abs(\tmpa*\tmpd-\tmpb*\tmpc))}% abs should not be needed
% \typeout{ROT\tmpa\space\tmpb\space\tmpc\space\tmpd\space\myscale}
- \pgfmathsetlength\pgf@circ@res@temp{\pgf@circ@ls/\myscale}
+ \pgfmathsetlength\pgf@circ@res@temp{\pgf@circ@ls/\myscale+\ctikzvalof{#1 distance}/\myscale}
\pgfmathadd{\pgf@circ@labanc}{90}
\pgfmathround{\pgfmathresult}
\def\pgf@circ@labanctext{\pgf@circ@labanc}
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
index 82b156c46d..6acaa06aa9 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
@@ -730,13 +730,29 @@
\ifpgf@circ@rotaryarrow
\pgfscope % arrow
- \ifpgf@circ@rotaryarrow@ccw\pgfsetarrowsstart{latexslim}\fi
+ \pgfcirc@set@arrows{switch}{\ifpgf@circ@rotaryarrow@ccw latexslim\fi}{\ifpgf@circ@rotaryarrow@cw latexslim\fi}
\pgf@circ@setlinewidth{bipoles}{\pgflinewidth}
\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}} % center of cin node
\pgftransformrotate{\wiper}
\pgfpathmoveto{\pgfpointpolar{50}{1.0\pgf@circ@res@right}}
\pgfpatharc{50}{-50}{1.0\pgf@circ@res@right}
- \ifpgf@circ@rotaryarrow@cw\pgfsetarrowsend{latexslim}\fi
+ \ifpgf@circ@rotaryarrow@ccw
+ \ifpgf@circ@rotaryarrow@cw
+ % both here, maintain values
+ \relax
+ \else
+ % only ccw: remove end arrow
+ \pgfsetarrowsend{}
+ \fi
+ \else
+ \ifpgf@circ@rotaryarrow@cw
+ % only cw: remove start arrow
+ \pgfsetarrowsstart{}
+ \else
+ % none: shouldn't happen
+ \relax
+ \fi
+ \fi
\pgfusepath{draw}
\endpgfscope
\fi
diff --git a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
index fcc31889fe..0724a8fcf7 100644
--- a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
@@ -10,8 +10,8 @@
%
% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
-\def\pgfcircversion{1.3.2}
-\def\pgfcircversiondate{2021/03/14}
+\def\pgfcircversion{1.3.3}
+\def\pgfcircversiondate{2021/04/04}
\writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion}
\usemodule[tikz]
diff --git a/graphics/pgf/contrib/dynkin-diagrams/README b/graphics/pgf/contrib/dynkin-diagrams/README
index 5d7efb3144..8c3a097ae4 100644
--- a/graphics/pgf/contrib/dynkin-diagrams/README
+++ b/graphics/pgf/contrib/dynkin-diagrams/README
@@ -1,6 +1,6 @@
Dynkin diagrams
-v3.141592653589793
-31 March 2021
+v3.1415926535897932
+04 April 2021
Authors:
Ben McKay
diff --git a/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf b/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf
index 870e3afa27..d5748302d2 100644
--- a/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf
+++ b/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty b/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty
index df3bc2ef69..baebba3f35 100644
--- a/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty
+++ b/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.sty
@@ -1,6 +1,6 @@
% The Dynkin Diagrams package.
%
-% Version 3.141592653589793
+% Version 3.141 592 653 589 793 2
%
% This package draws Dynkin diagrams in LaTeX
% documents, using the TikZ package.
@@ -13,7 +13,7 @@
% Released under the LaTeX Project Public License v1.3c or later, see
% http://www.latex-project.org/lppl.txt
\NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesPackage{dynkin-diagrams}[2021/03/31 Dynkin diagrams]
+\ProvidesPackage{dynkin-diagrams}[2021/04/04 Dynkin diagrams]
\RequirePackage{tikz}
\RequirePackage{xstring}
\RequirePackage{xparse}
@@ -2067,6 +2067,18 @@
at/.default = {(0,0)},
backwards/.is if = dynkin@is@backwards,
backwards = false,
+ bird-arrow/.style = {
+ arrow shape/.style={-{bird[length=1.25*\dynkin@root@radius]}},
+ },
+ bird arrow/.style = {
+ arrow shape/.style={-{bird[length=1.25*\dynkin@root@radius]}},
+ },
+ Bourbaki-arrow/.style={
+ arrow shape/.style={-{Bourbaki[length=2*\dynkin@root@radius]}},
+ },
+ Bourbaki arrow/.style = {
+ arrow shape/.style={-{Bourbaki[length=2*\dynkin@root@radius]}},
+ },
Coxeter/.is if = dynkin@Coxeter,
Coxeter=false,
double edges/.style = {
@@ -5561,5 +5573,64 @@
[\dynkin@error@series]%
}%
+%% An arrow type for drawing arrows in G2 and F4 diagrams:
+\pgfdeclarearrow{
+name = Bourbaki,
+parameters = { \the\pgfarrowlength },
+setup code = {},
+drawing code = {
+ \pgfsetdash{}{0pt} % do not dash
+ \pgfsetroundjoin % fix join
+ \pgfsetroundcap % fix cap
+ \pgfsetlinewidth{4\pgflinewidth}
+ \pgfsetstrokecolor{white}
+ \pgfpathmoveto{\pgfpoint{-.75\pgfarrowlength}{.75\pgfarrowlength}}
+ \pgfpathlineto{\pgfpoint{0}{0}}
+ \pgfpathlineto{\pgfpoint{-.75\pgfarrowlength}{-.75\pgfarrowlength}}
+ \pgfusepathqstroke
+ \pgfsetlinewidth{.25\pgflinewidth}
+ \pgfsetstrokecolor{black}
+ \pgfpathmoveto{\pgfpoint{-.75\pgfarrowlength}{.75\pgfarrowlength}}
+ \pgfpathlineto{\pgfpoint{0}{0}}
+ \pgfpathlineto{\pgfpoint{-.75\pgfarrowlength}{-.75\pgfarrowlength}}
+ \pgfusepathqstroke
+},
+defaults = { length = 2*\dynkin@root@radius }
+}
+
+%% An arrow type for drawing arrows in G2 and F4 diagrams:
+\pgfdeclarearrow{
+name = bird,
+parameters = { \the\pgfarrowlength },
+setup code = {},
+drawing code = {
+ \pgfsetdash{}{0pt} % do not dash
+ \pgfsetroundjoin % fix join
+ \pgfsetroundcap % fix cap
+\begin{pgfscope}
+ \pgfpathmoveto{\pgfpoint{-1.25\pgfarrowlength}{-2.5\pgfarrowlength}}
+ \pgfpathlineto{\pgfpoint{0}{-2.5\pgfarrowlength}}
+ \pgfpathlineto{\pgfpoint{0}{2.5\pgfarrowlength}}
+ \pgfpathlineto{\pgfpoint{-1.25\pgfarrowlength}{2.5\pgfarrowlength}}
+ \pgfpathlineto{\pgfpoint{-1.25\pgfarrowlength}{-2.5\pgfarrowlength}}
+\pgfusepathqclip
+ \pgfsetlinewidth{4\pgflinewidth}
+ \pgfsetstrokecolor{white}
+% \pgfsetstrokeopacity{.75}
+ \pgfpathmoveto{\pgfpoint{0}{0}}
+ \pgfpatharc{250}{190}{1.4\pgfarrowlength}
+ \pgfpathmoveto{\pgfpoint{0}{0}}
+ \pgfpatharc{110}{170}{1.4\pgfarrowlength}
+ \pgfusepathqstroke
+\end{pgfscope}
+ \pgfsetstrokecolor{black}
+ \pgfpathmoveto{\pgfpoint{0}{0}}
+ \pgfpatharc{250}{190}{1.4\pgfarrowlength}
+ \pgfpathmoveto{\pgfpoint{0}{0}}
+ \pgfpatharc{110}{170}{1.4\pgfarrowlength}
+ \pgfusepathqstroke
+},
+defaults = { length = 1.25*\dynkin@root@radius }
+}
\endinput
diff --git a/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex b/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex
index 8c882f70f2..1cc6083977 100644
--- a/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex
+++ b/graphics/pgf/contrib/dynkin-diagrams/dynkin-diagrams.tex
@@ -1,7 +1,7 @@
\documentclass{amsart}
\title[The Dynkin diagrams package]%
{The Dynkin diagrams package \\
-Version 3.141592653589793}
+Version 3.141\,592\,653\,589\,793\,2}
%% My name:
\makeatletter
\DeclareRobustCommand{\scotsMc}{\scotsMcx{c}}
@@ -20,12 +20,12 @@ Version 3.141592653589793}
\author{Ben \scotsMc{}Kay}
\address{School of Mathematical Sciences, University College Cork, Cork, Ireland}
\email{b.mckay@ucc.ie}
-\date{31 March 2021}
+\date{4 April 2021}
\usepackage[T1]{fontenc}
\usepackage[utf8]{inputenx}
\usepackage{etoolbox}
\usepackage{lmodern}
-\RequirePackage[tt=lining]{cfr-lm}
+\RequirePackage[tt={lining=true,variable=false}]{cfr-lm}
\usepackage[kerning=true,tracking=true]{microtype}
\usepackage{amsmath}
\usepackage{amsfonts}
@@ -50,7 +50,6 @@ Version 3.141592653589793}
\usepackage{fancyvrb}
\usepackage{xspace}
\newcommand{\TikZ}{Ti\textit{k}Z\xspace}
-\usepackage{filecontents}
\usetikzlibrary{decorations.markings}
\usetikzlibrary{decorations.pathmorphing}
\usepackage{tikz-cd}
@@ -232,7 +231,7 @@ The Dynkin diagram of \(B_3\) is
\renewcommand\do[1]{\dyn#1}
\begin{dynkinTable}{The Dynkin diagrams of the reduced simple root systems \cite{Bourbaki:2002} pp. 265--290, plates I--IX}{2.25cm}{2.5cm}
-\docsvlist{A{},C{},D{},E6,E7,E8,F4,G2}
+\docsvlist{A{},B{},C{},D{},E6,E7,E8,F4,G2}
\end{dynkinTable}
@@ -398,6 +397,7 @@ Optionally, you can add label directions to say where to put each label relative
\begin{tcblisting}{title={The \texttt{foreach} notation I}}
\dynkin[labels={1,3,...,7}]A9
\end{tcblisting}
+\newpage
\begin{tcblisting}{title={The \texttt{foreach} notation II}}
\dynkin[labels={,\alpha_2,\alpha_...,\alpha_7}]A7
\end{tcblisting}
@@ -631,12 +631,25 @@ For extended diagrams, this list starts at \(0\)-offset.
edge length=.75cm,
edge/.style={blue!50,thick},
arrow width=2mm,
- arrow style={red,width=2mm,line width=1pt}]{F}{4}
+ arrow style={red,width=2mm,line width=1pt}]F4
+\end{tcblisting}
+\begingroup
+\tikzset{/Dynkin diagram,edge length=1cm,root radius=1mm,edge/.style=thick}
+\begin{tcblisting}{title={Popular arrow shapes. These mess with nonwhite backgrounds, but are prettier than the default shape.}}
+\begin{tabular}{rcc}
+ default&\dynkin G2 &\dynkin F4\\
+Bourbaki&\dynkin[Bourbaki arrow]G2&\dynkin[Bourbaki arrow]F4\\
+ bird&\dynkin[bird arrow]G2 &\dynkin[bird arrow]F4
+\end{tabular}
\end{tcblisting}
-\begin{tcblisting}{title={Arrow shapes}}
+\endgroup
+Use \verb!\tikzset{/Dynkin diagram,Bourbaki arrow}! to force all arrows to have Bourbaki style throughout your document.
+\begin{tcblisting}{title={Other arrow shapes}}
\dynkin[edge length=.5cm,
arrow width=2mm,
arrow shape/.style={-{Stealth[blue,width=2mm]}}]F4
+\dynkin[edge length=1cm,
+ arrow shape/.style={-{Bourbaki[length=7pt]}}]F4
\end{tcblisting}
\begin{tcblisting}{title={Edge lengths}}
The Dynkin diagram of \(A_3\) is \dynkin[edge length=1.2]A3
@@ -650,6 +663,7 @@ The Dynkin diagram of \(A_3\) is \dynkin[edge length=1.2]A3
\dynkin[mark=x]E8
\dynkin[mark=X]E8
\end{tcblisting}
+
At the moment, you can only use:
\par\noindent\begin{tabular}{>{\ttfamily}ccl}
* &\dynkin[mark=*]A1& solid dot \\
@@ -675,7 +689,6 @@ The parabolic subgroup \(E_{8,124}\) is \dynkin[parabolic=124,x/.style={brown,ve
\dynkin[arrows=false]F4
\dynkin[arrows=false]G2
\end{tcblisting}
-\newpage
\begin{tcblisting}{title={Reverse arrows}}
\dynkin[reverse arrows]F4
\dynkin[reverse arrows]G2
@@ -715,6 +728,7 @@ The parabolic subgroup \(E_{8,124}\) is \dynkin[parabolic=124,x/.style={brown,ve
\draw[black] (root 2) circle (.05cm);
\end{dynkinDiagram}
\end{tcblisting}
+\newpage
\begin{tcblisting}{title={Draw curves between the roots}}
\begin{dynkinDiagram}[label]E8
\draw[very thick, black!50,-latex]
@@ -765,8 +779,6 @@ reverse arrows]G2
\ClassicalLieSuperalgebras[.07cm]{We need a slightly larger root radius parameter to distinguish the tensor product symbols from the solid dots.}
-\newpage
-
\ClassicalLieSuperalgebras{Here we see the problem with using the default root radius parameter, which is too small for tensor product symbols.}
@@ -916,7 +928,7 @@ D_4 &
\end{tcblisting}
Default is Bourbaki.
Sources are Adams \cite{Adams:1996} p. 56--57, Bourbaki \cite{Bourbaki:2002} p. pp. 265--290 plates I-IX, Carter \cite{Carter:2005} p. 540--609, Dynkin \cite{Dynkin:1952}, Kac \cite{Kac:1990} p. 43.
-\newpage
+
\NewDocumentCommand\tablerow{mm}%
{%
#1_{#2}&
@@ -949,6 +961,7 @@ The marks are set down in order according to the current root ordering:
\dynkin[label,ordering=Carter]E{*otxXOt*}
\dynkin[label,ordering=Kac]E{*otxXOt*}
\end{tcblisting}
+\newpage
\begin{tcblisting}{title={Convert between orderings}}
\newcount\r
\dynkinOrder E8.Carter::6->Bourbaki.{\r}
@@ -973,25 +986,26 @@ cells={nodes={anchor=center}}]
\end{tikzcd}
\end{tcblisting}
+\newpage
+
\begin{filecontents*}{hermitian-symmetric-spaces.tex}
\NewDocumentCommand\HSS{mommm}
{#1&\IfNoValueTF{#2}{\dynkin{#3}{#4}}{\dynkin[parabolic=#2]{#3}{#4}}&#5\\}
+\RenewDocumentCommand\do{m}{\HSS #1}
\renewcommand*{\arraystretch}{1.5}
\begin{longtable}
{>{\columncolor[gray]{.9}}>$l<$>{\columncolor[gray]{.9}}>$l<$>{\columncolor[gray]{.9}}l}
-\caption{The Hermitian symmetric spaces}\endfirsthead
-\caption{\dots continued}\\ \endhead
-\caption{continued \dots}\\ \endfoot
-\endlastfoot
-\HSS{A_n}A{**.*x*.**}{Grassmannian of $k$-planes in $\C{n+1}$}
-\HSS{B_n}[1]B{}{$(2n-1)$-dimensional hyperquadric, i.e. the variety of null lines in $\C{2n+1}$}
-\HSS{C_n}[16]C{}{space of Lagrangian $n$-planes in $\C{2n}$}
-\HSS{D_n}[1]D{}{$(2n-2)$-dimensional hyperquadric, i.e. the variety of null lines in $\C{2n}$}
-\HSS{D_n}[32]D{}{one component of the variety of maximal dimension null subspaces of $\C{2n}$}
-\HSS{D_n}[16]D{}{the other component}
-\HSS{E_6}[1]E6{complexified octave projective plane}
-\HSS{E_6}[32]E6{its dual plane}
-\HSS{E_7}[64]E7{the space of null octave 3-planes in octave 6-space}
+\caption{The Hermitian symmetric spaces}\endhead\endfoot\endlastfoot
+\docsvlist{%
+{{A_n}A{**.*x*.**}{Grassmannian of $k$-planes in $\C{n+1}$}},
+{{B_n}[1]B{}{$(2n-1)$-dimensional quadric hypersurface}},
+{{C_n}[16]C{}{space of Lagrangian $n$-planes in $\C{2n}$}},
+{{D_n}[1]D{}{$(2n-2)$-dimensional quadric hypersurface}},
+{{D_n}[32]D{}{component of maximal null subspaces of $\C{2n}$}},
+{{D_n}[16]D{}{the other component}},
+{{E_6}[1]E6{complexified octave projective plane}},
+{{E_6}[32]E6{its dual plane}},
+{{E_7}[64]E7{the space of null octave 3-planes in octave 6-space}}}
\end{longtable}
\end{filecontents*}
\begingroup
@@ -999,6 +1013,7 @@ cells={nodes={anchor=center}}]
\endgroup
\VerbatimInput{hermitian-symmetric-spaces.tex}
+\newpage
\section{Extended Dynkin diagrams}
\begin{tcblisting}{title={Extended Dynkin diagrams}}
@@ -1013,6 +1028,7 @@ The extended Dynkin diagrams are also described in the notation of Kac \cite{Kac
\begin{dynkinTable}{The Dynkin diagrams of the extended simple root systems}{3cm}{5cm}
\docsvlist{A{1},A{},B{},C{},D{},E6,E7,E8,F4,G2}
\end{dynkinTable}
+\newpage
\begin{tcblisting}{title={Directed edges}}
\dynkin[%
edge length=.75cm,
@@ -1127,6 +1143,7 @@ The \(D^{(1)}_{\ell}\) diagrams can be folded on their left end and separately o
\dynkin[fold right]D[1]{} \
\dynkin[fold]D[1]{}
\end{tcblisting}
+\newpage
We have to be careful about the 4-ply foldings of \(D^{(1)}_{2\ell}\), for which we can have two different patterns, so by default, the package only draws as much as it can without distinguishing the two:
\begin{tcblisting}{title={Default \(D^{(1)}_{2\ell}\) and the two ways to finish it}}
\dynkin[ply=4]D[1]{****.*****.*****}%
@@ -1303,6 +1320,7 @@ We can then connect the two with folding edges:
\end{pgfonlayer}
\end{dynkinDiagram}
\end{tcblisting}
+\newpage
The following diagrams arise in the Satake diagrams of the pseudo-Riemannian symmetric spaces \cite{Baba:2009}.
\begin{tcblisting}{}
\pgfkeys{/Dynkin diagram,edge length=.5cm,fold radius=.5cm}
@@ -1311,33 +1329,25 @@ The following diagrams arise in the Satake diagrams of the pseudo-Riemannian sym
\node (a) at (-.3,-.4){};
\dynkin[name=2,at=(a)]A{IIIb}
\begin{pgfonlayer}{Dynkin behind}
- \foreach \i in {1,...,7}%
- {%
+ \foreach \i in {1,...,7}{
\draw[/Dynkin diagram/fold style]
- ($(1 root \i)$)
- --
- ($(2 root \i)$);%
- }%
+ ($(1 root \i)$) -- ($(2 root \i)$);}
\end{pgfonlayer}
\end{tikzpicture}
\end{tcblisting}
\begin{tcblisting}{}
\pgfkeys{/Dynkin diagram,
-edge length=.75cm,
-edge/.style={draw=example-color,double=black,very thick}}
+ edge length=.75cm,
+ edge/.style={draw=example-color,double=black,very thick}}
\begin{tikzpicture}
- \foreach \d in {1,...,4}
- {
+ \foreach \d in {1,...,4}{
\node (current) at ($(\d*.05,\d*.3)$){};
- \dynkin[name=\d,at=(current)]D{oo.oooo}
- }
+ \dynkin[name=\d,at=(current)]D{oo.oooo}}
\begin{pgfonlayer}{Dynkin behind}
- \foreach \i in {1,...,6}%
- {%
- \draw[/Dynkin diagram/fold style] ($(1 root \i)$) -- ($(2 root \i)$);%
- \draw[/Dynkin diagram/fold style] ($(2 root \i)$) -- ($(3 root \i)$);%
- \draw[/Dynkin diagram/fold style] ($(3 root \i)$) -- ($(4 root \i)$);%
- }%
+ \newcommand\df[2]{
+ \draw[/Dynkin diagram/fold style]
+ ($(#1 root \i)$) -- ($(#2 root \i)$);}
+ \foreach \i in {1,...,6}{\df{1}{2}\df{2}{3}\df{3}{4}}
\end{pgfonlayer}
\end{tikzpicture}
\end{tcblisting}
@@ -1629,32 +1639,21 @@ Below we draw the Vogan diagrams of some affine Lie superalgebras \cite{Ransingh
\section{Example: the complex simple Lie algebras}
\begin{filecontents*}{simple-lie-algebras.tex}
-\NewDocumentEnvironment{bunch}{}%
-{
+\NewDocumentEnvironment{bunch}{}{
\renewcommand*{\arraystretch}{1}
\begin{array}{@{}ll@{}}
\\ \midrule
}{
- \\ \midrule\end{array}
-}
+ \\ \midrule\end{array}}
\small
-\NewDocumentCommand\nct{mm}
-{
- \newcolumntype{#1}{>{\columncolor[gray]{.9}}>{$}m{#2cm}<{$}}
-}
-\nct{G}{.3}
-\nct{J}{2.1}
-\nct{K}{3}
-\nct{R}{3.7}
-\nct{S}{3}
+\NewDocumentCommand\nct{mm}{
+ \newcolumntype{#1}{>{\columncolor[gray]{.9}}>{$}m{#2cm}<{$}}}
+\nct{G}{.3}\nct{J}{2.1}\nct{K}{3}\nct{R}{3.7}\nct{S}{3}
\NewDocumentCommand\LieG{}{\mathfrak{g}}
-\NewDocumentCommand\W{om}
-{
+\NewDocumentCommand\W{om}{
\ensuremath{
\mathbb{Z}^{#2}
- \IfValueT{#1}{/\left<#1\right>}
- }
-}
+ \IfValueT{#1}{/\left<#1\right>}}}
\renewcommand*{\arraystretch}{1.5}
\NewDocumentCommand\quo{}{\text{quotient of } E_8}
\begin{longtable}{@{}GJKRS@{}}
@@ -1764,22 +1763,18 @@ G_2&
line cap=round,
line width=1mm,
shorten <=1mm,
- shorten >=1mm}
-}
+ shorten >=1mm}}
\newcommand\catholic[2]{
- \draw[big arrow,green!25!white] (root #1) to (root #2);
-}
+ \draw[big arrow,green!25!white] (root #1) to (root #2);}
\newcommand\protestant[2]{
\begin{scope}[transparency group, opacity=.25]
\draw[big arrow,orange] (root #1) to (root #2);
- \end{scope}
-}
+ \end{scope}}
\begin{dynkinDiagram}[%
edge length=1.2cm,
indefinite edge/.style={
thick,
- loosely dotted
- },
+ loosely dotted},
labels*={0,1,2,3,\ell-3,\ell-2,\ell-1,\ell}]
D[1]{}
\catholic 06\catholic 17
@@ -1858,6 +1853,10 @@ The environment syntax is \verb!\begin{dynkinDiagram}! followed by the same para
& whether to draw the arrows that arise along the edges \\
\optionLabel{backwards}{\truefalse}{false}
& whether to reverse right to left \\
+\optionLabel{bird arrow}{\truefalse}{false}
+& whether to use bird style arrows in \(G_2,F_4\).\\
+\optionLabel{Bourbaki arrow}{\truefalse}{false}
+& whether to use Bourbaki style arrows in \(G_2,F_4\). \\
\optionLabel{ceref}{\truefalse}{false}
& whether to draw roots in a ``ceref'' style \\
\optionLabel{Coxeter}{\truefalse}{false}
diff --git a/graphics/pgf/contrib/figchild/README.md b/graphics/pgf/contrib/figchild/README.md
new file mode 100644
index 0000000000..6df7bc327c
--- /dev/null
+++ b/graphics/pgf/contrib/figchild/README.md
@@ -0,0 +1,32 @@
+# figchild
+_figchild: Figures for Creating Children's Activities_
+
+This package was created with the aim of facilitating the work of Elementary School teachers who need to create colorful and attractive activities for their students. It is a product of the Computational Mathematics discipline offered at the Federal University of Viçosa - Campus UFV - Florestal by professor Fernando de Souza Bastos. It makes use of the tikz and xcolor packages.
+
+**Current version:** v1.0.0
+
+## Upcoming changes:
+
+- Adding new images
+- Adding activity templates
+
+## Authors:
+
+Fernando de Souza Bastos, Guilherme Fernandes Castro de Oliveira, José Vitor Novaes Moreira, Jéssica de Mendonça, Gabriel Singh Bruno, Matheus Iago Teixeira da Silva, Erlane Alves Santiago, Ana Carolina de Assis Coelho, Lucas Mendes Viana, Dhavy Alexwander Lopes dos Santos, Vitória Augusta Dutra de Castro Soares, Júlia Letícia Gonçalves Martins, Kethile Alves Fagundes, Luan Moises dos Santos Valadares, Luiz Henrique de Souza Matos, Warley Ribeiro de Freitas, Paula Alves de Freitas, Janaíne Geralda Mesquita Martins, Henrique Ribeiro Diniz
+
+## Maintainer:
+
+Fernando de Souza Bastos
+
+## E-mail:
+
+fernando.bastos@ufv.br
+
+## License
+
+Copyright 2021 by Fernando de Souza Bastos <fernando.bastos@ufv.br>.
+
+Released under the LaTeX Project Public License v1.3c or later. See http://www.latex-project.org/lppl.txt
+
+
+Feature requests, issues and pull requests are welcome. \ No newline at end of file
diff --git a/graphics/pgf/contrib/figchild/figchild.pdf b/graphics/pgf/contrib/figchild/figchild.pdf
new file mode 100644
index 0000000000..c6830b1466
--- /dev/null
+++ b/graphics/pgf/contrib/figchild/figchild.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/figchild/figchild.sty b/graphics/pgf/contrib/figchild/figchild.sty
new file mode 100644
index 0000000000..a388165b73
--- /dev/null
+++ b/graphics/pgf/contrib/figchild/figchild.sty
@@ -0,0 +1,5086 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{figchild}[2021/04/03 Package for creating activities for children]
+
+\RequirePackage{tikz}
+\RequirePackage{xcolor}
+%Definicao de largura e escala da imagem
+\newlength\imagewidthh
+\newlength\imagescaleh
+%Tamanho da Imagem na tela
+\pgfmathsetlength{\imagewidthh}{10cm}
+%escala da imagem para o desenho vetorial
+\pgfmathsetlength{\imagescaleh}{\imagewidthh/100}
+
+%Released under the LaTeX Project Public License v1.3c or later.
+%See \url{http://www.latex-project.org/lppl.txt}.
+%Feature requests, issues and pull requests are welcome.
+
+\newcommand{\version}[3]{
+ version #1.#2.#3
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%##Coruja##%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\owl}[3]{
+
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (162, 411) circle (9cm);
+\draw[draw=#2, line width=#3pt] (121, 426) circle (4cm);
+\draw[draw=#2, line width=#3pt] (200, 426) circle (4cm);
+
+\draw[draw=#2, line width=#3pt, fill] (121, 426) circle (1cm);
+\draw[draw=#2, line width=#3pt, fill] (200, 426) circle (1cm);
+
+\draw[draw=#2, line width=#3pt] (141, 391) -- (179, 391) -- (163, 344) -- cycle;
+\draw[draw=#2, line width=#3pt] (95, 474) -- (94, 531) -- (136, 498);
+\draw[draw=#2, line width=#3pt] (189, 498) -- (229, 528) -- (228, 472);
+
+\draw[draw=#2, line width=#3pt] (79, 375) .. controls (52, 348) and (2, 278) .. (18, 227) ..
+controls (82, 236) and (89, 296) .. (109, 338);
+
+\draw[draw=#2, line width=#3pt] (244, 375) .. controls (272, 344) and (315, 281) .. (303, 231) ..
+controls (243, 247) and (227, 302) .. (212, 336);
+
+\draw[draw=#2, line width=#3pt] (61, 246) .. controls (100, 110) and (223, 110) .. (263, 252);
+
+\draw[draw=#2, line width=#3pt] (122, 156) -- (121, 127) -- (99, 116);
+\draw[draw=#2, line width=#3pt] (121, 127) -- (95, 127) -- (141, 127);
+
+\draw[draw=#2, line width=#3pt] (190, 152) -- (190, 127) -- (221, 127) -- (170, 127);
+\draw[draw=#2, line width=#3pt] (190, 127) -- (215, 116);
+
+\draw[draw=#2, line width=#3pt] (110, 293) -- (120, 300) -- (130, 293) -- (140, 300) -- (150, 293) --
+(160, 300) -- (170, 293) -- (180, 300) -- (190, 293) -- (200, 300) -- (210, 293);
+
+\draw[draw=#2, line width=#3pt] (90, 263) -- (100, 270) -- (110, 263) -- (120, 270) -- (130, 263) -- (140, 270) -- (150, 263) --
+(160, 270) -- (170, 263) -- (180, 270) -- (190, 263) -- (200, 270) -- (210, 263) --
+(220, 270) -- (230, 263);
+
+\draw[draw=#2, line width=#3pt] (90, 233) -- (100, 240) -- (110, 233) -- (120, 240) -- (130, 233) -- (140, 240) -- (150, 233) --
+(160, 240) -- (170, 233) -- (180, 240) -- (190, 233) -- (200, 240) -- (210, 233) --
+(220, 240) -- (230, 233);
+
+\draw[draw=#2, line width=#3pt] (110, 203) -- (120, 210) -- (130, 203) -- (140, 210) -- (150, 203) --
+(160, 210) -- (170, 203) -- (180, 210) -- (190, 203) -- (200, 210) -- (210, 203);
+
+\draw[draw=#2, line width=#3pt] (110, 173) -- (120, 180) -- (130, 173) -- (140, 180) -- (150, 173) --
+(160, 180) -- (170, 173) -- (180, 180) -- (190, 173) -- (200, 180) -- (210, 173);
+
+\end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#####Bell####%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\bell}[3]{
+
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (210, 421) ellipse (3cm and 2cm);
+
+\draw[draw=#2, line width=#3pt] (210, 402) .. controls (69, 410) and (165, 195) .. (33.5, 99);
+\draw[draw=#2, line width=#3pt] (210, 402) .. controls (341, 420) and (260, 190) .. (384, 99);
+
+
+\draw[draw=#2, line width=#3pt] (209, 90) ellipse (18cm and 4cm);
+\draw[draw=#2, line width=#3pt] (205, 109) ellipse (3cm and 2cm);
+
+\end{tikzpicture}
+
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#####Book####%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\book}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (61,216) -- (40,215) -- (40,29)-- (168,40) .. controls (186, 25) and (230, 35) .. (227, 40) --(355,27) -- (352,219) -- (330,220);
+\draw[draw=#2, line width=#3pt] (58,205)--(58,43) -- (81,81) .. controls (134, 86) and (175,101) .. (197, 50) .. controls (200, 81) and (245,89) .. (315, 78.8) --(335,46);
+\draw[draw=#2, line width=#3pt] (58,43) -- (178,50) .. controls (180, 38.5) and (210, 38.5) .. (219,50) --(335,46) --(336,205) -- (318,241) .. controls (264, 250) and (209, 255) .. (198, 225) .. controls (180, 250) and (127, 260) .. (78, 240) --(58,205);
+\draw[draw=#2, line width=#3pt] (197,50) -- (198,225);
+\draw[draw=#2, line width=#3pt] (78,240) -- (81,81);
+\draw[draw=#2, line width=#3pt] (318,241) -- (315,78.8);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#####dino####%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\dino}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt] (60,178) ellipse (4cm and 3cm);
+\draw[draw=#2, line width=#3pt,rotate=20] (130,155) arc(270:190:18);
+\draw[draw=#2, line width=#3pt] (40,152) arc(270:360:6);
+\draw[draw=#2, line width=#3pt] (200,105) ellipse (12.4cm and 7.3cm);
+
+\draw[draw=#2, line width=#3pt] (98,169) -- (110.5,155);
+\draw[draw=#2, line width=#3pt] (73,150) -- (86,134);
+
+\draw[draw=#2, line width=#3pt] (86,77) .. controls (50, 30) and (110, 30) .. (119, 45);
+\draw[draw=#2, line width=#3pt] (118,51) .. controls (120, 30) and (140, 2) .. (162, 36);
+\draw[draw=#2, line width=#3pt] (224,34) .. controls (230,20) and (245,-3) .. (271, 38);
+\draw[draw=#2, line width=#3pt] (268,44) .. controls (275,30) and (320,-2.8) .. (310,71);
+
+\draw[draw=#2, line width=1pt] (47,199) -- (43,190) --(50,194) --(52,185) --(56,190) --(59,182) --(64,189) --(68,183) --(69,190);
+\draw[draw=#2, line width=#3pt] (144,170)--(156,202) -- (176,177) --(190,206) --(209,179) --(224,205) --(239,175) -- (261,201) --(270,166) -- (297,186) --(298,150);
+
+
+\draw[draw=#2, line width=#3pt] (76,60)--(66,58) --(74,55) --(69,44) -- (79,42) --(77,33) --(86,37) --(91,29) --(96,37);
+\draw[draw=#2, line width=#3pt] (124,32)--(117,19) --(129,25) --(129,13) -- (138,20) --(143,11) --(148,22) --(159,15) --(156,29);
+\draw[draw=#2, line width=#3pt] (226,29)--(218,20) --(233,19) --(229,7) -- (240,15) --(242,6) --(248,15) --(258,7) --(256,21);
+\draw[draw=#2, line width=#3pt] (281,30)--(281,19) --(290,26) --(299,16) -- (300,25) --(311,23) --(309,33) --(319,35) --(310,43);
+
+
+\draw[draw=#2, line width=#3pt] (309,138) .. controls (328, 146) and (350, 157) .. (379, 180);
+\draw[draw=#2, line width=#3pt] (323,94) .. controls (335, 135) and (354, 155) .. (379, 180);
+
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####abobora###%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\pumpkin}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt] (152,268) .. controls (156, 266) and (162, 269) ..(167,264) .. controls (194, 268) and (219, 266) ..(235,262).. controls (245, 268) and (246, 267) ..(250,266).. controls (400, 330) and (415, 40) ..(316,46).. controls (305, 33) and (278, 27) ..(262,40).. controls (258, 34) and (236, 35) ..(228,41)
+.. controls (216, 25) and (188, 25) ..(177,40).. controls (169,35) and (150, 32) ..(138,40).. controls (126, 34) and (97, 40) ..(88,48).. controls (0, 30) and (0, 327) ..(152,268);
+
+\draw[draw=#2, line width=#3pt,] (143,270) .. controls (153,285) and (196, 287) ..(205,279) ;
+\draw[draw=#2, line width=#3pt,fill=black] (199,266) .. controls (234,304) and (205, 375) ..(170,346) .. controls (166,342) and (154, 311) ..(184,330) .. controls (199,330) and (190, 280) ..(148,300)
+ .. controls (115,390) and (280, 415) ..(219,265);
+ \draw[draw=#2, line width=#3pt] (220,270).. controls (234,288) and (255, 287) ..(268,272) ;
+
+ \draw[draw=#2, line width=#3pt] (50,238).. controls (78,260) and (70, 150) ..(102,228).. controls (107,239) and (117, 239) ..(119,234) ;
+\draw[draw=#2, line width=#3pt] (119,237) parabola bend (143,200) (162,230);
+\draw[draw=#2, line width=#3pt] (183,237) parabola bend (200,200) (217,230);
+\draw[draw=#2, line width=#3pt] (241,234) parabola bend (258,200) (280,230);
+\draw[draw=#2, line width=#3pt] (300,233) parabola bend (319,200) (334,230) .. controls (335,231) and (336, 235) ..(353,241) ;
+
+\draw[draw=#2, line width=#3pt] (162,230) parabola bend (172,238) (183,235);
+\draw[draw=#2, line width=#3pt] (217,230) parabola bend (227,237) (241,234);
+\draw[draw=#2, line width=#3pt] (280,230) parabola bend (288,236) (300,233);
+%linha2
+\draw[draw=#2, line width=#3pt] (49,169) parabola bend (68,131) (85,169);
+\draw[draw=#2, line width=#3pt] (106,169) parabola bend (128,133) (145,169);
+\draw[draw=#2, line width=#3pt] (165,167) parabola bend (187,130) (207,169);
+\draw[draw=#2, line width=#3pt] (229,166) parabola bend (244,130) (264,165);
+\draw[draw=#2, line width=#3pt] (283,166) parabola bend (303,130) (320,168);
+\draw[draw=#2, line width=#3pt] (344,163) parabola bend (360,131) (378,150);
+
+\draw[draw=#2, line width=#3pt] (29,169) parabola bend (38,174) (49,169);
+\draw[draw=#2, line width=#3pt] (106,169) parabola bend (98,175) (85,169);
+\draw[draw=#2, line width=#3pt] (165,167) parabola bend (152,173) (145,169);
+\draw[draw=#2, line width=#3pt] (229,166) parabola bend (216,172) (207,165);
+\draw[draw=#2, line width=#3pt] (283,166) parabola bend (272,175) (264,165);
+\draw[draw=#2, line width=#3pt] (344,163) parabola bend (331,175) (320,168);
+
+%linha3
+\draw[draw=#2, line width=#3pt] (32,106) parabola bend (63,67) (80,97);
+\draw[draw=#2, line width=#3pt] (98,97) parabola bend (115,67) (135,97);
+\draw[draw=#2, line width=#3pt] (158,97) parabola bend (175,67) (195,97);
+\draw[draw=#2, line width=#3pt] (219,97) parabola bend (235,67) (251,97);
+\draw[draw=#2, line width=#3pt] (275,97) parabola bend (295,67) (310,97);
+\draw[draw=#2, line width=#3pt] (342,78) parabola bend (356,65) (356,65);
+
+\draw[draw=#2, line width=#3pt] (80,97) parabola bend (89,104) (98,97);
+\draw[draw=#2, line width=#3pt] (157,97) parabola bend (150,106) (135,97);
+\draw[draw=#2, line width=#3pt] (218,97) parabola bend (206,106) (195,97);
+\draw[draw=#2, line width=#3pt] (275,97) parabola bend (264,106) (251,97);
+\draw[draw=#2, line width=#3pt] (342,78) parabola bend (324,106) (310,97);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####coroa###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+
+\newcommand{\crown}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt,fill=black] (51,171)--(81,107) .. controls (147, 122) and (232, 132) .. (328, 108) --(354,175);
+\draw[white,line width=0.0005pt,fill=black] (51,170) --(125,180)--(212,211) --(291,174);
+
+
+\draw[draw=#2, line width=#3pt](50,182) circle (1cm) ;
+\draw[draw=#2, line width=#3pt,fill=white] (58,176) .. controls (87, 140) and (130, 85) .. (119, 180);
+
+\draw[draw=#2, line width=#3pt,](120,190) circle (1cm) ;
+\draw[draw=#2, line width=#3pt,fill=white] (128,184) .. controls (140, 143) and (185, 65) .. (200, 210);
+
+\draw[draw=#2, line width=#3pt](204,220) circle (1cm) ;
+\draw[draw=#2, line width=#3pt] (128,184) .. controls (140, 143) and (185, 65) .. (200, 210);
+
+\draw[draw=#2, line width=#3pt](281,190) circle (1cm) ;
+\draw[draw=#2, line width=#3pt,fill=white] (210,212) .. controls (206, 147) and (233, 80) .. (275, 183);
+
+\draw[draw=#2, line width=#3pt](352,185) circle (1cm) ;
+\draw[draw=#2, line width=#3pt,fill=white] (284,180) .. controls (283, 135) and (280, 75) .. (348, 176);
+
+\draw[draw=#2, line width=#3pt,fill=white](86,122) circle (0.5cm) ;
+\draw[draw=#2, line width=#3pt,fill=white](135,135) circle (0.5cm) ;
+\draw[draw=#2, line width=#3pt,fill=white](201,141) circle (0.5cm) ;
+\draw[draw=#2, line width=#3pt,fill=white](270,132) circle (0.5cm) ;
+\draw[draw=#2, line width=#3pt,fill=white](320,122) circle (0.5cm) ;
+
+\draw[draw=#2, line width=#3pt](81,107)--(98,52);
+\draw[draw=#2, line width=#3pt] (197,55) ellipse (10cm and 2 cm);
+\draw[draw=#2, line width=#3pt](295,52)--(328,108);
+
+
+\draw[fill=black, line width=#3pt] (107,99) circle (0.5cm);
+\draw[fill=black, line width=#3pt] (131,105) circle (0.5cm);
+\draw[fill=black, line width=#3pt] (151,110) circle (0.5cm);
+\draw[fill=black, line width=#3pt] (169,112) circle (0.5cm);
+\draw[fill=black, line width=#3pt] (192,114) circle (0.5cm);
+\draw[fill=black, line width=#3pt] (215,113) circle (0.5cm);
+\draw[fill=black, line width=#3pt] (239,112) circle (0.5cm);
+\draw[fill=black, line width=#3pt] (265,107) circle (0.5cm);
+\draw[fill=black, line width=#3pt] (288,103) circle (0.5cm);
+
+\draw[fill=black, line width=#3pt] (115,79) circle (0.5cm);
+\draw[fill=black, line width=#3pt] (138,86) circle (0.5cm);
+\draw[fill=black, line width=#3pt] (160,92) circle (0.5cm);
+\draw[fill=black, line width=#3pt] (180,93) circle (0.5cm);
+\draw[fill=black, line width=#3pt] (201,95) circle (0.5cm);
+\draw[fill=black, line width=#3pt] (223,92) circle (0.5cm);
+\draw[fill=black, line width=#3pt] (244,92) circle (0.5cm);
+\draw[fill=black, line width=#3pt] (265,85) circle (0.5cm);
+\draw[fill=black, line width=#3pt] (288,80) circle (0.5cm);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%####spinning###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\spinning}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2, line width=#3pt,fill=black] (207,428) ellipse (3.5cm and 2.8cm);
+
+\draw[draw=#2, line width=#3pt,fill=white] (79,312) .. controls (121,446) and (308,439) ..(347,308);
+\draw[draw=#2, line width=#3pt,fill=black] (79,312) .. controls (151,362) and (286,368) ..(347,308) .. controls (351,303) and (349,291) ..(347,281) .. controls (304,335) and (136,360) ..(78,287)
+ .. controls (76,294) and (81,319) ..(79,312);
+
+\draw[draw=#2, line width=#3pt,fill=black] (78,287) .. controls (80,271) and (92,245) ..(106,229).. controls (130,284) and (287,289) ..(323,234).. controls (327,232) and (331,238) ..(331,241).. controls (294,310) and (148,320) ..(97,245);
+
+\draw[draw=#2, line width=#3pt] (328,234).. controls (333,243) and (348,269) ..(347,281);
+
+\draw[draw=#2, line width=#3pt,fill=black] (200,95).. controls (203,70) and (205,50) ..(210,24).. controls (215,49) and (220,73) ..(220,95);
+\draw[draw=#2, line width=#3pt,fill=white] (105,230) --(209,82) --(330,238);
+\draw[draw=#2, line width=#3pt,fill=black] (133,188).. controls (157,251) and (266,272) ..(287,185) .. controls (286,183) and (282,178) ..(281,177).. controls (267,226) and (160,250) ..(145,172).. controls (139,180) and (134,186) ..(133,188);
+
+\end{tikzpicture}
+}
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%####alligator###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\alligator}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2, line width=#3pt] (99,111).. controls (81,99) and (85,86) ..(35,93)-- (40,86).. controls (69,79) and (105,89) ..(121,98).. controls (117,106) and (98,112) ..(80,115)
+.. controls (76,126) and (68,130) ..(60,134) --(44,148).. controls (54,158) and (64,150) ..(68,138).. controls (78,143) and (86,139) ..(91,137)
+.. controls (118,135) and (130,131) ..(143,116);
+\draw[rotate=-40,draw=#2, line width=#3pt,fill] (-25,92) rectangle (-33,86);
+
+\draw[draw=#2, line width=#3pt] (36,82).. controls (133,44) and (194,76) ..(242,102);
+
+
+\draw[draw=#2, line width=#3pt] (242,102).. controls (243,64) and (229,85) ..(223,46) --(234,51) --(241,35)--(246,56)--(257,31)--(260,47)--
+(267,36)--(272,63)--(279,51)--(274,78).. controls (278,91) and (283,112) ..(280,124)--(315,144).. controls (327,131) and (307,116) ..(299,101)--
+(308,103)--(312,90) -- (316,102) -- (330,86) -- (331,99) --(339,87) --(342,113) --(346,104) --(345,123).. controls (353,146) and (370,195) ..(331,198)
+.. controls (337,354) and (222,321) ..(165,320).. controls (149,328) and (126,344) ..(107,345).. controls (125,326) and (141,300) ..(159,300).. controls (223,286) and (268,299) ..(292,230)--
+(281,233)--(275,209)--(255,216)--(246,199)--(226,196) --(215,180) --(202,185) --(190,164) --(177,168)--(166,156)--(152,154).. controls (145,139) and (143,128) ..(135,125);
+
+\draw[draw=#2, line width=#3pt] (154,114) --(164,114)--(175,130)--(185,122) --(201,146) --(223,137) --( 229,157) --(247,150) --(257,170) --(274,165) --(285,182) --(297,173)--(307,196)--(321,191);
+
+\draw[ draw=#2, line width=#3pt] (110,126).. controls (110,116) and (116,116) ..(123,116).. controls (123,123) and (116,124) ..(110,126);
+\draw[fill=black] (116,120) circle (0.3cm);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####bee###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\bee}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2, line width=#3pt] (146,339) .. controls (130, 459) and (265, 413) .. (233, 338) .. controls (265, 327) and (259, 295) .. (230, 275)
+ .. controls (291, 234) and (302, 100) .. (201,54) --(189,24) --(174,54) .. controls (90, 90) and (78, 228) .. (145,277) .. controls (125, 285) and (104, 326) .. (146, 339);
+
+\draw[fill=black] (175,360) circle (1cm);
+\draw[fill=black] (212,360) circle (1cm);
+
+\draw[draw=#2, line width=#3pt] (149,311) .. controls (172, 281) and (221, 282) .. (236, 311);
+\draw[draw=#2, line width=#3pt] (145,277) .. controls (170, 267) and (201, 264) .. (230, 275);
+
+\draw[draw=#2, line width=#3pt] (239,267) .. controls (328, 378) and (475, 150) .. (268, 125);
+\draw[draw=#2, line width=#3pt] (112,123) .. controls (-65, 161) and (4, 353) .. (137, 270);
+
+
+
+\draw[draw=#2, line width=#3pt] (206,409) .. controls (327, 521) and (270, 320) .. (243, 417) .. controls (307, 390) and (250, 457) .. (221, 401);
+\draw[draw=#2, line width=#3pt] (166,407) .. controls (100, 507) and (80,340) .. (140, 412).. controls (87, 409) and (133, 454) .. (158, 402);
+
+
+\draw[draw=#2, line width=#3pt,fill=black] (105,212) .. controls (156, 235) and (242, 225) .. (271, 213)--(276,190).. controls (206, 213) and (156, 215) .. (103, 192);
+\draw[draw=#2, line width=#3pt,fill=black] (101,170) .. controls (156, 205) and (242, 200) .. (276, 166)--(274,151).. controls (206, 193) and (156, 180) .. (105, 151);
+\draw[draw=#2, line width=#3pt,fill=black] (109,132) .. controls (156, 175) and (242, 168) .. (271,134)--(265,119).. controls (206, 163) and (156, 145) .. (114, 118);
+\draw[draw=#2, line width=#3pt,fill=black] (126,95) .. controls (156, 140) and (242, 130) .. (254, 98)--(245,87).. controls (206, 115) and (156, 115) .. (135, 82);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%####squirrel###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\squirrel}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+\draw[draw=#2, line width=#3pt] (128,272) .. controls (127, 251) and (99, 245) .. (91, 264) .. controls (85, 290) and (103, 307) .. (131, 299) .. controls (170, 279) and (176, 222) .. (125, 206)
+ .. controls (55, 180) and (12, 288) .. (82, 335) .. controls (147, 380) and (215, 346) .. (218, 258) .. controls (220, 252) and (222, 249) .. (222, 245);
+
+\draw[draw=#2, line width=#3pt] (112,203) .. controls (114,177) and (102, 147) .. (117, 111) .. controls (122,99) and (148, 58) .. (174, 51).. controls (138,103) and (185, 170) .. (224,216);
+
+\draw[draw=#2, line width=#3pt] (174,51) .. controls (175,46) and (181, 43) .. (191, 34) .. controls (160,183) and (300, 145) .. (265, 41)--(283,32)--(291,13)--(201,17)
+.. controls (199,26) and (195, 30) .. (191, 34);
+
+\draw[draw=#2, line width=#3pt] (291,13)--(322,18) .. controls (316,39) and (300, 38) .. (292, 44);
+
+\draw[draw=#2, line width=#3pt] (283,33) .. controls (315,59) and (300,122) .. (297, 137);
+
+
+\draw[draw=#2, line width=#3pt] (231,145) .. controls (275,128) and (325, 128) .. (327, 180) .. controls (308,176) and (287, 168) .. (274, 177)
+ .. controls (271,177) and (251, 191) .. (240,177);
+
+\draw[draw=#2, line width=#3pt] (290,172) .. controls (288,177) and (287, 181) .. (287, 184);
+
+\draw[draw=#2, line width=#3pt] (288,180) .. controls (299,179) and (313,183) .. (327,190) .. controls (333,188) and (343,173) .. (324,163);
+
+
+\draw[draw=#2, line width=#3pt] (269,187) .. controls (315,173) and (330,204) .. (335, 230) .. controls (317,249) and (282,275) .. (266, 272)
+.. controls (251,267) and (241,254) .. (236, 246);
+
+\draw[fill=black] (271,239) circle (0.3cm);
+\draw[fill=black] (285,259) circle (0.3cm);
+
+\draw[draw=#2, line width=#3pt] (291,206) .. controls (300,200) and (311,199).. (321,199);
+
+\draw[draw=#2, line width=#3pt] (327,205) .. controls (328,219) and (328,223).. (327,228);
+
+\draw[fill=black] (324,229) ellipse (0.4cm and 0.2cm);
+\draw[fill=black] (331,229) ellipse (0.4cm and 0.2cm);
+
+\draw[draw=#2, line width=#3pt] (240,243) .. controls (209,247) and (231, 246) .. (222,244) .. controls (201,238) and (216, 221) .. (224,215)
+ .. controls (242,215) and (246, 221) .. (249,227);
+
+\draw[draw=#2, line width=#3pt] (238,238) .. controls (220,254) and (229,204) .. (244, 229);
+
+\draw[draw=#2, line width=#3pt] (276,270) .. controls (297,288) and (241,328) .. (253, 268);
+\draw[draw=#2, line width=#3pt] (268,276) .. controls (290,278) and (245,308) .. (259, 272);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####hippo###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\hippo}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2, line width=#3pt] (101,160).. controls (137,83) and (260,62) ..(289,162);
+\draw[draw=#2, line width=#3pt] (92,359).. controls (50,309) and (20,122) ..(135,34).. controls (172,19) and (237,2) ..(280,54)
+.. controls (349,147) and (360,175) ..(308,359).. controls (319,410) and (275,503) ..(239,509).. controls (203,525) and (164,512) ..(139,501)
+.. controls (103,460) and (76,398) ..(92,359);
+
+\draw[draw=#2, line width=#3pt] (127,414).. controls (144,440) and (157,441) ..(170,436);
+\draw[draw=#2, line width=#3pt] (223,435).. controls (247,440) and (258,427) ..(270,413);
+
+\draw[draw=#2, line width=#3pt] (104,230) circle (1cm);
+\draw[draw=#2, line width=#3pt] (288,230) circle (1cm);
+
+\draw[draw=#2, line width=#3pt] (104,239)--(88,249).. controls (96,253) and (106,257) ..(113,257);
+\draw[draw=#2, line width=#3pt] (295,238)--(304,248).. controls (300,261) and (289,258) ..(284,257);
+
+\draw[draw=#2, line width=#3pt] (162,375) ellipse (2.0cm and 3.5cm);
+\draw[draw=#2, line width=#3pt] (234,375) ellipse (2.0cm and 3.5cm);
+
+\draw[draw=#2, line width=#3pt,fill=black] (162,365) circle (1.8cm);
+\draw[draw=#2, line width=#3pt,fill=black] (234,365) circle (1.8cm);
+
+
+\draw[draw=#2, line width=#3pt] (115,466).. controls (81,492) and (83,513) ..(83,530).. controls (127,517) and (131,506) ..(138,496);
+\draw[draw=#2, line width=#3pt] (257,496).. controls (274,525) and (293,536) ..(312,528) .. controls (309,493) and (295,475) ..(282,465);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%###elephant#%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\elephant}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2, line width=#3pt] (158,254) .. controls (213, 254) and (242, 265) .. (318, 226) .. controls (323, 214) and (325, 207) .. (325, 184)
+ .. controls (310, 116) and (288, 71) .. (273,47)--(277,39);
+
+\draw[draw=#2, line width=#3pt,fill=black] (277,39) .. controls (280, 35) and (280, 31) .. (278,27) .. controls (266, 28) and (243, 29) .. (235,34)
+.. controls (236, 37) and (238, 40) .. (242,46) .. controls (278, 25) and (275, 51) .. (277,39);
+
+\draw[draw=#2, line width=#3pt] (242,46) .. controls (255, 71) and (261, 104) .. (258,120).. controls (255, 121) and (261, 100) .. (190,136)
+ .. controls (198, 105) and (205, 91) .. (208,50);
+
+\draw[draw=#2, line width=#3pt,fill=black] (208,50) .. controls (211, 45) and (208, 40) .. (207,36) .. controls (198, 34) and (177, 34) .. (170,39)
+.. controls (171, 43) and (172, 46) .. (174,52) .. controls (178, 47) and (197, 47) .. (208,50);
+
+\draw[draw=#2, line width=#3pt] (174,52) .. controls (184, 70) and (169, 90) .. (156,99);
+\draw[draw=#2, line width=#3pt] (147,56) .. controls (151, 78) and (163, 131) .. (177,146);
+
+
+\draw[draw=#2, line width=#3pt,fill=black] (147,56) .. controls (148, 54) and (152, 51) .. (150,47).. controls (139, 42) and (115, 46) .. (103,50)
+ .. controls (109, 58) and (105, 56) .. (111,61).. controls (122, 56) and (133, 55) .. (149,59);
+
+\draw[draw=#2, line width=#3pt] (111,61) .. controls (119, 85) and (128, 133) .. (124,168);
+
+\draw[draw=#2, line width=#3pt] (111,246) .. controls (127, 258) and (141, 265) .. (158,254) .. controls (168, 250) and (174, 246) .. (181,239)
+ .. controls (181, 226) and (181, 226) .. (156,182) .. controls (144, 175) and (132, 170) .. (124,168) .. controls (114, 164) and (110, 167) .. (104,171)
+ .. controls (93,170) and (87, 167) .. (73,160) .. controls (67, 149) and (43, 129) .. (13,118) .. controls (39, 140) and (59, 156) .. (63,167);
+
+\draw[fill=black] (83,210) circle (0.8cm) ;
+
+ \draw[draw=#2, line width=#3pt] (62,146)--(59,114) .. controls (59, 105) and (67, 104) .. (69,109) .. controls (65,95) and (75, 94) .. (70,96)
+ .. controls (57, 91) and (45, 91) .. (43,129);
+
+\draw[draw=#2, line width=#3pt] (43,145) .. controls (49, 210) and (68, 267) .. (112,249);
+
+\draw[draw=#2, line width=#3pt] (317,153) .. controls (328, 130) and (325, 113) .. (327,96) .. controls (335, 79) and (336, 76) .. (339,54);
+
+\draw[draw=#2, line width=#3pt,fill=black] (339,54) --(342,42) .. controls (330, 37) and (305, 35) .. (299,42)--(304,51) ..
+controls (311, 47) and (326, 48) .. (339,54) ;
+
+\draw[draw=#2, line width=#3pt] (304,51) .. controls (312, 64) and (303, 80) .. (295,81);
+
+\draw[draw=#2, line width=#3pt] (325,187) .. controls (335, 156) and (342, 129) .. (356,120).. controls (358, 117) and (358, 113) .. (353,113)
+.. controls (325, 126) and (342, 129) .. (321,169);
+
+\draw[draw=#2, line width=#3pt] (353,113) --(377,140);
+\draw[draw=#2, line width=#3pt] (353,113) --(383,132);
+\draw[draw=#2, line width=#3pt] (353,113) --(384,123);
+\draw[draw=#2, line width=#3pt] (353,113) --(380,109);
+\draw[draw=#2, line width=#3pt] (353,113) --(361,95);
+\draw[draw=#2, line width=#3pt] (353,113) --(351,90);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%###Rose###%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\rose}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (159,193) .. controls(141,193) and (113,200) ..(96,212);
+\draw[draw=#2, line width=#3pt] (96,212) .. controls(73,240) ..(60,288);
+\draw[draw=#2, line width=#3pt] (60,288) .. controls(61,321) and (78,346) ..(109,385);
+\draw[draw=#2, line width=#3pt] (109,385) .. controls(118,404) ..(116,428);
+ \draw[draw=#2, line width=#3pt] (116,428) .. controls (134,431) and (154,419) ..(166,386);
+ \draw[draw=#2, line width=#3pt] (149,414) .. controls (162,431) and (178,420) ..(190,408);
+ \draw[draw=#2, line width=#3pt] (159,193) .. controls (140,214) and (131,245) ..(130,298);
+\draw[draw=#2, line width=#3pt] (130,298).. controls (136,333) and (163,392) ..(211,420);
+\draw[draw=#2, line width=#3pt] (211,420).. controls (241,399) and (264,347) ..(261,250);
+\draw[draw=#2, line width=#3pt] (261,250).. controls (240,212) and (227,195) ..(185,189);
+\draw[draw=#2, line width=#3pt] (185,189).. controls (169,190) and (164,193) ..(157,193);
+\draw[draw=#2, line width=#3pt] (220,413) -- (243,425);
+\draw[draw=#2, line width=#3pt] (243,425) -- (248,410);
+\draw[draw=#2, line width=#3pt] (233,394).. controls (248,410) and (270,419) ..(294,419);
+\draw[draw=#2, line width=#3pt] (294,419).. controls (290,388) and (291,367) ..(297,339);
+\draw[draw=#2, line width=#3pt] (297,339).. controls (309,268) and (312,256) ..(298,227);
+\draw[draw=#2, line width=#3pt] (298,227).. controls (277,206) and (246,190) ..(222,201);
+\draw[draw=#2, line width=#3pt] (173,191).. controls (167,130) and (164,98) ..(166,63);
+\draw[draw=#2, line width=#3pt] (185,190).. controls (178,134) and (176,105) ..(175,67) -- (166,63);
+\draw[draw=#2, line width=#3pt] (177,105).. controls (205,131) and (251,162) ..(296,157);
+\draw[draw=#2, line width=#3pt] (296,157).. controls (269,105) and (202,76) ..(175,83);
+\draw[draw=#2, line width=1pt] (189,98).. controls (221,110) and (244,125) ..(265,141);
+\draw[draw=#2, line width=#3pt] (164,89).. controls (123,95) and (87,134) ..(73,176);
+\draw[draw=#2, line width=#3pt] (73,176).. controls (115,172) and (149,156) ..(168,131);
+\draw[draw=#2, line width=1pt] (154,116).. controls (125,138) and (110,150) ..(96,164);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####icecream###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\icecream}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (117,348) -- (196,37) -- (274,348);
+\draw[draw=#2, line width=#3pt] (274,348) .. controls (218,333) and (146,332) .. (117,348);
+\draw[draw=#2, line width=#3pt] (117,348) .. controls (96,371) and (71,425) .. (114,438);
+\draw[draw=#2, line width=#3pt] (114,438) .. controls (89,448) and (121,476) .. (147,480);
+\draw[draw=#2, line width=#3pt] (147,480) .. controls (101,500) and (213,530) .. (177,557);
+\draw[draw=#2, line width=#3pt] (177,557) .. controls (210,545) and (245,533) .. (229,509);
+\draw[draw=#2, line width=#3pt] (229,509) .. controls (261,497) and (273,479) .. (262,458);
+\draw[draw=#2, line width=#3pt] (262,458) .. controls (310,456) and (298,415) .. (282,399);
+\draw[draw=#2, line width=#3pt] (282,399) .. controls (307,379) and (286,354) .. (274,348);
+\end{tikzpicture}
+}
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####fish###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\fish}[3]{
+
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2,line width=#3pt](160,145) ellipse(16cm and 13cm);
+\draw[draw=#2,line width=#3pt](280,220) arc(-63:180:50);
+\draw[draw=#2,line width=#3pt](280,178) ellipse(8cm and 5cm);
+\draw[draw=#2,line width=5pt](237,136)--(194,18);
+\draw[draw=#2,line width=5pt](210,153)--(159,17);
+\draw[draw=#2,line width=5pt](253,250)--(244,221);
+\draw[draw=#2,line width=5pt](165,275)--(92,29);
+\draw[draw=#2,line width=#3pt](67,190) ellipse(1.9cm and 3cm);
+\draw[draw=#2,line width=#3pt](49,186)--(78,166);
+\draw[draw=#2,line width=#3pt](1,150)--(46,126);
+\draw[draw=#2,line width=#3pt](295,76)--(361,80);
+\draw[draw=#2,line width=#3pt](364,81)--(314,111);
+\end{tikzpicture}
+
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####boat###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\boat}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width = 3pt ] (187,149) -- (187,383) -- (202,383) -- (202,149); %mastro
+
+\draw[draw=#2, line width = 3pt ] (27,149) -- (375,149) .. controls (320,30) and (80,30) .. (27,149); %casco
+
+\draw[draw=#2, line width = 3pt ] (187,313) .. controls (161,274) and (128,202).. (107,150);
+\draw[draw=#2, line width = 3pt ] (292,150) .. controls (222,340) and (270,222) .. (202,375); %velas
+\end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####house###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\house}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width = 3pt ] (82,160) -- (82,25) -- (219,17) -- (363,40) -- (363,170);
+\draw[draw=#2, line width = 3pt ] (218,17) -- (220,155); %paredes
+
+\draw[draw=#2, line width = 3pt ] (383,173) -- (218,154) -- (150,250) -- (83,158) -- (33,158) -- (145,297) -- (305,295) -- (383,173); %telhado
+
+\draw[draw=#2, line width = 3pt ] (115,25) -- (117,117) -- (162,117) -- (163,22); %porta
+
+\draw[draw=#2, line width = 3pt ] (264,87) -- (334,96) -- (334,143) -- (264,133) -- (264,87);
+\draw[draw=#2, line width = 3pt ] (263,109) -- (333,119);
+\draw[draw=#2, line width = 3pt ] (297,138) -- (297,92); % janela
+
+\draw[draw=#2,line width=#3pt] (150,70) circle (0.5cm); %maçaneta
+
+\end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####gnat###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\gnat}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2,line width=#3pt] (215,258) circle (4cm);
+\draw[draw=#2,line width=#3pt] (274,204) circle (4cm);
+\draw[draw=#2,line width=#3pt] (225,250) circle (1.5cm);
+\draw[draw=#2,line width=#3pt] (264,210) circle (1.5cm); %olhos
+
+\draw[draw=#2, line width = 3pt ](175,250) .. controls(-30,130) and(150,-30) .. (260,165) ; %corpo
+
+\draw[draw=#2, line width = 3pt ] (153,238) -- (113,314) .. controls (80,300) and (25,240) .. (16,192) -- (96,180);
+\draw[draw=#2, line width = 3pt ] (252,152) -- (345,146) .. controls (330,60) and (275,30) .. (253,20) -- (212,104); %asas
+
+\draw[draw=#2, line width = 3pt ] (245,283) .. controls (280,340) and (240,400) .. (193,357);
+\draw[draw=#2, line width = 3pt ] (290,240) .. controls (345,280) and (400,230) .. (365,185); %antenas
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####fan###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\fan}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2,line width=#3pt] (186,273) circle (3.8cm);
+\draw[draw=#2,line width=#3pt] (186,273) circle (5cm);
+\draw[draw=#2,line width=#3pt] (186,273) circle (8cm);
+\draw[draw=#2,line width=#3pt] (186,273) circle (11cm);
+\draw[draw=#2,line width=#3pt] (186,273) circle (14cm);
+\draw[draw=#2,line width=#3pt] (186,273) circle (17cm); %grade
+
+\draw[draw=#2, line width = 3pt ] (175,236) -- (175,63) -- (200,63) -- (200,236); % aste
+
+\draw[draw=#2,line width=#3pt] (188,43) ellipse (50 and 20); %suporte
+
+\draw[draw=#2, line width = 3pt ] (161,244) -- (113,180) .. controls (81,195) and (60,228) .. (67,262) -- (147,271);
+\draw[draw=#2, line width = 3pt ] (171,308) -- (142,379) .. controls (160,400) and (215,400) .. (235,377) -- (203,306);
+\draw[draw=#2, line width = 3pt ] (210,243) -- (257,182) .. controls (290,190) and (310,230) .. (305,262) -- (223,272);% hélices
+
+\end{tikzpicture}
+}
+
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####cupcake###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\cupcake}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width = 3pt ] (61,184) -- (73,106) .. controls (126,33) and (237,30) .. (296,106) -- (316,206) ;
+\draw[draw=#2, line width = 3pt ] (84,94) -- (75,184);
+\draw[draw=#2, line width = 3pt ] (115,69) -- (105,194);
+\draw[draw=#2, line width = 3pt ] (144,56) -- (139,209);
+\draw[draw=#2, line width = 3pt ] (180,51) -- (180,192);
+\draw[draw=#2, line width = 3pt ] (216,55) -- (222,199);
+\draw[draw=#2, line width = 3pt ] (244,65) -- (267,218);
+\draw[draw=#2, line width = 3pt ] (274,85) -- (296,213); %forma
+
+\draw[draw=#2, line width = 3pt ] (171,197) .. controls (191,183) and (207,183) .. (221,198) .. controls (265,230) and (286,215) .. (317,206) .. controls (360,210) and (370,280) .. (269,326) .. controls (237,336) and (195,338) .. (166,333) .. controls (120,320) and (65,285) .. (40,267) ..controls (6,225) and (40,193) .. (61,184) ;
+\draw[draw=#2, line width = 3pt ](61,184) .. controls (92,184) and (101,190) .. (106,195) .. controls (144,217) and (157,210) .. (171,197); %cobertura
+
+\end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####flamingo###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\flamingo}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[fill = black] (117,369) circle (1cm); % olho
+
+\draw[draw=#2, line width = 3pt ] (80,357) .. controls (50,352) and (37,339) .. (38,289) .. controls (41,275) and (50,273) .. (54,289) .. controls (58,313) and (77,320) .. (85,319) ; %bico
+
+\draw[draw=#2, line width = 3pt ] (180,92) -- (179,53) -- (144,50) -- (176,49) -- (152,39) -- (186,46) -- (208,46) -- (190,52) -- (189,91);
+\draw[draw=#2, line width = 3pt ] (251,95) -- (249,52) -- (232,45) -- (258,45) -- (287,39) -- (265,50) -- (295,51) -- (260,53) -- (260,96); %pés
+
+\draw[draw=#2, line width = 3pt ] (80,357) .. controls (91,403) and (144,415) .. (166,372) .. controls (180,339) and (143,290) .. (161,263) .. controls (194,299) and (263,295) .. (293,257) .. controls(328,259) and (339,262) .. (345,264) .. controls (349,254) and (339,248) .. (330,246) -- (353,247) .. controls (350,238) and (332,237) .. (327,237) -- (313,227) .. controls (352,227) and (365,245) .. (371,261) .. controls (378,138) and (311,117) .. (259,96) .. controls (70,60) and (95,220) .. (111,265) .. controls(119,300) and (98,313) .. (85,319); %corpo
+
+\end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####bonnet###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\bonnet}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2,line width=#3pt] (28,184) .. controls (46,115) and (113,90) .. (169,100) .. controls (295,140) and (290,192) .. (298,210) .. controls (312,296) and (256,350) .. (183,347) .. controls (66,350) and (20,287) .. (28,184);
+\draw[draw=#2,line width=#3pt] (143,274) circle (1cm);
+\draw[draw=#2,line width=#3pt] (245,277) circle (0.4cm);
+\draw[draw=#2,line width=#3pt] (164,194) circle (0.4cm);
+\draw[draw=#2,line width=#3pt] (180,347) .. controls (152,327) and (147,306) .. (146,283);
+\draw[draw=#2,line width=#3pt] (268,315) .. controls (219,324) and (178,308) .. (152,279);
+\draw[draw=#2,line width=#3pt] (271,157) .. controls (262,217) and (212,260) .. (152,270);
+\draw[draw=#2,line width=#3pt] (150,99) .. controls (90,135) and (99,210) .. (138,265);
+\draw[draw=#2,line width=#3pt] (28,184) .. controls (41,247) and (83,264) .. (133,271);
+
+\draw[draw=#2,line width=#3pt] (118,100) .. controls (220,0) and (285,23) .. (347,92) .. controls (437,204) and (350,230) .. (299,247); %aba
+
+\end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####mailbox###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\mailbox}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2,line width=#3pt] (48,137) -- (48,25) -- (172,26) -- (172,132) .. controls (174,190) and (70,217) .. (48,137);
+\draw[draw=#2,line width=#3pt] (206,220) -- (101,194) .. controls (65,185) and (43,171) .. (41,133) -- (41,18) -- (180,19) -- (361,62) -- (361,179) .. controls (355,233) and (307,245) .. (275,237);
+\draw[draw=#2,line width=#3pt] (206,94) -- (206,242) -- (275,260) -- (275,200) -- (231,188) -- (231,99) -- (206,94);
+\draw[draw=#2,line width=#3pt] (82,136) -- (82,116) -- (87,109) -- (120,109) -- (136,115) -- (136,134) -- (122,129) -- (88,129) -- (82,136);
+\draw[draw=#2,line width=#3pt] (274,230) .. controls (327,239) and (345,210) .. (354,180) -- (354,69) -- (180,26) -- (179,134) .. controls (179,164) and (157,182) .. (125,192) -- (205,212);
+
+
+\end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####giraffe###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\giraffe}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[fill = black] (62,398) circle (0.6cm);
+\draw[fill = black] (88,390) circle (0.6cm); % olhos
+
+\draw[draw=#2,line width=#3pt] (103,416) ..controls (105,415) and (75,425) .. (56,412) .. controls (0,380) and (28,295) .. (102,372) .. controls (138,340) and (135,279) .. (141,220) .. controls (149,197) and (161,191) .. (174,183) .. controls (170,183) and (185,141) .. (189,141) .. controls (189,142) and (190,102) .. (196,100) -- (194,32) -- (217,31) -- (215,106) .. controls (225,121) and (222,159) .. (221,180) .. controls (221,177) and (275,165) .. (275,168) .. controls (270,168) and (310,119) .. (312,119) -- (315,51) -- (309,33) -- ( 333,32) -- (338,46) -- (339,102) .. controls (357,116) and (345,133) .. (335,175) .. controls (375,250) and (265,256) .. (217,273) .. controls (170,320) and (165,395) .. (125,407);
+\draw[draw=#2,line width=#3pt] (152,198) .. controls (150,198) and (160,159) .. (162,159) .. controls (160,159) and (162,121) .. (165,121) -- (169,51) -- (163,39) -- (188,41) -- (185,62) -- (185,123) -- (189,135);
+\draw[draw=#2,line width=#3pt] (234,175) .. controls (232,173) and (265,130) .. (267,131) -- (270,67) -- (261,46) -- (285,46) -- (289,56) -- (290,115) .. controls (293,116) and (299,135) .. (297,134); % corpo
+
+\draw[fill = black,line width=#3pt] (162,39) -- (158,32) -- (191,32) -- (188,41) -- (162,39);
+\draw[fill = black,line width=#3pt] (193,32) -- (188,24) -- (222,23) -- (217,32) -- (193,32);
+\draw[fill = black,line width=#3pt] (259,46) -- (254,37) -- (287,38) -- (287,46) -- (259,46);
+\draw[fill = black,line width=#3pt] (307,33) -- (302,22) -- (333,22) --(333,31) -- (307,33); %casco
+
+\draw[draw=#2,line width=#3pt] (104,415) .. controls (95,395) and (110,392) .. (125,406) .. controls (137,427) and (122,438) .. (104,415);
+\draw[draw=#2,line width=#3pt] (71,417) .. controls (70,455) and (45,450) .. (56,411); %orelha
+
+\draw[draw=#2,line width=#3pt] (337,224) .. controls (363,217) and (365,169) .. (390,153) -- (384,154) -- (383,148) -- (378,153) -- (374,148) -- (372,154) -- (368,156) -- (374,159) .. controls (372,159) and (347,210) .. (343,210); %rabo
+
+\draw[draw=black,line width=#3pt] (99,417) -- (102,432) ..controls (90,440) and (111,442) .. (111,439) .. controls (121,434) and (117,429) .. (112,428) --(109,421);
+\draw[draw=black,line width=#3pt] (88,418) -- (89,436) .. controls (94,441) and (87,443) .. (82,443) .. controls (70,443) and (74,432) .. (78,432) -- (80,418); % antenas
+
+\draw[fill=#2] (134,334) .. controls (153,327) and (167,344) .. (156,359) .. controls (140,366) and (129,350) .. (134,334);
+\draw[fill=#2] (152,301) .. controls (165,344) and (194,325) .. (172,298) .. controls (163,294) and (153,289) .. (152,301);
+\draw[fill=#2] (183,259) .. controls (206,267) and (188,294) .. (183,287) .. controls (169,279) and (162,253) .. (183,259);
+\draw[fill=#2] (164,223) .. controls (183,230) and (180,250) .. (165,252) .. controls (150,245) and (145,220) .. (164,223);
+\draw[fill=#2] (189,207) .. controls (211,215) and (207,235) .. (190,234) .. controls (176,222) and (170,206) .. (189,207);
+\draw[fill=#2] (223,197) .. controls (250,182) and (256,215) .. (236,217) .. controls (217,222) and (210,207) .. (223,197);
+\draw[fill=#2] (216,236) .. controls (235,245) and (227,267) .. (216,264) .. controls (193,250) and (201,235) .. (216,236);
+\draw[fill=#2] (308,136) .. controls (318,120) and (340,130) .. (334,142) .. controls (330,160) and (295,155) .. (308,136);
+\draw[fill=#2] (244,224) .. controls (271,220) and (277,247) .. (263,251) .. controls (243,249) and (240,238) .. (244,224);
+\draw[fill=#2] (302,233) .. controls (277,238) and (274,223) .. (287,218) .. controls (311,200) and (325,230) .. (302,233);
+\draw[fill=#2] (271,213) .. controls (291,205) and (282,181) .. (266,184) .. controls (243,186) and (261,204) .. (271,213);
+\draw[fill=#2] (298,172) .. controls (280,185) and (317,200) .. (327,182) .. controls (326,163) and (308,161) .. (298,172);
+\draw[fill=#2] (169,166) ellipse (7 and 5);
+\draw[fill=#2] (175,128) ellipse (10 and 8);
+\draw[fill=#2] (175,146) ellipse (8 and 6);
+\draw[fill=#2] (202,178) ellipse (9 and 7);
+\draw[fill=#2] (195,156) ellipse (9 and 7);
+\draw[fill=#2] (205,135) ellipse (9 and 7);
+\draw[fill=#2] (206,109) ellipse (9 and 7);
+\draw[fill=#2] (271,148) ellipse (9 and 7);
+\draw[fill=#2] (280,128) ellipse (9 and 7);
+\draw[fill=#2] (280,105) ellipse (9 and 8);
+\draw[fill=#2] (328,117) ellipse (10 and 7);
+\draw[fill=#2] (327,97) ellipse (10 and 7); % manchas
+
+\end{tikzpicture}
+}
+
+
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####rabbit###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\rabbit}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw [draw=#2, line width=#3pt] (130, 248) .. controls (35, 402) and (65, 486) .. (120, 443) .. controls (157, 402) and (169, 358) .. (183, 274) .. controls (195, 274) and (223, 280) .. (251, 273) .. controls (245, 363) and (305, 486) .. (354, 450) .. controls (382, 396) and (339, 307) .. (298, 250) .. controls (376, 185) and (339, 85) .. (216, 75) .. controls (111, 75) and (55, 185) .. (130, 248);
+
+\draw [fill = black] (176, 217.3) circle (1.15cm);
+
+\draw [fill = black] (254, 217.3) circle (1.15cm);
+
+\draw [draw=#2, line width=#3pt] (211, 143) .. controls (180, 162) and (212, 168).. (221, 164) .. controls (232, 161) and (222, 150) .. (211, 143);
+
+\draw [draw=#2, line width=#3pt] (211, 143) -- (212, 132);
+
+\draw [draw=#2, line width=#3pt] (212, 132) arc (0 : -150 : 25);
+
+\draw [draw=#2, line width=#3pt] (212, 132) arc (-180 : -30 : 25);
+
+\draw [draw=#2, line width=#3pt] (161, 126) .. controls (145, 132) and (118, 132) .. (91, 127);
+
+\draw [draw=#2, line width=#3pt] (168, 125) .. controls (143, 140) and (119, 146) .. (98, 149);
+
+\draw [draw=#2, line width=#3pt] (162, 136) .. controls (145, 151) and (120, 161) .. (99, 164);
+
+\draw [draw=#2, line width=#3pt] (273, 129) .. controls (303, 135) and (324, 135) .. (345, 130);
+
+\draw [draw=#2, line width=#3pt] (271, 133) .. controls (293, 143) and (317, 151) .. (338, 151);
+
+\draw [draw=#2, line width=#3pt] (273, 141) .. controls (288, 153) and (309, 161) .. (335, 167);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Duck###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\Duck}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw [draw=#2, line width=#3pt] (46, 353) .. controls (68, 357) and (86, 364) .. (99, 373);
+
+\draw [draw=#2, line width=#3pt] (46, 353) .. controls (54, 344) and (72, 337) .. (105, 337);
+
+\draw [draw=#2, line width=#3pt] (99, 373)--(105, 337);
+
+\draw [draw=#2, line width=#3pt] (99, 373) .. controls (115, 401) and (142, 423) .. (172, 396) .. controls (183, 384) and (181, 359) .. (173, 324) .. controls (171, 313) and (168, 301) .. (175, 283);
+
+\draw [draw=#2, line width=#3pt] (175, 283) .. controls (195, 297) and (217, 304) .. (247, 305) .. controls (277, 302) and (278, 288) .. (300, 280) .. controls (314, 277) and (329, 282) .. (335, 284).. controls (355, 288) and (340, 270) .. (330, 268).. controls (338, 269) and (367, 277) .. (345, 264).. controls (335, 259) and (322, 261) .. (316, 251).. controls (335, 252) and (355, 255) .. (369, 288).. controls (365, 227) and (373, 176) .. (265, 131);
+
+\draw [draw=#2, line width=#3pt] (265, 131)--(267, 89);
+
+\draw [draw=#2, line width=#3pt] (267, 89)--(299, 87);
+
+\draw [draw=#2, line width=#3pt] (267, 89)--(291, 79);
+
+\draw [draw=#2, line width=#3pt] (291, 79)..controls (285, 78) and (272, 82) .. (265, 85)..controls (240, 86) and (239, 85) .. (256, 91);
+
+\draw [draw=#2, line width=#3pt] (256, 91)--(259, 131);
+\draw [draw=#2, line width=#3pt] (259, 131)..controls (237, 126) and (218, 126) .. (200, 131);
+
+\draw [draw=#2, line width=#3pt] (200, 131)--(202, 89);
+
+\draw [draw=#2, line width=#3pt] (202, 89)--(217,84);
+
+\draw [draw=#2, line width=#3pt] (217,84)--(197,85);
+
+\draw [draw=#2, line width=#3pt] (197,85)--(181,81);
+
+\draw [draw=#2, line width=#3pt] (181,81)..controls (168, 75) and (163, 79) .. (173, 84);
+
+\draw [draw=#2, line width=#3pt] (173,84)--(192,91);
+
+\draw [draw=#2, line width=#3pt] (192,91)--(159,87);
+
+\draw [draw=#2, line width=#3pt] (192,91)--(192,129);
+
+\draw [draw=#2, line width=#3pt] (192,129)..controls (130,145) and (110, 191) .. (119.5, 258)..controls (128,282) and (140, 317) .. (105, 337);
+
+\draw [fill = black] (134, 379) circle (0.8cm);
+
+\end{tikzpicture}
+}
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Hat###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\beaver}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw [draw=#2, line width=#3pt] (113, 182)--(113, 235);
+\draw [draw=#2, line width=#3pt] (113, 235) .. controls (115, 264) and (145, 283) .. (174, 259) .. controls (190, 251) and (212, 250) .. (219, 260) .. controls (239, 279) and (264, 292) .. (281, 259);
+\draw [draw=#2, line width=#3pt] (281, 259)--(296, 182);
+\draw [draw=#2, line width=#3pt] (296, 182) .. controls (366, 147) and (425, 125) .. (331, 86) .. controls (234, 77) and (134, 70) .. (60, 105) .. controls (15, 120) and (-4, 180) .. (113, 182);
+\draw [draw=#2, line width=#3pt] (119, 210) .. controls (181, 189) and (246, 195) .. (290, 207);
+\draw [draw=#2, line width=#3pt] (119, 220) .. controls (181, 199) and (246, 205) .. (290, 217);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####phone###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\phone}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (164,137)--(190,137);
+\draw[draw=#2, line width=#3pt] (190,137)--(190,152);
+\draw[draw=#2, line width=#3pt] (190,152)--(164,152);
+\draw[draw=#2, line width=#3pt] (164,152)--(164,137);
+%botão8%
+\draw[draw=#2, line width=#3pt] (203,137)--(229,137);
+\draw[draw=#2, line width=#3pt] (229,137)--(229,152);
+\draw[draw=#2, line width=#3pt] (229,152)--(203,152);
+\draw[draw=#2, line width=#3pt] (203,152)--(203,137);
+%9%
+\draw[draw=#2, line width=#3pt] (239,137)--(265,137);
+\draw[draw=#2, line width=#3pt] (265,137)--(265,152);
+\draw[draw=#2, line width=#3pt] (265,152)--(239,152);
+\draw[draw=#2, line width=#3pt] (239,152)--(239,137);
+%4%
+\draw[draw=#2, line width=#3pt] (164,164)--(190,164);
+\draw[draw=#2, line width=#3pt] (190,164)--(190,179);
+\draw[draw=#2, line width=#3pt] (190,179)--(164,179);
+\draw[draw=#2, line width=#3pt] (164,179)--(164,164);
+%botão5%
+\draw[draw=#2, line width=#3pt] (203,164)--(229,164);
+\draw[draw=#2, line width=#3pt] (229,164)--(229,179);
+\draw[draw=#2, line width=#3pt] (229,179)--(203,179);
+\draw[draw=#2, line width=#3pt] (203,179)--(203,164);
+%6%
+\draw[draw=#2, line width=#3pt] (239,164)--(265,164);
+\draw[draw=#2, line width=#3pt] (265,164)--(265,179);
+\draw[draw=#2, line width=#3pt] (265,179)--(239,179);
+\draw[draw=#2, line width=#3pt] (239,179)--(239,164);
+%1%
+\draw[draw=#2, line width=#3pt] (164,191)--(190,191);
+\draw[draw=#2, line width=#3pt] (190,191)--(190,206);
+\draw[draw=#2, line width=#3pt] (190,206)--(164,206);
+\draw[draw=#2, line width=#3pt] (164,206)--(164,191);
+%botão2%
+\draw[draw=#2, line width=#3pt] (203,191)--(229,191);
+\draw[draw=#2, line width=#3pt] (229,191)--(229,206);
+\draw[draw=#2, line width=#3pt] (229,206)--(203,206);
+\draw[draw=#2, line width=#3pt] (203,206)--(203,191);
+%3%
+\draw[draw=#2, line width=#3pt] (239,191)--(265,191);
+\draw[draw=#2, line width=#3pt] (265,191)--(265,206);
+\draw[draw=#2, line width=#3pt] (265,206)--(239,206);
+\draw[draw=#2, line width=#3pt] (239,206)--(239,191);
+%telefone%
+\draw[draw=#2, line width=#3pt] (87,62)--(343,62);
+\draw[draw=#2, line width=#3pt] (343,62)--(343,105);
+\draw[draw=#2, line width=#3pt] (87,62)--(87,105);
+\draw[draw=#2, line width=#3pt] (87,62)--(87,105)..controls(87,121) and (95,132)..(102,145);
+\draw[draw=#2, line width=#3pt] (343,62)--(343,105)..controls(345,121) and (342,132)..(333,145);
+\draw[draw=#2, line width=#3pt] (333,145)--(281,222);
+\draw[draw=#2, line width=#3pt] (102,145)--(150,222);
+\draw[draw=#2, line width=#3pt] (150,222)--(149,251);
+\draw[draw=#2, line width=#3pt] (149,251)--(186,251);
+\draw[draw=#2, line width=#3pt] (186,251)--(186,232);
+\draw[draw=#2, line width=#3pt] (186,232)--(241,232);
+\draw[draw=#2, line width=#3pt] (241,232)--(241,251);
+\draw[draw=#2, line width=#3pt] (241,251)--(282,251);
+\draw[draw=#2, line width=#3pt] (282,251)--(281,222);
+%parte de cima%
+\draw[draw=#2, line width=#3pt] (50,228)--(50,210)..controls(56,195) and (69,197)..(83,197)..controls(114,198)and(124,203)..(130,215)..controls(140,238)and(140,246)..(118,234)..controls(100, 224)and(73,225)..(50,228);
+\draw[draw=#2, line width=#3pt] (50,240)--(83, 235)..controls(112,238) and (115,240)..(130,248)..controls(135,259)and(139,264)..(156,273)..controls(171,278)and(260,291)..(296,254)..controls(294,249)and(344,230)..(379,242)..controls(375,261)and(366,283)..(361,292)..controls(296,325)and(143, 325)..(70,292)..controls(60,272)and(53,254)..(50,240);
+\draw[draw=#2, line width=#3pt] (294,239)--(294,220)..controls(300,205) and (318,202)..(329,200)..controls(358,199)and(380,203)..(377,228)..controls(362,228)and(348,226)..(339,227)..controls(324, 227)and(304,236)..(294,239);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Sandal###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\sandal}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (34,109)--(36,86)..controls(79,60) and (144,60)..(225,84)..controls(269,97) and (289,106)..(361,144)..controls(379,154) and (390,175)..(368,196)..controls(354,206) and (357,208)..(319,206)..controls(283,194) and (256,184)..(223,167);
+
+\draw[draw=#2, line width=#3pt] (34,109)--(38,122)..controls(47,149) and (95,194)..(133,223)..controls(151,237) and (193,232)..(207,206);
+
+\draw[draw=#2, line width=#3pt] (207,206)--(237,119);
+
+\draw[draw=#2, line width=#3pt] (34,109)--(45,103)..controls(100,71) and (118,75)..(317,149)..controls(349,159) and (379,171)..(363,200);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Robe###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\robe}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw [draw=#2, line width=#3pt] (165,594)--(90,562);
+\draw [draw=#2, line width=#3pt] (90, 562) .. controls (82, 557) and (79, 550) .. (73, 533);
+\draw [draw=#2, line width=#3pt] (73,533)--(33,323);
+\draw [draw=#2, line width=#3pt] (33, 323) .. controls (57, 299) and (91, 301) .. (119, 302);
+\draw [draw=#2, line width=#3pt] (33, 323) .. controls (59, 327) and (96, 315) .. (119, 302);
+\draw [draw=#2, line width=#3pt] (119,302)--(120,423);
+%manga direita%
+\draw [draw=#2, line width=#3pt] (229,594)--(304,562);
+\draw [draw=#2, line width=#3pt] (304, 562) .. controls (312, 557) and (315, 550) .. (321, 533);
+\draw [draw=#2, line width=#3pt] (321,533)--(371,323);
+\draw [draw=#2, line width=#3pt] (371, 323) .. controls (347, 299) and (313, 301) .. (300, 310);
+\draw [draw=#2, line width=#3pt] (371, 323) .. controls (347, 332) and (313, 320) .. (300, 310);
+\draw [draw=#2, line width=#3pt] (300,310)--(279,423);
+%corpo%
+\draw [draw=#2, line width=#3pt] (95,301)--(55,68);
+\draw [draw=#2, line width=#3pt] (55,68) .. controls (72, 44) and (120, 44) .. (182,42);
+\draw [draw=#2, line width=#3pt] (182,42) .. controls (192, 86) and (211, 224) .. (214,251).. controls (214, 305) and (219, 365) .. (211,435).. controls (204, 469) and (191, 518) .. (164,575);
+\draw [draw=#2, line width=#3pt] (164,575)--(165,594);
+\draw [draw=#2, line width=#3pt] (229,594) .. controls (221, 574) and (215, 547) .. (185,526);
+\draw [draw=#2, line width=#3pt] (229,594) .. controls (205, 589) and (182, 590) .. (165,594);
+\draw [draw=#2, line width=#3pt] (300,310) .. controls (320, 172) and (327, 94) .. (326,58);
+\draw [draw=#2, line width=#3pt] (326,58) .. controls (275, 36) and (240, 32) .. (182,42);
+\draw [draw=#2, line width=#3pt] (216,37) .. controls (207, 80) and (204, 129) .. (204,173);
+\draw [draw=#2, line width=#3pt] (288,371) .. controls (214, 350) and (156, 367) .. (120,366);
+\draw [draw=#2, line width=#3pt] (285,392) .. controls (214, 371) and (156, 388) .. (120,387);
+\draw [fill = black] (210, 371) circle (1.2cm);
+\draw [draw=#2, line width=#3pt] (200,364) .. controls (160, 339) and (172, 273) .. (169,210);
+\draw[draw=#2, line width=#3pt] (169,210)--(186,200);
+\draw [draw=#2, line width=#3pt] (186,200) .. controls (182, 251) and (187, 313) .. (202,363);
+%.%
+\draw [draw=#2, line width=#3pt] (220,364) .. controls (260, 339) and (259, 273) .. (254,150);
+\draw[draw=#2, line width=#3pt] (254,150)--(237,160);
+\draw [draw=#2, line width=#3pt] (237,160) .. controls (235, 216) and (252, 258) .. (217,363);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Tractor###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\tractor}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+%roda%
+\draw [draw=#2, line width=#3pt] (63, 88) circle (5.8cm);
+\draw [draw=#2, line width=#3pt] (61, 87) circle (1.5cm);
+\draw [draw=#2, line width=#3pt] (232, 60) circle (5cm);
+\draw [draw=#2, line width=#3pt] (232, 60) circle (1.5cm);
+\draw [draw=#2, line width=#3pt] (43, 143) .. controls (107, 175) and (153, 122) .. (134, 63) .. controls (118, 30) and (79, 9) .. (43, 33);
+\draw [draw=#2, line width=#3pt] (222, 109) .. controls (274, 134) and (305, 80) .. (293, 43) .. controls (291, 29) and (259, 5) .. (235, 10);
+\draw [draw=#2, line width=#3pt] (266,97)--(281,91);
+\draw [draw=#2, line width=#3pt] (291,83)--(288,75);
+\draw [draw=#2, line width=#3pt] (282,54)--(289,46);
+\draw [draw=#2, line width=#3pt] (120,76)--(126,67);
+\draw [draw=#2, line width=#3pt] (132,120)--(129,104);
+\draw [draw=#2, line width=#3pt] (105,128)--(117,121);
+%corpo trator%
+\draw [draw=#2, line width=#3pt] (138, 89) .. controls (151, 74) and (162, 60) .. (182, 56);
+\draw [draw=#2, line width=#3pt] (138,89)--(191,89);
+\draw [draw=#2, line width=#3pt] (53,148)--(66,174);
+\draw [draw=#2, line width=#3pt] (66,174)--(97,174);
+\draw [draw=#2, line width=#3pt] (97, 174)--(111,234);
+\draw [draw=#2, line width=#3pt] (111,234)--(174,248);
+\draw [draw=#2, line width=#3pt] (174,248)--(244,246);
+\draw [draw=#2, line width=#3pt] (244,246)--(272,179);
+\draw [draw=#2, line width=#3pt] (272,179)--(356,165);
+\draw [draw=#2, line width=#3pt] (356,165)--(321,143);
+\draw [draw=#2, line width=#3pt] (321,143)--(220,160);
+\draw [draw=#2, line width=#3pt] (220,160)--(272,179);
+\draw [draw=#2, line width=#3pt] (220,160)--(220,109);
+\draw [draw=#2, line width=#3pt] (321,143)--(317,96);
+\draw [draw=#2, line width=#3pt] (356,165)--(350,121);
+\draw [draw=#2, line width=#3pt] (350,121)--(317,96);
+\draw [draw=#2, line width=#3pt] (338,92)--(317,96);
+\draw [draw=#2, line width=#3pt] (350,121)--(365,112);
+\draw [draw=#2, line width=#3pt] (338,92)--(365,112);
+\draw [draw=#2, line width=#3pt] (366,80)--(365,112);
+\draw [draw=#2, line width=#3pt] (338,92)--(338,57);
+\draw [draw=#2, line width=#3pt] (366,80)--(338,57);
+\draw [draw=#2, line width=#3pt] (314,60)--(317,96);
+\draw [draw=#2, line width=#3pt] (314,60)--(338,57);
+\draw [draw=#2, line width=#3pt] (315,72)--(294,73);
+\draw [draw=#2, line width=#3pt] (286,177)--(286,259);
+\draw [draw=#2, line width=#3pt] (303,259)--(286,259);
+\draw [draw=#2, line width=#3pt] (303,259)--(303,174);
+\draw [draw=#2, line width=#3pt] (214,177)--(257,186);
+\draw [draw=#2, line width=#3pt] (257,186)--(238,231);
+\draw [draw=#2, line width=#3pt] (198,230)--(238,231);
+\draw [draw=#2, line width=#3pt] (198,230)--(214,177);
+\draw [draw=#2, line width=#3pt] (174,248)--(203,163);
+\draw [draw=#2, line width=#3pt] (200,99)--(203,163);
+\draw [draw=#2, line width=#3pt] (143,241)--(128,172);
+\draw [draw=#2, line width=#3pt] (155,90)--(128,172);
+\draw [draw=#2, line width=#3pt] (132,231)--(122,174);
+\draw [draw=#2, line width=#3pt] (107,173)--(122,174);
+\draw [draw=#2, line width=#3pt] (107,173)--(115,230);
+\draw [draw=#2, line width=#3pt] (132,231)--(115,230);
+\draw [draw=#2, line width=#3pt] (154,150)--(190,150);
+\draw [draw=#2, line width=#3pt] (190,163)--(190,150);
+\draw [draw=#2, line width=#3pt] (190,163)--(169,234);
+\draw [draw=#2, line width=#3pt] (154,232)--(169,234);
+\draw [draw=#2, line width=#3pt] (154,232)--(144,173);
+\draw [draw=#2, line width=#3pt] (154,150)--(144,173);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####glass###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\glass}[3]{
+\begin{tikzpicture}[scale = #1]
+\draw[draw=#2, line width=#3pt] (-0.84, -1.8) .. controls (-0.6,-2.1) and (0.5, -2.1)
+.. (0.8, -1.75) -- (1.2,1).. controls (-0,0.5) and (0,0.7) ..(-1.2,0.9)-- (-0.8,-1.9);
+\draw[draw=#2, line width=#3pt,fill=white] (0,1) ellipse (1.2cm and 0.5cm);
+\end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####apple###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\apple}[3]{
+\begin{tikzpicture}[scale = #1]
+\draw[draw=#2, line width=#3pt]
+(0.0, 0.87) .. controls (-1.8, 1.35) and (-1, -1.9) ..
+(0, -1.3) .. controls (1, -1.9) and (1.85, 1.35) ..
+(-0.05, 0.87) ;
+
+\draw[draw=#2, line width=#3pt]
+(0.0, 0.9) .. controls (0.08, 1.2) and (0.01,1.3) ..
+(-0.0, 1.4);
+
+\draw[draw=#2, line width=0.1pt,fill=green]
+(0.08, 1.1) .. controls (0.2, 1) and (0.5,1.1) ..
+(0.6, 1.2) .. controls (0.4, 1.3) and (0.2,1.4) ..
+(0.07, 1.3);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####egg###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\egg}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+\draw[draw=#2, line width=3.5pt]
+(191,324) ellipse (17cm and 23cm);
+
+\draw[draw=#2, line width=1pt] (38, 424) -- (62, 398) --
+(86, 424) --(104, 398)-- (128, 424)-- (144, 398) -- (166, 424) -- (186, 398)-- (204, 424)
+--(226, 398)-- (248, 424)-- (266, 398) -- (290, 424) -- (310, 398)-- (336, 432);
+
+\draw[draw=#2, line width=1pt] (22, 338) -- (42, 314) --
+(62, 338) --(86, 314)-- (102, 338)-- (125, 314)--(145, 338) -- (167, 314) --
+(185, 338) --(207, 314)-- (225, 338)-- (247, 314)--(265, 338) -- (287, 314) --
+(305, 338)--(327, 314)-- (352, 340) ;
+
+
+\draw[draw=#2, line width=1pt] (40, 224) -- (66, 250)
+ --(88, 224)-- (110, 250)-- (134, 224)--(154, 250) -- (172, 224) --
+(194, 250) --(216, 224)-- (234, 250)-- (254, 224)--(280, 250)
+ --(302, 224)-- (324, 250)-- (346, 224);
+
+ \draw[draw=#2, line width=1pt] (92, 146) -- (118, 166)
+ --(142, 146)-- (164, 166)--(186, 146) -- (208, 166)
+ --(232, 146)-- (252, 166)--(280, 138);
+ \end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####spider###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\spider}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2, line width=#3pt]
+(203,117) ellipse (10.7cm and 9cm);
+\draw[draw=#2, line width=-10pt, fill=black ]
+(178,150) circle (1.6cm);
+\draw[draw=#2, line width=-10pt, fill=black]
+(235,150) circle (1.6cm);
+\draw[draw=#2, line width=#3pt]
+(133, 88) .. controls (159,53) and (249, 53) .. (276, 86);
+\draw[draw=#2, line width=#3pt]
+(284,178) -- (316,204).. controls (335,128) and (358, 159) .. (366, 165);
+\draw[draw=#2, line width=#3pt]
+(309,138) -- (324,149).. controls (337,116) and (355, 105) .. (378, 111);
+\draw[draw=#2, line width=#3pt]
+(309,100) -- (323,104).. controls (324,87) and (338, 66) .. (374, 66);
+\draw[draw=#2, line width=#3pt]
+(280,54).. controls (293,35) and (320,30) .. (330, 35);
+\draw[draw=#2, line width=#3pt]
+(125,182) -- (102,203).. controls (92,176) and (64, 155) .. (48, 166);
+\draw[draw=#2, line width=#3pt]
+(99,140) -- (86,149).. controls (81,126) and (54, 101) .. (40, 109);
+\draw[draw=#2, line width=#3pt]
+(96,102) -- (88,104).. controls (83,83) and (62, 57) .. (40, 65);
+\draw[draw=#2, line width=#3pt]
+(129,53) .. controls (119,36) and (98, 27) .. (85, 36);
+
+\end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####moon###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\moon}[3]{
+\begin{tikzpicture}[scale = #1]
+\draw[draw=#2, line width=#3pt]
+(0.4, 1.9) .. controls (-1.8, 0.4) and (0., -1.5) ..
+(1.6, -0.4);
+\draw[draw=#2, line width=#3pt]
+(0.4, 1.9) .. controls (-0.2, 1.5) and (-0.4, -0.8) ..
+(1.6, -0.4);
+\end{tikzpicture}
+}
+
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Bat###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\bat}[3]{
+\begin{tikzpicture}[scale = #1]
+\draw[draw=#2, line width=#3pt]
+ (0.0, -1.7) .. controls (0.3,-1.0) and (1.0,-0.87) ..
+ (1.22,-0.95) .. controls (1.1,-0.4) and (2.2,0.2) ..
+ (2.42, -0.1) .. controls (2.3,0.2) and (2.7,0.7) ..
+ (3.2,0.85) .. controls (2.7,0.8) and (2.25,0.9) ..
+ (1.93,1.22) .. controls (2,1) and (1.5,0.3) ..
+ (0.8,-0.2) .. controls (0.3,-0.45) and (0.45,0) ..
+ (0.32,0.3) -- (0.2,0.12) .. controls (0,0.25) and (-0.1,0.2) ..
+ (-0.2,0.12) -- (-0.32,0.3) .. controls (-0.45,0) and (-0.3,-0.45) ..
+ (-0.8,-0.2) .. controls (-1.5,0.3) and (-2,1) ..
+ (-1.93,1.22) .. controls (-2.25,0.9) and (-2.7,0.8) ..
+ (-3.2,0.85) .. controls (-2.7,0.7) and (-2.3,0.2) ..
+ (-2.42, -0.1) .. controls (-2.2,0.2) and (-1.1,-0.4) ..
+ (-1.22,-0.95) .. controls (-1.0,-0.87) and (-0.3,-1.0) ..
+ (0.0,0-1.7);
+%boca
+\draw[draw=#2, line width = #3pt]
+ (-0.19,-0.2) .. controls (-0.1,-0.3) and (0.1,-0.3) .. (0.16,-0.2);
+%olhos
+\draw[fill = black, draw=#2, line width = #3pt]
+ (0.09,-0.04) circle (0.05)
+ (-0.11,-0.04) circle (0.05);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Car###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\car}[3]{
+\begin{tikzpicture}[scale = #1]
+\draw[draw=#2, line width = #3pt]
+ (-2.35,-0.6) -- (-2,-0.6)
+ (-1.1,-0.6) -- (0.85,-0.6)
+ (1.7,-0.6) -- (2.08,-0.6)
+ (-2.35,-0.6) .. controls (-2.35,-0.5) and (-2.38,-0.35)..
+ (-2.33,-0.25) .. controls (-2.3,-0.2) and (-2.3,-0.2)..
+ (-2.24,-0.18) .. controls (-2,0.45) and (-1.3,0.45)..
+ (-1.2,0.48) .. controls (-0.7,1.15) and (0.5,1.1)..
+ (0.9,0.5) .. controls (1.3,0.4) and (1.73,0.4)..
+ (1.97,-0.18) .. controls (2.0,-0.2) and (2.0,-0.2)..
+ (2.05,-0.25) .. controls (2.1,-0.3) and (2.1,-0.4)..
+ (2.08,-0.6);
+%rodasdeFora
+\draw[draw=#2, line width = #3pt]
+ (-1.55,-0.55) circle (0.43)
+ (1.27,-0.55) circle (0.43);
+%rodaseDentro
+\draw[draw=#2, line width = #3pt]
+ (-1.55,-0.54) circle (0.23)
+ (1.27,-0.54) circle (0.23);
+%janela
+\draw[draw=#2, line width = #3pt]
+ (-0.99,0.0) -- (-0.3,0.0) -- (-0.3,0.47) --
+ (-0.85,0.47) -- (-0.97,0)
+ (0.03,0.02) -- (0.7,0.02) -- (0.55,0.47) --
+ (0,0.47) -- (0.03,0);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####crow###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\crow}[3]{
+\begin{tikzpicture}[scale = #1]
+\draw[draw=#2, line width = #3pt]
+ (2.5,-1.05) .. controls (1.55,-0.85) and (-1.3,-0.8) ..
+ (-2.04,-1.1) .. controls (-2.5,-0.1) and (-2.7,0.35) ..
+ (-2.85,0.9) -- (-2.14,0.46) -- (-1.68,1) -- (-1.14,0.55) --
+ (-0.7,1.1) -- (-0.23,0.65) -- (0.23,1.14) -- (0.69,0.68) --
+ (1.18,1.1) -- (1.6,0.55) -- (2.13,1) -- (2.6,0.45) --
+ (3.3,0.9) .. controls (3.15,0.3) and (2.85,-0.3) .. (2.5,-1.05);
+%partedeDentro
+\draw[draw=#2, line width = #3pt]
+ (0.25,-1.09) ellipse (2.28cm and 0.19cm);
+%bolinhas
+\draw [fill = black, draw=#2]
+ (-2.86, 1.0) circle (0.1)
+ (-1.67, 1.1) circle (0.1)
+ (-0.72, 1.2) circle (0.1)
+ (0.21, 1.24) circle (0.1)
+ (1.17, 1.2) circle (0.1)
+ (2.14, 1.1) circle (0.1)
+ (3.3, 0.97) circle (0.1)
+ (-2.46, 0.39) circle (0.1)
+ (-1.64, 0.61) circle (0.1)
+ (-0.66, 0.73) circle (0.1)
+ (0.25, 0.72) circle (0.1)
+ (1.15, 0.71) circle (0.1)
+ (2.1, 0.59) circle (0.1)
+ (2.94, 0.4) circle (0.1);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Egg###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Egg}[3]{
+\begin{tikzpicture}[scale = #1]
+\draw[draw=#2, line width = #3pt]
+ (0.05,2.03) .. controls (1.8,1.85) and (1.85,-1.7)..
+ (0.1,-1.65) .. controls (-1.65,-1.85) and (-1.75,1.7).. (0.06,2.03);
+%1ªlinha
+\draw[draw=#2, line width = #3pt]
+ (-0.94,1.3).. controls (-1,1) and (-0.7,0.9) ..
+ (-0.7,1.2) .. controls (-0.7,1.4) and (-0.45,1.4)..
+ (-0.45,1.2) .. controls (-0.45,0.95) and (-0.2,0.95)..
+ (-0.2,1.2) .. controls (-0.2,1.4) and (0.05,1.4)..
+ (0.05,1.2) .. controls (0.05,0.95) and (0.3,0.95)..
+ (0.3,1.2) .. controls (0.3,1.4) and (0.55,1.4)..
+ (0.55,1.2) .. controls (0.55,0.95) and (0.75,0.95)..
+ (0.78,1.2) .. controls (0.8,1.4) and (1,1.4)..
+ (1,1.2) .. controls (1,1) and (1.15,0.9)..
+ (1.18,1.1);
+%2ª linha
+\draw[draw=#2, line width = #3pt]
+ (-1.25,0.2) .. controls (-1.2,0.35) and (-1,0.35)..
+ (-1.0,0.2) .. controls (-1.05,-0.05) and (-0.8,-0.1)..
+ (-0.75,0.15) .. controls (-0.75,0.4) and (-0.5,0.35)..
+ (-0.5,0.2) .. controls (-0.5,-0.1) and (-0.25,-0.1)..
+ (-0.25,0.2) .. controls (-0.2,0.4) and (0,0.35)..
+ (0,0.15) .. controls (0,-0.1) and (0.25,-0.1)..
+ (0.27,0.2) .. controls (0.3,0.4) and (0.5,0.35)..
+ (0.5,0.2) .. controls (0.5,-0.1) and (0.8,-0.1)..
+ (0.77,0.15) .. controls (0.75,0.4) and (1.05,0.35)..
+ (1.03,0.2) .. controls (0.95,-0.05) and (1.25,-0.1)..
+ (1.25,0.1) .. controls (1.25,0.2) and (1.3,0.35)..
+ (1.38,0.3);
+%3ªlinha
+\draw[draw=#2, line width = #3pt]
+ (-1.16,-0.65) .. controls (-1.15,-0.45) and (-0.9,-0.5)..
+ (-0.91,-0.7) .. controls (-0.9,-0.95) and (-0.65,-0.9)..
+ (-0.65,-0.7) .. controls (-0.65,-0.45) and (-0.4,-0.5)..
+ (-0.4,-0.7) .. controls (-0.4,-0.95) and
+ (-0.15,-0.9)..
+ (-0.15,-0.7) .. controls (-0.15,-0.45) and (0.1,-0.5)..
+ (0.1,-0.7) .. controls (0.1,-0.95) and (0.35,-0.9)..
+ (0.35,-0.7) .. controls (0.35,-0.45) and (0.6,-0.5)..
+ (0.6,-0.7) .. controls (0.6,-0.95) and (0.85,-0.9)..
+ (0.85,-0.7) .. controls (0.85,-0.45) and (1.1,-0.5)..
+ (1.1,-0.7) .. controls (1.1,-0.75) and (1.1,-0.85)..
+ (1.23,-0.85);
+\end{tikzpicture}
+}
+
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####goose###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\goose}[3]{
+\begin{tikzpicture}[scale = #1]
+%cabeçaePescoço
+\draw[draw=#2, line width = #3pt]
+ (-0.13,0.18) .. controls (-0.2,0.45) and (-0.15,0.6) ..
+ (-0.23,0.93) .. controls (-0.1,0.95) and (-0.15,1.4) ..
+ (-0.5,1.48) .. controls (-1,1.5) and (-1.2,0.85) ..
+ (-0.55,0.83) .. controls (-0.45,0.6) and (-0.6,0.2) ..
+ (-0.45,-0.05);
+%bico
+\draw[draw=#2, line width = #3pt]
+ (-0.95,1.18) .. controls (-1.0,1.2) and (-1.05,1.3) ..
+ (-1.05,1.38) .. controls (-1,1.4) and (-0.9,1.4) ..
+ (-0.85,1.36);
+\draw[draw=#2, fill = black]
+ (-0.73,1.23) circle (0.065);
+%4ªpata
+\draw[draw=#2, line width = #3pt]
+ (0.93,-0.98) .. controls (0.93,-1.2) and (1.15,-1.45) ..
+ (0.74,-1.5) .. controls (0.8,-1.5) and (0.8,-1.25) ..
+ (0.75,-1.28) -- (0.74,-1.19) .. controls (0.8,-1.2) and (0.8,-1.25)..
+ (0.8,-0.985);
+%3ªpata
+\draw[draw=#2, line width = #3pt]
+ (0.73,-1.08) -- (0.75,-1.28) .. controls
+ (0.8,-1.25) and (0.85,-1.55) .. (0.6,-1.56)
+ .. controls (0.3,-1.5) and (0.5,-1.25) .. (0.59,-1.26)
+ .. controls (0.6,-1.2) and (0.6,-1.1) .. (0.555,-1.09) ..
+ controls (0.62,-0.998) and (0.6,-1.095) .. (0.73,-1.08);
+%2ªpata
+\draw[draw=#2, line width = #3pt]
+ (-0.06,-1.08) .. controls (-0.05,-1.15) and (-0.1,-1.15) ..
+ (-0.13,-1.17) .. controls (-0.13,-1.2) and (-0.06,-1.34) ..
+ (-0.1,-1.45).. controls (0.15,-1.55) and (0.15,-1.15) ..
+ (0.08,-1.18) -- (0.08,-1.07);
+%1ª pata
+ \draw[draw=#2, line width = #3pt]
+ (-0.3,-1) .. controls (-0.29,-1) and (-0.28,-1.01) ..
+ (-0.25,-0.98) .. controls (-0.3,-1.04) and (-0.2,-1.08) ..
+ (-0.15,-1.05) .. controls (-0.15,-1.2) and (-0.05,-1.3) ..
+ (-0.1,-1.45) .. controls (-0.25,-1.65) and (-0.65,-1.4) ..
+ (-0.28,-1.2) .. controls (-0.25,-1.1) and (-0.33,-1.1) ..
+ (-0.3,-1);
+%barriga
+\draw[draw=#2, line width = #3pt]
+ (0.2,0.2) .. controls (0.2,0.33) and (0.4,0.33) ..
+ (0.45,0.2) .. controls (0.5,0.3) and (0.65,0.3) ..
+ (0.7,0.15) .. controls (0.8,0.25) and (0.9,0.15) ..
+ (0.88,0.05) .. controls (1,0.15) and (1.1,0) ..
+ (1,-0.08) .. controls (1.15,-0.05) and (1.2,-0.15) ..
+ (1.1,-0.22) .. controls (1.25,-0.2) and (1.3,-0.3) ..
+ (1.18,-0.37) .. controls (1.3,-0.4) and (1.3,-0.5) ..
+ (1.18,-0.53) .. controls (1.3,-0.6) and (1.3,-0.7) ..
+ (1.15,-0.7) .. controls (1.25,-0.8) and (1.15,-0.9) ..
+ (1,-0.86) .. controls (1.15,-1) and (0.9,-1.0) ..
+ (0.8,-0.98) .. controls (0.8,-1.1) and (0.7,-1.1) ..
+ (0.58,-1.04) .. controls (0.55,-1.15) and (0.4,-1.15) ..
+ (0.37,-1.08) .. controls (0.3,-1.15) and (0.2,-1.2) ..
+ (0.1,-1.05) .. controls (0.05,-1.1) and (-0.1,-1.1) ..
+ (-0.14,-1.02) .. controls (-0.15,-1.1) and (-0.3,-1.05) ..
+ (-0.25,-0.98) .. controls (-0.3,-1.05) and (-0.55,-0.95) ..
+ (-0.39,-0.87) .. controls (-0.5,-0.9) and (-0.65,-0.8) ..
+ (-0.5,-0.73) .. controls (-0.8,-0.75) and (-0.7,-0.6) ..
+ (-0.6,-0.58) .. controls (-0.8,-0.6) and (-0.75,-0.45) ..
+ (-0.65,-0.43) .. controls (-0.8,-0.4) and (-0.7,-0.25) ..
+ (-0.6,-0.3) .. controls (-0.7,-0.25) and (-0.65,-0.18) ..
+ (-0.51,-0.16) .. controls (-0.6,-0.1) and (-0.5,-0.03) ..
+ (-0.4,-0.05) .. controls (-0.5,0.05) and (-0.35,0.1) ..
+ (-0.25,0.07) .. controls (-0.25,0.2) and (-0.1,0.2) ..
+ (-0.07,0.15) .. controls (-0.05,0.3) and (0.1,0.3) ..
+ (0.2,0.2);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####House###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\House}[3]{
+\begin{tikzpicture}[scale = #1]
+%paredeDireita
+\draw[draw=#2, line width = #3pt]
+ (1.65, 0.0) -- (-0.48,-0.3) -- (-0.55,-1.95) --
+ (1.4,-1.38) -- (1.5,-0.03);
+%paredeEsquerda
+\draw[draw=#2, line width = #3pt]
+ (-0.55,-1.95) -- (-1.4,-1.48) -- (-1.46,-0.1) --
+ (-1.09,1.05) -- (-0.48,-0.3);
+%janelaMeio
+\draw[draw=#2, line width = #3pt]
+ (-0.3,-1.31) -- (-0.3,-0.87) -- (0.15,-0.78) --
+ (0.15,-1.2) -- (-0.29,-1.31);
+%janelaDireita
+\draw[draw=#2, line width = #3pt]
+ (0.93,-1.02) -- (0.95,-0.65) -- (1.38,-0.54) --
+ (1.35,-0.9) -- (0.93,-1.02);
+%janelaEsquerda
+\draw[draw=#2, line width = #3pt]
+ (-1.2,-0.15) -- (-1.2,0.25) .. controls (-1.15,0.45) and
+ (-0.9,0.3) .. (-0.93,0.15) -- (-0.9,-0.2) -- (-1.2,-0.15);
+%Porta
+\draw[draw=#2, line width = #3pt]
+ (0.3,-1.7) -- (0.35,-0.75) -- (0.85,-0.65) -- (0.8,-1.55);
+%Maçaneta
+\draw[draw=#2, line width = #3pt]
+ (0.75366,-1.25) circle (0.04);
+%chaminé
+\draw[draw=#2, line width = #3pt]
+ (0.75,1.6) -- (0.75,0.85) -- (0.4,0.8) -- (0.4,1.55) -- (0.75,1.6)
+ (0.4,1.55) --(0.3,1.6) -- (0.3,1.1) -- (0.4,0.8);
+%telhado
+\draw[draw=#2, line width = #3pt]
+ (-1.46,-0.1) -- (-1.6,-0.08) -- (-1.1,1.35) -- (-0.45,-0.15) --
+ (-0.48,-0.3) -- (-1.09,1.05) -- (-1.46,-0.1)
+ (-0.45,-0.15) -- (1.67,0.15) -- (1.65,0) -- (-0.48,-0.3) -- (-0.45,-0.15);
+\draw[draw=#2, line width = #3pt]
+ (-1.1,1.35) -- (-0.45,-0.15) -- (1.67,0.15) -- (0.9,1.35) -- (0.75,1.35)
+ -- (0.75,0.85) -- (0.4,0.8) -- (0.3,1.1) -- (0.3,1.3) -- (-1.1,1.35);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####monkey###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\monkey}[3]{
+\begin{tikzpicture}[scale = #1]
+%cabeça
+\draw[draw=#2, line width = #3pt]
+ (0.75,-0.38) .. controls (0.8,-0.35) and (0.93,-0.25) ..
+ (0.98,-0.13).. controls (1.23,0.7) and (0.4,1.1) ..
+ (-0.15,0.58).. controls (-0.78,1.15) and (-1.58,0.65) ..
+ (-1.31,-0.13).. controls (-1.3,-0.2) and (-1.15,-0.35) ..
+ (-1.1,-0.38) .. controls (-1.73,0.1) and (-1.65,0.85) ..
+ (-1.33,1.15) .. controls (-0.6,1.85) and (0.3,1.85) ..
+ (0.97,1.15) .. controls (1.35,0.7) and (1.3,0.15) .. (0.94,-0.2);
+%cara
+\draw[draw=#2, line width = #3pt]
+ (-1.1,-0.38) .. controls (-1.15,-0.35) and (-1.3,-0.2) ..
+ (-1.31,-0.13) .. controls (-1.58,0.65) and (-0.78,1.15) ..
+ (-0.15,0.58) .. controls (0.4,1.1) and (1.23,0.7) ..
+ (0.98,-0.13) .. controls (0.93,-0.25) and (0.8,-0.35) ..
+ (0.75,-0.38) .. controls (1.6,-0.95) and (0.6,-1.6) ..
+ (-0.15,-1.55) .. controls (-0.9,-1.6) and (-2,-0.95) ..
+ (-1.1,-0.38);
+%boca
+\draw[draw=#2, line width = #3pt]
+ (-1,-0.83) .. controls (-0.5,-1.3) and (0.1,-1.3) .. (0.66,-0.83);
+%olhos
+\draw[draw=#2, line width = #3pt]
+ (-0.85, 0.05) .. controls (-0.85,0.55) and (-0.5,0.55) ..
+ (-0.48, 0.1) .. controls (-0.45,-0.25) and (-0.8,-0.25) ..
+ (-0.85, 0.05)
+ (0.13,0.05) .. controls (0.13,0.55) and (0.5,0.55) ..
+ (0.52,0.1) .. controls (0.5,-0.25) and (0.15,-0.25) ..
+ (0.13, 0.05) ;
+%olhos
+\draw[draw=#2, fill = black]
+ (-0.85, 0.05) .. controls (-0.6,0.23) and (-0.7,0.23) ..
+ (-0.48,0.05) .. controls (-0.45,-0.25) and (-0.8,-0.25) ..
+ (-0.85, 0.05)
+ (0.13,0.05) .. controls (0.4,0.23) and (0.25,0.23) .. (0.52,0.05)
+ (0.51,0.05) .. controls (0.5,-0.25) and (0.15,-0.25) ..
+ (0.13, 0.05);
+%orelha
+\draw[draw=#2, line width = #3pt]
+ (-1.5,0.15) .. controls (-2.25,0.2) and (-2.05,1.35) .. (-1.33,1.15)
+ (0.97,1.15) .. controls (1.7,1.3) and (1.85,0.2) .. (1.18,0.16);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####mushroom###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\mushroom}[3]{
+\begin{tikzpicture}[scale = #1]
+%bolinhas
+\draw[draw=#2, line width = #3pt]
+ (-2.45,1.45) .. controls (-1.7,0.2) and (-0.35,2.3) .. (-1.95,2.4)
+ (-1.45,3.1) .. controls (-1,2.8) and (-0.4,3.4).. (-0.6,3.8) ..
+ controls (-0.9,3.7) and (-1.3,3.3) .. (-1.45,3.1)
+ (0.2,4) -- (0.3,3.7) .. controls (0.5,3.35) and (1,3.05)..
+ (1.4,3.55) .. controls (1.1,3.8) and (0.55,4) .. (0.2,4)
+ (2.03,3) .. controls (0.8,2.3) and (2.25,1.15).. (2.8,2.1)
+ (0.0, 3.2) .. controls (0.65,3.35) and (1.1,2.25).. (0.0,1.9)
+ (0.0, 3.2) .. controls (-1,2.85) and (-0.7,1.75).. (0.0,1.9);
+%partedeBaixo
+\draw[draw=#2, line width = #3pt]
+ (-3.0,0.1) .. controls (-2.3,-0.55) and (-1.4,-0.9)..
+ (-0.5,-1) -- (-0.5,-0.05) .. controls (0.1,0.3) and
+ (1.15,0.5).. (1.55,0.1) -- (1.8,-1) .. controls (2.5,-0.9) and
+ (3.3,-0.55) .. (3.83,0.15) .. controls (1.55,1.65) and
+ (-1.25,1.05) .. (-3,0.1);
+%partedeCima
+\draw[draw=#2, line width = #3pt]
+ (-3.0,0.1) .. controls (-1.25,5) and (0.9,5.2) ..
+ (3.43,1.2) .. controls (3.55,0.85) and (3.55,0.6)..
+ (3.8,0.15) .. controls (1.35,1.6) and (-0.5,1.2)..
+ (-3.0,0.1);
+%caule
+\draw[draw=#2, line width = #3pt]
+ (-0.5,-0.05) .. controls (0.1,0.3) and (1.15,0.5)..
+ (1.55,0.1) .. controls (2.05,-1.3) and (1.6,-2.9)..
+ (0.9,-4.0) .. controls (0.4,-4.75) and (-1.8,-4.5)..
+ (-1.6,-3.3) .. controls (-0.7,-2.15) and (-0.35,-1.35)..
+ (-0.5,-0.05);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####pig###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\pig}[3]{
+\begin{tikzpicture}[scale = #1]
+\draw[draw=#2, line width = #3pt]
+ (-0.95,1.24) .. controls (0.05,1.7) and (0.95,1.65) ..
+ (1.5,1.3) .. controls (2.1,0.7) and (1.85,0) ..
+ (1.5,-0.5) .. controls (1.6,-0.8) and (1.65,-1.2) ..
+ (1.68,-1.5) .. controls (1.5,-1.7) and (1.1,-1.7) ..
+ (1.0,-1.5) .. controls (1.2,-1.2) and (1.2,-0.95) ..
+ (0.9,-0.72) .. controls (0.8,-0.85) and (0.7,-0.85) ..
+ (0.63,-0.9) .. controls (0.7,-1.1) and (0.6,-1.25) ..
+ (0.48,-1.49) .. controls (0.6,-1.6) and (0.8,-1.65) ..
+ (1.0,-1.5)
+ (0.63,-0.9) .. controls (0.4,-1) and (0,-1) ..
+ (-0.08,-0.85) .. controls (0.05,-1.2) and (0,-1.5) ..
+ (-0.1,-1.7) .. controls (-0.3,-1.8) and (-0.5,-1.8) ..
+ (-0.56,-1.67) .. controls (-0.5,-1.2) and (-0.5,-0.9) ..
+ (-0.8,-0.7)
+ (-0.56,-1.67) .. controls (-0.8,-1.8) and (-1.0,-1.7) ..
+ (-1.12,-1.6) .. controls (-0.9,-1.2) and (-0.8,-0.9) ..
+ (-0.9,-0.65) (-0.5,-0.35) .. controls (-1.15,-0.95) and
+ (-1.5,-0.6) .. (-1.8,-0.39)
+ (-1.73,-0.45) .. controls (-1.75,-0.15) and (-1.75,0.05) ..
+ (-2.05,0.15) .. controls (-2.25,-0.05) and (-2.05,-0.35) ..
+ (-1.75,-0.4) .. controls (-1.6,-0.35) and (-1.5,-0.3) ..
+ (-1.35,-0.2)
+ (-2.05,0.15) .. controls (-1.65,0.35) and (-1.6,0.7) ..
+ (-1.55,0.97) .. controls (-2,1) and (-1.95,1.3) ..
+ (-1.95,1.55) .. controls (-1.7,1.4) and (-1.45,1.2) ..
+ (-1.43,1.05) .. controls (-1.45,1.2) and (-1.3,1.2) ..
+ (-1.25,1.1) (-1,0.95).. controls (-1.4,1.05) and
+ (-1.25,1.4) .. (-1.35,1.6) .. controls (-1.2,1.5) and
+ (-1.05,1.35) .. (-0.93,1.23);
+\draw[draw=#2, line width = #3pt, fill = black]
+ (-1.13,0.48) ellipse (0.045cm and 0.06cm)
+ (-1.5,0.6) ellipse (0.045cm and 0.06cm);
+\draw[draw=#2, line width = #3pt, fill = black]
+ (-2,-0.03) circle (0.02)
+ (-1.9,-0.17) circle (0.02);
+\draw[draw=#2, line width = #3pt, fill = black]
+ (1.69,-1.5) .. controls (1.5,-1.7) and (1.1,-1.7) ..
+ (1.0,-1.5) -- (1.05,-1.4) .. controls (1.2,-1.6) and
+ (1.5,-1.55) .. (1.65,-1.4) -- (1.68,-1.5)
+ (1.0,-1.5) -- (1.05,-1.39) .. controls (0.8,-1.55) and
+ (0.6,-1.45) .. (0.53,-1.4) --(0.49,-1.49) .. controls (0.6,-1.6) and
+ (0.8,-1.65) .. (1.0,-1.5)
+ (-0.05,-1.55) .. controls (-0.08,-1.65) and (-0.08,-1.7) ..
+ (-0.1,-1.7) .. controls (-0.3,-1.8) and (-0.5,-1.8) ..
+ (-0.56,-1.67) -- (-0.55,-1.57).. controls (-0.4,-1.75) and
+ (-0.2,-1.7) .. (-0.03,-1.5) (-0.56,-1.67) --
+ (-0.55,-1.57) .. controls (-0.7,-1.7) and (-0.9,-1.65) ..
+ (-1.07,-1.5) -- (-1.12,-1.6) .. controls (-1,-1.73) and
+ (-0.7,-1.8) .. (-0.56,-1.67);
+\draw[draw=#2, line width = #3pt, fill = black]
+ (1.6,1.2) .. controls (1.8,1.25) and (2.1,1.35) ..
+ (2.12,1.54) .. controls (2,1.83) and (1.25,1.35) ..
+ (2.23,1.2) -- (2.23,1.18) .. controls (1.26,1.28) and
+ (1.85,1.88)..(2.13,1.58) .. controls (2.2,1.45) and
+ (2.03,1.25).. (1.63,1.18) -- (1.6,1.2);
+\end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####trunk###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\trunk}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width= #3pt] (67 ,104) ellipse (1cm and 1.5cm);
+\draw[draw=#2, line width= #3pt] (67,104) ellipse (2cm and 2.5cm);
+\draw[draw=#2, line width= #3pt] (67 , 104) ellipse (3cm and 4cm);
+\draw[draw=#2, line width= #3pt] (67,104) ellipse (4.4cm and 5.5cm);
+\draw[draw=#2, line width= #3pt] (67,104) ellipse (5.5cm and 6.7cm);
+\draw[draw=#2, line width= #3pt] (67 , 171) -- (333 , 183);
+\draw[draw=#2, line width= #3pt] (333 , 183) .. controls (356, 183) and (399, 122) .. (345, 75);
+\draw[draw=#2, line width= #3pt] (89, 43) -- (345, 75);
+\draw[draw=#2, line width= #3pt] (174, 176) -- (180, 205);
+\draw[draw=#2, line width= #3pt] (201, 177)-- (200, 198);
+\draw[draw=#2, line width= #3pt] (180,205) .. controls (186,197) .. (200,198);
+\draw[draw=#2, line width= #3pt] (180,205) .. controls (192, 206) .. (200,198);
+\draw[draw=#2, line width= #3pt] (191, 146) .. controls (206, 154) .. (344, 161);
+\draw[draw=#2, line width= #3pt] (134,138) .. controls (157,129) .. (286,123);
+\draw[draw=#2, line width= #3pt] (177,85) .. controls (208,96) .. (330,99);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####flower###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\flower}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width= #3pt] (200,252) circle (2.5cm);
+\draw[draw=#2, line width= #3pt] (200,252) circle (3.9cm);
+
+\draw[draw=#2, line width= #3pt] (161,251) .. controls (99,257) and (50, 270) .. (39,311);
+\draw[draw=#2, line width= #3pt] (70,357) .. controls (114,364) and ( 174, 314) .. (185,289);
+\draw[draw=#2,line width= #3pt] (39,311) .. controls (36,339) and (51,355).. (70,357);
+
+\draw[draw=#2,line width= #3pt] (213,425) .. controls (220,430) and (241,437).. (252,420);
+\draw[draw=#2, line width= #3pt] (185,289) .. controls (178,345) and (157,376) .. (213,425);
+\draw[draw=#2,line width= #3pt] (252,420) .. controls (287,369)and (261,304) .. (231,276);
+
+\draw[draw=#2,line width= #3pt] (231,276) .. controls (306,309.5) and (339,297) .. (354,290);
+\draw[draw=#2,line width= #3pt] (354,290.) .. controls (385,270) and (385,245) .. (355,226);
+\draw[draw=#2,line width= #3pt] (355,226) .. controls (333,215) and (281,201) .. (232,229);
+
+\draw[draw=#2,line width= #3pt] (232,229) .. controls (278,192) and (284,158) .. (287,139);
+\draw[draw=#2,line width= #3pt] (287,139) .. controls (292, 98) and (250,79) .. (223,106);
+\draw[draw=#2,line width= #3pt] (223,106) .. controls (200,132) and (188,175) .. (188,215);
+
+\draw[draw=#2,line width= #3pt] (188,215) .. controls (173,160) and (146,130) .. (129,120);
+\draw[draw=#2,line width= #3pt] (129,120) .. controls (100,104) and (64,117) .. (67,164);
+\draw[draw=#2,line width= #3pt] (67,164) .. controls (80,211) and (113,228) .. (161,251);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####pig###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\ship}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2,line width=#3pt] (28,85) -- (43,17) -- (290,28) -- (374,212);
+\draw[draw=#2,line width=#3pt] (39,34) -- (285,150) -- (320,100);
+\draw[draw=#2,line width=#3pt] (28,85)-- (149,235);
+\draw[draw=#2,line width=#3pt] (149,235) .. controls (229,299) .. (327,325);
+\draw[draw=#2,line width=#3pt] (374,212) .. controls (369,275) .. (327,325);
+\draw[draw=#2,line width=#3pt] (264,28) -- (327,325);
+\draw[draw=#2,line width=#3pt] (51,117) -- (37,181) -- (166,316);
+\draw[draw=#2,line width=#3pt] (166,316) .. controls (191,330) and ( 246,330) .. (271,310);
+\draw[draw=#2,line width= #3pt] (54,234) -- (74,215) -- (120,266) -- (86,304);
+\draw[draw=#2,line width= #3pt] (54,234) .. controls (50,275) and (71,294) .. (86,304);
+\draw[draw=#2,line width= #3pt] (199,325)--(169,374);
+\draw[draw=#2,line width= #3pt] (100,343) -- (140,285);
+\draw[draw=#2,line width= #3pt] (100,343) .. controls (134,374) .. (169,374);
+\draw[draw=#2,line width= #3pt] (237,227) ellipse (2cm and 3cm);
+\draw[draw=#2,line width= #3pt] (373,218) .. controls (357,222) and (346,218) .. (342,206);
+\draw[draw=#2,line width= #3pt] (342,206) .. controls (336,189) and (338,176) .. (350,163);
+\end{tikzpicture}
+}
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####bullet###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Bullet}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2,line width= #3pt] (185,119) ellipse ( 8.2cm and 8.cm);
+\draw[draw=#2,line width= #3pt] (148,190) .. controls (136,138) .. (107,96);
+\draw[draw=#2,line width= #3pt] (182,199) .. controls (172,127) .. (124,66);
+\draw[draw=#2,line width= #3pt] (225,189) .. controls (206,111) .. (148,48);
+\draw[draw=#2,line width= #3pt] (258,155) .. controls (240,89) .. (196,40);
+
+\draw[draw=#2,line width= #3pt] (267,119) .. controls (285,129) .. (305,129);
+\draw[draw=#2,line width= #3pt] (265,103) .. controls (293,109) .. (324,106);
+\draw[draw=#2,line width= #3pt] (262,93) .. controls (287,88) .. (308,70);
+
+\draw[draw=#2,line width= #3pt] (103,128) .. controls (88,124) .. (69,122);
+\draw[draw=#2,line width= #3pt] (107,143) .. controls (76,145) .. (59,162);
+\draw[draw=#2,line width= #3pt] (112,157) .. controls (84,178) .. (72,199);
+
+\draw[draw=#2,line width= #3pt] (265,137) .. controls (306,154) .. (333,154);
+\draw[draw=#2,line width= #3pt] (333,154) .. controls (362,149) and (360,137) .. (353,131);
+\draw[draw=#2,line width= #3pt] (353,131) .. controls (348,125)and (350,117) .. (360,113);
+\draw[draw=#2,line width= #3pt] (360,113) .. controls (378,105) and (375,92) .. (358,81);
+\draw[draw=#2,line width= #3pt] (358,81) .. controls (338,72) and (330,59) .. (338,42);
+\draw[draw=#2,line width= #3pt] (338,42) .. controls (344,25) and (317,13) .. (298,28) ;
+\draw[draw=#2,line width= #3pt] (298,28) .. controls (275,48) .. (255,78);
+
+\draw[draw=#2,line width= #3pt] (103,121) .. controls (75,103) .. (44,104);
+\draw[draw=#2,line width= #3pt] (44,104) .. controls (1,109) and (15,123) .. (21,126);
+\draw[draw=#2,line width= #3pt] (21,126).. controls (26,130) .. (18,138);
+\draw[draw=#2,line width= #3pt](18,138) .. controls (9,147) and (12,156) .. (18,159);
+\draw[draw=#2,line width= #3pt] (18,159) .. controls (25,164) and ( 26,175) .. (21,187);
+\draw[draw=#2,line width= #3pt] (21,187) .. controls (18,200) .. (26,210);
+\draw[draw=#2,line width= #3pt] (26,210) .. controls (34,216) .. (35,229);
+\draw[draw=#2,line width= #3pt] (35,229) .. controls (40,248) and (62,249) .. (73,237);
+\draw[draw=#2,line width= #3pt] (73,237) .. controls (103,209) .. (128,177);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####bee###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Bee}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width= #3pt] (86,154) .. controls (83,95) and (115,59) .. (150,43);
+\draw[draw=#2, line width= #3pt] (150,43) -- (230,12);
+\draw[draw=#2, line width= #3pt] (230,12) .. controls (265,04) .. (305,19);
+\draw[draw=#2, line width= #3pt] (305,19) .. controls (345,35) and (359,80) .. (331,119);
+\draw[draw=#2, line width= #3pt] (331,119) .. controls ( 268,175) and (204,176) .. (149,178);
+\draw[draw=#2, fill, line width=#3pt] (327,34) -- (345,70) -- (367,38) -- (327,34);
+
+\draw[draw=#2, fill, line width=#3pt] (171,177) ..controls (140,132) .. (89,117) .. controls (94,99) .. (95,99).. controls (160,112) .. (193,176);
+\draw[draw=#2, fill, line width=#3pt] (250,165) .. controls (213,88) .. (133,53) ..controls (144,46) .. (153,42) .. controls (231,73).. (275,156);
+\draw[draw=#2, fill, line width=#3pt] (309,136) ..controls (276,62)..(220,16) ..controls (232,11) .. (246,09) .. controls (310,68).. (328,121);
+
+\draw[draw=#2, line width= #3pt] (271,157) .. controls (338,200) and (378,260) .. (367,297);
+\draw[draw=#2, line width= #3pt] (367,297) .. controls (350,319) .. (333,331);
+\draw[draw=#2, line width= #3pt] (333,331) .. controls(326,331).. (324,335);
+\draw[draw=#2, line width= #3pt] (324,335) .. controls (299,337) .. (270,335);
+\draw[draw=#2, line width= #3pt] (270,335) .. controls (238,315) and (220,234) .. (209,174);
+
+\draw[draw=#2, line width= #3pt] (211,187) .. controls (186,298) .. (164,329);
+\draw[draw=#2, line width= #3pt] (164,329) .. controls (129,342) and (81,325) ..(76,294) -- (77,263);
+
+\draw[draw=#2, line width= #3pt] (88,271) .. controls (63,255) .. (56,229);
+\draw[draw=#2, line width= #3pt] (56,229) -- (55,216);
+\draw[draw=#2, line width= #3pt] (55,216) .. controls (40,205) and (36,176) ..(58,164);
+\draw[draw=#2, line width= #3pt] (58,164) .. controls (84,144) and (132,152) .. (149,178);
+\draw[draw=#2, line width= #3pt] (149,178) .. controls (159,192) and (147,206).. (140,213);
+\draw[draw=#2, line width= #3pt] (140,213) -- (139,232);
+\draw[draw=#2, line width= #3pt] (139,232) .. controls (132,255) .. (108,271);
+\draw[draw=#2, line width= #3pt] (88,271)--(108,271);
+
+\draw[draw=#2, line width= #3pt] (85,269) .. controls (75,287) .. (63,290);
+\draw[draw=#2, line width= #3pt] (116,266) .. controls (124,289) .. (135,290);
+\draw[draw=#2, fill, line width=#3pt] (59,288) ellipse (0.9cm and 0.7cm );
+\draw[draw=#2, fill, line width=#3pt] (138,287) ellipse (0.8cm and 0.6cm );
+
+\draw[draw=#2, line width= #3pt] (79,227) ellipse (0.8cm and 1.5cm);
+\draw[draw=#2, line width= #3pt] (115,227) ellipse (0.8cm and 1.5cm);
+\draw[draw=#2, fill ] (79, 219) circle (0.5cm);
+\draw[draw=#2, fill, line width=#3pt] (115, 219 ) circle (0.5cm);
+
+\draw[draw=#2, line width= #3pt] (87,190) .. controls (97,188) .. (100,176) .. controls (103,186) .. (112,190);
+\end{tikzpicture}
+}
+
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Sun###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\sun}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (196, 190) circle (5.5cm);
+\draw[draw=#2, line width=#3pt] (204,247) -- (213,347);
+
+\draw[draw=#2, line width=#3pt] (165,237) -- (102,316);
+\draw[draw=#2, line width=#3pt] (145,208) -- (49,251);
+\draw[draw=#2, line width=#3pt] (146,173) -- (44,141);
+\draw[draw=#2, line width=#3pt] (164,146) -- (90,71);
+\draw[draw=#2, line width=#3pt] (199,135) -- (199,32);
+\draw[draw=#2, line width=#3pt] (226,141) -- (276,52);
+\draw[draw=#2, line width=#3pt] (250,180) -- (348,141);
+\draw[draw=#2, line width=#3pt] (250,200) -- (354,225);
+\draw[draw=#2, line width=#3pt] (232,234) -- (295,314);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Star###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Star}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+\draw[draw=#2, line width=#3pt] (145,276) -- (190,380) --
+(237,279) -- (349,288) --(278,199) -- (349,108) --
+(237,121) -- (191,19) -- (147,118) -- (37,109) --
+(98,198) -- (35, 287) -- (148,273);
+\end{tikzpicture}
+}
+
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Train###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\train}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt] (68,95) -- (115,95) -- (115,57) -- (71,57) -- (71,95);
+\draw[draw=#2, line width=#3pt] (162,95) -- (205,95) -- (204,51) -- (162,51) -- (162,95);
+\draw[draw=#2, line width=#3pt] (246,51) -- (246,95) -- (289,95) -- (290,51) -- (248,51);
+\draw[draw=#2, line width=#3pt] (333,51) -- (333,95) -- (374,95) -- (373,51) -- (333,51);
+\draw[draw=#2, line width=#3pt] (31,71) -- (30,81) -- (25,82) -- (24,89) -- (39,90) -- (40,82) -- (30,82) -- (35,82) -- (35,71);
+\draw[draw=#2, line width=#3pt] (320,105) -- (320,28) -- (386,28) -- (386,105) -- (320,105);
+\draw[draw=#2, line width=#3pt] (235,105) -- (235,28) -- (300,28) -- (301,105) -- (235,105);
+\draw[draw=#2, line width=#3pt] (149,105) -- (149,28) -- (217,28) -- (217,105) -- (149,105);
+\draw[draw=#2, line width=#3pt] (26,28) -- (130,28) -- (130,105) -- (59,105) -- (59,70) -- (24,69);
+\draw[draw=#2, line width=#3pt] (130,34) -- (149,34) -- (151,44) -- (132,44);
+\draw[draw=#2, line width=#3pt] (217,34) -- (235,34) -- (233,44) -- (218,44);
+\draw[draw=#2, line width=#3pt] (302,34) -- (319,34) -- (319,44) -- (302,44);
+\draw[draw=#2, line width=#3pt] (25, 28) .. controls (21, 41) and (21,62) .. (25,71);
+\draw[draw=#2, line width=#3pt] (29, 28) .. controls (32.5,12.35) and (52,10) .. (57,28);
+\draw[draw=#2, line width=#3pt] (67, 28) .. controls (68, 10) and (89,10) .. (93,28);
+\draw[draw=#2, line width=#3pt] (100, 28) .. controls (104, 10) and (125,10) .. (128,28);
+\draw[draw=#2, line width=#3pt] (152, 28) .. controls (153, 10) and (175,10) .. (178,28);
+\draw[draw=#2, line width=#3pt] (188, 28) .. controls (188, 10) and (217,10) .. (212,28);
+\draw[draw=#2, line width=#3pt] (237, 28) .. controls (235, 10) and (261,10) .. (263,28);
+\draw[draw=#2, line width=#3pt] (274, 28) .. controls (273, 10) and (302,10) .. (296,28);
+\draw[draw=#2, line width=#3pt] (321, 28) .. controls (324, 10) and (343,10) .. (347,28);
+\draw[draw=#2, line width=#3pt] (358, 28) .. controls (361, 10) and (380,10) .. (385,28);
+
+\draw[draw=#2, line width=#3pt] (26, 92) .. controls (29, 98) and (29,94) .. (27,101);
+\draw[draw=#2, line width=#3pt] (26, 105) .. controls (29, 112) and (29,107) .. (27,113);
+\draw[draw=#2, line width=#3pt] (34, 92) .. controls (33, 98) and (29,94) .. (32,101);
+\draw[draw=#2, line width=#3pt] (32, 101) .. controls (30, 112) and (35,107) .. (35,116);
+\draw[draw=#2, line width=#3pt] (39, 92) .. controls (40, 98) and (42,94) .. (41,101);
+\draw[draw=#2, line width=#3pt] (39, 105) .. controls (40, 98) and (41,108) .. (41,115);
+
+\draw[draw=#2, line width=#3pt] (58, 106) .. controls (53, 110) and (52,115) .. (57,116);
+
+\draw[draw=#2, line width=#3pt] (130, 106) .. controls (137, 110) and (135,115) .. (131,116);
+
+\draw[draw=#2, line width=#3pt] (149, 106) .. controls (144, 110) and (141,114) .. (148,116);
+
+\draw[draw=#2, line width=#3pt] (217,106) .. controls (223,111) and (222,112) .. (219,117) -- (147,116);
+
+\draw[draw=#2, line width=#3pt] (57,116) -- (131,116);
+
+\draw[draw=#2, line width=#3pt] (235,105) .. controls (229,109) and (229,115) .. (233,117) -- (304,117) ..controls (306,114) and (309,110) .. (301,106);
+
+
+\draw[draw=#2, line width=#3pt] (319,106) .. controls (314,109) and (314,115) .. (318,117) -- (388,117) ..controls (391,111) and (391,109) .. (385,106);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Sheep###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\sheep}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt] (118, 248) .. controls (123, 253) and (131, 255) .. (137, 250) .. controls (142, 258) and (153, 259) .. (158, 253) .. controls (165, 259) and (176, 257) .. (183, 249);
+\draw[draw=#2, line width=#3pt] (183, 249) .. controls (187, 256) and (199, 257) .. (205, 252) .. controls (211,257) and (222,256) .. (229, 248) .. controls (234,254) and (244,255) .. (251,249);
+\draw[draw=#2, line width=#3pt] (251,249) .. controls (258,254) and (270,252) .. (278,246) .. controls (289,247) and (301,241) .. (305,231) .. controls (320,230) and (332,225) .. (335,211);
+\draw[draw=#2, line width=#3pt] (335,211) .. controls (344,210) and (355,196) .. (353,187) .. controls (361,179) and (360,166) .. (353,162) .. controls (360,155) and (360,141) .. (353,135);
+\draw[draw=#2, line width=#3pt] (353,135) .. controls (358,127) and (351,113) .. (341,109) .. controls (350,102) and (346,87) .. (335,85) .. controls (339,75) and (334,65) .. (327,64);
+\draw[draw=#2, line width=#3pt] (327,64) .. controls (321,58) and (313,53) .. (303,56) .. controls (301,46) and (287,43) .. (279,50) .. controls (273,44) and (264,44) .. (256,50);
+\draw[draw=#2, line width=#3pt] (256,50) .. controls (251,44) and (238,46) .. (227,54) .. controls (220,48) and (213,47) .. (206,52) .. controls (199,47) and (189,48) .. (181,55);
+\draw[draw=#2, line width=#3pt] (181,55) .. controls (176,51) and (166,50) .. (159,56) .. controls (151,50) and (143,51) .. (134,59) .. controls (127,56) and (119,58) .. (118,64);
+\draw[draw=#2, line width=#3pt] (111,64) .. controls (106,73) and (96,60) .. (90,93) .. controls (82,98) and (80,105) .. (80,113) .. controls (73,115) and (70,133) .. (71,134);
+\draw[draw=#2, line width=#3pt] (117,63) .. controls (113,63) and (110,64) .. (109,66);
+\draw[draw=#2, line width=#3pt] (110,230) .. controls (115,237) and (117,247) .. (110,251) .. controls (112,262) and (99,270) .. (90,264) .. controls (83,273) and (73,276) .. (67,271);
+\draw[draw=#2, line width=#3pt] (67,271) .. controls (61,272) and (57,266) .. (54,261) .. controls (46,264) and (38,263) .. (33,255) .. controls (38,246) and (28,246) .. (28,237);
+\draw[draw=#2, line width=#3pt] (28,237) .. controls (29,259) and (23,225) .. (36,221);
+\draw[draw=#2, line width=#3pt] (71,135) .. controls (82,130) and (104,147) .. (115,174) .. controls (117,200) and (111,227) .. (104,243);
+\draw[draw=#2, line width=#3pt] (57,168) .. controls (65,159) and (77,159) .. (91,168);
+\draw[draw=#2, line width=#3pt] (36,221) .. controls (45,240) and (55,241) .. (63,243) .. controls (67,249) and (71,245) .. (76,249) .. controls (82,247) and (91,247) .. (95,252);
+\draw[draw=#2, line width=#3pt] (95,252) .. controls (103,243) and (107,243) .. (107,239);
+\draw[draw=#2, line width=#3pt] (339,208) .. controls (341,216) and (345,220) .. (351,221) .. controls (349,227) and (353,230) .. (357,233) .. controls (357,239) and (362,242) .. (369,238);
+\draw[draw=#2, line width=#3pt] (362,242) .. controls (369,238) and (377,234) .. (375,222) .. controls (369,220) and (371,215) .. (367,212) .. controls (370,207) and (355,201) .. (352,193);
+\draw[draw=#2, line width=#3pt] (339,208) .. controls (341,216) and (345,220) .. (351,221) .. controls (349,227) and (353,230) .. (357,233) .. controls (357,239) and (362,242) .. (369,238);
+\draw[draw=#2, line width=#3pt] (362,242) .. controls (369,238) and (377,234) .. (375,222) .. controls (369,220) and (371,215) .. (367,212) .. controls (370,207) and (355,201) .. (352,193);
+\draw[draw=#2, line width=#3pt] (157,54) .. controls (157,36) and (157,26) .. (157,26) .. controls (160,19) and (150,17) .. (149,17) -- (145,28);
+\draw[draw=#2, line width=#3pt] (145,28) .. controls (138,18) and (134,20) .. (145,20) .. controls (141,18) and (137,19) .. (131,24) -- (138,32) -- (138,55);
+\draw[draw=#2, line width=#3pt] (127,58) .. controls (130,48) and (126,36) .. (119,22);
+\draw[draw=#2, line width=#3pt] (119,22) .. controls (123,23) and (128,21) .. (132,22);
+\draw[draw=#2, line width=#3pt] (123,25) -- (129,33);
+\draw[draw=#2, line width=#3pt] (311,55) .. controls (304,39) and (305,24) .. (307,11);
+\draw[draw=#2, line width=#3pt] (307,11) .. controls (303,08) and (295,09) .. (294,11);
+\draw[draw=#2, line width=#3pt] (294,11) .. controls (286,10) and (282,13) .. (282,17);
+\draw[draw=#2, line width=#3pt] (282,17) -- (285,21) -- (285,45);
+\draw[draw=#2, line width=#3pt] (293,11) -- (294,22);
+\draw[draw=#2, line width=#3pt] (123,25) -- (129,33);
+\draw[draw=#2, line width=#3pt] (267,17) .. controls (271,27) and (277,33) .. (274,47);
+\draw[draw=#2, line width=#3pt] (281,15) -- (275,13) -- (267,17) -- (271,15) -- (277,24);
+\draw[draw=#2, line width=#3pt] (113,235) .. controls (127,215) and (135,208) .. (145,198) .. controls (140,179) and (129,160) .. (117, 177);
+\draw[draw=#2, line width=#3pt] (31,222) .. controls (23,209) and (15,202) .. (09,197) .. controls (09,179) and (15,168) .. (23,161) .. controls (28,165) and (32,168) .. (35,171) ;
+\draw[draw=#2, line width=#3pt] (35,221) .. controls (31,197) and (33,183) .. (35,171) .. controls (42,155) and (56,140) .. (70,135);
+\draw[draw=#2, line width=#3pt] (59,210) ellipse (0.8cm and 1.3cm);
+\draw[draw=#2, line width=#3pt] (89,210) ellipse (0.8cm and 1.3cm);
+\draw[fill=black] (59,207) circle (0.7cm) ;
+\draw[fill=black] (89,207) circle (0.7cm) ;
+
+\end{tikzpicture}
+}
+
+
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Carrot###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\carrot}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (230,344) .. controls (230,392) .. (205,427);
+\draw[draw=#2, line width=#3pt] (205,427) .. controls (199,439) .. (211,442);
+\draw[draw=#2, line width=#3pt] (211,442) .. controls (218,443) .. (219,459);
+\draw[draw=#2, line width=#3pt] (219,459) .. controls (219,472) .. (231,466);
+\draw[draw=#2, line width=#3pt] (231,466) .. controls (239,462) .. (247,481);
+\draw[draw=#2, line width=#3pt] (247,481) .. controls (253,488) .. (262,475);
+\draw[draw=#2, line width=#3pt] (262,476) .. controls (269,420) .. (243,338);
+\draw[draw=#2, line width=#3pt] (265,445) .. controls (274,494) .. (278,509);
+\draw[draw=#2, line width=#3pt] (278,509) .. controls (286,520) .. (294,510);
+\draw[draw=#2, line width=#3pt] (294,510) .. controls (297,499) .. (304,504);
+\draw[draw=#2, line width=#3pt] (304,504) .. controls (312,505) .. (313,489);
+\draw[draw=#2, line width=#3pt] (313,489) .. controls (315,480) .. (326,477);
+\draw[draw=#2, line width=#3pt] (326,477) .. controls (332,470) .. (315,436);
+\draw[draw=#2, line width=#3pt] (249,357) .. controls (289,411) .. (327,447);
+\draw[draw=#2, line width=#3pt] (327,447) .. controls (349,450) .. (340,430);
+\draw[draw=#2, line width=#3pt] (340,430) .. controls (334,418) .. (342,415);
+\draw[draw=#2, line width=#3pt] (342,415) .. controls (347,412) .. (340,404);
+\draw[draw=#2, line width=#3pt] (340,404) .. controls (334,397) .. (342,392);
+\draw[draw=#2, line width=#3pt] (342,392) .. controls (346,386) .. (334,377);
+\draw[draw=#2, line width=#3pt] (334,377) .. controls (290,376) .. (252,332);
+\draw[draw=#2, line width=#3pt] (254,200) arc (-50 : 180 : 85);
+\draw[draw=#2, line width=#3pt] (114,265) .. controls (87,213) .. (92,150);
+\draw[draw=#2, line width=#3pt] (92,150) .. controls (81,94) .. (98,32);
+\draw[draw=#2, line width=#3pt] (98,32) .. controls (167,69) .. (193,110);
+\draw[draw=#2, line width=#3pt] (193,110) .. controls (240,146) .. (254,200);
+\end{tikzpicture}
+}
+
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####mouse###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\mouse}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (162,126) .. controls (252,7) .. (335,125);
+\draw[draw=#2, line width=#3pt] (220,175) arc (-1 : 270 : 50);
+\draw[draw=#2, line width=#3pt] (325,125) arc (-89 : 180: 50);
+\draw[draw=#2, line width=#3pt] (230,70) .. controls (190,82) .. (154,71);
+\draw[draw=#2, line width=#3pt] (233,62) .. controls (195,68) .. (165,46);
+\draw[draw=#2, line width=#3pt] (233,56) .. controls (202,58) .. (189,26);
+\draw[draw=#2, line width=#3pt] (272,71) .. controls (312,82) .. (347,69);
+\draw[draw=#2, line width=#3pt] (268,62) .. controls (311,66) .. (337,45);
+\draw[draw=#2, line width=#3pt] (268,56) .. controls (300,58) .. (312,26);
+\draw[draw=#2, line width=#3pt] (355,215) arc (1: 180: 110);
+\draw[draw=#2, line width=#3pt] (233,322) .. controls (189,357) .. (141,352);
+\draw[draw=#2, line width=#3pt] (141,352) .. controls (114,331) .. (64,298);
+\draw[draw=#2, line width=#3pt] (64,298) .. controls (43,291) .. (21,311);
+\draw[draw=#2, line width=#3pt] (21,311) .. controls (44,303) .. (114,351);
+\draw[draw=#2, line width=#3pt] (170,379) .. controls (143,371) .. (114,351);
+\draw[draw=#2, line width=#3pt] (170,379) .. controls (223,374) .. (270,322);
+\draw[draw=#2, line width=#3pt] (218,108) ellipse (0.8cm and 1.5cm);
+\draw[draw=#2, line width=#3pt] (281,109) ellipse (0.8cm and 1.5cm);
+\draw[draw=#2, line width=#3pt] (250,49) -- (262,67) -- (239,67) -- (250,49);
+\end{tikzpicture}
+}
+
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####pencil###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\pencil}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2, line width=#3pt] (375,70) -- (63,70) -- (68,66 ) -- ( 82,61 ) -- ( 75,56 ) -- ( 86,53 ) -- ( 69,46 ) -- ( 77,42 ) -- ( 64,36 ) -- (375,36) -- ( 375,70 ) ;
+\draw[draw=#2, line width=#3pt] (63,70) -- (30,61) ;
+\draw[draw=#2, line width=#3pt] ( 64,36 ) -- (30,48) ;
+\draw[draw=#2, line width=#3pt] (30,61) -- ( 39,58 ) -- (31,54) -- (40,50 ) -- (30,48) -- (8 ,54) -- (30,61) ;
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####shooting star###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\sstar}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+
+\draw[draw=#2, line width=#3pt] (48,131) -- (85,90) -- (133,111 ) -- ( 108,63 ) --
+( 142,23 ) -- ( 92,34 ) -- ( 65,-10 ) -- ( 58,42 ) -- ( 07,56 ) -- (54,78) -- (48,131);
+\draw[draw=#2, line width=#3pt] (120,85) .. controls (180, 115) and (260, 150) .. (370,85);
+\draw[draw=#2, line width=#3pt] ( 370 , 85) -- (345,85) ;
+\draw[draw=#2, line width=#3pt] (345,85) .. controls (360, 70) and (380, 57) .. (391,29);
+\draw[draw=#2, line width=#3pt] (278,58) .. controls (282, 60) and (320, 70) .. (391,29);
+\draw[draw=#2, line width=#3pt] ( 278 , 58) -- (291,23) ;
+\draw[draw=#2, line width=#3pt] (117,52) .. controls (120, 54) and (190, 87) .. (291,23);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Star###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\STAR}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+
+\draw[draw=#2, line width=#3pt] (190,370) -- (247,263) -- (364,250 ) -- ( 285,164 ) -- ( 311,47 ) -- ( 204,100 ) -- ( 99,35 ) -- ( 114,154 ) -- ( 24,237 ) -- (142,258) -- (190,370);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####van###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\van}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2, line width=#3pt] (46, 61) -- (22,61) ;
+\draw[draw=#2, line width=#3pt](76,64) circle (1.8cm);
+\draw[draw=#2, line width=#3pt](76,64) circle (3cm);
+\draw[draw=#2, line width=#3pt] (22,61) .. controls (19, 92) and (22, 103) .. (30,109);
+\draw[draw=#2, line width=#3pt] (30,109) .. controls (36,148) and (63,171) .. (100,176);
+\draw[draw=#2, line width=#3pt] (100,176) .. controls (108,187) and (125,221) .. (156,227 );
+\draw[draw=#2, line width=#3pt] (156,227) -- (376,227) ;
+\draw[draw=#2, line width=#3pt] (376,227) -- (376,61) ;
+\draw[draw=#2, line width=#3pt] (318,61) -- (376,61) ;
+\draw[draw=#2, line width=#3pt] (251,61) -- (106,61) ;
+\draw[draw=#2, line width=#3pt](286,64) circle (1.8cm);
+\draw[draw=#2, line width=#3pt](286,64) circle (3cm);
+\draw[draw=#2, line width=#3pt] (114,146) -- (176,146) ;
+\draw[draw=#2, line width=#3pt] (176,146)-- (176,207) ;
+\draw[draw=#2, line width=#3pt] (114,146) .. controls (125,200) and (150,205) .. (176,207 );
+\draw[draw=#2, line width=#3pt] (196,207) -- (196,146) ;
+\draw[draw=#2, line width=#3pt] (196,207) -- (268,207) ;
+\draw[draw=#2, line width=#3pt] (268,146) -- (268,207) ;
+\draw[draw=#2, line width=#3pt] (268,146) -- (196,146) ;
+
+\draw[draw=#2, line width=#3pt] (286,207) -- (286,146) ;
+\draw[draw=#2, line width=#3pt] (286,207) -- (360,207) ;
+\draw[draw=#2, line width=#3pt] (360,146) -- (360,207) ;
+\draw[draw=#2, line width=#3pt] (360,146) -- (286,146) ;
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Truck###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\truck}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2, line width=#3pt] (31, 73) -- (16,73) ;
+\draw[draw=#2, line width=#3pt](54,64) circle (1.5cm);
+\draw[draw=#2, line width=#3pt](54,64) circle (2.5cm);
+\draw[draw=#2, line width=#3pt] (16, 135) -- (16,73) ;
+\draw[draw=#2, line width=#3pt] (16, 135) -- (46,135) ;
+\draw[draw=#2, line width=#3pt] (46, 175) -- (46,135) ;
+\draw[draw=#2, line width=#3pt] (46, 175) -- (88,175) ;
+\draw[draw=#2, line width=#3pt] (88, 82) -- (88,175) ;
+\draw[draw=#2, line width=#3pt] (88, 200) -- (88,175) ;
+\draw[draw=#2, line width=#3pt] (88, 200) -- (374,200) --(374,72) -- (367,72) ;
+\draw[draw=#2, line width=#3pt] (314, 72) -- (320,72) (267,72) -- (132,72) ;
+\draw[draw=#2, line width=#3pt] (78, 73) -- (85,73) ;
+\draw[draw=#2, line width=#3pt](108,64) circle (1.5cm);
+\draw[draw=#2, line width=#3pt](108,64) circle (2.5cm);
+\draw[draw=#2, line width=#3pt] (80, 128) -- (80,164) --(54,164) -- (54,128) ;
+\draw[draw=#2, line width=#3pt] (80, 128) -- (54,128) ;
+
+\draw[draw=#2, line width=#3pt](291,64) circle (1.5cm);
+\draw[draw=#2, line width=#3pt](291,64) circle (2.5cm);
+
+\draw[draw=#2, line width=#3pt](344,64) circle (1.5cm);
+\draw[draw=#2, line width=#3pt](344,64) circle (2.5cm);
+\end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####bike###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\bike}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (102,85) circle (6cm);
+\draw[draw=#2, line width=#3pt] (290,85) circle (6cm);
+\draw[draw=#2, line width=#3pt] (102,84) -- (153,185) -- (245,187) -- (255,164) -- (199,86) -- (102,85) ;
+\draw[draw=#2, line width=#3pt] (153,186) -- (202,90);
+\draw[draw=#2, line width=#3pt] (155,182) -- (142,210);
+
+\draw[draw=#2, line width=#3pt] (125.9,201.9) -- (163,221) .. controls (165,225) and (161,231) .. (155,231) -- (131,231) .. controls (125,234) and (120,232) .. (119,228) .. controls (118,220) and (121,210) .. (124,203) .. controls (125,201) .. (126,202);
+
+\draw[draw=#2, line width=#3pt] (290,85) -- (220,243);
+\draw[draw=#2, line width=#3pt] (197,235) -- (243,247);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Egg###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\EGg}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (192,241) ellipse (16cm and 22cm);
+\draw[draw=#2, line width=#3pt] (93,412).. controls (95,375) and (122,375) .. (124,403) ;
+\draw[draw=#2, line width=#3pt] (124,403) .. controls (127,428) and (151,428) .. (154,403);
+
+\draw[draw=#2, line width=#3pt] (154,403) .. controls (156,375) and (180,375) .. (185,403);
+\draw[draw=#2, line width=#3pt] (185,403) .. controls (187,428) and (210,428) .. (213,403);
+\draw[draw=#2, line width=#3pt] (213,403) .. controls (216,375) and (240,375) .. (245,403);
+\draw[draw=#2, line width=#3pt] (245,403) .. controls (246,428) and (268,428) .. (273,403);
+\draw[draw=#2, line width=#3pt] (273,403) .. controls (277,380) and (297,384) .. (303,400);
+
+\draw[draw=#2, line width=#3pt] (79,88).. controls (86,104) and (105,104) .. (110,80) ;
+\draw[draw=#2, line width=#3pt] (110,80) .. controls (114,54) and (132,54) .. (139,80);
+\draw[draw=#2, line width=#3pt] (139,80) .. controls (144,105) and (164,105) .. (169,80);
+\draw[draw=#2, line width=#3pt] (169,80) .. controls (174,54) and (194,54) .. (199,80);
+\draw[draw=#2, line width=#3pt] (199,80) .. controls (203,105) and (225,105) .. (228,80);
+\draw[draw=#2, line width=#3pt] (228,80) .. controls (235,54) and (257,54) .. (258,80);
+\draw[draw=#2, line width=#3pt] (258,80) .. controls (267,108) and (287,109) .. (290,67);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Plane###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\plane}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (44,140) .. controls (51,175) .. (87,181);
+\draw[draw=#2, line width=#3pt] (44,140) .. controls (1,133) and (1,103) .. (44,90);
+\draw[draw=#2, line width=#3pt] (44,90) -- (167,90) -- (259,21) -- (278,52) -- (246,90) -- (327,90) .. controls (360,105) and (360,215) .. (327,226) .. controls (308,215) .. (303,165);
+\draw[draw=#2, line width=#3pt] (303,165) -- (256,165) -- (232,168) -- (215,170) -- (192,171) -- (154,176) -- (124,178) -- (87,181);
+\draw[draw=#2, line width=#3pt] (132,121) -- (253,121) -- (253, 146) -- (132,146) -- (132,121);
+\draw[draw=#2, line width=#3pt] (172,121) -- (172,146);
+\draw[draw=#2, line width=#3pt] (213,121) -- (213,146);
+
+(60,131) (82,131) (82,160) (60,160)
+
+\draw[draw=#2, line width=#3pt] (71,131) .. controls (82,131) .. (82,145);
+\draw[draw=#2, line width=#3pt] (82,145) .. controls (82,160) .. (71,160);
+\draw[draw=#2, line width=#3pt] (71,160) .. controls (60,160) .. (60,145);
+\draw[draw=#2, line width=#3pt] (60,145) .. controls (60,131) .. (71,131);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Bear###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\bear}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (90,176) circle (4.8cm);
+\draw[draw=#2, line width=#3pt] (338,179) circle (4.8cm);
+\draw[draw=#2, line width=#3pt] (210,268) circle (4.8cm);
+\draw[draw=#2, line width=#3pt] (172,330) circle (1.5cm);
+\draw[draw=#2, line width=#3pt] (211,289) circle (1.5cm);
+\draw[draw=#2, line width=#3pt] (253,329) circle (1.5cm);
+
+\draw[draw=#2, line width=#3pt] (123,210) .. controls (136,220) .. (148,228);
+
+
+\draw[draw=#2, line width=#3pt] (180,384) arc (25 : 246 : 48);
+
+\draw[draw=#2, line width=#3pt] (179,384) .. controls (200,392) and (230,392) .. (246,383);
+\draw[draw=#2, line width=#3pt] (246,383) arc (154 : -73 : 48);
+\draw[draw=#2, line width=#3pt] (305,316) arc ( 8 : -190 : 96);
+\draw[draw=#2, line width=#3pt] (210,262) arc (-2 : -165 : 14);
+\draw[draw=#2, line width=#3pt] (211,262) arc (-170 : -23 : 15);
+\draw[draw=#2, line width=#3pt] (270,228) .. controls (288,221) .. (299,210);
+\draw[draw=#2, line width=#3pt] (333,133) .. controls (332,117) .. (326,102);
+\draw[draw=#2, line width=#3pt] (326,104) arc (36 : -142 : 60);
+\draw[draw=#2, line width=#3pt] (326,104) arc (58 : 197: 64);
+\draw[draw=#2, line width=#3pt] (230,32) .. controls (208,30) .. (186,32);
+\draw[draw=#2, line width=#3pt] (186,32) arc (-38 : -219 : 60);
+
+\draw[draw=#2, line width=#3pt] (186,32) arc (-13 : 118 : 66);
+\draw[draw=#2, line width=#3pt] (92,107) .. controls (88,117) .. (88,128);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Frog###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\frog}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (166,380) circle (2cm);
+\draw[draw=#2, line width=#3pt] (151,380) circle (5cm);
+\draw[draw=#2, line width=#3pt] (201,387) -- (206,387);
+\draw[draw=#2, line width=#3pt] (240,380) circle (2cm);
+\draw[draw=#2, line width=#3pt] (255,380) circle (5cm);
+\draw[draw=#2, line width=#3pt] (247,303) arc (2 : -180 : 44);
+\draw[draw=#2, line width=#3pt] (89,209) .. controls (75,235) .. (40,243) .. controls (9,230) .. (4,208) .. controls (20,167) and (35,139) .. (73,75) .. controls (74,67) .. (68,61) .. controls (55,50) .. (52,42) .. controls (51,36) .. (52,30) .. controls (61,23) .. (75,26) .. controls (80,29) .. (85,30) .. controls (84,25) .. (94,16) .. controls (102,14) .. (110,15) .. controls (118,26) .. (118,31);
+\draw[draw=#2, line width=#3pt] (76,179) -- (60,201) ;
+\draw[draw=#2, line width=#3pt] (127,117) -- (147,56) .. controls (146,53) .. (140,56) .. controls (129,53) .. (124,47) .. controls (118,38) .. (120,32) .. controls (129,24) .. (144,22) .. controls (146,11) .. (157,7) .. controls (168,9) .. (181,21) .. controls (186,) and (195,3) .. (206,6) .. controls (213,10) .. (216,17) .. controls (217,22) .. (213,29) .. controls (207,33) .. (201,34) -- (205,123);
+\draw[draw=#2, line width=#3pt] (216,17) .. controls (221,8) .. (228,4) .. controls (239,4) .. (247,10) .. controls (247,21) .. (249,26) .. controls (260,22) .. (272,23) .. controls(280,30) .. (286,38) .. controls (287,43) .. (273,57) .. controls ( 266,58) .. (263,57) .. controls (262,61) .. (264,68) .. controls (270,75) .. (272,88) .. controls (277,104) and (277,109) .. (282,121);
+\draw[draw=#2, line width=#3pt] (283,34) .. controls (286,21) .. (293,15) .. controls (300,14) .. (306,15) .. controls (315,20) .. (317,25) .. controls (317,27) .. (316,30) .. controls (325,26) .. (332,25) .. controls (344,25) .. (349,29) .. controls (351,35) .. (347,50) .. controls (343,55) .. (334,61) .. controls (327,66) .. (328,71) .. controls (329,78) .. (333,85) .. controls (364,138) .. (368,145) .. controls (389,183) .. (396,204) .. controls (398,213) .. (392,226) .. controls (379,237) .. (365,242) .. controls (345,242) .. (331,234) .. controls (323,228) .. (317,217);
+\draw[draw=#2, line width=#3pt] (342,201) -- (332,187);
+\draw[draw=#2, line width=#3pt] (243,33) -- (229,33);
+\draw[draw=#2, line width=#3pt] (311,47) -- (300,47);
+\draw[draw=#2, line width=#3pt] (170,37) -- (159,40);
+\draw[draw=#2, line width=#3pt] (103,47) -- (91,47);
+\draw[draw=#2, line width=#3pt] (137,89) arc (-108 : -234.5 : 84);
+\draw[draw=#2, line width=#3pt] (129,224) arc ( -122 : - 223.6 : 81);
+\draw[draw=#2, line width=#3pt] (272,87) arc (-75 : 60.5 : 83);
+\draw[draw=#2, line width=#3pt] (283,230) arc (-52 : 42 : 81);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Bull###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\bull}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (150,409) .. controls (109,383) and (99,364) .. (84,339) .. controls (66,280) and (59,224) .. (74,118);
+\draw[draw=#2, line width=#3pt] (74,118) -- (85,56) .. controls (89,31) and (117,16) .. (141,11);
+\draw[draw=#2, line width=#3pt] (141,11) .. controls (207,10) .. (277,16);
+\draw[draw=#2, line width=#3pt] (277,16) .. controls (309,19) and (328,58) .. (327,86) .. controls (335,117) and (342,198) .. (340, 254) .. controls (337,324) .. (298,382);
+\draw[draw=#2, line width=#3pt] (298,384) .. controls (265,408) .. (235,409);
+\draw[draw=#2, line width=#3pt] (150,409) .. controls (194,413) .. (235,409);
+\draw[draw=#2, line width=#3pt] (150,409) .. controls (162,402) .. (159,391) .. controls (149,359) and (162,337) .. (182,332);
+\draw[draw=#2, line width=#3pt] (182,332) .. controls (200,335) and (209,343) .. (215,358) .. controls (222,361) .. (229,362) .. controls (241,362) .. (251,381) .. controls (252,394) .. (264,406);
+\draw[draw=#2, line width=#3pt] (264,406) .. controls (283,432) .. (300,483);
+\draw[draw=#2, line width=#3pt] (300,483) .. controls (316,425) .. (297,380);
+\draw[draw=#2, line width=#3pt] (297,380) .. controls (315,389) .. (334,386) .. controls (362,356) .. (349,350) .. controls (347,345) .. (338,343) .. controls (329,347) .. (319,349);
+\draw[draw=#2, line width=#3pt] (146,406) .. controls (124,434) .. (106,482) .. controls (90,421) .. (112,378);
+\draw[draw=#2, line width=#3pt] (112,378) .. controls (101,387) .. (73,387) .. controls (59,375) .. (44,359) .. controls (52,353) .. (59,347) .. controls (77,347) .. (82,351) -- (90,350);
+\draw[draw=#2, line width=#3pt] (135,58) circle (1.5cm);
+\draw[draw=#2, line width=#3pt] (135,58) circle (1cm);
+\draw[draw=#2, line width=#3pt] (269,56) circle (1cm);
+\draw[draw=#2, line width=#3pt] (269,56) circle (1.5cm);
+\draw[draw=#2, line width=#3pt] (263,283) ellipse (2.2cm and 4.2cm);
+\draw[draw=#2, line width=#3pt] (241,278) .. controls (251,281) .. (258,286) .. controls (263,289) ..(269,286) .. controls (273,283) .. (285,281);
+\draw[draw=#2, line width=#3pt] (137,283) ellipse (2.2cm and 4.2cm);
+\draw[draw=#2, line width=#3pt] (115,279) .. controls (129,280) .. (132,286) .. controls (138,288) .. (143,286) .. controls (148,283) .. (159,281);
+\draw[draw=#2, line width=#3pt] (71,118) .. controls (179,94) and (253,96) .. (333,118);
+
+\end{tikzpicture}
+}
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Elephant###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Elephant}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (16,113) .. controls (13,120) .. (14,126) .. controls (21,128) .. (32,128) .. controls (43,122) .. (58,119) .. controls (74,120) .. (84,127)
+.. controls (93,147) .. (98,168) .. controls (108,197) .. (109,215) .. controls (114,220) .. (121,224) .. controls (135,226) .. (149,223) .. controls (157,235) and (171,238) .. (178,236) ..
+ controls (179,232) .. (193,226) .. controls (208,218) .. (213,204) .. controls (215,192) .. (211,177) .. controls (205,164) .. (205,153) .. controls (204,147) .. (196,139) ..
+ controls (193,133) .. (190,127) -- (174,153);
+\draw[draw=#2, line width=#3pt] (138,188) ellipse (0.8cm and 1.2cm);
+\draw[draw=#2, line width=#3pt] (16,112.5) .. controls (21,119) .. (27,117) .. controls (36,110) .. (44,106) .. controls (56,101) .. (68,100) .. controls (81,100) .. (94,106) ..
+controls (121,119) .. (145,139) .. controls (126,107) .. (101,84) .. controls (103,83) .. (103,78) .. controls (133,100) .. (156,132) .. controls (170,125) .. (174,116) .. controls (179,68) .. (176,31);
+\draw[draw=#2, line width=#3pt] (176,31) .. controls (173,23) .. (174,17);
+\draw[draw=#2, line width=#3pt] (174,17)--(174,16) .. controls (201,12) .. (223,24) .. controls (218,28) .. (212,29) .. controls (208,27) .. (206,18) .. controls (202,23) .. (197,24) .. controls (193,23) .. (190,17) .. controls (187,21) .. (183,23) .. controls (178,22) .. (174,17);
+\draw[draw=#2, line width=#3pt] (223,24) .. controls (224,28) .. (224,32) .. controls (221,44) .. (217,54) .. controls (217,80).. (222,86) .. controls (240,93) .. (256,95).. controls (276,93) .. (294,83) .. controls (296,79) .. (296,73) .. controls (299,52) .. (299,34) .. controls (299,28) .. (296,22) .. controls (296,20) .. (296,18);
+\draw[draw=#2, line width=#3pt] (296,18) -- (297,17) .. controls (320,8) and (331,16) .. (347,20) .. controls (343,28) .. (337,28) .. controls (334,27) and (331,24) .. (330,19) .. controls (326,22) .. (321,22) .. controls (316,20) .. (314,17) .. controls (311,22) .. (306,24) .. controls (300,23) .. (297,17) ;
+\draw[draw=#2, line width=#3pt] (347,20) .. controls (350,23) .. (352,27) .. controls (350,39) .. (346,48) .. controls (344,64) .. (344,70) .. controls (360,107) .. (367,145) .. controls (369,145) .. (371,142) .. controls (376,135) .. (378,128) .. controls (378,123) .. (375,113) .. controls (376,110) .. (378,104) .. controls (380,100) .. (384,96) .. controls (386,96) .. (388,99) .. controls (389,108) .. (387,117) .. controls (385,119) .. (386,131) ..
+ controls (385,138) .. (381,145) .. controls (375,151) .. (367,154) .. controls (364,166) .. (357,178) .. controls (326,206) .. (294,219) .. controls (256,229) .. (233,229) .. controls (212,228) .. (196,225);
+ \draw[draw=#2, line width=#3pt] (156,132) -- (146,141);
+ \draw[draw=#2, line width=#3pt] (367,154) .. controls (367,149) .. (367,145);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Sheet###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\sheet}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt] (49,22) .. controls(102,134) and (243,236) .. (378,291);
+\draw[draw=#2, line width=#3pt] (50,20).. controls (60,238) and (140,260) ..(304,282)..
+controls (339,295) and (367,299).. (378,291);
+\draw[draw=#2, line width=#3pt] (49,22) .. controls(91,51) and (116,65) .. (177,71) ..
+controls (265,85) and(333,132).. (360,263) ..
+controls(365,271) and (376,276) .. (378,291);
+\draw[draw=#2, line width=#3pt] (108,110)--(112,178);
+\draw[draw=#2, line width=#3pt] (166,164)--(251,186);
+\draw[draw=#2, line width=#3pt] (245,223)--(254,268);
+\end{tikzpicture}
+}
+
+%##########################################################
+
+
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Birdie###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\birdie}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt] (110,188).. controls(98,182) and(78,180) .. (16,190)..
+controls(-1,122) and (108,17) .. (226,27)..
+controls(300,36)and(384,115)..(371,181)..
+controls(372,220) and(325,303) ..(191,250);
+%corpo
+
+\draw[draw=#2, line width=#3pt] (367,140)--(393,109)--(356,113);
+%bico
+
+\draw[draw=#2, line width=#3pt] (217,98).. controls(82,117) and (96,235) .. (149,300)..
+controls(187,254) and (258,181)..(217,98);
+%asa
+
+\draw[fill=black, ultra thick](313,169) circle (1.1 cm);
+%olho
+\end{tikzpicture}
+}
+
+%##########################################################
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Octopus###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\octopus}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt](234,184).. controls(239,214) and(260,239)..(280,264)..
+controls(318,306) and(299,379)..(259,394)..
+controls(208,422) and (156,403) .. (133,368)..
+controls(100,315) and(111,290) .. (135,226)..
+controls(146,172) and (112,185) ..(103,193)..
+controls(103,212) and (84,237) ..(60,226)..
+controls(87,216) and(71,177)..(93,166)..
+controls(65,147) and(82,222)..(25,196)..
+controls(54,195) and(39,157)..(65,145)..
+controls(82,130) and(94,134)..(109,130)..
+controls(101,118) and(88,120)..(78,129)..
+controls(54,130) and(41,131)..(37,109)..
+controls(66,126) and(88,70)..(137,108)..
+controls(141,78) and(123,72)..(109,84)..
+controls(93,83) and(72,86)..(71,56)..
+controls(100,77) and(134,21)..(182,82)..
+controls(220,1) and(285,57)..(301,40)..
+controls(295,85) and(250,56)..(243,62)..
+controls(233,72) and(233,82)..(236,91)..
+controls(284,50) and(310,105)..(334,91)..
+controls(319,138) and(275,85)..(265,111)..
+controls(327,105) and(322,180)..(347,178)..
+controls(302,200) and(300,129)..(277,149)..
+controls(300,165) and(285,198)..(312,208)..
+controls(282,220) and(270,194)..(265,173)..
+controls(253,159) and(233,167)..(234,184);
+%corpo
+
+\draw[fill=black, ultra thick] (234,331) ellipse (.6 cm and .89 cm);
+\draw[fill=black, ultra thick] (165,331) ellipse (.6 cm and .89 cm);
+%olhos
+
+\draw[draw=#2, line width=#3pt](157,266)..controls(172,240) and(210,235)..(224,266);
+%boca
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Pineapple###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\pineapple}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt] (198,230) ellipse (13 cm and 15.8 cm);
+\draw[draw=#2, line width=#3pt](184,387)--(326,256);
+\draw[draw=#2, line width=#3pt](154,379)--(327,211);
+\draw[draw=#2, line width=#3pt](123,359)--(318,171);
+\draw[draw=#2, line width=#3pt](101,334)--(305.1,139);
+\draw[draw=#2, line width=#3pt](86,310)--(286,114);
+\draw[draw=#2, line width=#3pt](75,280)--(260,90);
+\draw[draw=#2, line width=#3pt](68,242)--(233,79);
+\draw[draw=#2, line width=#3pt](207,388)--(70,255);
+\draw[draw=#2, line width=#3pt](240,380)--(70,207);
+\draw[draw=#2, line width=#3pt](271,360)--(79,168);
+\draw[draw=#2, line width=#3pt](293,337)--(92,140);
+\draw[draw=#2, line width=#3pt](309,312)--(113,110);
+\draw[draw=#2, line width=#3pt](321,281)--(137,91);
+\draw[draw=#2, line width=#3pt](327,242)--(167,77);
+\draw[draw=#2, line width=#3pt](324,194)--(200,72);
+\draw[draw=#2, line width=#3pt](72,196)--(200,72);
+\draw[draw=#2, line width=#3pt](251,374).. controls(257,409) and(287,437)..(317,468)..
+controls(272,451) and (233,417)..(232,384);
+\draw[draw=#2, line width=#3pt] (250,425)..controls(244,419) and (254,450)..(282,490)..
+controls(254,476) and (233,451)..(217,410)--(217,387)..
+controls(213,435) and (220,465)..(245,519)..
+controls(200,482) and (180,428)..(201,389);
+\draw[draw=#2, line width=#3pt] (185,387)..controls(205,425) and (190,472)..(143,518)..
+controls(180,453) and (168,420)..(169,384)..
+controls(170,435) and (150,460)..(105,490)..
+controls(125,460) and (136,434)..(137,427);
+\draw[draw=#2, line width=#3pt] (155,380).. controls(155,423) and (120,447)..(70,468)..
+controls(120,417) and (132,401)..(135,368);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Butterfly###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\butterfly}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt](190,175) ellipse (2.5 cm and 10.5cm);
+%corpo
+\draw [fill=black, ultra thick](83,261) circle (1.1 cm);
+\draw [fill=black, ultra thick](90,210) circle (1.1 cm);
+\draw [fill=black, ultra thick](133,238) circle (1.1 cm);
+\draw [fill=black, ultra thick](133,184) circle (1.1 cm);
+\draw [fill=black, ultra thick](94,130) circle (1.1 cm);
+\draw [fill=black, ultra thick](148,115) circle (1.1 cm);
+\draw [fill=black, ultra thick](88,81) circle (1.1 cm);
+\draw [fill=black, ultra thick](252,240) circle (1.1 cm);
+\draw [fill=black, ultra thick](302,264) circle (1.1 cm);
+\draw [fill=black, ultra thick](296,212) circle (1.1 cm);
+\draw [fill=black, ultra thick](252,186) circle (1.1 cm);
+\draw [fill=black, ultra thick](293,134) circle (1.1 cm);
+\draw [fill=black, ultra thick](237,119) circle (1.1 cm);
+\draw [fill=black, ultra thick](298,85) circle (1.1 cm);
+\draw[draw=#2, line width=#3pt](207,250).. controls(266,318) and(330,310)..(353,261)..
+controls(360,234) and(337,192)..(284,168)..
+controls(336,150) and(375,95)..(339,52)..
+controls(293,23) and(236,46)..(206,94);
+\draw[draw=#2, line width=#3pt](175,94)..controls(151,45) and(88,20)..(45,51)..
+controls(1,80) and(46,157)..(100,168)..
+controls(50,184) and(15,232)..(34,274)..
+controls(63,314) and(139,305)..(172,250);
+%asas
+\draw[draw=#2, line width=#3pt](178,270)..controls(177,306) and(166,340)..(142,339)..
+controls(125,338) and(115,320)..(127,312)..
+controls(134,310) and(144,313)..(142,327)..
+controls(152,317) and(140,290)..(112,310)..
+controls(102,328) and(105,345)..(130,354)..
+controls(166,365) and(185,314)..(190,280);
+\draw[draw=#2, line width=#3pt](190,280).. controls(197,310) and(200,349)..(229,354)..
+controls(260,360) and(275,330)..(271,317)..
+controls(263,290) and(226,300)..(234,326)..
+controls(250,300) and(268,315)..(250,335)..
+controls(236,345) and(227,338)..(219,331)..
+controls(210,317) and(202,301)..(202,271);
+%antenas
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Fish###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Fish}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt] (45,136) circle (2 cm);
+\draw[draw=#2, line width=#3pt] (30,73) circle (1.5 cm);
+\draw[fill=black,ultra thick] (59,220) ellipse (.5 cm and .7cm);
+\draw[draw=#2, line width=#3pt](45,184).. controls(53,183) and(58,188)..(58,197);
+\draw[draw=#2, line width=#3pt] (39,201)..controls(50,270) and(220,289)..(285,225)--(344,264)--(349,154)--(291,186)..
+controls(240,120) and(45,130)..(39,201);
+\draw[draw=#2, line width=#3pt](143,265)..controls(164,282) and(203,305)..(250,297)..
+controls(226,289) and(220,276)..(216,259);
+\draw[draw=#2, line width=#3pt](220,148)..controls(219,135) and(228,123)..(254,111)..
+controls(222,98) and(160,125)..(148,142);
+
+\draw[draw=#2, line width=#3pt](114,156)..controls(100,161) and(105,177)..(116,179)..
+controls(100,181) and(105,197)..(113,200)..
+controls(100,205) and(105,220)..(116,223)..
+controls(100,225) and(105,243)..(114,245);
+
+\draw[draw=#2, line width=#3pt](143,156)..controls(130,161) and(135,177)..(147,179)..
+controls(130,181) and(135,197)..(144,200)..
+controls(130,205) and(135,220)..(147,223)..
+controls(130,225) and(135,243)..(144,245);
+
+\draw[draw=#2, line width=#3pt](173,156)..controls(160,161) and(165,177)..(175,179)..
+controls(160,181) and(165,197)..(173,200)..
+controls(160,205) and(165,220)..(176,223)..
+controls(160,225) and(165,243)..(174,245);
+
+\draw[draw=#2, line width=#3pt](203,156)..controls(190,161) and(195,177)..(206,179)..
+controls(190,181) and(195,197)..(203,200)..
+controls(190,205) and(195,220)..(206,223)..
+controls(190,225) and(195,243)..(204,245);
+
+\draw[draw=#2, line width=#3pt](233,156)..controls(220,161) and(225,177)..(236,179)..
+controls(220,181) and(225,197)..(233,200)..
+controls(220,205) and(225,220)..(236,223)..
+controls(220,225) and(225,243)..(236,245);
+\end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Christmas Tree###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\christmastree}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt](187,57)--(187,24)--(212,24)--(213,48);
+\draw[draw=#2, line width=#3pt](153,85) circle (1cm) ;
+\draw[draw=#2, line width=#3pt](175,147) circle (1.2cm) ;
+\draw[draw=#2, line width=#3pt](238,213) circle (1cm) ;
+\draw[draw=#2, line width=#3pt](201,279) circle (1cm) ;
+\draw[draw=#2, line width=#3pt](252,113) circle (1cm) ;
+\draw[draw=#2, line width=#3pt](286,71) circle (1cm) ;
+\draw[draw=#2, line width=#3pt];
+\draw[draw=#2, line width=#3pt] (214,371) ..controls(208,317) and (176,285)..(139,283)..
+controls(141,270) and (159,266)..(176,265)..
+controls(171,227) and (155,207)..(115,201)..
+controls(118,185) and (132,189)..(144,173)..
+controls(141,151) and (118,135)..(89,142)..
+controls(86,128) and (95,114)..(123,98)..
+controls(110,82) and (84,70)..(51,84)..
+controls(76,20) and (135,35)..(187,61)..
+controls(235,20) and (328,30)..(366,84)..
+controls(335,72) and (324,77)..(311,96)..
+controls(336,102) and (350,122)..(351,146)..
+controls(313,134) and (290,151)..(282,171)..
+controls(303,175) and (318,190)..(323,209)..
+controls(283,206) and (260,227)..(253,252)..
+controls(272,254) and (278,262)..(289,280)..
+controls(241,293) and (241,293)..(214,371);
+\end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Pumpkin###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Pumpkin}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt](114,196)--(91,155)--(138,155)--(114,196);
+\draw[draw=#2, line width=#3pt](241,196)--(266,155)--(216,155)--(241,196);
+\draw[draw=#2, line width=#3pt](177,156)--(154,115)--(202,115)--(177,156);
+\draw[draw=#2, line width=#3pt](120,83)--(100,49)--(137,50)--(120,83);
+\draw[draw=#2, line width=#3pt](157,83)--(137,50)--(176,50)--(157,83);
+\draw[draw=#2, line width=#3pt](196,83)--(176,50)--(215,50)--(196,83);
+\draw[draw=#2, line width=#3pt](235,83)--(215,50)--(256,48)--(235,83);
+
+\draw[draw=#2, line width=#3pt] (176,218).. controls(162,225) and(147,223)..(138,213);
+\draw[draw=#2, line width=#3pt] (138,213).. controls(91,233) and(40,171)..(42,104)..
+controls(44,70) and(64,35)..(93,37)..
+controls(98,26) and(119,24)..(130,30)..
+controls(141,24) and(151,28)..(161,33)..
+controls(171,21) and(191,21)..(201,33)..
+controls(210,25) and(222,25)..(229,32)..
+controls(241,24) and(260,28)..(268,38)..
+controls(305,38) and(322,84)..(315,121)..
+controls(312,185) and(252,240)..(217,208)..
+controls(213,209) and(209,209)..(207,205)..
+controls(195,211) and(188,211)..(174,206)..
+controls(168,211) and(158,212)..(153,207)..
+controls(148,210) and(135,208)..(138,213);
+\draw[draw=#2, line width=#3pt] (189,216).. controls(205,225) and(221,223)..(228,215);
+\draw[draw=#2, line width=#3pt](176,206)..controls(180,241) and(166,278)..(139,255)..
+controls(126,238)and(145,225)..(148,242)..
+controls(151,245)and(156,243)..(156,235)..
+controls(155,226)and(146,221)..(135,225)..
+controls(125,233)and(118,243)..(131,264)..
+controls(142,277)and(167,274)..(174,262)..
+controls(183,251)and(187,227)..(189,211);
+
+\end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Flamingo###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Flamingo}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2, line width=#3pt] (45,301)..controls (10,272)..(39,214)..
+controls (45,209)..(50,217)..
+controls (53,253) ..(72,270);
+
+\draw[draw=#2, line width=#3pt] (72,270) arc (-5:90:28);
+
+\draw[draw=#2, line width=#3pt] (72,270)..controls (100,284)..(112,284)..
+controls (127,276)..(118,256)..
+controls (71,199)..(108,137)..
+controls (113,120)..(131,124)..
+controls (138,106)..(154,111)..
+controls (165,95)..(180,104)..
+controls (193,89)..(206,101)..
+controls (219,86)..(234,95)..
+controls (246,82) ..(260,95)..
+controls (273,82) .. (285,95)..
+controls (298,81)..(313,89)..
+controls (325,78) ..(338,86)..
+controls (354,74)..(366,90)..
+controls (389,85)..(380,108)..
+controls (390,128)..(370,135)..
+controls (370,152)..(351,153)..
+controls (354,173)..(335,174)..
+controls (334,191)..(318,191)..
+controls (315,210)..(296,207)..
+controls (290,226)..(274,219)..
+controls (263,234)..(248,222)..
+controls (237,236)..(223,225)..
+controls (208,237)..(196,221)..
+controls (180,224)..(175,206)..
+controls (159,207)..(154,191)..
+controls (138,190)..(134,172)..
+controls (117,180)..(110,188)..
+controls (104,206)..(121,231)..
+controls (151,277)..(146,315)..
+controls (127,340)..(95,346)..
+controls (71,337) ..(45,301);
+
+\draw[draw=#2, line width=#3pt] (89,321) circle (0.8cm);
+
+\draw[draw=#2, line width=#3pt] (196,93)..controls (194,62)..(194,33)..
+controls (172,33)..(141,25)..
+controls (138,22)..(143,17)..
+controls (175,13) .. (212,19)..
+controls (217,26)..(213,36)..
+controls (208,59)..(207,100);
+
+\draw[draw=#2, line width=#3pt] (288,92)..controls (285,55)..(286,33)..
+controls (263,32) ..(235,28)..
+controls (230,22) ..(234,17)..
+controls (270,12) .. (304,17)..
+controls (308,27)..(304,35)..
+controls (300,57)..(302,85);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Bell###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Bell}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (239,518) ellipse (2cm and 1.5 cm);
+
+\draw[draw=#2, line width=#3pt] (219,519) .. controls (90, 480) and (160,308) .. (82,227);
+
+\draw[draw=#2, line width=#3pt] (236,197) ellipse (17 cm and 7cm );
+
+\draw[draw=#2, line width=#3pt] (175,230) ellipse (5cm and 3cm);
+
+\draw[draw=#2, line width=#3pt] (259,517) .. controls (375,480) and (323,304) .. (395,222);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Broom###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\broom}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2, line width=#3pt] (163,800) --(196,800);
+
+\draw[draw=#2, line width=#3pt] (163,800)--(167,343);
+
+\draw[draw=#2, line width=#3pt] (196,800) -- (193,344);
+
+\draw[draw=#2, line width=#3pt] (167,343) .. controls (132,325) .. (109,260);
+
+\draw[draw=#2, line width=#3pt] (109,260) .. controls (65,196) .. (0,161);
+
+\draw[draw=#2, line width=#3pt] (0,161) -- (12,140);
+
+\draw[draw=#2, line width=#3pt] (12,140) .. controls (76,180) .. (118,245);
+
+\draw[draw=#2, line width=#3pt] (118,245) .. controls (90,155) .. (53,126);
+
+\draw[draw=#2, line width=#3pt] (53,126) -- (70,112);
+
+\draw[draw=#2, line width=#3pt] (70,112) .. controls (116,166) .. (136,237);
+
+\draw[draw=#2, line width=#3pt] (136,237) .. controls (137,159) .. (112,104);
+
+\draw[draw=#2, line width=#3pt] (112,104)--(136,93);
+
+\draw[draw=#2, line width=#3pt] (136,93) .. controls (157,160) .. (160,234);
+
+\draw[draw=#2, line width=#3pt] (160,234) .. controls (172,171) .. (179,87);
+
+\draw[draw=#2, line width=#3pt] (179,87) -- (199,90);
+
+\draw[draw=#2, line width=#3pt] (199,90) .. controls (188,176) .. (194,231);
+
+\draw[draw=#2, line width=#3pt] (194,231) .. controls (198,170) .. (224,93);
+
+\draw[draw=#2, line width=#3pt] (224,93) -- (245,101);
+
+\draw[draw=#2, line width=#3pt] (245,101) .. controls (220,156) .. (218,232);
+
+\draw[draw=#2, line width=#3pt] (218,232) .. controls (240,166) .. (291,111);
+
+\draw[draw=#2, line width=#3pt] (291,111) -- (304,122);
+
+\draw[draw=#2, line width=#3pt] (304,122) .. controls (253,183) ..(240,238);
+
+\draw[draw=#2, line width=#3pt] (240,238) .. controls (281,181) .. (347,145);
+
+\draw[draw=#2, line width=#3pt] (347,145)--(356,156);
+
+\draw[draw=#2, line width=#3pt] (356,156) .. controls (291,203) .. (244,262);
+
+\draw[draw=#2, line width=#3pt] (244,262) .. controls (237,311) .. (193,344);
+
+
+\end{tikzpicture}
+}
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Candle###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\candle}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2, line width=#3pt] (189,324) ellipse (10cm and 2.5cm );
+
+\draw[draw=#2, line width=#3pt] (88,323) -- (85,78);
+
+\draw[draw=#2, line width=#3pt] (85,78) .. controls (196,48) ..(283,82);
+
+\draw[draw=#2, line width=#3pt] (282,82) -- (289,323);
+
+\draw[draw=#2, line width=#3pt] (177,376)--(177,321)--(194,321)--(195,377)--(177,376);
+
+\draw[draw=#2, line width=#3pt] (178,557) .. controls (105,415) .. (177,376);
+
+\draw[draw=#2, line width=#3pt] (194,378) .. controls (250,437) .. (178,557);
+
+\draw[draw=#2, line width=#3pt] (184,387) .. controls (144,428) .. (182,501);
+
+\draw[draw=#2, line width=#3pt] (184,387) .. controls (211,446) .. (182,501);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Kite###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\kite}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+\draw[draw=#2, line width=#3pt] (325,446) .. controls (227,407) .. (133,398);
+
+\draw[draw=#2, line width=#3pt] (133,398) .. controls (142,267) .. (122,156);
+
+\draw[draw=#2, line width=#3pt] (325,446) .. controls (341,353) .. (373,280);
+
+\draw[draw=#2, line width=#3pt] (373,280) .. controls (244,232) .. (122,156);
+
+\draw[draw=#2, line width=#3pt] (325,446) -- (122,156) ;
+
+\draw[draw=#2, line width=#3pt] (133,398) -- (373,280) ;
+
+\draw[draw=#2, line width=#3pt] (239,380) circle (1.5cm);
+
+\draw[draw=#2, line width=#3pt] (183,315) circle (1.5cm);
+
+\draw[draw=#2, line width=#3pt] (260,281) circle (1.5cm);
+
+\draw[draw=#2, line width=#3pt] (308,345) circle (1.5cm);
+
+\draw[draw=#2, line width=#3pt] (122,156) .. controls (124,98) .. (101,54);
+
+\draw[draw=#2, line width=#3pt] (102,54) .. controls (55,37) .. (25,10);
+
+\end{tikzpicture}
+
+}
+
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Mouse###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Mouse}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+\draw[draw=#2, line width=#3pt] (305,195) arc (-90 : 180: 45);
+
+\draw[draw=#2, line width=#3pt] (305,215) arc (-90 : 180: 25);
+
+\draw[draw=#2, line width=#3pt] (136,242) arc (1 : 270 : 45);
+
+\draw[draw=#2, line width=#3pt] (119,238) arc (1 : 270 : 25);
+
+\draw[draw=#2, line width=#3pt] (91,197) -- (186,32);
+
+\draw[draw=#2, line width=#3pt] (186,32) .. controls (198,24) .. (211,31);
+
+\draw[draw=#2, line width=#3pt] (211,31) -- (305,196);
+
+\draw[draw=#2, line width=#3pt] (135,241)--(260,240);
+
+\draw[draw=#2, line width=#3pt] (168,62) .. controls (142,68) .. (117,79);
+
+\draw[draw=#2, line width=#3pt] (172,58) .. controls (144,53) .. (117,58);
+
+\draw[draw=#2, line width=#3pt] (175,50) .. controls (150,36) .. (124,35);
+
+\draw[draw=#2, line width=#3pt] (219,46) .. controls (240,34) .. (268,32);
+
+\draw[draw=#2, line width=#3pt] (225,57) .. controls (249,52) .. (274,57);
+
+\draw[draw=#2, line width=#3pt] (229,67) .. controls (256,67) .. (276,79);
+
+\draw[draw=#2, line width=#3pt] (154,180) circle (1.5cm);
+
+\draw[draw=#2, line width=#3pt] (238,180) circle (1.5cm);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Cloud###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\cloud}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2, line width=#3pt] (320,77) arc (-90 : 90 : 61);
+
+\draw[draw=#2, line width=#3pt] (198,184) arc (2 : 180 : 55);
+
+\draw[draw=#2, line width=#3pt] (320,189) arc (2: 180 : 61);
+
+\draw[draw=#2, line width=#3pt] (110,180) arc (75 : 270 : 61);
+
+\draw[draw=#2, line width=#3pt] (318,78) arc (10 : -180 : 31);
+
+\draw[draw=#2, line width=#3pt] (258,68) arc (-15 : -180 : 31);
+
+\draw[draw=#2, line width=#3pt] (205,54) arc (-25 : -180 : 61);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Horse###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\horse}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2, line width=#3pt] (80,251) -- (71,250);
+\draw[draw=#2, line width=#3pt] (71,250) .. controls (66,253) .. (63,261);
+\draw[draw=#2, line width=#3pt] (63,261) .. controls (60,250) .. (68,242);
+\draw[draw=#2, line width=#3pt] (68,242) .. controls (60,229) .. (59,217);
+\draw[draw=#2, line width=#3pt] (59,218) .. controls (57,205) .. (49,193);
+\draw[draw=#2, line width=#3pt] (49,193) .. controls (51,181) .. (62,181);
+\draw[draw=#2, line width=#3pt] (62,181) .. controls (73,189) .. (83,198);
+\draw[draw=#2, line width=#3pt] (83,198) .. controls (99,186) .. (117,143);
+\draw[draw=#2, line width=#3pt] (117,143) .. controls (118,129) .. (128,114);
+\draw[draw=#2, line width=#3pt] (128,114) .. controls (120,104) .. (112,93);
+\draw[draw=#2, line width=#3pt] (112,93) .. controls (111,88) .. (110,53);
+\draw[draw=#2, line width=#3pt] (110,53) .. controls (108,48) .. (103,40);
+\draw[draw=#2, line width=#3pt] (103,40) .. controls (112,35) .. (122,38);
+\draw[draw=#2, line width=#3pt] (122,38) .. controls (122,44) .. (121,50);
+\draw[draw=#2, line width=#3pt] (121,50) .. controls (119,66) .. (121,82);
+\draw[draw=#2, line width=#3pt] (121,82) .. controls (129,92) .. (139,97);
+\draw[draw=#2, line width=#3pt] (139,97) .. controls (145,73) .. (144,49);
+\draw[draw=#2, line width=#3pt] (144,49) .. controls (143,44) .. (137,38);
+\draw[draw=#2, line width=#3pt] (137,38) .. controls (144,34) .. (154,37);
+\draw[draw=#2, line width=#3pt] (154,37) .. controls (153,43) .. (153,48);
+\draw[draw=#2, line width=#3pt] (153,48) .. controls (154,76) .. (155,110);
+\draw[draw=#2, line width=#3pt] (155,110) .. controls (200,100) .. (242,108);
+\draw[draw=#2, line width=#3pt] (242,108) .. controls (249,88) .. (243,48);
+\draw[draw=#2, line width=#3pt] (243,48) .. controls (241,41) .. (237,36);
+\draw[draw=#2, line width=#3pt] (237,36) .. controls (242,32) .. (253,36);
+\draw[draw=#2, line width=#3pt] (253,36) .. controls (253,42) .. (254,48);
+\draw[draw=#2, line width=#3pt] (254,48) .. controls (257,69) .. (266,96);
+\draw[draw=#2, line width=#3pt] (266,96) .. controls (278,72) .. (280,59);
+\draw[draw=#2, line width=#3pt] (280,59) .. controls (277,52) .. (274,48);
+\draw[draw=#2, line width=#3pt] (274,48) .. controls (283,45) .. (291,47);
+\draw[draw=#2, line width=#3pt] (291,47) .. controls (291,53) .. (291,57);
+\draw[draw=#2, line width=#3pt] (291,57) .. controls (287,82) .. (286,90);
+\draw[draw=#2, line width=#3pt] (286,90) .. controls (286,97) .. (287,103);
+\draw[draw=#2, line width=#3pt] (287,103) .. controls (283,105) .. (278,111);
+\draw[draw=#2, line width=#3pt] (278,111) .. controls (273,117) .. (272,125);
+\draw[draw=#2, line width=#3pt] (272,125) .. controls (282,145) .. (270,168);
+\draw[draw=#2, line width=#3pt] (270,168) .. controls (273,171) .. (277,171);
+\draw[draw=#2, line width=#3pt] (277,171) .. controls (287,154) .. (307,144);
+\draw[draw=#2, line width=#3pt] (307,144) --(308,148);
+\draw[draw=#2, line width=#3pt] (308,148) .. controls (335,146) .. (355,155);
+\draw[draw=#2, line width=#3pt] (355,155) -- (349,159);
+\draw[draw=#2, line width=#3pt] (349,159) -- (358,157);
+\draw[draw=#2, line width=#3pt] (358,157) .. controls (334,168) .. (312,166);
+\draw[draw=#2, line width=#3pt] (312,166) -- (320,170);
+\draw[draw=#2, line width=#3pt] (320,170) -- (305,170);
+\draw[draw=#2, line width=#3pt] (305,170) .. controls (295,184) .. (288,188);
+\draw[draw=#2, line width=#3pt] (288,188) .. controls (273,190) .. (266,174);
+\draw[draw=#2, line width=#3pt] (266,174) .. controls (241,186) .. (190,179);
+\draw[draw=#2, line width=#3pt] (190,179) .. controls (185,184) .. (183,184);
+\draw[draw=#2, line width=#3pt] (183,184) .. controls (154,191) .. (133,218);
+\draw[draw=#2, line width=#3pt] (133,218) -- (130,218);
+\draw[draw=#2, line width=#3pt] (130,218) -- (129,221);
+\draw[draw=#2, line width=#3pt] (129,221) -- (120,226);
+\draw[draw=#2, line width=#3pt] (120,226) -- (118,231);
+\draw[draw=#2, line width=#3pt] (118,231) -- (107,238);
+\draw[draw=#2, line width=#3pt] (107,238) -- (106,242);
+\draw[draw=#2, line width=#3pt] (106,242) -- (90,250);
+\draw[draw=#2, line width=#3pt] (90,250) -- (78,264);
+\draw[draw=#2, line width=#3pt] (78,264) -- (80,251);
+\draw[draw=#2, line width=#3pt] (90,250) .. controls (90,230) .. (96,216);
+\draw[draw=#2, line width=#3pt] (96,216) .. controls (95,228) .. (96,236);
+\draw[draw=#2, line width=#3pt] (96,236) .. controls (100,220) .. (106,207);
+\draw[draw=#2, line width=#3pt] (106,207) .. controls (106,217) .. (108,222);
+\draw[draw=#2, line width=#3pt] (108,222) -- (110,204);
+\draw[draw=#2, line width=#3pt] (110,204) .. controls (115,199) .. (116,191);
+\draw[draw=#2, line width=#3pt] (116,191) .. controls (117,201) .. (115,210);
+\draw[draw=#2, line width=#3pt] (115,210) .. controls (122,203) .. (128,181);
+\draw[draw=#2, line width=#3pt] (128,181) -- (128,196);
+\draw[draw=#2, line width=#3pt] (128,196) .. controls (133,191) .. (138,181);
+\draw[draw=#2, line width=#3pt] (138,181) -- (138,190);
+\draw[draw=#2, line width=#3pt] (138,190) .. controls (143,185) .. (150,178);
+\draw[draw=#2, line width=#3pt] (150,178) -- (147,187);
+\draw[draw=#2, line width=#3pt] (147,187) .. controls (152,186) .. (156,179);
+\draw[draw=#2, line width=#3pt] (156,179) -- (157,185);
+\draw[draw=#2, line width=#3pt] (157,185) .. controls (161,181) .. (163,171);
+\draw[draw=#2, line width=#3pt] (163,171) -- (167,173);
+\draw[draw=#2, line width=#3pt] (167,173) .. controls (170,172) .. (173,168);
+\draw[draw=#2, line width=#3pt] (173,168) .. controls (183,171) .. (189,179);
+\draw[draw=#2, line width=#3pt] (76,234) circle (0.2cm);
+\draw[draw=#2, line width=#3pt] (54,189) -- (60,185);
+\draw[draw=#2, line width=#3pt] (60,185) arc (-54 : 180 : 4);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Duckduck###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Duckduck}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2, line width=#3pt] (72,270) .. controls (41,265) .. (24,265);
+
+\draw[draw=#2, line width=#3pt] (25,265) arc (70 : 270 : 17);
+
+\draw[draw=#2, line width=#3pt] (19,232) .. controls (41,241) .. (66,254);
+
+\draw[draw=#2, line width=#3pt] (22,233) .. controls (39,230) .. (72,239);
+
+\draw[draw=#2, line width=#3pt] (72,239) .. controls (78,234) .. (76,220);
+
+\draw[draw=#2, line width=#3pt] (76,220) .. controls (53,114) .. (92,78);
+
+\draw[draw=#2, line width=#3pt] (91,79) .. controls (155,47) .. (214,40);
+
+\draw[draw=#2, line width=#3pt] (213,40) .. controls (293,54) .. (359,107);
+
+\draw[draw=#2, line width=#3pt] (359,107) -- (358,113);
+
+\draw[draw=#2, line width=#3pt] (358,113) .. controls (377,143) .. (391,178);
+
+\draw[draw=#2, line width=#3pt] (391,178) .. controls (376,162) .. (365,155);
+
+\draw[draw=#2, line width=#3pt] (365,155) .. controls (370,167) .. (374,178);
+
+\draw[draw=#2, line width=#3pt] (374,178) .. controls (368,170) .. (362,166);
+
+\draw[draw=#2, line width=#3pt] (362,166) .. controls (355,164) .. (343,167);
+
+\draw[draw=#2, line width=#3pt] (343,167) .. controls (241,212) .. (162,188);
+
+\draw[draw=#2, line width=#3pt] (136,220) arc (170 : 270 : 27);
+
+\draw[draw=#2, line width=#3pt] (136,220) .. controls (141,232) .. (154,246);
+
+\draw[draw=#2, line width=#3pt] (154,246) arc (-35 : 90 : 40);
+
+\draw[draw=#2, line width=#3pt] (122,309) .. controls (92,306) .. (71,270);
+
+\draw[draw=#2, line width=#3pt] (110,276) circle (1cm);
+
+\draw[draw=#2, line width=#3pt] (110,276) circle (0.2cm);
+
+\draw[draw=#2, line width=#3pt] (161,168) arc (100 : 270 : 37);
+
+\draw[draw=#2, line width=#3pt] (167,95) .. controls (225,103) .. (273,129);
+
+\draw[draw=#2, line width=#3pt] (273,129) -- (259,132);
+
+\draw[draw=#2, line width=#3pt] (259,132) -- (270,138);
+
+\draw[draw=#2, line width=#3pt] (270,138) -- (257,140);
+
+\draw[draw=#2, line width=#3pt] (257,140) -- (266,146);
+
+\draw[draw=#2, line width=#3pt] (266,146) -- (254,147);
+
+\draw[draw=#2, line width=#3pt] (191,44) -- (191,32);
+
+\draw[draw=#2, line width=#3pt] (191,32) .. controls (177,24) .. (158,21);
+
+\draw[draw=#2, line width=#3pt] (158,21) .. controls (165,15) .. (165,5);
+
+\draw[draw=#2, line width=#3pt] (165,5) .. controls (177,8) .. (185,1);
+
+\draw[draw=#2, line width=#3pt] (185,1) .. controls (188,7) .. (195,5);
+
+\draw[draw=#2, line width=#3pt] (195,5) .. controls (201,12) .. (205,20);
+
+\draw[draw=#2, line width=#3pt] (205,20) -- (204,42);
+
+\draw[draw=#2, line width=#3pt] (171,17) -- (188,25);
+
+\draw[draw=#2, line width=#3pt] (188,25) -- (177,14);
+
+\draw[draw=#2, line width=#3pt] (183,12) -- (193,21);
+
+\draw[draw=#2, line width=#3pt] (193,21) -- (190,11);
+
+\draw[draw=#2, line width=#3pt] (254,48) -- (255,34);
+
+\draw[draw=#2, line width=#3pt] (255,34) .. controls (240,29) .. (220,25);
+
+\draw[draw=#2, line width=#3pt] (220,25) .. controls (224,18) .. (225,11);
+
+\draw[draw=#2, line width=#3pt] (225,11) .. controls (238,12) .. (242,5);
+
+\draw[draw=#2, line width=#3pt] (242,5) .. controls (250,9) .. (254,7);
+
+\draw[draw=#2, line width=#3pt] (254,7) .. controls (262,15) .. (265,23);
+
+\draw[draw=#2, line width=#3pt] (265,23) -- (265,51);
+
+\draw[draw=#2, line width=#3pt] (232,19) -- (248,26);
+
+\draw[draw=#2, line width=#3pt] (248,26) -- (237,16);
+
+\draw[draw=#2, line width=#3pt] (245,15) -- (254,24);
+
+\draw[draw=#2, line width=#3pt] (254,24) -- (252,15);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Flamingo###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Fflamingo}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2, line width=#3pt] (45,301) .. controls (10,272) .. (39,214);
+
+\draw[draw=#2, line width=#3pt] (39,214) .. controls (45,209) .. (50,217);
+
+\draw[draw=#2, line width=#3pt] (50,217) .. controls (53,253) .. (72,270);
+
+\draw[draw=#2, line width=#3pt] (72,270) arc (-5 : 90 : 28);
+
+\draw[draw=#2, line width=#3pt] (72,270) .. controls (100,284) .. (112,284);
+
+\draw[draw=#2, line width=#3pt] (112,284) .. controls (127,276) .. (118,256);
+
+\draw[draw=#2, line width=#3pt] (118,256) .. controls (71,199) .. (108,137);
+
+\draw[draw=#2, line width=#3pt] (108,137) .. controls (113,120) .. (131,124);
+
+\draw[draw=#2, line width=#3pt] (131,124) .. controls (138,106) .. (154,111);
+
+\draw[draw=#2, line width=#3pt] (154,111) .. controls (165,95) .. (180,104);
+
+\draw[draw=#2, line width=#3pt] (180,104) .. controls (193,89) .. (206,101);
+
+\draw[draw=#2, line width=#3pt] (206,101) .. controls (219,86) .. (234,95);
+
+\draw[draw=#2, line width=#3pt] (234,95) .. controls (246,82) .. (260,95);
+
+\draw[draw=#2, line width=#3pt] (260,95) .. controls (273,82) .. (285,95);
+
+\draw[draw=#2, line width=#3pt] (285,95) .. controls (298,81) .. (313,89);
+
+\draw[draw=#2, line width=#3pt] (313,89) .. controls (325,78) .. (338,86);
+
+\draw[draw=#2, line width=#3pt] (338,86) .. controls (354,74) .. (366,90);
+
+\draw[draw=#2, line width=#3pt] (366,90) .. controls (389,85) .. (380,108);
+
+\draw[draw=#2, line width=#3pt] (380,108) .. controls (390,128) .. (370,135);
+
+\draw[draw=#2, line width=#3pt] (370,135) .. controls (370,152) .. (351,153);
+
+\draw[draw=#2, line width=#3pt] (351,153) .. controls (354,173) .. (335,174);
+
+\draw[draw=#2, line width=#3pt] (335,174) .. controls (334,191) .. (318,191);
+
+\draw[draw=#2, line width=#3pt] (318,191) .. controls (315,210) .. (296,207);
+
+\draw[draw=#2, line width=#3pt] (296,207) .. controls (290,226) .. (274,219);
+
+\draw[draw=#2, line width=#3pt] (274,219) .. controls (263,234) .. (248,222);
+
+\draw[draw=#2, line width=#3pt] (248,222) .. controls (237,236) .. (223,225);
+
+\draw[draw=#2, line width=#3pt] (223,225) .. controls (208,237) .. (196,221);
+
+\draw[draw=#2, line width=#3pt] (196,221) .. controls (180,224) .. (175,206);
+
+\draw[draw=#2, line width=#3pt] (175,206) .. controls (159,207) .. (154,191);
+
+\draw[draw=#2, line width=#3pt] (154,191) .. controls (138,190) .. (134,172);
+
+\draw[draw=#2, line width=#3pt] (134,172) .. controls (117,180) .. (110,188);
+
+\draw[draw=#2, line width=#3pt] (110,188) .. controls (104,206) .. (121,231);
+
+\draw[draw=#2, line width=#3pt] (121,231) .. controls (151,277) .. (146,315);
+
+\draw[draw=#2, line width=#3pt] (146,315) .. controls (127,340) .. (95,346);
+
+\draw[draw=#2, line width=#3pt] (95,346) .. controls (71,337) .. (45,301);
+
+\draw[draw=#2, line width=#3pt] (89,321) circle (0.8cm);
+
+\draw[draw=#2, line width=#3pt] (196,93) .. controls (194,62) .. (194,33);
+
+\draw[draw=#2, line width=#3pt] (194,33) .. controls (172,33) .. (141,25);
+
+\draw[draw=#2, line width=#3pt] (141,25) .. controls (138,22) .. (143,17);
+
+\draw[draw=#2, line width=#3pt] (143,17) .. controls (175,13) .. (212,19);
+
+\draw[draw=#2, line width=#3pt] (212,19) .. controls (217,26) .. (213,36);
+
+\draw[draw=#2, line width=#3pt] (213,36) .. controls (208,59) .. (207,100);
+
+\draw[draw=#2, line width=#3pt] (288,92) .. controls (285,55) .. (286,33);
+
+\draw[draw=#2, line width=#3pt] (286,33) .. controls (263,32) .. (235,28);
+
+\draw[draw=#2, line width=#3pt] (235,28) .. controls (230,22) .. (234,17);
+
+\draw[draw=#2, line width=#3pt] (234,17) .. controls (270,12) .. (304,17);
+
+\draw[draw=#2, line width=#3pt] (304,17) .. controls (308,27) .. (304,35);
+
+\draw[draw=#2, line width=#3pt] (304,35) .. controls (300,57) .. (302,85);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Ant###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\ant}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+ \draw[draw=#2, line width=#3pt] (94,129) circle (3.5cm); %cabeça
+ \draw[draw=#2, line width=#3pt] (90.4,143) circle (0.7cm);%olho
+ \draw[draw=#2, line width=#3pt] (74,157.5) .. controls(76,184 ) .. (66,193);%antena
+ \draw[draw=#2, line width=#3pt] (64,192) circle (0.4cm);
+ \draw[draw=#2, line width=#3pt] (88,163.5) .. controls(91,181 ) .. (87,196);%antena
+ \draw[draw=#2, line width=#3pt] (86,196) circle (0.4cm);
+ \draw[draw=#2, line width=#3pt] (70,104) .. controls(79,112) .. (82,122);%boca
+ \draw[draw=#2, line width=#3pt] (265,124) ellipse (55 and 30);%barriga
+ \draw[draw=#2, line width=#3pt] (174,120) ellipse (45 and 35);%corpo final
+ \draw[draw=#2, line width=#3pt] (145,93).. controls(140,57) and (120,40) .. (108,43);%pata1
+ \draw[draw=#2, line width=#3pt] (164,86).. controls(146,41) .. (133,34);%pata2
+ \draw[draw=#2, line width=#3pt] (180,85).. controls(191,29) .. (205,30);%pata3
+ \draw[draw=#2, line width=#3pt] (197,90).. controls(206,40) .. (217,37);%pata4
+ \draw[draw=#2, line width=#3pt] (255,94).. controls(240,40) .. (230,40);%pata5
+ \draw[draw=#2, line width=#3pt] (272,94).. controls(280,38) .. (296,40);%pata6
+\end{tikzpicture}
+}
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####bat###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Bat}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+\draw[draw=#2, line width=#3pt] (36,45) circle (1.3cm);
+\draw[draw=#2, line width=#3pt] (49,47)--(352,260)..controls(344,292)..(319,302)--(41,57);
+\end{tikzpicture}
+}
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Mug###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\mug}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+\draw[draw=#2, line width=#3pt] (30,33)..controls(30,10) and (281,10)..(281,33)--(281,310)..controls(281,340) and (30,340)..(30,310)--cycle;
+\draw[draw=#2, line width=#3pt] (155,300) ellipse (110 and 20);
+\draw[draw=#2, line width=#3pt](281,118) arc (258:462:65);
+\draw[draw=#2, line width=#3pt](281,93) arc (262:458:90);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Umbrella###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\umbrella}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+ % UMBRELLA Resindent Evil
+ \draw[draw=#2, line width=#3pt] (170,146)..controls(170,118)and(200,118)..(200,146)--(200,330)--(189,329)--(189,146)..controls(189,130)and(175,130)..(177,146)--(170,146);
+ \draw [fill=black,line width=2pt] (189,516.5)--(198,550)--(210,516)--cycle;
+ \draw [black,line width=3pt](28,325)..controls(72,360)..(121,325)..controls(157,359) ..(194,325)..controls(230,360) and (245,360)..(278,330)..controls(320,362)..(368,324)..controls(328,470)..(198,521)..controls(80,463)..(28,325);
+\draw[draw=#2, line width=#3pt] (198,521)--(194,325);
+\draw[draw=#2, line width=#3pt] (198,521)..controls(133,445)..(121,325);
+\draw[draw=#2, line width=#3pt] (198,521)..controls(259,454)..(278,330);
+ \draw [fill=black] (97,392) circle (1cm);
+ \draw [fill=black] (118,443) circle (1cm);
+ \draw [fill=black] (164,383) circle (1cm);
+ \draw [fill=black] (173,438) circle (1cm);
+ \draw [fill=black] (227,441) circle (1cm);
+ \draw [fill=black] (234,386) circle (1cm);
+ \draw [fill=black] (310,394) circle (1cm);
+ \draw [fill=black] (290,446) circle (1cm);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Lion###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\lion}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+\draw[draw=#2, line width=#3pt](130,355)--(165,345)--(190,360)--(195,350)--(215,370)..controls(226,354)..(245,345)--(270,355)--(265,340)--(295,325)--(290,315)--(320,295)--(305,290)..controls(328,261)..(330,240)--(350,210)--(340,205)--(355,170)..controls(344,169)..(330,105)--(320,115)..controls(322,98)..(290,60)--(290,75)--(267,20)..controls(246,25)..(230,45)--(225,25)..controls(215,39)..(200,50)--(175,20)--(170,43)..controls(156,27)..(130,21)..controls(127,35)..(105,75)--(105,60)..controls(75,93)..(70,115)--(65,100)..controls(51,161)..(40,170)--(50,210)--(35,215)..controls(70,233) and(64,270)..(95,293)--(80,300)--(110,320)--(100,325)--(140,345)--cycle;
+
+\draw[draw=#2, line width=#3pt] (165,290)--(180,285)--(195,290)--(200,285)--(205,290)--(222,280)--(235,285)--(235,275)--(250,270)--(240,270)--(260,260)--(250,255)..controls(262,243)..(265,230)--(275,215)--(270,210)--(275,195)--(270,199)--(274,176)--(286,168)--(276,164)--(286,155)--(275,155)--(275,145)--(270,145)--(265,135)--(259,136)--(234,121)..controls(234,95) and (170,95) ..(170,121)--(135,140)--(130,140)--(125,145)--(115,145)--(120,155)--(105,155)--(115,165)--(105,170)..controls(122,175)..(125,200)--(115,195)--(125,215)--(115,215)..controls(137,230)and (120,243)..(145,255)--(135,260)--(155,270)--(150,275)--(170,280)--cycle;
+
+ %olhos
+ \draw[draw=#2, line width=#3pt] (172,222) ellipse (12 and 17);
+ \draw [draw=none,fill=black, line width=2pt](161,214)..controls(172,228)..(183,214);
+ \draw [ line width=2pt,fill=black](163,215)..controls(163,203)and(182,203)..(182,215);
+
+ \draw [fill=white, line width=2pt] (230,222) ellipse (12 and 17);
+ \draw [fill=black,draw=none, line width=2pt](219,214)..controls(230,227)..(241,214);
+ \draw [ fill=black,line width=2pt](220,215)..controls(220,203)and(240,203)..(240,215);
+ %nariz
+\draw[draw=#2, line width=#3pt](192,171)..controls(201,174)..(210,171)..controls(210,167)..(202,159)..controls(192,167)..cycle;
+ %boca
+ \draw[draw=#2, line width=#3pt] (168,141)..controls(180,130) and (200,130)..(202,159)..controls(200,130) and(228,130)..(233,141);
+
+ %bigodes
+\draw[draw=#2, line width=#3pt](235,165) ..controls(267,186)..(305,200);
+\draw[draw=#2, line width=#3pt](235,160) ..controls(274,175)..(310,180);
+\draw[draw=#2, line width=#3pt](240,155) ..controls(286,159)..(325,150);
+\draw[draw=#2, line width=#3pt](170,160) ..controls(136,185).. (95,195);
+\draw[draw=#2, line width=#3pt](170,150) ..controls(136,170).. (90,175);
+\draw[draw=#2, line width=#3pt](165,145) ..controls(125,154)..(80,150);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Chick###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\chick}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+\draw[draw=#2, line width=#3pt] (70,155) ..controls(70,0)and(335,-40).. (335,185) -- (275,160) -- (235,190) -- (185,165) -- (160,180) -- (130,155) -- (100,180)--cycle;
+
+\draw[draw=#2, line width=#3pt] (275,160) -- (255,125) -- (240,130) -- (245,105) -- (215,90);
+
+\draw[draw=#2, line width=#3pt] (330,183).. controls(335,200).. (320,205) ..controls(335,205)and(355,230)..(320,225) ..controls(350,240)and(350,252).. (320,250) ..controls(380,300) and (360,330).. (275,255) ..controls(262,244).. (255,220);
+
+\draw[draw=#2, line width=#3pt] (289,267) ..controls(288,289)and(278,332).. (245,353) ..controls(285,360)and(238,375).. (227,362)..controls(240,383)and(220,383).. (212,370).. controls(190,390)and(180,390)..(190,363) ..controls(120,360)and(110,300).. (135,245) ..controls(113,235)and(102,193).. (105,176);
+
+\draw[draw=#2, line width=#3pt] (85,167) ..controls(48,195)and(60,208)..(75,200) ..controls(40,215)and(50,240).. (67,228) ..controls(53,236)and(40,270).. (73,258) ..controls(25,298)and(70,310).. (126,270);
+
+\draw[draw=#2, line width=#3pt] (165,305) ..controls(160,265).. (185,295) ..controls(125,325).. (190,325) ..controls(190,340)and(210,320).. (195,305)..controls(196,293)..(201,287)..controls(158,250).. (155,310);
+\draw[draw=#2, line width=#3pt] (183,344) ellipse (6 and 9);
+\draw[draw=#2, line width=#3pt] (212,336) ellipse (6 and 9);
+
+\draw [fill=black,line width=2pt] (177,344)..controls(185,345)..(188,349);
+\draw [fill=black,line width=2pt] (177,343)..controls(179,354)and(183,355)..(188,349);
+
+\draw [fill=black,line width=2pt] (206,336)..controls(215,338)..(216,343);
+\draw [fill=black,line width=2pt] (206,335)..controls(205,347)and(215,346)..(216,342);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####squirrel###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Squirrel}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+ %scraft
+ \draw[draw=#2, line width=#3pt] (175,165) ..controls(110,90)and(100,120).. (145,160) ..controls(140,176).. (130,180)..controls(58,195)and(84,249).. (155,255)-- (175,280)..controls(181,260)..(180,245) ..controls(195,220)and(190,200).. (175,185) ..controls(188,161).. (185,130) ..controls(200,100)and(240,100).. (215,265) ..controls(240,330)and(330,289).. (335,250) ..controls(283,280)and(270,250).. (280,210) ..controls(320,30)and(195,40)..(175,95) ..controls(175,65).. (160,65) ..controls(95,60)and(119,85).. (135,85) ..controls(130,94)and(130,120).. (155,125) -- (153,141.7);
+
+\draw[draw=#2, line width=#3pt] (120,182.5)..controls(85,140)and(105,100)..(132.5,95);
+\draw[draw=#2, line width=#3pt] (185,130) ..controls(204,155).. (190,220) ..controls(160,320)and(300,360).. (336,250);
+\draw[draw=#2, line width=#3pt] (140,253) ..controls(142,260).. (140,280) ..controls(151,270).. (155,255);
+\draw[draw=#2, line width=#3pt] (108,112.5) -- (108,95) ..controls(85,85)and(92,75).. (117.5,75);
+\draw[draw=#2, line width=#3pt] (165,250) ..controls(175,265)..(175,280);
+ \draw [fill=black!80](126,229) circle (0.4cm);
+ \draw [line width=2pt,fill=black!80] (88,217) ..controls(94,215).. (95,210) ..controls(94,207).. (90,203)..controls(87,211)..cycle;
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Giraffe###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Giraffe}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+ \draw[draw=#2, line width=#3pt] (85,515).. controls(163,340)..(160,245) ..controls(169,139)and (165,50).. (150,40) ..controls(155,29)..(180,30)..controls(190,290)and (220,290).. (195,50) ..controls(189,42).. (185,35) ..controls (203,29)..(220,35) ..controls(222,40).. (220,50) ..controls(225,245).. (275,205) ..controls(274,152).. (235,50) ..controls(245,40)..(265,45) ..controls(250,64)and(310,164).. (310,195) ..controls(315,166).. (310,140) ..controls(305,76)..(295,50) ..controls(306,43).. (325,45) ..controls(335,165).. (330,255) ..controls(353,224).. (370,180) ..controls(357,150).. (360,110) ..controls(390,153)and (385,235).. (330,280) ..controls(325,295).. (310,305) ..controls(211,405).. (120,570) ..controls(128,600).. (120,615) ..controls(99,610).. (80,590) ..controls(73,606).. (75,620) -- (60,620) ..controls(66,600)..(60,585) ..controls(49,575)..(40,550) ..controls(39,526).. (25,505) ..controls(24,495)..(25,490) ..controls(54,490)..(65,505)--cycle;
+
+ \draw[draw=#2, line width=#3pt] (55,580) ..controls(50,593)..(40,605) -- (50,615) ..controls(57,605).. (62,590);
+ \draw [fill=black](77,567) circle(0.6cm);
+\draw[draw=#2, line width=#3pt] (35,490).. controls(49,499)..(55,515);
+
+ \draw[fill=black, line width=2pt] (180,45) -- (155,45) --(150,40) ..controls(155,30)..(160,29) -- (180,31)--cycle;
+ \draw [fill=black,line width=2pt] (220,50) -- (195,50) -- (185,35)..controls(202,30).. (220,35) ..controls(223,44)..(220,50)--cycle;
+ \draw [fill=black,line width=2pt] (239,60) -- (262,55) -- (265,45) ..controls(246,40).. (235,50)--cycle;
+ \draw [fill=black,line width=2pt] (299,60) -- (295,50) -- (305,45) ..controls(315,44).. (325,45) -- (325,50)--cycle;
+
+ \draw [draw=none,fill=black](118,520) ellipse(15 and 10);
+ \draw [draw=none,fill=black](131,488) ellipse(10 and 15);
+ \draw [draw=none,fill=black](109,498) ellipse(7 and 7);
+ \draw [draw=none,fill=black](154,483) ellipse(5 and 5);
+ \draw [draw=none,fill=black](146,456) ellipse(14 and 11);
+ \draw [draw=none,fill=black](144,428) ellipse(7 and 7);
+ \draw [draw=none,fill=black](166,425) ellipse(10 and 15);
+ \draw [draw=none,fill=black](188,421) ellipse(6 and 10);
+ \draw [draw=none,fill=black](154,398) ellipse(7 and 10);
+ \draw [draw=none,fill=black](181,393) ellipse(13 and 9);
+ \draw [draw=none,fill=black](207,385) ellipse(6 and 12);
+ \draw [draw=none,fill=black](176,359) ellipse(10 and 15);
+ \draw [draw=none,fill=black](216,358) ellipse(16 and 10);
+ \draw [draw=none,fill=black](241,345) ellipse(9 and 9);
+ \draw [draw=none,fill=black](186,324) ellipse(10 and 15);
+ \draw [draw=none,fill=black](214,317) ellipse(10 and 13);
+ \draw [draw=none,fill=black](250,315) ellipse(12 and 10);
+ \draw [draw=none,fill=black](194,287) ellipse(16 and 13);
+ \draw [draw=none,fill=black](177,268) ellipse(5 and 5);
+ \draw [draw=none,fill=black] (230,290) ellipse (10 and 15);
+ \draw [draw=none,fill=black] (255,265) ellipse (10 and 15);
+ \draw [draw=none,fill=black] (285,285) ellipse (10 and 8);
+ \draw [draw=none,fill=black] (280,310) ellipse (12 and 10);
+ \draw [draw=none,fill=black] (315,280) ellipse (10 and 10);
+ \draw [draw=none,fill=black] (310,240) ellipse (5 and 10);
+ \draw [draw=none,fill=black] (280,245) ellipse (10 and 15);
+ \draw [draw=none,fill=black] (310,220) ellipse (10 and 5);
+ \draw [draw=none,fill=black] (285,205) ellipse (5 and 5);
+ \draw [draw=none,fill=black] (293,178) ellipse (5 and 13);
+ \draw [draw=none,fill=black] (285,155) ellipse (5 and 10);
+ \draw [draw=none,fill=black] (275,135) ellipse (5 and 5);
+ \draw [draw=none,fill=black] (275,115) ellipse (5 and 5);
+ \draw [draw=none,fill=black] (265,105) ellipse (5 and 5);
+ \draw [draw=none,fill=black] (255,80) ellipse (5 and 5);
+ \draw [draw=none,fill=black] (310,80) ellipse (5 and 5);
+ \draw [draw=none,fill=black] (320,95) ellipse (9 and 5);
+ \draw [draw=none,fill=black] (320,125) ellipse (5 and 5);
+ \draw [draw=none,fill=black] (320,150) ellipse (5 and 5);
+ \draw [draw=none,fill=black] (325,185) ellipse (5 and 10);
+ \draw [draw=none,fill=black] (205,255) ellipse (15 and 10);
+ \draw [draw=none,fill=black] (220,230) ellipse (10 and 5);
+ \draw [draw=none,fill=black] (215,200) ellipse (5 and 10);
+ \draw [draw=none,fill=black] (215,170) ellipse (5 and 10);
+ \draw [draw=none,fill=black] (210,150) ellipse (5 and 5);
+ \draw [draw=none,fill=black] (210,125) ellipse (5 and 5);
+ \draw [draw=none,fill=black] (210,95) ellipse (7 and 9);
+ \draw [draw=none,fill=black] (215,62) ellipse (5 and 10);
+ \draw [draw=none,fill=black] (175,235) ellipse (10 and 8);
+ \draw [draw=none,fill=black] (180,205) ellipse (7 and 10);
+ \draw [draw=none,fill=black] (175,175) ellipse (5 and 10);
+ \draw [draw=none,fill=black] (180,155) ellipse (5 and 10);
+ \draw [draw=none,fill=black] (175,135) ellipse (5 and 5);
+ \draw [draw=none,fill=black] (175,105) ellipse (5 and 5);
+ \draw [draw=none,fill=black] (175,85) ellipse (5 and 10);
+ \draw [draw=none,fill=black] (175,60) ellipse (5 and 5);
+\end{tikzpicture}
+}
+
+
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####rabit###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\rabit}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (179,431) .. controls (156,449) and (19,271) ..(190,267);
+\draw[draw=#2, line width=#3pt] (190,267) .. controls (343,295) and (208,449) ..(176,432);
+\draw[draw=#2, line width=#3pt] (154,420) .. controls (125,484) and (140,450) ..(113,505);
+\draw[draw=#2, line width=#3pt] (113,505) .. controls (102,522) and (45,483) ..(26,468);
+\draw[draw=#2, line width=#3pt] (26,468) .. controls (24,449) and (71,451) ..(92,454);
+\draw[draw=#2, line width=#3pt] (92,454) .. controls (98,454) and (118,427) ..(139,404);
+\draw[draw=#2, line width=#3pt] (209,420) .. controls (227,457) and (248,499) ..(253,505);
+\draw[draw=#2, line width=#3pt] (253,505) .. controls (262,516) and (316,481) ..(336,466);
+\draw[draw=#2, line width=#3pt] (336,466) .. controls (338,448) and (293,449) ..(272,450);
+\draw[draw=#2, line width=#3pt] (272,450) .. controls (260,442) and (241,418) ..(227,403);
+\draw[draw=#2, line width=#3pt] (166,385) ellipse(0.6cm and 0.9cm);
+\draw[draw=#2, line width=#3pt] (196,388) ellipse(0.6cm and 0.9cm);
+\draw[draw=#2, line width=#3pt] (133,327) .. controls (108,344) and (77,354) ..(47,352);
+\draw[draw=#2, line width=#3pt] (116,320) .. controls (105,322) and (92,322) ..(80,319);
+\draw[draw=#2, line width=#3pt] (123,304) .. controls (91,300) and (83,278) ..(75,263);
+\draw[draw=#2, line width=#3pt] (244,352) .. controls (258,373) and (278,385) ..(300,393);
+\draw[draw=#2, line width=#3pt] (249,334) .. controls (267,341) and (287,352) ..(302,362);
+\draw[draw=#2, line width=#3pt] (242,319) .. controls (260,316) and (279,312) ..(294,302);
+\draw[draw=#2, line width=#3pt] (142,342) .. controls (157,354) and (191,379) ..(230,347);
+\draw[draw=#2, line width=#3pt] (142,342) .. controls (157,325) and (183,306) ..(191,300);
+\draw[draw=#2, line width=#3pt] (191,300) .. controls (209,316) and (226,333) ..(230,347);
+\draw[draw=#2, line width=#3pt] (191,300) -- (191,284);
+\draw[draw=#2, line width=#3pt] (135,278) .. controls (-16,-4) and (438,-32) ..(241,288);
+\draw[draw=#2, line width=#3pt] (135,277) .. controls (71,241) and (52,243) ..(32,220);
+\draw[draw=#2, line width=#3pt] (32,220) .. controls (14,198) and (35,168) ..(77,201);
+\draw[draw=#2, line width=#3pt] (77,201) .. controls (88,201) and (101,209) ..(111,220);
+\draw[draw=#2, line width=#3pt] (247,292) .. controls (289,270) and (338,248) ..(357,238);
+\draw[draw=#2, line width=#3pt] (357,238) .. controls (381,223) and (337,186) ..(324,207);
+\draw[draw=#2, line width=#3pt] (324,207) .. controls (310,211) and (284,215) ..(275,220);
+\draw[draw=#2, line width=#3pt] (108,138) .. controls (62,129) and (53,94) ..(81,51);
+\draw[draw=#2, line width=#3pt] (81,51) .. controls (20,25) and (51,6) ..(167,24);
+\draw[draw=#2, line width=#3pt] (167,24) .. controls (180,33) and (188,47) ..(187,60);
+\draw[draw=#2, line width=#3pt] (207,58) .. controls (211,41) and (217,30) ..(225,24);
+\draw[draw=#2, line width=#3pt] (225,24) .. controls (257,26) and (281,18) ..(300,20);
+\draw[draw=#2, line width=#3pt] (300,20) .. controls (361,6) and (357,35) ..(313,50);
+\draw[draw=#2, line width=#3pt] (313,50) .. controls (335,105) and (340,115) ..(291,140);
+\end{tikzpicture}
+}
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%##strawberry#%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\strawberry}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (144,307) .. controls (120,318) and (85,341) ..(91,369);
+\draw[draw=#2, line width=#3pt] (91,369) .. controls (108,354) and (176,345) ..(185,314);
+\draw[draw=#2, line width=#3pt] (185,314) .. controls (190,336) and (177,357) ..(163,373);
+\draw[draw=#2, line width=#3pt] (163,373) .. controls (202,369) and (220,327) ..(223,303);
+\draw[draw=#2, line width=#3pt] (223,303) .. controls (221,343) and (253,372) ..(282,384);
+\draw[draw=#2, line width=#3pt] (282,384) .. controls (288,354) and (273,324) ..(260,316);
+\draw[draw=#2, line width=#3pt] (260,316) .. controls (296,311) and (318,274) ..(345,272);
+\draw[draw=#2, line width=#3pt] (345,272) .. controls (319,255) and (256,263) ..(230,267);
+\draw[draw=#2, line width=#3pt] (230,267) .. controls (243,237) and (220,216) ..(224,192);
+\draw[draw=#2, line width=#3pt] (224,192) .. controls (178,227) and (187,263) ..(180,271);
+\draw[draw=#2, line width=#3pt] (180,271) .. controls (133,234) and (100,256) ..(68,253);
+\draw[draw=#2, line width=#3pt] (68,253) .. controls (83,277) and (135,289) ..(144,307);
+\draw[draw=#2, line width=#3pt] (121,320) .. controls (-84,240) and (90,115) ..(140,80);
+\draw[draw=#2, line width=#3pt] (140,80) .. controls (195,16) and (265,4) ..(307,115);
+\draw[draw=#2, line width=#3pt] (307,115) .. controls (424,246) and (365,352) ..(264,319);
+\draw[draw=#2, line width=#3pt] (70,220) .. controls (52,169) and (116,170) ..(70,220);
+\draw[draw=#2, line width=#3pt] (128,163) .. controls (95,116) and (182,100) ..(128,163);
+\draw[draw=#2, line width=#3pt] (158,231) .. controls (136,177) and (201,173) ..(158,231);
+\draw[draw=#2, line width=#3pt] (216,173) .. controls (192,120) and (256,129) ..(216,173);
+\draw[draw=#2, line width=#3pt] (239,103) .. controls (219,47) and (272,62) ..(239,103);
+\draw[draw=#2, line width=#3pt] (293,237) .. controls (286,167) and (348,219) ..(293,237);
+
+
+\end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####turtle###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\turtle}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (114,192) .. controls (86,180) and (83,168) ..(88,158);
+\draw[draw=#2, line width=#3pt] (88,158) .. controls (74,129) and (118,113) ..(133,104);
+\draw[draw=#2, line width=#3pt] (133,104) .. controls (148,86) and (191,76) ..(213,85);
+\draw[draw=#2, line width=#3pt] (213,85) .. controls (251,76) and (284,93) ..(289,119);
+\draw[draw=#2, line width=#3pt] (289,119) .. controls (336,126) and (336,170) ..(265,189);
+\draw[draw=#2, line width=#3pt] (265,189) .. controls (242,208) and (201,214) ..(180,205);
+\draw[draw=#2, line width=#3pt] (180,205) .. controls (151,210) and (118,203) ..(114,192);
+\draw[draw=#2, line width=#3pt] (91,177) .. controls (85,191) and (89,186) ..(79,195);
+\draw[draw=#2, line width=#3pt] (79,195) .. controls (91,196) and (96,188) ..(105,188);
+\draw[draw=#2, line width=#3pt] (162,170) .. controls (180,188) and (215,188) ..(242,169);
+\draw[draw=#2, line width=#3pt] (162,170) .. controls (181,167) and (196,160) ..(211,152);
+\draw[draw=#2, line width=#3pt] (242,169) .. controls (235,161) and (218,157) ..(211,152);
+\draw[draw=#2, line width=#3pt] (162,170) .. controls (105,166) and (130,169) ..(88,158);
+\draw[draw=#2, line width=#3pt] (114,192) .. controls (139,193) and (155,189) ..(174,178);
+\draw[draw=#2, line width=#3pt] (180,205) .. controls (190,199) and (197,190) ..(201,183);
+\draw[draw=#2, line width=#3pt] (265,189) .. controls (249,177) and (250,171) ..(242,169);
+\draw[draw=#2, line width=#3pt] (242,169) .. controls (275,166) and (305,149) ..(317,133);
+\draw[draw=#2, line width=#3pt] (289,119) .. controls (269,135) and (234,151) ..(211,152);
+\draw[draw=#2, line width=#3pt] (213,85) .. controls (218,108) and (216,133) ..(211,152);
+\draw[draw=#2, line width=#3pt] (133,104) .. controls (154,128) and (173,141) ..(211,152);
+\draw[draw=#2, line width=#3pt] (113,115) .. controls (95,83) and (49,76) ..(41,109);
+\draw[draw=#2, line width=#3pt] (41,109) .. controls (68,102) and (84,111) ..(95,128);
+\draw[draw=#2, line width=#3pt] (196,82) .. controls (189,73) and (193,76) ..(191,65);
+\draw[draw=#2, line width=#3pt] (191,65) .. controls (153,42) and (155,34) ..(164,24);
+\draw[draw=#2, line width=#3pt] (164,24) .. controls (194,23) and (232,45) ..(226,83);
+\draw[draw=#2, line width=#3pt] (108,108) .. controls (130,84) and (158,68) ..(191,65);
+\draw[draw=#2, line width=#3pt] (226,65) .. controls (249,61) and (282,73) ..(295,89);
+\draw[draw=#2, line width=#3pt] (273,94) .. controls (278,89) and (288,90) ..(295,89);
+\draw[draw=#2, line width=#3pt] (295,89) .. controls (311,93) and (326,74) ..(346,73);
+\draw[draw=#2, line width=#3pt] (346,73) .. controls (379,73) and (372,128) ..(310,127);
+\draw[draw=#2, line width=#3pt] (305,89) .. controls (302,94) and (303,95) ..(305,98);
+\draw[draw=#2, line width=#3pt] (329,125) .. controls (356,146) and (348,166) ..(312,165);
+\draw[draw=#2, line width=#3pt] (326,95) ellipse(0.2cm and 0.3cm);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####FLOWER###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\FLOWER}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (10,43) -- (119,206);
+\draw[draw=#2, line width=#3pt] (30,44) -- (130,197);
+\draw[draw=#2, line width=#3pt] (51,77) .. controls (121,125) and (181,141) ..(244,142);
+\draw[draw=#2, line width=#3pt] (244,142) .. controls (254,114) and (257,84) ..(237,53);
+\draw[draw=#2, line width=#3pt] (237,53) .. controls (308,94) and (283,144) ..(206,168);
+\draw[draw=#2, line width=#3pt] (206,168) .. controls (179,174) and (118,141) ..(79,119);
+\draw[draw=#2, line width=#3pt] (119,206) .. controls (84,253) and (108,308) ..(121,369);
+\draw[draw=#2, line width=#3pt] (121,369) .. controls (118,305) and (154,271) ..(134,217);
+\draw[draw=#2, line width=#3pt] (134,218) .. controls (170,254) and (249,237) ..(273,265);
+\draw[draw=#2, line width=#3pt] (273,265) .. controls (184,191) and (214,217) ..(130,197);
+\draw[draw=#2, line width=#3pt] (129,307) .. controls (130,333) and (146,365) ..(149,402);
+\draw[draw=#2, line width=#3pt] (149,402) .. controls (151,338) and (177,295) ..(160,252);
+\draw[draw=#2, line width=#3pt] (160,328) .. controls (156,360) and (181,379) ..(184,427);
+\draw[draw=#2, line width=#3pt] (184,427) .. controls (181,368) and (208,327) ..(186,288);
+\draw[draw=#2, line width=#3pt] (188,375) .. controls (193,404) and (210,425) ..(212,462);
+\draw[draw=#2, line width=#3pt] (212,462) .. controls (207,410) and (239,366) ..(215,321);
+\draw[draw=#2, line width=#3pt] (219,397) .. controls (218,412) and (256,467) ..(263,494);
+\draw[draw=#2, line width=#3pt] (263,494) .. controls (246,442) and (276,396) ..(241,356);
+\draw[draw=#2, line width=#3pt] (227,247) .. controls (245,254) and (271,288) ..(303,302);
+\draw[draw=#2, line width=#3pt] (303,302) .. controls (271,275) and (189,294) ..(160,253);
+\draw[draw=#2, line width=#3pt] (248,285) .. controls (271,295) and (294,324) ..(317,332);
+\draw[draw=#2, line width=#3pt] (317,332) .. controls (287,313) and (218,336) ..(186,289);
+\draw[draw=#2, line width=#3pt] (282,323) .. controls (303,328) and (321,362) ..(349,369);
+\draw[draw=#2, line width=#3pt] (349,369) .. controls (319,347) and (241,363) ..(221,336);
+\draw[draw=#2, line width=#3pt] (304,356) .. controls (320,366) and (342,401) ..(366,413);
+\draw[draw=#2, line width=#3pt] (366,413) .. controls (327,381) and (269,397) ..(252,373);
+\draw[draw=#2, line width=#3pt] (295,389) .. controls (322,405) and (329,472) ..(378,504);
+\draw[draw=#2, line width=#3pt] (378,504) .. controls (340,460) and (265,451) ..(259,410);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####FISH###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\FISH}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2,line width=#3pt](160,145) ellipse(16cm and 13cm);
+\draw[draw=#2,line width=#3pt](280,220) arc(-63:180:50);
+\draw[draw=#2,line width=#3pt](280,178) ellipse(8cm and 5cm);
+\draw[draw=#2,line width=#3pt](237,136)--(194,18);
+\draw[draw=#2,line width=#3pt](210,153)--(159,17);
+\draw[draw=#2,line width=#3pt](253,250)--(244,221);
+\draw[draw=#2,line width=#3pt](165,275)--(92,29);
+\draw[draw=#2,line width=#3pt](67,190) ellipse(1.9cm and 3cm);
+\draw[draw=#2,line width=#3pt](49,186)--(78,166);
+\draw[draw=#2,line width=#3pt](1,150)--(46,126);
+\draw[draw=#2,line width=#3pt](295,76)--(361,80);
+\draw[draw=#2,line width=#3pt](364,81)--(314,111);
+
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%##centipede##%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\centipede}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2,line width=#3pt](317,70)circle(38.3);
+\draw[draw=#2,line width=#3pt](250,107) circle(35.3);
+\draw[draw=#2,line width=#3pt](188,137) circle(35.3);
+\draw[draw=#2,line width=#3pt](148,191) circle(35.3);
+\draw[draw=#2,line width=#3pt](100,241) circle(35.3);
+\draw[draw=#2,line width=#3pt](68,299) circle(35.3);
+\draw[draw=#2,line width=#3pt](38,360) circle(35.3);
+\draw[draw=#2,line width=#3pt](85,410) circle(35.3);
+\draw[draw=#2,line width=#3pt](335,106)--(357,121);
+\draw[draw=#2,line width=#3pt](327,109)--(332,132);
+\draw[draw=#2,line width=#3pt](310,109)--(319,141);
+\draw[draw=#2,line width=#3pt](332,34)--(341,19);
+\draw[draw=#2,line width=#3pt](312,32)--(316,05);
+\draw[draw=#2,line width=#3pt](292,40)--(295,15);
+\draw[draw=#2,line width=#3pt](252,72)--(250,55);
+\draw[draw=#2,line width=#3pt](231,79)--(227,56);
+\draw[draw=#2,line width=#3pt](220,87)--(209,61);
+\draw[draw=#2,line width=#3pt](271,135)--(292,149);
+\draw[draw=#2,line width=#3pt](254,144)--(277,161);
+\draw[draw=#2,line width=#3pt](235,139)--(252,165);
+\draw[draw=#2,line width=#3pt](216,156)--(230,162);
+\draw[draw=#2,line width=#3pt](211,165)--(226,184);
+\draw[draw=#2,line width=#3pt](192,172)--(214,184);
+\draw[draw=#2,line width=#3pt](191,102)--(190,85);
+\draw[draw=#2,line width=#3pt](167,109)--(165,90);
+\draw[draw=#2,line width=#3pt](154,125)--(145,110);
+\draw[draw=#2,line width=#3pt](141,155)--(134,146);
+\draw[draw=#2,line width=#3pt](119,170)--(116,156);
+\draw[draw=#2,line width=#3pt](114,189)--(101,171);
+\draw[draw=#2,line width=#3pt](184,184)--(201,187);
+\draw[draw=#2,line width=#3pt](181,201)--(202,204);
+\draw[draw=#2,line width=#3pt](169,222)--(181,229);
+\draw[draw=#2,line width=#3pt](136,236)--(147,237);
+\draw[draw=#2,line width=#3pt] (131,256)--(157,258);
+\draw[draw=#2,line width=#3pt](114,274)--(142,280);
+\draw[draw=#2,line width=#3pt](95,206)--(87,192);
+\draw[draw=#2,line width=#3pt](74,217)--(60,205);
+\draw[draw=#2,line width=#3pt](64,240)--(47,229);
+\draw[draw=#2,line width=#3pt](52,270)--(30,265);
+\draw[draw=#2,line width=#3pt](36,277)--(15,280);
+\draw[draw=#2,line width=#3pt](32,297)--(15,304);
+\draw[draw=#2,line width=#3pt](102,289)--(117,286);
+\draw[draw=#2,line width=#3pt](101,309)--(127,304);
+\draw[draw=#2,line width=#3pt](87,326)--(115,330);
+\draw[draw=#2,line width=#3pt](75,334)--(115,336);
+\draw[draw=#2,line width=#3pt](69,341)--(90,347);
+\draw[draw=#2,line width=#3pt](72,357)--(90,357);
+\draw[draw=#2,line width=#3pt](72,364)--(96,364);
+\draw[draw=#2,line width=#3pt](26,325)--(12,314);
+\draw[draw=#2,line width=#3pt](11,342)--(-04,342);
+\draw[draw=#2,line width=#3pt](4,369)--(-10,367);
+\draw[draw=#2,line width=#3pt](73,441) arc(-50:160:30);
+\draw[draw=#2,line width=#3pt](121,416) arc(-65:-180:-30);
+\draw[draw=#2,line width=#3pt](32,467) circle(10.4);
+\draw[draw=#2,line width=#3pt](164,376) circle(10.4);
+\draw[draw=#2,line width=#3pt](63,391) arc(30:120:-20);
+\draw[draw=#2,line width=#3pt](72,417) circle(06.1);
+\draw[draw=#2,line width=#3pt](98,406) circle(06.1);
+
+\end{tikzpicture}
+}
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%##Book##%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\Book}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2,line width=#3pt](216,36)--(330,76);
+\draw[draw=#2,line width=#3pt](330,76)--(331,310);
+\draw[draw=#2,line width=#3pt](331,310)--(214,267);
+\draw[draw=#2,line width=#3pt](214,267)--(177,268);
+\draw[draw=#2,line width=#3pt](177,268)--(62,307);
+\draw[draw=#2,line width=#3pt](62,307)--(62,76);
+\draw[draw=#2,line width=#3pt](62,76)--(178,35);
+\draw[draw=#2,line width=#3pt](178,36)--(216,36);
+\draw[draw=#2,line width=#3pt](216,36)--(216,266);
+\draw[draw=#2,line width=#3pt](178,36)--(177,268);
+\draw[draw=#2,line width=#3pt](220,22)--(344,62);
+\draw[draw=#2,line width=#3pt](344,62)--(347,308);
+\draw[draw=#2,line width=#3pt](347,308)--(333,310);--(331,76);
+\draw[draw=#2,line width=#3pt](220,22)--(206,25);
+\draw[draw=#2,line width=#3pt](206,25)--(186,25);
+\draw[draw=#2,line width=#3pt](186,25)--(178,18);
+\draw[draw=#2,line width=#3pt](178,18)--(41,60);
+\draw[draw=#2,line width=#3pt](41,60)--(61,77);
+\draw[draw=#2,line width=#3pt](41,60)--(43,309);
+\draw[draw=#2,line width=#3pt](43,309)--(61,307);
+\draw[draw=#2,line width=#3pt](109,143) arc (20:140:20);
+\draw[draw=#2,line width=#3pt](115,184) arc (55:130:30);
+\draw[draw=#2,line width=#3pt](115,233) arc (20:150:20);
+\draw[draw=#2,line width=#3pt](141,138)arc(20:150:20);
+\draw[draw=#2,line width=#3pt](159,126) arc(2:145:12);
+\draw[draw=#2,line width=#3pt](137,172) arc (2:130:20);
+\draw[draw=#2,line width=#3pt](158,167) arc (20:120:20);
+\draw[draw=#2,line width=#3pt](135,231) arc (25:125:20);
+\draw[draw=#2,line width=#3pt](151,227) arc (15:115:13);
+\draw[draw=#2,line width=#3pt](256,129) arc (30:140:20);
+\draw[draw=#2,line width=#3pt](285,136) arc (40:150:20);
+\draw[draw=#2,line width=#3pt] (305,138) arc (20:140:20);
+\draw[draw=#2,line width=#3pt](251,171) arc (30:150:15);
+\draw[draw=#2,line width=#3pt](279,177) arc (40:133:25);
+\draw[draw=#2,line width=#3pt](307,179) arc (40:133:25);
+\draw[draw=#2,line width=#3pt](258,205) arc (40:135:25);
+\draw[draw=#2,line width=#3pt](275,215) arc(45:140:20);
+\draw[draw=#2,line width=#3pt](310,218) arc (40:145:20);
+\draw[draw=#2,line width=#3pt](263,241) arc (40:133:25);
+\draw[draw=#2,line width=#3pt](287,249) arc (40:145:20);
+\draw[draw=#2,line width=#3pt](313,248) arc (40:135:20);
+\end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%##Turtle##%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\Turtle}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (71, 174) arc (167 : 0 : 156);
+\draw[draw=#2, line width=#3pt] (71, 174) .. controls (192, 146) and (272, 141) .. (379, 139);
+\draw[draw=#2, line width=#3pt] (252,145) -- (253,155) -- (232,174) -- (172,174) -- (156, 157);
+\draw[draw=#2, line width=#3pt] (135, 161) -- (156,182)--(139, 208)--(85,212);
+\draw[draw=#2, line width=#3pt] (90,220)--(138,215)--(168, 229) -- (168,254) -- (144, 274);
+\draw[draw=#2, line width=#3pt] (156, 280) -- (176, 266)--(199, 274) -- (200, 293);
+\draw[draw=#2, line width=#3pt] (214, 296) -- (215, 277) -- (248, 262) -- (309, 268);
+\draw[draw=#2, line width=#3pt] (316, 256) -- (252, 253) -- (238, 233) -- (265, 214) -- (321, 216) -- (340, 232) --(316, 256);
+\draw[draw=#2, line width=#3pt] (183, 234) -- (227, 234) -- (232, 255) -- (206, 268) -- (181, 258) -- (183, 234);
+\draw[draw=#2, line width=#3pt] (152, 209) -- (182, 226) -- (226, 225) -- (251, 206) -- (235, 183) -- (175, 183) -- (152, 209);
+\draw[draw=#2, line width=#3pt] (247, 178) -- (277, 154) -- (312, 146) -- (336, 159) -- (346, 181) -- (320, 202)--(268, 204) -- (247, 178);
+\draw[draw=#2, line width=#3pt] (350, 228) -- (330,215) -- (363, 192) -- (369, 193);
+\draw[draw=#2, line width=#3pt] (373, 181) -- (361, 181) -- (348, 157) -- (348, 140);
+\draw[draw=#2, line width=#3pt] (356, 141) .. controls (377, 120) and (363, 80) .. (360, 78) .. controls (365, 91) and (345, 99) .. (326, 106) .. controls (313, 113) and (308, 121) .. (308, 141);
+\draw[draw=#2, line width=#3pt] (315, 114) .. controls (297,87) and (294, 86) .. (270, 76) .. controls (290, 98) and (258, 114) .. (265, 144);
+\draw[draw=#2, line width=#3pt] (156, 156) .. controls (162, 135) and (130,113)..(150, 82)..controls(121,99) and (106,117) .. (104,137);
+\draw[draw=#2, line width=#3pt] (71, 175) .. controls (67, 150) and (64, 124) .. (78, 106)..controls(71,125) and (127,145) .. (130,162);
+\draw[draw=#2, line width=#3pt] (120, 257)..controls(94,299) and (39, 292)..(16,260)..controls(28,230) and (52, 219)..(82,204);
+\draw[draw=#2, line width=#3pt] (16, 260) arc (-150 : -100 : 20);
+\draw[fill = black] (56, 269) circle (0.7cm);
+\end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#flyingSaucer#%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\flyingSaucer}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[fill = black] (131, 363) circle (1.3cm);
+\draw[fill = black] (246, 369) circle (1.3cm);
+\draw[fill = black] (85, 82) circle (1.7cm);
+\draw[fill = black] (202, 49) circle (1.7cm);
+\draw[fill = black] (303, 86) circle (1.7cm);
+\draw[draw=#2, line width=#3pt] (138,352)--(176,311);
+\draw[draw=#2, line width=#3pt] (240,357)--(217,311);
+\draw[draw=#2, line width=#3pt] (190,144)--(195,64);
+\draw[draw=#2, line width=#3pt] (207,145)--(208,66);
+\draw[draw=#2, line width=#3pt] (263,152)--(291,99);
+\draw[draw=#2, line width=#3pt] (304,102)--(277,155);
+\draw[draw=#2, line width=#3pt] (102,153)--(81,98);
+\draw[draw=#2, line width=#3pt] (115,149)--(95,96);
+\draw[draw=#2, line width=#3pt] (117, 205) arc (200 : -20 : 80);
+\draw[draw=#2, line width=#3pt] (112, 223)..controls(15,203) and (40, 183)..(50,174)..controls(108,141)and(198,128)..(334,170)..controls(355,186) and (330, 210)..(272,225);
+\draw[draw=#2, line width=#3pt] (117,205).. controls(164,182) and (224,178) .. (268,205);
+\draw[draw=#2, line width=#3pt] (117,205).. controls(164,240) and (224,238) .. (268,205);
+\draw[draw=#2, line width=#3pt] (117,205)--(160,209);
+\draw[draw=#2, line width=#3pt](268,205) -- (227,208);
+\draw[draw=#2, line width=#3pt](227,208)..controls(216,227) and (173,230)..(160,209);
+\draw[draw=#2, line width=#3pt](227,208)..controls(216,185) and (173,188)..(160,209);
+\draw[draw=#2, line width=#3pt](84,205)--(78,199)--(68,199)--(71,190)--(67,181)--(79,183)--(85,177)--(86,186)--(95,190)--(86,195)--(84,205);
+\draw[draw=#2, line width=#3pt](119,182)--(124,172)--(119,165)--(130,167)--(136,158)--(138,169)--(148,173)--(137,177)--(137,189)--(129,181)--(119,182);
+\draw[draw=#2, line width=#3pt](185,164)--(180,156)--(191,159)--(197,151)--(198,160)--(207,165)--(199,167)--(198,178)--(190,171)--(181,173)--(185,164);
+\draw[draw=#2, line width=#3pt](246,158)--(257,162)--(263,155)--(264,165)--(275,169)--(265,173)--(263,184)--(257,175)--(245,178)--(251,167)--(246,158);
+\draw[draw=#2, line width=#3pt](293,181)--(307,184)--(312,175)--(312,187)--(321,190)--(312,194)--(312,205)--(305,196)--(293,201)--(300,189)--(293,181);
+\end{tikzpicture}
+}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#ghost#%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\ghost}[3]{
+\begin{tikzpicture}[scale = #1]
+\draw[color=black, line width=#3pt]
+(0.7,0.1) .. controls (0.3,2) and (-0.6,0.8) ..
+(-0.7, 0.1);
+\draw[color=black, line width=#3pt]
+(-0.7, 0.1) .. controls (-0.8,-0.4) and (-0.9,-0.5) ..
+(-1.2, -0.8);
+
+\draw[color=black, line width=#3pt]
+(0.7, 0.1) .. controls (0.7,-0.1) and (0.9,-0.5) ..
+(1.1, -0.8);
+
+\draw[color=black, line width=#3pt]
+(-1.2, -0.8)..controls(-1.1,-0.8)and(-0.9,-0.8)..(-0.8,-0.8)..
+controls(-0.8,-0.9)and(-0.7,-1)..(-0.6,-1)..
+controls(-0.5,-1)and(-0.4,-1)..(-0.3,-0.9)..
+controls(-0.2,-1)and(-0.1,-1)..(0.1,-1.0,0.1)..
+controls(0.1,-1)and(0.3,-1)..(0.3,-0.9)..
+controls(0.6,-0.9)and(0.6,-1)..(0.7,-1.1)..
+controls(0.8,-1)and(0.9,-0.9)..(1.1,-0.8);
+\draw[black, line width=#3pt] (-0.18,0.6)circle(0.2cm);
+\draw[black, line width=#3pt] (0.2,0.6)circle(0.2cm);
+\draw[black, line width=#3pt, fill] (-0.2,0.6)circle(0.1cm);
+\draw[black, line width=#3pt ,fill] (0.2,0.6)circle(0.1cm);
+\end{tikzpicture}
+}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#watermelon#%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\watermelon}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (381,178) arc (360:180: 18.5cm and 16cm);
+\draw[draw=#2, line width=#3pt] (355,178) arc (360:180: 16cm and 14 cm);
+\draw[draw=#2, line width=#3pt] (381,178) -- (12,178);
+\draw[draw=#2, line width=#3pt] (75,156) .. controls (60,122) and (99,122) .. (75,156);
+\draw[draw=#2, line width=#3pt] (131,155) .. controls (118,122) and (155,122) .. (131,155);
+\draw[draw=#2, line width=#3pt] (125,120) .. controls (100,90) and (150,90) .. (125,120);
+\draw[draw=#2, line width=#3pt] (175,146) .. controls (160,112) and (200,112) .. (175,146);
+\draw[draw=#2, line width=#3pt] (75,156) .. controls (60,122) and (99,122) .. (75,156);
+\draw[draw=#2, line width=#3pt] (183,109) .. controls (160,78) and (210,78) .. (183,109);
+\draw[draw=#2, line width=#3pt] (215,165) .. controls (200,135) and (238,135) .. (215,165);
+\draw[draw=#2, line width=#3pt] (248,144) .. controls (230,112) and (278,112) .. (248,144);
+\draw[draw=#2, line width=#3pt] (242,100) .. controls (225,65) and (270,65) .. (242,100);
+\draw[draw=#2, line width=#3pt] (305,133) .. controls (284,100) and (340,100) .. (305,133);
+\draw[draw=#2, line width=#3pt] (300,169) .. controls (276,137) and (328,137) .. (300,169);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%####witchHat###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\witchHat}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2,line width=#3pt] (126,165) --(180,396)-- (127,447) .. controls (184,440) .. (209,419) -- (297,165);
+\draw[draw=#2,line width=#3pt] (126,165) .. controls (160,115) and (275,115) .. (297,165);
+\draw[draw=#2,line width=#3pt] (136,211) arc (117: 425:16.5cm and 7cm) (281,210);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%##Butterfly#%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Butterfly}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2,line width=#3pt] (87,199) circle (4.5cm);
+\draw[draw=#2,line width=#3pt] (313,199) circle (4.5cm);
+\draw[draw=#2,line width=#3pt] (116,72) circle (3cm);
+\draw[draw=#2,line width=#3pt] (283,72) circle (3cm);
+\draw[draw=#2,line width=#3pt] (199,134) ellipse (2.3cm and 10.8cm);
+\draw[draw=#2,line width=#3pt] (193,238) ..controls (190,335) and (148,339) .. (129,316) .. controls (115,290) and (125,270) .. (142,273) .. controls (157,276) and (155,290) .. (153,292) .. controls (151,297) and (145,292) .. (145,291) .. controls (141,285) and (139,282).. (134,289) .. controls (125,318) and (152,322).. (160,317).. controls (183,305) and (181,261) .. (184,215) ;
+\draw[draw=#2,line width=#3pt] (184,215) .. controls (114,292) and (36,268) .. (16,244)..controls (-14,205) and (-3,153) .. (72,105).. controls (50,79) and (43,40) .. (54,28).. controls (76,-7) and (125,-11).. (187,42) ;
+\draw[draw=#2,line width=#3pt] (205,238) ..controls (207,306) and (226,332) .. (255,325).. controls (278,317) and (275,293).. (272,283).. controls (266,268) and (244,268) .. (243,287).. controls(245,298) and (251,295) .. (253,289).. controls (259,280) and (264,288) ..(265,292).. controls (272,310) and (247,328) .. (234,315) .. controls (216,302) and (217,267) .. (214,215) ;
+\draw[draw=#2,line width=#3pt] (214,215).. controls (288,290) and (368,282) .. (393,229).. controls (408,182) and (375,132) .. (326,106)..controls (352,79) and (356,37) .. (338,22)..controls (312,-05) and (256,0) .. (212,45) ;
+\end{tikzpicture}}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%###dolphin###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\dolphin}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2,line width=#3pt] (349,262) .. controls (368,295) and (318,337).. (277,339).. controls (229,344) and (197,329).. (150,300);
+\draw[draw=#2,line width=#3pt] (349,263) .. controls (357,249).. (366,235).. controls (381,208) and (366,204) .. (353,212).. controls (337,222).. (328,231).. controls (318,243) and (308,240) .. (305,245).. controls (302,250) .. (302,256);
+\draw[draw=#2,line width=#3pt] (349,263)..controls (330,252) and (304,273).. (255,272)..controls(242,271) .. (223,266);
+\draw[draw=#2,line width=#3pt] (294,255)..controls(302,257) .. (309,254);
+\draw[draw=#2,line width=#3pt] (348,215) .. controls (347,187) and (333,206).. (318,218).. controls (302,232) .. (294,235);
+\draw[draw=#2,line width=#3pt] (341,220) ..controls (339,207)and(334,218) .. (332,227);
+\draw[draw=#2,line width=#3pt] (278,311) .. controls (287,325)and(301,325).. (308,301);
+\draw[draw=#2,line width=#3pt] (286,285.5) circle (1.6cm);
+\draw[draw=#2,line width=#3pt] (286,270) ..controls (299,285) and (280,298) .. (270,287);
+\draw[draw=#2,line width=#3pt] (283,285) ellipse (0.5cm and 0.4cm);
+\draw[draw=#2,line width=#3pt] (302,231) .. controls (267,220) .. (210,210)..controls(164,201) and (151,169) ..(150,150).. controls (146,108)and(140,87) ..(131,73);
+\draw[draw=#2,line width=#3pt] (223,266) ..controls (217,250) and (176,255) .. (160,244)..controls (115,202)and(135,120).. (131,73);
+\draw[draw=#2,line width=#3pt] (223,266)..controls(199,296)and(130,311).. (91,296)..controls(62,283)and(68,272) ..(86,274)..controls (111,273)and(148,267)..(160,244);
+\draw[draw=#2,line width=#3pt] (126,267)..controls(99,215)and(103,178).. (115,145)..controls (124,100)and(105,98)..(87,80)..controls(70,60)..(64,40)..controls(57,5)and(78,27)..(97,38)--(130,60)--(159,30)..controls(185,7)and(186,11)..(182,41)..controls(178,60)and(165,81)..(144,107);
+\draw[draw=#2,line width=#3pt] (183.5,27)..controls(168,68)..(140,94);
+\draw[draw=#2,line width=#3pt](64,23)..controls(81,64)..(111,93)..controls(117,98)and(126,106)..(131.2,78);
+\draw[draw=#2,line width=#3pt](267,221)..controls(269,187)..(257,167)..controls(239,141)and(229,150)..(233,170)..controls(236,186)and(225,200)..(215,211);
+\draw[draw=#2,line width=#3pt](217,333)..controls(177,356)..(126,358)..controls(97,357)and(97,343)..(111,338)..controls(130,328)..(153,302);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Plane###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\Plane}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width = #3pt] (77,89) .. controls (89,108) .. (108,120);
+\draw[draw=#2, line width = #3pt] (108,120) .. controls (70,143) .. (42,162);
+\draw[draw=#2, line width = #3pt] (42,162) .. controls (21,160) .. (14,153);
+\draw[draw=#2, line width = #3pt] (14,153) .. controls (46,120) .. (77,89);
+\draw[draw=#2, line width = #3pt] (122,124) .. controls (72,83) .. (78,55);
+\draw[draw=#2, line width = #3pt] (96,39) arc (-95 : 180 : 20);
+\draw[draw=#2, line width = #3pt] (90,40) arc (-95 : 180 : 13);
+\draw[draw=#2, line width = #3pt] (78,54) .. controls (80,43) .. (91,40);
+\draw[draw=#2, line width = #3pt] (96,39) -- (92,40);
+\draw[draw=#2, line width = #3pt] (94,40) .. controls (145,18) .. (193,40);
+\draw[draw=#2, line width = #3pt] (193,40) .. controls (286,32) .. (370,28);
+\draw[draw=#2, line width = #3pt] (370,28) .. controls (380,38) .. (387,51);
+\draw[draw=#2, line width = #3pt] (387,51) .. controls (312,62) .. (246,69);
+\draw[draw=#2, line width = #3pt] (246,69) .. controls (271,92) .. (291,123);
+\draw[draw=#2, line width = #3pt] (291,123) .. controls (293,142) .. (294,157);
+\draw[draw=#2, line width = #3pt] (294,157) .. controls (327,153) .. (358,152);
+\draw[draw=#2, line width = #3pt] (358,152) -- (362,160);
+\draw[draw=#2, line width = #3pt] (362,160) .. controls (329,168) .. (297,172);
+\draw[draw=#2, line width = #3pt] (297,172) .. controls (304,212) .. (307,251);
+\draw[draw=#2, line width = #3pt] (307,251) .. controls (301,256) .. (293,256);
+\draw[draw=#2, line width = #3pt] (293,256) .. controls (273,198) .. (261,158);
+\draw[draw=#2, line width = #3pt] (264,175) .. controls (240,178) .. (215,181);
+\draw[draw=#2, line width = #3pt] (215,181) -- (207,176);
+\draw[draw=#2, line width = #3pt] (207,176) .. controls (233,167) .. (260,163);
+\draw[draw=#2, line width = #3pt] (261,158) .. controls (257,150) .. (237,152);
+\draw[draw=#2, line width = #3pt] (237,152) .. controls (196,163) .. (158,168);
+\draw[draw=#2, line width = #3pt] (158,168) .. controls (137,155) .. (122,124);
+\draw[draw=#2, line width = #3pt] (180,98) -- (191,101) -- (183,145) -- (180,98);
+\draw[draw=#2, line width = #3pt] (194,102) -- (209,106) -- (204,140) -- (187,145) -- (194,102);
+\draw[draw=#2, line width = #3pt] (125,124) .. controls (146,124) .. (177,101);
+\draw[draw=#2, line width = #3pt] (177,101) -- (179,147);
+\draw[draw=#2, line width = #3pt] (179,147) .. controls (157,157) .. (141,154);
+\draw[draw=#2, line width = #3pt] (141,154) .. controls (132,140) .. (125,125);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%###ladybug##%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\ladybug}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width = #3pt] (195,160) ellipse (13cm and 15cm);
+\draw[draw=#2, line width = #3pt] (196,309) -- (196,09);
+\draw[draw=#2, line width = #3pt] (151,234) circle (2.5cm);
+\draw[draw=#2, line width = #3pt] (108,168) circle (2.5cm);
+\draw[draw=#2, line width = #3pt] (153,104) circle (2.5cm);
+\draw[draw=#2, line width = #3pt] (271,224) circle (2.5cm);
+\draw[draw=#2, line width = #3pt] (236,155) circle (2.5cm);
+\draw[draw=#2, line width = #3pt] (258,96) circle (2.5cm);
+\draw[draw=#2, line width = #3pt] (134,295) .. controls (124,354) .. (162,387);
+\draw[draw=#2, line width = #3pt] (162,387) .. controls (192,396) .. (229,390);
+\draw[draw=#2, line width = #3pt] (229,390) .. controls (269,350) .. (252,293);
+\draw[draw=#2, line width = #3pt] (161,386) .. controls (133,422) .. (113,423);
+\draw[draw=#2, line width = #3pt] (113,423) .. controls (95,408) .. (97,396);
+\draw[draw=#2, line width = #3pt] (97,396) .. controls (106,391) .. (119,410);
+\draw[draw=#2, line width = #3pt] (119,410) .. controls (118,386) .. (101,380);
+\draw[draw=#2, line width = #3pt] (101,380) .. controls (83,387) .. (76,408);
+\draw[draw=#2, line width = #3pt] (76,408) .. controls (82,434) .. (109,449);
+\draw[draw=#2, line width = #3pt] (109,449) .. controls (146,441) .. (172,391);
+\draw[draw=#2, line width = #3pt] (219,392) .. controls (242,436) .. (283,445);
+\draw[draw=#2, line width = #3pt] (283,445) .. controls (312,422) .. (302,388);
+\draw[draw=#2, line width = #3pt] (302,388) .. controls (275,381) .. (262,409);
+\draw[draw=#2, line width = #3pt] (262,409) .. controls (279,397) .. (284,394);
+\draw[draw=#2, line width = #3pt] (284,394) .. controls (291,399) .. (291,408);
+\draw[draw=#2, line width = #3pt] (291,408) .. controls (265,428) .. (234,383);
+\draw[draw=#2, line width = #3pt] (92,251) .. controls (47,245) .. (29,234);
+\draw[draw=#2, line width = #3pt] (29,234) .. controls (25,220) .. (35,221);
+\draw[draw=#2, line width = #3pt] (35,221) .. controls (52,230) .. (83,234);
+\draw[draw=#2, line width = #3pt] (66,175) .. controls (41,171) .. (27,159);
+\draw[draw=#2, line width = #3pt] (27,159) .. controls (22,145) .. (35,144);
+\draw[draw=#2, line width = #3pt] (35,144) .. controls (49,153) .. (65,159);
+\draw[draw=#2, line width = #3pt] (74,104) .. controls (47,98) .. (27,85);
+\draw[draw=#2, line width = #3pt] (27,85) .. controls (22,72) .. (36,71);
+\draw[draw=#2, line width = #3pt] (36,71) .. controls (56,80) .. (81,87);
+\draw[draw=#2, line width = #3pt] (298,250) .. controls (338,248) .. (361,237);
+\draw[draw=#2, line width = #3pt] (361,237) .. controls (367,222) .. (357,220);
+\draw[draw=#2, line width = #3pt] (357,220) .. controls (335,233) .. (307,234);
+\draw[draw=#2, line width = #3pt] (323,176) .. controls (350,170) .. (362,158);
+\draw[draw=#2, line width = #3pt] (362,158) .. controls (366,151) .. (356,145);
+\draw[draw=#2, line width = #3pt] (356,145) .. controls (343,152) .. (324,159);
+\draw[draw=#2, line width = #3pt] (316,106) .. controls (346,98) .. (364,85);
+\draw[draw=#2, line width = #3pt] (364,85) .. controls (367,72) .. (356,71);
+\draw[draw=#2, line width = #3pt] (356,71) .. controls (336,82) .. (309,88);
+
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%##peacock##%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\peacock}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width = #3pt] (210,183) circle (4.5cm);
+\draw[draw=#2, line width = #3pt] (185,185) -- (211,185);
+\draw[draw=#2, line width = #3pt] (185,185) .. controls (180,210) and (215,218) .. (211,185);
+\draw[draw=#2, line width = #3pt] (212,185) -- (240,185);
+\draw[draw=#2, line width = #3pt] (212,185) .. controls (212,214) and (239,215) .. (240,185);
+\draw[draw=#2, line width = #3pt] (204,190) circle (0.5cm);
+\draw[draw=#2, line width = #3pt] (219,190) circle (0.5cm);
+\draw[draw=#2, line width = #3pt] (199,167) .. controls (210,199) and (230,175) .. (221,147);
+\draw[draw=#2, line width = #3pt] (199,168) -- (221,147);
+\draw[draw=#2, line width = #3pt] (199,168) .. controls (200,154) and (209,143) .. (217,151);
+\draw[draw=#2, line width = #3pt] (201,132) .. controls (200,168) and (217,136) .. (220,131);
+\draw[draw=#2, line width = #3pt] (220,131) .. controls (223,127) and (217,125) .. (212,128);
+\draw[draw=#2, line width = #3pt] (212,128) .. controls (211,123) and (227,90) .. (206,110);
+\draw[draw=#2, line width = #3pt] (206,110) .. controls (204,121) .. (206,132);
+\draw[draw=#2, line width = #3pt] (206,132) -- (201,132);
+\draw[draw=#2, line width = #3pt] (170,161) .. controls (161,146) .. (155,132);
+\draw[draw=#2, line width = #3pt] (180,105) .. controls (171,128) and (146,141) .. (136,126);
+\draw[draw=#2, line width = #3pt] (136,126) .. controls (130,111) and (134,80) .. (151,59);
+\draw[draw=#2, line width = #3pt] (151,59) .. controls (160,58) and (168,68) .. (159,83);
+\draw[draw=#2, line width = #3pt] (159,83) .. controls (156,88) and (161,91) .. (166,82);
+\draw[draw=#2, line width = #3pt] (166,82) .. controls (169,78) and (177,87) .. (169,98);
+\draw[draw=#2, line width = #3pt] (169,98) .. controls (164,103) and (169,106) .. (171,103);
+\draw[draw=#2, line width = #3pt] (171,103) .. controls (174,100) and (180,102) .. (180,105);
+\draw[draw=#2, line width = #3pt] (159,61) .. controls (167,51) .. (174,43);
+\draw[draw=#2, line width = #3pt] (180,47) -- (196,45);
+\draw[draw=#2, line width = #3pt] (180,47) -- (161,36);
+\draw[draw=#2, line width = #3pt] (161,36) -- (166,24);
+\draw[draw=#2, line width = #3pt] (166,24) -- (182,34);
+\draw[draw=#2, line width = #3pt] (182,34) -- (171,13);
+\draw[draw=#2, line width = #3pt] (171,13) -- (182,8);
+\draw[draw=#2, line width = #3pt] (182,8) -- (189,32);
+\draw[draw=#2, line width = #3pt] (189,32) -- (192,15);
+\draw[draw=#2, line width = #3pt] (192,15) -- (204,16);
+\draw[draw=#2, line width = #3pt] (204,16) -- (196,45);
+\draw[draw=#2, line width = #3pt] (199,35) .. controls (212,32) .. (228,38);
+\draw[draw=#2, line width = #3pt] (244,45) -- (229,42);
+\draw[draw=#2, line width = #3pt] (229,42) -- (222,14);
+\draw[draw=#2, line width = #3pt] (222,14) -- (233,11);
+\draw[draw=#2, line width = #3pt] (233,11) -- (238,29);
+\draw[draw=#2, line width = #3pt] (238,29) -- (243,7);
+\draw[draw=#2, line width = #3pt] (243,7) -- (254,11);
+\draw[draw=#2, line width = #3pt] (254,11) -- (245,31);
+\draw[draw=#2, line width = #3pt] (245,31) -- (258,24);
+\draw[draw=#2, line width = #3pt] (258,24) -- (264,33);
+\draw[draw=#2, line width = #3pt] (264,33) -- (244,45);
+\draw[draw=#2, line width = #3pt] (244,45) .. controls (251,51) .. (256,62);
+\draw[draw=#2, line width = #3pt] (236,106) .. controls (264,155) and (305,118) .. (267,65);
+\draw[draw=#2, line width = #3pt] (236,107) .. controls (234,103) and (239,100) .. (244,104);
+\draw[draw=#2, line width = #3pt] (244,104) .. controls (245,106) and (250,104) .. (240,93);
+\draw[draw=#2, line width = #3pt] (240,93) .. controls (237,85) and (245,77) .. (254,86);
+\draw[draw=#2, line width = #3pt] (254,86) .. controls (255,92) and (259,88) .. (254,78);
+\draw[draw=#2, line width = #3pt] (254,78) .. controls (249,67) and (259,51) .. (267,65);
+\draw[draw=#2, line width = #3pt] (263,129) .. controls (259,142) .. (249,162);
+\draw[draw=#2, line width = #3pt] (171,47) .. controls (107,64) and (37,90) .. (35,115);
+\draw[draw=#2, line width = #3pt] (35,115) .. controls (49,132) and (96,123) .. (134,113);
+\draw[draw=#2, line width = #3pt] (103,121) .. controls (71,144) and (54,166) .. (55,185);
+\draw[draw=#2, line width = #3pt] (55,185) .. controls (74,202) and (109,178) .. (161,146);
+\draw[draw=#2, line width = #3pt] (107,179) .. controls (84,204) and (71,229) .. (77,244);
+\draw[draw=#2, line width = #3pt] (77,244) .. controls (99,255) and (134,226) .. (167,197);
+\draw[draw=#2, line width = #3pt] (144,216) .. controls (124,245) and (115,269) .. (121,286);
+\draw[draw=#2, line width = #3pt] (121,286) .. controls (140,294) and (163,277) .. (183,249);
+\draw[draw=#2, line width = #3pt] (182,219) .. controls (182,276) and (193,316) .. (208,321);
+\draw[draw=#2, line width = #3pt] (208,321) .. controls (225,317) and (240,274) .. (235,220);
+\draw[draw=#2, line width = #3pt] (236,241) .. controls (260,270) and (286,292) .. (304,291);
+\draw[draw=#2, line width = #3pt] (304,291) .. controls (314,274) and (304,245) .. (282,213);
+\draw[draw=#2, line width = #3pt] (254,190) .. controls (293,222) and (333,253) .. (350,248);
+\draw[draw=#2, line width = #3pt] (350,248) .. controls (357,233) and (333,181) .. (259,140);
+\draw[draw=#2, line width = #3pt] (297,165) .. controls (334,188) and (357,196) .. (372,190);
+\draw[draw=#2, line width = #3pt] (372,190) .. controls (374,168) and (355,144) .. (322,118);
+\draw[draw=#2, line width = #3pt] (282,110) .. controls (321,117) and (377,130) .. (394,118);
+\draw[draw=#2, line width = #3pt] (394,118) .. controls (389,88) and (319,51) .. (242,45);
+
+\end{tikzpicture}}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####dog###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\dog}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width = #3pt] (114,399) .. controls (86,398) and (65,365) .. (42,358);
+\draw[draw=#2, line width = #3pt] (42,358) .. controls (20,351) and (0,354) .. (19,312);
+\draw[draw=#2, line width = #3pt] (19,312) .. controls (38,317) .. (48,330);
+\draw[draw=#2, line width = #3pt] (20,312) .. controls (35,291) and (62,317) .. (88,304);
+\draw[draw=#2, line width = #3pt] (101,344) .. controls (99,324) and (65,295) .. (112,294);
+\draw[draw=#2, line width = #3pt] (130,343) .. controls (133,321) and (162,295) .. (112,294);
+\draw[draw=#2, line width = #3pt] (107,294) .. controls (150,229) and (126,176) .. (128,156);
+\draw[draw=#2, line width = #3pt] (128,156) .. controls (145,132) and (175,105) .. (183,69);
+\draw[draw=#2, line width = #3pt] (183,69) .. controls (184,57) and (178,44) .. (165,35);
+\draw[draw=#2, line width = #3pt] (165,35) .. controls (163,33) and (169,25) .. (175,36);
+\draw[draw=#2, line width = #3pt] (169,31) .. controls (169,31) and (175,22) .. (179,34);
+\draw[draw=#2, line width = #3pt] (175,29) .. controls (175,29) and (182,22) .. (198,33);
+\draw[draw=#2, line width = #3pt] (198,33) .. controls (200,58) .. (218,104);
+\draw[draw=#2, line width = #3pt] (149,130) .. controls (170,81) .. (170,53);
+\draw[draw=#2, line width = #3pt] (170,53) .. controls (151,45) and (132,27) .. (165,34);
+\draw[draw=#2, line width = #3pt] (149,39) -- (159,41);
+\draw[draw=#2, line width = #3pt] (153,33) -- (159,38);
+\draw[draw=#2, line width = #3pt] (254,166) .. controls (200,155) and (205,81) .. (257,53);
+\draw[draw=#2, line width = #3pt] (282,67) .. controls (250,49) .. (222,45);
+\draw[draw=#2, line width = #3pt] (222,45) .. controls (208,44) and (205,32) .. (222,36);
+\draw[draw=#2, line width = #3pt] (210,40) -- (219,40);
+\draw[draw=#2, line width = #3pt] (215,35) .. controls (215,36) and (219,25) .. (273,35);
+\draw[draw=#2, line width = #3pt] (273,35) .. controls (323,52) .. (350,98);
+\draw[draw=#2, line width = #3pt] (350,98) .. controls (410,145) and (375,233) .. (352,237);
+\draw[draw=#2, line width = #3pt] (352,237) .. controls (337,236) and (330,225) .. (353,222);
+\draw[draw=#2, line width = #3pt] (353,222) .. controls (370,208) and (390,149) .. (343,113);
+\draw[draw=#2, line width = #3pt] (343,113) .. controls (350,159) and (325,188) .. (288,224);
+\draw[draw=#2, line width = #3pt] (288,224) .. controls (254,240) and (219,268) .. (210,290);
+\draw[draw=#2, line width = #3pt] (210,290) .. controls (197,305) .. (185,318);
+\draw[draw=#2, line width = #3pt] (185,318) .. controls (155,340) and (138,398) .. (114,399);
+\draw[draw=#2, line width = #3pt] (21,352) .. controls (24,342) and (22,333) .. (14,326);
+\draw[draw=#2, line width = #3pt] (91,367) ellipse (0.7cm and 1cm);
+\draw[fill = black] (91,364) ellipse (0.6cm and 0.6cm);
+\draw[fill = black] (120,371) ellipse (0.4cm and 0.6cm);
+\draw[fill = black ] (145,341) ellipse (0.5cm and 0.8cm);
+\draw[fill = black] (165,299) ellipse (0.5cm and 0.8cm);
+\draw[fill = black] (153,266) ellipse (0.5cm and 0.8cm);
+\draw[fill = black] (186,259) ellipse (0.5cm and 0.9cm);
+\draw[fill = black] (164,227) ellipse (0.4cm and 0.7cm);
+\draw[fill = black] (201,233) ellipse (0.2cm and 0.4cm );
+\draw[fill = black] (155,184) ellipse (0.5cm and 0.8cm);
+\draw[fill = black] (195,183) ellipse (0.5cm and 0.8cm);
+\draw[fill = black] (190,125) ellipse (0.5cm and 0.8cm);
+\draw[fill = black] (227,183) ellipse (0.2cm and 0.4cm);
+\draw[fill = black] (237,215) ellipse (0.5cm and 0.8cm);
+\draw[fill = black] (274,193) ellipse (0.5cm and 0.8cm);
+\draw[fill = black] (307,180) ellipse (0.3cm and 0.5cm);
+\draw[fill = black] (288,140) ellipse (0.5cm and 0.8cm);
+\draw[fill = black] (253,118) ellipse (0.5cm and 0.8cm);
+\draw[fill = black] (293,108) ellipse (0.3cm and 0.5cm);
+
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####ball###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\ball}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt](201,216) circle (16cm) ;
+\draw[draw=#2, line width=#3pt] (157,366) -- (134,311) -- (74,308);
+\draw[draw=#2, line width=#3pt] (134,311) -- (167,265) -- (144,210) -- (83,206) -- (47,253) -- (74,308);
+\draw[draw=#2, line width=#3pt] (83,206) -- (60,148);
+\draw[draw=#2, line width=#3pt] (218,370) -- (251,324) -- (228,270) -- (167,265);
+\draw[draw=#2, line width=#3pt] (228,270) -- (261,222) -- (236,168) -- (178,164) -- (144,210);
+\draw[draw=#2, line width=#3pt] (251,324) -- (313,328) -- (347,277) -- (321,225) -- (261,222);
+\draw[draw=#2, line width=#3pt] (321,225) -- (354,180) -- (330,123) -- (273,119) -- (236,168);
+\draw[draw=#2, line width=#3pt] (273,119) -- (249,66) -- (186,60) -- (155,107) -- (178,164);
+\draw[draw=#2, line width=#3pt] (155,107) -- (93,102) -- (60,148);
+\draw[draw=#2, line width=#3pt] (157,366) -- (218,370);
+
+\end{tikzpicture}}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Birdie###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Birdie}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt] (52,239) -- (19,229) -- (44,222) -- (25,213) -- (42,210);
+\draw[draw=#2, line width=#3pt] (359,138) -- (340,137) -- (361,160) -- (345,157) -- (366,182);
+\draw[draw=#2, line width=#3pt] (42,210) .. controls (65,70) and (242,10) .. (359,138);
+\draw[draw=#2, line width=#3pt] (42,210) .. controls (75,323) and (136,301) .. (177,276);
+\draw[draw=#2, line width=#3pt] (177,276) -- (221,231);
+\draw[draw=#2, line width=#3pt] (264,197) .. controls (294,173) and (337,174) .. (366,182);
+\draw[draw=#2, line width=#3pt](89,221) ellipse (1.4cm and 2.5cm) ;
+\draw[draw=#2, line width=#3pt] (80,239) -- (70,251);
+\draw[draw=#2, line width=#3pt] (86,245) -- (82,258);
+\draw[draw=#2, line width=#3pt] (92,245) -- (98,257);
+\draw[draw=#2, line width=#3pt] (100,238) -- (108,251);
+\draw[draw=#2, line width=#3pt] (113,97) -- (113,64) -- (73,62) -- (106,57) -- (84,49) -- (117,55) -- (142,54) -- (129,62) -- (129,88);
+\draw[draw=#2, line width=#3pt] (185,70) -- (185,54) -- (148,52) -- (175,47) -- (157,38) -- (188,46) -- (217,45) -- (200,51) -- (200,68);
+\draw[draw=#2, line width=#3pt] (75,218) .. controls (85,230) and (94,230) .. (103,217);
+\draw[draw=#2, line width=#3pt] (174,278) .. controls (190,301) and (205,315) .. (211,315);
+\draw[draw=#2, line width=#3pt] (211,315) .. controls (213,313) and (215,312) .. (214,307);
+\draw[draw=#2, line width=#3pt] (214,307) .. controls (220,312) and (226,313) .. (225,307);
+\draw[draw=#2, line width=#3pt] (225,307) .. controls (231,307) and (231,297) .. (223,278);
+\draw[draw=#2, line width=#3pt] (223,278) .. controls (230,271) and (228,263) .. (216,255);
+\draw[draw=#2, line width=#3pt] (216,255) .. controls (218,251) and (216,245) .. (214,239);
+\draw[draw=#2, line width=#3pt] (195,206) .. controls (221,234) and (262,265) .. (279,265);
+\draw[draw=#2, line width=#3pt] (279,265) .. controls (282,257) .. (290,258);
+\draw[draw=#2, line width=#3pt] (290,258) .. controls (294,249) and (291,237) .. (282,229);
+\draw[draw=#2, line width=#3pt] (282,229) .. controls (283,218) and (274,208) .. (265,208);
+\draw[draw=#2, line width=#3pt] (265,208) .. controls (268,202) .. (264,197);
+\draw[draw=#2, line width=#3pt] (264,197) .. controls (258,190) and (246,179) .. (228,166);
+\draw[draw=#2, line width=#3pt] (228,166) .. controls (223,163) and (213,163) .. (208,165);
+\draw[draw=#2, line width=#3pt] (208,165) .. controls (203,175) and (197,172) .. (194,180);
+\draw[draw=#2, line width=#3pt] (194,180) .. controls (191,186) and (191,196) .. (195,206);
+
+
+\end{tikzpicture}}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Sun###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Sun}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt](200,201) circle (10cm) ;
+\draw[draw=#2, line width=#3pt] (159,292) .. controls (155,322) and (189,360) .. (221,365);
+\draw[draw=#2, line width=#3pt] (221,365) .. controls (203,332) and (221,313) .. (227,297);
+\draw[draw=#2, line width=#3pt] (238,293) .. controls (275,323) and (308,322) .. (332,301);
+\draw[draw=#2, line width=#3pt] (332,301) .. controls (311,295) and (286,268) .. (288,248);
+\draw[draw=#2, line width=#3pt] (293,238) .. controls (333,235) and (353,214) .. (362,177);
+\draw[draw=#2, line width=#3pt] (362,177) .. controls (346,184) and (317,189) .. (295,170);
+\draw[draw=#2, line width=#3pt] (293,166) .. controls (311,144) and (324,101) .. (300,71);
+\draw[draw=#2, line width=#3pt] (300,71) .. controls (293,88) and (273,115) .. (250,115);
+\draw[draw=#2, line width=#3pt] (293,166) .. controls (311,144) and (324,101) .. (300,71);
+\draw[draw=#2, line width=#3pt] (238,109) .. controls (241,81) and (221,55) .. (178,40);
+\draw[draw=#2, line width=#3pt] (178,40) .. controls (190,66) and (185,86) .. (170,106);
+\draw[draw=#2, line width=#3pt] (163,108) .. controls (139,90) and (101,80) .. (72,103);
+\draw[draw=#2, line width=#3pt] (72,103) .. controls (100,116) and (106,134) .. (113,153);
+\draw[draw=#2, line width=#3pt] (109,159) .. controls (69,168) and (50,167) .. (40,221);
+\draw[draw=#2, line width=#3pt] (40,221) .. controls (66,204) and (89,220) .. (103,228);
+\draw[draw=#2, line width=#3pt] (108,240) .. controls (90,260) and (82,296) .. (101,331);
+\draw[draw=#2, line width=#3pt] (101,331) .. controls (108,306) and (137,296) .. (154,290);
+
+
+\end{tikzpicture}}
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Flower###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\Flower}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt] (98,9) -- (25,348) -- (373,347) -- (301,9) -- (98,9);
+\draw[draw=#2, line width=#3pt] (55,210) -- (343,210);
+\draw[draw=#2, line width=#3pt] (69,147) -- (329,147);
+\draw[draw=#2, line width=#3pt] (201,347) -- (201,489);
+\draw[draw=#2, line width=#3pt] (201,394) .. controls (157,361) and (95,407) .. (71,470);
+\draw[draw=#2, line width=#3pt] (71,470) .. controls (125,477) and (170,450) .. (201,394);
+\draw[draw=#2, line width=#3pt] (201,394) .. controls (247,361) and (307,407) .. (331,470);
+\draw[draw=#2, line width=#3pt] (331,470) .. controls (247,477) and (236,439) .. (201,394);
+\draw[draw=#2, line width=#3pt](200,617) circle (4.5cm) ;
+\draw[draw=#2, line width=#3pt] (201,489) .. controls (221,489) and (237,501) .. (238,526);
+\draw[draw=#2, line width=#3pt] (238,526) .. controls (276,512) and (306,546) .. (291,580);
+\draw[draw=#2, line width=#3pt] (291,580) .. controls (330,599) and (337,630) .. (291,656);
+\draw[draw=#2, line width=#3pt] (291,656) .. controls (312,699) and (268,728) .. (237,709);
+\draw[draw=#2, line width=#3pt] (237,709) .. controls (223,749) and (180,755) .. (162,708);
+\draw[draw=#2, line width=#3pt] (162,708) .. controls (122,729) and (95,694) .. (108,657);
+\draw[draw=#2, line width=#3pt] (108,657) .. controls (70,642) and (70,593) .. (108,579);
+\draw[draw=#2, line width=#3pt] (108,579) .. controls (91,533) and (127,513) .. (162,525);
+\draw[draw=#2, line width=#3pt] (162,525) .. controls (165,501) and (181,489) .. (201,489);
+
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####HOUSE###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\HOUSE}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt] (76,23) -- (76,274) -- (201,490) -- (326,274) -- (326,23) -- (76,23);
+\draw[draw=#2, line width=#3pt] (76,274) -- (326,274);
+\draw[draw=#2, line width=#3pt] (145,23) -- (145,155) -- (253,155) -- (253,23);
+
+
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Cherry###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\Cherry}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt] (152,268) .. controls (156, 266) and (162, 269) ..(167,264) .. controls (194, 268) and (219, 266) ..(235,262).. controls (245, 268) and (246, 267) ..(250,266).. controls (400, 330) and (415, 40) ..(316,46).. controls (305, 33) and (278, 27) ..(262,40).. controls (258, 34) and (236, 35) ..(228,41)
+.. controls (216, 25) and (188, 25) ..(177,40).. controls (169,35) and (150, 32) ..(138,40).. controls (126, 34) and (97, 40) ..(88,48).. controls (0, 30) and (0, 327) ..(152,268);
+
+\draw[draw=#2, line width=#3pt,] (143,270) .. controls (153,285) and (196, 287) ..(205,279) ;
+\draw[draw=#2, line width=#3pt,fill=black] (199,266) .. controls (234,304) and (205, 375) ..(170,346) .. controls (166,342) and (154, 311) ..(184,330) .. controls (199,330) and (190, 280) ..(148,300)
+ .. controls (115,390) and (280, 415) ..(219,265);
+ \draw[draw=#2, line width=#3pt] (220,270).. controls (234,288) and (255, 287) ..(268,272) ;
+
+\draw[draw=#2, line width=#3pt] (49,169) parabola bend (68,131) (85,169);
+\draw[draw=#2, line width=#3pt] (106,169) parabola bend (128,133) (145,169);
+\draw[draw=#2, line width=#3pt] (165,167) parabola bend (187,130) (207,169);
+\draw[draw=#2, line width=#3pt] (229,166) parabola bend (244,130) (264,165);
+\draw[draw=#2, line width=#3pt] (283,166) parabola bend (303,130) (320,168);
+\draw[draw=#2, line width=#3pt] (344,163) parabola bend (360,131) (378,150);
+
+\draw[draw=#2, line width=#3pt] (29,169) parabola bend (38,174) (49,169);
+\draw[draw=#2, line width=#3pt] (106,169) parabola bend (98,175) (85,169);
+\draw[draw=#2, line width=#3pt] (165,167) parabola bend (152,173) (145,169);
+\draw[draw=#2, line width=#3pt] (229,166) parabola bend (216,172) (207,165);
+\draw[draw=#2, line width=#3pt] (283,166) parabola bend (272,175) (264,165);
+\draw[draw=#2, line width=#3pt] (344,163) parabola bend (331,175) (320,168);
+
+
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####one###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\one}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2,line width=#3pt] (38,56) -- (38,17) -- (380,17) -- (380,56)..controls(271,60)..(260,112)--(260,575)-- (222,575) ..controls(149,521).. (38,511) -- (38,469) -- (163,469)--(163,112)..controls(153,60)..(38,56);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####two###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\two}[3]{
+\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (104,379) .. controls (174,240) and (-72,242) .. (68,410);
+\draw[draw=#2, line width=#3pt] (68,410) .. controls (204,504) and (364,437) .. (368,315);
+\draw[draw=#2, line width=#3pt] (368,315) .. controls (387,187) and (160,148) .. (86,82);
+\draw[draw=#2, line width=#3pt] (86,82) -- (389,84) -- (389,14) -- (19,13) -- (18,68);
+\draw[draw=#2, line width=#3pt] (18,68) .. controls (111,185) and (261,188) .. (278,296);
+\draw[draw=#2, line width=#3pt] (278,296) .. controls (293,427) and (136,446) .. (104,379);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####three###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\three}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt] (118,487) .. controls (293, 623) and (375, 291) .. (150, 316)--(154,274);
+
+\draw[draw=#2, line width=#3pt] (154,275) .. controls (350, 323) and (375, -50) .. (101, 70) .. controls (145, 184) and (31, 184) .. (29, 118) .. controls (130, -180) and (620, 193) .. (254, 302) .. controls (465, 358) and (334, 678) .. (83, 502)
+ .. controls (65, 483) and (55, 464) .. (49, 442) .. controls (63, 365) and (128, 397) .. (131, 435)
+ .. controls (128, 456) and (128, 456) .. (118, 487);
+
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####four###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\four}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw=#2, line width=#3pt] (248,513) -- (30,245);
+
+\draw[draw=#2, line width=#3pt] (30,245) -- (32,175);
+
+\draw[draw=#2, line width=#3pt] (32,175) -- (247,175) ;
+
+\draw[draw=#2, line width=#3pt] (247,175) -- (243,25);
+
+\draw[draw=#2, line width=#3pt] (243,25) -- (311,25);
+
+\draw[draw=#2, line width=#3pt] (311,25) -- (311,175);
+
+\draw[draw=#2, line width=#3pt] (311,175) -- (378,176);
+
+\draw[draw=#2, line width=#3pt] (378,176) -- (377,221);
+
+\draw[draw=#2, line width=#3pt] (377,221) -- (308,221);
+
+\draw[draw=#2, line width=#3pt] (308,221)--(307,512);
+
+\draw[draw=#2, line width=#3pt] (307,512) -- (248,513);
+
+\draw[draw=#2, line width=#3pt] (66,220) -- (245,220);
+
+\draw[draw=#2, line width=#3pt] (245,220) -- (245,433);
+
+\draw[draw=#2, line width=#3pt] (245,433) -- (66,220);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####five###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\five}[3]{
+\begin{tikzpicture}[scale = #1]
+\draw[draw=#2, line width=#3pt]
+ (-3.2,7.25) -- (4.65,7.25) -- (4.65,5.3) --
+ (-2.2,5.3) -- (-2.7,1.25) .. controls (-0.5,2.35) and (0.5,2.35) ..
+ (2.45,1.7) .. controls (3.9,1.1) and (4.65,0) ..
+ (4.95,-0.9) .. controls (5.2,-2) and (5.2,-3) ..
+ (4.9,-4.0) .. controls (4.55,-5) and (3.65,-6) ..
+ (2.9,-6.5) .. controls (1.55,-7.35) and (0.05,-7.55) ..
+ (-1.5,-7.4) .. controls (-2.5,-7.2) and (-3.6,-6.85) ..
+ (-4.5,-6.0) .. controls (-5.5,-5) and (-5.1,-3.55) ..
+ (-4.35,-3.3) .. controls (-2.8,-2.9) and (-2.4,-4.05) ..
+ (-2.55,-4.75) -- (-2.8,-5.8) .. controls (-2.45,-6.1) and
+ (-2.05,-6.25) .. (-1.5,-6.4) .. controls (-0.9,-6.45) and
+ (1,-6.85) .. (2.05,-5) .. controls (2.75,-3.8) and
+ (2.75,-2.35) .. (2.5,-1.35) .. controls (2.15,0.2) and
+ (0.75,0.95) .. (-0.5,0.85) .. controls (-1.5,0.75) and
+ (-2.5,0.55) .. (-3.25,-0.5) -- (-4.1,-0.2) -- (-3.2,7.25);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####six###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\six}[3]{\begin{tikzpicture}[scale = #1]
+\draw[draw=#2, line width=#3pt] (15.4,28.4) node (v1) {} .. controls (-5.4,24.9) and (-0.9,-1.5) .. (10.7,1.2);
+\draw[draw=#2, line width=#3pt] (10.7,1.2) .. controls (28,6.1) and (16.6,25.4) .. (5.1,15.7);
+\draw[draw=#2, line width=#3pt] (5.1,15.8) .. controls (5.1,20.3) and (10.1,25.8) .. (15.7,26.6) node (v2) {};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(5.1,14) (5.6,6.8) (10,2.6) (14.7,6.8) (13.5,14.6) (9.4,16.3) (5.2,14)};
+\node (v3) at (15.4,28.55) {};
+\node (v4) at (15.7,26.5) {};
+\draw[draw=#2, line width=#3pt] (v3) edge (v4);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####seven###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\seven}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+ \draw[draw=#2,line width=#3pt] (70,25)--(118,25)--(383,534)--(383,559)--(34,560)--(35,414)--(54,414)..controls(76,505)..(320,498)--cycle;
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####eight###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\eight}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt] (134,271).. controls(5,323) and(20,420)..(76,474)..
+controls(156,550) and(278,525)..(330,471)..
+controls(385,399) and(380,331) ..(260,279)..
+controls(420,230) and(395,107) ..(342,65)..
+controls(274,-3) and(117,-6) ..(46,65)..
+controls(-5,120) and(-5,239) ..(134,271);
+
+\draw[draw=#2, line width=#3pt](243,290)..controls(306,328) and(315,444) ..(243,480)..
+controls(201,500) and (132,496) ..(109,430)..
+controls(90,376) and (133,330) ..(243,290);
+
+\draw[draw=#2, line width=#3pt](151,262)..controls(191,247) and (233,229) ..(274,204)..
+controls(299,190) and(330,147)..(296,87)..
+controls(250,10) and(143,40)..(114,74)..
+controls(55,147) and(88,218)..(151,262);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####nine###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\nine}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+
+\draw[draw=#2, line width=#3pt, line width=#3pt ] (296,238) .. controls (280,150) and (215,40) .. (82,37) -- (89,5) .. controls (357,38) and (390,266) .. (373,365) .. controls (335,555) and (60,580) .. (20,353) .. controls (17,216) and (170,135) .. (296,238); %exterior
+
+\draw[draw=#2, line width=#3pt, line width=#3pt ] (298,273) .. controls (307,410) and (270,490) .. (190,485) .. controls (116,477) and (80,380) .. (101,323) .. controls (120,240) and (210,200) .. (298,273); %interior
+
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####ten###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\ten}[3]{ \begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+% ten
+\draw[draw=#2, line width=#3pt] (13,340) -- (13,316) -- (65, 316) -- (65, 99);
+\draw[draw=#2, line width=#3pt] (13 , 340) .. controls (57, 345) .. (91,378);
+\draw[draw=#2, line width=#3pt] (91,378) -- (108, 378) -- (108, 99);
+\draw[draw=#2, line width=#3pt] (65,99) .. controls (60 , 74 ) .. (13,68);
+\draw[draw=#2, line width=#3pt](108,99) .. controls (115, 77) .. (157, 68);
+\draw[draw=#2, line width=#3pt] ( 13, 68) -- ( 13,45) -- (157, 45) -- ( 157,68);
+\draw[draw=#2, line width=#3pt] (282.5,208) ellipse (6.5cm and 14.8cm );
+\draw[draw=#2, line width=#3pt] (282.5 , 208) ellipse ( 11 cm and 17 cm );
+
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####bus###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\bus}[3]{
+\begin{tikzpicture}[scale = #1]
+\draw[fill=black] (6.2,2) node (v1) {} circle (0.2);
+\draw[draw=#2, line width=#3pt] (v1) node (v2) {} circle (0.6);
+\draw[draw=#2, line width=#3pt] (v2) circle (1.2);
+\draw[draw=#2, line width=#3pt] (15.2,2) node (v3) {} circle (0.5);
+\draw[draw=#2, line width=#3pt] (v3) node (v4) {} circle (1.2);
+\draw[fill=black] (v4) circle (0.2);
+\node (v6) at (14.1,1.9) {};
+\node (v5) at (7.2596,2.0173) {};
+\draw[draw=#2, line width=#3pt] (v5) edge (v6);
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(16.4,2.1) (17.7,2.1) (18.1,3.3) (17.7,3.5)};
+\node (v9) at (17.1,7.5) {};
+\node (v11) at (5.483,7.4926) {};
+\node (v13) at (3.8,6.1) {};
+\node (v14) at (3.6,5.6) {};
+\node (v15) at (3.5,4.1) {};
+\draw[draw=#2, line width=#3pt] (3.6,3.7) ellipse (0.4 and 0.4);
+\node (v7) at (15.9001,2.8581) {};
+\node (v8) at (17.643,2.9215) {};
+\draw[draw=#2, line width=#3pt] (v7) edge (v8);
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(17.5,2.9) (17.7,3.2) (17.7,4.1)};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(17.7,4.1) (17.7,6.6) (v9)};
+\node (v10) at (17.2443,7.4811) {};
+\draw[draw=#2, line width=#3pt] (v10) edge (v11);
+\node (v12) at (5.6,7.5) {};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(v12) (v13) (v14) (v15)};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(3.529,3.3222) (3.5,2.9) (3.9,2.7) (5.2424,2.7115)};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(3.5,3.2) (3.2,3.1) (3.1,2.9) (3.1,2.4) (3.5,2.1) (5.0403,2.1115)};
+\node (v17) at (16.6,3.9) {};
+\node (v19) at (16.5,4.2) {};
+\node (v18) at (4.9,4.4) {};
+\node (v16) at (4.8,4.1) {};
+\draw[draw=#2, line width=#3pt] (v16) edge (v17);
+\draw[draw=#2, line width=#3pt] (v18) edge (v19);
+\node (v23) at (16.4,6.8) {};
+\node (v20) at (14.4,6.8) {};
+\node (v21) at (14.4,4.8) {};
+\node (v22) at (16.4,4.8) {};
+\draw[draw=#2, line width=#3pt] (v20) edge (v21);
+\draw[draw=#2, line width=#3pt] (v22) edge (v23);
+\draw[draw=#2, line width=#3pt] (v20) edge (v23);
+\draw[draw=#2, line width=#3pt] (v21) edge (v22);
+\node (v27) at (13.2,6.8) {};
+\node (v24) at (11.2,6.8) {};
+\node (v25) at (11.2,4.7) {};
+\node (v26) at (13.2,4.7) {};
+\draw[draw=#2, line width=#3pt] (v24) edge (v25);
+\draw[draw=#2, line width=#3pt] (v26) edge (v25);
+\draw[draw=#2, line width=#3pt] (v27) edge (v26);
+\draw[draw=#2, line width=#3pt] (v24) edge (v27);
+\node (v28) at (8.2,6.8) {};
+\node (v31) at (10.1,6.8) {};
+\node (v30) at (10.1,4.8) {};
+\node (v29) at (8.1,4.8) {};
+\draw[draw=#2, line width=#3pt] (v28) edge (v29);
+\draw[draw=#2, line width=#3pt] (v30) edge (v29);
+\draw[draw=#2, line width=#3pt] (v31) edge (v30);
+\draw[draw=#2, line width=#3pt] (v31) edge (v28);
+\node (v33) at (5.2,6.7) {};
+\node (v34) at (4.0633,5.7173) {};
+\node (v35) at (4,4.8) {};
+\node (v36) at (6.9,4.8) {};
+\node (v32) at (6.9,6.7) {};
+\draw[draw=#2, line width=#3pt] (v32) edge (v33);
+\draw[draw=#2, line width=#3pt] (v34) edge (v33);
+\draw[draw=#2, line width=#3pt] (v35) edge (v34);
+\draw[draw=#2, line width=#3pt] (v36) edge (v35);
+\draw[draw=#2, line width=#3pt] (v32) edge (v36);
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(3.8404,2.3112) (3.9951,2.2974)};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(4.1429,2.3318) (4.521,2.3181) (4.6551,2.3834)};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(6.463,1.1047) (6.4974,1.2216)};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(6.6486,1.2388) (6.6933,1.2972)};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(6.8136,1.4141) (6.9648,1.5378) (7.0061,1.854)};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(15.6987,1.2044) (15.7296,1.3316)};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(15.8534,1.3797) (15.8637,1.5035)};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(15.9632,1.607) (16.1056,1.7668) (16.097,2.1079)};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(17.0854,2.3347) (17.1952,2.3013) (17.2478,2.3634)};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(17.4102,2.3299) (17.6919,2.3538) (17.8114,2.5783)};
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####daisy###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\daisy}[3]{\begin{tikzpicture}[scale = #1]
+\draw[fill=black] (11.3,12.4) ellipse (0.4 and 0.4);
+\draw[fill=black] (12.5,11.3) ellipse (0.3 and 0.3);
+\draw[fill=black] (11.1,11) ellipse (0.4 and 0.4);
+\draw[fill=black] (11.8,9.6) ellipse (0.3 and 0.3);
+\draw[fill=black] (10.2,9.6) ellipse (0.3 and 0.4);
+\draw[fill=black] (9.1,10.5) ellipse (0.4 and 0.4);
+\draw[fill=black] (9.8,11.7) ellipse (0.3 and 0.5);
+\draw[draw=#2, line width=#3pt] (10.7,10.7) ellipse (2.8 and 2.8);
+\node (v2) at (10.7,13.4) {};
+\node (v1) at (10.7,14.9) {};
+\draw[draw=#2, line width=#3pt] (v1) edge (v2);
+\node (v4) at (11.3,13.3) {};
+\node (v5) at (12.2,12.9) {};
+\node (v8) at (12.7,12.5) {};
+\node (v9) at (13.3,11.5) {};
+\node (v12) at (13.4,10.6) {};
+\node (v13) at (13.3,10) {};
+\node (v16) at (12.9,9.1) {};
+\node (v18) at (12.4,8.6) {};
+\node (v20) at (11.3,8.1) {};
+\node (v22) at (10.6,8) {};
+\node (v24) at (9.9,8.1) {};
+\node (v26) at (9,8.6) {};
+\node (v28) at (8.6,9.1) {};
+\node (v29) at (8.2,9.8) {};
+\node (v32) at (8,10.4) {};
+\node (v33) at (8,11.1) {};
+\node (v35) at (8.5,12.2) {};
+\node (v38) at (9,12.8) {};
+\node (v40) at (10.1,13.4) {};
+\node (v39) at (9.7,14.7) {};
+\node (v37) at (8,13.7) {};
+\node (v36) at (7.6,12.8) {};
+\node (v34) at (6.9,11.4) {};
+\node (v31) at (6.8,10.3) {};
+\node (v30) at (7.1,9.4) {};
+\node (v27) at (7.4,8.1) {};
+\node (v25) at (8.1,7.5) {};
+\node (v23) at (9.6,6.5) {};
+\node (v21) at (10.5,6.6) {};
+\node (v19) at (11.5,6.6) {};
+\node (v17) at (13.2,7.7) {};
+\node (v15) at (13.8,8.4) {};
+\node (v14) at (14.6,9.4) {};
+\node (v11) at (14.8,10.5) {};
+\node (v10) at (14.6,11.9) {};
+\node (v7) at (13.9,13.5) {};
+\node (v6) at (13.3,14.2) {};
+\node (v3) at (11.5,14.8) {};
+\draw[draw=#2, line width=#3pt] (v3) edge (v4);
+\draw[draw=#2, line width=#3pt] (v5) edge (v6);
+\draw[draw=#2, line width=#3pt] (v7) edge (v8);
+\draw[draw=#2, line width=#3pt] (v9) edge (v10);
+\draw[draw=#2, line width=#3pt] (v11) edge (v12);
+\draw[draw=#2, line width=#3pt] (v13) edge (v14);
+\draw[draw=#2, line width=#3pt] (v15) edge (v16);
+\draw[draw=#2, line width=#3pt] (v17) edge (v18);
+\draw[draw=#2, line width=#3pt] (v19) edge (v20);
+\draw[draw=#2, line width=#3pt] (v21) edge (v22);
+\draw[draw=#2, line width=#3pt] (v23) edge (v24);
+\draw[draw=#2, line width=#3pt] (v25) edge (v26);
+\draw[draw=#2, line width=#3pt] (v27) edge (v28);
+\draw[draw=#2, line width=#3pt] (v29) edge (v30);
+\draw[draw=#2, line width=#3pt] (v31) edge (v32);
+\draw[draw=#2, line width=#3pt] (v33) edge (v34);
+\draw[draw=#2, line width=#3pt] (v35) edge (v36);
+\draw[draw=#2, line width=#3pt] (v37) edge (v38);
+\draw[draw=#2, line width=#3pt] (v39) edge (v40);
+\draw[draw=#2, line width=#3pt] (9.6,8.1) .. controls (2.3,-0.4) and (18.7,-1.3) .. (11.8,8.2);
+\draw[draw=#2, line width=#3pt] (8.3,11.9) .. controls (-0.2,17.2) and (-0.5,3.8) .. (8.3,9.4);
+\draw[draw=#2, line width=#3pt] (9.5,13.1) .. controls (3.5,22.2) and (17.6,21.7) .. (11.9,13.2);
+\draw[draw=#2, line width=#3pt] (13.1,12) .. controls (21.6,17.3) and (22.3,4.8) .. (13.1,9.4);
+\draw[draw=#2, line width=#3pt] (13.5,4.2) .. controls (17.1,2.4) and (19,4.8) .. (16.4,8.4);
+\draw[draw=#2, line width=#3pt] (7.8,4.1) .. controls (4.4,2.5) and (2.3,5.1) .. (4.7,8.1);
+\draw[draw=#2, line width=#3pt] (4.6,13.1) .. controls (2.8,16.5) and (4.3,18.5) .. (8,17.2);
+\draw[draw=#2, line width=#3pt] (13.1,17.3) .. controls (17,18.9) and (18.6,16.5) .. (16.4,13.2);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####gloves###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\gloves}[3]{\begin{tikzpicture}[scale = #1]
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(6.2,8.2) (11.8,8.1) (14.9,8.5) (18.6,8.1)};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(18.6,8.2) (18.7,5) (17,3.8) (8.7,3.9) (5.7,4.5) (6.3,8.2)};
+\draw[draw=#2, line width=#3pt] (18.1,8.2) .. controls (24.4,35) and (3.8,35.7) .. (7,17.6) node (v1) {};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(v1) (3.7,20.3) (2.1,19.5) (2.2,16.9) (5.9,12.7) (6.3,8.1)};
+\node (v9) at (6.5,20.1) {};
+\node (v8) at (19.4,20.1) {};
+\node (v7) at (19.3,20.7) {};
+\node (v4) at (19.2,21.3) {};
+\node (v3) at (19.1,22) {};
+\node (v6) at (6.5,20.6) {};
+\node (v5) at (6.5,21.2) {};
+\node (v2) at (6.5,21.8) {};
+\draw[draw=#2, line width=#3pt] (v2) edge (v3);
+\draw[draw=#2, line width=#3pt] (v4) edge (v5);
+\draw[draw=#2, line width=#3pt] (v6) edge (v7);
+\draw[draw=#2, line width=#3pt] (v8) edge (v9);
+\draw[draw=#2, line width=#3pt] (8.6,16) node (v10) {} -- (8.6,11.5) -- (10.4,11.4) -- (10.4,16.1) -- (v10);
+\draw[draw=#2, line width=#3pt] (11.6,16) node (v11) {} -- (11.6,11.5) -- (13.4,11.4) -- (13.5,16) -- (v11);
+\draw[draw=#2, line width=#3pt] (14.6,15.9) node (v12) {} -- (14.6,11.5) -- (16.4,11.4) -- (16.4,15.9) -- (v12);
+\draw[draw=#2, line width=#3pt] (8.7,10) node (v13) {} -- (9.5,9.3) -- (10.2,10) -- (9.6,10.8) -- (v13);
+\draw[draw=#2, line width=#3pt] (11.8,10.1) node (v14) {} -- (12.6,9.2) -- (13.4,10) -- (12.6,10.8) -- (v14);
+\draw[draw=#2, line width=#3pt] (14.7,10.2) node (v15) {} -- (15.6,9.5) -- (16.3,10.2) -- (15.5,11.1) -- (v15);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####key###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\key}[3]{\begin{tikzpicture}[scale = #1]
+\draw[draw=#2, line width=#3pt] (16.7,5.5) node (v1) {} ellipse (3.6 and 3.7);
+\draw[draw=#2, line width=#3pt] (18.1,5.6) ellipse (0.6 and 1.1);
+\draw[draw=#2, line width=#3pt] (13.2,6.1) -- (1.4,6.1) -- (1.4,4.8) -- (13.2,4.8);
+\draw[draw=#2, line width=#3pt] (2.4,6.1) -- (2.4,9.1) -- (3.3,9.1) -- (3.3,6.1);
+\draw[draw=#2, line width=#3pt] (3.7,6.1) -- (3.7,8.1) -- (4.5,8.1) -- (4.5,6.1);
+\draw[draw=#2, line width=#3pt] (v1) node (v2) {} ellipse (3.1 and 3.3);
+\end{tikzpicture}}
+
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Owl###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\Owl}[3]{\begin{tikzpicture}[scale = #1]
+\draw[draw=#2, line width=#3pt] (6.8,17.5) .. controls (-4.4,-3) and (26.4,-3) .. (15.1,17.5);
+\draw[draw=#2, line width=#3pt] (6.8,17.5) .. controls (6.2,15.8) and (15.9,15.6) .. (15.1,17.5);
+\draw[fill=black] (9.5,14) node (v1) {} ellipse (0.5 and 0.5);
+\draw[draw=#2, line width=#3pt] (v1) ellipse (1.5 and 1.4);
+\draw[fill=black] (12.5,14) node (v2) {} ellipse (0.5 and 0.5);
+\draw[draw=#2, line width=#3pt] (v2) ellipse (1.5 and 1.5);
+\draw[draw=#2, line width=#3pt] (10.1,12.7) node (v3) {} -- (11.8,12.7) -- (11,11.4) -- (v3);
+\draw[draw=#2, line width=#3pt] (4.6,11.7) .. controls (0.6,10.8) and (1.7,7.1) .. (3.3,8.8);
+\draw[draw=#2, line width=#3pt] (3.3,8.8) .. controls (2,7.6) and (3.3,6.3) .. (4.2,7.4);
+\draw[draw=#2, line width=#3pt] (4.2,7.4) .. controls (3.1,6.4) and (4.2,5.7) .. (4.8,6.3);
+\draw[draw=#2, line width=#3pt] (17.3,12) .. controls (21.4,10.7) and (21,7.7) .. (18.8,8.8);
+\draw[draw=#2, line width=#3pt] (18.8,8.8) .. controls (20.1,7.9) and (18.9,6.7) .. (18,7.4);
+\draw[draw=#2, line width=#3pt] (18,7.4) .. controls (18.6,7) and (18,6.1) .. (17.2,6.5);
+\draw[draw=#2, line width=#3pt] (8.3,2.7) .. controls (7.4,1.5) and (8.1,1.1) .. (8.4,1.6);
+\draw[draw=#2, line width=#3pt] (8.4,1.6) .. controls (8.1,1.2) and (8.7,0.8) .. (8.9,1.3);
+\draw[draw=#2, line width=#3pt] (8.9,1.3) .. controls (8.6,0.9) and (9.5,0.1) .. (10.1,2.2);
+\draw[draw=#2, line width=#3pt] (13.6,2.6) .. controls (14.7,1.4) and (13.8,1.1) .. (13.5,1.6);
+\draw[draw=#2, line width=#3pt] (13.5,1.6) .. controls (13.8,1.2) and (13.2,0.9) .. (12.9,1.3);
+\draw[draw=#2, line width=#3pt] (12.9,1.3) .. controls (13.3,0.9) and (12.6,0) .. (11.6,2.2);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####Pencil###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\Pencil}[3]{\begin{tikzpicture}[scale = #1]
+\draw[draw=#2, line width=#3pt] (4.7,6.6) node (v2) {} -- (18.5,18.8) node (v10) {};
+\draw[draw=#2, line width=#3pt] (20.8,15) node (v9) {} -- (6.9,2.9) node (v1) {};
+\draw[draw=#2, line width=#3pt] (v1) -- (0.9,0.5) node (v3) {} -- (v2);
+\draw[draw=#2, line width=#3pt][fill=black] (v3) -- (2.5,2.9) -- (3.6,1.6) -- (v3);
+\draw[draw=#2, line width=#3pt] (4.7,6.6) .. controls (5.4,7.7) and (7.1,6.1) .. (5.3,5.2);
+\draw[draw=#2, line width=#3pt] (5.3,5.2) node (v4) {} .. controls (6.6,6.5) and (7.9,5) .. (6.1,4);
+\draw[draw=#2, line width=#3pt] (6.1,4) node (v5) {} .. controls (7.5,5.3) and (8.7,4.3) .. (6.9,2.9);
+\draw[draw=#2, line width=#3pt] (v4) -- (15.4,14) node (v6) {};
+\draw[draw=#2, line width=#3pt] (v5) -- (16,12.7) node (v7) {};
+\draw[fill=black] (14.1,14.9) node (v8) {} -- (v6) -- (v7) -- (16.4,11.2) -- (18,12.5) -- (17.5,14.2) -- (16.7,15.3) -- (15.3,16) -- (v8);
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(v9) (20.3,17.3) (v10)};
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####rocket###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\rocket}[3]{\begin{tikzpicture}[scale = #1]
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(5.2,6.4) (5.6,19) (10,23.5)};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(10,23.5) (14.7,18.9) (15.5,6.3)};
+\draw[draw=#2, line width=#3pt] (5.1,12) -- (2.8,11) -- (3,4.3) -- (4,6.8) -- (5.2,7.6);
+\draw[draw=#2, line width=#3pt] (15.4,12.1) -- (18,11.1) -- (18.3,4.3) -- (17.1,6.9) -- (15.5,8);
+\node (v2) at (15.5,6.3) {};
+\node (v1) at (5.2,6.4) {};
+\draw[draw=#2, line width=#3pt] (v1) edge (v2);
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(8.3,6.4) (7.2,5.4) (8.9,4.2) (9.8,1)};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(12.4,6.4) (13.5,5.6) (11.3,4.2) (9.8,1)};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(5.8,19.6) (10.3,19.3) (14.4,19.6)};
+\draw[draw=#2, line width=#3pt] plot[smooth, tension=.7] coordinates {(6.4,20.6) (10.3,20.4) (13.8,20.7)};
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####DUCK###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\DUCK}[3]{\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+\draw[draw=#2,line width=#3pt]
+(303,374).. controls (550,90) and (-10,70)..(82,291);
+\draw[draw=#2,line width=#3pt](82,291).. controls (97,330) and(96,366)..(87,406);
+\draw[draw=#2,line width=#3pt](304,374).. controls (90,200) and(191,368)..(250,420);
+\draw[draw=#2,line width=#3pt](251,424).. controls (110,607) and(90,400)..(86,410);
+\draw[draw=#2,line width=#3pt](311,250).. controls (150,81) and(64,391)..(311,250);
+\draw[draw=#2,line width=#3pt](127,460) circle(10.1);
+\draw[draw=#2,line width=#3pt](257,140)--(253,83);
+\draw[draw=#2,line width=#3pt](251,80)--(277,62);
+\draw[draw=#2,line width=#3pt](253,83)--(234,71);
+\draw[draw=#2,line width=#3pt](253,83)--(218,80);
+\draw[draw=#2,line width=#3pt](168,140)--(167,81);
+\draw[draw=#2,line width=#3pt](168,81)--(187,74);
+\draw[draw=#2,line width=#3pt](168,81)--(144,70);
+\draw[draw=#2,line width=#3pt](168,81)--(124,82);
+\draw[draw=#2,line width=#3pt](88,407).. controls (65,409) and (30,447)..(56,458).. controls (68,452) and (80,442)..(98,444);
+
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####HAT###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+\newcommand{\HAT}[3]{\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2,line width=#3pt]
+(295,116)..controls(227,345) and (104,242)..(75,160);
+\draw[draw=#2,line width=#3pt](292,116)..controls(401,200) and (-90,175)..(51,132);
+\draw[draw=#2,line width=#3pt](51,132)..controls(133,150) and(223,154)..(283,145);
+\draw[draw=#2,line width=#3pt](203,172)--(169,206);
+\draw[draw=#2,line width=#3pt](189,185)--(155,190);
+\draw[draw=#2,line width=#3pt](289,116) ..controls(132,100) and(279,79)..(276,96);
+\draw[draw=#2,line width=#3pt](276,96)..controls(247,67) and(238,46)..(291,56);
+\draw[draw=#2,line width=#3pt](291,56)..controls(288,6) and(306,4)..(326,79);
+\draw[draw=#2,line width=#3pt](326,79)..controls(350,104) and(350,124)..(298,120);
+
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####SUN###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\SUN}[3]{\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2,line width=#3pt](206,248) circle(98.7);
+\draw[draw=#2,line width=#3pt](162,340)..controls(60,388) and(22,294)..(102,238);
+\draw[draw=#2,line width=#3pt](102,238)..controls(16,190) and(88,106)..(156,162);
+\draw[draw=#2,line width=#3pt](156,162)..controls(152,74) and(252,46)..(270,148);
+\draw[draw=#2,line width=#3pt](248,154)..controls(370,120) and(394,214)..(300,264);
+\draw[draw=#2,line width=#3pt](300,264)..controls(412,298) and(356,412)..(238,340);
+\draw[draw=#2,line width=#3pt](272,356)..controls(230,478) and(144,472)..(130,352);
+
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%####BUtterfly###%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\BUtterfly}[3]{\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw=#2,line width=#3pt](199,89)..controls(456,206) and(47,416)..(156,120);
+\draw[draw=#2,line width=#3pt](134,209)..controls(-54,279) and(139,65)..(297,87);
+\draw[draw=#2,line width=#3pt](297,87)..controls(345,114) and(323,137)..(268,140);
+\draw[draw=#2,line width=#3pt](299,135)..controls(307,152) and(295,159)..(277,154);
+\draw[draw=#2,line width=#3pt](85,162)..controls(140,55) and(233,41)..(255,87);
+\draw[draw=#2,line width=#3pt](94,150) circle(1.4);
+\draw[draw=#2,line width=#3pt](87,154)arc(15:155:15);
+\draw[draw=#2,line width=#3pt](89,149) arc(15:155:15);
+\draw[draw=#2,line width=#3pt](175,250) circle(8.4);
+\draw[draw=#2,line width=#3pt](229,239) circle(8.4);
+\draw[draw=#2,line width=#3pt](160,230) circle(8.4);
+\draw[draw=#2,line width=#3pt](212,222) circle(8.4);
+\draw[draw=#2,line width=#3pt](273,184) circle(8.4);
+\draw[draw=#2,line width=#3pt](258,161) circle(8.4);
+\draw[draw=#2,line width=#3pt](238,131) circle(8.4);
+\draw[draw=#2,line width=#3pt](170,177) circle(8.4);
+\draw[draw=#2,line width=#3pt](130,131) arc(15:155:15);
+\draw[draw=#2,line width=#3pt](152,122)--(139,99);
+\draw[draw=#2,line width=#3pt](184,104)--(165,72);
+\draw[draw=#2,line width=#3pt](215,96)--(202,61);
+\draw[draw=#2,line width=#3pt](230,90)--(227,65);
+\draw[draw=#2,line width=#3pt](133,147) circle(8.4);
+\draw[draw=#2,line width=#3pt](108,165) circle(8.4);
+\draw[draw=#2,line width=#3pt](120,199) circle(8.4);
+\draw[draw=#2,line width=#3pt](93,191) circle(8.4);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####fpetals###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\fpetals}[3]{\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw = #2, line width=#3pt] (216,372) circle (4.6cm);
+\draw[draw = #2, line width=#3pt,fill=black] (190,368) circle (0.8cm);
+\draw[draw = #2, line width=#3pt,fill=black] (208,345) circle (0.8cm);
+\draw[draw = #2, line width=#3pt,fill=black] (238,352) circle (0.8cm);
+\draw[draw = #2, line width=#3pt,fill=black] (202,394) circle (0.8cm);
+\draw[draw = #2, line width=#3pt,fill=black] (230,395) circle (0.8cm);
+\draw[draw = #2, line width=#3pt,fill=black] (246,374) circle (0.8cm);
+\draw[draw = #2, line width=#3pt,fill=black] (217,370) circle (0.8cm);
+\draw[draw = #2, line width=#3pt] (118,408).. controls (75,486) and (136, 491) ..(173,472).. controls (190,543) and (244, 534) ..(258,483)..
+ controls (295,502) and (358, 466) ..(309,416) .. controls (398,404) and (375, 335) ..(314,330) .. controls (354,275) and (330, 245) ..(256,263)
+ .. controls (245,200) and (179, 203) ..(171,265) .. controls (95,220) and (85, 309) ..(116,324) .. controls (60,330) and (36, 407) ..(118,408);
+\draw[draw = #2, line width=#3pt] (173,472).. controls (175,461) and (184, 432) ..(198,414);
+\draw[draw = #2, line width=#3pt] (258,483).. controls (256,458) and (241, 424) ..(237,411);
+\draw[draw = #2, line width=#3pt] (309,416).. controls (292,406) and (276, 400) ..(256,390);
+\draw[draw = #2, line width=#3pt] (314,330).. controls (300,327) and (274, 340) ..(256,349);
+\draw[draw = #2, line width=#3pt] (256,263).. controls (257,314) and (244, 314) ..(234,330);
+\draw[draw = #2, line width=#3pt] (197,327).. controls (187,308) and (172, 285) ..(171,265);
+\draw[draw = #2, line width=#3pt] (116,324).. controls (144,327) and (159, 337) ..(177,346);
+\draw[draw = #2, line width=#3pt] (118,408).. controls (135,407) and (153, 398) ..(174,394);
+\draw[draw = #2, line width=#3pt] (202,217).. controls (199,125) and (174, 70) ..(131,29);
+\draw[draw = #2, line width=#3pt,rotate=-6] (202,243).. controls (205,125) and (174, 70) ..(139,35);
+\draw[draw = #2, line width=#3pt] (132,29)--(143,21);
+\draw[draw = #2, line width=#3pt] (34,217).. controls (78,217) and (127, 250) ..(147,167).. controls (127,160) and (78,127) ..(34,217);
+\draw[draw = #2, line width=#3pt] (147,167).. controls (165,155) and (178, 155) ..(196,156);
+\draw[draw = #2, line width=#3pt,rotate=-2] (130,165).. controls (165,155) and (178, 155) ..(191,156);
+\draw[draw = #2, line width=#3pt] (259,127).. controls (245,127) and (229, 119) ..(209,124);
+\draw[draw = #2, line width=#3pt] (205,113).. controls (230,108) and (249, 111) ..(268,120);
+\draw[draw = #2, line width=#3pt] (258,127).. controls (289,198) and (327, 184) ..(381,183);
+\draw[draw = #2, line width=#3pt] (258,127).. controls (264,120) and (348, 95) ..(381,183);
+\draw[draw = #2, line width=#3pt] (34,217) --(147,167);
+\draw[draw = #2, line width=#3pt] (123,176) --(115,198);
+\draw[draw = #2, line width=#3pt] (66,213) --(70,200);
+\draw[draw = #2, line width=#3pt] (62,190) --(91,192);
+\draw[draw = #2, line width=#3pt] (258,127) --(381,183);
+\draw[draw = #2, line width=#3pt] (291,140) --(298,166);
+\draw[draw = #2, line width=#3pt] (326,154) --(350,152);
+\draw[draw = #2, line width=#3pt] (343,164) --(347,177);
+\draw[draw = #2, line width=#3pt] (205,415) --(201,433);
+\draw[draw = #2, line width=#3pt] (213,417) --(213,433);
+\draw[draw = #2, line width=#3pt] (228,414) --(230,433);
+\draw[draw = #2, line width=#3pt] (243,407) --(259,424);
+\draw[draw = #2, line width=#3pt] (253,401) --(268,413);
+\draw[draw = #2, line width=#3pt] (260,382) --(277,387);
+\draw[draw = #2, line width=#3pt] (262,364) --(280,366);
+\draw[draw = #2, line width=#3pt] (259,356) --(279,346);
+\draw[draw = #2, line width=#3pt] (254,340) --(266,330);
+\draw[draw = #2, line width=#3pt] (243,333) --(256,323);
+\draw[draw = #2, line width=#3pt] (227,326) --(229,307);
+\draw[draw = #2, line width=#3pt] (215,326) --(215,308);
+\draw[draw = #2, line width=#3pt] (202,326) --(194,301);
+\draw[draw = #2, line width=#3pt] (184,337) --(174,325);
+\draw[draw = #2, line width=#3pt] (178,340) --(164,329);
+\draw[draw = #2, line width=#3pt] (171,354) --(159,352);
+\draw[draw = #2, line width=#3pt] (205,415) --(201,433);
+\draw[draw = #2, line width=#3pt] (173,362) --(152,360);
+\draw[draw = #2, line width=#3pt] (171,376) --(153,379);
+\draw[draw = #2, line width=#3pt] (177,396) --(163,407);
+\draw[draw = #2, line width=#3pt] (182,409) --(172,416);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####cow###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\cow}[3]{\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw = #2, line width=#3pt] (139,281) .. controls(129,289) and (116,292) .. (107,292) .. controls (94,291) and (82,286) .. (74,281) .. controls (69,270) and (70,255) .. (70,240) .. controls (71,236) and (74,231) .. (76,226) .. controls (77,222) and (76,219) .. (73,213) .. controls (72,211) and (71,203) .. (74,191)
+.. controls (76,188) and (77,184) .. (81,182) .. controls (107,179) .. (132,182) .. controls (136,185) and (140,189) .. (140,193) .. controls (141,199) and (141,208) .. (139,213.5) .. controls (135,224) .. (139,235) .. controls (142,240) and (144,249) .. (144,255) .. controls (144,265) and (142,277) .. (139,281);
+\draw[draw = #2, line width=#3pt] (70,242) .. controls (56,239) .. (41,243) .. controls (40,247) .. (43,252) .. controls (50,265) and (56,263) .. (70,263);
+\draw[draw = #2, line width=#3pt] (71,269) .. controls (58,280) .. (57,291) .. controls (58,299) .. (60,303) .. controls (65,304) .. (67,297) .. controls (68,287) .. (75,281);
+\draw[draw = #2, line width=#3pt] (138,282) .. controls (147,290) .. (148,305) .. controls (149,307) and (153,306) .. (155,302) .. controls (158,288) and (153,277) .. (143,269);
+\draw[draw = #2, line width=#3pt] (143,266) .. controls (166,264) .. (173,248) .. controls (173,243) .. (167,243) .. controls (153,243) .. (143,247);
+\draw[draw = #2, line width=#3pt] (139,214) .. controls (123,222) and (111,216) .. (106,211);
+\draw[draw = #2, line width=#3pt] (73,214) .. controls (90,222) and (99,216) .. (106,211);
+\draw[draw = #2, line width=#3pt] (92,205) circle (0.5cm);
+\draw[draw = #2, line width=#3pt] (121,205) circle (0.5cm);
+\draw[draw = #2, line width=#3pt] (95,258) ellipse (0.5 cm and 1 cm);
+\draw[draw = #2, line width=#3pt] (114,258) ellipse (0.5 cm and 1 cm);
+\draw[draw = #2, line width=#3pt] (119,261) .. controls (114,259) .. (109,261);
+\draw[draw = #2, line width=#3pt] (100,261) .. controls (96,259) .. (90,261);
+\draw[draw = #2, line width=#3pt] (100,180) .. controls (100,153) and (109,140) .. (130,131) .. controls (132,84) .. (122,43) .. controls (133,37) .. (144,40) .. controls (151,83) .. (151,116) .. controls (169,110) .. (185,117) .. controls (195,71) .. (195,33) .. controls (205,30) .. (214,34) .. controls (212,75) .. (212,121) .. controls (263,134) .. (302,155) .. controls (312,110) .. (311,72) .. controls (321,68) .. (332,71) .. controls (325,153) and (348,217) .. (331,245)
+.. controls (352,216) and (356,196) .. (356,165) .. controls (351,152) .. (361,144) .. controls (369,153) .. (364,166) .. controls (363,196) and (363,242) .. (310,268) .. controls (270,279) .. (215,268) .. controls (194,260) .. (169,256);
+\draw[draw = #2, line width=#3pt] (331,245) .. controls (325,254) .. (309,268);
+\draw[draw = #2, line width=#3pt] (332,71) .. controls (336,58)and (332,51) .. (323,49) .. controls (317,53) .. (320,61);
+\draw[draw = #2, line width=#3pt] (310.5,72) .. controls (306,65) .. (304,61) .. controls (302,57) .. (308,51) .. controls (314,50) .. (318.5,57);
+\draw[draw = #2, line width=#3pt] (292,150) .. controls (292,101) .. (285,61) .. controls (289,53) .. (285,46) .. controls (278,43) .. (272,42) .. controls (271,50) .. (273,55);
+\draw[draw = #2, line width=#3pt] (271.5,51) .. controls (267,45) .. (260,45) .. controls (255,50) .. (256,55) .. controls (260,58) .. (265,64) .. controls (271,88) .. (273,140);
+\draw[draw = #2, line width=#3pt] (214,35) .. controls (219,23) .. (215,14) .. controls (208,11) .. (199.5,12) .. controls (193,12) and (187,14) .. (185,20) .. controls (188,28) .. (195,34);
+\draw[draw = #2, line width=#3pt] (199,12) .. controls (200,20) .. (204,24);
+\draw[draw = #2, line width=#3pt] (144,41) .. controls (147,28) and (141,22) .. (133,21) .. controls (128,22) .. (129,29) .. controls (125,20) .. (119,23) .. controls (114,30) .. (122,44);
+\draw[fill=black,draw = #2, line width=#3pt] (325,177) .. controls (319,181) .. (315,188) .. controls (311,188) .. (307,183) .. controls (316,175) .. (325,177);
+\draw[fill=black,draw = #2, line width=#3pt] (312,169) .. controls (307,177) .. (299,177) .. controls (301,173) .. (302,169) .. controls (309,167) .. (312,169);
+\draw[fill=black,draw = #2, line width=#3pt] (322,231) .. controls (311,227) .. (308,216) .. controls (314,219) .. (319,216) .. controls (324,214) .. (330,217) .. controls (330,221) and (323,226) .. (322,231);
+\draw[fill=black,draw = #2, line width=#3pt] (310,196) .. controls (305,208) .. (295,207) .. controls (296,202) .. (302,200) -- (310,196);
+\draw[fill=black,draw = #2, line width=#3pt] (298,191) -- (288,191) .. controls (288,195) .. (286,199) .. controls (289,199) .. (293,198) -- (298,191);
+\draw[fill=black,draw = #2, line width=#3pt] (287,175) .. controls (277,179) and (264,172) .. (256,176) .. controls (258,161) .. (273,155) .. controls (275,161) and (284,168) .. (287,175);
+\draw[fill=black,draw = #2, line width=#3pt] (278,192) .. controls (274,187) .. (270,184) .. controls (265,185) .. (260,191) .. controls (271,194) .. (278,192);
+\draw[fill=black,draw = #2, line width=#3pt] (279,199) .. controls (280,202) .. (273,203) .. controls (269,202) .. (267,199) -- (279,199);
+\draw[fill=black,draw = #2, line width=#3pt] (303,245) .. controls (305,235) .. (296,235) .. controls (277,248) .. (279,259) .. controls (285,261) .. (293,260);
+\draw[fill=black,draw = #2, line width=#3pt] (270,257) .. controls (264,264) .. (260,271) .. controls (251,266) .. (249,257) .. controls (255,259) .. (261,256) .. controls (267,253) .. (270,257);
+\draw[fill=black,draw = #2, line width=#3pt] (288,227) .. controls (282,220) .. (268,221) .. controls (267,229) .. (263,241) .. controls (270,242) .. (274,239) .. controls (280,234) .. (287,232) .. controls (290,229) .. (288,227);
+\draw[fill=black,draw = #2, line width=#3pt] (255,237) -- (229,236) .. controls (233,245) .. (243,248) .. controls (252,245) .. (255,237);
+\draw[fill=black,draw = #2, line width=#3pt] (237,208) .. controls (222,211) .. (222,227) .. controls (227,224) .. (231,226) .. controls (240,228) .. (249,228) .. controls (251,220) .. (237,208);
+\draw[fill=black,draw = #2, line width=#3pt] (243,179) .. controls (242,170) .. (234,170) .. controls (214,184) .. (220,193) .. controls (227,195) .. (232,190) .. controls (238,186) .. (243,179);
+\draw[fill=black,draw = #2, line width=#3pt] (232,143) .. controls (235,153) .. (244,154) .. controls (246,150) .. (251,147) .. controls (254,141) .. (249,141);
+\draw[fill=black,draw = #2, line width=#3pt] (226,165) .. controls (222,154) .. (207,156) .. controls (207,163) .. (203,170) .. controls (204,176) .. (212,175) .. controls (228,159) .. (226,165);
+\draw[fill=black,draw = #2, line width=#3pt] (194,171) .. controls (192,179) .. (181,182) .. controls (172,178) .. (169,169) -- (194,171);
+\draw[fill=black,draw = #2, line width=#3pt] (188,146) .. controls (191,137) .. (184,139) .. controls (178,140) .. (171,140) .. controls (173,149) .. (182,152) .. controls (184,148) .. (188,146);
+\draw[fill=black,draw = #2, line width=#3pt] (153,127) .. controls (163,139) .. (149,138) .. controls (146,137) .. (141,139) .. controls (143,127) .. (153,124) -- (153,127);
+\draw[fill=black,draw = #2, line width=#3pt] (144,153) .. controls (135,148) .. (128,154) .. controls (124,160) .. (125,170) .. controls (133,167) .. (140,170) .. controls (156,169) .. (151,160) .. controls (146,159) .. (144,156);
+\draw[fill=black,draw = #2, line width=#3pt] (156,187) .. controls (169,188) .. (162,196) .. controls (159,197) .. (158,200) .. controls (147,196) .. (147,187) .. controls (152,189) .. (156,187);
+\draw[fill=black,draw = #2, line width=#3pt] (178,213) -- (162,212) .. controls (163,206) .. (170,204) .. controls (174,207) .. (178,213);
+\draw[fill=black,draw = #2, line width=#3pt] (180,219) -- (167,218) .. controls (169,222) .. (174,223) .. controls (179,223) .. (180,219);
+\draw[fill=black,draw = #2, line width=#3pt] (201,214) .. controls (196,215) .. (189,220) .. controls (189,215) .. (191,211) .. controls (196,209) .. (201,214);
+\draw[fill=black,draw = #2, line width=#3pt] (195,239) .. controls (197,251) .. (208,254) .. controls (211,248) .. (215,244) .. controls (217,238) .. (211,239) .. controls (203,241) .. (195,239);
+\draw[fill=black,draw = #2, line width=#3pt] (209,219) .. controls (205,227) .. (196,227) .. controls (200,221) .. (209,219);
+\draw[draw = #2, line width=#3pt] (285,62) .. controls (273,58) .. (265,64);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####fatbird###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\fatbird}[3]{\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[draw = #2, line width=#3pt] (176,308) -- (206,308);
+\draw[draw = #2, line width=#3pt] (176,308) .. controls (164,302) and (151,284) .. (149,267) .. controls (138,253) and (138,233) .. (149,229) .. controls (153,225) .. (155,217) .. controls (160,213) .. (166,218) .. controls (172,211) and (183,211) .. (186,218) .. controls (192,211) and (203,211) .. (206,218) .. controls (210,212) and (214,212) .. (219,216) .. controls (225,213) .. (228,218);
+\draw[draw = #2, line width=#3pt] (206,308) .. controls (218,302) and (230,284) .. (231,267) .. controls (244,253) and (244,233) .. (232,229) .. controls (228,225) .. (228,218);
+\draw[draw = #2, line width=#3pt] (184,308) .. controls (189,331) and (200,350) .. (216,358) .. controls (221,353) and (221,347) .. (213,340) .. controls (220,335) and (220,331) .. (212,329) .. controls (214,323) and (210,320) .. (204,322) .. controls (208,316) and (208,312) .. (206,308);
+\draw[draw = #2, line width=#3pt] (233,230) .. controls (265,199) .. (288,160) .. controls (289,147) and (281,137) .. (271,147) -- (265,157) .. controls (251,155) and (244,164) .. (244,179) .. controls (233,181) and (226,193) .. (231,204);
+\draw[draw = #2, line width=#3pt] (236,228) .. controls (256,254) and (278,269) .. (295,269) .. controls (277,253) and (263,234) .. (253,210);
+\draw[draw = #2, line width=#3pt] (258,222) .. controls (271,235) and (292,251) .. (314,250) .. controls (296,235) and (276,216) .. (267,195);
+\draw[draw = #2, line width=#3pt] (290,228) .. controls (310,238) and (325,239) .. (337,236) .. controls (309,223) and (286,210) .. (272,187);
+\draw[draw = #2, line width=#3pt] (278,144) .. controls (273,116) and (253,95) .. (218,87) .. controls (215,75) and (206,75) .. (202,87) -- (182,87) .. controls (178,75) and (170,75) .. (165,87);
+\draw[draw = #2, line width=#3pt] (151,227) .. controls (115,194) .. (96,163) .. controls (94,146) and (101,135) .. (116,149) -- (121,155) .. controls (134,154) and (143,166) .. (141,180) .. controls (154,181) and (158,190) .. (153,203);
+\draw[draw = #2, line width=#3pt] (108,144) .. controls (113,116) and (140,88) .. (165,87);
+\draw[draw = #2, line width=#3pt] (214,80) -- (215,50) .. controls (221,48) .. (224,43);
+\draw[draw = #2, line width=#3pt] (215,50) .. controls (213,48) .. (211,41) .. controls (209,47) .. (206,51);
+\draw[draw = #2, line width=#3pt] (206,80) --(206,50) .. controls (200,49) .. (198,45);
+\draw[draw = #2, line width=#3pt] (177,80) -- (177,50) .. controls (184,48) .. (186,45);
+\draw[draw = #2, line width=#3pt] (177,50) .. controls (175,46) .. (174,42) .. controls (172,48) .. (170,50) .. controls (165,49) .. (161,45);
+\draw[draw = #2, line width=#3pt] (170,80) -- (170,50);
+\draw[fill=black,draw = #2, line width=#3pt] (177,259) circle (0.3cm);
+\draw[fill=black,draw = #2, line width=#3pt] (203,259) circle (0.3cm);
+\draw[draw = #2, line width=#3pt] (167,237) -- (213,236) .. controls (206,245) .. (199,248) .. controls (192,249) .. (181,248) .. controls (175,245) .. (167,237);
+\draw[draw = #2, line width=#3pt] (167,237) .. controls (175,227) .. (182,223) .. controls (192,222) .. (200,223) .. controls (207,227) .. (213,236);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####bloom###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\bloom}[3]{\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]
+\draw[fill=black,draw = #2, line width=#3pt] (209,227) -- (207,252) -- (195,252) -- (194,226) -- (186,239) -- (176,235) -- (180,220) -- (169,230) -- (161,224) -- (171,208) -- (145,217) -- (141,206) -- (168,195) -- (151,193) -- (153,183) -- (169,182) -- (155,173) -- (161,164) -- (175,171) -- (163,148) -- (170,142) -- (187,161) -- (187,146) -- (197,144) -- (203,158) -- (207,145) -- (217,146) -- (218,161) -- (235,143) -- (244,150) -- (230,170) -- (244,165) -- (249,174) -- (237,184) -- (252,182) -- (253,194) -- (238,197) -- (262,207) -- (259,216) -- (233,210) -- (243,222) -- (236,229) -- (224,221) -- (228,234) -- (218,239) -- (209,227);
+\draw[fill=white,white, line width=#3pt] (203,192) circle (3.5 cm);
+\draw[fill=black,draw = #2, line width=#3pt] (203,192) circle (1.4 cm);
+\draw[draw = #2, line width=#3pt] (248,250) .. controls (271,278) .. (282,309) .. controls (288,328) and (250,360) .. (234,347) .. controls (203,334) .. (175,347) .. controls (145,358) and (115,326) .. (125,294);
+\draw[draw = #2, line width=#3pt] (158,251) .. controls (131,288) .. (106,303) .. controls (90,315) and (57,296) .. (57,276) .. controls (58,238) .. (38,217) .. controls (20,193) and (32,157) .. (79,153);
+\draw[draw = #2, line width=#3pt] (130,172) .. controls (95,162) .. (63,142) .. controls (47,121) and (55,90) .. (77,87) .. controls (115,72) .. (133,48) .. controls (152,26) and (196,39) .. (203,71);
+\draw[draw = #2, line width=#3pt] (201,121) .. controls (182,70) and (245,2) .. (274,55) .. controls (289,78) .. (313,82) .. controls (357,83) and (357,137) .. (327,155);
+\draw[draw = #2, line width=#3pt] (275,170) .. controls (311,155) .. (338,156) .. controls (365,155) and (388,195) .. (363,218) .. controls (347,238) .. (348,257) .. controls (354,298) and (303,315) .. (276,289);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####nestling###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\nestling}[3]{\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+\draw[draw = #2, line width=#3pt] (52,239) -- (19,229) -- (44,222) -- (25,213) -- (42,210);
+\draw[draw = #2, line width=#3pt] (359,138) -- (340,137) -- (361,160) -- (345,157) -- (366,182);
+\draw[draw = #2, line width=#3pt] (42,210) .. controls (65,70) and (242,10) .. (359,138);
+\draw[draw = #2, line width=#3pt] (42,210) .. controls (75,323) and (136,301) .. (177,276);
+\draw[draw = #2, line width=#3pt] (177,276) -- (221,231);
+\draw[draw = #2, line width=#3pt] (264,197) .. controls (294,173) and (337,174) .. (366,182);
+\draw[draw = #2, line width=#3pt](89,221) ellipse (1.4cm and 2.5cm) ;
+\draw[draw = #2, line width=#3pt] (80,239) -- (70,251);
+\draw[draw = #2, line width=#3pt] (86,245) -- (82,258);
+\draw[draw = #2, line width=#3pt] (92,245) -- (98,257);
+\draw[draw = #2, line width=#3pt] (100,238) -- (108,251);
+\draw[draw = #2, line width=#3pt] (113,97) -- (113,64) -- (73,62) -- (106,57) -- (84,49) -- (117,55) -- (142,54) -- (129,62) -- (129,88);
+\draw[draw = #2, line width=#3pt] (185,70) -- (185,54) -- (148,52) -- (175,47) -- (157,38) -- (188,46) -- (217,45) -- (200,51) -- (200,68);
+\draw[draw = #2, line width=#3pt] (75,218) .. controls (85,230) and (94,230) .. (103,217);
+\draw[draw = #2, line width=#3pt] (174,278) .. controls (190,301) and (205,315) .. (211,315);
+\draw[draw = #2, line width=#3pt] (211,315) .. controls (213,313) and (215,312) .. (214,307);
+\draw[draw = #2, line width=#3pt] (214,307) .. controls (220,312) and (226,313) .. (225,307);
+\draw[draw = #2, line width=#3pt] (225,307) .. controls (231,307) and (231,297) .. (223,278);
+\draw[draw = #2, line width=#3pt] (223,278) .. controls (230,271) and (228,263) .. (216,255);
+\draw[draw = #2, line width=#3pt] (216,255) .. controls (218,251) and (216,245) .. (214,239);
+\draw[draw = #2, line width=#3pt] (195,206) .. controls (221,234) and (262,265) .. (279,265);
+\draw[draw = #2, line width=#3pt] (279,265) .. controls (282,257) .. (290,258);
+\draw[draw = #2, line width=#3pt] (290,258) .. controls (294,249) and (291,237) .. (282,229);
+\draw[draw = #2, line width=#3pt] (282,229) .. controls (283,218) and (274,208) .. (265,208);
+\draw[draw = #2, line width=#3pt] (265,208) .. controls (268,202) .. (264,197);
+\draw[draw = #2, line width=#3pt] (264,197) .. controls (258,190) and (246,179) .. (228,166);
+\draw[draw = #2, line width=#3pt] (228,166) .. controls (223,163) and (213,163) .. (208,165);
+\draw[draw = #2, line width=#3pt] (208,165) .. controls (203,175) and (197,172) .. (194,180);
+\draw[draw = #2, line width=#3pt] (194,180) .. controls (191,186) and (191,196) .. (195,206);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####cottage###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\cottage}[3]{\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+\draw[draw = #2, line width=#3pt] (76,23) -- (76,274) -- (201,490) -- (326,274) -- (326,23) -- (76,23);
+\draw[draw = #2, line width=#3pt] (76,274) -- (326,274);
+\draw[draw = #2, line width=#3pt] (145,23) -- (145,155) -- (253,155) -- (253,23);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####catface###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\catface}[3]{\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+\draw[draw = #2, line width=#3pt] (59,107) -- (47,253);
+\draw[draw = #2, line width=#3pt] (188,14) .. controls (130,15) and (70,40) .. (59,107);
+\draw[draw = #2, line width=#3pt] (47,253) .. controls (59,290) and (82,260) .. (97,244);
+\draw[draw = #2, line width=#3pt] (97,244) .. controls (133,200) and (191,212) .. (233,217);
+\draw[draw = #2, line width=#3pt] (233,217) .. controls (251,218) and (264,247) .. (265,246);
+\draw[draw = #2, line width=#3pt] (265,246) .. controls (271,260) and (291,267) .. (305,273);
+\draw[draw = #2, line width=#3pt] (305,272) .. controls (320,250) and (323,227) .. (317,207);
+\draw[draw = #2, line width=#3pt] (317,207) .. controls (315,184) and (315,142) .. (316,108);
+\draw[draw = #2, line width=#3pt] (316,108) .. controls (303,50) and (256,15) .. (188,14);
+\draw[draw = #2, line width=#3pt] (120,67) .. controls (140,48) and (168,50) .. (187,74);
+\draw[draw = #2, line width=#3pt] (187,74) .. controls (205,47) and (243,50) .. (255,67);
+\draw[draw = #2, line width=#3pt] (187,74) -- (187,104);
+\draw[draw = #2, line width=#3pt] (187,104) .. controls (181,109) and (174,115) .. (173,118);
+\draw[draw = #2, line width=#3pt] (173,118) .. controls (168,125) and (170,130) .. (178,131);
+\draw[draw = #2, line width=#3pt] (178,131) .. controls (184,132) and (194,131) .. (198,129);
+\draw[draw = #2, line width=#3pt] (198,129) .. controls (202,128) and (205,124) .. (202,118);
+\draw[draw = #2, line width=#3pt] (202,118) .. controls (200,114) and (195,108) .. (187,104);
+\draw[draw = #2, line width=#3pt] (18,81) .. controls (50,93) and (83,91) .. (115,80);
+\draw[draw = #2, line width=#3pt] (29,110) .. controls (70,110) and (106,95) .. (120,84);
+\draw[draw = #2, line width=#3pt] (31,133) .. controls (71,128) and (101,107) .. (117,95);
+\draw[draw = #2, line width=#3pt] (273,85) .. controls (305,94) and (336,97) .. (370,85);
+\draw[draw = #2, line width=#3pt] (268,88) .. controls (298,107) and (332,111) .. (359,114);
+\draw[draw = #2, line width=#3pt] (272,100) .. controls (302,122) and (330,131) .. (356,137);
+\draw[draw = #2, line width=#3pt] (146,136) -- (137,160);
+\draw[draw = #2, line width=#3pt] (137,160) .. controls (134,168) and (131,174) .. (119,177);
+\draw[draw = #2, line width=#3pt] (119,177) .. controls (108,177) and (100,179) .. (78,170);
+\draw[draw = #2, line width=#3pt] (78,170) .. controls (78,157) and (94,140) .. (103,136);
+\draw[draw = #2, line width=#3pt] (103,136) .. controls (110,135) and (119,135) .. (125,137);
+\draw[draw = #2, line width=#3pt] (125,137) .. controls (132,139) and (139,139) .. (146,136);
+\draw[draw = #2, line width=#3pt](113,156) ellipse (1.4cm and 2.08cm) ;
+\draw[draw = #2, line width=#3pt](252,159) ellipse (1.4cm and 2.08cm) ;
+\draw[draw = #2, line width=#3pt] (218,137) -- (229,165);
+\draw[draw = #2, line width=#3pt] (229,165) .. controls (234,174) and (238,178) .. (246,179);
+\draw[draw = #2, line width=#3pt] (246,179) .. controls (261,183) and (274,176) .. (285,172);
+\draw[draw = #2, line width=#3pt] (285,172) .. controls (282,162) and (278,154) .. (272,147);
+\draw[draw = #2, line width=#3pt] (272,147) .. controls (269,144) and (265,140) .. (261,138);
+\draw[draw = #2, line width=#3pt] (261,138) .. controls (256,136) and (248,137) .. (240,139);
+\draw[draw = #2, line width=#3pt] (240,139) .. controls (233,142) and (224,141) .. (218,137);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####fish###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\bisk}[3]{\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+
+\draw[draw = #2, line width=#3pt] (54,133) .. controls (103,116) and (145,71) .. (153,33);
+\draw[draw = #2, line width=#3pt] (53,29) .. controls (90,25) and (115,26) .. (153,33);
+\draw[draw = #2, line width=#3pt] (53,29) .. controls (45,58) and (45,92) .. (54,133);
+\draw[draw = #2, line width=#3pt] (54,133) .. controls (59,152) and (69,173) .. (81,185);
+\draw[draw = #2, line width=#3pt] (81,185) .. controls (125,218) and (171,250) .. (209,259);
+\draw[draw = #2, line width=#3pt] (209,259) .. controls (226,263) and (240,263) .. (254,259);
+\draw[draw = #2, line width=#3pt] (296,333) .. controls (313,333) and (332,327) .. (347,306);
+\draw[draw = #2, line width=#3pt] (347,306) .. controls (372,287) and (374,269) .. (373,251);
+\draw[draw = #2, line width=#3pt] (254,259) -- (296,333);
+\draw[draw = #2, line width=#3pt] (373,251) -- (288,209);
+\draw[draw = #2, line width=#3pt] (265,254) -- (313,330);
+\draw[draw = #2, line width=#3pt] (274,249) -- (332,322);
+\draw[draw = #2, line width=#3pt] (279,243) -- (351,302);
+\draw[draw = #2, line width=#3pt] (286,234) -- (365,287);
+\draw[draw = #2, line width=#3pt] (289,223) -- (371,272);
+\draw[draw = #2, line width=#3pt] (66,162) .. controls (50,176) and (37,194) .. (34,210);
+\draw[draw = #2, line width=#3pt] (34,210) .. controls (83,255) and (135,264) .. (181,249);
+\draw[draw = #2, line width=#3pt] (288,209) .. controls (278,164) and (260,121) .. (228,83);
+\draw[draw = #2, line width=#3pt] (228,83) .. controls (208,56) and (183,38) .. (153,33);
+\draw[draw = #2, line width=#3pt] (273,160) .. controls (284,121) and (283,91) .. (272,63);
+\draw[draw = #2, line width=#3pt] (272,63) .. controls (265,46) and (254,32) .. (245,24);
+\draw[draw = #2, line width=#3pt] (245,24) .. controls (236,14) and (230,13) .. (221,18);
+\draw[draw = #2, line width=#3pt] (221,18) .. controls (210,26) and (197,36) .. (188,46);
+\draw[draw = #2, line width=#3pt] (188,80) .. controls (183,86) and (175,88) .. (165,85);
+\draw[draw = #2, line width=#3pt] (168,106) .. controls (166,113) and (157,118) .. (148,119);
+\draw[draw = #2, line width=#3pt] (129,119) .. controls (129,128) and (122,132) .. (112,132);
+\draw[draw = #2, line width=#3pt] (105,135) .. controls (106,143) and (96,149) .. (86,147);
+\draw[draw = #2, line width=#3pt] (101,167) .. controls (112,166) and (119,160) .. (118,153);
+\draw[draw = #2, line width=#3pt] (110,181) .. controls (122,179) and (133,173) .. (131,164);
+\draw[draw = #2, line width=#3pt] (142,158) .. controls (152,156) and (161,153) .. (162,146);
+\draw[draw = #2, line width=#3pt] (172,135) .. controls (180,136) and (188,130) .. (188,124);
+\draw[draw = #2, line width=#3pt] (192,107) .. controls (201,108) and (209,103) .. (211,96);
+\draw[draw = #2, line width=#3pt] (122,196) .. controls (134,196) and (145,188) .. (149,181);
+\draw[draw = #2, line width=#3pt] (163,178) .. controls (172,177) and (180,170) .. (181,166);
+\draw[draw = #2, line width=#3pt] (184,151) .. controls (194,152) and (202,147) .. (204,140);
+\draw[draw = #2, line width=#3pt] (211,135) .. controls (218,132) and (227,129) .. (227,123);
+\draw[draw = #2, line width=#3pt] (217,146) .. controls (225,148) and (234,148) .. (236,137);
+\draw[draw = #2, line width=#3pt] (199,171) .. controls (209,170) and (217,165) .. (216,158);
+\draw[draw = #2, line width=#3pt] (142,220) .. controls (152,218) and (162,210) .. (164,203);
+\draw[draw = #2, line width=#3pt] (178,198) .. controls (185,198) and (194,194) .. (198,187);
+\draw[draw = #2, line width=#3pt] (209,184) .. controls (220,184) and (231,177) .. (227,167);
+\draw[draw = #2, line width=#3pt] (230,161) .. controls (238,160) and (248,156) .. (246,146);
+\draw[draw = #2, line width=#3pt] (171,234) .. controls (179,233) and (186,230) .. (190,221);
+\draw[draw = #2, line width=#3pt] (198,220) .. controls (205,220) and (216,218) .. (216,207);
+\draw[draw = #2, line width=#3pt] (228,199) .. controls (236,196) and (236,198) .. (247,190);
+\draw[draw = #2, line width=#3pt] (250,181) .. controls (260,180) and (266,174) .. (264,166);
+\draw[draw = #2, line width=#3pt] (214,247) .. controls (224,245) and (231,240) .. (232,231);
+\draw[draw = #2, line width=#3pt] (241,226) .. controls (254,226) and (262,222) .. (260,213);
+\draw[draw = #2, line width=#3pt] (73,61) .. controls (77,69) and (84,69) .. (89,63);
+\draw[draw = #2, line width=#3pt](81,68) ellipse (0.9cm and 1.4cm) ;
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####sock###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\sock}[3]{\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+\draw[draw = #2, line width=#3pt] (102,46) .. controls (40,30) and (10,90) .. (46,136);
+\draw[draw = #2, line width=#3pt] (102,46) .. controls (75,66) and (50,102) .. (46,136);
+\draw[draw = #2, line width=#3pt] (46,136) .. controls (78,158) and (112,176) .. (122,180);
+\draw[draw = #2, line width=#3pt] (122,180) .. controls (153,201) and (182,241) .. (187,289);
+\draw[draw = #2, line width=#3pt] (187,289) .. controls (185,368) and (216,449) .. (224,507);
+\draw[draw = #2, line width=#3pt] (224,507) -- (355,489);
+\draw[draw = #2, line width=#3pt] (218,473) -- (349,451);
+\draw[draw = #2, line width=#3pt] (355,489) .. controls (338,361) and (330,261) .. (342,228);
+\draw[draw = #2, line width=#3pt] (342,228) .. controls (346,164) and (329,129) .. (306,118);
+\draw[draw = #2, line width=#3pt] (306,118) .. controls (259,116) and (162,79) .. (102,46);
+\draw[draw = #2, line width=#3pt] (343,213) .. controls (329,190) and (302,181) .. (280,183);
+\draw[draw = #2, line width=#3pt] (280,183) .. controls (290,157) and (290,134) .. (268,112);
+\end{tikzpicture}}
+
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%####baseballbat###%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%#############%%%%%%%%%%%%%%%%%%%
+
+
+\newcommand{\baseballbat}[3]{\begin{tikzpicture}[x = \imagescaleh, y = \imagescaleh, scale = (#1)/10]]
+\draw[draw = #2,line width=#3pt] (36,45) circle (1.3cm);
+\draw[draw = #2,line width=#3pt] (49,47)--(352,260)..controls(344,292)..(319,302)--(41,57);
+\end{tikzpicture}}
+
diff --git a/graphics/pgf/contrib/figchild/figchild.tex b/graphics/pgf/contrib/figchild/figchild.tex
new file mode 100644
index 0000000000..8eb1293a50
--- /dev/null
+++ b/graphics/pgf/contrib/figchild/figchild.tex
@@ -0,0 +1,4749 @@
+\documentclass{article}
+\usepackage[english]{babel}
+\usepackage[utf8]{inputenc}
+\usepackage{figchild}
+\usepackage{verbatim}
+\usepackage{authblk}
+\usepackage{float}
+\usepackage{url}
+\usepackage{multirow}
+\usepackage{multicol}
+\usepackage{hyperref}
+\usepackage{amsmath,array,booktabs}
+\usepackage{afterpage}
+\usepackage{geometry}
+\geometry{top=2cm, left=2cm, right=2cm, bottom=2cm}
+\usepackage[bf]{caption}
+
+\begin{document}
+
+\begin{titlepage}
+
+\begin{center}
+
+\textbf{figchild:} Figures for Creating Children's Activities
+
+\vspace{0.5cm}
+
+\url{https://github.com/fsbmat-ufv/figchild}
+
+\vspace{0.5cm}
+
+\version{1}{0}{0}
+
+\vspace{0.5cm}
+
+\today
+
+\end{center}
+
+\vspace{2cm}
+
+
+
+ Fernando de Souza Bastos\footnote{Author and maintainer of the package (\textbf{E-mail:} fernando.bastos@ufv.br)},
+ Guilherme Fernandes Castro de Oliveira,
+ José Vitor Novaes Moreira,
+ Jéssica de Mendonça,
+ Gabriel Singh Bruno,
+ Matheus Iago Teixeira da Silva,
+ Erlane Alves Santiago,
+ Ana Carolina de Assis Coelho,
+ Lucas Mendes Viana,
+ Dhavy Alexwander Lopes dos Santos,
+ Vitória Augusta Dutra de Castro Soares,
+ Júlia Letícia Gonçalves Martins,
+ Kethile Alves Fagundes,
+ Luan Moises dos Santos Valadares,
+ Luiz Henrique de Souza Matos,
+ Warley Ribeiro de Freitas,
+ Paula Alves de Freitas,
+ Janaíne Geralda Mesquita Martins,
+ Henrique Ribeiro Diniz
+
+\vspace{3cm}
+
+\noindent \textbf{License:}
+
+\vspace{1cm}
+
+\noindent Copyright 2021 by Fernando de Souza Bastos
+
+\vspace{1cm}
+
+\noindent Released under the LaTeX Project Public License v1.3c or later. See \url{http://www.latex-project.org/lppl.txt}. Feature requests, issues and pull requests are welcome.
+
+\end{titlepage}
+
+\begin{abstract}
+This package was created with the aim of facilitating the work of Elementary School teachers who need to create colorful and attractive activities for their students. It is a product of the Computational Mathematics discipline offered at the Federal University of Viçosa - Campus UFV - Florestal by professor Fernando de Souza Bastos. It makes use of the tikz and xcolor packages.
+\end{abstract}
+
+\tableofcontents
+
+\listoftables
+
+\section{Introduction}
+
+\hspace{\parindent}This is a simple package to quickly make figures that can be used to build Basic Education activities. Of course, they can also be used for other purposes. It was created with the help of several students of Computational Mathematics discipline (MAF 172) from figures found in children's activities applied by teachers from Brazil and the world.. All students was added as authors of the package, as they contributed to the construction of the images, after learning how to use the tikz package. The discipline was offered by Professor Fernando de Souza Bastos\footnote{http://lattes.cnpq.br/9772451905214345}, at the Federal University of Viçosa - Campus UFV - Florestal (UFV), in Brazil.
+
+Our goal is to contribute to Teaching and the creation of high quality typographic materials. Thus, we seek to reproduce several images used in lists of activities of Basic Education in Brazil and in the world. That way, the teacher who wants to create activities, does not need to waste hours creating such images or copying low quality images on the internet. Just use our package.
+
+The package is in a process of constant evolution, whenever possible, we will add other images and content in it. In Tables \ref{tab1} à \ref{tab19} we present all the images created so far. We also intend to add images related to commemorative dates such as Christmas, Easter, Halloween, among others. Enjoy the figchild package.
+
+
+
+%\section{Author and Acknowledgements}
+
+%\hspace{\parindent}Fernando de Souza Bastos has a degree in Mathematics from the Federal University %of Viçosa and a PhD in Statistics from the Federal University of Minas Gerais. He has been working %with \LaTeX since 2003.
+
+%Thanks in particular the students Guilherme Fernandes Castro de Oliveira and José Vitor Novaes %Moreira who acted as monitors of the discipline (MAF 172) in the second remote period offered by UFV, %in the year 2021. I also thank all the students who contributed to the creation of the figures.
+
+\section{Usage}
+
+\hspace{\parindent}To use the package, simply add the command to your document's preamble:
+
+\begin{verbatim}
+ \usepackage{figchild}
+\end{verbatim}
+
+After that, in the body of your text you must use the command of the figure you want with its three options, the first option is related to the size of the figure, the second option is related to color and the third option is related to line thickness of the figure. That is, the command can be indicated as:
+
+\begin{verbatim}
+ \imagename{Picture size}{Picture color}{Line thickness}
+\end{verbatim}
+
+For example, to create a little train in the center of the page, of size 2, gray color and with line thickness that defines it of size 2, just use:
+
+\begin{verbatim}
+ \begin{center}
+ \train{2}{gray}{2}
+ \end{center}
+\end{verbatim}
+
+\begin{center}
+ \train{2}{gray}{2}
+\end{center}
+
+%\newgeometry{top=1.5cm, left=0.5cm, right=0.5cm, bottom=2cm}
+
+%\afterpage{\globaldefs=1 \newgeometry{top=1.5cm, left=0.5cm, right=0.5cm, bottom=2cm}}
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\owl{0.6}{blue}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\owl{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\owl{0.6}{blue}{1}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\bell{0.5}{red}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\bell{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\bell{0.2}{red}{2}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\Book{0.6}{gray}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Book{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Book{0.6}{gray}{2}|\\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\dino{0.8}{black}{2}}\\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\dino{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\dino{0.8}{black}{2}| \\
+\hline %Figura 5
+&
+&
+
+\multirow{5}{*}{\pumpkin{0.5}{orange}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\pumpkin{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\pumpkin{0.5}{orange}{1}| \\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{\crown{0.8}{yellow}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\crown{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\crown{0.8}{yellow}{1}| \\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{\spinning{0.5}{yellow}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\spinning{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\spinning{0.5}{yellow}{1}|\\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{\alligator{0.7}{green}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\alligator{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\alligator{0.7}{green}{1}|\\
+\hline
+ \end{tabular}
+ \caption{Figures model 1}
+ \label{tab1}
+\end{table}
+
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\bee{0.5}{yellow}{1}}\\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\bee{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\bee{0.5}{yellow}{1}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\squirrel{0.5}{brown}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\squirrel{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\squirrel{0.5}{brown}{1}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\hippo{0.4}{brown}{1}}\\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\hippo{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\hippo{0.4}{brown}{1}| \\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\elephant{0.7}{gray}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\elephant{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\elephant{0.7}{gray}{1}| \\
+\hline %Figura 5
+&
+&
+
+\multirow{5}{*}{\rose{0.6}{pink}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\rose{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\rose{0.6}{pink}{1}|\\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{\boat{0.6}{blue}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\boat{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\boat{0.6}{blue}{2}|\\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{\house{0.7}{brown}{2}}\\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\house{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\house{0.8}{brown}{2}| \\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{\gnat{0.6}{brown}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\gnat{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\gnat{0.6}{brown}{2}| \\
+\hline
+ \end{tabular}
+ \caption{Figures model 2}
+ \label{tab2}
+\end{table}
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\fan{0.5}{gray}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\fan{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\fan{0.5}{gray}{2}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\cupcake{0.7}{black}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\cupcake{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\cupcake{0.7}{black}{2}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\flamingo{0.6}{black}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\flamingo{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\flamingo{0.6}{black}{2}| \\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\bonnet{0.7}{black}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\bonnet{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\bonnet{0.7}{black}{2}| \\
+\hline %Figura 5
+&
+&
+
+\multirow{5}{*}{\mailbox{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\mailbox{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\mailbox{0.7}{black}{1}| \\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{\giraffe{0.5}{brown}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\giraffe{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\giraffe{0.5}{brown}{2}| \\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{\rabbit{0.5}{brown}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\rabbit{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\rabbit{0.5}{brown}{2}| \\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{\Duck{0.5}{green}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Duck{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Duck{0.5}{green}{2}| \\
+\hline
+ \end{tabular}
+ \caption{Figures model 3}
+ \label{tab3}
+\end{table}
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\beaver{0.6}{gray}{2}}\\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\beaver{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\beaver{0.6}{gray}{2}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\phone{0.8}{red}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\phone{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\phone{0.8}{red}{2}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\sandal{0.8}{black}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\sandal{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\sandal{0.8}{black}{2}| \\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\robe{0.4}{red}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\robe{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\robe{0.4}{red}{2}| \\
+\hline %Figura 5
+&
+&
+
+\multirow{5}{*}{\tractor{0.6}{red}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\tractor{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\tractor{0.6}{red}{2}| \\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{\glass{0.5}{red}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\glass{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\glass{0.5}{red}{2}| \\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{\apple{0.7}{red}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\apple{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\apple{0.7}{red}{2}| \\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{\egg{0.4}{red}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\egg{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\egg{0.4}{red}{2}| \\
+\hline
+ \end{tabular}
+ \caption{Figures model 4}
+ \label{tab4}
+\end{table}
+
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\spider{0.8}{red}{2}}\\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\spider{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\spider{0.8}{red}{2}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\moon{0.8}{red}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\moon{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\moon{0.8}{red}{2}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\bat{0.7}{red}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\bat{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\bat{0.7}{red}{2}| \\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\car{0.7}{red}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\car{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\car{0.7}{red}{2}| \\
+\hline %Figura 5
+&
+&
+
+\multirow{5}{*}{\crow{0.7}{red}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\crow{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\crow{0.7}{red}{2}| \\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{\Egg{0.5}{red}{2}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Egg{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Egg{0.5}{red}{2}| \\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{\goose{0.7}{red}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\goose{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\goose{0.7}{red}{1}| \\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{\House{0.6}{red}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\House{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\House{0.6}{red}{1}| \\
+\hline
+ \end{tabular}
+ \caption{Figures model 5}
+ \label{tab5}
+\end{table}
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\monkey{0.7}{red}{1}}\\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\monkey{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\monkey{0.7}{red}{1}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\mushroom{0.2}{red}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\mushroom{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\mushroom{0.2}{red}{1}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\pig{0.5}{red}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\pig{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\pig{0.5}{red}{1}| \\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\trunk{1}{brown}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\trunk{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\trunk{0.1}{brown}{1}| \\
+\hline %Figura 5
+&
+&
+
+\multirow{5}{*}{\flower{0.5}{red}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\flower{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\flower{0.5}{red}{1}| \\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{\ship{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\ship{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\ship{0.5}{black}{1}| \\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{\Bullet{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Bullet{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Bullet{0.7}{black}{1}| \\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{\Bee{0.5}{yellow}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Bee{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Bee{0.5}{yellow}{1}| \\
+\hline
+ \end{tabular}
+ \caption{Figures model 6}
+ \label{tab6}
+\end{table}
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\sun{1}{yellow}{1}}\\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\sun{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\sun{0.1}{yellow}{1}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\Star{0.5}{yellow}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Star{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Star{0.5}{yellow}{1}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\train{1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\train{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\train{0.1}{black}{1}| \\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\sheep{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\sheep{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\sheep{0.7}{black}{1}| \\
+\hline %Figura 5
+&
+&
+
+\multirow{5}{*}{\carrot{0.3}{orange}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\carrot{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\carrot{0.3}{orange}{1}| \\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{\mouse{0.7}{gray}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\mouse{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\mouse{0.7}{gray}{1}| \\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{\christmastree{0.5}{blue}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\christmastree{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+{\scriptsize\verb|\christmastree{0.5}{blue}{1}|} \\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{\pencil{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\pencil{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\pencil{0.7}{black}{1}| \\
+\hline
+ \end{tabular}
+ \caption{Figures model 7}
+ \label{tab7}
+\end{table}
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\sstar{1}{black}{1}}\\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\sstar{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\sstar{0.1}{black}{1}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\STAR{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\STAR{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\STAR{0.5}{black}{1}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\van{0.1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\van{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\van{0.1}{black}{1}| \\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\truck{1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\truck{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+\\
+&
+&
+\verb|\truck{1}{black}{1}| \\
+\hline %Figura 5
+&
+&
+\multirow{5}{*}{\bike{1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\bike{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\bike{1}{black}{1}| \\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{\EGg{0.4}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\EGg{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\EGg{0.4}{black}{1}| \\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{\plane{1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\plane{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\plane{1}{black}{1}| \\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{\bear{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\bear{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\bear{0.5}{black}{1}| \\
+\hline
+ \end{tabular}
+ \caption{Figures model 8}
+ \label{tab8}
+\end{table}
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\frog{0.5}{black}{1}}\\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\frog{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\frog{0.5}{black}{1}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\bull{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\bull{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\bull{0.5}{black}{1}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\Elephant{1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Elephant{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Elephant{1}{black}{1}| \\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\sheet{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\sheet{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\sheet{0.7}{black}{1}| \\
+\hline %Figura 5
+&
+&
+
+\multirow{5}{*}{\birdie{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\birdie{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\birdie{0.7}{black}{1}| \\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{\octopus{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\octopus{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\octopus{0.5}{black}{1}| \\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{\pineapple{0.4}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\pineapple{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\pineapple{0.4}{black}{1}| \\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{\butterfly{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\butterfly{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\butterfly{0.5}{black}{1}| \\
+\hline
+ \end{tabular}
+ \caption{Figures model 9}
+ \label{tab9}
+\end{table}
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\Fish{0.7}{black}{1}}\\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Fish{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Fish{0.7}{black}{1}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\Pumpkin{1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Pumpkin{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Pumpkin{1}{black}{1}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\Flamingo{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Flamingo{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Flamingo{0.7}{black}{1}| \\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\Bell{0.6}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Bell{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Bell{0.6}{black}{1}| \\
+\hline %Figura 5
+&
+&
+
+\multirow{5}{*}{\broom{0.3}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\broom{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\broom{0.3}{black}{1}| \\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{\candle{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\candle{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\candle{0.5}{black}{1}| \\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{\kite{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\kite{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\kite{0.5}{black}{1}| \\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{\Mouse{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Mouse{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Mouse{0.7}{black}{1}| \\
+\hline
+ \end{tabular}
+ \caption{Figures model 10}
+ \label{tab10}
+\end{table}
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\cloud{1}{black}{1}}\\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\cloud{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\cloud{1}{black}{1}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\horse{1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\horse{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\horse{1}{black}{1}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\Duckduck{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Duckduck{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Duckduck{0.7}{black}{1}| \\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\Fflamingo{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Fflamingo{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Fflamingo{0.7}{black}{1}| \\
+\hline %Figura 5
+&
+&
+
+\multirow{5}{*}{\ant{1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\ant{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\ant{1}{black}{1}| \\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{\bat{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\bat{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\bat{0.5}{black}{1}| \\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{\mug{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\mug{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\mug{0.7}{black}{1}| \\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{\umbrella{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\umbrella{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\umbrella{0.5}{black}{1}| \\
+\hline
+ \end{tabular}
+ \caption{Figures model 11}
+ \label{tab11}
+\end{table}
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\lion{0.6}{black}{1}}\\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\lion{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\lion{0.6}{black}{1}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\chick{0.6}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\chick{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\chick{0.6}{black}{1}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\Squirrel{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Squirrel{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Squirrel{0.7}{black}{1}| \\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\Giraffe{0.4}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Giraffe{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Giraffe{0.4}{black}{1}| \\
+\hline %Figura 5
+&
+&
+
+\multirow{5}{*}{\rabit{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\rabit{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\rabit{0.5}{black}{1}| \\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{\strawberry{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\strawberry{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\strawberry{0.5}{black}{1}| \\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{\turtle{1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\turtle{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\turtle{1}{black}{1}| \\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{\FLOWER{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\FLOWER{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\FLOWER{0.5}{black}{1}| \\
+\hline
+ \end{tabular}
+ \caption{Figures model 12}
+ \label{tab12}
+\end{table}
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\fish{0.6}{black}{1}}\\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\fish{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\fish{0.6}{black}{1}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\centipede{0.4}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\centipede{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\centipede{0.4}{black}{1}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\book{1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\book{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\book{1}{black}{1}| \\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\Turtle{1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Turtle{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Turtle{1}{black}{1}| \\
+\hline %Figura 5
+&
+&
+
+\multirow{5}{*}{\flyingSaucer{0.6}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\flyingSaucer{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+{\scriptsize\verb|\flyingSaucer{0.6}{black}{1}|} \\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{\watermelon{1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\watermelon{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\watermelon{1}{black}{1}| \\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{\witchHat{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\witchHat{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\witchHat{0.5}{black}{1}| \\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{\Butterfly{0.6}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Butterfly{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Butterfly{0.6}{black}{1}| \\
+\hline
+ \end{tabular}
+ \caption{Figures model 13}
+ \label{tab13}
+\end{table}
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\dolphin{0.5}{black}{1}}\\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\dolphin{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\dolphin{0.5}{black}{1}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\Plane{1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Plane{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Plane{1}{black}{1}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\ladybug{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\ladybug{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\ladybug{0.5}{black}{1}| \\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\peacock{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\peacock{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\peacock{0.7}{black}{1}| \\
+\hline %Figura 5
+&
+&
+
+\multirow{5}{*}{\dog{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\dog{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\dog{0.5}{black}{1}| \\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{\ball{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\ball{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\ball{0.7}{black}{1}| \\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{\birdie{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\birdie{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\birdie{0.7}{black}{1}| \\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{\Sun{0.8}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Sun{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Sun{0.8}{black}{1}| \\
+\hline
+ \end{tabular}
+ \caption{Figures model 14}
+ \label{tab14}
+\end{table}
+
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\Flower{0.3}{black}{1}}\\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Flower{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Flower{0.3}{black}{1}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\House{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\House{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\House{0.5}{black}{1}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\Cherry{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Cherry{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Cherry{0.5}{black}{1}| \\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\one{0.3}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\one{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\one{0.3}{black}{1}| \\
+\hline %Figura 5
+&
+&
+
+\multirow{5}{*}{\two{0.3}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\two{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\two{0.3}{black}{1}| \\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{\three{0.3}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\three{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\three{0.3}{black}{1}| \\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{\four{0.3}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\four{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\four{0.3}{black}{1}| \\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{\five{0.1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\five{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\five{0.1}{black}{1}| \\
+\hline
+ \end{tabular}
+ \caption{Figures model 15}
+ \label{tab15}
+\end{table}
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\six{0.08}{black}{1}}\\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\six{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\six{0.08}{black}{1}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\seven{0.3}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\seven{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\seven{0.3}{black}{1}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\eight{0.3}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\eight{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\eight{0.3}{black}{1}| \\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\nine{0.3}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\nine{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\nine{0.3}{black}{1}| \\
+\hline %Figura 5
+&
+&
+
+\multirow{5}{*}{\ten{0.3}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\ten{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\ten{0.3}{black}{1}| \\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{\bus{0.3}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\bus{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\bus{0.3}{black}{1}| \\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{\daisy{0.1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\daisy{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\daisy{0.1}{black}{1}| \\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{\gloves{0.07}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\gloves{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\gloves{0.07}{black}{1}| \\
+\hline
+ \end{tabular}
+ \caption{Figures model 16}
+ \label{tab16}
+\end{table}
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\key{0.1}{black}{1}}\\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\key{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\key{0.1}{black}{1}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\Owl{0.1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Owl{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Owl{0.1}{black}{1}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\Pencil{0.1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\Pencil{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\Pencil{0.1}{black}{1}| \\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\rocket{0.1}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\rocket{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\rocket{0.1}{black}{1}| \\
+\hline %Figura 5
+&
+&
+
+\multirow{5}{*}{\DUCK{0.4}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\DUCK{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\DUCK{0.4}{black}{1}| \\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{\HAT{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\HAT{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\HAT{0.5}{black}{1}| \\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{\SUN{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\SUN{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\SUN{0.5}{black}{1}| \\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{\BUtterfly{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\BUtterfly{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\BUtterfly{0.5}{black}{1}| \\
+\hline
+ \end{tabular}
+ \caption{Figures model 17}
+ \label{tab17}
+\end{table}
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\icecream{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\icecream{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\icecream{0.5}{black}{1}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\ghost{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\ghost{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\ghost{0.7}{black}{1}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\fpetals{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\fpetals{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\fpetals{0.5}{black}{1}| \\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\cow{0.8}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\cow{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\cow{0.8}{black}{1}| \\
+\hline %Figura 5
+&
+&
+
+\multirow{5}{*}{\fatbird{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\fatbird{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\fatbird{0.7}{black}{1}| \\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{\bloom{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\bloom{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\bloom{0.7}{black}{1}| \\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{\nestling{0.7}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\nestling{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\nestling{0.7}{black}{1}| \\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{\cottage{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\cottage{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\cottage{0.5}{black}{1}| \\
+\hline
+ \end{tabular}
+ \caption{Figures model 18}
+ \label{tab18}
+\end{table}
+
+\begin{table}[H]
+ \centering
+ \begin{tabular}{|c|l|c|}
+ \hline
+{\bf Command}& \multicolumn{1}{c|}{{\bf Options}} & {\bf Figures} \\
+\hline %Figura 1
+&
+&
+
+\multirow{5}{*}{\catface{0.8}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\catface{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\catface{0.8}{black}{1}| \\
+\hline %Figura 2
+&
+&
+
+\multirow{5}{*}{\bisk{0.8}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\bisk{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\bisk{0.8}{black}{1}| \\
+\hline %Figura 3
+&
+&
+
+\multirow{5}{*}{\sock{0.5}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\sock{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\sock{0.5}{black}{1}| \\
+\hline %Figura 4
+&
+&
+
+\multirow{5}{*}{\baseballbat{0.8}{black}{1}} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\baseballbat{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|\baseballbat{0.8}{black}{1}| \\
+\hline %Figura 5
+&
+&
+
+\multirow{5}{*}{Put the Figure Here!} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|Command used| \\
+\hline %Figura 6
+&
+&
+
+\multirow{5}{*}{Put the Figure Here!} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|Command used| \\
+\hline %Figura 7
+&
+&
+
+\multirow{5}{*}{Put the Figure Here!} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|Command used| \\
+\hline %Figura 8
+&
+&
+
+\multirow{5}{*}{Put the Figure Here!} \\
+&
+&
+
+\\
+&
+\verb|#1|: Figure Scale &
+
+\\
+\verb|\{#1}{#2}{#3}| &
+\verb|#2|: drawing line color &
+
+\\
+&
+\verb|#3|: Line thickness (pt) &
+
+\\
+&
+&
+
+\\
+&
+&
+
+\verb|Command used| \\
+\hline
+ \end{tabular}
+ \caption{Figures model 19}
+ \label{tab19}
+\end{table}
+
+\end{document}
diff --git a/graphics/pgf/contrib/figchild/latexmkrc b/graphics/pgf/contrib/figchild/latexmkrc
new file mode 100644
index 0000000000..cb3ebb1419
--- /dev/null
+++ b/graphics/pgf/contrib/figchild/latexmkrc
@@ -0,0 +1 @@
+$ENV{'TZ'}='America/Sao_Paulo'; \ No newline at end of file
diff --git a/language/marathi/LICENSE.md b/language/marathi/LICENSE.md
new file mode 100644
index 0000000000..b6e4c1fd62
--- /dev/null
+++ b/language/marathi/LICENSE.md
@@ -0,0 +1,207 @@
+---
+आलोक नित्यमुक्त परवाना
+---
+
+पहिली आवृत्ती (९ नोव्हेंबर, २०२०)
+
+© २०२१ आलोक मराठी नियतकालिक
+
+ह्या परवान्याची नवीनतम अधिकृत प्रत पुढील दुव्यावर उपलब्ध आहे.
+
+[https://varnamudra.com/aalok/nityamukta-parwana/](https://varnamudra.com/aalok/nityamukta-parwana/)
+
+ह्या परवान्याच्या प्रतीचे वितरण मुक्त आहे, परंतु त्यात परस्पर बदल करण्याची परवानगी
+नाही. परवान्यातील मजकुरासंदर्भात कोणत्याही तक्रारी, सूचना अथवा सल्ले असल्यास आलोक नित्यमुक्त
+परवान्याच्या गिट-पृष्ठावर त्यांची नोंद करावी. गिट-पृष्ठाच्या तक्रारींचे पान पुढील दुव्यावर
+सापडेल.
+
+[https://gitlab.com/aalok/nityamukta-parwana/-/issues](https://gitlab.com/aalok/nityamukta-parwana/-/issues)
+
+---
+प्रस्तावना
+---
+
+आलोक नित्यमुक्त परवाना हा कोणत्याही प्रतिमुद्राधिकारप्राप्त सामग्रीचे वितरण मुक्तपणे करण्यासाठी
+लिहिण्यात आलेला एक परवाना आहे. ह्या परवान्यासह वितरित होणाऱ्या सामग्रीची प्रतिमुद्रा
+करण्याचा व ती व्यावसायिक अथवा अव्यावसायिक, परिवर्तित अथवा यथामूल स्वरूपात वितरित
+करण्याचा अधिकार प्रतधारकास प्राप्त होतो, परंतु ह्या परवान्यासह वितरित होणाऱ्या सामग्रीवर
+आधारित अशी सामग्री अथवा मूळ सामग्रीत बदल करून निर्माण केलेली सामग्री वितरित करायची असेल,
+तर ती ह्या परवान्यातील सर्व अटींसह वितरित करणे सक्तीचे असते.
+
+-----------------------------------------------------
+तांत्रिक शब्द व त्यांचे अर्थ
+-----------------------------------------------------
+
+* सामग्री - ह्या परवान्यात वापरला गेलेला सामग्री हा शब्द प्रतिमुद्राधिकार लागू असलेल्या
+ कोणत्याही सामग्रीला उद्देशून येतो.
+
+* प्रतिमुद्रा - एखाद्या सामग्रीची नक्कल म्हणजे तिची प्रतिमुद्रा. उदा. एखाद्या कागदाची
+ छायाप्रत अथवा त्याचे काढलेले छायाचित्र ही मूळ कागदी प्रतीची प्रतिमुद्रा होय.
+
+* प्रतिमुद्राधिकार - कोणत्याही सामग्रीची निर्मिती करणाऱ्या व्यक्ती/संस्थेकडे त्या सामग्रीचे
+ प्रतिमुद्राधिकार असतात. प्रतिमुद्राधिकार कायद्याद्वारे पुढील हक्क प्रतिमुद्राधिकारधारकास
+ प्राप्त होतात.
+
+ - प्रतिमुद्राधिकारप्राप्त सामग्रीची निर्मिती प्रतिमुद्राधिकारधारकानेच केली आहे हे
+ वैधानिकरित्या सिद्ध करण्याचा हक्क.
+ - प्रतिमुद्राधिकारप्राप्त सामग्रीची पुनर्निर्मिती करण्याचा हक्क.
+ - प्रतिमुद्राधिकारप्राप्त सामग्रीच्या प्रतींचे वितरण करण्याचा हक्क.
+
+ संदर्भ - [http://www.legalserviceindia.com/article/l195-Copyright-Law-in-India.html](http://www.legalserviceindia.com/article/l195-Copyright-Law-in-India.html)
+* मुक्त परवाना - प्रतिमुद्राधिकारधारकास मिळणाऱ्या (वर निर्दिष्ट केलेल्या) तीन हक्कांपैकी
+ पहिल्या हक्काचे संरक्षण व उर्वरित दोन हक्क प्रत्येक प्रतधारकास प्रदान करणे मुक्त परवान्यांद्वारे
+ साधले जाते. मुक्त परवान्यासह वितरित झालेल्या सामग्रीची परिवर्तित अथवा यथामूल पुनर्निर्मिती
+ व तिचे व्यावसायिक अथवा अव्यावसायिक वितरण प्रत प्राप्त झालेली कोणतीही व्यक्ती करू
+ शकते. काही महत्त्वाचे मुद्दे.
+
+ - मुक्त परवान्यासह प्रतिमुद्राधिकारातील पहिल्या हक्काचे पूर्ण संरक्षण होते. सामग्रीच्या
+ निर्मात्या/निर्मातीखेरीज अन्य कोणीच वैधानिकरित्या सामग्रीच्या निर्मितीचा दावा करू शकत
+ नाही, परंतु मूळ मुक्त सामग्रीत बदल केला गेला असेल, तर मात्र बदल करणाऱ्याने/करणारीने बदल
+ समाविष्ट असलेल्या नव्या संपूर्ण सामग्रीचा प्रतिमुद्राधिकार स्वतःकडे घेऊन मूळ सामग्रीच्या
+ निर्मात्या/निर्मातीचा श्रेयनिर्देश करणे बंधनकारक असते.
+ - मुक्त परवान्यासह वितरित होणाऱ्या सामग्रीवर प्रतिमुद्राधिकारधारक तसेच अन्य प्रतधारक शुल्क
+ आकारू शकतात.
+ - ज्या सामग्रीत परिवर्तन करण्याचा अधिकार प्रतधारकास आहे, त्याच सामग्रीस मुक्त म्हणता येते.
+ - ज्या सामग्रीचे व्यावसायिक वितरण करण्याचा अधिकार प्रतधारकास आहे, त्याच सामग्रीस मुक्त
+ म्हणता येते.
+ - मुक्त परवान्यासह वितरित झालेल्या सामग्रीची प्रत एखाद्या व्यक्तीकडे असेल, तरी तिचे वितरण
+ करण्यासाठी कोणीही त्या व्यक्तीवर बळजबरी करू शकत नाही. मुक्त असलेल्या सामग्रीचे वितरण न
+ करण्याचा अधिकारही प्रतधारकाकडे आहे.
+ - मुक्त सामग्रीवर आधारित अथवा मुक्त सामग्रीत बदल करून तयार केलेली सामग्री अमुक्त असू शकते.
+ मुक्ततेची अट असलेल्या परवान्यांचा एक उपवर्ग आहे, त्याबद्दल आता जाणून घेऊ.
+
+* नित्यमुक्त परवाना - हा मुक्त परवान्यांचाच एक उपवर्ग आहे. ह्या परवान्यांसह वितरित होणारी
+ सामग्री सदैव मुक्त असते. तिच्या परिवर्तित स्वरूपाचे वितरणदेखील अमुक्त अटींसह करता येऊ शकत
+ नाही. नित्यमुक्त सामग्रीवर आधारित अथवा नित्यमुक्त सामग्रीत बदल करून तयार केलेली सामग्री
+ एका नित्यमुक्त परवान्यासह वितरित करण्याचे बंधन प्रतधारकास पाळावे लागते. तसे न केल्यास तो
+ परवान्याचा भंग ठरतो व त्यावर कायदेशीर कारवाई होऊ शकते. आलोक हा एक नित्यमुक्त परवाना
+ आहे.
+
+* अनुरूप परवाना - एखाद्या पुनर्निर्मित अथवा परिवर्तित सामग्रीस आलोकव्यतिरिक्त जे अन्य परवाने
+ चालू शकतात, त्या परवान्यांस अनुरूप परवाने असे म्हटले जाते. अननुरूप परवान्यांसह पुनर्वितरण केल्याचे
+ आढळल्यास त्या सामग्रीचा परवाना अवैध ठरवण्याचे अधिकार आलोक नियतकालिकाकडे आहेत.
+
+* परिवर्तन/बदल - मूळ सामग्रीत कोणत्याही प्रकारची भर घालणे, घट करणे, तिचा अनुवाद करणे व
+ इतर लहानात लहान भेद हे परिवर्तन म्हणून मोजले जातील. मिळालेली प्रतिमुद्रा यथामूल वितरित न
+ करता तिच्यात केलेला कुठलाही बदल मूळ सामग्रीचे परिवर्तन म्हणून पाहिला जाईल. परिवर्तित
+ सामग्रीचे प्रतिमुद्राधिकार बदल करणाऱ्या/करणारीने स्वतःकडे घेणे नित्यमुक्त परवान्यांमध्ये आवश्यक
+ ठरते. असे करताना मूळ सामग्रीच्या प्रतिमुद्राधिकारधारकास श्रेयनिर्देशन करणे हेदेखील बंधनकारक
+ होय.
+
+* बीज व फलित - ज्या धारिकेत आज्ञावली लिहिली जाते, तिला बीजधारिका असे म्हटले जाते. एखाद्या
+ चालकासह चालवल्यास आज्ञावली नेमून दिलेले कार्य पूर्ण करते. अशा वेळी मिळणारी धारिका फलित
+ म्हणून ओळखली जाते. ग्नू संस्थेचे परवाने व आलोक नित्यमुक्त परवाना हे आज्ञावलीय बीज मुक्तपणे
+ देण्याची वितरित करण्याची सक्ती निर्मात्यावर/निर्मातीवर करतो.
+
+-----------------------------------------------------
+कोणत्या सामग्रीस लागू?
+-----------------------------------------------------
+
+आलोक नित्यमुक्त परवाना प्रतिमुद्राधिकारप्राप्त कोणत्याही सामग्रीस वापरला जाऊ शकतो, परंतु
+ते वितरण करताना सामग्रीची प्रतिमुद्रा कोणत्या स्वरूपातील आहे ह्यावरून तिची परवाना
+वापरण्यासाठीची अर्हता ठरते. संगणकबाह्य कोणतीही सामग्री आलोक नित्यमुक्त परवाना वापरू
+शकते. उदा. छापील लेखन, छापील छायाचित्रे, फिल्मवर आधारित चित्रपट अथवा छायाचित्रे, रिळावर
+आधारलेली ध्वनिमुद्रणे. ही व अशी संगणकबाह्य कोणतीही सामग्री आलोक नित्यमुक्त परवान्यासह वितरित
+केली गेली असेल, तर तिच्या पुनर्निर्मितीस व वितरणास निर्मात्याची/निर्मातीची परवानगी आहे असे
+मानण्यात येईल. अशा संगणकबाह्य सामग्रीचे संगणकीकृत वितरण करावयाची परवावगी ह्या परवान्यासह
+आपसूक मिळत असली तरीही कोणत्याही स्वरूपाचे पुनर्वितरण एखाद्या नित्यमुक्त परवान्यासह करण्याची
+अट आहेच व आलोक नित्यमुक्त परवानाच वापरण्याची इच्छा असेल, तर संगणकबाह्य मुक्त सामग्रीचे
+संगणकीकरण करताना पुढील मुद्द्यांची काळजी घेण्यात यावी.
+
+आलोक नित्यमुक्त परवान्यासह संगणकीकृत सामग्रीचे वितरण करावयाचे असल्यास पुढील अटींची पूर्तता करणे
+आवश्यक आहे.
+
+* सामग्रीची निर्मिती मुक्त आज्ञावलीचा वापर करून झालेली असावी.
+* फलित सामग्रीचे आज्ञावलीय बीज कुठे पाहता येईल ह्याचा स्पष्ट निर्देश सामग्रीतच केलेला असावा.
+* संगणकीय आज्ञावलीचे बीजदेखील एका नित्यमुक्त परवान्यासह वितरित केलेले असावे.
+
+उदा. एखादा लेखी दस्तऐवज जर पीडीएफ् स्वरूपात वितरित करावयाचा असेल, तर त्याची निर्मिती
+करण्यासाठी मायक्रोसॉफ्ट वर्ड/इन-डिझाईन/ॲडॉब अशा अमुक्त आज्ञावल्या वापरू नयेत. अमुक्त
+आज्ञावल्यांचा वापर करून तयार करण्यात आलेल्या संगणकीकृत सामग्रीचे वितरण आलोक मुक्त परवान्यासह
+करता येणार नाही. संगणकीकृत सामग्रीचे वितरण करताना जर तिच्या सार्वत्रिक आज्ञावलीय बीजाचा
+निर्देश केला गेला नसेल व सामग्री अमुक्त आज्ञावल्यांचा वापर करून घडवण्यात आली असेल, तर त्या
+सामग्रीचा परवाना अवैध ठरवण्याचे अधिकार आलोक मराठी नियतकालिकाकडे आहेत.
+
+विविध प्रकारची संगणकीय सामग्री व तिचे वितरण करण्यासाठी आम्ही शिफारस करत असलेले स्वरूप
+पुढीलप्रमाणे -
+
+* लेखी दस्तऐवज - युनिकोड प्रणाली, .txt, .tex, .dvi (टेक्-फलित), .pdf (आवृत्ती १.७+
+ आवश्यक, मुक्त आज्ञावलीच्या वापर होणे आवश्यक), .odf, .md, .html, .epub, .djvu, .csv
+* छायाचित्रे - .flif (उत्कृष्ट गुणवत्तेसाठी), .png, .svg, .jpeg
+* ध्वनिफीती - .flac (उत्कृष्ट गुणवत्तेसाठी), .ogg (कमी आकारमान व मध्यम गुणवत्तेसाठी)
+* ध्वनिचित्रफीती - .mkv, .webm
+
+वर नोंदवलेले सामग्रीचे प्रकार व त्यांचे स्वरूप ही एक सर्वसमावेशक यादी नसून, केवळ आमच्या काही
+शिफारसी आहेत. ह्याव्यतिरिक्त उपलब्ध असलेल्या मुक्त स्वरूपांसह संगणकावर वितरित होणारी सामग्री
+आलोक नित्यमुक्त परवाना वापरण्यास पात्र आहे. मुक्त स्वरूपांची आणखी तपशीलवार यादी पुढील दुव्यावर
+पाहता येऊ शकते.
+
+[https://en.wikipedia.org/wiki/List_of_open_formats](https://en.wikipedia.org/wiki/List_of_open_formats)
+
+प्रतिमुद्राधिकारप्राप्त सामग्री संगणकीय आज्ञावलीच असेल तर ती मनुष्यास वाचनीय (द्विमान सामग्री
+मनुष्यास वाचनीय नसते) स्वरूपात महाजालावर उपलब्ध करून द्यावी. आज्ञावलीय बीज वितरित
+करण्यासाठी गिटहबऐवजी गिटलॅब ह्या मुक्त प्रणालीचा वापर करावा असे आम्ही सुचवू. ही एक अट नसून
+शिफारस आहे.
+
+-----------------------------------------------------
+वितरणविषयक नियम
+-----------------------------------------------------
+
+* सर्वप्रथम सामग्रीच्या निर्मात्याने/निर्मातीने प्रतिमुद्राधिकार आपले असल्याचा स्पष्ट निर्देश
+ करावा. तो करताना तारीख अथवा वर्ष स्पष्टपणे नमूद केलेले असावे. तत्पूर्वी प्रस्तुत सामग्रीची ही
+ कितवी आवृत्ती आहे व कधी प्रकाशित होत आहे तेही नमूद करावे. प्रतिमुद्राधिकाराचा निर्देश पुढील
+ प्रकारे करणे बंधनकारक आहे.
+
+ > <आवृत्तिक्रमांक>वी आवृत्ती <प्रकाशनाची तारीख><br>
+ > © <प्रकाशनवर्ष> <निर्मात्याचे/निर्मातीचे नाव>
+
+* ह्या मजकुराखाली पुढील परिच्छेद लिहिण्यात यावा.
+
+ > ह्या सामग्रीच्या वितरणाचे व प्रतिमुद्रणाचे अधिकार आलोक नित्यमुक्त परवान्यासह मुक्त करण्यात येत
+ > आहेत. ह्या सामग्रीची यथामूल अथवा परिवर्तित प्रतिमुद्रणे व्यावसायिक अथवा अव्यावसायिक
+ > स्वरूपात वितरित करण्यास प्रतिमुद्राधिकारधारक संमती देत आहे, परंतु असे करताना वितरकाने
+ > प्रतिमुद्राधिकारांचा योग्य श्रेयनिर्देश करणे व सामग्री परिवर्तित असल्यास ती ह्याच अटींसह
+ > वितरित करणे बंधनकारक आहे. ही सामग्री जशी आहे तशी पुरवण्यात येत आहे, पुरवणारा/पुरवणारी
+ > हिच्याबाबत कोणतीही हमी देत नाही. ह्या (व ह्यावर आधारित) सामग्रीचे अमुक्त वितरण
+ > बेकायदेशीर मानले जाईल. आलोक नित्यमुक्त परवान्याचा संपूर्ण मसुदा पुढील दुव्यावर वाचता
+ > येईल.
+
+ > [https://varnamudra.com/aalok/nityamukta-parwana/](https://varnamudra.com/aalok/nityamukta-parwana/)
+
+-----------------------------------------------------
+सामग्रीचे पुनर्वितरण कसे करावे?
+-----------------------------------------------------
+
+* ह्या परवान्यासह वितरित होणाऱ्या सामग्रीच्या परिवर्तित स्वरूपाचे वितरण करायचे असेल, तर
+ मूळ सामग्रीच्या प्रतिमुद्राधिकारधारकास त्याचे श्रेय पुढीलप्रमाणे द्यावे व त्याखाली नव्या
+ निर्मात्याने/निर्मातीने प्रतिमुद्राधिकार स्वतःकडे घ्यावेत. उदा.
+
+ > मूळ सामग्री - <सामग्रीचे नाव><br>
+ > निर्माता/निर्माती - <निर्माता/निर्मातीचे नाव><br>
+ > निर्मितीवर्ष - <मूळ सामग्रीच्या निर्मितीचे वर्ष><br>
+
+ > आधारित/परिवर्तित सामग्री<br>
+ > <आवृत्तिक्रमांक>वी आवृत्ती <प्रकाशनाची तारीख><br>
+ > © <प्रकाशनवर्ष> <निर्मात्याचे/निर्मातीचे नाव><br>
+
+* एखादी सामग्री प्रकाशित झाली तेव्हा मुक्त नसेल, परंतु प्रतिमुद्राधिकारधारकास तिचे नित्यमुक्त
+ वितरण करण्याची इच्छा असेल, तर त्याने/तिने नित्यमुक्त परवान्यासह त्या सामग्रीची सुधारित
+ आवृत्ती प्रकाशित करावी. एखादी प्रकाशित अमुक्त सामग्री आलोक नित्यमुक्त परवान्यासह मुक्त
+ माध्यमांवर प्रकाशित करायची असेल, तरीही त्या सामग्रीच्या प्रतिमुद्राधिकारधारकाशी संपर्क
+ साधून, त्यांची लेखी परवानगी घेऊन, हा परवाना वापरता येईल. असे करतानादेखील
+ प्रतिमुद्राधिकार मूळ निर्मात्या/निर्मातीकडेच राहतील.
+
+---
+अनुरूप परवाने
+---
+
+आलोक नित्यमुक्त परवान्यास केवळ `ग्नू फ्री डॉक्युमेन्टेशन परवाना` व ग्नू संस्थेचा `जनरल पब्लिक
+परवाना` हे दोन परवानेच अनुरूप आहेत. क्रिएटिव्ह कॉमन्सचे परवाने संगणकीय पुनर्वितरणाच्या वेळी
+अमुक्त आज्ञावल्यांना प्रतिबंध करत नाहीत, शिवाय आज्ञावलीय बीज देण्याची सक्तीदेखील करत नाहीत,
+त्यामुळे सामग्रीची परिवर्तनशीलता कमी होते व सामग्रीची मुक्तता घटते, त्यामुळे क्रिएटिव्ह कॉमन्सचे
+परवाने आलोकच्या परिवर्तित सामग्रीकरिता वापरू नयेत. अन्य कोणताही असा परवाना ज्यात
+आज्ञावलीच्या मुक्ततेचा विचार केला जातो व प्रतधारकाच्या सुरक्षेचा व स्वातंत्र्याचा विचार केला
+जातो, त्या परवान्याचा समावेश अनुरूप परवान्यांमध्ये करता येईल. असा कोणताही परवाना आढळल्यास
+आलोकच्या गिट-पृष्ठावर सुधारणांमध्ये तसे नोंदवावे. त्या परवान्याचा ह्या यादीत समावेश केला
+जाईल. परंतु (पहिल्या आवृत्तीनुसार) केवळ हे दोन परवानेच आलोक परवान्याकरिता अनुरूप मानले गेले
+आहेत.
diff --git a/language/marathi/README.txt b/language/marathi/README.txt
index 7228150f30..fd51475d1d 100644
--- a/language/marathi/README.txt
+++ b/language/marathi/README.txt
@@ -1,13 +1,19 @@
+--------------------------------------------------------------------------
+Note: This README file contains information about LaTeX package <marathi> in
+Marathi & English. As this package is targeted more towards the speakers of
+Marathi language, the description is initially given in Marathi, but for general
+readers an English description is provided at the end.
+--------------------------------------------------------------------------
आज्ञासंच: marathi
लेखक: निरंजन
-आवृत्ती: १.६.१ (१५ जानेवारी, २०२१)
+आवृत्ती: १.६.२ (३ एप्रिल, २०२१)
माहिती: लुआलाटेक् व झीलाटेक् ह्यांच्यासह मराठीचा
सुलभ वापर करण्यासाठी. इथून पुढे लाटेक्-वरील मराठीच्या
स्थानिकीकरणाचे काम ह्या आज्ञासंचामार्फत केले जाईल.
तूर्त expex व blindtext ह्या आज्ञासंचांचे स्थानिकीकरण
ह्या आज्ञासंचामार्फत पुरवले आहे.
-संग्राहिका: https://gitlab.com/niranjanvikastambe/marathi
-अडचणी: https://gitlab.com/niranjanvikastambe/marathi/-/issues
+संग्राहिका: https://gitlab.com/niruvt/marathi
+अडचणी: https://gitlab.com/niruvt/marathi/-/issues
परवाना: आलोक नित्यमुक्त परवाना. आवृत्ती १.० किंवा त्यापुढील.
दुवा - https://gitlab.com/aalok/nityamukta-parwana
आणि
@@ -25,14 +31,14 @@
--------------------------------------------------------------------------
Package: marathi
Author: Niranjan
-Version: 1.6.1 (15 January, 2021)
+Version: 1.6.2 (3 April, 2021)
Description: For conveniently typesetting Marathi
language with LuaLaTeX and XeLaTeX. This package
will now onwards host localizations needed for Marathi
language. Currently the package localizes package
blindtext and package expex.
-Repository: https://gitlab.com/niranjanvikastambe/marathi
-Bug tracker: https://gitlab.com/niranjanvikastambe/marathi/-/issues
+Repository: https://gitlab.com/niruvt/marathi
+Bug tracker: https://gitlab.com/niruvt/marathi/-/issues
License: `आलोक' copyleft license v1.0 or later.
Link - https://gitlab.com/aalok/nityamukta-parwana
and
diff --git a/language/marathi/glossaries.gls b/language/marathi/glossaries.gls
index dadb11aca5..11c89465d5 100644
--- a/language/marathi/glossaries.gls
+++ b/language/marathi/glossaries.gls
@@ -1,5 +1,5 @@
\newglossaryentry{अक्षरजुळणी}{name={अक्षरजुळणी},description={Typesetting}}
-\newglossaryentry{बीजधारिका}{name={बीजधारिका},description={Source file. पर्यायी - स्रोत-धारिका}}
+\newglossaryentry{बीजधारिका}{name={बीजधारिका},description={Source file. पर्यायी: स्रोत-धारिका}}
\newglossaryentry{आज्ञासंच}{name={आज्ञासंच},description={Package}}
\newglossaryentry{चालक}{name={चालक},description={Compiler}}
\newglossaryentry{लाटेक्-वर्ग}{name={लाटेक्-वर्ग},description={Document class}}
diff --git a/language/marathi/marathi.dtx b/language/marathi/marathi.dtx
index dace360ba1..b87f73e707 100644
--- a/language/marathi/marathi.dtx
+++ b/language/marathi/marathi.dtx
@@ -5,8 +5,8 @@
% आज्ञासंच: marathi
% लेखक: निरंजन
% माहिती: लुआलाटेक् व झीलाटेक् ह्यांच्यासह मराठीचा सुलभ वापर करण्यासाठी.
-% संग्राहिका: https://gitlab.com/niranjanvikastambe/marathi
-% अडचणी: https://gitlab.com/niranjanvikastambe/marathi/-/issues
+% संग्राहिका: https://gitlab.com/niruvt/marathi
+% अडचणी: https://gitlab.com/niruvt/marathi/-/issues
% परवाना: आलोक नित्यमुक्त परवाना. आवृत्ती १.० किंवा त्यापुढील तसेच
% ग्नू पब्लिक परवाना आवृत्ती ३.०+
% ---------------------------------------------------------------------------
@@ -32,16 +32,22 @@
\iffalse
%</internal>
%<*readme>
+--------------------------------------------------------------------------
+Note: This README file contains information about LaTeX package <marathi> in
+Marathi & English. As this package is targeted more towards the speakers of
+Marathi language, the description is initially given in Marathi, but for general
+readers an English description is provided at the end.
+--------------------------------------------------------------------------
आज्ञासंच: marathi
लेखक: निरंजन
-आवृत्ती: १.६.१ (१५ जानेवारी, २०२१)
+आवृत्ती: १.६.२ (३ एप्रिल, २०२१)
माहिती: लुआलाटेक् व झीलाटेक् ह्यांच्यासह मराठीचा
सुलभ वापर करण्यासाठी. इथून पुढे लाटेक्-वरील मराठीच्या
स्थानिकीकरणाचे काम ह्या आज्ञासंचामार्फत केले जाईल.
तूर्त expex व blindtext ह्या आज्ञासंचांचे स्थानिकीकरण
ह्या आज्ञासंचामार्फत पुरवले आहे.
-संग्राहिका: https://gitlab.com/niranjanvikastambe/marathi
-अडचणी: https://gitlab.com/niranjanvikastambe/marathi/-/issues
+संग्राहिका: https://gitlab.com/niruvt/marathi
+अडचणी: https://gitlab.com/niruvt/marathi/-/issues
परवाना: आलोक नित्यमुक्त परवाना. आवृत्ती १.० किंवा त्यापुढील.
दुवा - https://gitlab.com/aalok/nityamukta-parwana
आणि
@@ -59,14 +65,14 @@
--------------------------------------------------------------------------
Package: marathi
Author: Niranjan
-Version: 1.6.1 (15 January, 2021)
+Version: 1.6.2 (3 April, 2021)
Description: For conveniently typesetting Marathi
language with LuaLaTeX and XeLaTeX. This package
will now onwards host localizations needed for Marathi
language. Currently the package localizes package
blindtext and package expex.
-Repository: https://gitlab.com/niranjanvikastambe/marathi
-Bug tracker: https://gitlab.com/niranjanvikastambe/marathi/-/issues
+Repository: https://gitlab.com/niruvt/marathi
+Bug tracker: https://gitlab.com/niruvt/marathi/-/issues
License: `आलोक' copyleft license v1.0 or later.
Link - https://gitlab.com/aalok/nityamukta-parwana
and
@@ -94,7 +100,7 @@ Copy the following files in the following path texmf-dist/tex/latex/marathi
\hypersetup{
unicode,
pdfauthor={निरंजन},
- pdftitle={मराठी (आवृत्ती १.६.१, जानेवारी २०२१)},
+ pdftitle={मराठी (आवृत्ती १.६.२, एप्रिल २०२१)},
pdfsubject={लुआलाटेक् व झीलाटेक्-सह मराठीत अक्षरजुळणी.},
pdfkeywords={मराठी, लुआलाटेक्, झीलाटेक्, बेबल, पॉलिग्लॉसिया},
pdfproducer={हायपर्रेफ्-सह लुआलाटेक्},
@@ -148,8 +154,8 @@ Script=Devanagari
% \author{निरंजन}
% \date^^A
% {^^A
-% आवृत्ती १.६.१ \textemdash\ १५ जानेवारी, २०२१\\[1ex]^^A
-% {\small\textcolor{गिटलॅब}{\faIcon{gitlab}}\quad\url{https://gitlab.com/niranjanvikastambe/marathi}}^^A
+% आवृत्ती १.६.२ \textemdash\ ३ एप्रिल, २०२१\\[1ex]^^A
+% {\small\textcolor{गिटलॅब}{\faIcon{gitlab}}\quad\url{https://gitlab.com/niruvt/marathi}}^^A
% }^^A
%
% \maketitle
@@ -324,17 +330,17 @@ Script=Devanagari
%<*package>
% \end{macrocode}
% \begin{macrocode}
-\ProvidesPackage{marathi}[2021-01-15 v1.6 झीलाटेक् व लुआलाटेक्-सह मराठीचा सुलभ वापर]
+\ProvidesPackage{marathi}[2021-04-03 v1.6.2 झीलाटेक् व लुआलाटेक्-सह मराठीचा सुलभ वापर]
\NeedsTeXFormat{LaTeX2e}
% \end{macrocode}
% ह्या आज्ञांसह आज्ञासंचाची पायाभूत माहिती पुरवली. डेव्हिड कार्लआयल ह्यांनी गिट
% प्रकल्पावर नोंदवलेल्या
-% \href{https://gitlab.com/niranjanvikastambe/marathi/-/issues/1}{ह्या}
+% \href{https://gitlab.com/niruvt/marathi/-/issues/1}{ह्या}
% तक्रारीमुळे आज्ञासंचाची संक्षिप्त माहिती पुरवण्याची पद्धत मला वापरता आली.
%
% \subsection{अडचण दाखवणे}
% ह्या आज्ञासंचाच्या गिट प्रकल्पावर नोंदवलेल्या
-% \href{https://gitlab.com/niranjanvikastambe/marathi/-/issues/4}{तक्रारीचा}
+% \href{https://gitlab.com/niruvt/marathi/-/issues/4}{तक्रारीचा}
% विचार करून झी-लाटेक् अथवा लुआलाटेक् ह्या चालकांव्यतिरिक्त एखादा चालक वापरला गेल्यास
% वापरकर्त्यास चालक बदलण्याची सूचना दिली जावी ह्याकरिता पुढील आज्ञावली लिहिण्यात
% आली आहे.
@@ -408,7 +414,7 @@ Script=Devanagari
% आज्ञासंचाला मूलभूत भाषांतरे पुरवणारा आज्ञासंच मानून \pkg{polyglossia} हा आज्ञासंच
% वैकल्पिक ठेवला आहे. \pkg{polyglossia} आज्ञासंच केवळ झीलाटेक्-सह योग्य फलित
% देतो. डेव्हिड कार्लआयल ह्यांनी नोंदवलेल्या
-% \href{https://gitlab.com/niranjanvikastambe/marathi/-/issues/2}{ह्या}
+% \href{https://gitlab.com/niruvt/marathi/-/issues/2}{ह्या}
% तक्रारीमुळे भाषांतरे पुरवणारा आज्ञासंच निवडण्यात खूप मदत झाली. शोभिका हा उत्कृष्ट
% देवनागरी टंक टेक्-वितरणासह येत असल्याने त्याची निवड मूलटंक म्हणून करण्यात आली
% आहे. \verb|\टंक| ह्या आज्ञेसह मूलटंक बदलता येतो. \verb|\दुसराटंक| ह्या आज्ञेसह अधिकचे
diff --git a/language/marathi/marathi.ins b/language/marathi/marathi.ins
index c19cb84ce0..bde00b05c1 100644
--- a/language/marathi/marathi.ins
+++ b/language/marathi/marathi.ins
@@ -6,7 +6,7 @@
\preamble
--------------------------------------------------------------------------
-लाटेक् आज्ञासंच मराठी आवृत्ती १.६.१
+लाटेक् आज्ञासंच मराठी आवृत्ती १.६.२
© २०२१ निरंजन
ह्या सामग्रीच्या वितरणाचे व प्रतिमुद्रणाचे अधिकार आलोक नित्यमुक्त परवान्यासह मुक्त करण्यात येत
@@ -20,7 +20,7 @@
https://gitlab.com/aalok/nityamukta-parwana
--------------------------------------------------------------------------
-LaTeX Package marathi v1.6.1
+LaTeX Package marathi v1.6.2
© 2021 Niranjan
This program is free software: you can redistribute it and/or modify
@@ -39,8 +39,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
आज्ञासंच: marathi
लेखक: निरंजन
माहिती: लुआलाटेक् व झीलाटेक् ह्यांच्यासह मराठीचा सुलभ वापर करण्यासाठी.
-दुवा: https://gitlab.com/niranjanvikastambe/marathi
-अडचणी: https://gitlab.com/niranjanvikastambe/marathi/-/issues
+दुवा: https://gitlab.com/niruvt/marathi
+अडचणी: https://gitlab.com/niruvt/marathi/-/issues
परवाना: आलोक नित्यमुक्त परवाना. आवृत्ती १.०+
दुवा : https://gitlab.com/aalok/nityamukta-parwana
आणि
diff --git a/language/marathi/marathi.pdf b/language/marathi/marathi.pdf
index 6f622b6347..88a15721ba 100644
--- a/language/marathi/marathi.pdf
+++ b/language/marathi/marathi.pdf
Binary files differ
diff --git a/macros/latex/contrib/abraces/README.md b/macros/latex/contrib/abraces/README.md
new file mode 100644
index 0000000000..e5632dc131
--- /dev/null
+++ b/macros/latex/contrib/abraces/README.md
@@ -0,0 +1,16 @@
+`abraces` 2021/03/31 v2.0
+----------------------------------------
+
+A package that provides a character key-driven interface to
+supplement new constructions of the traditional `\overbrace`
+and `\underbrace` pairs in an asymmetric or arbitrary way.
+
+Copyright (c) 2021 Werner Grundlingh
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) any later version.
+The latest version of this license is in
+ http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of LaTeX
+version 2005/12/01 or later. \ No newline at end of file
diff --git a/macros/latex/contrib/abraces/abraces-doc.pdf b/macros/latex/contrib/abraces/abraces-doc.pdf
index 95030130fa..31cd8f8190 100644
--- a/macros/latex/contrib/abraces/abraces-doc.pdf
+++ b/macros/latex/contrib/abraces/abraces-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/abraces/abraces-doc.tex b/macros/latex/contrib/abraces/abraces-doc.tex
index 6db0fca990..b0326d6ee8 100644
--- a/macros/latex/contrib/abraces/abraces-doc.tex
+++ b/macros/latex/contrib/abraces/abraces-doc.tex
@@ -1,17 +1,23 @@
-% $Id: abraces-doc.tex,v 1.0 2012/08/31 00:00:00 wgrundlingh stable $
+% $Id: abraces-doc.tex,v 2.0 2021/03/31 00:00:00 wgrundlingh stable $
\RequirePackage{xcolor}% http://ctan.org/pkg/xcolor (required to "overload" color package)
-\documentclass{ltxdockit}[2011/03/25]
-%\usepackage{xspace}% http://ctan.org/pkg/xspace (already loaded by ltxdockit)
-\usepackage[overload]{abraces}% http://ctan.org/pkg/abraces
-\usepackage{booktabs}% http://ctan.org/pkg/booktabs
-\usepackage{shortvrb}% http://ctan.org/pkg/shortvrb
-\usepackage{amsmath}% http://ctan.org/pkg/amsmath
+\documentclass[10pt]{ltxdockit}[2011/03/25]
+
+%\usepackage{xspace}% Already loaded by ltxdockit
+\usepackage[overload]{abraces}
+\usepackage{booktabs,shortvrb,amsmath,xfp}
\MakeShortVerb{\|}
-\rcsid{$Id: abraces.tex,v 1.0 2012/08/31 00:00:00 wgrundlingh stable $}
+\rcsid{$Id: abraces.tex,v 2.0 2021/03/31 00:00:00 wgrundlingh stable $}
%\setcounter{secnumdepth}{2}
%\setcounter{tocdepth}{4}
+% https://tex.stackexchange.com/a/472150/5764
+% Use cases for breaking a paragraph that is not visible to the end user, forcing the paragraph to be set with a full-width/-length
+% last line. Then one could insert a \pagebreak if needed, depending on the layout requirements
+\newcommand{\parnopar}[1][]{\parfillskip=0pt\par%
+ #1%
+ \parskip=0pt\noindent\parfillskip=0pt plus1fil}
+
\newsavebox{\codebox}% For storing code segments in footer.
\newcommand*{\abracesctan}{http://ctan.org/pkg/abraces}
@@ -23,9 +29,14 @@
color,
bracetext,
bracescript,
- foxanddog,
+ FnD,
newcolumntype,
- newbracespec}
+ newbracespec,
+ bracecolor,
+ color,
+ textcolor,
+ aftergroup,
+ text}
}
\titlepage{%
@@ -38,177 +49,281 @@
date={\rcstoday}}
\hypersetup{%
- pdftitle={The abraces Package},
+ pdftitle={The abraces package},
pdfsubject={Asymmetric or arbitrary braces},
- pdfauthor={Werner Grundlingh},
+ pdfauthor={Werner Grundlingh (latex.abraces@gmail.com)},
pdfkeywords={tex, latex, braces, overbrace, underbrace, math-mode}}
+\usepackage{parskip}
+
+\newlength{\bracecusplen}
+\settowidth{\bracecusplen}{$\braceru\bracelu$}
+
\begin{document}
\printtitlepage
%\tableofcontents
-\section{Introduction} \label{intro}
+\section{Introduction} \label{sec:introduction}
-The \sty{abraces}\footnote{The \sty{abraces} package: \url{http://ctan.org/pkg/abraces}} package provides a character key-driven interface to supplement new constructions of the traditional \lstinline!\overbrace! and \lstinline!\underbrace! pairs in an asymmetric or arbitrary way.
+The \href{http://ctan.org/pkg/abraces}{\sty{abraces} package} provides a character key-driven interface to supplement new constructions of the traditional \lstinline!\overbrace! and \lstinline!\underbrace! pairs in an asymmetric or arbitrary way.
-\section{User interface} \label{user-interface}
+\section{Basic user interface} \label{sec:user-interface}
-\sty{abraces} defines two counterparts to the existing braces:
+This package defines two counterparts to the existing braces:
\begin{ltxsyntax}
-\cmditem{aoverbrace}[spec]{stuff}
-
-\cmditem{aunderbrace}[spec]{stuff}
+\cmditem{aoverbrace}[brace spec]{stuff}[script spec]\lstinline!^{!\prm{upper script}\lstinline!}_{!\prm{lower script}\lstinline!}!
-These create an overbrace and underbrace where \prm{spec} defines a construction pattern based on the elements in Table~\ref{tab:abrace-spec}.
+\cmditem{aunderbrace}[brace spec]{stuff}[script spec]\lstinline!^{!\prm{upper script}\lstinline!}_{!\prm{lower script}\lstinline!}!
-The provided interface is based on a ratio-principle, allowing one to put a larger share of ``filler'' (the horizontal rule) at any location within the brace construction. The traditional \lstinline!\overbrace! and \lstinline!\underbrace! pairs have a \mbox{1:1} share between the left and right side (either side of the tip/cust of the brace). Using a \mbox{1:2} ratio would place the brace cusp one third (from the left) into the brace. Similary a \mbox{3:2} ratio would place the cusp 40\% (or two fifths) from the right edge of the brace.
+\end{ltxsyntax}
-Other, more complex construction -- by means of the optional \prm{spec} argument -- can also be made by mixing the elements presented in Table~\ref{tab:abrace-spec}.
+Note that both the \prm{brace spec} and \prm{script spec} arguments are optional, as well as the use of an \prm{upper script} and \prm{lower script}. As such, in its most basic form, \lstinline!\aoverbrace{!\prm{stuff}\lstinline!}! (and \lstinline!\aunderbrace{!\prm{stuff}\lstinline!}!) would be similar to the traditional \lstinline!\overbrace{!\prm{stuff}\lstinline!}! (and \lstinline!\underbrace{!\prm{stuff}\lstinline!}!). However, if you specify a \prm{brace spec} -- a construction pattern based on the elements in \hyperref[tab:abrace-spec]{Table~\ref*{tab:abrace-spec}} -- you could adjust the shape of the brace in an arbitrary way. These definitions are robust.
-\cmditem{newbracespec}{char}{spec}
+The \prm{brace spec} interface is based on a ratio-principle, allowing one to put a larger share of ``filler'' (the horizontal rule) at any location within the brace construction. The traditional \lstinline!\overbrace! and \lstinline!\underbrace! pairs have a \mbox{1:1} share between the left and right side (either side of the tip/cusp of the brace), thereby forcing the tip/cust to be placed directly in the center horizontally. With \lstinline!abraces!, using a \mbox{1:2} ratio would place the brace cusp one third (from the left) into the brace. Similary a \mbox{3:2} ratio would place the cusp 40\% (or two fifths) from the right edge of the brace. The same holds for elements specified within \prm{script spec}, except these are used to alter the location of the scrips. For more detail, see section \hyperref[sec:advanced-interface]{\ref*{sec:advanced-interface}~\nameref*{sec:advanced-interface}}.
-This allows the user to define a new brace specification \prm{char} the results in the (possibly complex) construction \prm{spec}. The usage is similar to that of a \lstinline!\newcolumntype! construction provided by the \sty{array}\footnote{The \sty{array} package: \url{http://ctan.org/pkg/array}} package.
+Other, more complex constructions are possible by mixing the elements presented in \hyperref[tab:abrace-spec]{Table~\ref*{tab:abrace-spec}}. See section \hyperref[sec:examples]{\ref*{sec:examples} \nameref*{sec:examples}} for a showcase of uses.
-\cmditem{bracescript}{spec}
+\begin{ltxsyntax}
-Since the brace cusps may not fall directly at the horizontal centre of the construction, \lstinline|\bracescript| is provided that takes a similar construction-style interface to that of \prm{spec} in \lstinline|\aoverbrace| and \lstinline|\aunderbrace|. This allows the user to position the scripted text at the location(s) best-suited for presentation.
+\cmditem{newbracespec}{char}{brace spec}
\end{ltxsyntax}
+This allows the user to define a new brace specification \prm{char} that results in the (possibly complex) construction \prm{brace spec}. Note that \prm{char} should be different from any already used (see \hyperref[tab:abrace-spec]{Table~\ref*{tab:abrace-spec}}). The usage is similar to that of a \lstinline!\newcolumntype! construction provided by the \href{http://ctan.org/pkg/array}{\sty{array} package}.
\begin{table}[t]
\centering
+ \makeatletter
\begin{tabular}{cl}
\toprule
- \prm{spec} character & Output \\
+ \prm{spec} character & Output \\
\midrule
- |l| & $\bracelu$ \\
- |L| & $\braceld$ \\
- |r| & $\braceru$ \\
- |R| & $\bracerd$ \\
- |U| & $\braceru\bracelu$ \\
- |D| & $\bracerd\braceld$ \\
- |0| & (single) Empty fill \\
- |1|, \ldots,\verb|9| & Copies of regular fill \rule[.4ex]{2em}{1.5pt} \\
- |@{|\prm{stuff}|}| & Places \prm{stuff} into brace \\
- |!{|\prm{len}|}| & Regular fill of length \prm{len} \\
+ |l| & $\bracelu$ (left upward brace) \\
+ |L| & $\braceld$ (left downward brace) \\
+ |r| & $\braceru$ (right upward brace) \\
+ |R| & $\bracerd$ (right downward brace)\\
+ |U| & $\braceru\bracelu$ (upward cusp) \\
+ |D| & $\bracerd\braceld$ (downward cusp) \\
+ |,[|\prm{len}|]| & % Similar to \downbracketend in abraces.sty
+ \sbox\z@{$\braceld$}\dimen@\ht\z@ \advance\dimen@.7\fontdimen5\textfont2\relax
+ \vrule \@width\ht\z@ \@height\ht\z@ \@depth\dimexpr\dimen@-\ht\z@\ (downward end with optional \prm{len}gth control) \\
+ |'[|\prm{len}|]| & % Similar to \upbracketend in abraces.sty
+ \sbox\z@{$\bracelu$}\dimen@\ht\z@ \advance\dimen@.7\fontdimen5\textfont2\relax
+ \vrule \@width\ht\z@ \@height\dimen@ \@depth\z@\ (upward end with optional \prm{len}gth control) \\
+ |0| & (single) Empty fill \\
+ |1|, \ldots, |9| & Copies of regular fill \rule[.4ex]{2em}{1.5pt} \\
+ |@{|\prm{stuff}|}| & Places \prm{stuff} into brace \\
+ |!{|\prm{len}|}| & Regular fill of length \prm{len} \\
|*{|\prm{num}|}{|\prm{stuff}|}| & Repeat \prm{stuff} a total of \prm{num} times \\
\bottomrule
\end{tabular}
- \caption{Character specifications \prm{spec} used to construct braces.}
+ \makeatother
+ \caption{Character specifications within \prm{brace spec} used to construct braces.}
\label{tab:abrace-spec}
\end{table}
-If the package is loaded with the \lstinline!overload! option
+By default, any scripts will be placed at the cusp (|D| when providing a \prm{lower script} via \lstinline|_| or |U| when providing an \prm{upper script} via \lstinline|^|) of the brace. If you use more than one cusp within your \prm{brace spec}, you can separate scripts using \lstinline!&! which will place them above/below subsequent brace cusps, similar to separating columns within a \lstinline!tabular!.
+\begin{ltxsyntax}
+
+\cmditem{bracecolor}{spec}
+
+\end{ltxsyntax}
+
+If you're interested in using any form of colour, \lstinline|\bracecolor| will allow you to change the brace colour via an \lstinline!@!-insertion (for example, \lstinline!@{\bracecolor{red}}! would yield a \textcolor{red}{red} brace from that point onward). Regular script colouring can still be achieved using \lstinline!\color! or \lstinline!\textcolor!. The motivation here is that elements within the \lstinline!@!-insertions are grouped; \lstinline!\bracecolor! uses \lstinline!\aftergroup! to re-insert the use of \lstinline!\color!.
+
+If the package is loaded with the \lstinline!overload! option
\begin{lstlisting}
\usepackage[overload]{abraces}
\end{lstlisting}
-
-\noindent the traditional \lstinline!\overbrace! and \lstinline!\underbrace! pairs are redefined to be equivalent to \lstinline!\aoverbrace! and \lstinline!\aunderbrace!, respectively, via a straight-forward \lstinline!\let!:
-
+the traditional \lstinline!\overbrace!/\lstinline!\underbrace! pairs are redefined to be equivalent to \lstinline!\aoverbrace! and \lstinline!\aunderbrace!, respectively, via a straight-forward \lstinline!\let!:
\begin{lstlisting}
\let\overbrace\aoverbrace
\let\underbrace\aunderbrace
\end{lstlisting}
-\section{Examples}
+\section{Advanced uses} \label{sec:advanced-interface}
+
+There are some cases where you don't want to place elements exactly at the tip(s) of the brace(s). Maybe it's because you don't have any tips on your braces, or need to write other information around the tips. To that end, the second optional \prm{script spec} argument is provided where you can specify a new sequence that may differ from the original brace specification. Without any tips, for example, one could write \lstinline!$\aoverbrace[L1R]{a + b + \cdots +!\parnopar\lstinline!z}[U]^{\text{26 terms}}$! to denote a grouping of elements:
+\[
+ \aoverbrace[L1R]{a + b + \cdots + z}[U]^{\text{26 terms}}
+\]
+More detailed examples are covered in section \hyperref[sec:examples]{\ref*{sec:examples}~\nameref*{sec:examples}}.
-Some examples of the types of braces that can be constructed using \sty{abraces}:
+\section{Examples} \label{sec:examples}
+Some basic examples of the types of braces that can be constructed using \sty{abraces}:
\begin{lstlisting}
-\newcommand{\foxanddog}{%
+\newcommand{\FnD}{%
\textrm{The quick brown fox jumped over the lazy dog}}
\end{lstlisting}
-\newcommand{\foxanddog}{%
+\newcommand{\FnD}{%
\textrm{The quick brown fox jumped over the lazy dog}}
\begin{itemize}
- \item \lstinline!\aoverbrace{\foxanddog}! (traditional \lstinline!\overbrace!): \\ $\aoverbrace{\foxanddog}$
- \item \lstinline!\aunderbrace{\foxanddog}! (traditional \lstinline!\underbrace!): \\ $\aunderbrace{\foxanddog}$
- \item \lstinline!\aoverbrace[L3U1R]{\foxanddog}!: \\ $\aoverbrace[L3U1R]{\foxanddog}$
- \item \lstinline!\aoverbrace[l1D1r]{\foxanddog}!: \\ $\aoverbrace[l1D1r]{\foxanddog}$
- \item \lstinline!\aunderbrace[l2D7r]{\foxanddog}!: \\ $\aunderbrace[l2D7r]{\foxanddog}$
- \item \lstinline!\aunderbrace[l1D2U2D1r]{\foxanddog}!: \\ $\aunderbrace[l1D2U2D1r]{\foxanddog}$
- \item \lstinline!\aoverbrace[L1R]{\foxanddog}!: \\ $\aoverbrace[L1R]{\foxanddog}$
- \item \lstinline!\aunderbrace[L1U3R]{\foxanddog}!: \\ $\aunderbrace[L1U3R]{\foxanddog}$
- \item \lstinline!\aunderbrace[l6R0l3D3r0L6r]{\foxanddog}!: \\ $\aunderbrace[l6R0l3D3r0L6r]{\foxanddog}$
- \item \lstinline!\aoverbrace[L5*{3}{01}05U50*{3}{10}5R]{\foxanddog}!: \\ $\aoverbrace[L5*{3}{01}05U50*{3}{10}5R]{\foxanddog}$
- \item \lstinline!\aunderbrace[l1@{\hspace{5em}}2D2@{\hspace{3em}}1r]{\foxanddog}!: \\ $\aunderbrace[l1@{\hspace{5em}}2D2@{\hspace{3em}}1r]{\foxanddog}$
- \item \lstinline~\aunderbrace[l1R@{\color{red!80!white}}L1r]{\foxanddog}~: \\ $\aunderbrace[l1R@{\color{red!80!white}}L1r]{\foxanddog}$
- \item \lstinline~\aoverbrace[L1D!{5em}R]{\foxanddog}~: \\ $\aoverbrace[L1D!{5em}R]{\foxanddog}$
+ \item \lstinline!\aoverbrace{\FnD}! (traditional \lstinline!\overbrace!): \\
+ $\aoverbrace{\FnD}$
+
+ \item \lstinline!\aunderbrace{\FnD}! (traditional \lstinline!\underbrace!): \\
+ $\aunderbrace{\FnD}$
+
+ \item \lstinline!\aoverbrace[L3U1R]{\FnD}!: \\
+ $\aoverbrace[L3U1R]{\FnD}$
+
+ \item \lstinline!\aoverbrace[*{6}{0}l1D1r*{5}{0}]{\FnD}!: \\
+ $\aoverbrace[*{6}{0}l1D1r*{5}{0}]{\FnD}$
+
+ \item \lstinline~\aunderbrace[l2D1r000@{\bracecolor{blue!70!black}}l1D2r]{\FnD}~: \\
+ $\aunderbrace[l2D1r000@{\bracecolor{blue!70!black}}l1D2r]{\FnD}$
+
+ \item \lstinline!\aunderbrace[l1D2U2D1r]{\FnD}!: \\
+ $\aunderbrace[l1D2U2D1r]{\FnD}$
+
+ \item \lstinline!\aoverbrace[L1R]{\FnD}!: \\
+ $\aoverbrace[L1R]{\FnD}$
+
+ \item \lstinline!\aunderbrace[L1U3R]{\FnD}!: \\
+ $\aunderbrace[L1U3R]{\FnD}$
+
+ \item \lstinline!\aunderbrace['6,0l3D3r0,6']{\FnD}!: \\
+ $\aunderbrace['6,0l3D3r0,6']{\FnD}$
+
+ \item \lstinline!\aoverbrace[L5*{3}{01}05U50*{3}{10}5R]{\FnD}!: \\
+ $\aoverbrace[L5*{3}{01}05U50*{3}{10}5R]{\FnD}$
+
+ \item \lstinline!\aunderbrace[l1@{\hspace{5em}}2D2@{~\ldots~}1r]{\FnD}!: \\
+ $\aunderbrace[l1@{\hspace{5em}}2D2@{~\ldots~}1r]{\FnD}$
+
+ \item \lstinline~\aunderbrace[l1R@{\bracecolor{red!80!white}}L1r]{\FnD}~: \\
+ $\aunderbrace[l1R@{\bracecolor{red!80!white}}L1r]{\FnD}$
+
+ \item \lstinline~\aoverbrace[,1D!{5em},]{\FnD}~: \\
+ $\aoverbrace[,1D!{5em},]{\FnD}$
\end{itemize}
-The next question might be how to add content to the brace cusps. Here's a possible way to insert text at the appropriate ratio, using the above construction techniques:
-
-\newcommand{\bracetext}[1]{%
- \makebox[0pt][c]{\scriptsize#1}}%
-\[
- \overbrace[L2U2D1U1R]{\foxanddog}^{%
- \bracescript{L2r@{\bracetext{left}}l2D1r@{\bracetext{right}}l1R}%
- }%
-\]
-
-\begin{lstlisting}
-\newcommand{\bracetext}[1]{%
- \makebox[0pt][c]{\scriptsize#1}}%
-\[
- \overbrace[L2U2D1U1R]{\foxanddog}^{%
- \bracescript{L2r@{\bracetext{left}}l2D1r@{\bracetext{right}}l1R}%
- }%
-\]
-\end{lstlisting}
+Some more advanced techniques of adding content to the brace cusps:
+\begin{itemize}
+ \item \lstinline!\aoverbrace[L1U2R]{\FnD}^{\text{one-third of the way}}!: \\
+ $\aoverbrace[L1U2R]{\FnD}^{\text{one-third of the way}}$
+
+ \item \lstinline!\aoverbrace[L1U1D1U1R]{\FnD}^{\text{left} & \text{right}}!: \\
+ $\aoverbrace[L1U1D1U1R]{\FnD}^{\text{left} & \text{right}}$
+
+ \item \lstinline!\aoverbrace[L1U1D1U1R]{\FnD}! \\
+ \quad\lstinline![L1U1U1U1R]^{\text{left} & \text{middle} & \text{right}}!: \\
+ $\aoverbrace[L1U1D1U1R]{\FnD}[L*{3}{1U}1R]^{\text{left} & \text{middle} & \text{right}}$
+
+ \item
+ \newcommand{\ind}[1][1]{\hspace*{\fpeval{#1*1.5}em}}%
+ \lstinline!\newbracespec{u}! \\
+ \ind\lstinline!{@{\hspace{-.5\bracecusplen}}U@{\hspace{-.5\bracecusplen}}}! \\
+ \lstinline!\newbracespec{d}! \\
+ \ind\lstinline!{@{\hspace{-.5\bracecusplen}}D@{\hspace{-.5\bracecusplen}}}! \\
+ \lstinline!$\aunderbrace! \\
+ \ind[1]\lstinline![00l2@{\hspace{-\bracecusplen}}1r]{% \aunderbrace brace script! \\
+ \ind[2]\lstinline!\aoverbrace! \\
+ \ind[3]\lstinline![L1@{\hspace{-\bracecusplen}}1R000]% \aoverbrace brace script! \\
+ \ind[3]\lstinline!{\FnD}% stuff! \\
+ \ind[3]\lstinline![1u13]% \aoverbrace script spec! \\
+ \ind[3]\lstinline!^{2/5}% \aoverbrace upper script! \\
+ \ind\lstinline!}! \\
+ \lstinline![43d3]% \aunderbrace script spec! \\
+ \lstinline!_{3/5}$% \aunderbrace lower script!: \\
+ \newbracespec{u}{@{\hspace{-.5\bracecusplen}}U@{\hspace{-.5\bracecusplen}}}%
+ \newbracespec{d}{@{\hspace{-.5\bracecusplen}}D@{\hspace{-.5\bracecusplen}}}%
+ $\aunderbrace
+ [00l2@{\hspace{-\bracecusplen}}1r]{% \aunderbrace brace script
+ \aoverbrace
+ [L1@{\hspace{-\bracecusplen}}1R000]% \aoverbrace brace script
+ {\FnD}% stuff
+ [1u13]% \aoverbrace script spec
+ ^{2/5}% \aoverbrace upper script
+ }
+ [43d3]% \aunderbrace script spec
+ _{3/5}$% \aunderbrace lower script
+
+ \item
+ \lstinline!\newbracespec{a}{@{\hspace{-.5\bracecusplen}}D}! \\
+ \quad\lstinline!\newbracespec{z}{D@{\hspace{-.5\bracecusplen}}}! \\
+ \quad\lstinline!\aunderbrace[l1r]{\FnD}! \\
+ \quad\quad\lstinline![a1z]_{\text{\rlap{far left}} & \text{\llap{far right}}}!: \\
+ \newbracespec{a}{@{\hspace{-.5\bracecusplen}}D}%
+ \newbracespec{z}{D@{\hspace{-.5\bracecusplen}}}%
+ $\aunderbrace[l1r]{\FnD}[a1z]_{\text{\rlap{far left}} & \text{\llap{far right}}}$
+\end{itemize}
\begin{lrbox}{\codebox}\footnotesize\lstinline!\overbrace!\end{lrbox}% Capture code in \codebox
-Another usage might include ``breaking'' a brace across lines to indicate a continuous grouping of objects. The following example\footnote{Taken from the question \href{http://tex.stackexchange.com/q/25510/5764}{\usebox{\codebox} split across multiple lines} on the TeX StackExchange network.} constructs two open-ended \lstinline!\aoverbrace!s which ``spans'' multiple lines:
+Here is a real-world example where ``breaking'' a brace across lines is required to indicate a continuous grouping of objects. This example\footnote{Taken from the question \href{http://tex.stackexchange.com/q/25510/5764}{\usebox{\codebox} split across multiple lines} on the TeX StackExchange network.} constructs two open-ended \lstinline!\aoverbrace!s that ``span'' multiple lines:
\begin{multline*}
- f(x)=a_0+a_1x+a_2x^2+
- \aoverbrace[L1U1]{a_3x^3+a_4x^4+\cdots+a_{i-1}x^{i-1}+\hspace{1em}}^
- {\bracescript{L1r@{\bracetext{some text}}l1}} \\[\jot]
- \aoverbrace[1R]{\hspace{1em}a_ix^i+a_{i+1}x^{i+1}}+\cdots+a_{n-1}x^{n-1}
+ f(x) = a_0 + a_1 x + a_2 x^2 +
+ \aoverbrace[L1U1@{~\ldots}]{a_3 x^3 + a_4 x^4 + \dots +
+ a_{i - 1} x^{i - 1} + \quad}^
+ {\text{some text}} \\[\jot]
+ \aoverbrace[@{\ldots~}1R]{\quad a_i x^i + a_{i + 1} x^{i + 1}} +
+ \dots + a_{n - 1} x^{n - 1}
\end{multline*}
\begin{lstlisting}
\usepackage{amsmath}% http://ctan.org/pkg/amsmath
%...
\begin{multline*}
- f(x)=a_0+a_1x+a_2x^2+
- \aoverbrace[L1U1]{a_3x^3+a_4x^4+\cdots+a_{i-1}x^{i-1}+\hspace{1em}}^
- {\bracescript{L1r@{\bracetext{some text}}l1}} \\[\jot]
- \aoverbrace[1R]{\hspace{1em}a_ix^i+a_{i+1}x^{i+1}}+
- \cdots+a_{n-1}x^{n-1}
+ f(x) = a_0 + a_1 x + a_2 x^2 +
+ \aoverbrace[L1U1@{~\ldots}]{a_3 x^3 + a_4 x^4 + \dots +
+ a_{i - 1} x^{i - 1} + \quad}^
+ {\text{some text}} \\[\jot]
+ \aoverbrace[@{\ldots~}1R]{\quad a_i x^i + a_{i + 1} x^{i + 1}} +
+ \dots + a_{n - 1} x^{n - 1}
\end{multline*}
\end{lstlisting}
As a final example, consider a brace that should include a dashed component. Using \lstinline|\newbracespec| one can define your own dashed component:
-
\begin{lstlisting}
\newbracespec{d}{%
5@{\hspace{4pt}}1@{\hspace{4pt}}!{2em}@{\hspace{4pt}}1@{\hspace{4pt}}5%
}
\end{lstlisting}
-
\noindent and then use
-
\begin{lstlisting}
\[
- \aunderbrace[l*{3}{d}D*{3}{d}r]{\foxanddog}_
- {\bracetext{What happened to the cat?}}
+ \aunderbrace[l*{3}{d}D*{3}{d}r]{\FnD}_{\text{What happened to the cat?}}
\]
\end{lstlisting}
+\[
+ \newbracespec{d}{1@{\hspace{4pt}}1@{\hspace{4pt}}!{1em}@{\hspace{4pt}}1@{\hspace{4pt}}1}
+ \aunderbrace[l*{3}{d}D*{3}{d}r]{\FnD}_{\text{What happened to the cat?}}
+\]
-\newbracespec{d}{1@{\hspace{4pt}}1@{\hspace{4pt}}!{1em}@{\hspace{4pt}}1@{\hspace{4pt}}1}
+\section{Terms of reference}
-\[ \aunderbrace[l*{3}{d}D*{3}{d}r]{\foxanddog}_{\bracetext{What happened to the cat?}} \]
+This package originated from a question on the TeX StackEchange network called \href{http://tex.stackexchange.com/q/68526/5764}{Asymmetric overbrace}. Some code was taken from the \href{http://ctan.org/pkg/mathtools}{\sty{mathtools} package}.
-\section{Terms of reference}
+This material is released under and subject to the \href{https://latex-project.org/lppl/}{LaTeX Project Public Licence}.
+
+\section{Acknowledgements}
+
+Thanks to Frank Mittlebach who stepped in and suggested an improvement in the original way \sty{abraces} functioned. Expansions included the use of \LaTeX3 command interface (via the \href{http://ctan.org/pkg/xparse}{\sty{xparse} package}).
-This package originated from a question on the TeX StackEchange network called \href{http://tex.stackexchange.com/q/68526/5764}{Asymmetric overbrace}. Some code was taken from the \sty{mathtools}\footnote{The \sty{mathtools} package: \url{http://ctan.org/pkg/mathtools}} package.
+\section{Change log}
-This material is released under and subject to the \href{http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html}{LaTeX Project Public Licence}.
+\begin{itemize}
+ \item v2.0 (2021-03-31) Major update
+
+ \begin{itemize}
+ \item
+ The package now uses \href{http://ctan.org/pkg/xparse}{\sty{xparse}} for macro definitions.
+
+ \item
+ Included an automated way for handling elementary/default scripts. The placement of scripts can still be modified using the \lstinline|\bracescript| interface.
+
+ \item
+ The documentation was also updated to reflect the changes.
+ \end{itemize}
+
+ \item v1.0 (2012-08-31) Initial release
+\end{itemize}
\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/abraces/abraces.sty b/macros/latex/contrib/abraces/abraces.sty
index 768afbb3cd..68dbc7e8eb 100644
--- a/macros/latex/contrib/abraces/abraces.sty
+++ b/macros/latex/contrib/abraces/abraces.sty
@@ -1,111 +1,351 @@
-\ProvidesPackage{abraces}% http://ctan.org/pkg/abraces
- [2012/08/24 v1.0 Arbitrary and asymmetric braces]
-\newif\if@overload
-\DeclareOption{overload}{\@overloadtrue}
-\ProcessOptions
-\newsavebox{\bracebox}% stores content contained under/over brace
-
-\newcommand{\newbracespec}[2]{% Add a new brace specification based on existing ones
- \@defbracecharcode{#1}{\@genbrace#2\@nnil\@genbrace}
-}
-% Brace components
-\newcommand{\bracescript}[1]{{% Add a script above/below an over-/underbrace
- \let\@@bfil\@@bunfil% Make line leaders into void/empty leaders
- \let\@use@rl@se\phantom% Phantomize some brace components
- \makebox[\wd\bracebox]{$\genbrace{#1}$}% Place the text in a box of width \bracebox
-}}
-\def\@@bunfil{\leaders\hbox{\ }\hfill}% Empty filler
-\newcommand{\bracefil}[1]{%
- \csname brace@char@#1'\endcsname%
-}
-\def\@@bfil{\leaders \vrule \@height \ht\z@ \@depth \z@ \hfill}% default brace filler
-%\def\bfil{\@@bfil}%
-%\def\@bLfil{\@@bfil}% left leader filler
-%\def\@bRfil{\@@bfil}% right leader filler
-\def\aupbracefill#1{$\m@th\setbox\z@\hbox{$\braceld$}\genbrace{#1}$}
-\def\adownbracefill#1{$\m@th\setbox\z@\hbox{$\braceld$}\genbrace{#1}$}
-
-% Repetition structure. Reference:
-% Repeat command n times?
-% http://tex.stackexchange.com/q/16189/5764
-% Alternatively
-% \RequirePackage{expl3}% http://ctan.org/pkg/expl3
-% \ExplSyntaxOn
-% \cs_new_eq:NN \Repeat \prg_replicate:nn
-% \ExplSyntaxOff
-
-\newcommand{\Repeat}[1]{%
- \expandafter\@Repeat\expandafter{\the\numexpr #1\relax}%
-}
-\def\@Repeat#1{%
- \ifnum#1>0
- \expandafter\@@Repeat\expandafter{\the\numexpr #1-1\expandafter\relax\expandafter}%
- \else
- \expandafter\@gobble
- \fi
-}
-\def\@@Repeat#1#2{%
- \@Repeat{#1}{#2}#2%
-}
-% Taken from mathtools package (http://ctan.org/pkg/mathtools)
-\newcommand{\aunderbrace}[2][l1D1r]{%
- \begin{lrbox}{\bracebox}$\displaystyle{#2}$\end{lrbox}%
- \mathop{\vtop{\m@th\ialign{##\crcr
- $\hfil\displaystyle{#2}\hfil$\crcr
- \noalign{\kern.7\fontdimen5\textfont2\nointerlineskip}%
- \aupbracefill{#1}\crcr\noalign{\kern.5\fontdimen5\textfont2}}}}\limits}
-\newcommand{\aoverbrace}[2][L1U1R]{%
- \begin{lrbox}{\bracebox}$\displaystyle{#2}$\end{lrbox}%
- \mathop{\vbox{\m@th\ialign{##\crcr
- \noalign{\kern.5\fontdimen5\textfont2}%
- \adownbracefill{#1}\crcr
- \noalign{\kern.7\fontdimen5\textfont2\nointerlineskip}%
- $\hfil\displaystyle{#2}\hfil$\crcr}}}\limits}
-
-% Parsing structure. Reference:
-% Parsing a macro argument character-by-character for conditional execution
-% http://tex.stackexchange.com/q/33197/5764
-
-\let\@use@rl@se\relax
-\def\@defbracecharcode#1{% Macro to define brace character "codes"
- \@namedef{brace@char@#1}%
-}
-\@defbracecharcode{L}{\@use@rl@se\braceld\@genbrace}% Left down
-\@defbracecharcode{R}{\@use@rl@se\bracerd\@genbrace}% Right down
-\@defbracecharcode{l}{\@use@rl@se\bracelu\@genbrace}% Left up
-\@defbracecharcode{r}{\@use@rl@se\braceru\@genbrace}% Right up
-\@defbracecharcode{U}{\@use@rl@se\braceru\@use@rl@se\bracelu\@genbrace}% Tip up
-\@defbracecharcode{D}{\@use@rl@se\bracerd\@use@rl@se\braceld\@genbrace}% Tip down
-\@defbracecharcode{0}{\@@bunfil\@genbrace}% Do nothing
-\@defbracecharcode{1}{\@@bfil\@genbrace}% 1 filler
-\@defbracecharcode{2}{\@@bfil\@@bfil\@genbrace}% 2 fillers
-\@defbracecharcode{3}{\@@bfil\@@bfil\@@bfil\@genbrace}% 3 fillers
-\@defbracecharcode{4}{\@@bfil\@@bfil\@@bfil\@@bfil\@genbrace}% 4 fillers
-\@defbracecharcode{5}{\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@genbrace}% 5 fillers
-\@defbracecharcode{6}{\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@genbrace}% 6 fillers
-\@defbracecharcode{7}{\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@genbrace}% 7 fillers
-\@defbracecharcode{8}{\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@genbrace}% 8 fillers
-\@defbracecharcode{9}{\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@genbrace}% 9 fillers
-\@defbracecharcode{@}{\@firstofone@go}% Insert arbitrary stuff
-\@defbracecharcode{!}{\@firstofone@len}% Insert a leader of specific length
-\@defbracecharcode{*}{\@repeat@num@times}% Repeat stuff a number of times
-
-\newcommand{\@firstofone@go}[1]{#1\@genbrace}%
-\newcommand{\@firstofone@len}[1]{\hb@xt@#1{\@@bfil}\@genbrace}%
-\newcommand{\@repeat@num@times}[2]{\Repeat{#1}{\@genbrace#2\@nnil}\@genbrace}%
-
-\newcommand{\@genbrace}[1]{%
- \ifx\@nnil#1\relax\else
- \@nameuse{brace@char@#1\expandafter}%
- \fi%
-}
-\newcommand{\genbrace}[1]{%
- \@genbrace#1\@nnil%
-}
-
-% If package was loaded with \usepackage[overload]{abraces}
-\if@overload
- \let\overbrace\aoverbrace
- \let\underbrace\aunderbrace
-\fi
+%% abraces.sty
+%% Copyright 2021 Werner Grundlingh
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Werner Grundlingh.
+%
+% This work consists of the file abraces.sty.
+
+\ProvidesPackage{abraces}% http://ctan.org/pkg/abraces
+ [2021/03/31 v2.0 Arbitrary and asymmetric braces]
+
+\RequirePackage{xparse}
+
+\newif\if@overload
+\DeclareOption{overload}{\@overloadtrue}
+\ProcessOptions
+\newsavebox{\bracebox}% stores content contained under/over brace
+
+\newcommand{\newbracespec}[2]{% Add a new brace specification based on existing ones
+ \@defbracecharcode{#1}{\@genbrace#2\@nnil\@genbrace}
+}
+% Brace components
+\newcommand{\bracescript}[1]{{% Add a script above/below an over-/underbrace
+ \let\@@bfil\@@bunfil% Make line leaders into void/empty leaders
+ \let\@use@rl@se\phantom% Phantomize some brace components
+ \makebox[\wd\bracebox]{$\genbrace{#1}$}% Place the text in a box of width \bracebox
+}}
+\def\@@bunfil{\leaders\hbox{\ }\hfill}% Empty filler
+\newcommand{\bracefil}[1]{%
+ \csname brace@char@#1'\endcsname%
+}
+\def\@@bfil{\leaders \vrule \@height \ht\z@ \@depth \z@ \hfill}% default brace filler
+%\def\bfil{\@@bfil}%
+%\def\@bLfil{\@@bfil}% left leader filler
+%\def\@bRfil{\@@bfil}% right leader filler
+\def\aupbracefill#1{$\m@th\setbox\z@\hbox{$\braceld$}\genbrace{#1}$}
+\def\adownbracefill#1{$\m@th\setbox\z@\hbox{$\braceld$}\genbrace{#1}$}
+
+\DeclareDocumentCommand{\downbracketend}{ O{.7\fontdimen5\textfont2} }{%
+ \@use@rl@se
+ {\sbox\z@{$\braceld$}%
+ \dimen@\ht\z@ \advance\dimen@#1\relax
+ \vrule \@width\ht\z@ \@height\ht\z@ \@depth\dimexpr\dimen@-\ht\z@}%
+ \@genbrace}
+
+\DeclareDocumentCommand{\upbracketend}{ O{.7\fontdimen5\textfont2} }{%
+ \@use@rl@se
+ {\sbox\z@{$\bracelu$}%
+ \dimen@\ht\z@ \advance\dimen@#1\relax
+ \vrule \@width\ht\z@ \@height\dimen@ \@depth\z@}%
+ \@genbrace}
+
+% Repetition structure. Reference:
+% Repeat command n times?
+% http://tex.stackexchange.com/q/16189/5764
+\ExplSyntaxOn
+\cs_new_eq:NN \Repeat \prg_replicate:nn
+%FMi
+\cs_new_eq:NN \TrimArgSpaces \tl_trim_spaces:n % only needed when ^{...} should be text
+%FMi
+\ExplSyntaxOff
+
+% Taken from mathtools package (http://ctan.org/pkg/mathtools)
+\DeclareDocumentCommand{\aunderbrace}{ O{l1D1r} m o e{^_}}{%
+ \begin{lrbox}{\bracebox}$\displaystyle{#2}$\end{lrbox}%
+ \mathop{\vtop{\m@th\ialign{##\crcr
+ $\hfil\displaystyle{#2}\hfil$\crcr
+ \noalign{\kern.7\fontdimen5\textfont2\nointerlineskip}%
+ \aupbracefill{#1}\crcr\noalign{\kern.5\fontdimen5\textfont2}}}}\limits
+ % ...there was a ^:
+ \IfValueT{#4}{%
+ ^{%
+%FMi
+ \gdef\@abrace@text@arg{#4}% % save argument then split of portions later
+%FMi
+ \@defbracecharcode{A}{%
+ \@use@rl@se\braceru
+ \makebox[0pt][c]{\scriptsize
+%FMi % split off next part
+ \expandafter\@abrace@next@text\@abrace@text@arg&\@abrace@next@text}%
+%FMi
+ \@use@rl@se\bracelu\@genbrace
+ }%
+ % We interpret U as A
+ \let\brace@char@U\brace@char@A
+%FMi
+ \let\@abrace@stuff\phantom % render @{...} harmless
+%FMi
+ % Use the normal spec by default
+ \IfValueTF{#3}
+ {\bracescript{#3}}% Use newly-specified spec
+ {\bracescript{#1}}% Use default spec
+%FMi
+ \@abrace@is@arg@fully@used{^}{U}%
+%FMi
+ }%
+ }%
+ % ...there was a _:
+ \IfValueT{#5}{%
+ _{%
+%FMi
+ \gdef\@abrace@text@arg{#5}%
+%FMi
+ \@defbracecharcode{A}{%
+ \@use@rl@se\bracerd
+ \makebox[0pt][c]{%
+ \scriptsize % not needed if processed in math
+%FMi
+ \expandafter\@abrace@next@text\@abrace@text@arg&\@abrace@next@text}%
+%FMi
+ \@use@rl@se\braceld\@genbrace
+ }%
+ % We interpret D as A
+ \let\brace@char@D\brace@char@A
+%FMi
+ \let\@abrace@stuff\phantom % render @{...} harmless
+%FMi
+ % Use the normal spec by default
+ \IfValueTF{#3}
+ {\bracescript{#3}}% Use the newly-specified spec
+ {\bracescript{#1}}% Use the default spec
+%FMi
+ \@abrace@is@arg@fully@used{_}{D}%
+%FMi
+ }%
+ }%
+%FMi
+% If there is a second optional argument (#3) but there is neither
+% a ^{..} nor a _{..} then interpret the bracket group was not an optional argument
+% but actually belongs to the current formula, so return it.
+% Order of the test is #3 #5 #4 because an overbrace is more likely to have ^{..}.
+% For underbrace it is #3 #4 #5.
+ \IfValueT{#3}{\IfValueF{#5}{\IfValueF{#4}{[#3]}}}%
+%FMi
+}
+
+%\RequirePackage{unravel}
+
+%FMi
+\def\@abrace@next@text#1&#2\@abrace@next@text{%
+ \gdef\@abrace@text@arg{#2}%
+ % \TrimArgSpaces{#1}% % text solution
+ $\scriptstyle #1$% % use math mode instead? I think so
+}
+%FMi
+
+
+
+%FMi
+% check if current value of \@abrace@text@arg contains parts that haven't been used.
+%
+% Possible cases: (a) empty (b) one or more & symbols (c) some & symbol(s) and other stuff
+%
+% (c) is the case we need to generate an error for.
+
+
+\def\@abrace@is@arg@fully@used#1#2{%
+ \edef\abrace@tempa{\detokenize{#1}}% _ or ^
+ \def\abrace@tempb{#2}% % D or U
+ \let\abrace@next\@abrace@is@arg@fully@used@
+ \expandafter\@abrace@is@arg@fully@used@ \@abrace@text@arg \@nil &%
+}
+
+% As we know that here is at least \verb=\@nil &= in the stream ahead
+% we can grep one argument delimited by \verb=&= and then check if it
+% is empty (case (a) or (b)), if it is \verb=\@nil= (we are done) or
+% if it is anything else (case (c)).
+
+
+\def\@abrace@is@arg@fully@used@ #1&{%
+ \def\@abrace@text@arg{#1}%
+ \ifx\@abrace@text@arg\@empty % ok case
+ \else
+ \ifx\@abrace@text@arg\@nnil % we are done
+ \let\abrace@next\relax
+ \else
+ \PackageError{abraces}{Unused part in \abrace@tempa{...}:\MessageBreak
+ '\detokenize{#1}' dropped}%
+ {There have been more \string& symbols than
+ \abrace@tempb\space or A elements in the pattern.
+ Check your source!}%
+ \fi
+ \fi
+ \abrace@next
+}
+%FMi
+
+
+
+\DeclareDocumentCommand{\aoverbrace}{ O{L1U1R} m o e{^_}}{%
+%
+% \typeout{Arguments: \detokenize{1=#1|2=#2|3=#3|4=#4|5=#5|}}%
+%
+ \begin{lrbox}{\bracebox}$\displaystyle{#2}$\end{lrbox}%
+ \mathop{\vbox{\m@th\ialign{##\crcr
+ \noalign{\kern.5\fontdimen5\textfont2}%
+ \adownbracefill{#1}\crcr
+ \noalign{\kern.7\fontdimen5\textfont2\nointerlineskip}%
+ $\hfil\displaystyle{#2}\hfil$\crcr}}}\limits
+ % ...there was a ^:
+ \IfValueT{#4}{%
+ ^{%
+ % Define a text point instead of a tip
+%FMi
+ \gdef\@abrace@text@arg{#4}% % save argument then split of portions later
+%FMi
+ \@defbracecharcode{A}{%
+ \@use@rl@se\braceru
+ \makebox[0pt][c]{\scriptsize
+%FMi % split off next part
+ \expandafter\@abrace@next@text\@abrace@text@arg&\@abrace@next@text}%
+%FMi
+ \@use@rl@se\bracelu\@genbrace
+ }%
+ % We interpret U as A
+ \let\brace@char@U\brace@char@A
+ % Use the normal spec by default
+%FMi
+ \let\@abrace@stuff\phantom % render @{...} harmless
+%FMi
+ \IfValueTF{#3}
+ {\bracescript{#3}}% Use newly-specified spec
+ {\bracescript{#1}}% Use default spec
+%FMi
+ \@abrace@is@arg@fully@used{^}{U}%
+%FMi
+ }%
+ }%
+ % ...there was a _:
+ \IfValueT{#5}{%
+ _{%
+ % Define a text point instead of a tip
+%FMi
+ \gdef\@abrace@text@arg{#5}%
+%FMi
+ \@defbracecharcode{A}{%
+ \@use@rl@se\bracerd
+ \makebox[0pt][c]{%
+ \scriptsize % not needed if processed in math
+ %FMi
+ \expandafter\@abrace@next@text\@abrace@text@arg&\@abrace@next@text
+ }%
+%FMi
+ \@use@rl@se\braceld\@genbrace
+ }%
+ % We interpret D as A
+ \let\brace@char@D\brace@char@A
+%FMi
+ \let\@abrace@stuff\phantom % render @{...} harmless
+%FMi
+ % Use the normal spec by default
+ \IfValueTF{#3}
+ {\bracescript{#3}}% Use the newly-specified spec
+ {\bracescript{#1}}% Use the default spec
+%FMi
+ \@abrace@is@arg@fully@used{_}{D}%
+%FMi
+ }%
+ }%
+%FMi
+ \IfValueT{#3}{\IfValueF{#4}{\IfValueF{#5}{[#3]}}}%
+%FMi
+}
+
+% Parsing structure. Reference:
+% Parsing a macro argument character-by-character for conditional execution
+% http://tex.stackexchange.com/q/33197/5764
+
+\let\@use@rl@se\relax
+\def\@defbracecharcode#1{% Macro to define brace character "codes"
+ \@namedef{brace@char@#1}%
+}
+\@defbracecharcode{L}{\@use@rl@se\braceld\@genbrace}% Left down
+\@defbracecharcode{R}{\@use@rl@se\bracerd\@genbrace}% Right down
+\@defbracecharcode{l}{\@use@rl@se\bracelu\@genbrace}% Left up
+\@defbracecharcode{r}{\@use@rl@se\braceru\@genbrace}% Right up
+\@defbracecharcode{U}{\@use@rl@se\braceru\@use@rl@se\bracelu\@genbrace}% Tip up
+\@defbracecharcode{D}{\@use@rl@se\bracerd\@use@rl@se\braceld\@genbrace}% Tip down
+\@defbracecharcode{0}{\@@bunfil\@genbrace}% Do nothing
+\@defbracecharcode{1}{\@@bfil\@genbrace}% 1 filler
+\@defbracecharcode{2}{\@@bfil\@@bfil\@genbrace}% 2 fillers
+\@defbracecharcode{3}{\@@bfil\@@bfil\@@bfil\@genbrace}% 3 fillers
+\@defbracecharcode{4}{\@@bfil\@@bfil\@@bfil\@@bfil\@genbrace}% 4 fillers
+\@defbracecharcode{5}{\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@genbrace}% 5 fillers
+\@defbracecharcode{6}{\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@genbrace}% 6 fillers
+\@defbracecharcode{7}{\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@genbrace}% 7 fillers
+\@defbracecharcode{8}{\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@genbrace}% 8 fillers
+\@defbracecharcode{9}{\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@@bfil\@genbrace}% 9 fillers
+\@defbracecharcode{@}{\@firstofone@go}% Insert arbitrary stuff
+\@defbracecharcode{!}{\@firstofone@len}% Insert a leader of specific length
+\@defbracecharcode{*}{\@repeat@num@times}% Repeat stuff a number of times
+\@defbracecharcode{,}{\downbracketend}% Downward bracket end
+\@defbracecharcode{'}{\upbracketend}% Upward bracket end
+
+
+%FMi
+%like U or D (same width) but a straight line marking a possible anchor point for annotation material
+% can be used in patterns, e.g., $\aunderbrace[3A1]{a+b+c+d}_{x}$ makes a an underline rule with
+% the "x" being placed off center
+
+\@defbracecharcode{A}{%
+ \setbox\z@\hbox{$\m@th\braceru\bracelu$}%
+ \hb@xt@\wd\z@{\@@bfil}%
+ \@genbrace}%
+
+%FMi
+
+
+\newcommand{\bracecolor}[1]{\xdef\bracecolor@{\noexpand\color{#1}}\aftergroup\bracecolor@}
+%FMi
+\let\bracecolor\color % no longer needed
+%\newcommand{\@firstofone@go}[1]{\mathord{#1}\@genbrace}%
+\let\@abrace@stuff\@firstofone
+\newcommand{\@firstofone@go}[1]{\mathord{}\@abrace@stuff{#1}\mathord{}\@genbrace}%
+%FMi
+%\newcommand{\@firstofone@go}[1]{#1\@genbrace}%
+\newcommand{\@firstofone@len}[1]{\hb@xt@#1{\@@bfil}\@genbrace}%
+\newcommand{\@repeat@num@times}[2]{\Repeat{#1}{\@genbrace#2\@nnil}\@genbrace}%
+
+\newcommand{\@genbrace}[1]{%
+ \ifx\@nnil#1\relax\else
+%FMi
+ \expandafter\ifx\csname brace@char@#1\endcsname\relax
+ \PackageError{abraces}{Brace pattern '#1' unknown}%
+ {I'll use '0' instead.}%
+ \csname brace@char@0\expandafter\expandafter\expandafter\endcsname
+ \else
+ \csname brace@char@#1\expandafter\expandafter\expandafter\endcsname
+ \fi
+%FMi
+ \fi
+}
+\newcommand{\genbrace}[1]{%
+ \@genbrace#1\@nnil%
+}
+
+% If package was loaded with \usepackage[overload]{abraces}
+\if@overload
+ \let\overbrace\aoverbrace
+ \let\underbrace\aunderbrace
+\fi
\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.pdf b/macros/latex/contrib/easybook/doc/easybook-demo.pdf
index fce95a29ed..7aa01420f7 100644
--- a/macros/latex/contrib/easybook/doc/easybook-demo.pdf
+++ b/macros/latex/contrib/easybook/doc/easybook-demo.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.tex b/macros/latex/contrib/easybook/doc/easybook-demo.tex
index 06dca1fb6f..cb06db92dc 100644
--- a/macros/latex/contrib/easybook/doc/easybook-demo.tex
+++ b/macros/latex/contrib/easybook/doc/easybook-demo.tex
@@ -99,7 +99,7 @@
\url{https://latexstudio.net} \\
\url{https://gitee.com/texl3/easybook}\thanks{Gitee为项目的主要发布地址。}
}
-\date{2021/04/03\hskip\ccwd\relax v1.24c}
+\date{2021/04/04\hskip\ccwd\relax v1.24d}
\frontmatter[roman]
\maketitle
diff --git a/macros/latex/contrib/easybook/doc/easybook.pdf b/macros/latex/contrib/easybook/doc/easybook.pdf
index 4a11b5636d..d14bb989a7 100644
--- a/macros/latex/contrib/easybook/doc/easybook.pdf
+++ b/macros/latex/contrib/easybook/doc/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index cd6abe176e..338c72d9b4 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -55,7 +55,7 @@ The latest version of this license is in
%
% \title{\sffamily easybook书籍文档类}
% \author{瞿毅}
-% \date{2021/04/03\hskip\ccwd\relax v1.24c\thanks{\url{https://gitee.com/texl3/easybook}}}
+% \date{2021/04/04\hskip\ccwd\relax v1.24d\thanks{\url{https://gitee.com/texl3/easybook}}}
% \maketitle
% \begin{abstract}
% \cls{easybook} 是基于 \cls{ctexbook} 书籍文档类创建以极简为风格的模板,可以看作对 \cls{ctexbook} 的进一步包装。虽然\CTeX 文档类提供了较好的中文支持,但想实现个性化功能一般需要在其基础上载入更多宏包来定制。\cls{easybook} 考虑了一些细节并载入一些常用宏包实现一般的排版需求,它适用于排版中英文书籍或笔记,甚至可稍加调整成为学位论文模板。
@@ -151,7 +151,7 @@ The latest version of this license is in
%
% \subsection{文档命令}
% \label{subsec:document command}
-% \begin{function}[added = 2021-02-20,updated = 2021-03-15]{\frontmatter,\mainmatter,\backmatter,\tableofcontents,\listoffigures,\listoftables,\listoflistings}
+% \begin{function}[added = 2021-02-20,updated = 2021-04-04]{\frontmatter,\mainmatter,\backmatter,\tableofcontents,\listoffigures,\listoftables,\listoflistings}
% \begin{syntax}
% \tn{frontmatter*}\oarg{编号格式|(Roman)}
% \tn{mainmatter*}
@@ -161,16 +161,18 @@ The latest version of this license is in
% \tn{listoftables*}\oarg{键值列表}
% \tn{listoflistings*}\oarg{键值列表}
% \end{syntax}
-% \tn{frontmatter} 为前言区命令,章标题不编号,页码可设置为例如 \opt{roman}、\opt{Alph} 等格式,带有星号的命令 \tn{frontmatter*} 不使用 \tn{cleardoublepage}。\tn{mainmatter} 为主文区命令,章标题正常编号且页码为从1开始计数的阿拉伯数字,\tn{mainmatter*} 命令不使用 \tn{cleardoublepage}。\tn{backmatter} 为后记区命令,页码格式与编号保持不变,章标题不编号。\tn{listoffigures} 命令输出图片目录,\tn{listoftables} 命令输出表格目录,\tn{listoflistings} 命令输出代码目录。带有星号的目录命令不会添加进主文档目录中,目录的键值列表选项如下
+% \tn{frontmatter} 为前言区命令,章标题不编号,页码可设置为例如 \opt{roman}、\opt{Alph} 等格式,带有星号的命令 \tn{frontmatter*} 不使用 \tn{cleardoublepage}。\tn{mainmatter} 为主文区命令,章标题正常编号且页码为从1开始计数的阿拉伯数字,\tn{mainmatter*} 命令不使用 \tn{cleardoublepage}。\tn{backmatter} 为后记区命令,页码格式与编号保持不变,章标题不编号。\tn{listoffigures} 命令输出图片目录,\tn{listoftables} 输出表格目录,\tn{listoflistings} 输出代码目录。带有星号的目录命令不会添加进主文档目录中,目录的键值列表选项如下
% \changes{v1.23}{2021/02/20}{重新定义文档结构划分命令。}
% \end{function}
%
-% \begin{function}{multoc,book,article}
+% \begin{function}{multoc,title,book,article}
% \begin{syntax}
% multoc = <true|(false)>
+% title = <目录标题名称>
% \end{syntax}
-% \opt{multoc} 与 \opt{style/multoc} 选项具有相同的效果,但是具有优先性且可单独设置不同目录是否双栏排版。\opt{book} 选项使目录标题按照 \opt{chapter} 级别输出,\opt{article} 选项使目录标题按照 \opt{article} 级别输出,默认为 \opt{chapter} 级别。
+% \opt{multoc} 与 \opt{style/multoc} 选项具有相同的效果,但是具有优先性且可单独设置不同目录是否双栏排版。已经预置了中英文的目录标题,可以使用 \opt{title} 选项更改目录标题的名称。\opt{book} 选项使目录标题按照 \opt{chapter} 级别输出,\opt{article} 选项使目录标题按照 \opt{article} 级别输出,默认为 \opt{chapter} 级别。
% \changes{v1.23}{2021/03/15}{为几个目录增加键值列表的选项,可设置标题输出级别以及是否加入主目录。}
+% \changes{v1.24d}{2021/04/04}{目录命令的可选参数增加标题键值。}
% \end{function}
%
% \section{接口选项}
@@ -788,7 +790,7 @@ The latest version of this license is in
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/04/03}{1.24c}{beta}
+\ProvidesExplClass{easybook}{2021/04/04}{1.24d}{beta}
\cs_generate_variant:Nn \keys_define:nn {nx}
\cs_generate_variant:Nn \int_to_arabic:n {v}
@@ -819,20 +821,17 @@ The latest version of this license is in
english .code:n = \bool_set_false:N \l__lang_chinese_bool,
enstyle .meta:n = {newline,entitle,english},
- font .choice:,
- font .value_required:n = true,
- font/overleaf .code:n = {},
- font/adobe .code:n = \__put_ctexbook:n {fontset = #1},
- font/founder .code:n = \__put_ctexbook:n {fontset = #1},
- font/mac .code:n = \__put_ctexbook:n {fontset = #1},
- font/windows .code:n = \__put_ctexbook:n {fontset = #1},
- font/linux .code:n = \__put_ctexbook:n {fontset = ubuntu},
- font/none .code:n = \__put_ctexbook:n {fontset = #1},
+ font .choices:nn =
+ {adobe,founder,mac,windows,none}
+ {\__put_ctexbook:n {fontset = \l_keys_choice_tl}},
font/noto .code:n =
{
\bool_set_true:N \l__font_noto_bool
\__put_ctexbook:n {fontset = none}
},
+ font/overleaf .code:n = {},
+ font/linux .code:n = \__put_ctexbook:n {fontset = ubuntu},
+ font .value_required:n = true,
font .initial:n = overleaf,
paper .choice:,
@@ -906,39 +905,36 @@ The latest version of this license is in
}
\__ctex_define:nn {style}
{
- multoc .bool_set:N = \l__multoc_bool,
- multoc .default:n = true,
- withpart .bool_set:N = \l__chap_withpart_bool,
- withpart .default:n = true,
- withpart .initial:n = false,
- notomath .bool_set:N = \l__notomath_bool,
- notomath .default:n = true,
- notomath .initial:n = false,
- rulewidth .dim_set:N = \l__rule_width_dim,
- rulewidth .initial:n = 0.75pt,
- uppercase .bool_set:N = \l__uppercase_bool,
- uppercase .default:n = true,
- uppercase .initial:n = true,
+ multoc .bool_set:N = \l__multoc_bool,
+ multoc .default:n = true,
+ withpart .bool_set:N = \l__chap_withpart_bool,
+ withpart .default:n = true,
+ withpart .initial:n = false,
+ notomath .bool_set:N = \l__notomath_bool,
+ notomath .default:n = true,
+ notomath .initial:n = false,
+ rulewidth .dim_set:N = \l__rule_width_dim,
+ rulewidth .initial:n = 0.75pt,
+ uppercase .bool_set:N = \l__uppercase_bool,
+ uppercase .default:n = true,
+ uppercase .initial:n = true,
- footwith .choice:,
- footwith .value_required:n = true,
- footwith/part .code:n =
- {\tl_set:Nn \l__foot_numberwith_tl{#1}},
- footwith/page .code:n =
- {\tl_set:Nn \l__foot_numberwith_tl{#1}},
- footwith/chapter .code:n = {},
- footwith .initial:n = chapter,
+ footwith .choices:nn =
+ {part,page,chapter}
+ {\tl_set_eq:NN \l__foot_numberwith_tl\l_keys_choice_tl},
+ footwith .value_required:n = true,
+ footwith .initial:n = chapter,
- figure-sep .tl_set:N = \l__figure_separator_tl,
- table-sep .tl_set:N = \l__table_separator_tl,
- listing-sep .tl_set:N = \l__lstlisting_separator_tl,
- equation-sep .tl_set:N = \l__equation_separator_tl,
- number-sep .meta:n =
+ figure-sep .tl_set:N = \l__figure_separator_tl,
+ table-sep .tl_set:N = \l__table_separator_tl,
+ listing-sep .tl_set:N = \l__lstlisting_separator_tl,
+ equation-sep .tl_set:N = \l__equation_separator_tl,
+ number-sep .meta:n =
{
figure-sep = {#1},table-sep = {#1},
listing-sep = {#1},equation-sep = {#1}
},
- number-sep .initial:n = {.}
+ number-sep .initial:n = {.}
}
\RequirePackage
@@ -1362,7 +1358,8 @@ The latest version of this license is in
book .code:n = {},
multoc .bool_set:N = \l__multoc_bool,
multoc .default:n = true,
- multoc .initial:n = false
+ multoc .initial:n = false,
+ title .tl_set:N = \toc@title
}
\cs_new_protected:Npn \__title_mark_intoc:n #1
@@ -1408,12 +1405,19 @@ The latest version of this license is in
\fi
}{\tl_set:Nn \l__toc_type_tl{article}}
}
+\cs_new_protected:Npn \__title_ifintoc_set:n #1
+ {
+ \IfBooleanTF{#1}
+ {\__title_mark:n {\toc@title}}
+ {\__title_mark_intoc:n {\toc@title}}
+ }
\RenewDocumentCommand{\tableofcontents}{o}
{
\group_begin:
+ \tl_set_eq:NN \toc@title\contentsname
\IfValueT{#1}{\keys_set:nn {listoc}{#1}}
\__ifmultoc_pre_set:
- \__title_mark:n {\contentsname}
+ \__title_mark:n {\toc@title}
\vspace*{\dim_use:N \l__toc_offset_dim}
\@starttoc{toc}
\__ifmultoc_post_set:
@@ -1422,11 +1426,10 @@ The latest version of this license is in
\RenewDocumentCommand{\listoffigures}{so}
{
\group_begin:
+ \tl_set_eq:NN \toc@title\listfigurename
\IfValueT{#2}{\keys_set:nn {listoc}{#2}}
\__ifmultoc_pre_set:
- \IfBooleanTF{#1}
- {\__title_mark:n {\listfigurename}}
- {\__title_mark_intoc:n {\listfigurename}}
+ \__title_ifintoc_set:n {#1}
\dim_add:NV \l__toc_offset_dim\l__toc_listsoffset_dim
\vspace*{\dim_use:N \l__toc_offset_dim}
\@starttoc{lof}
@@ -1436,11 +1439,10 @@ The latest version of this license is in
\RenewDocumentCommand{\listoftables}{so}
{
\group_begin:
+ \tl_set_eq:NN \toc@title\listtablename
\IfValueT{#2}{\keys_set:nn {listoc}{#2}}
\__ifmultoc_pre_set:
- \IfBooleanTF{#1}
- {\__title_mark:n {\listtablename}}
- {\__title_mark_intoc:n {\listtablename}}
+ \__title_ifintoc_set:n {#1}
\dim_add:NV \l__toc_offset_dim\l__toc_listsoffset_dim
\vspace*{\dim_use:N \l__toc_offset_dim}
\@starttoc{lot}
@@ -1450,11 +1452,10 @@ The latest version of this license is in
\NewDocumentCommand{\listoflistings}{so}
{
\group_begin:
+ \tl_set_eq:NN \toc@title\lstlistlistingname
\IfValueT{#2}{\keys_set:nn {listoc}{#2}}
\__ifmultoc_pre_set:
- \IfBooleanTF{#1}
- {\__title_mark:n {\lstlistlistingname}}
- {\__title_mark_intoc:n {\lstlistlistingname}}
+ \__title_ifintoc_set:n {#1}
\dim_add:NV \l__toc_offset_dim\l__toc_listsoffset_dim
\vspace*{\dim_use:N \l__toc_offset_dim}
\@starttoc{lol}
@@ -2001,14 +2002,10 @@ The latest version of this license is in
\NewDocumentCommand{\printbibliography}{so}
{
\group_begin:
+ \tl_set_eq:NN \toc@title\bibname
\IfValueT{##2}{\keys_set:nn {listoc}{##2}}
\__ifmultoc_pre_set:
- \cs_set:Npn \bibsection
- {
- \IfBooleanTF{##1}
- {\__title_mark:n {\bibname}}
- {\__title_mark_intoc:n {\bibname}}
- }
+ \cs_set:Npn \bibsection{\__title_ifintoc_set:n {##1}}
\exp_args:NV \bibliography\l__bib_file_tl
\__ifmultoc_post_set:
\group_end:
@@ -2235,13 +2232,13 @@ The latest version of this license is in
{
\keys_set_known:nn {ctex}
{
- contentsname = {目\hspace{\ccwd}录},
- indexname = {索\hspace{\ccwd}引},
- listfigurename = {图片索引},
- listtablename = {表格索引},
- abstractname = {摘\hspace{\ccwd}要},
- lstlistlistingname = {代码索引},
- lstlistingname = {代码}
+ contentsname = 目\hspace{\ccwd}录,
+ indexname = 索\hspace{\ccwd}引,
+ listfigurename = 图片索引,
+ listtablename = 表格索引,
+ abstractname = 摘\hspace{\ccwd}要,
+ lstlistlistingname = 代码索引,
+ lstlistingname = 代码
}
\crefformat{equation}{#2式(#1)#3}
\crefformat{align}{#2式(#1)#3}
@@ -2261,9 +2258,9 @@ The latest version of this license is in
}{
\keys_set_known:nn {ctex}
{
- abstractname = {Abstract},
- lstlistlistingname = {List~of~Listings},
- lstlistingname = {Code}
+ abstractname = Abstract,
+ lstlistlistingname = List~of~Listings,
+ lstlistingname = Code
}
\crefformat{equation}{#2Equation~(#1)#3}
\crefformat{align}{#2Equation~(#1)#3}
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 d6ddd45937..58941454e4 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 55d142af2e..f367a69313 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 52e10b2057..97d7d22999 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 998177959c..47ab50100e 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 aec8073b5c..bb3d9bba37 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 cba0531af6..d93476179b 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 228b70627d..68530611ee 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 3544ca7255..73b2037b68 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 3fa62022e0..d624b0e021 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 3d41bd0ac4..a3006e631c 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 557a885e62..22e4df2e14 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 1c95904047..ca44a14887 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 95ec71c6ee..6812d6357c 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 b7110f0191..d66cd97cf6 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 08d1604edd..1419420db7 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 8b53eef328..c4167e889a 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 edfe84f457..f6e6357404 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 50daaa32d1..92303f68a8 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 562be32f2c..6ca8890883 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 f0925c078e..709761b7b5 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 b8bd11a686..871639bfac 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 62e7f9392d..8b3c00fbcd 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 c99fc42632..ba12c539f1 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 612aef36a8..4565ff9184 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 264c3127e7..7be2ba4d63 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 f7df44052b..2434009585 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 5008b620e6..f855b81f3c 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 c80f407333..d86378d280 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 9dc7c4876d..c678e20f35 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 d441a59733..feed6e27ea 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 1bf544a515..d92e07ab7e 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 7b6e3d3829..ccdc5625ae 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 8c47ab4918..08f0836796 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 5c192d4b1a..c8f8f491f2 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 3c85efd97f..e780168dc8 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 9d407600c2..5c14beb4be 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 75123ed947..298a355d76 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 ba289c1ab0..041a6fbfcf 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 c09c66b4e2..886682aff9 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 e94e68bcab..7dec0ce091 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 88c67bd0b9..dc46aa0994 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 5b8022b521..21d81aaa9e 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 e20e036604..7117f720c5 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 2f8fd1a4aa..0b26375b32 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 4250071048..b022878627 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 cea68e3072..20819048e6 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 0fa30756fd..779bd5474a 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 7535c44e0e..5fe0382656 100644
--- a/macros/latex/contrib/reledmac/reledmac.dtx
+++ b/macros/latex/contrib/reledmac/reledmac.dtx
@@ -578,6 +578,9 @@
% \changes{v2.37.0}{2021/02/28}{Fix bug with \protect\cs{Xnonote}}
% \changes{v2.37.0}{2021/02/28}{Improve syntaxis check.}
% \changes{v2.37.1}{2021/03/08}{Fix bug with \protect\cs{edgls} and related in \protect\cs{edtext} argument. Require \protect\package{glossaries-extra} is \protect\package{glossaries} is loaded.}
+% \changes{v2.37.2}{2021/04/04}{Fix bug with \protect\cs{Xstanzaonlyfirst}.}
+% \changes{v2.37.2}{2021/04/04}{Fix bug with \protect\option{parapparatus} option and nested \protect\cs{edtext}.}
+% \changes{v2.37.1}{2021/04/04}{Fix bug with \protect\cs{Xgroupbyline} and two or three columns notes.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -4468,7 +4471,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2021/03/08 v2.37.1 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2021/04/04 v2.37.2 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -5201,9 +5204,9 @@
% \changes{v0.4.0}{2004/02/29}{Added \protect\cs{showlemma}}
% \begin{macrocode}
\ifledfinal
- \newcommand*{\showlemma}[1]{#1}
+ \global\notbool{parapparatus@}{\newcommand*}{\newcommand}{\showlemma}[1]{#1}%
\else
- \newcommand*{\showlemma}[1]{\textbf{#1}}%
+ \global\notbool{parapparatus@}{\newcommand*}{\newcommand}{\showlemma}[1]{\textbf{#1}}%
\fi
% \end{macrocode}
@@ -10395,7 +10398,7 @@
}%
{}%
\csuse{##1@forinserting@####1}%
- \strut\par%
+ \strut\par\allowbreak%
}%
\global\csundef{##1@forinserting@####1}%
}%
@@ -12251,7 +12254,7 @@
togl{Xstanza@#2}%
and bool {numberstanza}%
and not (%
- togl{Xpstartonlyfirst@#2}%
+ togl{Xstanzaonlyfirst@#2}%
and test {\ifnumequal{\csuse{Xprevstanza@#2}}{\current@stanza}}%
)%
}{%
@@ -15120,6 +15123,9 @@
\fi%
\begingroup%
\newcommand{\content}{##2}%
+ \ifcsstring{series@display#1}{paragraph}{%
+ \patchcmd{\@tag}{\par}{\relax}{}{}%
+ }{}%
\ifnumberedpar@%
\ifledRcol%
\ifluatex%
diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf
index 26e04e5fd9..60151a3fbc 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.pdf b/macros/latex/contrib/reledmac/reledpar.pdf
index 80a0afcce9..cee0c73ade 100644
--- a/macros/latex/contrib/reledmac/reledpar.pdf
+++ b/macros/latex/contrib/reledmac/reledpar.pdf
Binary files differ
diff --git a/support/arara/README.md b/support/arara/README.md
index f5624f8b58..2f86065827 100644
--- a/support/arara/README.md
+++ b/support/arara/README.md
@@ -1,6 +1,6 @@
![arara](https://i.stack.imgur.com/hjUsN.png)
-# arara v6.0.2
+# arara v6.1.0
![Language: Kotlin](https://img.shields.io/badge/Language-Kotlin-blue.svg?style=flat-square)
![Minimum JRE: 8.0](https://img.shields.io/badge/Minimum_JRE-8-blue.svg?style=flat-square)
diff --git a/support/arara/doc/arara-manual.pdf b/support/arara/doc/arara-manual.pdf
index 835757c2df..342ebace9d 100644
--- a/support/arara/doc/arara-manual.pdf
+++ b/support/arara/doc/arara-manual.pdf
Binary files differ
diff --git a/support/arara/doc/arara-quickstart.pdf b/support/arara/doc/arara-quickstart.pdf
index 274932b248..315dc0d4fa 100644
--- a/support/arara/doc/arara-quickstart.pdf
+++ b/support/arara/doc/arara-quickstart.pdf
Binary files differ
diff --git a/support/arara/doc/arara.1 b/support/arara/doc/arara.1
index 7c8f2b69e6..08960a6576 100644
--- a/support/arara/doc/arara.1
+++ b/support/arara/doc/arara.1
@@ -1,4 +1,4 @@
-.TH ARARA 1 "31 March 2021" "v6.0.2"
+.TH ARARA 1 "04 April 2021" "v6.1.0"
.SH NAME
arara \- a TeX automation tool based on rules and directives.
.SH SYNOPSIS
diff --git a/support/arara/doc/version.tex b/support/arara/doc/version.tex
index 7a9f89d81a..358e78e607 100644
--- a/support/arara/doc/version.tex
+++ b/support/arara/doc/version.tex
@@ -1 +1 @@
-6.0.2 \ No newline at end of file
+6.1.0 \ No newline at end of file
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 8997bcbdf1..ff7f6d999b 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,7 +26,7 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2021
-depend revision/58710
+depend revision/58740
name 00texlive.image
category TLCore
@@ -20817,7 +20817,7 @@ catalogue-version 1.0
name arara
category Package
-revision 57972
+revision 58720
shortdesc Automation of LaTeX compilation
longdesc Arara is comparable with other well-known compilation tools
longdesc like latexmk and rubber. The key difference is that arara
@@ -20825,13 +20825,12 @@ longdesc determines its actions from metadata in the source code, rather
longdesc than relying on indirect resources, such as log file analysis.
longdesc Arara requires a Java virtual machine.
depend arara.ARCH
-containersize 10377536
-containerchecksum 87ba4273327cd963501d47e5b1bf10dd18474a00bf0817e9426c264de60285f74e2eb768f210fe718410d8f3f6594be7167fa5e6281026d8ec09d82c0d1391cf
-doccontainersize 2046836
-doccontainerchecksum c2908c6108ac261871fda12127ac333563bcae48cf57e1a7489af08e9894d6e579e89c8272a03c52050a020e9f23760c25e656ddf1804054b27f1f757ea65033
-docfiles size=831
+containersize 10394416
+containerchecksum d4ee5f7cb9fe786297c8be8f0a99f546883b6ac1e0506806db6480dde2793194d3cd2755a144926e2baa2add0fb0aa4dc6f68865f4e175d7df21090db261fa26
+doccontainersize 2032476
+doccontainerchecksum c499c0537c9fea85b1c9e4a5ff67662f2eade61a7d9be06a36cdd21febfaf6e008d4d30a396f5758401378daca5bd588418ed0a3d6b859ef8ce631e86e23d423
+docfiles size=827
texmf-dist/doc/man/man1/arara.1
- texmf-dist/doc/man/man1/arara.man1.pdf
texmf-dist/doc/support/arara/README.md details="Readme"
texmf-dist/doc/support/arara/arara-manual.pdf details="Reference manual"
texmf-dist/doc/support/arara/arara-manual.tex
@@ -20867,11 +20866,11 @@ docfiles size=831
texmf-dist/doc/support/arara/rules/manual.yaml
texmf-dist/doc/support/arara/rules/quickstart.yaml
texmf-dist/doc/support/arara/version.tex
-srccontainersize 99992
-srccontainerchecksum 9ef13bf542b9dbd48499953dacde7c6a44506d36b09183724951944d7ffc38365d05a44d0c780f1558cb5a6f245aeff1582cf5c46ff93469f07f6b984f870e49
+srccontainersize 100124
+srccontainerchecksum 2098356540f5cfa0af5464e1f5e98ceafefed0c702960404948b93511808d3d8453a96cc014d9ea1bae23f2605c090461740d3481938b5c4fd84a8c59ee2b5fc
srcfiles size=33
- texmf-dist/source/support/arara/arara-6.0.0-src.zip
-runfiles size=2907
+ texmf-dist/source/support/arara/arara-6.0.2-src.zip
+runfiles size=2910
texmf-dist/scripts/arara/arara.jar
texmf-dist/scripts/arara/arara.sh
texmf-dist/scripts/arara/rules/arara-rule-animate.yaml
@@ -20946,11 +20945,11 @@ runfiles size=2907
texmf-dist/scripts/arara/rules/arara-rule-xindy.yaml
catalogue-contact-bugs https://gitlab.com/islandoftex/arara/issues/
catalogue-contact-repository https://gitlab.com/islandoftex/arara/
-catalogue-contact-support https://gitter.im/cereda/arara
+catalogue-contact-support https://gitter.im/Island-of-TeX/arara
catalogue-ctan /support/arara
catalogue-license bsd
catalogue-topics compilation
-catalogue-version 6.0.0
+catalogue-version 6.1.0
name arara.aarch64-linux
category Package
@@ -37046,7 +37045,7 @@ catalogue-version 1.1z
name biblatex-chicago
category Package
-revision 54809
+revision 58715
shortdesc Chicago style files for BibLaTeX
relocated 1
longdesc This is a BibLaTeX style that implements the Chicago
@@ -37056,11 +37055,11 @@ longdesc edition (with continuing support for the 16th edition, too).
longdesc The style implements entry types for citing audio-visual
longdesc materials, among many others. The package was previously known
longdesc as biblatex-chicago-notes-df.
-containersize 92256
-containerchecksum dcb94af1b86fb8b7f789e598f2c0cab025d2e085b32f1211e281f426666662a8649f978a049122ff4b8b53acefa69555c2ff0d5eff35971718a11a79401a1131
-doccontainersize 6149932
-doccontainerchecksum bc807652d834bbb12913d88a4318ce9e537ad893fe4626af29191853fcd9d7ad0cda3a2536b6f05df7467989c75d4b8c0405ed90789a1c486655ccb7374ba0b0
-docfiles size=1886
+containersize 101696
+containerchecksum 27d9ce6b00b71ebf751a720d42ebb16c3f7d6bba7b494acb3acf2232849342b992aa7fb9de35d7de4c12ef94956aa80be8a5d61366d9ef897257a6c4e26de6d3
+doccontainersize 2828240
+doccontainerchecksum adb23e2fca96e703aef93385c48e82279e411e266b4a0d147be34fbf4b2fc781dd93ed4323b044a51660a94a2fd832f02f5ff16cfe13389b6058805190c881a1
+docfiles size=1067
RELOC/doc/latex/biblatex-chicago/README details="Readme and usage outline"
RELOC/doc/latex/biblatex-chicago/RELEASE
RELOC/doc/latex/biblatex-chicago/biblatex-chicago.pdf details="Package documentation"
@@ -37084,7 +37083,7 @@ docfiles size=1886
RELOC/doc/latex/biblatex-chicago/dates-test.bib
RELOC/doc/latex/biblatex-chicago/legal-test.bib
RELOC/doc/latex/biblatex-chicago/notes-test.bib
-runfiles size=453
+runfiles size=473
RELOC/tex/latex/biblatex-chicago/biblatex-chicago.sty
RELOC/tex/latex/biblatex-chicago/chicago-authordate-trad.bbx
RELOC/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx
@@ -37112,13 +37111,14 @@ runfiles size=453
RELOC/tex/latex/biblatex-chicago/cms-norsk.lbx
RELOC/tex/latex/biblatex-chicago/cms-norwegian.lbx
RELOC/tex/latex/biblatex-chicago/cms-nynorsk.lbx
+ RELOC/tex/latex/biblatex-chicago/cms-romanian.lbx
RELOC/tex/latex/biblatex-chicago/cms-swedish.lbx
RELOC/tex/latex/biblatex-chicago/cmsdocs.sty
RELOC/tex/latex/biblatex-chicago/cmsendnotes.sty
catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-chicago
catalogue-license lppl1.3
catalogue-topics biblatex
-catalogue-version 2.0
+catalogue-version 2.1
name biblatex-claves
category Package
@@ -37560,7 +37560,7 @@ catalogue-version 0.4
name biblatex-ieee
category Package
-revision 57256
+revision 58716
shortdesc IEEE style files for BibLaTeX
relocated 1
longdesc This is a BibLaTeX style that implements the bibliography style
@@ -37571,10 +37571,10 @@ longdesc \usepackage[style=ieee]{biblatex} A demonstration database is
longdesc provided to show how to format input for the style.
longdesc biblatex-ieee requires BibLaTeX 2.7 or later, and works with
longdesc both BibTeX and Biber as the database back-end.
-containersize 5400
-containerchecksum edf4d7d3d94c080d44154e06d1275e9a973f4d59fcd583c6fdd5ef6038db6430fc9b14605f42bf988226a374102827287157df9c2a805084969e83604d31cddc
-doccontainersize 558292
-doccontainerchecksum 4cbe9498f9a8bf08adae00d3bfd9f86d0c2a33f19d407abc13d025eb568d5e46b83e887d12f56a0d330e67ebdbce5bec6babd8812214750b16e1c854774b9c1c
+containersize 5416
+containerchecksum 2348c59f6b68e7846f3da93ef008f856b899173281281a1d061f5d98bad3c2b18216987e4aa366c2a2bf9f53f6daa6b29aeca202ff385058676572b8f3702317
+doccontainersize 558076
+doccontainerchecksum 70efd20bcdc08f1872242e77a389c207e048921b9a9741e11c4e81298fec1ff1a2c724e0485da5e3adf218ddc5171930170f9e4bf6e2503088a1fce5287403fe
docfiles size=174
RELOC/doc/latex/biblatex-ieee/README.md details="Readme"
RELOC/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf
@@ -37591,7 +37591,7 @@ runfiles size=9
catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-ieee
catalogue-license lppl1.3c
catalogue-topics biblatex journalpub
-catalogue-version 1.3d
+catalogue-version 1.3e
name biblatex-ijsra
category Package
@@ -63377,7 +63377,7 @@ catalogue-version 0.3
name cochineal
category Package
-revision 57176
+revision 58717
shortdesc Cochineal fonts with LaTeX support
relocated 1
longdesc Cochineal is a fork from the Crimson fonts (Roman, Italic,
@@ -63395,10 +63395,10 @@ longdesc adding about 2000 additional glyphs, which I could not even
longdesc contemplate. The fonts are provided in OpenType and PostScript
longdesc formats.
execute addMap Cochineal.map
-containersize 2532176
-containerchecksum a0414a08262cc0875b7df48b08b47a980cf58f0e0bbf75dab593a7d99a9002352c34c02eee411da667b379ee92df547f81caac399096098a197f183a53ff813f
-doccontainersize 369524
-doccontainerchecksum 5f51d54cfc3f04b0857223750ba841d72250219ae5259aaaed97b3870dcdf9af70d66f0f819abba09195b2691bf34c0185e42c2315d97363ef043500b85a96e4
+containersize 2532576
+containerchecksum 51596bff44f2aeb5720d6723283cd2c7a4c81419b0391af9aeda3231fd429c8bb8a6342278fab7f1cf17ed4cb752a25bd7c55c085671ef205bf9a28c429cfdc9
+doccontainersize 369568
+doccontainerchecksum 930c4bcbcec523c8800f3c52b286197758f7721aa511a7f0617fff68f2e1a86cabc7cc9f8ba2887f64edd0e61fff9c17a05eb615043d0a2de9a56e03e72b5e65
docfiles size=113
RELOC/doc/fonts/cochineal/OFL-FAQ.txt
RELOC/doc/fonts/cochineal/OFL.txt
@@ -64158,7 +64158,7 @@ runfiles size=5144
catalogue-ctan /fonts/cochineal
catalogue-license ofl lppl1.3
catalogue-topics font font-body font-serif font-multilingual font-greek font-cyrillic font-proportional font-otf font-type1 font-t1enc font-supp
-catalogue-version 1.065
+catalogue-version 1.066
name codeanatomy
category Package
@@ -98058,29 +98058,28 @@ catalogue-version 0.2b
name dynkin-diagrams
category Package
-revision 54948
+revision 58718
shortdesc Draw Dynkin, Coxeter, and Satake diagrams using TikZ
relocated 1
longdesc Draws Dynkin, Coxeter, and Satake diagrams in LaTeX documents,
longdesc using the TikZ package. The package requires amsmath, amssymb,
longdesc etoolbox, expl3, mathtools, pgfkeys, pgfopts, TikZ, xparse, and
longdesc xstring.
-containersize 19908
-containerchecksum fdbad30bcd62aab28d6150ab36fa73f2dbe9b8eded3b2b7d4c015cc018c26055740cde7d54c195155e4d39cc491df3463047b83e2cbfe58455647115d4f625c1
-doccontainersize 812132
-doccontainerchecksum 3018e1cd235b871793d36b12557bf654809cd95c3c66e3d2da53fd5ac14b83b64d33270310a69a61b69266177509e70abe483200d3592acd8772bcc2e3a28f30
-docfiles size=218
+containersize 19884
+containerchecksum a273122eb64aa1239eef064a5df382355a8f430ee2f70c4f4ecabf1beeefa3c8ddd2bb2319d04163aabea7e7ec930db5475b218685434b8239e3799ac905efc9
+doccontainersize 820132
+doccontainerchecksum d5d04348a9e3800ff61d4d4548241f9d0c0fbbf29f544b5b6a171f23bda90ca026de5412e30c582a14c621b13bdff54944408f858775fcfad8cfa6bd2abbaa22
+docfiles size=219
RELOC/doc/latex/dynkin-diagrams/README details="Readme"
RELOC/doc/latex/dynkin-diagrams/dynkin-diagrams.bib
RELOC/doc/latex/dynkin-diagrams/dynkin-diagrams.pdf details="Package documentation"
RELOC/doc/latex/dynkin-diagrams/dynkin-diagrams.tex
runfiles size=37
RELOC/tex/latex/dynkin-diagrams/dynkin-diagrams.sty
-catalogue-contact-home http://euclid.ucc.ie/Mckay/
catalogue-ctan /graphics/pgf/contrib/dynkin-diagrams
catalogue-license lppl1.3c
catalogue-topics graphics diagram pgf-tikz expl3
-catalogue-version 3.14159265358979
+catalogue-version 3.1415926535897932
name dyntree
category Package
@@ -98343,15 +98342,15 @@ catalogue-topics notes editorial
name easybook
category Package
-revision 58665
+revision 58719
shortdesc Typeset Chinese books or notes
relocated 1
longdesc Easybook is a minimalist style template based on the ctexbook
longdesc book document class.
-containersize 10916
-containerchecksum 5e8f9c0801cc406ee880a2180591d1fbdd0fd0bd1cc659657d55db518c215b4f7ddf45badac24da33f59ee86a5dc61d47788ceb39cae500fff2125e6f3300b8b
-doccontainersize 521784
-doccontainerchecksum cef13a188983ff4348eede02450ed5f2c01ed376d7796a9b04ffdafdc47b3e80ed8be7fe2f4ca6a60826ea24fcc12202662782fc27e682ee3e11f77c9d223043
+containersize 10912
+containerchecksum 76b1a54430b5f4df596c5682afc7b6abb732478d91ea0d32680fa9ab141231a5ddf725d8a4169d5e51f7e6c211ef4de7e38eb94674e6d19f575fdf3ef14e62ac
+doccontainersize 522176
+doccontainerchecksum 7dd0b2ce48fbf492154c555a6c11e70af820db88a1c9a96e7bb543a683aef8f983e47f8ca64b2d0657f21db3872cc829872ebed18b8d21f797ea38fbc999a028
docfiles size=137
RELOC/doc/latex/easybook/README.md details="Readme"
RELOC/doc/latex/easybook/appendix.tex
@@ -98362,8 +98361,8 @@ docfiles size=137
RELOC/doc/latex/easybook/easybook-demo.tex
RELOC/doc/latex/easybook/easybook.pdf details="Package documentation" language="zh"
RELOC/doc/latex/easybook/refs.bib
-srccontainersize 22000
-srccontainerchecksum 0fbf1659568ef939abee6fc26f4c9fe99a1cddb62d3979a756bebb2a748155c26eb68e82d793dae5e998e7a0f8e8bf89f5332fefdc81b83062361fdb8a5b596e
+srccontainersize 21848
+srccontainerchecksum e249d8eb1f39d6e7b6951524f77a4c3e056910184009a837c0b4de335d7b090555656b48e7eea6e044756201aaa0179ea92d5262f0eb2d4ab733aba24b8d6f15
srcfiles size=22
RELOC/source/latex/easybook/easybook.dtx
runfiles size=12
@@ -98373,7 +98372,7 @@ catalogue-contact-repository https://gitee.com/texl3/easybook
catalogue-ctan /macros/latex/contrib/easybook
catalogue-license cc-by-4
catalogue-topics book-pub class chinese expl3
-catalogue-version 1.23z
+catalogue-version 1.24d
name easyfig
category Package
@@ -103147,8 +103146,8 @@ catalogue-version 1.06
name ekdosis
category Package
-revision 56856
-shortdesc Typesetting TEI-xml-compliant Critical Editions
+revision 58721
+shortdesc Typesetting TEI-xml compliant Critical Editions
relocated 1
longdesc ekdosis is a LuaLaTeX package designed for multilingual
longdesc critical editions. It can be used to typeset texts and
@@ -103156,16 +103155,16 @@ longdesc different layers of critical notes in any direction accepted by
longdesc LuaTeX. Texts can be arranged in running paragraphs or on
longdesc facing pages, in any number of columns which in turn can be
longdesc synchronized or not. In addition to printed texts, ekdosis can
-longdesc convert .tex source files so as to produce TEI-xml-compliant
+longdesc convert .tex source files so as to produce TEI-xml compliant
longdesc critical editions. Database-driven encoding under LaTeX then
longdesc allows extraction of texts entered segment by segment according
longdesc to various criteria: main edited text, variant readings,
longdesc translations or annotated borrowings between texts.
-containersize 17880
-containerchecksum 4d009f77a361386a77cefb528c345af13ff4626516839d93c3e3a12cb8b2a193113f4b3830f076e1e99c91523a549901aeb6e9aebd647736ff2f602e47c1836a
-doccontainersize 599720
-doccontainerchecksum 45033f4c022205cdcb4dacf542d887b452dd1102cf3c8ba65fb1adc4e1bf27b913d8de695898b9673fb4d37fac62e09ac4da55f8fac06e0189867ce55016f624
-docfiles size=186
+containersize 19132
+containerchecksum 58c2cfad3b9269b9a056cbea0465f0af4a4e4bb2647f23497ce2726e7e4f4969f218c89b03e31f99b58afd353eb349ede499445eca3043dd0f25cac6eb5a425f
+doccontainersize 710012
+doccontainerchecksum b99409ec4d691b74b90b4d73c4f046ff62994743240befa008b0b4b0fb63bebff0f0f1d4c77db0034a8d1ae72e9eef474b5054579881d65c0fe730d75873063e
+docfiles size=216
RELOC/doc/lualatex/ekdosis/README.md details="Readme"
RELOC/doc/lualatex/ekdosis/ekdosis.el
RELOC/doc/lualatex/ekdosis/ekdosis.pdf details="Package documentation"
@@ -103173,13 +103172,13 @@ docfiles size=186
RELOC/doc/lualatex/ekdosis/samples/Caesar_BG-6-13-1.pdf
RELOC/doc/lualatex/ekdosis/samples/Caesar_BG-6-13-1.tex
RELOC/doc/lualatex/ekdosis/samples/Makefile
-srccontainersize 78344
-srccontainerchecksum 2da1013c456c6ff85152a32072ed833afb041e756e09f36507c33ef9d36e1d7ef0181641b1584f6431dd868e8631cf8091f4152f5ba58fe2d3b59bb962c21b1c
-srcfiles size=89
+srccontainersize 87748
+srccontainerchecksum 94d9ee25866c1418137f786ebece9c14bba9467b3df1f88f0595990276522b0e1938948c51ef41f9c6a565b3a87fb34f5b1825db1181bf6740d920eda7ad6f06
+srcfiles size=101
RELOC/source/lualatex/ekdosis/Makefile
RELOC/source/lualatex/ekdosis/ekdosis.dtx
RELOC/source/lualatex/ekdosis/ekdosis.ins
-runfiles size=25
+runfiles size=27
RELOC/tex/lualatex/ekdosis/ekdosis.lua
RELOC/tex/lualatex/ekdosis/ekdosis.sty
catalogue-contact-bugs https://gitlab.com/ralessi/ekdosis/issues
@@ -103189,7 +103188,7 @@ catalogue-contact-support http://www.robertalessi.net/mailman/listinfo/ekdosis
catalogue-ctan /macros/luatex/latex/ekdosis
catalogue-license gpl3+ fdl
catalogue-topics crit-ed parallel bidi luatex multilingual
-catalogue-version 1.1
+catalogue-version 1.2
name ektype-tanka
category Package
@@ -106546,7 +106545,7 @@ catalogue-version 1.1
name erewhon
category Package
-revision 57975
+revision 58722
shortdesc Font package derived from Heuristica and Utopia
relocated 1
longdesc Erewhon is based on the Heuristica package, which is based in
@@ -106556,10 +106555,10 @@ longdesc styles (proportional, inferior, numerator, denominator) and
longdesc superior letters. The size is 6% smaller than Heuristica,
longdesc matching that of UtopiaStd.
execute addMap erewhon.map
-containersize 2520660
-containerchecksum bcc35b18afa81e0d7fc949c385d514b455fb52cd65d4f3eededfdb4dacd284241cc09daf74b250647c10f5e0d1c2dff5dd1790e2bc913175586da614ad438adc
-doccontainersize 368740
-doccontainerchecksum 1b2f8d698b0a3a185ae5f509dbc595b477be18496c98e51c65f1806b498c322c90a2d2dc9823574d3690b30da219149b9978e942b0e0535ed42133c5254be75a
+containersize 2520664
+containerchecksum ba9a24a32010d2f69a3bdfd1f146194d0962f3a2108c1a17416faa4ed331fba5315ce2a30710c1778f75fa6d3a709e52c6b6781f4fc2a4634a91706945fcc45f
+doccontainersize 368752
+doccontainerchecksum 3f95f89b51be6b373448bd2fe728bb55d2a1249862147aff0434ac92d8b2628ac25ae2c9906aaca8d932a2cafb6e6d57b7ea674857934a98063cb717d619375e
docfiles size=254
RELOC/doc/fonts/erewhon/FontLog.txt
RELOC/doc/fonts/erewhon/OFL-FAQ.txt
@@ -107565,7 +107564,7 @@ runfiles size=2816
catalogue-ctan /fonts/erewhon
catalogue-license ofl lppl1.3
catalogue-topics font font-body font-multilingual font-cyrillic font-proportional font-serif font-otf font-type1 font-supp font-t1enc
-catalogue-version 1.114
+catalogue-version 1.115
name erewhon-math
category Package
@@ -132207,7 +132206,7 @@ catalogue-version 0.3.0
name gridpapers
category Package
-revision 58560
+revision 58723
shortdesc Graph paper backgrounds and color schemes
relocated 1
longdesc This package provides many preset yet customizable graph paper
@@ -132218,10 +132217,10 @@ longdesc and more. Pattern sizes can be controlled via package options.
longdesc There are several preset color palletes, and colors can be
longdesc overridden. The package uses the PGF/TikZ package, and the
longdesc geometry package to control page size.
-containersize 5144
-containerchecksum 10fd7e9c10851a284c0603f3800cea672486fb1ad38cf1e14334f1b007ab9f1a556573bcede7cd7a6a16b62227f333a75ca5514a5b05d8f1b54e1db855553c9d
-doccontainersize 223984
-doccontainerchecksum 91b9dc44b16cfc0415819a74f77d6828bc8e963a4412c4549e1b08a7c77c660cb052790398f4078ed874a829d54962ca55d543e4163a56eab9ef0b2a27de2d06
+containersize 5164
+containerchecksum 17f9b6b16a0d2f45648b131623c243e0b62f5e2d2fb1c1997af921a1307d941ffb07729d5e4787b4627961160a75de98165e97a42331b07a3259e91c987f27e0
+doccontainersize 225000
+doccontainerchecksum 0f4fed3e0d17f317f3d56f69a7100d36ac6d022f7c7c81c8dd0bb1f740f782ca5a4064cc2c80daf865c85e7ee84027a97fe675a13f9d0d348e489a2a8afa2ed9
docfiles size=75
RELOC/doc/latex/gridpapers/README.md details="Readme"
RELOC/doc/latex/gridpapers/examples/custom-colors.tex
@@ -132243,8 +132242,8 @@ docfiles size=75
RELOC/doc/latex/gridpapers/examples/red-graph.tex
RELOC/doc/latex/gridpapers/examples/triangular-grid.tex
RELOC/doc/latex/gridpapers/gridpapers.pdf details="Package documentation"
-srccontainersize 7856
-srccontainerchecksum 81ea98b1c3ad22868124397c8137d28076edba4246546ed6bcedc0c29e2e89d5dc94110f528bb478a71846c5c0a06909154bc0e6780ff57d932a039b4408ea61
+srccontainersize 7964
+srccontainerchecksum 962b9dd3c99ce419e58cc1f146406b0703807d365069a333971c1b0ad3409f64c9c89d6dfb9c4ce80731164af1d6dcde6b510c156602b0bdde2f231d7da45406
srcfiles size=8
RELOC/source/latex/gridpapers/gridpapers.dtx
RELOC/source/latex/gridpapers/gridpapers.ins
@@ -132256,7 +132255,7 @@ catalogue-contact-repository https://github.com/mcnees/LaTeX-Graph-Paper
catalogue-ctan /macros/latex/contrib/gridpapers
catalogue-license lppl1.3
catalogue-topics pgf-tikz background
-catalogue-version 1.0.1
+catalogue-version 1.0.2
name gridset
category Package
@@ -156573,7 +156572,7 @@ catalogue-topics diagram
name knowledge
category Package
-revision 56404
+revision 58724
shortdesc Displaying, hyperlinking, and indexing notions in a document
relocated 1
longdesc The package offers a systematic way to handle
@@ -156581,18 +156580,18 @@ longdesc notions/concepts/terms throughout a document. It helps building
longdesc an index. In combination with hyperref it makes it easy to have
longdesc every reference of a concept linked to its introduction. It
longdesc also offers simple notations.
-containersize 21540
-containerchecksum 38ee2c6f7dde23a50df6a91f6da4e89efd9297eb3287f1d481577cacdbff7c776e80816d3dcc50ed0ce3a60c185aa7127b16fc7ba68562ff1befd91d6947e5b3
-doccontainersize 772428
-doccontainerchecksum 3eb6621a98a0ba6fb5b21bfb52f08ec299da8fa9f7dfed0b8c2fa649a7147aac3616773a70451163a39417a59bae213abe243419ad6734746ca7315e9a139794
+containersize 21536
+containerchecksum 22b67c0c0833f593ec0ca072744986212d34765945e8e18e0ac37c1ceba26109e98e41ad6535df066cd8091757a55fc644c311159b734fe69952845fcaed1c31
+doccontainersize 772396
+doccontainerchecksum 99b2a1f7bf227317dfa946d0c500f4b3b018d9348b3e71eae188fa3b14df61ad0ea9a63297e186b6555c0ac002150fda71aeedf8abcea20065a13c6c39f0ccae
docfiles size=225
RELOC/doc/latex/knowledge/README.md details="Readme"
RELOC/doc/latex/knowledge/knowledge-example.tex
RELOC/doc/latex/knowledge/knowledge.pdf details="Package documentation"
RELOC/doc/latex/knowledge/knowledge.tex
RELOC/doc/latex/knowledge/makefile
-srccontainersize 41092
-srccontainerchecksum 65ba9b279c76fbc3339b8eedccae410f9d33aa72f5f0f8fc7c1fb9149321c995e3c03552f7595ac3cf556027d35f03b7bcbe537bb0c04001b4e44217ab0d26b9
+srccontainersize 41004
+srccontainerchecksum fe2cef9c5ddc8cfb133291d3340546d75168568211c99f3db5b87d6029fabc85027d382df5210d70e52b782b15728493932b9f15e5673911d821cf656bc56f57
srcfiles size=54
RELOC/source/latex/knowledge/knowledge-code.dtx
RELOC/source/latex/knowledge/knowledge-configuration.dtx
@@ -156605,7 +156604,7 @@ catalogue-contact-repository https://www.irif.fr/~colcombe/Knowledge/
catalogue-ctan /macros/latex/contrib/knowledge
catalogue-license lppl1.2
catalogue-topics index label-ref expl3
-catalogue-version 1.24
+catalogue-version 1.25
name knuth-errata
category Package
@@ -191188,7 +191187,7 @@ binfiles arch=x86_64-solaris size=1
name mathtools
category Package
-revision 58510
+revision 58725
shortdesc Mathematical tools to use with amsmath
relocated 1
longdesc Mathtools provides a series of packages designed to enhance the
@@ -191207,25 +191206,24 @@ longdesc for specifying the column alignment; More building blocks:
longdesc multlined, cases-like environments, new gathered environments;
longdesc Maths versions of \makebox, \llap, \rlap etc.; Cramped math
longdesc styles; and more... Mathtools requires mhsetup.
-containersize 19808
-containerchecksum d33385890c5ba962fac9a62673015700b3e5eee504f84ffa2b3d6745b37e54424b851e460f1dc58ac7cd96ba4e36dbd248d5d13885ea7b2a192fe4fced0e4f56
-doccontainersize 986036
-doccontainerchecksum d8e3c0fcf1023d2ad7fcd81bcf4a66e7ad512ae4a5d25d663f60347c549beeba005a6eedffdc9b4a1135fea66eeec8a6fe8b9341e41bbb9e8793124c71e82d66
+containersize 20008
+containerchecksum 52801da9fe4f3e0dcedd34cb8e7a4a3dd5220f2437f62f32ddd56b99cccb302c7fc138f058f3528e28aabfb8588735b950d1afaf054fa0bd1766ab997ec03e05
+doccontainersize 986028
+doccontainerchecksum ed6ba30e370b3a1ef394e4bdb8301e9ac2f101faeaf0c8260443842d16ac88e665a8d6450472fff1c4ada3e3d4ebd41820626704dab37eef465fda36112ebd77
docfiles size=248
RELOC/doc/latex/mathtools/README.md details="Package README"
RELOC/doc/latex/mathtools/empheq.pdf
RELOC/doc/latex/mathtools/mathtools.pdf details="Package documentation"
RELOC/doc/latex/mathtools/mhsetup.pdf
-srccontainersize 87528
-srccontainerchecksum e693e29dc13556161c709ec4065838aa7e8c323f3acfd297bf36e0f87f3583bac230a42917d75effcb8787bb96191a9f1a78fa80d101f7d75d029eb7eeedfb71
+srccontainersize 87964
+srccontainerchecksum 7d433c9d835ed64a485293d68a06953368fa9b16c60da2e20ccc59d116528d83b3a6fd2272332c8cb1c5a359bde5339c869d2a97a6fa3d236bf3637d8cfceef7
srcfiles size=107
RELOC/source/latex/mathtools/empheq.dtx
RELOC/source/latex/mathtools/empheq.ins
RELOC/source/latex/mathtools/mathtools.dtx
RELOC/source/latex/mathtools/mathtools.ins
RELOC/source/latex/mathtools/mhsetup.dtx
- RELOC/source/latex/mathtools/mhsetup.ins
-runfiles size=28
+runfiles size=29
RELOC/tex/latex/mathtools/empheq.sty
RELOC/tex/latex/mathtools/mathtools.sty
RELOC/tex/latex/mathtools/mhsetup.sty
@@ -191234,7 +191232,7 @@ catalogue-contact-repository https://github.com/latex3/mathtools
catalogue-ctan /macros/latex/contrib/mathtools
catalogue-license lppl1.3
catalogue-topics maths
-catalogue-version 1.25
+catalogue-version 1.26
name matlab-prettifier
category Package
@@ -226990,18 +226988,18 @@ catalogue-topics headings cite-supp
name notomath
category Package
-revision 57177
+revision 58726
shortdesc Math support for Noto fonts
relocated 1
longdesc Math support via newtxmath for Google's NotoSerif and NotoSans.
longdesc (Regular and Bold weights only.)
execute addMap NotoMath.map
-containersize 213344
-containerchecksum cfcc20cee5c36055658d79a345b33dc24605c7b11131fe3b3db9c148b0e0df514316a296e6404976487b20528362d13474e41fae8c04458652dbba0295327d9a
-doccontainersize 403200
-doccontainerchecksum 0a65bf4e4cf30687391c7634512458b8f0baa3b959887aab267ca17a6d03aa491e5f8c4c7e65ca03aed2976c7a735e909cf8b8fe22f6de7203b73d4a57e5ab16
-docfiles size=122
- RELOC/doc/fonts/notomath/README details="Readme"
+containersize 213352
+containerchecksum 87ea63d518f58926be25b144f1a76442873e991207feca20d32d5615c2a52cbc9df9547c081d220603cfe26e4e02f565de60d510d63dcd8179b2249ae2f764a9
+doccontainersize 417208
+doccontainerchecksum fcbcf7df38116022d439d6eb3b98e7e8979d934011bff5d7241e2490e83f4ae19168a4aff1cf4aa887c7aee90ecd82980679d21e53fd8780f5aa13c3b2681857
+docfiles size=125
+ RELOC/doc/fonts/notomath/README.txt details="Readme"
RELOC/doc/fonts/notomath/manifest
RELOC/doc/fonts/notomath/newtx-noto-subs.tex
RELOC/doc/fonts/notomath/newtx-notosans-subs.tex
@@ -227048,7 +227046,7 @@ runfiles size=86
catalogue-ctan /fonts/notomath
catalogue-license ofl lppl1.3
catalogue-topics font font-maths font-serif font-sans font-type1 font-supp
-catalogue-version 1.01
+catalogue-version 1.02
name novel
category Package
@@ -241916,7 +241914,7 @@ catalogue-topics float
name physconst
category Package
-revision 54587
+revision 58727
shortdesc Macros for commonly used physical constants
relocated 1
longdesc This package consists of several macros that are shorthand for
@@ -241934,17 +241932,17 @@ longdesc specified values. Constants that are derived from true
longdesc constants, e.g. the fine structure constant, have been
longdesc calculated using the accepted values of the fundamental
longdesc constants.
-containersize 6004
-containerchecksum c954464412df3790d43acbf0b9fbf6b50600281a28aa7b517f80d08f3255d99fc70d6ee7963144bb531de735227fd03b74d510642a819c91c92170da0c6a8035
-doccontainersize 207712
-doccontainerchecksum feb114e83ead721004ef64a3360c9d3c22e5303e52d409e7756e89db606e60baed2ad36f57f7ff6c374429494f34bdd27170109ca2fbf0dcaf501156e154c887
+containersize 6016
+containerchecksum 3655aa79c067d01831e6f30d85f13ba7b06742d4731f2f2bbea8066205256fd4f6a5d3290812e667bde8805b9bcad82c4713d49e3eb357cde56a1f50ad065877
+doccontainersize 209684
+doccontainerchecksum 1824589dccba975de608260ab460a8a6be0d8aecb099571fb9e088e0ecd53f2f6e854a3f21eebacafd06717bfd53290ce23fbdc85467798c8f9b1189d64a58e9
docfiles size=56
RELOC/doc/latex/physconst/CHANGELOG.md
RELOC/doc/latex/physconst/README.md details="Readme"
RELOC/doc/latex/physconst/makefile
RELOC/doc/latex/physconst/physconst.pdf details="Package documentation"
-srccontainersize 18712
-srccontainerchecksum 7e99c9ab14e0c5423be1d3129d292fee1f5b7cd75d6881f26287205ed832f301b8eae0c4c98779aafad927e43a8dd1953517940b562d60a5e38bf333263176f3
+srccontainersize 18756
+srccontainerchecksum 9e21baa7fe13e2ac201ce8d3d01e5217d078a5300c580fcb9e32fa321fa02ae5da58a4d44f81b4acdb31dc219ae6544196ab6580a123c891021185b65583362c
srcfiles size=92
RELOC/source/latex/physconst/physconst.dtx
RELOC/source/latex/physconst/physconst.ins
@@ -241954,8 +241952,8 @@ catalogue-contact-bugs https://github.com/astrobit/physconst/issues
catalogue-contact-repository https://github.com/astrobit/physconst
catalogue-ctan /macros/latex/contrib/physconst
catalogue-license lppl1.3c
-catalogue-topics physics
-catalogue-version 1.1.1
+catalogue-topics physics numbers
+catalogue-version 1.1.2
name physics
category Package
@@ -241982,24 +241980,24 @@ catalogue-version 1.3
name physunits
category Package
-revision 54588
+revision 58728
shortdesc Macros for commonly used physical units
relocated 1
longdesc This package provides a collection of macros to simplify using
longdesc physical units (e.g. m for meters, J for joules, etc.),
longdesc especially in math mode. All major SI units are included, as
longdesc well as some cgs units used in astronomy.
-containersize 1732
-containerchecksum 07ed1981923b47aaa5db8837a044c354b0a0ebb057497130e3bd5999cf3e92776290df0e01ccd5c1772365d45b176149ca6fcb276ad2c760a0e47f3f3c466d5e
-doccontainersize 103804
-doccontainerchecksum d63da845f312ef54c90b3c2ee27d8e3f0f02c2acd426dec0cfdb4325d79d61384827928eb69b4e8ce20ca49e4a7ed5d1e1a95e8a4ee922dcb53753ffa9f3d267
+containersize 1744
+containerchecksum 96f700e6dd103f768383a78645cb32e363b83c459a0c764a77d127bbf2aa7c143105752ef9910a2d9d6e659547931b01a2bb0683b41d8870c0fd850d7e01de3f
+doccontainersize 104792
+doccontainerchecksum e0a3fe337242d4da26153258f16dd8f71c2a704ed89fea8dc0f58b1fca7ecbf9fb168bc05adee988aca61883bf94272ec2f1ed841d99e47f0992b04f6c5bc371
docfiles size=29
RELOC/doc/latex/physunits/CHANGELOG.md
RELOC/doc/latex/physunits/README.md details="Readme"
RELOC/doc/latex/physunits/makefile
RELOC/doc/latex/physunits/physunits.pdf details="Package documentation"
-srccontainersize 6420
-srccontainerchecksum 435ed188e08e38ebdc2a4d49b85d17dcee2d589bec1e8256443fad6c865c8ada874a8fea0a462f5876fbabbd6dc196d58e24be88463f10e9c851daf9d117c660
+srccontainersize 6552
+srccontainerchecksum 59ebd20b6658b4f4082e56dbb2017b4f63fbf9d7a61dc6c5b91a1da1be4794b1e555f2c6e68cb19ee6bd4c0e860eab77905eadd7fd4f72ea83f4b251bc8fae14
srcfiles size=13
RELOC/source/latex/physunits/physunits.dtx
RELOC/source/latex/physunits/physunits.ins
@@ -242009,7 +242007,7 @@ catalogue-contact-repository https://github.com/astrobit/physunits
catalogue-ctan /macros/latex/contrib/physunits
catalogue-license lppl1.3c
catalogue-topics physics units scientific-docs
-catalogue-version 1.0.4
+catalogue-version 1.2.0
name piano
category Package
@@ -242876,16 +242874,16 @@ catalogue-version 0.7.0
name pkuthss
category Package
-revision 56838
+revision 58729
shortdesc LaTeX template for dissertations in Peking University
relocated 1
longdesc The package provides a simple, clear and flexible LaTeX
longdesc template for dissertations in Peking University.
-containersize 16200
-containerchecksum 5c788b191a0910098fa99dc602456621e82b18bb154f863a287dce24a02c55c2af89583836874aad7ac586b971461636482481cee9c9e9cc9511a503d8fbe86f
-doccontainersize 422744
-doccontainerchecksum a5e8421992285f670676e21ba766d054c96933d7b79de1fd8d3de7e5310f529da3db82454aedd2bb890f07e592f06d280a01539349cb2da9d8084bf9840e710a
-docfiles size=144
+containersize 16648
+containerchecksum 34f4fce7ef86327be8353d8a5634c8498007a8b30ee847b01a577610bf1d1a31f862bdd3888888a022563333e275f74f686efdea5ae8d7fe82f99e6d8e71f212
+doccontainersize 435360
+doccontainerchecksum ee343be7e84257bafd28ed10de0e5724c19c832a170ab8b176a0681da3bd108ba2f914e214e1c7045ffcdb981e72b3ba08c736c6486ad756af736e48e13738d0
+docfiles size=149
RELOC/doc/latex/pkuthss/README.txt details="Readme"
RELOC/doc/latex/pkuthss/example.pdf
RELOC/doc/latex/pkuthss/example/Make.bat
@@ -242920,7 +242918,7 @@ docfiles size=144
RELOC/doc/latex/pkuthss/readme/pkuthss-english.patch
RELOC/doc/latex/pkuthss/readme/pkuthss.bib
RELOC/doc/latex/pkuthss/readme/pkuthss.tex
-runfiles size=12
+runfiles size=13
RELOC/tex/latex/pkuthss/pkulogo.eps
RELOC/tex/latex/pkuthss/pkulogo.pdf
RELOC/tex/latex/pkuthss/pkuthss-gbk.def
@@ -242932,7 +242930,7 @@ catalogue-contact-repository https://gitea.com/CasperVector/pkuthss
catalogue-ctan /macros/latex/contrib/pkuthss
catalogue-license lppl1.3 bsd pd
catalogue-topics dissertation class chinese
-catalogue-version 1.8.3
+catalogue-version 1.9.0
name pl
category Package
@@ -248377,7 +248375,7 @@ catalogue-version 1.1
name powerdot
category Package
-revision 45165
+revision 58730
shortdesc A presentation class
relocated 1
longdesc Powerdot is a presentation class for LaTeX that allows for the
@@ -248387,11 +248385,11 @@ longdesc presenter. Examples are automatic overlays, personal notes and
longdesc a handout mode. To view a presentation, DVI, PS or PDF output
longdesc can be used. A powerful template system is available to easily
longdesc develop new styles. A LyX layout file is provided.
-containersize 26284
-containerchecksum 20888eecfbf1e390ff32e7cea503c1c9bcb5910044fc4f41238b63039b56da82993fb38c4f24fbcc43c8a4b451b59e1010fb81bca048d5ded1cd6455f7568bc2
-doccontainersize 943004
-doccontainerchecksum ba3051425104a49dc2d553d93220b569dfdf548090a90348ddc0286a36cb9f00e7956c617a133a0ef69bcf69cb5325b4f12007f6ce56868b6336d422183777a4
-docfiles size=321
+containersize 26304
+containerchecksum 040d634225ba154fb76145815b923ef9e266a48bc41f245098b70634d6d8fe7890e65a943c44a694d889252de3f66ea49bdb7d56ad7c8ec0e1ac563469138f97
+doccontainersize 947592
+doccontainerchecksum 8b3076cfd45d3c6774e0061b54d63bf89245b16ae704b0c7541ef61b62e0b4972d28b31493fd8e4c167cf87388d87b74ca5b8335b106a310cc78a4c8175330bb
+docfiles size=322
RELOC/doc/latex/powerdot/README details="Readme"
RELOC/doc/latex/powerdot/manifest.txt
RELOC/doc/latex/powerdot/pdpream.ble
@@ -248407,8 +248405,8 @@ docfiles size=321
RELOC/doc/latex/powerdot/powerdot.pdf details="Package documentation (English)" language="en"
RELOC/doc/latex/powerdot/powerdotDE.pdf details="Package documentation (German)" language="de"
RELOC/doc/latex/powerdot/powerdotDE.tex
-srccontainersize 67028
-srccontainerchecksum 573248dc8e8e0a248c652baa3a57ca411302b40005a4e095d594f01cfc3a51789ae3a0c90b48d125f863e09a7672020a4fc7e51e45a1a75d8434c30fa41979c2
+srccontainersize 67108
+srccontainerchecksum e1882bf2cedb5a4146cfcdab5a89618a986c5dab64ccc4953c90157060907c18429b834e2b4dd0cdd38969c30697a354f024bd6e2c4dda88a40acd664350ac2d
srcfiles size=79
RELOC/source/latex/powerdot/powerdot.dtx
runfiles size=50
@@ -248435,7 +248433,7 @@ catalogue-also prosper ha-prosper
catalogue-ctan /macros/latex/contrib/powerdot
catalogue-license lppl1.3
catalogue-topics presentation class
-catalogue-version 1.5c
+catalogue-version 1.6
name powerdot-fuberlin
category Package
@@ -254525,7 +254523,7 @@ catalogue-version 1.5e
name pstricks
category Package
-revision 56385
+revision 58731
catalogue pstricks-base
shortdesc PostScript macros for TeX
relocated 1
@@ -254545,10 +254543,10 @@ longdesc pdftricks package, to generate a PDF inclusion from a PSTricks
longdesc diagram. PSTricks macros can also generate PDF output when the
longdesc document is processed XeTeX, without the need for other
longdesc supporting packages.
-containersize 75816
-containerchecksum 38efa0b02d093aa38b83334b6db2913c1c62bedf1ad41de02eeb4f39747938ede724dea9d62304eac5a780af4f27899c87f34d72e41523545ee98e7815ea7aba
+containersize 75992
+containerchecksum 9d7eddbede84ccb7cab9024f4ebeff688707f189012c3f71ed3a57963bacb13fb7aa6ad2af136d11b9e530ea4b1b74b9c06563954b81a1cd41c65f3a2c8e5fd4
doccontainersize 7451364
-doccontainerchecksum 444b26571da58ad831f5d6ff395ff4e54f4759aab936d184036c30f780156bcd662d99f4ba8d8a96951d08c8dc4fb59fbb5230a2d5da81eeae60b859b44057bd
+doccontainerchecksum f3decc60f9153b5eca7a71c72518cfa9501c5e970c0d2957dcd866296c883070aac3fc11016e74e6e703927bec7bf1135bd2a20d5a8a5d937ce7d95e8410fe13
docfiles size=2269
RELOC/doc/generic/pstricks/PSTricks.bib
RELOC/doc/generic/pstricks/README details="Readme"
@@ -254597,7 +254595,7 @@ docfiles size=2269
RELOC/doc/generic/pstricks/pstricks-doc.pdf
RELOC/doc/generic/pstricks/test-pst.pdf
RELOC/doc/generic/pstricks/test-pst.tex
-runfiles size=121
+runfiles size=154
RELOC/dvips/pstricks/pst-algparser.pro
RELOC/dvips/pstricks/pst-dots.pro
RELOC/dvips/pstricks/pst-dots97.pro
@@ -254617,6 +254615,7 @@ runfiles size=121
RELOC/tex/generic/pstricks/pstricks-xetex.def
RELOC/tex/generic/pstricks/pstricks.con
RELOC/tex/generic/pstricks/pstricks.tex
+ RELOC/tex/generic/pstricks/pstricks.tex.neu
RELOC/tex/generic/pstricks/pstricks97.tex
RELOC/tex/latex/pstricks/pst-all.sty
RELOC/tex/latex/pstricks/pst-doc.cls
@@ -254632,7 +254631,7 @@ catalogue-contact-support http://tug.org/mailman/listinfo/pstricks
catalogue-ctan /graphics/pstricks/base
catalogue-license lppl1.3
catalogue-topics graphics-in-tex colour pstricks dvips-special xetex
-catalogue-version 3.01
+catalogue-version 3.01a
name pstricks-add
category Package
@@ -260982,7 +260981,7 @@ catalogue-version 1.1
name rec-thy
category Package
-revision 58212
+revision 58732
shortdesc Commands to typeset recursion theory papers
relocated 1
longdesc This package is designed to help mathematicians publishing
@@ -260990,21 +260989,21 @@ longdesc papers in the area of recursion theory (aka Computability
longdesc Theory) easily use standard notation. This includes easy
longdesc commands to denote Turing reductions, Turing functionals, c.e.
longdesc sets, stagewise computations, forcing and syntactic classes.
-containersize 13976
-containerchecksum c95c121049fa4891f0040334c63e4cadce442e1a38585e4710b7981860a5ec786f48fe060a7912059be17f3b549a46dbee4e8a1fa8c83c179b152a2316fe128b
-doccontainersize 115052
-doccontainerchecksum bde389325942032809680fb7b14badf8382396c3e5686c0e787e239c0ea2705970f391a9c37f09f066518d3f9a3c89e11b765f04e9d36d03692998a06f74ff4c
-docfiles size=46
+containersize 15068
+containerchecksum 6c7b66557d5d7b834c2838415744ee1da8eea05bd25292a9793b3a992174ff250f0f66b5ba09d962bc8d1abd0414ba0ef639539318ca1a30a877ef8c06a48a42
+doccontainersize 122696
+doccontainerchecksum a11ea08603dde4d2a8896c5ac392efc93de53f988b2d7dd458d06a66d91f8f014cb08b56349be4aae7d36dc29b47fb8d6a3e4d74978cddf85d12e596c42cf384
+docfiles size=49
RELOC/doc/latex/rec-thy/README details="Readme"
RELOC/doc/latex/rec-thy/rec-thy.pdf details="Package documentation"
RELOC/doc/latex/rec-thy/rec-thy.tex
-runfiles size=18
+runfiles size=20
RELOC/tex/latex/rec-thy/rec-thy.sty
catalogue-contact-repository https://github.com/TruePath/Recursion-Theory-Latex-Package
catalogue-ctan /macros/latex/contrib/rec-thy
catalogue-license pd
-catalogue-topics maths
-catalogue-version 3.6
+catalogue-topics maths expl3
+catalogue-version 3.7
name recipe
category Package
@@ -268334,7 +268333,7 @@ containerchecksum 44bc102582ef5f6e0499efde6d3190b86988def41aa062a6239075b9371f6c
name scholax
category Package
-revision 57178
+revision 58733
shortdesc Extension of TeXGyreSchola (New Century Schoolbook) with math support
relocated 1
longdesc This package contains an extension of TeXGyreSchola with
@@ -268344,11 +268343,11 @@ longdesc slanted and bold slanted faces. Math support is provided by one
longdesc of two options to newtxmath, one of which uses an adaptation of
longdesc the fourier math Greek letters.
execute addMap ScholaX.map
-containersize 1883408
-containerchecksum 7b515c99016c587f6929077d10efeca0e46555b79dce5790d61905e1ab7f76b1cda7d1122d8d25557f5a03a98fd70c2615dee2f25fb182d786875e267fd913e4
-doccontainersize 201524
-doccontainerchecksum da152b0ef3367b2d150601e5c8f9912b4a10ade27bea004500bf9a5f8652785029c79956a3f616bacb2d9908f5223d19bfc82dfb56c95b40bd3d7f71958473be
-docfiles size=99
+containersize 1884268
+containerchecksum 67818d34da2803257ae4de877eeb696d34eb887bd6ab54613793f4f1737ababa1fdb657162588c6ec353bf9604113403fbeae2203bf662b888f5197032e57924
+doccontainersize 334084
+doccontainerchecksum fb9cf815fb45cb513f8322597e1deefefc77c1829d2ae2f8cffb52a225bfb6fe9712be523ed861aca096bbe80317979dffcdfce87970b66fb403343a5e5e43af
+docfiles size=182
RELOC/doc/fonts/scholax/README details="Readme"
RELOC/doc/fonts/scholax/scholax-doc.pdf details="Package documentation"
RELOC/doc/fonts/scholax/scholax-doc.tex
@@ -268975,7 +268974,7 @@ runfiles size=1914
catalogue-ctan /fonts/scholax
catalogue-license lppl
catalogue-topics font font-body font-maths font-serif font-proportional font-otf font-type1 font-supp font-t1enc
-catalogue-version 1.029
+catalogue-version 1.030
name schooldocs
category Package
@@ -272922,7 +272921,7 @@ catalogue-version 1.0
name siunitx
category Package
-revision 53914
+revision 58714
shortdesc A comprehensive (SI) units package
relocated 1
longdesc Typesetting values with units requires care to ensure that the
@@ -272947,15 +272946,16 @@ longdesc The package relies on LaTeX 3 support from the l3kernel and
longdesc l3packages bundles.
depend l3kernel
depend l3packages
-containersize 34760
-containerchecksum 371fabf3b76239174c7f2f0cb6bf123b7fbb224261e07460d1620459578fd12a400f8e4babd43637afa9b917a39050c11973f4db8dd5ef17a6cdcd172eca245b
-doccontainersize 629508
-doccontainerchecksum e0b8c3dbafa6cebf1aa344c6d99bb17a532201c198bbb6e9f73319e6653bb8ede2243ba0bdaa57074d8c374b31d45659f3e803680eafde37797085a8edada8f9
-docfiles size=158
+containersize 34748
+containerchecksum 7f43171d9d2f4074af2f912de20c5953cc2dffd45a6540907dc1e2924ebf03925190eb120cdbd37b59686f0547c0e545f5aa1db0607274bf0b61b4db94c722eb
+doccontainersize 637016
+doccontainerchecksum f668ec1ca464eaa50d698397f03372b2a300e304a640c65357f42d612cc13eb498533ecfa4842a3bf65181402c1a324ea997fa5f438a5837a7b3131ca276499c
+docfiles size=166
+ RELOC/doc/latex/siunitx/CHANGELOG.md
RELOC/doc/latex/siunitx/README.md details="Readme"
RELOC/doc/latex/siunitx/siunitx.pdf details="User manual"
-srccontainersize 103376
-srccontainerchecksum ac85900c379cc0c2b052685c02d0a684e24016333b4ae8072ee390e213aaa3204b35faa74052cb8d6716064daddcb940afaf4905cf3145c02e2436fce7af88e1
+srccontainersize 103372
+srccontainerchecksum b288e83b4fc610a1a2a85a6557e6bd2e1dd1732ee2b6e90739ad15c5436100ebbf0e95eba820f74d079465f62898ca8cd608f9b6231e0b0bd84d80ef0a930fc3
srcfiles size=151
RELOC/source/latex/siunitx/siunitx.dtx
runfiles size=78
@@ -272969,7 +272969,7 @@ catalogue-contact-repository https://github.com/josephwright/siunitx
catalogue-ctan /macros/latex/contrib/siunitx
catalogue-license lppl1.3c
catalogue-topics units scientific-docs expl3
-catalogue-version 2.8b
+catalogue-version 2.8c
name skak
category Package
@@ -279914,7 +279914,7 @@ binfiles arch=x86_64-solaris size=1
name srdp-mathematik
category Package
-revision 58512
+revision 58734
shortdesc Typeset Austrian SRDP in mathematics
relocated 1
longdesc This package provides basic commands for the defined formats of
@@ -279923,11 +279923,11 @@ longdesc mathematics. Furthermore, it includes ways to implement answers
longdesc in the tex file which can optionally be displayed in the pdf
longdesc file, and it offers a way to vary the answers in order to
longdesc create different groups (e. g. for tests) easily.
-containersize 7396
-containerchecksum 6a6eccb5c2cd35df10414cf61b9c30a47839b0bd6e0aa9336c8692e440325ead3fe476577a69010188fcefe44db3727ba0eaa2cbb3fa9c3df948dd34446f6a9c
-doccontainersize 139248
-doccontainerchecksum 9880abbcc4fd606e0f59ee4e878a28e8e5d848f063153eebf1ca24b8edc1462e3521e601d3ba145a7919c7fc6539f06c3d21ac2ead0804f1af86e6fc0a6cd4f5
-docfiles size=53
+containersize 7456
+containerchecksum c6a37c722985c09980fb6487f46603a2b7475ce1d2bda4ab9eaea36c106fe19146b6b961e9406b76aea626ef0d09babb25193340a87bf4fc428c0a3314e04f34
+doccontainersize 147900
+doccontainerchecksum 7886d6da7321cfc19f364b730a54def58250138d81538a74512416a8adceea299a36b517a0ac0b660041b85a9f9f2ef2125d613f3efc899b73d6717d69d81163
+docfiles size=57
RELOC/doc/latex/srdp-mathematik/README.txt details="Readme"
RELOC/doc/latex/srdp-mathematik/srdp-mathematik.pdf details="Package documentation"
RELOC/doc/latex/srdp-mathematik/srdp-mathematik.tex
@@ -279936,7 +279936,7 @@ runfiles size=18
catalogue-ctan /macros/latex/contrib/srdp-mathematik
catalogue-license lppl1.3c
catalogue-topics exam maths std-conform
-catalogue-version 1.8
+catalogue-version 1.9.0
name sseq
category Package
@@ -282131,7 +282131,7 @@ catalogue-version 1.1.3
name stix2-otf
category Package
-revision 57427
+revision 58735
shortdesc OpenType Unicode text and maths fonts
relocated 1
longdesc The Scientific and Technical Information eXchange (STIX) fonts
@@ -282142,19 +282142,24 @@ longdesc Unicode-based collection of mathematical symbols and alphabets
longdesc with a set of text faces suitable for professional publishing.
longdesc The fonts are available royalty-free under the SIL Open Font
longdesc License.
-containersize 1383744
-containerchecksum 3bd27d08e0112039d35e37e3e026e1f88e0d2fb8c02955447bf68ac379767dce82d3c68415489afb606c753a5ddee5df4cdba905d178ba23f7d3bcc961f6aa20
-doccontainersize 1219820
-doccontainerchecksum 0dffc7f54f04deeca5f42e91a66e2a5c5de9d097058ce09bc7518b32efb2116cf647a4eadad18d9b56976959b3db8e1ca4d8d5542ef558e4010f91597eae972c
-docfiles size=363
+containersize 1382984
+containerchecksum b966a7d18a471f13b5eb85115566ef4aa7c894b142561a46144e5cda6a0198dfcd83b776d19d605cffe482d07a4ac9d80acde7879892381e1a266e7af4f9f72e
+doccontainersize 1252812
+doccontainerchecksum 15e370d490eb01022877ce01cb8e9954af89553bd0cb2b404820c8744271d13ea32c75d2971abed4cc64a692184fb0fe369bc97bf870524599b2011fec3bfec2
+docfiles size=481
RELOC/doc/fonts/stix2-otf/AUTHORS.txt
RELOC/doc/fonts/stix2-otf/CONTRIBUTORS.txt
RELOC/doc/fonts/stix2-otf/FONTLOG.txt
+ RELOC/doc/fonts/stix2-otf/Math-features.tex
RELOC/doc/fonts/stix2-otf/OFL-FAQ.txt
RELOC/doc/fonts/stix2-otf/OFL.txt
RELOC/doc/fonts/stix2-otf/README.md details="Readme"
- RELOC/doc/fonts/stix2-otf/STIXTwoMath-Regular.pdf details="Package documentation"
- RELOC/doc/fonts/stix2-otf/STIXTwoText-Regular.pdf details="Further Package documentation"
+ RELOC/doc/fonts/stix2-otf/STIXTwoMath-Regular.pdf details="Unicode Charts for STIX Two Math Regular"
+ RELOC/doc/fonts/stix2-otf/STIXTwoMath-Regular.tex
+ RELOC/doc/fonts/stix2-otf/STIXTwoText-Regular.pdf details="Unicode Charts for STIX Two Text Regular"
+ RELOC/doc/fonts/stix2-otf/STIXTwoText-Regular.tex
+ RELOC/doc/fonts/stix2-otf/Text-features.tex
+ RELOC/doc/fonts/stix2-otf/intro.tex
runfiles size=814
RELOC/fonts/opentype/public/stix2-otf/STIXTwoMath-Regular.otf
RELOC/fonts/opentype/public/stix2-otf/STIXTwoText-Bold.otf
@@ -282172,7 +282177,7 @@ catalogue-contact-repository https://github.com/stipub/stixfonts
catalogue-ctan /fonts/stix2-otf
catalogue-license ofl
catalogue-topics font font-otf font-maths font-symbol font-symbol-maths font-body font-collection font-nonroman font-serif
-catalogue-version 2.11
+catalogue-version 2.12
name stix2-type1
category Package
@@ -283626,7 +283631,7 @@ catalogue-version 4.1g
name suppose
category Package
-revision 58299
+revision 58736
shortdesc Abbreviate the word "Suppose"
relocated 1
longdesc This package provides commands for abbreviating the word
@@ -283635,20 +283640,20 @@ longdesc recommends only using these commands when the immediately
longdesc succeeding strings are mathematical in nature. He does not
longdesc recommend using them in formal work. The package requires
longdesc amsmath, amsfonts, and graphicx.
-containersize 1784
-containerchecksum 4768302660fd35bdb1de5dc459b9083b3c3a67bb607f33e0e88c8f1dcbf1d0d4edf66408534eb967781d98e0abe77610545538ab7df492ccead0028c017a41b1
-doccontainersize 160676
-doccontainerchecksum 68b74104f54228b3ad2755a695a1f706a622b0d33429298c134653972f3c75a255cbd21176f4ad73576a5b3aa724d4ef7d8609252aa340a07c9020e0cdfcba94
-docfiles size=44
+containersize 2164
+containerchecksum ff890a2809a19c63733769d545a908c05f1145762edc240c4aac8f18b6f0ef66c01f70d7be51c83eae298ea640af89b1c8b506ca0befbe5b461e8724fbcbb9bc
+doccontainersize 196252
+doccontainerchecksum 834bf055ae114b1c1f01375b066281b96c8faaa9be1a7b31fd80718dc25b0a418f69c916195ae98a40b5317a4aed46e0d0f6dd8bd535f562fb26760424b2882e
+docfiles size=53
RELOC/doc/latex/suppose/README.md details="Readme"
- RELOC/doc/latex/suppose/suppose.pdf details="Package documentation"
- RELOC/doc/latex/suppose/suppose.tex
+ RELOC/doc/latex/suppose/suppose-doc.pdf details="Package documentation"
+ RELOC/doc/latex/suppose/suppose-doc.tex
runfiles size=2
RELOC/tex/latex/suppose/suppose.sty
catalogue-ctan /macros/latex/contrib/suppose
catalogue-license lppl1.3c
catalogue-topics maths abbrev
-catalogue-version 1.0
+catalogue-version 1.2
name susy
category Package
@@ -305134,19 +305139,19 @@ catalogue-version 4.10c
name tikztosvg
category TLCore
-revision 56122
+revision 58737
shortdesc A utility for rendering TikZ diagrams to SVG
longdesc This package provides a shell script that calls XeTeX and
longdesc pdf2svg to convert TikZ environments to SVG files.
depend tikztosvg.ARCH
-containersize 1684
-containerchecksum e4d2bdd9d349d954386e8aeca46f6c605a93dc204e7dded3e6a2c487d246c51a7809edeaed0178f3e1aa0e20fe698f6bcb15a4ef7584ae5fdd1debd505e2cfe8
-doccontainersize 82612
-doccontainerchecksum f1212dfaf6108d7ebb18d03d0e04c64e6ec370f7cc2530aad1122ecdc27fd429a0d5e9d7195aca0c9f36b445b197fd9bff5a4285047b611eba3742810adeb9cc
-docfiles size=49
+containersize 2012
+containerchecksum 826b6cc6489db99d4b7651afdaf68117840e8aab4a19235110128af63cf26108fe409fba341acd26ef1ce2ba6276d368bd00e83c7b5954b1937d50b4d3c3fe8e
+doccontainersize 206532
+doccontainerchecksum 1418c505769ed1fe835f713cc546305a25b6a96a16a7e6dbf9938547824b59fbf4d638c9d40ec7ed1c23fb110ffb482062884eefdd432db1e57b9e567ac299a4
+docfiles size=66
texmf-dist/doc/man/man1/tikztosvg.1
texmf-dist/doc/man/man1/tikztosvg.man1.pdf
- texmf-dist/doc/support/tikztosvg/CHANGELOG.adoc
+ texmf-dist/doc/support/tikztosvg/CHANGELOG.md
texmf-dist/doc/support/tikztosvg/LICENSE
texmf-dist/doc/support/tikztosvg/Makefile
texmf-dist/doc/support/tikztosvg/README.md details="Readme"
@@ -305155,14 +305160,18 @@ docfiles size=49
texmf-dist/doc/support/tikztosvg/install.sh
texmf-dist/doc/support/tikztosvg/man.adoc
texmf-dist/doc/support/tikztosvg/tikztosvg.pdf details="Manual page (PDF)"
-runfiles size=1
+runfiles size=2
texmf-dist/scripts/tikztosvg/tikztosvg
-catalogue-contact-bugs https://gitlab.com/pablo-escobar/tikztosvg/-/issues
-catalogue-contact-repository https://gitlab.com/pablo-escobar/tikztosvg
+catalogue-contact-announce https://lists.sr.ht/~pablo-pie/tikztosvg
+catalogue-contact-bugs https://todo.sr.ht/~pablo-pie/tikztosvg
+catalogue-contact-development https://lists.sr.ht/~pablo-pie/tikztosvg
+catalogue-contact-home https://git.sr.ht/~pablo-pie/tikztosvg
+catalogue-contact-repository https://git.sr.ht/~pablo-pie/tikztosvg
+catalogue-contact-support https://lists.sr.ht/~pablo-pie/tikztosvg
catalogue-ctan /support/tikztosvg
catalogue-license gpl3
catalogue-topics cvt-other graphics pgf-tikz
-catalogue-version 0.1.2
+catalogue-version 0.2.0
name tikztosvg.aarch64-linux
category TLCore
@@ -313694,7 +313703,7 @@ catalogue-version 3.13a
name tudscr
category Package
-revision 56909
+revision 58713
shortdesc Corporate Design of Technische Universitat Dresden
relocated 1
longdesc The TUD-Script bundle provides both classes and packages in
@@ -313735,11 +313744,11 @@ depend opensans
depend trimspaces
depend xcolor
depend xpatch
-containersize 160144
-containerchecksum 38c93ccfe8521a355ab9c0bccf6a9ba4e4a803397d8ac59cfbea118d13ffde5c70e300a44d339df72f3b8f591ff568baf0b86cde882b8990f1f42d4b74e5821a
-doccontainersize 3742780
-doccontainerchecksum f84f8c0422a25e07475918fedb39d9427a2ee7174720c82fdadd23bb5549e1183c28ce11ce3d6e84e93184010ff6caa50e6b33ef08a96d235ac5bc7c672ec901
-docfiles size=1069
+containersize 160276
+containerchecksum 16ae7a0ca2544007dfcc1f2720080ae7f8453f535a696ff1edd252ed6a9d6eda9da48c80420c6a64e9b36c85322215c41477269871e285239707c17ae96b6960
+doccontainersize 3746440
+doccontainerchecksum 0e6d42d4bf8a7e2af363243be7a75d93fe489c7e99cc1c731e3e233aff96f2f7f00787af8a5e86419c8d5cf3c7bef9a593aed546e66c565343793f081f34b7d5
+docfiles size=1071
RELOC/doc/latex/tudscr/LICENSE.md
RELOC/doc/latex/tudscr/README.md details="Readme"
RELOC/doc/latex/tudscr/tudscr.pdf details="User manual" language="de"
@@ -313748,8 +313757,8 @@ docfiles size=1069
RELOC/doc/latex/tudscr/tutorials/mathswap.pdf
RELOC/doc/latex/tudscr/tutorials/mathtype.pdf
RELOC/doc/latex/tudscr/tutorials/treatise.pdf
-srccontainersize 316940
-srccontainerchecksum 102690681db659a244bcd56baf8fb5d49063ce183f3ded0108e750cb45f16cb312bba9a70dda56fb4ab2cf22a74c63ab6b429cb841318309f908b1eacf8bcb58
+srccontainersize 316860
+srccontainerchecksum 68651ed041af40431be9bac615e3fbefc33330fdf0be33d4cbc80d3cdf4080ba6e7ba5147cfb64101f332af0386cc29d44198fbd3594eb2447e680fa097206b1
srcfiles size=460
RELOC/source/latex/tudscr/doc/examples/dissertation.tex
RELOC/source/latex/tudscr/doc/examples/document.tex
@@ -313854,7 +313863,7 @@ catalogue-contact-support https://latex.wcms-file3.tu-dresden.de/phpBB3/index.ph
catalogue-ctan /macros/latex/contrib/tudscr
catalogue-license lppl1.3c
catalogue-topics dissertation class std-conform
-catalogue-version 2.06k
+catalogue-version 2.06l
name tufte-latex
category Package
@@ -335792,7 +335801,7 @@ binfiles arch=x86_64-linux size=1272
name xint
category Package
-revision 57832
+revision 58738
shortdesc Expandable operations on long numbers
relocated 1
longdesc The xint bundle main modules are: xinttools utilities of
@@ -335817,18 +335826,18 @@ longdesc display of continued fractions). All computations are
longdesc compatible with expansion-only context. The packages may be
longdesc used with Plain TeX, LaTeX, or (a priori) any other macro
longdesc format built upon TeX.
-containersize 70724
-containerchecksum 6fefb7924c8b3b263a28a99577ce6615d9122fc6226dbeae1f55904f390cf8fe1929a9d9bd0a576510c4ca74bafa3ed772972f5c9957dadaa5b53c1cfb915951
-doccontainersize 1991500
-doccontainerchecksum 43fe5e8bb44651b812bb283bea6c0d58688969a53af7fe4a162e03bfcf010ca6b1f3577e57120041c02df085547bd1c7344c8d803640684458423b256e1ff142
-docfiles size=526
+containersize 70940
+containerchecksum 44305994a39b6d0a0c517445bf554f1decaa8c1bde5eee2613010308308fd606790409266e9af0803828df00693ac5e1d015a8cef90d112553762eae97f8ed53
+doccontainersize 2002992
+doccontainerchecksum dc65101c1196c68a703d1e6f8f1b69c554bc3841fbde860cacf11c3547f6fe45928d371deed05ce1999f7afa1bd65368df626199a0f2dd5392c4d67e924a51b9
+docfiles size=530
RELOC/doc/generic/xint/CHANGES.html details="Changes (HTML)"
RELOC/doc/generic/xint/README.md details="Readme"
RELOC/doc/generic/xint/sourcexint.pdf details="Documented source code"
RELOC/doc/generic/xint/xint.pdf details="Package documentation"
-srccontainersize 343656
-srccontainerchecksum 62fa859a819c3e4a354e22426cf5dc545aaa8f3ec1e30a91080a55aa0b1f6259bf9c89e2cf33a79e5185b7b598bb5ed1006a569e42cf32149550b4d59a5b8bd9
-srcfiles size=403
+srccontainersize 346220
+srccontainerchecksum 75fa7fe493f9bd393cab448c7bbac43d56f67daf547281cc410d88db54e8b6ccffd86171a2ef5ed54721e73538c61b6493e41fca4a503775ff8ed0cb7bac968e
+srcfiles size=405
RELOC/source/generic/xint/Makefile
RELOC/source/generic/xint/xint.dtx
runfiles size=145
@@ -335847,7 +335856,7 @@ runfiles size=145
catalogue-ctan /macros/generic/xint
catalogue-license lppl1.3c
catalogue-topics arithmetic calculation
-catalogue-version 1.4c
+catalogue-version 1.4d
name xits
category Package
@@ -338655,7 +338664,7 @@ binfiles arch=x86_64-solaris size=1
name yquant
category Package
-revision 56830
+revision 58712
shortdesc Typesetting quantum circuits in a human-readable language
relocated 1
longdesc This LaTeX package allows to quickly draw quantum circuits. It
@@ -338668,11 +338677,11 @@ longdesc i.e., it requires no external program -- that introduces a
longdesc logic oriented language and thus brings the best of both worlds
longdesc together. It builds on and interacts with TikZ, which brings an
longdesc enourmous flexibility for customization of individual circuit.
-containersize 38920
-containerchecksum b0227b4573dc18aeaa6563afad2bfcff8190a3cbb63c3ef8406755b117035b1c8d7665c4998ef10ec81cc0619b30382a04be0cf9a8d43861ce3fa17f910b4f7d
-doccontainersize 476696
-doccontainerchecksum 06aa69f822908763495da04ca1e5dd1913ccf84c92d9eb56fc616a5b3d11ad85307cf3aec8370f7badf61677081b9dc8c26ded52fd282d4fdfa6cfb6f6b24dd4
-docfiles size=210
+containersize 45296
+containerchecksum 90c4488ffbb6a2ec49297b7584c27416044220253fb7f20104402062e57df415d0f89dd4545b4964e5c3ca28851cc4762301151963d0be74200f7809ec31f494
+doccontainersize 535904
+doccontainerchecksum ada2f983ef92968da06bbf21371b58ce02a257992160e898ad75a66fbb7aae3fbb00178d2663e1d816e3928eb187f44b50c812239f0c1b5861786ad9d5ccf812
+docfiles size=234
RELOC/doc/latex/yquant/README.md details="Readme"
RELOC/doc/latex/yquant/test1.qasm
RELOC/doc/latex/yquant/test10.qasm
@@ -338694,13 +338703,14 @@ docfiles size=210
RELOC/doc/latex/yquant/test9.qasm
RELOC/doc/latex/yquant/yquant-doc.pdf details="Package documentation"
RELOC/doc/latex/yquant/yquant-doc.tex
-runfiles size=65
+runfiles size=78
RELOC/tex/latex/yquant/yquant-circuit.tex
RELOC/tex/latex/yquant/yquant-config.tex
RELOC/tex/latex/yquant/yquant-draw.tex
RELOC/tex/latex/yquant/yquant-env.tex
RELOC/tex/latex/yquant/yquant-lang.tex
RELOC/tex/latex/yquant/yquant-langhelper.tex
+ RELOC/tex/latex/yquant/yquant-prepare.tex
RELOC/tex/latex/yquant/yquant-registers.tex
RELOC/tex/latex/yquant/yquant-shapes.tex
RELOC/tex/latex/yquant/yquant-tools.tex
@@ -338711,7 +338721,7 @@ catalogue-contact-home https://github.com/projekter/yquant
catalogue-ctan /graphics/pgf/contrib/yquant
catalogue-license lppl1.3c
catalogue-topics graphics diagram-circ pgf-tikz
-catalogue-version 0.3.3
+catalogue-version 0.4
name ytableau
category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index eaf2f0bcb5..2bb8fc85e5 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-5bed0b452306e5af615e4b53535ac940 texlive.tlpdb
+a4e51815874d1ef2e7a5a70117770752 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index dbe815d234..25fd1b8c15 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-f482e892bc03f8e31a7e36d2f45cc55b734dcb188a09d03b654c8b3960aca42a777e13be6e722e012cfcabe18382a9b58c5ed6e7c12030d308ad6d230cfade11 texlive.tlpdb
+32d1497392a512ce4244f565ce30cc78d29b2936d6bc3a2a527859bb6fc721ce7d37ca72e73fcd40261eafa2201b6c0fd1a5a7a257e586d6c1c4b0dfd30fcfaf texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 8b4f1a6efd..dd0ebdc72a 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-----
-iQEcBAEBCgAGBQJgaP+/AAoJEEzhh34ZQ4xwsPQIAKqRXenJKQ/Ov3YXHSnrlNPr
-38T2v1d4u+0XlUgB/AwJ+fDPE502f3KHFJbC9w5tNCyoBvKxtkDyMPHTDSofOPc4
-30UwdK3/DIrS24KDgD1xYb3AwZvnwfkfy4Ww/5WTbYKagvnaM2iHDfRUIyyTOztG
-jxtoHDEnYOcPVlic6HkCjGpPoxvZMngLnMNLgQWFw0s1wm87w13TmwQHviR5zEIA
-8cSMfX7pHDaTEQFGsqZVX5/133CBEXXxx8iQHXu9LzN4u0WKoY4QUXLqNUCuASC5
-RsZtxfUua20Aed6oP3FaE6zX6tFrZlTQdpB8tAeiMIo0PsRyp/mHgDTacKclcqA=
-=8LVx
+iQEcBAEBCgAGBQJgalFZAAoJEEzhh34ZQ4xw618IALfo/e7IwFqmo6vZhZTNTON0
+2oUBgoYFo7xn1EmqlVvmWfY9HfpvgBrvEeS/jqegCQii3ckfGOoLDv1hzhJJrCLz
+bGOr3pWS6nVwk8Aj3o0teLlXc9ihayStaM+pfFlmV4ANJrNnCTMZJCumQgANruV7
+u9cBbn56XLSUm9FrbgqrYimqXE0Y1Lu8YSQltJz8ntPCTcb6e7HHLuPfEGSKURjb
+Nz9Dr/tVWMmHNzmqx6hnHjrTWQIpJ4Ht7CDS53tMD3Gvst0Yf9egSlgnQYKHrs86
+UeofQh0cpZojjjancWlVa0x34m/yvCpqNOlEEWccNJOs5tIG+jnlFRwpdF8SPYY=
+=7ydf
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 5f9e7569a7..87596b2cd5 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 28a9c78c4d..a274f9e9f6 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=1617480872
+date=1617567317
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=4c61f71461ef0cbacf2e86d948f030df
+lstdigest=4e9cf36e2576306d6b46e2c157b5f892
numpkg=4077
relstate=next
-version=7763
+version=7764
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: BbU0F+ul1CNWGwFYNBe0AWew+9926Ca/of+IoVCLV1iX+pBa40uuuXJxJRhLy60TCju41uoeGW2BuItJ+awJG5AH5SSShCwxgM8HiRPbFszC5tAlfhU5t3BRr3t9irvfrdAIFTIOKrC0m/a2QKexeSaQPWR4qjuPoG4v3TxcozMDFbCYVxrWsCZAO5i7rYoHMRJPChktsvu/G89WFWl6YBDiVAupuqKq7fdBlqphNqRo/+e6Yj20Op8CMkaoMex/W9BTA4hDhvm0Fv3QSWa9BcztmuZubQmKi4kyY4j2Cb01czY8Yb8f/yaqaUZkxKgRgVhFW0AapHiLVZJjkhfcBQ==
+;;;; signature/miktex: S7r5BhpEl8uQmVF3CULe/Q8u3mObPptMjmF/ynhmQ7Ex9Er+w1MzlOMIP9SZbGXwd/0GDlddhc1YBqT+P4xGbOqvAXK2FYutwmGEaNVCJftqedGGO4LQwbVAlJaNt9B6zou6veLAQxvi6kpHti0Dk1OkT+SuYTg1QqFY5FV6DjSjdic07a6X8K8snrztQZzTGa+3kP6+LBcrCIlBcx4c4U1HFuw9FdVEUX+6IOWu77I8te5diW07DT2EhzoUyiKvSVl2eKwoyEGzdPl+monroAk9YfemPdZZDTIPTOS7WBn/NDPRpQXOxkoyjNPqpXmBFsqHUCfc2//3er7VN/eztg==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index be028d4ccd..79a7eafac1 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1617480666
+date=1617567118
lastupd=addfont babel beamer beamer-rl cmpj covington datetime2 easybook fontsize gastex graphics-def gridpapers hyph-utf8 intopdf jlreq koma-script l3backend langsci latexindent lshort-korean
-lstdigest=9e103c3bca14dea2eb686d29ec005c07
+lstdigest=38af8442152b00940acdc9598331ca02
numpkg=4077
relstate=stable
-version=7763
+version=7764
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: exnp2tfbiP0oxVgZo+JQz9BgqBUEt1NH4089/WooSikrvtS/lH+e6IIIgC04b1iW5Tcj+SL688qEkmGH6H9xg6o4qWKY5XPTyvXUem5augnGYzkDy5rQbXHBtO9w04IHbD3h+maRu547OuICGrfeaPqS00WE5qCejWallpce5hyQpJY4xV+4xhwK6XBjdEjmvMbzyN4TEoscPPg+6Jkbi3BWbCHGkj7nwDYP62Unl4yo/MeJYmWUbVRfaS0tEIk0Kvr+gIMiuMfbpqmJaMLOZzMe9sovbXE8N+RYdy8crTTq/hbSvSIVWY+yltYBIkNTcR7Cfv+JOb3eMurPg1IHIQ==
+;;;; signature/miktex: MwvsTNNhh2nX0aSez+pbDoNCj61+DCocNiGU/XtjyEoP0Byzo89ue56LDHetHKIZdpQAqM+siQLx7CbILEFnRzvREkjsqgawvXaVYiEi+Mm3Zdas0KsWwHNGsff9Lsa8b/w4WN1Eo5dfelTJUwH3puzrjB7/8YRadD74pwJxV2M+91QBgjWZmcil3ogiDzBJw5RJyx/ZkQIz5QbraDfVOjDAIEIJNwkAeAt5IUjVJabtXW9VO3APXguPDzKKTaY89dilzOpmE3NSxrKcqi4cfv1gt/R5hJ26Zb+jjs6KgowEW0bMfV5PsqzcAw7J9cTHB6gfphzV8vLZftTKHqta8w==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index d1f94e71c0..53098dc102 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:
-2021-04-04-02-02
+2021-04-05-02-02